Merge pull request #2166 from embroider-build/content-tag-pr-86

Fix gjs/gts sourcemaps -- we accidentally unlocked really good DX

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",

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,
         };
       },
     },

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