diff --git a/packages/nx-plugin/src/utils/versions/dependencies.ts b/packages/nx-plugin/src/utils/versions/dependencies.ts index 893b1cb6d..65d8a00f6 100644 --- a/packages/nx-plugin/src/utils/versions/dependencies.ts +++ b/packages/nx-plugin/src/utils/versions/dependencies.ts @@ -30,8 +30,8 @@ export const getAnalogDependencies = ( const getDependencies = (escapedAngularVersion: string) => { // fail out for versions <15.2.0 - if (lt(escapedAngularVersion, '16.0.0')) { - throw new Error(stripIndents`Angular v16.0.0 or newer is required.`); + if (lt(escapedAngularVersion, '15.0.0')) { + throw new Error(stripIndents`Angular v15.0.0 or newer is required.`); } // install 16.x deps for versions <17.0.0 diff --git a/packages/nx-plugin/src/utils/versions/dev-dependencies.ts b/packages/nx-plugin/src/utils/versions/dev-dependencies.ts index 52c453d7b..daf8d98c8 100644 --- a/packages/nx-plugin/src/utils/versions/dev-dependencies.ts +++ b/packages/nx-plugin/src/utils/versions/dev-dependencies.ts @@ -39,7 +39,7 @@ export const getAnalogDevDependencies = ( const getDevDependencies = (escapedAngularVersion: string) => { // fail out for versions <15.2.0 - if (lt(escapedAngularVersion, '16.0.0')) { + if (lt(escapedAngularVersion, '15.0.0')) { throw new Error(stripIndents`Angular v16.0.0 or newer is required.`); } diff --git a/packages/nx-plugin/src/utils/versions/ng_16_X/versions.ts b/packages/nx-plugin/src/utils/versions/ng_16_X/versions.ts index 1bfce6ba7..637dc1295 100644 --- a/packages/nx-plugin/src/utils/versions/ng_16_X/versions.ts +++ b/packages/nx-plugin/src/utils/versions/ng_16_X/versions.ts @@ -9,4 +9,4 @@ export const V16_X_NX_ANGULAR = '~18.0.0'; export const V16_X_NX_VITE = '~18.0.0'; export const V16_X_JSDOM = '^22.0.0'; export const V16_X_VITE_TSCONFIG_PATHS = '^4.2.0'; -export const V16_X_VITEST = '^1.31.0'; +export const V16_X_VITEST = '^1.3.1'; diff --git a/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts b/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts index e6703e97e..9e2b356c1 100644 --- a/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts +++ b/packages/vite-plugin-nitro/src/lib/vite-nitro-plugin.spec.data.ts @@ -12,6 +12,7 @@ export const mockViteDevServer = { export const mockNitroConfig: NitroConfig = { buildDir: resolve('./dist/.nitro'), + preset: undefined, handlers: [], logLevel: 0, output: { @@ -19,7 +20,6 @@ export const mockNitroConfig: NitroConfig = { publicDir: resolve('dist/analog/public'), }, rootDir: '.', - runtimeConfig: {}, scanDirs: ['src/server'], srcDir: 'src/server', prerender: { diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts index 5424493dc..5adb6ff38 100644 --- a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts +++ b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.spec.ts @@ -247,6 +247,7 @@ describe('nitro', () => { ...mockNitroConfig, prerender: { routes: ['/blog', '/about', '/blog/first', '/blog/02-second'], + crawlLinks: undefined, }, alias: expect.anything(), publicAssets: expect.anything(), diff --git a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts index 698413139..0203c80b6 100644 --- a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts +++ b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts @@ -1,7 +1,7 @@ import { NitroConfig, build, createDevServer, createNitro } from 'nitropack'; import { App, toNodeListener } from 'h3'; import type { Plugin, UserConfig, ViteDevServer } from 'vite'; -import { normalizePath } from 'vite'; +import { mergeConfig, normalizePath } from 'vite'; import { dirname, join, relative, resolve } from 'node:path'; import { platform } from 'node:os'; import { fileURLToPath } from 'node:url'; @@ -97,7 +97,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { publicDir: normalizePath( resolve(workspaceRoot, 'dist', rootDir, 'analog/public') ), - ...nitroOptions?.output, }, buildDir: normalizePath( resolve(workspaceRoot, 'dist', rootDir, '.nitro') @@ -105,7 +104,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { typescript: { generateTsConfig: false, }, - runtimeConfig: { ...nitroOptions?.runtimeConfig }, rollupConfig: { onwarn(warning) { if ( @@ -150,7 +148,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { nitroConfig.alias = { '#analog/ssr': ssrEntry, '#analog/index': indexEntry, - ...nitroOptions?.alias, }; if (isBuild) { @@ -250,18 +247,9 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { nitroConfig = { ...nitroConfig, externals: { - ...nitroOptions?.externals, - external: [ - 'rxjs', - 'node-fetch-native/dist/polyfill', - ...(nitroOptions?.externals?.external || []), - ], + external: ['rxjs', 'node-fetch-native/dist/polyfill'], }, - moduleSideEffects: [ - 'zone.js/node', - 'zone.js/fesm2015/zone-node', - ...(nitroOptions?.moduleSideEffects || []), - ], + moduleSideEffects: ['zone.js/node', 'zone.js/fesm2015/zone-node'], handlers: [ { handler: apiMiddlewareHandler, @@ -273,10 +261,10 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { } } - nitroConfig = { - ...nitroConfig, - ...nitroOptions, - }; + nitroConfig = mergeConfig( + nitroConfig, + nitroOptions as Record + ); }, async configureServer(viteServer: ViteDevServer) { if (isServe && !isTest) {