modify publicUrl is options filter space string

Author: imagine10255

lib/build-docker/index.ts

@@ -1,7 +1,11 @@
 import * as child_process from 'child_process';
 import chalk from 'chalk';
 import ora from 'ora';
-import {bash, renameDockerImage} from '../script/utils';
+import {
+    bash,
+    renameDockerImage,
+    isEmpty
+} from '../script/utils';
 import {CLIError} from '../script/cli';
 import logger from '../script/logger';
 import {initDefault} from '../config';
@@ -15,10 +19,14 @@ interface IArgs {
 }
 
 
-function buildDockerImage(imageName: string, version: string, remoteAddress: string, publicUrl: string, dockerfile: string): Promise<string> {
+function buildDockerImage(imageName: string, version: string, remoteAddress: string, dockerfile: string, publicUrl?: string): Promise<string> {
 
     return new Promise((resolve, reject) => {
-        const dockerBuildArgs = ['build', '-t', imageName, '-f', dockerfile, '--build-arg', `PUBLIC_URL=${publicUrl}`, '.'];
+        const options = {
+            publicUrl: isEmpty(publicUrl) ? `PUBLIC_URL=${publicUrl}`: undefined,
+        };
+        const dockerBuildArgs = ['build', '-t', imageName, '-f', dockerfile, '--build-arg', options.publicUrl, '.']
+            .filter(arg => typeof arg !== 'undefined') as string[];
 
         const loader = ora();
         logger.info(
@@ -87,7 +95,7 @@ async function run(args?: IArgs) {
     console.log(`ready release ${imageName}:${imageVersion} ...`);
 
     // Build Image
-    const targetImageName = await buildDockerImage(imageName, imageVersion, remoteAddress, publicUrl, dockerfile);
+    const targetImageName = await buildDockerImage(imageName, imageVersion, remoteAddress, dockerfile, publicUrl);
 
     // By OSX Notice
     bash(`osascript -e 'display notification "${targetImageName} done" with title "build done"'`);

lib/config.ts

@@ -2,6 +2,6 @@ export const initDefault = {
     packageName: 'bear-example',
     packageVersion: '0.0.0',
     dockerRegistry: 'docker.bear.com:8443',
-    publicUrl: '/',
+    publicUrl: undefined,
     dockerfilePath: './Dockerfile',
 };

lib/index.ts

@@ -8,7 +8,7 @@ module.exports = async function bearScript () {
             return yargs
                 .positional('publicUrl', {
                     describe: 'react-script build public url (ex: /recommend)',
-                    default: '/',
+                    default: 'undefined',
                 })
                 .positional('dockerfile', {
                     describe: 'custom dockerfile path (ex: ./)',

lib/script/utils.ts

@@ -14,4 +14,29 @@ export const bash = (cmd: string) => {
  */
 export const renameDockerImage = (imageName: string, version: string, remoteAddress: string): string => {
     return `${remoteAddress}/${imageName}:${version}`;
+};
+
+
+/**
+ * 判定是否為空
+ * @param value
+ * @param checkOption
+ * @returns {boolean}
+ */
+export function isEmpty(value: any, checkOption?: {
+    isZero?: boolean,
+    isFalse?: boolean,
+}): value is undefined {
+    const defaultCheckOption = {
+        isZero: checkOption?.isZero ?? true,
+        isFalse: checkOption?.isFalse ?? true,
+    };
+    return (
+        value === undefined
+        || value === null
+        || (defaultCheckOption.isFalse && (value === false || value === 'false'))
+        || (defaultCheckOption.isZero && (value === 0 || value === '0'))
+        || (!(value instanceof Date) && typeof value === 'object' && Object.keys(value).length === 0)
+        || (typeof value === 'string' && value.trim().length === 0)
+    );
 }