@marko/vite 4.1.9 → 4.1.11

package/dist/index.mjs

@@ -222,8 +222,7 @@ function serialize(basePath, nodes, preload, parts) {
   return parts;
 }
 function stripBasePath(basePath, path6) {
-  if (path6.startsWith(basePath))
-    return path6.slice(basePath.length);
+  if (path6.startsWith(basePath)) return path6.slice(basePath.length);
   return path6;
 }
 
@@ -664,6 +663,7 @@ var babelCaller = {
   supportsTopLevelAwait: true,
   supportsExportNamespaceFrom: true
 };
+var optimizedRegistryIds = /* @__PURE__ */ new Map();
 var registeredTagLib = false;
 function markoPlugin(opts = {}) {
   let compiler;
@@ -727,6 +727,7 @@ function markoPlugin(opts = {}) {
         baseConfig = {
           cache,
           optimize,
+          optimizedRegistryIds: optimize && linked ? optimizedRegistryIds : void 0,
           runtimeId,
           sourceMaps: true,
           writeVersionComment: false,
@@ -826,6 +827,13 @@ function markoPlugin(opts = {}) {
             ssr.noExternal = noExternalReg;
           }
         }
+        if (isSSRBuild && !config.build?.rollupOptions?.output) {
+          config.build ??= {};
+          config.build.rollupOptions ??= {};
+          config.build.rollupOptions.output = {
+            chunkFileNames: `[name]-[hash].js`
+          };
+        }
         if (basePathVar) {
           config.experimental ??= {};
           if (config.experimental.renderBuiltUrl) {
@@ -833,10 +841,6 @@ function markoPlugin(opts = {}) {
               "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
             );
           }
-          if (isSSRBuild && !config.build?.ssrEmitAssets) {
-            config.build ??= {};
-            config.build.assetsDir ??= "";
-          }
           const assetsDir = config.build?.assetsDir?.replace(/[/\\]$/, "") ?? "assets";
           const assetsDirLen = assetsDir.length;
           const assetsDirEnd = assetsDirLen + 1;
@@ -867,7 +871,7 @@ function markoPlugin(opts = {}) {
           resolve: {
             alias: [
               {
-                find: /^~/,
+                find: /^~(?!\/)/,
                 replacement: ""
               }
             ]
@@ -942,6 +946,14 @@ function markoPlugin(opts = {}) {
         if (isBuild && linked && !isSSRBuild) {
           try {
             serverManifest = await store.read();
+            if (serverManifest.optimizedRegistryIds) {
+              for (const id in serverManifest.optimizedRegistryIds) {
+                optimizedRegistryIds.set(
+                  id,
+                  serverManifest.optimizedRegistryIds[id]
+                );
+              }
+            }
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
             for (const entry in serverManifest.entrySources) {
               const id = normalizePath(path5.resolve(root, entry));
@@ -997,8 +1009,7 @@ function markoPlugin(opts = {}) {
               const resolved = normalizePath(
                 path5.resolve(importer, "..", importee)
               );
-              if (resolved === normalizePath(importer))
-                return resolved;
+              if (resolved === normalizePath(importer)) return resolved;
             }
             return this.resolve(importee, importer, resolveOpts);
           }
@@ -1179,6 +1190,7 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
               }
             }
           }
+          serverManifest.optimizedRegistryIds = Object.fromEntries(optimizedRegistryIds);
           store.write(serverManifest);
         } else {
           const browserManifest = {};
@@ -1282,18 +1294,15 @@ function isEmpty(obj) {
 }
 function stripVersionAndTimeStamp(id) {
   const queryStart = id.indexOf("?");
-  if (queryStart === -1)
-    return id;
+  if (queryStart === -1) return id;
   const url = id.slice(0, queryStart);
   const query = id.slice(queryStart + 1).replace(/(?:^|[&])[vt]=[^&]+/g, "");
-  if (query)
-    return `${url}?${query}`;
+  if (query) return `${url}?${query}`;
   return url;
 }
 function getConfigForFileSystem(info, config) {
   const fileSystem = info?.meta.arcFS;
-  if (!fileSystem)
-    return config;
+  if (!fileSystem) return config;
   let configsForFileSystem = configsByFileSystem.get(fileSystem);
   if (!configsForFileSystem) {
     configsForFileSystem = /* @__PURE__ */ new Map();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "4.1.9",
+  "version": "4.1.11",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -15,37 +15,37 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.1",
-    "@marko/compiler": "^5.34.7",
+    "@changesets/cli": "^2.27.5",
+    "@marko/compiler": "^5.37.0",
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.2.0",
     "@types/babel__core": "^7.20.5",
     "@types/jsdom": "^21.1.6",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.20",
+    "@types/node": "^20.12.12",
     "@types/resolve": "^1.20.6",
     "@types/serve-handler": "^6.1.4",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.11.0",
+    "@typescript-eslint/parser": "^7.11.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.21.4",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "fixpack": "^4.0.0",
     "husky": "^9.0.11",
-    "jsdom": "^24.0.0",
+    "jsdom": "^24.1.0",
     "less": "^4.2.0",
-    "lint-staged": "^15.2.2",
-    "marko": "^5.32.13",
-    "mocha": "^10.3.0",
+    "lint-staged": "^15.2.5",
+    "marko": "^5.35.0",
+    "mocha": "^10.4.0",
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
-    "playwright": "^1.41.2",
+    "playwright": "^1.44.1",
     "prettier": "^3.2.5",
     "serve-handler": "^6.1.5",
-    "tsx": "^4.7.1",
-    "typescript": "^5.3.3",
-    "vite": "^5.1.4"
+    "tsx": "^4.11.0",
+    "typescript": "^5.4.5",
+    "vite": "^5.2.12"
   },
   "files": [
     "dist",