@marko/vite 4.1.20 → 5.0.1

package/dist/esbuild-plugin.d.ts

@@ -1,6 +1,6 @@
 import type * as vite from "vite";
-import type * as Compiler from "@marko/compiler";
+import * as compiler from "@marko/compiler";
 type ESBuildOptions = Exclude<vite.DepOptimizationConfig["esbuildOptions"], undefined>;
 type ESBuildPlugin = Exclude<ESBuildOptions["plugins"], undefined>[number];
-export default function esbuildPlugin(compiler: typeof Compiler, config: Compiler.Config): ESBuildPlugin;
+export default function esbuildPlugin(config: compiler.Config): ESBuildPlugin;
 export {};

package/dist/index.d.ts

@@ -1,14 +1,13 @@
 import type * as vite from "vite";
-import type * as Compiler from "@marko/compiler";
+import * as compiler from "@marko/compiler";
 export declare namespace API {
     type getMarkoAssetCodeForEntry = (id: string) => string | void;
 }
 export interface Options {
     linked?: boolean;
-    compiler?: string;
     runtimeId?: string;
     translator?: string;
     basePathVar?: string;
-    babelConfig?: Compiler.Config["babelConfig"];
+    babelConfig?: compiler.Config["babelConfig"];
 }
 export default function markoPlugin(opts?: Options): vite.Plugin[];

package/dist/index.mjs

@@ -1,4 +1,5 @@
 // src/index.ts
+import * as compiler2 from "@marko/compiler";
 import fs4 from "fs";
 import path6 from "path";
 import crypto from "crypto";
@@ -106,41 +107,41 @@ function renderAssets(slot) {
 
 // src/server-entry-template.ts
 var server_entry_template_default = async (opts) => {
+  const addAssetsCall = `addAssets($global, [${opts.entryData.join(",")}])`;
   const fileNameStr = JSON.stringify(`./${path.basename(opts.fileName)}`);
   return `import template from ${fileNameStr};
 export * from ${fileNameStr};
 import { addAssets } from "${renderAssetsRuntimeId}";
 
-$ const g = out.global;
-$ const writeSync = addAssets(g, [${opts.entryData.join(",")}]);
+${opts.tagsAPI ? `<const/writeSync=${addAssetsCall}/>` : `$ const writeSync = ${addAssetsCall};`}
 
 <if(writeSync)>
   $!{
-    g.___viteRenderAssets("head-prepend") +
-    g.___viteRenderAssets("head") +
-    g.___viteRenderAssets("body-prepend")
+    $global.___viteRenderAssets("head-prepend") +
+    $global.___viteRenderAssets("head") +
+    $global.___viteRenderAssets("body-prepend")
   }
 </>
 <else>
   <__flush_here_and_after__>
     $!{
-      g.___viteRenderAssets("head-prepend") +
-      g.___viteRenderAssets("head") +
-      g.___viteRenderAssets("body-prepend")
+      $global.___viteRenderAssets("head-prepend") +
+      $global.___viteRenderAssets("head") +
+      $global.___viteRenderAssets("body-prepend")
     }
   </__flush_here_and_after__>
 </>
 
-<\${template} ...input/>
+<\${template} ...input/>${opts.tagsAPI ? "" : `
 <init-components/>
-<await-reorderer/>
+<await-reorderer/>`}
 
 <if(writeSync)>
-  $!{g.___viteRenderAssets("body")}
+  $!{$global.___viteRenderAssets("body")}
 </>
 <else>
   <__flush_here_and_after__>
-    $!{g.___viteRenderAssets("body")}
+    $!{$global.___viteRenderAssets("body")}
   </__flush_here_and_after__>
 </>
 `;
@@ -356,8 +357,9 @@ function isElement(node) {
 // src/esbuild-plugin.ts
 import fs from "fs";
 import path2 from "path";
+import * as compiler from "@marko/compiler";
 var markoErrorRegExp = /^(.+?)(?:\((\d+)(?:\s*,\s*(\d+))?\))?: (.*)$/gm;
-function esbuildPlugin(compiler, config) {
+function esbuildPlugin(config) {
   return {
     name: "marko",
     async setup(build) {
@@ -533,24 +535,45 @@ function plugin(options) {
             namespaceId = s.local;
           }
         }
-        namespaceId ||= path7.scope.generateUidIdentifier(
-          defaultImportId?.name || path7.node.source.value
+        const rawImport = path7.scope.generateUidIdentifier(
+          namespaceId?.name || defaultImportId?.name || path7.node.source.value
         );
-        path7.node.specifiers = [t.importDefaultSpecifier(namespaceId)];
+        path7.node.specifiers = [t.importNamespaceSpecifier(rawImport)];
         if (defaultImportId) {
           path7.insertAfter(
             t.variableDeclaration("const", [
               t.variableDeclarator(
-                defaultImportId,
+                t.objectPattern([
+                  t.objectProperty(t.identifier("default"), defaultImportId)
+                ]),
                 t.conditionalExpression(
                   t.optionalMemberExpression(
-                    namespaceId,
+                    t.memberExpression(rawImport, t.identifier("default")),
                     t.identifier("__esModule"),
                     false,
                     true
                   ),
-                  t.memberExpression(namespaceId, t.identifier("default")),
-                  namespaceId
+                  t.memberExpression(rawImport, t.identifier("default")),
+                  rawImport
+                )
+              )
+            ])
+          );
+        }
+        if (namespaceId) {
+          path7.insertAfter(
+            t.variableDeclaration("const", [
+              t.variableDeclarator(
+                namespaceId,
+                t.conditionalExpression(
+                  t.optionalMemberExpression(
+                    rawImport,
+                    t.identifier("__esModule"),
+                    false,
+                    true
+                  ),
+                  rawImport,
+                  t.memberExpression(rawImport, t.identifier("default"))
                 )
               )
             ])
@@ -570,7 +593,16 @@ function plugin(options) {
                     )
                   )
                 ),
-                namespaceId
+                t.conditionalExpression(
+                  t.optionalMemberExpression(
+                    rawImport,
+                    t.identifier("__esModule"),
+                    false,
+                    true
+                  ),
+                  rawImport,
+                  t.memberExpression(rawImport, t.identifier("default"))
+                )
               )
             ])
           );
@@ -593,7 +625,7 @@ function renderAssetsCall(t3, slot) {
   return t3.markoPlaceholder(
     t3.callExpression(
       t3.memberExpression(
-        t3.memberExpression(t3.identifier("out"), t3.identifier("global")),
+        t3.identifier("$global"),
         t3.identifier("___viteRenderAssets")
       ),
       [t3.stringLiteral(slot)]
@@ -773,7 +805,6 @@ var babelCaller = {
 var registeredTagLib = false;
 var cjsToEsm;
 function markoPlugin(opts = {}) {
-  let compiler;
   let { linked = true } = opts;
   let runtimeId;
   let basePathVar;
@@ -806,6 +837,9 @@ function markoPlugin(opts = {}) {
   let serverManifest;
   let basePath = "/";
   let getMarkoAssetFns;
+  const tagsAPI = !/^@marko\/translator-(?:default|interop-class-tags)$/.test(
+    opts.translator || compiler2.globalConfig?.translator || "@marko/translator-default"
+  );
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
@@ -825,7 +859,6 @@ function markoPlugin(opts = {}) {
         } else {
           process.env.MARKO_DEBUG = optimize ? "false" : "true";
         }
-        compiler ??= await import(opts.compiler || "@marko/compiler");
         runtimeId = opts.runtimeId;
         basePathVar = opts.basePathVar;
         if ("BASE_URL" in process.env && config.base == null) {
@@ -874,7 +907,7 @@ function markoPlugin(opts = {}) {
           resolveVirtualDependency,
           output: "hydrate"
         };
-        compiler.configure(baseConfig);
+        compiler2.configure(baseConfig);
         root = normalizePath(config.root || process.cwd());
         devEntryFile = path6.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
@@ -901,7 +934,7 @@ function markoPlugin(opts = {}) {
         }
         if (!registeredTagLib) {
           registeredTagLib = true;
-          compiler.taglib.register("@marko/vite", {
+          compiler2.taglib.register("@marko/vite", {
             transform: glob_import_transform_default,
             "<head>": { transformer: render_assets_transform_default },
             "<body>": { transformer: render_assets_transform_default },
@@ -917,13 +950,13 @@ function markoPlugin(opts = {}) {
             `!**/coverage/**`
           ];
         }
-        const domDeps = compiler.getRuntimeEntryFiles("dom", opts.translator);
+        const domDeps = compiler2.getRuntimeEntryFiles("dom", opts.translator);
         optimizeDeps.include = optimizeDeps.include ? [...optimizeDeps.include, ...domDeps] : domDeps;
         const optimizeExtensions = optimizeDeps.extensions ??= [];
         optimizeExtensions.push(".marko");
         const esbuildOptions = optimizeDeps.esbuildOptions ??= {};
         const esbuildPlugins = esbuildOptions.plugins ??= [];
-        esbuildPlugins.push(esbuildPlugin(compiler, baseConfig));
+        esbuildPlugins.push(esbuildPlugin(baseConfig));
         const ssr = config.ssr ??= {};
         const { noExternal } = ssr;
         if (noExternal !== true) {
@@ -1042,7 +1075,7 @@ function markoPlugin(opts = {}) {
         });
       },
       handleHotUpdate(ctx) {
-        compiler.taglib.clearCaches();
+        compiler2.taglib.clearCaches();
         baseConfig.cache.clear();
         for (const [, cache2] of configsByFileSystem) {
           cache2.clear();
@@ -1191,7 +1224,8 @@ function markoPlugin(opts = {}) {
               fileName,
               entryData,
               runtimeId,
-              basePathVar: isBuild ? basePathVar : void 0
+              basePathVar: isBuild ? basePathVar : void 0,
+              tagsAPI
             });
           }
         }
@@ -1224,7 +1258,7 @@ function markoPlugin(opts = {}) {
           }
           if (!query && isCJSModule(id)) {
             if (isBuild) {
-              const { code: code2, map: map2, meta: meta2 } = await compiler.compile(
+              const { code: code2, map: map2, meta: meta2 } = await compiler2.compile(
                 source,
                 id,
                 getConfigForFileSystem(info, ssrCjsConfig)
@@ -1237,7 +1271,7 @@ function markoPlugin(opts = {}) {
             }
           }
         }
-        const compiled = await compiler.compile(
+        const compiled = await compiler2.compile(
           source,
           id,
           getConfigForFileSystem(

package/dist/server-entry-template.d.ts

@@ -3,5 +3,6 @@ declare const _default: (opts: {
     entryData: string[];
     runtimeId?: string;
     basePathVar?: string;
+    tagsAPI?: boolean;
 }) => Promise<string>;
 export default _default;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "4.1.20",
+  "version": "5.0.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -16,37 +16,37 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.5",
-    "@marko/compiler": "^5.37.0",
+    "@changesets/cli": "^2.27.9",
+    "@marko/compiler": "^5.37.26",
     "@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.12.12",
+    "@types/jsdom": "^21.1.7",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^22.9.0",
     "@types/resolve": "^1.20.6",
     "@types/serve-handler": "^6.1.4",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
     "@typescript-eslint/parser": "^7.11.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.21.4",
+    "esbuild": "^0.24.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "fixpack": "^4.0.0",
-    "husky": "^9.0.11",
-    "jsdom": "^24.1.0",
+    "husky": "^9.1.7",
+    "jsdom": "^25.0.1",
     "less": "^4.2.0",
-    "lint-staged": "^15.2.5",
-    "marko": "^5.35.0",
-    "mocha": "^10.4.0",
+    "lint-staged": "^15.2.10",
+    "marko": "^5.35.35",
+    "mocha": "^10.8.2",
     "mocha-snap": "^5.0.0",
-    "nyc": "^15.1.0",
-    "playwright": "^1.44.1",
-    "prettier": "^3.2.5",
-    "serve-handler": "^6.1.5",
-    "tsx": "^4.11.0",
-    "typescript": "^5.4.5",
-    "vite": "^5.2.12"
+    "nyc": "^17.1.0",
+    "playwright": "^1.49.0",
+    "prettier": "^3.3.3",
+    "serve-handler": "^6.1.6",
+    "tsx": "^4.19.2",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.11"
   },
   "files": [
     "dist",