[cli]: pass buildDir to exports of package.json

zgid123 · Jun 12, 2024 · 68a136f · 68a136f
1 parent 009a194
commit 68a136f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc.ts/cli",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "license": "MIT",
   "directories": {
     "lib": "lib"

diff --git a/packages/cli/src/interface.ts b/packages/cli/src/interface.ts
@@ -15,6 +15,7 @@ export interface IMonorepoOutputProps {
 
 export interface IConfigProps {
   output?: string;
+  buildDir?: string;
   external?: string[];
   paths?: string | string[];
   monorepo?: IMonorepoOutputProps;
@@ -49,8 +50,11 @@ export interface INamespaceDataProps {
 
 export type TParseNamespaceReturn = [string, INamespaceDataProps];
 
-export type TConfigParams = Omit<Required<IConfigProps>, 'monorepo'> &
-  Pick<IConfigProps, 'monorepo'>;
+export type TConfigParams = Omit<
+  Required<IConfigProps>,
+  'monorepo' | 'buildDir'
+> &
+  Pick<IConfigProps, 'monorepo' | 'buildDir'>;
 
 export interface IProtoDataProps {
   filePath: string;

diff --git a/packages/cli/src/tasks/createContent/index.ts b/packages/cli/src/tasks/createContent/index.ts
@@ -25,7 +25,7 @@ export async function createContent(
   groupedData: IProtoDataProps[][],
   config: TConfigParams,
 ): Promise<void> {
-  const { output, monorepo } = config;
+  const { output, buildDir = 'dist', monorepo } = config;
   const cachedTypes: ICachedTypesProps = {};
   const cachedPackageOutputs: ICachedPackageOutputsProps = {};
   let outputDir = output;
@@ -134,8 +134,13 @@ export async function createContent(
 
   if (monorepo) {
     const { multiEntries, compiler } = monorepo;
-    const { engine } = compiler || {};
+    const { engine, options } = compiler || {};
     const hasEngine = !!engine;
+    let buildDirectory = buildDir;
+
+    if (options?.outDir) {
+      buildDirectory = options.outDir;
+    }
 
     await createCompilerConfig({
       config: monorepo,
@@ -151,10 +156,10 @@ export async function createContent(
         result.content.push(`export * from './${filename}';`);
 
         result.exports[`./${packageName}`] =
-          `./${filename}.${hasEngine ? 'js' : 'ts'}`;
+          `./${buildDirectory}/${filename}.${hasEngine ? 'js' : 'ts'}`;
 
         result.typesVersions[`${packageName}`] = [
-          `./${filename}.${hasEngine ? 'd.ts' : 'ts'}`,
+          `./${buildDirectory}/${filename}.${hasEngine ? 'd.ts' : 'ts'}`,
         ];
 
         return result;