upgrade 5.2.28

egret-labs · Sep 11, 2019 · c13aad4 · c13aad4
1 parent 4f11e37
commit c13aad4
Show file tree

Hide file tree

Showing 88 changed files with 924 additions and 462 deletions.
diff --git a/agora/demo/egretProperties.json b/agora/demo/egretProperties.json
@@ -1,6 +1,6 @@
 {
-	"engineVersion": "5.2.27",
-	"compilerVersion": "5.2.27",
+	"engineVersion": "5.2.28",
+	"compilerVersion": "5.2.28",
 	"template": {},
 	"target": {
 		"current": "web"

diff --git a/agora/demo/scripts/api.d.ts b/agora/demo/scripts/api.d.ts
@@ -287,6 +287,10 @@ declare module 'built-in' {
          * 其他传递的消息参数
          */
         info?:any
+        /**
+         * use wechat engine plugin
+         */
+        useWxPlugin?: boolean
     }
 
     /** 

diff --git a/agora/demo/scripts/config.vivogame.ts b/agora/demo/scripts/config.vivogame.ts
@@ -16,7 +16,7 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "debug", defines: { DEBUG: true, RELEASE: false } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
@@ -28,11 +28,14 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "release", defines: { DEBUG: false, RELEASE: true } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
                     new UglifyPlugin([{
+                        sources: ["resource/default.thm.js"],
+                        target: "default.thm.min.js"
+                    }, {
                         sources: ["main.js"],
                         target: "main.min.js"
                     }

diff --git a/agora/demo/scripts/vivogame/vivogame.ts b/agora/demo/scripts/vivogame/vivogame.ts
@@ -7,10 +7,11 @@ export class VivogamePlugin implements plugins.Command {
     async onFile(file: plugins.File) {
         if (file.extname == '.js') {
             const filename = file.origin;
-            this.jsFileList.push(file.basename)
+
             if (filename == "libs/modules/promise/promise.js" || filename == 'libs/modules/promise/promise.min.js') {
                 return null;
             }
+            this.jsFileList.push(file.basename)
             if (filename == 'libs/modules/egret/egret.js' || filename == 'libs/modules/egret/egret.min.js') {
                 let content = file.contents.toString();
                 content += `;window.egret = egret;`;
@@ -86,27 +87,40 @@ export class VivogamePlugin implements plugins.Command {
         const gameJSONPath = path.join(pluginContext.outputDir, "manifest.json");
         let gameJSONContent = JSON.parse(fs.readFileSync(gameJSONPath, { encoding: "utf8" }));
         gameJSONContent.deviceOrientation = orientation;
+        let engineVersion = this.readData(path.join(pluginContext.projectRoot, "egretProperties.json")).engineVersion
+        if(!gameJSONContent.thirdEngine)gameJSONContent.thirdEngine={}
+        gameJSONContent.thirdEngine.egret = engineVersion
+
         fs.writeFileSync(gameJSONPath, JSON.stringify(gameJSONContent, null, "\t"));
         let isPublish = pluginContext.buildConfig.command == "publish" ? true : false;
-        let configOption = "webpackConf.externals = Object.assign(webpackConf.externals || {\n\t\t"
+        let configArr: any[] = []
         for (var i = 0, len = this.jsFileList.length; i < len; i++) {
             let jsFile = this.jsFileList[i];
-            if(isPublish && jsFile == "main.js"){
-                jsFile = 'main.min.js'
-            }
-            configOption += `"js/${jsFile}":"commonjs js/${jsFile}"`
-            if (i < len - 1) {
-                configOption += ",\n\t\t"
-            } else {
-                configOption += "\n\t\t"
+            if (isPublish) {
+                if (jsFile == "main.js") {
+                    jsFile = 'main.min.js'
+                } else if (jsFile == "default.thm.js") {
+                    jsFile = "default.thm.min.js"
+                }
             }
+            configArr.push(JSON.stringify({
+                module_name: `./js/${jsFile}`,
+                module_path: `./js/${jsFile}`,
+                module_from: `engine/js/${jsFile}`,
+            }, null, "\t"))
         }
-        configOption += "})"
-        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configOption + '\n\t\t\/\/----auto option end----';
-
-        const webpackConfigPath = path.join(pluginContext.outputDir, '../config', "webpack.config.js");
-        let configJSContent = fs.readFileSync(webpackConfigPath, { encoding: "utf8" });
-        configJSContent = configJSContent.replace(reg, replaceConfigStr);
-        fs.writeFileSync(webpackConfigPath, configJSContent);
+        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configArr.toString()  + '\n\t\t\/\/----auto option end----';
+        const minigameConfigPath = path.join(pluginContext.outputDir,"../",  "minigame.config.js");
+        if(!fs.existsSync(minigameConfigPath)){
+            //5.2.28版本，vivo更新了项目结构，老项目需要升级
+            fs.writeFileSync(path.join(pluginContext.outputDir,"../","vivo更新了项目结构，请重新创建vivo小游戏项目.js"), "vivo更新了项目结构，请重新创建vivo小游戏项目");
+        }else{
+            let configJSContent = fs.readFileSync(minigameConfigPath, { encoding: "utf8" });
+            configJSContent = configJSContent.replace(reg, replaceConfigStr);
+            fs.writeFileSync(minigameConfigPath, configJSContent);
+        }
+    }
+    readData(filePath: string): any {
+        return JSON.parse(fs.readFileSync(filePath, { encoding: "utf8" }));
     }
 }
diff --git a/benchmark/demo/egretProperties.json b/benchmark/demo/egretProperties.json
@@ -29,6 +29,6 @@
 			"path": "../libsrc"
 		}
 	],
-	"engineVersion": "5.2.27",
-	"compilerVersion": "5.2.27"
+	"engineVersion": "5.2.28",
+	"compilerVersion": "5.2.28"
 }
diff --git a/benchmark/demo/scripts/api.d.ts b/benchmark/demo/scripts/api.d.ts
@@ -287,6 +287,10 @@ declare module 'built-in' {
          * 其他传递的消息参数
          */
         info?:any
+        /**
+         * use wechat engine plugin
+         */
+        useWxPlugin?: boolean
     }
 
     /** 

diff --git a/benchmark/demo/scripts/config.vivogame.ts b/benchmark/demo/scripts/config.vivogame.ts
@@ -16,7 +16,7 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "debug", defines: { DEBUG: true, RELEASE: false } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
@@ -28,11 +28,14 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "release", defines: { DEBUG: false, RELEASE: true } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
                     new UglifyPlugin([{
+                        sources: ["resource/default.thm.js"],
+                        target: "default.thm.min.js"
+                    }, {
                         sources: ["main.js"],
                         target: "main.min.js"
                     }

diff --git a/benchmark/demo/scripts/vivogame/vivogame.ts b/benchmark/demo/scripts/vivogame/vivogame.ts
@@ -7,10 +7,11 @@ export class VivogamePlugin implements plugins.Command {
     async onFile(file: plugins.File) {
         if (file.extname == '.js') {
             const filename = file.origin;
-            this.jsFileList.push(file.basename)
+
             if (filename == "libs/modules/promise/promise.js" || filename == 'libs/modules/promise/promise.min.js') {
                 return null;
             }
+            this.jsFileList.push(file.basename)
             if (filename == 'libs/modules/egret/egret.js' || filename == 'libs/modules/egret/egret.min.js') {
                 let content = file.contents.toString();
                 content += `;window.egret = egret;`;
@@ -86,27 +87,40 @@ export class VivogamePlugin implements plugins.Command {
         const gameJSONPath = path.join(pluginContext.outputDir, "manifest.json");
         let gameJSONContent = JSON.parse(fs.readFileSync(gameJSONPath, { encoding: "utf8" }));
         gameJSONContent.deviceOrientation = orientation;
+        let engineVersion = this.readData(path.join(pluginContext.projectRoot, "egretProperties.json")).engineVersion
+        if(!gameJSONContent.thirdEngine)gameJSONContent.thirdEngine={}
+        gameJSONContent.thirdEngine.egret = engineVersion
+
         fs.writeFileSync(gameJSONPath, JSON.stringify(gameJSONContent, null, "\t"));
         let isPublish = pluginContext.buildConfig.command == "publish" ? true : false;
-        let configOption = "webpackConf.externals = Object.assign(webpackConf.externals || {\n\t\t"
+        let configArr: any[] = []
         for (var i = 0, len = this.jsFileList.length; i < len; i++) {
             let jsFile = this.jsFileList[i];
-            if(isPublish && jsFile == "main.js"){
-                jsFile = 'main.min.js'
-            }
-            configOption += `"js/${jsFile}":"commonjs js/${jsFile}"`
-            if (i < len - 1) {
-                configOption += ",\n\t\t"
-            } else {
-                configOption += "\n\t\t"
+            if (isPublish) {
+                if (jsFile == "main.js") {
+                    jsFile = 'main.min.js'
+                } else if (jsFile == "default.thm.js") {
+                    jsFile = "default.thm.min.js"
+                }
             }
+            configArr.push(JSON.stringify({
+                module_name: `./js/${jsFile}`,
+                module_path: `./js/${jsFile}`,
+                module_from: `engine/js/${jsFile}`,
+            }, null, "\t"))
         }
-        configOption += "})"
-        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configOption + '\n\t\t\/\/----auto option end----';
-
-        const webpackConfigPath = path.join(pluginContext.outputDir, '../config', "webpack.config.js");
-        let configJSContent = fs.readFileSync(webpackConfigPath, { encoding: "utf8" });
-        configJSContent = configJSContent.replace(reg, replaceConfigStr);
-        fs.writeFileSync(webpackConfigPath, configJSContent);
+        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configArr.toString()  + '\n\t\t\/\/----auto option end----';
+        const minigameConfigPath = path.join(pluginContext.outputDir,"../",  "minigame.config.js");
+        if(!fs.existsSync(minigameConfigPath)){
+            //5.2.28版本，vivo更新了项目结构，老项目需要升级
+            fs.writeFileSync(path.join(pluginContext.outputDir,"../","vivo更新了项目结构，请重新创建vivo小游戏项目.js"), "vivo更新了项目结构，请重新创建vivo小游戏项目");
+        }else{
+            let configJSContent = fs.readFileSync(minigameConfigPath, { encoding: "utf8" });
+            configJSContent = configJSContent.replace(reg, replaceConfigStr);
+            fs.writeFileSync(minigameConfigPath, configJSContent);
+        }
+    }
+    readData(filePath: string): any {
+        return JSON.parse(fs.readFileSync(filePath, { encoding: "utf8" }));
     }
 }
diff --git a/dcagent/demo/egretProperties.json b/dcagent/demo/egretProperties.json
@@ -30,6 +30,6 @@
 			"path": "${EGRET_DEFAULT}"
 		}
 	],
-	"engineVersion": "5.2.27",
-	"compilerVersion": "5.2.27"
+	"engineVersion": "5.2.28",
+	"compilerVersion": "5.2.28"
 }
diff --git a/dcagent/demo/scripts/api.d.ts b/dcagent/demo/scripts/api.d.ts
@@ -287,6 +287,10 @@ declare module 'built-in' {
          * 其他传递的消息参数
          */
         info?:any
+        /**
+         * use wechat engine plugin
+         */
+        useWxPlugin?: boolean
     }
 
     /** 

diff --git a/dcagent/demo/scripts/config.vivogame.ts b/dcagent/demo/scripts/config.vivogame.ts
@@ -16,7 +16,7 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "debug", defines: { DEBUG: true, RELEASE: false } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
@@ -28,11 +28,14 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "release", defines: { DEBUG: false, RELEASE: true } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
                     new UglifyPlugin([{
+                        sources: ["resource/default.thm.js"],
+                        target: "default.thm.min.js"
+                    }, {
                         sources: ["main.js"],
                         target: "main.min.js"
                     }

diff --git a/dcagent/demo/scripts/vivogame/vivogame.ts b/dcagent/demo/scripts/vivogame/vivogame.ts
@@ -7,10 +7,11 @@ export class VivogamePlugin implements plugins.Command {
     async onFile(file: plugins.File) {
         if (file.extname == '.js') {
             const filename = file.origin;
-            this.jsFileList.push(file.basename)
+
             if (filename == "libs/modules/promise/promise.js" || filename == 'libs/modules/promise/promise.min.js') {
                 return null;
             }
+            this.jsFileList.push(file.basename)
             if (filename == 'libs/modules/egret/egret.js' || filename == 'libs/modules/egret/egret.min.js') {
                 let content = file.contents.toString();
                 content += `;window.egret = egret;`;
@@ -86,27 +87,40 @@ export class VivogamePlugin implements plugins.Command {
         const gameJSONPath = path.join(pluginContext.outputDir, "manifest.json");
         let gameJSONContent = JSON.parse(fs.readFileSync(gameJSONPath, { encoding: "utf8" }));
         gameJSONContent.deviceOrientation = orientation;
+        let engineVersion = this.readData(path.join(pluginContext.projectRoot, "egretProperties.json")).engineVersion
+        if(!gameJSONContent.thirdEngine)gameJSONContent.thirdEngine={}
+        gameJSONContent.thirdEngine.egret = engineVersion
+
         fs.writeFileSync(gameJSONPath, JSON.stringify(gameJSONContent, null, "\t"));
         let isPublish = pluginContext.buildConfig.command == "publish" ? true : false;
-        let configOption = "webpackConf.externals = Object.assign(webpackConf.externals || {\n\t\t"
+        let configArr: any[] = []
         for (var i = 0, len = this.jsFileList.length; i < len; i++) {
             let jsFile = this.jsFileList[i];
-            if(isPublish && jsFile == "main.js"){
-                jsFile = 'main.min.js'
-            }
-            configOption += `"js/${jsFile}":"commonjs js/${jsFile}"`
-            if (i < len - 1) {
-                configOption += ",\n\t\t"
-            } else {
-                configOption += "\n\t\t"
+            if (isPublish) {
+                if (jsFile == "main.js") {
+                    jsFile = 'main.min.js'
+                } else if (jsFile == "default.thm.js") {
+                    jsFile = "default.thm.min.js"
+                }
             }
+            configArr.push(JSON.stringify({
+                module_name: `./js/${jsFile}`,
+                module_path: `./js/${jsFile}`,
+                module_from: `engine/js/${jsFile}`,
+            }, null, "\t"))
         }
-        configOption += "})"
-        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configOption + '\n\t\t\/\/----auto option end----';
-
-        const webpackConfigPath = path.join(pluginContext.outputDir, '../config', "webpack.config.js");
-        let configJSContent = fs.readFileSync(webpackConfigPath, { encoding: "utf8" });
-        configJSContent = configJSContent.replace(reg, replaceConfigStr);
-        fs.writeFileSync(webpackConfigPath, configJSContent);
+        const replaceConfigStr = '\/\/----auto option start----\n\t\t' + configArr.toString()  + '\n\t\t\/\/----auto option end----';
+        const minigameConfigPath = path.join(pluginContext.outputDir,"../",  "minigame.config.js");
+        if(!fs.existsSync(minigameConfigPath)){
+            //5.2.28版本，vivo更新了项目结构，老项目需要升级
+            fs.writeFileSync(path.join(pluginContext.outputDir,"../","vivo更新了项目结构，请重新创建vivo小游戏项目.js"), "vivo更新了项目结构，请重新创建vivo小游戏项目");
+        }else{
+            let configJSContent = fs.readFileSync(minigameConfigPath, { encoding: "utf8" });
+            configJSContent = configJSContent.replace(reg, replaceConfigStr);
+            fs.writeFileSync(minigameConfigPath, configJSContent);
+        }
+    }
+    readData(filePath: string): any {
+        return JSON.parse(fs.readFileSync(filePath, { encoding: "utf8" }));
     }
 }
diff --git a/ecs/demo/egretProperties.json b/ecs/demo/egretProperties.json
@@ -30,6 +30,6 @@
 			"path": "../libsrc"
 		}
 	],
-	"engineVersion": "5.2.27",
-	"compilerVersion": "5.2.27"
+	"engineVersion": "5.2.28",
+	"compilerVersion": "5.2.28"
 }
diff --git a/ecs/demo/scripts/api.d.ts b/ecs/demo/scripts/api.d.ts
@@ -287,6 +287,10 @@ declare module 'built-in' {
          * 其他传递的消息参数
          */
         info?:any
+        /**
+         * use wechat engine plugin
+         */
+        useWxPlugin?: boolean
     }
 
     /** 

diff --git a/ecs/demo/scripts/config.vivogame.ts b/ecs/demo/scripts/config.vivogame.ts
@@ -16,7 +16,7 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "debug", defines: { DEBUG: true, RELEASE: false } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
@@ -28,11 +28,14 @@ const config: ResourceManagerConfig = {
             return {
                 outputDir,
                 commands: [
-                    new CleanPlugin({ matchers: ["../engine", "resource"] }),
+                    new CleanPlugin({ matchers: ["../engine/js", "resource"] }),
                     new CompilePlugin({ libraryType: "release", defines: { DEBUG: false, RELEASE: true } }),
                     new ExmlPlugin('commonjs'), // 非 EUI 项目关闭此设置
                     new VivogamePlugin(),
                     new UglifyPlugin([{
+                        sources: ["resource/default.thm.js"],
+                        target: "default.thm.min.js"
+                    }, {
                         sources: ["main.js"],
                         target: "main.min.js"
                     }