nest-webpack.js monorepoRoot use config from tsdk.config.js

tsdk-monorepo · Jan 2, 2024 · e7e2eca · e7e2eca
1 parent 6d1a932
commit e7e2eca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/tsdk/src/nest-webpack.ts b/packages/tsdk/src/nest-webpack.ts
@@ -7,6 +7,8 @@ import nodeExternals from 'webpack-node-externals';
 
 import { getNpmCommand } from './get-pkg-manager';
 
+export const tsdkConfigFilePath = path.join(process.cwd(), 'tsdk.config.js');
+
 const defaultMainName = 'default';
 const distProjects = 'dist-projects';
 
@@ -191,7 +193,7 @@ async function getNestProjectsConfig() {
   const cwd = process.cwd();
   const nestjsFilepath = path.resolve(
     cwd,
-    process.env.MONOREPO_ROOT || './',
+    require(tsdkConfigFilePath).monorepoRoot || './',
     'node_modules/@nestjs/cli/package.json'
   );
   const nestjsFilepathExists = await fsExtra.pathExists(nestjsFilepath);

diff --git a/packages/tsdk/src/run-nest-command.ts b/packages/tsdk/src/run-nest-command.ts
@@ -11,15 +11,18 @@ export async function runNestCommand() {
   if (command === 'build') {
     const cwd = process.cwd();
     const webpackDistFile = path.resolve(cwd, 'node_modules', 'nest-webpack.js');
-    const pkgManagerDistFile = path.resolve(cwd, 'node_modules', 'get-pkg-manager.js');
-    await Promise.all([
-      fsExtra.copy(path.resolve(__dirname, '../lib/nest-webpack.js'), webpackDistFile, {
-        overwrite: true,
-      }),
-      fsExtra.copy(path.resolve(__dirname, '../lib/get-pkg-manager.js'), pkgManagerDistFile, {
-        overwrite: true,
-      }),
-    ]);
+    const copyFiles = ['nest-webpack.js', 'get-pkg-manager.js'];
+    await Promise.all(
+      copyFiles.map((filename) => {
+        return fsExtra.copy(
+          path.resolve(__dirname, `../lib/${filename}`),
+          path.resolve(cwd, 'node_modules', filename),
+          {
+            overwrite: true,
+          }
+        );
+      })
+    );
 
     const names = process.argv.filter((i, index) => index > idx + 1);