@quilted/rollup 0.3.2 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @quilted/rollup
 
+## 0.4.0
+
+### Minor Changes
+
+- [#872](https://github.com/lemonmade/quilt/pull/872) [`8bf65e7`](https://github.com/lemonmade/quilt/commit/8bf65e797f929ee95730323426c229409e65c9a4) Thanks [@lemonmade](https://github.com/lemonmade)! - Replace @quilted/request-router with Hono
+
+## 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

package/build/esm/app.mjs

@@ -1,7 +1,7 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
 import { createRequire } from 'node:module';
-import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS } from './constants.mjs';
+import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_HONO, MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS } from './constants.mjs';
 import { resolveEnvOption } from './features/env.mjs';
 import { multiline } from './shared/strings.mjs';
 import { getNodePlugins, removeBuildFiles, normalizeRollupInput } from './shared/rollup.mjs';
@@ -363,7 +363,7 @@ async function quiltAppServerPlugins({
   app,
   env,
   entry,
-  format = "request-router",
+  format = "hono",
   graphql = true,
   assets,
   output,
@@ -420,12 +420,11 @@ async function quiltAppServerPlugins({
     }),
     magicModuleAppComponent({ entry: app, root: project.root }),
     createMagicModulePlugin({
-      name: "@quilted/request-router",
+      name: "@quilted/hono",
       sideEffects: true,
       module: MAGIC_MODULE_ENTRY,
       source() {
-        const options = { assets: { baseURL } };
-        return runtime.requestRouter?.(options) ?? nodeAppServerRuntime().requestRouter(options);
+        return runtime.hono?.() ?? nodeAppServerRuntime().hono();
       }
     }),
     magicModuleAppRequestRouter({ entry, root: project.root }),
@@ -490,13 +489,13 @@ async function quiltAppServerPlugins({
 function quiltAppServerInput({
   root = process.cwd(),
   entry,
-  format = "request-router"
+  format = "hono"
 } = {}) {
   return {
     name: "@quilted/app-server/input",
     async options(options) {
       const serverEntry = normalizeRollupInput(options.input) ?? await sourceEntryForAppServer({ entry, root });
-      const finalEntry = format === "request-router" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
+      const finalEntry = format === "hono" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
       const finalEntryName = typeof serverEntry === "string" ? path.basename(serverEntry).split(".").slice(0, -1).join(".") : "server";
       return {
         ...options,
@@ -665,8 +664,7 @@ function quiltAppServiceWorkerInput({
 function nodeAppServerRuntime({
   host,
   port,
-  format = "module",
-  assets: serveAssets = true
+  format = "module"
 } = {}) {
   const rollupFormat = format === "commonjs" || format === "cjs" ? "cjs" : "esm";
   return {
@@ -676,37 +674,15 @@ function nodeAppServerRuntime({
         format: rollupFormat
       }
     },
-    requestRouter({ assets }) {
-      const { baseURL } = assets;
+    hono() {
       return multiline`
-        ${serveAssets ? `import * as path from 'path';` : ""}
-        ${rollupFormat === "cjs" ? "" : `import {fileURLToPath} from 'url';`}
-        import {createServer} from 'http';
-
-        import requestRouter from ${JSON.stringify(
-        MAGIC_MODULE_REQUEST_ROUTER
-      )};
-
-        import {createHttpRequestListener${serveAssets ? ", serveStatic" : ""}} from '@quilted/quilt/request-router/node';
+        import app from ${JSON.stringify(MAGIC_MODULE_HONO)};
+        import {serve} from '@quilted/hono/node';
 
         const port = ${port ?? "Number.parseInt(process.env.PORT, 10)"};
         const host = ${host ? JSON.stringify(host) : "process.env.HOST"};
 
-        ${serveAssets ? multiline`
-              const dirname = ${rollupFormat === "cjs" ? `__dirname` : `path.dirname(fileURLToPath(import.meta.url))`};
-              const serve = serveStatic(path.resolve(dirname, '../assets'), {
-                baseUrl: ${JSON.stringify(baseURL)},
-              });
-            ` : ""}
-        const listener = createHttpRequestListener(requestRouter);
-      
-        createServer(async (request, response) => {
-          ${serveAssets ? `if (request.url.startsWith(${JSON.stringify(
-        baseURL
-      )})) return serve(request, response);` : ""}
-
-          await listener(request, response);
-        }).listen(port, host);
+        serve({fetch: app.fetch, port, hostname: host});
       `;
     }
   };
@@ -736,15 +712,13 @@ function magicModuleAppRequestRouter({
   root = process.cwd()
 } = {}) {
   return createMagicModulePlugin({
-    name: "@quilted/magic-module/app-request-router",
-    module: MAGIC_MODULE_REQUEST_ROUTER,
+    name: "@quilted/magic-module/app-hono",
+    module: MAGIC_MODULE_HONO,
     alias: () => sourceEntryForAppServer({ entry, root }),
     async source() {
       return multiline`
-        import '@quilted/quilt/globals';
-
+        import {Hono} from 'hono';
         import {jsx} from 'preact/jsx-runtime';
-        import {RequestRouter} from '@quilted/quilt/request-router';
         import {renderAppToHTMLResponse} from '@quilted/quilt/server';
 
         import App from ${JSON.stringify(MAGIC_MODULE_APP_COMPONENT)};
@@ -752,11 +726,11 @@ function magicModuleAppRequestRouter({
         MAGIC_MODULE_BROWSER_ASSETS
       )};
 
-        const router = new RequestRouter();
+        const app = new Hono();
         const assets = new BrowserAssets();
 
-        // For all GET requests, render our React application.
-        router.get(async (request) => {
+        app.get(async (c) => {
+          const request = c.req.raw;
           const response = await renderAppToHTMLResponse(jsx(App), {
             request,
             assets,
@@ -765,7 +739,7 @@ function magicModuleAppRequestRouter({
           return response;
         });
 
-        export default router;
+        export default app;
       `;
     }
   });
@@ -781,8 +755,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';
 
@@ -1074,4 +1046,4 @@ function getSourceFromCustomEntry(entry) {
   return typeof entry === "object" ? entry.source : entry;
 }
 
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, additionalEntriesForAppBrowser, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, nodeAppServerRuntime, quiltApp, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerInput, quiltAppServerPlugins, quiltAppServiceWorker, quiltAppServiceWorkerInput, quiltAppServiceWorkerPlugins, sourceEntryForAppBrowser, sourceEntryForAppServer, sourceEntryForAppServiceWorker };
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_HONO, additionalEntriesForAppBrowser, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, nodeAppServerRuntime, quiltApp, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerInput, quiltAppServerPlugins, quiltAppServiceWorker, quiltAppServiceWorkerInput, quiltAppServiceWorkerPlugins, sourceEntryForAppBrowser, sourceEntryForAppServer, sourceEntryForAppServiceWorker };

package/build/esm/constants.mjs

@@ -2,6 +2,6 @@ const MAGIC_MODULE_ENV = "quilt:module/env";
 const MAGIC_MODULE_ENTRY = "quilt:module/entry";
 const MAGIC_MODULE_APP_COMPONENT = "quilt:module/app";
 const MAGIC_MODULE_BROWSER_ASSETS = "quilt:module/assets";
-const MAGIC_MODULE_REQUEST_ROUTER = "quilt:module/request-router";
+const MAGIC_MODULE_HONO = "quilt:module/hono";
 
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_ENV, MAGIC_MODULE_REQUEST_ROUTER };
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_ENV, MAGIC_MODULE_HONO };

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 };

package/build/esm/index.mjs

@@ -3,4 +3,4 @@ export { quiltModule } from './module.mjs';
 export { quiltPackage, quiltPackageESModules, quiltPackageESNext } from './package.mjs';
 export { quiltServer } from './server.mjs';
 export { multiline } from './shared/strings.mjs';
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_ENV, MAGIC_MODULE_REQUEST_ROUTER } from './constants.mjs';
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_ENV, MAGIC_MODULE_HONO } from './constants.mjs';

package/build/esm/server.mjs

@@ -3,13 +3,13 @@ import { Project } from './shared/project.mjs';
 import { getNodePlugins, removeBuildFiles } from './shared/rollup.mjs';
 import { multiline } from './shared/strings.mjs';
 import { resolveEnvOption } from './features/env.mjs';
-import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER } from './constants.mjs';
+import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_HONO } from './constants.mjs';
 import { createMagicModulePlugin } from './shared/magic-module.mjs';
 
 async function quiltServer({
   root: rootPath = process.cwd(),
   entry,
-  format = "request-router",
+  format = "hono",
   env,
   graphql = true,
   output,
@@ -47,7 +47,7 @@ async function quiltServer({
     })
   ]);
   const serverEntry = entry ? project.resolve(entry) : await sourceForServer(project);
-  const finalEntry = format === "request-router" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
+  const finalEntry = format === "hono" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
   const finalEntryName = serverEntry ? path.basename(serverEntry).split(".").slice(0, -1).join(".") : "server";
   const plugins = [
     ...nodePlugins,
@@ -65,19 +65,19 @@ async function quiltServer({
     esnext({ mode, targets: ["current node"] }),
     removeBuildFiles([outputDirectory, reportDirectory], { root: project.root })
   ];
-  if (format === "request-router") {
+  if (format === "hono") {
     plugins.push(
       createMagicModulePlugin({
-        name: "@quilted/magic-module/server-request-router",
-        module: MAGIC_MODULE_REQUEST_ROUTER,
+        name: "@quilted/magic-module/server-hono",
+        module: MAGIC_MODULE_HONO,
         alias: serverEntry
       }),
       createMagicModulePlugin({
-        name: "@quilted/request-router",
+        name: "@quilted/hono",
         sideEffects: true,
         module: MAGIC_MODULE_ENTRY,
         source() {
-          return runtime.requestRouter?.() ?? nodeServerRuntime().requestRouter();
+          return runtime.hono?.() ?? nodeServerRuntime().hono();
         }
       })
     );
@@ -127,18 +127,31 @@ function nodeServerRuntime({
     resolve: {
       exportConditions: ["node"]
     },
-    requestRouter() {
+    hono() {
       return multiline`
-        import requestRouter from ${JSON.stringify(
-        MAGIC_MODULE_REQUEST_ROUTER
-      )};
+        import app from ${JSON.stringify(MAGIC_MODULE_HONO)};
 
-        import {createHttpServer} from '@quilted/quilt/request-router/node';
+        import {serve} from '@quilted/quilt/hono/node';
 
         const port = ${port ?? "Number.parseInt(process.env.PORT, 10)"};
         const host = ${host ? JSON.stringify(host) : "process.env.HOST"};
-      
-        createHttpServer(requestRouter).listen(port, host);
+
+        const server = serve(app);
+
+        process.on('SIGINT', () => {
+          server.close();
+          process.exit(0);
+        });
+
+        process.on('SIGTERM', () => {
+          server.close((err) => {
+            if (err) {
+              console.error(err);
+              process.exit(1);
+            }
+            process.exit(0);
+          });
+        });
       `;
     }
   };
@@ -159,4 +172,4 @@ async function sourceForServer(project) {
   return possibleSourceFiles[0];
 }
 
-export { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, nodeServerRuntime, quiltServer };
+export { MAGIC_MODULE_ENTRY, MAGIC_MODULE_HONO, nodeServerRuntime, quiltServer };