Merge pull request #544 from Gaurav0/ember_cli_2_11

Upgrade to Ember CLI 2.11

Author: Gaurav0

app/components/dummy-app.js

@@ -22,6 +22,11 @@ export default Ember.Component.extend(ResizeMixin, {
       this.element.removeChild(this.element.firstElementChild);
     }
 
+    let oldIframe = document.getElementById(this.iframeId);
+    if (oldIframe) {
+      oldIframe.parentNode.removeChild(oldIframe);
+    }
+
     let ifrm = document.createElement('iframe');
     ifrm.id = this.iframeId;
     let supportsSrcDoc = ('srcdoc' in ifrm);
@@ -60,5 +65,14 @@ export default Ember.Component.extend(ResizeMixin, {
       width:  width,
       height: height
     });
-  })
+  }),
+
+  willDestroyElement() {
+    this._super(...arguments);
+
+    let oldIframe = document.getElementById(this.iframeId);
+    if (oldIframe) {
+      oldIframe.parentNode.removeChild(oldIframe);
+    }
+  }
 });

app/components/file-editor-column.js

@@ -43,19 +43,19 @@ export default Ember.Component.extend({
 
     valueUpdated(value, __, changeObj) {
       const isUserChange = changeObj.origin !== 'setValue';
-      this.attrs.contentChanged(isUserChange, value);
+      this.get('contentChanged')(isUserChange, value);
     },
 
     removeColumn(col) {
-      this.attrs.removeColumn(col);
+      this.get('removeColumn')(col);
     },
 
     addColumn() {
-      this.attrs.addColumn();
+      this.get('addColumn')();
     },
 
     showFileTree() {
-      this.attrs.showFileTree();
+      this.get('showFileTree')();
     }
   }
 });

app/components/run-or-live-reload.js

@@ -11,11 +11,11 @@ export default Ember.Component.extend({
 
   actions: {
     runNowClicked() {
-      this.attrs.runNow();
+      this.get('runNow')();
     },
 
     liveReloadClicked(checked) {
-      this.attrs.liveReloadChanged(checked);
+      this.get('liveReloadChanged')(checked);
     }
   }
 });

app/mixins/app-builder.js

@@ -26,7 +26,8 @@ export default Ember.Mixin.create({
         console.error(errors);
       }
     }
-  }),
+    yield timeout(100);
+  }).enqueue(),
 
   rebuildApp: task(function *() {
     if (this.get('isLiveReload')) {

app/services/ember-cli.js

@@ -265,8 +265,10 @@ export default Ember.Service.extend({
     // avoids security error
     appJS += "window.history.pushState = function() {}; window.history.replaceState = function() {}; window.sessionStorage = undefined;";
 
-    // qunit
-    appJS += "window.QUnit = window.parent.QUnit;";
+    // Use parent's version of QUnit in Ember.testing mode
+    if (testing) {
+      appJS += "window.QUnit = window.parent.QUnit;";
+    }
 
     // Hide toolbar since it is not working
     appCSS += `\n#qunit-testrunner-toolbar, #qunit-tests a[href] { display: none; }\n`;

app/templates/components/file-editor-column.hbs

@@ -52,6 +52,6 @@
       fixedGutter=true
       lineWrapping=true
       tabSize=2)
-    valueUpdated="valueUpdated"
+    valueUpdated=(action "valueUpdated")
 }}
 {{/if}}

blueprints/twiddle.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.12.1",
+  "version": "0.12.2",
   "EmberENV": {
     "FEATURES": {}
   },

bower.json

@@ -1,9 +1,7 @@
 {
   "name": "ember-twiddle",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "dependencies": {
-    "ember": "~2.10.2",
-    "ember-cli-shims": "0.1.3",
     "jquery": "1.11.3",
     "codemirror": "~5.19.0",
     "bootstrap-sass": "~3.3.5",
@@ -17,7 +15,6 @@
   },
   "resolutions": {
     "codemirror": "~5.19.0",
-    "ember": "~2.10.2",
     "FakeXMLHttpRequest": "^1.3.0",
     "route-recognizer": "^0.2.3"
   }

ember-cli-build.js

@@ -63,7 +63,7 @@ module.exports = function(defaults) {
         }
       }
     },
-    babel: {
+    'ember-cli-babel': {
       includePolyfill: !isFastboot
     },
 
@@ -87,7 +87,7 @@ module.exports = function(defaults) {
     app.import('vendor/polyfill.js', { prepend: true });
   }
 
-  app.import('bower_components/ember/ember-template-compiler.js');
+  app.import('vendor/ember/ember-template-compiler.js');
   app.import('bower_components/babel/browser.js');
   app.import('vendor/shims/babel.js');
   app.import('vendor/shims/path.js');
@@ -123,6 +123,9 @@ module.exports = function(defaults) {
   });
 
   var bowerTree = funnel('bower_components');
+  var shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , {
+    destDir: 'ember-cli-shims'
+  });
 
   var baseResolverTree = funnel('node_modules/ember-resolver/addon', {
     destDir: 'ember-resolver'
@@ -147,7 +150,7 @@ module.exports = function(defaults) {
   var finalQUnitTree = buildAddonTree('ember-qunit');
   var finalTestHelpersTree = buildAddonTree('ember-test-helpers');
 
-  var mergedDepsTree = mergeTrees([bowerTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]);
+  var mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]);
 
   var twiddleVendorTree = concat(mergedDepsTree, {
     inputFiles: [

mirage/fixtures/ember-data.js

@@ -1,8 +1,8 @@
 export default {
   "status": "build_success",
   "status_date": "2016-03-21T01:55:42.140Z",
-  "addon_js": "//canary-addons.ember-twiddle.com/ember-2.11.0/ember-data/2.11.3/addon.js",
-  "addon_css": "//canary-addons.ember-twiddle.com/ember-2.11.0/ember-data/2.11.3/addon.css",
+  "addon_js": "//canary-addons.ember-twiddle.com/ember-2.12.0/ember-data/2.12.1/addon.js",
+  "addon_css": "//canary-addons.ember-twiddle.com/ember-2.12.0/ember-data/2.12.1/addon.css",
   "errors": null,
   "ember_errors": null
 };