update ci scripts and linting, pin broccoli-rollup

ember-cli · Aug 16, 2019 · bedab4e · bedab4e
1 parent 53f1d3d
commit bedab4e
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 138 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,8 @@
 module.exports = {
   root: true,
+  parser: 'babel-eslint',
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: 'module'
   },
   plugins: ['ember'],
@@ -14,10 +15,11 @@ module.exports = {
     Headers: 'off',
     Request: 'off',
     Response: 'off',
-    AbortController: 'off',
+    AbortController: 'off'
   },
   rules: {
-    'no-console': ["error", { allow: ['warn'] }]
+    'ember/no-jquery': 'error',
+    'no-console': ['error', { allow: ['warn'] }]
   },
   overrides: [
     // TypeScript files
@@ -43,15 +45,9 @@ module.exports = {
         'test/**/*.js',
         'tests/dummy/config/**/*.js'
       ],
-      excludedFiles: [
-        'app/**',
-        'addon-test-support/**',
-        'addon/**',
-        'tests/dummy/app/**'
-      ],
+      excludedFiles: ['app/**', 'addon-test-support/**', 'addon/**', 'tests/dummy/app/**'],
       parserOptions: {
-        sourceType: 'script',
-        ecmaVersion: 2015
+        sourceType: 'script'
       },
       env: {
         browser: false,
@@ -64,11 +60,9 @@ module.exports = {
     },
     // node tests
     {
-      files: [
-        'test/**/*.js',
-      ],
+      files: ['test/**/*.js'],
       env: {
-        mocha: true,
+        mocha: true
       },
       rules: {
         'node/no-unpublished-require': 'off',

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 node_js:
   # we recommend testing addons with the same minimum supported node version as Ember CLI
   # so that your addon works for all apps
-  - "6"
+  - "8"
 
 addons:
   chrome: stable
@@ -41,8 +41,9 @@ 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.16
-    - 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

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,6 @@ init:
 environment:
   MOCHA_REPORTER: "mocha-appveyor-reporter"
   matrix:
-    - nodejs_version: "6"
     - nodejs_version: "8"
     - nodejs_version: "10"
 

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -2,82 +2,80 @@
 
 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.16',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0'
-            }
+module.exports = async function() {
+  return {
+    scenarios: [
+      {
+        name: 'ember-lts-3.4',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.4.0'
           }
-        },
-        {
-          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'
-            }
+        }
+      },
+      {
+        name: 'ember-lts-3.8',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.8.0'
           }
-        },
-        {
-          name: 'ember-release',
-          npm: {
-            devDependencies: {
-              'ember-source': urls[0]
-            }
+        }
+      },
+      {
+        name: 'ember-lts-3.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.12.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')
           }
-        },
-        {
-          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
@@ -28,7 +28,7 @@
     "broccoli-concat": "^3.2.2",
     "broccoli-debug": "^0.6.5",
     "broccoli-merge-trees": "^3.0.0",
-    "broccoli-rollup": "^4.1.1",
+    "broccoli-rollup": "^2.1.1",
     "broccoli-stew": "^3.0.0",
     "broccoli-templater": "^2.0.1",
     "calculate-cache-key-for-tree": "^2.0.0",
@@ -39,6 +39,7 @@
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
+    "@ember/optional-features": "^0.7.0",
     "@types/ember": "^3.1.0",
     "@types/ember-data": "^3.1.7",
     "@types/ember-qunit": "^3.4.6",
@@ -49,6 +50,7 @@
     "@types/rsvp": "^4.0.3",
     "@typescript-eslint/eslint-plugin": "^2.0.0",
     "@typescript-eslint/parser": "^2.0.0",
+    "babel-eslint": "^10.0.2",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-test-helper": "^2.0.0",
     "chai": "^4.1.2",

diff --git a/tests/acceptance/root-test.js b/tests/acceptance/root-test.js
@@ -3,7 +3,7 @@ import { setupApplicationTest } from 'ember-qunit';
 import { visit, click, find, currentRouteName } from '@ember/test-helpers';
 import Pretender from 'pretender';
 import fetch from 'fetch';
-import $ from 'jquery';
+
 var server;
 
 module('Acceptance: Root', function(hooks) {
@@ -29,8 +29,8 @@ module('Acceptance: Root', function(hooks) {
     await visit('/');
 
     assert.equal(currentRouteName(), 'index');
-    assert.equal($.trim($('.fetch').text()), 'Hello World! fetch');
-    assert.equal($.trim($('.ajax').text()), 'Hello World! ajax');
+    assert.equal(this.element.querySelector('.fetch').textContent.trim(), 'Hello World! fetch');
+    assert.equal(this.element.querySelector('.ajax').textContent.trim(), 'Hello World! ajax');
   });
 
   test('posting a string', function(assert) {

diff --git a/tsconfig.json b/tsconfig.json
@@ -44,4 +44,3 @@
     "addon-test-support/**/*"
   ]
 }
-}