Browse Source

query-node: fix build scripts and remove generated code from yarn workspace

Mokhtar Naamani 4 years ago
parent
commit
ea241cf9f7
7 changed files with 31 additions and 543 deletions
  1. 1 0
      apps.Dockerfile
  2. 2 4
      package.json
  3. 1 0
      query-node/.dockerignore
  4. 1 14
      query-node/README.md
  5. 4 6
      query-node/package.json
  6. 3 1
      query-node/run-tests.sh
  7. 19 518
      yarn.lock

+ 1 - 0
apps.Dockerfile

@@ -11,5 +11,6 @@ RUN yarn install --frozen-lockfile
 # Error: packages/page-staking/src/index.tsx(24,21): error TS2307: Cannot find module './Targets' or its corresponding type declarations.
 # RUN yarn workspace pioneer build
 RUN yarn workspace storage-node build
+RUN yarn workspace query-node-root build
 
 ENTRYPOINT [ "yarn" ]

+ 2 - 4
package.json

@@ -4,7 +4,7 @@
   "version": "1.0.0",
   "license": "GPL-3.0-only",
   "scripts": {
-    "postinstall": "yarn workspace @joystream/types build && yarn workspace cd-schemas generate:all && yarn workspace cd-schemas build && yarn workspace @joystream/cli build && yarn workspace query-node-root build",
+    "postinstall": "yarn workspace @joystream/types build && yarn workspace cd-schemas generate:all && yarn workspace cd-schemas build && yarn workspace @joystream/cli build",
     "cargo-checks": "devops/git-hooks/pre-commit && devops/git-hooks/pre-push",
     "cargo-build": "scripts/cargo-build.sh"
   },
@@ -20,9 +20,7 @@
     "pioneer/packages/*",
     "utils/api-scripts",
     "content-directory-schemas",
-    "query-node",
-    "query-node/generated/graphql-server",
-    "query-node/generated/indexer"
+    "query-node"
   ],
   "resolutions": {
     "@polkadot/api": "1.26.1",

+ 1 - 0
query-node/.dockerignore

@@ -1,3 +1,4 @@
+generated
 **/node_modules
 **/dist
 ./lib/

+ 1 - 14
query-node/README.md

@@ -8,20 +8,7 @@ We use Hydra-cli to generate a graphql server and a block indexer for joystream
 
 ```bash
 $ cd query-node
-$ hydra-cli codegen
-```
-
-After codegen process is done, we must add this lines to the `indexer/tsconfig.json` file. It is required because we are using `joystream/types` for decoding chain data in the mappings:
-
-```json
-{
-  "compilerOptions":
-    ...
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/types/augment": ["../../node_modules/@joystream/types/augment-codec/augment-types.ts"]
-    }
-}
+$ yarn build
 ```
 
 ## Run mapping processor

+ 4 - 6
query-node/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.0",
 	"description": "GraphQL server and Substrate indexer. Generated with ♥ by Hydra-CLI",
 	"scripts": {
-		"build": "yarn hydra-cli codegen && cp indexer-tsconfig.json generated/indexer/tsconfig.json && tsc --build tsconfig.json",
+		"build": "yarn codegen:all && tsc --build tsconfig.json",
 		"test": "echo \"Error: no test specified\" && exit 1",
 		"clean": "rm -rf ./generated",
 		"processor:start": "(cd ./generated/indexer && yarn && DEBUG=${DEBUG} yarn start:processor)",
@@ -16,11 +16,9 @@
 		"db:schema:migrate": "(cd ./generated/graphql-server && yarn db:create && yarn db:sync && yarn db:migrate)",
 		"db:indexer:migrate": "(cd ./generated/indexer && yarn db:migrate)",
 		"db:migrate": "yarn db:schema:migrate && yarn db:indexer:migrate",
-		"codegen:all": "hydra-cli codegen",
-		"codegen:indexer": "hydra-cli codegen --no-graphql",
-		"codegen:server": "hydra-cli codegen --no-indexer",
-		"docker:indexer:build": "docker build -t hydra-indexer -f docker/Dockerfile.indexer .",
-		"docker:server:build": "docker build -t hydra-graphql-server -f docker/Dockerfile.server .",
+		"codegen:all": "yarn hydra-cli codegen && cp indexer-tsconfig.json generated/indexer/tsconfig.json",
+		"codegen:indexer": "yarn hydra-cli codegen --no-graphql && cp indexer-tsconfig.json generated/indexer/tsconfig.json",
+		"codegen:server": "yarn hydra-cli codegen --no-indexer",
 		"docker:up": "docker-compose up -d"
 	},
 	"author": "",

+ 3 - 1
query-node/run-tests.sh

@@ -16,7 +16,9 @@ trap cleanup EXIT
 
 export WS_PROVIDER_ENDPOINT_URI=ws://joystream-node:9944/
 
-yarn build
+# Only run codegen if no generated files found
+[ ! -d "generated/" ] && yarn codegen:all
+
 yarn db:up
 yarn db:migrate
 yarn docker:up

File diff suppressed because it is too large
+ 19 - 518
yarn.lock


Some files were not shown because too many files changed in this diff