fix: syncronize default dist folder

ccontrols · Mar 13, 2021 · e9780bb · e9780bb
1 parent f80bb99
commit e9780bb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/core/core/src/node-utils.ts b/core/core/src/node-utils.ts
@@ -19,8 +19,11 @@ export const findUpFile = (
   return findUpFile(path.resolve(filePath, '..'), fileName, levels - 1);
 };
 
+export const defaultDistFolder = 'dist';
+
 export const getDistName = (options: BuildProps): string => {
-  const dist = options.distFolder || path.join(process.cwd(), 'public');
+  const dist =
+    options.distFolder || path.join(process.cwd(), defaultDistFolder);
   return dist;
 };
 

diff --git a/core/webpack-compile/src/args.ts b/core/webpack-compile/src/args.ts
@@ -1,4 +1,5 @@
 import path from 'path';
+import { defaultDistFolder } from '@component-controls/core/node-utils';
 import yargs, { Options, Argv } from 'yargs';
 
 export interface CliArgTypes {
@@ -57,7 +58,7 @@ export const defaultCliArgs: ArgOptions = [
       alias: 'd',
       description: 'distribution (bundle output) folder',
       type: 'string',
-      default: 'public',
+      default: defaultDistFolder,
     },
   },
   {
@@ -66,7 +67,7 @@ export const defaultCliArgs: ArgOptions = [
       alias: 's',
       description: 'static assets folder',
       type: 'string',
-      default: path.join('dist', 'static'),
+      default: path.join(defaultDistFolder, 'static'),
     },
   },
   {

diff --git a/core/webpack-compile/src/utilities.ts b/core/webpack-compile/src/utilities.ts
@@ -4,6 +4,7 @@ import fs from 'fs';
 import { log, error } from '@component-controls/logger';
 import { mergeBuildConfiguration } from '@component-controls/config';
 import { BuildProps, defBundleName } from '@component-controls/core';
+import { defaultDistFolder } from '@component-controls/core/node-utils';
 import { LoadingStore } from '@component-controls/store';
 import LoaderPlugin from '@component-controls/loader/plugin';
 import {
@@ -39,7 +40,8 @@ export interface CompileResults {
  */
 export const getBundleName = (): string => {
   const args = cliArgs().parse();
-  let distFolder = args.dist || `${path.join(process.cwd(), 'public')}`;
+  let distFolder =
+    args.dist || `${path.join(process.cwd(), defaultDistFolder)}`;
   if (!path.isAbsolute(distFolder)) {
     distFolder = path.resolve(process.cwd(), distFolder);
   }
@@ -64,7 +66,8 @@ const createConfig = (options: BuildProps): webpack.Configuration => {
     distFolder: propDistFolder,
     bundleName = defBundleName,
   } = options;
-  let distFolder = propDistFolder || `${path.join(process.cwd(), 'public')}`;
+  let distFolder =
+    propDistFolder || `${path.join(process.cwd(), defaultDistFolder)}`;
   if (!path.isAbsolute(distFolder)) {
     distFolder = path.resolve(process.cwd(), distFolder);
   }

diff --git a/integrations/base-integration/src/webpack-build.ts b/integrations/base-integration/src/webpack-build.ts
@@ -7,7 +7,10 @@ import {
   defaultCompileProps,
 } from '@component-controls/core';
 import { getSiteMap } from '@component-controls/routes';
-import { getBundleName } from '@component-controls/core/node-utils';
+import {
+  getBundleName,
+  defaultDistFolder,
+} from '@component-controls/core/node-utils';
 import { LoadingStore, loadStore } from '@component-controls/store';
 import { log } from '@component-controls/logger';
 import {
@@ -54,7 +57,8 @@ const createOptions = (buildOptions?: BuildProps): BuildProps => {
     return acc;
   }, {});
 
-  const distFolder = options.distFolder || path.join(process.cwd(), 'dist');
+  const distFolder =
+    options.distFolder || path.join(process.cwd(), defaultDistFolder);
   const staticFolder = path.join(options.distFolder || distFolder, 'static');
   return mergeConfig<BuildProps>(
     mergeConfig(defaultCompileProps, {