From f5bdb86a658fbf7875250d1e315790d0783373cd Mon Sep 17 00:00:00 2001
From: Chad Hietala <chadhietala@gmail.com>
Date: Tue, 14 Mar 2017 15:07:44 -0400
Subject: [PATCH] Fix production builds

---
 ember-cli-build.js          | 8 ++------
 lib/packages.js             | 2 +-
 packages/ember/lib/index.js | 7 -------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 422101ed22b..85e51d42270 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -207,8 +207,8 @@ function babelConfigFor(environment) {
 
   plugins.push(applyFeatureFlags({
     imports: [
-      { module: 'ember-metal/features' },
-      { module: 'ember-metal', name: 'isFeatureEnabled' },
+      { module: 'ember-debug/features' },
+      { module: 'ember-debug', name: 'isFeatureEnabled' },
     ],
     features: features
   }));
@@ -216,10 +216,6 @@ function babelConfigFor(environment) {
   var isProduction = (environment === 'production');
   if (isProduction) {
     includeDevHelpers = false;
-    plugins.push(filterImports({
-      'ember-metal/debug': ['assert', 'debug', 'deprecate', 'info', 'runInDebug', 'warn', 'debugSeal', 'debugFreeze'],
-      'ember-metal': ['assert', 'debug', 'deprecate', 'info', 'runInDebug', 'warn', 'debugSeal', 'debugFreeze']
-    }));
   }
 
   return {
diff --git a/lib/packages.js b/lib/packages.js
index 4dd4d26be58..52c0d6ebd2c 100644
--- a/lib/packages.js
+++ b/lib/packages.js
@@ -5,7 +5,7 @@ module.exports = function(features) {
     'ember-utils':                { trees: null,  requirements: [] },
     'ember-console':              { trees: null,  requirements: [], skipTests: true },
     'ember-metal':                { trees: null,  requirements: ['ember-environment', 'ember-utils'], vendorRequirements: ['backburner'] },
-    'ember-debug':                { trees: null,  requirements: ['ember-metal'], testing: true },
+    'ember-debug':                { trees: null,  requirements: [] },
     'ember-runtime':              { trees: null,  vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal'] },
     'ember-views':                { trees: null,  requirements: ['ember-runtime'] },
     'ember-extension-support':    { trees: null,  requirements: ['ember-application'] },
diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js
index de79843c6da..4fd8000d56f 100644
--- a/packages/ember/lib/index.js
+++ b/packages/ember/lib/index.js
@@ -251,13 +251,6 @@ Object.defineProperty(Ember, 'testing', {
   enumerable: false
 });
 
-if (!has('ember-debug')) {
-  Ember.Debug = {
-    registerDeprecationHandler() {},
-    registerWarnHandler() {}
-  };
-}
-
 import Backburner from 'backburner';
 
 /**