feat: 新增 build 完之後以詢問方式要不要發布和刪除

Author: imagine10255

README.md

@@ -26,7 +26,7 @@ in your package.json
   "dockerRegistry": "docker.bearests.com:8443",
   "scripts": {
     "docker:build": "bear-react-docker docker --publicUrl=/recommend --dockerfile=./node_modules/bear-react-docker/config/Dockerfile",
-    "docker:push": "bear-react-docker push && bear-react-docker remove"
+    "docker:push": "bear-react-docker push"
   }
 }
 ```
@@ -42,7 +42,7 @@ package.json
   "dockerRegistry": "docker.bearests.com:8443",
   "scripts": {
     "docker:build": "bear-react-docker build --publicUrl=/recommend",
-    "docker:push": "bear-react-docker push && bear-react-docker remove"
+    "docker:push": "bear-react-docker push"
   }
 }
 ```

lib/build-docker/index.ts

@@ -4,10 +4,14 @@ import ora from 'ora';
 import {bash, renameDockerImage} from '../script/utils';
 import {CLIError} from '../script/cli';
 import logger from '../script/logger';
+import {initDefault} from '../config';
+import pushDocker from '../push-docker';
+
+const {Select} = require('enquirer');
 
 interface IArgs {
-    publicUrl: string
-    dockerfile: string
+    publicUrl?: string
+    dockerfile?: string
 }
 
 
@@ -73,12 +77,12 @@ function buildDockerImage(imageName: string, version: string, remoteAddress: str
 
 
 
-async function run(args: IArgs) {
-    const imageName = process.env.npm_package_name ?? 'bear-example';
-    const imageVersion = process.env.npm_package_version ?? '0.0.0';
-    const remoteAddress = process.env.npm_package_dockerRegistry ?? 'docker.bearests.com:8443';
-    const publicUrl = typeof args.publicUrl !== 'undefined' ? args.publicUrl: '';
-    const dockerfile = typeof args.dockerfile !== 'undefined' ? args.dockerfile: './';
+async function run(args?: IArgs) {
+    const imageName = process.env.npm_package_name ?? initDefault.packageName;
+    const imageVersion = process.env.npm_package_version ?? initDefault.packageVersion;
+    const remoteAddress = process.env.npm_package_dockerRegistry ?? initDefault.dockerRegistry;
+    const publicUrl = typeof args?.publicUrl !== 'undefined' ? args.publicUrl: initDefault.publicUrl;
+    const dockerfile = typeof args?.dockerfile !== 'undefined' ? args.dockerfile: initDefault.dockerfilePath;
 
     console.log(`ready release ${imageName}:${imageVersion} ...`);
 
@@ -87,6 +91,19 @@ async function run(args: IArgs) {
 
     // By OSX Notice
     bash(`osascript -e 'display notification "${targetImageName} done" with title "build done"'`);
+
+    const prompt = new Select({
+        name: 'confirmPush',
+        message: 'do you want to push it?',
+        choices: [
+            {name: 'y', message: 'Yes'},
+            {name: 'n', message: 'No'},
+        ],
+    });
+    const confirmPush = await prompt.run();
+    if(confirmPush === 'y'){
+        pushDocker();
+    }
 }
 
 export default run;

lib/build-docker/node-run.ts

@@ -0,0 +1,4 @@
+import buildDocker from './index';
+
+// $ ts-node lib/build-docker/node-run.ts
+buildDocker();

lib/config.ts

@@ -0,0 +1,7 @@
+export const initDefault = {
+    packageName: 'bear-example',
+    packageVersion: '0.0.0',
+    dockerRegistry: 'docker.bear.com:8443',
+    publicUrl: '',
+    dockerfilePath: './',
+};

lib/push-docker/index.ts

@@ -1,18 +1,16 @@
 import {bash, renameDockerImage} from '../script/utils';
 import logger from '../script/logger';
+import {initDefault} from '../config';
+import removeDocker from '../remove-docker';
 
-interface IArgs {
-    publicUrl: string
-    dockerfile: string
-}
-
+const {Select} = require('enquirer');
 
 
 
-async function run(args: IArgs) {
-    const imageName = process.env.npm_package_name ?? 'bear-example';
-    const imageVersion = process.env.npm_package_version ?? '0.0.0';
-    const remoteAddress = process.env.npm_package_dockerRegistry ?? 'docker.bearests.com:8443';
+async function run() {
+    const imageName = process.env.npm_package_name ?? initDefault.packageName;
+    const imageVersion = process.env.npm_package_version ?? initDefault.packageVersion;
+    const remoteAddress = process.env.npm_package_dockerRegistry ?? initDefault.dockerRegistry;
 
     console.log(`ready release ${imageName}:${imageVersion} ...`);
 
@@ -25,6 +23,19 @@ async function run(args: IArgs) {
 
     // By OSX Notice
     bash(`osascript -e 'display notification "${targetImageName} done" with title "publish done"'`);
+
+    const prompt = new Select({
+        name: 'confirmDelete',
+        message: 'do you want to delete it?',
+        choices: [
+            {name: 'y', message: 'Yes'},
+            {name: 'n', message: 'No'},
+        ],
+    });
+    const confirmDelete = await prompt.run();
+    if(confirmDelete === 'y'){
+        removeDocker();
+    }
 }
 
 export default run;

lib/push-docker/node-run.ts

@@ -0,0 +1,4 @@
+import pushDocker from './index';
+
+// $ ts-node lib/push-docker/node-run.ts
+pushDocker();

lib/remove-docker/index.ts

@@ -1,17 +1,14 @@
 import {bash, renameDockerImage} from '../script/utils';
 import logger from '../script/logger';
+import {initDefault} from '../config';
 
-interface IArgs {
-    publicUrl: string
-    dockerfile: string
-}
 
 
 
-async function run(args: IArgs) {
-    const imageName = process.env.npm_package_name ?? 'bear-example';
-    const imageVersion = process.env.npm_package_version ?? '0.0.0';
-    const remoteAddress = process.env.npm_package_dockerRegistry ?? 'docker.bearests.com:8443';
+async function run() {
+    const imageName = process.env.npm_package_name ?? initDefault.packageName;
+    const imageVersion = process.env.npm_package_version ?? initDefault.packageVersion;
+    const remoteAddress = process.env.npm_package_dockerRegistry ?? initDefault.dockerRegistry;
 
     // Build Image
     const targetImageName = renameDockerImage(imageName, imageVersion, remoteAddress);

lib/remove-docker/node-run.ts

@@ -0,0 +1,4 @@
+import removeDocker from './index';
+
+// $ ts-node lib/remove-docker/node-run.ts
+removeDocker();

package.json

@@ -56,6 +56,7 @@
     "cross-env": "^7.0.2",
     "cz-conventional-changelog": "3.3.0",
     "cz-customizable": "6.3.0",
+    "enquirer": "^2.3.6",
     "eslint": "^8.8.0",
     "jest": "^27.4.7",
     "microbundle": "0.14.2",

yarn.lock

@@ -1834,6 +1834,11 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^4.1.0"
 
+ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -3177,6 +3182,13 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
+enquirer@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"