Skip to content
Snippets Groups Projects
Commit ad0cc2bd authored by OZGCloud's avatar OZGCloud
Browse files

Angular update 11 -> 12

parent cdefef8a
No related branches found
No related tags found
No related merge requests found
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"allowedCommonJsDependencies": ["file-saver"], "allowedCommonJsDependencies": [
"file-saver"
],
"outputPath": "dist/apps/goofy", "outputPath": "dist/apps/goofy",
"index": "apps/goofy/src/index.html", "index": "apps/goofy/src/index.html",
"main": "apps/goofy/src/main.ts", "main": "apps/goofy/src/main.ts",
"polyfills": "apps/goofy/src/polyfills.ts", "polyfills": "apps/goofy/src/polyfills.ts",
"tsConfig": "apps/goofy/tsconfig.app.json", "tsConfig": "apps/goofy/tsconfig.app.json",
"aot": true,
"assets": [ "assets": [
"apps/goofy/src/assets", "apps/goofy/src/assets",
{ {
...@@ -35,11 +36,21 @@ ...@@ -35,11 +36,21 @@
"output": "assets/icons" "output": "assets/icons"
} }
], ],
"styles": ["apps/goofy/src/styles/main.scss"], "styles": [
"apps/goofy/src/styles/main.scss"
],
"scripts": [], "scripts": [],
"stylePreprocessorOptions": { "stylePreprocessorOptions": {
"includePaths": ["apps/goofy/src/styles/abstracts"] "includePaths": [
} "apps/goofy/src/styles/abstracts"
]
},
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
}, },
"configurations": { "configurations": {
"production": { "production": {
...@@ -70,7 +81,9 @@ ...@@ -70,7 +81,9 @@
] ]
} }
}, },
"outputs": ["{options.outputPath}"] "outputs": [
"{options.outputPath}"
]
}, },
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
...@@ -104,7 +117,9 @@ ...@@ -104,7 +117,9 @@
"jestConfig": "apps/goofy/jest.config.js", "jestConfig": "apps/goofy/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/apps/goofy"] "outputs": [
"coverage/apps/goofy"
]
} }
} }
}, },
...@@ -158,7 +173,9 @@ ...@@ -158,7 +173,9 @@
"jestConfig": "libs/api-root-shared/jest.config.js", "jestConfig": "libs/api-root-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/api-root-shared"] "outputs": [
"coverage/libs/api-root-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -188,7 +205,9 @@ ...@@ -188,7 +205,9 @@
"jestConfig": "libs/environment-shared/jest.config.js", "jestConfig": "libs/environment-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/environment-shared"] "outputs": [
"coverage/libs/environment-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -218,7 +237,9 @@ ...@@ -218,7 +237,9 @@
"jestConfig": "libs/tech-shared/jest.config.js", "jestConfig": "libs/tech-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/tech-shared"] "outputs": [
"coverage/libs/tech-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -236,7 +257,10 @@ ...@@ -236,7 +257,10 @@
"lint": { "lint": {
"builder": "@nrwl/linter:eslint", "builder": "@nrwl/linter:eslint",
"options": { "options": {
"lintFilePatterns": ["libs/ui/src/**/*.ts", "libs/ui/src/**/*.html"] "lintFilePatterns": [
"libs/ui/src/**/*.ts",
"libs/ui/src/**/*.html"
]
} }
}, },
"test": { "test": {
...@@ -245,7 +269,9 @@ ...@@ -245,7 +269,9 @@
"jestConfig": "libs/ui/jest.config.js", "jestConfig": "libs/ui/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/ui"] "outputs": [
"coverage/libs/ui"
]
} }
}, },
"schematics": { "schematics": {
...@@ -275,7 +301,9 @@ ...@@ -275,7 +301,9 @@
"jestConfig": "libs/vorgang-shared/jest.config.js", "jestConfig": "libs/vorgang-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/vorgang-shared"] "outputs": [
"coverage/libs/vorgang-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -305,7 +333,9 @@ ...@@ -305,7 +333,9 @@
"jestConfig": "libs/vorgang/jest.config.js", "jestConfig": "libs/vorgang/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/vorgang"] "outputs": [
"coverage/libs/vorgang"
]
} }
}, },
"schematics": { "schematics": {
...@@ -335,7 +365,9 @@ ...@@ -335,7 +365,9 @@
"jestConfig": "libs/navigation/jest.config.js", "jestConfig": "libs/navigation/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/navigation"] "outputs": [
"coverage/libs/navigation"
]
} }
}, },
"schematics": { "schematics": {
...@@ -365,7 +397,9 @@ ...@@ -365,7 +397,9 @@
"jestConfig": "libs/test-utils/jest.config.js", "jestConfig": "libs/test-utils/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/test-utils"] "outputs": [
"coverage/libs/test-utils"
]
} }
}, },
"schematics": { "schematics": {
...@@ -395,7 +429,9 @@ ...@@ -395,7 +429,9 @@
"jestConfig": "libs/app-shared/jest.config.js", "jestConfig": "libs/app-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/app-shared"] "outputs": [
"coverage/libs/app-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -425,7 +461,9 @@ ...@@ -425,7 +461,9 @@
"jestConfig": "libs/vorgang-detail/jest.config.js", "jestConfig": "libs/vorgang-detail/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/vorgang-detail"] "outputs": [
"coverage/libs/vorgang-detail"
]
} }
}, },
"schematics": { "schematics": {
...@@ -455,7 +493,9 @@ ...@@ -455,7 +493,9 @@
"jestConfig": "libs/command-shared/jest.config.js", "jestConfig": "libs/command-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
}, },
"outputs": ["coverage/libs/command-shared"] "outputs": [
"coverage/libs/command-shared"
]
} }
}, },
"schematics": { "schematics": {
...@@ -481,7 +521,9 @@ ...@@ -481,7 +521,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/wiedervorlage-shared"], "outputs": [
"coverage/libs/wiedervorlage-shared"
],
"options": { "options": {
"jestConfig": "libs/wiedervorlage-shared/jest.config.js", "jestConfig": "libs/wiedervorlage-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -506,7 +548,9 @@ ...@@ -506,7 +548,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/wiedervorlage"], "outputs": [
"coverage/libs/wiedervorlage"
],
"options": { "options": {
"jestConfig": "libs/wiedervorlage/jest.config.js", "jestConfig": "libs/wiedervorlage/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -531,7 +575,9 @@ ...@@ -531,7 +575,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/ozg-file-shared"], "outputs": [
"coverage/libs/ozg-file-shared"
],
"options": { "options": {
"jestConfig": "libs/ozg-file-shared/jest.config.js", "jestConfig": "libs/ozg-file-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -556,7 +602,9 @@ ...@@ -556,7 +602,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/ozg-file"], "outputs": [
"coverage/libs/ozg-file"
],
"options": { "options": {
"jestConfig": "libs/ozg-file/jest.config.js", "jestConfig": "libs/ozg-file/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -581,7 +629,9 @@ ...@@ -581,7 +629,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/forwarding-shared"], "outputs": [
"coverage/libs/forwarding-shared"
],
"options": { "options": {
"jestConfig": "libs/forwarding-shared/jest.config.js", "jestConfig": "libs/forwarding-shared/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -606,7 +656,9 @@ ...@@ -606,7 +656,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/forwarding"], "outputs": [
"coverage/libs/forwarding"
],
"options": { "options": {
"jestConfig": "libs/forwarding/jest.config.js", "jestConfig": "libs/forwarding/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
...@@ -631,7 +683,9 @@ ...@@ -631,7 +683,9 @@
}, },
"test": { "test": {
"builder": "@nrwl/jest:jest", "builder": "@nrwl/jest:jest",
"outputs": ["coverage/libs/vorgang-shared-ui"], "outputs": [
"coverage/libs/vorgang-shared-ui"
],
"options": { "options": {
"jestConfig": "libs/vorgang-shared-ui/jest.config.js", "jestConfig": "libs/vorgang-shared-ui/jest.config.js",
"passWithNoTests": true "passWithNoTests": true
......
...@@ -17,4 +17,4 @@ export const environment = { ...@@ -17,4 +17,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact * This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown. * on performance if an error is thrown.
*/ */
// import 'zone.js/dist/zone-error'; // Included with Angular CLI. // import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by default for Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************
* APPLICATION IMPORTS * APPLICATION IMPORTS
......
...@@ -14,11 +14,19 @@ ...@@ -14,11 +14,19 @@
"rules": { "rules": {
"@angular-eslint/directive-selector": [ "@angular-eslint/directive-selector": [
"error", "error",
{ "type": "attribute", "prefix": "goofyClient", "style": "camelCase" } {
"type": "attribute",
"prefix": "goofyClient",
"style": "camelCase"
}
], ],
"@angular-eslint/component-selector": [ "@angular-eslint/component-selector": [
"error", "error",
{ "type": "element", "prefix": "goofy-client", "style": "kebab-case" } {
"type": "element",
"prefix": "goofy-client",
"style": "kebab-case"
}
] ]
} }
}, },
......
...@@ -8,15 +8,25 @@ ...@@ -8,15 +8,25 @@
"plugin:@nrwl/nx/angular", "plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates" "plugin:@angular-eslint/template/process-inline-templates"
], ],
"parserOptions": { "project": ["libs/forwarding/tsconfig.*?.json"] }, "parserOptions": {
"project": ["libs/forwarding/tsconfig.*?.json"]
},
"rules": { "rules": {
"@angular-eslint/directive-selector": [ "@angular-eslint/directive-selector": [
"error", "error",
{ "type": "attribute", "prefix": "goofyClient", "style": "camelCase" } {
"type": "attribute",
"prefix": "goofyClient",
"style": "camelCase"
}
], ],
"@angular-eslint/component-selector": [ "@angular-eslint/component-selector": [
"error", "error",
{ "type": "element", "prefix": "goofy-client", "style": "kebab-case" } {
"type": "element",
"prefix": "goofy-client",
"style": "kebab-case"
}
] ]
} }
}, },
......
...@@ -8,15 +8,25 @@ ...@@ -8,15 +8,25 @@
"plugin:@nrwl/nx/angular", "plugin:@nrwl/nx/angular",
"plugin:@angular-eslint/template/process-inline-templates" "plugin:@angular-eslint/template/process-inline-templates"
], ],
"parserOptions": { "project": ["libs/ozg-file/tsconfig.*?.json"] }, "parserOptions": {
"project": ["libs/ozg-file/tsconfig.*?.json"]
},
"rules": { "rules": {
"@angular-eslint/directive-selector": [ "@angular-eslint/directive-selector": [
"error", "error",
{ "type": "attribute", "prefix": "goofyClient", "style": "camelCase" } {
"type": "attribute",
"prefix": "goofyClient",
"style": "camelCase"
}
], ],
"@angular-eslint/component-selector": [ "@angular-eslint/component-selector": [
"error", "error",
{ "type": "element", "prefix": "goofy-client", "style": "kebab-case" } {
"type": "element",
"prefix": "goofy-client",
"style": "kebab-case"
}
] ]
} }
}, },
......
...@@ -14,11 +14,19 @@ ...@@ -14,11 +14,19 @@
"rules": { "rules": {
"@angular-eslint/directive-selector": [ "@angular-eslint/directive-selector": [
"error", "error",
{ "type": "attribute", "prefix": "goofyClient", "style": "camelCase" } {
"type": "attribute",
"prefix": "goofyClient",
"style": "camelCase"
}
], ],
"@angular-eslint/component-selector": [ "@angular-eslint/component-selector": [
"error", "error",
{ "type": "element", "prefix": "goofy-client", "style": "kebab-case" } {
"type": "element",
"prefix": "goofy-client",
"style": "kebab-case"
}
] ]
} }
}, },
......
...@@ -46,19 +46,19 @@ ...@@ -46,19 +46,19 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "11.2.11", "@angular/animations": "12.0.0",
"@angular/cdk": "11.1.2", "@angular/cdk": "11.1.2",
"@angular/common": "11.2.11", "@angular/common": "12.0.0",
"@angular/compiler": "11.2.11", "@angular/compiler": "12.0.0",
"@angular/core": "11.2.11", "@angular/core": "12.0.0",
"@angular/forms": "11.2.11", "@angular/forms": "12.0.0",
"@angular/material": "11.1.2", "@angular/material": "11.1.2",
"@angular/material-moment-adapter": "11.2.3", "@angular/material-moment-adapter": "11.2.3",
"@angular/platform-browser": "11.2.11", "@angular/platform-browser": "12.0.0",
"@angular/platform-browser-dynamic": "11.2.11", "@angular/platform-browser-dynamic": "12.0.0",
"@angular/router": "11.2.11", "@angular/router": "12.0.0",
"@ngxp/rest": "4.0.0", "@ngxp/rest": "4.0.0",
"@nrwl/angular": "12.2.0", "@nrwl/angular": "12.3.3",
"angular-oauth2-oidc": "10.0.3", "angular-oauth2-oidc": "10.0.3",
"angular-oauth2-oidc-jwks": "9.0.0", "angular-oauth2-oidc-jwks": "9.0.0",
"faker": "5.5.3", "faker": "5.5.3",
...@@ -72,22 +72,22 @@ ...@@ -72,22 +72,22 @@
"rxjs": "6.5.5", "rxjs": "6.5.5",
"typeface-roboto": "1.1.13", "typeface-roboto": "1.1.13",
"whatwg-fetch": "3.6.2", "whatwg-fetch": "3.6.2",
"zone.js": "0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "0.1102.12", "@angular-devkit/build-angular": "12.0.0",
"@angular-eslint/eslint-plugin": "4.2.0", "@angular-eslint/eslint-plugin": "12.0.0",
"@angular-eslint/eslint-plugin-template": "4.2.0", "@angular-eslint/eslint-plugin-template": "12.0.0",
"@angular-eslint/template-parser": "4.2.0", "@angular-eslint/template-parser": "12.0.0",
"@angular/cli": "11.2.10", "@angular/cli": "12.0.0",
"@angular/compiler-cli": "11.2.11", "@angular/compiler-cli": "12.0.0",
"@angular/language-service": "11.2.11", "@angular/language-service": "12.0.0",
"@nrwl/cli": "12.2.0", "@nrwl/cli": "12.3.3",
"@nrwl/cypress": "12.2.0", "@nrwl/cypress": "12.3.3",
"@nrwl/eslint-plugin-nx": "12.2.0", "@nrwl/eslint-plugin-nx": "12.3.3",
"@nrwl/jest": "12.2.0", "@nrwl/jest": "12.3.3",
"@nrwl/linter": "12.2.0", "@nrwl/linter": "12.3.3",
"@nrwl/workspace": "12.2.0", "@nrwl/workspace": "12.3.3",
"@testing-library/jest-dom": "5.12.0", "@testing-library/jest-dom": "5.12.0",
"@types/file-saver": "2.0.2", "@types/file-saver": "2.0.2",
"@types/jest": "26.0.23", "@types/jest": "26.0.23",
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"sonarqube-scanner": "2.8.0", "sonarqube-scanner": "2.8.0",
"ts-jest": "26.5.5", "ts-jest": "26.5.5",
"ts-node": "9.1.1", "ts-node": "9.1.1",
"typescript": "4.1.4" "typescript": "4.2.4"
}, },
"optionalDependencies": { "optionalDependencies": {
"cypress": "7.2.0" "cypress": "7.2.0"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment