upgrade to ember-cli 2.3.0-beta.1

Dhaulagiri · Dhaulagiri · commit f9368dc94172 · 2016-01-20T07:27:34.000-06:00
diff --git a/app/app.js b/app/app.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
+import Resolver from './resolver';
 import loadInitializers from 'ember/load-initializers';
 import config from './config/environment';
 
diff --git a/app/index.html b/app/index.html
@@ -7,19 +7,20 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
+    {{content-for "head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/api.css">
 
-    {{content-for 'head-footer'}}
+    {{content-for "head-footer"}}
   </head>
 
   <body class="api">
-    {{content-for 'body'}}
+    {{content-for "body"}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/api.js"></script>
 
-    {{content-for 'body-footer'}}
-</body>
+    {{content-for "body-footer"}}
+  </body>
+</html>
diff --git a/app/resolver.js b/app/resolver.js
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;
diff --git a/bower.json b/bower.json
@@ -4,14 +4,11 @@
     "bourbon": "~3.2.3",
     "waypoints": "~3.1.0",
     "ember": "1.13.13",
-    "ember-cli-shims": "0.0.6",
-    "ember-cli-test-loader": "0.2.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
     "ember-load-initializers": "0.1.7",
-    "ember-qunit": "0.4.16",
     "ember-qunit-notifications": "0.1.0",
-    "ember-resolver": "~0.1.20",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.4.0",
-    "qunit": "~1.20.0"
+    "loader.js": "^3.5.0"
   }
 }
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "start": "ember server",
     "test": "ember test"
   },
-  "repository": "https://github.com/trek/ember-api",
+  "repository": "https://github.com/emberjs/api",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -21,25 +21,26 @@
     "body-parser": "^1.2.0",
     "broccoli-asset-rev": "^2.2.0",
     "connect-restreamer": "^1.0.1",
-    "ember-cli": "1.13.13",
+    "ember-cli": "2.3.0-beta.1",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.5",
-    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-content-security-policy": "0.5.0",
     "ember-cli-sass": "^5.2.1",
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "http-proxy": "^1.8.1",
-    "ember-cli-dependency-checker": "^1.1.0",
+    "ember-cli-dependency-checker": "^1.2.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-qunit": "^1.0.4",
+    "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
-    "ember-cli-sri": "^1.2.0",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-cli-yuidoc-converter": "git://github.com/trek/ember-cli-yuidoc-converter.git#7bc04b2",
     "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-export-application-global": "^1.0.4"
+    "ember-export-application-global": "^1.0.4",
+    "ember-resolver": "^2.0.3"
   }
 }
diff --git a/tests/helpers/resolver.js b/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();
diff --git a/tests/index.html b/tests/index.html
@@ -7,28 +7,28 @@
     <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/api.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/api.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>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import Resolver from 'ember-resolver';`
	`2`	`+`
	`3`	`+export default Resolver;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import Resolver from 'ember/resolver';`
	`1`	`+import Resolver from '../../resolver';`
`2`	`2`	`import config from '../../config/environment';`
`3`	`3`
`4`	`4`	`const resolver = Resolver.create();`