Skip to content

Commit

Permalink
feat!: update to Angular 13 (#710)
Browse files Browse the repository at this point in the history
  • Loading branch information
nsbarsukov authored Dec 4, 2023
1 parent 5323b19 commit 34ffdd3
Show file tree
Hide file tree
Showing 9 changed files with 27,551 additions and 35,154 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ speed-measure-plugin.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
3 changes: 1 addition & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": ["build", "test", "lint"],
"parallel": 1
"parallel": 3
}
}
},
Expand All @@ -39,7 +39,6 @@
"config": "project"
},
"@nrwl/angular:library": {
"style": "less",
"linter": "none",
"unitTestRunner": "jest",
"buildable": true,
Expand Down
62,611 changes: 27,503 additions & 35,108 deletions package-lock.json

Large diffs are not rendered by default.

48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"projects/*"
],
"scripts": {
"postinstall": "husky install && ngcc --async",
"postinstall": "husky install",
"*** Workflow ***": "",
"start": "nx run demo:serve",
"build": "nx run demo:build:production",
Expand Down Expand Up @@ -79,25 +79,25 @@
},
"prettier": "@taiga-ui/prettier-config",
"devDependencies": {
"@angular-devkit/build-angular": "12.2.18",
"@angular-devkit/core": "12.2.18",
"@angular-devkit/schematics": "12.2.18",
"@angular-devkit/schematics-cli": "0.1102.19",
"@angular/cli": "12.2.18",
"@angular/compiler-cli": "12.2.17",
"@angular/language-service": "12.2.17",
"@angular-devkit/build-angular": "13.3.11",
"@angular-devkit/core": "13.3.11",
"@angular-devkit/schematics": "13.3.11",
"@angular-devkit/schematics-cli": "13.0.0",
"@angular/cli": "13.3.11",
"@angular/compiler-cli": "13.3.12",
"@angular/language-service": "13.3.12",
"@commitlint/cli": "18.4.3",
"@nrwl/angular": "13.1.4",
"@nrwl/cli": "13.1.4",
"@nrwl/eslint-plugin-nx": "13.1.4",
"@nrwl/jest": "13.1.4",
"@nrwl/js": "13.3.0",
"@nrwl/node": "13.1.4",
"@nrwl/angular": "13.10.6",
"@nrwl/cli": "13.10.6",
"@nrwl/eslint-plugin-nx": "13.10.6",
"@nrwl/jest": "13.10.6",
"@nrwl/js": "13.10.6",
"@nrwl/node": "13.10.6",
"@nrwl/nx-cloud": "13.1.4",
"@nrwl/react": "13.3.0",
"@nrwl/tao": "13.1.4",
"@nrwl/web": "13.4.2",
"@nrwl/workspace": "13.1.4",
"@nrwl/react": "13.10.6",
"@nrwl/tao": "13.10.6",
"@nrwl/web": "13.10.6",
"@nrwl/workspace": "13.10.6",
"@taiga-ui/commitlint-config": "0.4.2",
"@taiga-ui/cspell-config": "0.23.1",
"@taiga-ui/eslint-plugin-experience": "0.39.3",
Expand All @@ -115,22 +115,22 @@
"eslint": "8.54.0",
"http-server": "14.1.1",
"husky": "8.0.3",
"jest": "28.1.3",
"jest-environment-jsdom": "28.1.3",
"jest-preset-angular": "12.2.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "13.1.4",
"lint-staged": "15.1.0",
"ng-packagr": "12.2.7",
"ng-packagr": "13.3.1",
"postcss": "8.4.31",
"postcss-import": "15.1.0",
"postcss-preset-env": "9.3.0",
"postcss-url": "10.1.3",
"prettier": "3.1.0",
"standard-version": "9.5.0",
"stylelint": "15.11.0",
"ts-jest": "28.0.8",
"ts-jest": "29.1.1",
"ts-node": "10.9.1",
"tsutils": "3.21.0",
"typescript": "4.3.5"
"typescript": "4.6.4"
},
"engines": {
"node": ">= 18",
Expand Down
3 changes: 2 additions & 1 deletion projects/angular/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ module.exports = {
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../coverage/angular',
transform: {
'^.+\\.(ts|js|html)$': 'jest-preset-angular',
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
Expand Down
6 changes: 3 additions & 3 deletions projects/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"tslib": "2.6.2"
},
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0",
"@angular/forms": ">=12.0.0",
"@angular/common": ">=13.0.0",
"@angular/core": ">=13.0.0",
"@angular/forms": ">=13.0.0",
"@maskito/core": "^1.9.0",
"rxjs": ">=6.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion projects/angular/tsconfig.lib.prod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "../../tsconfig.build.json",
"include": ["**/*"],
"compilerOptions": {
"declarationMap": false
}
Expand Down
3 changes: 2 additions & 1 deletion projects/demo/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ module.exports = {
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../coverage/demo',
transform: {
'^.+\\.(ts|js|html)$': 'jest-preset-angular',
'^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
},
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
snapshotSerializers: [
'jest-preset-angular/build/serializers/no-ng-attributes',
'jest-preset-angular/build/serializers/ng-snapshot',
Expand Down
28 changes: 14 additions & 14 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": "12.2.17",
"@angular/cdk": "12.2.13",
"@angular/common": "12.2.17",
"@angular/compiler": "12.2.17",
"@angular/core": "12.2.17",
"@angular/forms": "12.2.17",
"@angular/platform-browser": "12.2.17",
"@angular/platform-browser-dynamic": "12.2.17",
"@angular/platform-server": "12.2.17",
"@angular/router": "12.2.17",
"@angular/animations": "13.4.0",
"@angular/cdk": "13.3.9",
"@angular/common": "13.4.0",
"@angular/compiler": "13.4.0",
"@angular/core": "13.4.0",
"@angular/forms": "13.4.0",
"@angular/platform-browser": "13.4.0",
"@angular/platform-browser-dynamic": "13.4.0",
"@angular/platform-server": "13.4.0",
"@angular/router": "13.4.0",
"@maskito/angular": "*",
"@maskito/core": "*",
"@maskito/kit": "*",
"@ng-web-apis/universal": "3.0.7",
"@nguniversal/express-engine": "12.1.3",
"@nguniversal/express-engine": "13.1.1",
"@stackblitz/sdk": "1.9.0",
"@taiga-ui/addon-doc": "3.56.0",
"@taiga-ui/addon-mobile": "3.56.0",
Expand All @@ -28,7 +28,7 @@
"@taiga-ui/testing": "3.56.0",
"@tinkoff/ng-dompurify": "4.0.0",
"dompurify": "3.0.6",
"ngx-markdown": "10.1.1",
"ngx-markdown": "13.1.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"rxjs": "6.6.7",
Expand All @@ -37,8 +37,8 @@
"zone.js": "0.11.8"
},
"devDependencies": {
"@angular-builders/custom-webpack": "12.1.3",
"@nguniversal/builders": "12.1.3",
"@angular-builders/custom-webpack": "13.1.0",
"@nguniversal/builders": "13.1.1",
"@types/dompurify": "3.0.5",
"@types/express": "4.17.21",
"express": "4.18.2"
Expand Down

0 comments on commit 34ffdd3

Please sign in to comment.