Skip to content

Commit

Permalink
Merge pull request #86 from jkubiszewski/angular-12
Browse files Browse the repository at this point in the history
feat(workspace): upgrade to Angular 12
  • Loading branch information
tomastrajan authored May 18, 2021
2 parents 728a27d + ce9ecae commit 939dd29
Show file tree
Hide file tree
Showing 37 changed files with 8,992 additions and 10,485 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.ts]
quote_type = single

[*.md]
max_line_length = off
trim_trailing_whitespace = false
66 changes: 39 additions & 27 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,19 @@
"prefix": "ax",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"tsConfig": "projects/elements/tsconfig.lib.json",
"project": "projects/elements/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/elements/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/elements/tsconfig.lib.json"
}
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
Expand Down Expand Up @@ -57,7 +60,6 @@
"main": "projects/elements-demo/src/main.ts",
"polyfills": "projects/elements-demo/src/polyfills.ts",
"tsConfig": "projects/elements-demo/tsconfig.app.json",
"aot": true,
"assets": [
"projects/elements-demo/src/favicon.ico",
"projects/elements-demo/src/assets",
Expand All @@ -68,43 +70,50 @@
},
"configurations": {
"production": {
"budgets": [
{
"type": "initial",
"maximumWarning": "1mb",
"maximumError": "2mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "3kb",
"maximumError": "5kb"
}
],
"fileReplacements": [
{
"replace": "projects/elements-demo/src/environments/environment.ts",
"with": "projects/elements-demo/src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}
],
"serviceWorker": true,
"ngswConfigPath": "projects/elements-demo/ngsw-config.json"
},
"development": {
"buildOptimizer": false,
"optimization": false,
"vendorChunk": true,
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
}
}
},
"defaultConfiguration": "production"
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "elements-demo:build"
},
"configurations": {
"production": {
"browserTarget": "elements-demo:build:production"
},
"development": {
"browserTarget": "elements-demo:build:development"
}
}
},
"defaultConfiguration": "development"
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
Expand Down Expand Up @@ -142,14 +151,17 @@
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "projects/elements-demo/e2e/protractor.conf.js",
"devServerTarget": "elements-demo:serve"
"protractorConfig": "projects/elements-demo/e2e/protractor.conf.js"
},
"configurations": {
"production": {
"devServerTarget": "elements-demo:serve:production"
},
"development": {
"devServerTarget": "elements-demo:serve:development"
}
}
},
"defaultConfiguration": "development"
}
}
}
Expand Down
Loading

0 comments on commit 939dd29

Please sign in to comment.