@marko/compiler 5.28.3 → 5.28.5

package/dist/babel-plugin/index.js

@@ -53,6 +53,7 @@ const SOURCE_FILES = new WeakMap();var _default =
       opts.parserOpts.allowReturnOutsideFunction =
       opts.parserOpts.allowSuperOutsideMethod =
       opts.parserOpts.allowUndeclaredExports =
+      opts.parserOpts.allowNewTargetOutsideFunction =
       true;
       curOpts = opts;
     },

package/dist/index.js

@@ -65,14 +65,14 @@ function loadMarkoConfig(config) {
   const markoConfig = { ...globalConfig, ...config };
 
   if (markoConfig.stripTypes === undefined) {
-    markoConfig.stripTypes =
-    markoConfig.output !== "source" && markoConfig.output !== "migrate";
+    markoConfig.stripTypes = isTranslatedOutput(markoConfig.output);
   }
 
   return markoConfig;
 }
 
 function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
+  const isTranslated = isTranslatedOutput(markoConfig.output);
   const requiredPlugins = [
   [_babelPlugin.default, markoConfig],
   [
@@ -92,23 +92,29 @@ function loadBabelConfig(filename, { babelConfig, ...markoConfig }) {
     _path.default.relative(process.cwd(), filename) :
     undefined,
     sourceFileName: filename ? _path.default.basename(filename) : undefined,
+    configFile: isTranslated,
+    babelrc: isTranslated,
     ...babelConfig,
     filename,
     sourceType: "module",
     sourceMaps: markoConfig.sourceMaps,
     code: markoConfig.code,
-    ast: markoConfig.ast
+    ast: markoConfig.ast,
+    plugins:
+    babelConfig && babelConfig.plugins ?
+    requiredPlugins.concat(babelConfig.plugins) :
+    requiredPlugins
   };
 
-  if (markoConfig.modules === "cjs") {
-    requiredPlugins.push([_pluginTransformModulesCommonjs.default, { loose: true }]);
-  }
-
-  baseBabelConfig.plugins = requiredPlugins.concat(
-  baseBabelConfig.plugins || []);
+  if (isTranslated) {
+    if (markoConfig.modules === "cjs") {
+      baseBabelConfig.plugins.push([_pluginTransformModulesCommonjs.default, { loose: true }]);
+    }
 
+    return babel.loadPartialConfig(baseBabelConfig).options;
+  }
 
-  return babel.loadPartialConfig(baseBabelConfig).options;
+  return baseBabelConfig;
 }
 
 function buildResult(src, filename, errorRecovery, babelResult) {
@@ -124,7 +130,7 @@ function buildResult(src, filename, errorRecovery, babelResult) {
 
     for (const diag of meta.diagnostics) {
       if (diag.type === _babelUtils.DiagnosticType.Error) {
-        errors.push(diag);
+        errors.push((0, _buildCodeFrame.buildCodeFrameError)(filename, src, diag.loc, diag.label));
       }
     }
 
@@ -132,13 +138,12 @@ function buildResult(src, filename, errorRecovery, babelResult) {
       case 0:
         break;
       case 1:{
-          const [diag] = errors;
-          throw (0, _buildCodeFrame.buildCodeFrameError)(filename, src, diag.loc, diag.label);
+          throw errors[0];
         }
       default:{
           let err;
           const message = `${_kleur.default.red("AggregationError:")}\n${errors.
-          map((diag) => (0, _buildCodeFrame.buildCodeFrame)(filename, src, diag.loc, diag.label)).
+          map((err) => err.message).
           join("\n\n").
           replace(/^(?!\s*$)/gm, "\t")}\n`;
 
@@ -181,4 +186,8 @@ function isDefaultCache(config) {
 
 function getFs(config) {
   return config.fileSystem || globalConfig.fileSystem;
+}
+
+function isTranslatedOutput(output) {
+  return output !== "source" && output !== "migrate";
 }

package/dist/util/build-code-frame.js

@@ -1,8 +1,33 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrame = buildCodeFrame;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.buildCodeFrameError = buildCodeFrameError;var _path = _interopRequireDefault(require("path"));
 var _kleur = _interopRequireDefault(require("kleur"));
 var _codeFrame = require("@babel/code-frame");
 const CWD = process.cwd();
 
+function buildCodeFrameError(
+filename,
+code,
+loc,
+message,
+Error = SyntaxError)
+{
+  const err = new Error();
+  const codeFrame = buildCodeFrame(filename, code, loc, message);
+
+  err.loc = loc;
+  err.label = message;
+  err.stack = ""; // Avoid showing the stack trace for this error.
+
+  // Prevent babel from changing our error message.
+  Object.defineProperty(err, "message", {
+    get() {
+      return codeFrame;
+    },
+    set() {}
+  });
+
+  return err;
+}
+
 function buildCodeFrame(filename, code, loc, message) {
   return `${_kleur.default.cyan(_path.default.relative(CWD, filename))}${
   loc ?
@@ -27,28 +52,4 @@ function buildCodeFrame(filename, code, loc, message) {
   }` :
   `: ${message}`
   }`;
-}
-
-function buildCodeFrameError(
-filename,
-code,
-loc,
-message,
-Error = SyntaxError)
-{
-  const err = new Error();
-  const codeFrame = buildCodeFrame(filename, code, loc, message);
-
-  // Avoid showing the stack trace for this error.
-  err.stack = "";
-
-  // Prevent babel from changing our error message.
-  Object.defineProperty(err, "message", {
-    get() {
-      return codeFrame;
-    },
-    set() {}
-  });
-
-  return err;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@marko/compiler",
   "description": "Marko template to JS compiler.",
-  "version": "5.28.3",
+  "version": "5.28.5",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md",
   "dependencies": {
@@ -30,7 +30,7 @@
     "strip-json-comments": "^3.1.1"
   },
   "devDependencies": {
-    "@marko/translator-default": "^5.26.3"
+    "@marko/translator-default": "^5.26.5"
   },
   "files": [
     "dist",