Skip to content

Commit 707f267

Browse files
btecubtecu
committed
Drop support for Node 4. Update ember-cli and dependencies.
1 parent 663979b commit 707f267

24 files changed

+1896
-728
lines changed

‎.ember-cli

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false
2+
"disableAnalytics": true
93
}

‎.eslintrc.js

+38-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,46 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'ember-cli-build.js',
24+
'index.js',
25+
'testem.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js'
28+
],
29+
excludedFiles: [
30+
'addon/**',
31+
'addon-test-support/**',
32+
'app/**',
33+
'tests/dummy/app/**'
34+
],
35+
parserOptions: {
36+
sourceType: 'script',
37+
ecmaVersion: 2015
38+
},
39+
env: {
40+
browser: false,
41+
node: true
42+
},
43+
plugins: ['node'],
44+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
45+
// add your custom rules and overrides for node files here
46+
})
47+
}
48+
]
1349
};

‎.npmignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10-
.gitignore
1110
.eslintrc.js
11+
.gitignore
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
18+
# ember-try
19+
.node_modules.ember-try/
20+
bower.json.ember-try
21+
package.json.ember-try

‎.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ env:
2222
matrix:
2323
# we recommend new addons test the current and previous LTS
2424
# as well as latest stable release (bonus points to beta/canary)
25-
- EMBER_TRY_SCENARIO=ember-lts-2.8
2625
- EMBER_TRY_SCENARIO=ember-lts-2.12
26+
- EMBER_TRY_SCENARIO=ember-lts-2.16
27+
- EMBER_TRY_SCENARIO=ember-lts-2.18
2728
- EMBER_TRY_SCENARIO=ember-release
2829
- EMBER_TRY_SCENARIO=ember-beta
2930
- EMBER_TRY_SCENARIO=ember-canary
@@ -42,6 +43,7 @@ install:
4243
- yarn install --no-lockfile --non-interactive
4344

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

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017
3+
Copyright (c) 2018
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

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

66

77
## Requirements
8-
* Node.js 4 or newer
8+
* Node.js 6 or newer
99
* Bootstrap 3
1010
* Ember >= 2
1111
* Ember CLI

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
module.exports = {
55
description: '',
66

7-
normalizeEntityName: function() {},
7+
normalizeEntityName() {},
88

9-
afterInstall: function() {
9+
afterInstall() {
1010
return this.addPackagesToProject([
11-
{ name: 'ember-cli-moment-shim', target: '3.5.0' },
12-
{ name: 'moment', target: '^2.19.1' },
13-
{ name: 'moment-timezone', target: '^0.5.13' }
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' }
1414
]);
1515
}
1616
};

‎config/ember-try.js

+64-78
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,70 @@
1-
/* eslint-env node */
2-
module.exports = {
3-
scenarios: [
4-
{
5-
name: 'ember-lts-2.8',
6-
bower: {
7-
dependencies: {
8-
'ember': 'components/ember#lts-2-8'
1+
'use strict';
2+
3+
const getChannelURL = require('ember-source-channel-url');
4+
5+
module.exports = function() {
6+
return Promise.all([
7+
getChannelURL('release'),
8+
getChannelURL('beta'),
9+
getChannelURL('canary'),
10+
]).then((urls) => {
11+
return {
12+
scenarios: [
13+
{
14+
name: 'ember-lts-2.12',
15+
npm: {
16+
devDependencies: {
17+
'ember-source': '~2.12.0'
18+
}
19+
}
920
},
10-
resolutions: {
11-
'ember': 'lts-2-8'
12-
}
13-
},
14-
npm: {
15-
devDependencies: {
16-
'ember-source': null
17-
}
18-
}
19-
},
20-
{
21-
name: 'ember-lts-2.12',
22-
npm: {
23-
devDependencies: {
24-
'ember-source': '~2.12.0'
25-
}
26-
}
27-
},
28-
{
29-
name: 'ember-release',
30-
bower: {
31-
dependencies: {
32-
'ember': 'components/ember#release'
21+
{
22+
name: 'ember-lts-2.16',
23+
npm: {
24+
devDependencies: {
25+
'ember-source': '~2.16.0'
26+
}
27+
}
3328
},
34-
resolutions: {
35-
'ember': 'release'
36-
}
37-
},
38-
npm: {
39-
devDependencies: {
40-
'ember-source': null
41-
}
42-
}
43-
},
44-
{
45-
name: 'ember-beta',
46-
bower: {
47-
dependencies: {
48-
'ember': 'components/ember#beta'
29+
{
30+
name: 'ember-lts-2.18',
31+
npm: {
32+
devDependencies: {
33+
'ember-source': '~2.18.0'
34+
}
35+
}
4936
},
50-
resolutions: {
51-
'ember': 'beta'
52-
}
53-
},
54-
npm: {
55-
devDependencies: {
56-
'ember-source': null
57-
}
58-
}
59-
},
60-
{
61-
name: 'ember-canary',
62-
bower: {
63-
dependencies: {
64-
'ember': 'components/ember#canary'
37+
{
38+
name: 'ember-release',
39+
npm: {
40+
devDependencies: {
41+
'ember-source': urls[0]
42+
}
43+
}
6544
},
66-
resolutions: {
67-
'ember': 'canary'
68-
}
69-
},
70-
npm: {
71-
devDependencies: {
72-
'ember-source': null
45+
{
46+
name: 'ember-beta',
47+
npm: {
48+
devDependencies: {
49+
'ember-source': urls[1]
50+
}
51+
}
52+
},
53+
{
54+
name: 'ember-canary',
55+
npm: {
56+
devDependencies: {
57+
'ember-source': urls[2]
58+
}
59+
}
60+
},
61+
{
62+
name: 'ember-default',
63+
npm: {
64+
devDependencies: {}
65+
}
7366
}
74-
}
75-
},
76-
{
77-
name: 'ember-default',
78-
npm: {
79-
devDependencies: {}
80-
}
81-
}
82-
],
83-
useYarn: true
67+
]
68+
};
69+
});
8470
};

‎config/environment.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = function(environment, appConfig) {

‎ember-cli-build.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

‎index.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = {

‎package.json

+27-20
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,42 @@
2525
"repository": "https://github.com/btecu/ember-cli-bootstrap-datetimepicker",
2626
"scripts": {
2727
"build": "ember build",
28-
"start": "ember server",
29-
"test": "ember try:each"
28+
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
29+
"start": "ember serve",
30+
"test": "ember test",
31+
"test:all": "ember try:each"
3032
},
3133
"dependencies": {
32-
"ember-cli-babel": "^6.8.2",
33-
"ember-cli-htmlbars": "^2.0.1",
34+
"ember-cli-babel": "^6.12.0",
35+
"ember-cli-htmlbars": "^2.0.3",
3436
"eonasdan-bootstrap-datetimepicker": "btecu/bootstrap-datetimepicker"
3537
},
3638
"devDependencies": {
37-
"broccoli-asset-rev": "^2.4.5",
38-
"ember-cli": "~2.16.2",
39-
"ember-cli-dependency-checker": "^2.0.0",
40-
"ember-cli-eslint": "^4.0.0",
41-
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
42-
"ember-cli-inject-live-reload": "^1.4.1",
43-
"ember-cli-moment-shim": "3.5.0",
44-
"ember-cli-qunit": "^4.0.0",
45-
"ember-cli-uglify": "^2.0.0",
46-
"ember-disable-prototype-extensions": "^1.1.2",
39+
"broccoli-asset-rev": "^2.7.0",
40+
"ember-cli": "~3.1.1",
41+
"ember-cli-dependency-checker": "^2.1.0",
42+
"ember-cli-eslint": "^4.2.3",
43+
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
44+
"ember-cli-inject-live-reload": "^1.7.0",
45+
"ember-cli-moment-shim": "3.6.0",
46+
"ember-cli-qunit": "^4.3.2",
47+
"ember-cli-uglify": "^2.1.0",
48+
"ember-disable-prototype-extensions": "^1.1.3",
4749
"ember-export-application-global": "^2.0.0",
4850
"ember-load-initializers": "^1.0.0",
49-
"ember-resolver": "^4.0.0",
50-
"ember-source": "~2.16.0",
51-
"loader.js": "^4.2.3",
52-
"moment": "^2.19.1",
53-
"moment-timezone": "^0.5.13"
51+
"ember-maybe-import-regenerator": "^0.1.6",
52+
"ember-resolver": "^4.5.5",
53+
"ember-source": "~3.1.0",
54+
"ember-source-channel-url": "^1.1.0",
55+
"ember-try": "^0.2.23",
56+
"eslint-plugin-ember": "^5.1.0",
57+
"eslint-plugin-node": "^6.0.1",
58+
"loader.js": "^4.7.0",
59+
"moment": "^2.22.0",
60+
"moment-timezone": "^0.5.14"
5461
},
5562
"engines": {
56-
"node": "^4.5 || 6.* || >= 7.*"
63+
"node": "6.* || 8.* || 9.*"
5764
},
5865
"ember-addon": {
5966
"after": [

‎testem.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env node */
21
module.exports = {
32
test_page: 'tests/index.html?hidepassed',
43
disable_watching: true,
@@ -12,11 +11,14 @@ module.exports = {
1211
Chrome: {
1312
mode: 'ci',
1413
args: [
14+
// --no-sandbox is needed when running Chrome inside a container
15+
process.env.TRAVIS ? '--no-sandbox' : null,
16+
1517
'--disable-gpu',
1618
'--headless',
17-
'--remote-debugging-port=9222',
19+
'--remote-debugging-port=0',
1820
'--window-size=1440,900'
19-
]
20-
},
21+
].filter(Boolean)
22+
}
2123
}
2224
};

‎tests/.eslintrc.js

-5
This file was deleted.

0 commit comments

Comments
 (0)