Skip to content

Commit 4f4e472

Browse files
committed
Update blueprint
1 parent 158da74 commit 4f4e472

9 files changed

+752
-951
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'.eslintrc.js',
2324
'.template-lintrc.js',
2425
'ember-cli-build.js',
2526
'index.js',

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.sass-cache
1314
/connect.lock
1415
/coverage/

.npmignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
1415
/.gitignore
15-
/.watchmanconfig
16+
/.template-lintrc.js
1617
/.travis.yml
18+
/.watchmanconfig
1719
/bower.json
1820
/config/ember-try.js
21+
/CONTRIBUTING.md
1922
/ember-cli-build.js
2023
/testem.js
2124
/tests/

.travis.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ env:
1919
# See https://git.io/vdao3 for details.
2020
- JOBS=1
2121

22+
branches:
23+
only:
24+
- master
25+
# npm version tags
26+
- /^v\d+\.\d+\.\d+/
27+
2228
jobs:
2329
fail_fast: true
2430
allow_failures:
@@ -43,8 +49,8 @@ jobs:
4349
# we recommend new addons test the current and previous LTS
4450
# as well as latest stable release (bonus points to beta/canary)
4551
- stage: "Additional Tests"
46-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
47-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
52+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
53+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
4854
- env: EMBER_TRY_SCENARIO=ember-release
4955
- env: EMBER_TRY_SCENARIO=ember-beta
5056
- env: EMBER_TRY_SCENARIO=ember-canary

CONTRIBUTING.md

+26
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 ember-cli-bootstrap-datetimepicker`
7+
* `yarn install`
8+
9+
## Linting
10+
11+
* `yarn lint:hbs`
12+
* `yarn lint:js`
13+
* `yarn 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/).

config/ember-try.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,22 @@ module.exports = function() {
1212
useYarn: true,
1313
scenarios: [
1414
{
15-
name: 'ember-lts-2.16',
15+
name: 'ember-lts-2.18',
1616
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
17+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
1818
},
1919
npm: {
2020
devDependencies: {
2121
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.16.0'
22+
'ember-source': '~2.18.0'
2323
}
2424
}
2525
},
2626
{
27-
name: 'ember-lts-2.18',
28-
env: {
29-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
30-
},
27+
name: 'ember-lts-3.4',
3128
npm: {
3229
devDependencies: {
33-
'@ember/jquery': '^0.5.1',
34-
'ember-source': '~2.18.0'
30+
'ember-source': '~3.4.0'
3531
}
3632
}
3733
},
@@ -59,6 +55,10 @@ module.exports = function() {
5955
}
6056
}
6157
},
58+
// The default `.travis.yml` runs this scenario via `yarn 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: {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"eslint-plugin-ember": "^6.2.0",
6262
"eslint-plugin-node": "^8.0.1",
6363
"loader.js": "^4.7.0",
64-
"moment": "^2.24.2",
64+
"moment": "^2.24.0",
6565
"moment-timezone": "^0.5.23",
6666
"qunit-dom": "^0.8.4"
6767
},

0 commit comments

Comments
 (0)