From 7b2cd003a29d4c3bb6ed2c2f897ea0f466a82cf3 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Wed, 28 Aug 2019 12:26:21 +0800
Subject: [PATCH] fix(mp-alipay): import-sjs=>sjs

---
 packages/uni-cli-shared/lib/platform.js                       | 2 +-
 packages/uni-template-compiler/lib/platforms/mp-alipay.js     | 2 +-
 packages/vue-cli-plugin-uni/lib/mp.js                         | 4 ++--
 .../packages/webpack-custom-block-loader/index.js             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/uni-cli-shared/lib/platform.js b/packages/uni-cli-shared/lib/platform.js
index 345552cdb..73e7c9240 100644
--- a/packages/uni-cli-shared/lib/platform.js
+++ b/packages/uni-cli-shared/lib/platform.js
@@ -238,7 +238,7 @@ const PLATFORMS = {
     vue: megaloRuntime,
     compiler: megaloCompiler,
     megalo: 'alipay',
-    filterTag: 'import-sjs',
+    filterTag: 'sjs',
     subPackages: true,
     cssVars: {
       '--status-bar-height': '25px',
diff --git a/packages/uni-template-compiler/lib/platforms/mp-alipay.js b/packages/uni-template-compiler/lib/platforms/mp-alipay.js
index f9abfc174..4dfe6da7b 100644
--- a/packages/uni-template-compiler/lib/platforms/mp-alipay.js
+++ b/packages/uni-template-compiler/lib/platforms/mp-alipay.js
@@ -45,7 +45,7 @@ module.exports = {
   createFilterTag (filterTag, {
     attrs
   }) {
-    return `<${filterTag} name="${attrs.module}" from="${attrs.src}"></${filterTag}>`
+    return `<import-sjs name="${attrs.module}" from="${attrs.src}"></import-sjs>`
   },
   getEventType (eventType) {
     return EVENTS[eventType] || eventType
diff --git a/packages/vue-cli-plugin-uni/lib/mp.js b/packages/vue-cli-plugin-uni/lib/mp.js
index c98a18a94..6c1a3808a 100644
--- a/packages/vue-cli-plugin-uni/lib/mp.js
+++ b/packages/vue-cli-plugin-uni/lib/mp.js
@@ -132,10 +132,10 @@ module.exports = {
           resourceQuery: [
             /lang=wxs/,
             /lang=filter/,
-            /lang=import-sjs/,
+            /lang=sjs/,
             /blockType=wxs/,
             /blockType=filter/,
-            /blockType=import-sjs/
+            /blockType=sjs/
           ],
           use: [{
             loader: require.resolve(
diff --git a/packages/vue-cli-plugin-uni/packages/webpack-custom-block-loader/index.js b/packages/vue-cli-plugin-uni/packages/webpack-custom-block-loader/index.js
index 3b6887fce..f32b40fa8 100644
--- a/packages/vue-cli-plugin-uni/packages/webpack-custom-block-loader/index.js
+++ b/packages/vue-cli-plugin-uni/packages/webpack-custom-block-loader/index.js
@@ -48,7 +48,7 @@ module.exports = function(source) {
 
   descriptor.customBlocks = descriptor.customBlocks.filter(block => {
     if (
-      block.attrs.module ||
+      block.attrs.module &&
       (
         block.type === FILTER_TAG ||
         block.attrs.lang === FILTER_TAG
-- 
GitLab