Skip to content

Commit

Permalink
Merge pull request #419 from ember-learn/ember-3.12
Browse files Browse the repository at this point in the history
Ember-CLI 3.12
  • Loading branch information
locks authored Sep 13, 2019
2 parents 0f44c6c + 5e3b7d7 commit 08e56ef
Show file tree
Hide file tree
Showing 4 changed files with 577 additions and 167 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
ecmaVersion: 2018,
sourceType: 'module'
},
plugins: [
Expand Down Expand Up @@ -29,8 +29,7 @@ module.exports = {
'lib/*/index.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
sourceType: 'script'
},
env: {
browser: false,
Expand Down
Loading

0 comments on commit 08e56ef

Please sign in to comment.