Merge pull request #137 from paulcwatts/update-deps

Update dependencies
adopted-ember-addons · Sep 15, 2019 · e684d42 · e684d42
2 parents 76ae6ba + 6c5dd05
commit e684d42
Show file tree

Hide file tree

Showing 8 changed files with 1,498 additions and 1,165 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -40,8 +40,7 @@ module.exports = {
         'tests/dummy/app/**'
       ],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,

diff --git a/.travis.yml b/.travis.yml
@@ -45,8 +45,8 @@ jobs:
     # 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.4
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.8
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

diff --git a/README.md b/README.md
@@ -239,5 +239,5 @@ login, logout, and updating/verifying user attributes.
 
 ## Support
 
-* Ember versions 2.18, 3.4 and 3.10+
+* Ember versions 3.4+
 * AWS Amplify 1.x
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,83 +2,73 @@
 
 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.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.4.0'
           }
-        },
-        {
-          name: 'ember-lts-3.4',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.4.0'
-            }
-          }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
+        }
+      },
+      {
+        name: 'ember-lts-3.8',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.8.0'
           }
-        },
-        {
-          name: 'ember-beta',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[1]
-            }
+        }
+      },
+      {
+        name: 'ember-release',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('release')
           }
-        },
-        {
-          name: 'ember-canary',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[2]
-            }
+        }
+      },
+      {
+        name: 'ember-beta',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('beta')
           }
-        },
-        // 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-canary',
+        npm: {
+          devDependencies: {
+            'ember-source': await getChannelURL('canary')
           }
+        }
+      },
+      // 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'
           }
         }
-      ]
-    };
-  });
+      }
+    ]
+  };
 };
diff --git a/package.json b/package.json
@@ -24,19 +24,19 @@
   "dependencies": {
     "@aws-amplify/auth": "^1.2.22",
     "@aws-amplify/core": "^1.0.25",
+    "amazon-cognito-identity-js": "^3.0.12",
     "ember-auto-import": "^1.4.0",
-    "ember-cli-babel": "^7.1.2",
-    "amazon-cognito-identity-js": "^3.0.12"
+    "ember-cli-babel": "^7.1.2"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.10.1",
+    "ember-cli": "~3.12.0",
     "ember-cli-code-coverage": "^1.0.0-beta.6",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
     "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-cli-htmlbars-inline-precompile": "^3.0.0",
     "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-release": "^1.0.0-beta.2",
     "ember-cli-sri": "^2.1.1",
@@ -50,14 +50,14 @@
     "ember-resolver": "^5.0.1",
     "ember-simple-auth": "^1.5.1",
     "ember-sinon": "^4.0.0",
-    "ember-source": "~3.10.0",
+    "ember-source": "~3.12.0",
     "ember-source-channel-url": "^2.0.1",
     "ember-try": "^1.0.0",
     "eslint-plugin-disable-features": "^0.1.3",
-    "eslint-plugin-ember": "^6.3.0",
-    "eslint-plugin-node": "^9.0.1",
+    "eslint-plugin-ember": "^7.0.0",
+    "eslint-plugin-node": "^10.0.0",
     "loader.js": "^4.7.0",
-    "qunit-dom": "^0.8.4"
+    "qunit-dom": "^0.9.0"
   },
   "engines": {
     "node": "8.* || >= 10.*"

diff --git a/testem.js b/testem.js
@@ -13,7 +13,6 @@ module.exports = {
         // --no-sandbox is needed when running Chrome inside a container
         process.env.CI ? '--no-sandbox' : null,
         '--headless',
-        '--disable-gpu',
         '--disable-dev-shm-usage',
         '--disable-software-rasterizer',
         '--mute-audio',

diff --git a/tests/dummy/app/components/index-auth.js b/tests/dummy/app/components/index-auth.js
@@ -59,13 +59,15 @@ export default Component.extend({
     if (session) {
       return this.tokenInfo(session.getAccessToken());
     }
+    return undefined;
   }),
 
   idToken: computed('cognitoSession', function() {
     let session = this.get('cognitoSession');
     if (session) {
       return this.tokenInfo(session.getIdToken());
     }
+    return undefined;
   }),
 
   authenticatedData: computed('session.data', function() {