Skip to content

Commit f5e4c7f

Browse files
Upgrade to Angular 20
1 parent 3f220db commit f5e4c7f

35 files changed

Lines changed: 10057 additions & 13617 deletions

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
node-version: 20
3131
- name: Move article to current date directory
3232
run: |
33-
npm ci
33+
npm ci --ignore-scripts
3434
npm run build:utils
3535
npm run posts:publish
3636

.github/workflows/static.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ jobs:
4747
- uses: actions/setup-node@v4
4848
with:
4949
node-version: 20
50-
- run: npm ci
50+
- run: |
51+
npm ci --ignore-scripts
52+
npm rebuild esbuild protobufjs
5153
- run: |
5254
npm run build:utils
5355
npm run posts:update
54-
npm run build -- --configuration=production --base-href=/
56+
npm run build -- --define=O11Y_APP_KEY="'{{secrets.O11Y_APP_KEY}}'" --configuration=production --base-href=/
5557
cp dist/blog/browser/404/index.html dist/blog/browser/404.html
5658
- name: Setup Pages
5759
uses: actions/configure-pages@v5

angular.json

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@
1515
"prefix": "blog",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:application",
18+
"builder": "@angular/build:application",
1919
"options": {
2020
"outputPath": "dist/blog",
2121
"index": "src/index.html",
2222
"browser": "src/main.ts",
2323
"polyfills": ["zone.js"],
2424
"tsConfig": "tsconfig.app.json",
2525
"inlineStyleLanguage": "scss",
26+
"define": {
27+
"O11Y_APP_KEY": "'dev_key'"
28+
},
2629
"assets": [
2730
"src/favicon.ico",
2831
"src/assets",
@@ -113,7 +116,7 @@
113116
"defaultConfiguration": "production"
114117
},
115118
"serve": {
116-
"builder": "@angular-devkit/build-angular:dev-server",
119+
"builder": "@angular/build:dev-server",
117120
"configurations": {
118121
"production": {
119122
"buildTarget": "blog:build:production"
@@ -125,13 +128,13 @@
125128
"defaultConfiguration": "development"
126129
},
127130
"extract-i18n": {
128-
"builder": "@angular-devkit/build-angular:extract-i18n",
131+
"builder": "@angular/build:extract-i18n",
129132
"options": {
130133
"buildTarget": "blog:build"
131134
}
132135
},
133136
"test": {
134-
"builder": "@angular-devkit/build-angular:karma",
137+
"builder": "@angular/build:karma",
135138
"options": {
136139
"polyfills": ["zone.js", "zone.js/testing"],
137140
"tsConfig": "tsconfig.spec.json",
@@ -153,7 +156,7 @@
153156
"prefix": "lib",
154157
"architect": {
155158
"build": {
156-
"builder": "@angular-devkit/build-angular:ng-packagr",
159+
"builder": "@angular/build:ng-packagr",
157160
"options": {
158161
"project": "projects/utils/ng-package.json"
159162
},
@@ -168,7 +171,7 @@
168171
"defaultConfiguration": "production"
169172
},
170173
"test": {
171-
"builder": "@angular-devkit/build-angular:karma",
174+
"builder": "@angular/build:karma",
172175
"options": {
173176
"tsConfig": "projects/utils/tsconfig.spec.json",
174177
"polyfills": ["zone.js", "zone.js/testing"]
@@ -179,5 +182,31 @@
179182
},
180183
"cli": {
181184
"analytics": false
185+
},
186+
"schematics": {
187+
"@schematics/angular:component": {
188+
"type": "component"
189+
},
190+
"@schematics/angular:directive": {
191+
"type": "directive"
192+
},
193+
"@schematics/angular:service": {
194+
"type": "service"
195+
},
196+
"@schematics/angular:guard": {
197+
"typeSeparator": "."
198+
},
199+
"@schematics/angular:interceptor": {
200+
"typeSeparator": "."
201+
},
202+
"@schematics/angular:module": {
203+
"typeSeparator": "."
204+
},
205+
"@schematics/angular:pipe": {
206+
"typeSeparator": "."
207+
},
208+
"@schematics/angular:resolver": {
209+
"typeSeparator": "."
210+
}
182211
}
183212
}

0 commit comments

Comments
 (0)