Skip to content

Commit 9931ab9

Browse files
PowerKiKiPowerKiKi
committed
Angular 15 and all JS deps #9282
Except: - @types/node, we run on node 16
1 parent 948ad58 commit 9931ab9

File tree

11 files changed

+2774
-2479
lines changed

11 files changed

+2774
-2479
lines changed

‎.browserslistrc‎

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

‎angular.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,5 +136,13 @@
136136
}
137137
}
138138
}
139+
},
140+
"schematics": {
141+
"@angular-eslint/schematics:application": {
142+
"setParserOptionsProject": true
143+
},
144+
"@angular-eslint/schematics:library": {
145+
"setParserOptionsProject": true
146+
}
139147
}
140148
}

‎package.json‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,47 @@
1515
"build-demo": "yarn build-lib && ng build demo --aot --base-href /fab-speed-dial/ && cp dist/demo/index.html dist/demo/404.html"
1616
},
1717
"dependencies": {
18-
"@angular/animations": "^14.1.1",
19-
"@angular/cdk": "^14.1.1",
20-
"@angular/common": "^14.1.1",
21-
"@angular/compiler": "^14.1.1",
22-
"@angular/core": "^14.1.1",
23-
"@angular/forms": "^14.1.1",
24-
"@angular/material": "^14.1.1",
25-
"@angular/platform-browser": "^14.1.1",
26-
"@angular/platform-browser-dynamic": "^14.1.1",
27-
"rxjs": "~7.5.6",
28-
"tslib": "^2.4.0",
29-
"zone.js": "~0.11.7"
18+
"@angular/animations": "^15.1.2",
19+
"@angular/cdk": "^15.1.2",
20+
"@angular/common": "^15.1.2",
21+
"@angular/compiler": "^15.1.2",
22+
"@angular/core": "^15.1.2",
23+
"@angular/forms": "^15.1.2",
24+
"@angular/material": "^15.1.2",
25+
"@angular/platform-browser": "^15.1.2",
26+
"@angular/platform-browser-dynamic": "^15.1.2",
27+
"rxjs": "~7.8.0",
28+
"tslib": "^2.5.0",
29+
"zone.js": "~0.12.0"
3030
},
3131
"devDependencies": {
32-
"@angular-devkit/build-angular": "^14.1.1",
33-
"@angular-eslint/builder": "14.0.2",
34-
"@angular-eslint/eslint-plugin": "14.0.2",
35-
"@angular-eslint/eslint-plugin-template": "14.0.2",
36-
"@angular-eslint/schematics": "14.0.2",
37-
"@angular-eslint/template-parser": "14.0.2",
38-
"@angular/cli": "^14.1.1",
39-
"@angular/compiler-cli": "^14.1.1",
40-
"@angular/language-service": "^14.1.1",
41-
"@playwright/test": "^1.24.2",
42-
"@types/jasmine": "~4.0.3",
32+
"@angular-devkit/build-angular": "^15.1.3",
33+
"@angular-eslint/builder": "15.2.0",
34+
"@angular-eslint/eslint-plugin": "15.2.0",
35+
"@angular-eslint/eslint-plugin-template": "15.2.0",
36+
"@angular-eslint/schematics": "15.2.0",
37+
"@angular-eslint/template-parser": "15.2.0",
38+
"@angular/cli": "^15.1.3",
39+
"@angular/compiler-cli": "^15.1.2",
40+
"@angular/language-service": "^15.1.2",
41+
"@playwright/test": "^1.30.0",
42+
"@types/jasmine": "~4.3.1",
4343
"@types/jasminewd2": "~2.0.10",
4444
"@types/node": "^16.0",
45-
"@typescript-eslint/eslint-plugin": "^5.29.0",
46-
"@typescript-eslint/parser": "^5.29.0",
45+
"@typescript-eslint/eslint-plugin": "^5.43.0",
46+
"@typescript-eslint/parser": "^5.43.0",
4747
"codelyzer": "^6.0.2",
48-
"eslint": "^8.18.0",
49-
"jasmine-core": "~4.3.0",
48+
"eslint": "^8.28.0",
49+
"jasmine-core": "~4.5.0",
5050
"jasmine-spec-reporter": "~7.0.0",
51-
"karma": "~6.4.0",
51+
"karma": "~6.4.1",
5252
"karma-chrome-launcher": "~3.1.1",
5353
"karma-coverage-istanbul-reporter": "~3.0.2",
5454
"karma-jasmine": "~5.1.0",
5555
"karma-jasmine-html-reporter": "^2.0.0",
56-
"ng-packagr": "^14.1.0",
57-
"prettier": "2.7.1",
56+
"ng-packagr": "^15.1.1",
57+
"prettier": "2.8.3",
5858
"ts-node": "~10.9.1",
59-
"typescript": "~4.7.4"
59+
"typescript": "~4.9.4"
6060
}
6161
}

‎projects/fab-speed-dial/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"license": "MIT",
55
"repository": "github:Ecodev/fab-speed-dial",
66
"peerDependencies": {
7-
"@angular/common": "^14.1.0",
8-
"@angular/core": "^14.1.0",
9-
"@angular/material": "^14.1.0",
7+
"@angular/common": "^15.1.0",
8+
"@angular/core": "^15.1.0",
9+
"@angular/material": "^15.1.0",
1010
"rxjs": "^7.4.0"
1111
},
1212
"dependencies": {

‎projects/fab-speed-dial/src/lib/fab-speed-dial.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
Renderer2,
1717
ViewEncapsulation,
1818
} from '@angular/core';
19-
import {MatButton} from '@angular/material/button';
19+
import {MatLegacyButton as MatButton} from '@angular/material/legacy-button';
2020
import {CommonModule, DOCUMENT} from '@angular/common';
2121
import {forkJoin, fromEvent, Subscription} from 'rxjs';
2222
import {take} from 'rxjs/operators';

‎projects/fab-speed-dial/src/test.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ import 'zone.js/testing';
55
import {getTestBed} from '@angular/core/testing';
66
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
77

8-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
9-
declare const require: any;
10-
118
// First, initialize the Angular testing environment.
129
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
1310
teardown: {destroyAfterEach: true},
1411
});
15-
// Then we find all the tests.
16-
const context = require.context('./', true, /\.spec\.ts$/);
17-
// And load the modules.
18-
context.keys().map(context);

‎src/app/app.component.spec.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {FormsModule} from '@angular/forms';
33
import {MatIconModule} from '@angular/material/icon';
4-
import {MatButtonModule} from '@angular/material/button';
4+
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
55
import {MatButtonToggleModule} from '@angular/material/button-toggle';
6-
import {MatInputModule} from '@angular/material/input';
7-
import {MatRadioModule} from '@angular/material/radio';
6+
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
7+
import {MatLegacyRadioModule as MatRadioModule} from '@angular/material/legacy-radio';
88
import {MatToolbarModule} from '@angular/material/toolbar';
9-
import {MatCheckboxModule} from '@angular/material/checkbox';
10-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
11-
import {MatTooltipModule} from '@angular/material/tooltip';
12-
import {MatCardModule} from '@angular/material/card';
9+
import {MatLegacyCheckboxModule as MatCheckboxModule} from '@angular/material/legacy-checkbox';
10+
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
11+
import {MatLegacyTooltipModule as MatTooltipModule} from '@angular/material/legacy-tooltip';
12+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
1313

1414
import {AppComponent} from './app.component';
1515
import {EcoFabSpeedDialModule} from '@ecodev/fab-speed-dial';

‎src/app/app.module.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import {AppComponent} from './app.component';
55

66
import {EcoFabSpeedDialModule} from '@ecodev/fab-speed-dial';
77
import {MatIconModule} from '@angular/material/icon';
8-
import {MatButtonModule} from '@angular/material/button';
8+
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
99
import {MatButtonToggleModule} from '@angular/material/button-toggle';
10-
import {MatInputModule} from '@angular/material/input';
11-
import {MatRadioModule} from '@angular/material/radio';
10+
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
11+
import {MatLegacyRadioModule as MatRadioModule} from '@angular/material/legacy-radio';
1212
import {MatToolbarModule} from '@angular/material/toolbar';
13-
import {MatCheckboxModule} from '@angular/material/checkbox';
14-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
15-
import {MatTooltipModule} from '@angular/material/tooltip';
16-
import {MatCardModule} from '@angular/material/card';
13+
import {MatLegacyCheckboxModule as MatCheckboxModule} from '@angular/material/legacy-checkbox';
14+
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
15+
import {MatLegacyTooltipModule as MatTooltipModule} from '@angular/material/legacy-tooltip';
16+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
1717

1818
@NgModule({
1919
declarations: [AppComponent],

‎src/test.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@ import 'zone.js/testing';
44
import {getTestBed} from '@angular/core/testing';
55
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
66

7-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
8-
declare const require: any;
9-
107
// First, initialize the Angular testing environment.
118
getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
129
teardown: {destroyAfterEach: true},
1310
});
14-
// Then we find all the tests.
15-
const context = require.context('./', true, /\.spec\.ts$/);
16-
// And load the modules.
17-
context.keys().map(context);

‎tsconfig.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020
"experimentalDecorators": true,
2121
"moduleResolution": "node",
2222
"importHelpers": true,
23-
"target": "es2020",
23+
"target": "ES2022",
2424
"module": "es2020",
25-
"lib": ["es2020", "dom"]
25+
"lib": ["es2020", "dom"],
26+
"useDefineForClassFields": false
2627
},
2728
"angularCompilerOptions": {
2829
"enableI18nLegacyMessageIdFormat": false,

0 commit comments

Comments
 (0)