feat: upgrade to ember 3.17

upgrade addon to ember 3.17 BREAKING CHANGE: drop support for older ember & node versions
BBVAEngineering · Mar 24, 2020 · 091f316 · 091f316
1 parent cc22198
commit 091f316
Show file tree

Hide file tree

Showing 15 changed files with 415 additions and 144 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,3 +1,20 @@
+<<<<<<< HEAD
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+=======
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 [*]
 end_of_line = lf
 charset = utf-8

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,6 +1,7 @@
 'use strict';
 
 module.exports = {
+<<<<<<< HEAD
 	root: true,
 	parserOptions: {
 		ecmaVersion: 2017,
@@ -48,4 +49,111 @@ module.exports = {
 			'no-process-env': 0
 		})
 	}]
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
+  env: {
+    browser: true
+  },
+  rules: {
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        '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
+      })
+    }
+  ]
+=======
+  root: true,
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true
+    }
+  },
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
+  env: {
+    browser: true
+  },
+  rules: {
+    'ember/no-jquery': 'error'
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        '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'
+      },
+      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
+      })
+    }
+  ]
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 };
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,13 @@
 /bower_components
 
 # misc
+<<<<<<< HEAD
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+/.env*
+=======
+/.env*
+/.pnp*
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 /.sass-cache
 /connect.lock
 /coverage/*

diff --git a/.npmignore b/.npmignore
@@ -12,6 +12,7 @@
 /.env*
 /.eslintignore
 /.eslintrc.js
+/.git/
 /.gitignore
 /.template-lintrc.js
 /.travis.yml

diff --git a/.template-lintrc.js b/.template-lintrc.js
@@ -1,6 +1,7 @@
 'use strict';
 
 module.exports = {
+<<<<<<< HEAD
 	extends: 'recommended',
 	rules: {
 		'no-bare-strings': true,
@@ -20,4 +21,9 @@ module.exports = {
 		'no-inline-styles': true,
 		'simple-unless': false
 	}
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+  extends: 'recommended'
+=======
+  extends: 'octane'
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 };
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,22 @@
 ---
 language: node_js
+<<<<<<< HEAD
 node_js: stable
 sudo: false
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+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"
+
+sudo: false
+=======
+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"
+
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 dist: trusty
 
 addons:
@@ -16,11 +31,18 @@ env:
     - JOBS=1
 
 jobs:
-  fail_fast: true
+  fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
   include:
+<<<<<<< HEAD
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+    # runs linting and tests with current locked deps
+
+=======
+    # runs linting and tests with current locked deps
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
     - stage: "Tests"
       before_install:
         - npm config set spin false
@@ -34,6 +56,7 @@ jobs:
       before_script:
         - greenkeeper-lockfile-update
       script:
+<<<<<<< HEAD
         - commitlint-travis
         - npm run lint:js
         - npm run lint:hbs
@@ -42,14 +65,43 @@ jobs:
         - greenkeeper-lockfile-upload
       after_success:
         - codecov --file=coverage/lcov.info
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+        - npm run lint:hbs
+        - npm run lint:js
+        - npm test
+=======
+        - npm run lint
+        - npm run test:ember
+
+    - stage: "Additional Tests"
+      name: "Floating Dependencies"
+      install:
+        - npm install --no-package-lock
+      script:
+        - npm run test:ember
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 
+<<<<<<< HEAD
     - stage: "Regression Tests"
       env: EMBER_TRY_SCENARIO=ember-lts-2.18
     - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+    # 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.18
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+=======
+    # we recommend new addons test the current and previous LTS
+    # as well as latest stable release (bonus points to beta/canary)
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
+    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
     - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
+<<<<<<< HEAD
 
     - stage: "Release"
       script: skip
@@ -65,6 +117,15 @@ before_install:
   - npm config set spin false
   - npm install -g npm@6
   - npm --version
+||||||| parent of 27e5d89... v3.7.1...v3.17.0
+
+before_install:
+  - npm config set spin false
+  - npm install -g npm@4
+  - npm --version
+=======
+    - env: EMBER_TRY_SCENARIO=ember-classic
+>>>>>>> 27e5d89... v3.7.1...v3.17.0
 
 script:
   - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

diff --git a/README.md b/README.md
@@ -14,6 +14,10 @@
 
 Service to communicate your application with browser web workers.
 
+* Ember.js v3.12 or above
+* Ember CLI v2.13 or above
+* Node.js v10 or above
+
 This addon can be installed with `ember-cli`:
 
 * `ember install ember-web-workers`
@@ -218,6 +222,13 @@ We use [SemVer](http://semver.org/) for versioning. For the versions available,
 
 See the list of [contributors](https://github.com/BBVAEngineering/ember-wait-for-render/graphs/contributors) who participated in this project.
 
-## License
+Contributing
+------------------------------------------------------------------------------
+
+See the [Contributing](CONTRIBUTING.md) guide for details.
+
+
+License
+------------------------------------------------------------------------------
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details