Merge pull request #637 from embroider-build/fixing-broccoli-debug

Fixing broccoli-debug

Author: ef4

package-lock.json

@@ -3,7 +3,7 @@ import { Bundler, debugBundler } from './bundler';
 import Analyzer from './analyzer';
 import type { TreeType } from './analyzer';
 import Package from './package';
-import { buildDebugCallback } from 'broccoli-debug';
+import BroccoliDebug from 'broccoli-debug';
 import BundleConfig from './bundle-config';
 import type { Node } from 'broccoli-node-api';
 import { LeaderChooser } from './leader';
@@ -28,7 +28,7 @@ import path from 'path';
 import funnel from 'broccoli-funnel';
 import makeDebug from 'debug';
 
-const debugTree = buildDebugCallback('ember-auto-import');
+const debugTree = BroccoliDebug.buildDebugCallback('ember-auto-import');
 const debugWatch = makeDebug('ember-auto-import:watch');
 
 // This interface must be stable across all versions of ember-auto-import that

packages/ember-auto-import/ts/auto-import.ts

@@ -3,10 +3,10 @@ import type Splitter from './splitter';
 import type Package from './package';
 import type BundleConfig from './bundle-config';
 import type { BundleName } from './bundle-config';
-import { buildDebugCallback } from 'broccoli-debug';
+import BroccoliDebug from 'broccoli-debug';
 import type webpack from 'webpack';
 
-const debugTree = buildDebugCallback('ember-auto-import');
+const debugTree = BroccoliDebug.buildDebugCallback('ember-auto-import');
 
 export interface BundlerOptions {
   consoleWrite: (msg: string) => void;

packages/ember-auto-import/ts/bundler.ts

@@ -1,8 +1,7 @@
 declare module 'broccoli-debug' {
-  import { InputNode, Node } from "broccoli-plugin";
+  import { InputNode, Node } from 'broccoli-plugin';
   export default class BroccoliDebug implements Tree {
     constructor(inputTree: InputNode, name: 'string');
-    __broccoliGetInfo__(): any;
+    static buildDebugCallback(name: string): (inputTree: InputNode, name: string) => Node;
   }
-  export function buildDebugCallback(name: string): (inputTree: InputNode, name: string) => Node;
 }