Skip to content

Commit 55698ca

Browse files
committed
Update Ember
1 parent afcb21f commit 55698ca

File tree

16 files changed

+1211
-796
lines changed

16 files changed

+1211
-796
lines changed

.eslintignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
2325
'ember-cli-build.js',
2426
'index.js',
2527
'testem.js',
28+
'blueprints/*/index.js',
2629
'config/**/*.js',
2730
'tests/dummy/config/**/*.js'
2831
],

.gitignore

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
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
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
14-
/coverage/*
16+
/coverage/
1517
/libpeerconnection.log
16-
/.idea
17-
npm-debug.log*
18-
yarn-error.log
19-
testem.log
18+
/npm-debug.log*
19+
/testem.log
20+
/yarn-error.log
2021

2122
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
23+
/.node_modules.ember-try/
24+
/bower.json.ember-try
25+
/package.json.ember-try

.npmignore

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,31 @@
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+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.gitignore
16+
/.template-lintrc.js
17+
/.travis.yml
18+
/.watchmanconfig
19+
/bower.json
220
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.eslintrc.js
11-
.gitignore
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
21+
/CONTRIBUTING.md
22+
/ember-cli-build.js
23+
/testem.js
24+
/tests/
25+
/yarn.lock
26+
.gitkeep
1727

1828
# ember-try
19-
.node_modules.ember-try/
20-
bower.json.ember-try
21-
package.json.ember-try
29+
/.node_modules.ember-try/
30+
/bower.json.ember-try
31+
/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: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,37 @@ env:
1818
global:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
21-
matrix:
21+
22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
28+
jobs:
29+
fail_fast: true
30+
allow_failures:
31+
- 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+
2243
# we recommend new addons test the current and previous LTS
2344
# 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
34-
allow_failures:
45+
- stage: "Additional Tests"
46+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
47+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
48+
- env: EMBER_TRY_SCENARIO=ember-release
49+
- env: EMBER_TRY_SCENARIO=ember-beta
3550
- env: EMBER_TRY_SCENARIO=ember-canary
51+
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
3652

3753
before_install:
3854
- curl -o- -L https://yarnpkg.com/install.sh | bash

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) 2016
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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ This way your forms are only submitted when the underlying data is valid, otherw
77
markup will be applied. See the [FormElement documentation](http://kaliber5.github.io/ember-bootstrap/api/classes/Components.FormElement.html) for
88
further details.
99

10-
## Installation
10+
Compatibility
11+
------------------------------------------------------------------------------
12+
13+
* Ember.js v2.18 or above
14+
* Ember CLI v2.13 or above
15+
16+
17+
Installation
18+
------------------------------------------------------------------------------
1119

1220
ember install ember-bootstrap-changeset-validations
1321

@@ -47,6 +55,12 @@ Then assign the changeset based on that to your form:
4755

4856
[Simon Ihmig](https://github.com/simonihmig) @ [kaliber5](http://www.kaliber5.de)
4957

58+
59+
Contributing
60+
------------------------------------------------------------------------------
61+
62+
See the [Contributing](CONTRIBUTING.md) guide for details.
63+
5064
## Copyright and license
5165

5266
Code and documentation copyright 2017 kaliber5 GmbH. Code released under [the MIT license](LICENSE.md).

config/ember-try.js

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,28 @@ module.exports = function() {
66
return Promise.all([
77
getChannelURL('release'),
88
getChannelURL('beta'),
9-
getChannelURL('canary'),
9+
getChannelURL('canary')
1010
]).then((urls) => {
1111
return {
1212
useYarn: true,
1313
scenarios: [
1414
{
15-
name: 'ember-lts-2.12',
16-
npm: {
17-
devDependencies: {
18-
'ember-source': '~2.12.0'
19-
}
20-
}
21-
},
22-
{
23-
name: 'ember-lts-2.16',
15+
name: 'ember-lts-2.18',
16+
env: {
17+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18+
},
2419
npm: {
2520
devDependencies: {
26-
'ember-source': '~2.16.0'
21+
'@ember/jquery': '^0.5.1',
22+
'ember-source': '~2.18.0'
2723
}
2824
}
2925
},
3026
{
31-
name: 'ember-lts-2.18',
27+
name: 'ember-lts-3.4',
3228
npm: {
3329
devDependencies: {
34-
'ember-source': '~2.18.0'
30+
'ember-source': '~3.4.0'
3531
}
3632
}
3733
},
@@ -59,11 +55,28 @@ module.exports = function() {
5955
}
6056
}
6157
},
58+
// The default `.travis.yml` runs this scenario via `npm test`,
59+
// not via `ember try`. It's still included here so that running
60+
// `ember try:each` manually or from a customized CI config will run it
61+
// along with all the other scenarios.
6262
{
6363
name: 'ember-default',
6464
npm: {
6565
devDependencies: {}
6666
}
67+
},
68+
{
69+
name: 'ember-default-with-jquery',
70+
env: {
71+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
72+
'jquery-integration': true
73+
})
74+
},
75+
npm: {
76+
devDependencies: {
77+
'@ember/jquery': '^0.5.1'
78+
}
79+
}
6780
}
6881
]
6982
};

0 commit comments

Comments
 (0)