@quilted/rollup 0.2.19 → 0.2.21

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/rollup
 
+## 0.2.21
+
+### Patch Changes
+
+- [`704e17f0`](https://github.com/lemonmade/quilt/commit/704e17f0336e2cde642d5fd39badf23e9c072944) Thanks [@lemonmade](https://github.com/lemonmade)! - Improve `runtime` build option
+
+## 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

package/build/esm/app.mjs

@@ -276,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]`,
@@ -305,7 +306,9 @@ 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("build/server");
+  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;
@@ -332,7 +335,10 @@ async function quiltAppServerPlugins({
     import('./features/assets.mjs'),
     import('./features/async.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle })
+    getNodePlugins({
+      bundle,
+      resolve: { exportConditions: runtime.resolve?.exportConditions }
+    })
   ]);
   const plugins = [
     quiltAppServerInput({ root: project.root, entry, format }),

package/build/esm/module.mjs

@@ -9,15 +9,18 @@ async function quiltModule({
   entry,
   env,
   assets,
-  graphql = true
+  graphql = true,
+  runtime
 } = {}) {
   const project = Project.load(root);
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
-  const outputDirectory = project.resolve("build/output");
+  const outputDirectory = project.resolve(
+    runtime?.output?.directory ?? "build/output"
+  );
   const reportDirectory = path.join(outputDirectory, "../reports");
   const minify = assets?.minify ?? true;
   const hash = assets?.hash ?? "async-only";
-  const bundle = assets?.bundle ?? true;
+  const bundle = assets?.bundle ?? runtime?.output?.bundle ?? true;
   const browserGroup = await getBrowserGroupTargetDetails(assets?.targets, {
     root: project.root
   });
@@ -39,7 +42,10 @@ async function quiltModule({
     import('./features/node.mjs'),
     import('./features/react.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle })
+    getNodePlugins({
+      bundle,
+      resolve: { exportConditions: runtime?.resolve?.exportConditions }
+    })
   ]);
   const finalEntry = await resolveModuleEntry(entry, project);
   const plugins = [

package/build/esm/server.mjs

@@ -41,7 +41,10 @@ async function quiltServer({
     import('./features/node.mjs'),
     import('./features/react.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle })
+    getNodePlugins({
+      bundle,
+      resolve: { exportConditions: runtime.resolve?.exportConditions }
+    })
   ]);
   const serverEntry = entry ? project.resolve(entry) : await sourceForServer(project);
   const finalEntry = format === "request-router" ? MAGIC_MODULE_ENTRY : serverEntry ?? MAGIC_MODULE_ENTRY;
@@ -121,6 +124,9 @@ function nodeServerRuntime({
         format: format === "commonjs" || format === "cjs" ? "cjs" : "esm"
       }
     },
+    resolve: {
+      exportConditions: ["node"]
+    },
     requestRouter() {
       return multiline`
         import requestRouter from ${JSON.stringify(

package/build/esm/shared/rollup.mjs

@@ -32,7 +32,8 @@ function normalizeRollupInput(input) {
   return Array.isArray(input) && input.length === 0 ? void 0 : input;
 }
 async function getNodePlugins({
-  bundle = {}
+  bundle = {},
+  resolve = {}
 } = {}) {
   const [
     { default: commonjs },
@@ -49,7 +50,7 @@ async function getNodePlugins({
   if (bundle === true) {
     nodeExternalsOptions = {
       builtins: true,
-      builtinsPrefix: "strip",
+      builtinsPrefix: "add",
       deps: false,
       devDeps: false,
       peerDeps: false,
@@ -75,7 +76,7 @@ async function getNodePlugins({
     } = bundle;
     nodeExternalsOptions = {
       builtins: !bundleBuiltins,
-      builtinsPrefix: bundleBuiltins ? "strip" : "add",
+      builtinsPrefix: "add",
       deps: !bundleDependencies,
       devDeps: !bundleDevDependencies,
       peerDeps: !bundlePeerDependencies,
@@ -93,6 +94,7 @@ async function getNodePlugins({
       exportConditions: [
         "esnext",
         "quilt:esnext",
+        ...resolve.exportConditions ?? [],
         "default",
         "module",
         "import"