@quilted/rollup 0.2.12 → 0.2.14

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @quilted/rollup
 
+## 0.2.14
+
+### Patch Changes
+
+- [#669](https://github.com/lemonmade/quilt/pull/669) [`73127e7f`](https://github.com/lemonmade/quilt/commit/73127e7f32d15ddcdf1ea025eabcb2830e5ba559) Thanks [@lemonmade](https://github.com/lemonmade)! - Add runtime overrides
+
+- [`79845135`](https://github.com/lemonmade/quilt/commit/79845135aababc08b3a02b19a23c8b83d4dbdb82) Thanks [@lemonmade](https://github.com/lemonmade)! - Update rollup-plugin-visualizer to remove peer dependency error
+
+## 0.2.13
+
+### Patch Changes
+
+- [`5a1a3343`](https://github.com/lemonmade/quilt/commit/5a1a33433e1a944bfbbc7562da5e6775585398d3) Thanks [@lemonmade](https://github.com/lemonmade)! - Add async rollup plugin to Vite builds
+
 ## 0.2.12
 
 ### 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_APP_COMPONENT, MAGIC_MODULE_REQUEST_ROUTER, MAGIC_MODULE_BROWSER_ASSETS } from './constants.mjs';
+import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, 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';
@@ -10,14 +10,15 @@ import { getBrowserGroups, getBrowserGroupTargetDetails, targetsSupportModules,
 import { Project } from './shared/project.mjs';
 
 const require = createRequire(import.meta.url);
-async function quiltAppOptions({
+async function quiltApp({
   root = process.cwd(),
   app,
   env,
   graphql,
   assets,
   browser: browserOptions,
-  server: serverOptions
+  server: serverOptions,
+  runtime
 } = {}) {
   const project = Project.load(root);
   const browserGroups = await getBrowserGroups({ root: project.root });
@@ -26,10 +27,11 @@ async function quiltAppOptions({
   const optionPromises = [];
   browserGroupEntries.forEach(([name, browsers], index) => {
     optionPromises.push(
-      quiltAppBrowserOptions({
+      quiltAppBrowser({
         root: project.root,
         app,
         graphql,
+        runtime,
         ...browserOptions,
         env: {
           ...resolveEnvOption(env),
@@ -48,10 +50,11 @@ async function quiltAppOptions({
     );
   });
   optionPromises.push(
-    quiltAppServerOptions({
+    quiltAppServer({
       root: project.root,
       app,
       graphql,
+      runtime: runtime?.server,
       ...serverOptions,
       env: {
         ...resolveEnvOption(env),
@@ -62,11 +65,11 @@ async function quiltAppOptions({
   );
   return Promise.all(optionPromises);
 }
-async function quiltAppBrowserOptions(options = {}) {
-  const { root = process.cwd(), assets } = options;
+async function quiltAppBrowser(options = {}) {
+  const { root = process.cwd(), assets, runtime } = options;
   const project = Project.load(root);
   const [plugins, browserGroup] = await Promise.all([
-    quiltAppBrowser(options),
+    quiltAppBrowserPlugins(options),
     getBrowserGroupTargetDetails(assets?.targets, {
       root: project.root
     })
@@ -80,7 +83,9 @@ async function quiltAppBrowserOptions(options = {}) {
     plugins,
     output: {
       format: isESM ? "esm" : "systemjs",
-      dir: project.resolve(`build/assets`),
+      dir: project.resolve(
+        assets?.directory ?? runtime?.assets?.directory ?? `build/assets`
+      ),
       entryFileNames: `[name]${targetFilenamePart}.[hash].js`,
       assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,
       chunkFileNames: `[name]${targetFilenamePart}.[hash].js`,
@@ -90,7 +95,7 @@ async function quiltAppBrowserOptions(options = {}) {
     }
   };
 }
-async function quiltAppBrowser({
+async function quiltAppBrowserPlugins({
   root = process.cwd(),
   app,
   entry,
@@ -254,25 +259,29 @@ function quiltAppBrowserInput({
     }
   };
 }
-async function quiltAppServerOptions(options = {}) {
-  const { root = process.cwd(), output } = options;
+async function quiltAppServer(options = {}) {
+  const {
+    output,
+    root = process.cwd(),
+    runtime = nodeAppServerRuntime()
+  } = options;
   const project = Project.load(root);
   const hash = output?.hash ?? "async-only";
-  const outputFormat = output?.format ?? "esmodules";
-  const plugins = await quiltAppServer(options);
+  const plugins = await quiltAppServerPlugins({ ...options, root, runtime });
   return {
     plugins,
     output: {
-      format: outputFormat === "commonjs" || outputFormat === "cjs" ? "cjs" : "esm",
+      format: "esm",
       dir: project.resolve(`build/server`),
       entryFileNames: `[name]${hash === true ? `.[hash]` : ""}.js`,
       chunkFileNames: `[name]${hash === true || hash === "async-only" ? `.[hash]` : ""}.js`,
       assetFileNames: `[name]${hash === true ? `.[hash]` : ""}.[ext]`,
-      generatedCode: "es2015"
+      generatedCode: "es2015",
+      ...runtime.output?.options
     }
   };
 }
-async function quiltAppServer({
+async function quiltAppServerPlugins({
   root = process.cwd(),
   app,
   env,
@@ -280,7 +289,8 @@ async function quiltAppServer({
   format = "request-router",
   graphql = true,
   assets,
-  output
+  output,
+  runtime
 } = {}) {
   const project = Project.load(root);
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
@@ -317,10 +327,16 @@ async function quiltAppServer({
     quiltAppServerInput({ root: project.root, entry, format }),
     ...nodePlugins,
     replaceProcessEnv({ mode }),
-    magicModuleEnv({ ...resolveEnvOption(env), mode }),
+    magicModuleEnv({ runtime: runtime?.env, ...resolveEnvOption(env), mode }),
     magicModuleAppComponent({ entry: app, root: project.root }),
-    magicModuleAppServerEntry({
-      assets: { baseURL }
+    createMagicModulePlugin({
+      name: "@quilted/request-router",
+      sideEffects: true,
+      module: MAGIC_MODULE_ENTRY,
+      source() {
+        const options = { assets: { baseURL } };
+        return runtime?.requestRouter?.(options) ?? nodeAppServerRuntime().requestRouter(options);
+      }
     }),
     magicModuleAppRequestRouter({ entry, root: project.root }),
     magicModuleAppAssetManifests(),
@@ -405,6 +421,55 @@ function quiltAppServerInput({
     }
   };
 }
+function nodeAppServerRuntime({
+  host,
+  port,
+  format = "module",
+  assets: serveAssets = true
+} = {}) {
+  const rollupFormat = format === "commonjs" || format === "cjs" ? "cjs" : "esm";
+  return {
+    env: "process.env",
+    output: {
+      options: {
+        format: rollupFormat
+      }
+    },
+    requestRouter({ assets }) {
+      const { baseURL } = assets;
+      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';
+
+        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);
+      `;
+    }
+  };
+}
 function magicModuleAppComponent({
   entry,
   root = process.cwd()
@@ -507,50 +572,6 @@ function magicModuleAppBrowserEntry({
     }
   });
 }
-function magicModuleAppServerEntry({
-  host,
-  port,
-  assets,
-  format = "module"
-} = {}) {
-  const baseURL = typeof assets === "object" ? assets.baseURL : "/assets/";
-  return createMagicModulePlugin({
-    name: "@quilted/request-router/app-server",
-    module: MAGIC_MODULE_ENTRY,
-    sideEffects: true,
-    async source() {
-      const serveAssets = Boolean(assets);
-      return multiline`
-        ${serveAssets ? `import * as path from 'path';` : ""}
-        ${serveAssets && format === "module" ? `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';
-
-        const port = ${port ?? "Number.parseInt(process.env.PORT, 10)"};
-        const host = ${host ? JSON.stringify(host) : "process.env.HOST"};
-
-        ${serveAssets ? `const dirname = ${format === "module" ? "path.dirname(fileURLToPath(import.meta.url))" : "__dirname"};
-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);
-      `;
-    }
-  });
-}
 function magicModuleAppAssetManifests() {
   return createMagicModulePlugin({
     name: "@quilted/magic-module/asset-manifests",
@@ -705,4 +726,4 @@ function createManualChunksSorter() {
   };
 }
 
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, magicModuleAppServerEntry, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserOptions, quiltAppOptions, quiltAppServer, quiltAppServerInput, quiltAppServerOptions, sourceEntryForAppBrowser };
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, nodeAppServerRuntime, quiltApp, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerInput, quiltAppServerPlugins, sourceEntryForAppBrowser };

package/build/esm/index.mjs

@@ -1,4 +1,6 @@
-export { quiltAppBrowser, quiltAppBrowserOptions, quiltAppOptions, quiltAppServer, quiltAppServerOptions } from './app.mjs';
+export { quiltApp, quiltAppBrowser, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerPlugins } from './app.mjs';
 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';

package/build/esm/server.mjs

@@ -1,6 +1,6 @@
 import { Project } from './shared/project.mjs';
 import { getNodePlugins, removeBuildFiles } from './shared/rollup.mjs';
-import { magicModuleRequestRouterEntry } from './features/request-router.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 { createMagicModulePlugin } from './shared/magic-module.mjs';
@@ -12,16 +12,16 @@ async function quiltServer({
   env,
   graphql = true,
   output,
-  port,
-  host
+  runtime = nodeServerRuntime()
 } = {}) {
   const project = Project.load(rootPath);
   const mode = (typeof env === "object" ? env?.mode : void 0) ?? "production";
-  const outputDirectory = project.resolve("build/server");
+  const outputDirectory = project.resolve(
+    output?.directory ?? runtime.output?.directory ?? "build/server"
+  );
   const minify = output?.minify ?? false;
   const bundle = output?.bundle;
   const hash = output?.hash ?? "async-only";
-  const outputFormat = output?.format ?? "esmodules";
   const [
     { visualizer },
     { magicModuleEnv, replaceProcessEnv },
@@ -46,7 +46,7 @@ async function quiltServer({
   const plugins = [
     ...nodePlugins,
     replaceProcessEnv({ mode }),
-    magicModuleEnv({ ...resolveEnvOption(env), mode }),
+    magicModuleEnv({ runtime: runtime.env, ...resolveEnvOption(env), mode }),
     sourceCode({ mode, targets: ["current node"] }),
     tsconfigAliases({ root: project.root }),
     monorepoPackageAliases({ root: project.root }),
@@ -61,9 +61,13 @@ async function quiltServer({
         module: MAGIC_MODULE_REQUEST_ROUTER,
         alias: serverEntry
       }),
-      magicModuleRequestRouterEntry({
-        host,
-        port: typeof port === "string" ? Number.parseInt(port, 10) : port
+      createMagicModulePlugin({
+        name: "@quilted/request-router",
+        sideEffects: true,
+        module: MAGIC_MODULE_ENTRY,
+        source() {
+          return runtime.requestRouter?.() ?? nodeServerRuntime().requestRouter();
+        }
       })
     );
   }
@@ -87,12 +91,41 @@ async function quiltServer({
     input: finalEntry === MAGIC_MODULE_ENTRY ? { server: finalEntry } : finalEntry,
     plugins,
     output: {
-      format: outputFormat === "commonjs" || outputFormat === "cjs" ? "cjs" : "esm",
+      format: "esm",
       dir: outputDirectory,
       entryFileNames: `[name]${hash === true ? `.[hash]` : ""}.js`,
       chunkFileNames: `[name]${hash === true || hash === "async-only" ? `.[hash]` : ""}.js`,
       assetFileNames: `[name]${hash === true ? `.[hash]` : ""}.[ext]`,
-      generatedCode: "es2015"
+      generatedCode: "es2015",
+      ...runtime.output?.options
+    }
+  };
+}
+function nodeServerRuntime({
+  host,
+  port,
+  format = "module"
+} = {}) {
+  return {
+    env: "process.env",
+    output: {
+      options: {
+        format: format === "commonjs" || format === "cjs" ? "cjs" : "esm"
+      }
+    },
+    requestRouter() {
+      return multiline`
+        import requestRouter from ${JSON.stringify(
+        MAGIC_MODULE_REQUEST_ROUTER
+      )};
+
+        import {createHttpServer} from '@quilted/quilt/request-router/node';
+
+        const port = ${port ?? "Number.parseInt(process.env.PORT, 10)"};
+        const host = ${host ? JSON.stringify(host) : "process.env.HOST"};
+      
+        createHttpServer(requestRouter).listen(port, host);
+      `;
     }
   };
 }
@@ -112,4 +145,4 @@ async function sourceForServer(project) {
   return possibleSourceFiles[0];
 }
 
-export { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, quiltServer };
+export { MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, nodeServerRuntime, quiltServer };