@marko/vite 5.3.9 → 5.4.1

package/dist/index.mjs

@@ -887,6 +887,20 @@ function markoPlugin(opts = {}) {
       name: "marko-vite:pre",
       enforce: "pre",
       // Must be pre to allow us to resolve assets before vite.
+      sharedDuringBuild: true,
+      async buildApp(builder) {
+        const { ssr, client } = builder.environments;
+        if (!ssr || !client) {
+          return;
+        }
+        if (builder.config?.builder?.buildApp) {
+          return;
+        }
+        if (linked) {
+          await builder.build(ssr);
+        }
+        await builder.build(client);
+      },
       async config(config, env) {
         let optimize = env.mode === "production";
         isTest = env.mode === "test";
@@ -1093,6 +1107,36 @@ function markoPlugin(opts = {}) {
           }
         };
       },
+      configEnvironment(name, options) {
+        if (name === "ssr") {
+          options.resolve ??= {};
+          const { noExternal } = options.resolve;
+          if (noExternal !== true) {
+            const noExternalReg = /\.marko$/;
+            if (noExternal) {
+              if (Array.isArray(noExternal)) {
+                options.resolve.noExternal = [...noExternal, noExternalReg];
+              } else {
+                options.resolve.noExternal = [noExternal, noExternalReg];
+              }
+            } else {
+              options.resolve.noExternal = noExternalReg;
+            }
+          }
+          options.build ??= {};
+          if (!options.build?.rollupOptions?.output) {
+            options.build.rollupOptions ??= {};
+            options.build.rollupOptions.output = {
+              chunkFileNames: `[name]-[hash].js`
+            };
+          }
+          if (!options.build?.commonjsOptions?.esmExternals) {
+            options.build.commonjsOptions ??= {};
+            options.build.commonjsOptions.esmExternals = (id) => !isCJSModule(id, rootResolveFile);
+          }
+        }
+        return options;
+      },
       configResolved(config) {
         basePath = config.base;
         cacheDir = config.cacheDir && normalizePath(config.cacheDir);
@@ -1150,7 +1194,7 @@ function markoPlugin(opts = {}) {
       },
       async options(inputOptions) {
         if (linked && isBuild) {
-          if (isSSRBuild) {
+          if (isSSRBuild || this.environment?.name === "ssr") {
             serverManifest = {
               entries: {},
               entrySources: {},
@@ -1182,7 +1226,7 @@ function markoPlugin(opts = {}) {
         }
       },
       async buildStart() {
-        if (isBuild && linked && !isSSRBuild) {
+        if (isBuild && linked && !isSSRBuild && this.environment?.name !== "ssr") {
           for (const assetId of serverManifest.ssrAssetIds) {
             this.load({
               id: normalizePath(path6.resolve(root, assetId)),
@@ -1426,7 +1470,8 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
       name: "marko-vite:post",
       apply: "build",
       enforce: "post",
-      // We use a "post" plugin to allow us to read the final generated `.html` from vite.
+      // We use a "post" plugin to allow us to read the final generated `.html` from vite.,
+      sharedDuringBuild: true,
       transform(_source, id, opts2) {
         if (!opts2?.ssr && /\.module\.[^.]+(?:\?|$)/.test(id)) {
           return {
@@ -1443,7 +1488,7 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
             `Linked builds are currently only supported when in "write" mode.`
           );
         }
-        if (isSSRBuild) {
+        if (isSSRBuild || this.environment?.name === "ssr") {
           const dir = outputOptions.dir ? path6.resolve(outputOptions.dir) : path6.resolve(outputOptions.file, "..");
           for (const fileName in bundle) {
             const chunk = bundle[fileName];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/vite",
-  "version": "5.3.9",
+  "version": "5.4.1",
   "description": "A Marko plugin for Vite",
   "keywords": [
     "loader",