Skip to content

Commit

Permalink
Merge pull request #129 from ember-learn/octane-fix-lints
Browse files Browse the repository at this point in the history
Fix lint and test failures in Octane branch
  • Loading branch information
jenweber committed Jul 1, 2019
2 parents 88adfc7 + 1a64527 commit cb39b4c
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 11,617 deletions.
6 changes: 6 additions & 0 deletions .babelrc
@@ -0,0 +1,6 @@
{
"plugins": [
["@babel/plugin-proposal-decorators", { "decoratorsBeforeExport": false }],
"@babel/plugin-proposal-class-properties"
]
}
1 change: 1 addition & 0 deletions .eslintrc.js
Expand Up @@ -3,6 +3,7 @@ module.exports = {
server: true
},
root: true,
parser: 'babel-eslint',
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "6"
- "8"

sudo: required
dist: trusty
Expand Down
6 changes: 3 additions & 3 deletions app/templates/rentals/index.hbs
@@ -1,9 +1,9 @@
<ListFilter @filter={{this.filterByCity}} as |filteredResults|>
<ul class="results">
{{#each filteredResults as |rentalUnit|}}
<li>
<RentalListing @rental={{rentalUnit}} />
</li>
<li>
<RentalListing @rental={{rentalUnit}} />
</li>
{{/each}}
</ul>
</ListFilter>
Expand Down
1 change: 1 addition & 0 deletions config/environment.js
Expand Up @@ -8,6 +8,7 @@ module.exports = function(environment) {
locationType: 'auto',
EmberENV: {
FEATURES: {
EMBER_METAL_TRACKED_PROPERTIES: true
// Here you can enable experimental features on an ember canary build
// e.g. 'with-controller': true
},
Expand Down
2 changes: 1 addition & 1 deletion config/optional-features.json
@@ -1,3 +1,3 @@
{
"jquery-integration": true
"jquery-integration": false
}

0 comments on commit cb39b4c

Please sign in to comment.