@qwik.dev/core 2.0.0-beta.5 → 2.0.0-beta.6

package/dist/optimizer.d.ts

@@ -19,8 +19,6 @@ export declare interface ComponentEntryStrategy {
 /** @public */
 export declare const createOptimizer: (optimizerOptions?: OptimizerOptions) => Promise<Optimizer>;
 
-declare function createSymbolMapper(base: string): SymbolMapperFn;
-
 /** @public */
 export declare interface Diagnostic {
     scope: string;
@@ -60,7 +58,7 @@ export declare enum ExperimentalFeatures {
     enableRequestRewrite = "enableRequestRewrite",
     /** Enable worker$ */
     webWorker = "webWorker",
-    /** Enable the ability to use the Qwik Insights vite plugin and <Insights/> component */
+    /** Enable the ability to use the Qwik Insights vite plugin and `<Insights/>` component */
     insights = "insights"
 }
 
@@ -92,11 +90,11 @@ export declare interface InlineEntryStrategy {
 /** @public */
 export declare type MinifyMode = 'simplify' | 'none';
 
-declare interface NormalizedQwikPluginOptions extends Omit<Required<QwikPluginOptions>, 'vendorRoots' | 'experimental'> {
+declare interface NormalizedQwikPluginOptions extends Omit<Required<QwikPluginOptions>, 'input' | 'vendorRoots' | 'srcInputs' | 'experimental'> {
     input: string[] | {
         [entry: string]: string;
-    };
-    experimental?: Record<keyof typeof ExperimentalFeatures, boolean>;
+    } | undefined;
+    experimental: Record<keyof typeof ExperimentalFeatures, boolean> | undefined;
 }
 
 /** @public */
@@ -285,9 +283,12 @@ declare interface QwikPluginOptions {
         [entry: string]: string;
     };
     outDir?: string;
+    ssrOutDir?: string;
+    clientOutDir?: string;
     assetsDir?: string;
     srcDir?: string | null;
     scope?: string | null;
+    /** @deprecated Not used */
     srcInputs?: TransformModuleInput[] | null;
     sourcemap?: boolean;
     resolveQwikBuild?: boolean;
@@ -702,15 +703,8 @@ export declare type SourceMapsOption = 'external' | 'inline' | undefined | null;
 /** @public */
 export declare type SymbolMapper = Record<string, readonly [symbol: string, chunk: string]>;
 
-/**
- * @beta
- *   For a given symbol (QRL such as `onKeydown$`) the server needs to know which bundle the symbol is in.
- *
- *   Normally this is provided by Qwik's `q-manifest` . But `q-manifest` only exists after a full client build.
- *
- *   This would be a problem in dev mode. So in dev mode the symbol is mapped to the expected URL using the symbolMapper function below. For Vite the given path is fixed for a given symbol.
- */
-export declare let symbolMapper: ReturnType<typeof createSymbolMapper>;
+/** @alpha @deprecated No longer needed, it is automatic now */
+export declare const symbolMapper: undefined;
 
 /** @public */
 export declare type SymbolMapperFn = (symbolName: string, mapper: SymbolMapper | undefined, parent?: string) => readonly [symbol: string, chunk: string] | undefined;

package/dist/optimizer.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/optimizer 2.0.0-beta.5-dev+8887f7e
+ * @qwik.dev/core/optimizer 2.0.0-beta.6-dev+c42693f
  * Copyright QwikDev. All Rights Reserved.
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://github.com/QwikDev/qwik/blob/main/LICENSE
@@ -1282,7 +1282,7 @@ var QWIK_BINDING_MAP = {
 };
 
 var versions = {
-  qwik: "2.0.0-beta.5-dev+8887f7e"
+  qwik: "2.0.0-beta.6-dev+c42693f"
 };
 
 async function getSystem() {
@@ -1306,6 +1306,10 @@ async function getSystem() {
     sys.path = await sys.dynamicImport("node:path");
     sys.cwd = () => process.cwd();
     sys.os = process.platform;
+  } else if ("deno" === sysEnv) {
+    sys.path = await sys.dynamicImport("node:path");
+    sys.cwd = () => Deno.cwd();
+    sys.os = Deno.platform();
   }
   return sys;
 }
@@ -2141,15 +2145,16 @@ function createQwikPlugin(optimizerOptions = {}) {
     target: "client",
     buildMode: "development",
     debug: false,
-    rootDir: null,
+    rootDir: void 0,
     tsconfigFileNames: [ "./tsconfig.json" ],
-    input: null,
-    outDir: "",
-    assetsDir: null,
+    input: void 0,
+    outDir: void 0,
+    assetsDir: void 0,
     resolveQwikBuild: true,
-    entryStrategy: null,
-    srcDir: null,
-    srcInputs: null,
+    entryStrategy: void 0,
+    srcDir: void 0,
+    ssrOutDir: void 0,
+    clientOutDir: void 0,
     sourcemap: !!optimizerOptions.sourcemap,
     manifestInput: null,
     manifestOutput: null,
@@ -2164,10 +2169,14 @@ function createQwikPlugin(optimizerOptions = {}) {
     experimental: void 0
   };
   let lazyNormalizePath;
+  let maybeFs;
   const init2 = async () => {
     if (!internalOptimizer) {
       internalOptimizer = await createOptimizer(optimizerOptions);
       lazyNormalizePath = makeNormalizePath(internalOptimizer.sys);
+      try {
+        maybeFs = await internalOptimizer.sys.dynamicImport("node:fs");
+      } catch {}
     }
   };
   const getOptimizer = () => {
@@ -2188,7 +2197,7 @@ function createQwikPlugin(optimizerOptions = {}) {
   const configureServer = server => {
     devServer = server;
   };
-  const normalizeOptions = inputOpts => {
+  const normalizeOptions = async inputOpts => {
     const updatedOpts = Object.assign({}, inputOpts);
     const optimizer2 = getOptimizer();
     const path = optimizer2.sys.path;
@@ -2215,59 +2224,59 @@ function createQwikPlugin(optimizerOptions = {}) {
     if ("string" === typeof updatedOpts.srcDir) {
       opts.srcDir = normalizePath(path.resolve(opts.rootDir, updatedOpts.srcDir));
       srcDir = opts.srcDir;
-      opts.srcInputs = null;
-    } else if (Array.isArray(updatedOpts.srcInputs)) {
-      opts.srcInputs = [ ...updatedOpts.srcInputs ];
-      opts.srcDir = null;
     } else {
       opts.srcDir || (opts.srcDir = srcDir);
     }
+    opts.srcDir = normalizePath(path.resolve(opts.rootDir, normalizePath(opts.srcDir)));
     Array.isArray(updatedOpts.tsconfigFileNames) && updatedOpts.tsconfigFileNames.length > 0 && (opts.tsconfigFileNames = updatedOpts.tsconfigFileNames);
-    Array.isArray(opts.srcInputs) ? opts.srcInputs.forEach(i => {
-      i.path = normalizePath(path.resolve(opts.rootDir, i.path));
-    }) : "string" === typeof opts.srcDir && (opts.srcDir = normalizePath(path.resolve(opts.rootDir, normalizePath(opts.srcDir))));
+    updatedOpts.input || opts.input || ("ssr" === opts.target ? opts.input = [ path.resolve(srcDir, "entry.ssr") ] : "client" === opts.target ? opts.input = [ path.resolve(srcDir, "root") ] : opts.input = void 0);
     if (!updatedOpts.csr) {
-      if (Array.isArray(updatedOpts.input)) {
-        opts.input = [ ...updatedOpts.input ];
-      } else if ("string" === typeof updatedOpts.input) {
-        opts.input = [ updatedOpts.input ];
-      } else if ("ssr" === opts.target) {
-        opts.input || (opts.input = [ path.resolve(srcDir, "entry.ssr") ]);
-      } else if ("client" === opts.target) {
-        opts.input || (opts.input = [ path.resolve(srcDir, "root") ]);
-      } else if ("lib" === opts.target) {
-        if ("object" === typeof updatedOpts.input) {
-          for (const key in updatedOpts.input) {
-            const resolvedPaths = {};
-            if (Object.hasOwnProperty.call(updatedOpts.input, key)) {
-              const relativePath = updatedOpts.input[key];
-              const absolutePath = path.resolve(opts.rootDir, relativePath);
-              resolvedPaths[key] = absolutePath;
-            }
-            opts.input = {
-              ...opts.input,
-              ...resolvedPaths
-            };
+      updatedOpts.outDir && (opts.outDir = normalizePath(path.resolve(opts.rootDir, normalizePath(updatedOpts.outDir))));
+      opts.clientOutDir = normalizePath(path.resolve(opts.rootDir, updatedOpts.clientOutDir || CLIENT_OUT_DIR));
+      opts.ssrOutDir = normalizePath(path.resolve(opts.rootDir, updatedOpts.ssrOutDir || SSR_OUT_DIR));
+      "ssr" === opts.target ? opts.outDir || (opts.outDir = opts.ssrOutDir) : "lib" === opts.target ? opts.outDir || (opts.outDir = normalizePath(path.resolve(opts.rootDir, LIB_OUT_DIR))) : opts.outDir || (opts.outDir = opts.clientOutDir);
+    }
+    "function" === typeof updatedOpts.manifestOutput && (opts.manifestOutput = updatedOpts.manifestOutput);
+    updatedOpts.manifestInput && (opts.manifestInput = getValidManifest(updatedOpts.manifestInput) || null);
+    if (!opts.manifestInput && "ssr" === opts.target && "production" === opts.buildMode && maybeFs) {
+      let clientManifestPath = normalizePath(path.resolve(opts.clientOutDir, Q_MANIFEST_FILENAME));
+      await maybeFs.promises.stat(clientManifestPath).catch(() => false) || (clientManifestPath = normalizePath(path.resolve(opts.rootDir, CLIENT_OUT_DIR, Q_MANIFEST_FILENAME)));
+      try {
+        const clientManifestStr = await maybeFs.promises.readFile(clientManifestPath, "utf-8");
+        opts.manifestInput = getValidManifest(JSON.parse(clientManifestStr)) || null;
+        console.info("Read client manifest from", clientManifestPath);
+      } catch (e) {
+        console.warn(`could not read Qwik client manifest ${clientManifestPath}, ignoring. Make sure you provide it to the SSR renderer. (${e})`);
+      }
+    }
+    "function" === typeof updatedOpts.transformedModuleOutput && (opts.transformedModuleOutput = updatedOpts.transformedModuleOutput);
+    if (void 0 !== updatedOpts.scope) {
+      opts.scope = updatedOpts.scope;
+    } else if (!opts.scope && maybeFs) {
+      let pkgPath = "";
+      try {
+        let pkgDir = opts.rootDir;
+        while (true) {
+          pkgPath = path.resolve(pkgDir, "package.json");
+          if (await maybeFs.promises.stat(pkgPath).catch(() => false)) {
+            break;
           }
-        } else {
-          opts.input || (opts.input = [ path.resolve(srcDir, "index.ts") ]);
+          const parent = path.resolve(pkgDir, "..");
+          if (parent === pkgDir) {
+            break;
+          }
+          pkgDir = parent;
+          pkgPath = "";
         }
-      } else {
-        opts.input || (opts.input = []);
+        if (pkgPath) {
+          const pkgString = await maybeFs.promises.readFile(pkgPath, "utf-8");
+          const pkg = JSON.parse(pkgString);
+          "string" === typeof pkg.name && (opts.scope = pkg.name);
+        }
+      } catch (e) {
+        console.warn(`could not read ${pkgPath || "package.json"} to determine package name, ignoring. (${e})`);
       }
-      Array.isArray(opts.input) && (opts.input = opts.input.reduce((inputs, i) => {
-        let input = i;
-        i.startsWith("@") || i.startsWith("~") || i.startsWith("#") || (input = normalizePath(path.resolve(opts.rootDir, i)));
-        inputs.includes(input) || inputs.push(input);
-        return inputs;
-      }, []));
-      "string" === typeof updatedOpts.outDir ? opts.outDir = normalizePath(path.resolve(opts.rootDir, normalizePath(updatedOpts.outDir))) : opts.outDir || ("ssr" === opts.target ? opts.outDir = normalizePath(path.resolve(opts.rootDir, SSR_OUT_DIR)) : "lib" === opts.target ? opts.outDir = normalizePath(path.resolve(opts.rootDir, LIB_OUT_DIR)) : opts.outDir = normalizePath(path.resolve(opts.rootDir, CLIENT_OUT_DIR)));
     }
-    "function" === typeof updatedOpts.manifestOutput && (opts.manifestOutput = updatedOpts.manifestOutput);
-    const clientManifest = getValidManifest(updatedOpts.manifestInput);
-    clientManifest && (opts.manifestInput = clientManifest);
-    "function" === typeof updatedOpts.transformedModuleOutput && (opts.transformedModuleOutput = updatedOpts.transformedModuleOutput);
-    void 0 !== updatedOpts.scope && (opts.scope = updatedOpts.scope);
     "boolean" === typeof updatedOpts.resolveQwikBuild && (opts.resolveQwikBuild = updatedOpts.resolveQwikBuild);
     if ("object" === typeof updatedOpts.devTools) {
       "imageDevTools" in updatedOpts.devTools && (opts.devTools.imageDevTools = updatedOpts.devTools.imageDevTools);
@@ -2282,9 +2291,12 @@ function createQwikPlugin(optimizerOptions = {}) {
         ExperimentalFeatures[feature] ? (opts.experimental || (opts.experimental = {}))[feature] = true : console.error(`Qwik plugin: Unknown experimental feature: ${feature}`);
       }
     }
-    return {
+    const out = {
       ...opts
     };
+    opts.input || (opts.input = updatedOpts.input);
+    opts.input && "string" === typeof opts.input && (opts.input = [ opts.input ]);
+    return out;
   };
   let hasValidatedSource = false;
   const validateSource = async resolver => {
@@ -2319,17 +2331,6 @@ function createQwikPlugin(optimizerOptions = {}) {
         linter = await createLinter(optimizer.sys, opts.rootDir, opts.tsconfigFileNames);
       } catch {}
     }
-    const path = getPath();
-    if (Array.isArray(opts.srcInputs)) {
-      optimizer.sys.getInputFiles = async rootDir => opts.srcInputs.map(i => {
-        const relInput = {
-          path: normalizePath(path.relative(rootDir, i.path)),
-          code: i.code
-        };
-        return relInput;
-      });
-      debug(`buildStart() opts.srcInputs (${opts.srcInputs.length} files)`);
-    }
     debug("transformedOutputs.clear()");
     clientTransformedOutputs.clear();
     serverTransformedOutputs.clear();
@@ -2593,18 +2594,11 @@ function createQwikPlugin(optimizerOptions = {}) {
           parentIds.set(key, id2);
           currentOutputs.set(key, [ mod, id2 ]);
           deps.add(key);
-          if ("client" === opts.target) {
-            if (devServer) {
-              const rollupModule = devServer.moduleGraph.getModuleById(key);
-              rollupModule && devServer.moduleGraph.invalidateModule(rollupModule);
-            } else {
-              ctx.emitFile({
-                id: key,
-                type: "chunk",
-                preserveSignature: "allow-extension"
-              });
-            }
-          }
+          "client" !== opts.target || devServer || ctx.emitFile({
+            id: key,
+            type: "chunk",
+            preserveSignature: "allow-extension"
+          });
         }
       }
       for (const id3 of deps.values()) {
@@ -2666,8 +2660,8 @@ function createQwikPlugin(optimizerOptions = {}) {
   };
   const normalizePath = id2 => lazyNormalizePath(id2);
   function getQwikBuildModule(isServer, _target) {
-    const isDev2 = "development" === opts.buildMode;
-    return `// @qwik.dev/core/build\nexport const isServer = ${JSON.stringify(isServer)};\nexport const isBrowser = ${JSON.stringify(!isServer)};\nexport const isDev = ${JSON.stringify(isDev2)};\n`;
+    const isDev = "development" === opts.buildMode;
+    return `// @qwik.dev/core/build\nexport const isServer = ${JSON.stringify(isServer)};\nexport const isBrowser = ${JSON.stringify(!isServer)};\nexport const isDev = ${JSON.stringify(isDev)};\n`;
   }
   async function getQwikServerManifestModule(isServer) {
     const manifest = isServer ? opts.manifestInput : null;
@@ -2760,7 +2754,6 @@ function createQwikPlugin(optimizerOptions = {}) {
     });
     "function" === typeof opts.manifestOutput && await opts.manifestOutput(manifest);
     "function" === typeof opts.transformedModuleOutput && await opts.transformedModuleOutput(getTransformedOutputs());
-    return manifestStr;
   }
   return {
     buildStart: buildStart,
@@ -2879,8 +2872,9 @@ function qwikRollup(qwikRollupOpts = {}) {
         lint: qwikRollupOpts.lint,
         experimental: qwikRollupOpts.experimental
       };
-      const opts = qwikPlugin.normalizeOptions(pluginOpts);
-      inputOpts.input || (inputOpts.input = opts.input);
+      await qwikPlugin.normalizeOptions(pluginOpts);
+      const {input: input} = qwikPlugin.getOptions();
+      inputOpts.input = input;
       return inputOpts;
     },
     outputOptions: rollupOutputOpts => normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOpts, false),
@@ -2933,6 +2927,18 @@ function normalizeRollupOutputOptions(qwikPlugin, rollupOutputOpts, useAssetsDir
   };
 }
 
+var getChunkFileName = (prefix, opts, optimizer) => "production" !== opts.buildMode || opts.debug ? chunkInfo => {
+  if (chunkInfo.moduleIds?.some(id => id.endsWith("core.prod.mjs"))) {
+    return `${prefix}build/core.js`;
+  }
+  if (chunkInfo.moduleIds?.some(id => id.endsWith("qwik-router/lib/index.qwik.mjs"))) {
+    return `${prefix}build/qwik-router.js`;
+  }
+  const relativePath = optimizer.sys.path.relative(optimizer.sys.cwd(), chunkInfo.name);
+  const sanitized = relativePath.replace(/^(\.\.\/)+/, "").replace(/^\/+/, "").replace(/\//g, "-");
+  return `${prefix}build/${sanitized}.js`;
+} : `${prefix}build/q-[hash].js`;
+
 function normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOptsObj, useAssetsDir) {
   const outputOpts = {
     ...rollupOutputOptsObj
@@ -2940,38 +2946,19 @@ function normalizeRollupOutputOptionsObject(qwikPlugin, rollupOutputOptsObj, use
   const opts = qwikPlugin.getOptions();
   const optimizer = qwikPlugin.getOptimizer();
   const manualChunks = qwikPlugin.manualChunks;
+  outputOpts.assetFileNames || (outputOpts.assetFileNames = (useAssetsDir ? `${opts.assetsDir}/` : "") + "assets/[hash]-[name].[ext]");
+  const chunkFileName = getChunkFileName(useAssetsDir ? `${opts.assetsDir}` : "", opts, optimizer);
   if ("client" === opts.target) {
-    if (!outputOpts.assetFileNames) {
-      const assetFileNames = "assets/[hash]-[name].[ext]";
-      outputOpts.assetFileNames = useAssetsDir ? `${opts.assetsDir}/${assetFileNames}` : assetFileNames;
-    }
-    let fileName;
-    fileName = "production" !== opts.buildMode || opts.debug ? chunkInfo => {
-      if (chunkInfo.moduleIds?.some(id => id.endsWith("core.prod.mjs"))) {
-        return "build/core.js";
-      }
-      if (chunkInfo.moduleIds?.some(id => id.endsWith("qwik-router/lib/index.qwik.mjs"))) {
-        return "build/qwik-router.js";
-      }
-      const path = optimizer.sys.path;
-      const relativePath = path.relative(optimizer.sys.cwd(), chunkInfo.name);
-      const sanitized = relativePath.replace(/^(\.\.\/)+/, "").replace(/^\/+/, "").replace(/\//g, "-");
-      return `build/${sanitized}.js`;
-    } : "build/q-[hash].js";
-    const getFilePath = fileNamePattern => "string" === typeof fileNamePattern ? useAssetsDir ? `${opts.assetsDir}/${fileNamePattern}` : fileNamePattern : useAssetsDir ? chunkInfo => `${opts.assetsDir}/${fileNamePattern(chunkInfo)}` : chunkInfo => fileNamePattern(chunkInfo);
-    outputOpts.entryFileNames || (outputOpts.entryFileNames = getFilePath(fileName));
-    outputOpts.chunkFileNames || (outputOpts.chunkFileNames = getFilePath(fileName));
-  } else {
-    "production" === opts.buildMode && (outputOpts.chunkFileNames || (outputOpts.chunkFileNames = "q-[hash].js"));
-  }
-  outputOpts.assetFileNames || (outputOpts.assetFileNames = "assets/[hash]-[name].[ext]");
-  if ("client" === opts.target) {
+    outputOpts.entryFileNames || (outputOpts.entryFileNames = chunkFileName);
+    outputOpts.chunkFileNames || (outputOpts.chunkFileNames = chunkFileName);
     outputOpts.format = "es";
     const prevManualChunks = outputOpts.manualChunks;
     if (prevManualChunks && "function" !== typeof prevManualChunks) {
       throw new Error("manualChunks must be a function");
     }
     outputOpts.manualChunks = prevManualChunks ? (id, meta) => prevManualChunks(id, meta) || manualChunks(id, meta) : manualChunks;
+  } else {
+    outputOpts.chunkFileNames || (outputOpts.chunkFileNames = chunkFileName);
   }
   outputOpts.dir || (outputOpts.dir = opts.outDir);
   "cjs" === outputOpts.format && "string" !== typeof outputOpts.exports && (outputOpts.exports = "auto");
@@ -3329,8 +3316,6 @@ var perf_warning_default = "<script>\n  if (!window.__qwikViteLog) {\n    window
 
 var VITE_ERROR_OVERLAY_STYLES = "\nvite-error-overlay {\n  --color-bright: rgba(255, 255, 255, 0.8);\n  --color-yellow: rgba(255,246,85,0.8);\n  --qwik-dark-blue: #006ce9;\n  --qwik-light-blue: #3ec2f7;\n  --qwik-light-purple: #ac7ff4;\n  --qwik-dark-purple: #713fc2;\n  --yellow: #fff;                   /* override vite yellow */\n  --purple: var(--color-bright);    /* override vite purple */\n  --red: var(--qwik-light-blue);    /* override vite red */\n\n  --vertical-box-spacing: 15px;\n  --box-padding: 20px;\n  --box-margin: 0 0 var(--vertical-box-spacing) 0;\n  --box-background: rgba(0, 0, 0, 0.5);\n  --box-border-radius: 8px;\n}\n\nvite-error-overlay::part(backdrop) {\n  background: rgb(2 11 17 / 60%);\n}\n\nvite-error-overlay::part(window) {\n  background: transparent;\n  border: none;\n  box-shadow: none;\n  box-sizing: border-box;\n  margin: 50px auto;\n  max-width: 1200px;\n  padding: var(--box-padding);\n  width: 90%;\n}\n\nvite-error-overlay::part(message) {\n  display: flex;\n  flex-direction: column;\n  font-size: 1.6rem;\n  line-height: 1.7;\n  margin-bottom: 30px;\n}\n\nvite-error-overlay::part(plugin) {\n  font-size: 0.8rem;\n  font-weight: 100;\n}\n\nvite-error-overlay::part(file),\nvite-error-overlay::part(frame),\nvite-error-overlay::part(stack),\nvite-error-overlay::part(tip) {\n  background: var(--box-background);\n  border-left: 5px solid transparent;\n  border-radius: var(--box-border-radius);\n  margin: var(--box-margin);\n  min-height: 50px;\n  padding: var(--box-padding);\n  position: relative;\n}\n\nvite-error-overlay::part(file) {\n  border-left-color: rgb(25 182 246);\n  color: var(--color-bright);\n}\n\nvite-error-overlay::part(frame) {\n  border-left-color: var(--color-yellow);\n  color: var(--color-yellow);\n}\n\nvite-error-overlay::part(stack) {\n  border-left-color: #FF5722;\n}\n\n\nvite-error-overlay::part(tip) {\n  border-top: none;\n  border-left-color: rgb(172, 127, 244);\n}\n\nvite-error-overlay::part(file):before,\nvite-error-overlay::part(frame):before,\nvite-error-overlay::part(stack):before {\n  border-bottom: 1px solid #222;\n  color: var(--color-bright);\n  display: block;\n  margin-bottom: 15px;\n  padding-bottom: 5px;\n  padding-left: 30px; /* space for icon */\n  font-size: .8rem;\n}\n\nvite-error-overlay::part(file):before {\n  content: 'File';\n}\n\nvite-error-overlay::part(frame):before {\n  content: 'Frame';\n}\n\nvite-error-overlay::part(stack):before {\n  content: 'Stack Trace';\n}\n\nvite-error-overlay::part(file):after,\nvite-error-overlay::part(frame):after,\nvite-error-overlay::part(stack):after {\n  content: '';\n  display: block;\n  height: 20px;\n  position: absolute;\n  left: var(--box-padding);\n  top: var(--box-padding);\n  width: 20px;\n}\n\nvite-error-overlay::part(file):after {\n  background-image: url(\"data:image/svg+xml,%3Csvg width='20px' height='20px' viewBox='0 0 24 24' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3EFile-Generic%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='File-Generic'%3E%3Crect id='Rectangle' fill-rule='nonzero' x='0' y='0' width='24' height='24'%3E%3C/rect%3E%3Cpath d='M4 5 C4 3.89543 4.89543 3 6 3 L15.1716 3 C15.702 3 16.2107 3.21071 16.5858 3.58579 L19.4142 6.41421 C19.7893 6.78929 20 7.29799 20 7.82843 L20 19 C20 20.1046 19.1046 21 18 21 L6 21 C4.89543 21 4 20.1046 4 19 L4 5 Z' id='Path' stroke='rgba(255,255,255,0.7)' stroke-width='1' stroke-linecap='round'%3E%3C/path%3E%3Cpath d='M15 4 L15 6 C15 7.10457 15.8954 8 17 8 L19 8' id='Path' stroke='rgba(255,255,255,0.7)' stroke-width='1' stroke-linecap='round'%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/svg%3E\");\n}\n\nvite-error-overlay::part(frame):after {\n  background-image: url(\"data:image/svg+xml,%3Csvg width='20px' height='20px' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.6602 2.84952H19.1516C20.2555 2.84952 21.1504 3.74444 21.1504 4.84839V8.3398' stroke='rgba(255,255,255,0.7)' stroke-width='1.69904' stroke-linecap='round'/%3E%3Cpath d='M2.84949 8.33981L2.84949 4.8484C2.84949 3.74446 3.74441 2.84953 4.84836 2.84953L8.33977 2.84953' stroke='rgba(255,255,255,0.7)' stroke-width='1.69904' stroke-linecap='round'/%3E%3Cpath d='M21.1505 15.6602L21.1505 19.1516C21.1505 20.2555 20.2556 21.1505 19.1516 21.1505L15.6602 21.1505' stroke='rgba(255,255,255,0.7)' stroke-width='1.69904' stroke-linecap='round'/%3E%3Cpath d='M8.33984 21.1505L4.84843 21.1505C3.74449 21.1505 2.84956 20.2555 2.84956 19.1516L2.84956 15.6602' stroke='rgba(255,255,255,0.7)' stroke-width='1.69904' stroke-linecap='round'/%3E%3C/svg%3E\");\n}\n\nvite-error-overlay::part(stack):after {\n  background-image: url(\"data:image/svg+xml,%3Csvg width='20px' height='20px' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M14.78 20H9.78C7.98 20 4.58 19.09 4.58 15.64C4.58 12.19 7.98 11.28 9.78 11.28H14.22C14.37 11.28 17.92 11.23 17.92 8.42C17.92 5.61 14.37 5.56 14.22 5.56H9.22C9.02109 5.56 8.83032 5.48098 8.68967 5.34033C8.54902 5.19968 8.47 5.00891 8.47 4.81C8.47 4.61109 8.54902 4.42032 8.68967 4.27967C8.83032 4.13902 9.02109 4.06 9.22 4.06H14.22C16.02 4.06 19.42 4.97 19.42 8.42C19.42 11.87 16.02 12.78 14.22 12.78H9.78C9.63 12.78 6.08 12.83 6.08 15.64C6.08 18.45 9.63 18.5 9.78 18.5H14.78C14.9789 18.5 15.1697 18.579 15.3103 18.7197C15.451 18.8603 15.53 19.0511 15.53 19.25C15.53 19.4489 15.451 19.6397 15.3103 19.7803C15.1697 19.921 14.9789 20 14.78 20Z' fill='rgba(255,255,255,0.7)'/%3E%3Cpath d='M6.44 8.31C5.74314 8.30407 5.06363 8.09202 4.48708 7.70056C3.91054 7.30909 3.46276 6.75573 3.20018 6.11021C2.93759 5.46469 2.87195 4.75589 3.01153 4.07312C3.1511 3.39036 3.48965 2.76418 3.9845 2.2735C4.47935 1.78281 5.10837 1.44958 5.79229 1.31579C6.47622 1.182 7.18444 1.25363 7.82771 1.52167C8.47099 1.78971 9.02054 2.24215 9.40711 2.82199C9.79368 3.40182 9.99998 4.08311 10 4.78C10 5.2461 9.90773 5.70759 9.72846 6.13783C9.54919 6.56808 9.28648 6.95856 8.95551 7.28675C8.62453 7.61494 8.23184 7.87433 7.80009 8.04995C7.36834 8.22558 6.90609 8.31396 6.44 8.31ZM6.44 2.75C6.04444 2.75 5.65776 2.86729 5.32886 3.08706C4.99996 3.30682 4.74362 3.61918 4.59224 3.98463C4.44087 4.35008 4.40126 4.75221 4.47843 5.14018C4.5556 5.52814 4.74609 5.8845 5.02579 6.16421C5.3055 6.44391 5.66186 6.6344 6.04982 6.71157C6.43779 6.78874 6.83992 6.74913 7.20537 6.59776C7.57082 6.44638 7.88318 6.19003 8.10294 5.86114C8.32271 5.53224 8.44 5.14556 8.44 4.75C8.44 4.48735 8.38827 4.22728 8.28776 3.98463C8.18725 3.74198 8.03993 3.5215 7.85422 3.33578C7.6685 3.15007 7.44802 3.00275 7.20537 2.90224C6.96272 2.80173 6.70265 2.75 6.44 2.75Z' fill='rgba(255,255,255,0.7)'/%3E%3Cpath d='M17.56 22.75C16.8614 22.752 16.1779 22.5466 15.5961 22.1599C15.0143 21.7733 14.5603 21.2227 14.2916 20.5778C14.0229 19.933 13.9515 19.2229 14.0866 18.5375C14.2217 17.8521 14.5571 17.2221 15.0504 16.7275C15.5437 16.2328 16.1726 15.8956 16.8577 15.7586C17.5427 15.6215 18.253 15.6909 18.8986 15.9577C19.5442 16.2246 20.0961 16.6771 20.4844 17.2578C20.8727 17.8385 21.08 18.5214 21.08 19.22C21.08 20.1545 20.7095 21.0508 20.0496 21.7125C19.3898 22.3743 18.4945 22.7473 17.56 22.75ZM17.56 17.19C17.1644 17.19 16.7778 17.3073 16.4489 17.5271C16.12 17.7468 15.8636 18.0592 15.7122 18.4246C15.5609 18.7901 15.5213 19.1922 15.5984 19.5802C15.6756 19.9681 15.8661 20.3245 16.1458 20.6042C16.4255 20.8839 16.7819 21.0744 17.1698 21.1516C17.5578 21.2287 17.9599 21.1891 18.3254 21.0377C18.6908 20.8864 19.0032 20.63 19.2229 20.3011C19.4427 19.9722 19.56 19.5856 19.56 19.19C19.56 18.6596 19.3493 18.1508 18.9742 17.7758C18.5991 17.4007 18.0904 17.19 17.56 17.19Z' fill='rgba(255,255,255,0.7)'/%3E%3C/svg%3E\");\n}\n\nvite-error-overlay::part(tip):before {\n  content: \"Not sure how to solve this? Visit https://qwik.dev or connect with the community on Discord.\";\n  display: block;\n  margin-bottom: 1em;\n}\n";
 
-var SYNC_QRL = "<sync>";
-
 function getOrigin(req) {
   const {PROTOCOL_HEADER: PROTOCOL_HEADER, HOST_HEADER: HOST_HEADER} = process.env;
   const headers = req.headers;
@@ -3339,37 +3324,7 @@ function getOrigin(req) {
   return `${protocol}://${host}`;
 }
 
-function createSymbolMapper(base) {
-  return (symbolName, _mapper, parent) => {
-    if (symbolName === SYNC_QRL) {
-      return [ symbolName, "" ];
-    }
-    if (!parent) {
-      if (symbolName.startsWith("_")) {
-        return [ symbolName, `${base}${QWIK_HANDLERS_ID}` ];
-      }
-      console.error("qwik vite-dev-server symbolMapper: unknown qrl requested without parent:", symbolName);
-      return [ symbolName, `${base}${symbolName}.js` ];
-    }
-    const qrlFile = `${base}${parent.startsWith("/") ? parent.slice(1) : parent}_${symbolName}.js`;
-    return [ symbolName, qrlFile ];
-  };
-}
-
-var lazySymbolMapper = null;
-
-var symbolMapper = (symbolName, mapper, parent) => {
-  if (lazySymbolMapper) {
-    return lazySymbolMapper(symbolName, mapper, parent);
-  }
-  throw new Error("symbolMapper not initialized");
-};
-
-async function configureDevServer(base, server, opts, sys, path, isClientDevOnly, clientDevInput, devSsrServer) {
-  symbolMapper = lazySymbolMapper = createSymbolMapper(base);
-  if (!devSsrServer) {
-    return;
-  }
+async function configureDevServer(base, server, opts, sys, path, isClientDevOnly, clientDevInput) {
   const hasQwikRouter = server.config.plugins?.some(plugin => "vite-plugin-qwik-router" === plugin.name);
   const cssImportedByCSS = new Set;
   server.middlewares.use(async (req, res, next) => {
@@ -3406,6 +3361,14 @@ async function configureDevServer(base, server, opts, sys, path, isClientDevOnly
           return;
         }
         const firstInput = opts.input && Object.values(opts.input)[0];
+        if (!firstInput) {
+          console.error("no entry found for dev server");
+          res.statusCode || (res.statusCode = 404);
+          res.setHeader("Content-Type", "text/plain");
+          res.writeHead(res.statusCode);
+          res.end("No entry found for dev server");
+          return;
+        }
         const ssrModule = await server.ssrLoadModule(firstInput);
         const render = ssrModule.default ?? ssrModule.render;
         if ("function" === typeof render) {
@@ -3456,7 +3419,6 @@ async function configureDevServer(base, server, opts, sys, path, isClientDevOnly
             stream: res,
             snapshot: !isClientDevOnly,
             manifest: isClientDevOnly ? void 0 : manifest,
-            symbolMapper: isClientDevOnly ? void 0 : symbolMapper,
             serverData: serverData,
             containerAttributes: {
               ...serverData.containerAttributes
@@ -3638,7 +3600,6 @@ var FONTS = [ ".woff", ".woff2", ".ttf" ];
 function qwikVite(qwikViteOpts = {}) {
   let isClientDevOnly = false;
   let clientDevInput;
-  let tmpClientManifestPath;
   let viteCommand = "serve";
   let manifestInput = null;
   let clientOutDir = null;
@@ -3685,6 +3646,10 @@ function qwikVite(qwikViteOpts = {}) {
       } : "lib" === target && (qwikViteOpts.entryStrategy = {
         type: "inline"
       });
+      const ssrInput = "ssr" === target ? "string" === typeof viteConfig.build?.ssr ? viteConfig.build.ssr : qwikViteOpts.ssr?.input : void 0;
+      const clientInput = "client" === target ? qwikViteOpts.client?.input : void 0;
+      let input = viteConfig.build?.rollupOptions?.input || clientInput || ssrInput;
+      input && "string" === typeof input && (input = [ input ]);
       const shouldFindVendors = !qwikViteOpts.disableVendorScan && ("lib" !== target || "serve" === viteCommand);
       viteAssetsDir = viteConfig.build?.assetsDir;
       const useAssetsDir = "client" === target && !!viteAssetsDir && "_astro" !== viteAssetsDir;
@@ -3700,56 +3665,26 @@ function qwikVite(qwikViteOpts = {}) {
         resolveQwikBuild: true,
         transformedModuleOutput: qwikViteOpts.transformedModuleOutput,
         outDir: viteConfig.build?.outDir,
+        ssrOutDir: qwikViteOpts.ssr?.outDir || viteConfig.build?.outDir,
+        clientOutDir: qwikViteOpts.client?.outDir || (viteConfig.build?.ssr ? void 0 : viteConfig.build?.outDir),
         assetsDir: useAssetsDir ? viteAssetsDir : void 0,
         devTools: qwikViteOpts.devTools,
         sourcemap: !!viteConfig.build?.sourcemap,
         lint: qwikViteOpts.lint,
-        experimental: qwikViteOpts.experimental
+        experimental: qwikViteOpts.experimental,
+        input: input,
+        manifestInput: qwikViteOpts.ssr?.manifestInput,
+        manifestOutput: qwikViteOpts.client?.manifestOutput
       };
-      if (!qwikViteOpts.csr) {
-        if ("ssr" === target) {
-          "string" === typeof viteConfig.build?.ssr ? pluginOpts.input = viteConfig.build.ssr : "string" === typeof qwikViteOpts.ssr?.input && (pluginOpts.input = qwikViteOpts.ssr.input);
-          qwikViteOpts.ssr?.outDir && (pluginOpts.outDir = qwikViteOpts.ssr.outDir);
-          pluginOpts.manifestInput = qwikViteOpts.ssr?.manifestInput;
-        } else if ("client" === target) {
-          pluginOpts.input = qwikViteOpts.client?.input;
-          qwikViteOpts.client?.outDir && (pluginOpts.outDir = qwikViteOpts.client.outDir);
-          pluginOpts.manifestOutput = qwikViteOpts.client?.manifestOutput;
-        } else {
-          "object" === typeof viteConfig.build?.lib && (pluginOpts.input = viteConfig.build?.lib.entry);
-        }
-        if ("node" === sys.env || "bun" === sys.env) {
-          const fs = await sys.dynamicImport("node:fs");
-          try {
-            const rootDir2 = pluginOpts.rootDir ?? sys.cwd();
-            const packageJsonPath = sys.path.join(rootDir2, "package.json");
-            const pkgString = await fs.promises.readFile(packageJsonPath, "utf-8");
-            try {
-              const data = JSON.parse(pkgString);
-              "string" === typeof data.name && (pluginOpts.scope = data.name);
-            } catch (e) {
-              console.error(e);
-            }
-          } catch {}
-          const nodeOs = await sys.dynamicImport("node:os");
-          const scopeSuffix = pluginOpts.scope ? `-${pluginOpts.scope.replace(/\//g, "--")}` : "";
-          tmpClientManifestPath = path.join(nodeOs.tmpdir(), `vite-plugin-qwik-q-manifest${scopeSuffix}.json`);
-          if ("ssr" === target && !pluginOpts.manifestInput) {
-            try {
-              const clientManifestStr = await fs.promises.readFile(tmpClientManifestPath, "utf-8");
-              pluginOpts.manifestInput = JSON.parse(clientManifestStr);
-            } catch {}
-          }
-        }
-      }
-      const opts = qwikPlugin.normalizeOptions(pluginOpts);
-      manifestInput = pluginOpts.manifestInput || null;
+      const opts = await qwikPlugin.normalizeOptions(pluginOpts);
+      input || (input = opts.input);
+      manifestInput = opts.manifestInput;
       srcDir = opts.srcDir;
       rootDir = opts.rootDir;
       if (!qwikViteOpts.csr) {
-        clientOutDir = qwikPlugin.normalizePath(sys.path.resolve(opts.rootDir, qwikViteOpts.client?.outDir || CLIENT_OUT_DIR));
+        clientOutDir = opts.clientOutDir;
         clientPublicOutDir = viteConfig.base ? path.join(clientOutDir, viteConfig.base) : clientOutDir;
-        ssrOutDir = qwikPlugin.normalizePath(sys.path.resolve(opts.rootDir, qwikViteOpts.ssr?.outDir || SSR_OUT_DIR));
+        ssrOutDir = opts.ssrOutDir;
         clientDevInput = "string" === typeof qwikViteOpts.client?.devInput ? path.resolve(opts.rootDir, qwikViteOpts.client.devInput) : opts.srcDir ? path.resolve(opts.srcDir, CLIENT_DEV_INPUT) : path.resolve(opts.rootDir, "src", CLIENT_DEV_INPUT);
         clientDevInput = qwikPlugin.normalizePath(clientDevInput);
       }
@@ -3798,6 +3733,7 @@ function qwikVite(qwikViteOpts = {}) {
           },
           rollupOptions: {
             maxParallelFileOps: 1,
+            input: input,
             output: {
               manualChunks: qwikPlugin.manualChunks
             }
@@ -3816,7 +3752,7 @@ function qwikVite(qwikViteOpts = {}) {
         updatedViteConfig.build.outDir = buildOutputDir;
         const origOnwarn = updatedViteConfig.build.rollupOptions?.onwarn;
         updatedViteConfig.build.rollupOptions = {
-          input: opts.input,
+          ...updatedViteConfig.build.rollupOptions,
           output: normalizeRollupOutputOptions(qwikPlugin, viteConfig.build?.rollupOptions?.output, useAssetsDir, buildOutputDir),
           preserveEntrySignatures: "exports-only",
           onwarn: (warning, warn) => {
@@ -3830,7 +3766,7 @@ function qwikVite(qwikViteOpts = {}) {
           if ("build" === viteCommand) {
             updatedViteConfig.publicDir = false;
             updatedViteConfig.build.ssr = true;
-            null == viteConfig.build?.minify && "production" === buildMode && (updatedViteConfig.build.minify = "esbuild");
+            null == viteConfig.build?.minify && "production" === buildMode && (updatedViteConfig.build.minify = true);
           }
         } else if ("client" === opts.target) {
           isClientDevOnly && !opts.csr && (updatedViteConfig.build.rollupOptions.input = clientDevInput);
@@ -3861,6 +3797,7 @@ function qwikVite(qwikViteOpts = {}) {
       qwikPlugin.normalizeOptions(qwikViteOpts);
     },
     async buildStart() {
+      injections.length = 0;
       const resolver = this.resolve.bind(this);
       await qwikPlugin.validateSource(resolver);
       qwikPlugin.onDiagnostics((diagnostics, optimizer, srcDir2) => {
@@ -3950,17 +3887,12 @@ function qwikVite(qwikViteOpts = {}) {
               }
             }
           }
-          const clientManifestStr = await qwikPlugin.generateManifest(this, rollupBundle, bundleGraphAdders, {
+          await qwikPlugin.generateManifest(this, rollupBundle, bundleGraphAdders, {
             injections: injections,
             platform: {
               vite: ""
             }
           });
-          const sys = qwikPlugin.getSys();
-          if (tmpClientManifestPath && ("node" === sys.env || "bun" === sys.env)) {
-            const fs = await sys.dynamicImport("node:fs");
-            await fs.promises.writeFile(tmpClientManifestPath, clientManifestStr);
-          }
         }
       }
     },
@@ -4000,15 +3932,15 @@ function qwikVite(qwikViteOpts = {}) {
     },
     configureServer(server) {
       qwikPlugin.configureServer(server);
-      const devSsrServer = !("devSsrServer" in qwikViteOpts) || !!qwikViteOpts.devSsrServer;
+      const devSsrServer = !qwikViteOpts.csr && (!("devSsrServer" in qwikViteOpts) || !!qwikViteOpts.devSsrServer);
       const imageDevTools = !qwikViteOpts.devTools || !("imageDevTools" in qwikViteOpts.devTools) || qwikViteOpts.devTools.imageDevTools;
       imageDevTools && server.middlewares.use(getImageSizeServer(qwikPlugin.getSys(), rootDir, srcDir));
-      if (!qwikViteOpts.csr) {
+      if (devSsrServer) {
         const plugin = async () => {
           const opts = qwikPlugin.getOptions();
           const sys = qwikPlugin.getSys();
           const path = qwikPlugin.getPath();
-          await configureDevServer(basePathname, server, opts, sys, path, isClientDevOnly, clientDevInput, devSsrServer);
+          await configureDevServer(basePathname, server, opts, sys, path, isClientDevOnly, clientDevInput);
         };
         const isNEW = true === globalThis.__qwikRouterNew || true === globalThis.__qwikCityNew || server.config.build.lib;
         return isNEW ? plugin : plugin();
@@ -4142,4 +4074,6 @@ var VITE_CLIENT_MODULE = "@qwik.dev/core/vite-client";
 
 var CLIENT_DEV_INPUT = "entry.dev";
 
+var symbolMapper = void 0;
+
 export { createOptimizer, qwikRollup, qwikVite, symbolMapper, versions };