Skip to content

Commit 6742a4d

Browse files
committed
Angular 18.1 and all JS deps #10322
Except: - @types/node, we run on node 18
1 parent a5ea40f commit 6742a4d

File tree

8 files changed

+3341
-2814
lines changed

8 files changed

+3341
-2814
lines changed

.eslintrc.json

+32
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,38 @@
7373
}
7474
}
7575
],
76+
"@typescript-eslint/restrict-plus-operands": [
77+
"error",
78+
{
79+
// Allow some flexibility
80+
"allowAny": true,
81+
"allowBoolean": true,
82+
"allowNullish": true,
83+
"allowNumberAndString": true
84+
}
85+
],
86+
"@typescript-eslint/restrict-template-expressions": [
87+
"error",
88+
{
89+
// Allow some flexibility
90+
"allowAny": true,
91+
"allowBoolean": true,
92+
"allowNullish": true,
93+
"allowNumber": true
94+
}
95+
],
96+
"@typescript-eslint/no-unused-expressions": [
97+
"error",
98+
{
99+
"allowTernary": true
100+
}
101+
],
102+
"@typescript-eslint/no-unused-vars": [
103+
"error",
104+
{
105+
"caughtErrors": "none"
106+
}
107+
],
76108
"no-restricted-globals": [
77109
"error",
78110
"atob",

package.json

+19-24
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,41 @@
1616
"serve-demo": "echo '💡 open http://localhost:8000/fab-speed-dial/' && mkdir -p dist/server && ln -fs ../demo/browser dist/server/fab-speed-dial && php -S localhost:8000 -t dist/server/"
1717
},
1818
"dependencies": {
19-
"@angular/animations": "^17.1.1",
20-
"@angular/cdk": "^17.1.1",
21-
"@angular/common": "^17.1.1",
22-
"@angular/compiler": "^17.1.1",
23-
"@angular/core": "^17.1.1",
24-
"@angular/forms": "^17.1.1",
25-
"@angular/material": "^17.1.1",
26-
"@angular/platform-browser": "^17.1.1",
27-
"@angular/platform-browser-dynamic": "^17.1.1",
19+
"@angular/animations": "^18.1.0",
20+
"@angular/cdk": "^18.1.0",
21+
"@angular/common": "^18.1.0",
22+
"@angular/compiler": "^18.1.0",
23+
"@angular/core": "^18.1.0",
24+
"@angular/forms": "^18.1.0",
25+
"@angular/material": "^18.1.0",
26+
"@angular/platform-browser": "^18.1.0",
27+
"@angular/platform-browser-dynamic": "^18.1.0",
2828
"rxjs": "~7.8.1",
2929
"tslib": "^2.6.2",
3030
"zone.js": "~0.14.3"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "^17.1.1",
34-
"@angular-eslint/builder": "17.2.1",
35-
"@angular-eslint/eslint-plugin": "17.2.1",
36-
"@angular-eslint/eslint-plugin-template": "17.2.1",
37-
"@angular-eslint/schematics": "17.2.1",
38-
"@angular-eslint/template-parser": "17.2.1",
39-
"@angular/cli": "^17.1.1",
40-
"@angular/compiler-cli": "^17.1.1",
41-
"@angular/language-service": "^17.1.1",
33+
"@angular-devkit/build-angular": "^18.1.0",
34+
"@angular/cli": "^18.1.0",
35+
"@angular/compiler-cli": "^18.1.0",
36+
"@angular/language-service": "^18.1.0",
4237
"@playwright/test": "^1.41.1",
4338
"@types/jasmine": "~5.1.4",
4439
"@types/jasminewd2": "~2.0.13",
4540
"@types/node": "^18",
46-
"@typescript-eslint/eslint-plugin": "^6.10.0",
47-
"@typescript-eslint/parser": "^6.10.0",
48-
"eslint": "^8.53.0",
41+
"angular-eslint": "18.1.0",
42+
"eslint": "^9.6.0",
4943
"jasmine-core": "~5.1.1",
5044
"jasmine-spec-reporter": "~7.0.0",
5145
"karma": "~6.4.2",
5246
"karma-chrome-launcher": "~3.2.0",
5347
"karma-coverage-istanbul-reporter": "~3.0.2",
5448
"karma-jasmine": "~5.1.0",
5549
"karma-jasmine-html-reporter": "^2.1.0",
56-
"ng-packagr": "^17.1.2",
57-
"prettier": "3.2.5",
50+
"ng-packagr": "^18.1.0",
51+
"prettier": "3.3.3",
5852
"ts-node": "~10.9.2",
59-
"typescript": "~5.3.3"
53+
"typescript": "~5.5.3",
54+
"typescript-eslint": "8.0.0-alpha.38"
6055
}
6156
}

projects/fab-speed-dial/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"tslib": "^2.6"
88
},
99
"peerDependencies": {
10-
"@angular/common": "^17.1",
11-
"@angular/core": "^17.1",
12-
"@angular/material": "^17.1",
10+
"@angular/common": "^18.1",
11+
"@angular/core": "^18.1",
12+
"@angular/material": "^18.1",
1313
"rxjs": "^7.8.0"
1414
}
1515
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class EcoFabSpeedDialActionsComponent implements AfterContentInit {
7777
private initButtonStates(): void {
7878
this._buttons.forEach((button, i) => {
7979
this.renderer.addClass(getHostElement(button), 'eco-fab-action-item');
80-
this.changeElementStyle(getHostElement(button), 'z-index', '' + (Z_INDEX_ITEM - i));
80+
this.changeElementStyle(getHostElement(button), 'z-index', '' + (Z_INDEX_ITEM - i).toString());
8181
});
8282
}
8383

@@ -98,7 +98,7 @@ export class EcoFabSpeedDialActionsComponent implements AfterContentInit {
9898
}
9999

100100
const hostElement = getHostElement(button);
101-
this.changeElementStyle(hostElement, 'transition-delay', transitionDelay + 'ms');
101+
this.changeElementStyle(hostElement, 'transition-delay', transitionDelay.toString() + 'ms');
102102
this.changeElementStyle(hostElement, 'opacity', '1');
103103
this.changeElementStyle(hostElement, 'transform', transform);
104104
});
@@ -126,12 +126,12 @@ export class EcoFabSpeedDialActionsComponent implements AfterContentInit {
126126
transform = 'scale(0)';
127127
opacity = '0';
128128
} else {
129-
transform = this.getTranslateFunction(55 * (i + 1) - i * 5 + 'px');
129+
transform = this.getTranslateFunction((55 * (i + 1) - i * 5).toString() + 'px');
130130
}
131131

132132
const hostElement = getHostElement(button);
133133

134-
this.changeElementStyle(hostElement, 'transition-delay', transitionDelay + 'ms');
134+
this.changeElementStyle(hostElement, 'transition-delay', transitionDelay.toString() + 'ms');
135135
this.changeElementStyle(hostElement, 'opacity', opacity);
136136
this.changeElementStyle(hostElement, 'transform', transform);
137137

src/index.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet" />
1111
</head>
1212
<body>
13-
<app-root />
13+
<!-- eslint-disable-next-line @angular-eslint/template/prefer-self-closing-tags -->
14+
<app-root></app-root>
1415
</body>
1516
</html>

src/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ bootstrapApplication(AppComponent, {
3535
FormsModule,
3636
),
3737
],
38-
}).catch(err => console.error(err));
38+
}).catch((err: unknown) => console.error(err));

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"baseUrl": "./",
66
"outDir": "./dist/out-tsc",
77
"forceConsistentCasingInFileNames": true,
8+
"esModuleInterop": true,
89
"strict": true,
910
"noImplicitOverride": true,
1011
"noPropertyAccessFromIndexSignature": true,
@@ -16,7 +17,6 @@
1617
"@ecodev/fab-speed-dial/*": ["dist/fab-speed-dial/*"]
1718
},
1819
"declaration": false,
19-
"downlevelIteration": true,
2020
"experimentalDecorators": true,
2121
"moduleResolution": "node",
2222
"importHelpers": true,

0 commit comments

Comments
 (0)