Skip to content

Commit

Permalink
Update to Ember-cli 3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
cibernox authored and webark committed Dec 23, 2018
1 parent 3bf1cc8 commit 74c892a
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 1,252 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
/.watchmanconfig
/bower.json
/config/ember-try.js
/CONTRIBUTING.md
/ember-cli-build.js
/testem.js
/tests/
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,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:
Expand Down
26 changes: 26 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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/).
6 changes: 0 additions & 6 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ module.exports = function() {
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-default-with-jquery',
env: {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"devDependencies": {
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "^3.5.1",
"ember-cli": "~3.6.0",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-eslint": "^5.0.0",
"ember-cli-htmlbars": "^3.0.1",
Expand All @@ -62,7 +62,7 @@
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.1.2",
"ember-resolver": "^5.0.1",
"ember-source": "^3.6.0",
"ember-source": "^3.6.1",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^1.1.0",
"eslint-plugin-ember": "^6.0.1",
Expand Down
Loading

0 comments on commit 74c892a

Please sign in to comment.