Skip to content

Commit e6e4bd6

Browse files
committed
Fix a few things that were broken on the error recovery branch
1 parent c6f163d commit e6e4bd6

File tree

8 files changed

+523
-331
lines changed

8 files changed

+523
-331
lines changed

.eslintrc.cjs

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,6 @@ module.exports = {
1919
'**/fixtures',
2020
'!**/.eslintrc.cjs',
2121
],
22-
// parser: '@typescript-eslint/parser',
23-
// parserOptions: {
24-
// ecmaVersion: 'latest',
25-
// project: [],
26-
// },
27-
// settings: {
28-
// 'import/parsers': {
29-
// '@typescript-eslint/parser': ['.js', '.cjs', '.mjs', '.mts', '.ts', '.d.ts'],
30-
// },
31-
// 'import/resolver': {
32-
// typescript: {},
33-
// },
34-
// node: {
35-
// allowModules: ['@glimmer/debug', '@glimmer/local-debug-flags'],
36-
// tryExtensions: ['.js', '.ts', '.d.ts', '.json'],
37-
// },
38-
// },
39-
// plugins: [
40-
// '@typescript-eslint',
41-
// 'prettier',
42-
// 'qunit',
43-
// 'simple-import-sort',
44-
// 'unused-imports',
45-
// 'prettier',
46-
// 'n',
47-
// ],
48-
4922
rules: {},
5023
overrides: [
5124
{

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
"mkdirp": "^3.0.1",
110110
"npm-run-all": "^4.1.5",
111111
"prettier": "^3.1.0",
112-
"prettier-plugin-organize-imports": "^3.2.3",
113112
"puppeteer": "^21.5.0",
114113
"puppeteer-chromium-resolver": "^21.0.0",
115114
"qunit": "^2.20.0",

packages/@glimmer-workspace/build/lib/config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ export function tsconfig(updates) {
6464
declaration: true,
6565
declarationMap: true,
6666
verbatimModuleSyntax: true,
67+
isolatedModules: true,
6768
module: ModuleKind.NodeNext,
6869
moduleResolution: ModuleResolutionKind.NodeNext,
6970
...updates,
@@ -254,6 +255,8 @@ export class Package {
254255
* @property {boolean} [ esm ] enabled by default
255256
* @property {boolean} [ cjs ] enabled by default until eslint-plugin-ember and ember-source no longer need it
256257
*
258+
* @param {Formats} [formats]
259+
*
257260
* @returns {import("rollup").RollupOptions[] | import("rollup").RollupOptions}
258261
*/
259262
config(formats = {}) {

packages/@glimmer-workspace/build/lib/replace.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ export function createReplacePlugin(test, replacements, sourcemap) {
7070
/** @type {TransformResult} */
7171
const result = { code: s.toString() };
7272
if (sourcemap) {
73+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
74+
// @ts-ignore
7375
result.map = s.generateMap({ hires: true });
7476
}
7577
return result;

packages/@glimmer-workspace/integration-tests/lib/setup-harness.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ export async function setupQunit() {
5050

5151
testing.begin(() => {
5252
if (testing.config.ci) {
53+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
54+
// @ts-ignore
5355
const tap = qunitLib.reporters.tap;
5456
tap.init(runner, { log: console.info });
5557
}

packages/@glimmer/runtime/lib/vm/low-level.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export interface Externs {
203203
debug: VM;
204204
}
205205

206-
export interface VmDebugState {
206+
export interface LowLevelVmDebugState {
207207
readonly registers: Registers;
208208
readonly currentPc: number;
209209
readonly stack: DebugStack;
@@ -292,7 +292,7 @@ export class LowLevelVM {
292292
/**
293293
* @mutable
294294
*/
295-
get debug(): VmDebugState {
295+
get debug(): LowLevelVmDebugState {
296296
return {
297297
currentPc: this.#registers.pc - this.#currentOpSize,
298298
registers: this.#registers,

0 commit comments

Comments
 (0)