fix: config should in config dile

wangjs-jacky · Dec 9, 2021 · 3319dd0 · 3319dd0
1 parent 3258bc8
commit 3319dd0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/packages/father-build/src/build.ts b/packages/father-build/src/build.ts
@@ -117,8 +117,6 @@ export async function build(opts: IOpts, extraOpts: IExtraBuildOpts = {}) {
   const { cwd, rootPath, watch, buildArgs = {} } = opts;
   const { pkg } = extraOpts;
 
-  const outputDir = opts.buildArgs.output || 'dist';
-
   const dispose: Dispose[] = [];
 
   const customConfigPath =
@@ -147,6 +145,8 @@ export async function build(opts: IOpts, extraOpts: IExtraBuildOpts = {}) {
   for (const bundleOpts of bundleOptsArray) {
     validateBundleOpts(bundleOpts, { cwd, rootPath });
 
+    const outputDir = '' + (bundleOpts.output || 'dist');
+
     // Clean dist
     log(chalk.gray(`Clean ${outputDir} directory`));
     rimraf.sync(join(cwd, outputDir));

diff --git a/packages/father-build/src/schema.ts b/packages/father-build/src/schema.ts
@@ -4,6 +4,7 @@ export default {
   type: 'object',
   additionalProperties: false,
   properties: {
+    output: { type: 'string' },
     entry: {
       oneOf: [noEmptyStr, { type: 'array', items: noEmptyStr }],
     },
@@ -26,7 +27,7 @@ export default {
             importLibToEs: {
               type: 'boolean',
             },
-            dir: noEmptyStr
+            dir: noEmptyStr,
           },
         },
       ],
@@ -64,8 +65,8 @@ export default {
             sourcemap: {
               oneOf: [
                 { type: 'boolean' },
-                { type: 'string', pattern: '^(inline|hidden)$', },
-              ]
+                { type: 'string', pattern: '^(inline|hidden)$' },
+              ],
             },
           },
         },
@@ -102,11 +103,7 @@ export default {
       type: 'object',
     },
     include: {
-      oneOf: [
-        { type: 'string' },
-        { type: 'object' },
-        { type: 'array' },
-      ]
+      oneOf: [{ type: 'string' }, { type: 'object' }, { type: 'array' }],
     },
     runtimeHelpers: {
       type: 'boolean',
@@ -128,16 +125,13 @@ export default {
       type: 'object',
     },
     lessInRollupMode: {
-      type: 'object'
+      type: 'object',
     },
     sassInRollupMode: {
-      type: 'object'
+      type: 'object',
     },
     lessInBabelMode: {
-      oneOf: [
-        { type: 'boolean' },
-        { type: 'object' },
-      ],
+      oneOf: [{ type: 'boolean' }, { type: 'object' }],
     },
     browserFiles: {
       type: 'array',