Skip to content

Commit 8b47b50

Browse files
authored
Merge pull request #25 from baloise/update-angular-and-ds-versions
Update angular
2 parents 8bf7791 + e69b72f commit 8b47b50

26 files changed

Lines changed: 18656 additions & 19040 deletions

.github/workflows/continuous.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111

1212
- uses: actions/setup-node@v2
1313
with:
14-
node-version: '16.x'
14+
node-version: '20.x'
1515
registry-url: 'https://registry.npmjs.org'
1616

1717
- name: Restore lerna
18-
uses: actions/cache@v2
18+
uses: actions/cache@v4
1919
with:
2020
path: |
2121
node_modules

angular.json

Lines changed: 44 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "bal-ng",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:ng-packagr",
13+
"builder": "@angular/build:ng-packagr",
1414
"options": {
1515
"project": "projects/lib/ng-package.json"
1616
},
@@ -25,9 +25,9 @@
2525
"defaultConfiguration": "production"
2626
},
2727
"test": {
28-
"builder": "@angular-devkit/build-angular:karma",
28+
"builder": "@angular/build:karma",
2929
"options": {
30-
"main": "projects/lib/src/test.ts",
30+
"polyfills": ["zone.js", "zone.js/testing"],
3131
"tsConfig": "projects/lib/tsconfig.spec.json",
3232
"karmaConfig": "projects/lib/karma.conf.js"
3333
}
@@ -49,12 +49,15 @@
4949
"prefix": "app",
5050
"architect": {
5151
"build": {
52-
"builder": "@angular-devkit/build-angular:browser",
52+
"builder": "@angular/build:application",
5353
"options": {
54-
"outputPath": "dist-demo",
54+
"outputPath": {
55+
"base": "dist-demo"
56+
},
5557
"index": "projects/demo/src/index.html",
56-
"main": "projects/demo/src/main.ts",
57-
"polyfills": "projects/demo/src/polyfills.ts",
58+
"polyfills": [
59+
"projects/demo/src/polyfills.ts"
60+
],
5861
"tsConfig": "projects/demo/tsconfig.app.json",
5962
"inlineStyleLanguage": "scss",
6063
"assets": [
@@ -67,7 +70,8 @@
6770
"allowedCommonJsDependencies": [
6871
"query-string"
6972
],
70-
"scripts": []
73+
"scripts": [],
74+
"browser": "projects/demo/src/main.ts"
7175
},
7276
"configurations": {
7377
"production": {
@@ -92,9 +96,7 @@
9296
"outputHashing": "all"
9397
},
9498
"development": {
95-
"buildOptimizer": false,
9699
"optimization": false,
97-
"vendorChunk": true,
98100
"extractLicenses": false,
99101
"sourceMap": true,
100102
"namedChunks": true
@@ -103,25 +105,25 @@
103105
"defaultConfiguration": "production"
104106
},
105107
"serve": {
106-
"builder": "@angular-devkit/build-angular:dev-server",
108+
"builder": "@angular/build:dev-server",
107109
"configurations": {
108110
"production": {
109-
"browserTarget": "demo:build:production"
111+
"buildTarget": "demo:build:production"
110112
},
111113
"development": {
112-
"browserTarget": "demo:build:development"
114+
"buildTarget": "demo:build:development"
113115
}
114116
},
115117
"defaultConfiguration": "development"
116118
},
117119
"extract-i18n": {
118-
"builder": "@angular-devkit/build-angular:extract-i18n",
120+
"builder": "@angular/build:extract-i18n",
119121
"options": {
120-
"browserTarget": "demo:build"
122+
"buildTarget": "demo:build"
121123
}
122124
},
123125
"test": {
124-
"builder": "@angular-devkit/build-angular:karma",
126+
"builder": "@angular/build:karma",
125127
"options": {
126128
"main": "projects/demo/src/test.ts",
127129
"polyfills": "projects/demo/src/polyfills.ts",
@@ -141,8 +143,33 @@
141143
}
142144
}
143145
},
144-
"defaultProject": "@baloise/web-app-ng-utils",
145146
"cli": {
146147
"analytics": false
148+
},
149+
"schematics": {
150+
"@schematics/angular:component": {
151+
"type": "component"
152+
},
153+
"@schematics/angular:directive": {
154+
"type": "directive"
155+
},
156+
"@schematics/angular:service": {
157+
"type": "service"
158+
},
159+
"@schematics/angular:guard": {
160+
"typeSeparator": "."
161+
},
162+
"@schematics/angular:interceptor": {
163+
"typeSeparator": "."
164+
},
165+
"@schematics/angular:module": {
166+
"typeSeparator": "."
167+
},
168+
"@schematics/angular:pipe": {
169+
"typeSeparator": "."
170+
},
171+
"@schematics/angular:resolver": {
172+
"typeSeparator": "."
173+
}
147174
}
148175
}

ngcc.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module.exports = {
22
packages: {
3-
'@baloise/design-system-components-angular': {
3+
'@baloise/ds-angular-module': {
44
ignorableDeepImportMatchers: [/@baloise\//],
55
},
66
},

0 commit comments

Comments
 (0)