v2: make client outDir sane

.changeset/clear-shoes-cheat.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': minor
+---
+
+FEAT: `qwikVite` now accepts `ssr.manifestInputPath` for when the `q-manifest.json` file from the client build is at an unexpected location.

.changeset/six-breads-rule.md

@@ -0,0 +1,5 @@
+---
+'@qwik.dev/core': major
+---
+
+BREAKING: When using the `base` setting in Vite, the client build will no longer be placed under that base path. Instead, the output directory is always `dist/` by default. If you need to change the output directory, use the `build.outDir` setting in Vite or the `outDir` option in the `qwikVite` plugin under `client` or `ssr`.

packages/qwik/src/optimizer/src/plugins/plugin.ts

@@ -118,6 +118,7 @@ export function createQwikPlugin(optimizerOptions: OptimizerOptions = {}) {
     clientOutDir: undefined as any,
     sourcemap: !!optimizerOptions.sourcemap,
     manifestInput: null,
+    manifestInputPath: null,
     manifestOutput: null,
     transformedModuleOutput: null,
     scope: null,
@@ -964,7 +965,8 @@ export const isDev = ${JSON.stringify(isDev)};
       maybeFs
     ) {
       const path = getPath();
-      let clientManifestPath = path.resolve(opts.clientOutDir, Q_MANIFEST_FILENAME);
+      let clientManifestPath =
+        opts.manifestInputPath || path.resolve(opts.clientOutDir, Q_MANIFEST_FILENAME);
       if (!(await maybeFs.promises.stat(clientManifestPath).catch(() => false))) {
         clientManifestPath = path.resolve(opts.rootDir, CLIENT_OUT_DIR, Q_MANIFEST_FILENAME);
       }
@@ -977,7 +979,7 @@ export const isDev = ${JSON.stringify(isDev)};
         console.warn(
           `\n==========\n` +
             `Could not read Qwik client manifest ${clientManifestPath}.\n` +
-            `Make sure you provide it to the SSR renderer via the \`manifest\` argument, or define it in \`globalThis.__QWIK_MANIFEST__\` before the server bundle is loaded, or embed it in the server bundle by replacing \`globalThis.__QWIK_MANIFEST__\`.\n` +
+            `Make sure you provide it to the qwikVite plugin via the \`manifestInput\` \`manifestInputPath\`  arguments, or to the SSR renderer via the \`manifest\` argument, or define it in \`globalThis.__QWIK_MANIFEST__\` before the server bundle is loaded, or embed it in the server bundle by replacing \`globalThis.__QWIK_MANIFEST__\`.\n` +
             `Without the manifest, the SSR renderer will not be able to generate event handlers.\n` +
             `(${e})\n` +
             `==========\n`
@@ -1249,6 +1251,7 @@ export interface QwikPluginOptions {
   vendorRoots?: string[];
   manifestOutput?: ((manifest: QwikManifest) => Promise<void> | void) | null;
   manifestInput?: QwikManifest | null;
+  manifestInputPath?: string | null;
   input?: string[] | string | { [entry: string]: string };
   outDir?: string;
   ssrOutDir?: string;

packages/qwik/src/optimizer/src/plugins/vite.ts

@@ -178,6 +178,7 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
         experimental: qwikViteOpts.experimental,
         input,
         manifestInput: qwikViteOpts.ssr?.manifestInput,
+        manifestInputPath: qwikViteOpts.ssr?.manifestInputPath,
         manifestOutput: qwikViteOpts.client?.manifestOutput,
       };
 
@@ -284,21 +285,18 @@ export function qwikVite(qwikViteOpts: QwikVitePluginOptions = {}): any {
       };
 
       if (!qwikViteOpts.csr) {
-        const buildOutputDir =
-          target === 'client' && viteConfig.base
-            ? path.join(opts.outDir, viteConfig.base)
-            : opts.outDir;
-
         updatedViteConfig.build!.cssCodeSplit = false;
-        updatedViteConfig.build!.outDir = buildOutputDir;
+        if (opts.outDir) {
+          updatedViteConfig.build!.outDir = opts.outDir;
+        }
         const origOnwarn = updatedViteConfig.build!.rollupOptions?.onwarn;
         updatedViteConfig.build!.rollupOptions = {
           ...updatedViteConfig.build!.rollupOptions,
           output: await normalizeRollupOutputOptions(
             qwikPlugin,
             viteConfig.build?.rollupOptions?.output,
             useAssetsDir,
-            buildOutputDir
+            opts.outDir
           ),
           preserveEntrySignatures: 'exports-only',
           onwarn: (warning, warn) => {
@@ -915,6 +913,8 @@ interface QwikVitePluginSSROptions extends QwikVitePluginCommonOptions {
      * Default `undefined`
      */
     manifestInput?: QwikManifest;
+    /** Same as `manifestInput` but allows passing the path to the file. */
+    manifestInputPath?: string;
   };
 }
 

starters/dev-server.ts

@@ -202,6 +202,7 @@ export {
         optimizer.qwikVite({
           entryStrategy: { type: "segment" },
           client: {
+            outDir: join(appDistDir, appName),
             manifestOutput(manifest) {
               clientManifest = manifest;
             },