From 5249c879d211f1ca17f5e663dc937c0f94393b25 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Thu, 7 Nov 2024 21:40:46 -0500
Subject: [PATCH 1/2] Fix Sourcemaps for gjs, update content-tag, drop support
 for inline-source-map (it's not what anyone wants anyway)

---
 packages/addon-dev/src/rollup-gjs-plugin.ts | 8 +++-----
 packages/addon-dev/src/rollup.ts            | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/addon-dev/src/rollup-gjs-plugin.ts b/packages/addon-dev/src/rollup-gjs-plugin.ts
index 8dc5e34a5..ecd2b26ce 100644
--- a/packages/addon-dev/src/rollup-gjs-plugin.ts
+++ b/packages/addon-dev/src/rollup-gjs-plugin.ts
@@ -7,9 +7,7 @@ const PLUGIN_NAME = 'rollup-gjs-plugin';
 const processor = new Preprocessor();
 // import { parse as pathParse } from 'path';
 
-export default function rollupGjsPlugin(
-  { inline_source_map } = { inline_source_map: true }
-): Plugin {
+export default function rollupGjsPlugin(): Plugin {
   return {
     name: PLUGIN_NAME,
 
@@ -20,12 +18,12 @@ export default function rollupGjsPlugin(
         if (!gjsFilter(id)) {
           return null;
         }
-        let code = processor.process(input, {
+        let { code, map } = processor.process(input, {
           filename: id,
-          inline_source_map,
         });
         return {
           code,
+          map,
         };
       },
     },
diff --git a/packages/addon-dev/src/rollup.ts b/packages/addon-dev/src/rollup.ts
index ce035cc40..3f83e2822 100644
--- a/packages/addon-dev/src/rollup.ts
+++ b/packages/addon-dev/src/rollup.ts
@@ -59,8 +59,8 @@ export class Addon {
     return hbs(options);
   }
 
-  gjs(options?: { inline_source_map: boolean }) {
-    return gjs(options);
+  gjs() {
+    return gjs();
   }
 
   // this does incremental updates to the dist files and also deletes files that are not part of the generated bundle

From 653a69a2379049627ac6d7e2562b7b6d805d53a5 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sun, 10 Nov 2024 10:25:36 -0500
Subject: [PATCH 2/2] Upgrade content-tag to v3

---
 packages/addon-dev/package.json |  2 +-
 pnpm-lock.yaml                  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/addon-dev/package.json b/packages/addon-dev/package.json
index a481ae2e4..5a4f41227 100644
--- a/packages/addon-dev/package.json
+++ b/packages/addon-dev/package.json
@@ -36,7 +36,7 @@
   "dependencies": {
     "@embroider/core": "workspace:^",
     "@rollup/pluginutils": "^4.1.1",
-    "content-tag": "^2.0.1",
+    "content-tag": "^3.0.0",
     "fs-extra": "^10.0.0",
     "minimatch": "^3.0.4",
     "rollup-plugin-copy-assets": "^2.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3592399bb..5f21424e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,8 +64,8 @@ importers:
         specifier: ^4.1.1
         version: 4.2.1
       content-tag:
-        specifier: ^2.0.1
-        version: 2.0.2
+        specifier: ^3.0.0
+        version: 3.0.0
       fs-extra:
         specifier: ^10.0.0
         version: 10.1.0
@@ -3451,7 +3451,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.26.0(supports-color@8.1.1)
+      '@babel/core': 7.26.0
       '@babel/helper-plugin-utils': 7.25.9
 
   /@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0):
@@ -11998,6 +11998,10 @@ packages:
   /content-tag@2.0.2:
     resolution: {integrity: sha512-qHRyTp02dgzRK2tsCFxZ1H289bZOuSLNpupr6prvnSFq4SFPmNlBKbbE5PCMb+8+Z1a1z+yCVtXvQIGUCCa3lQ==}
 
+  /content-tag@3.0.0:
+    resolution: {integrity: sha512-HxWPmF9hzehv5PV7TSK7QSzlVBhmwQA8NgBrXmL+fqXfM3L1r3ResAPzeiGbxra3Zw6U3gdhw3cIDJADQnuCVQ==}
+    dev: false
+
   /content-type@1.0.5:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}