From c64b1b811ef119c0bc84bea9d497781b54e376b0 Mon Sep 17 00:00:00 2001 From: Kelly Selden Date: Sun, 1 Jul 2018 21:59:31 +0100 Subject: [PATCH] turn on preventDoubleAmdCompile and pass through doubleAmdCallback --- index.js | 6 +++++- package.json | 2 +- yarn.lock | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 9f8a14ea..6ccd073a 100644 --- a/index.js +++ b/index.js @@ -192,11 +192,13 @@ module.exports = { let shouldRunPresetEnv = true; let providedAnnotation; let throwUnlessParallelizable; + let doubleAmdCallback; if (emberCLIBabelConfig) { providedAnnotation = emberCLIBabelConfig.annotation; shouldRunPresetEnv = !emberCLIBabelConfig.disablePresetEnv; throwUnlessParallelizable = emberCLIBabelConfig.throwUnlessParallelizable; + doubleAmdCallback = emberCLIBabelConfig.doubleAmdCallback; } let sourceMaps = false; @@ -207,7 +209,9 @@ module.exports = { let options = { annotation: providedAnnotation || `Babel: ${this._parentName()}`, sourceMaps, - throwUnlessParallelizable + throwUnlessParallelizable, + preventDoubleAmdCompile: true, + doubleAmdCallback }; let userPlugins = addonProvidedConfig.plugins; diff --git a/package.json b/package.json index deda6d5c..67dfc59d 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "babel-plugin-transform-es2015-modules-amd": "^6.24.0", "babel-polyfill": "^6.26.0", "babel-preset-env": "^1.7.0", - "broccoli-babel-transpiler": "^6.4.2", + "broccoli-babel-transpiler": "kellyselden/broccoli-babel-transpiler#preventDoubleAmdCompile", "broccoli-debug": "^0.6.4", "broccoli-funnel": "^2.0.0", "broccoli-source": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 339e19e6..a80a2c36 100644 --- a/yarn.lock +++ b/yarn.lock @@ -923,9 +923,9 @@ broccoli-babel-transpiler@^6.0.0, broccoli-babel-transpiler@^6.1.2: rsvp "^3.5.0" workerpool "^2.3.0" -broccoli-babel-transpiler@^6.4.2: - version "6.4.2" - resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.4.2.tgz#f9e453ce664d5735baecabbc50e62c1b93b1796d" +broccoli-babel-transpiler@kellyselden/broccoli-babel-transpiler#preventDoubleAmdCompile: + version "6.4.3" + resolved "https://codeload.github.com/kellyselden/broccoli-babel-transpiler/tar.gz/ba2aee2fb3801201382186bc37b41b02e6799093" dependencies: babel-core "^6.26.0" broccoli-funnel "^2.0.1"