Skip to content

Commit f351d89

Browse files
brandonrobertsbrandonroberts
committed
Merge branch 'main' into beta
2 parents 112ea4a + 0350fcf commit f351d89

File tree

19 files changed

+68
-54
lines changed

19 files changed

+68
-54
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [1.18.0](https://github.com/analogjs/analog/compare/v1.17.1...v1.18.0) (2025-06-20)
2+
3+
### Bug Fixes
4+
5+
- **create-analog:** fix template and styles for SFCs ([#1778](https://github.com/analogjs/analog/issues/1778)) ([902fe23](https://github.com/analogjs/analog/commit/902fe23e56b4ba542bc0da0583921aad5054d0f5))
6+
- **create-analog:** update template dependencies to Angular v20 ([#1768](https://github.com/analogjs/analog/issues/1768)) ([8e1fae5](https://github.com/analogjs/analog/commit/8e1fae5ed9565286dcc4bb5eff8908e8600e1bea))
7+
- **nx-plugin:** add fallback for json.files property in preset ([6e2241a](https://github.com/analogjs/analog/commit/6e2241a63ca5e921570341e38c46abb6441467f1))
8+
- **nx-plugin:** ensure that tags option is used on app generation ([#1764](https://github.com/analogjs/analog/issues/1764)) ([df001b0](https://github.com/analogjs/analog/commit/df001b0bed89fb44baa6dc932b9c7e43c2e83eb8))
9+
- **vite-plugin-angular:** trigger compilation from external templates/styles ([#1779](https://github.com/analogjs/analog/issues/1779)) ([e3a1f27](https://github.com/analogjs/analog/commit/e3a1f278b6e39bca4e1b14a4555e977b32ba341c))
10+
11+
### Features
12+
13+
- **vite-plugin-nitro:** support static server side data fetching during prerendering ([#1771](https://github.com/analogjs/analog/issues/1771)) ([377cdd2](https://github.com/analogjs/analog/commit/377cdd227e005a0f73c01ad026a584834a49c044))
14+
115
# [1.18.0-beta.4](https://github.com/analogjs/analog/compare/v1.18.0-beta.3...v1.18.0-beta.4) (2025-06-20)
216

317
### Bug Fixes

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "analogjs-platform",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"license": "MIT",
55
"type": "module",
66
"scripts": {

‎packages/astro-angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/astro-angular",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Use Angular components within Astro",
55
"type": "module",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -32,7 +32,7 @@
3232
"url": "https://github.com/sponsors/brandonroberts"
3333
},
3434
"dependencies": {
35-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4"
35+
"@analogjs/vite-plugin-angular": "^1.18.0"
3636
},
3737
"peerDependencies": {
3838
"@angular-devkit/build-angular": ">=16.0.0",

‎packages/content/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/content",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Content Rendering for Analog",
55
"type": "module",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",

‎packages/create-analog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "create-analog",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"type": "module",
55
"license": "MIT",
66
"author": "Brandon Roberts",

‎packages/create-analog/template-angular-v16/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"test": "ng test"
1616
},
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^16.2.0",
2121
"@angular/common": "^16.2.0",
2222
"@angular/compiler": "^16.2.0",
@@ -38,9 +38,9 @@
3838
"zone.js": "~0.13.0"
3939
},
4040
"devDependencies": {
41-
"@analogjs/platform": "^1.18.0-beta.4",
42-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
43-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
41+
"@analogjs/platform": "^1.18.0",
42+
"@analogjs/vite-plugin-angular": "^1.18.0",
43+
"@analogjs/vitest-angular": "^1.18.0",
4444
"@angular-devkit/build-angular": "^16.2.0",
4545
"@angular/cli": "^16.2.0",
4646
"@angular/compiler-cli": "^16.2.0",

‎packages/create-analog/template-angular-v17/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"test": "ng test"
1616
},
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^17.2.0",
2121
"@angular/common": "^17.2.0",
2222
"@angular/compiler": "^17.2.0",
@@ -38,9 +38,9 @@
3838
"zone.js": "~0.14.0"
3939
},
4040
"devDependencies": {
41-
"@analogjs/platform": "^1.18.0-beta.4",
42-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
43-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
41+
"@analogjs/platform": "^1.18.0",
42+
"@analogjs/vite-plugin-angular": "^1.18.0",
43+
"@analogjs/vitest-angular": "^1.18.0",
4444
"@angular-devkit/build-angular": "^17.2.0",
4545
"@angular/cli": "^17.2.0",
4646
"@angular/compiler-cli": "^17.2.0",

‎packages/create-analog/template-angular-v18/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^18.0.0",
2121
"@angular/build": "^18.0.0",
2222
"@angular/common": "^18.0.0",
@@ -38,9 +38,9 @@
3838
"zone.js": "~0.14.3"
3939
},
4040
"devDependencies": {
41-
"@analogjs/platform": "^1.18.0-beta.4",
42-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
43-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
41+
"@analogjs/platform": "^1.18.0",
42+
"@analogjs/vite-plugin-angular": "^1.18.0",
43+
"@analogjs/vitest-angular": "^1.18.0",
4444
"@angular/cli": "^18.0.0",
4545
"@angular/compiler-cli": "^18.0.0",
4646
"jsdom": "^22.0.0",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^20.0.0",
2121
"@angular/common": "^20.0.0",
2222
"@angular/compiler": "^20.0.0",
@@ -36,9 +36,9 @@
3636
"zone.js": "~0.15.0"
3737
},
3838
"devDependencies": {
39-
"@analogjs/platform": "^1.18.0-beta.4",
40-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
41-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
39+
"@analogjs/platform": "^1.18.0",
40+
"@analogjs/vite-plugin-angular": "^1.18.0",
41+
"@analogjs/vitest-angular": "^1.18.0",
4242
"@angular/build": "^20.0.0",
4343
"@angular/cli": "^20.0.0",
4444
"@angular/compiler-cli": "^20.0.0",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^20.0.0",
2121
"@angular/common": "^20.0.0",
2222
"@angular/compiler": "^20.0.0",
@@ -37,9 +37,9 @@
3737
"zone.js": "~0.15.0"
3838
},
3939
"devDependencies": {
40-
"@analogjs/platform": "^1.18.0-beta.4",
41-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
42-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
40+
"@analogjs/platform": "^1.18.0",
41+
"@analogjs/vite-plugin-angular": "^1.18.0",
42+
"@analogjs/vitest-angular": "^1.18.0",
4343
"@angular/build": "^20.0.0",
4444
"@angular/cli": "^20.0.0",
4545
"@angular/compiler-cli": "^20.0.0",

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
},
1616
"private": true,
1717
"dependencies": {
18-
"@analogjs/content": "^1.18.0-beta.4",
19-
"@analogjs/router": "^1.18.0-beta.4",
18+
"@analogjs/content": "^1.18.0",
19+
"@analogjs/router": "^1.18.0",
2020
"@angular/animations": "^20.0.0",
2121
"@angular/common": "^20.0.0",
2222
"@angular/compiler": "^20.0.0",
@@ -37,9 +37,9 @@
3737
"zone.js": "~0.15.0"
3838
},
3939
"devDependencies": {
40-
"@analogjs/platform": "^1.18.0-beta.4",
41-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
42-
"@analogjs/vitest-angular": "^1.18.0-beta.4",
40+
"@analogjs/platform": "^1.18.0",
41+
"@analogjs/vite-plugin-angular": "^1.18.0",
42+
"@analogjs/vitest-angular": "^1.18.0",
4343
"@angular/build": "^20.0.0",
4444
"@angular/cli": "^20.0.0",
4545
"@angular/compiler-cli": "^20.0.0",

‎packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// dependencies
33
export const V18_X_NX_DEVKIT = '^21.0.0';
44
export const V18_X_NX_ANGULAR = '^21.0.0';
5-
export const V18_X_ANALOG_JS_CONTENT = '^1.18.0-beta.4';
6-
export const V18_X_ANALOG_JS_ROUTER = '^1.18.0-beta.4';
5+
export const V18_X_ANALOG_JS_CONTENT = '^1.18.0';
6+
export const V18_X_ANALOG_JS_ROUTER = '^1.18.0';
77
export const V18_X_ANALOG_JS_TRPC = '~0.3.0';
8-
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.18.0-beta.4';
9-
export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^1.18.0-beta.4';
8+
export const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.18.0';
9+
export const V18_X_ANALOG_JS_VITEST_ANGULAR = '^1.18.0';
1010
export const V18_X_TRPC_CLIENT = '^10.25.0';
1111
export const V18_X_TRPC_SERVER = '^10.25.0';
1212
export const V18_X_ISOMORPHIC_FETCH = '^3.0.0';
@@ -24,7 +24,7 @@ export const V18_X_POSTCSS = '^8.5.3';
2424
export const V18_X_AUTOPREFIXER = '^10.4.0';
2525

2626
// devDependencies
27-
export const V18_X_ANALOG_JS_PLATFORM = '^1.18.0-beta.4';
27+
export const V18_X_ANALOG_JS_PLATFORM = '^1.18.0';
2828
export const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
2929
export const V18_X_NX_VITE = '^21.0.0';
3030
export const V18_X_NX_LINTER = '^21.0.0';

‎packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// V19_X
2-
export const V19_X_ANALOG_JS_ROUTER = '^1.18.0-beta.4';
3-
export const V19_X_ANALOG_JS_CONTENT = '^1.18.0-beta.4';
2+
export const V19_X_ANALOG_JS_ROUTER = '^1.18.0';
3+
export const V19_X_ANALOG_JS_CONTENT = '^1.18.0';
44
export const V19_X_MARKED = '^15.0.7';
55
export const V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
66
export const V19_X_MARKED_HIGHLIGHT = '^2.2.1';
77
export const V19_X_MARKED_MANGLE = '^1.1.10';
88
export const V19_X_PRISMJS = '^1.29.0';
99

1010
// devDependencies
11-
export const V19_X_ANALOG_JS_PLATFORM = '^1.18.0-beta.4';
12-
export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.18.0-beta.4';
13-
export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^1.18.0-beta.4';
11+
export const V19_X_ANALOG_JS_PLATFORM = '^1.18.0';
12+
export const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^1.18.0';
13+
export const V19_X_ANALOG_JS_VITEST_ANGULAR = '^1.18.0';
1414
export const V19_X_NX_ANGULAR = '^21.0.0';
1515
export const V19_X_NX_VITE = '^21.0.0';
1616
export const V19_X_JSDOM = '^22.0.0';

‎packages/platform/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/platform",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "The fullstack meta-framework for Angular",
55
"type": "module",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -29,8 +29,8 @@
2929
},
3030
"dependencies": {
3131
"nitropack": "^2.11.0",
32-
"@analogjs/vite-plugin-angular": "^1.18.0-beta.4",
33-
"@analogjs/vite-plugin-nitro": "^1.18.0-beta.4",
32+
"@analogjs/vite-plugin-angular": "^1.18.0",
33+
"@analogjs/vite-plugin-nitro": "^1.18.0",
3434
"vitefu": "^1.0.0"
3535
},
3636
"peerDependencies": {

‎packages/router/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/router",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Filesystem-based routing for Angular",
55
"type": "module",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",
@@ -24,7 +24,7 @@
2424
"url": "https://github.com/sponsors/brandonroberts"
2525
},
2626
"peerDependencies": {
27-
"@analogjs/content": "^1.18.0-beta.4",
27+
"@analogjs/content": "^1.18.0",
2828
"@angular/core": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0",
2929
"@angular/router": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^20.0.0"
3030
},

‎packages/storybook-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/storybook-angular",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Storybook Integration for Angular & Vite",
55
"keywords": [
66
"storybook",

‎packages/vite-plugin-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/vite-plugin-angular",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Vite Plugin for Angular",
55
"type": "module",
66
"keywords": [

‎packages/vite-plugin-nitro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/vite-plugin-nitro",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "A Vite plugin for adding a nitro API server",
55
"type": "module",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",

‎packages/vitest-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@analogjs/vitest-angular",
3-
"version": "1.18.0-beta.4",
3+
"version": "1.18.0",
44
"description": "Vitest Builder for Angular",
55
"type": "commonjs",
66
"author": "Brandon Roberts <robertsbt@gmail.com>",

0 commit comments

Comments
 (0)