From 12978acd9926d8c24de3dfa2543cf1f9a7a2494c Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Tue, 31 Dec 2019 16:59:18 +0800
Subject: [PATCH] feat(h5): renderjs

---
 packages/vue-cli-plugin-uni/lib/app-plus/index.js     |  7 -------
 packages/vue-cli-plugin-uni/lib/vue-loader.js         | 11 ++++++-----
 .../packages/vue-loader/lib/index.js                  |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

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 e76c3c2a9..fff8e1686 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 fdb07275e..b58ea411c 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 ec1f3eb81..a8f3b8702 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}`
-- 
GitLab