Skip to content

Commit

Permalink
Merge pull request #69 from PoslinskiNet/3.6-upgrade
Browse files Browse the repository at this point in the history
3.6 upgrade
  • Loading branch information
PoslinskiNet authored Dec 28, 2018
2 parents 240e4cb + 4802c86 commit d4179e1
Show file tree
Hide file tree
Showing 8 changed files with 848 additions and 779 deletions.
48 changes: 24 additions & 24 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,50 @@ module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
sourceType: "module"
},
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
plugins: ["ember"],
extends: ["eslint:recommended", "plugin:ember/recommended"],
env: {
browser: true
},
rules: {
"ember/no-observers": "off"
},
overrides: [
// node files
{
files: [
'.eslintrc.js',
'.template-lintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
".eslintrc.js",
".template-lintrc.js",
"ember-cli-build.js",
"index.js",
"testem.js",
"config/**/*.js",
"tests/dummy/config/**/*.js"
],
excludedFiles: [
'addon/**',
'addon-test-support/**',
'app/**',
'tests/dummy/app/**'
"addon/**",
"addon-test-support/**",
"app/**",
"tests/dummy/app/**"
],
parserOptions: {
sourceType: 'script',
sourceType: "script",
ecmaVersion: 2015
},
env: {
browser: false,
node: true
},
plugins: ['node'],
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
'node/no-extraneous-require': 'off'
})
plugins: ["node"],
rules: Object.assign(
{},
require("eslint-plugin-node").configs.recommended.rules,
{
"node/no-extraneous-require": "off"
}
)
}
]
};
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 @@ -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:
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 [email protected]:PoslinskiNet/ember-pell.git`
* `cd ember-pell`
* `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/).
19 changes: 0 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,6 @@ export default Ember.Controller.extend({

Available options are documented in [Pell repository](https://github.com/jaredreich/pell)

### 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 [http://www.ember-cli.com/](http://www.ember-cli.com/).

## LICENSE

See the LICENSE file included in this repository.
Expand Down
6 changes: 0 additions & 6 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ module.exports = function() {
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
},
{
name: 'ember-default-with-jquery',
env: {
Expand Down
Loading

0 comments on commit d4179e1

Please sign in to comment.