From 98fc7fba0e15f53107ba9813e0010a38c94543fd Mon Sep 17 00:00:00 2001 From: Shaun Hamilton Date: Thu, 25 Nov 2021 11:01:50 +0000 Subject: [PATCH] fix(config): build all-langs.js before server (#44274) Co-authored-by: Oliver Eyton-Williams --- .eslintignore | 1 + .gitignore | 1 + package.json | 7 ++++--- tools/scripts/build/ensure-env.ts | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.eslintignore b/.eslintignore index 17c85c3b36..b6b3ec9ff8 100644 --- a/.eslintignore +++ b/.eslintignore @@ -5,5 +5,6 @@ api-server/src/public/** api-server/lib/** tools/contributor/** tools/scripts/build/ensure-env.js +tools/scripts/build/tsconfig.tsbuildinfo config/i18n/all-langs.js config/certification-settings.js diff --git a/.gitignore b/.gitignore index 456a80128c..527f49ec17 100644 --- a/.gitignore +++ b/.gitignore @@ -167,6 +167,7 @@ config/i18n/all-langs.js config/certification-settings.js tools/scripts/build/ensure-env.js +tools/scripts/build/tsconfig.tsbuildinfo ### vim ### # Swap diff --git a/package.json b/package.json index 46c3c0493d..4a25e13c95 100644 --- a/package.json +++ b/package.json @@ -29,8 +29,9 @@ "build:client": "cd ./client && npm run build", "build:curriculum": "cd ./curriculum && npm run build", "build:server": "cd ./api-server && npm run build", - "clean": "npm-run-all clean:client clean:server clean:packages clean:root-deps", + "clean": "npm-run-all clean:build-files clean:client clean:server clean:packages clean:root-deps", "clean-and-develop": "npm run clean && npm ci && npm run develop", + "clean:build-files": "shx rm ./tools/scripts/build/tsconfig.tsbuildinfo", "clean:client": "cd ./client && npm run clean", "clean:curriculum": "shx rm ./config/curriculum.json", "clean:gatsby-site": "npm run clean:client", @@ -48,14 +49,14 @@ "predevelop": "npm run ensure-env", "develop": "npm-run-all build:curriculum -p develop:*", "develop:client": "cd ./client && npm run develop", - "develop:server": "cd ./api-server && npm run develop", + "develop:server": "npm run predevelop && cd ./api-server && npm run develop", "docs:serve": "docsify serve ./docs -o --port 3200", "e2e": "npm run e2e:dev:run", "e2e:dev:run": "start-test develop ':3000/status/ping|8000' cypress:dev:run", "e2e:dev:watch": "start-test develop ':3000/status/ping|8000' cypress:dev:watch", "e2e:prd:run": "npm run build && start-test ':3000/status/ping|8000' cypress:dev:run", "e2e:prd:watch": "npm run build && start-test ':3000/status/ping|8000' cypress:dev:watch", - "ensure-env": "cross-env DEBUG=fcc:* tsc ./tools/scripts/build/ensure-env.ts && node ./tools/scripts/build/ensure-env.js", + "ensure-env": "cd ./tools/scripts/build/ && tsc --incremental && cross-env DEBUG=fcc:* node ./ensure-env.js", "format": "run-s format:eslint format:prettier", "format:eslint": "eslint . --fix", "format:prettier": "prettier --write .", diff --git a/tools/scripts/build/ensure-env.ts b/tools/scripts/build/ensure-env.ts index 145a319897..7ad84643de 100644 --- a/tools/scripts/build/ensure-env.ts +++ b/tools/scripts/build/ensure-env.ts @@ -16,7 +16,7 @@ function checkClientLocale() { /* eslint-disable @typescript-eslint/restrict-template-expressions */ throw Error(` - CLIENT_LOCALE, ${process.env.CLIENT_LOCALE}, is not an available language in config/i18n/all-langs.js + CLIENT_LOCALE, ${process.env.CLIENT_LOCALE}, is not an available language in config/i18n/all-langs.ts `); /* eslint-enable @typescript-eslint/restrict-template-expressions */ @@ -28,7 +28,7 @@ function checkCurriculumLocale() { /* eslint-disable @typescript-eslint/restrict-template-expressions */ throw Error(` - CURRICULUM_LOCALE, ${process.env.CURRICULUM_LOCALE}, is not an available language in config/i18n/all-langs.js + CURRICULUM_LOCALE, ${process.env.CURRICULUM_LOCALE}, is not an available language in config/i18n/all-langs.ts `); /* eslint-enable @typescript-eslint/restrict-template-expressions */