uni-vue-loader - npm Package Compare versions

Comparing version 1.0.1 to 1.0.2

conditionalCompilation.js

 function main(options) {
-    let { content, platform, ifRegExp, endRegExp } = options;
+    let { content, platform, ifRegExp, endRegExp, not } = options;
     const ifArr = content.match(new RegExp(ifRegExp, 'g'));
@@ -21,6 +21,14 @@ const endArr = content.match(new RegExp(endRegExp, 'g'));
 
-        if (platform === 'h5' && ifPlatform.indexOf('h5') > -1 || platform === 'bl' && ifPlatform.indexOf('bl') > -1) {
-            content = content.replace(new RegExp(ifRegExp), '');
-            content = content.replace(new RegExp(endRegExp), '');
-            continue;
+        if (!not) {
+            if (platform === 'h5' && ifPlatform.indexOf('h5') > -1 || platform === 'bl' && ifPlatform.indexOf('bl') > -1) {
+                content = content.replace(new RegExp(ifRegExp), '');
+                content = content.replace(new RegExp(endRegExp), '');
+                continue;
+            }
+        } else {
+            if (platform === 'h5' && ifPlatform.indexOf('h5') === -1 || platform === 'bl' && ifPlatform.indexOf('bl') === -1) {
+                content = content.replace(new RegExp(ifRegExp), '');
+                content = content.replace(new RegExp(endRegExp), '');
+                continue;
+            }
         }
@@ -43,2 +51,7 @@
 
+    const htmlIfnRegExp = '<!--\\s*#ifndef\\s+(.+?)\\s*-->';
+    const jsIfnRegExp = '//\\s*#ifndef\\s+(.+?)\\n';
+    const cssIfnRegExp = '/\\*\\s*#ifndef\\s+(.+?)\\s*\\*/';
+
+    // ifdef
     result.template.content = main({
@@ -67,3 +80,30 @@ content: result.template.content,
 
+    // ifndef
+    result.template.content = main({
+        content: result.template.content,
+        platform: options.platform,
+        ifRegExp: htmlIfnRegExp,
+        endRegExp: htmlEndRegExp,
+        not: true
+    });
+
+    result.script.content = main({
+        content: result.script.content,
+        platform: options.platform,
+        ifRegExp: jsIfnRegExp,
+        endRegExp: jsEndRegExp,
+        not: true
+    });
+
+    result.styles && result.styles.forEach(style => {
+        style.content = main({
+            content: style.content,
+            platform: options.platform,
+            ifRegExp: cssIfnRegExp,
+            endRegExp: cssEndRegExp,
+            not: true
+        });
+    });
+
     return result;
 };

package.json

 {
     "name": "uni-vue-loader",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "uni vue loader",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

5555

increased by29.61%

Lines of code

141

increased by34.29%

No dependency changes