8000 Merge branch 'octogonz/rush-sdk-internals' of https://github.com/micr… · pullup-0/rushstack@62cdb86 · GitHub
[go: up one dir, main page]

Skip to content

Commit 62cdb86

Browse files
committed
Merge branch 'octogonz/rush-sdk-internals' of https://github.com/microsoft/rushstack into octogonz/rush-sdk-internals
2 parents f4b2756 + 782c7d4 commit 62cdb86

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build-tests/install-test-workspace/workspace/rush-sdk-test/tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
"module": "commonjs",
1717
"target": "es6",
18-
"lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"]
18+
"lib": ["es5", "es2015.collection", "es2015.iterable", "es2015.promise"],
19+
"rootDir": "src"
1920
},
20-
"include": ["**/*.ts"],
21-
"exclude": ["node_modules", "lib"]
21+
"include": ["src/**/*.ts"]
2222
}

libraries/rush-lib/src/api/RushInternals.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class RushInternals {
1818
* @returns the module object as would be returned by `require()`
1919
*/
2020
public static loadModule(srcImportPath: string): unknown {
21-
const libPath: string = path.join(Rush._rushLibPackageFolder, 'lib', srcImportPath);
21+
const libPath: string = `${Rush._rushLibPackageFolder}/lib/${srcImportPath}`;
2222
try {
2323
return require(libPath);
2424
} catch (e) {

0 commit comments

Comments
 (0)
0