From 18df6a413f8271b5485db16bda56d7caf48e2df7 Mon Sep 17 00:00:00 2001 From: msojocs Date: Fri, 11 Mar 2022 12:43:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96wcc=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=B8=80=E5=A4=84=E8=AF=95=E5=9B=BE=E4=BF=AE=E6=94=B9=E5=B8=B8?= =?UTF-8?q?=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{--bug.md => bug_report_cn.md} | 2 +- .../{bug_report.md => bug_report_en.md} | 0 .github/workflows/release.yml | 1 + compiler/nodejs/wcc | 257 +++++++----------- res/aur/PKGBUILD | 6 +- 5 files changed, 101 insertions(+), 165 deletions(-) rename .github/ISSUE_TEMPLATE/{--bug.md => bug_report_cn.md} (91%) rename .github/ISSUE_TEMPLATE/{bug_report.md => bug_report_en.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/--bug.md b/.github/ISSUE_TEMPLATE/bug_report_cn.md similarity index 91% rename from .github/ISSUE_TEMPLATE/--bug.md rename to .github/ISSUE_TEMPLATE/bug_report_cn.md index f31acd5..9f1df0c 100644 --- a/.github/ISSUE_TEMPLATE/--bug.md +++ b/.github/ISSUE_TEMPLATE/bug_report_cn.md @@ -1,6 +1,6 @@ --- name: 报告Bug -about: 创建一个问题报告帮助我们做得更好 +about: 如果阁下提交的`issue`属于bug,但没有按模板提交,那么将会被忽略或删除 title: '' labels: bug assignees: '' diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report_en.md similarity index 100% rename from .github/ISSUE_TEMPLATE/bug_report.md rename to .github/ISSUE_TEMPLATE/bug_report_en.md diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c426d3b..aeafe11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,6 +66,7 @@ jobs: cp -r compiler tmp/build/compiler cd tmp/build ls -l + sudo rm -rf compiler/test tar -zcf compiler.tar.gz compiler tar -zcf nodegit.tar.gz nodegit rm -rf compiler nodegit diff --git a/compiler/nodejs/wcc b/compiler/nodejs/wcc index 67d60d6..afae76f 100755 --- a/compiler/nodejs/wcc +++ b/compiler/nodejs/wcc @@ -13,7 +13,90 @@ const DEBUG_OUTPUT = process.env["WX_DEBUG_COMPILER_OUTPUT"]; const COMMON_PREFIX = "var __wxAppData=__wxAppData||{};var __wxAppCode__=__wxAppCode__||{};var global=global||{};var __WXML_GLOBAL__=__WXML_GLOBAL__||{entrys:{},defines:{},modules:{},ops:[],wxs_nf_init:undefined,total_ops:0};var Component=Component||function(){};var definePlugin=definePlugin||function(){};var requirePlugin=requirePlugin||function(){};var Behavior=Behavior||function(){};var __vd_version_info__=__vd_version_info__||{};var __GWX_GLOBAL__=__GWX_GLOBAL__||{};var __globalThis=(typeof __vd_version_info__!=='undefined'&&typeof __vd_version_info__.globalThis!=='undefined')?__vd_version_info__.globalThis:(typeof window!=='undefined'?window:globalThis);if(this&&this.__g===undefined)Object.defineProperty(this,\u0022__g\u0022,{configurable:false,enumerable:false,writable:false,value:function(){function D(e,t){if(typeof t!=\u0022undefined\u0022)e.children.push(t)}function S(e){if(typeof e!=\u0022undefined\u0022)return{tag:\u0022virtual\u0022,wxKey:e,children:[]};return{tag:\u0022virtual\u0022,children:[]}}function v(e){$gwxc++;if($gwxc>=16e3){throw\u0022Dom limit exceeded, please check if there's any mistake you've made.\u0022}return{tag:\u0022wx-\u0022+e,attr:{},children:[],n:[],raw:{},generics:{}}}function e(e,t){t&&e.properities.push(t)}function t(e,t,r){return typeof e[r]!=\u0022undefined\u0022?e[r]:t[r]}function u(e){console.warn(\u0022WXMLRT_\u0022+g+\u0022:\u0022+e)}function r(e,t){u(t+\u0022:-1:-1:-1: Template `\u0022+e+\u0022` is being called recursively, will be stop.\u0022)}var s=console.warn;var n=console.log;function o(){function e(){}e.prototype={hn:function(e,t){if(typeof e==\u0022object\u0022){var r=0;var n=false,o=false;for(var a in e){n=n|a===\u0022__value__\u0022;o=o|a===\u0022__wxspec__\u0022;r++;if(r>2)break}return r==2&&n&&o&&(t||e.__wxspec__!==\u0022m\u0022||this.hn(e.__value__)===\u0022h\u0022)?\u0022h\u0022:\u0022n\u0022}return\u0022n\u0022},nh:function(e,t){return{__value__:e,__wxspec__:t?t:true}},rv:function(e){return this.hn(e,true)===\u0022n\u0022?e:this.rv(e.__value__)},hm:function(e){if(typeof e==\u0022object\u0022){var t=0;var r=false,n=false;for(var o in e){r=r|o===\u0022__value__\u0022;n=n|o===\u0022__wxspec__\u0022;t++;if(t>2)break}return t==2&&r&&n&&(e.__wxspec__===\u0022m\u0022||this.hm(e.__value__))}return false}};return new e}var A=o();function T(e){var t=e.split(\u0022\u005cn \u0022+\u0022 \u0022+\u0022 \u0022+\u0022 \u0022);for(var r=0;r=\u0022:case\u0022<=\u0022:case\u0022>\u0022:case\u0022<\u0022:case\u0022<<\u0022:case\u0022>>\u0022:p=x(e[1],t,r,n,o,a);u=x(e[2],t,r,n,o,a);l=M&&(A.hn(p)===\u0022h\u0022||A.hn(u)===\u0022h\u0022);switch(i){case\u0022+\u0022:f=A.rv(p)+A.rv(u);break;case\u0022*\u0022:f=A.rv(p)*A.rv(u);break;case\u0022/\u0022:f=A.rv(p)/A.rv(u);break;case\u0022%\u0022:f=A.rv(p)%A.rv(u);break;case\u0022|\u0022:f=A.rv(p)|A.rv(u);break;case\u0022^\u0022:f=A.rv(p)^A.rv(u);break;case\u0022&\u0022:f=A.rv(p)&A.rv(u);break;case\u0022===\u0022:f=A.rv(p)===A.rv(u);break;case\u0022==\u0022:f=A.rv(p)==A.rv(u);break;case\u0022!=\u0022:f=A.rv(p)!=A.rv(u);break;case\u0022!==\u0022:f=A.rv(p)!==A.rv(u);break;case\u0022>=\u0022:f=A.rv(p)>=A.rv(u);break;case\u0022<=\u0022:f=A.rv(p)<=A.rv(u);break;case\u0022>\u0022:f=A.rv(p)>A.rv(u);break;case\u0022<\u0022:f=A.rv(p)>\u0022:f=A.rv(p)>>A.rv(u);break;default:break}return l?A.nh(f,\u0022c\u0022):f;break;case\u0022-\u0022:p=e.length===3?x(e[1],t,r,n,o,a):0;u=e.length===3?x(e[2],t,r,n,o,a):x(e[1],t,r,n,o,a);l=M&&(A.hn(p)===\u0022h\u0022||A.hn(u)===\u0022h\u0022);f=l?A.rv(p)-A.rv(u):p-u;return l?A.nh(f,\u0022c\u0022):f;break;case\u0022!\u0022:p=x(e[1],t,r,n,o,a);l=M&&A.hn(p)==\u0022h\u0022;f=!A.rv(p);return l?A.nh(f,\u0022c\u0022):f;case\u0022~\u0022:p=x(e[1],t,r,n,o,a);l=M&&A.hn(p)==\u0022h\u0022;f=~A.rv(p);return l?A.nh(f,\u0022c\u0022):f;default:s(\u0022unrecognized op\u0022+i)}}function x(e,t,r,n,o,a){var i=e[0];var p=false;if(typeof a!==\u0022undefined\u0022)o.ap=a;if(typeof i===\u0022object\u0022){var u=i[0];var l,f,v,c,s,y,b,d,h,_,g;switch(u){case 2:return m(e,t,r,n,o);break;case 4:return x(e[1],t,r,n,o,p);break;case 5:switch(e.length){case 2:l=x(e[1],t,r,n,o,p);return M?[l]:[A.rv(l)];return[l];break;case 1:return[];break;default:l=x(e[1],t,r,n,o,p);v=x(e[2],t,r,n,o,p);l.push(M?v:A.rv(v));return l;break}break;case 6:l=x(e[1],t,r,n,o);var w=o.ap;h=A.hn(l)===\u0022h\u0022;f=h?A.rv(l):l;o.is_affected|=h;if(M){if(f===null||typeof f===\u0022undefined\u0022){return h?A.nh(undefined,\u0022e\u0022):undefined}v=x(e[2],t,r,n,o,p);_=A.hn(v)===\u0022h\u0022;c=_?A.rv(v):v;o.ap=w;o.is_affected|=_;if(c===null||typeof c===\u0022undefined\u0022||c===\u0022__proto__\u0022||c===\u0022prototype\u0022||c===\u0022caller\u0022){return h||_?A.nh(undefined,\u0022e\u0022):undefined}y=f[c];if(typeof y===\u0022function\u0022&&!w)y=undefined;g=A.hn(y)===\u0022h\u0022;o.is_affected|=g;return h||_?g?y:A.nh(y,\u0022e\u0022):y}else{if(f===null||typeof f===\u0022undefined\u0022){return undefined}v=x(e[2],t,r,n,o,p);_=A.hn(v)===\u0022h\u0022;c=_?A.rv(v):v;o.ap=w;o.is_affected|=_;if(c===null||typeof c===\u0022undefined\u0022||c===\u0022__proto__\u0022||c===\u0022prototype\u0022||c===\u0022caller\u0022){return undefined}y=f[c];if(typeof y===\u0022function\u0022&&!w)y=undefined;g=A.hn(y)===\u0022h\u0022;o.is_affected|=g;return g?A.rv(y):y}case 7:switch(e[1][0]){case 11:o.is_affected|=A.hn(n)===\u0022h\u0022;return n;case 3:b=A.rv(r);d=A.rv(t);v=e[1][1];if(n&&n.f&&n.f.hasOwnProperty(v)){l=n.f;o.ap=true}else{l=b&&b.hasOwnProperty(v)?r:d&&d.hasOwnProperty(v)?t:undefined}if(M){if(l){h=A.hn(l)===\u0022h\u0022;f=h?A.rv(l):l;y=f[v];g=A.hn(y)===\u0022h\u0022;o.is_affected|=h||g;y=h&&!g?A.nh(y,\u0022e\u0022):y;return y}}else{if(l){h=A.hn(l)===\u0022h\u0022;f=h?A.rv(l):l;y=f[v];g=A.hn(y)===\u0022h\u0022;o.is_affected|=h||g;return A.rv(y)}}return undefined}break;case 8:l={};l[e[1]]=x(e[2],t,r,n,o,p);return l;break;case 9:l=x(e[1],t,r,n,o,p);v=x(e[2],t,r,n,o,p);function O(e,t,r){var n,o;h=A.hn(e)===\u0022h\u0022;_=A.hn(t)===\u0022h\u0022;f=A.rv(e);c=A.rv(t);for(var a in c){if(r||!f.hasOwnProperty(a)){f[a]=M?_?A.nh(c[a],\u0022e\u0022):c[a]:A.rv(c[a])}}return e}var s=l;var j=true;if(typeof e[1][0]===\u0022object\u0022&&e[1][0][0]===10){l=v;v=s;j=false}if(typeof e[1][0]===\u0022object\u0022&&e[1][0][0]===10){var P={};return O(O(P,l,j),v,j)}else return O(l,v,j);break;case 10:l=x(e[1],t,r,n,o,p);l=M?l:A.rv(l);return l;break;case 12:var P;l=x(e[1],t,r,n,o);if(!o.ap){return M&&A.hn(l)===\u0022h\u0022?A.nh(P,\u0022f\u0022):P}var w=o.ap;v=x(e[2],t,r,n,o,p);o.ap=w;h=A.hn(l)===\u0022h\u0022;_=N(v);f=A.rv(l);c=A.rv(v);snap_bb=K(c,\u0022nv_\u0022);try{P=typeof f===\u0022function\u0022?K(f.apply(null,snap_bb)):undefined}catch(t){t.message=t.message.replace(/nv_/g,\u0022\u0022);t.stack=t.stack.substring(0,t.stack.indexOf(\u0022\u005cn\u0022,t.stack.lastIndexOf(\u0022at nv_\u0022)));t.stack=t.stack.replace(/\u005csnv_/g,\u0022 \u0022);t.stack=T(t.stack);if(n.debugInfo){t.stack+=\u0022\u005cn \u0022+\u0022 \u0022+\u0022 \u0022+\u0022 at \u0022+n.debugInfo[0]+\u0022:\u0022+n.debugInfo[1]+\u0022:\u0022+n.debugInfo[2];console.error(t)}P=undefined}return M&&(_||h)?A.nh(P,\u0022f\u0022):P}}else{if(i===3||i===1)return e[1];else if(i===11){var l=\u0022\u0022;for(var D=1;D=0;o--){if(r[e].i[o]&&n[r[e].i[o]][t])return n[r[e].i[o]][t]}for(var o=r[e].ti.length-1;o>=0;o--){var a=ne(r[e].ti[o],r,e);if(a&&n[a][t])return n[a][t]}var i=ae(r,e);for(var o=0;o=0;p--)if(r[e].j[p]){for(var a=r[r[e].j[p]].ti.length-1;a>=0;a--){var u=ne(r[r[e].j[p]].ti[a],r,e);if(u&&n[u][t]){return n[u][t]}}}}function ae(e,t){if(!t)return[];if($gaic[t]){return $gaic[t]}var r=[],n=[],o=0,a=0,i={},p={};n.push(t);p[t]=true;a++;while(o + ele.startsWith("./miniprogram_npm") || + ele.startsWith("../") || + ele.startsWith("./page") + ); + } + for (let key in pageConfig) { + if (pageConfig[key].deps.length > 0) { + for (let dep of pageConfig[key].deps) { + let index = x.indexOf(dep); + if (index < 0) { + continue; + } + // x + if (!t_x.includes(dep)) t_x.push(dep); + } + } + } + let i = 1; + for (let dep of t_x) { + if (dep.startsWith("../")) continue; + + // d_ + const d_Exp = `d_\\[x\\[${x.indexOf( + dep + )}\\]\\]={}\n[\\s\\S]*?e_\\[x\\[${x.indexOf( + dep + )}\\]\\]={f:m\\d+,j:\\[.*?\\],i:\\[.*?\\],ti:\\[(.*?)\\],ic:\\[.*?\\]}`; + + let m0 = source.match(new RegExp(d_Exp)); + let m0_str = m0[0]; + const depIndex = m0[1].match(/\d+/g); + if (depIndex) { + for (let index of depIndex) { + m0_str = m0_str.replace( + new RegExp(`x\\[${index}\\]`, "g"), + `x[${t_x.indexOf(x[index])}]` + ); + } + } + // process.stderr.write(dep + '=====' + x.indexOf(dep) + "-" + t_x.indexOf(dep) + '\n') + dep_d_ += + m0_str + .replace( + new RegExp(`x\\[${x.indexOf(dep)}\\]`, "g"), + `x[${t_x.indexOf(dep)}]` + ) + .replace( + new RegExp(`\\${funcName}\\_\\d+`, "g"), + `${funcName}_${i}` + ) + .replace(/m\d+/g, `m${i - 1}`) + "\n"; + let gz_name = m0_str.match(/var z=gz(.*?)\(\)/)[1]; + // process.stderr.write("get funcName - " + t[0].match(/var z=gz(.*?)\(\)/)[1] + "\n") + // gz + const exp = `function gz\\${gz_name}\\(\\)\\{[\\s\\S]*?__WXML_GLOBAL__\\.ops_cached\\.\\${gz_name}\n}`; + DEBUG_OUTPUT && + process.stderr.write("COMMON=====" + dep + "----" + exp + "\n"); + const gz = source.match(new RegExp(exp)); + dep_gz += + gz[0].replace( + new RegExp(`\\${funcName}\\_\\d+`, "g"), + `${funcName}_${i}` + ) + "\n"; + i++; + } + dep_x += `${t_x.join("','")}'];`; + return { + dep_x, + dep_gz, + dep_d_ + } +} function genFunctionContent_LLW(wxmlName, config = {}, source, x) { // 起始 let content = `var cs = cs || [];\u000a${config.funcName}${FUNC_PREFIX}`; @@ -96,84 +179,8 @@ function genCommonContent_LLW(source, pageConfig, x = []) { const cs = source.match(/var cs([\s\S]*?)function gz/); common += "var cs = cs || [];" + cs[1]; - // 插入引用信息 - let dep_x = `var x=['`; - let dep_gz = ""; - let dep_d_ = ""; - let t_x = []; - if (funcName !== "$gwx") { - // 非标准函数名 - t_x = x.filter( - (ele) => - ele.startsWith("./miniprogram_npm") || - ele.startsWith("../") || - ele.startsWith("./page") - ); - } - for (let key in pageConfig) { - if (pageConfig[key].deps.length > 0) { - for (let dep of pageConfig[key].deps) { - let index = x.indexOf(dep); - if (index < 0) { - process.stderr.write(dep + "index 搜索失败\n"); - continue; - } - // x - if (!t_x.includes(dep)) t_x.push(dep); - } - } - } - let i = 1; - for (let dep of t_x) { - if (dep.startsWith("../")) continue; - - // d_ - const d_Exp = `d_\\[x\\[${x.indexOf( - dep - )}\\]\\]={}\n[\\s\\S]*?e_\\[x\\[${x.indexOf( - dep - )}\\]\\]={f:m\\d+,j:\\[.*?\\],i:\\[.*?\\],ti:\\[(.*?)\\],ic:\\[.*?\\]}`; - - let m0 = source.match(new RegExp(d_Exp)); - let m0_str = m0[0]; - const depIndex = m0[1].match(/\d+/g); - if (depIndex) { - for (let index of depIndex) { - m0_str = m0_str.replace( - new RegExp(`x\\[${index}\\]`, "g"), - `x[${t_x.indexOf(x[index])}]` - ); - } - } - // process.stderr.write(dep + '=====' + x.indexOf(dep) + "-" + t_x.indexOf(dep) + '\n') - dep_d_ += - m0_str - .replace( - new RegExp(`x\\[${x.indexOf(dep)}\\]`, "g"), - `x[${t_x.indexOf(dep)}]` - ) - .replace( - new RegExp(`\\${funcName}\\_\\d+`, "g"), - `${funcName}_${i}` - ) - .replace(/m\d+/g, `m${i - 1}`) + "\n"; - let gz_name = m0_str.match(/var z=gz(.*?)\(\)/)[1]; - // process.stderr.write("get funcName - " + t[0].match(/var z=gz(.*?)\(\)/)[1] + "\n") - // gz - const exp = `function gz\\${gz_name}\\(\\)\\{[\\s\\S]*?__WXML_GLOBAL__\\.ops_cached\\.\\${gz_name}\n}`; - DEBUG_OUTPUT && - process.stderr.write("COMMON=====" + dep + "----" + exp + "\n"); - const gz = source.match(new RegExp(exp)); - dep_gz += - gz[0].replace( - new RegExp(`\\${funcName}\\_\\d+`, "g"), - `${funcName}_${i}` - ) + "\n"; - i++; - } - dep_x += `${t_x.join("','")}'];`; - delete t_x; - common += dep_gz; + const depsData = parseDeps(source, x, pageConfig) + common += depsData.dep_gz; // nv_require const nv_require = source.match( new RegExp( @@ -182,7 +189,7 @@ function genCommonContent_LLW(source, pageConfig, x = []) { ); common += nv_require[1]; - common += dep_x + dep_d_; + common += depsData.dep_x + depsData.dep_d_; common += "if(path&&e_[path]){\u000aouterGlobal.__wxml_comp_version__=0.02\u000areturn function(env,dd,global){$gwxc=0;var root={\u0022tag\u0022:\u0022wx-page\u0022};root.children=[]\u000a;g=\u0022" + funcName + @@ -190,13 +197,15 @@ function genCommonContent_LLW(source, pageConfig, x = []) { funcName + "();;var __WXML_DEP__=__WXML_DEP__||{};"; // 追加引用 + let common_end = '' for (let key in pageConfig) { if (pageConfig[key].deps.length > 0) { - common += `__WXML_DEP__["./${key}.wxml"]=["${pageConfig[ + common_end += `__WXML_DEP__["./${key}.wxml"]=["${pageConfig[ key ].deps.join('","')}",];`; } } + common += common_end return common; } // genCommonContent_LLW END @@ -216,7 +225,7 @@ function genFunctionContent_LLA(wxmlName, config = {}, source, x) { const exp = `function gz\\${funcName}_${ config.num + 1 }\\(\\)\\{[\\s\\S]*?\\)\\}`; - const gz = source.match(new RegExp(exp)); + gz = source.match(new RegExp(exp)); gz = gz[0].replace( new RegExp(`\\${funcName}\\_\\d+`, "g"), @@ -304,84 +313,8 @@ function genCommonContent_LLA(source, pageConfig, x) { const cs = source.match(/var cs([\s\S]*?)function gz/); common += "var cs = cs || [];" + cs[1]; - // 插入引用信息 - let dep_x = `var x=['`; - let dep_gz = ""; - let dep_d_ = ""; - let t_x = []; - if (funcName !== "$gwx") { - // 非标准函数名 - t_x = x.filter( - (ele) => - ele.startsWith("./miniprogram_npm") || - ele.startsWith("../") || - ele.startsWith("./page") - ); - } - for (let key in pageConfig) { - if (pageConfig[key].deps.length > 0) { - for (let dep of pageConfig[key].deps) { - let index = x.indexOf(dep); - if (index < 0) { - process.stderr.write(dep + "index 搜索失败\n"); - continue; - } - // x - if (!t_x.includes(dep)) t_x.push(dep); - } - } - } - let i = 1; - for (let dep of t_x) { - if (dep.startsWith("../")) continue; - - // d_ - const d_Exp = `d_\\[x\\[${x.indexOf( - dep - )}\\]\\]={}\n[\\s\\S]*?e_\\[x\\[${x.indexOf( - dep - )}\\]\\]={f:m\\d+,j:\\[.*?\\],i:\\[.*?\\],ti:\\[(.*?)\\],ic:\\[.*?\\]}`; - - let m0 = source.match(new RegExp(d_Exp)); - let m0_str = m0[0]; - const depIndex = m0[1].match(/\d+/g); - if (depIndex) { - for (let index of depIndex) { - m0_str = m0_str.replace( - new RegExp(`x\\[${index}\\]`, "g"), - `x[${t_x.indexOf(x[index])}]` - ); - } - } - // process.stderr.write(dep + '=====' + x.indexOf(dep) + "-" + t_x.indexOf(dep) + '\n') - dep_d_ += - m0_str - .replace( - new RegExp(`x\\[${x.indexOf(dep)}\\]`, "g"), - `x[${t_x.indexOf(dep)}]` - ) - .replace( - new RegExp(`\\${funcName}\\_\\d+`, "g"), - `${funcName}_${i}` - ) - .replace(/m\d+/g, `m${i - 1}`) + "\n"; - let gz_name = m0_str.match(/var z=gz(.*?)\(\)/)[1]; - // process.stderr.write("get funcName - " + t[0].match(/var z=gz(.*?)\(\)/)[1] + "\n") - // gz - const exp = `function gz\\${gz_name}\\(\\)\\{[\\s\\S]*?__WXML_GLOBAL__\\.ops_cached\\.\\${gz_name}\n}`; - DEBUG_OUTPUT && - process.stderr.write("COMMON=====" + dep + "----" + exp + "\n"); - const gz = source.match(new RegExp(exp)); - dep_gz += - gz[0].replace( - new RegExp(`\\${funcName}\\_\\d+`, "g"), - `${funcName}_${i}` - ) + "\n"; - i++; - } - dep_x += `${t_x.join("','")}'];`; - delete t_x; - common += dep_gz; + const depsData = parseDeps(source, x, pageConfig) + common += depsData.dep_gz; // nv_require const nv_require = source.match( new RegExp( @@ -390,7 +323,7 @@ function genCommonContent_LLA(source, pageConfig, x) { ); common += nv_require[1]; - common += dep_x + dep_d_; + common += depsData.dep_x + depsData.dep_d_; common += "if(path&&e_[path]){\u000areturn function(env,dd,global){$gwxc=0;var root={\u0022tag\u0022:\u0022wx-page\u0022};root.children=[]\u000a;g=\u0022" + funcName + @@ -398,13 +331,15 @@ function genCommonContent_LLA(source, pageConfig, x) { funcName + "();;var __WXML_DEP__=__WXML_DEP__||{};"; // 追加引用 + let common_end = '' for (let key in pageConfig) { if (pageConfig[key].deps.length > 0) { - common += `__WXML_DEP__["./${key}.wxml"]=["${pageConfig[ + common_end += `__WXML_DEP__["./${key}.wxml"]=["${pageConfig[ key ].deps.join('","')}",];`; } } + common += common_end return common; } // genCommonContent_LLA END diff --git a/res/aur/PKGBUILD b/res/aur/PKGBUILD index dfa63da..cde1ce9 100644 --- a/res/aur/PKGBUILD +++ b/res/aur/PKGBUILD @@ -20,7 +20,7 @@ _node_version="16.1.0" pkgname=wechat-devtools pkgver="${_wechat_devtools_ver}" # 主版本号 -pkgrel=1 # 次版本号release +pkgrel=2 # 次版本号release epoch=2 # 大版本迭代强制更新(维护者变更,尽量不用) pkgdesc="WeChat Devtools For Linux. " arch=("x86_64") @@ -32,7 +32,7 @@ makedepends=('p7zip' 'python2' 'openssl' 'gcc' 'make' 'libssh2' 'krb5') source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs_ver}/nwjs-sdk-v${_nwjs_ver}-linux-x64.tar.gz" "${_wechat_devtools_exe}::${_wechat_devtools_url}" "node-v${_node_version}.tar.gz::https://npm.taobao.org/mirrors/node/v${_node_version}/node-v${_node_version}-linux-x64.tar.gz" - "compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v0.19/compiler.tar.gz" + "compiler.tar.gz::https://download.fastgit.org/msojocs/wechat-devtools-linux/releases/download/v1.05.2203070-2/compiler.tar.gz" "wechat-devtools.desktop" "logo.svg" "fix-cli.sh" @@ -46,7 +46,7 @@ source=("nwjs-v${_nwjs_ver}.tar.gz::https://npm.taobao.org/mirrors/nwjs/v${_nwjs md5sums=(b6f49803c51d0abacca2d1e566c7fe19 # nwjs "${_wechat_devtools_md5}" 2280bfbbf29981fd5adce334f40146ff # nodejs - a9e061c97afbbc295b5664a2d8065492 # compiler + 72521b0e6aa748ed1c094617aa9c87ee # compiler 1abd6b4ebbbb918f601a6c5dbad55a05 # desktop 0f4353664123320280ea4d6bb295dce2 # svg "SKIP"