Skip to content

Commit 0c6aee8

Browse files
committed
Update dependencies
1 parent bd32210 commit 0c6aee8

11 files changed

+1827
-552
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414

1515
# ember-try
1616
/.node_modules.ember-try/
17+
/bower.json.ember-try
18+
/package.json.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+
'.template-lintrc.js',
2324
'ember-cli-build.js',
2425
'index.js',
2526
'testem.js',

.npmignore

+25-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
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+
/.watchmanconfig
16+
/.travis.yml
17+
/bower.json
218
/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
17-
yarn.lock
19+
/ember-cli-build.js
20+
/testem.js
21+
/tests/
22+
/yarn.lock
23+
.gitkeep
1824

1925
# ember-try
20-
.node_modules.ember-try/
21-
bower.json.ember-try
22-
package.json.ember-try
26+
/.node_modules.ember-try/
27+
/bower.json.ember-try
28+
/package.json.ember-try

.template-lintrc.js

+5
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

+29-16
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+
jobs:
23+
fail_fast: true
24+
allow_failures:
25+
- env: EMBER_TRY_SCENARIO=ember-canary
26+
27+
include:
28+
# runs linting and tests with current locked deps
29+
30+
- stage: "Tests"
31+
name: "Tests"
32+
install:
33+
- yarn install --non-interactive
34+
script:
35+
- yarn lint:hbs
36+
- yarn lint:js
37+
- yarn test
38+
39+
- name: "Floating Dependencies"
40+
script:
41+
- yarn 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.16
47+
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
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
@@ -42,7 +58,4 @@ install:
4258
- yarn install --no-lockfile --non-interactive
4359

4460
script:
45-
- yarn lint:js
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
61+
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

config/ember-try.js

+21-8
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ module.exports = function() {
1111
return {
1212
useYarn: true,
1313
scenarios: [
14-
{
15-
name: 'ember-lts-2.12',
16-
npm: {
17-
devDependencies: {
18-
'ember-source': '~2.12.0'
19-
}
20-
}
21-
},
2214
{
2315
name: 'ember-lts-2.16',
16+
env: {
17+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
18+
},
2419
npm: {
2520
devDependencies: {
21+
'@ember/jquery': '^0.5.1',
2622
'ember-source': '~2.16.0'
2723
}
2824
}
2925
},
3026
{
3127
name: 'ember-lts-2.18',
28+
env: {
29+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
30+
},
3231
npm: {
3332
devDependencies: {
33+
'@ember/jquery': '^0.5.1',
3434
'ember-source': '~2.18.0'
3535
}
3636
}
@@ -64,6 +64,19 @@ module.exports = function() {
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
};

config/optional-features.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": false
3+
}

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
module.exports = {
4-
name: 'ember-cli-bootstrap-datetimepicker',
4+
name: require('./package').name,
55

66
included: function(app) {
77
this._super.included(app);

package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@
3131
"test:all": "ember try:each"
3232
},
3333
"dependencies": {
34-
"ember-cli-babel": "^6.14.1",
35-
"ember-cli-htmlbars": "^2.0.3",
34+
"ember-cli-babel": "^7.1.1",
35+
"ember-cli-htmlbars": "^3.0.0",
3636
"eonasdan-bootstrap-datetimepicker": "btecu/bootstrap-datetimepicker"
3737
},
3838
"devDependencies": {
39-
"broccoli-asset-rev": "^2.7.0",
40-
"ember-cli": "~3.2.0",
41-
"ember-cli-dependency-checker": "^2.1.1",
39+
"@ember/optional-features": "^0.6.4",
40+
"broccoli-asset-rev": "^3.0.0",
41+
"ember-cli": "~3.4.2",
42+
"ember-cli-dependency-checker": "^3.0.0",
4243
"ember-cli-eslint": "^4.2.3",
4344
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
44-
"ember-cli-inject-live-reload": "^1.7.0",
45+
"ember-cli-inject-live-reload": "^1.8.2",
4546
"ember-cli-moment-shim": "3.7.1",
4647
"ember-cli-qunit": "^4.3.2",
47-
"ember-cli-uglify": "^2.1.0",
4848
"ember-disable-prototype-extensions": "^1.1.3",
4949
"ember-export-application-global": "^2.0.0",
5050
"ember-load-initializers": "^1.1.0",
5151
"ember-maybe-import-regenerator": "^0.1.6",
52-
"ember-resolver": "^4.5.6",
53-
"ember-source": "~3.2.2",
52+
"ember-resolver": "^5.0.1",
53+
"ember-source": "~3.4.1",
5454
"ember-source-channel-url": "^1.1.0",
55-
"ember-try": "^0.2.23",
55+
"ember-try": "^1.0.0",
5656
"eslint-plugin-ember": "^5.2.0",
57-
"eslint-plugin-node": "^6.0.1",
57+
"eslint-plugin-node": "^7.0.1",
5858
"loader.js": "^4.7.0",
5959
"moment": "^2.22.2",
6060
"moment-timezone": "^0.5.21"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": false
3+
}

0 commit comments

Comments
 (0)