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

feat!: update to Angular 15 #725

Merged
merged 6 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 0 additions & 13 deletions angular.json

This file was deleted.

39 changes: 26 additions & 13 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
{
"implicitDependencies": {
"angular.json": "*",
"package.json": {
"dependencies": "*",
"devDependencies": "*"
},
".eslintrc.js": "*",
"nx.json": "*",
"karma.*.js": "*",
"tsconfig.*.json": "*",
"tsconfig.json": "*"
},
"npmScope": "maskito",
"affected": {
"defaultBase": "origin/main"
Expand Down Expand Up @@ -70,5 +58,30 @@
}
}
},
"$schema": "./node_modules/nx/schemas/nx-schema.json"
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"namedInputs": {
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"sharedGlobals": [
"{workspaceRoot}/angular.json",
"{workspaceRoot}/nx.json",
"{workspaceRoot}/karma.*.js",
"{workspaceRoot}/tsconfig.*.json",
"{workspaceRoot}/tsconfig.json",
"{workspaceRoot}/babel.config.json"
],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s"
]
},
"targetDefaults": {
"build": {
"inputs": ["production", "^production"]
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
}
}
}
39,828 changes: 16,320 additions & 23,508 deletions package-lock.json

Large diffs are not rendered by default.

55 changes: 35 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,24 +79,31 @@
},
"prettier": "@taiga-ui/prettier-config",
"devDependencies": {
"@angular-devkit/build-angular": "14.2.13",
"@angular-devkit/core": "14.2.13",
"@angular-devkit/schematics": "14.2.13",
"@angular-devkit/schematics-cli": "14.2.13",
"@angular/cli": "14.2.13",
"@angular/compiler-cli": "14.2.12",
"@angular/language-service": "14.2.12",
"@angular-devkit/build-angular": "15.2.10",
"@angular-devkit/core": "15.2.10",
"@angular-devkit/schematics": "15.2.10",
"@angular-devkit/schematics-cli": "15.2.10",
"@angular/cli": "15.2.10",
"@angular/compiler-cli": "15.2.10",
"@angular/language-service": "15.2.10",
"@babel/preset-react": "7.23.3",
"@commitlint/cli": "18.4.3",
"@nrwl/angular": "14.6.0",
"@nrwl/cli": "14.6.0",
"@nrwl/eslint-plugin-nx": "14.6.0",
"@nrwl/jest": "14.6.0",
"@nrwl/js": "14.6.0",
"@nrwl/node": "14.6.0",
"@nrwl/react": "14.6.0",
"@nrwl/tao": "14.6.0",
"@nrwl/web": "14.6.0",
"@nrwl/workspace": "14.6.0",
"@nrwl/angular": "15.9.7",
"@nrwl/cli": "15.9.7",
"@nrwl/eslint-plugin-nx": "15.9.7",
"@nrwl/jest": "15.9.7",
"@nrwl/js": "15.9.7",
"@nrwl/linter": "15.9.7",
"@nrwl/node": "15.9.7",
"@nrwl/react": "15.9.7",
"@nrwl/rollup": "15.9.7",
"@nrwl/tao": "15.9.7",
"@nrwl/web": "15.9.7",
"@nrwl/webpack": "15.9.7",
"@nrwl/workspace": "15.9.7",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
"@schematics/angular": "15.2.10",
"@svgr/webpack": "6.5.1",
"@taiga-ui/commitlint-config": "0.4.2",
"@taiga-ui/cspell-config": "0.24.0",
"@taiga-ui/eslint-plugin-experience": "0.39.5",
Expand All @@ -110,6 +117,7 @@
"@types/node": "20.10.3",
"babel-jest": "29.7.0",
"cspell": "8.1.2",
"css-loader": "6.8.1",
"cypress": "13.6.1",
"cypress-real-events": "1.11.0",
"eslint": "8.55.0",
Expand All @@ -119,26 +127,33 @@
"jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "13.1.4",
"lint-staged": "15.2.0",
"ng-packagr": "14.2.2",
"ng-packagr": "15.2.2",
"postcss": "8.4.32",
"postcss-import": "15.1.0",
"postcss-preset-env": "9.3.0",
"postcss-url": "10.1.3",
"prettier": "3.1.0",
"react-refresh": "0.14.0",
"standard-version": "9.5.0",
"style-loader": "3.3.3",
"stylelint": "15.11.0",
"stylus": "0.62.0",
"stylus-loader": "7.1.3",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"tsutils": "3.21.0",
"typescript": "4.7.4"
"typescript": "4.9.5",
"url-loader": "4.1.1",
"webpack": "5.89.0",
"webpack-merge": "5.10.0"
},
"engines": {
"node": ">= 18",
"npm": ">= 9",
"yarn": "Please use npm instead of yarn to install dependencies"
},
"overrides": {
"ngx-highlightjs": "5.0.0"
"rollup-plugin-typescript2": "0.35.0"
nsbarsukov marked this conversation as resolved.
Show resolved Hide resolved
},
"standard-version": {
"scripts": {
Expand Down
7 changes: 4 additions & 3 deletions projects/angular/project.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "angular",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "projects/angular/src",
"prefix": "maskito",
"targets": {
"build": {
"executor": "@nrwl/angular:package",
"outputs": ["dist/angular"],
"outputs": ["{workspaceRoot}/dist/angular"],
"options": {
"project": "projects/angular/ng-package.json"
},
Expand All @@ -29,14 +30,14 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/angular"],
"outputs": ["{workspaceRoot}/coverage/angular"],
"options": {
"jestConfig": "projects/angular/jest.config.ts",
"passWithNoTests": true
}
},
"publish": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"command": "ts-node ./scripts/npm-publish.ts --path ./dist/angular --dry-run {args.dry-run}"
},
Expand Down
9 changes: 5 additions & 4 deletions projects/core/project.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "core",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "projects/core/src",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/web:rollup",
"executor": "@nrwl/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "projects/core/package.json",
"outputPath": "dist/core",
"entryFile": "projects/core/src/index.ts",
"tsConfig": "projects/core/tsconfig.lib.json",
"format": ["esm", "umd"],
"format": ["esm", "cjs"],
"assets": [
{
"glob": "projects/core/README.md",
Expand All @@ -23,14 +24,14 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/core"],
"outputs": ["{workspaceRoot}/coverage/core"],
"options": {
"jestConfig": "projects/core/jest.config.ts",
"passWithNoTests": true
}
},
"publish": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"command": "ts-node ./scripts/npm-publish.ts --path ./dist/core --dry-run {args.dry-run}"
},
Expand Down
31 changes: 16 additions & 15 deletions projects/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"name": "@maskito/demo",
"private": true,
"dependencies": {
"@angular/animations": "14.2.12",
"@angular/cdk": "14.2.7",
"@angular/common": "14.2.12",
"@angular/compiler": "14.2.12",
"@angular/core": "14.2.12",
"@angular/forms": "14.2.12",
"@angular/platform-browser": "14.2.12",
"@angular/platform-browser-dynamic": "14.2.12",
"@angular/platform-server": "14.2.12",
"@angular/router": "14.2.12",
"@angular/animations": "15.2.10",
"@angular/cdk": "15.2.9",
"@angular/common": "15.2.10",
"@angular/compiler": "15.2.10",
"@angular/core": "15.2.10",
"@angular/forms": "15.2.10",
"@angular/platform-browser": "15.2.10",
"@angular/platform-browser-dynamic": "15.2.10",
"@angular/platform-server": "15.2.10",
"@angular/router": "15.2.10",
"@maskito/angular": "*",
"@maskito/core": "*",
"@maskito/kit": "*",
"@ng-web-apis/universal": "3.0.7",
"@nguniversal/express-engine": "14.2.3",
"@nguniversal/express-engine": "15.2.1",
"@stackblitz/sdk": "1.9.0",
"@taiga-ui/addon-doc": "3.57.0",
"@taiga-ui/addon-mobile": "3.57.0",
Expand All @@ -28,17 +28,18 @@
"@taiga-ui/testing": "3.57.0",
"@tinkoff/ng-dompurify": "4.0.0",
"dompurify": "3.0.6",
"ngx-markdown": "14.0.1",
"marked": "4.3.0",
"ngx-markdown": "15.1.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"rxjs": "6.6.7",
"tslib": "2.6.2",
"vue": "3.3.10",
"zone.js": "0.11.8"
"zone.js": "0.13.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "14.1.0",
"@nguniversal/builders": "14.2.3",
"@angular-builders/custom-webpack": "15.0.0",
"@nguniversal/builders": "15.2.1",
"@types/dompurify": "3.0.5",
"@types/express": "4.17.21",
"express": "4.18.2"
Expand Down
13 changes: 7 additions & 6 deletions projects/demo/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "demo",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"generators": {},
Expand Down Expand Up @@ -74,14 +75,14 @@
"defaultConfiguration": "production"
},
"build-gh-pages": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": false,
"commands": [
"echo 'Github pages require special 404.html'",
"echo 'Read more: https://angular.io/guide/deployment#deploy-to-github-pages'",
"echo ------",
"nx build -c production",
"nx build demo -c production",
"cp dist/demo/browser/index.html dist/demo/browser/404.html",
"nx run demo:prerender"
]
Expand All @@ -106,13 +107,13 @@
"defaultConfiguration": "development"
},
"serve-ip": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"command": "nx serve --open --host 0.0.0.0 --disable-host-check"
}
},
"serve-ssl": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"parallel": false,
"commands": [
Expand All @@ -128,7 +129,7 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/demo"],
"outputs": ["{workspaceRoot}/coverage/demo"],
"options": {
"jestConfig": "projects/demo/jest.config.ts",
"passWithNoTests": true
Expand Down Expand Up @@ -176,7 +177,7 @@
"defaultConfiguration": "development"
},
"generate-routes-file": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"command": "ts-node ./scripts/generate-demo-routes-file.ts"
}
Expand Down
1 change: 0 additions & 1 deletion projects/demo/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,6 @@ export const appRoutes: Routes = [
imports: [
RouterModule.forRoot(appRoutes, {
initialNavigation: 'enabledBlocking',
relativeLinkResolution: 'corrected',
scrollPositionRestoration: 'enabled',
}),
],
Expand Down
1 change: 0 additions & 1 deletion projects/demo/src/main.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ if (environment.production) {
}

export {AppServerModule} from './app/app.server.module';
export {renderModule, renderModuleFactory} from '@angular/platform-server';
9 changes: 5 additions & 4 deletions projects/kit/project.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "kit",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "projects/kit/src",
"projectType": "library",
"targets": {
"build": {
"executor": "@nrwl/web:rollup",
"executor": "@nrwl/rollup:rollup",
"outputs": ["{options.outputPath}"],
"options": {
"project": "projects/kit/package.json",
"outputPath": "dist/kit",
"entryFile": "projects/kit/src/index.ts",
"tsConfig": "projects/kit/tsconfig.workaround.json",
"format": ["esm", "umd"],
"format": ["esm", "cjs"],
"assets": [
{
"glob": "projects/kit/README.md",
Expand All @@ -30,14 +31,14 @@
},
"test": {
"executor": "@nrwl/jest:jest",
"outputs": ["coverage/kit"],
"outputs": ["{workspaceRoot}/coverage/kit"],
"options": {
"jestConfig": "projects/kit/jest.config.ts",
"passWithNoTests": true
}
},
"publish": {
"executor": "@nrwl/workspace:run-commands",
"executor": "nx:run-commands",
"options": {
"command": "ts-node ./scripts/npm-publish.ts --path ./dist/kit --dry-run {args.dry-run}"
},
Expand Down
Loading
Loading