From c0365f5f422978358aeef7de451c16bab31db245 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Mon, 30 Oct 2023 18:28:18 -0400
Subject: [PATCH] Remove vm-babel-plugins

---
 lib/index.js   | 17 +++++++++++++++--
 package.json   |  1 -
 pnpm-lock.yaml | 12 ------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5a1a043dfb8..28643a40f0e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -8,7 +8,6 @@ const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
-const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
 const Overrides = require('./overrides');
 const SilentError = require('silent-error');
 const SupportedBrowsers = require('./browsers');
@@ -155,7 +154,21 @@ module.exports = {
         plugins: [
           babelHelperPlugin,
           buildDebugMacroPlugin(!isProduction),
-          ...vmBabelPlugins({ isDebug: !isProduction }),
+          [
+            require.resolve('babel-plugin-debug-macros'),
+            {
+              debugTools: {
+                source: '@glimmer/global-context',
+                isDebug: !isProduction,
+              },
+              externalizeHelpers: {
+                module: true,
+              },
+              flags: [{ source: '@glimmer/env', flags: { DEBUG: !isProduction } }],
+            },
+            'ember.js_@glimmer/env-debug-macros',
+          ],
+
           [
             require.resolve('@babel/plugin-transform-block-scoping'),
             { throwIfClosureRequired: true },
diff --git a/package.json b/package.json
index ab71f091452..faca5d86b38 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,6 @@
     "@glimmer/util": "0.85.4",
     "@glimmer/validator": "0.85.4",
     "@glimmer/vm": "0.85.4",
-    "@glimmer/vm-babel-plugins": "0.85.4",
     "@simple-dom/interface": "^1.4.0",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5bed5d758ee..692cf1ecf1d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -68,9 +68,6 @@ dependencies:
   '@glimmer/vm':
     specifier: 0.85.4
     version: 0.85.4
-  '@glimmer/vm-babel-plugins':
-    specifier: 0.85.4
-    version: 0.85.4(@babel/core@7.23.2)
   '@simple-dom/interface':
     specifier: ^1.4.0
     version: 1.4.0
@@ -2608,15 +2605,6 @@ packages:
       '@glimmer/util': 0.85.4
     dev: false
 
-  /@glimmer/vm-babel-plugins@0.85.4(@babel/core@7.23.2):
-    resolution: {integrity: sha512-vLhf4tp06G+LmjUdbVLjOk8/9WG6ExCBX69XxHJ9qks5iWVgsUyXSels02ZorrCPeSDQBMdemcJ8UUzECfRXqQ==}
-    engines: {node: '>=16'}
-    dependencies:
-      babel-plugin-debug-macros: 0.3.4(@babel/core@7.23.2)
-    transitivePeerDependencies:
-      - '@babel/core'
-    dev: false
-
   /@glimmer/vm@0.85.4:
     resolution: {integrity: sha512-pCehLDPuXgVOyNXFgVS3aZpelKn+O2TIIgx6FE3qLBUvpcPa7DCmgnF1DyD3Nr2qqoxcysDN/2j5r2ym3t8ICA==}
     dependencies: