@marko/vite 5.0.4 → 5.0.6

package/dist/index.mjs

@@ -3,7 +3,6 @@ import * as compiler2 from "@marko/compiler";
 import fs4 from "fs";
 import path6 from "path";
 import crypto from "crypto";
-import glob2 from "fast-glob";
 import anyMatch from "anymatch";
 import { pathToFileURL } from "url";
 
@@ -16,6 +15,19 @@ function getRenderAssetsRuntime(opts) {
   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.");` : "const base = import.meta.env.BASE_URL;"}
+
+export function getPrepend(g) {
+  return (
+    g.___viteRenderAssets("head-prepend") +
+    g.___viteRenderAssets("head") +
+    g.___viteRenderAssets("body-prepend") 
+  );
+}
+export function getAppend(g) {
+  return (
+    g.___viteRenderAssets("body-prepend") 
+  );
+}
 export function addAssets(g, newEntries) {
   const entries = g.___viteEntries;
   if (entries) {
@@ -108,42 +120,39 @@ 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};
+  if (opts.tagsAPI) {
+    return `import Template from ${fileNameStr};
 export * from ${fileNameStr};
-import { addAssets } from "${renderAssetsRuntimeId}";
-
-${opts.tagsAPI ? `<const/writeSync=${addAssetsCall}/>` : `$ const writeSync = ${addAssetsCall};`}
-
-${opts.tagsAPI ? "<if=writeSync>" : "<if(writeSync)>"}
-  $!{
-    $global.___viteRenderAssets("head-prepend") +
-    $global.___viteRenderAssets("head") +
-    $global.___viteRenderAssets("body-prepend")
+import { addAssets, getPrepend, getAppend } from "${renderAssetsRuntimeId}";
+static function flush($global, html) {
+  return getPrepend($global) + html + getAppend($global);
+}
+static function setFlush($global) {
+  $global.__flush__ = flush;
+}
+static const assets = [${opts.entryData.join(",")}];
+<const/writeSync=addAssets($global, assets) || setFlush($global)/>
+-- $!{writeSync && getPrepend($global)}
+<Template ...input/>
+-- $!{writeSync && getAppend($global)}
+`;
   }
+  return `import template from ${fileNameStr};
+export * from ${fileNameStr};
+import { addAssets, getPrepend, getAppend } from "${renderAssetsRuntimeId}";
+static const assets = [${opts.entryData.join(",")}];
+<if(addAssets($global, assets))>
+  $!{getPrepend($global)}
+  <\${template} ...input/>
+  $!{getAppend($global)}
 </>
 <else>
-  <__flush_here_and_after__>
-    $!{
-      $global.___viteRenderAssets("head-prepend") +
-      $global.___viteRenderAssets("head") +
-      $global.___viteRenderAssets("body-prepend")
-    }
-  </__flush_here_and_after__>
-</>
-
-<\${template} ...input/>${opts.tagsAPI ? "" : `
-<init-components/>
-<await-reorderer/>`}
-
-${opts.tagsAPI ? "<if=writeSync>" : "<if(writeSync)>"}
-  $!{$global.___viteRenderAssets("body")}
-</>
-<else>
-  <__flush_here_and_after__>
-    $!{$global.___viteRenderAssets("body")}
-  </__flush_here_and_after__>
+  <__flush_here_and_after__>$!{getPrepend($global)}</>
+  <\${template} ...input/>
+  <init-components/>
+  <await-reorderer/>
+  <__flush_here_and_after__>$!{getAppend($global)}</>
 </>
 `;
 };
@@ -803,7 +812,6 @@ var babelCaller = {
   supportsTopLevelAwait: true,
   supportsExportNamespaceFrom: true
 };
-var optimizeKnownTemplatesForRoot = /* @__PURE__ */ new Map();
 var registeredTagLib = false;
 var cjsToEsm;
 function noop2() {
@@ -846,6 +854,7 @@ function markoPlugin(opts = {}) {
   );
   const entryIds = /* @__PURE__ */ new Set();
   const cachedSources = /* @__PURE__ */ new Map();
+  const optimizedRegisistyIdMap = /* @__PURE__ */ new Map();
   const transformWatchFiles = /* @__PURE__ */ new Map();
   const transformOptionalFiles = /* @__PURE__ */ new Map();
   const store = new ReadOncePersistedStore(
@@ -875,7 +884,16 @@ function markoPlugin(opts = {}) {
           runtimeId,
           sourceMaps: true,
           writeVersionComment: false,
-          optimizeKnownTemplates: optimize && linked ? await getKnownTemplates(root) : void 0,
+          optimizeRegistryId(id) {
+            let registryId = optimizedRegisistyIdMap.get(id);
+            if (registryId === void 0) {
+              optimizedRegisistyIdMap.set(
+                id,
+                registryId = optimizedRegisistyIdMap.size
+              );
+            }
+            return registryId;
+          },
           babelConfig: opts.babelConfig ? {
             ...opts.babelConfig,
             caller: opts.babelConfig.caller ? {
@@ -1080,7 +1098,6 @@ function markoPlugin(opts = {}) {
       handleHotUpdate(ctx) {
         compiler2.taglib.clearCaches();
         baseConfig.cache.clear();
-        optimizeKnownTemplatesForRoot.clear();
         for (const [, cache2] of configsByFileSystem) {
           cache2.clear();
         }
@@ -1095,6 +1112,11 @@ function markoPlugin(opts = {}) {
           try {
             serverManifest = await store.read();
             inputOptions.input = toHTMLEntries(root, serverManifest.entries);
+            if (serverManifest.registered) {
+              for (let i = 0; i < serverManifest.registered.length; i++) {
+                optimizedRegisistyIdMap.set(serverManifest.registered[i], i);
+              }
+            }
             for (const entry in serverManifest.entrySources) {
               const id = normalizePath(path6.resolve(root, entry));
               entryIds.add(id);
@@ -1359,6 +1381,9 @@ if (import.meta.hot) import.meta.hot.accept(() => {});`;
               }
             }
           }
+          if (optimizedRegisistyIdMap.size) {
+            serverManifest.registered = [...optimizedRegisistyIdMap.keys()];
+          }
           store.write(serverManifest);
         } else {
           const browserManifest = {};
@@ -1487,28 +1512,6 @@ function getConfigForFileSystem(info, config) {
   }
   return configForFileSystem;
 }
-function getKnownTemplates(root) {
-  let knownTemplates = optimizeKnownTemplatesForRoot.get(root);
-  if (!knownTemplates) {
-    optimizeKnownTemplatesForRoot.set(
-      root,
-      knownTemplates = glob2.globSync("**/*.marko", {
-        absolute: true,
-        cwd: root,
-        ignore: [
-          "**/*test*/**",
-          "**/*example*/**",
-          "**/*stories*/**",
-          "**/*coverage*/**",
-          "**/*snapshots*/**",
-          "**/node_modules/**",
-          "**/*.d.marko"
-        ]
-      })
-    );
-  }
-  return knownTemplates;
-}
 export {
   markoPlugin as default
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
@@ -16,15 +16,15 @@
   },
   "devDependencies": {
     "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.9",
-    "@marko/compiler": "^5.37.26",
+    "@changesets/cli": "^2.27.10",
+    "@marko/compiler": "^5.38.0",
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.2.0",
     "@types/babel__core": "^7.20.5",
     "@types/diff": "^6.0.0",
     "@types/jsdom": "^21.1.7",
-    "@types/mocha": "^10.0.9",
-    "@types/node": "^22.9.0",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^22.9.1",
     "@types/resolve": "^1.20.6",
     "@types/serve-handler": "^6.1.4",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
@@ -39,7 +39,7 @@
     "jsdom": "^25.0.1",
     "less": "^4.2.0",
     "lint-staged": "^15.2.10",
-    "marko": "^5.35.35",
+    "marko": "^5.36.0",
     "mocha": "^10.8.2",
     "mocha-snap": "^5.0.0",
     "nyc": "^17.1.0",
@@ -47,7 +47,7 @@
     "prettier": "^3.3.3",
     "serve-handler": "^6.1.6",
     "tsx": "^4.19.2",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.2",
     "vite": "^5.4.11"
   },
   "files": [