Update to Ember-CLI 1.13.1

.npmignore

@@ -1,6 +1,7 @@
 bower_components/
 tests/
 tmp/
+dist/
 
 .bowerrc
 .editorconfig
@@ -9,5 +10,6 @@ tmp/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json

.travis.yml

@@ -1,13 +1,28 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
 cache:
   directories:
     - node_modules
 
+env:
+  - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=1.10.1
+  - EMBER_TRY_SCENARIO=1.11.3
+  - EMBER_TRY_SCENARIO=1.12.1
+  - EMBER_TRY_SCENARIO=ember-release
+  - EMBER_TRY_SCENARIO=ember-beta
+  - EMBER_TRY_SCENARIO=ember-canary
+
+matrix:
+  fast_finish: true
+
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
@@ -17,11 +32,4 @@ install:
   - bower install
 
 script:
-  - ./node_modules/.bin/ember try "$EMBER_TRY_SCENARIO" test
-
-env:
-  - EMBER_TRY_SCENARIO="Ember 1.10.0"
-  - EMBER_TRY_SCENARIO="Ember 1.11.3"
-  - EMBER_TRY_SCENARIO="Ember 1.12.0"
-  - EMBER_TRY_SCENARIO="Ember Beta"
-  - EMBER_TRY_SCENARIO="Ember Canary"
+  - ember try $EMBER_TRY_SCENARIO test

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}

bower.json

@@ -1,13 +1,13 @@
 {
   "name": "ember-wormhole",
   "dependencies": {
-    "ember": "1.11.3",
+    "ember": "1.13.5",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.1",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.15",
+    "ember-resolver": "~0.1.18",
     "jquery": "^1.11.1",
     "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"

config/ember-try.js

@@ -1,39 +1,54 @@
 module.exports = {
   scenarios: [
     {
-      name: 'Ember Canary',
+      name: 'default',
+      dependencies: { }
+    },
+    {
+      name: '1.10.1',
       dependencies: {
-        "ember": "components/ember#canary"
-      },
-      resolutions: {
-        "ember": "canary"
+        'ember': '1.10.1',
+        'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2'
       }
     },
     {
-      name: 'Ember Beta',
+      name: '1.11.3',
       dependencies: {
-        "ember": "components/ember#beta"
-      },
-      resolutions: {
-        "ember": "beta"
+        'ember': '1.11.3',
+        'ember-load-initializers': 'ember-cli/ember-load-initializers#0.0.2'
+      }
+    },
+    {
+      name: '1.12.1',
+      dependencies: {
+        'ember': '1.12.1'
       }
     },
     {
-      name: "Ember 1.12.0",
+      name: 'ember-release',
       dependencies: {
-        "ember": "1.12.0"
+        'ember': 'components/ember#release'
+      },
+      resolutions: {
+        'ember': 'release'
       }
     },
     {
-      name: "Ember 1.11.3",
+      name: 'ember-beta',
       dependencies: {
-        "ember": "1.11.3"
+        'ember': 'components/ember#beta'
+      },
+      resolutions: {
+        'ember': 'beta'
       }
     },
     {
-      name: "Ember 1.10.0",
+      name: 'ember-canary',
       dependencies: {
-        "ember": "1.10.0"
+        'ember': 'components/ember#canary'
+      },
+      resolutions: {
+        'ember': 'canary'
       }
     }
   ]

config/environment.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function(/* environment, appConfig */) {
+  return { };
+};

ember-cli-build.js

@@ -0,0 +1,17 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+
+module.exports = function(/*defaults*/) {
+  var app = new EmberApp({
+    snippetSearchPaths: ['tests/dummy/app']
+  });
+
+  /*
+    This build file specifes the options for the dummy test app of this
+    addon, located in `/tests/dummy`
+    This build file does *not* influence how the addon or the app using it
+    behave. You most likely want to be modifying `./index.js` or app's build file
+  */
+
+  return app.toTree();
+};

package.json

@@ -19,20 +19,23 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.2",
-    "ember-cli": "^0.2.3",
-    "ember-cli-app-version": "0.3.3",
-    "ember-cli-dependency-checker": "0.0.8",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-github-pages": "0.0.6",
-    "ember-cli-htmlbars": "^0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.10",
+    "ember-cli-qunit": "0.3.15",
     "ember-cli-release": "^0.2.5",
-    "ember-cli-uglify": "1.0.1",
+    "ember-cli-uglify": "^1.0.1",
     "ember-code-snippet": "1.1.0",
     "ember-disable-prototype-extensions": "^1.0.0",
+    "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.4"
+    "ember-try": "0.0.6"
   },
   "keywords": [
     "ember-addon"
@@ -44,4 +47,4 @@
     "configPath": "tests/dummy/config",
     "demoURL": "http://yapplabs.github.io/ember-wormhole/"
   }
-}
+}

testem.json

@@ -1,6 +1,7 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],

tests/.jshintrc

@@ -26,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -47,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }

tests/dummy/public/crossdomain.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>

tests/dummy/public/robots.txt

@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow:

tests/helpers/start-app.js

@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {