@quilted/rollup 0.2.4 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/rollup
 
+## 0.2.6
+
+### Patch Changes
+
+- [`e77a644c`](https://github.com/lemonmade/quilt/commit/e77a644cfaf528cd635f4bc26814c7ccb654e515) Thanks [@lemonmade](https://github.com/lemonmade)! - Add more development features to Vite plugin
+
+## 0.2.5
+
+### Patch Changes
+
+- [`465883e1`](https://github.com/lemonmade/quilt/commit/465883e12571bee9d6e8c8d517ebf6da384687b2) Thanks [@lemonmade](https://github.com/lemonmade)! - Add support for automatic in-repo source aliases
+
 ## 0.2.4
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -1,6 +1,5 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs/promises';
-import { glob } from 'glob';
 import { createRequire } from 'node:module';
 import { MAGIC_MODULE_ENTRY, MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_REQUEST_ROUTER, MAGIC_MODULE_BROWSER_ASSETS } from './constants.mjs';
 import { resolveEnvOption } from './features/env.mjs';
@@ -8,12 +7,11 @@ import { multiline } from './shared/strings.mjs';
 import { getNodePlugins, removeBuildFiles, normalizeRollupInput } from './shared/rollup.mjs';
 import { createMagicModulePlugin } from './shared/magic-module.mjs';
 import { getBrowserGroups, getBrowserGroupTargetDetails, targetsSupportModules, rollupGenerateOptionsForBrowsers, getBrowserGroupRegularExpressions } from './shared/browserslist.mjs';
-import { loadPackageJSON } from './shared/package-json.mjs';
-import { resolveRoot } from './shared/path.mjs';
+import { Project } from './shared/project.mjs';
 
 const require = createRequire(import.meta.url);
 async function quiltAppOptions({
-  root: rootPath = process.cwd(),
+  root = process.cwd(),
   app,
   env,
   graphql,
@@ -21,15 +19,15 @@ async function quiltAppOptions({
   browser: browserOptions,
   server: serverOptions
 } = {}) {
-  const root = resolveRoot(rootPath);
-  const browserGroups = await getBrowserGroups({ root });
+  const project = Project.load(root);
+  const browserGroups = await getBrowserGroups({ root: project.root });
   const browserGroupEntries = Object.entries(browserGroups);
   const hasMultipleBrowserGroups = browserGroupEntries.length > 1;
   const optionPromises = [];
   browserGroupEntries.forEach(([name, browsers], index) => {
     optionPromises.push(
       quiltAppBrowserOptions({
-        root,
+        root: project.root,
         app,
         graphql,
         ...browserOptions,
@@ -51,7 +49,7 @@ async function quiltAppOptions({
   });
   optionPromises.push(
     quiltAppServerOptions({
-      root,
+      root: project.root,
       app,
       graphql,
       ...serverOptions,
@@ -65,12 +63,12 @@ async function quiltAppOptions({
   return Promise.all(optionPromises);
 }
 async function quiltAppBrowserOptions(options = {}) {
-  const { root: rootPath = process.cwd(), assets } = options;
-  const root = resolveRoot(rootPath);
+  const { root = process.cwd(), assets } = options;
+  const project = Project.load(root);
   const [plugins, browserGroup] = await Promise.all([
     quiltAppBrowser(options),
     getBrowserGroupTargetDetails(assets?.targets, {
-      root
+      root: project.root
     })
   ]);
   const targetFilenamePart = browserGroup.name ? `.${browserGroup.name}` : "";
@@ -82,7 +80,7 @@ async function quiltAppBrowserOptions(options = {}) {
     plugins,
     output: {
       format: isESM ? "esm" : "systemjs",
-      dir: path.resolve(root, `build/assets`),
+      dir: project.resolve(`build/assets`),
       entryFileNames: `[name]${targetFilenamePart}.[hash].js`,
       assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,
       chunkFileNames: `[name]${targetFilenamePart}.[hash].js`,
@@ -92,7 +90,7 @@ async function quiltAppBrowserOptions(options = {}) {
   };
 }
 async function quiltAppBrowser({
-  root: rootPath = process.cwd(),
+  root = process.cwd(),
   app,
   entry,
   env,
@@ -100,13 +98,13 @@ async function quiltAppBrowser({
   module,
   graphql = true
 } = {}) {
-  const root = resolveRoot(rootPath);
+  const project = Project.load(root);
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
   const minify = assets?.minify ?? mode === "production";
   const baseURL = assets?.baseURL ?? "/assets/";
   const assetsInline = assets?.inline ?? true;
   const browserGroup = await getBrowserGroupTargetDetails(assets?.targets, {
-    root
+    root: project.root
   });
   const targetFilenamePart = browserGroup.name ? `.${browserGroup.name}` : "";
   const [
@@ -114,6 +112,7 @@ async function quiltAppBrowser({
     { magicModuleEnv, replaceProcessEnv },
     { sourceCode },
     { tsconfigAliases },
+    { monorepoPackageAliases },
     { react },
     { css },
     { assetManifest, rawAssets, staticAssets },
@@ -121,13 +120,13 @@ async function quiltAppBrowser({
     { systemJS },
     { workers },
     { esnext },
-    nodePlugins,
-    packageJSON
+    nodePlugins
   ] = await Promise.all([
     import('rollup-plugin-visualizer'),
     import('./features/env.mjs'),
     import('./features/source-code.mjs'),
     import('./features/typescript.mjs'),
+    import('./features/node.mjs'),
     import('./features/react.mjs'),
     import('./features/css.mjs'),
     import('./features/assets.mjs'),
@@ -135,15 +134,16 @@ async function quiltAppBrowser({
     import('./features/system-js.mjs'),
     import('./features/workers.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle: true }),
-    loadPackageJSON(root)
+    getNodePlugins({ bundle: true })
   ]);
   const plugins = [
-    quiltAppBrowserInput({ root, entry }),
+    quiltAppBrowserInput({ root: project.root, entry }),
     ...nodePlugins,
     systemJS({ minify }),
     replaceProcessEnv({ mode }),
     magicModuleEnv({ ...resolveEnvOption(env), mode }),
+    magicModuleAppComponent({ entry: app, root: project.root }),
+    magicModuleAppBrowserEntry(module),
     sourceCode({
       mode,
       targets: browserGroup.browsers,
@@ -176,39 +176,34 @@ async function quiltAppBrowser({
     asyncModules({
       baseURL,
       preload: true,
-      moduleID: ({ imported }) => path.relative(root, imported)
+      moduleID: ({ imported }) => path.relative(project.root, imported)
     }),
     workers({
       baseURL,
       outputOptions: {
         format: "iife",
         inlineDynamicImports: true,
-        dir: path.resolve(root, `build/assets`),
+        dir: project.resolve(`build/assets`),
         entryFileNames: `[name]${targetFilenamePart}.[hash].js`,
         assetFileNames: `[name]${targetFilenamePart}.[hash].[ext]`,
         chunkFileNames: `[name]${targetFilenamePart}.[hash].js`
       }
     }),
-    tsconfigAliases({ root })
+    tsconfigAliases({ root: project.root }),
+    monorepoPackageAliases({ root: project.root })
   ];
   if (assets?.clean ?? true) {
     plugins.push(
       removeBuildFiles(["build/assets", "build/manifests", "build/reports"], {
-        root
+        root: project.root
       })
     );
   }
-  const appEntry = await resolveAppEntry(app, { root, packageJSON });
-  if (appEntry) {
-    plugins.push(magicModuleAppComponent({ entry: appEntry }));
-  }
-  plugins.push(magicModuleAppBrowserEntry(module));
   if (graphql) {
     const { graphql: graphql2 } = await import('./features/graphql.mjs');
     plugins.push(
       graphql2({
-        manifest: path.resolve(
-          root,
+        manifest: project.resolve(
           `build/manifests/graphql${targetFilenamePart}.json`
         )
       })
@@ -226,18 +221,14 @@ async function quiltAppBrowser({
     assetManifest({
       baseURL,
       cacheKey,
-      file: path.resolve(
-        root,
-        `build/manifests/assets${targetFilenamePart}.json`
-      ),
+      file: project.resolve(`build/manifests/assets${targetFilenamePart}.json`),
       priority: assets?.priority
     }),
     visualizer({
       template: "treemap",
       open: false,
       brotliSize: true,
-      filename: path.resolve(
-        root,
+      filename: project.resolve(
         `build/reports/bundle-visualizer${targetFilenamePart}.html`
       )
     })
@@ -245,18 +236,13 @@ async function quiltAppBrowser({
   return plugins;
 }
 function quiltAppBrowserInput({
-  root: rootPath = process.cwd(),
+  root,
   entry
 } = {}) {
-  const root = resolveRoot(rootPath);
   return {
     name: "@quilted/app-browser/input",
     async options(options) {
-      const finalEntry = normalizeRollupInput(options.input) ?? (entry ? path.resolve(root, entry) : await glob("{browser,client,web}.{ts,tsx,mjs,js,jsx}", {
-        cwd: root,
-        nodir: true,
-        absolute: true
-      }).then((files) => files[0])) ?? MAGIC_MODULE_ENTRY;
+      const finalEntry = normalizeRollupInput(options.input) ?? await sourceForAppBrowser({ entry, root }) ?? MAGIC_MODULE_ENTRY;
       return {
         ...options,
         // If we are using the "magic entry", give it an explicit name of `browser`.
@@ -267,8 +253,8 @@ function quiltAppBrowserInput({
   };
 }
 async function quiltAppServerOptions(options = {}) {
-  const { root: rootPath = process.cwd(), output } = options;
-  const root = resolveRoot(rootPath);
+  const { root = process.cwd(), output } = options;
+  const project = Project.load(root);
   const hash = output?.hash ?? "async-only";
   const outputFormat = output?.format ?? "esmodules";
   const plugins = await quiltAppServer(options);
@@ -276,7 +262,7 @@ async function quiltAppServerOptions(options = {}) {
     plugins,
     output: {
       format: outputFormat === "commonjs" || outputFormat === "cjs" ? "cjs" : "esm",
-      dir: path.resolve(root, `build/server`),
+      dir: project.resolve(`build/server`),
       entryFileNames: `[name]${hash === true ? `.[hash]` : ""}.js`,
       chunkFileNames: `[name]${hash === true || hash === "async-only" ? `.[hash]` : ""}.js`,
       assetFileNames: `[name]${hash === true ? `.[hash]` : ""}.[ext]`,
@@ -285,7 +271,7 @@ async function quiltAppServerOptions(options = {}) {
   };
 }
 async function quiltAppServer({
-  root: rootPath = process.cwd(),
+  root = process.cwd(),
   app,
   env,
   entry,
@@ -294,7 +280,7 @@ async function quiltAppServer({
   assets,
   output
 } = {}) {
-  const root = resolveRoot(rootPath);
+  const project = Project.load(root);
   const mode = (typeof env === "object" ? env?.mode : env) ?? "production";
   const baseURL = assets?.baseURL ?? "/assets/";
   const assetsInline = assets?.inline ?? true;
@@ -306,30 +292,36 @@ async function quiltAppServer({
     { sourceCode },
     { react },
     { tsconfigAliases },
+    { monorepoPackageAliases },
     { css },
     { rawAssets, staticAssets },
     { asyncModules },
     { esnext },
-    nodePlugins,
-    packageJSON
+    nodePlugins
   ] = await Promise.all([
     import('rollup-plugin-visualizer'),
     import('./features/env.mjs'),
     import('./features/source-code.mjs'),
     import('./features/react.mjs'),
     import('./features/typescript.mjs'),
+    import('./features/node.mjs'),
     import('./features/css.mjs'),
     import('./features/assets.mjs'),
     import('./features/async.mjs'),
     import('./features/esnext.mjs'),
-    getNodePlugins({ bundle }),
-    loadPackageJSON(root)
+    getNodePlugins({ bundle })
   ]);
   const plugins = [
-    quiltAppServerInput({ root, entry, format }),
+    quiltAppServerInput({ root: project.root, entry, format }),
     ...nodePlugins,
     replaceProcessEnv({ mode }),
     magicModuleEnv({ ...resolveEnvOption(env), mode }),
+    magicModuleAppComponent({ entry: app, root: project.root }),
+    magicModuleAppServerEntry({
+      assets: { baseURL }
+    }),
+    magicModuleAppRequestRouter({ entry, root: project.root }),
+    magicModuleAppAssetManifests(),
     sourceCode({
       mode,
       targets: ["current node"],
@@ -361,27 +353,12 @@ async function quiltAppServer({
     asyncModules({
       baseURL,
       preload: false,
-      moduleID: ({ imported }) => path.relative(root, imported)
+      moduleID: ({ imported }) => path.relative(project.root, imported)
     }),
-    removeBuildFiles(["build/server"], { root }),
-    tsconfigAliases({ root })
+    removeBuildFiles(["build/server"], { root: project.root }),
+    tsconfigAliases({ root: project.root }),
+    monorepoPackageAliases({ root: project.root })
   ];
-  const appEntry = await resolveAppEntry(app, { root, packageJSON });
-  if (appEntry) {
-    plugins.push(magicModuleAppComponent({ entry: appEntry }));
-  }
-  const serverEntry = entry ? path.resolve(root, entry) : await glob("{server,service,backend}.{ts,tsx,mjs,js,jsx}", {
-    cwd: root,
-    nodir: true,
-    absolute: true
-  }).then((files) => files[0]);
-  plugins.push(
-    magicModuleAppServerEntry({
-      assets: { baseURL }
-    }),
-    magicModuleAppRequestRouter({ entry: serverEntry }),
-    magicModuleAppAssetManifests()
-  );
   if (graphql) {
     const { graphql: graphql2 } = await import('./features/graphql.mjs');
     plugins.push(graphql2({ manifest: false }));
@@ -395,27 +372,23 @@ async function quiltAppServer({
       template: "treemap",
       open: false,
       brotliSize: false,
-      filename: path.resolve(
-        root,
-        `build/reports/bundle-visualizer.server.html`
-      )
+      filename: project.resolve(`build/reports/bundle-visualizer.server.html`)
     })
   );
   return plugins;
 }
 function quiltAppServerInput({
-  root: rootPath = process.cwd(),
+  root = process.cwd(),
   entry,
   format = "request-router"
 } = {}) {
-  const root = resolveRoot(rootPath);
+  const project = Project.load(root);
   return {
     name: "@quilted/app-server/input",
     async options(options) {
       let finalEntry = normalizeRollupInput(options.input);
       if (!finalEntry) {
-        const serverEntry = entry ? path.resolve(root, entry) : await glob("{server,service,backend}.{ts,tsx,mjs,js,jsx}", {
-          cwd: root,
+        const serverEntry = entry ? project.resolve(entry) : await project.glob("{server,service,backend}.{ts,tsx,mjs,js,jsx}", {
           nodir: true,
           absolute: true
         }).then((files) => files[0]);
@@ -430,48 +403,80 @@ function quiltAppServerInput({
     }
   };
 }
-function magicModuleAppComponent({ entry }) {
+function magicModuleAppComponent({
+  entry,
+  root = process.cwd()
+}) {
   return createMagicModulePlugin({
     name: "@quilted/magic-module/app",
     module: MAGIC_MODULE_APP_COMPONENT,
-    alias: entry
+    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}",
+        {
+          nodir: true,
+          absolute: true
+        }
+      );
+      return globbed[0];
+    }
   });
 }
 function magicModuleAppRequestRouter({
-  entry
+  entry,
+  root = process.cwd()
 } = {}) {
   return createMagicModulePlugin({
     name: "@quilted/magic-module/app-request-router",
     module: MAGIC_MODULE_REQUEST_ROUTER,
-    alias: entry,
-    source: entry ? void 0 : async function source() {
+    alias: entry ?? async function magicModuleRequestRouter() {
+      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];
+    },
+    async source() {
       return multiline`
-            import '@quilted/quilt/globals';
+        import '@quilted/quilt/globals';
 
-            import {jsx} from 'react/jsx-runtime';
-            import {RequestRouter} from '@quilted/quilt/request-router';
-            import {renderToResponse} from '@quilted/quilt/server';
+        import {jsx} from 'react/jsx-runtime';
+        import {RequestRouter} from '@quilted/quilt/request-router';
+        import {renderToResponse} from '@quilted/quilt/server';
 
-            import App from ${JSON.stringify(MAGIC_MODULE_APP_COMPONENT)};
-            import {BrowserAssets} from ${JSON.stringify(
+        import App from ${JSON.stringify(MAGIC_MODULE_APP_COMPONENT)};
+        import {BrowserAssets} from ${JSON.stringify(
         MAGIC_MODULE_BROWSER_ASSETS
       )};
 
-            const router = new RequestRouter();
-            const assets = new BrowserAssets();
+        const router = new RequestRouter();
+        const assets = new BrowserAssets();
 
-            // For all GET requests, render our React application.
-            router.get(async (request) => {
-              const response = await renderToResponse(jsx(App), {
-                request,
-                assets,
-              });
+        // For all GET requests, render our React application.
+        router.get(async (request) => {
+          const response = await renderToResponse(jsx(App), {
+            request,
+            assets,
+          });
 
-              return response;
-            });
+          return response;
+        });
 
-            export default router;
-          `;
+        export default router;
+      `;
     }
   });
 }
@@ -549,8 +554,8 @@ function magicModuleAppAssetManifests() {
     name: "@quilted/magic-module/asset-manifests",
     module: MAGIC_MODULE_BROWSER_ASSETS,
     async source() {
-      const { glob: glob2 } = await import('glob');
-      const manifestFiles = await glob2("assets*.json", {
+      const { glob } = await import('glob');
+      const manifestFiles = await glob("assets*.json", {
         nodir: true,
         absolute: true,
         cwd: path.resolve(`build/manifests`)
@@ -604,6 +609,24 @@ function magicModuleAppAssetManifests() {
     }
   });
 }
+async function sourceForAppBrowser({
+  entry,
+  root = process.cwd()
+}) {
+  const project = Project.load(root);
+  if (entry) {
+    return project.resolve(entry);
+  } else {
+    const files = await project.glob(
+      "{browser,client,web}.{ts,tsx,mjs,js,jsx}",
+      {
+        nodir: true,
+        absolute: true
+      }
+    );
+    return files[0];
+  }
+}
 const FRAMEWORK_CHUNK_NAME = "framework";
 const POLYFILLS_CHUNK_NAME = "polyfills";
 const VENDOR_CHUNK_NAME = "vendor";
@@ -679,23 +702,5 @@ function createManualChunksSorter() {
     return `${bundleBaseName}-${relativeId.split(path.sep)[0]?.split(".")[0]}`;
   };
 }
-async function resolveAppEntry(entry, { root, packageJSON }) {
-  if (entry) {
-    return path.resolve(root, entry);
-  }
-  if (typeof packageJSON.main === "string") {
-    return path.resolve(root, packageJSON.main);
-  }
-  const rootEntry = packageJSON.exports?.["."];
-  if (typeof rootEntry === "string") {
-    return path.resolve(root, rootEntry);
-  }
-  const globbed = await glob("{App,app,index}.{ts,tsx,mjs,js,jsx}", {
-    cwd: root,
-    nodir: true,
-    absolute: true
-  });
-  return globbed[0];
-}
 
-export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, magicModuleAppServerEntry, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserOptions, quiltAppOptions, quiltAppServer, quiltAppServerInput, quiltAppServerOptions };
+export { MAGIC_MODULE_APP_COMPONENT, MAGIC_MODULE_BROWSER_ASSETS, MAGIC_MODULE_ENTRY, MAGIC_MODULE_REQUEST_ROUTER, magicModuleAppAssetManifests, magicModuleAppBrowserEntry, magicModuleAppComponent, magicModuleAppRequestRouter, magicModuleAppServerEntry, quiltAppBrowser, quiltAppBrowserInput, quiltAppBrowserOptions, quiltAppOptions, quiltAppServer, quiltAppServerInput, quiltAppServerOptions, sourceForAppBrowser };

package/build/esm/features/node.mjs

@@ -0,0 +1,57 @@
+import { realpathSync } from 'node:fs';
+import { Project, sourceEntriesForProject } from '../shared/project.mjs';
+
+async function monorepoPackageAliases({
+  root = process.cwd()
+} = {}) {
+  const project = Project.load(root);
+  const seenDependencies = /* @__PURE__ */ new Set();
+  const seenProjects = /* @__PURE__ */ new Set();
+  function processProject(project2) {
+    const { dependencies, devDependencies } = project2.packageJSON.raw;
+    for (const pkg of Object.keys({ ...dependencies, ...devDependencies })) {
+      if (seenDependencies.has(pkg))
+        continue;
+      seenDependencies.add(pkg);
+      let packageRoot;
+      try {
+        packageRoot = realpathSync(project2.resolve("node_modules", pkg));
+      } catch {
+      }
+      if (packageRoot == null || packageRoot.includes("node_modules") || packageRoot === root) {
+        continue;
+      }
+      const packageProject = Project.load(packageRoot);
+      if (seenProjects.has(packageProject))
+        continue;
+      seenProjects.add(packageProject);
+      processProject(packageProject);
+    }
+  }
+  processProject(project);
+  const [{ default: alias }, projectsWithEntries] = await Promise.all([
+    import('@rollup/plugin-alias'),
+    Promise.all(
+      Array.from(seenProjects, async (project2) => {
+        const entries = await sourceEntriesForProject(project2);
+        return { project: project2, entries };
+      })
+    )
+  ]);
+  const aliases = [];
+  for (const { project: project2, entries } of projectsWithEntries) {
+    const { name } = project2;
+    for (const [entry, source] of Object.entries(entries)) {
+      const entryName = entry === "." ? name : `${name}/${entry}`;
+      aliases.push({
+        find: new RegExp(`^${entryName}$`),
+        replacement: source
+      });
+    }
+  }
+  return alias({
+    entries: aliases
+  });
+}
+
+export { monorepoPackageAliases };