diff --git a/packages/uni-cli-shared/lib/platform.js b/packages/uni-cli-shared/lib/platform.js index 345552cdb278adad371f1933bf43c890c8e0082f..73e7c9240e1b2e755551eb27e097b1faf4c30d0b 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 f9abfc174f078e097c3cb77cd0084a84df9ebc22..4dfe6da7b14ff3672df14cc58c016521851ee05c 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}">` + return `` }, 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 c98a18a94180454889c0143228dc2aa28adfb17a..6c1a3808a8517593a4023e54739051d5ce6e85bb 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 3b6887fceaf9ac343962806ba44fae2b618e74f1..f32b40fa8933d06bb1f72c5363abdb0e51172e0c 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