Merge remote-tracking branch 'remotes/origin/octogonz/rush-sdk-intern…

…als' into release/rush-pr3954
microsoft · Feb 11, 2023 · c6fccf7 · c6fccf7
2 parents ab9079a + 8580a84
commit c6fccf7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/libraries/rush-sdk/config/heft.json b/libraries/rush-sdk/config/heft.json
@@ -94,7 +94,7 @@
     },
     {
       "actionKind": "runScript",
-      "heftEvent": "post-build",
+      "heftEvent": "bundle",
       "actionId": "generate-stubs",
       "scriptPath": "./lib-shim/generate-stubs.js"
     }

diff --git a/libraries/rush-sdk/config/typescript.json b/libraries/rush-sdk/config/typescript.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/heft/typescript.schema.json",
+
+  "emitFolderNameForTests": "lib-shim"
+}
diff --git a/libraries/rush-sdk/src/test/script.test.ts b/libraries/rush-sdk/src/test/script.test.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { Executable } from '@rushstack/node-core-library';
 
-const rushSdkPath: string = path.join(__dirname, '../../lib/index.js');
+const rushSdkPath: string = path.join(__dirname, '../../lib-shim/index.js');
 const sandboxRepoPath: string = `${__dirname}/sandbox`;
 const mockPackageFolder: string = `${sandboxRepoPath}/mock-package`;
 const mockRushLibPath: string = `${__dirname}/fixture/mock-rush-lib.js`;
@@ -32,7 +32,12 @@ console.log(require(${JSON.stringify(rushSdkPath)}));
       }
     );
     expect(result.stderr.trim()).toMatchInlineSnapshot(`""`);
-    expect(result.stdout.trim()).toMatchInlineSnapshot(`"{ foo: [Getter] }"`);
+    expect(result.stdout.trim()).toMatchInlineSnapshot(`
+"{
+  _rushSdk_loadInternalModule: [Function: _rushSdk_loadInternalModule],
+  foo: [Getter]
+}"
+`);
     expect(result.status).toBe(0);
   });
 });