diff --git a/extensions/fix_engine/dist/main.js b/extensions/fix_engine/dist/main.js index dd005f2c0498a1c0a96f4629ac2fc5522862ea77..79f434eb72e60657873fdf4cabd1676678f19d55 100644 --- a/extensions/fix_engine/dist/main.js +++ b/extensions/fix_engine/dist/main.js @@ -141,10 +141,7 @@ class _Helper { sourcePath = path.normalize(sourcePath); let sourceData = fs.readFileSync(sourcePath, "utf-8"); let destData = fs.readFileSync(destPath, "utf-8"); - let replace = function () { - return arguments[1] + sourceData + arguments[3]; - }; - destData = destData.replace(/(declare\s*module\s*"cc"\s*\{)([\s\n\S]*)(export\s*function\s* murmurhash2_32_gc)/g, replace); + destData = destData.replace('declare module "cc" {', sourceData); fs.writeFileSync(destPath, destData, { encoding: "utf-8" }); console.log(data.desc); } diff --git a/extensions/fix_engine/engine/ccdts b/extensions/fix_engine/engine/ccdts index 1190f2856b947b123ec4bae2938c155a5d3e6245..d8c26478fad009daba8771d5e7dd38f68c260f71 100644 --- a/extensions/fix_engine/engine/ccdts +++ b/extensions/fix_engine/engine/ccdts @@ -1,4 +1,4 @@ - +declare module "cc" { /**@description 引擎扩展声明开始 */ export interface Node { diff --git a/extensions/fix_engine/package-lock.json b/extensions/fix_engine/package-lock.json new file mode 100644 index 0000000000000000000000000000000000000000..f06f405f53dd9c76cfd6ed9d4b59b15166b71b1a --- /dev/null +++ b/extensions/fix_engine/package-lock.json @@ -0,0 +1,49 @@ +{ + "name": "fix_engine", + "version": "1.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "fix_engine", + "version": "1.0.0", + "devDependencies": { + "@types/node": "^16.0.1", + "typescript": "^4.3.4" + } + }, + "node_modules/@types/node": { + "version": "16.11.16", + "resolved": "https://registry.npmmirror.com/@types/node/download/@types/node-16.11.16.tgz", + "integrity": "sha512-Mt07oPv0YcV0OQMZ+ZDZbuNeL8024sJb1OJTtzG014ACGHVLB3sXzuXhnQaHI8fgMOLLTeHOasaltpGUMD0zrg==", + "dev": true + }, + "node_modules/typescript": { + "version": "4.5.4", + "resolved": "https://registry.npmmirror.com/typescript/download/typescript-4.5.4.tgz", + "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + } + }, + "dependencies": { + "@types/node": { + "version": "16.11.16", + "resolved": "https://registry.npmmirror.com/@types/node/download/@types/node-16.11.16.tgz", + "integrity": "sha512-Mt07oPv0YcV0OQMZ+ZDZbuNeL8024sJb1OJTtzG014ACGHVLB3sXzuXhnQaHI8fgMOLLTeHOasaltpGUMD0zrg==", + "dev": true + }, + "typescript": { + "version": "4.5.4", + "resolved": "https://registry.npmmirror.com/typescript/download/typescript-4.5.4.tgz", + "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==", + "dev": true + } + } +} diff --git a/extensions/fix_engine/src/main.ts b/extensions/fix_engine/src/main.ts index 57471eaa3df8a13dd37a06ac1b57b0658f3e7d05..4836764e3bc9edd79638bfd74800fa03f7b5011e 100644 --- a/extensions/fix_engine/src/main.ts +++ b/extensions/fix_engine/src/main.ts @@ -133,10 +133,7 @@ export class _Helper { sourcePath = path.normalize(sourcePath); let sourceData = fs.readFileSync(sourcePath,"utf-8"); let destData = fs.readFileSync(destPath,"utf-8"); - let replace = function(){ - return arguments[1] + sourceData + arguments[3]; - } - destData = destData.replace(/(declare\s*module\s*"cc"\s*\{)([\s\n\S]*)(export\s*function\s* murmurhash2_32_gc)/g,replace); + destData = destData.replace('declare module "cc" {',sourceData); fs.writeFileSync(destPath,destData,{encoding:"utf-8"}); console.log(data.desc); } else if( data.name == "jsbdts") { diff --git a/extensions/hotupdate/dist/Helper.js b/extensions/hotupdate/dist/Helper.js index 4770fe42dcfba3275681f7090ef618d85b53182c..2d91eee24bb8be2c4f9aeb15b88fa7dffa3f0743 100644 --- a/extensions/hotupdate/dist/Helper.js +++ b/extensions/hotupdate/dist/Helper.js @@ -59,7 +59,7 @@ class Helper { get config() { if (this._config == null) { let configPath = path_1.default.join(Editor.Project.path, "config/bundles.json"); - this._config = JSON.parse(fs_extra_1.readFileSync(configPath, { encoding: "utf-8" })); + this._config = JSON.parse((0, fs_extra_1.readFileSync)(configPath, { encoding: "utf-8" })); for (let i = 0; i < this._config.bundles.length; i++) { this.bundles[this._config.bundles[i].dir] = this._config.bundles[i]; } @@ -108,8 +108,8 @@ class Helper { getBundleVersion(key) { if (this.userCache.remoteDir.length > 0) { let versionManifestPath = path_1.default.join(this.userCache.remoteDir, `manifest/${key}_version.json`); - if (fs_extra_1.existsSync(versionManifestPath)) { - let data = fs_extra_1.readFileSync(versionManifestPath, { encoding: "utf-8" }); + if ((0, fs_extra_1.existsSync)(versionManifestPath)) { + let data = (0, fs_extra_1.readFileSync)(versionManifestPath, { encoding: "utf-8" }); let config = JSON.parse(data); return this.getShowRemoteString(config); } @@ -132,7 +132,7 @@ class Helper { /**@description 保存当前用户设置 */ saveUserCache() { let cacheString = JSON.stringify(this.userCache); - fs_extra_1.writeFileSync(this.userCachePath, cacheString); + (0, fs_extra_1.writeFileSync)(this.userCachePath, cacheString); // this.addLog(`写入缓存 :`, this.userCache); } /**@description 生成默认缓存 */ @@ -150,8 +150,8 @@ class Helper { } /**@description 读取本地缓存 */ readCache() { - if (fs_extra_1.existsSync(this.userCachePath)) { - let data = fs_extra_1.readFileSync(this.userCachePath, "utf-8"); + if ((0, fs_extra_1.existsSync)(this.userCachePath)) { + let data = (0, fs_extra_1.readFileSync)(this.userCachePath, "utf-8"); this.userCache = JSON.parse(data); if (this.checkUserCache()) { this.saveUserCache(); @@ -231,7 +231,7 @@ class Helper { } getManifestDir(buildDir) { if (buildDir && buildDir.length > 0) { - return buildDir + "\\manifest"; + return buildDir + "/manifest"; } else { return ""; @@ -240,10 +240,10 @@ class Helper { //插入热更新代码 onInsertHotupdate() { let codePath = path_1.default.join(Editor.Project.path, "extensions/hotupdate/code/hotupdate.js"); - let code = fs_extra_1.readFileSync(codePath, "utf8"); + let code = (0, fs_extra_1.readFileSync)(codePath, "utf8"); // console.log(code); let sourcePath = this.userCache.buildDir + "/main.js"; - let sourceCode = fs_extra_1.readFileSync(sourcePath, "utf8"); + let sourceCode = (0, fs_extra_1.readFileSync)(sourcePath, "utf8"); let templateReplace = function templateReplace() { // console.log(arguments); return arguments[1] + code + arguments[3]; @@ -251,7 +251,7 @@ class Helper { //添加子游戏测试环境版本号 sourceCode = sourceCode.replace(/(\);)([\s\w\S]*)(const[ ]*importMapJson)/g, templateReplace); this.addLog(`向${sourcePath}中插入热更新代码`); - fs_extra_1.writeFileSync(sourcePath, sourceCode, { "encoding": "utf8" }); + (0, fs_extra_1.writeFileSync)(sourcePath, sourceCode, { "encoding": "utf8" }); } /**@description 生成manifest版本文件 */ onCreateManifest() { @@ -264,10 +264,10 @@ class Helper { let version = this.userCache.version; this.addLog("主包版本号:", version); let buildDir = this.userCache.buildDir; - buildDir = path_1.normalize(buildDir); + buildDir = (0, path_1.normalize)(buildDir); this.addLog("构建目录:", buildDir); let manifestDir = this.getManifestDir(buildDir); - manifestDir = path_1.normalize(manifestDir); + manifestDir = (0, path_1.normalize)(manifestDir); this.addLog("构建目录下的Manifest目录:", manifestDir); let serverUrl = this.userCache.serverIP; this.addLog("热更新地址:", serverUrl); @@ -279,7 +279,7 @@ class Helper { }; //删除旧的版本控件文件 this.addLog("删除旧的Manifest目录", manifestDir); - if (fs_extra_1.existsSync(manifestDir)) { + if ((0, fs_extra_1.existsSync)(manifestDir)) { this.addLog("存在旧的，删除掉"); Tools_1.Tools.delDir(manifestDir); } @@ -296,10 +296,10 @@ class Helper { let md5 = require("crypto").createHash('md5').update(content).digest('hex'); manifest.md5 = md5; manifest.version = version; - fs_extra_1.writeFileSync(projectManifestPath, JSON.stringify(manifest)); + (0, fs_extra_1.writeFileSync)(projectManifestPath, JSON.stringify(manifest)); this.addLog(`生成${projectManifestPath}成功`); delete manifest.assets; - fs_extra_1.writeFileSync(versionManifestPath, JSON.stringify(manifest)); + (0, fs_extra_1.writeFileSync)(versionManifestPath, JSON.stringify(manifest)); this.addLog(`生成${versionManifestPath}成功`); //生成所有版本控制文件，用来判断当玩家停止在版本1，此时发版本2时，不让进入游戏，返回到登录，重新走完整个更新流程 let versions = { @@ -320,18 +320,18 @@ class Helper { let md5 = require("crypto").createHash('md5').update(content).digest('hex'); manifest.md5 = md5; manifest.version = this.userCache.bundles[key].version; - fs_extra_1.writeFileSync(projectManifestPath, JSON.stringify(manifest)); + (0, fs_extra_1.writeFileSync)(projectManifestPath, JSON.stringify(manifest)); this.addLog(`生成${projectManifestPath}成功`); delete manifest.assets; versions[`${key}`] = {}; versions[`${key}`].md5 = md5; versions[`${key}`].version = manifest.version; - fs_extra_1.writeFileSync(versionManifestPath, JSON.stringify(manifest)); + (0, fs_extra_1.writeFileSync)(versionManifestPath, JSON.stringify(manifest)); this.addLog(`生成${versionManifestPath}成功`); } //写入所有版本 let versionsPath = path_1.default.join(manifestDir, `versions.json`); - fs_extra_1.writeFileSync(versionsPath, JSON.stringify(versions)); + (0, fs_extra_1.writeFileSync)(versionsPath, JSON.stringify(versions)); this.addLog(`生成versions.json成功`); Tools_1.Tools.zipVersions({ /**@description 主包包含目录 */ @@ -367,7 +367,7 @@ class Helper { const nativeIosPath = projectPath + "/native/engine/ios"; const iosProjPath = projectPath + "/build/ios/proj"; const resPath = projectPath + "/build/ios"; - if (!fs_extra_1.existsSync(resPath) || !fs_extra_1.existsSync(nativeIosPath)) { + if (!(0, fs_extra_1.existsSync)(resPath) || !(0, fs_extra_1.existsSync)(nativeIosPath)) { return; } const prev = path_1.default.resolve(Editor.App.path, ".."); @@ -375,7 +375,7 @@ class Helper { console.log(cmake); const cmd = cmake + " with -S " + nativeIosPath + " -GXcode -B" + iosProjPath + " -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DRES_DIR=" + resPath; - child_process_1.exec(cmd, { encoding: 'utf8' }, function (err, stdout, stderr) { + (0, child_process_1.exec)(cmd, { encoding: 'utf8' }, function (err, stdout, stderr) { if (err) { console.log(err); } @@ -436,11 +436,11 @@ class Helper { this.addLog("[部署]请先选择本地服务器目录"); return; } - if (!fs_extra_1.existsSync(this.userCache.remoteDir)) { + if (!(0, fs_extra_1.existsSync)(this.userCache.remoteDir)) { this.addLog(`[部署]本地测试服务器目录不存在 : ${this.userCache.remoteDir}`); return; } - if (!fs_extra_1.existsSync(this.userCache.buildDir)) { + if (!(0, fs_extra_1.existsSync)(this.userCache.buildDir)) { this.addLog(`[部署]构建目录不存在 : ${this.userCache.buildDir} , 请先构建`); return; } @@ -465,7 +465,7 @@ class Helper { let copyDirs = ["manifest"].concat(temps); for (let i = 0; i < copyDirs.length; i++) { let dir = path_1.default.join(this.userCache.buildDir, copyDirs[i]); - if (!fs_extra_1.existsSync(dir)) { + if (!(0, fs_extra_1.existsSync)(dir)) { this.addLog(`${this.userCache.buildDir} [部署]不存在${copyDirs[i]}目录,无法拷贝文件`); return; } diff --git a/extensions/hotupdate/dist/Tools.js b/extensions/hotupdate/dist/Tools.js index 18cc826513fcd88eeb7873c326791650861ccf7d..2a3a0b7c7e989ae38c16864b26a6ca730d5593e8 100644 --- a/extensions/hotupdate/dist/Tools.js +++ b/extensions/hotupdate/dist/Tools.js @@ -27,11 +27,11 @@ class _Tools { getDirFileCount(dir) { let count = 0; let counter = (dir) => { - let readdir = fs_1.readdirSync(dir); + let readdir = (0, fs_1.readdirSync)(dir); for (let i in readdir) { count++; let fullPath = path_1.default.join(dir, readdir[i]); - fs_1.statSync(fullPath).isDirectory() && counter(fullPath); + (0, fs_1.statSync)(fullPath).isDirectory() && counter(fullPath); } }; counter(dir); @@ -39,16 +39,16 @@ class _Tools { } /**@description 压缩文件到zip */ zipDir(dir, jszip) { - if (!fs_1.existsSync(dir) || !jszip) { + if (!(0, fs_1.existsSync)(dir) || !jszip) { return; } - let readDirs = fs_1.readdirSync(dir); + let readDirs = (0, fs_1.readdirSync)(dir); for (let i = 0; i < readDirs.length; i++) { let file = readDirs[i]; let fullPath = path_1.default.join(dir, file); - let stat = fs_1.statSync(fullPath); + let stat = (0, fs_1.statSync)(fullPath); if (stat.isFile()) { - jszip.file(file, fs_1.readFileSync(fullPath)); + jszip.file(file, (0, fs_1.readFileSync)(fullPath)); } else { stat.isDirectory() && this.zipDir(fullPath, jszip.folder(file)); @@ -64,12 +64,12 @@ class _Tools { for (let index = 0; index < config.mainIncludes.length; index++) { const element = config.mainIncludes[index]; let fullPath = path_1.default.join(config.buildDir, element); - fullPath = path_1.normalize(fullPath); + fullPath = (0, path_1.normalize)(fullPath); this.zipDir(fullPath, jszip.folder(element)); } let packZipName = `main_${config.versions["main"].md5}.zip`; let packZipRootPath = Editor.Project.path + "/PackageVersion"; - packZipRootPath = path_1.normalize(packZipRootPath); + packZipRootPath = (0, path_1.normalize)(packZipRootPath); let packVersionZipPath = path_1.default.join(packZipRootPath, packZipName); this.delDir(packZipRootPath); this.mkdirSync(packZipRootPath); @@ -77,7 +77,7 @@ class _Tools { jszip.generateNodeStream({ type: "nodebuffer", streamFiles: !0 - }).pipe(fs_1.createWriteStream(packVersionZipPath)).on("finish", () => { + }).pipe((0, fs_1.createWriteStream)(packVersionZipPath)).on("finish", () => { config.log("[打包] 打包成功: " + packZipName); }).on("error", (e) => { config.log("[打包] 打包失败:" + e.message); @@ -95,7 +95,7 @@ class _Tools { jszip.generateNodeStream({ type: "nodebuffer", streamFiles: !0 - }).pipe(fs_1.createWriteStream(packVersionZipPath)).on("finish", () => { + }).pipe((0, fs_1.createWriteStream)(packVersionZipPath)).on("finish", () => { config.log("[打包] 打包成功: " + packZipName); }).on("error", (e) => { config.log("[打包] 打包失败:" + e.message); @@ -105,8 +105,8 @@ class _Tools { /**@description 创建目录 */ mkdirSync(dir) { try { - dir = path_1.normalize(dir); - fs_1.mkdirSync(dir); + dir = (0, path_1.normalize)(dir); + (0, fs_1.mkdirSync)(dir); } catch (e) { if ("EEXIST" !== e.code) @@ -120,27 +120,27 @@ class _Tools { */ delDir(sourceDir, isRemoveSourceDir = false) { let delFile = (dir) => { - if (!fs_1.existsSync(dir)) + if (!(0, fs_1.existsSync)(dir)) return; - let readDir = fs_1.readdirSync(dir); + let readDir = (0, fs_1.readdirSync)(dir); for (let i in readDir) { let fullPath = path_1.default.join(dir, readDir[i]); - fs_1.statSync(fullPath).isDirectory() ? delFile(fullPath) : fs_1.unlinkSync(fullPath); + (0, fs_1.statSync)(fullPath).isDirectory() ? delFile(fullPath) : (0, fs_1.unlinkSync)(fullPath); } }; let delDir = (dir) => { - if (!fs_1.existsSync(dir)) + if (!(0, fs_1.existsSync)(dir)) return; - let readDir = fs_1.readdirSync(dir); + let readDir = (0, fs_1.readdirSync)(dir); if (readDir.length > 0) { for (let i in readDir) { let fullPath = path_1.default.join(dir, readDir[i]); delDir(fullPath); } - (dir !== sourceDir || isRemoveSourceDir) && fs_1.rmdirSync(dir); + (dir !== sourceDir || isRemoveSourceDir) && (0, fs_1.rmdirSync)(dir); } else { - (dir !== sourceDir || isRemoveSourceDir) && fs_1.rmdirSync(dir); + (dir !== sourceDir || isRemoveSourceDir) && (0, fs_1.rmdirSync)(dir); } }; delFile(sourceDir); @@ -152,8 +152,8 @@ class _Tools { * @returns */ delFile(filePath) { - if (fs_1.existsSync(filePath)) { - fs_1.unlinkSync(filePath); + if ((0, fs_1.existsSync)(filePath)) { + (0, fs_1.unlinkSync)(filePath); return true; } return false; @@ -167,15 +167,15 @@ class _Tools { copySourceDirToDesDir(source, dest, copyFileCb) { let self = this; let makeDir = (_source, _dest, _copyFileCb) => { - fs_1.exists(_dest, function (isExist) { - isExist ? _copyFileCb(_source, _dest) : fs_1.mkdir(_dest, function () { + (0, fs_1.exists)(_dest, function (isExist) { + isExist ? _copyFileCb(_source, _dest) : (0, fs_1.mkdir)(_dest, function () { if (copyFileCb) copyFileCb(), _copyFileCb(_source, _dest); }); }); }; let copyFile = (_source, _dest) => { - fs_1.readdir(_source, function (err, files) { + (0, fs_1.readdir)(_source, function (err, files) { if (err) throw err; files.forEach(function (filename) { @@ -183,12 +183,12 @@ class _Tools { let writeStram; let sourcePath = _source + "/" + filename; let destPath = _dest + "/" + filename; - fs_1.stat(sourcePath, function (err, stats) { + (0, fs_1.stat)(sourcePath, function (err, stats) { if (err) throw err; if (stats.isFile()) { - readStream = fs_1.createReadStream(sourcePath); - writeStram = fs_1.createWriteStream(destPath); + readStream = (0, fs_1.createReadStream)(sourcePath); + writeStram = (0, fs_1.createWriteStream)(destPath); readStream.pipe(writeStram); if (copyFileCb) copyFileCb(); @@ -210,24 +210,24 @@ class _Tools { * @returns */ readDir(dir, obj, source) { - var stat = fs_1.statSync(dir); + var stat = (0, fs_1.statSync)(dir); if (!stat.isDirectory()) { return; } - var subpaths = fs_1.readdirSync(dir), subpath, size, md5, compressed, relative; + var subpaths = (0, fs_1.readdirSync)(dir), subpath, size, md5, compressed, relative; for (var i = 0; i < subpaths.length; ++i) { if (subpaths[i][0] === '.') { continue; } subpath = path_1.default.join(dir, subpaths[i]); - stat = fs_1.statSync(subpath); + stat = (0, fs_1.statSync)(subpath); if (stat.isDirectory()) { this.readDir(subpath, obj, source); } else if (stat.isFile()) { // Size in Bytes size = stat['size']; - md5 = require("crypto").createHash('md5').update(fs_1.readFileSync(subpath)).digest('hex'); + md5 = require("crypto").createHash('md5').update((0, fs_1.readFileSync)(subpath)).digest('hex'); compressed = path_1.default.extname(subpath).toLowerCase() === '.zip'; relative = path_1.default.relative(source, subpath); relative = relative.replace(/\\/g, '/'); diff --git a/extensions/hotupdate/dist/panels/default/script/index.js b/extensions/hotupdate/dist/panels/default/script/index.js index 3755519434f8c172c76a38bfcda2b946b5fa9350..568809aff53306524aed05c4565bb9a22678c079 100644 --- a/extensions/hotupdate/dist/panels/default/script/index.js +++ b/extensions/hotupdate/dist/panels/default/script/index.js @@ -7,8 +7,8 @@ const Helper_1 = require("../../../Helper"); Helper_1.helper.init(); module.exports = Editor.Panel.define({ listeners: {}, - template: fs_extra_1.readFileSync(path_1.join(__dirname, '../../../../static/template/default/index.html'), 'utf-8'), - style: fs_extra_1.readFileSync(path_1.join(__dirname, '../../../../static/style/default/index.css'), 'utf-8'), + template: (0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, '../../../../static/template/default/index.html'), 'utf-8'), + style: (0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, '../../../../static/style/default/index.css'), 'utf-8'), $: { app: '#app', logArea: "#logArea", @@ -16,9 +16,9 @@ module.exports = Editor.Panel.define({ methods: {}, ready() { if (this.$.app) { - const app = vue_1.createApp({}); + const app = (0, vue_1.createApp)({}); app.component('view-content', { - template: fs_extra_1.readFileSync(path_1.join(__dirname, '../../../../static/template/vue/view.html'), 'utf-8'), + template: (0, fs_extra_1.readFileSync)((0, path_1.join)(__dirname, '../../../../static/template/vue/view.html'), 'utf-8'), data() { return { bundles: Helper_1.helper.cache.bundles, diff --git a/extensions/hotupdate/src/Helper.ts b/extensions/hotupdate/src/Helper.ts index 33b997a90840b561bda561ac596e4f1f47b4f6a6..29cf09a1bb56ecd3562f1681990bb35f5d64ba87 100644 --- a/extensions/hotupdate/src/Helper.ts +++ b/extensions/hotupdate/src/Helper.ts @@ -219,7 +219,7 @@ class Helper { } getManifestDir(buildDir: string) { if (buildDir && buildDir.length > 0) { - return buildDir + "\\manifest"; + return buildDir + "/manifest"; } else { return ""; }