diff --git a/packages/compat/package.json b/packages/compat/package.json index a04b754c0..4df6af40b 100644 --- a/packages/compat/package.json +++ b/packages/compat/package.json @@ -45,8 +45,6 @@ "@embroider/macros": "0.4.3", "assert-never": "^1.1.0", "babel-core": "^6.26.3", - "babel-plugin-debug-macros": "^0.3.0", - "babel-plugin-ember-modules-api-polyfill": "^2.9.0", "babylon": "^6.18.0", "broccoli": "^2.2.0", "broccoli-funnel": "^2.0.1", diff --git a/packages/compat/src/v1-app.ts b/packages/compat/src/v1-app.ts index 126140351..5ee410368 100644 --- a/packages/compat/src/v1-app.ts +++ b/packages/compat/src/v1-app.ts @@ -188,7 +188,7 @@ export default class V1App implements V1Package { 'ember-cli-babel': { includeExternalHelpers: true, compileModules: false, - disableDebugTooling: true, + disableDebugTooling: false, disablePresetEnv: false, disableEmberModulesAPIPolyfill: false, disableDecoratorTransforms: false, @@ -211,8 +211,6 @@ export default class V1App implements V1Package { !TemplateCompiler.isInlinePrecompilePlugin(p) ); }); - // install debug macros - plugins.push(this.debugMacrosPlugin()); const config: TransformOptions = { babelrc: false, @@ -243,31 +241,6 @@ export default class V1App implements V1Package { return 7; } - private debugMacrosPlugin() { - let DebugMacros = require.resolve('babel-plugin-debug-macros'); - let isProduction = process.env.EMBER_ENV === 'production'; - let isDebug = !isProduction; - let options = { - flags: [ - { - source: '@glimmer/env', - flags: { DEBUG: isDebug, CI: !!process.env.CI }, - }, - ], - - externalizeHelpers: { - global: 'Ember', - }, - - debugTools: { - isDebug, - source: '@ember/debug', - assertPredicateIndex: 1, - }, - }; - return [DebugMacros, options]; - } - @Memoize() private transformedNodeFiles(): Map { // any app.imports from node_modules that need custom transforms will need diff --git a/yarn.lock b/yarn.lock index 5bdf6741b..427669253 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2390,24 +2390,10 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-debug-macros@^0.1.10: - version "0.1.11" - resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605" - integrity sha512-hZw5qNNGAR02Y+yBUrtsnJHh8OXavkayPRqKGAXnIm4t5rWVpj3ArwsC7TWdpZsBguQvHAeyTxZ7s23yY60HHg== - dependencies: - semver "^5.3.0" - -babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6: - version "0.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a" - integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA== - dependencies: - semver "^5.3.0" - -babel-plugin-debug-macros@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.0.tgz#7a025944faef0777804ef3518c54e8b040197397" - integrity sha512-D6qYBI/3+FvcKVnRnH6FBUwXPp/5o/jnJNVFKqVaZpYAWx88+R8jNNyaEX7iQFs7UfCib6rcY/9+ICR4jhjFCQ== +babel-plugin-debug-macros@0.3.2, babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.2.0, babel-plugin-debug-macros@^0.2.0-beta.6, babel-plugin-debug-macros@^0.3.0: + version "0.3.2" + resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.2.tgz#b536a29386fac76f525bf1b73c4f74cd5281c5fa" + integrity sha512-CslqMZ3RGUvlEERuKr+wrXcHqQGvQ9ALLrbcOt8aSEp4ySfNCHAQbuGQYKZYw3P30/VGkPaR0Begch+dbqgEpg== dependencies: semver "^5.3.0" @@ -2425,13 +2411,6 @@ babel-plugin-ember-modules-api-polyfill@^2.8.0: dependencies: ember-rfc176-data "^0.3.8" -babel-plugin-ember-modules-api-polyfill@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.9.0.tgz#8503e7b4192aeb336b00265e6235258ff6b754aa" - integrity sha512-c03h50291phJ2gQxo/aIOvFQE2c6glql1A7uagE3XbPXpKVAJOUxtVDjvWG6UAB6BC5ynsJfMWvY0w4TPRKIHQ== - dependencies: - ember-rfc176-data "^0.3.9" - babel-plugin-feature-flags@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1" @@ -5804,11 +5783,6 @@ ember-rfc176-data@^0.3.8: resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.8.tgz#d46bbef9a0d57c803217b258cfd2e90d8e191848" integrity sha512-SQup3iG7SDLZNuf7nMMx5BC5truO8AYKRi80gApeQ07NsbuXV4LH75i5eOaxF0i8l9+H1tzv34kGe6rEh0C1NQ== -ember-rfc176-data@^0.3.9: - version "0.3.9" - resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.9.tgz#44b6e051ead6c044ea87bd551f402e2cf89a7e3d" - integrity sha512-EiTo5YQS0Duy0xp9gCP8ekzv9vxirNi7MnIB4zWs+thtWp/mEKgf5mkiiLU2+oo8C5DuavVHhoPQDmyxh8Io1Q== - ember-router-generator@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee"