@quilted/rollup 0.1.9 → 0.1.11

package/build/typescript/shared/rollup.d.ts

@@ -1,7 +1,13 @@
-import type { InputOptions } from 'rollup';
+import type { Plugin, InputOptions } from 'rollup';
 import { type RollupReplaceOptions } from '@rollup/plugin-replace';
-export declare function smartReplace(values: NonNullable<RollupReplaceOptions['values']>, options?: Omit<RollupReplaceOptions, 'values'>): import("rollup").Plugin<any>;
-export declare function getNodePlugins(): Promise<import("rollup").Plugin<any>[]>;
+export declare function smartReplace(values: NonNullable<RollupReplaceOptions['values']>, options?: Omit<RollupReplaceOptions, 'values'>): Plugin<any>;
+export declare function removeBuildFiles(patterns: string | string[], { root }?: {
+    root?: string;
+}): {
+    name: string;
+    buildStart(this: import("rollup").PluginContext): Promise<void>;
+};
+export declare function getNodePlugins(): Promise<Plugin<any>[]>;
 export declare function rollupPluginsToArray(plugins?: InputOptions['plugins']): import("rollup").InputPluginOption[];
 export declare function addRollupOnWarn(options: InputOptions, warn: NonNullable<InputOptions['onwarn']>): InputOptions;
 //# sourceMappingURL=rollup.d.ts.map

package/build/typescript/shared/rollup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../../source/shared/rollup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AACzC,OAAgB,EAAC,KAAK,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE1E,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EACnD,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,gCAY/C;AAED,wBAAsB,cAAc,4CAwBnC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,wCAErE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GACxC,YAAY,CAed"}
+{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../../source/shared/rollup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAE,YAAY,EAAC,MAAM,QAAQ,CAAC;AACjD,OAAgB,EAAC,KAAK,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE1E,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,EACnD,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,eAY/C;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,EAC3B,EAAC,IAAoB,EAAC,GAAE;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAM;;;EAe7C;AAED,wBAAsB,cAAc,2BAwBnC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,wCAErE;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,YAAY,EACrB,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,GACxC,YAAY,CAed"}

package/package.json

@@ -6,7 +6,7 @@
     "access": "public",
     "@quilted/registry": "https://registry.npmjs.org"
   },
-  "version": "0.1.9",
+  "version": "0.1.11",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -43,6 +43,7 @@
     "@quilted/assets": "^0.0.4",
     "@quilted/graphql": "^2.0.0",
     "@types/babel__preset-env": "^7.9.0",
+    "browserslist": "^4.22.1",
     "dotenv": "^16.0.0",
     "esbuild": "^0.19.4",
     "glob": "^10.3.10",

package/source/app.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import * as fs from 'fs/promises';
 import {glob} from 'glob';
+import {fileURLToPath} from 'url';
 
 import type {Plugin, RollupOptions, GetManualChunk} from 'rollup';
 import type {AssetsBuildManifest} from '@quilted/assets';
@@ -14,10 +15,15 @@ import {
 import type {MagicModuleEnvOptions} from './features/env.ts';
 
 import {multiline} from './shared/strings.ts';
-import {getNodePlugins} from './shared/rollup.ts';
+import {getNodePlugins, removeBuildFiles} from './shared/rollup.ts';
 import {createMagicModulePlugin} from './shared/magic-module.ts';
 
 export interface AppOptions {
+  /**
+   * The root directory containing the source code for your application.
+   */
+  root?: string | URL;
+
   /**
    * The entry module for this app. This should be an absolute path, or relative
    * path from the root directory containing your project. This entry should just be
@@ -96,9 +102,17 @@ export interface AppBrowserAssetsOptions {
   minify?: boolean;
 
   baseURL?: string;
+  targets?:
+    | string[]
+    | {
+        name?: string;
+        browsers?: string[];
+      };
+  priority?: number;
 }
 
 export async function quiltAppBrowser({
+  root: rootPath = process.cwd(),
   app,
   entry,
   env,
@@ -106,12 +120,35 @@ export async function quiltAppBrowser({
   module,
   graphql = true,
 }: AppBrowserOptions = {}) {
-  const root = process.cwd();
+  const root = fileURLToPath(rootPath);
   const mode =
     (typeof env === 'object' ? env?.mode : undefined) ?? 'production';
   const minify = assets?.minify ?? mode === 'production';
   const baseURL = assets?.baseURL ?? '/assets/';
 
+  const assetTargets = assets?.targets ?? {};
+  const targets = Array.isArray(assetTargets)
+    ? {
+        browsers: assetTargets,
+      }
+    : assetTargets;
+  const targetBrowsers =
+    targets.browsers ??
+    (await (async () => {
+      const {default: browserslist} = await import('browserslist');
+      const config = browserslist.findConfig(root);
+
+      if (config == null) return ['defaults'];
+
+      const targetName = targets.name ?? 'defaults';
+      return config[targetName] ?? ['defaults'];
+    })());
+  const normalizedTargetName =
+    targets.name === 'defaults' ? 'default' : targets.name;
+  const targetFilenamePart = normalizedTargetName
+    ? `.${normalizedTargetName}`
+    : '';
+
   const [
     {visualizer},
     {assetManifest},
@@ -135,10 +172,13 @@ export async function quiltAppBrowser({
   const plugins: Plugin[] = [
     ...nodePlugins,
     systemJS({minify}),
-    sourceCode({mode}),
+    sourceCode({mode, targets: targetBrowsers}),
     css({minify, emit: true}),
     rawAssets(),
     staticAssets({baseURL, emit: true}),
+    removeBuildFiles(['build/assets', 'build/manifests', 'build/reports'], {
+      root,
+    }),
   ];
 
   const tsconfigAliases = await createTSConfigAliasPlugin();
@@ -177,31 +217,45 @@ export async function quiltAppBrowser({
 
   if (graphql) {
     const {graphql} = await import('./features/graphql.ts');
-    plugins.push(graphql({manifest: path.resolve(`manifests/graphql.json`)}));
+
+    plugins.push(
+      graphql({
+        manifest: path.resolve(`manifests/graphql${targetFilenamePart}.json`),
+      }),
+    );
   }
 
   if (minify) {
     const {minify} = await import('rollup-plugin-esbuild');
+
     plugins.push(minify());
   }
 
+  const cacheKey = targets.name ? {browserTarget: targets.name} : undefined;
+  const id = targets.name ? targets.name : undefined;
+
   plugins.push(
     // @ts-expect-error The plugin still depends on Rollup 3
     assetManifest({
+      id,
+      cacheKey,
       baseUrl: baseURL,
-      path: path.resolve(`build/manifests/assets.json`),
+      path: path.resolve(`build/manifests/assets${targetFilenamePart}.json`),
+      priority: assets?.priority,
     }),
     visualizer({
       template: 'treemap',
       open: false,
       brotliSize: true,
-      filename: path.resolve(`build/reports/bundle-visualizer.html`),
+      filename: path.resolve(
+        `build/reports/bundle-visualizer${targetFilenamePart}.html`,
+      ),
     }),
   );
 
   const finalEntry =
     entry ??
-    (await glob('browser.{ts,tsx,mjs,js,jsx}', {
+    (await glob('{browser,client}.{ts,tsx,mjs,js,jsx}', {
       cwd: root,
       nodir: true,
       absolute: true,
@@ -227,9 +281,9 @@ export async function quiltAppBrowser({
       // format: isESM ? 'esm' : 'systemjs',
       format: 'esm',
       dir: path.resolve(`build/assets`),
-      entryFileNames: `app.[hash].js`,
-      assetFileNames: `[name].[hash].[ext]`,
-      chunkFileNames: `[name].[hash].js`,
+      entryFileNames: `app${targetFilenamePart}.[hash].js`,
+      assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,
+      chunkFileNames: `[name]${targetFilenamePart}.[hash].js`,
       manualChunks: createManualChunksSorter(),
     },
   } satisfies RollupOptions;
@@ -282,10 +336,11 @@ export async function quiltAppServer({
 
   const plugins: Plugin[] = [
     ...nodePlugins,
-    sourceCode({mode}),
+    sourceCode({mode, targets: ['current node']}),
     css({emit: false, minify}),
     rawAssets(),
     staticAssets({emit: false}),
+    removeBuildFiles(['build/server'], {root}),
   ];
 
   const tsconfigAliases = await createTSConfigAliasPlugin();
@@ -338,14 +393,14 @@ export async function quiltAppServer({
     visualizer({
       template: 'treemap',
       open: false,
-      brotliSize: true,
-      filename: path.resolve(`build/reports/bundle-visualizer.html`),
+      brotliSize: false,
+      filename: path.resolve(`build/reports/bundle-visualizer.server.html`),
     }),
   );
 
   const finalEntry =
     entry ??
-    (await glob('server.{ts,tsx,mjs,js,jsx}', {
+    (await glob('{server,service,backend}.{ts,tsx,mjs,js,jsx}', {
       cwd: root,
       nodir: true,
       absolute: true,

package/source/index.ts

@@ -5,3 +5,4 @@ export {
   type AppBrowserOptions,
   type AppServerOptions,
 } from './app.ts';
+export {quiltPackageESModules, type PackageOptions} from './package.ts';

package/source/package.ts

@@ -0,0 +1,143 @@
+import * as path from 'path';
+import {Plugin, type RollupOptions} from 'rollup';
+import {glob} from 'glob';
+import {fileURLToPath} from 'url';
+
+import {getNodePlugins, removeBuildFiles} from './shared/rollup.ts';
+import {loadPackageJSON, type PackageJSON} from './shared/package-json.ts';
+
+export interface PackageOptions {
+  /**
+   * The root directory containing the source code for your application.
+   */
+  root?: string | URL;
+}
+
+export async function quiltPackageESModules({
+  root: rootPath = process.cwd(),
+}: PackageOptions = {}) {
+  const root = fileURLToPath(rootPath);
+  const outputDirectory = path.join(root, 'build/esm');
+
+  const [{sourceCode}, nodePlugins, packageJSON] = await Promise.all([
+    import('./features/source-code.ts'),
+    getNodePlugins(),
+    loadPackageJSON(root),
+  ]);
+
+  const [entries] = await Promise.all([
+    sourceEntriesForPackage(root, packageJSON),
+  ]);
+
+  let sourceRoot = root;
+
+  for (const entry of Object.values(entries)) {
+    if (!entry.startsWith(root)) continue;
+
+    sourceRoot = path.resolve(
+      root,
+      path.relative(root, entry).split(path.sep)[0] ?? '.',
+    );
+    break;
+  }
+
+  const plugins: Plugin[] = [
+    ...nodePlugins,
+    sourceCode({mode: 'production'}),
+    removeBuildFiles(['build/esm'], {root}),
+  ];
+
+  return {
+    input: entries,
+    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: {
+      preserveModules: true,
+      preserveModulesRoot: sourceRoot,
+      format: 'esm',
+      dir: outputDirectory,
+      entryFileNames: `[name].mjs`,
+      assetFileNames: `[name].[ext]`,
+      // chunkFileNames: createChunkNamer({
+      //   extension: ESM_EXTENSION,
+      //   sourceRoot: sourceRootDirectory,
+      // }),
+    },
+  } satisfies RollupOptions;
+}
+
+async function sourceEntriesForPackage(root: string, packageJSON: PackageJSON) {
+  const {main, exports} = packageJSON;
+
+  const entries: Record<string, string> = {};
+
+  if (typeof main === 'string') {
+    entries['.'] = await resolveTargetFileAsSource(main, root);
+  }
+
+  if (typeof exports === 'string') {
+    entries['.'] = await resolveTargetFileAsSource(exports, root);
+    return entries;
+  } else if (exports == null || typeof exports !== 'object') {
+    return entries;
+  }
+
+  for (const [exportPath, exportCondition] of Object.entries(
+    exports as Record<string, null | string | Record<string, string>>,
+  )) {
+    let targetFile: string | null | undefined = null;
+
+    if (exportCondition == null) continue;
+
+    if (typeof exportCondition === 'string') {
+      targetFile = exportCondition;
+    } else {
+      targetFile ??=
+        exportCondition['source'] ??
+        exportCondition['quilt:source'] ??
+        exportCondition['quilt:esnext'] ??
+        Object.values(exportCondition).find(
+          (condition) =>
+            typeof condition === 'string' && condition.startsWith('./build/'),
+        );
+    }
+
+    if (targetFile == null) continue;
+
+    const sourceFile = await resolveTargetFileAsSource(targetFile, root);
+
+    entries[exportPath] = sourceFile;
+  }
+
+  return entries;
+}
+
+async function resolveTargetFileAsSource(file: string, root: string) {
+  const sourceFile = file.includes('/build/')
+    ? (
+        await glob(
+          file
+            .replace(/[/]build[/][^/]+[/]/, '/*/')
+            .replace(/(\.d\.ts|\.[\w]+)$/, '.*'),
+          {
+            cwd: root,
+            absolute: true,
+            ignore: [path.resolve(root, file)],
+          },
+        )
+      )[0]!
+    : path.resolve(root, file);
+
+  return sourceFile;
+}

package/source/shared/package-json.ts

@@ -0,0 +1,17 @@
+import * as path from 'path';
+import {fileURLToPath} from 'url';
+import {readFile} from 'fs/promises';
+
+export interface PackageJSON {
+  name?: string;
+  [key: string]: unknown;
+}
+
+export async function loadPackageJSON(root: string | URL) {
+  const file = await readFile(
+    path.join(fileURLToPath(root), 'package.json'),
+    'utf8',
+  );
+
+  return JSON.parse(file) as PackageJSON;
+}

package/source/shared/rollup.ts

@@ -1,4 +1,7 @@
-import type {InputOptions} from 'rollup';
+import * as fs from 'fs/promises';
+import {glob} from 'glob';
+
+import type {Plugin, InputOptions} from 'rollup';
 import replace, {type RollupReplaceOptions} from '@rollup/plugin-replace';
 
 export function smartReplace(
@@ -17,6 +20,25 @@ export function smartReplace(
   });
 }
 
+export function removeBuildFiles(
+  patterns: string | string[],
+  {root = process.cwd()}: {root?: string} = {},
+) {
+  return {
+    name: '@quilt/remove-build-files',
+    async buildStart() {
+      const matches = await glob(patterns, {
+        cwd: root,
+        absolute: true,
+      });
+
+      await Promise.all(
+        matches.map((file) => fs.rm(file, {recursive: true, force: true})),
+      );
+    },
+  } satisfies Plugin;
+}
+
 export async function getNodePlugins() {
   const [
     {default: commonjs},