@multiplatform.one/vite-plugin-gnome 9.1.0 → 9.2.0

package/lib/index.cjs

@@ -318,6 +318,48 @@ function gnomeShimsOf(options, root) {
 	};
 }
 /**
+* Wraps a path-matching `manualChunks` so it never names a chunk for a module
+* the entries reach only through `import()`. A named chunk is a static import
+* of whatever uses it, so a lazy module caught by a rule like
+* `id.includes("public/components")` would evaluate at startup: shiki's
+* `import("shiki/wasm")` then runs `atob` at the top of the GJS import and
+* the bundle dies before the first frame (FZ-11149). Such a module returns
+* null instead and keeps the default lazy chunk. A module with no importers
+* that isn't an entry, or one the bundler can't describe, keeps the wrapped
+* answer.
+*/
+function keepLazyModulesLazy(manualChunks) {
+	const eager = /* @__PURE__ */ new Map();
+	const isEager = (id, meta) => {
+		const seen = new Set([id]);
+		const queue = [id];
+		while (queue.length > 0) {
+			const current = queue.pop();
+			const known = eager.get(current);
+			if (known === true) return markEager(id);
+			if (known === false) continue;
+			const info = meta.getModuleInfo(current);
+			if (!info || info.isEntry) return markEager(id);
+			if (info.importers.length === 0 && info.dynamicImporters.length === 0) return markEager(id);
+			for (const importer of info.importers) if (!seen.has(importer)) {
+				seen.add(importer);
+				queue.push(importer);
+			}
+		}
+		for (const lazy of seen) eager.set(lazy, false);
+		return false;
+	};
+	const markEager = (id) => {
+		eager.set(id, true);
+		return true;
+	};
+	return (id, meta) => {
+		const name = manualChunks(id, meta);
+		if (!name || !meta?.getModuleInfo) return name;
+		return eager.get(id) ?? isEager(id, meta) ? name : null;
+	};
+}
+/**
 * Resolution for a GNOME build, in one plugin. It turns the
 * {@link gnomeCondition} condition on, after the config's own
 * `resolve.conditions` (which it requires), applies the config's
@@ -349,6 +391,13 @@ function gnomeResolve() {
 		configResolved(config) {
 			resolver = gnomeShimResolver(gnomeShimsOf(config.gnome, config.root));
 		},
+		outputOptions(options) {
+			if (typeof options.manualChunks !== "function") return null;
+			return {
+				...options,
+				manualChunks: keepLazyModulesLazy(options.manualChunks)
+			};
+		},
 		async resolveId(source, importer) {
 			const shim = resolver.shimFor(source, importer);
 			if (shim) return shim;
@@ -366,6 +415,7 @@ exports.gnomePlatformExtensions = gnomePlatformExtensions;
 exports.gnomeResolve = gnomeResolve;
 exports.gnomeShimResolver = gnomeShimResolver;
 exports.gnomeShimsOf = gnomeShimsOf;
+exports.keepLazyModulesLazy = keepLazyModulesLazy;
 exports.tamaguiAliases = tamaguiAliases;
 exports.tamaguiLinkedAliases = tamaguiLinkedAliases;
 exports.tamaguiPatchAnchors = tamaguiPatchAnchors;

package/lib/index.mjs

@@ -317,6 +317,48 @@ function gnomeShimsOf(options, root) {
 	};
 }
 /**
+* Wraps a path-matching `manualChunks` so it never names a chunk for a module
+* the entries reach only through `import()`. A named chunk is a static import
+* of whatever uses it, so a lazy module caught by a rule like
+* `id.includes("public/components")` would evaluate at startup: shiki's
+* `import("shiki/wasm")` then runs `atob` at the top of the GJS import and
+* the bundle dies before the first frame (FZ-11149). Such a module returns
+* null instead and keeps the default lazy chunk. A module with no importers
+* that isn't an entry, or one the bundler can't describe, keeps the wrapped
+* answer.
+*/
+function keepLazyModulesLazy(manualChunks) {
+	const eager = /* @__PURE__ */ new Map();
+	const isEager = (id, meta) => {
+		const seen = new Set([id]);
+		const queue = [id];
+		while (queue.length > 0) {
+			const current = queue.pop();
+			const known = eager.get(current);
+			if (known === true) return markEager(id);
+			if (known === false) continue;
+			const info = meta.getModuleInfo(current);
+			if (!info || info.isEntry) return markEager(id);
+			if (info.importers.length === 0 && info.dynamicImporters.length === 0) return markEager(id);
+			for (const importer of info.importers) if (!seen.has(importer)) {
+				seen.add(importer);
+				queue.push(importer);
+			}
+		}
+		for (const lazy of seen) eager.set(lazy, false);
+		return false;
+	};
+	const markEager = (id) => {
+		eager.set(id, true);
+		return true;
+	};
+	return (id, meta) => {
+		const name = manualChunks(id, meta);
+		if (!name || !meta?.getModuleInfo) return name;
+		return eager.get(id) ?? isEager(id, meta) ? name : null;
+	};
+}
+/**
 * Resolution for a GNOME build, in one plugin. It turns the
 * {@link gnomeCondition} condition on, after the config's own
 * `resolve.conditions` (which it requires), applies the config's
@@ -348,6 +390,13 @@ function gnomeResolve() {
 		configResolved(config) {
 			resolver = gnomeShimResolver(gnomeShimsOf(config.gnome, config.root));
 		},
+		outputOptions(options) {
+			if (typeof options.manualChunks !== "function") return null;
+			return {
+				...options,
+				manualChunks: keepLazyModulesLazy(options.manualChunks)
+			};
+		},
 		async resolveId(source, importer) {
 			const shim = resolver.shimFor(source, importer);
 			if (shim) return shim;
@@ -360,4 +409,4 @@ function gnomeResolve() {
 }
 
 //#endregion
-export { gnomeCondition, gnomePlatformExtensions, gnomeResolve, gnomeShimResolver, gnomeShimsOf, tamaguiAliases, tamaguiLinkedAliases, tamaguiPatchAnchors, tamaguiPlugin };
+export { gnomeCondition, gnomePlatformExtensions, gnomeResolve, gnomeShimResolver, gnomeShimsOf, keepLazyModulesLazy, tamaguiAliases, tamaguiLinkedAliases, tamaguiPatchAnchors, tamaguiPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/vite-plugin-gnome",
-  "version": "9.1.0",
+  "version": "9.2.0",
   "description": "Vite plugin that makes Tamagui render under react-gnome (GTK4/GJS) — bundle patches for @tamagui/core's native lazy-init chains, the sheet/portal native builds, the hover/animation gates, plus the Tamagui-specific resolver aliases. Pairs with @react-gnome/vite-plugin (generic GJS aliases/conditions/define).",
   "keywords": [
     "gjs",

package/src/index.ts

@@ -586,6 +586,66 @@ export function gnomeShimsOf(
   return { dir: resolve(root, shims.dir), packages: shims.packages };
 }
 
+/** The slice of a bundler's module info {@link keepLazyModulesLazy} reads. */
+export interface LazyChunkModuleInfo {
+  isEntry: boolean;
+  importers: readonly string[];
+  dynamicImporters: readonly string[];
+}
+
+/** The `meta` argument Rollup and Rolldown pass to `output.manualChunks`. */
+export interface LazyChunkMeta {
+  getModuleInfo(id: string): LazyChunkModuleInfo | null;
+}
+
+/** A function-form `output.manualChunks`. */
+export type ManualChunks = (id: string, meta: LazyChunkMeta) => string | null | undefined | void;
+
+/**
+ * Wraps a path-matching `manualChunks` so it never names a chunk for a module
+ * the entries reach only through `import()`. A named chunk is a static import
+ * of whatever uses it, so a lazy module caught by a rule like
+ * `id.includes("public/components")` would evaluate at startup: shiki's
+ * `import("shiki/wasm")` then runs `atob` at the top of the GJS import and
+ * the bundle dies before the first frame (FZ-11149). Such a module returns
+ * null instead and keeps the default lazy chunk. A module with no importers
+ * that isn't an entry, or one the bundler can't describe, keeps the wrapped
+ * answer.
+ */
+export function keepLazyModulesLazy(manualChunks: ManualChunks): ManualChunks {
+  const eager = new Map<string, boolean>();
+  const isEager = (id: string, meta: LazyChunkMeta): boolean => {
+    const seen = new Set<string>([id]);
+    const queue = [id];
+    while (queue.length > 0) {
+      const current = queue.pop() as string;
+      const known = eager.get(current);
+      if (known === true) return markEager(id);
+      if (known === false) continue;
+      const info = meta.getModuleInfo(current);
+      if (!info || info.isEntry) return markEager(id);
+      if (info.importers.length === 0 && info.dynamicImporters.length === 0) return markEager(id);
+      for (const importer of info.importers) {
+        if (!seen.has(importer)) {
+          seen.add(importer);
+          queue.push(importer);
+        }
+      }
+    }
+    for (const lazy of seen) eager.set(lazy, false);
+    return false;
+  };
+  const markEager = (id: string): true => {
+    eager.set(id, true);
+    return true;
+  };
+  return (id, meta) => {
+    const name = manualChunks(id, meta);
+    if (!name || !meta?.getModuleInfo) return name;
+    return (eager.get(id) ?? isEager(id, meta)) ? name : null;
+  };
+}
+
 /**
  * Resolution for a GNOME build, in one plugin. It turns the
  * {@link gnomeCondition} condition on, after the config's own
@@ -627,6 +687,13 @@ export function gnomeResolve(): Plugin {
         gnomeShimsOf((config as { gnome?: GnomeOptions }).gnome, config.root),
       );
     },
+    outputOptions(options) {
+      if (typeof options.manualChunks !== "function") return null;
+      return {
+        ...options,
+        manualChunks: keepLazyModulesLazy(options.manualChunks as ManualChunks),
+      };
+    },
     async resolveId(source, importer) {
       const shim = resolver.shimFor(source, importer);
       if (shim) return shim;

package/types/index.d.ts

@@ -126,6 +126,30 @@ export interface GnomeShimResolver {
 export declare function gnomeShimResolver(shims: GnomeShims | undefined): GnomeShimResolver;
 /** A config's `gnome.shims` with `dir` resolved against `root`, or undefined. */
 export declare function gnomeShimsOf(options: GnomeOptions | undefined, root: string): GnomeShims | undefined;
+/** The slice of a bundler's module info {@link keepLazyModulesLazy} reads. */
+export interface LazyChunkModuleInfo {
+    isEntry: boolean;
+    importers: readonly string[];
+    dynamicImporters: readonly string[];
+}
+/** The `meta` argument Rollup and Rolldown pass to `output.manualChunks`. */
+export interface LazyChunkMeta {
+    getModuleInfo(id: string): LazyChunkModuleInfo | null;
+}
+/** A function-form `output.manualChunks`. */
+export type ManualChunks = (id: string, meta: LazyChunkMeta) => string | null | undefined | void;
+/**
+ * Wraps a path-matching `manualChunks` so it never names a chunk for a module
+ * the entries reach only through `import()`. A named chunk is a static import
+ * of whatever uses it, so a lazy module caught by a rule like
+ * `id.includes("public/components")` would evaluate at startup: shiki's
+ * `import("shiki/wasm")` then runs `atob` at the top of the GJS import and
+ * the bundle dies before the first frame (FZ-11149). Such a module returns
+ * null instead and keeps the default lazy chunk. A module with no importers
+ * that isn't an entry, or one the bundler can't describe, keeps the wrapped
+ * answer.
+ */
+export declare function keepLazyModulesLazy(manualChunks: ManualChunks): ManualChunks;
 /**
  * Resolution for a GNOME build, in one plugin. It turns the
  * {@link gnomeCondition} condition on, after the config's own

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAkCA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,uBAAuB,EAAE,SAAS,MAAM,EAOpD,CAAC;AAEF,oEAAoE;AACpE,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;IAC/D,6DAA6D;IAC7D,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA+PD;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,EAAE,SAAS,kBAAkB,EAK5D,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,MA8E3B,CAAC;AAEF,kEAAkE;AAClE,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,aAAa,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAWD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,mBAAmB,GAAG,iBAAiB,EAAE,CAShF;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,GAAG,iBAAiB,EAAE,CAStF;AAED;;;;;GAKG;AACH,eAAO,MAAM,cAAc,UAAU,CAAC;AAEtC,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,mCAAmC;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC,CAAC;CACtD;AAED,4EAA4E;AAC5E,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;CAC7B;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,UAAU;QAClB,KAAK,CAAC,EAAE,YAAY,CAAC;KACtB;CACF;AAED,oEAAoE;AACpE,MAAM,WAAW,iBAAiB;IAChC,6FAA6F;IAC7F,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;IAC7E,2EAA2E;IAC3E,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACnD;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,SAAS,GAAG,iBAAiB,CAiClF;AAED,iFAAiF;AACjF,wBAAgB,YAAY,CAC1B,OAAO,EAAE,YAAY,GAAG,SAAS,EACjC,IAAI,EAAE,MAAM,GACX,UAAU,GAAG,SAAS,CAIxB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,YAAY,IAAI,MAAM,CAmCrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}