Skip to content

Commit 9ddce1a

Browse files
committed
Angular 20 and all JS deps
Fixes #186
1 parent 7775f92 commit 9ddce1a

File tree

8 files changed

+1337
-4011
lines changed

8 files changed

+1337
-4011
lines changed

angular.json

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prefix": "app",
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:application",
14+
"builder": "@angular/build:application",
1515
"options": {
1616
"outputPath": "dist/demo",
1717
"index": "src/index.html",
@@ -52,7 +52,7 @@
5252
"defaultConfiguration": "production"
5353
},
5454
"serve": {
55-
"builder": "@angular-devkit/build-angular:dev-server",
55+
"builder": "@angular/build:dev-server",
5656
"options": {
5757
"port": 4212
5858
},
@@ -67,10 +67,10 @@
6767
"defaultConfiguration": "development"
6868
},
6969
"extract-i18n": {
70-
"builder": "@angular-devkit/build-angular:extract-i18n"
70+
"builder": "@angular/build:extract-i18n"
7171
},
7272
"test": {
73-
"builder": "@angular-devkit/build-angular:karma",
73+
"builder": "@angular/build:karma",
7474
"options": {
7575
"polyfills": ["zone.js", "zone.js/testing"],
7676
"tsConfig": "tsconfig.spec.json",
@@ -110,7 +110,7 @@
110110
"prefix": "lib",
111111
"architect": {
112112
"build": {
113-
"builder": "@angular-devkit/build-angular:ng-packagr",
113+
"builder": "@angular/build:ng-packagr",
114114
"options": {
115115
"project": "projects/fab-speed-dial/ng-package.json"
116116
},
@@ -125,7 +125,7 @@
125125
"defaultConfiguration": "production"
126126
},
127127
"test": {
128-
"builder": "@angular-devkit/build-angular:karma",
128+
"builder": "@angular/build:karma",
129129
"options": {
130130
"tsConfig": "projects/fab-speed-dial/tsconfig.spec.json",
131131
"polyfills": ["zone.js", "zone.js/testing"]
@@ -139,5 +139,31 @@
139139
}
140140
}
141141
}
142+
},
143+
"schematics": {
144+
"@schematics/angular:component": {
145+
"type": "component"
146+
},
147+
"@schematics/angular:directive": {
148+
"type": "directive"
149+
},
150+
"@schematics/angular:service": {
151+
"type": "service"
152+
},
153+
"@schematics/angular:guard": {
154+
"typeSeparator": "."
155+
},
156+
"@schematics/angular:interceptor": {
157+
"typeSeparator": "."
158+
},
159+
"@schematics/angular:module": {
160+
"typeSeparator": "."
161+
},
162+
"@schematics/angular:pipe": {
163+
"typeSeparator": "."
164+
},
165+
"@schematics/angular:resolver": {
166+
"typeSeparator": "."
167+
}
142168
}
143169
}

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@
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": "^19.2.13",
20-
"@angular/cdk": "19.2.17",
21-
"@angular/common": "^19.2.13",
22-
"@angular/compiler": "^19.2.13",
23-
"@angular/core": "^19.2.13",
24-
"@angular/forms": "^19.2.13",
25-
"@angular/material": "19.2.17",
26-
"@angular/platform-browser": "^19.2.13",
27-
"@angular/platform-browser-dynamic": "^19.2.13",
19+
"@angular/animations": "^20.0.2",
20+
"@angular/cdk": "20.0.2",
21+
"@angular/common": "^20.0.2",
22+
"@angular/compiler": "^20.0.2",
23+
"@angular/core": "^20.0.2",
24+
"@angular/forms": "^20.0.2",
25+
"@angular/material": "20.0.2",
26+
"@angular/platform-browser": "^20.0.2",
27+
"@angular/platform-browser-dynamic": "^20.0.2",
2828
"rxjs": "~7.8.2",
2929
"tslib": "^2.8.1",
30-
"zone.js": "~0.15.0"
30+
"zone.js": "~0.15.1"
3131
},
3232
"devDependencies": {
33-
"@angular-devkit/build-angular": "^19.2.13",
34-
"@angular/cli": "^19.2.13",
35-
"@angular/compiler-cli": "^19.2.13",
36-
"@playwright/test": "^1.51.1",
37-
"@types/jasmine": "~5.1.7",
38-
"angular-eslint": "^19.3.0",
39-
"eslint": "^9.24.0",
40-
"jasmine-core": "~5.6.0",
33+
"@angular/build": "^20.0.1",
34+
"@angular/cli": "^20.0.1",
35+
"@angular/compiler-cli": "^20.0.2",
36+
"@playwright/test": "^1.52.0",
37+
"@types/jasmine": "~5.1.8",
38+
"angular-eslint": "^20.0.0",
39+
"eslint": "^9.28.0",
40+
"jasmine-core": "~5.8.0",
4141
"karma": "~6.4.0",
4242
"karma-chrome-launcher": "~3.2.0",
4343
"karma-coverage": "~2.2.0",
4444
"karma-jasmine": "~5.1.0",
4545
"karma-jasmine-html-reporter": "~2.1.0",
46-
"ng-packagr": "^19.2.2",
47-
"playwright-ng-schematics": "2.0.2",
46+
"ng-packagr": "^20.0.0",
47+
"playwright-ng-schematics": "2.1.0",
4848
"prettier": "^3.5.3",
4949
"typescript": "~5.8.3",
50-
"typescript-eslint": "^8.29.1"
50+
"typescript-eslint": "^8.33.1"
5151
}
5252
}

projects/fab-speed-dial/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"tslib": "^2.8.1"
99
},
1010
"peerDependencies": {
11-
"@angular/common": "^19.1.0",
12-
"@angular/core": "^19.1.0",
13-
"@angular/material": "^19.1",
11+
"@angular/common": "^20.0",
12+
"@angular/core": "^20.0",
13+
"@angular/material": "^20.0",
1414
"rxjs": "^7.8.2"
1515
}
1616
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ describe('FabSpeedDial', () => {
123123

124124
/** Test component that contains an fab speed dial buttons */
125125
@Component({
126+
imports: [EcoFabSpeedDialActionsComponent, EcoFabSpeedDialTriggerComponent, EcoFabSpeedDialComponent],
126127
template: `
127128
<div>
128129
<eco-fab-speed-dial [direction]="direction" [(open)]="open">
@@ -139,7 +140,6 @@ describe('FabSpeedDial', () => {
139140
<div class="testElement">Test element</div>
140141
</div>
141142
`,
142-
imports: [EcoFabSpeedDialActionsComponent, EcoFabSpeedDialTriggerComponent, EcoFabSpeedDialComponent],
143143
})
144144
class TestAppComponent {
145145
public readonly fabActions = viewChild.required(EcoFabSpeedDialActionsComponent);

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,20 @@ import {
1212
output,
1313
Renderer2,
1414
ViewEncapsulation,
15+
DOCUMENT,
1516
} from '@angular/core';
1617
import {MatMiniFabAnchor, MatMiniFabButton} from '@angular/material/button';
17-
import {DOCUMENT} from '@angular/common';
18+
1819
import {forkJoin, fromEvent, Subscription} from 'rxjs';
1920
import {take} from 'rxjs/operators';
2021

2122
const Z_INDEX_ITEM = 23;
2223

2324
export type Direction = 'up' | 'down' | 'left' | 'right';
2425

25-
type MiniFab = MatMiniFabButton | MatMiniFabAnchor;
26+
type MiniFab = MatMiniFabButton;
2627

27-
function getHostElement(miniFab: MiniFab): HTMLButtonElement | HTMLAnchorElement {
28+
function getHostElement(miniFab: MiniFab): HTMLElement {
2829
return miniFab._elementRef.nativeElement;
2930
}
3031

src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import {MatToolbarModule} from '@angular/material/toolbar';
1515

1616
@Component({
1717
selector: 'app-root',
18-
templateUrl: './app.component.html',
19-
styleUrl: './app.component.scss',
2018
imports: [
2119
MatToolbarModule,
2220
MatButtonModule,
@@ -29,6 +27,8 @@ import {MatToolbarModule} from '@angular/material/toolbar';
2927
EcoFabSpeedDialTriggerComponent,
3028
EcoFabSpeedDialActionsComponent,
3129
],
30+
templateUrl: './app.component.html',
31+
styleUrl: './app.component.scss',
3232
})
3333
export class AppComponent {
3434
public open = false;

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{
44
"compileOnSave": false,
55
"compilerOptions": {
6+
"esModuleInterop": true,
67
"outDir": "./dist/out-tsc",
78
"strict": true,
89
"paths": {

0 commit comments

Comments
 (0)