From c98d44504cc44128e4e69849206a81585a7f6d23 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 3 Dec 2025 18:09:50 -0500
Subject: [PATCH 1/5] attempt to fix lint

---
 eslint.config.mjs              | 12 +-----------
 package.json                   |  2 +-
 tsconfig-vm.json               | 12 ------------
 tsconfig.json                  |  2 +-
 tsconfig/compiler-options.json |  2 +-
 5 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 tsconfig-vm.json

diff --git a/eslint.config.mjs b/eslint.config.mjs
index c2c3002d9a4..9b69cfe78ff 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -133,17 +133,6 @@ export default [
       '@typescript-eslint/no-unsafe-declaration-merging': 'off',
     },
   },
-  {
-    files: ['glimmer-vm/**/*.ts'],
-    languageOptions: {
-      ecmaVersion: 5,
-      sourceType: 'module',
-      parserOptions: {
-        project: './tsconfig-vm.json',
-        tsconfigRootDir: __dirname,
-      },
-    },
-  },
   {
     // TODO: files: ['packages/**/*.[jt]s'],
     files: ['packages/**/*.js'],
@@ -251,6 +240,7 @@ export default [
       'broccoli/**/*.js',
       '**/ember-cli-build.js',
       '**/*.cjs',
+      'glimmer-vm/bin/**/*',
     ],
 
     languageOptions: {
diff --git a/package.json b/package.json
index 0b159026387..5bdab3dfe39 100644
--- a/package.json
+++ b/package.json
@@ -208,6 +208,7 @@
       "@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js",
       "@ember/-internals/views/lib/component_lookup.js": "ember-source/@ember/-internals/views/lib/component_lookup.js",
       "@ember/-internals/views/lib/mixins/action_support.js": "ember-source/@ember/-internals/views/lib/mixins/action_support.js",
+      "@ember/-internals/views/lib/system/action_manager.js": "ember-source/@ember/-internals/views/lib/system/action_manager.js",
       "@ember/-internals/views/lib/system/event_dispatcher.js": "ember-source/@ember/-internals/views/lib/system/event_dispatcher.js",
       "@ember/-internals/views/lib/system/utils.js": "ember-source/@ember/-internals/views/lib/system/utils.js",
       "@ember/-internals/views/lib/views/core_view.js": "ember-source/@ember/-internals/views/lib/views/core_view.js",
@@ -345,7 +346,6 @@
       "@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js",
       "backburner.js/index.js": "ember-source/backburner.js/index.js",
       "dag-map/index.js": "ember-source/dag-map/index.js",
-      "ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js",
       "ember-testing/index.js": "ember-source/ember-testing/index.js",
       "ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js",
       "ember-testing/lib/adapters/qunit.js": "ember-source/ember-testing/lib/adapters/qunit.js",
diff --git a/tsconfig-vm.json b/tsconfig-vm.json
deleted file mode 100644
index 7d862c6cf6d..00000000000
--- a/tsconfig-vm.json
+++ /dev/null
@@ -1,12 +0,0 @@
-// this file exists to satisfy eslint and tsc simultaneously, while our
-// glimmer-vm packages have a different root location than our ember packages.
-// Once they're all merged as siblings this can hopefully be removed.
-{
-  "extends": "./tsconfig/compiler-options.json",
-  "compilerOptions": {
-    "outDir": "dist",
-    "noEmit": true
-  },
-  "include": ["glimmer-vm/packages/**/*.ts"],
-  "exclude": ["dist", "node_modules", "tmp", "types"]
-}
diff --git a/tsconfig.json b/tsconfig.json
index fb94bf9d432..9967a859771 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,6 @@
     "outDir": "dist",
     "noEmit": true
   },
-  "include": ["packages/**/*.ts"],
+  "include": ["packages/**/*.ts", "glimmer-vm/packages/**/*"],
   "exclude": ["dist", "node_modules", "tmp", "types"]
 }
diff --git a/tsconfig/compiler-options.json b/tsconfig/compiler-options.json
index ae51907b492..a7e59fdbefc 100644
--- a/tsconfig/compiler-options.json
+++ b/tsconfig/compiler-options.json
@@ -5,7 +5,7 @@
     "target": "esnext",
     "module": "esnext",
     "sourceMap": true,
-    "rootDir": "../packages",
+    "rootDir": "../",
 
     // Environment Configuration
     "experimentalDecorators": true,

From 7271b71c16a6ba9065e8344c1dd07627561c3525 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:31:14 -0500
Subject: [PATCH 2/5] Disable bin rules

---
 eslint.config.mjs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 9b69cfe78ff..b09a9081981 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -258,6 +258,14 @@ export default [
       'disable-features/disable-generator-functions': 'off',
     },
   },
+  {
+    // scripts that are allowed to print things
+    files: ['glimmer-vm/bin/**/*'],
+    rules: {
+      'no-console': 'off',
+      'n/no-process-exit': 'off',
+    },
+  },
   {
     files: ['node-tests/**/*.js'],
 

From 30aa23b260f296597db80197b2cc01c650c34fa3 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:33:44 -0500
Subject: [PATCH 3/5] Don't lint the guides

---
 eslint.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index b09a9081981..7d2a9f6790f 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -28,6 +28,7 @@ export default [
       'glimmer-vm/repo-metadata/',
       'glimmer-vm/**/rollup.config.mjs',
       'glimmer-vm/packages/@glimmer/vm-babel-plugins/',
+      'glimmer-vm/guides/',
     ],
   },
   pluginJs.configs.recommended,
@@ -263,7 +264,6 @@ export default [
     files: ['glimmer-vm/bin/**/*'],
     rules: {
       'no-console': 'off',
-      'n/no-process-exit': 'off',
     },
   },
   {

From a14a0183bf2ac194ff16cf6e67bce8a8f22295ae Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:38:11 -0500
Subject: [PATCH 4/5] Ignore more stuff we plan to delete

---
 eslint.config.mjs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index 7d2a9f6790f..aa74478c7e1 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -29,6 +29,11 @@ export default [
       'glimmer-vm/**/rollup.config.mjs',
       'glimmer-vm/packages/@glimmer/vm-babel-plugins/',
       'glimmer-vm/guides/',
+      // to Delete
+      'glimmer-vm/benchmark/',
+      'glimmer-vm/packages/@glimmer-workspace/benchmark-env',
+      'glimmer-vm/packages/@glimmer-workspace/build/',
+      'glimmer-vm/packages/@glimmer-workspace/eslint-plugin/',
     ],
   },
   pluginJs.configs.recommended,
@@ -242,6 +247,7 @@ export default [
       '**/ember-cli-build.js',
       '**/*.cjs',
       'glimmer-vm/bin/**/*',
+      'glimmer-vm/packages/@glimmer-workspace/**/*',
     ],
 
     languageOptions: {

From ed5fc1c7521e5ca276e6f008c30f7934347d382b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:49:34 -0500
Subject: [PATCH 5/5] fix

---
 eslint.config.mjs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/eslint.config.mjs b/eslint.config.mjs
index aa74478c7e1..dbbb1b07249 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -290,4 +290,24 @@ export default [
       },
     },
   },
+  ...tseslint.configs.recommendedTypeChecked.map((x) => {
+    x.languageOptions ||= {};
+    x.languageOptions.parserOptions = {
+      ...x.languageOptions?.parserOptions,
+      project: './tsconfig.json',
+      tsconfigRootDir: __dirname,
+    };
+    x.files = [
+      'glimmer-vm/packages/@glimmer/**/*',
+      'glimmer-vm/packages/@glimmer-workspace/integration-tests/**/*',
+    ];
+
+    x.rules = {
+      ...x.rules,
+      'prefer-const': 'off',
+      'no-implicit-coercion': 'off',
+    };
+
+    return x;
+  }),
 ];