Merge pull request #23 from kiwiupover/updated-to-ember2.4

Updated to ember-2.4 and beyond

.jscsrc

@@ -0,0 +1,3 @@
+{
+  "preset": "ember-suave"
+}

.npmignore

@@ -1,15 +1,16 @@
-bower_components/
-tests/
-tmp/
-dist/
-
+/bower_components
+/config/ember-try.js
+/dist
+/tests
+/tmp
+**/.gitkeep
 .bowerrc
 .editorconfig
 .ember-cli
+.gitignore
+.jshintrc
+.watchmanconfig
 .travis.yml
-.npmignore
-**/.gitkeep
 bower.json
 ember-cli-build.js
-Brocfile.js
-testem.json
+testem.js

.travis.yml

@@ -1,26 +1,14 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 
 sudo: false
 
 cache:
   directories:
     - node_modules
 
-env:
-  # - EMBER_TRY_SCENARIO=ember-1.6
-  # - EMBER_TRY_SCENARIO=ember-1.7
-  # - EMBER_TRY_SCENARIO=ember-1.8
-  #- EMBER_TRY_SCENARIO=ember-1.10
-  - EMBER_TRY_SCENARIO=ember-1.11
-  - EMBER_TRY_SCENARIO=ember-1.12
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-release
-  - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-beta
-  - ALLOW_DEPRECATIONS=true EMBER_TRY_SCENARIO=ember-canary
-
 matrix:
   fast_finish: true
   allow_failures:
@@ -36,13 +24,12 @@ before_install:
   - "npm install -g npm@^2"
 
 install:
-  - node lib/setup-packagejson.js
   - npm install -g bower
   - npm install
   - bower install
 
 script:
-  - npm run tryver $EMBER_TRY_SCENARIO --skip-cleanup
+  - npm test
 
 after_success:
 # Remove the downloaded copy of phantomJS

README.md

@@ -7,17 +7,15 @@
 
 Package | Ember Versions | Version | Status
 --------|----------------|---------|--------
-`ember-perf` | `1.10`, `1.11`, `1.12`, `1.13` | [![npm version](https://badge.fury.io/js/ember-perf.svg)](http://badge.fury.io/js/ember-perf) | [![Build Status](https://travis-ci.org/mike-north/ember-perf.svg?branch=master)](https://travis-ci.org/mike-north/ember-perf)
-`ember-perf-handlebars` | `1.5`, `1.6`, `1.7`, `1.8`, `1.9` |  [![npm version](https://badge.fury.io/js/ember-perf-handlebars.svg)](http://badge.fury.io/js/ember-perf-handlebars) | [![Build Status](https://travis-ci.org/mike-north/ember-perf.svg?branch=handlebars)](https://travis-ci.org/mike-north/ember-perf)
+`ember-perf` | `1.11`, `1.12`, `1.13`, `2.0`, `2.1`, `2.2`, ~~`2.3*`~~, `2.4`, `2.5` | [![npm version](https://badge.fury.io/js/ember-perf.svg)](http://badge.fury.io/js/ember-perf) | [![Build Status](https://travis-ci.org/mike-north/ember-perf.svg?branch=master)](https://travis-ci.org/mike-north/ember-perf)
+
 
 Page load performance instrumentation for ember.js apps
 
 ## Setup
 
 ```sh
-# Ember.js < 1.10
-ember install ember-perf-handlebars
-# Ember.js >= 1.10
+# Ember.js >= 1.11
 ember install ember-perf
 ```
 
@@ -126,7 +124,6 @@ Here's an example
 }
 ```
 
-
 ### Configuration
 
 This addon can be configured in your **config/environment.js** file
@@ -145,6 +142,8 @@ if (environment === 'development') {
 
 ![TransitionPerformance](http://i60.tinypic.com/2dtvfwz.png)
 
+### Warning
+\*Ember 2.3 doesn't work with `ember-perf`.
 
 ## Developer Installation
 
@@ -153,14 +152,23 @@ if (environment === 'development') {
 * `bower install`
 
 ## Running
-
-* `npm run tryver <EMBER_TRY_SCENARIO> s` (for example, `npm run tryver ember-1.8 s`)
-* Visit your app at http://localhost:4200.
+Running the app using an ember-try scenario
+* `ember try:one <EMBER_TRY_SCENARIO> --- ember serve` ( for example `ember try:one ember-2.4 --- ember serve`)
+* Visit the app at http://localhost:4200.
 
 ## Running Tests
 
-* `npm run tryver <EMBER_TRY_SCENARIO>` (for example, `npm run tryver ember-1.8`)
-* `npm run tryver <EMBER_TRY_SCENARIO> test --server` (for example, `npm run tryver ember-1.8 test --server`)
+#### All Supported Ember Versions
+* `npm test`
+
+#### Individual Ember Versions
+* `ember try:one <EMBER_TRY_SCENARIO>` (for example, `ember try:one ember-2.4`)
+* `ember try:one <EMBER_TRY_SCENARIO> --- ember test --server` (for example, `ember try:one ember-2.4 --- ember test --server`)
+
+#### Reset Dependencies
+* `ember try:reset`
+
+This command restores the original bower.json from bower.json.ember-try, rm -rfs bower_components and runs bower install. For use if any of the other commands fail to clean up after (they run this by default on completion).
 
 ## Building
 

addon/core/render-data.js

@@ -56,7 +56,7 @@ RenderData.prototype = {
     switch (name) {
       case 'render.component':
       case 'render.view':
-        const [viewData] = this.viewData.filter(v => {
+        const [viewData] = this.viewData.filter((v) => {
           return payload.view.elementId === v.id;
         });
         viewData.endTime = t();

addon/core/transition-data.js

@@ -22,8 +22,8 @@ prototype.constructor = TransitionData;
 prototype._super$constructor = RenderData;
 
 prototype.activateRoute = function activateRoute(route) {
-  const startTime = t();
-  const r = {
+  let startTime = t();
+  let r = {
     name: route.routeName,
     debugContainerKey: route._debugContainerKey,
     startTime,
@@ -36,8 +36,8 @@ prototype.activateRoute = function activateRoute(route) {
 };
 
 prototype.routeFinishedSetup = function routeFinishedSetup(route) {
-  const endTime = t();
-  const [r] = this.routes.filter(r => r.name === route.routeName);
+  let endTime = t();
+  let [r] = this.routes.filter((r) => r.name === route.routeName);
   r.endTime = endTime;
   r.elapsedTime = r.endTime - r.startTime;
 };

addon/ext/router.js

@@ -1,11 +1,12 @@
 import Ember from 'ember';
+import getOwner from 'ember-getowner-polyfill';
 
 const { computed, on, Mixin } = Ember;
 
 export default Mixin.create({
 
   perfService: computed(function() {
-    return this.container.lookup('service:ember-perf');
+    return getOwner(this).lookup('service:ember-perf');
   }),
 
   _doURLTransition() {

addon/services/ember-perf.js

@@ -26,7 +26,7 @@ export default Base.extend(Evented, {
 
   _setDefaults() {
     const defaults = Ember.getWithDefault(this, 'defaults', {});
-    keys(defaults).map(key => {
+    keys(defaults).map((key) => {
       const classifiedKey = classify(key);
       const defaultKey = `default${classifiedKey}`;
       return Ember.set(this, defaultKey, defaults[key]);

addon/utils/performance-now.js

@@ -1,5 +1,5 @@
 export default function performanceNow() {
-  if ('performance' in window) {
+  if ('performance' in window && typeof window.performance.now === 'function' && typeof fastboot === 'undefined') {
     return window.performance.now();
   } else {
     return new Date().valueOf();

bower.json

@@ -1,17 +1,10 @@
 {
   "name": "ember-perf",
   "dependencies": {
-    "ember": "1.13.7",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": "1.13.8",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "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",
+    "ember": "~2.5.0",
+    "ember-cli-shims": "0.1.1",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": "0.1.0",
     "pretender": "^0.9.0"
   }
 }