@10up/wp-vite-plugins 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/index.js

@@ -2326,15 +2326,47 @@ function parseImportClause(statement) {
   }
   return rest === "" ? clause : null;
 }
+function exportClauseRange(code, exports) {
+  let firstName = Number.POSITIVE_INFINITY;
+  let lastName = -1;
+  for (const record of exports) {
+    firstName = Math.min(firstName, record.s, record.ls >= 0 ? record.ls : record.s);
+    lastName = Math.max(lastName, record.e, record.le >= 0 ? record.le : record.e);
+  }
+  if (lastName < 0) return null;
+  const brace = code.lastIndexOf("{", firstName);
+  if (brace < 0) return null;
+  const beforeBrace = code.slice(0, brace).trimEnd();
+  if (!beforeBrace.endsWith("export")) return null;
+  const start = beforeBrace.length - "export".length;
+  if (start > 0 && /[\w$]/.test(code[start - 1])) return null;
+  const close = code.indexOf("}", lastName);
+  if (close < 0) return null;
+  let end = close + 1;
+  while (end < code.length && /\s/.test(code[end])) end += 1;
+  if (code[end] === ";") end += 1;
+  if (!/^export\s*\{[^{}]*\}\s*;?$/.test(code.slice(start, end))) return null;
+  return { start, end };
+}
 function toInlineExpression(code) {
   const [imports, exports] = parse(code);
   if (imports.length > 0) return null;
-  const body = code.replace(/^[ \t]*export\s*\{[^}]*\}\s*;?[ \t]*$/gm, "");
-  if (body === code && exports.length > 0) return null;
-  if (/^\s*(?:import|export)\b/m.test(body)) return null;
+  let body = code;
+  if (exports.length > 0) {
+    const range = exportClauseRange(code, exports);
+    if (!range) return null;
+    body = code.slice(0, range.start) + code.slice(range.end);
+  }
+  try {
+    const [bodyImports, bodyExports] = parse(body);
+    if (bodyImports.length > 0 || bodyExports.length > 0) return null;
+  } catch {
+    return null;
+  }
   const returned = exports.map((record) => `${objectKey(record.n)}: ${record.ln ?? record.n}`).join(", ");
   return `(() => {
 ${body.trim()}
+;
 return { ${returned} };
 })()`;
 }
@@ -2363,32 +2395,46 @@ function wpScriptDedupe() {
     // and normal buckets.
     enforce: "pre",
     apply: "build",
-    async resolveId(source, importer, options) {
-      if (!importer) return null;
-      if (source.includes("\0")) return null;
-      const key = `${importer}
+    resolveId: {
+      // `enforce: 'pre'` alone only puts this plugin in the pre bucket —
+      // *within* it, array position decides, and any pre-bucket resolver
+      // registered earlier answers first and hands back an untagged id.
+      // wpExternals' force-bundle resolver is exactly that: it answers
+      // `wp-vite-bundled:@wordpress/icons` itself, so the barrel came back
+      // unpartitioned and its whole subtree inherited one marker minted
+      // from the barrel — identical for every entry, i.e. a shared chunk
+      // (issue #23). Hook-level `order: 'pre'` puts this resolver ahead of
+      // every other resolveId hook no matter how the plugins are composed;
+      // it delegates through `this.resolve`, so those resolvers still
+      // decide *what* an id resolves to. This plugin only tags the answer.
+      order: "pre",
+      async handler(source, importer, options) {
+        if (!importer) return null;
+        if (source.includes("\0")) return null;
+        const key = `${importer}
 ${source}`;
-      if (inFlight.has(key)) return null;
-      const marker = markerOf(importer) ?? mintMarker(importer);
-      inFlight.add(key);
-      let resolved;
-      try {
-        resolved = await this.resolve(
-          stripEntryMarker(source),
-          stripEntryMarker(importer),
-          {
-            // `kind` rides along so plugins keying on `require-call`
-            // (wpExternals' CJS shim) still see the truth.
-            ...options,
-            skipSelf: true
-          }
-        );
-      } finally {
-        inFlight.delete(key);
+        if (inFlight.has(key)) return null;
+        const marker = markerOf(importer) ?? mintMarker(importer);
+        inFlight.add(key);
+        let resolved;
+        try {
+          resolved = await this.resolve(
+            stripEntryMarker(source),
+            stripEntryMarker(importer),
+            {
+              // `kind` rides along so plugins keying on `require-call`
+              // (wpExternals' CJS shim) still see the truth.
+              ...options,
+              skipSelf: true
+            }
+          );
+        } finally {
+          inFlight.delete(key);
+        }
+        if (!resolved || resolved.external) return resolved;
+        if (!isPartitionable(resolved.id)) return resolved;
+        return { ...resolved, id: withMarker(resolved.id, marker) };
       }
-      if (!resolved || resolved.external) return resolved;
-      if (!isPartitionable(resolved.id)) return resolved;
-      return { ...resolved, id: withMarker(resolved.id, marker) };
     },
     generateBundle: {
       // Load-bearing, not cosmetic: wpExternals emits its `.asset.php`