@marko/translator-default 5.32.2 → 5.32.3

package/dist/index.js

@@ -72,10 +72,6 @@ const analyze = exports.analyze = {
       (0, _babelUtils.resolveRelativePath)(file, filename) :
       filename
       );
-
-      meta.imports = program.node.body.
-      filter((child) => _compiler.types.isImportDeclaration(child)).
-      map((child) => child.source.value);
     }
   },
   MarkoTag(tag) {

package/dist/tag/custom-tag.js

@@ -44,13 +44,10 @@ function _default(path, isNullable) {
     const childProgram = childFile?.ast.program;
 
     if (childProgram?.extra?.___featureType === "tags") {
-      (0, _babelUtils.importDefault)(
-        file,
-        `marko/src/runtime/helpers/tags-compat-${
-        markoOpts.output === "html" ? "html" : "dom"
-        }.js`,
-        "marko_tags_compat"
-      );
+      const compatRuntimeFile = `marko/src/runtime/helpers/tags-compat/${
+      markoOpts.output === "html" ? "html" : "dom"
+      }${markoOpts.optimize ? "" : "-debug"}.${markoOpts.modules === "esm" ? "mjs" : "js"}`;
+      (0, _babelUtils.importDefault)(file, compatRuntimeFile);
       path.set("name", (0, _babelUtils.importDefault)(file, relativePath, path.node.name.value));
       return (0, _dynamicTag.default)(path);
     } else if (relativePath) {

package/dist/util/add-dependencies.js

@@ -11,23 +11,25 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
 (entryFile, isHydrate) => {
   const { resolveVirtualDependency, hydrateIncludeImports, hydrateInit } =
   entryFile.markoOpts;
-  const hydratedFiles = new Set();
   const program = entryFile.path;
   const shouldIncludeImport = toTestFn(hydrateIncludeImports);
+  const resolvedDeps = new Set();
+  const body = [];
 
   if (!isHydrate) {
-    addBrowserDeps(entryFile);
+    scanBrowserDeps(entryFile);
+    if (body.length) {
+      program.node.body = body.concat(program.node.body);
+    }
     return;
   }
 
+  const hydratedTemplates = new Set();
   const watchFiles = new Set();
   let hasComponents = false;
   let splitComponentIndex = 0;
-  program.set("body", []);
-  program.skip();
 
-  addHydrateDeps(entryFile);
-  entryFile.metadata.marko.watchFiles = Array.from(watchFiles);
+  scanHydrateDeps(entryFile);
 
   if (hasComponents) {
     const initId = _compiler.types.identifier("init");
@@ -40,15 +42,11 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
       );
     }
 
-    if (hydrateInit) {
-      markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
-    }
-
-    program.unshiftContainer("body", markoComponentsImport);
+    body.unshift(markoComponentsImport);
 
     if (hydrateInit) {
-      program.pushContainer(
-        "body",
+      markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
+      body.push(
         _compiler.types.expressionStatement(
           _compiler.types.callExpression(
             initId,
@@ -61,19 +59,23 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
     }
   }
 
-  function addHydrateDeps(file) {
+  entryFile.metadata.marko.watchFiles = Array.from(watchFiles);
+  program.node.body = body;
+  program.skip();
+
+  function scanHydrateDeps(file) {
     const meta = file.metadata.marko;
     const resolved = (0, _babelUtils.resolveRelativePath)(entryFile, file.opts.filename);
-    if (hydratedFiles.has(resolved)) return;
+    if (hydratedTemplates.has(resolved)) return;
 
-    hydratedFiles.add(resolved);
+    hydratedTemplates.add(resolved);
 
     if (meta.component) {
       hasComponents = true;
 
       if (_path.default.basename(meta.component) === _path.default.basename(file.opts.filename)) {
         // Stateful component.
-        program.pushContainer("body", importPath(resolved));
+        addDep(resolved);
         return;
       }
     }
@@ -84,25 +86,28 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
       watchFiles.add(watchFile);
     }
 
-    addBrowserDeps(file);
+    scanBrowserDeps(file);
 
-    for (const imported of meta.imports) {
-      if (shouldIncludeImport(imported)) {
-        program.pushContainer("body", importPath(resolvePath(file, imported)));
+    for (const child of file.path.node.body) {
+      if (_compiler.types.isImportDeclaration(child)) {
+        const { value } = child.source;
+        if (shouldIncludeImport(value)) {
+          addDep(resolvePath(file, value));
+        }
       }
     }
 
     for (const tag of meta.tags) {
       if (tag.endsWith(".marko")) {
-        if (!hydratedFiles.has(resolvePath(file, tag))) {
-          addHydrateDeps((0, _babelUtils.loadFileForImport)(file, tag));
+        if (!hydratedTemplates.has(resolvePath(file, tag))) {
+          scanHydrateDeps((0, _babelUtils.loadFileForImport)(file, tag));
         }
       } else {
         const importedTemplates = tryGetTemplateImports(file, tag);
         if (importedTemplates) {
           for (const templateFile of importedTemplates) {
-            if (!hydratedFiles.has(resolvePath(file, templateFile))) {
-              addHydrateDeps((0, _babelUtils.loadFileForImport)(file, templateFile));
+            if (!hydratedTemplates.has(resolvePath(file, templateFile))) {
+              scanHydrateDeps((0, _babelUtils.loadFileForImport)(file, templateFile));
             }
           }
         }
@@ -120,9 +125,8 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
       splitComponentImport.specifiers.push(
         _compiler.types.importDefaultSpecifier(splitComponentId)
       );
-      program.pushContainer("body", splitComponentImport);
-      program.pushContainer(
-        "body",
+      body.push(
+        splitComponentImport,
         _compiler.types.expressionStatement(
           _compiler.types.callExpression(_compiler.types.identifier("register"), [
           _compiler.types.stringLiteral(meta.id),
@@ -133,7 +137,7 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
     }
   }
 
-  function addBrowserDeps(file) {
+  function scanBrowserDeps(file) {
     const { filename, sourceMaps } = file.opts;
     let s;
 
@@ -174,10 +178,16 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
         continue;
       }
 
-      program.pushContainer("body", importPath(resolvePath(file, dep)));
+      addDep(resolvePath(file, dep));
     }
   }
 
+  function addDep(resolved) {
+    if (resolvedDeps.has(resolved)) return;
+    resolvedDeps.add(resolved);
+    body.push(importPath(resolved));
+  }
+
   function resolvePath(file, req) {
     return file === entryFile ?
     (0, _babelUtils.resolveRelativePath)(file, req) :

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "5.32.2",
+  "version": "5.32.3",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -28,14 +28,14 @@
     "build": "babel ./src --out-dir ./dist --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.9",
+    "@babel/runtime": "^7.24.0",
     "@marko/babel-utils": "^6.4.1",
-    "magic-string": "^0.30.6",
+    "magic-string": "^0.30.8",
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.35.3",
-    "marko": "^5.33.1"
+    "@marko/compiler": "^5.35.4",
+    "marko": "^5.33.4"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",