Skip to content

Commit 7764419

Browse files
committed
Upgrade to ember 3.1.2
1 parent 282df44 commit 7764419

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.eslintrc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'ember-cli-build.js',
2324
'index.js',
2425
'testem.js',
25-
'ember-cli-build.js',
2626
'config/**/*.js',
2727
'tests/dummy/config/**/*.js'
2828
],
2929
excludedFiles: [
30-
'app/**',
3130
'addon/**',
31+
'addon-test-support/**',
32+
'app/**',
3233
'tests/dummy/app/**'
3334
],
3435
parserOptions: {

config/ember-try.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function() {
66
return Promise.all([
77
getChannelURL('release'),
88
getChannelURL('beta'),
9-
getChannelURL('canary'),
9+
getChannelURL('canary')
1010
]).then((urls) => {
1111
return {
1212
scenarios: [

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"build": "ember build",
1717
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
1818
"start": "ember serve",
19-
"test": "ember try:each"
19+
"test": "ember test",
20+
"test:all": "ember try:each"
2021
},
2122
"repository": {
2223
"type": "git",
@@ -32,7 +33,7 @@
3233
"devDependencies": {
3334
"broccoli-asset-rev": "^2.4.5",
3435
"ember-ajax": "^3.0.0",
35-
"ember-cli": "~3.0.0",
36+
"ember-cli": "~3.1.2",
3637
"ember-cli-dependency-checker": "^2.0.0",
3738
"ember-cli-eslint": "^4.2.1",
3839
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
@@ -49,11 +50,11 @@
4950
"ember-load-initializers": "^1.0.0",
5051
"ember-maybe-import-regenerator": "^0.1.6",
5152
"ember-resolver": "^4.0.0",
52-
"ember-source": "~3.0.0",
53+
"ember-source": "~3.1.0",
5354
"ember-source-channel-url": "^1.0.1",
5455
"ember-try": "^0.2.23",
5556
"eslint-plugin-ember": "^5.0.0",
56-
"eslint-plugin-node": "^5.2.1",
57+
"eslint-plugin-node": "^6.0.1",
5758
"loader.js": "^4.2.3",
5859
"phantomjs": "^2.1.7"
5960
},

0 commit comments

Comments
 (0)