need commonjs

Author: patricklx

broccoli/amd-compat-entrypoints/ember.debug.js

@@ -197,6 +197,9 @@ d('@ember/controller/index', emberControllerIndex);
 import * as emberDebugIndex from '@ember/debug/index';
 d('@ember/debug/index', emberDebugIndex);
 
+import * as emberDebugInspectorSupportIndex from '@ember/debug/ember-inspector-support/index';
+d('@ember/debug/ember-inspector-support/index', emberDebugInspectorSupportIndex);
+
 import * as emberDebugLibCaptureRenderTree from '@ember/debug/lib/capture-render-tree';
 d('@ember/debug/lib/capture-render-tree', emberDebugLibCaptureRenderTree);
 

package.json

@@ -114,6 +114,7 @@
     "@embroider/shared-internals": "^2.5.0",
     "@glimmer/component": "^1.1.2",
     "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^28.0.0",
     "@simple-dom/document": "^1.4.0",
     "@swc-node/register": "^1.6.8",
     "@swc/core": "^1.3.100",
@@ -396,8 +397,7 @@
       "ember/version.js": "ember-source/ember/version.js",
       "route-recognizer/index.js": "ember-source/route-recognizer/index.js",
       "router_js/index.js": "ember-source/router_js/index.js",
-      "rsvp/index.js": "ember-source/rsvp/index.js",
-      "source-map-js/index.js": "ember-source/source-map-js/index.js"
+      "rsvp/index.js": "ember-source/rsvp/index.js"
     }
   },
   "typesVersions": {

packages/@ember/debug/ember-inspector-support/libs/source-map.ts

@@ -1,5 +1,5 @@
 import BaseObject from '@ember/debug/ember-inspector-support/utils/base-object';
-import * as SourceMap from 'source-map-js';
+import { SourceMapConsumer } from 'source-map-js';
 const notFoundError = new Error('Source map url not found');
 
 export default class SourceMapSupport extends BaseObject {
@@ -56,7 +56,7 @@ export default class SourceMapSupport extends BaseObject {
       (response) => {
         if (response) {
           const map = JSON.parse(response.map);
-          const sm = new SourceMap.SourceMapConsumer(map);
+          const sm = new SourceMapConsumer(map);
           sourceMaps[url] = sm;
           return sm;
         }

pnpm-lock.yaml

@@ -4,6 +4,7 @@ import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 import glob from 'glob';
 import { babel } from '@rollup/plugin-babel';
+import commonjs from '@rollup/plugin-commonjs';
 import sharedBabelConfig from './babel.config.mjs';
 
 const require = createRequire(import.meta.url);
@@ -61,6 +62,9 @@ function esmConfig() {
       chunkFileNames: 'packages/shared-chunks/[name]-[hash].js',
     },
     plugins: [
+      commonjs({
+        include: [resolve(require.resolve('source-map-js'), '..', '**')],
+      }),
       babel({
         babelHelpers: 'bundled',
         extensions: ['.js', '.ts'],
@@ -109,6 +113,9 @@ function legacyBundleConfig(input, output, { isDeveloping, isExternal }) {
     },
     onLog: handleRollupWarnings,
     plugins: [
+      commonjs({
+        include: [resolve(require.resolve('source-map-js'), '..', '**')],
+      }),
       amdDefineSupport(),
       ...(isDeveloping ? [concatenateAMDEntrypoints()] : []),
       babel({
@@ -183,7 +190,6 @@ function rolledUpPackages() {
 export function exposedDependencies() {
   return {
     'backburner.js': require.resolve('backburner.js/dist/es6/backburner.js'),
-    'source-map-js': require.resolve('source-map-js'),
     rsvp: require.resolve('rsvp/lib/rsvp.js'),
     'dag-map': require.resolve('dag-map/dag-map.js'),
     router_js: require.resolve('router_js/dist/modules/index.js'),
@@ -218,6 +224,7 @@ export function hiddenDependencies() {
       findFromProject('decorator-transforms').root,
       'dist/runtime.js'
     ),
+    'source-map-js': require.resolve('source-map-js'),
   };
 }
 
@@ -277,8 +284,8 @@ function entrypoint(pkg, which) {
 function resolveTS() {
   return {
     name: 'resolve-ts',
-    async resolveId(source, importer) {
-      let result = await this.resolve(source, importer);
+    async resolveId(source, importer, options) {
+      let result = await this.resolve(source, importer, options);
       if (result === null) {
         // the rest of rollup couldn't find it
         let stem = resolve(dirname(importer), source);
@@ -328,6 +335,7 @@ export function resolvePackages(deps, isExternal) {
         }
 
         if (testDependencies.includes(pkgName)) {
+          // these are allowed to fall through and get resolved noramlly by vite
           // these are allowed to fall through and get resolved noramlly by vite
           // within our test suite.
           return;