Skip to content

Commit

Permalink
upgrading ember-cli to latest and fixinf lint errors
Browse files Browse the repository at this point in the history
  • Loading branch information
aklkv committed Aug 5, 2020
1 parent ef79105 commit 7a8f79d
Show file tree
Hide file tree
Showing 11 changed files with 2,345 additions and 935 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
- ember-release
- ember-beta
- ember-canary
- ember-default
- ember-default-with-jquery
- ember-classic

Expand Down
11 changes: 6 additions & 5 deletions addon/components/field-for.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
<LabelFor @label={{@label}} @controlId={{this.controlId}} />
{{#if this._showValue}}
{{#if this.displayValueComponent}}
{{component this.displayValueComponent
value=this.value
editValue=this.edit
editText=this.editText
placeholder=this.placeholder
{{component
this.displayValueComponent
value=this.value
editValue=this.edit
editText=this.editText
placeholder=this.placeholder
}}
{{else}}
<button
Expand Down
4 changes: 2 additions & 2 deletions addon/components/form-controls/ff-checkbox-select.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Clear All
</button>
{{/if}}

{{#each @values as |value index|}}
<div
class="form-controls-ff-checkbox"
Expand All @@ -32,4 +32,4 @@
{{/let}}
</div>
{{/each}}
</div>
</div>
10 changes: 0 additions & 10 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,6 @@ module.exports = async function () {
},
},
},
// The default `.travis.yml` runs this scenario via `npm test`,
// not via `ember try`. It's still included here so that running
// `ember try:each` manually or from a customized CI config will run it
// along with all the other scenarios.
{
name: 'ember-default',
npm: {
devDependencies: {},
},
},
{
name: 'ember-default-with-jquery',
env: {
Expand Down
3,197 changes: 2,298 additions & 899 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@
"@ember/render-modifiers": "^1.0.2",
"ember-arg-types": "^0.2.1",
"ember-attacher": "^1.1.1",
"ember-cli-babel": "^7.21.0",
"ember-cli-babel": "^7.22.1",
"ember-cli-htmlbars": "^5.2.0",
"ember-composable-helpers": "^4.2.2",
"ember-element-helper": "^0.3.1",
"ember-event-helpers": "^0.1.1"
},
"devDependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.1",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.6.0",
"ember-cli": "~3.19.0",
"ember-cli-addon-docs": "^0.7.0",
"ember-cli": "^3.20.0",
"ember-cli-addon-docs": "^0.8.0",
"ember-cli-addon-docs-esdoc": "^0.2.3",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-deploy": "^1.0.2",
Expand All @@ -56,23 +56,23 @@
"ember-cli-inject-live-reload": "^2.0.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^3.0.0",
"ember-data": "^3.19.0",
"ember-data": "^3.20.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-inputmask": "^0.11.0",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^8.0.0",
"ember-source": "~3.19.0",
"ember-source-channel-url": "^2.0.1",
"ember-template-lint": "^2.9.0",
"ember-source": "^3.20.3",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^2.9.1",
"ember-template-lint-plugin-prettier": "^1.1.0",
"ember-test-selectors": "^4.1.0",
"ember-try": "^1.4.0",
"eslint": "^7.4.0",
"eslint": "^7.6.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-ember": "^8.9.1",
"eslint-plugin-ember": "^8.9.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.4",
"faker": "^4.1.0",
Expand All @@ -81,7 +81,7 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.0.5",
"prop-types": "^15.7.2",
"qunit-dom": "^1.2.0",
"qunit-dom": "^1.4.0",
"sinon": "^9.0.2"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Application from '@ember/application';
import Resolver from 'ember-resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';
import config from 'dummy/config/environment';

export default class App extends Application {
modulePrefix = config.modulePrefix;
Expand Down
3 changes: 2 additions & 1 deletion tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import AddonDocsRouter, { docsRoute } from 'ember-cli-addon-docs/router';
import config from './config/environment';

import config from 'dummy/config/environment';

export default class Router extends AddonDocsRouter {
location = config.locationType;
Expand Down
20 changes: 20 additions & 0 deletions tests/dummy/config/ember-cli-update.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.20.0",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--welcome"
]
}
]
}
]
}
2 changes: 1 addition & 1 deletion tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];

const isCI = !!process.env.CI;
const isCI = Boolean(process.env.CI);
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
Expand Down
4 changes: 2 additions & 2 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Application from '../app';
import config from '../config/environment';
import Application from 'dummy/app';
import config from 'dummy/config/environment';
import { setApplication } from '@ember/test-helpers';
import { start } from 'ember-qunit';

Expand Down

0 comments on commit 7a8f79d

Please sign in to comment.