feat: 将taro-plugin-solid与taro-plugin-react分离

packages/babel-preset-taro/index.js

@@ -58,13 +58,17 @@ module.exports = (_, options = {}) => {
       }
     }
   } else if (isSolid) {
-    presets.push([
-      require('babel-plugin-transform-solid-jsx'),
-      {
-        moduleName: '@tarojs/plugin-framework-react/dist/reconciler',
+    const solidOptions = {}
+    if (process.env.TARO_PLATFORM !== 'web') {
+      Object.assign(solidOptions, {
+        moduleName: '@tarojs/plugin-framework-solid/dist/reconciler',
         generate: 'universal',
-        uniqueTransform: process.env.TARO_PLATFORM !== 'web',
-      },
+        uniqueTransform: true,
+      })
+    }
+    presets.push([
+      require('babel-plugin-transform-solid-jsx-ad-taro-components'),
+      solidOptions,
     ])
   }
 

packages/taro-cli/src/cli.ts

@@ -11,7 +11,7 @@ const DEFAULT_FRAMEWORK = 'react'
 
 export default class CLI {
   appPath: string
-  constructor (appPath) {
+  constructor(appPath) {
     this.appPath = appPath || process.cwd()
   }
 
@@ -143,6 +143,7 @@ export default class CLI {
             react: '@tarojs/plugin-framework-react',
             preact: '@tarojs/plugin-framework-react',
             nerv: '@tarojs/plugin-framework-react',
+            solid: '@tarojs/plugin-framework-solid',
           }
           if (frameworkMap[framework]) {
             kernel.optsPlugins.push(frameworkMap[framework])

packages/taro-framework-react/src/index.ts

@@ -16,7 +16,7 @@ import type { PluginOption } from 'vite'
 export type Frameworks = 'react' | 'preact' | 'solid' | 'vue3'
 
 export function isReactLike(framework: IProjectConfig['framework'] = 'react'): framework is Frameworks {
-  return ['react', 'preact', 'solid'].includes(framework)
+  return ['react', 'preact'].includes(framework)
 }
 
 export default (ctx: IPluginContext) => {
@@ -63,7 +63,7 @@ export default (ctx: IPluginContext) => {
 
       const taroReactPlugin: esbuild.Plugin = {
         name: 'taroReactPlugin',
-        setup(build) {
+        setup (build) {
           build.onLoad({ filter: REG_TARO_H5 }, ({ path }) => {
             const content = fs.readFileSync(path).toString()
             return {
@@ -95,19 +95,13 @@ export default (ctx: IPluginContext) => {
   })
 }
 
-function setAlias(framework: Frameworks, chain) {
+function setAlias (framework: Frameworks, chain) {
   const alias = chain.resolve.alias
-
-  switch (framework) {
-    case 'preact':
-      alias.set('react', 'preact/compat')
-      alias.set('react-dom/test-utils', 'preact/test-utils')
-      alias.set('react-dom', 'preact/compat')
-      alias.set('react/jsx-runtime', 'preact/jsx-runtime')
-      break
-    case 'solid':
-      alias.set('react/jsx-runtime', 'solid-js/h/jsx-runtime')
-      break
+  if (framework === 'preact') {
+    alias.set('react', 'preact/compat')
+    alias.set('react-dom/test-utils', 'preact/test-utils')
+    alias.set('react-dom', 'preact/compat')
+    alias.set('react/jsx-runtime', 'preact/jsx-runtime')
   }
 }
 
@@ -131,10 +125,10 @@ function VitePresetPlugin (framework: Frameworks): PluginOption {
     })
 }
 
-function viteCommonPlugin(framework: Frameworks): PluginOption {
+function viteCommonPlugin (framework: Frameworks): PluginOption {
   return {
     name: 'taro-react:common',
-    config() {
+    config () {
       const alias =
         framework === 'preact'
           ? [
@@ -144,12 +138,6 @@ function viteCommonPlugin(framework: Frameworks): PluginOption {
             { find: 'react/jsx-runtime', replacement: 'preact/jsx-runtime' },
           ]
           : []
-      if (framework === 'solid') {
-        const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-        alias.push(
-          { find: 'react/jsx-runtime', replacement: reconcilerName },
-        )
-      }
 
       return {
         resolve: {

packages/taro-framework-react/src/loader-meta.ts

@@ -81,20 +81,6 @@ class App extends React.Component {
     }
   }
 
-  if (framework === 'solid') {
-    Object.assign(loaderMeta, {
-      creator: 'createSolidApp',
-      frameworkArgs: 'config',
-      importFrameworkStatement: '',
-      importFrameworkName: '',
-      mockAppStatement: `
-function App(props) {
-  return null
-}
-`,
-    })
-  }
-
   if (process.env.TARO_PLATFORM === 'web') {
     if (framework === 'react') {
       const react = require('react')

packages/taro-framework-react/src/runtime/connect.ts

@@ -50,8 +50,7 @@ export function setReconciler (ReactDOM?) {
     })
   })
 
-  // TODO 使用 solid 时，暂不支持以下事件
-  if (process.env.TARO_PLATFORM === 'web' && process.env.FRAMEWORK !== 'solid') {
+  if (process.env.TARO_PLATFORM === 'web') {
     hooks.tap('createPullDownComponent', (
       el: React.FunctionComponent<PageProps> | React.ComponentClass<PageProps>,
       _,

packages/taro-framework-react/src/vite.h5.ts

@@ -80,7 +80,7 @@ function esbuildExclude (framework: Frameworks): PluginOption {
     enforce: 'pre',
     config: () => ({
       optimizeDeps: {
-        exclude: ['react', 'preact', 'solid-js']
+        exclude: ['react', 'preact']
       }
     })
   }

packages/taro-framework-react/src/vite.harmony.ts

@@ -60,23 +60,6 @@ function aliasPlugin (ctx: IPluginContext, framework: Frameworks): PluginOption
           }
         }
 
-        return {
-          resolve: {
-            alias
-          }
-        }
-      }
-    }
-  } else if (framework === 'solid') {
-    return {
-      name: 'taro-solid:alias',
-      config () {
-        const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-        const alias = [
-          { find: 'solid-js/web', replacement: reconcilerName },
-          { find: 'react/jsx-runtime', replacement: reconcilerName },
-        ]
-
         return {
           resolve: {
             alias

packages/taro-framework-react/src/vite.mini.ts

@@ -66,23 +66,6 @@ function aliasPlugin (ctx: IPluginContext, framework: Frameworks): PluginOption
           }
         }
 
-        return {
-          resolve: {
-            alias
-          }
-        }
-      }
-    }
-  } else if (framework === 'solid') {
-    return {
-      name: 'taro-solid:alias',
-      config () {
-        const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-        const alias = [
-          { find: 'solid-js/web', replacement: reconcilerName },
-          { find: 'react/jsx-runtime', replacement: reconcilerName },
-        ]
-
         return {
           resolve: {
             alias

packages/taro-framework-react/src/webpack.h5.ts

@@ -49,8 +49,8 @@ export function modifyH5WebpackChain (ctx: IPluginContext, framework: Frameworks
   })
 }
 
-function setLoader(framework: Frameworks, chain) {
-  function customizer(object = '', sources = '') {
+function setLoader (framework: Frameworks, chain) {
+  function customizer (object = '', sources = '') {
     if ([object, sources].every((e) => typeof e === 'string')) return object + sources
   }
   chain.plugin('mainPlugin').tap((args) => {
@@ -59,7 +59,7 @@ function setLoader(framework: Frameworks, chain) {
   })
 }
 
-function setPlugin(ctx: IPluginContext, framework: Frameworks, chain) {
+function setPlugin (ctx: IPluginContext, framework: Frameworks, chain) {
   const config = ctx.initialConfig
   const webpackConfig = chain.toConfig()
   const isProd = webpackConfig.mode === 'production'
@@ -78,13 +78,7 @@ function setPlugin(ctx: IPluginContext, framework: Frameworks, chain) {
     basedir: process.cwd(),
     mainFields,
   }
-  if (framework === 'solid') {
-    const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-    const alias = chain.resolve.alias
-    alias.set(reconcilerName, resolveSync('solid-js/web', resolveOptions))
-    // Note: 本地 link 调试时，避免 solid 重复打包
-    alias.set('solid-js$', resolveSync('solid-js', resolveOptions))
-  } else if (framework === 'react') {
+  if (framework === 'react') {
     const alias = chain.resolve.alias
     // Note: 本地 link 调试时，避免 react 重复打包
     alias.set('react$', resolveSync('react', resolveOptions))

packages/taro-framework-react/src/webpack.harmony.ts

@@ -50,10 +50,6 @@ function setAlias (ctx: IPluginContext, framework: Frameworks, chain) {
         }
       }
     }
-  } else if (framework === 'solid') {
-    const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-    alias.set('solid-js/web', reconcilerName)
-    alias.set('react/jsx-runtime', reconcilerName)
   }
 }
 

packages/taro-framework-react/src/webpack.mini.ts

@@ -50,11 +50,6 @@ function setAlias (ctx: IPluginContext, framework: Frameworks, chain) {
         }
       }
     }
-  } else if (framework === 'solid') {
-    const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler'
-    alias.set('solid-js/web', reconcilerName)
-    // Note: 本地 link 调试时，避免 solid 重复打包
-    alias.set('solid-js$', resolveSync('solid-js', resolveOptions))
   }
 }
 

packages/taro-framework-solid/README.md

@@ -1,3 +1,3 @@
-# `@tarojs/plugin-platform-react`
+# `@tarojs/plugin-platform-solid`
 
-Taro 插件。用于支持编译 React/PReact/Nerv。
+Taro 插件。用于支持编译solid。

packages/taro-framework-solid/index.d.ts

@@ -1 +1 @@
-declare module '@tarojs/plugin-framework-react/dist/reconciler'
+declare module '@tarojs/plugin-framework-solid/dist/reconciler'

packages/taro-framework-solid/package.json

@@ -2,7 +2,7 @@
   "name": "@tarojs/plugin-framework-solid",
   "version": "4.0.0-beta.83",
   "description": "Solid 框架插件",
-  "author": "O2Team",
+  "author": "drchan",
   "homepage": "https://github.com/nervjs/taro",
   "license": "MIT",
   "main": "index.js",
@@ -19,7 +19,6 @@
     "url": "git+https://github.com/NervJS/taro.git"
   },
   "scripts": {
-    "prod": "pnpm run build",
     "prebuild": "run-s clean",
     "build": "pnpm run rollup --environment NODE_ENV:production",
     "clean": "rimraf --impl=move-remove dist",
@@ -29,43 +28,43 @@
   "bugs": {
     "url": "https://github.com/NervJS/taro/issues"
   },
-  "engines": {
-    "node": ">= 18"
-  },
   "dependencies": {
-    "acorn": "^8.11.3",
-    "acorn-walk": "^8.3.2",
-    "lodash": "^4.17.21",
-    "tslib": "^2.6.2"
+    "@tarojs/helper": "workspace:*",
+    "@tarojs/service": "workspace:*",
+    "acorn": "^8.0.4",
+    "acorn-walk": "^8.0.0",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@tarojs/helper": "workspace:*",
+    "@babel/core": "^7.14.5",
     "@tarojs/runtime": "workspace:*",
-    "@tarojs/shared": "workspace:*",
-    "@tarojs/service": "workspace:*",
     "@tarojs/taro": "workspace:*",
-    "@types/react": "^18.2.79",
-    "@types/react-dom": "^18.2.25",
-    "solid-js": "^1.8.17",
+    "@tarojs/shared": "workspace:*",
+    "webpack-chain": "^6.5.1",
+    "esbuild": "~0.19.5",
+    "solid-js": "^1.8.16",
+    "typescript": "^5.3.3",
     "vite": "^4.2.0",
-    "webpack-chain": "^6.5.1"
+    "vite-plugin-solid": "^2.10.2"
   },
   "peerDependencies": {
-    "@tarojs/helper": "workspace:*",
-    "@tarojs/runtime": "workspace:*",
-    "@tarojs/shared": "workspace:*",
-    "solid-js": "^1.8.0",
-    "vite": "^4",
-    "webpack": "^5"
+    "@tarojs/runtime": "workspace:~",
+    "@tarojs/shared": "workspace:~",
+    "vite-plugin-solid": "^2",
+    "webpack": "^5",
+    "solid-js": ">=1"
   },
   "peerDependenciesMeta": {
-    "solid-js": {
+    "vite-plugin-solid": {
       "optional": true
     },
-    "vite": {
+    "webpack": {
       "optional": true
     },
-    "webpack": {
+    "solid-js": {
+      "optional": true
+    },
+    "vite": {
       "optional": true
     }
   }

packages/taro-framework-solid/rollup.config.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
-import typescript from '@rollup/plugin-typescript'
+import ts from '@rollup/plugin-typescript'
 import { defineConfig } from 'rollup'
 import externals from 'rollup-plugin-node-externals'
 
@@ -17,7 +17,7 @@ const base: RollupOptions = {
       devDeps: false,
       include: [/@tarojs/]
     }),
-    typescript(),
+    ts(),
   ]
 }
 
@@ -45,7 +45,7 @@ const runtimeConfig: RollupOptions = {
 }
 
 const reconcilerConfig: RollupOptions = {
-  input: path.join(cwd, 'src/runtime/reconciler/index.ts'),
+  input: path.join(cwd, 'src/reconciler/index.ts'),
   output: {
     file: path.join(cwd, 'dist/reconciler.js'),
     format: 'es',

packages/taro-framework-solid/src/api-loader.ts

@@ -23,7 +23,7 @@ export default function (str: string) {
   useScope,
   useUnhandledRejection,
   useUnload
-} from '@tarojs/plugin-framework-react/dist/runtime'
+} from '@tarojs/plugin-framework-solid/dist/runtime'
 ${str}
 
 taro.useAddToFavorites = useAddToFavorites

packages/taro-framework-solid/src/constant.ts

@@ -0,0 +1 @@
+export const RECONCILER_NAME = '@tarojs/plugin-framework-solid/dist/reconciler'