Merge pull request #293 from teddyzeenny/upgrade-ember-cli

Upgrade to ember-cli 0.1.12
emberjs · Feb 2, 2015 · 2d39818 · 2d39818
2 parents 7189d26 + 4a82b1e
commit 2d39818
Show file tree

Hide file tree

Showing 60 changed files with 286 additions and 289 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -29,5 +29,5 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-[*.md]
+[*.{diff,md}]
 trim_trailing_whitespace = false
diff --git a/.jshintrc b/.jshintrc
@@ -4,8 +4,8 @@
     "window",
     "-Promise"
   ],
-  "browser" : true,
-  "boss" : true,
+  "browser": true,
+  "boss": true,
   "curly": true,
   "debug": false,
   "devel": true,

diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,11 @@ cache:
   directories:
     - node_modules
 
+before_install:
+  - "npm config set spin false"
+  - "npm install -g npm@^2"
+
+
 install:
   - npm install -g bower
   - npm install

diff --git a/Brocfile.js b/Brocfile.js
@@ -1,7 +1,7 @@
 /* global require, module */
 
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-var compileES6  = require('ember-cli/node_modules/broccoli-es6-concatenator');
+var compileES6  = require('broccoli-es6-concatenator');
 var mergeTrees  = require('broccoli-merge-trees');
 var wrapFiles = require('broccoli-wrap');
 var pickFiles = require('broccoli-static-compiler');

diff --git a/app/components/drag-handle.js b/app/components/drag-handle.js
@@ -2,7 +2,7 @@ import Ember from "ember";
 
 export default Ember.Component.extend({
   classNames: ['drag-handle'],
-  classNameBindings: ['isLeft:drag-handle--left', 'isRight:drag-handle--right'],
+  classNameBindings: ['isLeft:drag-handle--left', 'isRight:drag-handle--right', 'class'],
   attributeBindings: ['style'],
   position: 0,
   side: '',

diff --git a/app/components/draggable-column.js b/app/components/draggable-column.js
@@ -10,6 +10,9 @@ export default Component.extend({
   side: 'left',
   minWidth: 60,
   setIsDragging: 'setIsDragging',
+  classes: function() {
+    return this.get('classNames').join(' ');
+  }.property('classNames.[]'),
   actions: {
     setIsDragging: function(isDragging) {
       this.sendAction('setIsDragging', isDragging);

diff --git a/app/index.html b/app/index.html
@@ -11,11 +11,15 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/ember-inspector.css">
+
+    {{content-for 'head-footer'}}
   </head>
   <body>
     {{content-for 'body'}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/ember-inspector.js"></script>
+
+    {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/app/router.js b/app/router.js
@@ -6,7 +6,7 @@ var Router = Ember.Router.extend({
 });
 
 Router.map(function() {
-  this.resource('application-detected', { path: '/' }, function() {
+  this.resource('app-detected', { path: '/' }, function() {
     this.resource('view-tree', { path: '/' });
     this.resource('route-tree');
 

diff --git a/app/routes/application-detected.js → app/routes/app-detected.js b/app/routes/application-detected.js → app/routes/app-detected.js
diff --git a/app/templates/application.handlebars → app/templates/application.hbs b/app/templates/application.handlebars → app/templates/application.hbs
diff --git a/...plates/components/clear-button.handlebars → app/templates/components/clear-button.hbs b/...plates/components/clear-button.handlebars → app/templates/components/clear-button.hbs
diff --git a/...mplates/components/drag-handle.handlebars → app/templates/components/drag-handle.hbs b/...mplates/components/drag-handle.handlebars → app/templates/components/drag-handle.hbs
diff --git a/...es/components/draggable-column.handlebars → ...templates/components/draggable-column.hbs b/...es/components/draggable-column.handlebars → ...templates/components/draggable-column.hbs
@@ -1,4 +1,4 @@
-{{#resizable-column width=width classNames=classNames}}
+{{#resizable-column width=width class=classes}}
   {{yield}}
 {{/resizable-column}}
 

diff --git a/...s/components/expandable-render.handlebars → ...emplates/components/expandable-render.hbs b/...s/components/expandable-render.handlebars → ...emplates/components/expandable-render.hbs
diff --git a/...plates/components/not-detected.handlebars → app/templates/components/not-detected.hbs b/...plates/components/not-detected.handlebars → app/templates/components/not-detected.hbs
diff --git a/...ates/components/property-field.handlebars → app/templates/components/property-field.hbs b/...ates/components/property-field.handlebars → app/templates/components/property-field.hbs
diff --git a/...lates/components/reload-button.handlebars → app/templates/components/reload-button.hbs b/...lates/components/reload-button.handlebars → app/templates/components/reload-button.hbs
@@ -1,7 +1,7 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-   width="14px" height="14px" viewBox="0 0 54.203 55.142" enable-background="new 0 0 54.203 55.142" xml:space="preserve">
-<path fill="#797979" d="M54.203,21.472l-0.101-1.042h0.101c-0.042-0.159-0.101-0.311-0.146-0.468l-1.82-18.786l-6.056,6.055
-  C41.277,2.741,34.745,0,27.571,0C12.344,0,0,12.344,0,27.571s12.344,27.571,27.571,27.571c12.757,0,23.485-8.666,26.632-20.431
-  h-8.512c-2.851,7.228-9.881,12.349-18.12,12.349c-10.764,0-19.49-8.726-19.49-19.489s8.727-19.489,19.49-19.489
-  c4.942,0,9.441,1.853,12.873,4.887l-6.536,6.536L54.203,21.472z"/>
-</svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+   width="14px" height="14px" viewBox="0 0 54.203 55.142" enable-background="new 0 0 54.203 55.142" xml:space="preserve">
+<path fill="#797979" d="M54.203,21.472l-0.101-1.042h0.101c-0.042-0.159-0.101-0.311-0.146-0.468l-1.82-18.786l-6.056,6.055
+  C41.277,2.741,34.745,0,27.571,0C12.344,0,0,12.344,0,27.571s12.344,27.571,27.571,27.571c12.757,0,23.485-8.666,26.632-20.431
+  h-8.512c-2.851,7.228-9.881,12.349-18.12,12.349c-10.764,0-19.49-8.726-19.49-19.489s8.727-19.489,19.49-19.489
+  c4.942,0,9.441,1.853,12.873,4.887l-6.536,6.536L54.203,21.472z"/>
+</svg>
diff --git a/...tes/components/send-to-console.handlebars → app/templates/components/send-to-console.hbs b/...tes/components/send-to-console.handlebars → app/templates/components/send-to-console.hbs
diff --git a/...ates/components/sidebar-toggle.handlebars → app/templates/components/sidebar-toggle.hbs b/...ates/components/sidebar-toggle.handlebars → app/templates/components/sidebar-toggle.hbs
diff --git a/...mplates/container-type-toolbar.handlebars → app/templates/container-type-toolbar.hbs b/...mplates/container-type-toolbar.handlebars → app/templates/container-type-toolbar.hbs
diff --git a/app/templates/container-type.handlebars → app/templates/container-type.hbs b/app/templates/container-type.handlebars → app/templates/container-type.hbs
diff --git a/app/templates/container-types.handlebars → app/templates/container-types.hbs b/app/templates/container-types.handlebars → app/templates/container-types.hbs
diff --git a/.../container-types/index-toolbar.handlebars → ...mplates/container-types/index-toolbar.hbs b/.../container-types/index-toolbar.handlebars → ...mplates/container-types/index-toolbar.hbs
diff --git a/app/templates/data.handlebars → app/templates/data.hbs b/app/templates/data.handlebars → app/templates/data.hbs
diff --git a/app/templates/data/index.handlebars → app/templates/data/index.hbs b/app/templates/data/index.handlebars → app/templates/data/index.hbs
diff --git a/app/templates/iframes.handlebars b/app/templates/iframes.handlebars
diff --git a/app/templates/iframes.hbs b/app/templates/iframes.hbs
@@ -0,0 +1,4 @@
+<div class="dropdown">
+  {{view 'select' content=model value=selectedApp optionValuePath="content.val" optionLabelPath="content.name" class="dropdown__select"}}
+  <div class="dropdown__arrow"></div>
+</div>
diff --git a/app/templates/info.handlebars → app/templates/info.hbs b/app/templates/info.handlebars → app/templates/info.hbs
diff --git a/app/templates/instance-item.handlebars → app/templates/instance-item.hbs b/app/templates/instance-item.handlebars → app/templates/instance-item.hbs
diff --git a/app/templates/loading.handlebars → app/templates/loading.hbs b/app/templates/loading.handlebars → app/templates/loading.hbs
diff --git a/app/templates/main.handlebars → app/templates/main.hbs b/app/templates/main.handlebars → app/templates/main.hbs
diff --git a/app/templates/mixin-details.handlebars → app/templates/mixin-details.hbs b/app/templates/mixin-details.handlebars → app/templates/mixin-details.hbs
diff --git a/app/templates/mixin-stack.handlebars → app/templates/mixin-stack.hbs b/app/templates/mixin-stack.handlebars → app/templates/mixin-stack.hbs
diff --git a/app/templates/model-types.handlebars → app/templates/model-types.hbs b/app/templates/model-types.handlebars → app/templates/model-types.hbs
diff --git a/app/templates/nav.handlebars → app/templates/nav.hbs b/app/templates/nav.handlebars → app/templates/nav.hbs
diff --git a/app/templates/promise-item.handlebars → app/templates/promise-item.hbs b/app/templates/promise-item.handlebars → app/templates/promise-item.hbs
diff --git a/...templates/promise-tree-toolbar.handlebars → app/templates/promise-tree-toolbar.hbs b/...templates/promise-tree-toolbar.handlebars → app/templates/promise-tree-toolbar.hbs
diff --git a/app/templates/promise-tree.handlebars → app/templates/promise-tree.hbs b/app/templates/promise-tree.handlebars → app/templates/promise-tree.hbs
diff --git a/app/templates/promises/error.handlebars → app/templates/promises/error.hbs b/app/templates/promises/error.handlebars → app/templates/promises/error.hbs
diff --git a/app/templates/record-item.handlebars → app/templates/record-item.hbs b/app/templates/record-item.handlebars → app/templates/record-item.hbs
diff --git a/app/templates/records-toolbar.handlebars → app/templates/records-toolbar.hbs b/app/templates/records-toolbar.handlebars → app/templates/records-toolbar.hbs
diff --git a/app/templates/records.handlebars → app/templates/records.hbs b/app/templates/records.handlebars → app/templates/records.hbs
diff --git a/app/templates/render-item.handlebars → app/templates/render-item.hbs b/app/templates/render-item.handlebars → app/templates/render-item.hbs
diff --git a/app/templates/render-tree-toolbar.handlebars → app/templates/render-tree-toolbar.hbs b/app/templates/render-tree-toolbar.handlebars → app/templates/render-tree-toolbar.hbs
diff --git a/app/templates/render-tree.handlebars → app/templates/render-tree.hbs b/app/templates/render-tree.handlebars → app/templates/render-tree.hbs
diff --git a/app/templates/route-item.handlebars → app/templates/route-item.hbs b/app/templates/route-item.handlebars → app/templates/route-item.hbs
diff --git a/app/templates/route-tree-toolbar.handlebars → app/templates/route-tree-toolbar.hbs b/app/templates/route-tree-toolbar.handlebars → app/templates/route-tree-toolbar.hbs
diff --git a/app/templates/route-tree.handlebars → app/templates/route-tree.hbs b/app/templates/route-tree.handlebars → app/templates/route-tree.hbs
diff --git a/app/templates/view-item.handlebars → app/templates/view-item.hbs b/app/templates/view-item.handlebars → app/templates/view-item.hbs
diff --git a/app/templates/view-tree-toolbar.handlebars → app/templates/view-tree-toolbar.hbs b/app/templates/view-tree-toolbar.handlebars → app/templates/view-tree-toolbar.hbs
diff --git a/app/templates/view-tree.handlebars → app/templates/view-tree.hbs b/app/templates/view-tree.handlebars → app/templates/view-tree.hbs
diff --git a/bower.json b/bower.json
@@ -3,15 +3,14 @@
   "dependencies": {
     "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.7.0",
-    "ember-data": "1.0.0-beta.10",
-    "ember-resolver": "~0.1.7",
-    "loader.js": "stefanpenner/loader.js#1.0.1",
-    "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
-    "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
+    "ember": "1.8.1",
+    "ember-resolver": "~0.1.11",
+    "loader.js": "ember-cli/loader.js#1.0.1",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-test-loader": "ember-cli/ember-cli-test-loader#0.1.0",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
     "ember-qunit": "0.1.8",
-    "ember-qunit-notifications": "0.0.4",
+    "ember-qunit-notifications": "0.0.5",
     "qunit": "~1.15.0",
     "pikaday": "~1.2.0",
     "moment": "~2.8.4"

diff --git a/config/environment.js b/config/environment.js
@@ -26,16 +26,16 @@ module.exports = function(environment) {
 
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
-    //ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
-    //ENV.APP.LOG_VIEW_LOOKUPS = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
   }
 
   if (environment === 'test') {
     // Testem prefers this...
     ENV.baseURL = '/';
-    ENV.locationType = 'auto';
+    ENV.locationType = 'none';
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;

diff --git a/package.json b/package.json
@@ -37,21 +37,25 @@
   },
   "devDependencies": {
     "body-parser": "^1.2.0",
-    "broccoli-asset-rev": "0.3.1",
+    "broccoli-asset-rev": "^2.0.0",
     "broccoli-concat": "0.0.12",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
+    "broccoli-es6-concatenator": "^0.1.11",
     "broccoli-file-remover": "^0.3.1",
     "broccoli-jshint": "^0.5.3",
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-sass": "0.2.4",
     "broccoli-static-compiler": "^0.2.1",
     "broccoli-wrap": "0.0.2",
-    "ember-cli": "0.1.4",
+    "ember-cli": "0.1.12",
+    "ember-cli-6to5": "^3.0.0",
+    "ember-cli-app-version": "0.3.1",
     "ember-cli-content-security-policy": "0.3.0",
+    "ember-cli-dependency-checker": "0.0.7",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.1.0",
-    "ember-data": "1.0.0-beta.10",
+    "ember-cli-qunit": "0.3.1",
+    "ember-cli-uglify": "1.0.1",
     "ember-export-application-global": "^1.0.0",
     "ember-pikaday": "^0.2.1",
     "express": "^4.8.5",

diff --git a/testem.json b/testem.json
@@ -1,6 +1,6 @@
 {
   "framework": "qunit",
-  "test_page": "tests/index.html",
+  "test_page": "tests/index.html?hidepassed",
   "launch_in_ci": [
     "PhantomJS"
   ],

diff --git a/tests/ember_debug/view_debug_test.js b/tests/ember_debug/view_debug_test.js
@@ -75,7 +75,7 @@ function setupApp(){
   });
 
   setTemplate('application', '{{outlet}}');
-  setTemplate('simple', 'Simple {{input class="simple-input"}} {{view Ember.View classNames="simple-view"}}');
+  setTemplate('simple', 'Simple {{input class="simple-input"}} {{view "select" classNames="simple-view"}}');
   setTemplate('comments/index', '{{#each}}{{this}}{{/each}}');
   setTemplate('posts', 'Posts');
 }
@@ -283,7 +283,7 @@ test("Highlighting Views on hover", function() {
   })
   .then(function() {
     var previewDiv = findByLabel('preview-div');
-    equal(findByLabel('layer-view', previewDiv).text(), 'Ember.View', "Views without controllers can be configured to be highlighted.");
+    equal(findByLabel('layer-view', previewDiv).text(), 'Ember.Select', "Views without controllers can be configured to be highlighted.");
     port.trigger('view:inspectViews', { inspect: false });
     return wait();
   })

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -2,16 +2,21 @@ import Ember from 'ember';
 import Application from '../../app';
 import Router from '../../router';
 import config from '../../config/environment';
-var guidFor = Ember.guidFor;
+let { generateGuid } = Ember;
 
 export default function startApp(attrs) {
   var App;
 
   var attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Router.reopen({
-    location: 'none'
+  Application.initializer({
+    name: generateGuid() + "-detectEmberApplication",
+    initialize: function(container, application) {
+      container.lookup('route:app-detected').reopen({
+        model: Ember.K,
+      });
+    }
   });
 
   Ember.run(function() {
@@ -20,16 +25,6 @@ export default function startApp(attrs) {
     App.injectTestHelpers();
   });
 
-  App.initializer({
-    name: guidFor(App) + "-detectEmberApplication",
-    initialize: function(container, application) {
-      container.lookup('route:application-detected').reopen({
-        model: Ember.K,
-      });
-    }
-  });
-
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
 
   return App;
 }

diff --git a/tests/index.html b/tests/index.html
@@ -13,26 +13,11 @@
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/ember-inspector.css">
     <link rel="stylesheet" href="assets/test-support.css">
-    <style>
-      #ember-testing-container {
-        position: absolute;
-        background: white;
-        bottom: 0;
-        right: 0;
-        width: 640px;
-        height: 384px;
-        overflow: auto;
-        z-index: 9999;
-        border: 1px solid #ccc;
-      }
-      #ember-testing {
-        zoom: 50%;
-      }
-    </style>
+
+    {{content-for 'head-footer'}}
+    {{content-for 'test-head-footer'}}
   </head>
   <body>
-    <div id="qunit"></div>
-    <div id="qunit-fixture"></div>
 
     {{content-for 'body'}}
     {{content-for 'test-body'}}
@@ -42,5 +27,8 @@
     <script src="ember_debug.js"></script>
     <script src="testem.js"></script>
     <script src="assets/test-loader.js"></script>
+
+    {{content-for 'body-footer'}}
+    {{content-for 'test-body-footer'}}
   </body>
 </html>
diff --git a/tests/test-helper.js b/tests/test-helper.js
@@ -5,12 +5,6 @@ import {
 
 setResolver(resolver);
 
-document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
-
-QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});
-var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
-document.getElementById('ember-testing-container').style.visibility = containerVisibility;
-
 window.NO_EMBER_DEBUG = true;