@quilted/rollup 0.3.1 → 0.3.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @quilted/rollup
 
+## 0.3.3
+
+### Patch Changes
+
+- [#871](https://github.com/lemonmade/quilt/pull/871) [`c16b322`](https://github.com/lemonmade/quilt/commit/c16b3224d3c86bc3a3b6f6af44267650d1e8dc1d) Thanks [@lemonmade](https://github.com/lemonmade)! - Remove @quilt/quilt/globals module
+
+- Updated dependencies [[`c16b322`](https://github.com/lemonmade/quilt/commit/c16b3224d3c86bc3a3b6f6af44267650d1e8dc1d)]:
+  - @quilted/babel@0.2.4
+  - @quilted/graphql@3.3.9
+
+## 0.3.2
+
+### Patch Changes
+
+- [#863](https://github.com/lemonmade/quilt/pull/863) [`3e3e030`](https://github.com/lemonmade/quilt/commit/3e3e030d4e55c24efa79698c3dd18c8b627a864c) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix asset inlining for the default entry
+
 ## 0.3.1
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -266,7 +266,10 @@ async function quiltAppBrowserPlugins({
   if (entries) {
     for (const [name, entry2] of Object.entries(entries)) {
       if (typeof entry2 === "object" && entry2.inline) {
-        inline.add(name.startsWith("./") ? name.slice(2) : name);
+        const bareName = name.startsWith("./") ? name.slice(2) : name;
+        inline.add(
+          bareName === "." ? path.basename(getSourceFromCustomEntry(entry2)).split(".").slice(0, -1).join(".") : bareName
+        );
       }
     }
   }
@@ -738,8 +741,6 @@ function magicModuleAppRequestRouter({
     alias: () => sourceEntryForAppServer({ entry, root }),
     async source() {
       return multiline`
-        import '@quilted/quilt/globals';
-
         import {jsx} from 'preact/jsx-runtime';
         import {RequestRouter} from '@quilted/quilt/request-router';
         import {renderAppToHTMLResponse} from '@quilted/quilt/server';
@@ -778,8 +779,6 @@ function magicModuleAppBrowserEntry({
     async source() {
       const reactRootFunction = hydrate ? "hydrate" : "render";
       return multiline`
-        import '@quilted/quilt/globals';
-
         import {jsx} from 'preact/jsx-runtime';
         import {${reactRootFunction}} from 'preact';
 

package/build/esm/features/async.mjs

@@ -3,7 +3,6 @@ import { multiline } from '../shared/strings.mjs';
 import MagicString from 'magic-string';
 
 const MODULE_PREFIX = "quilt-async-module:";
-const IMPORT_PREFIX = "quilt-async-import:";
 function asyncModules({
   preload = true,
   baseURL = "/assets/",
@@ -13,9 +12,7 @@ function asyncModules({
     name: "@quilted/async",
     async resolveId(id, importer) {
       let prefix;
-      if (id.startsWith(IMPORT_PREFIX)) {
-        prefix = IMPORT_PREFIX;
-      } else if (id.startsWith(MODULE_PREFIX)) {
+      if (id.startsWith(MODULE_PREFIX)) {
         prefix = MODULE_PREFIX;
       } else {
         return null;
@@ -36,20 +33,6 @@ function asyncModules({
             return {id: ${JSON.stringify(moduleID)}, import: load};
           }
         `;
-        return code;
-      }
-      if (id.startsWith(`\0${IMPORT_PREFIX}`)) {
-        const imported = id.replace(`\0${IMPORT_PREFIX}`, "");
-        const moduleID = getModuleID({ imported });
-        const code = multiline`
-          import * as AsyncModule from ${JSON.stringify(imported)};
-
-          ((globalThis[Symbol.for('quilt')] ||= {}).asyncModules ||= new Map).set(${JSON.stringify(
-          moduleID
-        )}, AsyncModule);
-
-          export default AsyncModule;
-        `;
         return {
           code,
           meta: {
@@ -59,16 +42,15 @@ function asyncModules({
       }
       return null;
     },
-    transform: baseURL ? (code) => code.replace(/__QUILT_ASSETS_BASE_URL__/g, JSON.stringify(baseURL)) : void 0,
     async generateBundle(options, bundle) {
       if (preload) {
         switch (options.format) {
           case "es": {
-            await preloadAsyncAssetsInESMBundle(bundle);
+            await preloadAsyncAssetsInESMBundle(bundle, { baseURL });
             break;
           }
           case "system": {
-            await preloadAsyncAssetsInSystemJSBundle(bundle);
+            await preloadAsyncAssetsInSystemJSBundle(bundle, { baseURL });
             break;
           }
         }
@@ -79,7 +61,7 @@ function asyncModules({
 function defaultModuleID({ imported }) {
   return path.relative(process.cwd(), imported).replace(/[\\/]/g, "-");
 }
-async function preloadAsyncAssetsInESMBundle(bundle) {
+async function preloadAsyncAssetsInESMBundle(bundle, { baseURL = "/" } = {}) {
   const { parse: parseImports } = await import('es-module-lexer');
   for (const chunk of Object.values(bundle)) {
     if (chunk.type !== "chunk") continue;
@@ -87,6 +69,7 @@ async function preloadAsyncAssetsInESMBundle(bundle) {
     const { code } = chunk;
     const newCode = new MagicString(code);
     const imports = (await parseImports(code))[0];
+    let hasReplacements = false;
     for (const imported of imports) {
       const { s: start, e: end, ss: importStart, d: dynamicStart } = imported;
       if (dynamicStart < 0) continue;
@@ -94,9 +77,11 @@ async function preloadAsyncAssetsInESMBundle(bundle) {
       const dependencies = getDependenciesForImport(
         importSource,
         chunk,
-        bundle
+        bundle,
+        { baseURL }
       );
       if (dependencies.size === 1) continue;
+      hasReplacements = true;
       const originalImport = code.slice(importStart, end + 1);
       newCode.overwrite(
         importStart,
@@ -104,10 +89,13 @@ async function preloadAsyncAssetsInESMBundle(bundle) {
         preloadContentForDependencies(dependencies, originalImport)
       );
     }
+    if (hasReplacements) {
+      newCode.prepend(getPreloadHelperFunction() + "\n");
+    }
     chunk.code = newCode.toString();
   }
 }
-async function preloadAsyncAssetsInSystemJSBundle(bundle) {
+async function preloadAsyncAssetsInSystemJSBundle(bundle, { baseURL = "/" } = {}) {
   for (const chunk of Object.values(bundle)) {
     if (chunk.type !== "chunk") continue;
     if (chunk.dynamicImports.length === 0) continue;
@@ -115,30 +103,34 @@ async function preloadAsyncAssetsInSystemJSBundle(bundle) {
     const newCode = new MagicString(code);
     const systemDynamicImportRegex = /\bmodule\.import\(([^)]*)\)/g;
     let match;
+    let hasReplacements = false;
     while (match = systemDynamicImportRegex.exec(code)) {
       const [originalImport, imported] = match;
       const importSource = imported.trim().slice(1, imported.length - 1);
       const dependencies = getDependenciesForImport(
         importSource,
         chunk,
-        bundle
+        bundle,
+        { baseURL }
       );
       if (dependencies.size === 1) continue;
+      hasReplacements = true;
       newCode.overwrite(
         match.index,
         match.index + originalImport.length,
         preloadContentForDependencies(dependencies, originalImport)
       );
     }
+    if (hasReplacements) {
+      newCode.prepend(getPreloadHelperFunction() + "\n");
+    }
     chunk.code = newCode.toString();
   }
 }
 function preloadContentForDependencies(dependencies, originalExpression) {
-  return `Promise.resolve().then(() => globalThis[Symbol.for('quilt')]?.asyncModules?.preload?.(${Array.from(
-    dependencies
-  ).map((dependency) => JSON.stringify(dependency)).join(",")})).then(function(){return ${originalExpression}})`;
+  return `__quilt_preload(${JSON.stringify(Array.from(dependencies))}).then(() => {return ${originalExpression}})`;
 }
-function getDependenciesForImport(imported, chunk, bundle) {
+function getDependenciesForImport(imported, chunk, bundle, { baseURL = "/" } = {}) {
   const originalFilename = chunk.fileName;
   const dependencies = /* @__PURE__ */ new Set();
   const analyzed = /* @__PURE__ */ new Set();
@@ -152,7 +144,8 @@ function getDependenciesForImport(imported, chunk, bundle) {
     analyzed.add(filename);
     const chunk2 = bundle[filename];
     if (chunk2 == null) return;
-    dependencies.add(chunk2.fileName);
+    const url = `${baseURL}${baseURL.endsWith("/") ? "" : "/"}${chunk2.fileName}`;
+    dependencies.add(url);
     if (chunk2.type !== "chunk") return;
     for (const imported2 of chunk2.imports) {
       addDependencies(imported2);
@@ -161,5 +154,15 @@ function getDependenciesForImport(imported, chunk, bundle) {
   addDependencies(normalizedFile);
   return dependencies;
 }
+function getPreloadHelperFunction({
+  type = "module"
+} = {}) {
+  const scriptRel = JSON.stringify(
+    type === "module" ? "modulepreload" : "preload"
+  );
+  return multiline`
+    const __quilt_preload=(()=>{const o=new Map,f=${scriptRel};class QuiltPreloadError extends Error{constructor(e,{cause:l}={}){super(\`Unable to preload \${e}\`,{cause:l}),this.source=e}}class QuiltPreloadErrorEvent extends Event{constructor(e){super("quilt:preload-error",{cancelable:!0}),this.error=e}}return function __quilt_preload(e){return e.length===0?Promise.resolve():Promise.all(e.map(s=>{const r=s.startsWith("/")?s:"/"+s;if(o.has(r))return;o.set(r,!0);const i=r.endsWith(".css");if(document.querySelector(\`link[href="\${r}"]\`)!=null)return;const t=document.createElement("link");if(i?t.rel="stylesheet":(t.as="script",t.rel=f),t.crossOrigin="",t.href=r,document.head.appendChild(t),i)return new Promise(a=>{t.addEventListener("load",()=>a()),t.addEventListener("error",h=>a(new QuiltPreloadError(r,{cause:h})))})})).then(s=>{for(const r of s)r!=null&&d(r)})};function d(n){const e=new QuiltPreloadErrorEvent(n);if(window.dispatchEvent(e),!e.defaultPrevented)throw n}})();
+  `;
+}
 
-export { IMPORT_PREFIX, asyncModules };
+export { asyncModules };