wgt-node-utils 1.2.7 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wgt-node-utils",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "WGT工具类包",
   "main": "dist/bundle.js",
   "scripts": {

package/src/index.js

@@ -252,7 +252,7 @@ class wgtNodeUtils {
      * @dirname 项目的绝对地址
      * @useReactRouterDom 是否需要reactRouterDom
      */
-    readF2eFiles = (buildName, version, dirname, useReactRouterDom = false) => {
+    readF2eFiles = (buildName, version, dirname) => {
         console.log('静态资源:开始读取');
         return new Promise((resolve, reject) => {
             try {
@@ -273,14 +273,9 @@ class wgtNodeUtils {
                     }
                 });
                 // 增加react依赖
-                this.fileContents['react.production.min.js'] = fs.readFileSync(path.join(dirname, `../${buildName}/dist/react.production.min.js`),'utf8');
-                this.fileContents['react-dom.production.min.js'] = fs.readFileSync(path.join(dirname, `../${buildName}/dist/react-dom.production.min.js`),'utf8');
-                
-                if (useReactRouterDom) {
-                    this.fileContents['react-router-dom.min.js'] = fs.readFileSync(path.join(dirname, `../${buildName}/dist/react-router-dom.min.js`),'utf8');
-                }
+                fileContents['preact.min.js'] = fs.readFileSync(path.join(__dirname, `../${name}/dist/preact.min.js`),'utf8');
+		        console.log('静态资源列表:');
 
-                console.log('静态资源列表:');
                 const f2eFileLoadStatus = Object.keys(this.fileContents).every((item) => {
                     const file = this.fileContents[item];
                     console.log(item, ':', file ? file.length : 'null');
@@ -646,7 +641,7 @@ class wgtNodeUtils {
      * @pageName 页面名称
      * @isMobile 是否为移动端
      */
-    getModelF2eFiles = (pageName, isMobile, useReactRouterDom = false) => {
+    getModelF2eFiles = (pageName, isMobile) => {
         let jsName = `${pageName}.entry.js`;
         let cssName = `${pageName}.entry.css`;
         // 带设备信息的静态资源
@@ -658,13 +653,9 @@ class wgtNodeUtils {
         let f2eFiles = {
             jsStr: this.fileContents[jsName],
             cssStr: this.fileContents[cssName],
-            reactStr: this.fileContents['react.production.min.js'],
-            reactDomStr: this.fileContents['react-dom.production.min.js']
+            preactStr: fileContents['preact.min.js']
         };
-    
-        if (useReactRouterDom) {
-            f2eFiles.reactRouterStr = this.fileContents['react-router-dom.min.js']
-        }
+
         // 每次启动服务后仅对第一次失败进行验证
         if (!this.filesErrorSendStatus) {
             const fileStatus = Object.keys(f2eFiles).every(item => {
@@ -672,7 +663,7 @@ class wgtNodeUtils {
                 if (file && file.length > 0) {
                     return true;
                 }
-                this.appendLog(`文件加载失败:${pageName}[${item}]`, 'test', 'test');
+                this.appendLog(`文件加载失败:${pageName}[${item}]`);
                 return false;
             });
             this.filesErrorSendStatus = !fileStatus;
@@ -757,8 +748,8 @@ class wgtNodeUtils {
         // 检查是否包含大写字母（排除大写字母）
         const hasUpperCase = /[A-Z]/;
 
-        // 检查是否包含特殊字符（除斜杠和下划线外）
-        const hasSpecialChar = /[^a-zA-Z0-9/_]/;
+        // 检查是否包含特殊字符（除斜杠 、下划线 横杠外）
+        const hasSpecialChar = /[^a-zA-Z0-9/_-]/;
 
 
          // 任意条件满足即为非法路径