diff --git a/packages/vue-cli-plugin-uni/lib/app-plus/index.js b/packages/vue-cli-plugin-uni/lib/app-plus/index.js index e76c3c2a93cdfa0501f2e35b6ccec684093a8207..fff8e1686de6fd5dcd523d649550d0a67908a1e3 100644 --- a/packages/vue-cli-plugin-uni/lib/app-plus/index.js +++ b/packages/vue-cli-plugin-uni/lib/app-plus/index.js @@ -89,13 +89,6 @@ const v3 = { loader: path.resolve(__dirname, '../../packages/webpack-uni-app-loader/view/script') }) - // view 层 renderjs - // rules.push({ - // resourceQuery: [/lang=renderjs/, /blockType=renderjs/], - // use: [{ - // loader: path.resolve(__dirname, '../../packages/webpack-uni-app-loader/view/renderjs') - // }] - // }) } scriptLoaders.push({ loader: path.resolve(__dirname, diff --git a/packages/vue-cli-plugin-uni/lib/vue-loader.js b/packages/vue-cli-plugin-uni/lib/vue-loader.js index fdb07275ec9ec575218ad2ec8ecb567bf55874ff..b58ea411c6103b466b37c8a391e6f0f61a48fd4e 100644 --- a/packages/vue-cli-plugin-uni/lib/vue-loader.js +++ b/packages/vue-cli-plugin-uni/lib/vue-loader.js @@ -28,6 +28,7 @@ module.exports = function modifyVueLoader (webpackConfig, compilerOptions, api) .use('vue-loader') .loader(require.resolve('@dcloudio/vue-cli-plugin-uni/packages/vue-loader')) .tap(options => Object.assign(options, { + isH5: process.env.UNI_PLATFORM === 'h5', compiler: getPlatformCompiler(), compilerOptions: Object.assign({ isUnaryTag, @@ -35,11 +36,11 @@ module.exports = function modifyVueLoader (webpackConfig, compilerOptions, api) }, compilerOptions) }, cacheConfig)) .end() - // .use('uniapp-custom-block-loader') - // .loader(require.resolve('@dcloudio/vue-cli-plugin-uni/packages/webpack-custom-block-loader')) - // .options({ - // compiler: getPlatformCompiler() - // }) + // .use('uniapp-custom-block-loader') + // .loader(require.resolve('@dcloudio/vue-cli-plugin-uni/packages/webpack-custom-block-loader')) + // .options({ + // compiler: getPlatformCompiler() + // }) // h5 框架需要使用 scoped 样式,其他平台编译时识别是否 nvue 文件且注入 flex 相关样式 if (process.env.UNI_PLATFORM === 'h5') { diff --git a/packages/vue-cli-plugin-uni/packages/vue-loader/lib/index.js b/packages/vue-cli-plugin-uni/packages/vue-loader/lib/index.js index ec1f3eb81be615c5f7c9f877997e739ee52cc9f7..a8f3b870245f05c786a7325edbeae6c720773e4f 100644 --- a/packages/vue-cli-plugin-uni/packages/vue-loader/lib/index.js +++ b/packages/vue-cli-plugin-uni/packages/vue-loader/lib/index.js @@ -142,7 +142,7 @@ module.exports = function (source) { } let renderjsImport = `var renderjs` - if(options.isAppView && descriptor.renderjs){ + if((options.isAppView || options.isH5) && descriptor.renderjs){ const src = descriptor.renderjs.src || resourcePath const attrsQuery = attrsToQuery(descriptor.renderjs.attrs, 'js') const query = `?vue&type=renderjs${attrsQuery}${inheritQuery}`