Skip to content

Commit e876d6c

Browse files
authored
Merge pull request #82 from dataiku/feature/dss14-sc-283227-integrate-npm-pip-audit-into-github-actions
Update angular to version 21
2 parents 57170ec + 17e8bfc commit e876d6c

File tree

8 files changed

+408
-383
lines changed

8 files changed

+408
-383
lines changed

bs-templates/angular/{{cookiecutter.__project_slug}}/angular.json

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@
6969
"serve": {
7070
"builder": "@angular-builders/custom-webpack:dev-server",
7171
"options": {
72-
"browserTarget": "{{ cookiecutter.__project_slug }}:build"
72+
"buildTarget": "{{ cookiecutter.__project_slug }}:build"
7373
},
7474
"configurations": {
7575
"production": {
76-
"browserTarget": "{{ cookiecutter.__project_slug }}:build:production"
76+
"buildTarget": "{{ cookiecutter.__project_slug }}:build:production"
7777
},
7878
"development": {
79-
"browserTarget": "{{ cookiecutter.__project_slug }}:build:development"
79+
"buildTarget": "{{ cookiecutter.__project_slug }}:build:development"
8080
}
8181
},
8282
"defaultConfiguration": "development"
8383
},
8484
"extract-i18n": {
85-
"builder": "@angular-devkit/build-angular:extract-i18n",
85+
"builder": "@angular/build:extract-i18n",
8686
"options": {
87-
"browserTarget": "{{ cookiecutter.__project_slug }}:build"
87+
"buildTarget": "{{ cookiecutter.__project_slug }}:build"
8888
}
8989
},
9090
"test": {
91-
"builder": "@angular-devkit/build-angular:karma",
91+
"builder": "@angular/build:karma",
9292
"options": {
9393
"polyfills": [
9494
"zone.js",
@@ -108,6 +108,31 @@
108108
}
109109
}
110110
}
111+
},
112+
"schematics": {
113+
"@schematics/angular:component": {
114+
"type": "component"
115+
},
116+
"@schematics/angular:directive": {
117+
"type": "directive"
118+
},
119+
"@schematics/angular:service": {
120+
"type": "service"
121+
},
122+
"@schematics/angular:guard": {
123+
"typeSeparator": "."
124+
},
125+
"@schematics/angular:interceptor": {
126+
"typeSeparator": "."
127+
},
128+
"@schematics/angular:module": {
129+
"typeSeparator": "."
130+
},
131+
"@schematics/angular:pipe": {
132+
"typeSeparator": "."
133+
},
134+
"@schematics/angular:resolver": {
135+
"typeSeparator": "."
136+
}
111137
}
112-
}
113-
138+
}
Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,41 @@
11
{
22
"name": "{{ cookiecutter.__project_slug }}",
33
"version": "{{ cookiecutter.version }}",
4-
"scripts": {
5-
"ng": "ng",
6-
"start": "ng serve --disable-host-check --configuration development --port {{ cookiecutter.port }}",
7-
"build": "ng build --configuration production",
8-
"watch": "ng build --watch --configuration development",
9-
"test": "ng test"
10-
},
11-
"private": true,
12-
"dependencies": {
13-
"@angular/animations": "^16.1.0",
14-
"@angular/common": "^16.1.0",
15-
"@angular/compiler": "^16.1.0",
16-
"@angular/core": "^16.1.0",
17-
"@angular/forms": "^16.1.0",
18-
"@angular/platform-browser": "^16.1.0",
19-
"@angular/platform-browser-dynamic": "^16.1.0",
20-
"@angular/router": "^16.1.0",
21-
"rxjs": "~7.8.0",
22-
"tslib": "^2.3.0",
23-
"zone.js": "~0.13.0"
24-
},
25-
"devDependencies": {
26-
"@angular-builders/custom-webpack": "^16.0.0",
27-
"@angular-devkit/build-angular": "^16.1.1",
28-
"@angular/cli": "~16.1.1",
29-
"@angular/compiler-cli": "^16.1.0",
30-
"@types/jasmine": "~4.3.0",
31-
"@types/node": "^20.3.1",
32-
"jasmine-core": "~4.6.0",
33-
"karma": "~6.4.0",
34-
"karma-chrome-launcher": "~3.2.0",
35-
"karma-coverage": "~2.2.0",
36-
"karma-jasmine": "~5.1.0",
37-
"karma-jasmine-html-reporter": "~2.1.0",
38-
"typescript": "~5.1.3",
39-
"dotenv": "^16.1.3"
40-
}
41-
}
42-
4+
"scripts": {
5+
"ng": "ng",
6+
"start": "ng serve --disable-host-check --configuration development --port {{ cookiecutter.port }}",
7+
"build": "ng build --configuration production",
8+
"watch": "ng build --watch --configuration development",
9+
"test": "ng test"
10+
},
11+
"private": true,
12+
"dependencies": {
13+
"@angular/animations": "^21.0.6",
14+
"@angular/common": "^21.0.6",
15+
"@angular/compiler": "^21.0.6",
16+
"@angular/core": "^21.0.6",
17+
"@angular/forms": "^21.0.6",
18+
"@angular/platform-browser": "^21.0.6",
19+
"@angular/platform-browser-dynamic": "^21.0.6",
20+
"@angular/router": "^21.0.6",
21+
"rxjs": "~7.8.0",
22+
"tslib": "^2.3.0",
23+
"zone.js": "~0.15.1"
24+
},
25+
"devDependencies": {
26+
"@angular-builders/custom-webpack": "^21.0.0-beta.1",
27+
"@angular/build": "^21.0.4",
28+
"@angular/cli": "~21.0.4",
29+
"@angular/compiler-cli": "^21.0.6",
30+
"@types/jasmine": "~4.3.0",
31+
"@types/node": "^20.3.1",
32+
"dotenv": "^16.1.3",
33+
"jasmine-core": "~4.6.0",
34+
"karma": "~6.4.0",
35+
"karma-chrome-launcher": "~3.2.0",
36+
"karma-coverage": "~2.2.0",
37+
"karma-jasmine": "~5.1.0",
38+
"karma-jasmine-html-reporter": "~2.1.0",
39+
"typescript": "~5.9.3"
40+
}
41+
}

bs-templates/angular/{{cookiecutter.__project_slug}}/src/app/api.interceptor.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import { Injectable } from '@angular/core';
2-
import {
3-
HttpRequest,
4-
HttpHandler,
5-
HttpEvent,
6-
HttpInterceptor
7-
} from '@angular/common/http';
2+
import { HttpRequest, HttpHandler, HttpEvent, HttpInterceptor } from '@angular/common/http';
83
import { Observable } from 'rxjs';
94
import { isDevMode } from '@angular/core';
105

0 commit comments

Comments
 (0)