96ae4c6 fix(qrl): correct qrl loading in vite dev mode (#6579)

QwikDev/qwik@96ae4c6
QwikDev · Jun 20, 2024 · 596ff1c · 596ff1c
1 parent ed02be9
commit 596ff1c
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 42 deletions.
diff --git a/bindings/qwik.win32-x64-msvc.node b/bindings/qwik.win32-x64-msvc.node
diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/build",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

diff --git a/cli.cjs b/cli.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/cli 1.5.7-dev20240619180045
+ * @builder.io/qwik/cli 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -4889,7 +4889,7 @@ async function printHelp(app) {
   await runCommand2(Object.assign(app, { task: args[0], args }));
 }
 function printVersion() {
-  console.log("1.5.7-dev20240619180045");
+  console.log("1.5.7-dev20240620004924");
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

diff --git a/core.cjs b/core.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.5.7-dev20240619180045
+ * @builder.io/qwik 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -1560,7 +1560,7 @@
      *
      * @public
      */
-    const version = "1.5.7-dev20240619180045";
+    const version = "1.5.7-dev20240620004924";
 
     const hashCode = (text, hash = 0) => {
         for (let i = 0; i < text.length; i++) {
@@ -7307,7 +7307,7 @@ Task Symbol: ${task.$qrl$.$symbol$}
                 throwErrorAndStop('Sync QRL without containerState');
             }
         }
-        let output = `${encodeURI(chunk)}#${symbol}`;
+        let output = `${chunk}#${symbol}`;
         const capture = qrl.$capture$;
         const captureRef = qrl.$captureRef$;
         if (captureRef && captureRef.length) {

diff --git a/core.cjs.map b/core.cjs.map
diff --git a/core.d.ts b/core.d.ts
@@ -3835,7 +3835,7 @@ export declare type ValueOrPromise<T> = T | Promise<T>;
 export declare const _verifySerializable: <T>(value: T, preMessage?: string) => T;
 
 /**
- * 1.5.7-dev20240619180045
+ * 1.5.7-dev20240620004924
  *
  * @public
  */

diff --git a/core.min.mjs b/core.min.mjs
diff --git a/core.mjs b/core.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.5.7-dev20240619180045
+ * @builder.io/qwik 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -1556,7 +1556,7 @@ const dangerouslySetInnerHTML = 'dangerouslySetInnerHTML';
  *
  * @public
  */
-const version = "1.5.7-dev20240619180045";
+const version = "1.5.7-dev20240620004924";
 
 const hashCode = (text, hash = 0) => {
     for (let i = 0; i < text.length; i++) {
@@ -7303,7 +7303,7 @@ const serializeQRL = (qrl, opts = {}) => {
             throwErrorAndStop('Sync QRL without containerState');
         }
     }
-    let output = `${encodeURI(chunk)}#${symbol}`;
+    let output = `${chunk}#${symbol}`;
     const capture = qrl.$capture$;
     const captureRef = qrl.$captureRef$;
     if (captureRef && captureRef.length) {

diff --git a/core.mjs.map b/core.mjs.map
diff --git a/core.prod.cjs b/core.prod.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.5.7-dev20240619180045
+ * @builder.io/qwik 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -540,7 +540,7 @@
     }
     const shouldWrapFunctional = (res, node) => !!node.key && (!isJSXNode(res) || !isFunction(res.type) && res.key != node.key);
     const dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
-    const version = "1.5.7-dev20240619180045";
+    const version = "1.5.7-dev20240620004924";
     const hashCode = (text, hash = 0) => {
         for (let i = 0; i < text.length; i++) {
             hash = (hash << 5) - hash + text.charCodeAt(i), hash |= 0;
@@ -3595,7 +3595,7 @@
                 throwErrorAndStop("Sync QRL without containerState");
             }
         }
-        let output = `${encodeURI(chunk)}#${symbol}`;
+        let output = `${chunk}#${symbol}`;
         const capture = qrl.$capture$;
         const captureRef = qrl.$captureRef$;
         return captureRef && captureRef.length ? opts.$getObjId$ ? output += `[${mapJoin(captureRef, opts.$getObjId$, " ")}]` : opts.$addRefMap$ && (output += `[${mapJoin(captureRef, opts.$addRefMap$, " ")}]`) : capture && capture.length > 0 && (output += `[${capture.join(" ")}]`), 

diff --git a/core.prod.mjs b/core.prod.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.5.7-dev20240619180045
+ * @builder.io/qwik 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -829,7 +829,7 @@ const static_subtree = 2;
 
 const dangerouslySetInnerHTML = "dangerouslySetInnerHTML";
 
-const version = "1.5.7-dev20240619180045";
+const version = "1.5.7-dev20240620004924";
 
 const hashCode = (text, hash = 0) => {
     for (let i = 0; i < text.length; i++) {
@@ -4579,7 +4579,7 @@ const serializeQRL = (qrl, opts = {}) => {
             throwErrorAndStop("Sync QRL without containerState");
         }
     }
-    let output = `${encodeURI(chunk)}#${symbol}`;
+    let output = `${chunk}#${symbol}`;
     const capture = qrl.$capture$;
     const captureRef = qrl.$captureRef$;
     return captureRef && captureRef.length ? opts.$getObjId$ ? output += `[${mapJoin(captureRef, opts.$getObjId$, " ")}]` : opts.$addRefMap$ && (output += `[${mapJoin(captureRef, opts.$addRefMap$, " ")}]`) : capture && capture.length > 0 && (output += `[${capture.join(" ")}]`), 

diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/core",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "../core.mjs",
   "module": "../core.mjs",
   "types": "../core.d.ts",

diff --git a/jsx-dev-runtime/package.json b/jsx-dev-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/jsx-dev-runtime",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "../core.mjs",
   "module": "../core.mjs",
   "types": "../jsx-runtime.d.ts",

diff --git a/jsx-runtime/package.json b/jsx-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/jsx-runtime",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "../core.mjs",
   "module": "../core.mjs",
   "types": "../jsx-runtime.d.ts",

diff --git a/loader/package.json b/loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/loader",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

diff --git a/optimizer.cjs b/optimizer.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/optimizer 1.5.7-dev20240619180045
+ * @builder.io/qwik/optimizer 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -1256,7 +1256,7 @@ globalThis.qwikOptimizer = function(module) {
     }
   };
   var versions = {
-    qwik: "1.5.7-dev20240619180045"
+    qwik: "1.5.7-dev20240620004924"
   };
   async function getSystem() {
     const sysEnv = getEnv();
@@ -2059,6 +2059,7 @@ globalThis.qwikOptimizer = function(module) {
           const match = /^([^?]*)\?_qrl_parent=(.*)/.exec(id2);
           if (match) {
             let [, qrlId, parentId] = match;
+            parentId = decodeURIComponent(parentId);
             parentId.startsWith(opts.rootDir) && (qrlId = `${opts.rootDir}${qrlId}`);
             if (!transformedOutputs.has(qrlId)) {
               return null;
@@ -2996,6 +2997,7 @@ globalThis.qwikOptimizer = function(module) {
                 }
               }));
             }));
+            const encode = url2 => encodeURIComponent(url2).replaceAll("%2F", "/");
             const renderOpts = {
               debug: true,
               locale: serverData.locale,
@@ -3008,7 +3010,7 @@ globalThis.qwikOptimizer = function(module) {
                 }
                 const chunk = mapper && mapper[getSymbolHash(symbolName)];
                 if (chunk) {
-                  return chunk;
+                  return [ chunk[0], encode(chunk[1]) ];
                 }
                 parent ||= foundQrls.get(symbolName);
                 if (!parent) {
@@ -3017,7 +3019,7 @@ globalThis.qwikOptimizer = function(module) {
                 }
                 const parentPath = path.dirname(parent);
                 const qrlPath = parentPath.startsWith(opts.rootDir) ? path.relative(opts.rootDir, parentPath) : parentPath;
-                const qrlFile = `${qrlPath}/${symbolName.toLowerCase()}.js?_qrl_parent=${parent}`;
+                const qrlFile = `${encode(qrlPath)}/${symbolName.toLowerCase()}.js?_qrl_parent=${encode(parent)}`;
                 return [ symbolName, `${base}${qrlFile}` ];
               },
               prefetchStrategy: null,

diff --git a/optimizer.mjs b/optimizer.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/optimizer 1.5.7-dev20240619180045
+ * @builder.io/qwik/optimizer 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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: "1.5.7-dev20240619180045"
+  qwik: "1.5.7-dev20240620004924"
 };
 
 async function getSystem() {
@@ -2070,6 +2070,7 @@ function createPlugin(optimizerOptions = {}) {
         const match = /^([^?]*)\?_qrl_parent=(.*)/.exec(id2);
         if (match) {
           let [, qrlId, parentId] = match;
+          parentId = decodeURIComponent(parentId);
           parentId.startsWith(opts.rootDir) && (qrlId = `${opts.rootDir}${qrlId}`);
           if (!transformedOutputs.has(qrlId)) {
             return null;
@@ -3102,6 +3103,7 @@ async function configureDevServer(base, server, opts, sys, path, isClientDevOnly
               }
             }));
           }));
+          const encode = url2 => encodeURIComponent(url2).replaceAll("%2F", "/");
           const renderOpts = {
             debug: true,
             locale: serverData.locale,
@@ -3114,7 +3116,7 @@ async function configureDevServer(base, server, opts, sys, path, isClientDevOnly
               }
               const chunk = mapper && mapper[getSymbolHash(symbolName)];
               if (chunk) {
-                return chunk;
+                return [ chunk[0], encode(chunk[1]) ];
               }
               parent || (parent = foundQrls.get(symbolName));
               if (!parent) {
@@ -3123,7 +3125,7 @@ async function configureDevServer(base, server, opts, sys, path, isClientDevOnly
               }
               const parentPath = path.dirname(parent);
               const qrlPath = parentPath.startsWith(opts.rootDir) ? path.relative(opts.rootDir, parentPath) : parentPath;
-              const qrlFile = `${qrlPath}/${symbolName.toLowerCase()}.js?_qrl_parent=${parent}`;
+              const qrlFile = `${encode(qrlPath)}/${symbolName.toLowerCase()}.js?_qrl_parent=${encode(parent)}`;
               return [ symbolName, `${base}${qrlFile}` ];
             },
             prefetchStrategy: null,

diff --git a/optimizer/package.json b/optimizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/optimizer",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "../optimizer.mjs",
   "module": "../optimizer.mjs",
   "types": "../optimizer.d.ts",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
   "license": "MIT",
   "main": "./core.mjs",

diff --git a/prefetch/package.json b/prefetch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/prefetch",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,

diff --git a/server.cjs b/server.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/server 1.5.7-dev20240619180045
+ * @builder.io/qwik/server 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -159,7 +159,7 @@ function getBuildBase(opts) {
   return `${import_meta.env.BASE_URL}build/`;
 }
 var versions = {
-  qwik: "1.5.7-dev20240619180045",
+  qwik: "1.5.7-dev20240620004924",
   qwikDom: "2.1.19"
 };
 

diff --git a/server.mjs b/server.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/server 1.5.7-dev20240619180045
+ * @builder.io/qwik/server 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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
@@ -114,7 +114,7 @@ function getBuildBase(opts) {
   return `${import.meta.env.BASE_URL}build/`;
 }
 var versions = {
-  qwik: "1.5.7-dev20240619180045",
+  qwik: "1.5.7-dev20240620004924",
   qwikDom: "2.1.19"
 };
 

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/server",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "../server.mjs",
   "module": "../server.mjs",
   "types": "../server.d.ts",

diff --git a/testing/index.cjs b/testing/index.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/testing 1.5.7-dev20240619180045
+ * @builder.io/qwik/testing 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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

diff --git a/testing/index.mjs b/testing/index.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/testing 1.5.7-dev20240619180045
+ * @builder.io/qwik/testing 1.5.7-dev20240620004924
  * Copyright Builder.io, Inc. 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

diff --git a/testing/package.json b/testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/testing",
-  "version": "1.5.7-dev20240619180045",
+  "version": "1.5.7-dev20240620004924",
   "main": "index.mjs",
   "types": "index.d.ts",
   "private": true,