Merge pull request #26 from blimmer/chore/ember-cli-improvements

Ember CLI Upgrade/Improvements

.npmignore

@@ -10,5 +10,6 @@ dist/
 .npmignore
 **/.gitkeep
 bower.json
+ember-cli-build.js
 Brocfile.js
 testem.json

README.md

@@ -1,7 +1,7 @@
 # ember-state-services [![Build Status](https://travis-ci.org/stefanpenner/ember-state-services.svg)](https://travis-ci.org/stefanpenner/ember-state-services)
 
 This addon introduces a state management pattern using services, which allows them to serve
-multiple consumers (often components). 
+multiple consumers (often components).
 
 An example could be a master/detail experience where the detail view is a
 component which allows editing of content. It would be unfortunate if
@@ -74,7 +74,7 @@ export default Ember.Component.extend({
 
 ## Installation
 
-* `npm install --save ember-state-services`
+* `ember install ember-state-services`
 
 ## Example
 

blueprints/.jshintrc

@@ -0,0 +1,6 @@
+{
+  "predef": [
+    "console"
+  ],
+  "strict": false
+}

blueprints/ember-state-services/index.js

@@ -0,0 +1,7 @@
+module.exports = {
+  normalizeEntityName: function() {}, // no-op since we're just adding dependencies
+
+  afterInstall: function() {
+    return this.addAddonToProject('ember-buffered-proxy', '^0.5.1');
+  }
+};

bower.json

@@ -1,16 +1,15 @@
 {
   "name": "ember-state-services",
   "dependencies": {
-    "ember": "1.12.0",
+    "ember": "1.13.8",
     "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.0.0-beta.18",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.4",
-    "ember-qunit": "0.3.3",
+    "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.15",
-    "jquery": "^1.11.1",
-    "loader.js": "ember-cli/loader.js#3.2.0",
-    "qunit": "~1.17.1"
+    "ember-resolver": "~0.1.18",
+    "jquery": "^1.11.3",
+    "loader.js": "ember-cli/loader.js#3.2.1",
+    "qunit": "~1.18.0"
   }
-}
+}

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(defaults, {
+    // Add options here
+  });
+
+  /*
+    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

@@ -7,9 +7,9 @@
     "test": "tests"
   },
   "scripts": {
-    "start": "ember server",
     "build": "ember build",
-    "test": "ember test"
+    "start": "ember server",
+    "test": "ember try:testall"
   },
   "repository": {
     "type": "git",
@@ -20,28 +20,32 @@
   },
   "author": "",
   "license": "MIT",
-  "dependencies": {
-    "ember-cli-babel": "^5.0.0"
-  },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "ember-buffered-proxy": "^0.4.0",
-    "ember-cli": "^0.2.6",
-    "ember-cli-app-version": "0.3.2",
-    "ember-cli-content-security-policy": "0.3.0",
-    "ember-cli-dependency-checker": "0.0.8",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.9",
-    "ember-cli-uglify": "1.0.1",
-    "ember-export-application-global": "^1.0.2",
+    "broccoli-asset-rev": "^2.1.2",
+    "ember-buffered-proxy": "^0.5.1",
+    "ember-cli": "1.13.8",
+    "ember-cli-app-version": "0.5.0",
+    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-dependency-checker": "^1.0.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
+    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-inject-live-reload": "^1.3.1",
+    "ember-cli-qunit": "^1.0.0",
+    "ember-cli-release": "0.2.3",
+    "ember-cli-sri": "^1.0.3",
+    "ember-cli-uglify": "^1.2.0",
     "ember-disable-prototype-extensions": "^1.0.0",
-    "ember-try": "0.0.5"
+    "ember-disable-proxy-controllers": "^1.0.0",
+    "ember-export-application-global": "^1.0.3",
+    "ember-try": "0.0.6"
   },
   "keywords": [
     "ember-addon"
   ],
+  "dependencies": {
+    "ember-cli-babel": "^5.1.3"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }

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/app/templates/application.hbs

@@ -2,7 +2,7 @@
 <div class="master-detail">
   <div class='master'>
     <ul>
-      {{#each email in model}}
+      {{#each model as |email|}}
         <li>
           {{#link-to 'email' email}} {{email.subject}} {{/link-to}}
         </li>

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) {

tests/unit/state-mixin-test.js

@@ -2,7 +2,6 @@ import Ember from 'ember';
 import { module, test } from 'qunit';
 import StateMixin from 'ember-state-services/mixin';
 
-let State;
 let Service;
 let registry;
 let container;