Skip to content

Commit

Permalink
Drop node 7, 9. Support node 10.
Browse files Browse the repository at this point in the history
Update to ember-cli 3.2.
  • Loading branch information
btecu committed Jul 10, 2018
1 parent e07dbb3 commit 2604fbd
Show file tree
Hide file tree
Showing 11 changed files with 328 additions and 141 deletions.
16 changes: 16 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = {
'ember-cli-build.js',
'index.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js'
],
Expand Down
22 changes: 11 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/dist/
/tmp/

# dependencies
/node_modules
/bower_components
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/*
/coverage/
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
bower.json
ember-cli-build.js
testem.js
yarn.lock

# ember-try
.node_modules.ember-try/
Expand Down
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"
- "6"

sudo: false
Expand Down Expand Up @@ -43,7 +42,7 @@ install:
- yarn install --no-lockfile --non-interactive

script:
- npm run lint:js
- yarn lint:js
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ It uses [bootstrap-datetimepicker](https://github.com/Eonasdan/bootstrap-datetim


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


## Installation
Expand Down
6 changes: 3 additions & 3 deletions blueprints/ember-cli-bootstrap-datetimepicker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ module.exports = {

afterInstall() {
return this.addPackagesToProject([
{ name: 'ember-cli-moment-shim', target: '3.6.0' },
{ name: 'moment', target: '^2.22.0' },
{ name: 'moment-timezone', target: '^0.5.14' }
{ name: 'ember-cli-moment-shim', target: '3.7.1' },
{ name: 'moment', target: '^2.22.2' },
{ name: 'moment-timezone', target: '^0.5.21' }
]);
}
};
3 changes: 2 additions & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ module.exports = function() {
return Promise.all([
getChannelURL('release'),
getChannelURL('beta'),
getChannelURL('canary'),
getChannelURL('canary')
]).then((urls) => {
return {
useYarn: true,
scenarios: [
{
name: 'ember-lts-2.12',
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,42 +25,42 @@
"repository": "https://github.com/btecu/ember-cli-bootstrap-datetimepicker",
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each"
},
"dependencies": {
"ember-cli-babel": "^6.12.0",
"ember-cli-babel": "^6.14.1",
"ember-cli-htmlbars": "^2.0.3",
"eonasdan-bootstrap-datetimepicker": "btecu/bootstrap-datetimepicker"
},
"devDependencies": {
"broccoli-asset-rev": "^2.7.0",
"ember-cli": "~3.1.1",
"ember-cli-dependency-checker": "^2.1.0",
"ember-cli": "~3.2.0",
"ember-cli-dependency-checker": "^2.1.1",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.7.0",
"ember-cli-moment-shim": "3.6.0",
"ember-cli-moment-shim": "3.7.1",
"ember-cli-qunit": "^4.3.2",
"ember-cli-uglify": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-load-initializers": "^1.1.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-resolver": "^4.5.5",
"ember-source": "~3.1.0",
"ember-resolver": "^4.5.6",
"ember-source": "~3.2.2",
"ember-source-channel-url": "^1.1.0",
"ember-try": "^0.2.23",
"eslint-plugin-ember": "^5.1.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^6.0.1",
"loader.js": "^4.7.0",
"moment": "^2.22.0",
"moment-timezone": "^0.5.14"
"moment": "^2.22.2",
"moment-timezone": "^0.5.21"
},
"engines": {
"node": "6.* || 8.* || 9.*"
"node": "6.* || 8.* || >= 10.*"
},
"ember-addon": {
"after": [
Expand Down
11 changes: 6 additions & 5 deletions testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ module.exports = {
],
browser_args: {
Chrome: {
mode: 'ci',
args: [
ci: [
// --no-sandbox is needed when running Chrome inside a container
process.env.TRAVIS ? '--no-sandbox' : null,

'--disable-gpu',
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
Expand Down
Loading

0 comments on commit 2604fbd

Please sign in to comment.