Apply update patch

ivanvanderbyl · Jan 18, 2019 · e5feeff · e5feeff
1 parent c8521ab
commit e5feeff
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 94 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -8,6 +8,7 @@
 
 # dependencies
 /bower_components/
+/node_modules/
 
 # misc
 /coverage/

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -15,6 +15,7 @@ module.exports = {
     // node files
     {
       files: [
+        '.eslintrc.js',
         '.template-lintrc.js',
         'ember-cli-build.js',
         'index.js',

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 /node_modules/
 
 # misc
+/.env*
 /.sass-cache
 /connect.lock
 /coverage/

diff --git a/.npmignore b/.npmignore
@@ -9,6 +9,7 @@
 /.bowerrc
 /.editorconfig
 /.ember-cli
+/.env*
 /.eslintignore
 /.eslintrc.js
 /.gitignore
@@ -17,6 +18,7 @@
 /.watchmanconfig
 /bower.json
 /config/ember-try.js
+/CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js
 /tests/

diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
+---
 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
-  - '10'
+  - "6"
 
 sudo: false
 dist: trusty
@@ -11,7 +12,19 @@ addons:
   chrome: stable
 
 cache:
-  yarn: true
+  directories:
+    - $HOME/.npm
+
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
+branches:
+  only:
+    - master
+    # npm version tags
+    - /^v\d+\.\d+\.\d+/
 
 jobs:
   fail_fast: true
@@ -21,43 +34,27 @@ jobs:
   include:
     # runs linting and tests with current locked deps
 
-    - stage: 'Tests'
-      name: 'Tests'
-      install:
-        - yarn install --non-interactive
+    - stage: "Tests"
+      name: "Tests"
       script:
-        - yarn lint:js
-        - yarn test
+        - npm run lint:hbs
+        - npm run lint:js
+        - npm test
 
-    - name: 'Floating Dependencies'
-      script:
-        - yarn test
     # 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-2.18-d3-4.1
-    - env: EMBER_TRY_SCENARIO=ember-2.18-d3-4.7
-    - env: EMBER_TRY_SCENARIO=ember-2.18-d3-4.4.13
-    - env: EMBER_TRY_SCENARIO=ember-3.0-d3-5.0.0
-    - env: EMBER_TRY_SCENARIO=ember-3.0-d3-4.1
-    - env: EMBER_TRY_SCENARIO=ember-default
+    - stage: "Additional Tests"
+      env: EMBER_TRY_SCENARIO=ember-lts-2.18
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
-    - stage: 'Canary Tests'
-      script:
-        - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
-      env: EMBER_TRY_SCENARIO=ember-canary
-matrix:
-  fast_finish: true
+    - env: EMBER_TRY_SCENARIO=ember-canary
+    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
 
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-install:
-  - yarn install --no-lockfile --non-interactive
+  - npm config set spin false
+  - npm install -g npm@4
+  - npm --version
 
 script:
-  - yarn lint:js
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,26 @@
+# How To Contribute
+
+## Installation
+
+* `git clone <repository-url>`
+* `cd my-addon`
+* `npm install`
+
+## Linting
+
+* `npm run lint:hbs`
+* `npm run lint:js`
+* `npm run lint:js -- --fix`
+
+## Running tests
+
+* `ember test` – Runs the test suite on the current Ember version
+* `ember test --server` – Runs the test suite in "watch mode"
+* `ember try:each` – Runs the test suite against multiple Ember versions
+
+## Running the dummy application
+
+* `ember serve`
+* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
+
+For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016
+Copyright (c) 2019
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -1,80 +1,32 @@
-const getChannelURL = require('ember-source-channel-url')
+'use strict';
+
+const getChannelURL = require('ember-source-channel-url');
 
 module.exports = function() {
   return Promise.all([
     getChannelURL('release'),
     getChannelURL('beta'),
     getChannelURL('canary')
-  ]).then(urls => {
+  ]).then((urls) => {
     return {
-      useYarn: true,
       scenarios: [
         {
-          name: 'ember-lts-2.16',
+          name: 'ember-lts-2.18',
           env: {
             EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
           },
           npm: {
             devDependencies: {
               '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.16.0',
-              d3: '4.0.0'
-            }
-          }
-        },
-
-        {
-          name: 'ember-2.18-d3-4.1',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0',
-              d3: '4.1.0'
-            }
-          }
-        },
-
-        {
-          name: 'ember-2.18-d3-4.7',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.18.0',
-              d3: '4.7.0'
-            }
-          }
-        },
-
-        {
-          name: 'ember-2.18-d3-4.4.13',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.18.0',
-              d3: '4.13.0'
+              'ember-source': '~2.18.0'
             }
           }
         },
-
-        {
-          name: 'ember-3.0-d3-5.0.0',
-          npm: {
-            devDependencies: {
-              'ember-source': '~3.0.0',
-              d3: '^5.0.0'
-            }
-          }
-        },
-
         {
-          name: 'ember-3.0-d3-4.1',
+          name: 'ember-lts-3.4',
           npm: {
             devDependencies: {
-              'ember-source': '~3.0.0'
-            },
-            dependencies: {
-              d3: '^4.1.0'
+              'ember-source': '~3.4.0'
             }
           }
         },
@@ -102,6 +54,10 @@ module.exports = function() {
             }
           }
         },
+        // 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: {
@@ -122,6 +78,6 @@ module.exports = function() {
           }
         }
       ]
-    }
-  })
-}
+    };
+  });
+};
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   "devDependencies": {
     "@mike-north/js-lib-semantic-release-config": "1.0.1",
     "broccoli-asset-rev": "^3.0.0",
-    "ember-cli": "^3.5.0",
+    "ember-cli": "~3.7.1",
     "ember-cli-app-version": "^3.2.0",
     "ember-cli-changelog": "^0.3.4",
     "ember-cli-dependency-checker": "^3.0.0",
@@ -46,7 +46,7 @@
     "ember-load-initializers": "^2.0.0",
     "ember-maybe-import-regenerator": "^0.1.6",
     "ember-resolver": "^5.0.1",
-    "ember-source": "^3.5.1",
+    "ember-source": "~3.7.0",
     "ember-source-channel-url": "^1.1.0",
     "ember-try": "^1.1.0",
     "eslint-plugin-ember": "^5.4.0",
@@ -65,7 +65,7 @@
     "broccoli-merge-trees": "^3.0.0",
     "d3": "^5.0.0",
     "d3-selection-multi": "^1.0.1",
-    "ember-cli-babel": "^6.16.0"
+    "ember-cli-babel": "^7.1.2"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",