9cfb612 fix: improve new SW logic (#6641)

QwikDev/qwik@9cfb612
QwikDev · Jul 8, 2024 · 219eb4c · 219eb4c
1 parent e1dc461
commit 219eb4c
Show file tree

Hide file tree

Showing 28 changed files with 47 additions and 41 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.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439
+ * @builder.io/qwik/cli 1.6.0-dev20240708215852
  * 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.6.0-dev20240705183439");
+  console.log("1.6.0-dev20240708215852");
 }
 // 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.6.0-dev20240705183439
+ * @builder.io/qwik 1.6.0-dev20240708215852
  * 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
@@ -1009,7 +1009,7 @@
      *
      * @public
      */
-    const version = "1.6.0-dev20240705183439";
+    const version = "1.6.0-dev20240708215852";
 
     /**
      * @internal

diff --git a/core.d.ts b/core.d.ts
@@ -3836,7 +3836,7 @@ export declare type ValueOrPromise<T> = T | Promise<T>;
 export declare const _verifySerializable: <T>(value: T, preMessage?: string) => T;
 
 /**
- * 1.6.0-dev20240705183439
+ * 1.6.0-dev20240708215852
  *
  * @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.6.0-dev20240705183439
+ * @builder.io/qwik 1.6.0-dev20240708215852
  * 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
@@ -1005,7 +1005,7 @@ const serializeSStyle = (scopeIds) => {
  *
  * @public
  */
-const version = "1.6.0-dev20240705183439";
+const version = "1.6.0-dev20240708215852";
 
 /**
  * @internal

diff --git a/core.prod.cjs b/core.prod.cjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.6.0-dev20240705183439
+ * @builder.io/qwik 1.6.0-dev20240708215852
  * 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
@@ -355,7 +355,7 @@
             return value;
         }
     };
-    const version = "1.6.0-dev20240705183439";
+    const version = "1.6.0-dev20240708215852";
     const useSequentialScope = () => {
         const iCtx = useInvokeContext();
         const elCtx = getContext(iCtx.$hostElement$, iCtx.$renderCtx$.$static$.$containerState$);

diff --git a/core.prod.mjs b/core.prod.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik 1.6.0-dev20240705183439
+ * @builder.io/qwik 1.6.0-dev20240708215852
  * 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
@@ -592,7 +592,7 @@ const serializeSStyle = scopeIds => {
     }
 };
 
-const version = "1.6.0-dev20240705183439";
+const version = "1.6.0-dev20240708215852";
 
 const useSequentialScope = () => {
     const iCtx = useInvokeContext();

diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/core",
-  "version": "1.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439
+ * @builder.io/qwik/optimizer 1.6.0-dev20240708215852
  * 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.6.0-dev20240705183439"
+    qwik: "1.6.0-dev20240708215852"
   };
   async function getSystem() {
     const sysEnv = getEnv();
@@ -3556,9 +3556,12 @@ globalThis.qwikOptimizer = function(module) {
             const fs = await sys.dynamicImport("node:fs");
             const workerScriptPath = (await this.resolve("@builder.io/qwik/qwik-prefetch.js")).id;
             const workerScript = await fs.promises.readFile(workerScriptPath, "utf-8");
+            const assetsDir = qwikPlugin.getOptions().assetsDir || "";
+            const useAssetsDir = !!assetsDir && "_astro" !== assetsDir;
+            const qwikPrefetchServiceWorkerFile = "qwik-prefetch-service-worker.js";
             this.emitFile({
               type: "asset",
-              fileName: "qwik-prefetch-service-worker.js",
+              fileName: useAssetsDir ? sys.path.join(filePath, qwikPrefetchServiceWorkerFile) : qwikPrefetchServiceWorkerFile,
               source: workerScript
             });
             "function" === typeof opts.manifestOutput && await opts.manifestOutput(manifest);

diff --git a/optimizer.mjs b/optimizer.mjs
@@ -1,6 +1,6 @@
 /**
  * @license
- * @builder.io/qwik/optimizer 1.6.0-dev20240705183439
+ * @builder.io/qwik/optimizer 1.6.0-dev20240708215852
  * 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.6.0-dev20240705183439"
+  qwik: "1.6.0-dev20240708215852"
 };
 
 async function getSystem() {
@@ -3678,9 +3678,12 @@ function qwikVite(qwikViteOpts = {}) {
           const fs = await sys.dynamicImport("node:fs");
           const workerScriptPath = (await this.resolve("@builder.io/qwik/qwik-prefetch.js")).id;
           const workerScript = await fs.promises.readFile(workerScriptPath, "utf-8");
+          const assetsDir = qwikPlugin.getOptions().assetsDir || "";
+          const useAssetsDir = !!assetsDir && "_astro" !== assetsDir;
+          const qwikPrefetchServiceWorkerFile = "qwik-prefetch-service-worker.js";
           this.emitFile({
             type: "asset",
-            fileName: "qwik-prefetch-service-worker.js",
+            fileName: useAssetsDir ? sys.path.join(filePath, qwikPrefetchServiceWorkerFile) : qwikPrefetchServiceWorkerFile,
             source: workerScript
           });
           "function" === typeof opts.manifestOutput && await opts.manifestOutput(manifest);

diff --git a/optimizer/package.json b/optimizer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/qwik/optimizer",
-  "version": "1.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "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.6.0-dev20240705183439",
+  "version": "1.6.0-dev20240708215852",
   "description": "An Open-Source sub-framework designed with a focus on server-side-rendering, lazy-loading, and styling/animation.",
   "license": "MIT",
   "main": "./core.mjs",