Merge pull request #39 from yappbox/chore/update-dependencies

lukemelia · web-flow · commit a8b4a4348b51 · 2020-06-10T14:55:06.000+08:00
Dependency updates
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   root: true,
   parser: 'babel-eslint',
diff --git a/.travis.yml b/.travis.yml
@@ -35,15 +35,15 @@ jobs:
     - stage: "Tests"
       name: "Tests"
       script:
-        - npm run lint:js
-        - npm test
+        - yarn lint
+        - yarn test:ember
 
     - stage: "Additional Tests"
       name: "Floating Dependencies"
       install:
         - npm install --no-package-lock
       script:
-        - npm test
+        - yarn test:ember
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,4 +23,4 @@
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/package.json b/package.json
@@ -17,61 +17,64 @@
   },
   "scripts": {
     "build": "ember build --environment=production",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:js": "eslint .",
     "release": "release-it",
     "start": "ember serve",
-    "test": "ember test",
-    "test:all": "ember try:each"
+    "test": "npm-run-all lint:* test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
     "@ember/render-modifiers": "^1.0.2",
     "@glimmer/tracking": "^1.0.0",
     "ember-auto-import": "^1.5.3",
-    "ember-cli-babel": "7.17.2",
-    "ember-cli-htmlbars": "^4.2.2",
-    "ember-composable-helpers": "^4.0.0",
-    "ember-concurrency": "^1.1.5",
+    "ember-cli-babel": "7.20.5",
+    "ember-cli-htmlbars": "^5.1.2",
+    "ember-composable-helpers": "^4.1.3",
+    "ember-concurrency": "^1.1.7",
     "ember-concurrency-decorators": "^1.0.0",
     "ember-decorators": "^6.1.1",
     "hammerjs": "^2.0.8"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.10.2",
     "@ember/optional-features": "^1.3.0",
     "@glimmer/component": "^1.0.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.16.0",
+    "ember-cli": "~3.18.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-deploy": "^1.0.2",
-    "ember-cli-deploy-build": "^1.1.1",
+    "ember-cli-deploy-build": "^2.0.0",
     "ember-cli-deploy-git": "^1.3.3",
-    "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.2",
-    "ember-cli-sass": "^8.0.1",
+    "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-uglify": "^3.0.0",
-    "ember-collection": "1.0.0-alpha.9",
-    "ember-decorators-polyfill": "^1.1.1",
+    "ember-collection": "1.0.0-rc.0",
+    "ember-decorators-polyfill": "^1.1.5",
     "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.1",
     "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-qunit": "^4.6.0",
-    "ember-resolver": "^7.0.0",
-    "ember-simulant-test-helpers": "^0.3.0",
-    "ember-source": "~3.16.0",
+    "ember-resolver": "^8.0.0",
+    "ember-simulant-test-helpers": "^0.3.1",
+    "ember-source": "~3.18.0",
     "ember-source-channel-url": "^2.0.1",
+    "ember-template-lint": "^2.6.0",
     "ember-try": "^1.4.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-ember": "^7.7.2",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint": "^7.2.0",
+    "eslint-plugin-ember": "^8.4.0",
+    "eslint-plugin-node": "^11.1.0",
     "layout-bin-packer": "^1.2.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^1.0.0",
-    "release-it": "^13.6.0",
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^1.2.0",
+    "release-it": "^13.6.2",
     "release-it-lerna-changelog": "^2.3.0",
-    "sass": "^1.15.1"
+    "sass": "^1.26.8"
   },
   "engines": {
     "node": "10.* || >= 12"
diff --git a/testem.js b/testem.js
@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
diff --git a/tests/dummy/config/ember-cli-update.json b/tests/dummy/config/ember-cli-update.json
@@ -0,0 +1,21 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.18.0",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--yarn",
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/integration/components/collection-scroll-view-test.js b/tests/integration/components/collection-scroll-view-test.js
@@ -61,7 +61,7 @@ module('Integration | Component | collection-scroll-view', function(hooks) {
       amount: 400
     });
     await waitForOpacity(SCROLLBAR_THUMB, '1');
-    assert.equal(find(SCROLLBAR_THUMB).offsetHeight, 229);
+    assert.equal(find(SCROLLBAR_THUMB).offsetHeight, 230);
     await scrollPromise;
     assert.ok(scrollPosition(find(SCROLL_CONTAINER)) <= -390);
     assert.dom(SCROLL_CONTAINER).containsText('Ten');
diff --git a/tests/integration/components/scroll-view-test.js b/tests/integration/components/scroll-view-test.js
@@ -72,7 +72,7 @@ module('Integration | Component | scroll-view', function(hooks) {
     await this.render(EXAMPLE_1_HBS);
     let scrollPromise = scrollDown('.ScrollView #element1');
     await waitForOpacity(SCROLLBAR_THUMB, '1');
-    assert.equal(find(SCROLLBAR_THUMB).offsetHeight, 229);
+    assert.equal(find(SCROLLBAR_THUMB).offsetHeight, 230);
     await scrollPromise;
     assert.ok(scrollPosition(find(SCROLL_CONTAINER)) <= -190);
   });
diff --git a/tests/integration/components/vertical-scroll-bar-test.js b/tests/integration/components/vertical-scroll-bar-test.js
@@ -54,7 +54,7 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
   test('it renders with a thumb size proportional to content ratio', async function(assert) {
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, 100);
-    assert.equal(thumbSize(), 233);
+    assert.equal(thumbSize(), 234);
     assert.equal(thumbPosition(), 48);
     assert.equal(find(THUMB).style.opacity, "1");
   });
@@ -64,7 +64,7 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, 5);
     this.simulateCallback(true, 0);
-    assert.equal(thumbSize(), 480);
+    assert.equal(thumbSize(), 481);
     assert.equal(thumbPosition(), 0);
     assert.equal(find(THUMB).style.opacity, "1");
   });
@@ -78,7 +78,7 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     this.set('contentHeight', 100000);
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, 100);
-    assert.equal(thumbSize(), 16);
+    assert.equal(thumbSize(), 17);
   });
 
   test('thumb is visible when isScrolling is true', async function(assert) {
@@ -95,13 +95,13 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, -100);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 193, 'thumb height is compressed');
+    assert.equal(thumbSize(), 195, 'thumb height is compressed');
   });
 
   test('compresses scrollbar when overscrolled at bottom', async function(assert) {
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, 650);
-    assert.equal(thumbSize(), 182, 'thumb height is compressed');
+    assert.equal(thumbSize(), 184, 'thumb height is compressed');
     assert.equal(thumbPosition(), 298, 'thumb is at bottom');
   });
 
@@ -110,14 +110,14 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, -100);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 397, 'thumb height is compressed');
+    assert.equal(thumbSize(), 399, 'thumb height is compressed');
   });
 
   test('compresses scrollbar when overscrolled at bottom, short content', async function(assert) {
     this.set('contentHeight', 300);
     await this.render(EXAMPLE_1_HBS);
     this.simulateCallback(true, 400);
-    assert.equal(thumbSize(), 263, 'thumb height is compressed');
+    assert.equal(thumbSize(), 265, 'thumb height is compressed');
     assert.equal(thumbPosition(), 217, 'thumb is at bottom');
   });
 
@@ -130,22 +130,22 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     // when scrolled past bottom by 5
     this.simulateCallback(true, 105);
     assert.equal(thumbPosition(), 95, 'thumb is at bottom');
-    assert.equal(thumbSize(), 905, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 907, 'thumb is slightly compressed');
 
     // when scrolled past top by 5
     this.simulateCallback(true, -5);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 995, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 996, 'thumb is slightly compressed');
 
     // when scrolled past bottom by 100
     this.simulateCallback(true, 100);
     assert.equal(thumbPosition(), 90, 'thumb is at bottom');
-    assert.equal(thumbSize(), 910, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 911, 'thumb is slightly compressed');
 
     // when scrolled past top by 100
     this.simulateCallback(true, -100);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 909, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 910, 'thumb is slightly compressed');
   });
 
   test('behavior when content is equal to scrollview height', async function(assert) {
@@ -157,22 +157,22 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     // when scrolled past bottom by 5
     this.simulateCallback(true, 5);
     assert.equal(thumbPosition(), 4, 'thumb is at bottom');
-    assert.equal(thumbSize(), 996, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 997, 'thumb is slightly compressed');
 
     // when scrolled past top by 5
     this.simulateCallback(true, -5);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 995, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 996, 'thumb is slightly compressed');
 
     // when scrolled past bottom by 100
     this.simulateCallback(true, 100);
     assert.equal(thumbPosition(), 90, 'thumb is at bottom');
-    assert.equal(thumbSize(), 910, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 911, 'thumb is slightly compressed');
 
     // when scrolled past top by 100
     this.simulateCallback(true, -100);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 909, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 910, 'thumb is slightly compressed');
   });
 
   test('behavior when content is slightly more than scrollview height', async function(assert) {
@@ -184,27 +184,27 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     // when scrolled past bottom by 1
     this.simulateCallback(true, 101);
     assert.equal(thumbPosition(), 90, 'thumb is at bottom');
-    assert.equal(thumbSize(), 810, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 811, 'thumb is slightly compressed');
 
     // when scrolled past top by 1
     this.simulateCallback(true, -1);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 810, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 811, 'thumb is slightly compressed');
 
     // when scrolled to center
     this.simulateCallback(true, 50);
     assert.equal(thumbPosition(), 45, 'thumb is in center');
-    assert.equal(thumbSize(), 811, 'thumb height is not compressed');
+    assert.equal(thumbSize(), 812, 'thumb height is not compressed');
 
     // when scrolled past bottom by 200
     this.simulateCallback(true, 300);
     assert.equal(thumbPosition(), 237, 'thumb is at bottom');
-    assert.equal(thumbSize(), 663, 'thumb is heavily compressed');
+    assert.equal(thumbSize(), 665, 'thumb is heavily compressed');
 
     // when scrolled past top by 200
     this.simulateCallback(true, -200);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 663, 'thumb is heavily compressed');
+    assert.equal(thumbSize(), 665, 'thumb is heavily compressed');
   });
 
   test('behavior when content is a lot more than scrollview height', async function(assert) {
@@ -216,37 +216,37 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
     // when scrolled past bottom by 5
     this.simulateCallback(true, 1505);
     assert.equal(thumbPosition(), 376, 'thumb is at bottom');
-    assert.equal(thumbSize(), 124, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 126, 'thumb is slightly compressed');
 
     // when scrolled past top by 5
     this.simulateCallback(true, -5);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 124, 'thumb is slightly compressed');
+    assert.equal(thumbSize(), 126, 'thumb is slightly compressed');
 
     // when scrolled to center
     this.simulateCallback(true, 750);
     assert.equal(thumbPosition(), 187, 'thumb is in center');
-    assert.equal(thumbSize(), 126, 'thumb height is not compressed');
+    assert.equal(thumbSize(), 127, 'thumb height is not compressed');
 
     // when scrolled past bottom by 100
     this.simulateCallback(true, 1600);
     assert.equal(thumbPosition(), 395, 'thumb is at bottom');
-    assert.equal(thumbSize(), 105, 'thumb is heavily compressed');
+    assert.equal(thumbSize(), 106, 'thumb is heavily compressed');
 
     // when scrolled past top by 100
     this.simulateCallback(true, -100);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 105, 'thumb is heavily compressed');
+    assert.equal(thumbSize(), 106, 'thumb is heavily compressed');
 
     // when scrolled past bottom by 500
     this.simulateCallback(true, 2000);
     assert.equal(thumbPosition(), 437, 'thumb is at bottom');
-    assert.equal(thumbSize(), 63, 'thumb is small');
+    assert.equal(thumbSize(), 65, 'thumb is small');
 
     // when scrolled past top by 500
     this.simulateCallback(true, -500);
     assert.equal(thumbPosition(), 0, 'thumb is at top');
-    assert.equal(thumbSize(), 63, 'thumb is small');
+    assert.equal(thumbSize(), 65, 'thumb is small');
   });
 
   test('calculations update when scrollerHeight changes', async function(assert) {
@@ -257,12 +257,12 @@ module('Integration | Component | vertical-scroll-bar', function(hooks) {
 
     this.simulateCallback(true, 750);
     assert.equal(thumbPosition(), 187, 'thumb is in center');
-    assert.equal(thumbSize(), 126, 'thumb height is not compressed');
+    assert.equal(thumbSize(), 127, 'thumb height is not compressed');
 
     this.set('scrollerHeight', 1000);
 
     this.simulateCallback(true, 750);
     assert.equal(thumbPosition(), 375, 'thumb is in center');
-    assert.equal(thumbSize(), 501, 'thumb height is not compressed');
+    assert.equal(thumbSize(), 502, 'thumb height is not compressed');
   });
 });
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+'use strict';`
	`2`	`+`
`1`	`3`	`module.exports = {`
`2`	`4`	`root: true,`
`3`	`5`	`parser: 'babel-eslint',`