Merge pull request #161 from emberobserver/ember-3.10

Upgrade to Ember 3.10
emberobserver · Jun 14, 2019 · a92a5b1 · a92a5b1
2 parents f81c011 + ef4fbc7
commit a92a5b1
Show file tree

Hide file tree

Showing 6 changed files with 1,565 additions and 1,451 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module'
   },
   plugins: [
@@ -21,6 +21,14 @@ module.exports = {
     'ember/use-brace-expansion': 'off'
   },
   overrides: [
+    // tests
+    {
+      files: ['tests/**/*.js'],
+      excludedFiles: ['tests/dummy/**/*.js'],
+      globals: {
+        server: true,
+      }
+    },
     // node files
     {
       files: [
@@ -40,19 +48,15 @@ module.exports = {
       env: {
         browser: false,
         node: true
-      }
-    },
-
-    // test files
-    {
-      files: ['tests/**/*.js'],
-      excludedFiles: ['tests/dummy/**/*.js'],
-      env: {
-        embertest: true
       },
-      globals: {
-        server: true,
-      }
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off'
+      })
     }
   ]
 };
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "6"
+  - "8"
 
 sudo: false
 dist: trusty
@@ -18,9 +18,6 @@ env:
     # See https://git.io/vdao3 for details.
     - JOBS=1
 
-before_install:
-  - npm config set spin false
-
 script:
   - npm run lint:hbs
   - npm run lint:js

diff --git a/config/deprecation-workflow.js b/config/deprecation-workflow.js
@@ -1,6 +1,5 @@
 window.deprecationWorkflow = window.deprecationWorkflow || {};
 window.deprecationWorkflow.config = {
   workflow: [
-    { handler: "silence", matchId: "ember-polyfills.deprecate-merge" }, // ember-data, sigh (https://github.com/emberjs/data/pull/5812)
   ]
 };
diff --git a/config/environment.js b/config/environment.js
@@ -13,7 +13,7 @@ module.exports = function(environment) {
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
       },
       EXTEND_PROTOTYPES: {
         // Prevent Ember Data from overriding Date.parse.

diff --git a/package.json b/package.json
@@ -19,16 +19,16 @@
     "template-lint": "npx ember-template-lint app/templates"
   },
   "devDependencies": {
-    "@ember/jquery": "^0.5.2",
-    "@ember/optional-features": "^0.6.3",
+    "@ember/jquery": "^0.6.0",
+    "@ember/optional-features": "^0.7.0",
     "bourbon": "4.2.3",
     "bourbon-neat": "1.7.1",
-    "broccoli-asset-rev": "^2.7.0",
+    "broccoli-asset-rev": "^3.0.0",
     "dompurify": "^1.0.8",
-    "ember-ajax": "^4.0.1",
-    "ember-cli": "~3.8.0",
+    "ember-ajax": "^5.0.0",
+    "ember-cli": "~3.10.1",
     "ember-cli-app-version": "^3.2.0",
-    "ember-cli-babel": "^7.1.2",
+    "ember-cli-babel": "^7.7.3",
     "ember-cli-code-coverage": "^0.4.2",
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-deploy": "^1.0.2",
@@ -38,9 +38,9 @@
     "ember-cli-deploy-with-rsync": "^0.1.1",
     "ember-cli-deprecation-workflow": "^1.0.1",
     "ember-cli-document-title-northm": "^1.0.2",
-    "ember-cli-eslint": "^4.2.3",
-    "ember-cli-htmlbars": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^1.0.3",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
     "ember-cli-inject-live-reload": "^1.8.2",
     "ember-cli-inline-content": "0.4.1",
     "ember-cli-mirage": "^0.4.9",
@@ -51,32 +51,36 @@
     "ember-cli-template-lint": "^1.0.0-beta.1",
     "ember-cli-test-loader": "^2.2.0",
     "ember-cli-uglify": "^2.1.0",
-    "ember-concurrency": "^0.8.27",
-    "ember-data": "~3.8.0",
+    "ember-concurrency": "^0.10.0",
+    "ember-data": "~3.10.0",
     "ember-export-application-global": "^2.0.0",
-    "ember-feature-flags": "^5.0.0",
-    "ember-load-initializers": "^1.1.0",
+    "ember-feature-flags": "kategengler/ember-feature-flags#06b33fd",
+    "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-metrics": "^0.13.0",
     "ember-moment": "^7.6.0",
     "ember-pad": "1.2.3",
     "ember-percy": "^1.5.0",
     "ember-power-select": "^2.2.1",
     "ember-power-select-typeahead": "^0.7.3",
-    "ember-qunit": "^3.4.1",
+    "ember-qunit": "^4.4.1",
     "ember-resolver": "^5.0.1",
-    "ember-router-scroll": "dollarshaveclub/ember-router-scroll#4452258",
-    "ember-source": "~3.8.0",
+    "ember-router-scroll": "dollarshaveclub/ember-router-scroll#24799d7",
+    "ember-source": "~3.10.0",
     "ember-source-channel-url": "^1.0.1",
     "emberx-select": "^3.1.1",
-    "eslint-plugin-ember": "^5.2.0",
+    "eslint-plugin-ember": "^6.2.0",
+    "eslint-plugin-node": "^9.0.1",
     "glob": "^7.1.1",
     "http-proxy": "^1.15.2",
     "loader.js": "^4.7.0",
     "morgan": "^1.9.0",
-    "qunit-dom": "^0.8.0"
+    "qunit-dom": "^0.8.4"
   },
   "engines": {
-    "node": "6.* || 8.* || >= 10.*"
+    "node": "8.* || >= 10.*"
+  },
+  "resolutions": {
+    "ember-concurrency": "^0.10.0"
   }
 }