diff --git a/apps/create-analog-e2e/tests/create-analog.spec.ts b/apps/create-analog-e2e/tests/create-analog.spec.ts index a4c0e5061..612a9fa8a 100644 --- a/apps/create-analog-e2e/tests/create-analog.spec.ts +++ b/apps/create-analog-e2e/tests/create-analog.spec.ts @@ -44,7 +44,7 @@ describe('create-analog e2e', () => { { cwd: process.cwd() } ); - await runCommandAsync(`npm i`, { + await runCommandAsync(`npm i --legacy-peer-deps`, { cwd: tmpDir, }); @@ -86,7 +86,7 @@ describe('create-analog e2e', () => { { cwd: process.cwd() } ); - await runCommandAsync(`npm i`, { + await runCommandAsync(`npm i --legacy-peer-deps`, { cwd: tmpDir, }); diff --git a/package.json b/package.json index 2d162b461..cb2e35bc0 100644 --- a/package.json +++ b/package.json @@ -45,17 +45,17 @@ "apps/docs-app" ], "dependencies": { - "@angular/animations": "^17.1.0", + "@angular/animations": "^17.2.0", "@angular/cdk": "^17.1.0", - "@angular/common": "^17.1.0", - "@angular/compiler": "^17.1.0", - "@angular/core": "^17.1.0", - "@angular/forms": "^17.1.0", + "@angular/common": "^17.2.0", + "@angular/compiler": "^17.2.0", + "@angular/core": "^17.2.0", + "@angular/forms": "^17.2.0", "@angular/material": "^17.1.0", - "@angular/platform-browser": "^17.1.0", - "@angular/platform-browser-dynamic": "^17.1.0", - "@angular/platform-server": "^17.1.0", - "@angular/router": "^17.1.0", + "@angular/platform-browser": "^17.2.0", + "@angular/platform-browser-dynamic": "^17.2.0", + "@angular/platform-server": "^17.2.0", + "@angular/router": "^17.2.0", "@astrojs/mdx": "^1.1.0", "@astrojs/react": "^3.0.0", "@babel/core": "^7.21.8", @@ -84,20 +84,20 @@ "zone.js": "^0.14.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.1.0", - "@angular-devkit/core": "^17.1.0", - "@angular-devkit/schematics": "^17.1.0", + "@angular-devkit/build-angular": "^17.2.0", + "@angular-devkit/core": "^17.2.0", + "@angular-devkit/schematics": "^17.2.0", "@angular-eslint/eslint-plugin": "16.0.1", "@angular-eslint/eslint-plugin-template": "16.0.1", "@angular-eslint/template-parser": "16.0.1", - "@angular/cli": "~17.1.0", - "@angular/compiler-cli": "^17.1.0", - "@angular/language-service": "^17.1.0", + "@angular/cli": "~17.2.0", + "@angular/compiler-cli": "^17.2.0", + "@angular/language-service": "^17.2.0", "@astrojs/markdown-component": "^1.0.5", "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", "@netlify/functions": "^2.3.0", - "@ngtools/webpack": "^17.1.0", + "@ngtools/webpack": "^17.2.0", "@nx/cypress": "18.0.4", "@nx/eslint": "18.0.4", "@nx/eslint-plugin": "18.0.4", @@ -106,7 +106,7 @@ "@nx/plugin": "18.0.4", "@nx/vite": "18.0.4", "@nx/web": "18.0.4", - "@schematics/angular": "^17.1.0", + "@schematics/angular": "^17.2.0", "@swc-node/register": "1.8.0", "@swc/cli": "0.1.62", "@swc/core": "~1.3.85", @@ -143,7 +143,7 @@ "kolorist": "^1.6.0", "lint-staged": "^13.1.0", "minimist": "^1.2.7", - "ng-packagr": "^17.1.0", + "ng-packagr": "^17.2.0", "nitropack": "^2.6.0", "nx": "18.0.4", "playwright": "^1.30.0", diff --git a/packages/create-analog/template-angular-v17/package.json b/packages/create-analog/template-angular-v17/package.json index f884e5716..01b3d90ab 100644 --- a/packages/create-analog/template-angular-v17/package.json +++ b/packages/create-analog/template-angular-v17/package.json @@ -16,16 +16,16 @@ "dependencies": { "@analogjs/content": "^0.2.0", "@analogjs/router": "^0.2.0", - "@angular/animations": "^17.1.0", - "@angular/common": "^17.1.0", - "@angular/compiler": "^17.1.0", - "@angular/core": "^17.1.0", - "@angular/forms": "^17.1.0", - "@angular/platform-browser": "^17.1.0", - "@angular/platform-browser-dynamic": "^17.1.0", - "@angular/platform-server": "^17.1.0", - "@angular/router": "^17.1.0", - "@nx/angular": "~17.2.0", + "@angular/animations": "^17.2.0", + "@angular/common": "^17.2.0", + "@angular/compiler": "^17.2.0", + "@angular/core": "^17.2.0", + "@angular/forms": "^17.2.0", + "@angular/platform-browser": "^17.2.0", + "@angular/platform-browser-dynamic": "^17.2.0", + "@angular/platform-server": "^17.2.0", + "@angular/router": "^17.2.0", + "@nx/angular": "~18.0.0", "front-matter": "^4.0.2", "marked": "^5.0.2", "marked-gfm-heading-id": "^3.1.0", @@ -38,11 +38,11 @@ }, "devDependencies": { "@analogjs/platform": "^0.2.0", - "@angular-devkit/build-angular": "^17.1.0", - "@angular/cli": "^17.1.0", - "@angular/compiler-cli": "^17.1.0", - "@nx/vite": "~17.2.0", - "nx": "~17.2.0", + "@angular-devkit/build-angular": "^17.2.0", + "@angular/cli": "^17.2.0", + "@angular/compiler-cli": "^17.2.0", + "@nx/vite": "~18.0.0", + "nx": "~18.0.0", "jsdom": "^22.1.0", "typescript": "~5.3.0", "vite": "~5.0.0", diff --git a/packages/create-analog/template-blog/package.json b/packages/create-analog/template-blog/package.json index 43a6fa63d..32e0fa8d8 100644 --- a/packages/create-analog/template-blog/package.json +++ b/packages/create-analog/template-blog/package.json @@ -16,16 +16,16 @@ "dependencies": { "@analogjs/content": "^0.2.0", "@analogjs/router": "^0.2.0", - "@angular/animations": "^17.1.0", - "@angular/common": "^17.1.0", - "@angular/compiler": "^17.1.0", - "@angular/core": "^17.1.0", - "@angular/forms": "^17.1.0", - "@angular/platform-browser": "^17.1.0", - "@angular/platform-browser-dynamic": "^17.1.0", - "@angular/platform-server": "^17.1.0", - "@angular/router": "^17.1.0", - "@nx/angular": "~17.2.0", + "@angular/animations": "^17.2.0", + "@angular/common": "^17.2.0", + "@angular/compiler": "^17.2.0", + "@angular/core": "^17.2.0", + "@angular/forms": "^17.2.0", + "@angular/platform-browser": "^17.2.0", + "@angular/platform-browser-dynamic": "^17.2.0", + "@angular/platform-server": "^17.2.0", + "@angular/router": "^17.2.0", + "@nx/angular": "~18.0.0", "front-matter": "^4.0.2", "marked": "^5.0.2", "marked-gfm-heading-id": "^3.1.0", @@ -38,11 +38,11 @@ }, "devDependencies": { "@analogjs/platform": "^0.2.0", - "@angular-devkit/build-angular": "^17.1.0", - "@angular/cli": "^17.1.0", - "@angular/compiler-cli": "^17.1.0", - "@nx/vite": "~17.2.0", - "nx": "~17.2.0", + "@angular-devkit/build-angular": "^17.2.0", + "@angular/cli": "^17.2.0", + "@angular/compiler-cli": "^17.2.0", + "@nx/vite": "~18.0.0", + "nx": "~18.0.0", "jsdom": "^22.1.0", "typescript": "~5.3.0", "vite": "~5.0.0", diff --git a/packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts b/packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts index 4442cd9b5..ed0484f6e 100644 --- a/packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts +++ b/packages/nx-plugin/src/generators/app/lib/initialize-analog-workspace.ts @@ -59,22 +59,22 @@ const initWithNxNamespace = async ( addDependenciesToPackageJson( tree, { - '@angular/animations': '^17.1.0', - '@angular/common': '^17.1.0', - '@angular/compiler': '^17.1.0', - '@angular/core': '^17.1.0', - '@angular/forms': '^17.1.0', - '@angular/platform-browser': '^17.1.0', - '@angular/platform-browser-dynamic': '^17.1.0', - '@angular/platform-server': '^17.1.0', - '@angular/router': '^17.1.0', + '@angular/animations': '^17.2.0', + '@angular/common': '^17.2.0', + '@angular/compiler': '^17.2.0', + '@angular/core': '^17.2.0', + '@angular/forms': '^17.2.0', + '@angular/platform-browser': '^17.2.0', + '@angular/platform-browser-dynamic': '^17.2.0', + '@angular/platform-server': '^17.2.0', + '@angular/router': '^17.2.0', rxjs: '~7.5.6', tslib: '^2.4.0', 'zone.js': '~0.14.0', }, { - '@angular-devkit/build-angular': '^17.1.0', - '@angular/compiler-cli': '^17.1.0', + '@angular-devkit/build-angular': '^17.2.0', + '@angular/compiler-cli': '^17.2.0', '@nx/angular': versions['@nx/angular'], '@nx/devkit': versions['@nx/devkit'], '@nx/eslint': versions['@nx/eslint'], diff --git a/packages/platform/package.json b/packages/platform/package.json index 56f7139e9..64a40458a 100644 --- a/packages/platform/package.json +++ b/packages/platform/package.json @@ -29,8 +29,8 @@ "@analogjs/vite-plugin-nitro": "^0.2.37" }, "peerDependencies": { - "@nx/devkit": "^16.0.0 || ^17.0.0", - "@nx/vite": "^16.0.0 || ^17.0.0" + "@nx/devkit": "^16.0.0 || ^17.0.0 || ^18.0.0", + "@nx/vite": "^16.0.0 || ^17.0.0 || ^18.0.0" }, "builders": "./src/lib/nx-plugin/executors.json", "executors": "./src/lib/nx-plugin/executors.json", diff --git a/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/analog.spec.ts.snap b/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/analog.spec.ts.snap index fc78068ef..23d2a76f1 100644 --- a/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/analog.spec.ts.snap +++ b/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/analog.spec.ts.snap @@ -2,7 +2,7 @@ exports[`authoring ng file > should process component as an analog file 1`] = ` "import { Component, ChangeDetectionStrategy } from '@angular/core'; -import { signal, input, ViewChild, afterNextRender, ElementRef } from "@angular/core"; +import { signal, input, ViewChild, afterNextRender, ElementRef, viewChild, viewChildren, contentChild, contentChildren } from "@angular/core"; @Component({ standalone: true, @@ -44,6 +44,12 @@ export default class VirtualAnalogComponent { const requiredInputWithTransform = this.requiredInputWithTransform const output = this.output const outputWithType = this.outputWithType + const viewChildEl = this.viewChildEl + const viewChildRequiredEl = this.viewChildRequiredEl + const viewChildrenEl = this.viewChildrenEl + const contentChildEl = this.contentChildEl + const contentChildRequiredEl = this.contentChildRequiredEl + const contentChildrenEl = this.contentChildrenEl afterNextRender(() => { @@ -75,6 +81,12 @@ export default class VirtualAnalogComponent { }); protected output = new EventEmitter(); protected outputWithType = new EventEmitter(); + protected viewChildEl = viewChild('divElement'); + protected viewChildRequiredEl = viewChild.required('divElement'); + protected viewChildrenEl = viewChildren('divElement'); + protected contentChildEl = contentChild('divElement'); + protected contentChildRequiredEl = contentChild.required('divElement'); + protected contentChildrenEl = contentChildren('divElement'); } diff --git a/packages/vite-plugin-angular/src/lib/authoring/analog.spec.ts b/packages/vite-plugin-angular/src/lib/authoring/analog.spec.ts index a4e9d55bb..3eb60f7eb 100644 --- a/packages/vite-plugin-angular/src/lib/authoring/analog.spec.ts +++ b/packages/vite-plugin-angular/src/lib/authoring/analog.spec.ts @@ -2,7 +2,7 @@ import { compileAnalogFile } from './analog'; const COMPONENT_CONTENT = `