Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/catalog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@universal-ember/test-support": "catalog:",
"concurrently": "catalog:",
"ember-concurrency": "catalog:",
"ember-eslint-parser": "0.5.9",
"ember-eslint-parser": "^0.13.0",
"ember-modifier": "^4.1.0",
"ember-resources": "catalog:",
"ember-template-lint": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-boxel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"eslint": "catalog:"
},
"dependencies": {
"ember-eslint-parser": "^0.5.9",
"ember-eslint-parser": "^0.13.0",
"requireindex": "catalog:"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion packages/host/tests/live-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ async function discoverTestModules(realmURL) {
.map((url) => url.slice(0, -'.gts'.length));
}

// eslint-disable-next-line ember/no-test-import-export
export async function loadRealmTests(application) {
const urlParams = new URLSearchParams(window.location.search);
const qunitAny = /** @type {any} */ (QUnit);
Expand Down
1 change: 0 additions & 1 deletion packages/host/tests/unit/queue-test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { module, test } from 'qunit';

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

import { BrowserQueue } from '@cardstack/host/lib/browser-queue';
Expand Down
2 changes: 1 addition & 1 deletion packages/realm-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"cron": "catalog:",
"date-fns": "catalog:",
"decorator-transforms": "catalog:",
"ember-eslint-parser": "0.5.9",
"ember-eslint-parser": "^0.13.0",
"eslint-plugin-qunit": "catalog:",
"ethers": "catalog:",
"flat": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"decorator-transforms": "catalog:",
"diff": "catalog:",
"ember-concurrency-async-plugin": "workspace:*",
"ember-eslint-parser": "0.5.9",
"ember-eslint-parser": "^0.13.0",
"ember-source": "catalog:",
"eslint": "catalog:",
"ethers": "catalog:",
Expand Down
19 changes: 9 additions & 10 deletions patches/ember-eslint-parser.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
diff --git a/src/preprocessor/noop.js b/src/preprocessor/noop.js
index b173262bd1f52e657ce41799cbb32e7ee5a0a27e..feb7c67f111f62993a41397ee6528e4986680159 100644
--- a/src/preprocessor/noop.js
+++ b/src/preprocessor/noop.js
@@ -24,6 +24,8 @@ module.exports = {
msgs[0].message +=
'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
'\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
+ // We want this to fail in CI so we notice if linting is broken
+ msgs[0].fatal = true;
}
parsedFiles.delete(fileName); // required for tests
return msgs;
@@ -25,6 +25,8 @@ export const postprocess = (messages, fileName) => {
msgs[0].message +=
'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
'\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
+ // We want this to fail in CI so we notice if linting is broken
+ msgs[0].fatal = true;
}
parsedFiles.delete(fileName); // required for tests
return msgs;
442 changes: 358 additions & 84 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ catalog:
eslint: ^8.57.1
eslint-config-prettier: ^9.1.2
eslint-doc-generator: ^1.7.1
eslint-plugin-ember: ^12.5.0
eslint-plugin-ember: ^13.3.2
eslint-plugin-eslint-comments: ^3.2.0
eslint-plugin-eslint-plugin: ^5.5.1
eslint-plugin-filenames: ^1.3.2
Expand Down Expand Up @@ -258,33 +258,33 @@ minimumReleaseAgeExclude:
allowedDeprecatedVersions:
babel-eslint: 10.1.0
overrides:
'@types/eslint': 8.56.5
'@embroider/util': 1.13.1
'@glimmer/tracking>@glimmer/validator': 0.84.3
'@glimmer/component': ^2.0.0
"@types/eslint": 8.56.5
"@embroider/util": 1.13.1
"@glimmer/tracking>@glimmer/validator": 0.84.3
"@glimmer/component": ^2.0.0
jsesc: ^3.0.0
ember-modifier: ^4.1.0
tracked-built-ins: ^4.1.2
peerDependencyRules:
allowedVersions:
mustache: '3'
ember-qunit@5.1.2>ember-source: '*'
mustache: "3"
ember-qunit@5.1.2>ember-source: "*"
patchedDependencies:
magic-string@0.25.9: patches/magic-string@0.25.9.patch
style-loader@2.0.0: patches/style-loader@2.0.0.patch
ember-css-url@1.0.0: patches/ember-css-url@1.0.0.patch
ember-basic-dropdown@8.0.4: patches/ember-basic-dropdown@8.0.4.patch
monaco-editor@0.52.2: patches/monaco-editor@0.52.2.patch
'@embroider/compat@3.9.4': patches/@embroider__compat.patch
"@embroider/compat@3.9.4": patches/@embroider__compat.patch
ember-eslint-parser: patches/ember-eslint-parser.patch
openai: patches/openai.patch
matrix-js-sdk@38.3.0: patches/matrix-js-sdk@38.3.0.patch
'@embroider/webpack': patches/@embroider__webpack.patch
"@embroider/webpack": patches/@embroider__webpack.patch
ember-source: patches/ember-source.patch
object-inspect: patches/object-inspect.patch
allowBuilds:
'@percy/core': true
'@vscode/vsce-sign': true
"@percy/core": true
"@vscode/vsce-sign": true
aws-sdk: true
core-js: false
esbuild: true
Expand Down
Loading