Skip to content

Commit

Permalink
[MOD-189][Improvement] Upgrade ember-cli to 2.16.2 (#102)
Browse files Browse the repository at this point in the history
* Upgrade ember-cli to 2.16.2

* Upgrade ember-data to 2.16.2
  • Loading branch information
laurenbarker authored and aaxelb committed Dec 14, 2017
1 parent ec94114 commit 424ca30
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 177 deletions.
23 changes: 23 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4

[*.scss]
indent_size = 2

[*.hbs]
insert_final_newline = false

[*.{diff,md}]
trim_trailing_whitespace = false
3 changes: 3 additions & 0 deletions .watchmanconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
}
9 changes: 9 additions & 0 deletions config/targets.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-env node */
module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions',
],
};
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"broccoli-asset-rev": "^2.4.5",
"coveralls": "^3.0.0",
"ember-bootstrap": "^1.0.0-rc.1",
"ember-cli": "~2.15.1",
"ember-cli": "2.16.2",
"ember-cli-app-version": "^3.0.0",
"ember-cli-babel": "^6.3.0",
"ember-cli-code-coverage": "^0.4.2",
Expand All @@ -43,7 +43,7 @@
"ember-cli-uglify": "^1.2.0",
"ember-component-css": "^0.3.5",
"ember-concurrency": "^0.8.12",
"ember-data": "~2.15.3",
"ember-data": "2.16.2",
"ember-export-application-global": "^2.0.0",
"ember-font-awesome": "^3.0.0",
"ember-i18n": "5.0.2",
Expand All @@ -52,7 +52,7 @@
"ember-parachute": "^0.3.5",
"ember-radio-button": "^1.1.1",
"ember-resolver": "^4.0.0",
"ember-source": "2.15.2",
"ember-source": "2.16.2",
"ember-toastr": "^1.7.0",
"eslint": "^4.4.1",
"loader.js": "^4.2.3",
Expand Down
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
Loading

0 comments on commit 424ca30

Please sign in to comment.