@qwik.dev/core 2.0.0-beta.8 → 2.0.0-beta.9

package/dist/loader/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwik.dev/core/loader",
-  "version": "2.0.0-beta.8-dev+434cd18",
+  "version": "2.0.0-beta.9-dev+6b582c7",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

package/dist/optimizer.cjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/optimizer 2.0.0-beta.8-dev+434cd18
+ * @qwik.dev/core/optimizer 2.0.0-beta.9-dev+6b582c7
  * 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
@@ -1257,7 +1257,7 @@ globalThis.qwikOptimizer = function(module) {
     }
   };
   var versions = {
-    qwik: "2.0.0-beta.8-dev+434cd18"
+    qwik: "2.0.0-beta.9-dev+6b582c7"
   };
   async function getSystem() {
     const sysEnv = getEnv();
@@ -3512,7 +3512,6 @@ globalThis.qwikOptimizer = function(module) {
       async config(viteConfig, viteEnv) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         await qwikPlugin.init();
-        const sys = qwikPlugin.getSys();
         const path = qwikPlugin.getPath();
         let target;
         target = (null == (_a = viteConfig.build) ? void 0 : _a.ssr) || "ssr" === viteEnv.mode ? "ssr" : "lib" === viteEnv.mode ? "lib" : "test" === viteEnv.mode ? "test" : "client";
@@ -3532,7 +3531,6 @@ globalThis.qwikOptimizer = function(module) {
         const clientInput = "client" === target ? null == (_d = qwikViteOpts.client) ? void 0 : _d.input : void 0;
         let input = (null == (_f = null == (_e = viteConfig.build) ? void 0 : _e.rollupOptions) ? void 0 : _f.input) || clientInput || ssrInput;
         input && "string" === typeof input && (input = [ input ]);
-        const shouldFindVendors = !qwikViteOpts.disableVendorScan && ("lib" !== target || "serve" === viteCommand);
         viteAssetsDir = null == (_g = viteConfig.build) ? void 0 : _g.assetsDir;
         const useAssetsDir = "client" === target && !!viteAssetsDir && "_astro" !== viteAssetsDir;
         const pluginOpts = {
@@ -3570,8 +3568,6 @@ globalThis.qwikOptimizer = function(module) {
           clientDevInput = "string" === typeof (null == (_q = qwikViteOpts.client) ? void 0 : _q.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);
         }
-        const vendorRoots = shouldFindVendors ? await findQwikRoots(sys, sys.cwd()) : [];
-        const vendorIds = vendorRoots.map(v => v.id);
         const isDevelopment = "development" === buildMode;
         const qDevKey = "globalThis.qDev";
         const qTestKey = "globalThis.qTest";
@@ -3582,11 +3578,11 @@ globalThis.qwikOptimizer = function(module) {
         const qSerialize = (null == (_t = null == viteConfig ? void 0 : viteConfig.define) ? void 0 : _t[qSerializeKey]) ?? isDevelopment;
         const updatedViteConfig = {
           ssr: {
-            noExternal: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_BUILD_ID, ...vendorIds ]
+            noExternal: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_BUILD_ID ]
           },
           envPrefix: [ "VITE_", "PUBLIC_" ],
           resolve: {
-            dedupe: [ ...DEDUPE, ...vendorIds ],
+            dedupe: [ ...DEDUPE ],
             conditions: "production" === buildMode && "client" === target ? [ "min" ] : [],
             alias: {
               "@builder.io/qwik": "@qwik.dev/core",
@@ -3597,6 +3593,7 @@ globalThis.qwikOptimizer = function(module) {
               "@builder.io/qwik/jsx-dev-runtime": "@qwik.dev/core/jsx-dev-runtime",
               "@builder.io/qwik/optimizer": "@qwik.dev/core/optimizer",
               "@builder.io/qwik/loader": "@qwik.dev/core/loader",
+              "@builder.io/qwik/backpatch": "@qwik.dev/core/backpatch",
               "@builder.io/qwik/cli": "@qwik.dev/core/cli",
               "@builder.io/qwik/testing": "@qwik.dev/core/testing"
             }
@@ -3606,7 +3603,7 @@ globalThis.qwikOptimizer = function(module) {
             jsx: "automatic"
           },
           optimizeDeps: {
-            exclude: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_JSX_RUNTIME_ID, QWIK_JSX_DEV_RUNTIME_ID, QWIK_BUILD_ID, QWIK_CLIENT_MANIFEST_ID, ...vendorIds, "@builder.io/qwik", "@builder.io/qwik-city" ]
+            exclude: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_JSX_RUNTIME_ID, QWIK_JSX_DEV_RUNTIME_ID, QWIK_BUILD_ID, QWIK_CLIENT_MANIFEST_ID, "@builder.io/qwik", "@builder.io/qwik-city" ]
           },
           build: {
             modulePreload: false,
@@ -3850,7 +3847,75 @@ globalThis.qwikOptimizer = function(module) {
         }
       }
     };
-    return [ vitePluginPre, vitePluginPost ];
+    return [ vitePluginPre, vitePluginPost, checkExternals() ];
+  }
+  async function checkExternals() {
+    let fs;
+    let path;
+    try {
+      fs = await import("node:fs").then(m => m.promises);
+      path = await import("node:path");
+    } catch {
+      return;
+    }
+    const seen = new Set;
+    let rootDir;
+    const core2 = "@qwik-dev/core";
+    const core1 = "@builder.io/qwik";
+    async function isQwikDep(dep, dir) {
+      var _a, _b, _c, _d;
+      while (dir) {
+        const pkg = path.join(dir, "node_modules", dep, "package.json");
+        try {
+          await fs.access(pkg);
+          const data = await fs.readFile(pkg, {
+            encoding: "utf-8"
+          });
+          const json = JSON.parse(data);
+          if (json.qwik || (null == (_a = json.dependencies) ? void 0 : _a[core2]) || (null == (_b = json.peerDependencies) ? void 0 : _b[core2]) || (null == (_c = json.dependencies) ? void 0 : _c[core1]) || (null == (_d = json.peerDependencies) ? void 0 : _d[core1])) {
+            return true;
+          }
+          return false;
+        } catch {}
+        const nextRoot = path.dirname(dir);
+        if (nextRoot === dir) {
+          break;
+        }
+        dir = nextRoot;
+      }
+      return false;
+    }
+    return {
+      name: "checkQwikExternals",
+      enforce: "pre",
+      configResolved: config => {
+        rootDir = config.root;
+      },
+      resolveId: {
+        order: "pre",
+        async handler(source, importer, options) {
+          if (!options.ssr || /^([./]|node:|[^a-z])/.test(source) || seen.has(source)) {
+            return;
+          }
+          const packageName = (source.startsWith("@") ? source.split("/").slice(0, 2).join("/") : source.split("/")[0]).split("?")[0];
+          if (seen.has(packageName)) {
+            return;
+          }
+          seen.add(source);
+          seen.add(packageName);
+          const result = await this.resolve(packageName, importer, {
+            ...options,
+            skipSelf: true
+          });
+          if ((null == result ? void 0 : result.external) && await isQwikDep(packageName, importer ? path.dirname(importer) : rootDir)) {
+            throw new Error(`\n==============\n${packageName} is being treated as an external dependency, but it should be included in the server bundle, because it uses Qwik.\nPlease add the package to "ssr.noExternal" in the Vite config. \n==============`);
+          }
+          if (packageName === source) {
+            return result;
+          }
+        }
+      }
+    };
   }
   var ANSI_COLOR = {
     Black: "",
@@ -3884,69 +3949,6 @@ globalThis.qwikOptimizer = function(module) {
     const qwikLoader = JSON.stringify(opts.debug ? QWIK_LOADER_DEFAULT_DEBUG : QWIK_LOADER_DEFAULT_MINIFIED);
     return `// Qwik Vite Dev Module\nimport { render as qwikRender } from '@qwik.dev/core';\n\nexport async function render(document, rootNode, opts) {\n\n  await qwikRender(document, rootNode, opts);\n\n  let qwikLoader = document.getElementById('qwikloader');\n  if (!qwikLoader) {\n    qwikLoader = document.createElement('script');\n    qwikLoader.id = 'qwikloader';\n    qwikLoader.innerHTML = ${qwikLoader};\n    const parent = document.head ?? document.body ?? document.documentElement;\n    parent.appendChild(qwikLoader);\n  }\n\n  if (!window.__qwikViteLog) {\n    window.__qwikViteLog = true;\n    console.debug("%c⭐️ Qwik Client Mode","background: #0c75d2; color: white; padding: 2px 3px; border-radius: 2px; font-size: 0.8em;","Do not use this mode in production!\\n - No portion of the application is pre-rendered on the server\\n - All of the application is running eagerly in the browser\\n - Optimizer/Serialization/Deserialization code is not exercised!");\n  }\n}`;
   }
-  async function findDepPkgJsonPath(sys, dep, parent) {
-    const fs = await sys.dynamicImport("node:fs");
-    let root = parent;
-    while (root) {
-      const pkg = sys.path.join(root, "node_modules", dep, "package.json");
-      try {
-        await fs.promises.access(pkg);
-        return fs.promises.realpath(pkg);
-      } catch {}
-      const nextRoot = sys.path.dirname(root);
-      if (nextRoot === root) {
-        break;
-      }
-      root = nextRoot;
-    }
-    return;
-  }
-  var findQwikRoots = async (sys, packageJsonDir) => {
-    const paths = new Map;
-    if ("node" === sys.env || "bun" === sys.env) {
-      const fs = await sys.dynamicImport("node:fs");
-      let prevPackageJsonDir;
-      do {
-        try {
-          const data = await fs.promises.readFile(sys.path.join(packageJsonDir, "package.json"), {
-            encoding: "utf-8"
-          });
-          try {
-            const packageJson = JSON.parse(data);
-            const dependencies = packageJson.dependencies;
-            const devDependencies = packageJson.devDependencies;
-            const packages = [];
-            "object" === typeof dependencies && packages.push(...Object.keys(dependencies));
-            "object" === typeof devDependencies && packages.push(...Object.keys(devDependencies));
-            const basedir = sys.cwd();
-            await Promise.all(packages.map(async id => {
-              const pkgJsonPath = await findDepPkgJsonPath(sys, id, basedir);
-              if (pkgJsonPath) {
-                const pkgJsonContent = await fs.promises.readFile(pkgJsonPath, "utf-8");
-                const pkgJson = JSON.parse(pkgJsonContent);
-                const qwikPath = pkgJson.qwik;
-                if (!qwikPath) {
-                  return;
-                }
-                const allPaths = Array.isArray(qwikPath) ? qwikPath : [ qwikPath ];
-                for (const p of allPaths) {
-                  paths.set(await fs.promises.realpath(sys.path.resolve(sys.path.dirname(pkgJsonPath), p)), id);
-                }
-              }
-            }));
-          } catch (e) {
-            console.error(e);
-          }
-        } catch {}
-        prevPackageJsonDir = packageJsonDir;
-        packageJsonDir = sys.path.dirname(packageJsonDir);
-      } while (packageJsonDir !== prevPackageJsonDir);
-    }
-    return Array.from(paths).map(([path, id]) => ({
-      path: path,
-      id: id
-    }));
-  };
   var VITE_CLIENT_MODULE = "@qwik.dev/core/vite-client";
   var CLIENT_DEV_INPUT = "entry.dev";
   var symbolMapper = void 0;

package/dist/optimizer.mjs

@@ -1,6 +1,6 @@
 /**
  * @license
- * @qwik.dev/core/optimizer 2.0.0-beta.8-dev+434cd18
+ * @qwik.dev/core/optimizer 2.0.0-beta.9-dev+6b582c7
  * 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.8-dev+434cd18"
+  qwik: "2.0.0-beta.9-dev+6b582c7"
 };
 
 async function getSystem() {
@@ -3630,7 +3630,6 @@ function qwikVite(qwikViteOpts = {}) {
     api: api,
     async config(viteConfig, viteEnv) {
       await qwikPlugin.init();
-      const sys = qwikPlugin.getSys();
       const path = qwikPlugin.getPath();
       let target;
       target = viteConfig.build?.ssr || "ssr" === viteEnv.mode ? "ssr" : "lib" === viteEnv.mode ? "lib" : "test" === viteEnv.mode ? "test" : "client";
@@ -3650,7 +3649,6 @@ function qwikVite(qwikViteOpts = {}) {
       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;
       const pluginOpts = {
@@ -3688,8 +3686,6 @@ function qwikVite(qwikViteOpts = {}) {
         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);
       }
-      const vendorRoots = shouldFindVendors ? await findQwikRoots(sys, sys.cwd()) : [];
-      const vendorIds = vendorRoots.map(v => v.id);
       const isDevelopment = "development" === buildMode;
       const qDevKey = "globalThis.qDev";
       const qTestKey = "globalThis.qTest";
@@ -3700,11 +3696,11 @@ function qwikVite(qwikViteOpts = {}) {
       const qSerialize = viteConfig?.define?.[qSerializeKey] ?? isDevelopment;
       const updatedViteConfig = {
         ssr: {
-          noExternal: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_BUILD_ID, ...vendorIds ]
+          noExternal: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_BUILD_ID ]
         },
         envPrefix: [ "VITE_", "PUBLIC_" ],
         resolve: {
-          dedupe: [ ...DEDUPE, ...vendorIds ],
+          dedupe: [ ...DEDUPE ],
           conditions: "production" === buildMode && "client" === target ? [ "min" ] : [],
           alias: {
             "@builder.io/qwik": "@qwik.dev/core",
@@ -3715,6 +3711,7 @@ function qwikVite(qwikViteOpts = {}) {
             "@builder.io/qwik/jsx-dev-runtime": "@qwik.dev/core/jsx-dev-runtime",
             "@builder.io/qwik/optimizer": "@qwik.dev/core/optimizer",
             "@builder.io/qwik/loader": "@qwik.dev/core/loader",
+            "@builder.io/qwik/backpatch": "@qwik.dev/core/backpatch",
             "@builder.io/qwik/cli": "@qwik.dev/core/cli",
             "@builder.io/qwik/testing": "@qwik.dev/core/testing"
           }
@@ -3724,7 +3721,7 @@ function qwikVite(qwikViteOpts = {}) {
           jsx: "automatic"
         },
         optimizeDeps: {
-          exclude: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_JSX_RUNTIME_ID, QWIK_JSX_DEV_RUNTIME_ID, QWIK_BUILD_ID, QWIK_CLIENT_MANIFEST_ID, ...vendorIds, "@builder.io/qwik", "@builder.io/qwik-city" ]
+          exclude: [ QWIK_CORE_ID, QWIK_CORE_INTERNAL_ID, QWIK_CORE_SERVER, QWIK_JSX_RUNTIME_ID, QWIK_JSX_DEV_RUNTIME_ID, QWIK_BUILD_ID, QWIK_CLIENT_MANIFEST_ID, "@builder.io/qwik", "@builder.io/qwik-city" ]
         },
         build: {
           modulePreload: false,
@@ -3966,7 +3963,75 @@ function qwikVite(qwikViteOpts = {}) {
       }
     }
   };
-  return [ vitePluginPre, vitePluginPost ];
+  return [ vitePluginPre, vitePluginPost, checkExternals() ];
+}
+
+async function checkExternals() {
+  let fs;
+  let path;
+  try {
+    fs = await import("node:fs").then(m => m.promises);
+    path = await import("node:path");
+  } catch {
+    return;
+  }
+  const seen = new Set;
+  let rootDir;
+  const core2 = "@qwik-dev/core";
+  const core1 = "@builder.io/qwik";
+  async function isQwikDep(dep, dir) {
+    while (dir) {
+      const pkg = path.join(dir, "node_modules", dep, "package.json");
+      try {
+        await fs.access(pkg);
+        const data = await fs.readFile(pkg, {
+          encoding: "utf-8"
+        });
+        const json = JSON.parse(data);
+        if (json.qwik || json.dependencies?.[core2] || json.peerDependencies?.[core2] || json.dependencies?.[core1] || json.peerDependencies?.[core1]) {
+          return true;
+        }
+        return false;
+      } catch {}
+      const nextRoot = path.dirname(dir);
+      if (nextRoot === dir) {
+        break;
+      }
+      dir = nextRoot;
+    }
+    return false;
+  }
+  return {
+    name: "checkQwikExternals",
+    enforce: "pre",
+    configResolved: config => {
+      rootDir = config.root;
+    },
+    resolveId: {
+      order: "pre",
+      async handler(source, importer, options) {
+        if (!options.ssr || /^([./]|node:|[^a-z])/.test(source) || seen.has(source)) {
+          return;
+        }
+        const packageName = (source.startsWith("@") ? source.split("/").slice(0, 2).join("/") : source.split("/")[0]).split("?")[0];
+        if (seen.has(packageName)) {
+          return;
+        }
+        seen.add(source);
+        seen.add(packageName);
+        const result = await this.resolve(packageName, importer, {
+          ...options,
+          skipSelf: true
+        });
+        if (result?.external && await isQwikDep(packageName, importer ? path.dirname(importer) : rootDir)) {
+          throw new Error(`\n==============\n${packageName} is being treated as an external dependency, but it should be included in the server bundle, because it uses Qwik.\nPlease add the package to "ssr.noExternal" in the Vite config. \n==============`);
+        }
+        if (packageName === source) {
+          return result;
+        }
+      }
+    }
+  };
 }
 
 var ANSI_COLOR = {
@@ -4005,71 +4070,6 @@ function getViteDevModule(opts) {
   return `// Qwik Vite Dev Module\nimport { render as qwikRender } from '@qwik.dev/core';\n\nexport async function render(document, rootNode, opts) {\n\n  await qwikRender(document, rootNode, opts);\n\n  let qwikLoader = document.getElementById('qwikloader');\n  if (!qwikLoader) {\n    qwikLoader = document.createElement('script');\n    qwikLoader.id = 'qwikloader';\n    qwikLoader.innerHTML = ${qwikLoader};\n    const parent = document.head ?? document.body ?? document.documentElement;\n    parent.appendChild(qwikLoader);\n  }\n\n  if (!window.__qwikViteLog) {\n    window.__qwikViteLog = true;\n    console.debug("%c⭐️ Qwik Client Mode","background: #0c75d2; color: white; padding: 2px 3px; border-radius: 2px; font-size: 0.8em;","Do not use this mode in production!\\n - No portion of the application is pre-rendered on the server\\n - All of the application is running eagerly in the browser\\n - Optimizer/Serialization/Deserialization code is not exercised!");\n  }\n}`;
 }
 
-async function findDepPkgJsonPath(sys, dep, parent) {
-  const fs = await sys.dynamicImport("node:fs");
-  let root = parent;
-  while (root) {
-    const pkg = sys.path.join(root, "node_modules", dep, "package.json");
-    try {
-      await fs.promises.access(pkg);
-      return fs.promises.realpath(pkg);
-    } catch {}
-    const nextRoot = sys.path.dirname(root);
-    if (nextRoot === root) {
-      break;
-    }
-    root = nextRoot;
-  }
-  return;
-}
-
-var findQwikRoots = async (sys, packageJsonDir) => {
-  const paths = new Map;
-  if ("node" === sys.env || "bun" === sys.env) {
-    const fs = await sys.dynamicImport("node:fs");
-    let prevPackageJsonDir;
-    do {
-      try {
-        const data = await fs.promises.readFile(sys.path.join(packageJsonDir, "package.json"), {
-          encoding: "utf-8"
-        });
-        try {
-          const packageJson = JSON.parse(data);
-          const dependencies = packageJson.dependencies;
-          const devDependencies = packageJson.devDependencies;
-          const packages = [];
-          "object" === typeof dependencies && packages.push(...Object.keys(dependencies));
-          "object" === typeof devDependencies && packages.push(...Object.keys(devDependencies));
-          const basedir = sys.cwd();
-          await Promise.all(packages.map(async id => {
-            const pkgJsonPath = await findDepPkgJsonPath(sys, id, basedir);
-            if (pkgJsonPath) {
-              const pkgJsonContent = await fs.promises.readFile(pkgJsonPath, "utf-8");
-              const pkgJson = JSON.parse(pkgJsonContent);
-              const qwikPath = pkgJson.qwik;
-              if (!qwikPath) {
-                return;
-              }
-              const allPaths = Array.isArray(qwikPath) ? qwikPath : [ qwikPath ];
-              for (const p of allPaths) {
-                paths.set(await fs.promises.realpath(sys.path.resolve(sys.path.dirname(pkgJsonPath), p)), id);
-              }
-            }
-          }));
-        } catch (e) {
-          console.error(e);
-        }
-      } catch {}
-      prevPackageJsonDir = packageJsonDir;
-      packageJsonDir = sys.path.dirname(packageJsonDir);
-    } while (packageJsonDir !== prevPackageJsonDir);
-  }
-  return Array.from(paths).map(([path, id]) => ({
-    path: path,
-    id: id
-  }));
-};
-
 var VITE_CLIENT_MODULE = "@qwik.dev/core/vite-client";
 
 var CLIENT_DEV_INPUT = "entry.dev";