fixed > in expr

#118
Tencent · May 2, 2017 · b441dd9 · b441dd9
1 parent 2d6b365
commit b441dd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/wepy-cli/src/compile-template.js b/packages/wepy-cli/src/compile-template.js
@@ -37,7 +37,7 @@ export default {
         });
         */
         let doc = new DOMImplementation().createDocument();
-        let node = new DOMParser().parseFromString(content);
+        let node = cWpy.createParser().parseFromString(content);
         let template = [].slice.call(node.childNodes || []).filter((n) => n.nodeName === 'template');
 
         [].slice.call(template[0].childNodes || []).forEach((n) => {
@@ -474,7 +474,7 @@ export default {
 
     compile (template) {
         let lang = template.type;
-        let content = template.code;
+        let content = util.attrReplace(template.code);
 
         let config = util.getConfig();
         let src = cache.getSrc();
@@ -490,7 +490,7 @@ export default {
 
 
         compiler(content, config.compilers[lang] || {}).then(content => {
-            let node = new DOMParser().parseFromString(content);
+            let node = cWpy.createParser().parseFromString(content);
             node = this.compileXML(node, template);
             let target = util.getDistPath(path.parse(template.src), 'wxml', src, dist);
 

diff --git a/packages/wepy-cli/src/compile-wpy.js b/packages/wepy-cli/src/compile-wpy.js
@@ -22,6 +22,9 @@ export default {
                     // ignore warnings
                 } else
                     util.warning(x);
+            },
+            error (x) {
+                util.error(x);
             }
         }});
     },

diff --git a/packages/wepy-cli/src/util.js b/packages/wepy-cli/src/util.js
@@ -270,7 +270,8 @@ const utils = {
             // 用户可以通过临时加入 knownTags 的方法兼容
             knownTags.push.apply(knownTags, configTags);
         }
-        return content.replace(/<([\w-\_]*)\s[^>]*>/ig, (tag, tagName) => {
+        // Exp error when using this code: <input focus wx:if="{{test >   
+        return content.replace(/<([\w-]+)\s*[\s\S]*?(\/|<\/[\w-]+)>/ig, (tag, tagName) => {
             tagName = tagName.toLowerCase();
             const isKnownTag = knownTags.indexOf(tagName) >= 0;
             return tag.replace(/\s+:([\w-_]*)([\.\w]*)\s*=/ig, (attr, name, type) => { // replace :param.sync => v-bind:param.sync