From aa4677290d0dec5fb9b24339dc5dd50f5fee8ede Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Thu, 13 Jun 2019 16:30:15 -0400 Subject: [PATCH] fix: update deps --- .eslintignore | 1 + .eslintrc.js | 3 ++- .gitignore | 2 ++ .npmignore | 2 ++ .travis.yml | 17 +++++++++-------- CONTRIBUTING.md | 26 ++++++++++++++++++++++++++ LICENSE.md | 2 +- config/ember-try.js | 18 +++++++++--------- package.json | 28 ++++++++++++++-------------- tests/dummy/config/environment.js | 2 +- 10 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/.eslintignore b/.eslintignore index fd20a38..72df373 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,6 +8,7 @@ # dependencies /bower_components/ +/node_modules/ # misc /coverage/ diff --git a/.eslintrc.js b/.eslintrc.js index 4c662f0..41e015f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, parserOptions: { - ecmaVersion: 2017, + ecmaVersion: 2018, sourceType: 'module' }, plugins: [ @@ -20,6 +20,7 @@ module.exports = { // node files { files: [ + '.eslintrc.js', '.template-lintrc.js', 'ember-cli-build.js', 'index.js', diff --git a/.gitignore b/.gitignore index 29c9bc6..c40a1b2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ /node_modules/ # misc +/.env* +/.pnp* /.sass-cache /connect.lock /coverage/ diff --git a/.npmignore b/.npmignore index 6032b25..fba9154 100644 --- 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 index f904298..a259c74 100644 --- 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" sudo: false dist: trusty @@ -20,6 +20,12 @@ env: # See https://git.io/vdao3 for details. - JOBS=1 +branches: + only: + - master + # npm version tags + - /^v\d+\.\d+\.\d+/ + jobs: fail_fast: true allow_failures: @@ -38,17 +44,12 @@ 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-2.18 + - env: EMBER_TRY_SCENARIO=ember-lts-3.4 - 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 -before_install: - - npm config set spin false - - npm install -g npm@4 - - npm --version - script: - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..4d14b95 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,26 @@ +# How To Contribute + +## Installation + +* `git clone ` +* `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/). \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md index 198f6da..f8d1edb 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 +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 index 7742969..e7f892f 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -11,26 +11,22 @@ module.exports = function() { return { scenarios: [ { - name: 'ember-lts-2.16', + name: 'ember-lts-2.18', env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, npm: { devDependencies: { '@ember/jquery': '^0.5.1', - 'ember-source': '~2.16.0' + 'ember-source': '~2.18.0' } } }, { - name: 'ember-lts-2.18', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), - }, + name: 'ember-lts-3.4', npm: { devDependencies: { - '@ember/jquery': '^0.5.1', - 'ember-source': '~2.18.0' + 'ember-source': '~3.4.0' } } }, @@ -58,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: { diff --git a/package.json b/package.json index 7e8c685..6619aa8 100644 --- a/package.json +++ b/package.json @@ -31,34 +31,34 @@ "rsvp": "^4.7.0" }, "devDependencies": { - "@ember/optional-features": "^0.6.3", - "broccoli-asset-rev": "^2.7.0", - "ember-cli": "~3.5.0", - "ember-cli-dependency-checker": "^3.0.0", - "ember-cli-eslint": "^4.2.3", - "ember-cli-htmlbars": "^3.0.0", - "ember-cli-htmlbars-inline-precompile": "^1.0.3", + "@ember/optional-features": "^0.7.0", + "broccoli-asset-rev": "^3.0.0", + "ember-cli": "~3.10.1", + "ember-cli-dependency-checker": "^3.1.0", + "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-sri": "^2.1.1", "ember-cli-template-lint": "^1.0.0-beta.1", "ember-cli-uglify": "^2.1.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.0", - "ember-load-initializers": "^1.1.0", + "ember-load-initializers": "^2.0.0", "ember-maybe-import-regenerator": "^0.1.6", - "ember-qunit": "^3.4.1", + "ember-qunit": "^4.4.1", "ember-resolver": "^5.0.1", - "ember-source": "~3.5.0", + "ember-source": "~3.10.0", "ember-source-channel-url": "^1.1.0", "ember-try": "^1.0.0", - "eslint-plugin-ember": "^5.2.0", - "eslint-plugin-node": "^7.0.1", + "eslint-plugin-ember": "^6.2.0", + "eslint-plugin-node": "^9.0.1", "loader.js": "^4.7.0", - "qunit-dom": "^0.8.0", + "qunit-dom": "^0.8.4", "standard-version": "^4.4.0" }, "engines": { - "node": "6.* || 8.* || >= 10.*" + "node": "8.* || >= 10.*" }, "ember-addon": { "configPath": "tests/dummy/config" diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js index 1460909..b43eb48 100644 --- a/tests/dummy/config/environment.js +++ b/tests/dummy/config/environment.js @@ -9,7 +9,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.