@quilted/rollup 0.2.18 → 0.2.20

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/rollup
 
+## 0.2.20
+
+### Patch Changes
+
+- [`545ec714`](https://github.com/lemonmade/quilt/commit/545ec714275700c550e6586c7a0490b1ee321b6d) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix server output directory
+
+## 0.2.19
+
+### Patch Changes
+
+- [#675](https://github.com/lemonmade/quilt/pull/675) [`e7115258`](https://github.com/lemonmade/quilt/commit/e7115258241d9e049280224d205e2c40bb31d3ca) Thanks [@lemonmade](https://github.com/lemonmade)! - Improve output directories and names
+
 ## 0.2.18
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -109,6 +109,9 @@ async function quiltAppBrowserPlugins({
   const minify = assets?.minify ?? mode === "production";
   const baseURL = assets?.baseURL ?? "/assets/";
   const assetsInline = assets?.inline ?? true;
+  const assetsDirectory = project.resolve("build/assets");
+  const reportsDirectory = path.join(assetsDirectory, "../reports");
+  const manifestsDirectory = path.join(assetsDirectory, "../manifests");
   const browserGroup = await getBrowserGroupTargetDetails(assets?.targets, {
     root: project.root
   });
@@ -190,7 +193,7 @@ async function quiltAppBrowserPlugins({
       baseURL,
       format: supportsModuleWorkers ? "module" : "classic",
       outputOptions: {
-        dir: project.resolve(`build/assets`),
+        dir: assetsDirectory,
         entryFileNames: `[name]${targetFilenamePart}.[hash].js`,
         assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,
         chunkFileNames: `[name]${targetFilenamePart}.[hash].js`
@@ -201,17 +204,21 @@ async function quiltAppBrowserPlugins({
   ];
   if (assets?.clean ?? true) {
     plugins.push(
-      removeBuildFiles(["build/assets", "build/manifests", "build/reports"], {
-        root: project.root
-      })
+      removeBuildFiles(
+        [assetsDirectory, manifestsDirectory, reportsDirectory],
+        {
+          root: project.root
+        }
+      )
     );
   }
   if (graphql) {
     const { graphql: graphql2 } = await import('./features/graphql.mjs');
     plugins.push(
       graphql2({
-        manifest: project.resolve(
-          `build/manifests/graphql${targetFilenamePart}.json`
+        manifest: path.join(
+          manifestsDirectory,
+          `graphql${targetFilenamePart}.json`
         )
       })
     );
@@ -228,15 +235,16 @@ async function quiltAppBrowserPlugins({
     assetManifest({
       baseURL,
       cacheKey,
-      file: project.resolve(`build/manifests/assets${targetFilenamePart}.json`),
+      file: path.join(manifestsDirectory, `assets${targetFilenamePart}.json`),
       priority: assets?.priority
     }),
     visualizer({
       template: "treemap",
       open: false,
       brotliSize: true,
-      filename: project.resolve(
-        `build/reports/bundle-visualizer${targetFilenamePart}.html`
+      filename: path.join(
+        reportsDirectory,
+        `bundle-visualizer${targetFilenamePart}.html`
       )
     })
   );
@@ -250,11 +258,12 @@ function quiltAppBrowserInput({
     name: "@quilted/app-browser/input",
     async options(options) {
       const finalEntry = normalizeRollupInput(options.input) ?? await sourceEntryForAppBrowser({ entry, root }) ?? MAGIC_MODULE_ENTRY;
+      const finalEntryName = typeof finalEntry === "string" && finalEntry !== MAGIC_MODULE_ENTRY ? path.basename(finalEntry).split(".").slice(0, -1).join(".") : "browser";
       return {
         ...options,
         // If we are using the "magic entry", give it an explicit name of `browser`.
         // Otherwise, Rollup will use the file name as the output name.
-        input: finalEntry === MAGIC_MODULE_ENTRY ? { browser: finalEntry } : finalEntry
+        input: typeof finalEntry === "string" ? { [finalEntryName]: finalEntry } : finalEntry
       };
     }
   };
@@ -267,12 +276,13 @@ async function quiltAppServer(options = {}) {
   } = options;
   const project = Project.load(root);
   const hash = output?.hash ?? "async-only";
+  const format = runtime.output?.format ?? "esm";
   const plugins = await quiltAppServerPlugins({ ...options, root, runtime });
   return {
     plugins,
     output: {
-      format: "esm",
-      dir: project.resolve(`build/server`),
+      format: format === "cjs" || format === "commonjs" ? "commonjs" : "esm",
+      dir: project.resolve(runtime.output?.directory ?? `build/server`),
       entryFileNames: `[name]${hash === true ? `.[hash]` : ""}.js`,
       chunkFileNames: `[name]${hash === true || hash === "async-only" ? `.[hash]` : ""}.js`,
       assetFileNames: `[name]${hash === true ? `.[hash]` : ""}.[ext]`,
@@ -296,6 +306,10 @@ async function quiltAppServerPlugins({
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
   const baseURL = assets?.baseURL ?? "/assets/";
   const assetsInline = assets?.inline ?? true;
+  const outputDirectory = project.resolve(
+    runtime.output?.directory ?? "build/server"
+  );
+  const reportsDirectory = path.resolve(outputDirectory, "../reports");
   const bundle = output?.bundle ?? runtime.output?.bundle;
   const minify = output?.minify ?? false;
   const [
@@ -378,7 +392,7 @@ async function quiltAppServerPlugins({
       preload: false,
       moduleID: ({ imported }) => path.relative(project.root, imported)
     }),
-    removeBuildFiles(["build/server"], { root: project.root }),
+    removeBuildFiles([outputDirectory], { root: project.root }),
     tsconfigAliases({ root: project.root }),
     monorepoPackageAliases({ root: project.root })
   ];
@@ -395,7 +409,7 @@ async function quiltAppServerPlugins({
       template: "treemap",
       open: false,
       brotliSize: false,
-      filename: project.resolve(`build/reports/bundle-visualizer.server.html`)
+      filename: path.join(reportsDirectory, `bundle-visualizer.server.html`)
     })
   );
   return plugins;
@@ -405,23 +419,15 @@ function quiltAppServerInput({
   entry,
   format = "request-router"
 } = {}) {
-  const project = Project.load(root);
   return {
     name: "@quilted/app-server/input",
     async options(options) {
-      let finalEntry = normalizeRollupInput(options.input);
-      if (!finalEntry) {
-        const serverEntry = entry ? project.resolve(entry) : await project.glob("{server,service,backend}.{ts,tsx,mjs,js,jsx}", {
-          nodir: true,
-          absolute: true
-        }).then((files) => files[0]);
-        finalEntry = format === "request-router" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
-      }
+      const serverEntry = normalizeRollupInput(options.input) ?? await sourceEntryForAppServer({ entry, root });
+      const finalEntry = format === "request-router" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
+      const finalEntryName = typeof serverEntry === "string" ? path.basename(serverEntry).split(".").slice(0, -1).join(".") : "server";
       return {
         ...options,
-        // If we are using the "magic entry", give it an explicit name of `server`.
-        // Otherwise, Rollup will use the file name as the output name.
-        input: finalEntry === MAGIC_MODULE_ENTRY ? { server: finalEntry } : finalEntry
+        input: typeof finalEntry === "string" ? { [finalEntryName]: finalEntry } : finalEntry
       };
     }
   };
@@ -655,6 +661,24 @@ async function sourceEntryForAppBrowser({
     return files[0];
   }
 }
+async function sourceEntryForAppServer({
+  entry,
+  root = process.cwd()
+}) {
+  const project = Project.load(root);
+  if (entry) {
+    return project.resolve(entry);
+  } else {
+    const files = await project.glob(
+      "{server,service,backend}.{ts,tsx,mjs,js,jsx}",
+      {
+        nodir: true,
+        absolute: true
+      }
+    );
+    return files[0];
+  }
+}
 const FRAMEWORK_CHUNK_NAME = "framework";
 const POLYFILLS_CHUNK_NAME = "polyfills";
 const VENDOR_CHUNK_NAME = "vendor";
@@ -731,4 +755,4 @@ function createManualChunksSorter() {
   };
 }
 
-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 };
+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, sourceEntryForAppServer };

package/build/esm/module.mjs

@@ -1,3 +1,4 @@
+import * as path from 'node:path';
 import { Project, sourceEntriesForProject } from './shared/project.mjs';
 import { getNodePlugins, removeBuildFiles } from './shared/rollup.mjs';
 import { getBrowserGroupTargetDetails, rollupGenerateOptionsForBrowsers } from './shared/browserslist.mjs';
@@ -12,7 +13,8 @@ async function quiltModule({
 } = {}) {
   const project = Project.load(root);
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
-  const outputDirectory = project.resolve("build/assets");
+  const outputDirectory = project.resolve("build/output");
+  const reportDirectory = path.join(outputDirectory, "../reports");
   const minify = assets?.minify ?? true;
   const hash = assets?.hash ?? "async-only";
   const bundle = assets?.bundle ?? true;
@@ -60,7 +62,7 @@ async function quiltModule({
   }
   if (assets?.clean ?? true) {
     plugins.push(
-      removeBuildFiles(["build/assets", "build/reports"], {
+      removeBuildFiles([outputDirectory, reportDirectory], {
         root: project.root
       })
     );
@@ -70,8 +72,9 @@ async function quiltModule({
       template: "treemap",
       open: false,
       brotliSize: true,
-      filename: project.resolve(
-        `build/reports/bundle-visualizer${targetFilenamePart}.html`
+      filename: path.join(
+        reportDirectory,
+        `bundle-visualizer${targetFilenamePart}.html`
       )
     })
   );

package/build/esm/server.mjs

@@ -1,8 +1,9 @@
+import * as path from 'node:path';
 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_REQUEST_ROUTER, MAGIC_MODULE_ENTRY } from './constants.mjs';
 import { createMagicModulePlugin } from './shared/magic-module.mjs';
 
 async function quiltServer({
@@ -17,8 +18,9 @@ async function quiltServer({
   const project = Project.load(rootPath);
   const mode = (typeof env === "object" ? env?.mode : void 0) ?? "production";
   const outputDirectory = project.resolve(
-    output?.directory ?? runtime.output?.directory ?? "build/server"
+    output?.directory ?? runtime.output?.directory ?? "build/output"
   );
+  const reportDirectory = path.resolve(outputDirectory, "../reports");
   const minify = output?.minify ?? false;
   const bundle = output?.bundle ?? runtime.output?.bundle;
   const hash = output?.hash ?? "async-only";
@@ -43,6 +45,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 finalEntryName = serverEntry ? path.basename(serverEntry).split(".").slice(0, -1).join(".") : "server";
   const plugins = [
     ...nodePlugins,
     replaceProcessEnv({ mode }),
@@ -57,7 +60,7 @@ async function quiltServer({
     monorepoPackageAliases({ root: project.root }),
     react(),
     esnext({ mode, targets: ["current node"] }),
-    removeBuildFiles(["build/server", "build/reports"], { root: project.root })
+    removeBuildFiles([outputDirectory, reportDirectory], { root: project.root })
   ];
   if (format === "request-router") {
     plugins.push(
@@ -89,11 +92,11 @@ async function quiltServer({
       template: "treemap",
       open: false,
       brotliSize: true,
-      filename: project.resolve(`build/reports/bundle-visualizer.html`)
+      filename: path.join(reportDirectory, "bundle-visualizer.html")
     })
   );
   return {
-    input: finalEntry === MAGIC_MODULE_ENTRY ? { server: finalEntry } : finalEntry,
+    input: { [finalEntryName]: finalEntry },
     plugins,
     output: {
       format: "esm",