Skip to content

Commit 23afa78

Browse files
committed
eslint-plugin-ember linter addon
1 parent 717fbe7 commit 23afa78

File tree

9 files changed

+51
-15
lines changed

9 files changed

+51
-15
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
},
77
extends: [
88
'eslint:recommended',
9-
'plugin:ember-suave/recommended'
9+
'plugin:ember/recommended'
1010
],
1111
env: {
1212
browser: true

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55

66
## [Unreleased][unreleased]
7+
### Added
8+
- `eslint-plugin-ember` linter addon
9+
710
### Updated
811
- `package.json` dependencies
912
- Ember CLI v2.13.2
@@ -12,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1215

1316
### Removed
1417
- `ember-cli-release` package
18+
- `eslint-plugin-ember-suave` package
1519

1620

1721
## [v1.0.1] - 2017-04-13

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
},
3838
"dependencies": {
3939
"ember-cli-babel": "^6.4.1",
40-
"ember-cli-htmlbars": "^2.0.2"
40+
"ember-cli-htmlbars": "^2.0.2",
41+
"eslint-plugin-ember": "^3.4.1"
4142
},
4243
"devDependencies": {
4344
"broccoli-asset-rev": "^2.4.5",
@@ -67,7 +68,6 @@
6768
"ember-percy": "1.2.12",
6869
"ember-resolver": "^4.0.0",
6970
"ember-source": "^2.13.3",
70-
"eslint-plugin-ember-suave": "^1.0.0",
7171
"loader.js": "4.4.1",
7272
"mocha": "^3.4.2",
7373
"request": "^2.81.0",

tests/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module.exports = {
33
embertest: true
44
},
55
rules: {
6-
'ember-suave/no-direct-property-access': 'off'
6+
'ember/alias-model-in-controller': 'off'
77
}
88
};

tests/dummy/app/app.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6+
const {
7+
LinkComponent,
8+
Application
9+
} = Ember;
10+
611
let App;
712

8-
Ember.LinkComponent.reopen({
13+
LinkComponent.reopen({
914
attributeBindings: ['role']
1015
});
1116

12-
App = Ember.Application.extend({
17+
App = Application.extend({
1318
modulePrefix: config.modulePrefix,
1419
podModulePrefix: config.podModulePrefix,
1520
Resolver

tests/helpers/destroy-app.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import Ember from 'ember';
22

3+
const {
4+
run
5+
} = Ember;
6+
37
export default function destroyApp(application) {
4-
Ember.run(application, 'destroy');
8+
run(application, 'destroy');
59
}

tests/helpers/module-for-acceptance.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'dummy/tests/helpers/percy/register-helpers';
66

77
const { RSVP: { Promise } } = Ember;
88

9+
/* eslint-disable ember/named-functions-in-promises */
910
export default function(name, options = {}) {
1011
module(name, {
1112
beforeEach() {

tests/helpers/start-app.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@ import Ember from 'ember';
22
import Application from '../../app';
33
import config from '../../config/environment';
44

5+
const {
6+
merge,
7+
run
8+
} = Ember;
9+
510
export default function startApp(attrs) {
6-
let attributes = Ember.merge({}, config.APP);
7-
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
11+
let attributes = merge({}, config.APP);
12+
attributes = merge(attributes, attrs); // use defaults, but you can override;
813

9-
return Ember.run(() => {
14+
return run(() => {
1015
let application = Application.create(attributes);
1116
application.setupForTesting();
1217
application.injectTestHelpers();

yarn.lock

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2667,11 +2667,12 @@ escope@^3.6.0:
26672667
esrecurse "^4.1.0"
26682668
estraverse "^4.1.1"
26692669

2670-
eslint-plugin-ember-suave@^1.0.0:
2671-
version "1.0.0"
2672-
resolved "https://registry.yarnpkg.com/eslint-plugin-ember-suave/-/eslint-plugin-ember-suave-1.0.0.tgz#ea7d232a126562dcd8b1ee3aa2700ac3b626e514"
2670+
eslint-plugin-ember@^3.4.1:
2671+
version "3.4.1"
2672+
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-3.4.1.tgz#849124656bd1e0786f85425f0b50f8b0724a8115"
26732673
dependencies:
2674-
requireindex "~1.1.0"
2674+
requireindex "^1.1.0"
2675+
snake-case "^2.1.0"
26752676

26762677
eslint@^3.0.0:
26772678
version "3.19.0"
@@ -4181,6 +4182,10 @@ loud-rejection@^1.0.0:
41814182
currently-unhandled "^0.4.1"
41824183
signal-exit "^3.0.0"
41834184

4185+
lower-case@^1.1.1:
4186+
version "1.1.4"
4187+
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
4188+
41844189
lru-cache@^4.0.1:
41854190
version "4.0.2"
41864191
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -4442,6 +4447,12 @@ [email protected]:
44424447
version "0.6.1"
44434448
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
44444449

4450+
no-case@^2.2.0:
4451+
version "2.3.1"
4452+
resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.1.tgz#7aeba1c73a52184265554b7dc03baf720df80081"
4453+
dependencies:
4454+
lower-case "^1.1.1"
4455+
44454456
node-fetch@^1.3.3:
44464457
version "1.6.3"
44474458
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -5179,7 +5190,7 @@ require-uncached@^1.0.2:
51795190
caller-path "^0.1.0"
51805191
resolve-from "^1.0.0"
51815192

5182-
requireindex@~1.1.0:
5193+
requireindex@^1.1.0:
51835194
version "1.1.0"
51845195
resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
51855196

@@ -5410,6 +5421,12 @@ slide@^1.1.5:
54105421
version "1.1.6"
54115422
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
54125423

5424+
snake-case@^2.1.0:
5425+
version "2.1.0"
5426+
resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
5427+
dependencies:
5428+
no-case "^2.2.0"
5429+
54135430
54145431
version "1.0.9"
54155432
resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"

0 commit comments

Comments
 (0)