Merge pull request #50 from pswai/update-ember-cli

Update all non-React dependencies (Ember CLI, Babel 7, etc)

.gitignore

@@ -9,6 +9,8 @@
 /node_modules/
 
 # misc
+/.env*
+/.pnp*
 /.sass-cache
 /connect.lock
 /coverage/

.npmignore

@@ -1,22 +1,31 @@
-/bower_components
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/.bowerrc
+/.editorconfig
+/.ember-cli
+/.env*
+/.eslintignore
+/.eslintrc.js
+/.gitignore
+/.template-lintrc.js
+/.travis.yml
+/.watchmanconfig
+/bower.json
 /config/ember-try.js
-/dist
-/tests
-/tmp
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.eslintrc.js
-.gitignore
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js
-yarn.lock
+/CONTRIBUTING.md
+/ember-cli-build.js
+/testem.js
+/tests/
+/yarn.lock
+.gitkeep
 
 # ember-try
-.node_modules.ember-try/
-bower.json.ember-try
-package.json.ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

CHANGELOG.md

@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-- Support Ember >= 3.6.0 (#47)
+### Added
+
+- Support Ember >= 3.6.0. (#47)
+- Upgrade majority of dependencies (Babel 7, Ember CLI, etc).
+- Drop `ember-cli-mocha` in favor of `ember-mocha`.
+
+### Changed
+
+- Stop using `Ember.NAME_KEY` for connected component name as it is deprecated.
 
 ## [0.3.0] - 2018-10-07
 

addon/connectAdvanced.js

@@ -145,9 +145,7 @@ function connectAdvanced(
     ConnectedComponent = WrappedComponent.extend({
       init() {
         const wrappedComponentName =
-          this.get(Ember.NAME_KEY) ||
-          this.get('_debugContainerKey') ||
-          'Component';
+          this.get('_debugContainerKey') || 'Component';
         const store = this[storeKey];
         const updater = createUpdater(store, wrappedComponentName);
         let unsubscribe;

ember-cli-build.js

@@ -5,7 +5,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 module.exports = function(defaults) {
   let app = new EmberAddon(defaults, {
     babel: {
-      plugins: ['transform-object-rest-spread'],
+      plugins: ['@babel/plugin-proposal-object-rest-spread'],
     },
   });
 

index.js

@@ -10,7 +10,7 @@ module.exports = {
       },
     },
     babel: {
-      plugins: ['transform-object-rest-spread'],
+      plugins: ['@babel/plugin-proposal-object-rest-spread'],
     },
   },
 };

package.json

@@ -39,46 +39,50 @@
     ]
   },
   "dependencies": {
-    "ember-auto-import": "^1.2.13",
-    "ember-cli-babel": "^6.6.0",
+    "ember-auto-import": "^1.2.21",
+    "ember-cli-babel": "^7.1.2",
     "react": "^16.4.1",
     "react-redux": "^5.0.7",
     "redux": "^4.0.0",
     "semver": "^5.6.0"
   },
   "devDependencies": {
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.4.0",
+    "@ember/jquery": "^0.6.0",
+    "@ember/optional-features": "^0.7.0",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "~3.4.1",
+    "chai": "^4.2.0",
+    "ember-cli": "~3.8.1",
     "ember-cli-chai": "^0.5.0",
-    "ember-cli-dependency-checker": "^3.0.0",
+    "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
-    "ember-cli-inject-live-reload": "^1.8.2",
-    "ember-cli-mocha": "https://github.com/ember-cli/ember-cli-mocha.git#64d8742",
-    "ember-cli-shims": "^1.2.0",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^2.0.0",
-    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-uglify": "^2.1.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
     "ember-export-application-global": "^2.0.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-resolver": "^5.0.1",
-    "ember-sinon": "^2.1.0",
-    "ember-source": "~3.4.0",
-    "ember-source-channel-url": "^1.0.1",
-    "ember-try": "^1.0.0",
+    "ember-mocha": "^0.14.0",
+    "ember-resolver": "^5.1.3",
+    "ember-sinon": "^3.1.0",
+    "ember-source": "~3.8.0",
+    "ember-source-channel-url": "^1.1.0",
+    "ember-try": "^1.1.0",
     "eslint": "^5.15.3",
     "eslint-config-prettier": "^4.1.0",
     "eslint-plugin-ember": "^6.3.0",
     "eslint-plugin-node": "^8.0.1",
     "eslint-plugin-prettier": "2.6.0",
     "husky": "^1.3.1",
     "lint-staged": "^8.1.5",
-    "loader.js": "^4.2.3",
+    "loader.js": "^4.7.0",
     "prettier": "^1.16.4",
-    "sinon-chai": "^3.2.0"
+    "sinon": "^7.3.0",
+    "sinon-chai": "^3.3.0"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"

tests/dummy/config/optional-features.json

@@ -0,0 +1,3 @@
+{
+  "jquery-integration": true
+}