Skip to content

Commit 0ca640e

Browse files
knownasilyaknownasilya
committed
fix: update using ember-cli-update
1 parent c25d89f commit 0ca640e

14 files changed

Lines changed: 205 additions & 114 deletions

‎.eslintignore‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1-
/blueprints/*/files/**/*.js
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

‎.eslintrc.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ module.exports = {
2424
// node files
2525
{
2626
files: [
27+
'.eslintrc.js',
28+
'.template-lintrc.js',
2729
'ember-cli-build.js',
2830
'index.js',
2931
'testem.js',

‎.gitignore‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
1919

2020
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
21+
/.node_modules.ember-try/
22+
/bower.json.ember-try
23+
/package.json.ember-try

‎.npmignore‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.eslintignore
13+
/.eslintrc.js
14+
/.gitignore
15+
/.template-lintrc.js
16+
/.travis.yml
17+
/.watchmanconfig
18+
/bower.json
219
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.gitignore
11-
.eslintrc.js
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
20+
/CONTRIBUTING.md
21+
/ember-cli-build.js
22+
/testem.js
23+
/tests/
24+
/yarn.lock
25+
.gitkeep
26+
27+
# ember-try
28+
/.node_modules.ember-try/
29+
/bower.json.ember-try
30+
/package.json.ember-try

‎.template-lintrc.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended'
5+
};

‎.travis.yml‎

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "6"
57

6-
useYarn: true
7-
88
sudo: false
99
dist: trusty
1010

@@ -18,22 +18,38 @@ env:
1818
global:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
21-
matrix:
22-
# we recommend new addons test the current and previous LTS
23-
# as well as latest stable release (bonus points to beta/canary)
24-
- EMBER_TRY_SCENARIO=ember-lts-2.12
25-
- EMBER_TRY_SCENARIO=ember-lts-2.16
26-
- EMBER_TRY_SCENARIO=ember-lts-2.18
27-
- EMBER_TRY_SCENARIO=ember-release
28-
- EMBER_TRY_SCENARIO=ember-beta
29-
- EMBER_TRY_SCENARIO=ember-canary
30-
- EMBER_TRY_SCENARIO=ember-default
31-
32-
matrix:
33-
fast_finish: true
21+
22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
28+
jobs:
29+
fail_fast: true
3430
allow_failures:
3531
- env: EMBER_TRY_SCENARIO=ember-canary
32+
33+
include:
34+
# runs linting and tests with current locked deps
35+
36+
- stage: "Tests"
37+
name: "Tests"
38+
script:
39+
- npm run lint:hbs
40+
- npm run lint:js
41+
- npm test
42+
43+
# we recommend new addons test the current and previous LTS
44+
# as well as latest stable release (bonus points to beta/canary)
45+
- stage: "Additional Tests"
46+
env: EMBER_TRY_SCENARIO=ember-lts-2.16
47+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
48+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
49+
- env: EMBER_TRY_SCENARIO=ember-release
3650
- env: EMBER_TRY_SCENARIO=ember-beta
51+
- env: EMBER_TRY_SCENARIO=ember-canary
52+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3753

3854
before_install:
3955
- curl -o- -L https://yarnpkg.com/install.sh | bash
@@ -43,6 +59,4 @@ install:
4359
- yarn install --no-lockfile --non-interactive
4460

4561
script:
46-
# Usually, it's ok to finish the test scenario without reverting
47-
# to the addon's original dependency state, skipping "cleanup".
48-
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
62+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# How To Contribute
2+
3+
## Installation
4+
5+
* `git clone <repository-url>`
6+
* `cd my-addon`
7+
* `npm install`
8+
9+
## Linting
10+
11+
* `npm run lint:hbs`
12+
* `npm run lint:js`
13+
* `npm run lint:js -- --fix`
14+
15+
## Running tests
16+
17+
* `ember test` – Runs the test suite on the current Ember version
18+
* `ember test --server` – Runs the test suite in "watch mode"
19+
* `ember try:each` – Runs the test suite against multiple Ember versions
20+
21+
## Running the dummy application
22+
23+
* `ember serve`
24+
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
25+
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015
3+
Copyright (c) 2019
44

55
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:
66

‎README.md‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -99,30 +99,9 @@ var app = new EmberApp(defaults, {
9999

100100
## Contributing
101101

102-
### Installation
102+
See the [Contributing](CONTRIBUTING.md) guide.
103103

104-
* `git clone <repository-url>`
105-
* `cd my-addon`
106-
* `npm install`
107-
108-
### Linting
109-
110-
* `npm run lint:js`
111-
* `npm run lint:js -- --fix`
112-
113-
### Running tests
114-
115-
* `ember test` – Runs the test suite on the current Ember version
116-
* `ember test --server` – Runs the test suite in "watch mode"
117-
* `ember try:each` – Runs the test suite against multiple Ember versions
118-
119-
### Running the dummy application
120-
121-
* `ember serve`
122-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
123-
124-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
125-
126-
## License
104+
License
105+
------------------------------------------------------------------------------
127106

128107
This project is licensed under the [MIT License](LICENSE.md).

‎config/ember-try.js‎

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,34 @@ module.exports = function() {
1111
return {
1212
scenarios: [
1313
{
14-
name: 'ember-lts-2.12',
14+
name: 'ember-lts-2.16',
15+
env: {
16+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
17+
},
1518
npm: {
1619
devDependencies: {
17-
'ember-source': '~2.12.0'
20+
'@ember/jquery': '^0.5.1',
21+
'ember-source': '~2.16.0'
1822
}
1923
}
2024
},
2125
{
22-
name: 'ember-lts-2.16',
26+
name: 'ember-lts-2.18',
27+
env: {
28+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
29+
},
2330
npm: {
2431
devDependencies: {
25-
'ember-source': '~2.16.0'
32+
'@ember/jquery': '^0.5.1',
33+
'ember-source': '~2.18.0'
2634
}
2735
}
2836
},
2937
{
30-
name: 'ember-lts-2.18',
38+
name: 'ember-lts-3.4',
3139
npm: {
3240
devDependencies: {
33-
'ember-source': '~2.18.0'
41+
'ember-source': '~3.4.0'
3442
}
3543
}
3644
},
@@ -58,11 +66,28 @@ module.exports = function() {
5866
}
5967
}
6068
},
69+
// The default `.travis.yml` runs this scenario via `npm test`,
70+
// not via `ember try`. It's still included here so that running
71+
// `ember try:each` manually or from a customized CI config will run it
72+
// along with all the other scenarios.
6173
{
6274
name: 'ember-default',
6375
npm: {
6476
devDependencies: {}
6577
}
78+
},
79+
{
80+
name: 'ember-default-with-jquery',
81+
env: {
82+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
83+
'jquery-integration': true
84+
})
85+
},
86+
npm: {
87+
devDependencies: {
88+
'@ember/jquery': '^0.5.1'
89+
}
90+
}
6691
}
6792
]
6893
};

0 commit comments

Comments
 (0)