change es6 cicd

cicdScript.js

@@ -1,24 +1,22 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import zipChannel from './zipChannelScript.js'
+import htmlChannel from './htmlChannelScript.js'
 import { fileURLToPath } from 'url'
+import { removeDist, createDist } from './common/utils.js'
+
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+
 
 // 脚本执行之前的操作
 var iosUrl = "https://apps.apple.com/app/legend-of-mushroom/id6475333787"
 var androidUrl = "https://play.google.com/store/apps/details?id=com.mxdzzus.google"
 
-const __filename = fileURLToPath(import.meta.url)
+removeDist()
-const __dirname = path.dirname(__filename)
+createDist()
-
-function removeDist() {
-    const isExists = fs.existsSync(path.join(__dirname, 'dist'))
-    if (isExists) {
-        fs.rmdirSync(path.join(__dirname, 'dist'), { recursive: true })
-    }
-    if (!isExists) {
-        fs.mkdirSync(path.join(__dirname, 'dist'))
-    }
-}
 
 
 function replaceAppStoreUrl() {

common/utils.js

@@ -0,0 +1,24 @@
+import * as fs from 'fs'
+import * as path from 'path'
+import { fileURLToPath } from 'url'
+
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+
+const dist = path.join(__dirname, '../', 'dist')
+
+export function removeDist() {
+    const isExists = fs.existsSync(dist)
+    if (isExists) {
+        fs.rmdirSync(dist, { recursive: true })
+    }
+}
+
+export function createDist() {
+    const isExists = fs.existsSync(dist)
+    if (!isExists) {
+        fs.mkdirSync(dist)
+    }
+}

htmlChannelScript.js

@@ -1,14 +1,10 @@
 
 import * as fs from 'fs'
 import * as path from 'path'
-import do_task from './single-html/build'
+import do_task from './single-html/build.js'
+import { createDist } from './common/utils.js'
 
 
-// 创建 dist 目录
-if (!fs.existsSync('dist')) {
-    fs.mkdirSync('dist');
-}
-
 // 处理 HTML 渠道
 async function processHtmlChannels(options) {
     const outputPrefix = options.outputPrefix || '';
@@ -96,6 +92,8 @@ async function processHtmlChannels(options) {
         console.log(`已将 ${channelName}.js 和相关 script 引入到 index.html 中`);
 
         // 调用 do_task 方法，将 web-mobile 下的所有包打包成一个 HTML
+        createDist()
+
         do_task();
 
         // 如果是 ironsource 渠道，将 <script src="mraid.js"></script> 插入到 body 标签之前

package.json

@@ -2,9 +2,7 @@
   "type": "module",
   "scripts": {
     "build": "node single-html/build.js",
-    "build:zip": "node zipChannelScript.js",
+    "build:cicd": "node cicdScript.js"
-    "build:h5": "node htmlChannelScript.js",
-    "build:allChannels": "node scriptBefore.js && npm run build:zip && npm run build:h5"
   },
   "devDependencies": {
     "clean-css": "^5.3.3",

single-html/base122.js

@@ -247,10 +247,11 @@ function print8Bits(num) {
     return "00000000".substring(num.toString(2).length) + num.toString(2);
 }
 
-module.exports = {
+
-    encode: encode,
+export {
-    decode: decode,
+    encode,
-    encodeFromBase64: encodeFromBase64,
+    decode,
-    encodeFile: encodeFile,
+    encodeFromBase64,
-    utf8DataToString: utf8DataToString
+    encodeFile,
+    utf8DataToString
 };

single-html/build.js

@@ -4,7 +4,7 @@ import * as path from 'path'
 import uglify from 'uglify-js'
 import CleanCSS from 'clean-css'
 import brotli from 'brotli'
-import base122 from './base122'
+import * as base122 from './base122.js'
 
 /** 一些配置参数
  * - [注意] 路径问题.start脚本与web-mobile同层级,因此相对路径需要带上web-mobile;cocos在调用资源时没有web-mobile,需要在最后去掉

zipChannelScript.js

@@ -1,13 +1,8 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import archiver from 'archiver'
+import { createDist } from './common/utils.js'
 
-// 创建 dist 目录
-if (!fs.existsSync('dist')) {
-    fs.mkdirSync('dist');
-}
-
-// 1. 将js复制到web-mobile中
 async function processChannels(options) {
     const zipChannel = options.zipChannel || ['facebook', 'google', 'tiktok', 'vungle', 'liftoff'];
     const outputPrefix = options.outputPrefix || '';
@@ -97,6 +92,9 @@ async function processChannels(options) {
         fs.writeFileSync(htmlFilePath, htmlContent);
         console.log(`已将 ${channelName}.js 和 SDK script 引入到 index.html 中`);
 
+
+        createDist()
+
         // 打包 web-mobile 目录为 zip 文件
         const output = fs.createWriteStream(path.join('dist', `${outputPrefix}${channelName}.zip`));
         const archive = archiver('zip', {