Skip to content

Commit ef9bbee

Browse files
brandonrobertsbrandonroberts
authored
feat: update deps and apps to Angular v18 release (#1101)
1 parent 00bf117 commit ef9bbee

File tree

24 files changed

+1642
-2035
lines changed

24 files changed

+1642
-2035
lines changed

‎.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- beta
7+
- main
78

89
permissions:
910
contents: read # for checkout

‎package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@
4444
"apps/docs-app"
4545
],
4646
"dependencies": {
47-
"@angular/animations": "^18.0.0-rc.0",
48-
"@angular/cdk": "^18.0.0-rc.0",
49-
"@angular/common": "^18.0.0-rc.0",
50-
"@angular/compiler": "^18.0.0-rc.0",
51-
"@angular/core": "^18.0.0-rc.0",
52-
"@angular/forms": "^18.0.0-rc.0",
53-
"@angular/material": "^18.0.0-rc.0",
54-
"@angular/platform-browser": "^18.0.0-rc.0",
55-
"@angular/platform-browser-dynamic": "^18.0.0-rc.0",
56-
"@angular/platform-server": "^18.0.0-rc.0",
57-
"@angular/router": "^18.0.0-rc.0",
58-
"@astrojs/mdx": "^1.1.0",
47+
"@angular/animations": "^18.0.0",
48+
"@angular/cdk": "^18.0.0",
49+
"@angular/common": "^18.0.0",
50+
"@angular/compiler": "^18.0.0",
51+
"@angular/core": "^18.0.0",
52+
"@angular/forms": "^18.0.0",
53+
"@angular/material": "^18.0.0",
54+
"@angular/platform-browser": "^18.0.0",
55+
"@angular/platform-browser-dynamic": "^18.0.0",
56+
"@angular/platform-server": "^18.0.0",
57+
"@angular/router": "^18.0.0",
58+
"@astrojs/mdx": "^3.0.1",
5959
"@astrojs/react": "^3.0.0",
6060
"@babel/core": "^7.21.8",
61-
"@mdx-js/react": "1.6.22",
61+
"@mdx-js/react": "3.0.1",
6262
"@nx/angular": "19.0.3",
6363
"@nx/devkit": "19.0.3",
6464
"@trpc/client": "^10.25.0",
@@ -83,20 +83,20 @@
8383
"zone.js": "^0.14.0"
8484
},
8585
"devDependencies": {
86-
"@angular-devkit/build-angular": "^18.0.0-rc.0",
87-
"@angular-devkit/core": "^18.0.0-rc.0",
88-
"@angular-devkit/schematics": "^18.0.0-rc.0",
86+
"@angular-devkit/build-angular": "^18.0.0",
87+
"@angular-devkit/core": "^18.0.0",
88+
"@angular-devkit/schematics": "^18.0.0",
8989
"@angular-eslint/eslint-plugin": "17.3.0",
9090
"@angular-eslint/eslint-plugin-template": "17.3.0",
9191
"@angular-eslint/template-parser": "17.3.0",
92-
"@angular/cli": "^18.0.0-rc.0",
93-
"@angular/compiler-cli": "^18.0.0-rc.0",
94-
"@angular/language-service": "^18.0.0-rc.0",
92+
"@angular/cli": "^18.0.0",
93+
"@angular/compiler-cli": "^18.0.0",
94+
"@angular/language-service": "^18.0.0",
9595
"@astrojs/markdown-component": "^1.0.5",
9696
"@commitlint/cli": "^17.4.2",
9797
"@commitlint/config-conventional": "^17.4.2",
9898
"@netlify/functions": "^2.3.0",
99-
"@ngtools/webpack": "^18.0.0-rc.0",
99+
"@ngtools/webpack": "^18.0.0",
100100
"@nx/cypress": "19.0.3",
101101
"@nx/eslint": "19.0.3",
102102
"@nx/eslint-plugin": "19.0.3",
@@ -105,7 +105,7 @@
105105
"@nx/plugin": "19.0.3",
106106
"@nx/vite": "19.0.3",
107107
"@nx/web": "19.0.3",
108-
"@schematics/angular": "^18.0.0-rc.0",
108+
"@schematics/angular": "^18.0.0",
109109
"@semantic-release/changelog": "^6.0.3",
110110
"@semantic-release/exec": "^6.0.3",
111111
"@semantic-release/git": "^10.0.1",
@@ -124,7 +124,7 @@
124124
"@typescript-eslint/eslint-plugin": "7.4.0",
125125
"@typescript-eslint/parser": "7.4.0",
126126
"all-contributors-cli": "^6.24.0",
127-
"astro": "3.0.8",
127+
"astro": "4.8.7",
128128
"conventional-changelog": "^3.1.25",
129129
"conventional-changelog-cli": "^2.2.2",
130130
"cpy-cli": "^4.2.0",
@@ -145,8 +145,8 @@
145145
"kolorist": "^1.6.0",
146146
"lint-staged": "^13.1.0",
147147
"minimist": "^1.2.7",
148-
"ng-packagr": "^18.0.0-rc.0",
149-
"nitropack": "^2.6.0",
148+
"ng-packagr": "^18.0.0",
149+
"nitropack": "^2.9.0",
150150
"nx": "19.0.3",
151151
"playwright": "^1.30.0",
152152
"postcss": "^8.4.21",

‎packages/astro-angular/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
"@analogjs/vite-plugin-angular": "^1.4.0-beta.3"
3232
},
3333
"peerDependencies": {
34-
"@angular-devkit/build-angular": ">=16.0.0 || ^18.0.0-rc.0",
35-
"@angular/animations": ">=16.0.0 || ^18.0.0-rc.0",
36-
"@angular/common": ">=16.0.0 || ^18.0.0-rc.0",
37-
"@angular/compiler-cli": ">=16.0.0 || ^18.0.0-rc.0",
38-
"@angular/compiler": ">=16.0.0 || ^18.0.0-rc.0",
39-
"@angular/core": ">=16.0.0 || ^18.0.0-rc.0",
40-
"@angular/language-service": ">=16.0.0 || ^18.0.0-rc.0",
41-
"@angular/platform-browser": ">=16.0.0 || ^18.0.0-rc.0",
42-
"@angular/platform-browser-dynamic": ">=16.0.0 || ^18.0.0-rc.0",
43-
"@angular/platform-server": ">=16.0.0 || ^18.0.0-rc.0",
34+
"@angular-devkit/build-angular": ">=16.0.0",
35+
"@angular/animations": ">=16.0.0",
36+
"@angular/common": ">=16.0.0",
37+
"@angular/compiler-cli": ">=16.0.0",
38+
"@angular/compiler": ">=16.0.0",
39+
"@angular/core": ">=16.0.0",
40+
"@angular/language-service": ">=16.0.0",
41+
"@angular/platform-browser": ">=16.0.0",
42+
"@angular/platform-browser-dynamic": ">=16.0.0",
43+
"@angular/platform-server": ">=16.0.0",
4444
"rxjs": "^7.5.6",
4545
"zone.js": ">=0.13.3",
4646
"tslib": "^2.4.0"

‎packages/astro-angular/src/index.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import viteAngular, { PluginOptions } from '@analogjs/vite-plugin-angular';
22
import { enableProdMode } from '@angular/core';
3-
import { AstroIntegration, AstroRenderer } from 'astro';
3+
import type { AstroIntegration, AstroRenderer, ViteUserConfig } from 'astro';
4+
import type { DeepPartial } from 'astro/dist/type-utils';
45

56
interface AngularOptions {
67
vite?: PluginOptions;
@@ -79,7 +80,11 @@ export default function (options?: AngularOptions): AstroIntegration {
7980
}
8081

8182
addRenderer(getRenderer());
82-
updateConfig({ vite: getViteConfiguration(options?.vite) });
83+
updateConfig({
84+
vite: getViteConfiguration(
85+
options?.vite
86+
) as DeepPartial<ViteUserConfig>,
87+
});
8388
},
8489
'astro:config:done': ({ config }) => {
8590
if (

‎packages/content/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
"url": "https://github.com/analogjs/analog.git"
2020
},
2121
"peerDependencies": {
22-
"@angular/common": ">=15.0.0 || ^18.0.0-rc.0",
23-
"@angular/core": ">=15.0.0 || ^18.0.0-rc.0",
24-
"@angular/platform-browser": ">=15.0.0 || ^18.0.0-rc.0",
25-
"@angular/router": ">=15.0.0 || ^18.0.0-rc.0",
22+
"@angular/common": ">=15.0.0 || ^18.0.0",
23+
"@angular/core": ">=15.0.0 || ^18.0.0",
24+
"@angular/platform-browser": ">=15.0.0 || ^18.0.0",
25+
"@angular/router": ">=15.0.0 || ^18.0.0",
2626
"rxjs": "^6.5.0 || ^7.5.0",
2727
"marked": "^5.0.2",
2828
"marked-gfm-heading-id": "^3.0.4",

‎packages/create-analog/template-blog/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
"dependencies": {
1818
"@analogjs/content": "^1.4.0-beta.3",
1919
"@analogjs/router": "^1.4.0-beta.3",
20-
"@angular/animations": "^17.2.0",
21-
"@angular/common": "^17.2.0",
22-
"@angular/compiler": "^17.2.0",
23-
"@angular/core": "^17.2.0",
24-
"@angular/forms": "^17.2.0",
25-
"@angular/platform-browser": "^17.2.0",
26-
"@angular/platform-browser-dynamic": "^17.2.0",
27-
"@angular/platform-server": "^17.2.0",
28-
"@angular/router": "^17.2.0",
29-
"@nx/angular": "~18.0.0",
20+
"@angular/animations": "^18.0.0",
21+
"@angular/common": "^18.0.0",
22+
"@angular/compiler": "^18.0.0",
23+
"@angular/core": "^18.0.0",
24+
"@angular/forms": "^18.0.0",
25+
"@angular/platform-browser": "^18.0.0",
26+
"@angular/platform-browser-dynamic": "^18.0.0",
27+
"@angular/platform-server": "^18.0.0",
28+
"@angular/router": "^18.0.0",
29+
"@nx/angular": "~19.0.0",
3030
"front-matter": "^4.0.2",
3131
"marked": "^5.0.2",
3232
"marked-gfm-heading-id": "^3.1.0",
@@ -40,13 +40,13 @@
4040
"devDependencies": {
4141
"@analogjs/platform": "^1.4.0-beta.3",
4242
"@analogjs/vite-plugin-angular": "^1.4.0-beta.3",
43-
"@angular-devkit/build-angular": "^17.2.0",
44-
"@angular/cli": "^17.2.0",
45-
"@angular/compiler-cli": "^17.2.0",
46-
"@nx/vite": "~18.0.0",
47-
"nx": "~18.0.0",
43+
"@angular-devkit/build-angular": "^18.0.0",
44+
"@angular/cli": "^18.0.0",
45+
"@angular/compiler-cli": "^18.0.0",
46+
"@nx/vite": "~19.0.0",
47+
"nx": "~19.0.0",
4848
"jsdom": "^22.1.0",
49-
"typescript": "~5.3.0",
49+
"typescript": "~5.4.2",
5050
"vite": "^5.0.0",
5151
"vitest": "^1.3.1"
5252
}

‎packages/create-analog/template-blog/src/assets/.gitkeep renamed to ‎packages/create-analog/template-blog/public/.gitkeep

File renamed without changes.

‎packages/create-analog/template-blog/src/assets/analog.svg renamed to ‎packages/create-analog/template-blog/public/analog.svg

File renamed without changes.

‎packages/create-analog/template-blog/favicon.ico renamed to ‎packages/create-analog/template-blog/public/favicon.ico

File renamed without changes.

‎packages/create-analog/template-blog/src/assets/vite.svg renamed to ‎packages/create-analog/template-blog/public/vite.svg

File renamed without changes.

0 commit comments

Comments
 (0)