Merge pull request #501 from bjornharrtell/ember-2.10-upgrade

carols10cents · web-flow · commit 51a3f149c701 · 2017-02-10T21:53:53.000-05:00
Upgrade Ember and other dependencies where possible
diff --git a/.jshintrc b/.jshintrc
@@ -28,6 +28,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/app/index.html b/app/index.html
@@ -17,8 +17,8 @@
       ga('send', 'pageview');
     </script>
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/cargo.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
 
     {{content-for 'head-footer'}}
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
@@ -35,8 +35,8 @@
         </div>
     </noscript>
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/cargo.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/cargo.js"></script>
 
     {{content-for 'body-footer'}}
   </body>
diff --git a/app/routes/crate/version.js b/app/routes/crate/version.js
@@ -4,7 +4,7 @@ import ajax from 'ic-ajax';
 export default Ember.Route.extend({
 
     model(params) {
-        const requestedVersion = params.version_num;
+        const requestedVersion = params.version_num === 'all' ? '' : params.version_num;
 
         const crate = this.modelFor('crate');
         const controller = this.controllerFor(this.routeName);
diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -138,6 +138,10 @@ body {
     }
 }
 
+input.search {
+    box-shadow: none;
+}
+
 span.small {
     color: $main-color-light;
     font-size: 80%;
@@ -226,6 +230,7 @@ pre {
 }
 
 button.dropdown, a.dropdown {
+    color: inherit;
     cursor: pointer;
     .arrow { font-size: 50%; display: inline-block; vertical-align: middle; }
     .arrow::after { content: "▼"; }
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
@@ -27,7 +27,7 @@
 
     <div class='nav'>
         {{#link-to "crates" (query-params letter="null" page=1)}}
-            <button type="button">Browse All Crates</button>
+            Browse All Crates
         {{/link-to}}
         <span class="sep">|</span>
         {{#rl-dropdown-container class="dropdown-container"}}
@@ -69,10 +69,8 @@
             {{/rl-dropdown-container}}
         {{else}}
             {{#link-to "login"}}
-                <button type="button">
                     <img class="lock" src="/assets/lock.png"/>
                     Log in with GitHub
-                </button>
             {{/link-to}}
         {{/if}}
     </div>
diff --git a/app/templates/crate/version.hbs b/app/templates/crate/version.hbs
@@ -251,7 +251,7 @@
 
             {{#rl-dropdown id="all-versions" tagName="ul" class="dropdown" closeOnChildClick="a:link"}}
                 <li class='all'>
-                    {{#link-to 'crate.version' ''}}All Versions{{/link-to}}
+                    {{#link-to 'crate.version' 'all'}}All Versions{{/link-to}}
                 </li>
                 {{#each smallSortedVersions as |version|}}
                     <li>
diff --git a/bower.json b/bower.json
@@ -1,22 +1,13 @@
 {
   "name": "cargo",
   "dependencies": {
-    "Faker": "~3.0.0",
-    "ember": "~2.6.0",
-    "ember-cli-moment-shim": "~0.1.0",
-    "ember-cli-shims": "0.1.1",
-    "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",
-    "lodash": "~3.7.0",
-    "moment": ">= 2.8.0",
-    "moment-timezone": ">= 0.1.0",
-    "normalize-css": "~3.0.3",
-    "pretender": "~1.1.0",
-    "qunit": "~1.20.0"
+    "Faker": "3.1.0",
+    "jquery": "3.1.1",
+    "lodash": "4.17.4",
+    "ember": "2.11.0",
+    "moment": "2.17.1",
+    "moment-timezone": "0.5.11",
+    "normalize-css": "5.0.0",
+    "pretender": "1.4.2"
   }
 }
diff --git a/config/environment.js b/config/environment.js
@@ -4,13 +4,17 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'cargo',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'router-scroll',
     historySupportMiddleware: true,
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
@@ -30,7 +34,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter
diff --git a/mirage/config.js b/mirage/config.js
diff --git a/mirage/fixtures/categories.js b/mirage/fixtures/categories.js
diff --git a/mirage/fixtures/search.js b/mirage/fixtures/search.js
diff --git a/mirage/fixtures/summary.js b/mirage/fixtures/summary.js
diff --git a/mirage/scenarios/default.js b/mirage/scenarios/default.js
diff --git a/mirage/serializers/application.js b/mirage/serializers/application.js
@@ -0,0 +1,4 @@
+import { JSONAPISerializer } from 'ember-cli-mirage';
+
+export default JSONAPISerializer.extend({
+});
diff --git a/package.json b/package.json
@@ -22,38 +22,39 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bower": "^1.7.9",
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.8.0",
-    "ember-cli-app-version": "^2.0.0",
-    "ember-cli-babel": "^5.1.6",
-    "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-htmlbars": "^1.0.3",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "bower": "1.8.0",
+    "broccoli-asset-rev": "2.5.0",
+    "ember-ajax": "2.5.4",
+    "ember-cli": "2.11.1",
+    "ember-cli-app-version": "2.0.1",
+    "ember-cli-babel": "5.2.4",
+    "ember-cli-dependency-checker": "1.3.0",
+    "ember-cli-htmlbars": "1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "0.3.6",
     "ember-cli-ic-ajax": "1.0.0",
-    "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-jshint": "^2.0.1",
-    "ember-cli-meta-tags": "^2.0.2",
-    "ember-cli-mirage": "0.1.13",
-    "ember-cli-moment-shim": "2.0.0",
-    "ember-cli-qunit": "3.0.1",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sass": "5.5.1",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.6.0",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.5.1",
-    "ember-moment": "6.1.0",
-    "ember-page-title": "3.0.7",
-    "ember-resolver": "^2.0.3",
-    "ember-rl-dropdown": "0.7.1",
-    "ember-route-alias": "^0.1.3",
-    "ember-router-scroll": "^0.1.1",
-    "ember-suave": "4.0.0",
-    "ember-welcome-page": "^1.0.1",
-    "emberx-select": "2.2.2",
-    "loader.js": "4.0.11"
+    "ember-cli-inject-live-reload": "1.6.1",
+    "ember-cli-jshint": "2.0.1",
+    "ember-cli-meta-tags": "3.0.4",
+    "ember-cli-mirage": "0.2.5",
+    "ember-cli-moment-shim": "3.0.1",
+    "ember-cli-qunit": "3.1.1",
+    "ember-cli-release": "0.2.9",
+    "ember-cli-sass": "6.1.1",
+    "ember-cli-shims": "1.0.2",
+    "ember-cli-sri": "2.1.1",
+    "ember-cli-test-loader": "1.1.1",
+    "ember-cli-uglify": "1.2.0",
+    "ember-data": "2.11.1",
+    "ember-export-application-global": "1.1.1",
+    "ember-load-initializers": "0.6.3",
+    "ember-moment": "7.3.0",
+    "ember-page-title": "3.1.5",
+    "ember-resolver": "2.1.1",
+    "ember-rl-dropdown": "0.10.0",
+    "ember-route-alias": "0.1.5",
+    "ember-router-scroll": "0.1.1",
+    "ember-suave": "4.0.1",
+    "emberx-select": "2.2.3",
+    "loader.js": "4.1.0"
   }
 }
diff --git a/tests/.jshintrc b/tests/.jshintrc
@@ -50,6 +50,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
+  "esversion": 6,
   "unused": true
 }
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
@@ -2,4 +2,5 @@ import Ember from 'ember';
 
 export default function destroyApp(application) {
     Ember.run(application, 'destroy');
+    server.shutdown();
 }
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,23 +1,23 @@
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
     module(name, {
         beforeEach() {
             this.application = startApp();
 
             if (options.beforeEach) {
-                options.beforeEach.apply(this, arguments);
+                return options.beforeEach.apply(this, arguments);
             }
         },
 
         afterEach() {
-            destroyApp(this.application);
-
-            if (options.afterEach) {
-                options.afterEach.apply(this, arguments);
-            }
+            let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+            return Promise.resolve(afterEach).then(() => destroyApp(this.application));
         }
     });
 }
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/helpers/start-app.js b/tests/helpers/start-app.js
@@ -6,8 +6,8 @@ import './has-text';
 export default function startApp(attrs) {
     let application;
 
-    let attributes = Ember.merge({}, config.APP);
-    attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+    // use defaults, but you can override
+    let attributes = Ember.assign({}, config.APP, attrs);
 
     Ember.run(() => {
         application = Application.create(attributes);
diff --git a/tests/index.html b/tests/index.html
@@ -6,28 +6,27 @@
     <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/cargo.css">
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/cargo.css">
+    <link rel="stylesheet" href="{{rootURL}}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="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/cargo.js"></script>
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="/testem.js" integrity=""></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/cargo.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@`
`28`	`28`	`"strict": false,`
`29`	`29`	`"white": false,`
`30`	`30`	`"eqnull": true,`
`31`		`- "esnext": true,`
	`31`	`+ "esversion": 6,`
`32`	`32`	`"unused": true`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ body {`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
	`141`	`+input.search {`
	`142`	`+ box-shadow: none;`
	`143`	`+}`
	`144`	`+`
`141`	`145`	`span.small {`
`142`	`146`	`color: $main-color-light;`
`143`	`147`	`font-size: 80%;`
`@@ -226,6 +230,7 @@ pre {`
`226`	`230`	`}`
`227`	`231`
`228`	`232`	`button.dropdown, a.dropdown {`
	`233`	`+ color: inherit;`
`229`	`234`	`cursor: pointer;`
`230`	`235`	`.arrow { font-size: 50%; display: inline-block; vertical-align: middle; }`
`231`	`236`	`.arrow::after { content: "▼"; }`