@marko/translator-default 5.30.1 → 5.31.1

package/dist/util/add-dependencies.js

@@ -9,7 +9,7 @@ var _babelUtils = require("@marko/babel-utils");var _default =
 
 
 (entryFile, isHydrate) => {
-  const { resolveVirtualDependency, hydrateIncludeImports } =
+  const { resolveVirtualDependency, hydrateIncludeImports, hydrateInit } =
   entryFile.markoOpts;
   const hydratedFiles = new Set();
   const program = entryFile.path;
@@ -32,26 +32,33 @@ var _babelUtils = require("@marko/babel-utils");var _default =
   if (hasComponents) {
     const initId = _compiler.types.identifier("init");
     const markoComponentsImport = importPath(
-    resolvePath(entryFile, "marko/src/runtime/components/index.js"));
-
+      resolvePath(entryFile, "marko/src/runtime/components/index.js")
+    );
     if (splitComponentIndex) {
       markoComponentsImport.specifiers.push(
-      _compiler.types.importSpecifier(_compiler.types.identifier("register"), _compiler.types.identifier("register")));
-
+        _compiler.types.importSpecifier(_compiler.types.identifier("register"), _compiler.types.identifier("register"))
+      );
     }
-    markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
-    program.unshiftContainer("body", markoComponentsImport);
-    program.pushContainer(
-    "body",
-    _compiler.types.expressionStatement(
-    _compiler.types.callExpression(
-    initId,
-    entryFile.markoOpts.runtimeId ?
-    [_compiler.types.stringLiteral(entryFile.markoOpts.runtimeId)] :
-    [])));
 
+    if (hydrateInit) {
+      markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
+    }
 
+    program.unshiftContainer("body", markoComponentsImport);
 
+    if (hydrateInit) {
+      program.pushContainer(
+        "body",
+        _compiler.types.expressionStatement(
+          _compiler.types.callExpression(
+            initId,
+            entryFile.markoOpts.runtimeId ?
+            [_compiler.types.stringLiteral(entryFile.markoOpts.runtimeId)] :
+            []
+          )
+        )
+      );
+    }
   }
 
   function addHydrateDeps(file) {
@@ -105,24 +112,24 @@ var _babelUtils = require("@marko/babel-utils");var _default =
     if (meta.component) {
       // Split component
       const splitComponentId = _compiler.types.identifier(
-      `component_${splitComponentIndex++}`);
-
+        `component_${splitComponentIndex++}`
+      );
       const splitComponentImport = importPath(
-      resolvePath(file, meta.component));
-
+        resolvePath(file, meta.component)
+      );
       splitComponentImport.specifiers.push(
-      _compiler.types.importDefaultSpecifier(splitComponentId));
-
+        _compiler.types.importDefaultSpecifier(splitComponentId)
+      );
       program.pushContainer("body", splitComponentImport);
       program.pushContainer(
-      "body",
-      _compiler.types.expressionStatement(
-      _compiler.types.callExpression(_compiler.types.identifier("register"), [
-      _compiler.types.stringLiteral(meta.id),
-      splitComponentId])));
-
-
-
+        "body",
+        _compiler.types.expressionStatement(
+          _compiler.types.callExpression(_compiler.types.identifier("register"), [
+          _compiler.types.stringLiteral(meta.id),
+          splitComponentId]
+          )
+        )
+      );
     }
   }
 
@@ -159,6 +166,10 @@ var _babelUtils = require("@marko/babel-utils");var _default =
           code,
           virtualPath
         });
+
+        if (!dep) {
+          continue;
+        }
       } else if (dep.startsWith("package:")) {
         continue;
       }
@@ -171,9 +182,9 @@ var _babelUtils = require("@marko/babel-utils");var _default =
     return file === entryFile ?
     (0, _babelUtils.resolveRelativePath)(file, req) :
     (0, _babelUtils.resolveRelativePath)(
-    entryFile,
-    _path.default.join(file.opts.filename, "..", req));
-
+      entryFile,
+      _path.default.join(file.opts.filename, "..", req)
+    );
   }
 
   function importPath(path) {
@@ -183,17 +194,17 @@ var _babelUtils = require("@marko/babel-utils");var _default =
 
 function tryGetTemplateImports(file, rendererRelativePath) {
   const resolvedRendererPath = _path.default.join(
-  file.opts.filename,
-  "..",
-  rendererRelativePath);
-
+    file.opts.filename,
+    "..",
+    rendererRelativePath
+  );
   let templateImports;
 
   try {
     for (const statement of (0, _babelUtils.parseStatements)(
-    file,
-    file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8")))
-    {
+      file,
+      file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8")
+    )) {
       if (statement.type === "ImportDeclaration") {
         addImport(statement.source.value);
       } else {

package/dist/util/get-component-files.js

@@ -20,8 +20,8 @@ function getComponentFiles({ hub: { file } }) {
   const styleMatch = new RegExp(`^${fileMatch}style\\.\\w+$`);
   const componentMatch = new RegExp(`^${fileMatch}component\\.\\w+$`);
   const splitComponentMatch = new RegExp(
-  `^${fileMatch}component-browser\\.\\w+$`);
-
+    `^${fileMatch}component-browser\\.\\w+$`
+  );
   const packageMatch = new RegExp(`^${fileMatch}browser\\.\\json$`);
   let styleFile;
   let packageFile;

package/dist/util/html-out-write.js

@@ -6,10 +6,10 @@ function write(strings, ...expressions) {
 
   if (template) {
     return _compiler.types.expressionStatement(
-    _compiler.types.callExpression(
-    _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("w")),
-    [template]));
-
-
+      _compiler.types.callExpression(
+        _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier("w")),
+        [template]
+      )
+    );
   }
 }

package/dist/util/key-manager.js

@@ -49,10 +49,10 @@ class KeyManager {
         const keyValueIdentifier = path.scope.generateUidIdentifier("keyValue");
         firstChildTag.set("key", keyValueIdentifier);
         firstChildTag.insertBefore(
-        _compiler.types.variableDeclaration("const", [
-        _compiler.types.variableDeclarator(keyValueIdentifier, firstChildKey)]));
-
-
+          _compiler.types.variableDeclaration("const", [
+          _compiler.types.variableDeclarator(keyValueIdentifier, firstChildKey)]
+          )
+        );
 
         path.set("keyValue", keyValueIdentifier);
         path.get("body").scope.crawl();
@@ -71,11 +71,11 @@ class KeyManager {
     const parentKeyScope = getParentKeyScope(path);
     const autoKey = path.get("key").node || this.nextKey();
     path.set(
-    "key",
-    parentKeyScope ?
-    _compiler.types.binaryExpression("+", autoKey, parentKeyScope) :
-    autoKey);
-
+      "key",
+      parentKeyScope ?
+      _compiler.types.binaryExpression("+", autoKey, parentKeyScope) :
+      autoKey
+    );
   }
 }
 
@@ -99,12 +99,12 @@ function getKeyScope(path) {
     scope.getOwnBinding(firstChildKeyValue.name).path;
     const declarationPath = valuePath.parentPath;
     declarationPath.pushContainer(
-    "declarations",
-    _compiler.types.variableDeclarator(
-    keyScopeIdentifier,
-    (0, _babelUtils.normalizeTemplateString)`[${firstChildKeyValue}]`));
-
-
+      "declarations",
+      _compiler.types.variableDeclarator(
+        keyScopeIdentifier,
+        (0, _babelUtils.normalizeTemplateString)`[${firstChildKeyValue}]`
+      )
+    );
   } else {
     let keyValue;
 
@@ -119,10 +119,10 @@ function getKeyScope(path) {
     if (!keyValue) {
       const keyValueIdentifier = path.scope.generateUidIdentifier("keyValue");
       path.insertBefore(
-      _compiler.types.variableDeclaration("let", [
-      _compiler.types.variableDeclarator(keyValueIdentifier, _compiler.types.numericLiteral(0))]));
-
-
+        _compiler.types.variableDeclaration("let", [
+        _compiler.types.variableDeclarator(keyValueIdentifier, _compiler.types.numericLiteral(0))]
+        )
+      );
 
       keyValue = _compiler.types.updateExpression("++", keyValueIdentifier);
     }
@@ -135,14 +135,14 @@ function getKeyScope(path) {
     path.
     get("body").
     unshiftContainer(
-    "body",
-    _compiler.types.variableDeclaration("const", [
-    _compiler.types.variableDeclarator(
-    keyScopeIdentifier,
-    (0, _babelUtils.normalizeTemplateString)`[${keyValue}]`)]));
-
-
-
+      "body",
+      _compiler.types.variableDeclaration("const", [
+      _compiler.types.variableDeclarator(
+        keyScopeIdentifier,
+        (0, _babelUtils.normalizeTemplateString)`[${keyValue}]`
+      )]
+      )
+    );
   }
 
   path.set("keyScope", keyScopeIdentifier);

package/dist/util/optimize-vdom-create.js

@@ -15,36 +15,36 @@ const skipDirectives = new Set([
 "no-update",
 "no-update-if",
 "no-update-body",
-"no-update-body-if"]);
-
+"no-update-body-if"]
+);
 const staticNodes = new WeakSet();
 
 const mergeStaticCreateVisitor = {
   MarkoText(path, state) {
     const { node } = path;
     state.currentRoot = _compiler.types.callExpression(
-    _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
-    [_compiler.types.stringLiteral((0, _he.decode)(node.value))]);
-
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
+      [_compiler.types.stringLiteral((0, _he.decode)(node.value))]
+    );
   },
   MarkoPlaceholder(path, state) {
     const computed = (0, _babelUtils.computeNode)(path.node.value);
     state.currentRoot = _compiler.types.callExpression(
-    _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
-    [
-    _compiler.types.stringLiteral(
-    computed && computed.value != null ? `${computed.value}` : "")]);
-
-
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("t")),
+      [
+      _compiler.types.stringLiteral(
+        computed && computed.value != null ? `${computed.value}` : ""
+      )]
 
+    );
   },
   MarkoTag(path, state) {
     (0, _keyManager.getKeyManager)(path).resolveKey(path);
     const writeArgs = (0, _nativeTagVdom.tagArguments)(path, true);
     state.currentRoot = _compiler.types.callExpression(
-    _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("e")),
-    writeArgs);
-
+      _compiler.types.memberExpression(state.currentRoot, _compiler.types.identifier("e")),
+      writeArgs
+    );
   }
 };
 
@@ -81,15 +81,15 @@ const analyzeStaticVisitor = {
       path.
       get("attributes").
       every(
-      (attr) =>
-      _compiler.types.isMarkoAttribute(attr) &&
-      !(
-      attr.node.arguments ||
-      attr.node.modifier ||
-      skipDirectives.has(attr.node.name) ||
-      !(0, _babelUtils.computeNode)(attr.node.value)));
-
+        (attr) =>
+        _compiler.types.isMarkoAttribute(attr) &&
+        !(
+        attr.node.arguments ||
+        attr.node.modifier ||
+        skipDirectives.has(attr.node.name) ||
+        !(0, _babelUtils.computeNode)(attr.node.value))
 
+      );
 
       // check children
       isStatic =
@@ -121,20 +121,20 @@ function optimizeStaticVDOM(path) {
   const writeArgs = (0, _nativeTagVdom.tagArguments)(path, true);
   const state = {
     currentRoot: _compiler.types.callExpression(
-    (0, _babelUtils.importDefault)(
-    file,
-    "marko/src/runtime/vdom/helpers/v-element.js",
-    "marko_createElement"),
-
-    writeArgs)
-
+      (0, _babelUtils.importDefault)(
+        file,
+        "marko/src/runtime/vdom/helpers/v-element.js",
+        "marko_createElement"
+      ),
+      writeArgs
+    )
   };
 
   path.traverse(mergeStaticCreateVisitor, state);
 
   const d = _compiler.types.variableDeclaration("const", [
-  _compiler.types.variableDeclarator(identifier, state.currentRoot)]);
-
+  _compiler.types.variableDeclarator(identifier, state.currentRoot)]
+  );
   file.path.node.body.push(d);
   path.replaceWith((0, _vdomOutWrite.default)("n", identifier, file._componentInstanceIdentifier));
   path.skip();

package/dist/util/vdom-out-write.js

@@ -2,9 +2,9 @@
 
 function write(method, ...args) {
   return _compiler.types.expressionStatement(
-  _compiler.types.callExpression(
-  _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier(method)),
-  args));
-
-
+    _compiler.types.callExpression(
+      _compiler.types.memberExpression(_compiler.types.identifier("out"), _compiler.types.identifier(method)),
+      args
+    )
+  );
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "5.30.1",
+  "version": "5.31.1",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -35,8 +35,8 @@
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.32.0",
-    "marko": "^5.30.1"
+    "@marko/compiler": "^5.33.1",
+    "marko": "^5.31.4"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",