Browse Source

Feature/upgrade Nx to version 21.1.2 (#4809)

* Upgrade Nx to version 21.1.2

* Update changelog
pull/4779/head
Thomas Kaul 4 weeks ago
committed by GitHub
parent
commit
8cee03f16a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      .env.dev
  2. 2
      .gitignore
  3. 6
      CHANGELOG.md
  4. 1
      Dockerfile
  5. 7
      apps/client-e2e/project.json
  6. 109
      apps/client/project.json
  7. 9
      apps/ui-e2e/project.json
  8. 3
      nx.json
  9. 1793
      package-lock.json
  10. 24
      package.json

1
.env.dev

@ -22,4 +22,3 @@ JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
# For more info, see: https://nx.dev/concepts/inferred-tasks # For more info, see: https://nx.dev/concepts/inferred-tasks
NX_ADD_PLUGINS=false NX_ADD_PLUGINS=false
NX_NATIVE_COMMAND_RUNNER=false

2
.gitignore

@ -25,8 +25,10 @@ npm-debug.log
# misc # misc
/.angular/cache /.angular/cache
.cursor/rules/nx-rules.mdc
.env .env
.env.prod .env.prod
.github/instructions/nx.instructions.md
.nx/cache .nx/cache
.nx/workspace-data .nx/workspace-data
/.sass-cache /.sass-cache

6
CHANGELOG.md

@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Changed
- Upgraded `Nx` from version `20.8.1` to `21.1.2`
## 2.166.0 - 2025-06-05 ## 2.166.0 - 2025-06-05
### Added ### Added

1
Dockerfile

@ -33,6 +33,7 @@ COPY ./nx.json nx.json
COPY ./replace.build.mjs replace.build.mjs COPY ./replace.build.mjs replace.build.mjs
COPY ./tsconfig.base.json tsconfig.base.json COPY ./tsconfig.base.json tsconfig.base.json
ENV NX_DAEMON=false
RUN npm run build:production RUN npm run build:production
# Prepare the dist image with additional node_modules # Prepare the dist image with additional node_modules

7
apps/client-e2e/project.json

@ -3,12 +3,13 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/client-e2e/src", "sourceRoot": "apps/client-e2e/src",
"projectType": "application", "projectType": "application",
"tags": [],
"implicitDependencies": ["client"],
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "@nx/cypress:cypress", "executor": "@nx/cypress:cypress",
"options": { "options": {
"cypressConfig": "apps/client-e2e/cypress.json", "cypressConfig": "apps/client-e2e/cypress.json",
"tsConfig": "apps/client-e2e/tsconfig.e2e.json",
"devServerTarget": "client:serve" "devServerTarget": "client:serve"
}, },
"configurations": { "configurations": {
@ -17,7 +18,5 @@
} }
} }
} }
}, }
"tags": [],
"implicitDependencies": ["client"]
} }

109
apps/client/project.json

@ -2,13 +2,63 @@
"name": "client", "name": "client",
"$schema": "../../node_modules/nx/schemas/project-schema.json", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application", "projectType": "application",
"sourceRoot": "apps/client/src",
"prefix": "gf",
"i18n": {
"locales": {
"ca": {
"baseHref": "/ca/",
"translation": "apps/client/src/locales/messages.ca.xlf"
},
"de": {
"baseHref": "/de/",
"translation": "apps/client/src/locales/messages.de.xlf"
},
"es": {
"baseHref": "/es/",
"translation": "apps/client/src/locales/messages.es.xlf"
},
"fr": {
"baseHref": "/fr/",
"translation": "apps/client/src/locales/messages.fr.xlf"
},
"it": {
"baseHref": "/it/",
"translation": "apps/client/src/locales/messages.it.xlf"
},
"nl": {
"baseHref": "/nl/",
"translation": "apps/client/src/locales/messages.nl.xlf"
},
"pl": {
"baseHref": "/pl/",
"translation": "apps/client/src/locales/messages.pl.xlf"
},
"pt": {
"baseHref": "/pt/",
"translation": "apps/client/src/locales/messages.pt.xlf"
},
"tr": {
"baseHref": "/tr/",
"translation": "apps/client/src/locales/messages.tr.xlf"
},
"uk": {
"baseHref": "/uk/",
"translation": "apps/client/src/locales/messages.uk.xlf"
},
"zh": {
"baseHref": "/zh/",
"translation": "apps/client/src/locales/messages.zh.xlf"
}
},
"sourceLocale": "en"
},
"tags": [],
"generators": { "generators": {
"@schematics/angular:component": { "@schematics/angular:component": {
"style": "scss" "style": "scss"
} }
}, },
"sourceRoot": "apps/client/src",
"prefix": "gf",
"targets": { "targets": {
"build": { "build": {
"executor": "@nx/angular:webpack-browser", "executor": "@nx/angular:webpack-browser",
@ -211,7 +261,8 @@
"production": { "production": {
"buildTarget": "client:build:production" "buildTarget": "client:build:production"
} }
} },
"continuous": true
}, },
"extract-i18n": { "extract-i18n": {
"executor": "ng-extract-i18n-merge:ng-extract-i18n-merge", "executor": "ng-extract-i18n-merge:ng-extract-i18n-merge",
@ -247,55 +298,5 @@
}, },
"outputs": ["{workspaceRoot}/coverage/apps/client"] "outputs": ["{workspaceRoot}/coverage/apps/client"]
} }
}, }
"i18n": {
"locales": {
"ca": {
"baseHref": "/ca/",
"translation": "apps/client/src/locales/messages.ca.xlf"
},
"de": {
"baseHref": "/de/",
"translation": "apps/client/src/locales/messages.de.xlf"
},
"es": {
"baseHref": "/es/",
"translation": "apps/client/src/locales/messages.es.xlf"
},
"fr": {
"baseHref": "/fr/",
"translation": "apps/client/src/locales/messages.fr.xlf"
},
"it": {
"baseHref": "/it/",
"translation": "apps/client/src/locales/messages.it.xlf"
},
"nl": {
"baseHref": "/nl/",
"translation": "apps/client/src/locales/messages.nl.xlf"
},
"pl": {
"baseHref": "/pl/",
"translation": "apps/client/src/locales/messages.pl.xlf"
},
"pt": {
"baseHref": "/pt/",
"translation": "apps/client/src/locales/messages.pt.xlf"
},
"tr": {
"baseHref": "/tr/",
"translation": "apps/client/src/locales/messages.tr.xlf"
},
"uk": {
"baseHref": "/uk/",
"translation": "apps/client/src/locales/messages.uk.xlf"
},
"zh": {
"baseHref": "/zh/",
"translation": "apps/client/src/locales/messages.zh.xlf"
}
},
"sourceLocale": "en"
},
"tags": []
} }

9
apps/ui-e2e/project.json

@ -3,13 +3,14 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ui-e2e/src", "sourceRoot": "apps/ui-e2e/src",
"projectType": "application", "projectType": "application",
"tags": [],
"implicitDependencies": ["ui"],
"targets": { "targets": {
"e2e": { "e2e": {
"executor": "@nx/cypress:cypress", "executor": "@nx/cypress:cypress",
"options": { "options": {
"cypressConfig": "apps/ui-e2e/cypress.json", "cypressConfig": "apps/ui-e2e/cypress.json",
"devServerTarget": "ui:storybook", "devServerTarget": "ui:storybook"
"tsConfig": "apps/ui-e2e/tsconfig.json"
}, },
"configurations": { "configurations": {
"ci": { "ci": {
@ -23,7 +24,5 @@
"lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"] "lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
} }
} }
}, }
"tags": [],
"implicitDependencies": ["ui"]
} }

3
nx.json

@ -72,6 +72,5 @@
] ]
}, },
"parallel": 1, "parallel": 1,
"defaultBase": "origin/main", "defaultBase": "origin/main"
"useLegacyCache": true
} }

1793
package-lock.json

File diff suppressed because it is too large

24
package.json

@ -154,17 +154,17 @@
"@eslint/js": "9.24.0", "@eslint/js": "9.24.0",
"@nestjs/schematics": "11.0.5", "@nestjs/schematics": "11.0.5",
"@nestjs/testing": "11.1.0", "@nestjs/testing": "11.1.0",
"@nx/angular": "20.8.1", "@nx/angular": "21.1.2",
"@nx/cypress": "20.8.1", "@nx/cypress": "21.1.2",
"@nx/eslint-plugin": "20.8.1", "@nx/eslint-plugin": "21.1.2",
"@nx/jest": "20.8.1", "@nx/jest": "21.1.2",
"@nx/js": "20.8.1", "@nx/js": "21.1.2",
"@nx/module-federation": "20.8.1", "@nx/module-federation": "21.1.2",
"@nx/nest": "20.8.1", "@nx/nest": "21.1.2",
"@nx/node": "20.8.1", "@nx/node": "21.1.2",
"@nx/storybook": "20.8.1", "@nx/storybook": "21.1.2",
"@nx/web": "20.8.1", "@nx/web": "21.1.2",
"@nx/workspace": "20.8.1", "@nx/workspace": "21.1.2",
"@schematics/angular": "19.2.1", "@schematics/angular": "19.2.1",
"@storybook/addon-essentials": "8.6.12", "@storybook/addon-essentials": "8.6.12",
"@storybook/addon-interactions": "8.6.12", "@storybook/addon-interactions": "8.6.12",
@ -191,7 +191,7 @@
"jest": "29.7.0", "jest": "29.7.0",
"jest-environment-jsdom": "29.7.0", "jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "14.4.2", "jest-preset-angular": "14.4.2",
"nx": "20.8.1", "nx": "21.1.2",
"prettier": "3.5.3", "prettier": "3.5.3",
"prettier-plugin-organize-attributes": "1.0.0", "prettier-plugin-organize-attributes": "1.0.0",
"prisma": "6.8.2", "prisma": "6.8.2",

Loading…
Cancel
Save