From 2d7a581af87818767d11932b7b9c8e60c2e4b4aa Mon Sep 17 00:00:00 2001 From: Brandon Roberts Date: Tue, 2 Apr 2024 08:30:20 -0500 Subject: [PATCH] feat: add support for Nx w/Project Crystal setup (#991) --- packages/vite-plugin-nitro/src/lib/build-ssr.ts | 7 +++++-- packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts | 8 +++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/vite-plugin-nitro/src/lib/build-ssr.ts b/packages/vite-plugin-nitro/src/lib/build-ssr.ts index aa6f9ac3f..9b5ac3452 100644 --- a/packages/vite-plugin-nitro/src/lib/build-ssr.ts +++ b/packages/vite-plugin-nitro/src/lib/build-ssr.ts @@ -10,9 +10,12 @@ export async function buildSSRApp(config: UserConfig, options?: Options) { build: { ssr: true, rollupOptions: { - input: options?.entryServer || resolve(rootDir, './src/main.server.ts'), + input: + options?.entryServer || + resolve(workspaceRoot, rootDir, 'src/main.server.ts'), }, - outDir: options?.ssrBuildDir || resolve('dist', rootDir, 'ssr'), + outDir: + options?.ssrBuildDir || resolve(workspaceRoot, 'dist', rootDir, 'ssr'), }, }); 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 20b692cf5..ff4ce7c40 100644 --- a/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts +++ b/packages/vite-plugin-nitro/src/lib/vite-plugin-nitro.ts @@ -72,9 +72,6 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { `ssr/main.server${filePrefix ? '.js' : ''}` ) ); - const indexEntry = normalizePath( - resolve(clientOutputPath, 'index.html') - ); const rendererEntry = filePrefix + normalizePath( @@ -130,11 +127,16 @@ export function nitro(options?: Options, nitroOptions?: NitroConfig): Plugin[] { if (!ssrBuild && !isTest) { // store the client output path for the SSR build config clientOutputPath = resolve( + workspaceRoot, rootDir, config.build?.outDir || 'dist/client' ); } + const indexEntry = normalizePath( + resolve(clientOutputPath, 'index.html') + ); + nitroConfig.alias = { '#analog/ssr': ssrEntry, '#analog/index': indexEntry,