gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(config): build all-langs.js before server (#44274)

Browse Source 
Co-authored-by: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
This commit is contained in:
Shaun Hamilton
2021-11-25 11:01:50 +00:00
committed by GitHub
parent 56e394eb0e
commit 98fc7fba0e
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -5,5 +5,6 @@ api-server/src/public/**
api-server/lib/** api-server/lib/**
tools/contributor/** tools/contributor/**
tools/scripts/build/ensure-env.js tools/scripts/build/ensure-env.js
tools/scripts/build/tsconfig.tsbuildinfo
config/i18n/all-langs.js config/i18n/all-langs.js
config/certification-settings.js config/certification-settings.js

1
.gitignore vendored
View File

@ -167,6 +167,7 @@ config/i18n/all-langs.js
config/certification-settings.js config/certification-settings.js
tools/scripts/build/ensure-env.js tools/scripts/build/ensure-env.js
tools/scripts/build/tsconfig.tsbuildinfo
### vim ### ### vim ###
# Swap # Swap

7
package.json
View File

@ -29,8 +29,9 @@
"build:client": "cd ./client && npm run build", "build:client": "cd ./client && npm run build",
"build:curriculum": "cd ./curriculum && npm run build", "build:curriculum": "cd ./curriculum && npm run build",
"build:server": "cd ./api-server && 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-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:client": "cd ./client && npm run clean",
"clean:curriculum": "shx rm ./config/curriculum.json", "clean:curriculum": "shx rm ./config/curriculum.json",
"clean:gatsby-site": "npm run clean:client", "clean:gatsby-site": "npm run clean:client",
@ -48,14 +49,14 @@
"predevelop": "npm run ensure-env", "predevelop": "npm run ensure-env",
"develop": "npm-run-all build:curriculum -p develop:*", "develop": "npm-run-all build:curriculum -p develop:*",
"develop:client": "cd ./client && npm run 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", "docs:serve": "docsify serve ./docs -o --port 3200",
"e2e": "npm run e2e:dev:run", "e2e": "npm run e2e:dev:run",
"e2e:dev:run": "start-test develop ':3000/status/ping|8000' cypress: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: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: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", "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": "run-s format:eslint format:prettier",
"format:eslint": "eslint . --fix", "format:eslint": "eslint . --fix",
"format:prettier": "prettier --write .", "format:prettier": "prettier --write .",

4
tools/scripts/build/ensure-env.ts
View File

@ -16,7 +16,7 @@ function checkClientLocale() {
/* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable @typescript-eslint/restrict-template-expressions */
throw Error(` 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 */ /* eslint-enable @typescript-eslint/restrict-template-expressions */
@ -28,7 +28,7 @@ function checkCurriculumLocale() {
/* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable @typescript-eslint/restrict-template-expressions */
throw Error(` 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 */ /* eslint-enable @typescript-eslint/restrict-template-expressions */