@marko/vite 2.4.9 → 3.0.1

package/README.md

@@ -94,7 +94,7 @@ app.listen(3000);
 
 ### options.babelConfig
 
-You can manually override Marko's Babel configuration by passing a `babelConfig` object to the `@marko/vite` plugin. By default Babel's regular [config file resolution](https://babeljs.io/docs/en/config-files) will be used.
+You can manually override Marko's Babel configuration by passing a `babelConfig` object to the `@marko/vite` plugin. If no babel configuration is specified, babel related config files will not be considered.
 
 ```javascript
 marko({

package/dist/index.js

@@ -59,6 +59,13 @@ const htmlExt = ".html";
 const resolveOpts = { skipSelf: true };
 const cache = /* @__PURE__ */ new Map();
 const thisFile = typeof __filename === "string" ? __filename : (0, import_url.fileURLToPath)(import_meta.url);
+const babelCaller = {
+  name: "@marko/vite",
+  supportsStaticESM: true,
+  supportsDynamicImport: true,
+  supportsTopLevelAwait: true,
+  supportsExportNamespaceFrom: true
+};
 function markoPlugin(opts = {}) {
   let compiler;
   let { linked = true } = opts;
@@ -68,7 +75,7 @@ function markoPlugin(opts = {}) {
   let ssrConfig;
   let domConfig;
   let hydrateConfig;
-  const resolveViteVirtualDep = (from, dep) => {
+  const resolveVirtualDependency = (from, dep) => {
     const query = `${virtualFileQuery}&id=${encodeURIComponent(
       normalizePath(dep.virtualPath)
     )}`;
@@ -105,7 +112,7 @@ function markoPlugin(opts = {}) {
       enforce: "pre",
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
@@ -114,31 +121,36 @@ function markoPlugin(opts = {}) {
           runtimeId,
           sourceMaps: true,
           writeVersionComment: false,
-          babelConfig: {
+          babelConfig: opts.babelConfig ? {
             ...opts.babelConfig,
-            caller: {
+            caller: opts.babelConfig.caller ? {
               name: "@marko/vite",
               supportsStaticESM: true,
               supportsDynamicImport: true,
               supportsTopLevelAwait: true,
               supportsExportNamespaceFrom: true,
-              ...(_a = opts.babelConfig) == null ? void 0 : _a.caller
-            }
+              ...opts.babelConfig.caller
+            } : babelCaller
+          } : {
+            babelrc: false,
+            configFile: false,
+            browserslistConfigFile: false,
+            caller: babelCaller
           }
         };
         ssrConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "html"
         };
         domConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "dom"
         };
         hydrateConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "hydrate"
         };
         compiler.configure(baseConfig);
@@ -153,6 +165,13 @@ function markoPlugin(opts = {}) {
         );
         if (isTest) {
           linked = false;
+          if ((_b = (_a = config.test) == null ? void 0 : _a.environment) == null ? void 0 : _b.includes(
+            "dom"
+          )) {
+            config.resolve ?? (config.resolve = {});
+            (_c = config.resolve).conditions ?? (_c.conditions = []);
+            config.resolve.conditions.push("browser");
+          }
         }
         if (linked && !registeredTag) {
           const transformer = import_path.default.resolve(
@@ -219,13 +238,26 @@ function markoPlugin(opts = {}) {
               "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
             );
           }
+          const assetsDir = ((_e = (_d = config.build) == null ? void 0 : _d.assetsDir) == null ? void 0 : _e.replace(/[/\\]$/, "")) ?? "assets";
+          const assetsDirLen = assetsDir.length;
+          const assetsDirEnd = assetsDirLen + 1;
+          const trimAssertsDir = (fileName) => {
+            if (fileName.startsWith(assetsDir)) {
+              switch (fileName[assetsDirLen]) {
+                case POSIX_SEP:
+                case WINDOWS_SEP:
+                  return fileName.slice(assetsDirEnd);
+              }
+            }
+            return fileName;
+          };
           config.experimental.renderBuiltUrl = (fileName, { hostType, ssr: ssr2 }) => {
             switch (hostType) {
               case "html":
-                return fileName;
+                return trimAssertsDir(fileName);
               case "js":
                 return {
-                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(fileName)}`
+                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(trimAssertsDir(fileName))}`
                 };
               default:
                 return { relative: true };

package/dist/index.mjs

@@ -39,6 +39,13 @@ var htmlExt = ".html";
 var resolveOpts = { skipSelf: true };
 var cache = /* @__PURE__ */ new Map();
 var thisFile = typeof __filename === "string" ? __filename : fileURLToPath(import.meta.url);
+var babelCaller = {
+  name: "@marko/vite",
+  supportsStaticESM: true,
+  supportsDynamicImport: true,
+  supportsTopLevelAwait: true,
+  supportsExportNamespaceFrom: true
+};
 function markoPlugin(opts = {}) {
   let compiler;
   let { linked = true } = opts;
@@ -48,7 +55,7 @@ function markoPlugin(opts = {}) {
   let ssrConfig;
   let domConfig;
   let hydrateConfig;
-  const resolveViteVirtualDep = (from, dep) => {
+  const resolveVirtualDependency = (from, dep) => {
     const query = `${virtualFileQuery}&id=${encodeURIComponent(
       normalizePath(dep.virtualPath)
     )}`;
@@ -85,7 +92,7 @@ function markoPlugin(opts = {}) {
       enforce: "pre",
       // Must be pre to allow us to resolve assets before vite.
       async config(config, env) {
-        var _a;
+        var _a, _b, _c, _d, _e;
         compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
@@ -94,31 +101,36 @@ function markoPlugin(opts = {}) {
           runtimeId,
           sourceMaps: true,
           writeVersionComment: false,
-          babelConfig: {
+          babelConfig: opts.babelConfig ? {
             ...opts.babelConfig,
-            caller: {
+            caller: opts.babelConfig.caller ? {
               name: "@marko/vite",
               supportsStaticESM: true,
               supportsDynamicImport: true,
               supportsTopLevelAwait: true,
               supportsExportNamespaceFrom: true,
-              ...(_a = opts.babelConfig) == null ? void 0 : _a.caller
-            }
+              ...opts.babelConfig.caller
+            } : babelCaller
+          } : {
+            babelrc: false,
+            configFile: false,
+            browserslistConfigFile: false,
+            caller: babelCaller
           }
         };
         ssrConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "html"
         };
         domConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "dom"
         };
         hydrateConfig = {
           ...baseConfig,
-          resolveVirtualDependency: resolveViteVirtualDep,
+          resolveVirtualDependency,
           output: "hydrate"
         };
         compiler.configure(baseConfig);
@@ -133,6 +145,13 @@ function markoPlugin(opts = {}) {
         );
         if (isTest) {
           linked = false;
+          if ((_b = (_a = config.test) == null ? void 0 : _a.environment) == null ? void 0 : _b.includes(
+            "dom"
+          )) {
+            config.resolve ?? (config.resolve = {});
+            (_c = config.resolve).conditions ?? (_c.conditions = []);
+            config.resolve.conditions.push("browser");
+          }
         }
         if (linked && !registeredTag) {
           const transformer = path.resolve(
@@ -199,13 +218,26 @@ function markoPlugin(opts = {}) {
               "Cannot use @marko/vite `basePathVar` with Vite's `renderBuiltUrl` option."
             );
           }
+          const assetsDir = ((_e = (_d = config.build) == null ? void 0 : _d.assetsDir) == null ? void 0 : _e.replace(/[/\\]$/, "")) ?? "assets";
+          const assetsDirLen = assetsDir.length;
+          const assetsDirEnd = assetsDirLen + 1;
+          const trimAssertsDir = (fileName) => {
+            if (fileName.startsWith(assetsDir)) {
+              switch (fileName[assetsDirLen]) {
+                case POSIX_SEP:
+                case WINDOWS_SEP:
+                  return fileName.slice(assetsDirEnd);
+              }
+            }
+            return fileName;
+          };
           config.experimental.renderBuiltUrl = (fileName, { hostType, ssr: ssr2 }) => {
             switch (hostType) {
               case "html":
-                return fileName;
+                return trimAssertsDir(fileName);
               case "js":
                 return {
-                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(fileName)}`
+                  runtime: `${ssr2 ? basePathVar : `$mbp${runtimeId ? `_${runtimeId}` : ""}`}+${JSON.stringify(trimAssertsDir(fileName))}`
                 };
               default:
                 return { relative: true };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.4.9",
+  "version": "3.0.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {