Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: upgrade angular to v17 #1289

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Nx 18 enables using plugins to infer targets by default
# This is disabled for existing workspaces to maintain compatibility
# For more info, see: https://nx.dev/concepts/inferred-tasks
NX_ADD_PLUGINS=false
NX_NATIVE_COMMAND_RUNNER=false# fix for https://github.com/nrwl/nx/issues/21779
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ $RECYCLE.BIN/
.DS_Store
Thumbs.db
UserInterfaceState.xcuserstate
.env

storybook-static/

Expand All @@ -38,4 +37,4 @@ tmp/
.angular
.nx-cache

.nx/cache
.nx/cache
16 changes: 13 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,24 @@
"{projectRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintrc.json"
]
},
"@angular-devkit/build-angular:browser": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
},
"@nx/angular:package": {
"cache": true,
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
}
},
"generators": {
"@nx/angular:application": {
"style": "scss",
"e2eTestRunner": "none",
"linter": "eslint",
"unitTestRunner": "none",
"e2eTestRunner": "none"
"style": "scss",
"unitTestRunner": "none"
},
"@nx/angular:library": {
"linter": "eslint",
Expand Down
63 changes: 36 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,35 @@
"clean:node-modules": "nx run-many --target=clean --configuration=nodejs --exclude workspace && shx rm -rf node_modules"
},
"devDependencies": {
"@angular-devkit/build-angular": "~15.1.0",
"@angular-eslint/eslint-plugin": "~15.0.0",
"@angular-eslint/eslint-plugin-template": "~15.0.0",
"@angular-eslint/template-parser": "~15.0.0",
"@angular/cli": "~15.1.0",
"@angular/compiler-cli": "~15.1.0",
"@angular/language-service": "~15.1.0",
"@nx/angular": "17.3.0-beta.8",
"@nx/devkit": "17.3.0-beta.8",
"@nx/eslint": "17.3.0-beta.8",
"@nx/eslint-plugin": "17.3.0-beta.8",
"@nx/playwright": "17.3.0-beta.8",
"@nx/storybook": "17.3.0-beta.8",
"@angular-devkit/build-angular": "~17.1.0",
"@angular-devkit/core": "~17.1.0",
"@angular-devkit/schematics": "~17.1.0",
"@angular-eslint/eslint-plugin": "~17.0.0",
"@angular-eslint/eslint-plugin-template": "~17.0.0",
"@angular-eslint/template-parser": "~17.0.0",
"@angular/cli": "~17.1.0",
"@angular/compiler-cli": "~17.1.0",
"@angular/language-service": "~17.1.0",
"@nx/angular": "18.0.7",
"@nx/devkit": "18.0.7",
"@nx/eslint": "18.0.7",
"@nx/eslint-plugin": "18.0.7",
"@nx/js": "18.0.7",
"@nx/playwright": "18.0.7",
"@nx/storybook": "18.0.7",
"@playwright/test": "^1.36.0",
"@schematics/angular": "~17.1.0",
"@swc-node/register": "~1.8.0",
"@swc/core": "~1.3.85",
"@swc/helpers": "~0.5.2",
"@types/conventional-recommended-bump": "^9.0.3",
"@types/css-font-loading-module": "^0.0.7",
"@types/fs-extra": "^9.0.13",
"@types/jest": "29.5.11",
"@types/shelljs": "^0.8.15",
"@typescript-eslint/eslint-plugin": "6.13.2",
"@typescript-eslint/parser": "6.13.2",
"autoprefixer": "^10.4.0",
"camelcase": "^6.2.0",
"chalk": "^4.1.2",
"conventional-changelog-angular": "^7.0.0",
Expand All @@ -58,35 +66,36 @@
"jest": "29.7.0",
"jest-cli": "29.7.0",
"js-yaml": "^3.14.0",
"jsonc-eslint-parser": "^2.1.0",
"lint-staged": "^10.5.3",
"ng-packagr": "~15.1.0",
"nx": "17.3.0-beta.8",
"ng-packagr": "~17.1.0",
"nx": "18.0.7",
"postcss": "^8.4.5",
"postcss-import": "~14.1.0",
"postcss-preset-env": "~7.5.0",
"postcss-url": "~10.1.3",
"prettier": "^2.1.2",
"prettier": "^2.6.2",
"prompts": "^2.4.0",
"semver": "^7.5.4",
"shelljs": "^0.8.4",
"shx": "^0.3.2",
"svgo": "^2.8.0",
"ts-node": "^10.9.1",
"typescript": "~4.9.4",
"typescript": "~5.3.2",
"yalc": "^1.0.0-pre.32"
},
"dependencies": {
"@angular/animations": "~15.1.0",
"@angular/common": "~15.1.0",
"@angular/compiler": "~15.1.0",
"@angular/core": "~15.1.0",
"@angular/forms": "~15.1.0",
"@angular/platform-browser": "~15.1.0",
"@angular/platform-browser-dynamic": "~15.1.0",
"@angular/router": "~15.1.0",
"rxjs": "~7.5.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/platform-browser": "~17.1.0",
"@angular/platform-browser-dynamic": "~17.1.0",
"@angular/router": "~17.1.0",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
"zone.js": "~0.14.3"
},
"workspaces": {
"packages": [
Expand Down
14 changes: 4 additions & 10 deletions packages/elements-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,17 @@
"dist/",
".yalc"
],
"module": "./dist/fesm2015/inovex.de-elements-angular.mjs",
"es2020": "./dist/fesm2020/inovex.de-elements-angular.mjs",
"esm2020": "./dist/esm2020/inovex.de-elements-angular.mjs",
"fesm2020": "./dist/fesm2020/inovex.de-elements-angular.mjs",
"fesm2015": "./dist/fesm2015/inovex.de-elements-angular.mjs",
"module": "./dist/fesm2022/inovex.de-elements-angular.mjs",
"typings": "./dist/index.d.ts",
"exports": {
"./package.json": {
"default": "./package.json"
},
".": {
"types": "./dist/index.d.ts",
"esm2020": "./dist/esm2020/inovex.de-elements-angular.mjs",
"es2020": "./dist/fesm2020/inovex.de-elements-angular.mjs",
"es2015": "./dist/fesm2015/inovex.de-elements-angular.mjs",
"node": "./dist/fesm2015/inovex.de-elements-angular.mjs",
"default": "./dist/fesm2020/inovex.de-elements-angular.mjs"
"esm2022": "./dist/esm2022/inovex.de-elements-angular.mjs",
"esm": "./dist/esm2022/inovex.de-elements-angular.mjs",
"default": "./dist/fesm2022/inovex.de-elements-angular.mjs"
}
}
}
1 change: 0 additions & 1 deletion packages/elements-react-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"@types/react-dom": "^18.2.8",
"@types/react-router-dom": "^5.3.3",
"@vitejs/plugin-react": "^4.1.0",
"typescript": "^4.5.5",
"vite": "^4.4.9"
}
}
3 changes: 1 addition & 2 deletions packages/elements-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
"@types/node": "^14.17.0",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"@types/react-router": "^5.1.20",
"typescript": "^4.5.5"
"@types/react-router": "^5.1.20"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/elements-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,5 @@
},
"peerDependencies": {
"vue": "^3.0.0"
},
"devDependencies": {
"typescript": "^4.2.4"
}
}
3 changes: 1 addition & 2 deletions packages/landingpage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"eslint-config-next": "12.3.1",
"next-html": "^0.1.1",
"next-images": "^1.8.4",
"sass": "^1.55.0",
"typescript": "4.8.4"
"sass": "^1.55.0"
}
}
3 changes: 1 addition & 2 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"eslint-plugin-storybook": "^0.6.15",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.6.12",
"typescript": "^4.5.5"
"storybook": "^7.6.12"
}
}
10 changes: 5 additions & 5 deletions packages/storybook/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@ import { defineConfig, devices } from '@playwright/test';
import { nxE2EPreset } from '@nx/playwright/preset';
import { fileURLToPath } from 'url';
import { workspaceRoot } from '@nx/devkit';

// @ts-ignore
const __filename = fileURLToPath(import.meta.url);

const STORYBOOK_URL = 'http://localhost:6006';

// For CI, you may want to set BASE_URL to the deployed application.
const baseURL = process.env['BASE_URL'] || STORYBOOK_URL; // storybook URL

/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// require('dotenv').config();

/**
* See https://playwright.dev/docs/test-configuration.
*/
Expand All @@ -39,4 +34,9 @@ export default defineConfig({
reuseExistingServer: !process.env.CI,
cwd: workspaceRoot,
},
projects: [
{ name: 'chromium', use: { ...devices['Desktop Chrome'] } },
// { name: 'firefox', use: { ...devices['Desktop Firefox'] } },
// { name: 'webkit', use: { ...devices['Desktop Safari'] } },
],
});
1 change: 0 additions & 1 deletion packages/storybook/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"outputs": ["{workspaceRoot}/dist/.playwright/packages/storybook"],
"options": {
"config": "packages/storybook/playwright.config.ts",
"browser": "chromium",
"timeout": 15000
},
"defaultConfiguration": "headless",
Expand Down
1 change: 0 additions & 1 deletion packages/ui-patterns-playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"eslint-plugin-react-refresh": "^0.4.4",
"postcss": "^8.4.32",
"tailwindcss": "^3.3.6",
"typescript": "^5.2.2",
"vite": "^4.5.2"
}
}
1 change: 0 additions & 1 deletion packages/ui-patterns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"eslint-plugin-react-refresh": "^0.4.3",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.3",
"typescript": "^5.0.2",
"vite": "^4.4.5",
"vite-plugin-dts": "^3.6.0",
"vite-plugin-static-copy": "^0.17.0"
Expand Down
Loading
Loading