marko 5.37.31 → 5.37.33

package/dist/translator/taglib/core/parse-module-code.js

@@ -1,6 +1,5 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = _default;var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
 var _path = _interopRequireDefault(require("path"));
-var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 
 const startOffset = "module-code".length;
 
@@ -11,7 +10,7 @@ function _default(tag) {
   } = tag;
   const dirname = _path.default.dirname(file.opts.filename);
   const relativeRequire = (entry) =>
-  _modules.default.require((0, _resolveFrom.default)(dirname, entry));
+  _modules.default.require(_modules.default.resolve(entry, dirname));
   const fn = eval(rawValue.slice(startOffset));
   const source = fn(relativeRequire, file.markoOpts);
   file.metadata.marko.moduleCode = source;

package/dist/translator/util/add-dependencies.js

@@ -4,9 +4,9 @@ var _babelUtils = require("@marko/compiler/babel-utils");
 
 
 
+var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
 var _magicString = _interopRequireDefault(require("magic-string"));
 var _path = _interopRequireDefault(require("path"));
-var _resolveFrom = _interopRequireDefault(require("resolve-from"));
 const kEntryState = Symbol();
 const lassoDepPrefix = "package: ";var _default =
 
@@ -282,7 +282,10 @@ function tryGetTemplateImports(file, rendererRelativePath) {
       const resolvedTemplatePath =
       request[0] === "." ?
       _path.default.resolve(resolvedRendererPath, "..", request) :
-      _resolveFrom.default.silent(_path.default.dirname(resolvedRendererPath), request);
+      _modules.default.tryResolve(
+        request,
+        _path.default.dirname(resolvedRendererPath)
+      );
       if (resolvedTemplatePath) {
         if (templateImports) {
           templateImports.push(resolvedTemplatePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.37.31",
+  "version": "5.37.33",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.27.0",
-    "@marko/compiler": "^5.39.20",
+    "@marko/compiler": "^5.39.22",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/translator/taglib/core/parse-module-code.js

@@ -1,6 +1,5 @@
 import markoModules from "@marko/compiler/modules";
 import path from "path";
-import resolveFrom from "resolve-from";
 
 const startOffset = "module-code".length;
 
@@ -11,7 +10,7 @@ export default function (tag) {
   } = tag;
   const dirname = path.dirname(file.opts.filename);
   const relativeRequire = (entry) =>
-    markoModules.require(resolveFrom(dirname, entry));
+    markoModules.require(markoModules.resolve(entry, dirname));
   const fn = eval(rawValue.slice(startOffset));
   const source = fn(relativeRequire, file.markoOpts);
   file.metadata.marko.moduleCode = source;

package/src/translator/util/add-dependencies.js

@@ -4,9 +4,9 @@ import {
   parseStatements,
   resolveRelativePath,
 } from "@marko/compiler/babel-utils";
+import markoModules from "@marko/compiler/modules";
 import MagicString from "magic-string";
 import path from "path";
-import resolveFrom from "resolve-from";
 const kEntryState = Symbol();
 const lassoDepPrefix = "package: ";
 
@@ -282,7 +282,10 @@ function tryGetTemplateImports(file, rendererRelativePath) {
       const resolvedTemplatePath =
         request[0] === "."
           ? path.resolve(resolvedRendererPath, "..", request)
-          : resolveFrom.silent(path.dirname(resolvedRendererPath), request);
+          : markoModules.tryResolve(
+              request,
+              path.dirname(resolvedRendererPath),
+            );
       if (resolvedTemplatePath) {
         if (templateImports) {
           templateImports.push(resolvedTemplatePath);