@quilted/rollup 0.1.13 → 0.1.15

package/build/esm/package.mjs

@@ -5,28 +5,30 @@ import { getNodePlugins, removeBuildFiles } from './shared/rollup.mjs';
 import { loadPackageJSON } from './shared/package-json.mjs';
 
 async function quiltPackageESModules({
-  root: rootPath = process.cwd()
+  root: rootPath = process.cwd(),
+  graphql = true
 } = {}) {
   const root = typeof rootPath === 'string' ? rootPath : fileURLToPath(rootPath);
   const outputDirectory = path.join(root, 'build/esm');
   const [{
     sourceCode
   }, nodePlugins, packageJSON] = await Promise.all([import('./features/source-code.mjs'), getNodePlugins(), loadPackageJSON(root)]);
-  const [entries] = await Promise.all([sourceEntriesForPackage(root, packageJSON)]);
-  let sourceRoot = root;
-  const sourceEntryFiles = Object.values(entries);
-  for (const entry of sourceEntryFiles) {
-    if (!entry.startsWith(root)) continue;
-    sourceRoot = path.resolve(root, path.relative(root, entry).split(path.sep)[0] ?? '.');
-    break;
-  }
+  const source = await sourceForPackage(root, packageJSON);
   const plugins = [...nodePlugins, sourceCode({
     mode: 'production'
   }), removeBuildFiles(['build/esm'], {
     root
   })];
+  if (graphql) {
+    const {
+      graphql
+    } = await import('./features/graphql.mjs');
+    plugins.push(graphql({
+      manifest: false
+    }));
+  }
   return {
-    input: sourceEntryFiles,
+    input: source.files,
     plugins,
     onwarn(warning, defaultWarn) {
       // Removes annoying warnings for React-focused libraries that
@@ -38,7 +40,7 @@ async function quiltPackageESModules({
     },
     output: {
       preserveModules: true,
-      preserveModulesRoot: sourceRoot,
+      preserveModulesRoot: source.root,
       format: 'esm',
       dir: outputDirectory,
       entryFileNames: `[name].mjs`,
@@ -46,6 +48,65 @@ async function quiltPackageESModules({
     }
   };
 }
+async function quiltPackageESNext({
+  root: rootPath = process.cwd(),
+  graphql = true
+} = {}) {
+  const root = typeof rootPath === 'string' ? rootPath : fileURLToPath(rootPath);
+  const outputDirectory = path.join(root, 'build/esnext');
+  const [{
+    sourceCode
+  }, nodePlugins, packageJSON] = await Promise.all([import('./features/source-code.mjs'), getNodePlugins(), loadPackageJSON(root)]);
+  const source = await sourceForPackage(root, packageJSON);
+  const plugins = [...nodePlugins, sourceCode({
+    mode: 'production',
+    babel: false
+  }), removeBuildFiles(['build/esnext'], {
+    root
+  })];
+  if (graphql) {
+    const {
+      graphql
+    } = await import('./features/graphql.mjs');
+    plugins.push(graphql({
+      manifest: false
+    }));
+  }
+  return {
+    input: source.files,
+    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: source.root,
+      format: 'esm',
+      dir: outputDirectory,
+      entryFileNames: `[name].esnext`,
+      assetFileNames: `[name].[ext]`
+    }
+  };
+}
+async function sourceForPackage(root, packageJSON) {
+  const [entries] = await Promise.all([sourceEntriesForPackage(root, packageJSON)]);
+  let sourceRoot = root;
+  const sourceEntryFiles = Object.values(entries);
+  for (const entry of sourceEntryFiles) {
+    if (!entry.startsWith(root)) continue;
+    sourceRoot = path.resolve(root, path.relative(root, entry).split(path.sep)[0] ?? '.');
+    break;
+  }
+  return {
+    root: sourceRoot,
+    files: sourceEntryFiles
+  };
+}
 async function sourceEntriesForPackage(root, packageJSON) {
   const {
     main,
@@ -84,4 +145,4 @@ async function resolveTargetFileAsSource(file, root) {
   return sourceFile;
 }
 
-export { quiltPackageESModules };
+export { quiltPackageESModules, quiltPackageESNext };

package/build/esnext/app.esnext

@@ -37,8 +37,6 @@ async function quiltAppBrowser({
   const targetFilenamePart = normalizedTargetName ? `.${normalizedTargetName}` : '';
   const [{
     visualizer
-  }, {
-    assetManifest
   }, {
     sourceCode
   }, {
@@ -46,11 +44,12 @@ async function quiltAppBrowser({
   }, {
     css
   }, {
+    assetManifest,
     rawAssets,
     staticAssets
   }, {
     systemJS
-  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('@quilted/assets/rollup'), import('./features/source-code.esnext'), import('./features/typescript.esnext'), import('./features/css.esnext'), import('./features/assets.esnext'), import('./features/system-js.esnext'), getNodePlugins()]);
+  }, nodePlugins] = await Promise.all([import('rollup-plugin-visualizer'), import('./features/source-code.esnext'), import('./features/typescript.esnext'), import('./features/css.esnext'), import('./features/assets.esnext'), import('./features/system-js.esnext'), getNodePlugins()]);
   const plugins = [...nodePlugins, systemJS({
     minify
   }), sourceCode({
@@ -119,13 +118,11 @@ async function quiltAppBrowser({
     browserTarget: targets.name
   } : undefined;
   const id = targets.name ? targets.name : undefined;
-  plugins.push(
-  // @ts-expect-error The plugin still depends on Rollup 3
-  assetManifest({
+  plugins.push(assetManifest({
     id,
     cacheKey,
-    baseUrl: baseURL,
-    path: path.resolve(`build/manifests/assets${targetFilenamePart}.json`),
+    baseURL,
+    file: path.resolve(`build/manifests/assets${targetFilenamePart}.json`),
     priority: assets?.priority
   }), visualizer({
     template: 'treemap',

package/build/esnext/features/assets.esnext

@@ -1,8 +1,116 @@
 import * as path from 'node:path';
-import { readFile } from 'node:fs/promises';
+import * as fs from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import * as mime from 'mrmime';
 
+function assetManifest(manifestOptions) {
+  return {
+    name: '@quilted/asset-manifest',
+    async generateBundle(options, bundle) {
+      await writeManifestForBundle.call(this, bundle, manifestOptions, options);
+    }
+  };
+}
+async function writeManifestForBundle(bundle, {
+  id,
+  file,
+  baseURL,
+  cacheKey,
+  priority
+}, {
+  format
+}) {
+  const outputs = Object.values(bundle);
+  const entries = outputs.filter(output => output.type === 'chunk' && output.isEntry);
+  if (entries.length === 0) {
+    throw new Error(`Could not find any entries in your rollup bundle...`);
+  }
+
+  // We assume the first entry is the "main" one. There can be
+  // more than one because each worker script is also listed as an
+  // entry (though, from a separate build).
+  const entryChunk = entries[0];
+  const dependencyMap = new Map();
+  for (const output of outputs) {
+    if (output.type !== 'chunk') continue;
+    dependencyMap.set(output.fileName, output.imports);
+  }
+  const assets = [];
+  const assetIdMap = new Map();
+  function getAssetId(file) {
+    let id = assetIdMap.get(file);
+    if (id == null) {
+      assets.push(`${baseURL}${file}`);
+      id = assets.length - 1;
+      assetIdMap.set(file, id);
+    }
+    return id;
+  }
+  const manifest = {
+    id,
+    priority,
+    cacheKey,
+    assets,
+    attributes: format === 'es' ? {
+      scripts: {
+        type: 'module'
+      }
+    } : undefined,
+    entries: {
+      default: createAssetsEntry([...entryChunk.imports, entryChunk.fileName], {
+        dependencyMap,
+        getAssetId
+      })
+    },
+    modules: {}
+  };
+  for (const output of outputs) {
+    if (output.type !== 'chunk') continue;
+    const originalModuleId = output.facadeModuleId ?? output.moduleIds[output.moduleIds.length - 1];
+    if (originalModuleId == null) continue;
+
+    // This metadata is added by the rollup plugin for @quilted/async
+    const moduleId = this.getModuleInfo(originalModuleId)?.meta.quilt?.moduleId;
+    if (moduleId == null) continue;
+    manifest.modules[moduleId] = createAssetsEntry([...output.imports, output.fileName], {
+      dependencyMap,
+      getAssetId
+    });
+  }
+  await fs.mkdir(path.dirname(file), {
+    recursive: true
+  });
+  await fs.writeFile(file, JSON.stringify(manifest, null, 2));
+}
+function createAssetsEntry(files, {
+  dependencyMap,
+  getAssetId
+}) {
+  const styles = [];
+  const scripts = [];
+  const allFiles = new Set();
+  const addFile = file => {
+    if (allFiles.has(file)) return;
+    allFiles.add(file);
+    for (const dependency of dependencyMap.get(file) ?? []) {
+      addFile(dependency);
+    }
+  };
+  for (const file of files) {
+    addFile(file);
+  }
+  for (const file of allFiles) {
+    if (file.endsWith('.css')) {
+      styles.push(getAssetId(file));
+    } else {
+      scripts.push(getAssetId(file));
+    }
+  }
+  return {
+    scripts,
+    styles
+  };
+}
 const QUERY_PATTERN = /\?.*$/s;
 const HASH_PATTERN = /#.*$/s;
 const RAW_PATTERN = /(\?|&)raw(?:&|$)/;
@@ -26,7 +134,7 @@ function rawAssets() {
       }
       const moduleId = cleanModuleIdentifier(id);
       this.addWatchFile(moduleId);
-      const file = await readFile(moduleId, {
+      const file = await fs.readFile(moduleId, {
         encoding: 'utf-8'
       });
       return `export default ${JSON.stringify(file)}`;
@@ -53,7 +161,7 @@ function staticAssets({
         return cached;
       }
       const file = cleanModuleIdentifier(id);
-      const content = await readFile(file);
+      const content = await fs.readFile(file);
       let url;
       if (!file.endsWith('.svg') && content.length < inlineLimit) {
         // base64 inlined as a string
@@ -104,4 +212,4 @@ function cleanModuleIdentifier(url) {
   return url.replace(HASH_PATTERN, '').replace(QUERY_PATTERN, '');
 }
 
-export { rawAssets, staticAssets };
+export { assetManifest, rawAssets, staticAssets };

package/build/esnext/features/source-code.esnext

@@ -1,11 +1,22 @@
 import { createRequire } from 'node:module';
 import babel from '@rollup/plugin-babel';
+import esbuild from 'rollup-plugin-esbuild';
 
 const require = createRequire(import.meta.url);
 function sourceCode({
   mode,
-  targets
+  targets,
+  babel: useBabel = true
 }) {
+  if (!useBabel) {
+    return esbuild({
+      // Support very modern features
+      target: 'es2022',
+      jsx: 'automatic',
+      jsxImportSource: 'react',
+      exclude: 'node_modules/**'
+    });
+  }
   return babel({
     envName: mode,
     configFile: false,

package/build/esnext/index.esnext

@@ -1,2 +1,2 @@
 export { quiltAppBrowser, quiltAppServer } from './app.esnext';
-export { quiltPackageESModules } from './package.esnext';
+export { quiltPackageESModules, quiltPackageESNext } from './package.esnext';

package/build/esnext/package.esnext

@@ -5,28 +5,30 @@ import { getNodePlugins, removeBuildFiles } from './shared/rollup.esnext';
 import { loadPackageJSON } from './shared/package-json.esnext';
 
 async function quiltPackageESModules({
-  root: rootPath = process.cwd()
+  root: rootPath = process.cwd(),
+  graphql = true
 } = {}) {
   const root = typeof rootPath === 'string' ? rootPath : fileURLToPath(rootPath);
   const outputDirectory = path.join(root, 'build/esm');
   const [{
     sourceCode
   }, nodePlugins, packageJSON] = await Promise.all([import('./features/source-code.esnext'), getNodePlugins(), loadPackageJSON(root)]);
-  const [entries] = await Promise.all([sourceEntriesForPackage(root, packageJSON)]);
-  let sourceRoot = root;
-  const sourceEntryFiles = Object.values(entries);
-  for (const entry of sourceEntryFiles) {
-    if (!entry.startsWith(root)) continue;
-    sourceRoot = path.resolve(root, path.relative(root, entry).split(path.sep)[0] ?? '.');
-    break;
-  }
+  const source = await sourceForPackage(root, packageJSON);
   const plugins = [...nodePlugins, sourceCode({
     mode: 'production'
   }), removeBuildFiles(['build/esm'], {
     root
   })];
+  if (graphql) {
+    const {
+      graphql
+    } = await import('./features/graphql.esnext');
+    plugins.push(graphql({
+      manifest: false
+    }));
+  }
   return {
-    input: sourceEntryFiles,
+    input: source.files,
     plugins,
     onwarn(warning, defaultWarn) {
       // Removes annoying warnings for React-focused libraries that
@@ -38,7 +40,7 @@ async function quiltPackageESModules({
     },
     output: {
       preserveModules: true,
-      preserveModulesRoot: sourceRoot,
+      preserveModulesRoot: source.root,
       format: 'esm',
       dir: outputDirectory,
       entryFileNames: `[name].mjs`,
@@ -46,6 +48,65 @@ async function quiltPackageESModules({
     }
   };
 }
+async function quiltPackageESNext({
+  root: rootPath = process.cwd(),
+  graphql = true
+} = {}) {
+  const root = typeof rootPath === 'string' ? rootPath : fileURLToPath(rootPath);
+  const outputDirectory = path.join(root, 'build/esnext');
+  const [{
+    sourceCode
+  }, nodePlugins, packageJSON] = await Promise.all([import('./features/source-code.esnext'), getNodePlugins(), loadPackageJSON(root)]);
+  const source = await sourceForPackage(root, packageJSON);
+  const plugins = [...nodePlugins, sourceCode({
+    mode: 'production',
+    babel: false
+  }), removeBuildFiles(['build/esnext'], {
+    root
+  })];
+  if (graphql) {
+    const {
+      graphql
+    } = await import('./features/graphql.esnext');
+    plugins.push(graphql({
+      manifest: false
+    }));
+  }
+  return {
+    input: source.files,
+    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: source.root,
+      format: 'esm',
+      dir: outputDirectory,
+      entryFileNames: `[name].esnext`,
+      assetFileNames: `[name].[ext]`
+    }
+  };
+}
+async function sourceForPackage(root, packageJSON) {
+  const [entries] = await Promise.all([sourceEntriesForPackage(root, packageJSON)]);
+  let sourceRoot = root;
+  const sourceEntryFiles = Object.values(entries);
+  for (const entry of sourceEntryFiles) {
+    if (!entry.startsWith(root)) continue;
+    sourceRoot = path.resolve(root, path.relative(root, entry).split(path.sep)[0] ?? '.');
+    break;
+  }
+  return {
+    root: sourceRoot,
+    files: sourceEntryFiles
+  };
+}
 async function sourceEntriesForPackage(root, packageJSON) {
   const {
     main,
@@ -84,4 +145,4 @@ async function resolveTargetFileAsSource(file, root) {
   return sourceFile;
 }
 
-export { quiltPackageESModules };
+export { quiltPackageESModules, quiltPackageESNext };