@marko/compiler
Advanced tools
Comparing version
@@ -6,2 +6,13 @@ # Change Log | ||
# [5.0.0-next.72](https://github.com/marko-js/marko/tree/master/packages/compiler/compare/v5.0.0-next.71...v5.0.0-next.72) (2021-01-13) | ||
### Features | ||
* **compiler:** support string as translator option ([0c6e968](https://github.com/marko-js/marko/tree/master/packages/compiler/commit/0c6e968b4eadd9c792c8495cd218791b04206ec5)) | ||
# [5.0.0-next.71](https://github.com/marko-js/marko/tree/master/packages/compiler/compare/v5.0.0-next.70...v5.0.0-next.71) (2021-01-12) | ||
@@ -8,0 +19,0 @@ |
@@ -17,4 +17,21 @@ "use strict";var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.getMarkoFile = getMarkoFile;exports.default = void 0;var _path = _interopRequireDefault(require("path")); | ||
api.assertVersion(7); | ||
const translator = markoOpts.translator; | ||
let translator = markoOpts.translator; | ||
if (typeof translator === "string") { | ||
try { | ||
translator = _modules.default.require(translator); | ||
} catch (err) { | ||
try { | ||
translator = _modules.default.require(`@marko/translator-${translator}`); | ||
} catch { | ||
try { | ||
translator = _modules.default.require(`marko-translator-${translator}`); | ||
} catch { | ||
throw err; | ||
} | ||
} | ||
} | ||
} | ||
markoOpts.translator = translator; | ||
markoOpts.output = markoOpts.output || "html"; | ||
@@ -21,0 +38,0 @@ |
@@ -1,4 +0,4 @@ | ||
"use strict";var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _fs = _interopRequireDefault(require("fs")); | ||
"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _fs = _interopRequireDefault(require("fs")); | ||
var _lassoPackageRoot = require("lasso-package-root"); | ||
var _enhancedResolve = require("enhanced-resolve"); | ||
var translator = _interopRequireWildcard(require("@marko/translator-default")); | ||
@@ -46,4 +46,47 @@ let config; | ||
*/ | ||
translator, | ||
translator: (() => { | ||
const translatorReg = /^(@\/marko\/|marko-)translator-/; | ||
let translator = "@marko/translator-default"; | ||
let pkg; | ||
try { | ||
pkg = (0, _lassoPackageRoot.getRootPackage)(process.cwd()); | ||
// eslint-disable-next-line no-empty | ||
} catch {} | ||
if (pkg) { | ||
for (const name in pkg.dependencies) { | ||
if (translatorReg.test(name)) { | ||
if (translator && translator !== name) { | ||
return; | ||
} | ||
translator = name; | ||
} | ||
} | ||
for (const name in pkg.peerDependencies) { | ||
if (translatorReg.test(name)) { | ||
if (translator && translator !== name) { | ||
return; | ||
} | ||
translator = name; | ||
} | ||
} | ||
for (const name in pkg.devDependencies) { | ||
if (translatorReg.test(name)) { | ||
if (translator && translator !== name) { | ||
return; | ||
} | ||
translator = name; | ||
} | ||
} | ||
} | ||
return translator; | ||
})(), | ||
/** | ||
@@ -50,0 +93,0 @@ * Use a different file system object, eg webpacks CachedInputFileSystem or lasso-caching-fs |
{ | ||
"name": "@marko/compiler", | ||
"description": "Marko template to JS compiler.", | ||
"version": "5.0.0-next.71", | ||
"version": "5.0.0-next.72", | ||
"author": "Dylan Piercey <dpiercey@ebay.com>", | ||
@@ -17,4 +17,3 @@ "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md", | ||
"@marko/babel-types": "^5.0.0-next.71", | ||
"@marko/babel-utils": "^5.0.0-next.71", | ||
"@marko/translator-default": "^5.0.0-next.71", | ||
"@marko/babel-utils": "^5.0.0-next.72", | ||
"complain": "^1.6.0", | ||
@@ -31,3 +30,4 @@ "enhanced-resolve": "5.0.0", | ||
"devDependencies": { | ||
"marko": "^5.0.0-next.71" | ||
"@marko/translator-default": "^5.0.0-next.72", | ||
"marko": "^5.0.0-next.72" | ||
}, | ||
@@ -61,3 +61,3 @@ "files": [ | ||
}, | ||
"gitHead": "61e4dbf6d31ce756a669e150d1b0886cad63f6af" | ||
"gitHead": "d04bc1801d5ec6f89e8c50b3d0be1a1dfcef66bb" | ||
} |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
201909
2.32%20
-4.76%3478
1.46%2
100%- Removed
- Removed