@inkandswitch/patchwork 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @inkandswitch/patchwork
 
+## 0.7.1
+
+### Patch Changes
+
+- 8b9206d: Don't copy `static` sources or write `build-info.json` when a dev server shuts
+  down. `closeBundle` runs then too, so stopping `vite` was filling `dist/` with
+  a copy of every static source.
+
 ## 0.7.0
 
 ### Minor Changes

package/dist/vite/build-info-plugin.js

@@ -42,13 +42,17 @@ export function buildInfoPlugin(options = {}) {
         return null;
     let root;
     let outDir;
+    let serve = false;
     return {
         name: "@patchwork/build-info",
         configResolved(config) {
             root = config.root;
             outDir = join(config.root, config.build.outDir);
+            serve = config.command === "serve";
         },
         async closeBundle() {
+            if (serve)
+                return;
             const sources = resolveStatic(options, root).map((source) => source.packageDirectory
                 ? { from: source.from, ...describe(source.packageDirectory) }
                 : { from: source.from, revision: revision(source.path) });

package/dist/vite/dev-plugin.js

@@ -14,6 +14,7 @@ const stylesheets = {
     [PATCHWORK_CSS]: fileURLToPath(import.meta.resolve("@inkandswitch/patchwork/global.css")),
     [BOOTLOADER_CSS]: fileURLToPath(import.meta.resolve("@inkandswitch/patchwork-bootloader/global.css")),
 };
+const builtinPaths = new Map(Object.entries(builtins).map(([id, fileName]) => [fileName, id]));
 /**
  * Workers are `type: "module"` scripts the browser fetches directly, so import
  * maps don't apply to them and their heavy imports have to resolve to real
@@ -92,6 +93,17 @@ export function devPlugin(options = {}) {
                     }
                     return;
                 }
+                // A worker script is fetched by URL, and import maps don't apply to
+                // those, so code that starts one reaches for the /packages/… path the
+                // build emits. In dev those are the optimized deps the page's import
+                // map points at — same module, one URL over.
+                const builtin = builtinPaths.get(pathname);
+                if (builtin) {
+                    response.statusCode = 302;
+                    response.setHeader("Location", `/@id/${encodeURI(devDependencyId(builtin))}`);
+                    response.end();
+                    return;
+                }
                 const binary = wasm.get(pathname);
                 if (binary) {
                     try {

package/dist/vite/static-plugin.js

@@ -112,6 +112,7 @@ export function staticPlugin(options = {}) {
     let root;
     let outDir;
     let base = "/";
+    let serve = false;
     let logger;
     return {
         name: "@patchwork/static",
@@ -120,9 +121,13 @@ export function staticPlugin(options = {}) {
             root = config.root;
             outDir = resolve(config.root, config.build.outDir);
             base = config.base;
+            serve = config.command === "serve";
             logger = config.logger;
         },
         async closeBundle() {
+            // also called when a dev server shuts down, which has nothing to copy
+            if (serve)
+                return;
             for (const source of sources) {
                 const paths = source.file ? [""] : await files(source.path);
                 const kept = [];

package/package.json

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/patchwork"
   },
-  "version": "0.7.0",
+  "version": "0.7.1",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -45,8 +45,8 @@
     "vite-plugin-wasm": "^3.6.0",
     "@inkandswitch/patchwork-bootloader": "^0.6.2",
     "@inkandswitch/patchwork-filesystem": "^0.2.5",
-    "@inkandswitch/patchwork-plugins": "^1.2.0",
     "@inkandswitch/patchwork-providers": "^0.5.0",
+    "@inkandswitch/patchwork-plugins": "^1.2.0",
     "@inkandswitch/patchwork-elements": "^6.0.0"
   },
   "devDependencies": {

package/src/vite/build-info-plugin.ts

@@ -49,13 +49,16 @@ export function buildInfoPlugin(
   if (!options.buildInfo) return null;
   let root: string;
   let outDir: string;
+  let serve = false;
   return {
     name: "@patchwork/build-info",
     configResolved(config) {
       root = config.root;
       outDir = join(config.root, config.build.outDir);
+      serve = config.command === "serve";
     },
     async closeBundle() {
+      if (serve) return;
       const sources = resolveStatic(options, root).map((source) =>
         source.packageDirectory
           ? { from: source.from, ...describe(source.packageDirectory) }

package/src/vite/dev-plugin.ts

@@ -23,6 +23,10 @@ const stylesheets: Record<string, string> = {
   ),
 };
 
+const builtinPaths = new Map(
+  Object.entries(builtins).map(([id, fileName]) => [fileName, id])
+);
+
 /**
  * Workers are `type: "module"` scripts the browser fetches directly, so import
  * maps don't apply to them and their heavy imports have to resolve to real
@@ -117,6 +121,21 @@ export function devPlugin(options: PatchworkVitePluginOptions = {}): Plugin {
           return;
         }
 
+        // A worker script is fetched by URL, and import maps don't apply to
+        // those, so code that starts one reaches for the /packages/… path the
+        // build emits. In dev those are the optimized deps the page's import
+        // map points at — same module, one URL over.
+        const builtin = builtinPaths.get(pathname);
+        if (builtin) {
+          response.statusCode = 302;
+          response.setHeader(
+            "Location",
+            `/@id/${encodeURI(devDependencyId(builtin))}`
+          );
+          response.end();
+          return;
+        }
+
         const binary = wasm.get(pathname);
         if (binary) {
           try {

package/src/vite/static-plugin.ts

@@ -170,6 +170,7 @@ export function staticPlugin(
   let root: string;
   let outDir: string;
   let base = "/";
+  let serve = false;
   let logger: Logger;
   return {
     name: "@patchwork/static",
@@ -178,9 +179,12 @@ export function staticPlugin(
       root = config.root;
       outDir = resolve(config.root, config.build.outDir);
       base = config.base;
+      serve = config.command === "serve";
       logger = config.logger;
     },
     async closeBundle() {
+      // also called when a dev server shuts down, which has nothing to copy
+      if (serve) return;
       for (const source of sources) {
         const paths = source.file ? [""] : await files(source.path);
         const kept: string[] = [];