From 0fa62d713da2734b101bf5a4fe5be6553a26462e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Wed, 9 Jan 2019 14:39:55 +0100
Subject: [PATCH 1/3] fix(glimmer-wrapper): move debug `normalize` in
 `.extend()` block

https://github.com/ember-cli/ember-resolver/pull/300#issuecomment-452696317
---
 .../addon/resolvers/glimmer-wrapper/index.js  | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/mu-trees/addon/resolvers/glimmer-wrapper/index.js b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
index 14dee728..5f0f6610 100644
--- a/mu-trees/addon/resolvers/glimmer-wrapper/index.js
+++ b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
@@ -82,7 +82,15 @@ const Resolver = GlobalsResolver.extend({
     this._glimmerResolver = new GlimmerResolver(this.config, this.glimmerModuleRegistry);
   },
 
-  normalize: null,
+  normalize: !DEBUG ? null : function(specifier) {
+    // This method is called by `Registry#validateInjections` in dev mode.
+    // https://github.com/ember-cli/ember-resolver/issues/299
+    const [type, name] = specifier.split(':', 2);
+    if (name && (type === 'service' || type === 'controller')) {
+      return `${type}:${dasherize(name)}`;
+    }
+    return specifier;
+  },
 
   expandLocalLookup(specifier, source, namespace) {
     if (isAbsoluteSpecifier(specifier)) {
@@ -140,16 +148,4 @@ const Resolver = GlobalsResolver.extend({
 
 });
 
-if (DEBUG) {
-  Resolver.prototype.normalize = function(specifier) {
-    // This method is called by `Registry#validateInjections` in dev mode.
-    // https://github.com/ember-cli/ember-resolver/issues/299
-    const [type, name] = specifier.split(':', 2);
-    if (name && (type === 'service' || type === 'controller')) {
-      return `${type}:${dasherize(name)}`;
-    }
-    return specifier;
-  }
-}
-
 export default Resolver;

From 834a56325e909de17335f523537c60edf6880f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Fri, 15 Feb 2019 17:33:02 +0100
Subject: [PATCH 2/3] refactor(glimmer-wrapper): hoist `normalize`

---
 .../addon/resolvers/glimmer-wrapper/index.js  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mu-trees/addon/resolvers/glimmer-wrapper/index.js b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
index 5f0f6610..920e3573 100644
--- a/mu-trees/addon/resolvers/glimmer-wrapper/index.js
+++ b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
@@ -64,6 +64,16 @@ function cleanupEmberSpecifier(specifier, source, _namespace) {
   return [specifier, source];
 }
 
+const normalize = !DEBUG ? null : function (specifier) {
+  // This method is called by `Registry#validateInjections` in dev mode.
+  // https://github.com/ember-cli/ember-resolver/issues/299
+  const [type, name] = specifier.split(':', 2);
+  if (name && (type === 'service' || type === 'controller')) {
+    return `${type}:${dasherize(name)}`;
+  }
+  return specifier;
+};
+
 /*
  * Wrap the @glimmer/resolver in Ember's resolver API. Although
  * this code extends from the DefaultResolver, it should never
@@ -82,15 +92,7 @@ const Resolver = GlobalsResolver.extend({
     this._glimmerResolver = new GlimmerResolver(this.config, this.glimmerModuleRegistry);
   },
 
-  normalize: !DEBUG ? null : function(specifier) {
-    // This method is called by `Registry#validateInjections` in dev mode.
-    // https://github.com/ember-cli/ember-resolver/issues/299
-    const [type, name] = specifier.split(':', 2);
-    if (name && (type === 'service' || type === 'controller')) {
-      return `${type}:${dasherize(name)}`;
-    }
-    return specifier;
-  },
+  normalize,
 
   expandLocalLookup(specifier, source, namespace) {
     if (isAbsoluteSpecifier(specifier)) {

From c607a8ace2a780542eebb36fb30d9549641a964d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Fri, 15 Feb 2019 17:33:58 +0100
Subject: [PATCH 3/3] style(glimmer-wrapper): remove extra space

---
 mu-trees/addon/resolvers/glimmer-wrapper/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mu-trees/addon/resolvers/glimmer-wrapper/index.js b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
index 920e3573..e2de565d 100644
--- a/mu-trees/addon/resolvers/glimmer-wrapper/index.js
+++ b/mu-trees/addon/resolvers/glimmer-wrapper/index.js
@@ -64,7 +64,7 @@ function cleanupEmberSpecifier(specifier, source, _namespace) {
   return [specifier, source];
 }
 
-const normalize = !DEBUG ? null : function (specifier) {
+const normalize = !DEBUG ? null : function(specifier) {
   // This method is called by `Registry#validateInjections` in dev mode.
   // https://github.com/ember-cli/ember-resolver/issues/299
   const [type, name] = specifier.split(':', 2);