Skip to content

Commit

Permalink
Merge pull request #1296 from merico-dev/1294-upgrade-api-node-versio…
Browse files Browse the repository at this point in the history
…n-to-20

Upgrade api to node 20
  • Loading branch information
ZeekoZhu authored Dec 5, 2023
2 parents 496a102 + 9c74aa6 commit 5afa3dc
Show file tree
Hide file tree
Showing 3 changed files with 1,138 additions and 202 deletions.
4 changes: 2 additions & 2 deletions Dockerfile-api
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/node:16 as installer
FROM docker.io/node:20 as installer

ENV YARN_NPM_REGISTRY_SERVER=https://registry.npmmirror.com

Expand All @@ -15,7 +15,7 @@ RUN yarn set version $YARN_VERSION

RUN yarn install

FROM registry.cn-hongkong.aliyuncs.com/merico/node:lts_base_v2
FROM registry.cn-hongkong.aliyuncs.com/merico/node:20.10.0

COPY --from=installer /code/api/_build /code/api/_build

Expand Down
78 changes: 39 additions & 39 deletions api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"dev:add-preset-dashboards": "node -r ts-node/register src/preset/scripts/configure_dashboards.ts",
"dev:add-preset-custom_functions": "node -r ts-node/register src/preset/scripts/configure_custom_functions.ts",
"dev:add-preset-sql_snippets": "node -r ts-node/register src/preset/scripts/configure_sql_snippets.ts",
"typeorm": "typeorm-ts-node-esm",
"migration:create": "npx typeorm-ts-node-esm migration:create",
"migration:run": "npx typeorm-ts-node-esm migration:run -d src/data_sources/dashboard.ts",
"migration:revert": "npx typeorm-ts-node-esm migration:revert -d src/data_sources/dashboard.ts",
"typeorm": "ts-node -r ./src/data_sources/dashboard.ts ./node_modules/typeorm/cli",
"migration:create": "yarn typeorm migration:create",
"migration:run": "yarn typeorm migration:run -d src/data_sources/dashboard.ts",
"migration:revert": "yarn typeorm migration:revert -d src/data_sources/dashboard.ts",
"dev:cli:rename-datasource": "node -r ts-node/register src/cli/renameDataSource.ts",
"dev:cli:clear-fs-cache": "node -r ts-node/register src/cli/clearFsCache.ts",
"test:e2e": "node --expose-gc --max-old-space-size=4096 ../node_modules/jest/bin/jest -i --ci --coverage --forceExit --detectOpenHandles --config=./jest-e2e.config.js tests/e2e/ --logHeapUsage",
Expand All @@ -35,57 +35,57 @@
"license": "Apache-2.0",
"dependencies": {
"argparse": "^2.0.1",
"axios": "^0.27.2",
"bcrypt": "^5.0.1",
"body-parser": "^1.20.0",
"axios": "^1.6.2",
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
"class-transformer": "^0.5.1",
"class-validator": "^0.14.0",
"class-validator-jsonschema": "^3.1.1",
"class-validator-jsonschema": "^5.0.0",
"cors": "^2.8.5",
"crypto-js": "^4.1.1",
"dotenv": "^16.0.1",
"express": "^4.18.1",
"fs-extra": "^11.1.0",
"crypto-js": "^4.2.0",
"dotenv": "^16.3.1",
"express": "^4.18.2",
"fs-extra": "^11.2.0",
"generate-api-key": "^1.0.2",
"i18n": "^0.15.1",
"inversify": "^6.0.1",
"inversify-express-utils": "^6.4.3",
"inversify": "^6.0.2",
"inversify-express-utils": "^6.4.6",
"js-base64": "^3.7.5",
"jsonwebtoken": "^8.5.1",
"jsonwebtoken": "^9.0.2",
"lodash": "^4.17.21",
"mysql": "^2.18.1",
"npmlog": "^6.0.2",
"pg": "^8.7.3",
"npmlog": "^7.0.1",
"pg": "^8.11.3",
"reflect-metadata": "^0.1.13",
"simple-git": "^3.15.0",
"socket.io": "^4.6.1",
"simple-git": "^3.21.0",
"socket.io": "^4.7.2",
"swagger-express-ts": "^1.1.0",
"swagger-ui-dist": "^4.11.1",
"tsconfig-paths": "^4.0.0",
"swagger-ui-dist": "^5.10.3",
"tsconfig-paths": "^4.2.0",
"typeorm": "^0.3.17"
},
"devDependencies": {
"@types/bcrypt": "^5.0.0",
"@types/body-parser": "^1.19.2",
"@types/crypto-js": "^4.1.1",
"@types/express": "^4.17.13",
"@types/fs-extra": "^11.0.1",
"@types/i18n": "^0.13.6",
"@types/jest": "^29.4.0",
"@types/jsonwebtoken": "^8.5.8",
"@types/lodash": "^4.14.182",
"@types/node": "^17.0.35",
"@types/pg": "^8.6.5",
"@types/supertest": "^2.0.12",
"@types/bcrypt": "^5.0.2",
"@types/body-parser": "^1.19.5",
"@types/crypto-js": "^4.2.1",
"@types/express": "^4.17.21",
"@types/fs-extra": "^11.0.4",
"@types/i18n": "^0.13.10",
"@types/jest": "^29.5.10",
"@types/jsonwebtoken": "^9.0.5",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.1",
"@types/pg": "^8.10.9",
"@types/supertest": "^2.0.16",
"gulp": "^4.0.2",
"gulp-cli": "^2.3.0",
"gulp-terser": "^2.1.0",
"gulp-typescript": "^6.0.0-alpha.1",
"jest": "^29.4.1",
"nodemon": "^2.0.16",
"supertest": "^6.3.1",
"ts-jest": "^29.1.0",
"ts-node": "^10.8.0",
"typescript": "^4.6.4"
"jest": "^29.7.0",
"nodemon": "^3.0.1",
"supertest": "^6.3.3",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typescript": "^5.3.2"
}
}
Loading

0 comments on commit 5afa3dc

Please sign in to comment.