Fix a few things that were broken on the error recovery branch

glimmerjs · Dec 5, 2023 · a41a6e2 · a41a6e2
1 parent 7fc66eb
commit a41a6e2
Show file tree

Hide file tree

Showing 8 changed files with 523 additions and 331 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -19,33 +19,6 @@ module.exports = {
     '**/fixtures',
     '!**/.eslintrc.cjs',
   ],
-  // parser: '@typescript-eslint/parser',
-  // parserOptions: {
-  //   ecmaVersion: 'latest',
-  //   project: [],
-  // },
-  // settings: {
-  //   'import/parsers': {
-  //     '@typescript-eslint/parser': ['.js', '.cjs', '.mjs', '.mts', '.ts', '.d.ts'],
-  //   },
-  //   'import/resolver': {
-  //     typescript: {},
-  //   },
-  //   node: {
-  //     allowModules: ['@glimmer/debug', '@glimmer/local-debug-flags'],
-  //     tryExtensions: ['.js', '.ts', '.d.ts', '.json'],
-  //   },
-  // },
-  // plugins: [
-  //   '@typescript-eslint',
-  //   'prettier',
-  //   'qunit',
-  //   'simple-import-sort',
-  //   'unused-imports',
-  //   'prettier',
-  //   'n',
-  // ],
-
   rules: {},
   overrides: [
     {

diff --git a/package.json b/package.json
@@ -109,7 +109,6 @@
     "mkdirp": "^3.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^3.1.0",
-    "prettier-plugin-organize-imports": "^3.2.3",
     "puppeteer": "^21.5.0",
     "puppeteer-chromium-resolver": "^21.0.0",
     "qunit": "^2.20.0",

diff --git a/packages/@glimmer-workspace/build/lib/config.js b/packages/@glimmer-workspace/build/lib/config.js
@@ -64,6 +64,7 @@ export function tsconfig(updates) {
     declaration: true,
     declarationMap: true,
     verbatimModuleSyntax: true,
+    isolatedModules: true,
     module: ModuleKind.NodeNext,
     moduleResolution: ModuleResolutionKind.NodeNext,
     ...updates,
@@ -255,6 +256,8 @@ export class Package {
    * @property {boolean} [ esm ] enabled by default
    * @property {boolean} [ cjs ] enabled by default until eslint-plugin-ember and ember-source no longer need it
    *
+   * @param {Formats} [formats]
+   *
    * @returns {import("rollup").RollupOptions[] | import("rollup").RollupOptions}
    */
   config(formats = {}) {

diff --git a/packages/@glimmer-workspace/build/lib/replace.js b/packages/@glimmer-workspace/build/lib/replace.js
@@ -70,6 +70,8 @@ export function createReplacePlugin(test, replacements, sourcemap) {
         /** @type {TransformResult} */
         const result = { code: s.toString() };
         if (sourcemap) {
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-ignore
           result.map = s.generateMap({ hires: true });
         }
         return result;

diff --git a/packages/@glimmer-workspace/integration-tests/lib/setup-harness.ts b/packages/@glimmer-workspace/integration-tests/lib/setup-harness.ts
@@ -50,6 +50,8 @@ export async function setupQunit() {
 
   testing.begin(() => {
     if (testing.config.ci) {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
       const tap = qunitLib.reporters.tap;
       tap.init(runner, { log: console.info });
     }

diff --git a/packages/@glimmer/runtime/lib/vm/low-level.ts b/packages/@glimmer/runtime/lib/vm/low-level.ts
@@ -203,7 +203,7 @@ export interface Externs {
   debug: VM;
 }
 
-export interface VmDebugState {
+export interface LowLevelVmDebugState {
   readonly registers: Registers;
   readonly currentPc: number;
   readonly stack: DebugStack;
@@ -292,7 +292,7 @@ export class LowLevelVM {
   /**
    * @mutable
    */
-  get debug(): VmDebugState {
+  get debug(): LowLevelVmDebugState {
     return {
       currentPc: this.#registers.pc - this.#currentOpSize,
       registers: this.#registers,