Skip to content

Commit

Permalink
Update eslint and plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
bertdeblock committed Aug 18, 2023
1 parent b28f98d commit 0697a1a
Show file tree
Hide file tree
Showing 9 changed files with 653 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/blueprints/*/files/**/*.js
/dist/
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ module.exports = {
// node files
{
files: [
'.eslintrc.js',
'ember-cli-build.js',
'index.js',
'testem.js',
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/bower_components

# misc
/.eslintcache
/.sass-cache
/connect.lock
/coverage/*
Expand Down
4 changes: 2 additions & 2 deletions node-tests/addon-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `define(\"foo\", [], function () {\n \"use strict\";\n\n Ember.String.camelize('stuff-here');\n});`
"foo.js": `define("foo", [], function () {\n "use strict";\n\n Ember.String.camelize('stuff-here');\n});`
});
}));
});
Expand Down Expand Up @@ -2282,7 +2282,7 @@ describe('babel config file', function() {
yield output.build();

expect(output.read()).to.deep.equal({
"foo.js": `define(\"foo\", [\"exports\"], function (_exports) {\n \"use strict\";\n\n Object.defineProperty(_exports, \"__esModule\", {\n value: true\n });\n _exports.default = void 0;\n var _default = {};\n _exports.default = _default;\n});`,
"foo.js": `define("foo", ["exports"], function (_exports) {\n "use strict";\n\n Object.defineProperty(_exports, "__esModule", {\n value: true\n });\n _exports.default = void 0;\n var _default = {};\n _exports.default = _default;\n});`,
});
}));

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"scripts": {
"build": "ember build",
"changelog": "lerna-changelog",
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support",
"lint:js": "eslint . --cache",
"release": "release-it",
"start": "ember serve",
"test": "mocha node-tests && ember test",
Expand Down Expand Up @@ -97,9 +97,9 @@
"ember-resolver": "^11.0.1",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^1.1.0",
"eslint": "^4.0.0",
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"eslint": "^7.32.0",
"eslint-plugin-ember": "^11.10.0",
"eslint-plugin-node": "^11.1.0",
"fixturify-project": "^5.2.0",
"lerna-changelog": "^0.8.0",
"loader.js": "^4.7.0",
Expand Down
2 changes: 2 additions & 0 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable ember/no-classic-classes */

import 'core-js/stable';
import 'regenerator-runtime/runtime';

Expand Down
7 changes: 5 additions & 2 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* eslint-disable ember/no-computed-properties-in-native-classes */

import { set } from '@ember/object';
import Controller from '@ember/controller';
import { computed } from '@ember/object';
import { A } from '@ember/array';
Expand All @@ -7,10 +10,10 @@ export default class ApplicationController extends Controller {
constructor() {
super(...arguments);

this.animal = new Animal('dog');
set(this, 'animal', new Animal('dog'));
}

@computed({
@computed('animal.name', {
get() {
return this.animal.name;
},
Expand Down
2 changes: 2 additions & 0 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable ember/no-classic-classes */

import EmberRouter from '@ember/routing/router';
import config from './config/environment';

Expand Down
Loading

0 comments on commit 0697a1a

Please sign in to comment.