Merge pull request #26 from toddjordan/upgrade-to-cli-32

Upgrade to cli 3.2
toddjordan · Feb 28, 2016 · ecf676f · ecf676f
2 parents 415e590 + a14c0df
commit ecf676f
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 40 deletions.
diff --git a/.npmignore b/.npmignore
@@ -1,14 +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
-Brocfile.js
+ember-cli-build.js
 testem.json
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015
+Copyright (c) 2016
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/bower.json b/bower.json
@@ -1,19 +1,15 @@
 {
   "name": "ember-cli-dynamic-forms",
   "dependencies": {
-    "ember": "2.3.0",
+    "ember": "~2.3.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
-    "ember-load-initializers": "0.1.7",
-    "ember-qunit-notifications": "0.1.0",
     "jquery": "1.11.3",
-    "loader.js": "^3.5.0",
     "alpaca": "1.5.14",
     "bootstrap": "3.3.2",
     "lodash": "~3.10.1"
   },
   "resolutions": {
-    "ember": "2.3.0",
     "jquery": "1.11.3"
   }
 }
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -3,33 +3,41 @@ module.exports = {
   scenarios: [
     {
       name: 'default',
-      dependencies: { }
+      bower: {
+        dependencies: { }
+      }
     },
     {
       name: 'ember-release',
-      dependencies: {
-        'ember': 'components/ember#release'
-      },
-      resolutions: {
-        'ember': 'release'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#release'
+        },
+        resolutions: {
+          'ember': 'release'
+        }
       }
     },
     {
       name: 'ember-beta',
-      dependencies: {
-        'ember': 'components/ember#beta'
-      },
-      resolutions: {
-        'ember': 'beta'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#beta'
+        },
+        resolutions: {
+          'ember': 'beta'
+        }
       }
     },
     {
       name: 'ember-canary',
-      dependencies: {
-        'ember': 'components/ember#canary'
-      },
-      resolutions: {
-        'ember': 'canary'
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#canary'
+        },
+        resolutions: {
+          'ember': 'canary'
+        }
       }
     }
   ]

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.2.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0-beta.1",
+    "ember-cli": "2.3.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-github-pages": "0.0.6",
@@ -42,9 +42,11 @@
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
+    "ember-load-initializers": "^0.5.0",
     "ember-getowner-polyfill": "1.0.0",
     "ember-resolver": "^2.0.3",
-    "ember-try": "~0.0.8"
+    "ember-try": "^0.1.2",
+    "loader.js": "^4.0.0"
   },
   "keywords": [
     "ember-addon",

diff --git a/tests/dummy/app/app.js b/tests/dummy/app/app.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 import Resolver from './resolver';
-import loadInitializers from 'ember/load-initializers';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 let App;

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -11,11 +11,12 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/dummy.css">
+
     {{content-for "head-footer"}}
   </head>
   <body>
     {{content-for "body"}}
-    <!-- - Latest compiled and minified JavaScript -->
+
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
 

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -2,13 +2,10 @@
 
 module.exports = function(environment) {
   var ENV = {
-    contentSecurityPolicy: {
-        'script-src': "'self' 'unsafe-inline'"
-    },
     modulePrefix: 'dummy',
     environment: environment,
     baseURL: '/',
-    locationType: 'hash',
+    locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
@@ -43,7 +40,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-    ENV.baseURL = '/ember-cli-dynamic-forms';
+
   }
 
   return ENV;

diff --git a/tests/index.html b/tests/index.html
@@ -6,7 +6,6 @@
     <title>Dummy Tests</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:49152"> 
 
     {{content-for "head"}}
     {{content-for "test-head"}}