Skip to content

Commit 384cfb5

Browse files
authored
Merge pull request #110 from rwwagner90/ember-3.13
Ember 3.13
2 parents 573e4a5 + cca2590 commit 384cfb5

7 files changed

+1709
-1299
lines changed

.eslintrc.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
45
ecmaVersion: 2018,
56
sourceType: 'module'
@@ -15,6 +16,7 @@ module.exports = {
1516
browser: true
1617
},
1718
rules: {
19+
'ember/no-jquery': 'error'
1820
},
1921
overrides: [
2022
// node files

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

.travis.yml

+17-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,28 @@ branches:
2828

2929
jobs:
3030
fail_fast: true
31+
allow_failures:
32+
- env: EMBER_TRY_SCENARIO=ember-canary
3133

3234
include:
3335
# runs linting and tests with current locked deps
36+
3437
- stage: "Tests"
3538
name: "Tests"
3639
script:
3740
- npm run lint:hbs
3841
- npm run lint:js
39-
- npm run test:all
42+
- npm test
43+
44+
# we recommend new addons test the current and previous LTS
45+
# as well as latest stable release (bonus points to beta/canary)
46+
- stage: "Additional Tests"
47+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
49+
- env: EMBER_TRY_SCENARIO=ember-release
50+
- env: EMBER_TRY_SCENARIO=ember-beta
51+
- env: EMBER_TRY_SCENARIO=ember-canary
52+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
53+
54+
script:
55+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Installation
44

55
* `git clone <repository-url>`
6-
* `cd my-addon`
6+
* `cd ember-cli-chart`
77
* `npm install`
88

99
## Linting

0 commit comments

Comments
 (0)