Skip to content

Commit bbbb166

Browse files
authored
Merge pull request #5088 from cardstack/cs-11324-eslint-plugin-ember-upgrade
CS-11324: upgrade eslint-plugin-ember to ^13.3.2
2 parents b26a6c9 + c9460b4 commit bbbb166

9 files changed

Lines changed: 382 additions & 111 deletions

File tree

packages/catalog/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@universal-ember/test-support": "catalog:",
1919
"concurrently": "catalog:",
2020
"ember-concurrency": "catalog:",
21-
"ember-eslint-parser": "0.5.9",
21+
"ember-eslint-parser": "^0.13.0",
2222
"ember-modifier": "^4.1.0",
2323
"ember-resources": "catalog:",
2424
"ember-template-lint": "catalog:",

packages/eslint-plugin-boxel/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"eslint": "catalog:"
3838
},
3939
"dependencies": {
40-
"ember-eslint-parser": "^0.5.9",
40+
"ember-eslint-parser": "^0.13.0",
4141
"requireindex": "catalog:"
4242
},
4343
"devDependencies": {

packages/host/tests/live-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ async function discoverTestModules(realmURL) {
2828
.map((url) => url.slice(0, -'.gts'.length));
2929
}
3030

31-
// eslint-disable-next-line ember/no-test-import-export
3231
export async function loadRealmTests(application) {
3332
const urlParams = new URLSearchParams(window.location.search);
3433
const qunitAny = /** @type {any} */ (QUnit);

packages/host/tests/unit/queue-test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { module, test } from 'qunit';
22

33
import { runSharedTest } from '@cardstack/runtime-common/helpers';
4-
// eslint-disable-next-line ember/no-test-import-export
54
import queueTests from '@cardstack/runtime-common/tests/queue-test';
65

76
import { BrowserQueue } from '@cardstack/host/lib/browser-queue';

packages/realm-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"cron": "catalog:",
5050
"date-fns": "catalog:",
5151
"decorator-transforms": "catalog:",
52-
"ember-eslint-parser": "0.5.9",
52+
"ember-eslint-parser": "^0.13.0",
5353
"eslint-plugin-qunit": "catalog:",
5454
"ethers": "catalog:",
5555
"flat": "catalog:",

packages/runtime-common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"decorator-transforms": "catalog:",
5050
"diff": "catalog:",
5151
"ember-concurrency-async-plugin": "workspace:*",
52-
"ember-eslint-parser": "0.5.9",
52+
"ember-eslint-parser": "^0.13.0",
5353
"ember-source": "catalog:",
5454
"eslint": "catalog:",
5555
"ethers": "catalog:",

patches/ember-eslint-parser.patch

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
diff --git a/src/preprocessor/noop.js b/src/preprocessor/noop.js
2-
index b173262bd1f52e657ce41799cbb32e7ee5a0a27e..feb7c67f111f62993a41397ee6528e4986680159 100644
32
--- a/src/preprocessor/noop.js
43
+++ b/src/preprocessor/noop.js
5-
@@ -24,6 +24,8 @@ module.exports = {
6-
msgs[0].message +=
7-
'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
8-
'\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
9-
+ // We want this to fail in CI so we notice if linting is broken
10-
+ msgs[0].fatal = true;
11-
}
12-
parsedFiles.delete(fileName); // required for tests
13-
return msgs;
4+
@@ -25,6 +25,8 @@ export const postprocess = (messages, fileName) => {
5+
msgs[0].message +=
6+
'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
7+
'\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
8+
+ // We want this to fail in CI so we notice if linting is broken
9+
+ msgs[0].fatal = true;
10+
}
11+
parsedFiles.delete(fileName); // required for tests
12+
return msgs;

pnpm-lock.yaml

Lines changed: 358 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ catalog:
143143
eslint: ^8.57.1
144144
eslint-config-prettier: ^9.1.2
145145
eslint-doc-generator: ^1.7.1
146-
eslint-plugin-ember: ^12.5.0
146+
eslint-plugin-ember: ^13.3.2
147147
eslint-plugin-eslint-comments: ^3.2.0
148148
eslint-plugin-eslint-plugin: ^5.5.1
149149
eslint-plugin-filenames: ^1.3.2
@@ -258,33 +258,33 @@ minimumReleaseAgeExclude:
258258
allowedDeprecatedVersions:
259259
babel-eslint: 10.1.0
260260
overrides:
261-
'@types/eslint': 8.56.5
262-
'@embroider/util': 1.13.1
263-
'@glimmer/tracking>@glimmer/validator': 0.84.3
264-
'@glimmer/component': ^2.0.0
261+
"@types/eslint": 8.56.5
262+
"@embroider/util": 1.13.1
263+
"@glimmer/tracking>@glimmer/validator": 0.84.3
264+
"@glimmer/component": ^2.0.0
265265
jsesc: ^3.0.0
266266
ember-modifier: ^4.1.0
267267
tracked-built-ins: ^4.1.2
268268
peerDependencyRules:
269269
allowedVersions:
270-
mustache: '3'
271-
ember-qunit@5.1.2>ember-source: '*'
270+
mustache: "3"
271+
ember-qunit@5.1.2>ember-source: "*"
272272
patchedDependencies:
273273
magic-string@0.25.9: patches/magic-string@0.25.9.patch
274274
style-loader@2.0.0: patches/style-loader@2.0.0.patch
275275
ember-css-url@1.0.0: patches/ember-css-url@1.0.0.patch
276276
ember-basic-dropdown@8.0.4: patches/ember-basic-dropdown@8.0.4.patch
277277
monaco-editor@0.52.2: patches/monaco-editor@0.52.2.patch
278-
'@embroider/compat@3.9.4': patches/@embroider__compat.patch
278+
"@embroider/compat@3.9.4": patches/@embroider__compat.patch
279279
ember-eslint-parser: patches/ember-eslint-parser.patch
280280
openai: patches/openai.patch
281281
matrix-js-sdk@38.3.0: patches/matrix-js-sdk@38.3.0.patch
282-
'@embroider/webpack': patches/@embroider__webpack.patch
282+
"@embroider/webpack": patches/@embroider__webpack.patch
283283
ember-source: patches/ember-source.patch
284284
object-inspect: patches/object-inspect.patch
285285
allowBuilds:
286-
'@percy/core': true
287-
'@vscode/vsce-sign': true
286+
"@percy/core": true
287+
"@vscode/vsce-sign": true
288288
aws-sdk: true
289289
core-js: false
290290
esbuild: true

0 commit comments

Comments
 (0)