Skip to content

Commit 75031a5

Browse files
crisbetocrisbeto
authored
build: update to latest Angular and fix build errors (#1249)
Updates to the latest version of Angular and fixes some build errors.
1 parent 06b2bf7 commit 75031a5

File tree

11 files changed

+2896
-2902
lines changed

11 files changed

+2896
-2902
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-1306950124
5-
pnpm-lock.yaml=-93580819
6-
yarn.lock=-1601036339
7-
package.json=-1110318834
5+
pnpm-lock.yaml=1732658939
6+
yarn.lock=-2144284508
7+
package.json=-1734035326

‎package.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030
},
3131
"private": true,
3232
"dependencies": {
33-
"@angular/animations": "^17.3.0",
34-
"@angular/cdk": "^17.3.0",
35-
"@angular/cdk-experimental": "^17.3.0",
36-
"@angular/common": "^17.3.0",
37-
"@angular/compiler": "^17.3.0",
33+
"@angular/animations": "^18.0.0-next.6",
34+
"@angular/cdk": "^18.0.0-next.6",
35+
"@angular/cdk-experimental": "^18.0.0-next.6",
36+
"@angular/common": "^18.0.0-next.6",
37+
"@angular/compiler": "^18.0.0-next.6",
3838
"@angular/components-examples": "https://github.com/angular/material2-docs-content.git#8319d8fde93ab4ed2bd6e0b6e2a88d893661bdd5",
39-
"@angular/core": "^17.3.0",
40-
"@angular/forms": "^17.3.0",
41-
"@angular/google-maps": "^17.3.0",
42-
"@angular/localize": "^17.3.0",
43-
"@angular/material": "^17.3.0",
44-
"@angular/material-experimental": "^17.3.0",
45-
"@angular/material-moment-adapter": "^17.3.0",
46-
"@angular/platform-browser": "^17.3.0",
47-
"@angular/platform-browser-dynamic": "^17.3.0",
48-
"@angular/router": "^17.3.0",
49-
"@angular/ssr": "^17.3.0",
50-
"@angular/youtube-player": "^17.3.0",
39+
"@angular/core": "^18.0.0-next.6",
40+
"@angular/forms": "^18.0.0-next.6",
41+
"@angular/google-maps": "^18.0.0-next.6",
42+
"@angular/localize": "^18.0.0-next.6",
43+
"@angular/material": "^18.0.0-next.6",
44+
"@angular/material-experimental": "^18.0.0-next.6",
45+
"@angular/material-moment-adapter": "^18.0.0-next.6",
46+
"@angular/platform-browser": "^18.0.0-next.6",
47+
"@angular/platform-browser-dynamic": "^18.0.0-next.6",
48+
"@angular/router": "^18.0.0-next.6",
49+
"@angular/ssr": "^18.0.0-next.3",
50+
"@angular/youtube-player": "^18.0.0-next.6",
5151
"@stackblitz/sdk": "^1.5.2",
5252
"moment": "^2.29.1",
5353
"path-normalize": "^6.0.7",
@@ -56,16 +56,16 @@
5656
"zone.js": "~0.14.0"
5757
},
5858
"devDependencies": {
59-
"@angular-devkit/architect": "^0.1703.0",
60-
"@angular-devkit/architect-cli": "^0.1702.0",
61-
"@angular-devkit/build-angular": "^17.3.0",
59+
"@angular-devkit/architect": "^0.1800.0-next.3",
60+
"@angular-devkit/architect-cli": "^0.1800.0-next.3",
61+
"@angular-devkit/build-angular": "^18.0.0-next.3",
6262
"@angular-eslint/builder": "^14.0.0",
6363
"@angular-eslint/eslint-plugin": "^14.0.0",
6464
"@angular-eslint/eslint-plugin-template": "^14.0.0",
6565
"@angular-eslint/template-parser": "^14.0.0",
6666
"@material/tokens": "15.0.0-canary.7f224ddd4.0",
67-
"@angular/cli": "^17.3.0",
68-
"@angular/compiler-cli": "^17.3.0",
67+
"@angular/cli": "^18.0.0-next.3",
68+
"@angular/compiler-cli": "^18.0.0-next.6",
6969
"@bazel/bazelisk": "^1.12.1",
7070
"@types/imagemin": "^7.0.0",
7171
"@types/jasmine": "^3.7.7",

‎pnpm-lock.yaml

+1,401-1,461
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scenes/src/styles.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
@use 'sass:map';
22
@use '@angular/material' as mat;
3-
@use '@angular//material-experimental' as matx;
43

54
@include mat.core();
65

7-
$theme: matx.define-theme((
6+
$theme: mat.define-theme((
87
color: (
98
theme-type: light,
10-
primary: matx.$m3-red-palette,
9+
primary: mat.$red-palette,
1110
),
1211
typography: (
1312
brand-family: 'Roboto',

‎src/assets/stack-blitz/src/theme.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32

4-
$theme: matx.define-theme((
3+
$theme: mat.define-theme((
54
color: (
65
theme-type: light,
7-
primary: matx.$m3-azure-palette,
8-
tertiary: matx.$m3-blue-palette,
6+
primary: mat.$azure-palette,
7+
tertiary: mat.$blue-palette,
98
)
109
));
1110

1211
@include mat.core();
13-
@include matx.color-variants-back-compat($theme);
12+
@include mat.color-variants-backwards-compatibility($theme);
1413

1514
:root {
1615
@include mat.all-component-themes($theme);

‎src/styles.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32
@use './app-theme';
43
@use './styles/api';
54
@use './styles/markdown';
65
@use './styles/tables';
76
@use './styles/general';
87

9-
$theme: matx.define-theme((
8+
$theme: mat.define-theme((
109
color: (
1110
theme-type: light,
12-
primary: matx.$m3-azure-palette,
13-
tertiary: matx.$m3-blue-palette,
11+
primary: mat.$azure-palette,
12+
tertiary: mat.$blue-palette,
1413
)
1514
));
1615

1716
// Include material core styles.
1817
@include mat.core();
19-
@include matx.color-variants-back-compat($theme);
18+
@include mat.color-variants-backwards-compatibility($theme);
2019
@include app-theme.theme($theme);
2120

2221
:root {

‎src/styles/custom-themes/azure-blue.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32
@use '../../app-theme';
43

5-
$theme: matx.define-theme((
4+
$theme: mat.define-theme((
65
color: (
76
theme-type: light,
8-
primary: matx.$m3-azure-palette,
9-
tertiary: matx.$m3-blue-palette,
7+
primary: mat.$azure-palette,
8+
tertiary: mat.$blue-palette,
109
)
1110
));
1211

13-
@include matx.color-variants-back-compat($theme);
12+
@include mat.color-variants-backwards-compatibility($theme);
1413
@include app-theme.theme($theme);
1514

1615
:root {

‎src/styles/custom-themes/cyan-orange.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32
@use '../../app-theme';
43
@use '../../highlightjs/material-dark';
54

6-
$theme: matx.define-theme((
5+
$theme: mat.define-theme((
76
color: (
87
theme-type: dark,
9-
primary: matx.$m3-cyan-palette,
10-
tertiary: matx.$m3-orange-palette
8+
primary: mat.$cyan-palette,
9+
tertiary: mat.$orange-palette
1110
)
1211
));
1312

14-
@include matx.color-variants-back-compat($theme);
13+
@include mat.color-variants-backwards-compatibility($theme);
1514
@include app-theme.theme($theme);
1615

1716
:root {

‎src/styles/custom-themes/magenta-violet.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32
@use '../../app-theme';
43
@use '../../highlightjs/material-dark';
54

6-
$theme: matx.define-theme((
5+
$theme: mat.define-theme((
76
color: (
87
theme-type: dark,
9-
primary: matx.$m3-magenta-palette,
10-
tertiary: matx.$m3-violet-palette,
8+
primary: mat.$magenta-palette,
9+
tertiary: mat.$violet-palette,
1110
)
1211
));
1312

14-
@include matx.color-variants-back-compat($theme);
13+
@include mat.color-variants-backwards-compatibility($theme);
1514
@include app-theme.theme($theme);
1615

1716
:root {

‎src/styles/custom-themes/rose-red.scss

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
@use '@angular/material' as mat;
2-
@use '@angular/material-experimental' as matx;
32
@use '../../app-theme';
43

5-
$theme: matx.define-theme((
4+
$theme: mat.define-theme((
65
color: (
76
theme-type: light,
8-
primary: matx.$m3-rose-palette,
9-
tertiary: matx.$m3-red-palette,
7+
primary: mat.$rose-palette,
8+
tertiary: mat.$red-palette,
109
)
1110
));
1211

13-
@include matx.color-variants-back-compat($theme);
12+
@include mat.color-variants-backwards-compatibility($theme);
1413
@include app-theme.theme($theme);
1514

1615
:root {

0 commit comments

Comments
 (0)