Upgrade Ember and dependencies

stingerlabs · Jan 5, 2020 · 50cd9ae · 50cd9ae
1 parent b3c6787
commit 50cd9ae
Show file tree

Hide file tree

Showing 17 changed files with 3,665 additions and 2,613 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,8 +1,12 @@
 module.exports = {
   root          : true,
+  parser        : 'babel-eslint',
   parserOptions : {
-    ecmaVersion : 2017,
-    sourceType  : 'module',
+    ecmaVersion  : 2018,
+    sourceType   : 'module',
+    ecmaFeatures : {
+      legacyDecorators : true,
+    },
   },
   plugins : [
     'align-assignments',
@@ -23,6 +27,8 @@ module.exports = {
     'arrow-parens'                        : 'off',
     'camelcase'                           : 'off',
     'comma-dangle'                        : ['error', 'always-multiline'],
+    'ember/no-jquery'                     : 'error',
+    'ember/no-observers'                  : 'off',
     'func-call-spacing'                   : 'off',
     'generator-star-spacing'              : 'off',
     'indent'                              : ['error', 2, {flatTernaryExpressions : true}],

diff --git a/.npmignore b/.npmignore
@@ -12,6 +12,7 @@
 /.env*
 /.eslintignore
 /.eslintrc.js
+/.git/
 /.gitignore
 /.template-lintrc.js
 /.travis.yml

diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  extends : 'recommended',
+  extends : 'octane',
 
   rules : {
     quotes : false,

diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,6 @@ jobs:
 
   include:
     # runs linting and tests with current locked deps
-
     - stage: "Tests"
       name: "Tests"
       install:
@@ -40,26 +39,27 @@ jobs:
         - yarn lint:js
         - yarn test
 
-    - name: "Floating Dependencies"
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - yarn install --no-lockfile  --non-interactive
+
       script:
         - yarn test
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-2.18
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+    - env: EMBER_TRY_SCENARIO=ember-classic
 
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
 
-install:
-  - yarn install --no-lockfile --non-interactive
-
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/addon/components/drag-sort-list.js b/addon/components/drag-sort-list.js
@@ -23,6 +23,7 @@ export default Component.extend({
   childClass      : '',
   childTagName    : 'div',
   handle          : null,
+  sourceOnly      : false,
 
   isHorizontal : false,
   isRtl        : false,

diff --git a/addon/templates/components/drag-sort-list.hbs b/addon/templates/components/drag-sort-list.hbs
@@ -1,20 +1,22 @@
-{{#each items as |item index|}}
-  {{#drag-sort-item
-    additionalArgs                 = additionalArgs
-    item                           = item
-    index                          = index
-    items                          = items
-    group                          = group
-    handle                         = handle
-    class                          = childClass
-    tagName                        = childTagName
-    isHorizontal                   = isHorizontal
-    isRtl                          = isRtl
-    draggingEnabled                = draggingEnabled
-    dragEndAction                  = dragEndAction
-    determineForeignPositionAction = determineForeignPositionAction
-    sourceOnly                     = sourceOnly
-  }}
+{{#each this.items as |item index|}}
+  <DragSortItem
+    @additionalArgs                 = {{this.additionalArgs}}
+    @item                           = {{item}}
+    @index                          = {{index}}
+    @items                          = {{this.items}}
+    @group                          = {{this.group}}
+    @handle                         = {{this.handle}}
+    @tagName                        = {{this.childTagName}}
+    @isHorizontal                   = {{this.isHorizontal}}
+    @isRtl                          = {{this.isRtl}}
+    @draggingEnabled                = {{this.draggingEnabled}}
+    @dragEndAction                  = {{this.dragEndAction}}
+    @determineForeignPositionAction = {{this.determineForeignPositionAction}}
+    @sourceOnly                     = {{this.sourceOnly}}
+
+
+    class = {{this.childClass}}
+  >
     {{yield item index}}
-  {{/drag-sort-item}}
+  </DragSortItem>
 {{/each}}
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,83 +2,88 @@
 
 const getChannelURL = require('ember-source-channel-url')
 
-module.exports = function () {
-  return Promise.all([
-    getChannelURL('release'),
-    getChannelURL('beta'),
-    getChannelURL('canary'),
-  ]).then((urls) => {
-    return {
-      useYarn   : true,
-      scenarios : [
-        {
-          name : 'ember-lts-2.18',
-          env  : {
-            EMBER_OPTIONAL_FEATURES : JSON.stringify({ 'jquery-integration' : true }),
-          },
-          npm : {
-            devDependencies : {
-              '@ember/jquery' : '^0.5.1',
-              'ember-source'  : '~2.18.0',
-            },
+module.exports = async function () {
+  return {
+    useYarn   : true,
+    scenarios : [
+      {
+        name : 'ember-lts-3.8',
+        npm  : {
+          devDependencies : {
+            'ember-source' : '~3.8.0',
           },
         },
-        {
-          name : 'ember-lts-3.4',
-          npm  : {
-            devDependencies : {
-              'ember-source' : '~3.4.0',
-            },
+      },
+      {
+        name : 'ember-lts-3.12',
+        npm  : {
+          devDependencies : {
+            'ember-source' : '~3.12.0',
           },
         },
-        {
-          name : 'ember-release',
-          npm  : {
-            devDependencies : {
-              'ember-source' : urls[0],
-            },
+      },
+      {
+        name : 'ember-release',
+        npm  : {
+          devDependencies : {
+            'ember-source' : await getChannelURL('release'),
           },
         },
-        {
-          name : 'ember-beta',
-          npm  : {
-            devDependencies : {
-              'ember-source' : urls[1],
-            },
+      },
+      {
+        name : 'ember-beta',
+        npm  : {
+          devDependencies : {
+            'ember-source' : await getChannelURL('beta'),
           },
         },
-        {
-          name : 'ember-canary',
-          npm  : {
-            devDependencies : {
-              'ember-source' : urls[2],
-            },
+      },
+      {
+        name : 'ember-canary',
+        npm  : {
+          devDependencies : {
+            'ember-source' : await getChannelURL('canary'),
           },
         },
-        // The default `.travis.yml` runs this scenario via `yarn test`,
-        // not via `ember try`. It's still included here so that running
-        // `ember try:each` manually or from a customized CI config will run it
-        // along with all the other scenarios.
-        {
-          name : 'ember-default',
-          npm  : {
-            devDependencies : {},
-          },
+      },
+      // The default `.travis.yml` runs this scenario via `npm test`,
+      // not via `ember try`. It's still included here so that running
+      // `ember try:each` manually or from a customized CI config will run it
+      // along with all the other scenarios.
+      {
+        name : 'ember-default',
+        npm  : {
+          devDependencies : {},
+        },
+      },
+      {
+        name : 'ember-default-with-jquery',
+        env  : {
+          EMBER_OPTIONAL_FEATURES : JSON.stringify({
+            'jquery-integration' : true,
+          }),
         },
-        {
-          name : 'ember-default-with-jquery',
-          env  : {
-            EMBER_OPTIONAL_FEATURES : JSON.stringify({
-              'jquery-integration' : true,
-            }),
+        npm : {
+          devDependencies : {
+            '@ember/jquery' : '^0.5.1',
           },
-          npm : {
-            devDependencies : {
-              '@ember/jquery' : '^0.5.1',
-            },
+        },
+      },
+      {
+        name : 'ember-classic',
+        env  : {
+          EMBER_OPTIONAL_FEATURES : JSON.stringify({
+            'application-template-wrapper'     : true,
+            'default-async-observers'          : false,
+            'template-only-glimmer-components' : false,
+          }),
+        },
+        npm : {
+          ember : {
+            edition : 'classic',
           },
         },
-      ],
-    }
-  })
+      },
+    ],
+  }
 }
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -3,7 +3,7 @@
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
 
 module.exports = function (defaults) {
-  let app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     // Add options here
   })
 

diff --git a/package.json b/package.json
@@ -41,54 +41,58 @@
     "test:all": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^7.1.2",
-    "ember-cli-htmlbars": "^3.0.0",
+    "ember-cli-babel": "^7.13.0",
+    "ember-cli-htmlbars": "^4.2.0",
     "eslint-plugin-varspacing": "^1.2.1"
   },
   "devDependencies": {
-    "@ember/optional-features": "^0.6.3",
-    "broccoli-asset-rev": "^2.7.0",
-    "ember-auto-import": "^1.2.21",
-    "ember-cli": "~3.8.1",
-    "ember-cli-dependency-checker": "^3.1.0",
+    "@ember/optional-features": "^1.1.0",
+    "@glimmer/component": "^1.0.0",
+    "babel-eslint": "^10.0.3",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^1.5.3",
+    "ember-cli": "~3.15.1",
+    "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-ghpages": "^0.2.0",
-    "ember-cli-eslint": "^4.2.3",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
-    "ember-cli-inject-live-reload": "^1.8.2",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-page-object": "^1.15.2",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.1",
-    "ember-cli-uglify": "^2.1.0",
-    "ember-composable-helpers": "^2.2.0",
-    "ember-concurrency": "^0.9.0",
+    "ember-cli-template-lint": "^1.0.0-beta.3",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-composable-helpers": "^3.0.3",
+    "ember-concurrency": "^1.1.3",
     "ember-disable-prototype-extensions": "^1.1.3",
-    "ember-export-application-global": "^2.0.0",
+    "ember-export-application-global": "^2.0.1",
     "ember-fork-me": "^3.0.1",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.1.1",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-qunit": "^3.4.1",
-    "ember-resolver": "^5.0.1",
-    "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/19184b8de3f14c26292a864f4e3aa124ead0db76.tgz",
-    "ember-source-channel-url": "^1.1.0",
+    "ember-qunit": "^4.6.0",
+    "ember-resolver": "^7.0.0",
+    "ember-source": "^3.15.0",
+    "ember-source-channel-url": "^2.0.1",
     "ember-truth-helpers": "^2.1.0",
-    "ember-try": "^1.0.0",
-    "eslint-config-standard": "^12.0.0",
+    "ember-try": "^1.4.0",
+    "eslint-config-standard": "^14.1.0",
     "eslint-plugin-align-assignments": "^1.1.2",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-ember": "^7.7.1",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.8.0",
-    "sinon": "^7.3.1",
+    "qunit-dom": "^0.9.2",
+    "sinon": "^8.0.2",
     "sinon-chai": "^3.3.0"
   },
   "engines": {
     "node": "8.* || >= 10.*"
   },
+  "ember": {
+    "edition": "octane"
+  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "demoURL": "https://kaliber5.github.io/ember-drag-sort/"