npm - @inkandswitch/patchwork - Versions diffs - 0.7.1 → 0.7.3 - Mend

@inkandswitch/patchwork 0.7.1 → 0.7.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/CHANGELOG.md +28 -0
package/dist/site-kit/html.js +13 -3
package/dist/site-kit/options.d.ts +9 -1
package/dist/vite/build-info-plugin.d.ts +1 -1
package/dist/vite/build-info-plugin.js +1 -1
package/dist/vite/config-plugin.d.ts +1 -1
package/dist/vite/config-plugin.js +1 -1
package/dist/vite/dev-plugin.d.ts +1 -1
package/dist/vite/dev-plugin.js +1 -1
package/dist/vite/html-plugin.d.ts +1 -1
package/dist/vite/html-plugin.js +1 -1
package/dist/vite/icons.d.ts +1 -1
package/dist/vite/icons.js +1 -1
package/dist/vite/manifest-plugin.d.ts +1 -1
package/dist/vite/manifest-plugin.js +1 -1
package/dist/vite/netlify-plugin.d.ts +1 -1
package/dist/vite/netlify-plugin.js +1 -1
package/dist/vite/patchwork-plugin.d.ts +10 -0
package/dist/vite/patchwork-plugin.js +26 -16
package/dist/vite/static-plugin.d.ts +3 -2
package/dist/vite/static-plugin.js +15 -4
package/package.json +45 -5
package/src/site-kit/html.ts +17 -3
package/src/site-kit/options.ts +9 -1
package/src/vite/build-info-plugin.ts +1 -1
package/src/vite/config-plugin.ts +1 -1
package/src/vite/dev-plugin.ts +1 -1
package/src/vite/html-plugin.ts +1 -1
package/src/vite/icons.ts +1 -1
package/src/vite/manifest-plugin.ts +1 -1
package/src/vite/netlify-plugin.ts +1 -1
package/src/vite/patchwork-plugin.ts +27 -16
package/src/vite/static-plugin.ts +23 -8

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,33 @@
 # @inkandswitch/patchwork
+## 0.7.3
+### Patch Changes
+- 8742cd2: Expose the individual vite plugins that `patchwork()` composes. Each one now has its own subpath — `@inkandswitch/patchwork/vite/importmap`, `/vite/service-worker`, `/vite/config`, `/vite/dev`, `/vite/icons`, `/vite/html`, `/vite/manifest`, `/vite/netlify`, `/vite/static`, `/vite/build-info` — and they are also re-exported from `@inkandswitch/patchwork/vite` as `importmap`, `serviceworker`, `config`, `dev`, `icons`, `html`, `manifest`, `netlify`, `statics` and `buildInfo`, so a site that wants its own composition can pick the pieces it needs instead of the whole default plugin array.
+- Updated dependencies [94f6299]
+- Updated dependencies [a96f250]
+  - @inkandswitch/patchwork-elements@6.0.1
+  - @inkandswitch/patchwork-plugins@1.2.1
+  - @inkandswitch/patchwork-filesystem@0.2.6
+## 0.7.2
+### Patch Changes
+- e1374ad: Serve the `/packages/…` builtin URLs in dev. Import maps don't apply to worker
+  scripts, so code that starts one — `@automerge/automerge-repo`'s shared
+  subduction websocket worker, for instance — asks for the `/packages/…` path the
+  build emits. Nothing served those in dev, and the worker failed to fetch; the
+  dev server now redirects them to the same optimized dep the page's import map
+  points at.
+- e1374ad: Say what's actually wrong when a `static` package declares a directory that
+  isn't there. The package resolved fine — its `"patchwork": {"static": …}` field
+  is what's wrong — and "static source not found" named neither the field nor the
+  path it pointed at. The error now quotes the declaration, gives the full path
+  that's missing, and says that a package publishing its static tree as the root
+  of its own tarball shouldn't set the field at all.
 ## 0.7.1
 ### Patch Changes

package/dist/site-kit/html.js CHANGED Viewed

@@ -15,6 +15,10 @@ export function escapeHtml(value) {
 export function buildHtml(options) {
     const title = options.title ?? DEFAULT_TITLE;
     const lang = (options.html && options.html.lang) || "en";
+    const attributes = Object.entries((options.html && options.html.attributes) || {})
+        .filter(([name]) => name !== "lang" && /^[a-z][a-z0-9-]*$/i.test(name))
+        .map(([name, value]) => ` ${name}="${escapeHtml(value)}"`)
+        .join("");
     const entry = options.entry ?? "/src/main.ts";
     const syncServers = resolveSyncServers(options);
     const head = [
@@ -61,11 +65,17 @@ export function buildHtml(options) {
     if (options.html && options.html.extraHead) {
         head.push(options.html.extraHead);
     }
+    const body = [
+        `<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>`,
+        `<script type="module" src="${entry}"></script>`,
+    ];
+    if (options.html && options.html.extraBody) {
+        body.push(options.html.extraBody);
+    }
     return `<!doctype html>
-<html lang="${lang}">
+<html lang="${lang}"${attributes}>
 ${head.join("\n")}
-<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>
-<script type="module" src="${entry}"></script>
+${body.join("\n")}
 </html>
 `;
 }

package/dist/site-kit/options.d.ts CHANGED Viewed

@@ -16,8 +16,16 @@ export interface PatchworkIconsOptions {
 }
 export interface PatchworkHtmlOptions {
     lang?: string;
-    /** Raw HTML appended just before </html> — e.g. extra <link>/<meta> tags. */
+    /** Raw HTML appended after the generated head — e.g. extra <link>/<meta> tags. */
     extraHead?: string;
+    /** Raw HTML appended after the app root and entry script. */
+    extraBody?: string;
+    /**
+     * Attributes set on the root `<html>` element. How a site states its own
+     * configuration to the packages it loads: a package reads the attribute
+     * instead of guessing from load order. `lang` stays its own option.
+     */
+    attributes?: Record<string, string>;
 }
 export interface PatchworkNetlifyOptions {
     /** Cache-Control: immutable on /assets/*. Default true. */

package/dist/vite/build-info-plugin.d.ts CHANGED Viewed

@@ -5,4 +5,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export declare function buildInfoPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function buildInfo(options?: PatchworkVitePluginOptions): Plugin | null;

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

@@ -37,7 +37,7 @@ function describe(directory) {
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export function buildInfoPlugin(options = {}) {
+export function buildInfo(options = {}) {
     if (!options.buildInfo)
         return null;
     let root;

package/dist/vite/config-plugin.d.ts CHANGED Viewed

@@ -15,5 +15,5 @@ export declare function buildDefines(options?: PatchworkVitePluginOptions): Reco
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export declare function configPlugin(options?: PatchworkVitePluginOptions): Plugin;
+export declare function config(options?: PatchworkVitePluginOptions): Plugin;
 export { wasm };

package/dist/vite/config-plugin.js CHANGED Viewed

@@ -27,7 +27,7 @@ export function buildDefines(options = {}) {
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export function configPlugin(options = {}) {
+export function config(options = {}) {
     return {
         name: "@patchwork/config",
         config() {

package/dist/vite/dev-plugin.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
-export declare function devPlugin(options?: PatchworkVitePluginOptions): Plugin;
+export declare function dev(options?: PatchworkVitePluginOptions): Plugin;

package/dist/vite/dev-plugin.js CHANGED Viewed

@@ -53,7 +53,7 @@ function workerContexts(options) {
     }
     return contexts;
 }
-export function devPlugin(options = {}) {
+export function dev(options = {}) {
     let serve = false;
     let contexts;
     const wasm = new Map(wasmAssets().map(({ fileName, path }) => [`/${fileName}`, path]));

package/dist/vite/html-plugin.d.ts CHANGED Viewed

@@ -8,4 +8,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export declare function htmlPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function html(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/html-plugin.js CHANGED Viewed

@@ -9,7 +9,7 @@ const GENERATED_PATH = "index.html";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export function htmlPlugin(options = {}) {
+export function html(options = {}) {
     if (options.html === false)
         return null;
     const html = buildHtml(options);

package/dist/vite/icons.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export declare function iconsPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function icons(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/icons.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { resolve } from "node:path";
 import { getIcons } from "../site-kit/icons.js";
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export function iconsPlugin(options = {}) {
+export function icons(options = {}) {
     if (!options.icons)
         return null;
     const { source } = options.icons;

package/dist/vite/manifest-plugin.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import type { Plugin } from "vite";
 import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export declare function manifestPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function manifest(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/manifest-plugin.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { buildManifest } from "../site-kit/manifest.js";
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export function manifestPlugin(options = {}) {
+export function manifest(options = {}) {
     if (options.manifest === false)
         return null;
     const manifest = buildManifest(options);

package/dist/vite/netlify-plugin.d.ts CHANGED Viewed

@@ -6,4 +6,4 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export declare function netlifyPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function netlify(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/netlify-plugin.js CHANGED Viewed

@@ -5,7 +5,7 @@ import { buildHeaders, REDIRECTS } from "../site-kit/netlify.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export function netlifyPlugin(options = {}) {
+export function netlify(options = {}) {
     if (options.netlify === false)
         return null;
     const headers = buildHeaders(options);

package/dist/vite/patchwork-plugin.d.ts CHANGED Viewed

@@ -23,6 +23,16 @@ import type { PatchworkSiteOptions } from "../site-kit/options.js";
  * a different bundler adapter.
  */
 export default function patchwork(options?: PatchworkVitePluginOptions): Plugin<any>[];
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";
 type Imports = {
     [name: string]: string;
 };

package/dist/vite/patchwork-plugin.js CHANGED Viewed

@@ -1,13 +1,13 @@
 import { importmap } from "./importmap-plugin.js";
 import { serviceworker } from "./service-worker-plugin.js";
-import { configPlugin, wasm } from "./config-plugin.js";
-import { devPlugin } from "./dev-plugin.js";
-import { iconsPlugin } from "./icons.js";
-import { htmlPlugin } from "./html-plugin.js";
-import { manifestPlugin } from "./manifest-plugin.js";
-import { netlifyPlugin } from "./netlify-plugin.js";
-import { staticPlugin } from "./static-plugin.js";
-import { buildInfoPlugin } from "./build-info-plugin.js";
+import { config, wasm } from "./config-plugin.js";
+import { dev } from "./dev-plugin.js";
+import { icons } from "./icons.js";
+import { html } from "./html-plugin.js";
+import { manifest } from "./manifest-plugin.js";
+import { netlify } from "./netlify-plugin.js";
+import { statics } from "./static-plugin.js";
+import { buildInfo } from "./build-info-plugin.js";
 /**
  * The patchwork vite plugin. A site's vite.config.ts can shrink down to
  * `plugins: [patchwork({...})]` plus a single source icon file — this plugin
@@ -32,15 +32,25 @@ import { buildInfoPlugin } from "./build-info-plugin.js";
 export default function patchwork(options) {
     return [
         wasm(),
-        configPlugin(options),
-        iconsPlugin(options),
-        htmlPlugin(options),
-        manifestPlugin(options),
-        netlifyPlugin(options),
+        config(options),
+        icons(options),
+        html(options),
+        manifest(options),
+        netlify(options),
         importmap(options),
         serviceworker(),
-        devPlugin(options),
-        staticPlugin(options),
-        buildInfoPlugin(options),
+        dev(options),
+        statics(options),
+        buildInfo(options),
     ].filter((plugin) => plugin != null);
 }
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";

package/dist/vite/static-plugin.d.ts CHANGED Viewed

@@ -7,7 +7,8 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * `from` is either a package specifier or a path relative to the site root. A
  * package says where its static tree lives with a `"patchwork": {"static":
  * "static-dist"}` field in its own package.json; without one, the whole
- * package directory is mounted.
+ * package directory is mounted — which is what a package that publishes its
+ * static tree as the root of its own tarball wants.
  */
 export interface PatchworkStaticSource {
     from: string;
@@ -43,4 +44,4 @@ export declare function resolveStatic(options: PatchworkVitePluginOptions, root:
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export declare function staticPlugin(options?: PatchworkVitePluginOptions): Plugin | null;
+export declare function statics(options?: PatchworkVitePluginOptions): Plugin | null;

package/dist/vite/static-plugin.js CHANGED Viewed

@@ -34,17 +34,28 @@ function packageDirectory(name, root) {
         throw new Error(`[patchwork] can't find the package "${name}" — a static source has to be a dependency of the site`);
     }
 }
+/** A package's static tree: the directory it declares, or its root. */
+function staticDirectory(name, directory) {
+    const declared = JSON.parse(readFileSync(join(directory, "package.json"), "utf8")).patchwork?.static;
+    if (!declared)
+        return directory;
+    const path = join(directory, declared);
+    if (!existsSync(path)) {
+        throw new Error(`[patchwork] ${name} declares "patchwork": {"static": ${JSON.stringify(declared)}}, but ${path} doesn't exist. ` +
+            `The field is a path inside the installed package — a package that publishes its static tree as the tarball's own root shouldn't set it at all.`);
+    }
+    return path;
+}
 export function resolveStatic(options, root) {
     return (options.static ?? []).map((source) => {
         const entry = typeof source === "string" ? { from: source } : source;
         const isPath = entry.from.startsWith(".") || isAbsolute(entry.from);
         const directory = isPath ? undefined : packageDirectory(entry.from, root);
         const path = directory
-            ? join(directory, JSON.parse(readFileSync(join(directory, "package.json"), "utf8"))
-                .patchwork?.static ?? ".")
+            ? staticDirectory(entry.from, directory)
             : resolve(root, entry.from);
         if (!existsSync(path)) {
-            throw new Error(`[patchwork] static source not found: ${entry.from}`);
+            throw new Error(`[patchwork] static source not found: ${entry.from} (${path})`);
         }
         const file = statSync(path).isFile();
         const to = entry.to ?? "/";
@@ -105,7 +116,7 @@ async function files(source, directory = source) {
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export function staticPlugin(options = {}) {
+export function statics(options = {}) {
     if (!options.static?.length)
         return null;
     let sources = [];

package/package.json CHANGED Viewed

@@ -5,7 +5,7 @@
     "url": "git+https://github.com/inkandswitch/patchwork-system.git",
     "directory": "core/patchwork"
   },
-  "version": "0.7.1",
+  "version": "0.7.3",
   "author": "Ink & Switch",
   "type": "module",
   "license": "MIT",
@@ -19,6 +19,46 @@
       "import": "./dist/vite/patchwork-plugin.js",
       "types": "./dist/vite/patchwork-plugin.d.ts"
     },
+    "./vite/build-info": {
+      "import": "./dist/vite/build-info-plugin.js",
+      "types": "./dist/vite/build-info-plugin.d.ts"
+    },
+    "./vite/config": {
+      "import": "./dist/vite/config-plugin.js",
+      "types": "./dist/vite/config-plugin.d.ts"
+    },
+    "./vite/dev": {
+      "import": "./dist/vite/dev-plugin.js",
+      "types": "./dist/vite/dev-plugin.d.ts"
+    },
+    "./vite/html": {
+      "import": "./dist/vite/html-plugin.js",
+      "types": "./dist/vite/html-plugin.d.ts"
+    },
+    "./vite/icons": {
+      "import": "./dist/vite/icons.js",
+      "types": "./dist/vite/icons.d.ts"
+    },
+    "./vite/importmap": {
+      "import": "./dist/vite/importmap-plugin.js",
+      "types": "./dist/vite/importmap-plugin.d.ts"
+    },
+    "./vite/manifest": {
+      "import": "./dist/vite/manifest-plugin.js",
+      "types": "./dist/vite/manifest-plugin.d.ts"
+    },
+    "./vite/netlify": {
+      "import": "./dist/vite/netlify-plugin.js",
+      "types": "./dist/vite/netlify-plugin.d.ts"
+    },
+    "./vite/service-worker": {
+      "import": "./dist/vite/service-worker-plugin.js",
+      "types": "./dist/vite/service-worker-plugin.d.ts"
+    },
+    "./vite/static": {
+      "import": "./dist/vite/static-plugin.js",
+      "types": "./dist/vite/static-plugin.d.ts"
+    },
     "./head": {
       "import": "./dist/head.js"
     },
@@ -44,10 +84,10 @@
     "sharp": "^0.35.3",
     "vite-plugin-wasm": "^3.6.0",
     "@inkandswitch/patchwork-bootloader": "^0.6.2",
-    "@inkandswitch/patchwork-filesystem": "^0.2.5",
-    "@inkandswitch/patchwork-providers": "^0.5.0",
-    "@inkandswitch/patchwork-plugins": "^1.2.0",
-    "@inkandswitch/patchwork-elements": "^6.0.0"
+    "@inkandswitch/patchwork-elements": "^6.0.1",
+    "@inkandswitch/patchwork-filesystem": "^0.2.6",
+    "@inkandswitch/patchwork-plugins": "^1.2.1",
+    "@inkandswitch/patchwork-providers": "^0.5.0"
   },
   "devDependencies": {
     "rollup": "^4.61.1",

package/src/site-kit/html.ts CHANGED Viewed

@@ -18,6 +18,12 @@ export function escapeHtml(value: string): string {
 export function buildHtml(options: PatchworkSiteOptions): string {
   const title = options.title ?? DEFAULT_TITLE;
   const lang = (options.html && options.html.lang) || "en";
+  const attributes = Object.entries(
+    (options.html && options.html.attributes) || {}
+  )
+    .filter(([name]) => name !== "lang" && /^[a-z][a-z0-9-]*$/i.test(name))
+    .map(([name, value]) => ` ${name}="${escapeHtml(value)}"`)
+    .join("");
   const entry = options.entry ?? "/src/main.ts";
   const syncServers = resolveSyncServers(options);
@@ -90,11 +96,19 @@ export function buildHtml(options: PatchworkSiteOptions): string {
     head.push(options.html.extraHead);
   }
+  const body = [
+    `<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>`,
+    `<script type="module" src="${entry}"></script>`,
+  ];
+  if (options.html && options.html.extraBody) {
+    body.push(options.html.extraBody);
+  }
   return `<!doctype html>
-<html lang="${lang}">
+<html lang="${lang}"${attributes}>
 ${head.join("\n")}
-<repo-provider><patchwork-view id="root"></patchwork-view></repo-provider>
-<script type="module" src="${entry}"></script>
+${body.join("\n")}
 </html>
 `;
 }

package/src/site-kit/options.ts CHANGED Viewed

@@ -19,8 +19,16 @@ export interface PatchworkIconsOptions {
 export interface PatchworkHtmlOptions {
   lang?: string;
-  /** Raw HTML appended just before </html> — e.g. extra <link>/<meta> tags. */
+  /** Raw HTML appended after the generated head — e.g. extra <link>/<meta> tags. */
   extraHead?: string;
+  /** Raw HTML appended after the app root and entry script. */
+  extraBody?: string;
+  /**
+   * Attributes set on the root `<html>` element. How a site states its own
+   * configuration to the packages it loads: a package reads the attribute
+   * instead of guessing from load order. `lang` stays its own option.
+   */
+  attributes?: Record<string, string>;
 }
 export interface PatchworkNetlifyOptions {

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

@@ -43,7 +43,7 @@ function describe(directory: string) {
  * revision, the version of patchwork that built it, and every `static` source,
  * plus whatever extra fields the site passes as the option value.
  */
-export function buildInfoPlugin(
+export function buildInfo(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.buildInfo) return null;

package/src/vite/config-plugin.ts CHANGED Viewed

@@ -40,7 +40,7 @@ export function buildDefines(
  * used to hand-write in its own vite.config.ts. Each is switched off
  * individually via the matching `false` option.
  */
-export function configPlugin(
+export function config(
   options: PatchworkVitePluginOptions = {}
 ): Plugin {
   return {

package/src/vite/dev-plugin.ts CHANGED Viewed

@@ -71,7 +71,7 @@ function workerContexts(
   return contexts;
 }
-export function devPlugin(options: PatchworkVitePluginOptions = {}): Plugin {
+export function dev(options: PatchworkVitePluginOptions = {}): Plugin {
   let serve = false;
   let contexts: Map<string, Promise<esbuild.BuildContext>> | undefined;
   const wasm = new Map(

package/src/vite/html-plugin.ts CHANGED Viewed

@@ -13,7 +13,7 @@ const GENERATED_PATH = "index.html";
  * virtual module: `resolveId` claims the one id we care about, `load`
  * returns the generated string — nothing ever touches disk.
  */
-export function htmlPlugin(
+export function html(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.html === false) return null;

package/src/vite/icons.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 import { getIcons } from "../site-kit/icons.js";
 /** Emits the rendered icon PNGs for build, and serves the same buffers for dev. */
-export function iconsPlugin(
+export function icons(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.icons) return null;

package/src/vite/manifest-plugin.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
 import { buildManifest } from "../site-kit/manifest.js";
 /** Emits manifest.webmanifest for build and serves it for dev, from the same generated object. */
-export function manifestPlugin(
+export function manifest(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.manifest === false) return null;

package/src/vite/netlify-plugin.ts CHANGED Viewed

@@ -8,7 +8,7 @@ import { buildHeaders, REDIRECTS } from "../site-kit/netlify.js";
  * The Link header shares its sync-server/wasm-asset lists with html-plugin
  * so the two never drift out of sync with each other.
  */
-export function netlifyPlugin(
+export function netlify(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (options.netlify === false) return null;

package/src/vite/patchwork-plugin.ts CHANGED Viewed

@@ -2,14 +2,14 @@ import type { Plugin, ServerOptions, PreviewOptions, BuildOptions } from "vite";
 import { importmap } from "./importmap-plugin.js";
 import { serviceworker } from "./service-worker-plugin.js";
-import { configPlugin, wasm } from "./config-plugin.js";
-import { devPlugin } from "./dev-plugin.js";
-import { iconsPlugin } from "./icons.js";
-import { htmlPlugin } from "./html-plugin.js";
-import { manifestPlugin } from "./manifest-plugin.js";
-import { netlifyPlugin } from "./netlify-plugin.js";
-import { staticPlugin, type PatchworkStaticSource } from "./static-plugin.js";
-import { buildInfoPlugin } from "./build-info-plugin.js";
+import { config, wasm } from "./config-plugin.js";
+import { dev } from "./dev-plugin.js";
+import { icons } from "./icons.js";
+import { html } from "./html-plugin.js";
+import { manifest } from "./manifest-plugin.js";
+import { netlify } from "./netlify-plugin.js";
+import { statics, type PatchworkStaticSource } from "./static-plugin.js";
+import { buildInfo } from "./build-info-plugin.js";
 import type { PatchworkSiteOptions } from "../site-kit/options.js";
 /**
@@ -36,19 +36,30 @@ import type { PatchworkSiteOptions } from "../site-kit/options.js";
 export default function patchwork(options?: PatchworkVitePluginOptions) {
   return [
     wasm(),
-    configPlugin(options),
-    iconsPlugin(options),
-    htmlPlugin(options),
-    manifestPlugin(options),
-    netlifyPlugin(options),
+    config(options),
+    icons(options),
+    html(options),
+    manifest(options),
+    netlify(options),
     importmap(options),
     serviceworker(),
-    devPlugin(options),
-    staticPlugin(options),
-    buildInfoPlugin(options),
+    dev(options),
+    statics(options),
+    buildInfo(options),
   ].filter((plugin): plugin is Plugin => plugin != null);
 }
+export { importmap, builtins, devDependencyId } from "./importmap-plugin.js";
+export { serviceworker, workers } from "./service-worker-plugin.js";
+export { config, buildDefines, wasm } from "./config-plugin.js";
+export { dev } from "./dev-plugin.js";
+export { icons } from "./icons.js";
+export { html } from "./html-plugin.js";
+export { manifest } from "./manifest-plugin.js";
+export { netlify } from "./netlify-plugin.js";
+export { statics, resolveStatic } from "./static-plugin.js";
+export { buildInfo } from "./build-info-plugin.js";
 type Imports = { [name: string]: string };
 export type ImportMap = {
   imports: Imports;

package/src/vite/static-plugin.ts CHANGED Viewed

@@ -22,7 +22,8 @@ import type { PatchworkVitePluginOptions } from "./patchwork-plugin.js";
  * `from` is either a package specifier or a path relative to the site root. A
  * package says where its static tree lives with a `"patchwork": {"static":
  * "static-dist"}` field in its own package.json; without one, the whole
- * package directory is mounted.
+ * package directory is mounted — which is what a package that publishes its
+ * static tree as the root of its own tarball wants.
  */
 export interface PatchworkStaticSource {
   from: string;
@@ -87,6 +88,22 @@ function packageDirectory(name: string, root: string) {
   }
 }
+/** A package's static tree: the directory it declares, or its root. */
+function staticDirectory(name: string, directory: string) {
+  const declared = JSON.parse(
+    readFileSync(join(directory, "package.json"), "utf8")
+  ).patchwork?.static;
+  if (!declared) return directory;
+  const path = join(directory, declared);
+  if (!existsSync(path)) {
+    throw new Error(
+      `[patchwork] ${name} declares "patchwork": {"static": ${JSON.stringify(declared)}}, but ${path} doesn't exist. ` +
+        `The field is a path inside the installed package — a package that publishes its static tree as the tarball's own root shouldn't set it at all.`
+    );
+  }
+  return path;
+}
 export function resolveStatic(
   options: PatchworkVitePluginOptions,
   root: string
@@ -96,14 +113,12 @@ export function resolveStatic(
     const isPath = entry.from.startsWith(".") || isAbsolute(entry.from);
     const directory = isPath ? undefined : packageDirectory(entry.from, root);
     const path = directory
-      ? join(
-          directory,
-          JSON.parse(readFileSync(join(directory, "package.json"), "utf8"))
-            .patchwork?.static ?? "."
-        )
+      ? staticDirectory(entry.from, directory)
       : resolve(root, entry.from);
     if (!existsSync(path)) {
-      throw new Error(`[patchwork] static source not found: ${entry.from}`);
+      throw new Error(
+        `[patchwork] static source not found: ${entry.from} (${path})`
+      );
     }
     const file = statSync(path).isFile();
     const to = entry.to ?? "/";
@@ -162,7 +177,7 @@ async function files(source: string, directory = source): Promise<string[]> {
  * order, and a site keeps its own `modules.json` by listing it before the
  * package it borrows the rest of the packages from.
  */
-export function staticPlugin(
+export function statics(
   options: PatchworkVitePluginOptions = {}
 ): Plugin | null {
   if (!options.static?.length) return null;