From 0881b0137bf92c1a207f81187f94b777f8515c97 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期一, 09 九月 2024 14:27:13 +0800
Subject: [PATCH] Merge branch 'test'
---
scripts/deploy.js | 1 -
scripts/build.js | 1 -
scripts/helper.js | 2 +-
scripts/merge.js | 2 ++
package.json | 2 --
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 83afd91..f5b4e12 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,6 @@
"publish": "node ./scripts/publish.js yw",
"use:pro": "node ./scripts/use.js yw:pro",
"dev:pro": "node ./scripts/dev.js yw:pro",
- "build:pro": "node ./scripts/build.js yw:pro",
- "deploy:pro": "node ./scripts/deploy.js yw:pro",
"publish:pro": "node ./scripts/publish.js yw:pro",
"merge":"node ./scripts/merge.js",
"preview": "vite preview",
diff --git a/scripts/build.js b/scripts/build.js
index 720aeba..8df5a98 100644
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -24,7 +24,6 @@
logError(`璇锋纭娇鐢ㄥ懡浠� 鈥渘pm run build customer鈥濓紙鐩墠鍙敮鎸佷竴娆￠儴缃蹭竴涓級`);
exit(); // 閫�鍑鸿剼鏈�
}
-changeBranch();
checkCustomer('npm run build', firstCustomerName);
diff --git a/scripts/deploy.js b/scripts/deploy.js
index 37fa6d9..8741ff7 100644
--- a/scripts/deploy.js
+++ b/scripts/deploy.js
@@ -6,7 +6,6 @@
`);
exit(); // 閫�鍑鸿剼鏈�
}
-changeBranch();
checkCustomer('npm run deploy')
diff --git a/scripts/helper.js b/scripts/helper.js
index d092997..62fda81 100644
--- a/scripts/helper.js
+++ b/scripts/helper.js
@@ -384,6 +384,6 @@
updateImportGlob,
restoreImportGlob,
-
+ deployEnv,
changeBranch
};
diff --git a/scripts/merge.js b/scripts/merge.js
index acf4db1..e7ccff3 100644
--- a/scripts/merge.js
+++ b/scripts/merge.js
@@ -1,3 +1,5 @@
+const { execSync } = require('child_process');
+
// 鍚堝苟娴嬭瘯鍒嗘敮鍒颁富鍒嗘敮
try {
execSync('git merge test master', { stdio: 'inherit' });
--
Gitblit v1.9.3