@quilted/rollup 0.1.7 → 0.1.9

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @quilted/rollup
 
+## 0.1.9
+
+### Patch Changes
+
+- [`afadefe6`](https://github.com/lemonmade/quilt/commit/afadefe6d6fc6b62c17bbc318f9c13c50ef50b7b) Thanks [@lemonmade](https://github.com/lemonmade)! - Add automatic detection of entrypoints
+
+- [`36751497`](https://github.com/lemonmade/quilt/commit/36751497d36fd9bea227c2baf55a302d54468863) Thanks [@lemonmade](https://github.com/lemonmade)! - Add tsconfig aliases plugin
+
+## 0.1.8
+
+### Patch Changes
+
+- [`86430876`](https://github.com/lemonmade/quilt/commit/864308760c9105cfe4b403ea54916c314af0e50b) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix asset manifest plugins
+
+- [`e2038611`](https://github.com/lemonmade/quilt/commit/e203861184c39bc008ed7358f541944aa7db1cdd) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix 'use client' directive in server builds
+
 ## 0.1.7
 
 ### Patch Changes

package/build/cjs/app.cjs

@@ -1,6 +1,8 @@
 'use strict';
 
 var path = require('node:path');
+var fs = require('node:fs/promises');
+var glob = require('glob');
 var constants = require('./constants.cjs');
 var strings = require('./shared/strings.cjs');
 var rollup = require('./shared/rollup.cjs');
@@ -24,15 +26,17 @@ function _interopNamespaceDefault(e) {
 }
 
 var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 
 async function quiltAppBrowser({
   app,
-  entry = constants.MAGIC_MODULE_ENTRY,
+  entry,
   env,
   assets,
   module,
   graphql = true
 } = {}) {
+  const root = process.cwd();
   const mode = (typeof env === 'object' ? env?.mode : undefined) ?? 'production';
   const minify = assets?.minify ?? mode === 'production';
   const baseURL = assets?.baseURL ?? '/assets/';
@@ -42,6 +46,8 @@ async function quiltAppBrowser({
     assetManifest
   }, {
     sourceCode
+  }, {
+    createTSConfigAliasPlugin
   }, {
     css
   }, {
@@ -49,7 +55,7 @@ async function quiltAppBrowser({
     staticAssets
   }, {
     systemJS
-  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('@quilted/assets/rollup'), Promise.resolve().then(function () { return require('./features/source-code.cjs'); }), Promise.resolve().then(function () { return require('./features/css.cjs'); }), Promise.resolve().then(function () { return require('./features/assets.cjs'); }), Promise.resolve().then(function () { return require('./features/system-js.cjs'); }), rollup.getNodePlugins()]);
+  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('@quilted/assets/rollup'), Promise.resolve().then(function () { return require('./features/source-code.cjs'); }), Promise.resolve().then(function () { return require('./features/typescript.cjs'); }), Promise.resolve().then(function () { return require('./features/css.cjs'); }), Promise.resolve().then(function () { return require('./features/assets.cjs'); }), Promise.resolve().then(function () { return require('./features/system-js.cjs'); }), rollup.getNodePlugins()]);
   const plugins = [...nodePlugins, systemJS({
     minify
   }), sourceCode({
@@ -61,6 +67,10 @@ async function quiltAppBrowser({
     baseURL,
     emit: true
   })];
+  const tsconfigAliases = await createTSConfigAliasPlugin();
+  if (tsconfigAliases) {
+    plugins.push(tsconfigAliases);
+  }
   if (env) {
     const {
       magicModuleEnv,
@@ -82,9 +92,14 @@ async function quiltAppBrowser({
       }));
     }
   }
-  if (app) {
+  const appEntry = app ?? (await glob.glob('{App,app,input}.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0]));
+  if (appEntry) {
     plugins.push(magicModuleAppComponent({
-      entry: app
+      entry: appEntry
     }));
   }
   plugins.push(magicModuleAppBrowserEntry(module));
@@ -113,8 +128,13 @@ async function quiltAppBrowser({
     brotliSize: true,
     filename: path__namespace.resolve(`build/reports/bundle-visualizer.html`)
   }));
+  const finalEntry = entry ?? (await glob.glob('browser.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0])) ?? constants.MAGIC_MODULE_ENTRY;
   return {
-    input: entry,
+    input: finalEntry,
     plugins,
     onwarn(warning, defaultWarn) {
       // Removes annoying warnings for React-focused libraries that
@@ -138,15 +158,18 @@ async function quiltAppBrowser({
 async function quiltAppServer({
   app,
   env,
+  entry,
   graphql = true,
-  entry = constants.MAGIC_MODULE_ENTRY,
   minify = false
 } = {}) {
+  const root = process.cwd();
   const mode = (typeof env === 'object' ? env?.mode : undefined) ?? 'production';
   const [{
     visualizer
   }, {
     sourceCode
+  }, {
+    createTSConfigAliasPlugin
   }, {
     css
   }, {
@@ -154,7 +177,7 @@ async function quiltAppServer({
     staticAssets
   }, {
     magicModuleRequestRouterEntry
-  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), Promise.resolve().then(function () { return require('./features/source-code.cjs'); }), Promise.resolve().then(function () { return require('./features/css.cjs'); }), Promise.resolve().then(function () { return require('./features/assets.cjs'); }), Promise.resolve().then(function () { return require('./features/request-router.cjs'); }), rollup.getNodePlugins()]);
+  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), Promise.resolve().then(function () { return require('./features/source-code.cjs'); }), Promise.resolve().then(function () { return require('./features/typescript.cjs'); }), Promise.resolve().then(function () { return require('./features/css.cjs'); }), Promise.resolve().then(function () { return require('./features/assets.cjs'); }), Promise.resolve().then(function () { return require('./features/request-router.cjs'); }), rollup.getNodePlugins()]);
   const plugins = [...nodePlugins, sourceCode({
     mode
   }), css({
@@ -163,6 +186,10 @@ async function quiltAppServer({
   }), rawAssets(), staticAssets({
     emit: false
   })];
+  const tsconfigAliases = await createTSConfigAliasPlugin();
+  if (tsconfigAliases) {
+    plugins.push(tsconfigAliases);
+  }
   if (env) {
     const {
       magicModuleEnv,
@@ -184,15 +211,21 @@ async function quiltAppServer({
       }));
     }
   }
-  if (app) {
+  const appEntry = app ?? (await glob.glob('{App,app,input}.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0]));
+  if (appEntry) {
     plugins.push(magicModuleAppComponent({
-      entry: app
+      entry: appEntry
     }));
   }
   plugins.push(magicModuleRequestRouterEntry());
   plugins.push(magicModuleAppRequestRouter({
     entry
   }));
+  plugins.push(magicModuleAppAssetManifests());
   if (graphql) {
     const {
       graphql
@@ -213,9 +246,22 @@ async function quiltAppServer({
     brotliSize: true,
     filename: path__namespace.resolve(`build/reports/bundle-visualizer.html`)
   }));
+  const finalEntry = entry ?? (await glob.glob('server.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0])) ?? constants.MAGIC_MODULE_ENTRY;
   return {
-    input: entry,
+    input: finalEntry,
     plugins,
+    onwarn(warning, defaultWarn) {
+      // Removes annoying warnings for React-focused libraries that
+      // include 'use client' directives.
+      if (warning.code === 'MODULE_LEVEL_DIRECTIVE' && /['"]use client['"]/.test(warning.message)) {
+        return;
+      }
+      defaultWarn(warning);
+    },
     output: {
       // format: isESM ? 'esm' : 'systemjs',
       format: 'esm',
@@ -294,6 +340,43 @@ function magicModuleAppBrowserEntry({
     }
   });
 }
+function magicModuleAppAssetManifests() {
+  return magicModule.createMagicModulePlugin({
+    name: '@quilted/magic-module/asset-manifests',
+    module: constants.MAGIC_MODULE_BROWSER_ASSETS,
+    async source() {
+      const {
+        glob
+      } = await import('glob');
+      const manifestFiles = await glob('assets*.json', {
+        nodir: true,
+        absolute: true,
+        cwd: path__namespace.resolve(`build/manifests`)
+      });
+      const manifests = await Promise.all(manifestFiles.map(async file => JSON.parse(await fs__namespace.readFile(file, 'utf8'))));
+      manifests.sort((manifestA, manifestB) => (manifestA.priority ?? 0) - (manifestB.priority ?? 0));
+      return strings.multiline`
+        import {BrowserAssetsFromManifests} from '@quilted/quilt/server';
+
+        export class BrowserAssets extends BrowserAssetsFromManifests {
+          constructor() {
+            const manifests = JSON.parse(${JSON.stringify(JSON.stringify(manifests))});
+
+            // The default manifest is the last one, since it has the widest browser support.
+            const defaultManifest = manifests.at(-1);
+
+            super(manifests, {
+              defaultManifest,
+              cacheKey(request) {
+                return {};
+              },
+            });
+          }
+        }
+      `;
+    }
+  });
+}
 const FRAMEWORK_CHUNK_NAME = 'framework';
 const POLYFILLS_CHUNK_NAME = 'polyfills';
 const VENDOR_CHUNK_NAME = 'vendor';
@@ -361,6 +444,7 @@ function createManualChunksSorter() {
   };
 }
 
+exports.magicModuleAppAssetManifests = magicModuleAppAssetManifests;
 exports.magicModuleAppBrowserEntry = magicModuleAppBrowserEntry;
 exports.magicModuleAppComponent = magicModuleAppComponent;
 exports.magicModuleAppRequestRouter = magicModuleAppRequestRouter;

package/build/cjs/features/typescript.cjs

@@ -0,0 +1,56 @@
+'use strict';
+
+var path = require('node:path');
+var fs = require('node:fs');
+
+function _interopNamespaceDefault(e) {
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
+var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
+
+async function createTSConfigAliasPlugin({
+  root = process.cwd()
+} = {}) {
+  const [{
+    default: alias
+  }, tsconfig] = await Promise.all([import('@rollup/plugin-alias'), getTSConfig(root)]);
+  const tsconfigPaths = tsconfig?.compilerOptions?.paths;
+  if (tsconfigPaths == null) return undefined;
+  return alias({
+    entries: Object.entries(tsconfigPaths).map(([name, aliases]) => {
+      return {
+        find: name.includes('*') ? new RegExp(`^${name.replace(/\*/, '(.*)')}$`) : name,
+        replacement: aliases[0].replace('*', '$1')
+      };
+    })
+  });
+}
+async function getTSConfig(root) {
+  const tsconfigPath = path__namespace.join(root, 'tsconfig.json');
+  if (!fs__namespace.existsSync(tsconfigPath)) {
+    return undefined;
+  }
+  try {
+    const tsconfig = JSON.parse(await fs__namespace.promises.readFile(tsconfigPath, 'utf8'));
+    return tsconfig;
+  } catch {
+    // intentional noop
+  }
+}
+
+exports.createTSConfigAliasPlugin = createTSConfigAliasPlugin;

package/build/esm/app.mjs

@@ -1,4 +1,6 @@
 import * as path from 'node:path';
+import * as fs from 'node:fs/promises';
+import { glob } from 'glob';
 import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_REQUEST_ROUTER, MAGIC_MODULE_BROWSER_ASSETS } from './constants.mjs';
 import { multiline } from './shared/strings.mjs';
 import { getNodePlugins } from './shared/rollup.mjs';
@@ -6,12 +8,13 @@ import { createMagicModulePlugin } from './shared/magic-module.mjs';
 
 async function quiltAppBrowser({
   app,
-  entry = MAGIC_MODULE_ENTRY,
+  entry,
   env,
   assets,
   module,
   graphql = true
 } = {}) {
+  const root = process.cwd();
   const mode = (typeof env === 'object' ? env?.mode : undefined) ?? 'production';
   const minify = assets?.minify ?? mode === 'production';
   const baseURL = assets?.baseURL ?? '/assets/';
@@ -21,6 +24,8 @@ async function quiltAppBrowser({
     assetManifest
   }, {
     sourceCode
+  }, {
+    createTSConfigAliasPlugin
   }, {
     css
   }, {
@@ -28,7 +33,7 @@ async function quiltAppBrowser({
     staticAssets
   }, {
     systemJS
-  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('@quilted/assets/rollup'), import('./features/source-code.mjs'), import('./features/css.mjs'), import('./features/assets.mjs'), import('./features/system-js.mjs'), getNodePlugins()]);
+  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('@quilted/assets/rollup'), import('./features/source-code.mjs'), import('./features/typescript.mjs'), import('./features/css.mjs'), import('./features/assets.mjs'), import('./features/system-js.mjs'), getNodePlugins()]);
   const plugins = [...nodePlugins, systemJS({
     minify
   }), sourceCode({
@@ -40,6 +45,10 @@ async function quiltAppBrowser({
     baseURL,
     emit: true
   })];
+  const tsconfigAliases = await createTSConfigAliasPlugin();
+  if (tsconfigAliases) {
+    plugins.push(tsconfigAliases);
+  }
   if (env) {
     const {
       magicModuleEnv,
@@ -61,9 +70,14 @@ async function quiltAppBrowser({
       }));
     }
   }
-  if (app) {
+  const appEntry = app ?? (await glob('{App,app,input}.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0]));
+  if (appEntry) {
     plugins.push(magicModuleAppComponent({
-      entry: app
+      entry: appEntry
     }));
   }
   plugins.push(magicModuleAppBrowserEntry(module));
@@ -92,8 +106,13 @@ async function quiltAppBrowser({
     brotliSize: true,
     filename: path.resolve(`build/reports/bundle-visualizer.html`)
   }));
+  const finalEntry = entry ?? (await glob('browser.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0])) ?? MAGIC_MODULE_ENTRY;
   return {
-    input: entry,
+    input: finalEntry,
     plugins,
     onwarn(warning, defaultWarn) {
       // Removes annoying warnings for React-focused libraries that
@@ -117,15 +136,18 @@ async function quiltAppBrowser({
 async function quiltAppServer({
   app,
   env,
+  entry,
   graphql = true,
-  entry = MAGIC_MODULE_ENTRY,
   minify = false
 } = {}) {
+  const root = process.cwd();
   const mode = (typeof env === 'object' ? env?.mode : undefined) ?? 'production';
   const [{
     visualizer
   }, {
     sourceCode
+  }, {
+    createTSConfigAliasPlugin
   }, {
     css
   }, {
@@ -133,7 +155,7 @@ async function quiltAppServer({
     staticAssets
   }, {
     magicModuleRequestRouterEntry
-  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('./features/source-code.mjs'), import('./features/css.mjs'), import('./features/assets.mjs'), import('./features/request-router.mjs'), getNodePlugins()]);
+  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('./features/source-code.mjs'), import('./features/typescript.mjs'), import('./features/css.mjs'), import('./features/assets.mjs'), import('./features/request-router.mjs'), getNodePlugins()]);
   const plugins = [...nodePlugins, sourceCode({
     mode
   }), css({
@@ -142,6 +164,10 @@ async function quiltAppServer({
   }), rawAssets(), staticAssets({
     emit: false
   })];
+  const tsconfigAliases = await createTSConfigAliasPlugin();
+  if (tsconfigAliases) {
+    plugins.push(tsconfigAliases);
+  }
   if (env) {
     const {
       magicModuleEnv,
@@ -163,15 +189,21 @@ async function quiltAppServer({
       }));
     }
   }
-  if (app) {
+  const appEntry = app ?? (await glob('{App,app,input}.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0]));
+  if (appEntry) {
     plugins.push(magicModuleAppComponent({
-      entry: app
+      entry: appEntry
     }));
   }
   plugins.push(magicModuleRequestRouterEntry());
   plugins.push(magicModuleAppRequestRouter({
     entry
   }));
+  plugins.push(magicModuleAppAssetManifests());
   if (graphql) {
     const {
       graphql
@@ -192,9 +224,22 @@ async function quiltAppServer({
     brotliSize: true,
     filename: path.resolve(`build/reports/bundle-visualizer.html`)
   }));
+  const finalEntry = entry ?? (await glob('server.{ts,tsx,mjs,js,jsx}', {
+    cwd: root,
+    nodir: true,
+    absolute: true
+  }).then(files => files[0])) ?? MAGIC_MODULE_ENTRY;
   return {
-    input: entry,
+    input: finalEntry,
     plugins,
+    onwarn(warning, defaultWarn) {
+      // Removes annoying warnings for React-focused libraries that
+      // include 'use client' directives.
+      if (warning.code === 'MODULE_LEVEL_DIRECTIVE' && /['"]use client['"]/.test(warning.message)) {
+        return;
+      }
+      defaultWarn(warning);
+    },
     output: {
       // format: isESM ? 'esm' : 'systemjs',
       format: 'esm',
@@ -273,6 +318,43 @@ function magicModuleAppBrowserEntry({
     }
   });
 }
+function magicModuleAppAssetManifests() {
+  return createMagicModulePlugin({
+    name: '@quilted/magic-module/asset-manifests',
+    module: MAGIC_MODULE_BROWSER_ASSETS,
+    async source() {
+      const {
+        glob
+      } = await import('glob');
+      const manifestFiles = await glob('assets*.json', {
+        nodir: true,
+        absolute: true,
+        cwd: path.resolve(`build/manifests`)
+      });
+      const manifests = await Promise.all(manifestFiles.map(async file => JSON.parse(await fs.readFile(file, 'utf8'))));
+      manifests.sort((manifestA, manifestB) => (manifestA.priority ?? 0) - (manifestB.priority ?? 0));
+      return multiline`
+        import {BrowserAssetsFromManifests} from '@quilted/quilt/server';
+
+        export class BrowserAssets extends BrowserAssetsFromManifests {
+          constructor() {
+            const manifests = JSON.parse(${JSON.stringify(JSON.stringify(manifests))});
+
+            // The default manifest is the last one, since it has the widest browser support.
+            const defaultManifest = manifests.at(-1);
+
+            super(manifests, {
+              defaultManifest,
+              cacheKey(request) {
+                return {};
+              },
+            });
+          }
+        }
+      `;
+    }
+  });
+}
 const FRAMEWORK_CHUNK_NAME = 'framework';
 const POLYFILLS_CHUNK_NAME = 'polyfills';
 const VENDOR_CHUNK_NAME = 'vendor';
@@ -340,4 +422,4 @@ function createManualChunksSorter() {
   };
 }
 
-export { magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, quiltAppBrowser, quiltAppServer };
+export { magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, quiltAppBrowser, quiltAppServer };

package/build/esm/features/typescript.mjs

@@ -0,0 +1,34 @@
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+
+async function createTSConfigAliasPlugin({
+  root = process.cwd()
+} = {}) {
+  const [{
+    default: alias
+  }, tsconfig] = await Promise.all([import('@rollup/plugin-alias'), getTSConfig(root)]);
+  const tsconfigPaths = tsconfig?.compilerOptions?.paths;
+  if (tsconfigPaths == null) return undefined;
+  return alias({
+    entries: Object.entries(tsconfigPaths).map(([name, aliases]) => {
+      return {
+        find: name.includes('*') ? new RegExp(`^${name.replace(/\*/, '(.*)')}$`) : name,
+        replacement: aliases[0].replace('*', '$1')
+      };
+    })
+  });
+}
+async function getTSConfig(root) {
+  const tsconfigPath = path.join(root, 'tsconfig.json');
+  if (!fs.existsSync(tsconfigPath)) {
+    return undefined;
+  }
+  try {
+    const tsconfig = JSON.parse(await fs.promises.readFile(tsconfigPath, 'utf8'));
+    return tsconfig;
+  } catch {
+    // intentional noop
+  }
+}
+
+export { createTSConfigAliasPlugin };