@marko/vite 4.0.0 → 4.0.2

package/dist/index.mjs

@@ -11,9 +11,9 @@ import path from "path";
 // src/render-assets-runtime.ts
 var renderAssetsRuntimeId = "\0marko-render-assets.mjs";
 function getRenderAssetsRuntime(opts) {
-  return `${!opts.basePathVar ? "const base = import.meta.env.BASE_URL;" : `const base = globalThis.${opts.basePathVar};
+  return `${opts.basePathVar && opts.isBuild ? `const base = globalThis.${opts.basePathVar};
 if (typeof base !== "string") throw new Error("${opts.basePathVar} must be defined when using basePathVar.");
-if (!base.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");`}
+if (!base.endsWith("/")) throw new Error("${opts.basePathVar} must end with a '/' when using basePathVar.");` : "const base = import.meta.env.BASE_URL;"}
 export function addAssets(g, newEntries) {
   const entries = g.___viteEntries;
   if (entries) {
@@ -24,7 +24,7 @@ export function addAssets(g, newEntries) {
     g.___viteInjectAttrs = g.cspNonce
       ? \` nonce="\${g.cspNonce.replace(/"/g, "'")}"\`
       : "";
-    ${opts.runtimeId ? `$ g.runtimeId = ${JSON.stringify(opts.runtimeId)};` : ""}
+    ${opts.runtimeId ? `g.runtimeId = ${JSON.stringify(opts.runtimeId)};` : ""}
   }
 }
 
@@ -600,6 +600,7 @@ var browserQuery = "?marko-browser";
 var markoExt = ".marko";
 var htmlExt = ".html";
 var resolveOpts = { skipSelf: true };
+var configsByFileSystem = /* @__PURE__ */ new Map();
 var cache = /* @__PURE__ */ new Map();
 var babelCaller = {
   name: "@marko/vite",
@@ -616,7 +617,8 @@ function markoPlugin(opts = {}) {
   let basePathVar;
   let baseConfig;
   let ssrConfig;
-  let ssrCjsConfig;
+  let ssrCjsBuildConfig;
+  let ssrCjsServeConfig;
   let domConfig;
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
@@ -664,6 +666,7 @@ function markoPlugin(opts = {}) {
           runtimeId,
           sourceMaps: true,
           writeVersionComment: false,
+          optimize: env.mode === "production",
           babelConfig: opts.babelConfig ? {
             ...opts.babelConfig,
             caller: opts.babelConfig.caller ? {
@@ -686,6 +689,12 @@ function markoPlugin(opts = {}) {
           resolveVirtualDependency,
           output: "html"
         };
+        ssrCjsServeConfig = {
+          ...ssrConfig,
+          ast: true,
+          code: false,
+          sourceMaps: false
+        };
         domConfig = {
           ...baseConfig,
           resolveVirtualDependency,
@@ -789,7 +798,7 @@ function markoPlugin(opts = {}) {
       },
       configResolved(config) {
         basePath = config.base;
-        ssrCjsConfig = {
+        ssrCjsBuildConfig = {
           ...ssrConfig,
           //modules: 'cjs'
           babelConfig: {
@@ -841,6 +850,9 @@ function markoPlugin(opts = {}) {
       handleHotUpdate(ctx) {
         compiler.taglib.clearCaches();
         baseConfig.cache.clear();
+        for (const [, cache2] of configsByFileSystem) {
+          cache2.clear();
+        }
         for (const mod of ctx.modules) {
           if (mod.id && virtualFiles.has(mod.id)) {
             virtualFiles.set(mod.id, createDeferredPromise());
@@ -878,12 +890,12 @@ function markoPlugin(opts = {}) {
         if (importeeQuery) {
           importee = importee.slice(0, -importeeQuery.length);
         } else if (!importOpts.scan) {
-          if (ssr && linked && importer && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
+          if (ssr && linked && importer && importer[0] !== "\0" && (importer !== devEntryFile || normalizePath(importer) !== devEntryFilePosix) && // Vite tries to resolve against an `index.html` in some cases, we ignore it here.
           isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
             importeeQuery = serverEntryQuery;
           } else if (!ssr && isBuild && importer && isMarkoFile(importee) && this.getModuleInfo(importer)?.isEntry) {
             importeeQuery = browserEntryQuery;
-          } else if (linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
+          } else if (!isBuild && linked && !ssr && !importeeQuery && isMarkoFile(importee)) {
             importeeQuery = browserQuery;
           }
         }
@@ -934,6 +946,10 @@ function markoPlugin(opts = {}) {
       },
       async transform(source, rawId, ssr) {
         let id = stripVersionAndTimeStamp(rawId);
+        const info = isBuild ? this.getModuleInfo(id) : void 0;
+        if (info?.meta.arcSourceId) {
+          id = info.meta.arcSourceId;
+        }
         const isSSR = typeof ssr === "object" ? ssr.ssr : ssr;
         const query = getMarkoQuery(id);
         if (query && !query.startsWith(virtualFileQuery)) {
@@ -993,20 +1009,22 @@ function markoPlugin(opts = {}) {
           }
           if (!query && isCJSModule(id)) {
             if (isBuild) {
-              const { code: code2, map: map2 } = await compiler.compile(
+              const { code: code2, map: map2, meta: meta2 } = await compiler.compile(
                 source,
                 id,
-                ssrCjsConfig
+                getConfigForFileSystem(info, ssrCjsBuildConfig)
               );
-              return { code: code2, map: map2, meta: { source } };
+              return {
+                code: code2,
+                map: map2,
+                meta: { arcSourceCode: source, arcScanIds: meta2.analyzedTags }
+              };
             } else {
-              const { ast } = await compiler.compile(source, id, {
-                cache,
-                ast: true,
-                code: false,
-                output: "source",
-                sourceMaps: false
-              });
+              const { ast } = await compiler.compile(
+                source,
+                id,
+                ssrCjsServeConfig
+              );
               let namedExports = "";
               let code2 = `import { createRequire } from "module";
 `;
@@ -1068,7 +1086,10 @@ function markoPlugin(opts = {}) {
         const compiled = await compiler.compile(
           source,
           id,
-          isSSR ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
+          getConfigForFileSystem(
+            info,
+            isSSR ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig
+          )
         );
         const { map, meta } = compiled;
         let { code } = compiled;
@@ -1090,7 +1111,11 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
           ]);
           transformWatchFiles.set(id, meta.watchFiles);
         }
-        return { code, map, meta: isBuild ? { source } : void 0 };
+        return {
+          code,
+          map,
+          meta: isBuild ? { arcSourceCode: source, arcScanIds: meta.analyzedTags } : void 0
+        };
       }
     },
     {
@@ -1238,6 +1263,26 @@ function stripVersionAndTimeStamp(id) {
     return `${url}?${query}`;
   return url;
 }
+function getConfigForFileSystem(info, config) {
+  const fileSystem = info?.meta.arcFS;
+  if (!fileSystem)
+    return config;
+  let configsForFileSystem = configsByFileSystem.get(fileSystem);
+  if (!configsForFileSystem) {
+    configsForFileSystem = /* @__PURE__ */ new Map();
+    configsByFileSystem.set(fileSystem, configsForFileSystem);
+  }
+  let configForFileSystem = configsForFileSystem.get(config);
+  if (!configForFileSystem) {
+    configForFileSystem = {
+      ...config,
+      fileSystem,
+      cache: configsForFileSystem
+    };
+    configsForFileSystem.set(config, configForFileSystem);
+  }
+  return configForFileSystem;
+}
 export {
   markoPlugin as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.8",
     "@changesets/cli": "^2.26.2",
-    "@marko/compiler": "^5.33.7",
+    "@marko/compiler": "^5.33.8",
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.1.4",
     "@types/babel__core": "^7.20.4",
@@ -24,8 +24,8 @@
     "@types/node": "^20.9.0",
     "@types/resolve": "^1.20.5",
     "@types/serve-handler": "^6.1.4",
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.19.5",
     "eslint": "^8.53.0",
@@ -33,15 +33,15 @@
     "fixpack": "^4.0.0",
     "husky": "^8.0.3",
     "jsdom": "^22.1.0",
-    "lint-staged": "^15.0.2",
-    "marko": "^5.31.17",
+    "lint-staged": "^15.1.0",
+    "marko": "^5.31.18",
     "mocha": "^10.2.0",
     "mocha-snap": "^5.0.0",
     "nyc": "^15.1.0",
     "playwright": "^1.39.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "serve-handler": "^6.1.5",
-    "tsx": "^4.1.0",
+    "tsx": "^4.1.2",
     "typescript": "^5.2.2",
     "vite": "^5.0.0-beta.17"
   },