Update ember-cli to version from PR #562 using canary.

abuiles · abuiles · commit bb9e6a4c5982 · 2014-05-02T01:51:14.000-03:00
diff --git a/client/Brocfile.js b/client/Brocfile.js
@@ -2,38 +2,57 @@
 
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
+EmberApp.prototype.populateLegacyFiles = function () {
+
+  this.import('jquery/jquery.js');
+  this.import('handlebars/handlebars.js');
+
+  if (this.env === 'production') {
+    this.import('ember-prod/index.js');
+  } else {
+    this.import('ember/index.js');
+  }
+
+  this.import('ember-cli-shims/app-shims.js', {
+    ember: ['default']
+  });
+
+  this.import('ember-resolver/dist/modules/ember-resolver.js', {
+    'ember/resolver': ['default']
+  });
+
+  this.import('ember-load-initializers/ember-load-initializers.js', {
+    'ember/load-initializers': ['default']
+  });
+};
+
+
 var app = new EmberApp({
   name: require('./package.json').name,
 
-  legacyFilesToAppend: [
-    'jquery.js',
-    'handlebars.js',
-    'ember.js',
-    'ic-ajax/dist/named-amd/main.js',
-    'ember-data.js',
-    'app-shims.js',
-    'ember-resolver.js',
-    'ember-load-initializers.js'
-  ],
-
-  // AKA whitelisted modules
-  ignoredModules: [
-    'ember',
-    'ember/resolver',
-    'ember/load-initializers',
-    'ic-ajax'
-  ],
-
-  // hack we can hopefully remove as the addon system improves
-  importWhitelist: {
-    'ember': ['default'],
-    'ember/resolver': ['default'],
-    'ember/load-initializers': ['default'],
-    'ic-ajax': ['request'],
-  },
+  // Use this to instruct the `broccoli-es6-concatenator` to allow
+  // references to the following modules (this would commonly include
+  // any modules exported from any AMD files added to `legacyFilesToAppend`)
+  ignoredModules: [ ],
+
+  // Use this to notify the import validator of any AMD modules
+  // that you add to your project.
+  importWhitelist: { },
 
   // hack
   getEnvJSON: require('./config/environment')
 });
 
+app.import('ember-data/ember-data.js');
+app.import('ic-ajax/dist/named-amd/main.js', {
+  'ic-ajax': [
+    'default',
+    'defineFixture',
+    'lookupFixture',
+    'raw',
+    'request',
+  ]
+});
+
+
 module.exports = app.toTree();
diff --git a/client/app/index.html b/client/app/index.html
@@ -12,9 +12,11 @@
     <link rel="stylesheet" href="assets/app.css">
   </head>
   <body>
-    <script src="assets/app.js"></script>
     <script>
       window.ENV = {{ENV}};
+    </script>
+    <script src="assets/app.js"></script>
+    <script>
       window.Client = require('client/app')['default'].create(ENV.APP);
     </script>
   </body>
diff --git a/client/bower.json b/client/bower.json
@@ -5,12 +5,16 @@
     "jquery": "~1.9.1",
     "qunit": "~1.12.0",
     "ember-qunit": "~0.1.5",
-    "ember": "1.5.1",
+    "ember": "http://builds.emberjs.com/canary/ember.js",
+    "ember-prod": "http://builds.emberjs.com/canary/ember.prod.js",
     "ember-data": "1.0.0-beta.7",
     "ember-resolver": "stefanpenner/ember-jj-abrams-resolver#master",
     "ic-ajax": "~1.x",
     "loader": "stefanpenner/loader.js#1.0.0",
     "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.1",
     "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.1"
+  },
+  "resolutions": {
+    "ember": "e-tag:ffc1155fb"
   }
 }
diff --git a/client/config/environment.js b/client/config/environment.js
@@ -2,8 +2,7 @@ module.exports = function(environment) {
   var ENV = {
     baseURL: '/',
     FEATURES: {
-      // Here you can enable experimental features on an ember canary build
-      // e.g. 'with-controller': true
+      "query-params-new" : true
     },
 
     APP: {
diff --git a/client/tests/.jshintrc b/client/tests/.jshintrc
@@ -39,7 +39,11 @@
     "DS",
     "keyEvent",
     "isolatedContainer",
-    "startApp"
+    "startApp",
+    "andThen",
+    "currentUrl",
+    "currentPath",
+    "currentRouteName"
   ],
   "node" : false,
   "browser" : false,
diff --git a/client/tests/index.html b/client/tests/index.html
@@ -32,11 +32,13 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
+    <script>
+      window.ENV = {{ENV}};
+    </script>
     <script src="assets/qunit.js"></script>
     <script src="assets/app.js"></script>
     <script src="testem.js"></script>
     <script>
-      window.ENV = {{ENV}};
       require('client/tests/test-helper');
       require('client/tests/test-loader');
     </script>
