Merge pull request #18 from pixelhandler/upgrade-ember-cli-to-beta

Upgrade to ember-cli version: 2.3.0-beta.2

Author: pixelhandler

app/app.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;

app/index.html

@@ -11,19 +11,19 @@
     <meta name="author" content="Bill Heaton">
     <meta name="google-site-verification" content="Uu2vsNmMVDBS1O10oJbzTVxAMleQ9tgGtJQ-buLNewg" />
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/pixelhandler-blog.css">
 
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/pixelhandler-blog.js"></script>
 
-    {{content-for 'body-footer'}}
+    {{content-for "body-footer"}}
   </body>
 </html>

app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

bower.json

@@ -1,21 +1,19 @@
 {
   "name": "pixelhandler-blog",
   "dependencies": {
-    "ember": "~2.3.0",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "0.2.1",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit": "0.4.18",
+    "ember": "~2.3.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
     "jquery": "^2.2.0",
-    "loader.js": "ember-cli/loader.js#3.4.0",
-    "qunit": "~1.20.0",
     "fetch": "~0.10.1",
     "es6-promise": "~3.0.2",
     "moment": ">= 2.8.0",
     "moment-timezone": ">= 0.1.0",
     "showdown": "~1.3.0",
     "normalize.css": "~3.0.3"
+  },
+  "resolutions": {
+    "jquery": "^2.2.0"
   }
 }

config/environment.js

@@ -46,11 +46,10 @@ 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;
 
     ENV.contentSecurityPolicy['connect-src'] += " ws://localhost:35729 localhost:3000";
     ENV.contentSecurityPolicy['script-src'] += " 'unsafe-inline' 'unsafe-eval'";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixelhandler-blog",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "summary": "Bill Heaton's Blog",
   "description": "pixelhandler.com",
   "homepage": "https://pixelhandler.com",
@@ -28,39 +28,42 @@
   "devDependencies": {
     "autoprefixer": "^6.2.1",
     "broccoli-asset-rev": "^2.2.0",
-    "ember-cli": "1.13.14",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.3.0-beta.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-deploy": "0.5.1",
     "ember-cli-deploy-lightning-pack": "0.3.0",
     "ember-cli-get-dependency-depth": "1.0.0",
     "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-moment-shim": "0.7.1",
     "ember-cli-path-utils": "1.0.0",
     "ember-cli-postcss": "^2.1.1",
-    "ember-cli-qunit": "^1.0.4",
+    "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
     "ember-cli-showdown": "2.5.0",
-    "ember-cli-sri": "^1.2.0",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-string-utils": "1.0.0",
     "ember-cli-test-info": "1.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
     "ember-inflector": "1.9.4",
-    "ember-jsonapi-resources": "~1.0.0",
+    "ember-jsonapi-resources": "~1.0.5",
+    "ember-load-initializers": "^0.5.0",
     "ember-metrics": "0.5.3",
     "ember-moment": "~4.2.1",
     "ember-normalize": "0.0.9",
     "ember-page-title": "~2.0.7",
+    "ember-resolver": "^2.0.3",
     "glob": "^4.5.3",
     "http-proxy": "^1.12.0",
     "inflection": "^1.7.2",
+    "loader.js": "^4.0.0",
     "lodash": "~3.10.1",
     "morgan": "^1.6.1",
     "postcss-cssnext": "^2.3.0",

tests/helpers/resolver.js

@@ -1,4 +1,4 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
 const resolver = Resolver.create();

tests/index.html

@@ -3,32 +3,32 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>BlogClient Tests</title>
+    <title>PixelhandlerBlog Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/pixelhandler-blog.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/pixelhandler-blog.js"></script>
-    <script src="testem.js" integrity=""></script>
     <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>