Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions lib/build/amodro-trace/read/es.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
const transform = require('@babel/core').transform;
const transformSync = require('@babel/core').transformSync;

// use babel to translate native es module into AMD module
module.exports = function es(fileName, fileContents) {
return transform(fileContents, {
/**
* Use babel to translate native es module into AMD module
* @param {string} fileName
* @param {string} fileContents
* @param {{} | boolean} inputSourceMap
* @returns {{ code: string, map: string, ast: any }}
*/
module.exports = function es(fileName, fileContents, inputSourceMap) {
return transformSync(fileContents, {
babelrc: false,
plugins: [['@babel/plugin-transform-modules-amd', {loose: true}]]
}).code;
plugins: [['@babel/plugin-transform-modules-amd', {loose: true}]],
inputSourceMap: inputSourceMap
});
};
12 changes: 11 additions & 1 deletion lib/build/bundled-source.js
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,17 @@ exports.BundledSource = class {
} catch {
// file is not in amd/cjs format, try native es module
try {
contents = esTransform(modulePath, this.contents);
/** @type {{} | boolean} */
let inputSourceMap = false;
if (this.file.sourceMap) {
inputSourceMap = typeof this.file.sourceMap === 'string' ? JSON.parse(this.file.sourceMap) : this.file.sourceMap;
}
const result = esTransform(modulePath, this.contents, inputSourceMap);

contents = result.code;
if (result.map) {
this.file.sourceMap = result.map; // save updated source map
}
} catch (e) {
logger.error('Could not convert to AMD module, skipping ' + modulePath);
logger.error('Error was: ' + e);
Expand Down
Loading