Skip to content

Commit 7512090

Browse files
authored
Merge pull request #1020 from cyrilletuzi:ng192
Angular 19.2
2 parents 146f7b3 + 9b59bea commit 7512090

File tree

5 files changed

+7172
-12193
lines changed

5 files changed

+7172
-12193
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ jobs:
88

99
strategy:
1010
matrix:
11-
os: [ubuntu-latest, windows-latest, macos-14]
11+
# os: [ubuntu-latest, windows-latest, macos-latest]
12+
os: [ubuntu-latest, windows-latest]
1213

1314
name: Test with Angular@latest on ${{ matrix.os }}
1415
runs-on: ${{ matrix.os }}
@@ -21,8 +22,7 @@ jobs:
2122
with:
2223
node-version: '22'
2324
- name: Install dependencies
24-
# run: npm ci
25-
run: npm install --force
25+
run: npm ci
2626
env:
2727
CI: true
2828
- name: Build the lib
@@ -48,14 +48,13 @@ jobs:
4848
with:
4949
node-version: '18'
5050
- name: Install dependencies
51-
# run: npm ci
52-
run: npm install --force
51+
run: npm ci
5352
env:
5453
CI: true
5554
- name: Build the lib (with the current version, as it is what is published on npm)
5655
run: npm run build
5756
- name: Downgrade dependencies to minimal required version
58-
57+
5958
env:
6059
CI: true
6160
- name: Run unit tests

angular.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"prefix": "ngx-pwa",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:ng-packagr",
13+
"builder": "@angular/build:ng-packagr",
1414
"options": {
1515
"project": "lib/ng-package.json"
1616
},
@@ -25,8 +25,9 @@
2525
"defaultConfiguration": "production"
2626
},
2727
"test": {
28-
"builder": "@angular-devkit/build-angular:karma",
28+
"builder": "@angular/build:karma",
2929
"options": {
30+
"aot": true,
3031
"polyfills": [
3132
"zone.js",
3233
"zone.js/testing"
@@ -53,7 +54,7 @@
5354
"prefix": "app",
5455
"architect": {
5556
"build": {
56-
"builder": "@angular-devkit/build-angular:application",
57+
"builder": "@angular/build:application",
5758
"options": {
5859
"outputPath": "dist/demo",
5960
"index": "testing-apps/demo/src/index.html",
@@ -91,7 +92,7 @@
9192
"defaultConfiguration": "production"
9293
},
9394
"serve": {
94-
"builder": "@angular-devkit/build-angular:dev-server",
95+
"builder": "@angular/build:dev-server",
9596
"options": {
9697
"port": 4201
9798
},
@@ -114,7 +115,7 @@
114115
"prefix": "app",
115116
"architect": {
116117
"build": {
117-
"builder": "@angular-devkit/build-angular:application",
118+
"builder": "@angular/build:application",
118119
"options": {
119120
"outputPath": "dist/iframe",
120121
"index": "testing-apps/iframe/src/index.html",
@@ -152,7 +153,7 @@
152153
"defaultConfiguration": "production"
153154
},
154155
"serve": {
155-
"builder": "@angular-devkit/build-angular:dev-server",
156+
"builder": "@angular/build:dev-server",
156157
"options": {
157158
"port": 4202
158159
},
@@ -175,7 +176,7 @@
175176
"prefix": "app",
176177
"architect": {
177178
"build": {
178-
"builder": "@angular-devkit/build-angular:application",
179+
"builder": "@angular/build:application",
179180
"options": {
180181
"outputPath": "dist/localforage",
181182
"index": "testing-apps/localforage/src/index.html",
@@ -213,7 +214,7 @@
213214
"defaultConfiguration": "production"
214215
},
215216
"serve": {
216-
"builder": "@angular-devkit/build-angular:dev-server",
217+
"builder": "@angular/build:dev-server",
217218
"options": {
218219
"port": 4203
219220
},

lib/karma.conf.js

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,29 @@
44
module.exports = function (config) {
55
config.set({
66
basePath: "",
7-
frameworks: ["jasmine", "@angular-devkit/build-angular"],
7+
frameworks: ["jasmine"],
88
plugins: [
99
require("karma-jasmine"),
1010
require("karma-chrome-launcher"),
1111
require("karma-firefox-launcher"),
12-
require("karma-safarinative-launcher"),
13-
require("karma-safari-private-launcher"),
12+
// require("karma-safarinative-launcher"),
13+
// require("karma-safari-private-launcher"),
1414
require("karma-jasmine-html-reporter"),
15-
require("karma-coverage"),
16-
require("@angular-devkit/build-angular/plugins/karma")
1715
],
16+
/*
1817
client: {
1918
jasmine: {
2019
// you can add configuration options for Jasmine here
2120
// the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
2221
// for example, you can disable the random execution with `random: false`
2322
// or set a specific seed with `seed: 4321`
2423
},
25-
clearContext: false // leave Jasmine Spec Runner output visible in browser
2624
},
25+
*/
2726
jasmineHtmlReporter: {
2827
suppressAll: true // removes the duplicated traces
2928
},
30-
coverageReporter: {
31-
dir: require("path").join(__dirname, "../coverage/lib"),
32-
subdir: ".",
33-
reporters: [
34-
{ type: "html" },
35-
{ type: "text-summary" }
36-
]
37-
},
3829
reporters: ["progress", "kjhtml"],
39-
port: 9876,
40-
colors: true,
41-
logLevel: config.LOG_INFO,
42-
autoWatch: true,
4330
customLaunchers: {
4431
ChromePrivate: {
4532
base: "Chrome",
@@ -60,7 +47,6 @@ module.exports = function (config) {
6047
// browsers: ["Chrome", "Firefox"],
6148
/* Tests on Windows in private mode */
6249
// browsers: ["ChromePrivate", "FirefoxPrivate"],
63-
singleRun: false,
6450
restartOnFileChange: true
6551
});
66-
};
52+
};

0 commit comments

Comments
 (0)