@quilted/rollup 0.2.39 → 0.2.40

package/build/typescript/features/assets.d.ts

@@ -1,9 +1,9 @@
 import type { Plugin, PluginContext } from 'rollup';
 export interface AssetManifestOptions {
     file: string;
-    baseURL: string;
+    key?: URLSearchParams;
+    base: string;
     priority?: number;
-    cacheKey?: URLSearchParams;
     moduleID?(details: {
         imported: string;
     }): string;

package/build/typescript/features/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../source/features/assets.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAIV,MAAM,EACN,aAAa,EACd,MAAM,QAAQ,CAAC;AAQhB,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,QAAQ,CAAC,CAAC,OAAO,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,CAAC;CAChD;AAED,wBAAgB,aAAa,CAAC,eAAe,EAAE,oBAAoB,GAAG,MAAM,CAO3E;AA2KD,wBAAgB,SAAS,IAAI,MAAM,CAmBlC;AAED,wBAAgB,YAAY,CAAC,EAC3B,IAAW,EACX,OAAa,EACb,UAA4C,EAC5C,WAAkC,EAClC,aAAsC,GACvC,GAAE;IACD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACnB;;;EA+DL"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../../source/features/assets.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAIV,MAAM,EACN,aAAa,EACd,MAAM,QAAQ,CAAC;AAKhB,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,CAAC,OAAO,EAAE;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,CAAC;CAChD;AAED,wBAAgB,aAAa,CAAC,eAAe,EAAE,oBAAoB,GAAG,MAAM,CAO3E;AA2KD,wBAAgB,SAAS,IAAI,MAAM,CAmBlC;AAED,wBAAgB,YAAY,CAAC,EAC3B,IAAW,EACX,OAAa,EACb,UAA4C,EAC5C,WAAkC,EAClC,aAAsC,GACvC,GAAE;IACD,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACnB;;;EA+DL"}

package/package.json

@@ -6,7 +6,7 @@
     "access": "public",
     "@quilted/registry": "https://registry.npmjs.org"
   },
-  "version": "0.2.39",
+  "version": "0.2.40",
   "engines": {
     "node": ">=14.0.0"
   },
@@ -143,7 +143,7 @@
     "@rollup/plugin-commonjs": "^25.0.5",
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@quilted/assets": "^0.1.0",
+    "@quilted/assets": "^0.1.3",
     "@quilted/babel": "^0.2.2",
     "@quilted/graphql": "^3.3.4",
     "@types/babel__preset-env": "^7.9.0",

package/source/app.ts

@@ -8,7 +8,7 @@ import type {
   InputPluginOption,
   GetManualChunk,
 } from 'rollup';
-import type {AssetsBuildManifest} from '@quilted/assets';
+import type {AssetBuildManifest} from '@quilted/assets';
 
 import {
   MAGIC_MODULE_ENTRY,
@@ -614,11 +614,10 @@ export async function quiltAppBrowserPlugins({
 
   plugins.push(
     assetManifest({
-      baseURL,
-      cacheKey,
+      key: cacheKey,
+      base: baseURL,
       file: path.join(manifestsDirectory, `assets${targetFilenamePart}.json`),
       priority: assets?.priority,
-      moduleID: ({imported}) => path.relative(project.root, imported),
     }),
     visualizer({
       template: 'treemap',
@@ -638,6 +637,8 @@ export function quiltAppBrowserInput({
   root,
   entry,
 }: Pick<AppBrowserOptions, 'root' | 'entry'> = {}) {
+  const MODULES_TO_ENTRIES = new Map<string, string>();
+
   return {
     name: '@quilted/app-browser/input',
     async options(options) {
@@ -649,6 +650,15 @@ export function quiltAppBrowserInput({
         typeof finalEntry === 'string' && finalEntry !== MAGIC_MODULE_ENTRY
           ? path.basename(finalEntry).split('.').slice(0, -1).join('.')
           : 'browser';
+      const additionalEntries = await additionalEntriesForAppBrowser({root});
+
+      if (typeof finalEntry === 'string') {
+        MODULES_TO_ENTRIES.set(finalEntry, '.');
+      }
+
+      for (const [name, entry] of Object.entries(additionalEntries)) {
+        MODULES_TO_ENTRIES.set(entry, `./${name}`);
+      }
 
       return {
         ...options,
@@ -656,10 +666,24 @@ export function quiltAppBrowserInput({
         // Otherwise, Rollup will use the file name as the output name.
         input:
           typeof finalEntry === 'string'
-            ? {[finalEntryName]: finalEntry}
-            : finalEntry,
+            ? {...additionalEntries, [finalEntryName]: finalEntry}
+            : Array.isArray(finalEntry)
+              ? finalEntry
+              : {...additionalEntries, ...finalEntry},
       };
     },
+    resolveId(source, importer, options) {
+      const entry = MODULES_TO_ENTRIES.get(source);
+      if (entry == null) return null;
+
+      return this.resolve(source, importer, {...options, skipSelf: true}).then(
+        (resolved) => {
+          return resolved
+            ? {...resolved, meta: {...resolved.meta, quilt: {entry}}}
+            : resolved;
+        },
+      );
+    },
   } satisfies Plugin;
 }
 
@@ -1152,17 +1176,6 @@ export function magicModuleAppComponent({
       entry ??
       async function magicModuleApp() {
         const project = Project.load(root);
-        const {packageJSON} = project;
-
-        if (typeof packageJSON.raw.main === 'string') {
-          return project.resolve(packageJSON.raw.main);
-        }
-
-        const rootEntry = (packageJSON.raw.exports as any)?.['.'];
-
-        if (typeof rootEntry === 'string') {
-          return project.resolve(rootEntry);
-        }
 
         const globbed = await project.glob(
           '{App,app,index}.{ts,tsx,mjs,js,jsx}',
@@ -1184,7 +1197,7 @@ export function magicModuleAppRequestRouter({
   return createMagicModulePlugin({
     name: '@quilted/magic-module/app-request-router',
     module: MAGIC_MODULE_REQUEST_ROUTER,
-    alias: () => appServerEntry({entry, root}) as Promise<string>,
+    alias: () => sourceEntryForAppServer({entry, root}) as Promise<string>,
     async source() {
       return multiline`
         import '@quilted/quilt/globals';
@@ -1217,25 +1230,6 @@ export function magicModuleAppRequestRouter({
   });
 }
 
-export async function appServerEntry({
-  entry,
-  root = process.cwd(),
-}: Pick<AppServerOptions, 'entry' | 'root'> = {}) {
-  if (entry) return entry;
-
-  const project = Project.load(root);
-
-  const globbed = await project.glob(
-    '{server,service,backend}.{ts,tsx,mjs,js,jsx}',
-    {
-      nodir: true,
-      absolute: true,
-    },
-  );
-
-  return globbed[0];
-}
-
 export function magicModuleAppBrowserEntry({
   hydrate = true,
   selector = '#app',
@@ -1279,7 +1273,7 @@ export function magicModuleAppAssetManifests() {
       const manifests = await Promise.all(
         manifestFiles.map(
           async (file) =>
-            JSON.parse(await fs.readFile(file, 'utf8')) as AssetsBuildManifest,
+            JSON.parse(await fs.readFile(file, 'utf8')) as AssetBuildManifest,
         ),
       );
 
@@ -1346,6 +1340,39 @@ export async function sourceEntryForAppBrowser({
   if (entry) {
     return project.resolve(entry);
   } else {
+    const {packageJSON} = project;
+
+    // If we have a `main` or `browser` field in our `package.json`, use that
+    // as the browser entry.
+    if (typeof packageJSON.raw.main === 'string') {
+      return project.resolve(packageJSON.raw.main);
+    }
+
+    if (typeof packageJSON.raw.browser === 'string') {
+      return project.resolve(packageJSON.raw.browser);
+    }
+
+    // Try `package.json` `exports` field, if it’s a string or an object with export conditions
+    let currentEntry = packageJSON.raw.exports as any;
+    let resolvedEntryFromExports = resolveExportsField(
+      project,
+      currentEntry,
+      BROWSER_EXPORT_CONDITIONS,
+    );
+
+    if (resolvedEntryFromExports) return resolvedEntryFromExports;
+
+    // Then, try `exports[.]`, if it’s a string or an object with export conditions
+    currentEntry = currentEntry?.['.'];
+    resolvedEntryFromExports = resolveExportsField(
+      project,
+      currentEntry,
+      BROWSER_EXPORT_CONDITIONS,
+    );
+
+    if (resolvedEntryFromExports) return resolvedEntryFromExports;
+
+    // If we don’t have an entry yet, try the default file names
     const files = await project.glob(
       '{browser,client,web}.{ts,tsx,mjs,js,jsx}',
       {
@@ -1358,6 +1385,72 @@ export async function sourceEntryForAppBrowser({
   }
 }
 
+const BROWSER_EXPORT_CONDITIONS = new Set([
+  'browser',
+  'source',
+  'quilt:source',
+  'default',
+]);
+const SERVER_EXPORT_CONDITIONS = new Set([
+  'server',
+  'source',
+  'quilt:source',
+  'default',
+]);
+
+async function additionalEntriesForAppBrowser({
+  root = process.cwd(),
+}: {
+  root?: string | URL;
+}) {
+  const additionalEntries: Record<string, string> = {};
+
+  const project = Project.load(root);
+  const exports = project.packageJSON.raw.exports as any;
+
+  if (typeof exports === 'object' && exports != null) {
+    for (const [key, value] of Object.entries(exports)) {
+      // skip anything other than entries
+      if (!key.startsWith('.')) continue;
+
+      // Skip the `.` key, since it’s not an additional entry
+      if (key === '.') continue;
+
+      const resolvedEntry = resolveExportsField(
+        project,
+        value as any,
+        BROWSER_EXPORT_CONDITIONS,
+      );
+
+      if (resolvedEntry) {
+        additionalEntries[key.slice(2)] = resolvedEntry;
+      }
+    }
+  }
+
+  return additionalEntries;
+}
+
+function resolveExportsField(
+  project: Project,
+  entry:
+    | string
+    | null
+    | undefined
+    | Record<string, string | null | undefined | Record<string, unknown>>,
+  conditions: Set<string>,
+) {
+  if (typeof entry === 'string') {
+    return project.resolve(entry);
+  } else if (typeof entry === 'object' && entry != null) {
+    for (const [condition, value] of Object.entries(entry)) {
+      if (conditions.has(condition) && typeof value === 'string') {
+        return project.resolve(value);
+      }
+    }
+  }
+}
+
 export async function sourceEntryForAppServer({
   entry,
   root = process.cwd(),
@@ -1369,7 +1462,21 @@ export async function sourceEntryForAppServer({
 
   if (entry) {
     return project.resolve(entry);
-  } else {
+  }
+  {
+    const {packageJSON} = project;
+
+    // Try `package.json` `exports` field, if it has a `server` condition or a `.`
+    // enrty with a `server` condition
+    const exports = packageJSON.raw.exports as any;
+
+    const resolvedFromRootServerEntry = resolveExportsField(
+      project,
+      exports?.['server'] ?? exports?.['.']?.['server'],
+      SERVER_EXPORT_CONDITIONS,
+    );
+    if (resolvedFromRootServerEntry) return resolvedFromRootServerEntry;
+
     const files = await project.glob(
       '{server,service,backend}.{ts,tsx,mjs,js,jsx}',
       {

package/source/features/assets.ts

@@ -11,16 +11,13 @@ import type {
 } from 'rollup';
 import * as mime from 'mrmime';
 
-import type {
-  AssetsBuildManifest,
-  AssetsBuildManifestEntry,
-} from '@quilted/assets';
+import type {AssetBuildManifest, AssetBuildAsset} from '@quilted/assets';
 
 export interface AssetManifestOptions {
   file: string;
-  baseURL: string;
+  key?: URLSearchParams;
+  base: string;
   priority?: number;
-  cacheKey?: URLSearchParams;
   moduleID?(details: {imported: string}): string;
 }
 
@@ -38,8 +35,8 @@ async function writeManifestForBundle(
   bundle: OutputBundle,
   {
     file,
-    baseURL,
-    cacheKey,
+    base,
+    key,
     priority,
     moduleID: getModuleID = defaultModuleID,
   }: AssetManifestOptions,
@@ -56,11 +53,6 @@ async function writeManifestForBundle(
     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<string, string[]>();
 
   for (const output of outputs) {
@@ -68,14 +60,14 @@ async function writeManifestForBundle(
     dependencyMap.set(output.fileName, output.imports);
   }
 
-  const assets: string[] = [];
+  const assets: AssetBuildAsset[] = [];
   const assetIdMap = new Map<string, number>();
 
   function getAssetId(file: string) {
     let id = assetIdMap.get(file);
 
     if (id == null) {
-      assets.push(`${baseURL}${file}`);
+      assets.push([file.endsWith('.css') ? 1 : 2, file]);
       id = assets.length - 1;
       assetIdMap.set(file, id);
     }
@@ -83,34 +75,40 @@ async function writeManifestForBundle(
     return id;
   }
 
-  const manifest: AssetsBuildManifest = {
+  const manifest: AssetBuildManifest = {
+    key: key && key.size > 0 ? key.toString() : undefined,
+    base,
     priority,
-    cacheKey: cacheKey && cacheKey.size > 0 ? cacheKey.toString() : undefined,
     assets,
-    attributes: format === 'es' ? {scripts: {type: 'module'}} : undefined,
-    entries: {
-      default: createAssetsEntry([...entryChunk.imports, entryChunk.fileName], {
-        dependencyMap,
-        getAssetId,
-      }),
-    },
+    attributes: format === 'es' ? {2: {type: 'module'}} : undefined,
+    entries: {} as any,
     modules: {},
   };
 
   for (const output of outputs) {
-    if (output.type !== 'chunk' || !output.isDynamicEntry) continue;
+    if (
+      output.type !== 'chunk' ||
+      (!output.isDynamicEntry && !output.isEntry)
+    ) {
+      continue;
+    }
 
     const rollupModuleID = output.facadeModuleId ?? output.moduleIds.at(-1);
 
     if (rollupModuleID == null) continue;
 
-    const imported =
-      this.getModuleInfo(rollupModuleID)?.meta?.quilt?.module ?? rollupModuleID;
+    const moduleInfo = this.getModuleInfo(rollupModuleID);
+    const imported = moduleInfo?.meta?.quilt?.module ?? rollupModuleID;
 
     const moduleID = getModuleID({imported: imported});
 
     if (moduleID == null) continue;
 
+    if (output.isEntry) {
+      const entry = moduleInfo?.meta?.quilt?.entry ?? moduleID;
+      manifest.entries[entry] = moduleID;
+    }
+
     manifest.modules[moduleID] = createAssetsEntry(
       [...output.imports, output.fileName],
       {dependencyMap, getAssetId},
@@ -122,7 +120,11 @@ async function writeManifestForBundle(
 }
 
 function defaultModuleID({imported}: {imported: string}) {
-  return path.relative(process.cwd(), imported).replace(/[\\/]/g, '-');
+  return imported.startsWith('/')
+    ? path.relative(process.cwd(), imported)
+    : imported.startsWith('\0')
+      ? imported.replace('\0', '')
+      : imported;
 }
 
 function createAssetsEntry(
@@ -134,9 +136,8 @@ function createAssetsEntry(
     dependencyMap: Map<string, string[]>;
     getAssetId(file: string): number;
   },
-): AssetsBuildManifestEntry {
-  const styles: number[] = [];
-  const scripts: number[] = [];
+) {
+  const assets: number[] = [];
 
   const allFiles = new Set<string>();
   const addFile = (file: string) => {
@@ -153,14 +154,10 @@ function createAssetsEntry(
   }
 
   for (const file of allFiles) {
-    if (file.endsWith('.css')) {
-      styles.push(getAssetId(file));
-    } else {
-      scripts.push(getAssetId(file));
-    }
+    assets.push(getAssetId(file));
   }
 
-  return {scripts, styles};
+  return assets;
 }
 
 const QUERY_PATTERN = /\?.*$/s;