From 8cb1cb680783f0d6bcb25242e66119151ca0896d Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Sat, 24 Jun 2023 13:10:09 -0500 Subject: [PATCH] feat: update template app dependencies to Angular v16.1.x, Nx 16.4.x --- .../template-angular-v16/package.json | 36 +++++++++---------- .../src/generators/app/generator.spec.ts | 6 ++-- .../app/lib/initialize-analog-workspace.ts | 9 ++--- .../nx-plugin/src/generators/app/versions.ts | 24 ++++++------- .../src/generators/preset/generator.spec.ts | 2 +- 5 files changed, 39 insertions(+), 38 deletions(-) diff --git a/packages/create-analog/template-angular-v16/package.json b/packages/create-analog/template-angular-v16/package.json index 849ea9174..1a62f3635 100644 --- a/packages/create-analog/template-angular-v16/package.json +++ b/packages/create-analog/template-angular-v16/package.json @@ -16,16 +16,16 @@ "dependencies": { "@analogjs/content": "^0.2.0-beta.17", "@analogjs/router": "^0.2.0-beta.17", - "@angular/animations": "^16.0.0", - "@angular/common": "^16.0.0", - "@angular/compiler": "^16.0.0", - "@angular/core": "^16.0.0", - "@angular/forms": "^16.0.0", - "@angular/platform-browser": "^16.0.0", - "@angular/platform-browser-dynamic": "^16.0.0", - "@angular/platform-server": "^16.0.0", - "@angular/router": "^16.0.0", - "@nx/angular": "^16.0.0", + "@angular/animations": "^16.1.0", + "@angular/common": "^16.1.0", + "@angular/compiler": "^16.1.0", + "@angular/core": "^16.1.0", + "@angular/forms": "^16.1.0", + "@angular/platform-browser": "^16.1.0", + "@angular/platform-browser-dynamic": "^16.1.0", + "@angular/platform-server": "^16.1.0", + "@angular/router": "^16.1.0", + "@nx/angular": "^16.4.0", "front-matter": "^4.0.2", "marked": "^5.0.2", "prismjs": "^1.29.0", @@ -35,14 +35,14 @@ }, "devDependencies": { "@analogjs/platform": "^0.2.0-beta.17", - "@angular-devkit/build-angular": "^16.0.0", - "@angular/cli": "^16.0.0", - "@angular/compiler-cli": "^16.0.0", - "@nx/vite": "^16.0.0", - "nx": "^16.0.0", - "jsdom": "^20.0.0", + "@angular-devkit/build-angular": "^16.1.0", + "@angular/cli": "^16.1.0", + "@angular/compiler-cli": "^16.1.0", + "@nx/vite": "^16.4.0", + "nx": "^16.4.0", + "jsdom": "^22.1.0", "typescript": "~5.0.2", - "vite": "^4.0.3", - "vitest": "^0.31.0" + "vite": "^4.3.9", + "vitest": "^0.32.0" } } diff --git a/packages/nx-plugin/src/generators/app/generator.spec.ts b/packages/nx-plugin/src/generators/app/generator.spec.ts index 795ee2b51..fb66b0b7b 100644 --- a/packages/nx-plugin/src/generators/app/generator.spec.ts +++ b/packages/nx-plugin/src/generators/app/generator.spec.ts @@ -26,10 +26,10 @@ describe('nx-plugin generator', () => { dependencies: Record, devDependencies: Record ) => { - expect(dependencies['@analogjs/router']).toBe('0.2.0-beta.15'); - expect(dependencies['@angular/platform-server']).toBe('~16.0.0'); + expect(dependencies['@analogjs/router']).toBe('0.2.0-beta.17'); + expect(dependencies['@angular/platform-server']).toBe('~16.1.0'); - expect(devDependencies['@analogjs/platform']).toBe('0.2.0-beta.15'); + expect(devDependencies['@analogjs/platform']).toBe('0.2.0-beta.17'); expect(devDependencies['vite-tsconfig-paths']).toBe('^4.0.2'); }; 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 85e75f4c9..9a4bafc7a 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 @@ -16,6 +16,7 @@ import { } from '../versions'; import { getInstalledPackageVersion } from '../../../utils/version-utils'; import { NormalizedOptions } from '../generator'; +import { UnitTestRunner } from '@nx/angular/generators'; export async function initializeAngularWorkspace( tree: Tree, @@ -29,7 +30,7 @@ export async function initializeAngularWorkspace( 'Angular has not been installed yet. Creating an Angular application' ); - if (major(installedNxVersion) === 16) { + if (major(installedNxVersion) >= 16) { try { ensurePackage('@nx/devkit', V16_NX_DEVKIT); ensurePackage('@nx/angular', V16_NX_ANGULAR); @@ -61,7 +62,7 @@ export async function initializeAngularWorkspace( ); } - if (major(installedNxVersion) === 16) { + if (major(installedNxVersion) >= 16) { await ( await import( // eslint-disable-next-line @typescript-eslint/ban-ts-comment @@ -69,7 +70,7 @@ export async function initializeAngularWorkspace( '@nx/angular/generators' ) ).angularInitGenerator(tree, { - unitTestRunner: 'none' as any, + unitTestRunner: UnitTestRunner.None, skipInstall: true, skipFormat: normalizedOptions.skipFormat, }); @@ -78,7 +79,7 @@ export async function initializeAngularWorkspace( await ( await import('@nx/angular/generators') ).angularInitGenerator(tree, { - unitTestRunner: 'none' as any, + unitTestRunner: UnitTestRunner.None, skipInstall: true, skipFormat: normalizedOptions.skipFormat, }); diff --git a/packages/nx-plugin/src/generators/app/versions.ts b/packages/nx-plugin/src/generators/app/versions.ts index 1275a3bc0..ba0b02a7d 100644 --- a/packages/nx-plugin/src/generators/app/versions.ts +++ b/packages/nx-plugin/src/generators/app/versions.ts @@ -1,30 +1,30 @@ export const MINIMUM_SUPPORTED_ANGULAR_VERSION = '15.0.0'; // V16 // dependencies -export const V16_ANGULAR = '16.0.0'; -export const V16_NX_DEVKIT = '~16.0.0'; -export const V16_NX_ANGULAR = '~16.0.0'; -export const V16_ANALOG_JS_CONTENT = '0.2.0-beta.15'; -export const V16_ANALOG_JS_ROUTER = '0.2.0-beta.15'; -export const V16_ANALOG_JS_TRPC = '0.2.0-beta.15'; +export const V16_ANGULAR = '16.1.0'; +export const V16_NX_DEVKIT = '~16.4.0'; +export const V16_NX_ANGULAR = '~16.4.0'; +export const V16_ANALOG_JS_CONTENT = '0.2.0-beta.17'; +export const V16_ANALOG_JS_ROUTER = '0.2.0-beta.17'; +export const V16_ANALOG_JS_TRPC = '0.2.0-beta.17'; export const V16_TRPC_CLIENT = '^10.25.0'; export const V16_TRPC_SERVER = '^10.25.0'; export const V16_ISOMORPHIC_FETCH = '^3.0.0'; export const V16_SUPERJSON = '^1.12.3'; -export const V16_ANGULAR_PLATFORM_SERVER = '~16.0.0'; +export const V16_ANGULAR_PLATFORM_SERVER = '~16.1.0'; export const V16_FRONT_MATTER = '^4.0.2'; export const V16_MARKED = '^5.0.2'; export const V16_PRISMJS = '^1.29.0'; // devDependencies -export const V16_ANALOG_JS_PLATFORM = '0.2.0-beta.15'; -export const V16_NX_VITE = '^16.0.0'; -export const V16_JSDOM = '^20.0.0'; +export const V16_ANALOG_JS_PLATFORM = '0.2.0-beta.17'; +export const V16_NX_VITE = '^16.4.0'; +export const V16_JSDOM = '^22.1.0'; export const V16_TYPESCRIPT = '~5.0.2'; -export const V16_VITE = '^4.0.3'; +export const V16_VITE = '^4.3.9'; export const V16_VITE_TSCONFIG_PATHS = '^4.0.2'; -export const V16_VITEST = '^0.31.0'; +export const V16_VITEST = '^0.32.0'; export const V16_ZOD = '^3.21.4'; // V15 diff --git a/packages/nx-plugin/src/generators/preset/generator.spec.ts b/packages/nx-plugin/src/generators/preset/generator.spec.ts index 7a5cecf83..bc5a7495e 100644 --- a/packages/nx-plugin/src/generators/preset/generator.spec.ts +++ b/packages/nx-plugin/src/generators/preset/generator.spec.ts @@ -10,7 +10,7 @@ import { AnalogNxApplicationGeneratorOptions } from '../app/schema'; describe('preset generator', () => { const setup = async (options: AnalogNxApplicationGeneratorOptions) => { const tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' }); - addDependenciesToPackageJson(tree, { nx: '16.0.0' }, {}); + addDependenciesToPackageJson(tree, { nx: '16.4.0' }, {}); await generator(tree, options); const config = readProjectConfiguration(tree, options.analogAppName); return {