Skip to content

Commit

Permalink
Update Ember CLI to 3.3 and Node to 10.7 (#1731)
Browse files Browse the repository at this point in the history
I ran into many problems also updating Ember itself and
Ember Data, so I’ve split this off for partial completion.
  • Loading branch information
backspace committed Aug 1, 2018
1 parent 811eabe commit c13f194
Show file tree
Hide file tree
Showing 7 changed files with 1,578 additions and 1,304 deletions.
20 changes: 18 additions & 2 deletions .eslintignore
@@ -1,2 +1,18 @@
node_modules/
bower_components/
# unconventional js
/blueprints/*/files/
/vendor/
/public/
/server/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/

# misc
/coverage/

# ember-try
/.node_modules.ember-try/
3 changes: 2 additions & 1 deletion .eslintrc.js
Expand Up @@ -315,8 +315,9 @@ module.exports = {
// node files
{
files: [
'testem.js',
'ember-cli-build.js',
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'lib/*/index.js'
],
Expand Down
24 changes: 11 additions & 13 deletions .gitignore
@@ -1,29 +1,27 @@
# 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*
testem.log
/npm-debug.log*
/testem.log
/yarn-error.log
.DS_Store

# files generated by older build tools
public/scripts

# 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

# vs code JavaScript config file
jsconfig.json
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,6 +1,6 @@
---
language: node_js
node_js: 8.5
node_js: 10.7

env:
global:
Expand All @@ -23,7 +23,7 @@ env:

before_install:
- npm config set spin false
- npm install -g npm@5
- npm install -g npm@6
- npm --version
- npm install -g greenkeeper-lockfile@1

Expand Down

0 comments on commit c13f194

Please sign in to comment.