refactor: pass exclude as a top level param

callstack · Sep 15, 2023 · 950cc59 · 950cc59
1 parent 876a19a
commit 950cc59
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/packages/react-native-builder-bob/src/index.ts b/packages/react-native-builder-bob/src/index.ts
@@ -390,6 +390,9 @@ yargs
       );
     }
 
+    const exclude =
+      options.exclude ?? '**/{__tests__,__fixtures__,__mocks__}/**';
+
     const report = {
       info: logger.info,
       warn: logger.warn,
@@ -418,7 +421,8 @@ yargs
             root,
             source: path.resolve(root, source as string),
             output: path.resolve(root, output as string, 'commonjs'),
-            options: { ...targetOptions, exclude: options.exclude },
+            exclude,
+            options: targetOptions,
             report,
           });
           break;
@@ -427,7 +431,8 @@ yargs
             root,
             source: path.resolve(root, source as string),
             output: path.resolve(root, output as string, 'module'),
-            options: { ...targetOptions, exclude: options.exclude },
+            exclude,
+            options: targetOptions,
             report,
           });
           break;

diff --git a/packages/react-native-builder-bob/src/targets/commonjs.ts b/packages/react-native-builder-bob/src/targets/commonjs.ts
@@ -10,14 +10,15 @@ type Options = Input & {
     configFile?: string | false | null;
     sourceMaps?: boolean;
     copyFlow?: boolean;
-    exclude?: string;
   };
+  exclude: string;
 };
 
 export default async function build({
   root,
   source,
   output,
+  exclude,
   options,
   report,
 }: Options) {
@@ -32,6 +33,7 @@ export default async function build({
     root,
     source,
     output,
+    exclude,
     modules: 'commonjs',
     report,
     field: 'main',

diff --git a/packages/react-native-builder-bob/src/targets/module.ts b/packages/react-native-builder-bob/src/targets/module.ts
@@ -10,14 +10,15 @@ type Options = Input & {
     configFile?: string | false | null;
     sourceMaps?: boolean;
     copyFlow?: boolean;
-    exclude?: string;
   };
+  exclude: string;
 };
 
 export default async function build({
   root,
   source,
   output,
+  exclude,
   options,
   report,
 }: Options) {
@@ -32,6 +33,7 @@ export default async function build({
     root,
     source,
     output,
+    exclude,
     modules: false,
     report,
     field: 'module',

diff --git a/packages/react-native-builder-bob/src/utils/compile.ts b/packages/react-native-builder-bob/src/utils/compile.ts
@@ -11,9 +11,9 @@ type Options = Input & {
   configFile?: string | false | null;
   sourceMaps?: boolean;
   copyFlow?: boolean;
-  exclude?: string;
   modules: 'commonjs' | false;
   field: 'main' | 'module';
+  exclude: string;
 };
 
 export default async function compile({
@@ -22,7 +22,7 @@ export default async function compile({
   output,
   babelrc = false,
   configFile = false,
-  exclude = '**/{__tests__,__fixtures__,__mocks__}/**',
+  exclude,
   modules,
   copyFlow,
   sourceMaps = true,