Skip to content

Commit 2604fbd

Browse files
committed
Drop node 7, 9. Support node 10.
Update to ember-cli 3.2.
1 parent e07dbb3 commit 2604fbd

File tree

11 files changed

+328
-141
lines changed

11 files changed

+328
-141
lines changed

.eslintignore

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
15+
# ember-try
16+
/.node_modules.ember-try/

.eslintrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ module.exports = {
2323
'ember-cli-build.js',
2424
'index.js',
2525
'testem.js',
26+
'blueprints/*/index.js',
2627
'config/**/*.js',
2728
'tests/dummy/config/**/*.js'
2829
],

.gitignore

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
yarn.lock
1718

1819
# ember-try
1920
.node_modules.ember-try/

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "4"
76
- "6"
87

98
sudo: false
@@ -43,7 +42,7 @@ install:
4342
- yarn install --no-lockfile --non-interactive
4443

4544
script:
46-
- npm run lint:js
45+
- yarn lint:js
4746
# Usually, it's ok to finish the test scenario without reverting
4847
# to the addon's original dependency state, skipping "cleanup".
4948
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ It uses [bootstrap-datetimepicker](https://github.com/Eonasdan/bootstrap-datetim
55

66

77
## Requirements
8-
* Node.js 6 or newer
8+
* Node.js 6, 8 or 10
99
* Bootstrap 3
10-
* Ember >= 2
11-
* Ember CLI
10+
* Ember 3+
1211

1312

1413
## Installation

blueprints/ember-cli-bootstrap-datetimepicker/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ module.exports = {
88

99
afterInstall() {
1010
return this.addPackagesToProject([
11-
{ name: 'ember-cli-moment-shim', target: '3.6.0' },
12-
{ name: 'moment', target: '^2.22.0' },
13-
{ name: 'moment-timezone', target: '^0.5.14' }
11+
{ name: 'ember-cli-moment-shim', target: '3.7.1' },
12+
{ name: 'moment', target: '^2.22.2' },
13+
{ name: 'moment-timezone', target: '^0.5.21' }
1414
]);
1515
}
1616
};

config/ember-try.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ module.exports = function() {
66
return Promise.all([
77
getChannelURL('release'),
88
getChannelURL('beta'),
9-
getChannelURL('canary'),
9+
getChannelURL('canary')
1010
]).then((urls) => {
1111
return {
12+
useYarn: true,
1213
scenarios: [
1314
{
1415
name: 'ember-lts-2.12',

package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,42 @@
2525
"repository": "https://github.com/btecu/ember-cli-bootstrap-datetimepicker",
2626
"scripts": {
2727
"build": "ember build",
28-
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
28+
"lint:js": "eslint .",
2929
"start": "ember serve",
3030
"test": "ember test",
3131
"test:all": "ember try:each"
3232
},
3333
"dependencies": {
34-
"ember-cli-babel": "^6.12.0",
34+
"ember-cli-babel": "^6.14.1",
3535
"ember-cli-htmlbars": "^2.0.3",
3636
"eonasdan-bootstrap-datetimepicker": "btecu/bootstrap-datetimepicker"
3737
},
3838
"devDependencies": {
3939
"broccoli-asset-rev": "^2.7.0",
40-
"ember-cli": "~3.1.1",
41-
"ember-cli-dependency-checker": "^2.1.0",
40+
"ember-cli": "~3.2.0",
41+
"ember-cli-dependency-checker": "^2.1.1",
4242
"ember-cli-eslint": "^4.2.3",
43-
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
43+
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
4444
"ember-cli-inject-live-reload": "^1.7.0",
45-
"ember-cli-moment-shim": "3.6.0",
45+
"ember-cli-moment-shim": "3.7.1",
4646
"ember-cli-qunit": "^4.3.2",
4747
"ember-cli-uglify": "^2.1.0",
4848
"ember-disable-prototype-extensions": "^1.1.3",
4949
"ember-export-application-global": "^2.0.0",
50-
"ember-load-initializers": "^1.0.0",
50+
"ember-load-initializers": "^1.1.0",
5151
"ember-maybe-import-regenerator": "^0.1.6",
52-
"ember-resolver": "^4.5.5",
53-
"ember-source": "~3.1.0",
52+
"ember-resolver": "^4.5.6",
53+
"ember-source": "~3.2.2",
5454
"ember-source-channel-url": "^1.1.0",
5555
"ember-try": "^0.2.23",
56-
"eslint-plugin-ember": "^5.1.0",
56+
"eslint-plugin-ember": "^5.2.0",
5757
"eslint-plugin-node": "^6.0.1",
5858
"loader.js": "^4.7.0",
59-
"moment": "^2.22.0",
60-
"moment-timezone": "^0.5.14"
59+
"moment": "^2.22.2",
60+
"moment-timezone": "^0.5.21"
6161
},
6262
"engines": {
63-
"node": "6.* || 8.* || 9.*"
63+
"node": "6.* || 8.* || >= 10.*"
6464
},
6565
"ember-addon": {
6666
"after": [

testem.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ module.exports = {
99
],
1010
browser_args: {
1111
Chrome: {
12-
mode: 'ci',
13-
args: [
12+
ci: [
1413
// --no-sandbox is needed when running Chrome inside a container
15-
process.env.TRAVIS ? '--no-sandbox' : null,
16-
17-
'--disable-gpu',
14+
process.env.CI ? '--no-sandbox' : null,
1815
'--headless',
16+
'--disable-gpu',
17+
'--disable-dev-shm-usage',
18+
'--disable-software-rasterizer',
19+
'--mute-audio',
1920
'--remote-debugging-port=0',
2021
'--window-size=1440,900'
2122
].filter(Boolean)

0 commit comments

Comments
 (0)