Always resolve Ember relative to the project root

Author: dfreeman

index.js

@@ -2,6 +2,7 @@
 'use strict';
 
 const path = require('path');
+const resolve = require('resolve');
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
 const EmberApp = require('ember-cli/lib/broccoli/ember-app');
@@ -136,7 +137,7 @@ module.exports = {
 
   _templateCompilerTree() {
     if (this._hasEmberSource()) {
-      return new Funnel(path.dirname(require.resolve('ember-source/package.json')), {
+      return new Funnel(path.dirname(resolve.sync('ember-source/package.json'), { basedir: this.project.root }), {
         srcDir: 'dist',
         destDir: 'ember'
       });

package.json

@@ -46,6 +46,7 @@
     "marked": "^0.3.6",
     "minimatch": "^3.0.4",
     "quick-temp": "^0.1.8",
+    "resolve": "^1.5.0",
     "striptags": "^3.1.0",
     "yuidoc-to-jsonapi": "^0.4.1",
     "yuidocjs": "^0.10.2"

yarn.lock

@@ -6157,7 +6157,7 @@ resolve@^1.1.2, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3:
   dependencies:
     path-parse "^1.0.5"
 
-resolve@^1.4.0:
+resolve@^1.4.0, resolve@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
   dependencies: