feat: vue support fragment fix

NervJS · Feb 7, 2023 · c0aa4e0 · c0aa4e0
1 parent ff64cad
commit c0aa4e0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/packages/taro-components-library-vue2/package.json b/packages/taro-components-library-vue2/package.json
@@ -15,7 +15,8 @@
   "author": "ZakaryCode",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/components": "workspace:*"
+    "@tarojs/components": "workspace:*",
+    "vue-fragment": "^1.6.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.14.5",

diff --git a/packages/taro-components-library-vue2/rollup.config.js b/packages/taro-components-library-vue2/rollup.config.js
@@ -15,7 +15,9 @@ const config = {
   },
   treeshake: false,
   plugins: [
-    externals(),
+    externals({
+      exclude: ['vue-fragment']
+    }),
     resolve({
       preferBuiltins: false,
       mainFields: ['main:h5', 'browser', 'module', 'jsnext:main', 'main']

diff --git a/packages/taro-components-library-vue2/scripts/fix.js b/packages/taro-components-library-vue2/scripts/fix.js
@@ -6,7 +6,12 @@ const utilsPath = path.resolve(__dirname, '..', 'src/vue-component-lib/utils.ts'
 
 if (fs.existsSync(componentsPath)) {
   const codeBuffer = fs.readFileSync(componentsPath)
-  const code = codeBuffer.toString().replace(/const\sTaro([A-Za-z]+)\s=/g, 'const $1 =').replace(/const\s([A-Za-z]+)Core\s=/g, 'const $1 =')
+  let code = codeBuffer.toString().replace(/const\sTaro([A-Za-z]+)\s=/g, 'const $1 =').replace(/const\s([A-Za-z]+)Core\s=/g, 'const $1 =')
+
+  if (!code.includes('fragment')) {
+    const comps = ['block', 'custom-wrapper']
+    code = code.replace(new RegExp(`taro-(${comps.join('|')})-core`, 'ig'), 'fragment')
+  }
 
   fs.writeFileSync(componentsPath, code)
 }

diff --git a/packages/taro-components-library-vue2/src/index.ts b/packages/taro-components-library-vue2/src/index.ts
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import { ExtendedVue } from 'vue/types/vue'
+import Fragment from 'vue-fragment'
 
 import * as components from './components'
 
@@ -8,6 +9,8 @@ export function initVue2Components () {
   if (!Vue.config.ignoredElements?.includes(ignoredElements[0])) {
     Vue.config.ignoredElements = [...Vue.config.ignoredElements, ...ignoredElements]
   }
+
+  Vue.use(Fragment.Plugin)
   Object.entries(components).forEach(params => {
     const [name, definition] = params as [string, ExtendedVue<Vue, unknown, unknown, unknown, Record<string, unknown>>]
     if (definition) {

diff --git a/packages/taro-components-library-vue3/scripts/fix.js b/packages/taro-components-library-vue3/scripts/fix.js
@@ -6,7 +6,13 @@ const utilsPath = path.resolve(__dirname, '..', 'src/vue-component-lib/utils.ts'
 
 if (fs.existsSync(componentsPath)) {
   const codeBuffer = fs.readFileSync(componentsPath)
-  const code = codeBuffer.toString().replace(/const\sTaro([A-Za-z]+)\s=/g, 'const $1 =').replace(/const\s([A-Za-z]+)Core\s=/g, 'const $1 =')
+  let code = codeBuffer.toString().replace(/const\sTaro([A-Za-z]+)\s=/g, 'const $1 =').replace(/const\s([A-Za-z]+)Core\s=/g, 'const $1 =')
+
+  if (!code.includes('Fragment')) {
+    const comps = ['Block', 'CustomWrapper']
+    code = code.replace('/* auto-generated vue proxies */', `/* auto-generated vue proxies */\nimport { defineComponent } from 'vue'`)
+    code = code.replace(new RegExp(`export const (${comps.join('|')}) = \\/\\*\\@__PURE__\\*\\/ defineContainer[^;]*;`, 'ig'), 'export const $1 = defineComponent((__props, { slots }) => slots.default);')
+  }
 
   fs.writeFileSync(componentsPath, code)
 }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml