Skip to content

Commit

Permalink
Merge pull request #19512 from abpframework/issue-19218
Browse files Browse the repository at this point in the history 
Update angular version
  • Loading branch information
@Sinan997
Sinan997 authored Apr 16, 2024
2 parents 232e5e4 + 17aede1 commit 97fafaa
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 147 deletions.
84 changes: 28 additions & 56 deletions npm/ng-packs/migrations.json
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,56 @@
{
"migrations": [
{
"cli": "nx",
"version": "17.3.0-beta.6",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"version": "18.1.0-beta.3",
"description": "Moves affected.defaultBase to defaultBase in `nx.json`",
"implementation": "./src/migrations/update-17-2-0/move-default-base",
"package": "nx",
"name": "17.3.0-update-nx-wrapper"
},
{
"cli": "nx",
"version": "18.0.0-beta.2",
"description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
"implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
"x-repair-skip": true,
"package": "nx",
"name": "18.0.0-disable-adding-plugins-for-existing-workspaces"
},
{
"version": "17.2.0-beta.0",
"description": "Simplify eslintFilePatterns",
"implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns",
"package": "@nx/eslint",
"name": "simplify-eslint-patterns"
},
{
"version": "17.2.9",
"description": "Move executor options to target defaults",
"implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults",
"package": "@nx/eslint",
"name": "move-options-to-target-defaults"
"name": "move-default-base-to-nx-json-root"
},
{
"cli": "nx",
"version": "17.2.0-beta.2",
"description": "Rename '@nx/angular:webpack-dev-server' executor to '@nx/angular:dev-server'",
"factory": "./src/migrations/update-17-2-0/rename-webpack-dev-server",
"package": "@nx/angular",
"name": "rename-webpack-dev-server-executor"
"version": "18.1.0-beta.3",
"description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
"implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6",
"package": "@nx/cypress",
"name": "update-cypress-version-13-6-6"
},
{
"cli": "nx",
"version": "17.3.0-beta.10",
"version": "18.1.0-beta.1",
"requires": {
"@angular/core": ">=17.1.0"
"@angular/core": ">=17.2.0"
},
"description": "Update the @angular/cli package version to ~17.1.0.",
"factory": "./src/migrations/update-17-3-0/update-angular-cli",
"description": "Update the @angular/cli package version to ~17.2.0.",
"factory": "./src/migrations/update-18-1-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-17-1-0"
"name": "update-angular-cli-version-17-2-0"
},
{
"cli": "nx",
"version": "17.3.0-beta.10",
"requires": {
"@angular/core": ">=17.1.0"
},
"description": "Add 'browser-sync' as dev dependency when '@angular-devkit/build-angular:ssr-dev-server' or '@nx/angular:module-federation-dev-ssr' is used.",
"factory": "./src/migrations/update-17-3-0/add-browser-sync-dependency",
"version": "18.1.1-beta.0",
"description": "Ensure targetDefaults inputs for task hashing when '@nx/angular:webpack-browser' is used are correct for Module Federation.",
"factory": "./src/migrations/update-18-1-1/fix-target-defaults-inputs",
"package": "@nx/angular",
"name": "add-browser-sync-dependency"
"name": "fix-target-defaults-for-webpack-browser"
},
{
"cli": "nx",
"version": "17.3.0-beta.10",
"version": "18.2.0-beta.0",
"requires": {
"@angular/core": ">=17.1.0"
"@angular/core": ">=17.3.0"
},
"description": "Add 'autoprefixer' as dev dependency when '@nx/angular:ng-packagr-lite' or '@nx/angular:package` is used.",
"factory": "./src/migrations/update-17-3-0/add-autoprefixer-dependency",
"description": "Update the @angular/cli package version to ~17.3.0.",
"factory": "./src/migrations/update-18-2-0/update-angular-cli",
"package": "@nx/angular",
"name": "add-autoprefixer-dependency"
"name": "update-angular-cli-version-17-3-0"
},
{
"cli": "nx",
"version": "18.0.0-beta.0",
"description": "Add NX_MF_DEV_SERVER_STATIC_REMOTES to inputs for task hashing when '@nx/angular:webpack-browser' is used for Module Federation.",
"factory": "./src/migrations/update-18-0-0/add-mf-env-var-to-target-defaults",
"package": "@nx/angular",
"name": "add-module-federation-env-var-to-target-defaults"
"version": "17.3.0",
"description": "Updates two-way bindings that have an invalid expression to use the longform expression instead.",
"factory": "./migrations/invalid-two-way-bindings/bundle",
"package": "@angular/core",
"name": "invalid-two-way-bindings"
}
]
}
3 changes: 0 additions & 3 deletions npm/ng-packs/nx.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"affected": {
"defaultBase": "dev"
},
"workspaceLayout": {
"libsDir": "packages",
"appsDir": ""
Expand Down
66 changes: 33 additions & 33 deletions npm/ng-packs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,40 +46,40 @@
"devDependencies": {
"@abp/ng.theme.lepton-x": "~3.1.0",
"@abp/utils": "~8.1.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-devkit/core": "~17.1.0",
"@angular-devkit/schematics": "~17.1.0",
"@angular-devkit/schematics-cli": "~17.1.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/animations": "~17.1.0",
"@angular/cli": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"@angular-devkit/build-angular": "~17.3.0",
"@angular-devkit/core": "~17.3.0",
"@angular-devkit/schematics": "~17.3.0",
"@angular-devkit/schematics-cli": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/animations": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
"@angular/core": "~17.3.0",
"@angular/forms": "~17.3.0",
"@angular/language-service": "~17.3.0",
"@angular/localize": "~17.3.0",
"@angular/platform-browser": "~17.3.0",
"@angular/platform-browser-dynamic": "~17.3.0",
"@angular/router": "~17.3.0",
"@fortawesome/fontawesome-free": "^6.0.0",
"@ng-bootstrap/ng-bootstrap": "~16.0.0",
"@ngneat/spectator": "^16.0.0",
"@ngx-validate/core": "^0.2.0",
"@nx/angular": "~18.0.0",
"@nx/cypress": "~18.0.0",
"@nx/devkit": "~18.0.0",
"@nx/eslint": "~18.0.0",
"@nx/eslint-plugin": "~18.0.0",
"@nx/jest": "~18.0.0",
"@nx/js": "~18.0.0",
"@nx/plugin": "~18.0.0",
"@nx/workspace": "~18.0.0",
"@nx/angular": "~18.2.0",
"@nx/cypress": "~18.2.0",
"@nx/devkit": "~18.2.0",
"@nx/eslint": "~18.2.0",
"@nx/eslint-plugin": "~18.2.0",
"@nx/jest": "~18.2.0",
"@nx/js": "~18.2.0",
"@nx/plugin": "~18.2.0",
"@nx/workspace": "~18.2.0",
"@popperjs/core": "~2.11.0",
"@schematics/angular": "~17.1.0",
"@schematics/angular": "~17.3.0",
"@swc-node/register": "1.6.8",
"@swc/cli": "~0.1.0",
"@swc/core": "1.3.94",
Expand All @@ -96,23 +96,23 @@
"chart.js": "^4.0.0",
"cypress": "^7.0.0",
"dotenv": "10.0.0",
"eslint": "8.48.0",
"eslint": "8.57.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-cypress": "^2.10.3",
"got": "^11.0.0",
"jest": "^29.0.0",
"jest-canvas-mock": "^2.0.0",
"jest-environment-jsdom": "^29.0.0",
"jest-preset-angular": "13.1.3",
"jest-preset-angular": "14.0.3",
"jsonc-eslint-parser": "^2.0.0",
"jsonc-parser": "^2.0.0",
"just-clone": "^6.0.0",
"just-compare": "^2.0.0",
"lerna": "^4.0.0",
"lint-staged": "^13.0.0",
"ng-packagr": "~17.1.0",
"ng-packagr": "~17.3.0",
"ng-zorro-antd": "^17.0.0",
"nx": "~18.0.0",
"nx": "~18.2.0",
"perfect-scrollbar": "^1.0.0",
"postcss": "^8.0.0",
"postcss-import": "14.1.0",
Expand Down
36 changes: 18 additions & 18 deletions templates/app-nolayers/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@
"@abp/ng.tenant-management": "~8.1.0",
"@abp/ng.theme.shared": "~8.1.0",
"@abp/ng.theme.lepton-x": "~3.1.0",
"@angular/animations": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
"@angular/core": "~17.3.0",
"@angular/forms": "~17.3.0",
"@angular/localize": "~17.3.0",
"@angular/platform-browser": "~17.3.0",
"@angular/platform-browser-dynamic": "~17.3.0",
"@angular/router": "~17.3.0",
"bootstrap-icons": "~1.8.0",
"rxjs": "~7.8.0",
"tslib": "^2.0.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@abp/ng.schematics": "~8.1.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular-devkit/build-angular": "~17.3.0",
"@angular-eslint/builder": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/schematics": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
"@angular/language-service": "~17.3.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
Expand Down
36 changes: 18 additions & 18 deletions templates/app/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,31 @@
"@abp/ng.tenant-management": "~8.1.0",
"@abp/ng.theme.lepton-x": "~3.1.0",
"@abp/ng.theme.shared": "~8.1.0",
"@angular/animations": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
"@angular/core": "~17.3.0",
"@angular/forms": "~17.3.0",
"@angular/localize": "~17.3.0",
"@angular/platform-browser": "~17.3.0",
"@angular/platform-browser-dynamic": "~17.3.0",
"@angular/router": "~17.3.0",
"bootstrap-icons": "~1.8.0",
"rxjs": "~7.8.0",
"tslib": "^2.0.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@abp/ng.schematics": "~8.1.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular-devkit/build-angular": "~17.3.0",
"@angular-eslint/builder": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/schematics": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
"@angular/language-service": "~17.3.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
Expand Down
38 changes: 19 additions & 19 deletions templates/module/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,30 +22,30 @@
"@abp/ng.tenant-management": "~8.1.0",
"@abp/ng.theme.basic": "~8.1.0",
"@abp/ng.theme.shared": "~8.1.0",
"@angular/animations": "~17.1.0",
"@angular/common": "~17.1.0",
"@angular/compiler": "~17.1.0",
"@angular/core": "~17.1.0",
"@angular/forms": "~17.1.0",
"@angular/localize": "~17.1.0",
"@angular/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"@angular/animations": "~17.3.0",
"@angular/common": "~17.3.0",
"@angular/compiler": "~17.3.0",
"@angular/core": "~17.3.0",
"@angular/forms": "~17.3.0",
"@angular/localize": "~17.3.0",
"@angular/platform-browser": "~17.3.0",
"@angular/platform-browser-dynamic": "~17.3.0",
"@angular/router": "~17.3.0",
"rxjs": "~7.8.0",
"tslib": "^2.1.0",
"zone.js": "~0.14.0"
},
"devDependencies": {
"@abp/ng.schematics": "~8.1.0",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-eslint/builder": "~17.2.0",
"@angular-eslint/eslint-plugin": "~17.2.0",
"@angular-eslint/eslint-plugin-template": "~17.2.0",
"@angular-eslint/schematics": "~17.2.0",
"@angular-eslint/template-parser": "~17.2.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@angular-devkit/build-angular": "~17.3.0",
"@angular-eslint/builder": "~17.3.0",
"@angular-eslint/eslint-plugin": "~17.3.0",
"@angular-eslint/eslint-plugin-template": "~17.3.0",
"@angular-eslint/schematics": "~17.3.0",
"@angular-eslint/template-parser": "~17.3.0",
"@angular/cli": "~17.3.0",
"@angular/compiler-cli": "~17.3.0",
"@angular/language-service": "~17.3.0",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "6.9.1",
Expand All @@ -57,7 +57,7 @@
"karma-coverage": "~2.1.0",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.7.0",
"ng-packagr": "~17.1.0",
"ng-packagr": "~17.3.0",
"symlink": "^2.0.0",
"typescript": "~5.3.0"
}
Expand Down

0 comments on commit 97fafaa

Please sign in to comment.