Merge pull request #4777 from rwjblue/use-resolver-from-addon

Use addon version of ember-resolver.
ember-cli · Aug 31, 2015 · 2e2b7f1 · 2e2b7f1
2 parents ea93de4 + 24af516
commit 2e2b7f1
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 16 deletions.
diff --git a/blueprints/app/files/app/app.js b/blueprints/app/files/app/app.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 

diff --git a/blueprints/app/files/bower.json b/blueprints/app/files/bower.json
@@ -8,7 +8,6 @@
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
     "ember-qunit": "0.4.10",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.20",
     "jquery": "^1.11.3",
     "loader.js": "ember-cli/loader.js#3.2.1",
     "qunit": "~1.18.0"

diff --git a/blueprints/app/files/package.json b/blueprints/app/files/package.json
@@ -35,6 +35,7 @@
     "ember-cli-uglify": "^1.2.0",
     "ember-data": "2.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.4"
+    "ember-export-application-global": "^1.0.4",
+    "ember-resolver": "^2.0.2"
   }
 }
diff --git a/blueprints/app/files/tests/helpers/resolver.js b/blueprints/app/files/tests/helpers/resolver.js
@@ -1,4 +1,4 @@
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import config from '../../config/environment';
 
 var resolver = Resolver.create();

diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
@@ -268,6 +268,13 @@ EmberApp.prototype._initVendorFiles = function() {
     return value === null;
   });
 
+  if (!!this.registry.availablePlugins['ember-resolver']) {
+    // if the project is using `ember-resolver` as an addon
+    // remove it from `vendorFiles` (the NPM version properly works
+    // without `app.import`s)
+    delete this.vendorFiles['ember-resolver.js'];
+  }
+
   // this is needed to support versions of Ember older than
   // 1.8.0 (when ember-testing.js was added to the deployment)
   if (!existsSync(this.vendorFiles['ember-testing.js'][0])) {

diff --git a/tests/fixtures/addon/simple/bower.json b/tests/fixtures/addon/simple/bower.json
@@ -4,7 +4,6 @@
     "jquery": "^1.11.1",
     "ember": "1.7.0",
     "ember-data": "1.0.0-beta.10",
-    "ember-resolver": "~0.1.7",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",

diff --git a/tests/fixtures/addon/simple/package.json b/tests/fixtures/addon/simple/package.json
@@ -7,7 +7,8 @@
   "ember-addon": {
     "paths": ["./lib/ember-super-button"]
   },
-  "devDependencies": {
+    "devDependencies": {
+    "ember-resolver": "^2.0.2",
     "ember-cli": "latest",
     "ember-random-addon": "latest",
     "ember-non-root-addon": "latest",
@@ -19,4 +20,3 @@
     "ember-addon-with-dependencies": "latest"
   }
 }
-
diff --git a/tests/fixtures/brocfile-tests/pods-with-prefix-templates/app/app.js b/tests/fixtures/brocfile-tests/pods-with-prefix-templates/app/app.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember/load-initializers';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
@@ -13,4 +13,3 @@ var App = Ember.Application.extend({
 loadInitializers(App, 'some-cool-app');
 
 export default App;
-
diff --git a/tests/fixtures/brocfile-tests/query/app/app.js b/tests/fixtures/brocfile-tests/query/app/app.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
+import Resolver from 'ember-resolver';
 import loadInitializers from 'ember/load-initializers';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
@@ -13,4 +13,3 @@ var App = Ember.Application.extend({
 loadInitializers(App, 'query');
 
 export default App;
-
diff --git a/tests/fixtures/brocfile-tests/query/package.json b/tests/fixtures/brocfile-tests/query/package.json
@@ -2,6 +2,7 @@
   "name": "query",
   "dependencies": {
     "ember-cli": "*",
-    "ember-cli-htmlbars": "0.7.9"
+      "ember-cli-htmlbars": "0.7.9",
+      "ember-resolver": "^2.0.2"
   }
 }
diff --git a/tests/fixtures/project-with-handlebars/bower.json b/tests/fixtures/project-with-handlebars/bower.json
@@ -5,7 +5,6 @@
     "jquery": "^1.11.1",
     "ember": "1.7.0",
     "ember-data": "1.0.0-beta.10",
-    "ember-resolver": "~0.1.7",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",

diff --git a/tests/fixtures/project-with-handlebars/package.json b/tests/fixtures/project-with-handlebars/package.json
@@ -6,7 +6,7 @@
   "ember-addon": {
   },
   "devDependencies": {
-    "ember-cli": "latest"
+    "ember-cli": "latest",
+    "ember-resolver": "^2.0.2"
   }
 }
-
diff --git a/tests/unit/models/project-test.js b/tests/unit/models/project-test.js
@@ -157,6 +157,7 @@ describe('models/project.js', function() {
       var expected = {
         'ember-cli': 'latest',
         'ember-random-addon': 'latest',
+        'ember-resolver': '^2.0.2',
         'ember-non-root-addon': 'latest',
         'ember-generated-with-export-addon': 'latest',
         'non-ember-thingy': 'latest',
@@ -175,7 +176,6 @@ describe('models/project.js', function() {
         'jquery': '^1.11.1',
         'ember': '1.7.0',
         'ember-data': '1.0.0-beta.10',
-        'ember-resolver': '~0.1.7',
         'loader.js': 'ember-cli/loader.js#1.0.1',
         'ember-cli-shims': 'ember-cli/ember-cli-shims#0.0.3',
         'ember-cli-test-loader': 'rwjblue/ember-cli-test-loader#0.0.4',