@tarojs/plugin-framework-react 4.0.0-canary.0 → 4.0.0-canary.10

package/LICENSE

@@ -158,3 +158,17 @@ MIT (stencil-vue2-output-target):
 The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
 `/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
 See `/LICENSE` for details of the license.
+
+==================
+
+MIT (weui):
+The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
+`/packages/taro-components/src/components/*.scss`
+See `/LICENSE.txt` for details of the license.
+
+==================
+
+Apache-2.0 (intersection-observer):
+The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
+`/packages/taro-api/src/polyfill/intersection-observer.ts`
+See `/LICENSE.txt` for details of the license.

package/dist/api-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-loader.js","sources":["../src/api-loader.ts"],"sourcesContent":["export default function (str: string) {\n  return `import {\n  useAddToFavorites,\n  useDidHide,\n  useDidShow,\n  useError,\n  useLaunch,\n  useLoad,\n  useOptionMenuClick,\n  usePageNotFound,\n  usePageScroll,\n  usePullDownRefresh,\n  usePullIntercept,\n  useReachBottom,\n  useReady,\n  useResize,\n  useRouter,\n  useSaveExitState,\n  useShareAppMessage,\n  useShareTimeline,\n  useTabItemTap,\n  useTitleClick,\n  useScope,\n  useUnhandledRejection,\n  useUnload\n} from '@tarojs/plugin-framework-react/dist/runtime'\n${str}\n\ntaro.useAddToFavorites = useAddToFavorites\ntaro.useDidHide = useDidHide\ntaro.useDidShow = useDidShow\ntaro.useError = useError\ntaro.useLaunch = useLaunch\ntaro.useLoad = useLoad\ntaro.useOptionMenuClick = useOptionMenuClick\ntaro.usePageNotFound = usePageNotFound\ntaro.usePageScroll = usePageScroll\ntaro.usePullDownRefresh = usePullDownRefresh\ntaro.usePullIntercept = usePullIntercept\ntaro.useReachBottom = useReachBottom\ntaro.useReady = useReady\ntaro.useResize = useResize\ntaro.useRouter = useRouter\ntaro.useSaveExitState = useSaveExitState\ntaro.useShareAppMessage = useShareAppMessage\ntaro.useShareTimeline = useShareTimeline\ntaro.useTabItemTap = useTabItemTap\ntaro.useTitleClick = useTitleClick\ntaro.useScope = useScope\ntaro.useUnhandledRejection = useUnhandledRejection\ntaro.useUnload = useUnload\n\nexport {\n  useAddToFavorites,\n  useDidHide,\n  useDidShow,\n  useError,\n  useLaunch,\n  useLoad,\n  useOptionMenuClick,\n  usePageNotFound,\n  usePageScroll,\n  usePullDownRefresh,\n  usePullIntercept,\n  useReachBottom,\n  useReady,\n  useResize,\n  useRouter,\n  useSaveExitState,\n  useShareAppMessage,\n  useShareTimeline,\n  useTabItemTap,\n  useTitleClick,\n  useScope,\n  useUnhandledRejection,\n  useUnload\n}\n`\n}\n"],"names":[],"mappings":";;AAAc,kBAAA,EAAW,GAAW,EAAA;IAChC,OAAO,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;EAyBT,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDJ,CAAC;AACF;;;;"}
+{"version":3,"file":"api-loader.js","sources":["../src/api-loader.ts"],"sourcesContent":["export default function (str: string) {\n  return `import {\n  useAddToFavorites,\n  useDidHide,\n  useDidShow,\n  useError,\n  useLaunch,\n  useLoad,\n  useOptionMenuClick,\n  usePageNotFound,\n  usePageScroll,\n  usePullDownRefresh,\n  usePullIntercept,\n  useReachBottom,\n  useReady,\n  useResize,\n  useRouter,\n  useSaveExitState,\n  useShareAppMessage,\n  useShareTimeline,\n  useTabItemTap,\n  useTitleClick,\n  useScope,\n  useUnhandledRejection,\n  useUnload\n} from '@tarojs/plugin-framework-react/dist/runtime'\n${str}\n\ntaro.useAddToFavorites = useAddToFavorites\ntaro.useDidHide = useDidHide\ntaro.useDidShow = useDidShow\ntaro.useError = useError\ntaro.useLaunch = useLaunch\ntaro.useLoad = useLoad\ntaro.useOptionMenuClick = useOptionMenuClick\ntaro.usePageNotFound = usePageNotFound\ntaro.usePageScroll = usePageScroll\ntaro.usePullDownRefresh = usePullDownRefresh\ntaro.usePullIntercept = usePullIntercept\ntaro.useReachBottom = useReachBottom\ntaro.useReady = useReady\ntaro.useResize = useResize\ntaro.useRouter = useRouter\ntaro.useSaveExitState = useSaveExitState\ntaro.useShareAppMessage = useShareAppMessage\ntaro.useShareTimeline = useShareTimeline\ntaro.useTabItemTap = useTabItemTap\ntaro.useTitleClick = useTitleClick\ntaro.useScope = useScope\ntaro.useUnhandledRejection = useUnhandledRejection\ntaro.useUnload = useUnload\n\nexport {\n  useAddToFavorites,\n  useDidHide,\n  useDidShow,\n  useError,\n  useLaunch,\n  useLoad,\n  useOptionMenuClick,\n  usePageNotFound,\n  usePageScroll,\n  usePullDownRefresh,\n  usePullIntercept,\n  useReachBottom,\n  useReady,\n  useResize,\n  useRouter,\n  useSaveExitState,\n  useShareAppMessage,\n  useShareTimeline,\n  useTabItemTap,\n  useTitleClick,\n  useScope,\n  useUnhandledRejection,\n  useUnload\n}\n`\n}\n"],"names":[],"mappings":";;AAAc,kBAAA,EAAW,GAAW,EAAA;IAClC,OAAO,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;EAyBP,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDJ,CAAA;AACD;;;;"}

package/dist/index.js

@@ -43,7 +43,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise */
+/* global Reflect, Promise, SuppressedError, Symbol */
 
 
 function __awaiter(thisArg, _arguments, P, generator) {
@@ -54,7 +54,12 @@ function __awaiter(thisArg, _arguments, P, generator) {
         function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
-}
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
 
 function apiLoader (str) {
     return `import {
@@ -227,7 +232,20 @@ class App extends React.Component {
     if (framework === 'nerv') {
         Object.assign(loaderMeta, nervMeta);
     }
-    if (shared.isWebPlatform()) {
+    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');
             const majorVersion = Number((react.version || '18').split('.')[0]);
@@ -275,7 +293,6 @@ function setTaroApi() {
         enforce: 'pre',
         config: () => ({
             optimizeDeps: {
-                force: true,
                 esbuildOptions: {
                     plugins: [
                         {
@@ -317,7 +334,7 @@ function esbuildExclude(framework) {
         enforce: 'pre',
         config: () => ({
             optimizeDeps: {
-                exclude: ['react', 'preact']
+                exclude: ['react', 'preact', 'solid-js']
             }
         })
     };
@@ -349,8 +366,13 @@ function aliasPlugin$1(ctx, framework) {
             config(config) {
                 var _a;
                 const alias = [
-                    { find: /react-dom$/, replacement: '@tarojs/react' }
+                    { find: /react-dom$/, replacement: '@tarojs/react' },
                 ];
+                const mainFields = ['unpkg', ...helper.defaultMainFields];
+                const resolveOptions = {
+                    basedir: process.cwd(),
+                    mainFields,
+                };
                 const isProd = config.mode === 'production';
                 // TODO：harmony 目前会导致部分包用 production 版本，部分用 development 版本，导致许多 api 报错
                 const isHarmony = ctx.runOpts.options.platform === 'harmony';
@@ -362,7 +384,7 @@ function aliasPlugin$1(ctx, framework) {
                     alias.push({ find: /react\/jsx-runtime$/, replacement: 'react/cjs/react-jsx-runtime.production.min.js' });
                     // 在React18中，使用了exports字段约定了模块暴露路径，其中并未暴露 ./cjs/ 。这将使上面的alias在编译时报错。相当的tricky。
                     // Why writeJson？ prebundle will load package.json via readFile to check exports property.
-                    const reactPkgPath = require.resolve('react/package.json', { paths: [process.cwd()] });
+                    const reactPkgPath = helper.resolveSync('react/package.json', resolveOptions);
                     if (reactPkgPath) {
                         const reactPkg = require('react/package.json');
                         const reactVersion = (reactPkg.version || '');
@@ -382,6 +404,23 @@ function aliasPlugin$1(ctx, framework) {
             }
         };
     }
+    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
+                    }
+                };
+            }
+        };
+    }
     return [];
 }
 
@@ -413,6 +452,11 @@ function aliasPlugin(ctx, framework) {
                 const alias = [
                     { find: /react-dom$/, replacement: '@tarojs/react' }
                 ];
+                const mainFields = ['unpkg', ...helper.defaultMainFields];
+                const resolveOptions = {
+                    basedir: process.cwd(),
+                    mainFields,
+                };
                 const isProd = config.mode === 'production';
                 // TODO：harmony 目前会导致部分包用 production 版本，部分用 development 版本，导致许多 api 报错
                 const isHarmony = ctx.runOpts.options.platform === 'harmony';
@@ -424,7 +468,7 @@ function aliasPlugin(ctx, framework) {
                     alias.push({ find: /react\/jsx-runtime$/, replacement: 'react/cjs/react-jsx-runtime.production.min.js' });
                     // 在React18中，使用了exports字段约定了模块暴露路径，其中并未暴露 ./cjs/ 。这将使上面的alias在编译时报错。相当的tricky。
                     // Why writeJson？ prebundle will load package.json via readFile to check exports property.
-                    const reactPkgPath = require.resolve('react/package.json', { paths: [process.cwd()] });
+                    const reactPkgPath = helper.resolveSync('react/package.json', resolveOptions);
                     if (reactPkgPath) {
                         const reactPkg = require('react/package.json');
                         const reactVersion = (reactPkg.version || '');
@@ -444,6 +488,23 @@ function aliasPlugin(ctx, framework) {
             }
         };
     }
+    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
+                    }
+                };
+            }
+        };
+    }
     return [];
 }
 
@@ -455,23 +516,58 @@ function modifyH5WebpackChain(ctx, framework, chain) {
     const externals = {};
     if (isBuildNativeComp) {
         // Note: 该模式不支持 prebundle 优化，不必再处理
-        externals.react = 'React';
-        externals['react-dom'] = 'ReactDOM';
+        externals.react = {
+            commonjs: 'react',
+            commonjs2: 'react',
+            amd: 'react',
+            root: 'React'
+        };
+        externals['react-dom'] = {
+            commonjs: 'react-dom',
+            commonjs2: 'react-dom',
+            amd: 'react-dom',
+            root: 'ReactDOM'
+        };
         if (framework === 'preact') {
             externals.preact = 'preact';
         }
+        chain.merge({
+            externalsType: 'umd'
+        });
     }
     chain.merge({
         externals,
         module: {
             rule: {
-                'process-import-taro': {
+                'process-import-taro-h5': {
                     test: helper.REG_TARO_H5,
                     loader: require.resolve('./api-loader'),
                 },
             },
         },
     });
+    chain.merge({
+        externals,
+        module: {
+            rule: {
+                'process-import-taro-harmony-hybrid': {
+                    test: /taro-platform-harmony-hybrid[\\/]dist[\\/]api[\\/]apis[\\/]taro/,
+                    loader: require.resolve('./api-loader')
+                }
+            }
+        },
+    });
+    chain.merge({
+        externals,
+        module: {
+            rule: {
+                'process-import-taro-harmony-hybrid': {
+                    test: /taro-platform-harmony-hybrid[\\/]dist[\\/]api[\\/]apis[\\/]taro/,
+                    loader: require.resolve('./api-loader')
+                }
+            }
+        },
+    });
 }
 function setLoader$2(framework, chain) {
     function customizer(object = '', sources = '') {
@@ -498,6 +594,23 @@ function setPlugin(ctx, framework, chain) {
             chain.plugin('fastRefreshPlugin').use(require('@prefresh/webpack'));
         }
     }
+    const mainFields = ['unpkg', ...helper.defaultMainFields];
+    const resolveOptions = {
+        basedir: process.cwd(),
+        mainFields,
+    };
+    if (framework === 'solid') {
+        const reconcilerName = '@tarojs/plugin-framework-react/dist/reconciler';
+        const alias = chain.resolve.alias;
+        alias.set(reconcilerName, helper.resolveSync('solid-js/web', resolveOptions));
+        // Note: 本地 link 调试时，避免 solid 重复打包
+        alias.set('solid-js$', helper.resolveSync('solid-js', resolveOptions));
+    }
+    else if (framework === 'react') {
+        const alias = chain.resolve.alias;
+        // Note: 本地 link 调试时，避免 react 重复打包
+        alias.set('react$', helper.resolveSync('react', resolveOptions));
+    }
 }
 
 function modifyHarmonyWebpackChain(ctx, framework, chain) {
@@ -508,6 +621,11 @@ function setAlias$2(ctx, framework, chain) {
     var _a;
     const config = ctx.initialConfig;
     const alias = chain.resolve.alias;
+    const mainFields = ['unpkg', ...helper.defaultMainFields];
+    const resolveOptions = {
+        basedir: process.cwd(),
+        mainFields,
+    };
     if (framework === 'react') {
         alias.set('react-dom$', '@tarojs/react');
         alias.set('react-dom/client$', '@tarojs/react');
@@ -516,14 +634,14 @@ function setAlias$2(ctx, framework, chain) {
         if (!isProd && ((_a = config.harmony) === null || _a === void 0 ? void 0 : _a.debugReact) !== true) {
             // 不是生产环境，且没有设置 debugReact，则使用压缩版本的 react 依赖，减少体积
             // 兼容pnpm workspace
-            const reactModulePath = require.resolve('react', { paths: [process.cwd()] });
+            const reactModulePath = helper.resolveSync('react', resolveOptions);
             const newFilePath = path.join(path.dirname(reactModulePath), 'cjs', 'react.production.min.js');
             alias.set('react-reconciler$', 'react-reconciler/cjs/react-reconciler.production.min.js');
             alias.set('react$', newFilePath);
             alias.set('react/jsx-runtime$', 'react/cjs/react-jsx-runtime.production.min.js');
             // 在React18中，使用了exports字段约定了模块暴露路径，其中并未暴露 ./cjs/ 。这将使上面的alias在编译时报错。相当的tricky。
             // Why writeJson？ prebundle will load package.json via readFile to check exports property.
-            const reactPkgPath = require.resolve('react/package.json', { paths: [process.cwd()] });
+            const reactPkgPath = helper.resolveSync('react/package.json', resolveOptions);
             if (reactPkgPath) {
                 const reactPkg = require('react/package.json');
                 const reactVersion = reactPkg.version || '';
@@ -536,6 +654,11 @@ function setAlias$2(ctx, framework, 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);
+    }
 }
 function setLoader$1(framework, chain) {
     chain.plugin('mainPlugin').tap((args) => {
@@ -552,6 +675,11 @@ function setAlias$1(ctx, framework, chain) {
     var _a;
     const config = ctx.initialConfig;
     const alias = chain.resolve.alias;
+    const mainFields = ['unpkg', ...helper.defaultMainFields];
+    const resolveOptions = {
+        basedir: process.cwd(),
+        mainFields,
+    };
     if (framework === 'react') {
         alias.set('react-dom$', '@tarojs/react');
         alias.set('react-dom/client$', '@tarojs/react');
@@ -560,14 +688,14 @@ function setAlias$1(ctx, framework, chain) {
         if (!isProd && ((_a = config.mini) === null || _a === void 0 ? void 0 : _a.debugReact) !== true) {
             // 不是生产环境，且没有设置 debugReact，则使用压缩版本的 react 依赖，减少体积
             // 兼容pnpm workspace
-            const reactModulePath = require.resolve('react', { paths: [process.cwd()] });
+            const reactModulePath = helper.resolveSync('react', resolveOptions);
             const newFilePath = path.join(path.dirname(reactModulePath), 'cjs', 'react.production.min.js');
             alias.set('react-reconciler$', 'react-reconciler/cjs/react-reconciler.production.min.js');
             alias.set(/^(?!.*mobx-react$).*react$/, newFilePath);
             alias.set('react/jsx-runtime$', 'react/cjs/react-jsx-runtime.production.min.js');
             // 在React18中，使用了exports字段约定了模块暴露路径，其中并未暴露 ./cjs/ 。这将使上面的alias在编译时报错。相当的tricky。
             // Why writeJson？ prebundle will load package.json via readFile to check exports property.
-            const reactPkgPath = require.resolve('react/package.json', { paths: [process.cwd()] });
+            const reactPkgPath = helper.resolveSync('react/package.json', resolveOptions);
             if (reactPkgPath) {
                 const reactPkg = require('react/package.json');
                 const reactVersion = reactPkg.version || '';
@@ -580,6 +708,12 @@ function setAlias$1(ctx, framework, 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$', helper.resolveSync('solid-js', resolveOptions));
+    }
 }
 function setLoader(framework, chain) {
     chain.plugin('miniPlugin').tap((args) => {
@@ -598,12 +732,7 @@ var index = (ctx) => {
     ctx.modifyWebpackChain(({ chain }) => {
         // 通用
         setAlias(framework, chain);
-        chain.plugin('definePlugin').tap((args) => {
-            const config = args[0];
-            config.__TARO_FRAMEWORK__ = `"${framework}"`;
-            return args;
-        });
-        if (shared.isWebPlatform()) {
+        if (process.env.TARO_PLATFORM === 'web') {
             // H5
             modifyH5WebpackChain(ctx, framework, chain);
         }
@@ -645,6 +774,12 @@ var index = (ctx) => {
                             contents: require('./api-loader')(content),
                         };
                     });
+                    build.onLoad({ filter: /taro-platform-harmony-hybrid[\\/]dist[\\/]api[\\/]apis[\\/]taro/ }, ({ path }) => {
+                        const content = helper.fs.readFileSync(path).toString();
+                        return {
+                            contents: require('./api-loader')(content)
+                        };
+                    });
                 },
             };
             prebundleOptions.esbuild || (prebundleOptions.esbuild = {});
@@ -656,7 +791,7 @@ var index = (ctx) => {
             compiler.vitePlugins || (compiler.vitePlugins = []);
             compiler.vitePlugins.push(viteCommonPlugin(framework));
             compiler.vitePlugins.push(VitePresetPlugin(framework));
-            if (shared.isWebPlatform()) {
+            if (process.env.TARO_PLATFORM === 'web') {
                 // H5
                 compiler.vitePlugins.push(h5iVitePlugin(ctx, framework));
             }
@@ -684,6 +819,9 @@ function setAlias(framework, chain) {
             alias.set('react$', 'nervjs');
             alias.set('react-dom$', 'nervjs');
             break;
+        case 'solid':
+            alias.set('react/jsx-runtime', 'solid-js/h/jsx-runtime');
+            break;
     }
 }
 function VitePresetPlugin(framework) {
@@ -717,17 +855,11 @@ function viteCommonPlugin(framework) {
                     { 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 {
-                optimizeDeps: {
-                    esbuildOptions: {
-                        define: {
-                            __TARO_FRAMEWORK__: `"${framework}"`
-                        }
-                    }
-                },
-                define: {
-                    __TARO_FRAMEWORK__: `"${framework}"`,
-                },
                 resolve: {
                     alias,
                 },