@quilted/rollup 0.2.38 → 0.2.40

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @quilted/rollup
 
+## 0.2.40
+
+### Patch Changes
+
+- [#805](https://github.com/lemonmade/quilt/pull/805) [`4995757`](https://github.com/lemonmade/quilt/commit/49957579a4811a1c310635f5dcdb4e67668ec22e) Thanks [@lemonmade](https://github.com/lemonmade)! - Allow server entry from `exports`
+
+- [#805](https://github.com/lemonmade/quilt/pull/805) [`4995757`](https://github.com/lemonmade/quilt/commit/49957579a4811a1c310635f5dcdb4e67668ec22e) Thanks [@lemonmade](https://github.com/lemonmade)! - Compress built asset manifest and allow multiple named entries
+
+- [#805](https://github.com/lemonmade/quilt/pull/805) [`4995757`](https://github.com/lemonmade/quilt/commit/49957579a4811a1c310635f5dcdb4e67668ec22e) Thanks [@lemonmade](https://github.com/lemonmade)! - Use more `package.json` for browser entrypoint
+
+- Updated dependencies [[`4995757`](https://github.com/lemonmade/quilt/commit/49957579a4811a1c310635f5dcdb4e67668ec22e)]:
+  - @quilted/assets@0.1.3
+
+## 0.2.39
+
+### Patch Changes
+
+- [#803](https://github.com/lemonmade/quilt/pull/803) [`3af36eb`](https://github.com/lemonmade/quilt/commit/3af36ebb90db5506d311d77c0621b79cc5485c9d) Thanks [@lemonmade](https://github.com/lemonmade)! - Add manifest entries for all async modules
+
 ## 0.2.38
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -259,8 +259,8 @@ async function quiltAppBrowserPlugins({
   }
   plugins.push(
     assetManifest({
-      baseURL,
-      cacheKey,
+      key: cacheKey,
+      base: baseURL,
       file: path.join(manifestsDirectory, `assets${targetFilenamePart}.json`),
       priority: assets?.priority
     }),
@@ -280,17 +280,34 @@ function quiltAppBrowserInput({
   root,
   entry
 } = {}) {
+  const MODULES_TO_ENTRIES = /* @__PURE__ */ new Map();
   return {
     name: "@quilted/app-browser/input",
     async options(options) {
       const finalEntry = normalizeRollupInput(options.input) ?? await sourceEntryForAppBrowser({ entry, root }) ?? MAGIC_MODULE_ENTRY;
       const finalEntryName = 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, entry2] of Object.entries(additionalEntries)) {
+        MODULES_TO_ENTRIES.set(entry2, `./${name}`);
+      }
       return {
         ...options,
         // If we are using the "magic entry", give it an explicit name of `browser`.
         // Otherwise, Rollup will use the file name as the output name.
-        input: typeof finalEntry === "string" ? { [finalEntryName]: finalEntry } : finalEntry
+        input: typeof finalEntry === "string" ? { ...additionalEntries, [finalEntryName]: finalEntry } : Array.isArray(finalEntry) ? finalEntry : { ...additionalEntries, ...finalEntry }
       };
+    },
+    resolveId(source, importer, options) {
+      const entry2 = MODULES_TO_ENTRIES.get(source);
+      if (entry2 == null) return null;
+      return this.resolve(source, importer, { ...options, skipSelf: true }).then(
+        (resolved) => {
+          return resolved ? { ...resolved, meta: { ...resolved.meta, quilt: { entry: entry2 } } } : resolved;
+        }
+      );
     }
   };
 }
@@ -679,14 +696,6 @@ function magicModuleAppComponent({
     module: MAGIC_MODULE_APP_COMPONENT,
     alias: 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?.["."];
-      if (typeof rootEntry === "string") {
-        return project.resolve(rootEntry);
-      }
       const globbed = await project.glob(
         "{App,app,index}.{ts,tsx,mjs,js,jsx}",
         {
@@ -705,7 +714,7 @@ function magicModuleAppRequestRouter({
   return createMagicModulePlugin({
     name: "@quilted/magic-module/app-request-router",
     module: MAGIC_MODULE_REQUEST_ROUTER,
-    alias: () => appServerEntry({ entry, root }),
+    alias: () => sourceEntryForAppServer({ entry, root }),
     async source() {
       return multiline`
         import '@quilted/quilt/globals';
@@ -737,21 +746,6 @@ function magicModuleAppRequestRouter({
     }
   });
 }
-async function appServerEntry({
-  entry,
-  root = process.cwd()
-} = {}) {
-  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];
-}
 function magicModuleAppBrowserEntry({
   hydrate = true,
   selector = "#app"
@@ -845,6 +839,27 @@ async function sourceEntryForAppBrowser({
   if (entry) {
     return project.resolve(entry);
   } else {
+    const { packageJSON } = project;
+    if (typeof packageJSON.raw.main === "string") {
+      return project.resolve(packageJSON.raw.main);
+    }
+    if (typeof packageJSON.raw.browser === "string") {
+      return project.resolve(packageJSON.raw.browser);
+    }
+    let currentEntry = packageJSON.raw.exports;
+    let resolvedEntryFromExports = resolveExportsField(
+      project,
+      currentEntry,
+      BROWSER_EXPORT_CONDITIONS
+    );
+    if (resolvedEntryFromExports) return resolvedEntryFromExports;
+    currentEntry = currentEntry?.["."];
+    resolvedEntryFromExports = resolveExportsField(
+      project,
+      currentEntry,
+      BROWSER_EXPORT_CONDITIONS
+    );
+    if (resolvedEntryFromExports) return resolvedEntryFromExports;
     const files = await project.glob(
       "{browser,client,web}.{ts,tsx,mjs,js,jsx}",
       {
@@ -855,6 +870,51 @@ async function sourceEntryForAppBrowser({
     return files[0];
   }
 }
+const BROWSER_EXPORT_CONDITIONS = /* @__PURE__ */ new Set([
+  "browser",
+  "source",
+  "quilt:source",
+  "default"
+]);
+const SERVER_EXPORT_CONDITIONS = /* @__PURE__ */ new Set([
+  "server",
+  "source",
+  "quilt:source",
+  "default"
+]);
+async function additionalEntriesForAppBrowser({
+  root = process.cwd()
+}) {
+  const additionalEntries = {};
+  const project = Project.load(root);
+  const exports = project.packageJSON.raw.exports;
+  if (typeof exports === "object" && exports != null) {
+    for (const [key, value] of Object.entries(exports)) {
+      if (!key.startsWith(".")) continue;
+      if (key === ".") continue;
+      const resolvedEntry = resolveExportsField(
+        project,
+        value,
+        BROWSER_EXPORT_CONDITIONS
+      );
+      if (resolvedEntry) {
+        additionalEntries[key.slice(2)] = resolvedEntry;
+      }
+    }
+  }
+  return additionalEntries;
+}
+function resolveExportsField(project, entry, conditions) {
+  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);
+      }
+    }
+  }
+}
 async function sourceEntryForAppServer({
   entry,
   root = process.cwd()
@@ -862,7 +922,16 @@ async function sourceEntryForAppServer({
   const project = Project.load(root);
   if (entry) {
     return project.resolve(entry);
-  } else {
+  }
+  {
+    const { packageJSON } = project;
+    const exports = packageJSON.raw.exports;
+    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}",
       {
@@ -967,4 +1036,4 @@ function createManualChunksSorter() {
   };
 }
 
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, appServerEntry, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, nodeAppServerRuntime, quiltApp, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerInput, quiltAppServerPlugins, quiltAppServiceWorker, quiltAppServiceWorkerInput, quiltAppServiceWorkerPlugins, sourceEntryForAppBrowser, sourceEntryForAppServer, sourceEntryForAppServiceWorker };
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, nodeAppServerRuntime, quiltApp, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserPlugins, quiltAppServer, quiltAppServerInput, quiltAppServerPlugins, quiltAppServiceWorker, quiltAppServiceWorkerInput, quiltAppServiceWorkerPlugins, sourceEntryForAppBrowser, sourceEntryForAppServer, sourceEntryForAppServiceWorker };

package/build/esm/features/assets.mjs

@@ -11,7 +11,13 @@ function assetManifest(manifestOptions) {
     }
   };
 }
-async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priority }, { format }) {
+async function writeManifestForBundle(bundle, {
+  file,
+  base,
+  key,
+  priority,
+  moduleID: getModuleID = defaultModuleID
+}, { format }) {
   const outputs = Object.values(bundle);
   const entries = outputs.filter(
     (output) => output.type === "chunk" && output.isEntry
@@ -19,7 +25,6 @@ async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priorit
   if (entries.length === 0) {
     throw new Error(`Could not find any entries in your rollup bundle...`);
   }
-  const entryChunk = entries[0];
   const dependencyMap = /* @__PURE__ */ new Map();
   for (const output of outputs) {
     if (output.type !== "chunk") continue;
@@ -30,32 +35,36 @@ async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priorit
   function getAssetId(file2) {
     let id = assetIdMap.get(file2);
     if (id == null) {
-      assets.push(`${baseURL}${file2}`);
+      assets.push([file2.endsWith(".css") ? 1 : 2, file2]);
       id = assets.length - 1;
       assetIdMap.set(file2, id);
     }
     return id;
   }
   const manifest = {
+    key: key && key.size > 0 ? key.toString() : void 0,
+    base,
     priority,
-    cacheKey: cacheKey && cacheKey.size > 0 ? cacheKey.toString() : void 0,
     assets,
-    attributes: format === "es" ? { scripts: { type: "module" } } : void 0,
-    entries: {
-      default: createAssetsEntry([...entryChunk.imports, entryChunk.fileName], {
-        dependencyMap,
-        getAssetId
-      })
-    },
+    attributes: format === "es" ? { 2: { type: "module" } } : void 0,
+    entries: {},
     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;
-    const moduleId = this.getModuleInfo(originalModuleId)?.meta.quilt?.moduleID;
-    if (moduleId == null) continue;
-    manifest.modules[moduleId] = createAssetsEntry(
+    if (output.type !== "chunk" || !output.isDynamicEntry && !output.isEntry) {
+      continue;
+    }
+    const rollupModuleID = output.facadeModuleId ?? output.moduleIds.at(-1);
+    if (rollupModuleID == null) continue;
+    const moduleInfo = this.getModuleInfo(rollupModuleID);
+    const imported = moduleInfo?.meta?.quilt?.module ?? rollupModuleID;
+    const moduleID = getModuleID({ 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 }
     );
@@ -63,12 +72,14 @@ async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priorit
   await fs.mkdir(path.dirname(file), { recursive: true });
   await fs.writeFile(file, JSON.stringify(manifest, null, 2));
 }
+function defaultModuleID({ imported }) {
+  return imported.startsWith("/") ? path.relative(process.cwd(), imported) : imported.startsWith("\0") ? imported.replace("\0", "") : imported;
+}
 function createAssetsEntry(files, {
   dependencyMap,
   getAssetId
 }) {
-  const styles = [];
-  const scripts = [];
+  const assets = [];
   const allFiles = /* @__PURE__ */ new Set();
   const addFile = (file) => {
     if (allFiles.has(file)) return;
@@ -81,13 +92,9 @@ function createAssetsEntry(files, {
     addFile(file);
   }
   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;
 const HASH_PATTERN = /#.*$/s;

package/build/esm/features/async.mjs

@@ -1,5 +1,4 @@
-import { createHash } from 'node:crypto';
-import { sep, posix } from 'node:path';
+import * as path from 'node:path';
 import { multiline } from '../shared/strings.mjs';
 import MagicString from 'magic-string';
 
@@ -54,7 +53,7 @@ function asyncModules({
         return {
           code,
           meta: {
-            quilt: { moduleID }
+            quilt: { module: imported, moduleID }
           }
         };
       }
@@ -78,9 +77,7 @@ function asyncModules({
   };
 }
 function defaultModuleID({ imported }) {
-  const name = imported.split(sep).pop().split(".")[0];
-  const hash = createHash("sha256").update(imported).digest("hex").substring(0, 8);
-  return `${name}_${hash}`;
+  return path.relative(process.cwd(), imported).replace(/[\\/]/g, "-");
 }
 async function preloadAsyncAssetsInESMBundle(bundle) {
   const { parse: parseImports } = await import('es-module-lexer');
@@ -145,7 +142,10 @@ function getDependenciesForImport(imported, chunk, bundle) {
   const originalFilename = chunk.fileName;
   const dependencies = /* @__PURE__ */ new Set();
   const analyzed = /* @__PURE__ */ new Set();
-  const normalizedFile = posix.join(posix.dirname(originalFilename), imported);
+  const normalizedFile = path.posix.join(
+    path.posix.dirname(originalFilename),
+    imported
+  );
   const addDependencies = (filename) => {
     if (filename === originalFilename) return;
     if (analyzed.has(filename)) return;
@@ -162,4 +162,4 @@ function getDependenciesForImport(imported, chunk, bundle) {
   return dependencies;
 }
 
-export { asyncModules };
+export { IMPORT_PREFIX, asyncModules };