@marko/vite 3.1.4 → 3.1.5

package/dist/babel-plugin-cjs-interop.d.ts

@@ -0,0 +1,31 @@
+import type { PluginObj } from "@babel/core";
+/**
+ * This plugin is designed to transform imports within Marko files to interop between ESM and CJS.
+ * In Node, ESM files cannot reliably use named imports and default imports from CJS files.
+ * Additionally, modules which are transpiled from ESM to CJS will use a `__esModule` property to
+ * signal that the consuming ESM code should treat `exports.default` as the default import.
+ * This plugin only modifies imports it determined to be for CJS modules
+ *
+ * Examples
+ *   1. Source: ```import { bar as baz } from 'foo';```
+ *      Becomes:```
+ *        import _foo from 'foo';
+ *        const { bar: baz } = _foo
+ *      ```
+ *
+ *   2. Source:  ```import myFoo from 'foo';```
+ *      Becomes: ```
+ *        import * as _myFoo from 'foo';
+ *        const myFoo = _myFoo?.__esModule ? _myFoo.default : _myFoo;
+ *      ```
+ *
+ *   3. Source:  ```import foo, * as nsFoo from 'foo';```
+ *      Becomes: ```
+ *        import nsFoo from 'foo';
+ *        const myFoo = nsFoo?.__esModule ? nsFoo.default : nsFoo
+ *      ```
+ */
+export default function plugin(options: {
+    extensions: string[];
+    conditions: string[];
+}): PluginObj;

package/dist/babel-plugin-cjs-interop.js

@@ -0,0 +1,117 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var babel_plugin_cjs_interop_exports = {};
+__export(babel_plugin_cjs_interop_exports, {
+  default: () => plugin
+});
+module.exports = __toCommonJS(babel_plugin_cjs_interop_exports);
+var t = __toESM(require("@babel/types"));
+var import_resolve = require("./resolve");
+function plugin(options) {
+  return {
+    name: "marko-import-interop",
+    visitor: {
+      ImportDeclaration(path) {
+        if (!path.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path.node.source.value)) {
+          return;
+        }
+        try {
+          const resolved = (0, import_resolve.resolve)(
+            path.node.source.value,
+            path.hub.file.opts.filename,
+            options.extensions,
+            options.conditions
+          );
+          if (!/\.c?js$/.test(resolved) || !(0, import_resolve.isCJSModule)(resolved)) {
+            return;
+          }
+        } catch (_) {
+          return;
+        }
+        let namespaceId;
+        let defaultImportId;
+        let imports;
+        for (const s of path.node.specifiers) {
+          if (t.isImportSpecifier(s)) {
+            (imports || (imports = [])).push({
+              name: t.isStringLiteral(s.imported) ? s.imported.value : s.imported.name,
+              alias: s.local.name
+            });
+          } else if (t.isImportDefaultSpecifier(s)) {
+            defaultImportId = s.local;
+          } else if (t.isImportNamespaceSpecifier(s)) {
+            namespaceId = s.local;
+          }
+        }
+        namespaceId || (namespaceId = path.scope.generateUidIdentifier(
+          (defaultImportId == null ? void 0 : defaultImportId.name) || path.node.source.value
+        ));
+        path.node.specifiers = [t.importDefaultSpecifier(namespaceId)];
+        if (defaultImportId) {
+          path.insertAfter(
+            t.variableDeclaration("const", [
+              t.variableDeclarator(
+                defaultImportId,
+                t.conditionalExpression(
+                  t.optionalMemberExpression(
+                    namespaceId,
+                    t.identifier("__esModule"),
+                    false,
+                    true
+                  ),
+                  t.memberExpression(namespaceId, t.identifier("default")),
+                  namespaceId
+                )
+              )
+            ])
+          );
+        }
+        if (imports) {
+          path.insertAfter(
+            t.variableDeclaration("const", [
+              t.variableDeclarator(
+                t.objectPattern(
+                  imports.map(
+                    ({ name, alias }) => t.objectProperty(
+                      t.identifier(name),
+                      t.identifier(alias),
+                      false,
+                      name === alias
+                    )
+                  )
+                ),
+                namespaceId
+              )
+            ])
+          );
+        }
+      }
+    }
+  };
+}

package/dist/babel-plugin-cjs-interop.mjs

@@ -0,0 +1,7 @@
+import {
+  plugin
+} from "./chunk-4NVOXZG5.mjs";
+import "./chunk-XYEU3RSG.mjs";
+export {
+  plugin as default
+};

package/dist/chunk-4NVOXZG5.mjs

@@ -0,0 +1,93 @@
+import {
+  isCJSModule,
+  resolve
+} from "./chunk-XYEU3RSG.mjs";
+
+// src/babel-plugin-cjs-interop.ts
+import * as t from "@babel/types";
+function plugin(options) {
+  return {
+    name: "marko-import-interop",
+    visitor: {
+      ImportDeclaration(path) {
+        if (!path.node.specifiers.length || /\.(?:mjs|marko)$|\?/.test(path.node.source.value)) {
+          return;
+        }
+        try {
+          const resolved = resolve(
+            path.node.source.value,
+            path.hub.file.opts.filename,
+            options.extensions,
+            options.conditions
+          );
+          if (!/\.c?js$/.test(resolved) || !isCJSModule(resolved)) {
+            return;
+          }
+        } catch (_) {
+          return;
+        }
+        let namespaceId;
+        let defaultImportId;
+        let imports;
+        for (const s of path.node.specifiers) {
+          if (t.isImportSpecifier(s)) {
+            (imports || (imports = [])).push({
+              name: t.isStringLiteral(s.imported) ? s.imported.value : s.imported.name,
+              alias: s.local.name
+            });
+          } else if (t.isImportDefaultSpecifier(s)) {
+            defaultImportId = s.local;
+          } else if (t.isImportNamespaceSpecifier(s)) {
+            namespaceId = s.local;
+          }
+        }
+        namespaceId || (namespaceId = path.scope.generateUidIdentifier(
+          (defaultImportId == null ? void 0 : defaultImportId.name) || path.node.source.value
+        ));
+        path.node.specifiers = [t.importDefaultSpecifier(namespaceId)];
+        if (defaultImportId) {
+          path.insertAfter(
+            t.variableDeclaration("const", [
+              t.variableDeclarator(
+                defaultImportId,
+                t.conditionalExpression(
+                  t.optionalMemberExpression(
+                    namespaceId,
+                    t.identifier("__esModule"),
+                    false,
+                    true
+                  ),
+                  t.memberExpression(namespaceId, t.identifier("default")),
+                  namespaceId
+                )
+              )
+            ])
+          );
+        }
+        if (imports) {
+          path.insertAfter(
+            t.variableDeclaration("const", [
+              t.variableDeclarator(
+                t.objectPattern(
+                  imports.map(
+                    ({ name, alias }) => t.objectProperty(
+                      t.identifier(name),
+                      t.identifier(alias),
+                      false,
+                      name === alias
+                    )
+                  )
+                ),
+                namespaceId
+              )
+            ])
+          );
+        }
+      }
+    }
+  };
+}
+
+export {
+  plugin
+};

package/dist/chunk-XYEU3RSG.mjs

@@ -0,0 +1,61 @@
+// src/resolve.ts
+import { exports } from "resolve.exports";
+import * as Resolve from "resolve";
+import path from "path";
+import fs from "fs";
+var exportsMainFile = `__package_exports__`;
+var modulePathReg = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/;
+var cjsModuleLookup = /* @__PURE__ */ new Map();
+function isCJSModule(id) {
+  var _a;
+  const modulePath = (_a = modulePathReg.exec(id)) == null ? void 0 : _a[0];
+  if (modulePath) {
+    const pkgPath = modulePath + "package.json";
+    let isCJS = cjsModuleLookup.get(pkgPath);
+    if (isCJS === void 0) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+        isCJS = pkg.type !== "module" && !pkg.exports;
+      } catch {
+        isCJS = false;
+      }
+      cjsModuleLookup.set(pkgPath, isCJS);
+    }
+    return isCJS;
+  }
+  return false;
+}
+function resolve(id, from, extensions, conditions) {
+  return Resolve.sync(id, {
+    basedir: path.dirname(from),
+    filename: from,
+    pathFilter,
+    packageFilter,
+    extensions
+  });
+  function pathFilter(pkg, pkgFile, relativePath) {
+    var _a;
+    cjsModuleLookup.set(pkgFile, pkg.type !== "module" && !pkg.exports);
+    if (pkg.exports) {
+      return (_a = exports(
+        pkg,
+        relativePath === exportsMainFile ? "." : relativePath,
+        {
+          conditions
+        }
+      )) == null ? void 0 : _a[0];
+    }
+    return relativePath;
+  }
+}
+function packageFilter(pkg) {
+  if (pkg.exports) {
+    pkg.main = exportsMainFile;
+  }
+  return pkg;
+}
+
+export {
+  isCJSModule,
+  resolve
+};

package/dist/index.js

@@ -41,13 +41,15 @@ var import_server_entry_template = __toESM(require("./server-entry-template"));
 var import_manifest_generator = require("./manifest-generator");
 var import_esbuild_plugin = __toESM(require("./esbuild-plugin"));
 var import_store = require("./store");
+var import_babel_plugin_cjs_interop = __toESM(require("./babel-plugin-cjs-interop"));
+var import_resolve = require("./resolve");
 __reExport(src_exports, require("./store"), module.exports);
 const import_meta = {};
 const POSIX_SEP = "/";
 const WINDOWS_SEP = "\\";
 const normalizePath = import_path.default.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 const virtualFiles = /* @__PURE__ */ new Map();
-const queryReg = /\?marko-.+$/;
+const queryReg = /\?marko-[^?]+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
 const virtualFileQuery = "?marko-virtual";
@@ -73,6 +75,7 @@ function markoPlugin(opts = {}) {
   let basePathVar;
   let baseConfig;
   let ssrConfig;
+  let ssrCjsConfig;
   let domConfig;
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
@@ -247,6 +250,19 @@ function markoPlugin(opts = {}) {
       },
       configResolved(config) {
         basePath = config.base;
+        ssrCjsConfig = {
+          ...ssrConfig,
+          //modules: 'cjs'
+          babelConfig: {
+            ...ssrConfig.babelConfig,
+            plugins: (ssrConfig.babelConfig.plugins || []).concat(
+              (0, import_babel_plugin_cjs_interop.default)({
+                extensions: config.resolve.extensions,
+                conditions: config.resolve.conditions
+              })
+            )
+          }
+        };
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
@@ -413,8 +429,15 @@ function markoPlugin(opts = {}) {
           if (linked) {
             cachedSources.set(id, source);
           }
-          if (!query) {
-            if (!isBuild && isCJSModule(id)) {
+          if (!query && (0, import_resolve.isCJSModule)(id)) {
+            if (isBuild) {
+              const { code: code2, map: map2 } = await compiler.compile(
+                source,
+                id,
+                ssrCjsConfig
+              );
+              return { code: code2, map: map2, meta: { source } };
+            } else {
               const { ast } = await compiler.compile(source, id, {
                 cache,
                 ast: true,
@@ -648,26 +671,6 @@ function isEmpty(obj) {
   }
   return true;
 }
-const cjsModuleLookup = /* @__PURE__ */ new Map();
-function isCJSModule(id) {
-  var _a;
-  const modulePath = (_a = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/.exec(id)) == null ? void 0 : _a[0];
-  if (modulePath) {
-    let isCJS = cjsModuleLookup.get(modulePath);
-    if (isCJS === void 0) {
-      const pkgPath = modulePath + "package.json";
-      try {
-        const pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
-        isCJS = pkg.type !== "module" && !pkg.exports;
-      } catch {
-        isCJS = false;
-      }
-      cjsModuleLookup.set(modulePath, isCJS);
-    }
-    return isCJS;
-  }
-  return false;
-}
 function stripVersionAndTimeStamp(id) {
   const queryStart = id.indexOf("?");
   if (queryStart === -1)

package/dist/index.mjs

@@ -1,3 +1,13 @@
+import "./chunk-KIYHBIE6.mjs";
+import {
+  FileStore
+} from "./chunk-FCWFM7VD.mjs";
+import {
+  MemoryStore
+} from "./chunk-DCBMHGK4.mjs";
+import {
+  plugin
+} from "./chunk-4NVOXZG5.mjs";
 import {
   esbuildPlugin
 } from "./chunk-HR4PYNIR.mjs";
@@ -5,17 +15,13 @@ import {
   generateDocManifest,
   generateInputDoc
 } from "./chunk-2E5QX7AF.mjs";
+import {
+  isCJSModule
+} from "./chunk-XYEU3RSG.mjs";
 import "./chunk-NTHVNXFC.mjs";
 import {
   server_entry_template_default
 } from "./chunk-6IJ5UJ3N.mjs";
-import "./chunk-KIYHBIE6.mjs";
-import {
-  MemoryStore
-} from "./chunk-DCBMHGK4.mjs";
-import {
-  FileStore
-} from "./chunk-FCWFM7VD.mjs";
 
 // src/index.ts
 import fs from "fs";
@@ -27,7 +33,7 @@ var POSIX_SEP = "/";
 var WINDOWS_SEP = "\\";
 var normalizePath = path.sep === WINDOWS_SEP ? (id) => id.replace(/\\/g, POSIX_SEP) : (id) => id;
 var virtualFiles = /* @__PURE__ */ new Map();
-var queryReg = /\?marko-.+$/;
+var queryReg = /\?marko-[^?]+$/;
 var browserEntryQuery = "?marko-browser-entry";
 var serverEntryQuery = "?marko-server-entry";
 var virtualFileQuery = "?marko-virtual";
@@ -53,6 +59,7 @@ function markoPlugin(opts = {}) {
   let basePathVar;
   let baseConfig;
   let ssrConfig;
+  let ssrCjsConfig;
   let domConfig;
   let hydrateConfig;
   const resolveVirtualDependency = (from, dep) => {
@@ -227,6 +234,19 @@ function markoPlugin(opts = {}) {
       },
       configResolved(config) {
         basePath = config.base;
+        ssrCjsConfig = {
+          ...ssrConfig,
+          //modules: 'cjs'
+          babelConfig: {
+            ...ssrConfig.babelConfig,
+            plugins: (ssrConfig.babelConfig.plugins || []).concat(
+              plugin({
+                extensions: config.resolve.extensions,
+                conditions: config.resolve.conditions
+              })
+            )
+          }
+        };
       },
       configureServer(_server) {
         ssrConfig.hot = domConfig.hot = true;
@@ -393,8 +413,15 @@ function markoPlugin(opts = {}) {
           if (linked) {
             cachedSources.set(id, source);
           }
-          if (!query) {
-            if (!isBuild && isCJSModule(id)) {
+          if (!query && isCJSModule(id)) {
+            if (isBuild) {
+              const { code: code2, map: map2 } = await compiler.compile(
+                source,
+                id,
+                ssrCjsConfig
+              );
+              return { code: code2, map: map2, meta: { source } };
+            } else {
               const { ast } = await compiler.compile(source, id, {
                 cache,
                 ast: true,
@@ -628,26 +655,6 @@ function isEmpty(obj) {
   }
   return true;
 }
-var cjsModuleLookup = /* @__PURE__ */ new Map();
-function isCJSModule(id) {
-  var _a;
-  const modulePath = (_a = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/.exec(id)) == null ? void 0 : _a[0];
-  if (modulePath) {
-    let isCJS = cjsModuleLookup.get(modulePath);
-    if (isCJS === void 0) {
-      const pkgPath = modulePath + "package.json";
-      try {
-        const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
-        isCJS = pkg.type !== "module" && !pkg.exports;
-      } catch {
-        isCJS = false;
-      }
-      cjsModuleLookup.set(modulePath, isCJS);
-    }
-    return isCJS;
-  }
-  return false;
-}
 function stripVersionAndTimeStamp(id) {
   const queryStart = id.indexOf("?");
   if (queryStart === -1)

package/dist/resolve.d.ts

@@ -0,0 +1,2 @@
+export declare function isCJSModule(id: string): boolean;
+export declare function resolve(id: string, from: string, extensions: string[], conditions: string[]): string;

package/dist/resolve.js

@@ -0,0 +1,94 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var resolve_exports = {};
+__export(resolve_exports, {
+  isCJSModule: () => isCJSModule,
+  resolve: () => resolve
+});
+module.exports = __toCommonJS(resolve_exports);
+var import_resolve = require("resolve.exports");
+var Resolve = __toESM(require("resolve"));
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+const exportsMainFile = `__package_exports__`;
+const modulePathReg = /^.*[/\\]node_modules[/\\](?:@[^/\\]+[/\\])?[^/\\]+[/\\]/;
+const cjsModuleLookup = /* @__PURE__ */ new Map();
+function isCJSModule(id) {
+  var _a;
+  const modulePath = (_a = modulePathReg.exec(id)) == null ? void 0 : _a[0];
+  if (modulePath) {
+    const pkgPath = modulePath + "package.json";
+    let isCJS = cjsModuleLookup.get(pkgPath);
+    if (isCJS === void 0) {
+      try {
+        const pkg = JSON.parse(import_fs.default.readFileSync(pkgPath, "utf8"));
+        isCJS = pkg.type !== "module" && !pkg.exports;
+      } catch {
+        isCJS = false;
+      }
+      cjsModuleLookup.set(pkgPath, isCJS);
+    }
+    return isCJS;
+  }
+  return false;
+}
+function resolve(id, from, extensions, conditions) {
+  return Resolve.sync(id, {
+    basedir: import_path.default.dirname(from),
+    filename: from,
+    pathFilter,
+    packageFilter,
+    extensions
+  });
+  function pathFilter(pkg, pkgFile, relativePath) {
+    var _a;
+    cjsModuleLookup.set(pkgFile, pkg.type !== "module" && !pkg.exports);
+    if (pkg.exports) {
+      return (_a = (0, import_resolve.exports)(
+        pkg,
+        relativePath === exportsMainFile ? "." : relativePath,
+        {
+          conditions
+        }
+      )) == null ? void 0 : _a[0];
+    }
+    return relativePath;
+  }
+}
+function packageFilter(pkg) {
+  if (pkg.exports) {
+    pkg.main = exportsMainFile;
+  }
+  return pkg;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isCJSModule,
+  resolve
+});

package/dist/resolve.mjs

@@ -0,0 +1,8 @@
+import {
+  isCJSModule,
+  resolve
+} from "./chunk-XYEU3RSG.mjs";
+export {
+  isCJSModule,
+  resolve
+};

package/dist/store/index.mjs

@@ -1,10 +1,10 @@
 import "../chunk-KIYHBIE6.mjs";
-import {
-  MemoryStore
-} from "../chunk-DCBMHGK4.mjs";
 import {
   FileStore
 } from "../chunk-FCWFM7VD.mjs";
+import {
+  MemoryStore
+} from "../chunk-DCBMHGK4.mjs";
 export {
   FileStore,
   MemoryStore

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
     "anymatch": "^3.1.3",
     "domelementtype": "^2.3.0",
     "domhandler": "^5.0.3",
-    "htmlparser2": "^9.0.0"
+    "htmlparser2": "^9.0.0",
+    "resolve": "^1.22.8",
+    "resolve.exports": "^2.0.2"
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.4.8",
@@ -16,9 +18,11 @@
     "@marko/compiler": "^5.33.2",
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.1.4",
+    "@types/babel__core": "^7.20.3",
     "@types/jsdom": "^21.1.3",
     "@types/mocha": "^10.0.2",
     "@types/node": "^20.8.2",
+    "@types/resolve": "^1.20.4",
     "@types/serve-handler": "^6.1.2",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
@@ -38,7 +42,7 @@
     "playwright": "^1.38.1",
     "prettier": "^2.8.8",
     "serve-handler": "^6.1.5",
-    "tsx": "^3.13.0",
+    "tsx": "^3.14.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11"
   },