Browse Source

Feature/upgrade nx to version 15 (#1375)

* Upgrade to Nx 15

* Update changelog
pull/1379/head
Thomas Kaul 2 years ago
committed by GitHub
parent
commit
8fd1fbd44a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 8
      apps/api/project.json
  3. 2
      apps/client/project.json
  4. 2
      libs/common/project.json
  5. 2
      libs/ui/project.json
  6. 38
      nx.json
  7. 30
      package.json
  8. 1357
      yarn.lock

1
CHANGELOG.md

@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Migrated the `angular.json` to `project.json` files in the `Nx` workspace - Migrated the `angular.json` to `project.json` files in the `Nx` workspace
- Upgraded `Nx` from version `14.6.4` to `15.0.0`
## 1.205.2 - 16.10.2022 ## 1.205.2 - 16.10.2022

8
apps/api/project.json

@ -6,12 +6,14 @@
"generators": {}, "generators": {},
"targets": { "targets": {
"build": { "build": {
"executor": "@nrwl/node:webpack", "executor": "@nrwl/webpack:webpack",
"options": { "options": {
"outputPath": "dist/apps/api", "outputPath": "dist/apps/api",
"main": "apps/api/src/main.ts", "main": "apps/api/src/main.ts",
"tsConfig": "apps/api/tsconfig.app.json", "tsConfig": "apps/api/tsconfig.app.json",
"assets": ["apps/api/src/assets"] "assets": ["apps/api/src/assets"],
"target": "node",
"compiler": "tsc"
}, },
"configurations": { "configurations": {
"production": { "production": {
@ -47,7 +49,7 @@
"jestConfig": "apps/api/jest.config.ts", "jestConfig": "apps/api/jest.config.ts",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/apps/api"] "outputs": ["{workspaceRoot}/coverage/apps/api"]
} }
}, },
"tags": [] "tags": []

2
apps/client/project.json

@ -173,7 +173,7 @@
"jestConfig": "apps/client/jest.config.ts", "jestConfig": "apps/client/jest.config.ts",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/apps/client"] "outputs": ["{workspaceRoot}/coverage/apps/client"]
} }
}, },
"i18n": { "i18n": {

2
libs/common/project.json

@ -11,7 +11,7 @@
}, },
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/common"], "outputs": ["{workspaceRoot}/coverage/libs/common"],
"options": { "options": {
"jestConfig": "libs/common/jest.config.ts", "jestConfig": "libs/common/jest.config.ts",
"passWithNoTests": true "passWithNoTests": true

2
libs/ui/project.json

@ -11,7 +11,7 @@
"targets": { "targets": {
"test": { "test": {
"executor": "@nrwl/jest:jest", "executor": "@nrwl/jest:jest",
"outputs": ["coverage/libs/ui"], "outputs": ["{workspaceRoot}/coverage/libs/ui"],
"options": { "options": {
"jestConfig": "libs/ui/jest.config.ts", "jestConfig": "libs/ui/jest.config.ts",
"passWithNoTests": true "passWithNoTests": true

38
nx.json

@ -1,14 +1,4 @@
{ {
"implicitDependencies": {
"angular.json": "*",
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
"tsconfig.base.json": "*",
".eslintrc.json": "*",
"nx.json": "*"
},
"affected": { "affected": {
"defaultBase": "origin/main" "defaultBase": "origin/main"
}, },
@ -46,7 +36,33 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json", "$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": { "targetDefaults": {
"build": { "build": {
"dependsOn": ["^build"] "dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"e2e": {
"inputs": ["default", "^production"]
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
},
"build-storybook": {
"inputs": ["default", "^production", "{workspaceRoot}/.storybook/**/*"]
} }
},
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [
"{workspaceRoot}/angular.json",
"{workspaceRoot}/tsconfig.base.json",
"{workspaceRoot}/nx.json"
],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.storybook/**/*",
"!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)"
]
} }
} }

30
package.json

@ -80,7 +80,7 @@
"@nestjs/platform-express": "9.0.7", "@nestjs/platform-express": "9.0.7",
"@nestjs/schedule": "2.1.0", "@nestjs/schedule": "2.1.0",
"@nestjs/serve-static": "3.0.0", "@nestjs/serve-static": "3.0.0",
"@nrwl/angular": "14.6.4", "@nrwl/angular": "15.0.0",
"@prisma/client": "4.4.0", "@prisma/client": "4.4.0",
"@simplewebauthn/browser": "5.2.1", "@simplewebauthn/browser": "5.2.1",
"@simplewebauthn/server": "5.2.1", "@simplewebauthn/server": "5.2.1",
@ -131,24 +131,24 @@
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "14.2.1", "@angular-devkit/build-angular": "14.2.1",
"@angular-eslint/eslint-plugin": "14.0.3", "@angular-eslint/eslint-plugin": "14.0.4",
"@angular-eslint/eslint-plugin-template": "14.0.3", "@angular-eslint/eslint-plugin-template": "14.0.4",
"@angular-eslint/template-parser": "14.0.3", "@angular-eslint/template-parser": "14.0.4",
"@angular/cli": "14.2.1", "@angular/cli": "14.2.1",
"@angular/compiler-cli": "14.2.0", "@angular/compiler-cli": "14.2.0",
"@angular/language-service": "14.2.0", "@angular/language-service": "14.2.0",
"@angular/localize": "14.2.0", "@angular/localize": "14.2.0",
"@nestjs/schematics": "9.0.1", "@nestjs/schematics": "9.0.1",
"@nestjs/testing": "9.0.7", "@nestjs/testing": "9.0.7",
"@nrwl/cli": "14.6.4", "@nrwl/cli": "15.0.0",
"@nrwl/cypress": "14.6.4", "@nrwl/cypress": "15.0.0",
"@nrwl/eslint-plugin-nx": "14.6.4", "@nrwl/eslint-plugin-nx": "15.0.0",
"@nrwl/jest": "14.6.4", "@nrwl/jest": "15.0.0",
"@nrwl/nest": "14.6.4", "@nrwl/nest": "15.0.0",
"@nrwl/node": "14.6.4", "@nrwl/node": "15.0.0",
"@nrwl/nx-cloud": "14.6.1", "@nrwl/nx-cloud": "14.7.0",
"@nrwl/storybook": "14.6.4", "@nrwl/storybook": "15.0.0",
"@nrwl/workspace": "14.6.4", "@nrwl/workspace": "15.0.0",
"@simplewebauthn/typescript-types": "5.2.1", "@simplewebauthn/typescript-types": "5.2.1",
"@storybook/addon-essentials": "6.5.9", "@storybook/addon-essentials": "6.5.9",
"@storybook/angular": "6.5.9", "@storybook/angular": "6.5.9",
@ -179,7 +179,7 @@
"jest": "28.1.3", "jest": "28.1.3",
"jest-environment-jsdom": "28.1.1", "jest-environment-jsdom": "28.1.1",
"jest-preset-angular": "12.2.2", "jest-preset-angular": "12.2.2",
"nx": "14.6.4", "nx": "15.0.0",
"prettier": "2.7.1", "prettier": "2.7.1",
"prettier-plugin-organize-attributes": "0.0.5", "prettier-plugin-organize-attributes": "0.0.5",
"replace-in-file": "6.2.0", "replace-in-file": "6.2.0",
@ -187,7 +187,7 @@
"ts-jest": "28.0.8", "ts-jest": "28.0.8",
"ts-node": "10.9.1", "ts-node": "10.9.1",
"tslib": "2.0.0", "tslib": "2.0.0",
"typescript": "4.7.3" "typescript": "4.8.4"
}, },
"engines": { "engines": {
"node": ">=14" "node": ">=14"

1357
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save