Skip to content

Commit 0dbace9

Browse files
committed
chore: update angular version to 20
1 parent f2ee2fc commit 0dbace9

File tree

12 files changed

+2747
-3281
lines changed

12 files changed

+2747
-3281
lines changed

packages/ngx-conveyer/.browserslistrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

packages/ngx-conveyer/angular.json

Lines changed: 46 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular/build:application",
1919
"options": {
20-
"outputPath": "dist/ngx-conveyer-project",
20+
"outputPath": {
21+
"base": "dist/ngx-conveyer-project"
22+
},
2123
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
24+
"polyfills": [
25+
"src/polyfills.ts"
26+
],
2427
"tsConfig": "tsconfig.app.json",
2528
"assets": [
2629
"src/favicon.ico",
@@ -29,7 +32,8 @@
2932
"styles": [
3033
"src/styles.css"
3134
],
32-
"scripts": []
35+
"scripts": [],
36+
"browser": "src/main.ts"
3337
},
3438
"configurations": {
3539
"production": {
@@ -54,9 +58,7 @@
5458
"outputHashing": "all"
5559
},
5660
"development": {
57-
"buildOptimizer": false,
5861
"optimization": false,
59-
"vendorChunk": true,
6062
"extractLicenses": false,
6163
"sourceMap": true,
6264
"namedChunks": true
@@ -65,25 +67,25 @@
6567
"defaultConfiguration": "production"
6668
},
6769
"serve": {
68-
"builder": "@angular-devkit/build-angular:dev-server",
70+
"builder": "@angular/build:dev-server",
6971
"configurations": {
7072
"production": {
71-
"browserTarget": "ngx-conveyer-project:build:production"
73+
"buildTarget": "ngx-conveyer-project:build:production"
7274
},
7375
"development": {
74-
"browserTarget": "ngx-conveyer-project:build:development"
76+
"buildTarget": "ngx-conveyer-project:build:development"
7577
}
7678
},
7779
"defaultConfiguration": "development"
7880
},
7981
"extract-i18n": {
80-
"builder": "@angular-devkit/build-angular:extract-i18n",
82+
"builder": "@angular/build:extract-i18n",
8183
"options": {
82-
"browserTarget": "ngx-conveyer-project:build"
84+
"buildTarget": "ngx-conveyer-project:build"
8385
}
8486
},
8587
"test": {
86-
"builder": "@angular-devkit/build-angular:karma",
88+
"builder": "@angular/build:karma",
8789
"options": {
8890
"main": "src/test.ts",
8991
"polyfills": "src/polyfills.ts",
@@ -108,7 +110,7 @@
108110
"prefix": "lib",
109111
"architect": {
110112
"build": {
111-
"builder": "@angular-devkit/build-angular:ng-packagr",
113+
"builder": "@angular/build:ng-packagr",
112114
"options": {
113115
"project": "projects/ngx-conveyer/ng-package.json"
114116
},
@@ -123,7 +125,7 @@
123125
"defaultConfiguration": "production"
124126
},
125127
"test": {
126-
"builder": "@angular-devkit/build-angular:karma",
128+
"builder": "@angular/build:karma",
127129
"options": {
128130
"main": "projects/ngx-conveyer/src/test.ts",
129131
"tsConfig": "projects/ngx-conveyer/tsconfig.spec.json",
@@ -133,5 +135,33 @@
133135
}
134136
}
135137
},
136-
"defaultProject": "ngx-conveyer-project"
138+
"schematics": {
139+
"@schematics/angular:component": {
140+
"type": "component"
141+
},
142+
"@schematics/angular:directive": {
143+
"type": "directive"
144+
},
145+
"@schematics/angular:service": {
146+
"type": "service"
147+
},
148+
"@schematics/angular:guard": {
149+
"typeSeparator": "."
150+
},
151+
"@schematics/angular:interceptor": {
152+
"typeSeparator": "."
153+
},
154+
"@schematics/angular:module": {
155+
"typeSeparator": "."
156+
},
157+
"@schematics/angular:pipe": {
158+
"typeSeparator": "."
159+
},
160+
"@schematics/angular:resolver": {
161+
"typeSeparator": "."
162+
}
163+
},
164+
"cli": {
165+
"analytics": false
166+
}
137167
}

packages/ngx-conveyer/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
1414
],
1515
client: {
1616
jasmine: {

packages/ngx-conveyer/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
"private": true,
1212
"lernaHelperPublishPath": "./dist/ngx-conveyer",
1313
"dependencies": {
14-
"@angular/animations": "~13.0.0",
15-
"@angular/common": "~13.0.0",
16-
"@angular/compiler": "~13.0.0",
17-
"@angular/core": "~13.0.0",
18-
"@angular/forms": "~13.0.0",
19-
"@angular/platform-browser": "~13.0.0",
20-
"@angular/platform-browser-dynamic": "~13.0.0",
21-
"@angular/router": "~13.0.0",
14+
"@angular/animations": "^20.2.3",
15+
"@angular/common": "^20.2.3",
16+
"@angular/compiler": "^20.2.3",
17+
"@angular/core": "^20.2.3",
18+
"@angular/forms": "^20.2.3",
19+
"@angular/platform-browser": "^20.2.3",
20+
"@angular/platform-browser-dynamic": "^20.2.3",
21+
"@angular/router": "^20.2.3",
2222
"@egjs/ngx-infinitegrid": "^4.2.0-beta.2",
2323
"rxjs": "~7.4.0",
2424
"tslib": "^2.3.0",
25-
"zone.js": "~0.11.4"
25+
"zone.js": "~0.15.1"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/build-angular": "~13.0.3",
29-
"@angular/cli": "~13.0.3",
30-
"@angular/compiler-cli": "~13.0.0",
28+
"@angular/build": "^20.2.1",
29+
"@angular/cli": "^20.2.1",
30+
"@angular/compiler-cli": "^20.2.3",
3131
"@types/jasmine": "~3.10.0",
3232
"@types/node": "^12.11.1",
3333
"jasmine-core": "~3.10.0",
@@ -36,7 +36,7 @@
3636
"karma-coverage": "~2.0.3",
3737
"karma-jasmine": "~4.0.0",
3838
"karma-jasmine-html-reporter": "~1.7.0",
39-
"ng-packagr": "^13.0.0",
40-
"typescript": "~4.4.3"
39+
"ng-packagr": "^20.2.0",
40+
"typescript": "~5.9.2"
4141
}
42-
}
42+
}

packages/ngx-conveyer/projects/ngx-conveyer/.browserslistrc

Lines changed: 0 additions & 16 deletions
This file was deleted.

packages/ngx-conveyer/projects/ngx-conveyer/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function (config) {
1010
require('karma-chrome-launcher'),
1111
require('karma-jasmine-html-reporter'),
1212
require('karma-coverage'),
13-
require('@angular-devkit/build-angular/plugins/karma')
13+
1414
],
1515
client: {
1616
jasmine: {

packages/ngx-conveyer/projects/ngx-conveyer/src/lib/ngx-conveyer.directive.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ import { ANGULAR_CONVEYER_EVENTS } from './consts';
1212
import { NgxConveyerInterface } from './ngx-conveyer.interface';
1313

1414
@Directive({
15-
selector: '[ngxConveyer]',
16-
exportAs: 'ngxConveyer',
17-
outputs: ANGULAR_CONVEYER_EVENTS,
15+
selector: '[ngxConveyer]',
16+
exportAs: 'ngxConveyer',
17+
outputs: ANGULAR_CONVEYER_EVENTS,
18+
standalone: false
1819
})
1920
export class NgxConveyerDirective extends NgxConveyerInterface {
2021
@Input() ngxConveyer!: ConveyerOptions | '';

packages/ngx-conveyer/projects/ngx-conveyer/src/test.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,8 @@ import {
88
platformBrowserDynamicTesting
99
} from '@angular/platform-browser-dynamic/testing';
1010

11-
declare const require: {
12-
context(path: string, deep?: boolean, filter?: RegExp): {
13-
<T>(id: string): T;
14-
keys(): string[];
15-
};
16-
};
17-
1811
// First, initialize the Angular testing environment.
1912
getTestBed().initTestEnvironment(
2013
BrowserDynamicTestingModule,
2114
platformBrowserDynamicTesting(),
2215
);
23-
24-
// Then we find all the tests.
25-
const context = require.context('./', true, /\.spec\.ts$/);
26-
// And load the modules.
27-
context.keys().map(context);

packages/ngx-conveyer/src/app/app.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import { OnRequestAppend, OnRenderComplete } from "@egjs/infinitegrid";
44
import { NgxConveyerDirective } from "projects/ngx-conveyer/src/public-api";
55

66
@Component({
7-
selector: "app-root",
8-
templateUrl: "./app.component.html",
9-
styleUrls: ["./app.component.css"]
7+
selector: "app-root",
8+
templateUrl: "./app.component.html",
9+
styleUrls: ["./app.component.css"],
10+
standalone: false
1011
})
1112
export class AppComponent {
1213
@ViewChild("ig", { static: false }) ig!: NgxInfiniteGridComponent;

packages/ngx-conveyer/src/test.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,8 @@ import {
77
platformBrowserDynamicTesting
88
} from '@angular/platform-browser-dynamic/testing';
99

10-
declare const require: {
11-
context(path: string, deep?: boolean, filter?: RegExp): {
12-
keys(): string[];
13-
<T>(id: string): T;
14-
};
15-
};
16-
1710
// First, initialize the Angular testing environment.
1811
getTestBed().initTestEnvironment(
1912
BrowserDynamicTestingModule,
2013
platformBrowserDynamicTesting(),
2114
);
22-
23-
// Then we find all the tests.
24-
const context = require.context('./', true, /\.spec\.ts$/);
25-
// And load the modules.
26-
context.keys().map(context);

0 commit comments

Comments
 (0)