@quilted/rollup 0.2.5 → 0.2.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

package/build/esm/app.mjs

@@ -142,6 +142,8 @@ async function quiltAppBrowser({
     systemJS({ minify }),
     replaceProcessEnv({ mode }),
     magicModuleEnv({ ...resolveEnvOption(env), mode }),
+    magicModuleAppComponent({ entry: app, root: project.root }),
+    magicModuleAppBrowserEntry(module),
     sourceCode({
       mode,
       targets: browserGroup.browsers,
@@ -197,11 +199,6 @@ async function quiltAppBrowser({
       })
     );
   }
-  const appEntry = await resolveAppEntry(app, project);
-  if (appEntry) {
-    plugins.push(magicModuleAppComponent({ entry: appEntry }));
-  }
-  plugins.push(magicModuleAppBrowserEntry(module));
   if (graphql) {
     const { graphql: graphql2 } = await import('./features/graphql.mjs');
     plugins.push(
@@ -239,17 +236,13 @@ async function quiltAppBrowser({
   return plugins;
 }
 function quiltAppBrowserInput({
-  root = process.cwd(),
+  root,
   entry
 } = {}) {
-  const project = Project.load(root);
   return {
     name: "@quilted/app-browser/input",
     async options(options) {
-      const finalEntry = normalizeRollupInput(options.input) ?? (entry ? project.resolve(entry) : await project.glob("{browser,client,web}.{ts,tsx,mjs,js,jsx}", {
-        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`.
@@ -323,6 +316,12 @@ async function quiltAppServer({
     ...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"],
@@ -360,21 +359,6 @@ async function quiltAppServer({
     tsconfigAliases({ root: project.root }),
     monorepoPackageAliases({ root: project.root })
   ];
-  const appEntry = await resolveAppEntry(app, project);
-  if (appEntry) {
-    plugins.push(magicModuleAppComponent({ entry: appEntry }));
-  }
-  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]);
-  plugins.push(
-    magicModuleAppServerEntry({
-      assets: { baseURL }
-    }),
-    magicModuleAppRequestRouter({ entry: serverEntry }),
-    magicModuleAppAssetManifests()
-  );
   if (graphql) {
     const { graphql: graphql2 } = await import('./features/graphql.mjs');
     plugins.push(graphql2({ manifest: false }));
@@ -419,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;
+      `;
     }
   });
 }
@@ -593,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";
@@ -668,23 +702,5 @@ function createManualChunksSorter() {
     return `${bundleBaseName}-${relativeId.split(path.sep)[0]?.split(".")[0]}`;
   };
 }
-async function resolveAppEntry(entry, project) {
-  if (entry) {
-    return project.resolve(entry);
-  }
-  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];
-}
 
-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/shared/magic-module.mjs

@@ -7,18 +7,20 @@ function createMagicModulePlugin({
   source: getSource,
   sideEffects = false
 }) {
+  const virtualModuleAlias = `${VIRTUAL_MODULE_PREFIX}${module}${VIRTUAL_MODULE_POSTFIX}`;
   return {
     name,
-    resolveId(id) {
+    async resolveId(id) {
       if (id !== module)
         return null;
+      const resolved = (typeof alias === "function" ? await alias() : alias) ?? virtualModuleAlias;
       return {
-        id: alias,
+        id: resolved,
         moduleSideEffects: sideEffects ? "no-treeshake" : void 0
       };
     },
     load: getSource ? async function load(source) {
-      if (source !== alias)
+      if (source !== virtualModuleAlias)
         return null;
       const code = await getSource.call(this);
       return {