Merge pull request #99 from salsify/fare-thee-well-resolver-monkeypat…

…ching

Fare thee well, resolver monkeypatching

.travis.yml

@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: true
 dist: trusty

addon/extensions.js

@@ -1,14 +1,4 @@
-import Controller from '@ember/controller';
 import Component from '@ember/component';
-import Ember from 'ember';
-import Resolver from 'ember-resolver';
-
 import ComponentMixin from './mixins/component-mixin';
-import ControllerMixin from './mixins/controller-mixin';
-import ComponentLookupMixin from './mixins/component-lookup-mixin';
-import ResolverMixin from './mixins/resolver-mixin';
 
 Component.reopen(ComponentMixin);
-Controller.reopen(ControllerMixin);
-Ember.ComponentLookup.reopen(ComponentLookupMixin);
-Resolver.reopen(ResolverMixin);

addon/mixins/component-mixin.js

@@ -1,7 +1,10 @@
+/* global require */
+
 import { computed, defineProperty } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { dasherize } from '@ember/string';
 import { getOwner } from '@ember/application';
+import { assert } from '@ember/debug';
 
 export default Mixin.create({
   localClassNames: null,
@@ -27,18 +30,29 @@ export default Mixin.create({
   },
 
   __styles__: computed(function() {
-    // If styles is an explicitly set hash, defer to it. Otherwise, use the resolver.
-    if (this.styles && Object.getPrototypeOf(this.styles) === Object.prototype) {
-      return this.styles;
-    }
-
     let key = this._debugContainerKey;
     if (!key) { return; }
 
-    return getOwner(this).resolveRegistration(`styles:components/${key.substring(key.indexOf(':') + 1)}`);
+    let name = key.replace(/^component:/, '');
+    let layout = this.layout || getOwner(this).lookup(`template:components/${name}`);
+    assert('Unable to resolve localClassNames or localClassNameBindings for a component with no layout', layout);
+
+    // This is not public API and might break at any time...
+    let moduleName = (layout.meta || layout.referrer).moduleName.replace(/\.hbs$/, '');
+    if (/\/template$/.test(moduleName)) {
+      return tryLoad(moduleName.replace(/template$/, 'styles'));
+    } else if (/\/templates\//.test(moduleName)) {
+      return tryLoad(moduleName.replace('/templates/', '/styles/'));
+    }
   })
 });
 
+function tryLoad(path) {
+  if (require.has(path)) {
+    return require(path).default;
+  }
+}
+
 const LOCAL_CLASS_NAMES_CP = '__ecm_local_class_names__';
 
 function localClassNames(component) {

appveyor.yml

@@ -1,5 +1,5 @@
 install:
-  - ps: Install-Product node 4
+  - ps: Install-Product node 6
   - yarn
 
 cache:

ember-cli-build.js

@@ -1,10 +1,6 @@
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-const Funnel = require('broccoli-funnel');
-const path = require('path');
-
-const HAS_EMBER_SOURCE = 'ember-source' in require('./package.json').devDependencies;
 
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
@@ -37,19 +33,5 @@ module.exports = function(defaults) {
     }
   });
 
-  if (app.env === 'test') {
-    app.import(`${HAS_EMBER_SOURCE ? 'vendor' : 'bower_components'}/ember/ember-template-compiler.js`);
-  }
-
-  let additionalTrees = [];
-
-  if (HAS_EMBER_SOURCE) {
-    additionalTrees.push(new Funnel(path.dirname(require.resolve('ember-source')), {
-      srcDir: 'dist',
-      destDir: 'vendor/ember',
-      include: ['ember-template-compiler.js']
-    }));
-  }
-
-  return app.toTree(additionalTrees);
+  return app.toTree();
 };