@marko/compiler 5.30.3 → 5.31.1

package/dist/babel-plugin/index.js

@@ -205,7 +205,6 @@ function getMarkoFile(code, fileOpts, markoOpts) {
 
   const meta = file.metadata.marko = {
     id,
-    macros: {},
     deps: [],
     tags: [],
     watchFiles: [],

package/dist/index.js

@@ -14,6 +14,8 @@ var _buildCodeFrame = require("./util/build-code-frame");
 var _mergeErrors = _interopRequireDefault(require("./util/merge-errors"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function (nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
 
+const CWD = process.cwd();
+
 let globalConfig = { ..._config.default };
 function configure(newConfig) {
   globalConfig = { ..._config.default, ...newConfig };
@@ -88,9 +90,8 @@ function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
 
 
   const baseBabelConfig = {
-    filenameRelative: filename ?
-    _path.default.relative(process.cwd(), filename) :
-    undefined,
+    filenameRelative: filename ? _path.default.relative(CWD, filename) : undefined,
+    sourceRoot: filename ? _path.default.dirname(filename) : undefined,
     sourceFileName: filename ? _path.default.basename(filename) : undefined,
     configFile: isTranslated,
     babelrc: isTranslated,

package/dist/register.js

@@ -4,27 +4,48 @@ const compiler = require(".");
 const shouldOptimize = require("./util/should-optimize").default;
 const requiredOptions = { modules: "cjs" };
 const isDev = !shouldOptimize();
+const sourceMaps = new Map();
+let installSourceMaps = () => {
+  installSourceMaps = () => {};
+  require("source-map-support").install({
+    handleUncaughtExceptions: false,
+    environment: "node",
+    retrieveSourceMap(source) {
+      const map = sourceMaps.get(source);
+      if (map) {
+        return { url: null, map };
+      }
+      return null;
+    }
+  });
+};
 
 module.exports = register;
 register();
 
 function register({ extensions = require.extensions, ...options } = {}) {
-  extensions[".marko"] = (module, filename) =>
-  module._compile(
-  compiler.compileFileSync(
-  filename,
-  Object.assign(
-  {
-    meta: true,
-    hot: process.env.BROWSER_REFRESH_URL !== undefined,
-    // eslint-disable-next-line no-constant-condition
-    sourceMaps: isDev ? "inline" : false
-  },
-  options,
-  requiredOptions)).
-
-  code,
-  filename);
+  extensions[".marko"] = (module, filename) => {
+    const compiled = compiler.compileFileSync(
+    filename,
+    Object.assign(
+    {
+      meta: true,
+      hot: process.env.BROWSER_REFRESH_URL !== undefined,
+      // eslint-disable-next-line no-constant-condition
+      sourceMaps: isDev ? "both" : false
+    },
+    options,
+    requiredOptions));
+
+
+
+    if (compiled.map) {
+      sourceMaps.set(filename, compiled.map);
+      installSourceMaps();
+    }
+
+    return module._compile(compiled.code, filename);
+  };
 
   return extensions;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.30.3",
+  "version": "5.31.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -15,7 +15,7 @@
     "@babel/runtime": "^7.16.0",
     "@babel/traverse": "^7.16.0",
     "@babel/types": "^7.16.0",
-    "@marko/babel-utils": "^6.1.0",
+    "@marko/babel-utils": "^6.2.0",
     "complain": "^1.6.0",
     "he": "^1.2.0",
     "htmljs-parser": "^5.4.3",
@@ -26,11 +26,12 @@
     "raptor-util": "^3.2.0",
     "resolve-from": "^5.0.0",
     "self-closing-tags": "^1.0.1",
+    "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.0",
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.28.3"
+    "@marko/translator-default": "^5.29.1"
   },
   "files": [
     "dist",