Update dependencies + ESLint, remove node 4 support

kaliber5 · May 5, 2018 · 1d6ccf4 · 1d6ccf4
1 parent 34aca98
commit 1d6ccf4
Show file tree

Hide file tree

Showing 26 changed files with 2,575 additions and 2,113 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+/blueprints/*/files/**/*.js
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,10 +4,73 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'ember-cli-build.js',
+        'index.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'tests/dummy/config/**/*.js'
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+      })
+    },
+    {
+      files: [
+        'lib/**/*.js',
+        'node-tests/**/*.js'
+      ],
+      excludedFiles: [
+        'addon/**',
+        'addon-test-support/**',
+        'app/**',
+        'tests/dummy/app/**'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true,
+        mocha: true
+      },
+      plugins: ['node'],
+      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+        // add your custom rules and overrides for node files here
+        'ember/no-global-jquery': 0
+      })
+    }
+  ]
 };
diff --git a/.npmignore b/.npmignore
@@ -7,11 +7,16 @@
 .bowerrc
 .editorconfig
 .ember-cli
-.gitignore
 .eslintrc.js
+.gitignore
 .watchmanconfig
 .travis.yml
 bower.json
 ember-cli-build.js
 testem.js
-.ideanode-tests/
+/node-tests
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 ---
 language: node_js
 node_js:
-  - "4"
+  - "6"
 
 sudo: false
 
@@ -19,4 +19,5 @@ install:
   - yarn install
 
 script:
-  - yarn run nodetest
+  - yarn run lint:js
+  - yarn run nodetest
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,83 +1,70 @@
-/* eslint-env node */
-module.exports = {
-  scenarios: [
-    {
-      name: 'ember-lts-2.8',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#lts-2-8'
+'use strict';
+
+const getChannelURL = require('ember-source-channel-url');
+
+module.exports = function() {
+  return Promise.all([
+    getChannelURL('release'),
+    getChannelURL('beta'),
+    getChannelURL('canary')
+  ]).then((urls) => {
+    return {
+      scenarios: [
+        {
+          name: 'ember-lts-2.12',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.12.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': 'lts-2-8'
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null
-        }
-      }
-    },
-    {
-      name: 'ember-lts-2.12',
-      npm: {
-        devDependencies: {
-          'ember-source': '~2.12.0'
-        }
-      }
-    },
-    {
-      name: 'ember-release',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#release'
+        {
+          name: 'ember-lts-2.16',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.16.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': 'release'
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null
-        }
-      }
-    },
-    {
-      name: 'ember-beta',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#beta'
+        {
+          name: 'ember-lts-2.18',
+          npm: {
+            devDependencies: {
+              'ember-source': '~2.18.0'
+            }
+          }
         },
-        resolutions: {
-          'ember': 'beta'
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null
-        }
-      }
-    },
-    {
-      name: 'ember-canary',
-      bower: {
-        dependencies: {
-          'ember': 'components/ember#canary'
+        {
+          name: 'ember-release',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[0]
+            }
+          }
         },
-        resolutions: {
-          'ember': 'canary'
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': null
+        {
+          name: 'ember-beta',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[1]
+            }
+          }
+        },
+        {
+          name: 'ember-canary',
+          npm: {
+            devDependencies: {
+              'ember-source': urls[2]
+            }
+          }
+        },
+        {
+          name: 'ember-default',
+          npm: {
+            devDependencies: {}
+          }
         }
-      }
-    },
-    {
-      name: 'ember-default',
-      npm: {
-        devDependencies: {}
-      }
-    }
-  ]
+      ]
+    };
+  });
 };
diff --git a/config/environment.js b/config/environment.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

diff --git a/index.js b/index.js
@@ -1,4 +1,3 @@
-/* eslint-env node */
 'use strict';
 
 module.exports = {

diff --git a/lib/.eslintrc.js b/lib/.eslintrc.js
diff --git a/lib/tasks/test.js b/lib/tasks/test.js
@@ -44,6 +44,7 @@ module.exports = CoreObject.extend({
     return run()
       .then((failures) => {
         process.on('exit', function () {
+          // eslint-disable-next-line no-process-exit
           process.exit(failures);  // exit with non-zero status if there were failures
         });
       });

diff --git a/lib/tests/setup.js b/lib/tests/setup.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const App = require('ember-cli-addon-tests').App;
 const visit = require('./visit');
 const debug = require('debug')('ember-fastboot-app-tests');

diff --git a/package.json b/package.json
@@ -19,47 +19,54 @@
   },
   "scripts": {
     "build": "ember build",
-    "start": "ember server",
-    "test": "ember try:each",
+    "lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests node-tests",
+    "start": "ember serve",
+    "test": "ember test",
+    "test:all": "ember try:each",
     "nodetest": "mocha node-tests --recursive"
   },
   "dependencies": {
     "chalk": "^2.1.0",
-    "core-object": "^3.0.0",
+    "core-object": "^3.1.5",
     "debug": "^3.1.0",
     "ember-cli-addon-tests": "^0.11.0",
     "ember-cli-babel": "^6.8.2",
     "ember-cli-version-checker": "^2.0.0",
-    "jquery": "^3.1.1",
-    "jsdom": "^9.10.0",
-    "mocha": "^4.0.0",
-    "request": "^2.79.0",
+    "jquery": "^3.3.1",
+    "jsdom": "^11.10.0",
+    "mocha": "^5.1.1",
+    "request": "^2.85.0",
     "rsvp": "^4.7.0"
   },
   "devDependencies": {
-    "ember-cli": "2.15.1",
+    "ember-cli": "~3.1.4",
     "ember-cli-app-version": "^3.1.0",
-    "ember-cli-blueprint-test-helpers": "0.18.0",
-    "ember-cli-dependency-checker": "^2.0.1",
-    "ember-cli-eslint": "4.2.0",
+    "ember-cli-blueprint-test-helpers": "^0.18.3",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-eslint": "^4.2.1",
     "ember-cli-htmlbars": "^2.0.3",
     "ember-cli-htmlbars-inline-precompile": "^1.0.2",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0",
-    "ember-cli-shims": "^1.1.0",
+    "ember-cli-qunit": "^4.1.1",
+    "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-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
+    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.15.0",
+    "ember-source": "~3.1.0",
+    "ember-source-channel-url": "^1.0.1",
+    "ember-try": "^0.2.23",
+    "eslint-plugin-ember": "^5.0.0",
+    "eslint-plugin-node": "^6.0.1",
     "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*"
+    "node": "6.* || >= 8.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}