Fix build and runtime issues in rush-sdk.

Author: iclanton

common/config/subspaces/default/pnpm-lock.yaml

@@ -30,5 +30,7 @@
 # ---------------------------------------------------------------------------
 # DO NOT MODIFY ABOVE THIS LINE!  Add any project-specific overrides below.
 # ---------------------------------------------------------------------------
+
+/lib-dts/**
 /lib-commonjs/**
-/lib-esnext/**
+/lib-esm/**

libraries/rush-sdk/.npmignore

@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
 
-  "mainEntryPointFilePath": "<projectFolder>/lib-commonjs/loader.d.ts",
+  "mainEntryPointFilePath": "<projectFolder>/lib-dts/loader.d.ts",
 
   "apiReport": {
     "enabled": true,

libraries/rush-sdk/config/api-extractor.json

@@ -1,17 +1,3 @@
 {
-  "extends": "local-node-rig/profiles/default/config/jest.config.json",
-
-  "roots": ["<rootDir>/lib-shim"],
-
-  "testMatch": ["<rootDir>/lib-shim/**/*.test.js"],
-
-  "collectCoverageFrom": [
-    "lib-shim/**/*.js",
-    "!lib-shim/**/*.d.ts",
-    "!lib-shim/**/*.test.js",
-    "!lib-shim/**/test/**",
-    "!lib-shim/**/__tests__/**",
-    "!lib-shim/**/__fixtures__/**",
-    "!lib-shim/**/__mocks__/**"
-  ]
+  "extends": "local-node-rig/profiles/default/config/jest.config.json"
 }

libraries/rush-sdk/config/jest.config.json

@@ -44,7 +44,8 @@
     "@rushstack/node-core-library": "workspace:*",
     "@rushstack/package-deps-hash": "workspace:*",
     "@rushstack/terminal": "workspace:*",
-    "tapable": "2.2.1"
+    "tapable": "2.2.1",
+    "true-case-path": "~2.2.1"
   },
   "devDependencies": {
     "@microsoft/rush-lib": "workspace:*",

libraries/rush-sdk/config/typescript.json

@@ -10,7 +10,7 @@ import {
   Executable
 } from '@rushstack/node-core-library';
 import { Terminal, ConsoleTerminalProvider } from '@rushstack/terminal';
-import { RushGlobalFolder } from '@microsoft/rush-lib/lib-esnext/api/RushGlobalFolder';
+import { RushGlobalFolder } from '@microsoft/rush-lib/lib/api/RushGlobalFolder';
 import type { SpawnSyncReturns } from 'child_process';
 import {
   RUSH_LIB_NAME,
@@ -211,6 +211,20 @@ ${errorMessage}
   process.exit(1);
 }
 
+const exports: typeof import('@microsoft/rush-lib') = {
+  /**
+   * Used by the .js stubs for path-based imports of `@microsoft/rush-lib` internal APIs.
+   */
+  _rushSdk_loadInternalModule: (srcImportPath: string) => {
+    if (!exports._RushInternals) {
+      throw new Error(
+        `Rush version ${exports.Rush.version} does not support internal API imports via rush-sdk`
+      );
+    }
+    return exports._RushInternals.loadModule(srcImportPath);
+  }
+} as unknown as typeof import('@microsoft/rush-lib');
+
 // Based on TypeScript's __exportStar()
 for (const property in sdkContext.rushLibModule) {
   if (property !== 'default' && !exports.hasOwnProperty(property)) {
@@ -226,14 +240,4 @@ for (const property in sdkContext.rushLibModule) {
   }
 }
 
-/**
- * Used by the .js stubs for path-based imports of `@microsoft/rush-lib` internal APIs.
- */
-export function _rushSdk_loadInternalModule(srcImportPath: string): unknown {
-  if (!exports._RushInternals) {
-    throw new Error(
-      `Rush version ${exports.Rush.version} does not support internal API imports via rush-sdk`
-    );
-  }
-  return exports._RushInternals.loadModule(srcImportPath);
-}
+export default exports;

libraries/rush-sdk/package.json

@@ -77,7 +77,11 @@ exports[`@rushstack/rush-sdk Should load via global (for plugins): stdout 1`] =
 exports[`@rushstack/rush-sdk Should load via install-run (for standalone tools): stderr 1`] = `""`;
 
 exports[`@rushstack/rush-sdk Should load via install-run (for standalone tools): stdout 1`] = `
-"Trying to load  @microsoft/rush-lib installed by install-run-rush
+"Try to load @microsoft/rush-lib from rush global folder
+The expected global rush installed folder is \\"/Users/ianc/.rush/node-v22.12.0/rush-5.57.0\\"
+Failed to load @microsoft/rush-lib from rush global folder: File does not exist: /Users/ianc/.rush/node-v22.12.0/rush-5.57.0
+ENOENT: no such file or directory, lstat '/Users/ianc/.rush/node-v22.12.0/rush-5.57.0'
+Trying to load  @microsoft/rush-lib installed by install-run-rush
 Loaded @microsoft/rush-lib installed by install-run-rush
 [
   '_rushSdk_loadInternalModule',

libraries/rush-sdk/src/index.ts

@@ -1,7 +1,6 @@
 {
   "extends": "./node_modules/local-node-rig/profiles/default/tsconfig-base.json",
   "compilerOptions": {
-    "outDir": "lib-commonjs",
     "types": [
       "node",
       "heft-jest",

libraries/rush-sdk/src/test/__snapshots__/script.test.ts.snap

@@ -17,16 +17,16 @@ module.exports = () => {
     mode: 'development', // So the output isn't minified
     devtool: 'source-map',
     entry: {
-      // Using CommonJS due to access of module.parent
-      index: `${__dirname}/lib-commonjs/index.js`,
-      loader: `${__dirname}/lib-commonjs/loader.js`
+      index: `${__dirname}/lib-esm/index.js`,
+      loader: `${__dirname}/lib-esm/loader.js`
     },
     output: {
       path: `${__dirname}/lib-shim`,
       filename: '[name].js',
       chunkFilename: 'chunks/[name].js',
       library: {
-        type: 'commonjs2'
+        type: 'commonjs2',
+        export: 'default'
       }
     },
     optimization: {