From 96b5a4305fe9fadef8261f5e83d3dc6922519307 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 8 Aug 2025 13:50:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(taro-components):=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8E=E5=90=84lib=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__tests__/__mocks__/h5-definition.json | 2 + .../package.json | 17 +- .../rollup.config.mjs | 2 +- .../scripts/{fix.js => fix.cjs} | 0 .../tsconfig.json | 2 +- .../package.json | 17 +- .../rollup.config.mjs | 2 +- .../scripts/{fix.js => fix.cjs} | 0 .../tsconfig.json | 2 +- .../taro-components-library-vue3/package.json | 17 +- .../rollup.config.mjs | 2 +- .../scripts/{fix.js => fix.cjs} | 0 .../tsconfig.json | 2 +- packages/taro-components-react/package.json | 2 + .../taro-components-react/src/index.react.ts | 135 +++++++------ .../taro-components-react/src/index.solid.ts | 138 ++++++------- .../taro-components-react/types/global.d.ts | 4 +- packages/taro-components/package.json | 15 +- .../scripts/stencil/stencil.config.ts | 10 +- packages/taro-platform-h5/package.json | 3 + packages/taro-platform-h5/src/program.ts | 28 ++- .../build/config/harmony-definition.json | 4 +- .../taro-platform-harmony-hybrid/package.json | 3 + .../src/components/react/index.ts | 133 ++++++------- .../src/components/vue3/index.ts | 135 +++++++------ .../src/program.ts | 30 ++- .../types/component.d.ts | 4 +- pnpm-lock.yaml | 188 ++++++++---------- tests/__tests__/utils/compiler.ts | 4 +- 29 files changed, 466 insertions(+), 435 deletions(-) rename packages/taro-components-library-react/scripts/{fix.js => fix.cjs} (100%) rename packages/taro-components-library-solid/scripts/{fix.js => fix.cjs} (100%) rename packages/taro-components-library-vue3/scripts/{fix.js => fix.cjs} (100%) diff --git a/packages/babel-plugin-transform-taroapi/__tests__/__mocks__/h5-definition.json b/packages/babel-plugin-transform-taroapi/__tests__/__mocks__/h5-definition.json index 8a86b94726d9..5525e4c5c0b1 100644 --- a/packages/babel-plugin-transform-taroapi/__tests__/__mocks__/h5-definition.json +++ b/packages/babel-plugin-transform-taroapi/__tests__/__mocks__/h5-definition.json @@ -2353,6 +2353,7 @@ "script": {}, "scroll-view": { "animated": "boolean", + "enhanced": "boolean", "lowerThreshold": "string | number", "mpScrollIntoView": "string", "mpScrollIntoViewAlignment": "\"center\" | \"start\" | \"end\" | \"nearest\"", @@ -2362,6 +2363,7 @@ "mpScrollTop": "string | number", "scrollX": "boolean", "scrollY": "boolean", + "showScrollbar": "boolean", "upperThreshold": "string | number" }, "share-element": {}, diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 01244097ede0..42dd5320fd83 100644 --- a/packages/taro-components-library-react/package.json +++ b/packages/taro-components-library-react/package.json @@ -2,14 +2,23 @@ "name": "@tarojs/components-library-react", "version": "4.1.5", "description": "Taro 组件库 React 版本库", - "private": true, "author": "O2Team", "license": "MIT", - "main": "index.js", + "main": "./dist/index.js", + "exports": { + ".": { + "default": "./dist/index.js", + "types": "./dist/index.d.ts" + }, + "./component-lib": { + "default": "./dist/component-lib/index.js", + "types": "./dist/component-lib/index.d.ts" + } + }, "scripts": { - "prebuild": "pnpm run clean && node ./scripts/fix.js", + "prebuild": "pnpm run clean && node ./scripts/fix.cjs", "build": "rollup -c", - "clean": "rimraf ../taro-components/lib/react", + "clean": "rimraf dist", "dev": "pnpm run build -w", "prod": "pnpm run build" }, diff --git a/packages/taro-components-library-react/rollup.config.mjs b/packages/taro-components-library-react/rollup.config.mjs index cfd0b8d083b4..2edcaebff22b 100644 --- a/packages/taro-components-library-react/rollup.config.mjs +++ b/packages/taro-components-library-react/rollup.config.mjs @@ -7,7 +7,7 @@ import postcss from 'rollup-plugin-postcss' const config = { input: ['src/index.ts', 'src/component-lib/index.ts'], output: { - dir: '../taro-components/lib/react', + dir: 'dist', exports: 'named', preserveModules: true, preserveModulesRoot: 'src', diff --git a/packages/taro-components-library-react/scripts/fix.js b/packages/taro-components-library-react/scripts/fix.cjs similarity index 100% rename from packages/taro-components-library-react/scripts/fix.js rename to packages/taro-components-library-react/scripts/fix.cjs diff --git a/packages/taro-components-library-react/tsconfig.json b/packages/taro-components-library-react/tsconfig.json index 18a6c4934d30..74718cac21ef 100644 --- a/packages/taro-components-library-react/tsconfig.json +++ b/packages/taro-components-library-react/tsconfig.json @@ -2,8 +2,8 @@ "extends": "../../tsconfig.root.json", "compilerOptions": { "baseUrl": ".", + "outDir": "./dist", "declaration": true, - "declarationDir": "../taro-components/lib/react", "jsx": "react", "jsxFactory": "React.createElement", "module": "ESNext", diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 997db7db02b0..99ead7007ec9 100644 --- a/packages/taro-components-library-solid/package.json +++ b/packages/taro-components-library-solid/package.json @@ -2,12 +2,21 @@ "name": "@tarojs/components-library-solid", "version": "4.1.5", "description": "Taro 组件库 Solid 版本库", - "private": true, - "main": "index.js", + "main": "./dist/index.js", + "exports": { + ".": { + "default": "./dist/index.js", + "types": "./dist/index.d.ts" + }, + "./component-lib": { + "default": "./dist/component-lib/index.js", + "types": "./dist/component-lib/index.d.ts" + } + }, "scripts": { - "prebuild": "pnpm run clean && node ./scripts/fix.js", + "prebuild": "pnpm run clean && node ./scripts/fix.cjs", "build": "rollup -c", - "clean": "rimraf ../taro-components/lib/solid", + "clean": "rimraf dist", "dev": "pnpm run build -w", "prod": "pnpm run build" }, diff --git a/packages/taro-components-library-solid/rollup.config.mjs b/packages/taro-components-library-solid/rollup.config.mjs index ddf00dd7c351..7165da8b8add 100644 --- a/packages/taro-components-library-solid/rollup.config.mjs +++ b/packages/taro-components-library-solid/rollup.config.mjs @@ -7,7 +7,7 @@ import postcss from 'rollup-plugin-postcss' const config = { input: ['src/index.ts', 'src/component-lib/index.ts'], output: { - dir: '../taro-components/lib/solid', + dir: 'dist', exports: 'named', preserveModules: true, preserveModulesRoot: 'src', diff --git a/packages/taro-components-library-solid/scripts/fix.js b/packages/taro-components-library-solid/scripts/fix.cjs similarity index 100% rename from packages/taro-components-library-solid/scripts/fix.js rename to packages/taro-components-library-solid/scripts/fix.cjs diff --git a/packages/taro-components-library-solid/tsconfig.json b/packages/taro-components-library-solid/tsconfig.json index 73a3252a725b..0af490eca63a 100644 --- a/packages/taro-components-library-solid/tsconfig.json +++ b/packages/taro-components-library-solid/tsconfig.json @@ -2,9 +2,9 @@ "extends": "../../tsconfig.root.json", "compilerOptions": { "baseUrl": ".", + "outDir": "./dist", "declaration": true, "jsx": "preserve", - "declarationDir": "../taro-components/lib/solid", "jsxImportSource": "solid-js", "module": "ESNext", "noUnusedLocals": false, diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json index bc7468e07e6b..2855fad3b049 100644 --- a/packages/taro-components-library-vue3/package.json +++ b/packages/taro-components-library-vue3/package.json @@ -2,15 +2,24 @@ "name": "@tarojs/components-library-vue3", "version": "4.1.5", "description": "Taro 组件库 Vue3 版本库", - "private": true, "author": "O2Team", "license": "MIT", - "main": "index.js", + "main": "./dist/index.js", + "exports": { + ".": { + "default": "./dist/index.js", + "types": "./dist/index.d.ts" + }, + "./component-lib": { + "default": "./dist/component-lib/index.js", + "types": "./dist/component-lib/index.d.ts" + } + }, "scripts": { "prod": "pnpm run build", - "prebuild": "pnpm run clean && node ./scripts/fix.js", + "prebuild": "pnpm run clean && node ./scripts/fix.cjs", "build": "rollup -c", - "clean": "rimraf ../taro-components/lib/vue3", + "clean": "rimraf dist", "dev": "pnpm run build -w" }, "keywords": [], diff --git a/packages/taro-components-library-vue3/rollup.config.mjs b/packages/taro-components-library-vue3/rollup.config.mjs index cca0d96295f1..5d1e0f690963 100644 --- a/packages/taro-components-library-vue3/rollup.config.mjs +++ b/packages/taro-components-library-vue3/rollup.config.mjs @@ -7,7 +7,7 @@ import postcss from 'rollup-plugin-postcss' const config = { input: ['src/index.ts', 'src/components-loader.ts', 'src/component-lib/index.ts'], output: { - dir: '../taro-components/lib/vue3', + dir: 'dist', exports: 'named', preserveModules: true, sourcemap: true, diff --git a/packages/taro-components-library-vue3/scripts/fix.js b/packages/taro-components-library-vue3/scripts/fix.cjs similarity index 100% rename from packages/taro-components-library-vue3/scripts/fix.js rename to packages/taro-components-library-vue3/scripts/fix.cjs diff --git a/packages/taro-components-library-vue3/tsconfig.json b/packages/taro-components-library-vue3/tsconfig.json index 4b2c6fdbda75..8973bf7d9ec8 100644 --- a/packages/taro-components-library-vue3/tsconfig.json +++ b/packages/taro-components-library-vue3/tsconfig.json @@ -2,8 +2,8 @@ "extends": "../../tsconfig.root.json", "compilerOptions": { "baseUrl": ".", + "outDir": "./dist", "declaration": true, - "declarationDir": "../taro-components/lib/vue3", "module": "ESNext", "noUnusedLocals": false, "skipLibCheck": true, diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json index 134d4a4de112..ca53a157d292 100644 --- a/packages/taro-components-react/package.json +++ b/packages/taro-components-react/package.json @@ -38,6 +38,8 @@ "dependencies": { "@babel/runtime": "^7.24.4", "@tarojs/components": "workspace:*", + "@tarojs/components-library-react": "workspace:*", + "@tarojs/components-library-solid": "workspace:*", "@tarojs/shared": "workspace:*", "@tarojs/taro": "workspace:*", "classnames": "^2.2.5", diff --git a/packages/taro-components-react/src/index.react.ts b/packages/taro-components-react/src/index.react.ts index 3bb7c0cdfa7c..dc4eb6bb3265 100644 --- a/packages/taro-components-react/src/index.react.ts +++ b/packages/taro-components-react/src/index.react.ts @@ -1,78 +1,77 @@ -/* eslint-disable simple-import-sort/exports */ -export { Ad } from '@tarojs/components/lib/react' -export { AdCustom } from '@tarojs/components/lib/react' -export { AnimationVideo } from '@tarojs/components/lib/react' -export { AnimationView } from '@tarojs/components/lib/react' -export { ArCamera } from '@tarojs/components/lib/react' -export { Audio } from '@tarojs/components/lib/react' -export { AwemeData } from '@tarojs/components/lib/react' -export { Block } from '@tarojs/components/lib/react' export { default as Button } from './components/button' -export { Camera } from '@tarojs/components/lib/react' -export { Canvas } from '@tarojs/components/lib/react' -export { ChannelLive } from '@tarojs/components/lib/react' -export { ChannelVideo } from '@tarojs/components/lib/react' -export { Checkbox, CheckboxGroup } from '@tarojs/components/lib/react' -export { CommentDetail, CommentList } from '@tarojs/components/lib/react' -export { ContactButton } from '@tarojs/components/lib/react' -export { CoverImage } from '@tarojs/components/lib/react' -export { CoverView } from '@tarojs/components/lib/react' -export { CustomWrapper } from '@tarojs/components/lib/react' -export { DraggableSheet } from '@tarojs/components/lib/react' -export { Editor } from '@tarojs/components/lib/react' -export { FollowSwan } from '@tarojs/components/lib/react' -export { Form } from '@tarojs/components/lib/react' -export { FunctionalPageNavigator } from '@tarojs/components/lib/react' -export { GridView } from '@tarojs/components/lib/react' -export { GridBuilder } from '@tarojs/components/lib/react' export { default as Icon } from './components/icon' export { default as Image } from './components/image' -export { InlinePaymentPanel } from '@tarojs/components/lib/react' export { default as Input } from './components/input' -export { KeyboardAccessory } from '@tarojs/components/lib/react' -export { Label } from '@tarojs/components/lib/react' -export { Lifestyle } from '@tarojs/components/lib/react' -export { Like } from '@tarojs/components/lib/react' -export { LivePlayer } from '@tarojs/components/lib/react' -export { LivePusher } from '@tarojs/components/lib/react' -export { ListBuilder } from '@tarojs/components/lib/react' -export { ListView } from '@tarojs/components/lib/react' -export { Login } from '@tarojs/components/lib/react' -export { Lottie } from '@tarojs/components/lib/react' -export { Map } from '@tarojs/components/lib/react' -export { MatchMedia } from '@tarojs/components/lib/react' -export { MovableArea, MovableView } from '@tarojs/components/lib/react' -export { NavigationBar } from '@tarojs/components/lib/react' -export { Navigator } from '@tarojs/components/lib/react' -export { NestedScrollBody } from '@tarojs/components/lib/react' -export { NestedScrollHeader } from '@tarojs/components/lib/react' -export { OfficialAccount } from '@tarojs/components/lib/react' -export { OpenData } from '@tarojs/components/lib/react' -export { OpenContainer } from '@tarojs/components/lib/react' -export { PageContainer } from '@tarojs/components/lib/react' -export { PageMeta } from '@tarojs/components/lib/react' export { default as Picker } from './components/picker' -export { PickerView, PickerViewColumn } from '@tarojs/components/lib/react' -export { Progress } from '@tarojs/components/lib/react' export { default as PullDownRefresh } from './components/pull-down-refresh' -// export { PullToRefresh } from '@tarojs/components/lib/react' -export { Radio, RadioGroup } from '@tarojs/components/lib/react' -export { RichText } from '@tarojs/components/lib/react' -export { RootPortal } from '@tarojs/components/lib/react' -export { RtcRoom, RtcRoomItem } from '@tarojs/components/lib/react' -export { Script } from '@tarojs/components/lib/react' +export { Ad } from '@tarojs/components-library-react' +export { AdCustom } from '@tarojs/components-library-react' +export { AnimationVideo } from '@tarojs/components-library-react' +export { AnimationView } from '@tarojs/components-library-react' +export { ArCamera } from '@tarojs/components-library-react' +export { Audio } from '@tarojs/components-library-react' +export { AwemeData } from '@tarojs/components-library-react' +export { Block } from '@tarojs/components-library-react' +export { Camera } from '@tarojs/components-library-react' +export { Canvas } from '@tarojs/components-library-react' +export { ChannelLive } from '@tarojs/components-library-react' +export { ChannelVideo } from '@tarojs/components-library-react' +export { Checkbox, CheckboxGroup } from '@tarojs/components-library-react' +export { CommentDetail, CommentList } from '@tarojs/components-library-react' +export { ContactButton } from '@tarojs/components-library-react' +export { CoverImage } from '@tarojs/components-library-react' +export { CoverView } from '@tarojs/components-library-react' +export { CustomWrapper } from '@tarojs/components-library-react' +export { DraggableSheet } from '@tarojs/components-library-react' +export { Editor } from '@tarojs/components-library-react' +export { FollowSwan } from '@tarojs/components-library-react' +export { Form } from '@tarojs/components-library-react' +export { FunctionalPageNavigator } from '@tarojs/components-library-react' +export { GridView } from '@tarojs/components-library-react' +export { GridBuilder } from '@tarojs/components-library-react' +export { InlinePaymentPanel } from '@tarojs/components-library-react' +export { KeyboardAccessory } from '@tarojs/components-library-react' +export { Label } from '@tarojs/components-library-react' +export { Lifestyle } from '@tarojs/components-library-react' +export { Like } from '@tarojs/components-library-react' +export { LivePlayer } from '@tarojs/components-library-react' +export { LivePusher } from '@tarojs/components-library-react' +export { ListBuilder } from '@tarojs/components-library-react' +export { ListView } from '@tarojs/components-library-react' +export { Login } from '@tarojs/components-library-react' +export { Lottie } from '@tarojs/components-library-react' +export { Map } from '@tarojs/components-library-react' +export { MatchMedia } from '@tarojs/components-library-react' +export { MovableArea, MovableView } from '@tarojs/components-library-react' +export { NavigationBar } from '@tarojs/components-library-react' +export { Navigator } from '@tarojs/components-library-react' +export { NestedScrollBody } from '@tarojs/components-library-react' +export { NestedScrollHeader } from '@tarojs/components-library-react' +export { OfficialAccount } from '@tarojs/components-library-react' +export { OpenData } from '@tarojs/components-library-react' +export { OpenContainer } from '@tarojs/components-library-react' +export { PageContainer } from '@tarojs/components-library-react' +export { PageMeta } from '@tarojs/components-library-react' +export { PickerView, PickerViewColumn } from '@tarojs/components-library-react' +export { Progress } from '@tarojs/components-library-react' +// export { PullToRefresh } from '@tarojs/components-library-react' export { default as ScrollView } from './components/scroll-view' -export { ShareElement } from '@tarojs/components/lib/react' -export { Slider } from '@tarojs/components/lib/react' -export { Snapshot } from '@tarojs/components/lib/react' -export { Span } from '@tarojs/components/lib/react' -export { NativeSlot, Slot } from '@tarojs/components/lib/react' export { Swiper, SwiperItem } from './components/swiper' -export { Switch } from '@tarojs/components/lib/react' -export { Tabs } from '@tarojs/components/lib/react' export { default as Text } from './components/text' -export { Textarea } from '@tarojs/components/lib/react' -export { Video } from '@tarojs/components/lib/react' export { default as View } from './components/view' -export { VoipRoom } from '@tarojs/components/lib/react' -export { WebView } from '@tarojs/components/lib/react' +export { Radio, RadioGroup } from '@tarojs/components-library-react' +export { RichText } from '@tarojs/components-library-react' +export { RootPortal } from '@tarojs/components-library-react' +export { RtcRoom, RtcRoomItem } from '@tarojs/components-library-react' +export { Script } from '@tarojs/components-library-react' +export { ShareElement } from '@tarojs/components-library-react' +export { Slider } from '@tarojs/components-library-react' +export { Snapshot } from '@tarojs/components-library-react' +export { Span } from '@tarojs/components-library-react' +export { NativeSlot, Slot } from '@tarojs/components-library-react' +export { Switch } from '@tarojs/components-library-react' +export { Tabs } from '@tarojs/components-library-react' +export { Textarea } from '@tarojs/components-library-react' +export { Video } from '@tarojs/components-library-react' +export { VoipRoom } from '@tarojs/components-library-react' +export { WebView } from '@tarojs/components-library-react' diff --git a/packages/taro-components-react/src/index.solid.ts b/packages/taro-components-react/src/index.solid.ts index d8f59a7a1045..3493b986c0ad 100644 --- a/packages/taro-components-react/src/index.solid.ts +++ b/packages/taro-components-react/src/index.solid.ts @@ -1,78 +1,78 @@ /* eslint-disable simple-import-sort/exports */ -export { Ad } from '@tarojs/components/lib/solid' -export { AdCustom } from '@tarojs/components/lib/solid' -export { AnimationVideo } from '@tarojs/components/lib/solid' -export { AnimationView } from '@tarojs/components/lib/solid' -export { ArCamera } from '@tarojs/components/lib/solid' -export { Audio } from '@tarojs/components/lib/solid' -export { AwemeData } from '@tarojs/components/lib/solid' -export { Block } from '@tarojs/components/lib/solid' +export { Ad } from '@tarojs/components-library-solid' +export { AdCustom } from '@tarojs/components-library-solid' +export { AnimationVideo } from '@tarojs/components-library-solid' +export { AnimationView } from '@tarojs/components-library-solid' +export { ArCamera } from '@tarojs/components-library-solid' +export { Audio } from '@tarojs/components-library-solid' +export { AwemeData } from '@tarojs/components-library-solid' +export { Block } from '@tarojs/components-library-solid' export { default as Button } from './components/button' -export { Camera } from '@tarojs/components/lib/solid' -export { Canvas } from '@tarojs/components/lib/solid' -export { ChannelLive } from '@tarojs/components/lib/solid' -export { ChannelVideo } from '@tarojs/components/lib/solid' -export { Checkbox, CheckboxGroup } from '@tarojs/components/lib/solid' -export { CommentDetail, CommentList } from '@tarojs/components/lib/solid' -export { ContactButton } from '@tarojs/components/lib/solid' -export { CoverImage } from '@tarojs/components/lib/solid' -export { CoverView } from '@tarojs/components/lib/solid' -export { CustomWrapper } from '@tarojs/components/lib/solid' -export { DraggableSheet } from '@tarojs/components/lib/solid' -export { Editor } from '@tarojs/components/lib/solid' -export { FollowSwan } from '@tarojs/components/lib/solid' -export { Form } from '@tarojs/components/lib/solid' -export { FunctionalPageNavigator } from '@tarojs/components/lib/solid' -export { GridView } from '@tarojs/components/lib/solid' -export { GridBuilder } from '@tarojs/components/lib/solid' +export { Camera } from '@tarojs/components-library-solid' +export { Canvas } from '@tarojs/components-library-solid' +export { ChannelLive } from '@tarojs/components-library-solid' +export { ChannelVideo } from '@tarojs/components-library-solid' +export { Checkbox, CheckboxGroup } from '@tarojs/components-library-solid' +export { CommentDetail, CommentList } from '@tarojs/components-library-solid' +export { ContactButton } from '@tarojs/components-library-solid' +export { CoverImage } from '@tarojs/components-library-solid' +export { CoverView } from '@tarojs/components-library-solid' +export { CustomWrapper } from '@tarojs/components-library-solid' +export { DraggableSheet } from '@tarojs/components-library-solid' +export { Editor } from '@tarojs/components-library-solid' +export { FollowSwan } from '@tarojs/components-library-solid' +export { Form } from '@tarojs/components-library-solid' +export { FunctionalPageNavigator } from '@tarojs/components-library-solid' +export { GridView } from '@tarojs/components-library-solid' +export { GridBuilder } from '@tarojs/components-library-solid' export { default as Icon } from './components/icon' export { default as Image } from './components/image' -export { InlinePaymentPanel } from '@tarojs/components/lib/solid' -export { Input } from '@tarojs/components/lib/solid' -export { KeyboardAccessory } from '@tarojs/components/lib/solid' -export { Label } from '@tarojs/components/lib/solid' -export { Lifestyle } from '@tarojs/components/lib/solid' -export { Like } from '@tarojs/components/lib/solid' -export { LivePlayer } from '@tarojs/components/lib/solid' -export { LivePusher } from '@tarojs/components/lib/solid' -export { ListBuilder } from '@tarojs/components/lib/solid' -export { ListView } from '@tarojs/components/lib/solid' -export { Login } from '@tarojs/components/lib/solid' -export { Lottie } from '@tarojs/components/lib/solid' -export { Map } from '@tarojs/components/lib/solid' -export { MatchMedia } from '@tarojs/components/lib/solid' -export { MovableArea, MovableView } from '@tarojs/components/lib/solid' -export { NavigationBar } from '@tarojs/components/lib/solid' -export { Navigator } from '@tarojs/components/lib/solid' -export { NestedScrollBody } from '@tarojs/components/lib/solid' -export { NestedScrollHeader } from '@tarojs/components/lib/solid' -export { OfficialAccount } from '@tarojs/components/lib/solid' -export { OpenData } from '@tarojs/components/lib/solid' -export { OpenContainer } from '@tarojs/components/lib/solid' -export { PageContainer } from '@tarojs/components/lib/solid' -export { PageMeta } from '@tarojs/components/lib/solid' +export { InlinePaymentPanel } from '@tarojs/components-library-solid' +export { Input } from '@tarojs/components-library-solid' +export { KeyboardAccessory } from '@tarojs/components-library-solid' +export { Label } from '@tarojs/components-library-solid' +export { Lifestyle } from '@tarojs/components-library-solid' +export { Like } from '@tarojs/components-library-solid' +export { LivePlayer } from '@tarojs/components-library-solid' +export { LivePusher } from '@tarojs/components-library-solid' +export { ListBuilder } from '@tarojs/components-library-solid' +export { ListView } from '@tarojs/components-library-solid' +export { Login } from '@tarojs/components-library-solid' +export { Lottie } from '@tarojs/components-library-solid' +export { Map } from '@tarojs/components-library-solid' +export { MatchMedia } from '@tarojs/components-library-solid' +export { MovableArea, MovableView } from '@tarojs/components-library-solid' +export { NavigationBar } from '@tarojs/components-library-solid' +export { Navigator } from '@tarojs/components-library-solid' +export { NestedScrollBody } from '@tarojs/components-library-solid' +export { NestedScrollHeader } from '@tarojs/components-library-solid' +export { OfficialAccount } from '@tarojs/components-library-solid' +export { OpenData } from '@tarojs/components-library-solid' +export { OpenContainer } from '@tarojs/components-library-solid' +export { PageContainer } from '@tarojs/components-library-solid' +export { PageMeta } from '@tarojs/components-library-solid' export { default as Picker } from './components/picker' -export { PickerView, PickerViewColumn } from '@tarojs/components/lib/solid' -export { Progress } from '@tarojs/components/lib/solid' +export { PickerView, PickerViewColumn } from '@tarojs/components-library-solid' +export { Progress } from '@tarojs/components-library-solid' // export { default as PullDownRefresh } from './components/pull-down-refresh' -export { PullToRefresh } from '@tarojs/components/lib/solid' -export { Radio, RadioGroup } from '@tarojs/components/lib/solid' -export { RichText } from '@tarojs/components/lib/solid' -export { RootPortal } from '@tarojs/components/lib/solid' -export { RtcRoom, RtcRoomItem } from '@tarojs/components/lib/solid' -export { Script } from '@tarojs/components/lib/solid' +export { PullToRefresh } from '@tarojs/components-library-solid' +export { Radio, RadioGroup } from '@tarojs/components-library-solid' +export { RichText } from '@tarojs/components-library-solid' +export { RootPortal } from '@tarojs/components-library-solid' +export { RtcRoom, RtcRoomItem } from '@tarojs/components-library-solid' +export { Script } from '@tarojs/components-library-solid' export { default as ScrollView } from './components/scroll-view' -export { ShareElement } from '@tarojs/components/lib/solid' -export { Slider } from '@tarojs/components/lib/solid' -export { Snapshot } from '@tarojs/components/lib/solid' -export { Span } from '@tarojs/components/lib/solid' -export { NativeSlot, Slot } from '@tarojs/components/lib/solid' -export { Swiper, SwiperItem } from '@tarojs/components/lib/solid' -export { Switch } from '@tarojs/components/lib/solid' -export { Tabs } from '@tarojs/components/lib/solid' +export { ShareElement } from '@tarojs/components-library-solid' +export { Slider } from '@tarojs/components-library-solid' +export { Snapshot } from '@tarojs/components-library-solid' +export { Span } from '@tarojs/components-library-solid' +export { NativeSlot, Slot } from '@tarojs/components-library-solid' +export { Swiper, SwiperItem } from '@tarojs/components-library-solid' +export { Switch } from '@tarojs/components-library-solid' +export { Tabs } from '@tarojs/components-library-solid' export { default as Text } from './components/text' -export { Textarea } from '@tarojs/components/lib/solid' -export { Video } from '@tarojs/components/lib/solid' +export { Textarea } from '@tarojs/components-library-solid' +export { Video } from '@tarojs/components-library-solid' export { default as View } from './components/view' -export { VoipRoom } from '@tarojs/components/lib/solid' -export { WebView } from '@tarojs/components/lib/solid' +export { VoipRoom } from '@tarojs/components-library-solid' +export { WebView } from '@tarojs/components-library-solid' diff --git a/packages/taro-components-react/types/global.d.ts b/packages/taro-components-react/types/global.d.ts index 32807413f3ac..eb67df7d4385 100644 --- a/packages/taro-components-react/types/global.d.ts +++ b/packages/taro-components-react/types/global.d.ts @@ -4,10 +4,10 @@ declare namespace JSX { } } -declare module '@tarojs/components/lib/solid' { +declare module '@tarojs/components-library-solid' { export * from '@tarojs/components' } -declare module '@tarojs/components/lib/react' { +declare module '@tarojs/components-library-react' { export * from '@tarojs/components' } diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json index 906b667bf07c..156b496db74b 100644 --- a/packages/taro-components/package.json +++ b/packages/taro-components/package.json @@ -13,7 +13,6 @@ ], "files": [ "dist", - "lib", "loader", "mini", "types", @@ -23,19 +22,11 @@ "collection": "dist/collection/collection-manifest.json", "collection:main": "dist/collection/index.js", "scripts": { - "prod": "pnpm run build:ci", + "prod": "pnpm run build", "prepare": "run-p generate:*", "prebuild": "run-p generate:*", - "prebuild:ci": "run-p generate:*", - "build:ci": "cross-env NODE_ENV=production run-s build:components", - "build": "cross-env NODE_ENV=production run-s build:components build:library", - "build:components": "stencil build", - "build:library": "pnpm --filter @tarojs/components-library-react --filter @tarojs/components-library-vue3 --filter @tarojs/components-library-solid run build", - "dev:components": "cross-env NODE_ENV=development pnpm run build:components --watch", - "dev:library-react": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-react run dev", - "dev:library-vue3": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-vue3 run dev", - "dev:library-solid": "cross-env NODE_ENV=development pnpm --filter @tarojs/components-library-solid run dev", - "generate:lib": "mkdirp lib", + "build": "cross-env NODE_ENV=production stencil build", + "dev:components": "cross-env NODE_ENV=development stencil build --watch", "generate:stencil-config": "esbuild ./scripts/stencil/stencil.config.ts --external:lightningcss --bundle --platform=node --outfile=stencil.config.js", "sync:types": "pnpm run tsx --files scripts/json-schema-to-types.ts", "pretest:ci": "node ./node_modules/puppeteer/install.js", diff --git a/packages/taro-components/scripts/stencil/stencil.config.ts b/packages/taro-components/scripts/stencil/stencil.config.ts index 3208e0b8eaf4..89d80e40ee04 100644 --- a/packages/taro-components/scripts/stencil/stencil.config.ts +++ b/packages/taro-components/scripts/stencil/stencil.config.ts @@ -12,7 +12,7 @@ const outputTargets: OutputTarget[] = [ componentCorePackage: '@tarojs/components', customElementsDir: 'dist/components', includeImportCustomElements: true, - proxiesFile: '../taro-components-library-react/src/components.ts', + proxiesFile: 'dist/lib/react/components.ts', }), vue3OutputTarget({ componentCorePackage: '@tarojs/components', @@ -31,13 +31,13 @@ const outputTargets: OutputTarget[] = [ }], customElementsDir: 'dist/components', includeImportCustomElements: true, - proxiesFile: '../taro-components-library-vue3/src/components.ts', + proxiesFile: 'dist/lib/vue3/components.ts', }), solidOutputTarget({ componentCorePackage: '@tarojs/components', customElementsDir: 'dist/components', includeImportCustomElements: true, - proxiesFile: '../taro-components-library-solid/src/components.ts', + proxiesFile: 'dist/lib/solid/components.ts', }), { type: 'dist', @@ -89,8 +89,8 @@ export const config: Config = { { components: ['taro-video-core', 'taro-video-control', 'taro-video-danmu'] } ], /** - * Note: Taro内部有很多地方都直接引用了dist/components，最终的编译产物中有很多super()，导致低版安装白屏 - * 为彻底解决此包导致的白屏问题，故暂不在包构建是转为es5，而是将此包加入到项目的babel编译中 + * Note: Taro 内部有很多地方都直接引用了 dist/components，最终的编译产物中有很多 super()，导致低版安装白屏 + * 为彻底解决此包导致的白屏问题，故暂不在包构建是转为 es5，而是将此包加入到项目的 babel 编译中 */ // buildEs5: 'prod', /** diff --git a/packages/taro-platform-h5/package.json b/packages/taro-platform-h5/package.json index c9db3491be49..e44771df87d0 100644 --- a/packages/taro-platform-h5/package.json +++ b/packages/taro-platform-h5/package.json @@ -42,6 +42,9 @@ "@babel/core": "^7.14.5", "@tarojs/components": "workspace:*", "@tarojs/components-react": "workspace:*", + "@tarojs/components-library-react": "workspace:*", + "@tarojs/components-library-solid": "workspace:*", + "@tarojs/components-library-vue3": "workspace:*", "@tarojs/runtime": "workspace:*", "@tarojs/service": "workspace:*", "@tarojs/shared": "workspace:*", diff --git a/packages/taro-platform-h5/src/program.ts b/packages/taro-platform-h5/src/program.ts index 27ca2dcb3778..d868f6cf5ca5 100644 --- a/packages/taro-platform-h5/src/program.ts +++ b/packages/taro-platform-h5/src/program.ts @@ -1,5 +1,3 @@ -import path from 'node:path' - import { transformAsync } from '@babel/core' import { defaultMainFields, SCRIPT_EXT } from '@tarojs/helper' import { TaroPlatformWeb } from '@tarojs/service' @@ -56,14 +54,22 @@ export default class H5 extends TaroPlatformWeb { } return require.resolve('./runtime/components') } else if (this.useDeprecatedAdapterComponent) { - return require.resolve(`@tarojs/components/lib/${this.aliasFramework}/component-lib`) + return require.resolve(`@tarojs/components-library-${this.aliasFramework}/component-lib`) } else { - return require.resolve(`@tarojs/components/lib/${this.aliasFramework}`) + return require.resolve(`@tarojs/components-library-${this.aliasFramework}`) } } - get componentAdapter() { - return path.join(path.dirname(require.resolve('@tarojs/components')), '..', 'lib') + get componentAdapterReact () { + return require.resolve(`@tarojs/components-library-react`) + } + + get componentAdapterSolid () { + return require.resolve(`@tarojs/components-library-solid`) + } + + get componentAdapterVue3 () { + return require.resolve(`@tarojs/components-library-vue3`) } get routerLibrary() { @@ -114,7 +120,9 @@ export default class H5 extends TaroPlatformWeb { const alias = chain.resolve.alias // TODO 考虑集成到 taroComponentsPath 中，与小程序端对齐 alias.set('@tarojs/components$', this.componentLibrary) - alias.set('@tarojs/components/lib', this.componentAdapter) + alias.set('@tarojs/components-library-react$', this.componentAdapterReact) + alias.set('@tarojs/components-library-solid$', this.componentAdapterSolid) + alias.set('@tarojs/components-library-vue3$', this.componentAdapterVue3) alias.set('@tarojs/router$', this.routerLibrary) alias.set('@tarojs/taro', this.apiLibrary) chain.plugin('mainPlugin').tap((args) => { @@ -136,7 +144,7 @@ export default class H5 extends TaroPlatformWeb { switch (this.framework) { case 'vue3': - args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components/lib/vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` args[0].loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: @@ -171,7 +179,7 @@ export default class H5 extends TaroPlatformWeb { resolve: { alias: [ { find: /@tarojs\/components$/, replacement: that.componentLibrary }, - { find: '@tarojs/components/lib', replacement: that.componentAdapter }, + { find: '@tarojs/components-library-', replacement: that.componentAdapterReact }, { find: /@tarojs\/router$/, replacement: that.routerLibrary }, { find: '@tarojs/taro', replacement: that.apiLibrary }, ], @@ -203,7 +211,7 @@ export default class H5 extends TaroPlatformWeb { switch (that.framework) { case 'vue3': - viteCompilerContext.loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components/lib/vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + viteCompilerContext.loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` viteCompilerContext.loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: diff --git a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json index 6de056a13852..afe47d86ff42 100644 --- a/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json +++ b/packages/taro-platform-harmony-hybrid/build/config/harmony-definition.json @@ -2172,7 +2172,9 @@ } }, "cover-view": { - "scroll-top": false + "scroll-top": false, + "marker-id": false, + "slot": false }, "custom-wrapper": true, "double-tap-gesture-handler": { diff --git a/packages/taro-platform-harmony-hybrid/package.json b/packages/taro-platform-harmony-hybrid/package.json index 4be68965d6c7..480cdf9419a9 100644 --- a/packages/taro-platform-harmony-hybrid/package.json +++ b/packages/taro-platform-harmony-hybrid/package.json @@ -40,6 +40,9 @@ "@tarojs/api": "workspace:*", "@tarojs/components": "workspace:*", "@tarojs/components-react": "workspace:*", + "@tarojs/components-library-react": "workspace:*", + "@tarojs/components-library-solid": "workspace:*", + "@tarojs/components-library-vue3": "workspace:*", "@tarojs/helper": "workspace:*", "@tarojs/plugin-platform-h5": "workspace:*", "@tarojs/router": "workspace:*", diff --git a/packages/taro-platform-harmony-hybrid/src/components/react/index.ts b/packages/taro-platform-harmony-hybrid/src/components/react/index.ts index 9cccfd478a02..a6b77ade91d3 100644 --- a/packages/taro-platform-harmony-hybrid/src/components/react/index.ts +++ b/packages/taro-platform-harmony-hybrid/src/components/react/index.ts @@ -1,68 +1,67 @@ -/* eslint-disable simple-import-sort/exports */ -export { Ad } from '@tarojs/components/lib/react' -export { AdCustom } from '@tarojs/components/lib/react' -export { AnimationVideo } from '@tarojs/components/lib/react' -export { AnimationView } from '@tarojs/components/lib/react' -export { ArCamera } from '@tarojs/components/lib/react' -export { Audio } from '@tarojs/components/lib/react' -export { AwemeData } from '@tarojs/components/lib/react' -export { Block } from '@tarojs/components/lib/react' -export { Button } from '@tarojs/components/lib/react' -export { Camera } from '@tarojs/components/lib/react' -export { Canvas } from '@tarojs/components/lib/react' -export { ChannelLive } from '@tarojs/components/lib/react' -export { ChannelVideo } from '@tarojs/components/lib/react' -export { Checkbox, CheckboxGroup } from '@tarojs/components/lib/react' -export { CommentDetail, CommentList } from '@tarojs/components/lib/react' -export { ContactButton } from '@tarojs/components/lib/react' -export { CoverImage } from '@tarojs/components/lib/react' -export { CoverView } from '@tarojs/components/lib/react' -export { CustomWrapper } from '@tarojs/components/lib/react' -export { Editor } from '@tarojs/components/lib/react' -export { FollowSwan } from '@tarojs/components/lib/react' -export { Form } from '@tarojs/components/lib/react' -export { FunctionalPageNavigator } from '@tarojs/components/lib/react' -export { Icon } from '@tarojs/components/lib/react' -export { Image } from '@tarojs/components/lib/react' -export { InlinePaymentPanel } from '@tarojs/components/lib/react' -export { Input } from '@tarojs/components/lib/react' -export { KeyboardAccessory } from '@tarojs/components/lib/react' -export { Label } from '@tarojs/components/lib/react' +export { Ad } from '@tarojs/components-library-react' +export { AdCustom } from '@tarojs/components-library-react' +export { AnimationVideo } from '@tarojs/components-library-react' +export { AnimationView } from '@tarojs/components-library-react' +export { ArCamera } from '@tarojs/components-library-react' +export { Audio } from '@tarojs/components-library-react' +export { AwemeData } from '@tarojs/components-library-react' +export { Block } from '@tarojs/components-library-react' +export { Button } from '@tarojs/components-library-react' +export { Camera } from '@tarojs/components-library-react' +export { Canvas } from '@tarojs/components-library-react' +export { ChannelLive } from '@tarojs/components-library-react' +export { ChannelVideo } from '@tarojs/components-library-react' +export { Checkbox, CheckboxGroup } from '@tarojs/components-library-react' +export { CommentDetail, CommentList } from '@tarojs/components-library-react' +export { ContactButton } from '@tarojs/components-library-react' +export { CoverImage } from '@tarojs/components-library-react' +export { CoverView } from '@tarojs/components-library-react' +export { CustomWrapper } from '@tarojs/components-library-react' +export { Editor } from '@tarojs/components-library-react' +export { FollowSwan } from '@tarojs/components-library-react' +export { Form } from '@tarojs/components-library-react' +export { FunctionalPageNavigator } from '@tarojs/components-library-react' +export { Icon } from '@tarojs/components-library-react' +export { Image } from '@tarojs/components-library-react' +export { InlinePaymentPanel } from '@tarojs/components-library-react' +export { Input } from '@tarojs/components-library-react' +export { KeyboardAccessory } from '@tarojs/components-library-react' +export { Label } from '@tarojs/components-library-react' // export { Label } from './components/label/label' -export { Lifestyle } from '@tarojs/components/lib/react' -export { Like } from '@tarojs/components/lib/react' -export { LivePlayer } from '@tarojs/components/lib/react' -export { LivePusher } from '@tarojs/components/lib/react' -export { Login } from '@tarojs/components/lib/react' -export { Lottie } from '@tarojs/components/lib/react' export { default as HosMap } from '../components-react/Map/Map' -export { Map } from '@tarojs/components/lib/react' -export { MovableArea, MovableView } from '@tarojs/components/lib/react' -export { NavigationBar } from '@tarojs/components/lib/react' -export { Navigator } from '@tarojs/components/lib/react' -export { OfficialAccount } from '@tarojs/components/lib/react' -export { OpenData } from '@tarojs/components/lib/react' -export { PageMeta } from '@tarojs/components/lib/react' -export { Picker } from '@tarojs/components/lib/react' -export { PickerView, PickerViewColumn } from '@tarojs/components/lib/react' -export { Progress } from '@tarojs/components/lib/react' -export { PullToRefresh } from '@tarojs/components/lib/react' -export { Radio, RadioGroup } from '@tarojs/components/lib/react' -export { RichText } from '@tarojs/components/lib/react' -export { RtcRoom, RtcRoomItem } from '@tarojs/components/lib/react' -export { ScrollView } from '@tarojs/components/lib/react' -export { ShareElement } from '@tarojs/components/lib/react' -export { Slider } from '@tarojs/components/lib/react' -export { NativeSlot, Slot } from '@tarojs/components/lib/react' -export { Swiper, SwiperItem } from '@tarojs/components/lib/react' -export { Switch } from '@tarojs/components/lib/react' -export { Tabs } from '@tarojs/components/lib/react' -export { Text } from '@tarojs/components/lib/react' -export { Textarea } from '@tarojs/components/lib/react' -export { Video } from '@tarojs/components/lib/react' -export { View } from '@tarojs/components/lib/react' -export { VoipRoom } from '@tarojs/components/lib/react' -export { WebView } from '@tarojs/components/lib/react' +export { Lifestyle } from '@tarojs/components-library-react' +export { Like } from '@tarojs/components-library-react' +export { LivePlayer } from '@tarojs/components-library-react' +export { LivePusher } from '@tarojs/components-library-react' +export { Login } from '@tarojs/components-library-react' +export { Lottie } from '@tarojs/components-library-react' +export { Map } from '@tarojs/components-library-react' +export { MovableArea, MovableView } from '@tarojs/components-library-react' +export { NavigationBar } from '@tarojs/components-library-react' +export { Navigator } from '@tarojs/components-library-react' +export { OfficialAccount } from '@tarojs/components-library-react' +export { OpenData } from '@tarojs/components-library-react' +export { PageMeta } from '@tarojs/components-library-react' +export { Picker } from '@tarojs/components-library-react' +export { PickerView, PickerViewColumn } from '@tarojs/components-library-react' +export { Progress } from '@tarojs/components-library-react' +export { PullToRefresh } from '@tarojs/components-library-react' +export { Radio, RadioGroup } from '@tarojs/components-library-react' +export { RichText } from '@tarojs/components-library-react' +export { RtcRoom, RtcRoomItem } from '@tarojs/components-library-react' +export { ScrollView } from '@tarojs/components-library-react' +export { ShareElement } from '@tarojs/components-library-react' +export { Slider } from '@tarojs/components-library-react' +export { NativeSlot, Slot } from '@tarojs/components-library-react' +export { Swiper, SwiperItem } from '@tarojs/components-library-react' +export { Switch } from '@tarojs/components-library-react' +export { Tabs } from '@tarojs/components-library-react' +export { Text } from '@tarojs/components-library-react' +export { Textarea } from '@tarojs/components-library-react' +export { Video } from '@tarojs/components-library-react' +export { View } from '@tarojs/components-library-react' +export { VoipRoom } from '@tarojs/components-library-react' +export { WebView } from '@tarojs/components-library-react' // export * from './components/block/block' // export * from './components/grid/grid' // export * from './components/root-portal/root-portal' @@ -73,11 +72,11 @@ export { WebView } from '@tarojs/components/lib/react' // export { MatchMedia } from './components/match-media/match-media' // export { default as PageContainer } from './components/page-container/page-container' export { - StickyHeader, - StickySection, - RootPortal, GridView, ListView, MatchMedia, PageContainer, -} from '@tarojs/components/lib/react' + RootPortal, + StickyHeader, + StickySection, +} from '@tarojs/components-library-react' diff --git a/packages/taro-platform-harmony-hybrid/src/components/vue3/index.ts b/packages/taro-platform-harmony-hybrid/src/components/vue3/index.ts index 2c59f0f9b404..5940044bd676 100644 --- a/packages/taro-platform-harmony-hybrid/src/components/vue3/index.ts +++ b/packages/taro-platform-harmony-hybrid/src/components/vue3/index.ts @@ -1,68 +1,67 @@ -/* eslint-disable simple-import-sort/exports */ -export { Ad } from '@tarojs/components/lib/vue3' -export { AdCustom } from '@tarojs/components/lib/vue3' -export { AnimationVideo } from '@tarojs/components/lib/vue3' -export { AnimationView } from '@tarojs/components/lib/vue3' -export { ArCamera } from '@tarojs/components/lib/vue3' -export { Audio } from '@tarojs/components/lib/vue3' -export { AwemeData } from '@tarojs/components/lib/vue3' -export { Block } from '@tarojs/components/lib/vue3' -export { Button } from '@tarojs/components/lib/vue3' -export { Camera } from '@tarojs/components/lib/vue3' -export { Canvas } from '@tarojs/components/lib/vue3' -export { ChannelLive } from '@tarojs/components/lib/vue3' -export { ChannelVideo } from '@tarojs/components/lib/vue3' -export { Checkbox, CheckboxGroup } from '@tarojs/components/lib/vue3' -export { CommentDetail, CommentList } from '@tarojs/components/lib/vue3' -export { ContactButton } from '@tarojs/components/lib/vue3' -export { CoverImage } from '@tarojs/components/lib/vue3' -export { CoverView } from '@tarojs/components/lib/vue3' -export { CustomWrapper } from '@tarojs/components/lib/vue3' -export { Editor } from '@tarojs/components/lib/vue3' -export { FollowSwan } from '@tarojs/components/lib/vue3' -export { Form } from '@tarojs/components/lib/vue3' -export { FunctionalPageNavigator } from '@tarojs/components/lib/vue3' -export { Icon } from '@tarojs/components/lib/vue3' -export { Image } from '@tarojs/components/lib/vue3' -export { InlinePaymentPanel } from '@tarojs/components/lib/vue3' -export { Input } from '@tarojs/components/lib/vue3' -export { KeyboardAccessory } from '@tarojs/components/lib/vue3' -export { Label } from '@tarojs/components/lib/vue3' +export { Ad } from '@tarojs/components-library-vue3' +export { AdCustom } from '@tarojs/components-library-vue3' +export { AnimationVideo } from '@tarojs/components-library-vue3' +export { AnimationView } from '@tarojs/components-library-vue3' +export { ArCamera } from '@tarojs/components-library-vue3' +export { Audio } from '@tarojs/components-library-vue3' +export { AwemeData } from '@tarojs/components-library-vue3' +export { Block } from '@tarojs/components-library-vue3' +export { Button } from '@tarojs/components-library-vue3' +export { Camera } from '@tarojs/components-library-vue3' +export { Canvas } from '@tarojs/components-library-vue3' +export { ChannelLive } from '@tarojs/components-library-vue3' +export { ChannelVideo } from '@tarojs/components-library-vue3' +export { Checkbox, CheckboxGroup } from '@tarojs/components-library-vue3' +export { CommentDetail, CommentList } from '@tarojs/components-library-vue3' +export { ContactButton } from '@tarojs/components-library-vue3' +export { CoverImage } from '@tarojs/components-library-vue3' +export { CoverView } from '@tarojs/components-library-vue3' +export { CustomWrapper } from '@tarojs/components-library-vue3' +export { Editor } from '@tarojs/components-library-vue3' +export { FollowSwan } from '@tarojs/components-library-vue3' +export { Form } from '@tarojs/components-library-vue3' +export { FunctionalPageNavigator } from '@tarojs/components-library-vue3' +export { Icon } from '@tarojs/components-library-vue3' +export { Image } from '@tarojs/components-library-vue3' +export { InlinePaymentPanel } from '@tarojs/components-library-vue3' +export { Input } from '@tarojs/components-library-vue3' +export { KeyboardAccessory } from '@tarojs/components-library-vue3' +export { Label } from '@tarojs/components-library-vue3' // export { Label } from './components/label/label' -export { Lifestyle } from '@tarojs/components/lib/vue3' -export { Like } from '@tarojs/components/lib/vue3' -export { LivePlayer } from '@tarojs/components/lib/vue3' -export { LivePusher } from '@tarojs/components/lib/vue3' -export { Login } from '@tarojs/components/lib/vue3' -export { Lottie } from '@tarojs/components/lib/vue3' -export { Map } from '@tarojs/components/lib/vue3' -export { MovableArea, MovableView } from '@tarojs/components/lib/vue3' -export { NavigationBar } from '@tarojs/components/lib/vue3' -export { Navigator } from '@tarojs/components/lib/vue3' -export { OfficialAccount } from '@tarojs/components/lib/vue3' -export { OpenData } from '@tarojs/components/lib/vue3' -export { PageMeta } from '@tarojs/components/lib/vue3' -export { Picker } from '@tarojs/components/lib/vue3' -export { PickerView, PickerViewColumn } from '@tarojs/components/lib/vue3' -export { Progress } from '@tarojs/components/lib/vue3' -export { PullToRefresh } from '@tarojs/components/lib/vue3' -export { Radio, RadioGroup } from '@tarojs/components/lib/vue3' -export { RichText } from '@tarojs/components/lib/vue3' -export { RtcRoom, RtcRoomItem } from '@tarojs/components/lib/vue3' -export { ScrollView } from '@tarojs/components/lib/vue3' -export { ShareElement } from '@tarojs/components/lib/vue3' -export { Slider } from '@tarojs/components/lib/vue3' -export { NativeSlot, Slot } from '@tarojs/components/lib/vue3' -export { Swiper, SwiperItem } from '@tarojs/components/lib/vue3' -export { Switch } from '@tarojs/components/lib/vue3' -// export { Tabbar, TabItem } from '@tarojs/components/lib/vue3' -export { Tabs } from '@tarojs/components/lib/vue3' -export { Text } from '@tarojs/components/lib/vue3' -export { Textarea } from '@tarojs/components/lib/vue3' -export { Video } from '@tarojs/components/lib/vue3' -export { View } from '@tarojs/components/lib/vue3' -export { VoipRoom } from '@tarojs/components/lib/vue3' -export { WebView } from '@tarojs/components/lib/vue3' +export { Lifestyle } from '@tarojs/components-library-vue3' +export { Like } from '@tarojs/components-library-vue3' +export { LivePlayer } from '@tarojs/components-library-vue3' +export { LivePusher } from '@tarojs/components-library-vue3' +export { Login } from '@tarojs/components-library-vue3' +export { Lottie } from '@tarojs/components-library-vue3' +export { Map } from '@tarojs/components-library-vue3' +export { MovableArea, MovableView } from '@tarojs/components-library-vue3' +export { NavigationBar } from '@tarojs/components-library-vue3' +export { Navigator } from '@tarojs/components-library-vue3' +export { OfficialAccount } from '@tarojs/components-library-vue3' +export { OpenData } from '@tarojs/components-library-vue3' +export { PageMeta } from '@tarojs/components-library-vue3' +export { Picker } from '@tarojs/components-library-vue3' +export { PickerView, PickerViewColumn } from '@tarojs/components-library-vue3' +export { Progress } from '@tarojs/components-library-vue3' +export { PullToRefresh } from '@tarojs/components-library-vue3' +export { Radio, RadioGroup } from '@tarojs/components-library-vue3' +export { RichText } from '@tarojs/components-library-vue3' +export { RtcRoom, RtcRoomItem } from '@tarojs/components-library-vue3' +export { ScrollView } from '@tarojs/components-library-vue3' +export { ShareElement } from '@tarojs/components-library-vue3' +export { Slider } from '@tarojs/components-library-vue3' +export { NativeSlot, Slot } from '@tarojs/components-library-vue3' +export { Swiper, SwiperItem } from '@tarojs/components-library-vue3' +export { Switch } from '@tarojs/components-library-vue3' +// export { Tabbar, TabItem } from '@tarojs/components-library-vue3' +export { Tabs } from '@tarojs/components-library-vue3' +export { Text } from '@tarojs/components-library-vue3' +export { Textarea } from '@tarojs/components-library-vue3' +export { Video } from '@tarojs/components-library-vue3' +export { View } from '@tarojs/components-library-vue3' +export { VoipRoom } from '@tarojs/components-library-vue3' +export { WebView } from '@tarojs/components-library-vue3' // export * from './components/block/block' // export * from './components/grid/grid' // export * from './components/root-portal/root-portal' @@ -73,11 +72,11 @@ export { WebView } from '@tarojs/components/lib/vue3' // export { MatchMedia } from './components/match-media/match-media' // export { default as PageContainer } from './components/page-container/page-container' export { - StickyHeader, - StickySection, - RootPortal, GridView, ListView, MatchMedia, PageContainer, -} from '@tarojs/components/lib/vue3' + RootPortal, + StickyHeader, + StickySection, +} from '@tarojs/components-library-vue3' diff --git a/packages/taro-platform-harmony-hybrid/src/program.ts b/packages/taro-platform-harmony-hybrid/src/program.ts index a6f4cc02e6b9..1cce8ed0d9f4 100644 --- a/packages/taro-platform-harmony-hybrid/src/program.ts +++ b/packages/taro-platform-harmony-hybrid/src/program.ts @@ -1,5 +1,3 @@ -import path from 'node:path' - import { TaroPlatformWeb } from '@tarojs/service' import { resolveSync } from './resolve' @@ -48,14 +46,22 @@ export default class H5 extends TaroPlatformWeb { if (this.useHtmlComponents && this.aliasFramework === 'react') { return require.resolve('./runtime/components') } else if (this.useDeprecatedAdapterComponent) { - return require.resolve(`@tarojs/components/lib/${this.aliasFramework}/component-lib`) + return require.resolve(`@tarojs/components-library-${this.aliasFramework}/component-lib`) } else { return require.resolve(`@tarojs/plugin-platform-harmony-hybrid/dist/components/${this.aliasFramework}`) } } - get componentAdapter () { - return path.join(path.dirname(require.resolve('@tarojs/components')), '..', 'lib') + get componentAdapterReact () { + return require.resolve(`@tarojs/components-library-react`) + } + + get componentAdapterSolid () { + return require.resolve(`@tarojs/components-library-solid`) + } + + get componentAdapterVue3 () { + return require.resolve(`@tarojs/components-library-vue3`) } get routerLibrary () { @@ -94,7 +100,9 @@ export default class H5 extends TaroPlatformWeb { const alias = chain.resolve.alias // TODO 考虑集成到 taroComponentsPath 中，与小程序端对齐 alias.set('@tarojs/components$', this.componentLibrary) - alias.set('@tarojs/components/lib', this.componentAdapter) + alias.set('@tarojs/components-library-react$', this.componentAdapterReact) + alias.set('@tarojs/components-library-solid$', this.componentAdapterSolid) + alias.set('@tarojs/components-library-vue3$', this.componentAdapterVue3) alias.set('@tarojs/router$', this.routerLibrary) alias.set('@tarojs/taro', this.apiLibrary) chain.plugin('mainPlugin').tap((args) => { @@ -116,7 +124,7 @@ export default class H5 extends TaroPlatformWeb { switch (this.framework) { case 'vue3': - args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components/lib/vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` args[0].loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: @@ -130,7 +138,7 @@ export default class H5 extends TaroPlatformWeb { return args }) - // 修改htmlWebpackPlugin插件的script脚本 + // 修改 htmlWebpackPlugin 插件的 script 脚本 chain.plugin('htmlWebpackPlugin').tap((args) => { const options = this.config?.postcss?.pxtransform?.config || {} // const max = options?.maxRootSize ?? 40 @@ -144,8 +152,8 @@ export default class H5 extends TaroPlatformWeb { if ((this.config?.targetUnit ?? 'rem') === 'rem') { /** * 缩放策略为： - * 1. 手机-竖屏，缩放策略为“自动缩放” - * 2. 折叠屏、Pad竖屏，缩放策略为“依据设计尺寸，大小不变” + * 1. 手机 - 竖屏，缩放策略为“自动缩放” + * 2. 折叠屏、Pad 竖屏，缩放策略为“依据设计尺寸，大小不变” * 3. Pad(模屏)、2in1(默认)，缩放策略为“依据设计尺寸，大小不变” * 4. 2in1（全屏），缩放策略为“依据设计尺寸，大小不变” */ @@ -155,7 +163,7 @@ export default class H5 extends TaroPlatformWeb { return args }) - // 修改h5平台的rule的正则表达式 + // 修改 h5 平台的 rule 的正则表达式 chain.module .rule('process-import-taro-h5') .test(/(plugin|taro)-platform-harmony-hybrid[\\/]dist[\\/]api[\\/]apis[\\/]taro/) diff --git a/packages/taro-platform-harmony-hybrid/types/component.d.ts b/packages/taro-platform-harmony-hybrid/types/component.d.ts index 08adf62ca2f7..ec27f945986c 100644 --- a/packages/taro-platform-harmony-hybrid/types/component.d.ts +++ b/packages/taro-platform-harmony-hybrid/types/component.d.ts @@ -5,10 +5,10 @@ declare module '@tarojs/components/dist/components' { export * from '@tarojs/components/dist/components' } -declare module '@tarojs/components/lib/vue3' { +declare module '@tarojs/components-library-vue3' { export * from '@tarojs/components' } -declare module '@tarojs/components/lib/react' { +declare module '@tarojs/components-library-react' { export * from '@tarojs/components' } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b775b8e6d94e..e08ec49834a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -925,6 +925,12 @@ importers: '@tarojs/components': specifier: workspace:* version: link:../taro-components + '@tarojs/components-library-react': + specifier: workspace:* + version: link:../taro-components-library-react + '@tarojs/components-library-solid': + specifier: workspace:* + version: link:../taro-components-library-solid '@tarojs/shared': specifier: workspace:* version: link:../shared @@ -979,7 +985,7 @@ importers: version: 1.9.5(@babel/core@7.26.10) jest: specifier: ^29.7.0 - version: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) + version: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) jest-environment-jsdom: specifier: ^29.7.0 version: 29.7.0 @@ -988,7 +994,7 @@ importers: version: 1.9.5 ts-jest: specifier: ^29.1.1 - version: 29.3.1(@babel/core@7.26.10)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(typescript@5.4.5) + version: 29.3.1(@babel/core@7.26.10)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(typescript@5.4.5) packages/taro-components-rn: dependencies: @@ -1028,7 +1034,7 @@ importers: version: 5.4.3(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) '@testing-library/react-native': specifier: ^12.4.1 - version: 12.9.0(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) + version: 12.9.0(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) cpy-cli: specifier: ^5.0.0 version: 5.0.0 @@ -1046,10 +1052,10 @@ importers: version: 14.1.3(expo@50.0.21(@babel/core@7.26.10)(@react-native/babel-preset@0.73.21(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10)))) expo-module-scripts: specifier: ^3.5.1 - version: 3.5.4(@babel/core@7.26.10)(@jest/types@29.6.3)(@types/eslint@8.56.12)(babel-jest@29.7.0(@babel/core@7.26.10))(eslint@8.57.1)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(prettier@2.8.8)(react-dom@18.3.1(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) + version: 3.5.4(@babel/core@7.26.10)(@jest/types@29.6.3)(@types/eslint@8.56.12)(babel-jest@29.7.0(@babel/core@7.26.10))(eslint@8.57.1)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(prettier@2.8.8)(react-dom@18.3.1(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) jest-expo: specifier: ~50.0.3 - version: 50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react@18.3.1) + version: 50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react@18.3.1) react-native: specifier: ^0.73.1 version: 0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1) @@ -1421,6 +1427,15 @@ importers: '@tarojs/components': specifier: workspace:* version: link:../taro-components + '@tarojs/components-library-react': + specifier: workspace:* + version: link:../taro-components-library-react + '@tarojs/components-library-solid': + specifier: workspace:* + version: link:../taro-components-library-solid + '@tarojs/components-library-vue3': + specifier: workspace:* + version: link:../taro-components-library-vue3 '@tarojs/components-react': specifier: workspace:* version: link:../taro-components-react @@ -1637,6 +1652,15 @@ importers: '@tarojs/components': specifier: workspace:* version: link:../taro-components + '@tarojs/components-library-react': + specifier: workspace:* + version: link:../taro-components-library-react + '@tarojs/components-library-solid': + specifier: workspace:* + version: link:../taro-components-library-solid + '@tarojs/components-library-vue3': + specifier: workspace:* + version: link:../taro-components-library-vue3 '@tarojs/components-react': specifier: workspace:* version: link:../taro-components-react @@ -2031,7 +2055,7 @@ importers: version: 5.4.3(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) '@testing-library/react-native': specifier: ^12.4.1 - version: 12.9.0(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) + version: 12.9.0(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1) cpy-cli: specifier: ^5.0.0 version: 5.0.0 @@ -2070,7 +2094,7 @@ importers: version: 12.9.1(expo@50.0.21(@babel/core@7.26.10)(@react-native/babel-preset@0.73.21(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10)))) jest-expo: specifier: ~50.0.3 - version: 50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react@18.3.1) + version: 50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react@18.3.1) mock-socket: specifier: ^7.1.0 version: 7.1.0 @@ -5326,36 +5350,42 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm-musl@2.5.1': resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [musl] '@parcel/watcher-linux-arm64-glibc@2.5.1': resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.5.1': resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [musl] '@parcel/watcher-linux-x64-glibc@2.5.1': resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-x64-musl@2.5.1': resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [musl] '@parcel/watcher-win32-arm64@2.5.1': resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==} @@ -5804,56 +5834,67 @@ packages: resolution: {integrity: sha512-mz5POx5Zu58f2xAG5RaRRhp3IZDK7zXGk5sdEDj4o96HeaXhlUwmLFzNlc4hCQi5sGdR12VDgEUqVSHer0lI9g==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.39.0': resolution: {integrity: sha512-+YDwhM6gUAyakl0CD+bMFpdmwIoRDzZYaTWV3SDRBGkMU/VpIBYXXEvkEcTagw/7VVkL2vA29zU4UVy1mP0/Yw==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.39.0': resolution: {integrity: sha512-EKf7iF7aK36eEChvlgxGnk7pdJfzfQbNvGV/+l98iiMwU23MwvmV0Ty3pJ0p5WQfm3JRHOytSIqD9LB7Bq7xdQ==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.39.0': resolution: {integrity: sha512-vYanR6MtqC7Z2SNr8gzVnzUul09Wi1kZqJaek3KcIlI/wq5Xtq4ZPIZ0Mr/st/sv/NnaPwy/D4yXg5x0B3aUUA==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loongarch64-gnu@4.39.0': resolution: {integrity: sha512-NMRUT40+h0FBa5fb+cpxtZoGAggRem16ocVKIv5gDB5uLDgBIwrIsXlGqYbLwW8YyO3WVTk1FkFDjMETYlDqiw==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-powerpc64le-gnu@4.39.0': resolution: {integrity: sha512-0pCNnmxgduJ3YRt+D+kJ6Ai/r+TaePu9ZLENl+ZDV/CdVczXl95CbIiwwswu4L+K7uOIGf6tMo2vm8uadRaICQ==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.39.0': resolution: {integrity: sha512-t7j5Zhr7S4bBtksT73bO6c3Qa2AV/HqiGlj9+KB3gNF5upcVkx+HLgxTm8DK4OkzsOYqbdqbLKwvGMhylJCPhQ==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.39.0': resolution: {integrity: sha512-m6cwI86IvQ7M93MQ2RF5SP8tUjD39Y7rjb1qjHgYh28uAPVU8+k/xYWvxRO3/tBN2pZkSMa5RjnPuUIbrwVxeA==} cpu: [riscv64] os: [linux] + libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.39.0': resolution: {integrity: sha512-iRDJd2ebMunnk2rsSBYlsptCyuINvxUfGwOUldjv5M4tpa93K8tFMeYGpNk2+Nxl+OBJnBzy2/JCscGeO507kA==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.39.0': resolution: {integrity: sha512-t9jqYw27R6Lx0XKfEFe5vUeEJ5pF3SGIM6gTfONSMb7DuG6z6wfj2yjcoZxHg129veTqU7+wOhY6GX8wmf90dA==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.39.0': resolution: {integrity: sha512-ThFdkrFDP55AIsIZDKSBWEt/JcWlCzydbZHinZ0F/r1h83qbGeenCt/G/wG2O0reuENDD2tawfAj2s8VK7Bugg==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-win32-arm64-msvc@4.39.0': resolution: {integrity: sha512-jDrLm6yUtbOg2TYB3sBF3acUnAwsIksEYjLeHL+TJv9jg+TmTwdyjnDex27jqEMakNKf3RwwPahDIt7QXCSqRQ==} @@ -6030,24 +6071,28 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [glibc] '@swc/core-linux-arm64-musl@1.3.96': resolution: {integrity: sha512-i5/UTUwmJLri7zhtF6SAo/4QDQJDH2fhYJaBIUhrICmIkRO/ltURmpejqxsM/ye9Jqv5zG7VszMC0v/GYn/7BQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [musl] '@swc/core-linux-x64-gnu@1.3.96': resolution: {integrity: sha512-USdaZu8lTIkm4Yf9cogct/j5eqtdZqTgcTib4I+NloUW0E/hySou3eSyp3V2UAA1qyuC72ld1otXuyKBna0YKQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [glibc] '@swc/core-linux-x64-musl@1.3.96': resolution: {integrity: sha512-QYErutd+G2SNaCinUVobfL7jWWjGTI0QEoQ6hqTp7PxCJS/dmKmj3C5ZkvxRYcq7XcZt7ovrYCTwPTHzt6lZBg==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [musl] '@swc/core-win32-arm64-msvc@1.3.96': resolution: {integrity: sha512-hjGvvAduA3Un2cZ9iNP4xvTXOO4jL3G9iakhFsgVhpkU73SGmK7+LN8ZVBEu4oq2SUcHO6caWvnZ881cxGuSpg==} @@ -6168,48 +6213,56 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@tarojs/parse-css-to-stylesheet-linux-arm64-gnu@1.1.12': resolution: {integrity: sha512-IiW5+sRfxsUlKygzxw/k0+ryEzPFB06jJI2xrlV8KDWJhTe108mmKl0jc0YtMbpcbaqSFimPGKKMNIMxRusndg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@tarojs/parse-css-to-stylesheet-linux-arm64-musl@0.0.69': resolution: {integrity: sha512-bYODGCEx1Ni4EMNuZU95IUPqVZAXsY9gIc5CPSfKQ2j167Vbeo/gskQk/uNVjmnYJ69PplgJ9npylINgLIPIrA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@tarojs/parse-css-to-stylesheet-linux-arm64-musl@1.1.12': resolution: {integrity: sha512-YOjlv8gtj17BS1CCamLWOjTjmOJETzDV4fZ19DWLFlmM971Ith3oBo8qzo9NM4dcHX1n6y/s3xcAo7GiLXKLTQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@tarojs/parse-css-to-stylesheet-linux-x64-gnu@0.0.69': resolution: {integrity: sha512-89f03s+txGJ1c8Zc6Ib4qTAP4YhfFbVFq29XExqbC7eGvpQl5DeOtwonO5DBwMc7lA+LG4b1Q4CMXE3qodn2eA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@tarojs/parse-css-to-stylesheet-linux-x64-gnu@1.1.12': resolution: {integrity: sha512-cgx4/iaJXhlXJmQ5cnlAIqL3wLbogwS1wbo336cdjxUokjQYD9X7IF1qhTkNzl0B9K1G2GyCWW8iQlDvlu64Rg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@tarojs/parse-css-to-stylesheet-linux-x64-musl@0.0.69': resolution: {integrity: sha512-vyewIf1KysXYNIJdkzc9JSPguTG9zD65Belk3H186mLR18KtsvrqNqlWnP8kKfduF4ixh6qt0F2PkKbeI9PZvg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@tarojs/parse-css-to-stylesheet-linux-x64-musl@1.1.12': resolution: {integrity: sha512-Z1TEx6XMMzE4cESfGGZlb1dakOOLkjPEXuB/XVQbOzZBLgsIZgCXx/mDcMQCTGxFw5gZieNhh4OcROcaESNwTg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@tarojs/parse-css-to-stylesheet-win32-x64-msvc@0.0.69': resolution: {integrity: sha512-CHKlVjAiSAZTFNV8GkfXV88Jy9yyFSvKBAO3++l2KSQUBUWmPX775FbH+god2BOLf5SfAXRPd0HVAEK9qNeHXQ==} @@ -6259,24 +6312,28 @@ packages: engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] '@tarojs/plugin-doctor-linux-arm64-musl@0.0.13': resolution: {integrity: sha512-V1HnFITOLgHVyQ+OCa1oPFKOtGFRtP91vlbUGfOwMA4GeOVw9g28W/hfTyucTCkfZWlrssLehgW6L2AGAMXh2w==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] '@tarojs/plugin-doctor-linux-x64-gnu@0.0.13': resolution: {integrity: sha512-oetfzBW60uenPBBF4/NE6Mf0Iwkw1YGqIIBiN++aVQynbWrmMzWBsW8kleZ5vN1npxI9aud9EfRU1uM37DrG2A==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] '@tarojs/plugin-doctor-linux-x64-musl@0.0.13': resolution: {integrity: sha512-OdIF/kFwwM0kQPDnpkanhvfWRaAI6EtDmpM9rQA/Lu2QcJq86w5d7X/WSN0U2xF1nialAUrfl79NyIaEzp4Fcw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] '@tarojs/plugin-doctor-win32-ia32-msvc@0.0.13': resolution: {integrity: sha512-nIbG2SliRhRwACLa1kNMskcfjsihp+3tZQMAxl+LoYUq6JRaWgP3vH2nHkDyZHTCheBTDtAaupqXWrYF3w+U6g==} @@ -11700,48 +11757,56 @@ packages: engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] lightningcss-linux-arm64-gnu@1.29.3: resolution: {integrity: sha512-Pqau7jtgJNmQ/esugfmAT1aCFy/Gxc92FOxI+3n+LbMHBheBnk41xHDhc0HeYlx9G0xP5tK4t0Koy3QGGNqypw==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] lightningcss-linux-arm64-musl@1.19.0: resolution: {integrity: sha512-vSCKO7SDnZaFN9zEloKSZM5/kC5gbzUjoJQ43BvUpyTFUX7ACs/mDfl2Eq6fdz2+uWhUh7vf92c4EaaP4udEtA==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [musl] lightningcss-linux-arm64-musl@1.29.3: resolution: {integrity: sha512-dxakOk66pf7KLS7VRYFO7B8WOJLecE5OPL2YOk52eriFd/yeyxt2Km5H0BjLfElokIaR+qWi33gB8MQLrdAY3A==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [musl] lightningcss-linux-x64-gnu@1.19.0: resolution: {integrity: sha512-0AFQKvVzXf9byrXUq9z0anMGLdZJS+XSDqidyijI5njIwj6MdbvX2UZK/c4FfNmeRa2N/8ngTffoIuOUit5eIQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [glibc] lightningcss-linux-x64-gnu@1.29.3: resolution: {integrity: sha512-ySZTNCpbfbK8rqpKJeJR2S0g/8UqqV3QnzcuWvpI60LWxnFN91nxpSSwCbzfOXkzKfar9j5eOuOplf+klKtINg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [glibc] lightningcss-linux-x64-musl@1.19.0: resolution: {integrity: sha512-SJoM8CLPt6ECCgSuWe+g0qo8dqQYVcPiW2s19dxkmSI5+Uu1GIRzyKA0b7QqmEXolA+oSJhQqCmJpzjY4CuZAg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [musl] lightningcss-linux-x64-musl@1.29.3: resolution: {integrity: sha512-3pVZhIzW09nzi10usAXfIGTTSTYQ141dk88vGFNCgawIzayiIzZQxEcxVtIkdvlEq2YuFsL9Wcj/h61JHHzuFQ==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [musl] lightningcss-win32-arm64-msvc@1.29.3: resolution: {integrity: sha512-VRnkAvtIkeWuoBJeGOTrZxsNp4HogXtcaaLm8agmbYtLDOhQdpgxW6NjZZjDXbvGF+eOehGulXZ3C1TiwHY4QQ==} @@ -20587,7 +20652,7 @@ snapshots: react-dom: 18.3.1(react@18.3.1) react-test-renderer: 18.3.1(react@18.3.1) - '@testing-library/react-native@12.9.0(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1)': + '@testing-library/react-native@12.9.0(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react-native@0.73.11(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: jest-matcher-utils: 29.7.0 pretty-format: 29.7.0 @@ -20596,7 +20661,7 @@ snapshots: react-test-renderer: 18.3.1(react@18.3.1) redent: 3.0.0 optionalDependencies: - jest: 29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) + jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) '@testing-library/react@14.3.1(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -23273,21 +23338,6 @@ snapshots: - supports-color - ts-node - create-jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)): - dependencies: - '@jest/types': 29.6.3 - chalk: 4.1.2 - exit: 0.1.2 - graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - jest-util: 29.7.0 - prompts: 2.4.2 - transitivePeerDependencies: - - '@types/node' - - babel-plugin-macros - - supports-color - - ts-node - create-jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)): dependencies: '@jest/types': 29.6.3 @@ -24932,7 +24982,7 @@ snapshots: dependencies: expo: 50.0.21(@babel/core@7.26.10)(@react-native/babel-preset@0.73.21(@babel/core@7.26.10)(@babel/preset-env@7.26.9(@babel/core@7.26.10))) - expo-module-scripts@3.5.4(@babel/core@7.26.10)(@jest/types@29.6.3)(@types/eslint@8.56.12)(babel-jest@29.7.0(@babel/core@7.26.10))(eslint@8.57.1)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(prettier@2.8.8)(react-dom@18.3.1(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1): + expo-module-scripts@3.5.4(@babel/core@7.26.10)(@jest/types@29.6.3)(@types/eslint@8.56.12)(babel-jest@29.7.0(@babel/core@7.26.10))(eslint@8.57.1)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(prettier@2.8.8)(react-dom@18.3.1(react@18.3.1))(react-test-renderer@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@babel/cli': 7.27.0(@babel/core@7.26.10) '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.10) @@ -24948,10 +24998,10 @@ snapshots: eslint-config-universe: 12.1.0(@types/eslint@8.56.12)(eslint@8.57.1)(prettier@2.8.8)(typescript@5.4.5) find-yarn-workspace-root: 2.0.0 glob: 7.2.3 - jest-expo: 51.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react@18.3.1) + jest-expo: 51.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react@18.3.1) jest-snapshot-prettier: prettier@2.8.8 - jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5))) - ts-jest: 29.0.5(@babel/core@7.26.10)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(typescript@5.4.5) + jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5))) + ts-jest: 29.0.5(@babel/core@7.26.10)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(typescript@5.4.5) typescript: 5.4.5 transitivePeerDependencies: - '@babel/core' @@ -26743,25 +26793,6 @@ snapshots: - supports-color - ts-node - jest-cli@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)): - dependencies: - '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - '@jest/test-result': 29.7.0 - '@jest/types': 29.6.3 - chalk: 4.1.2 - create-jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - exit: 0.1.2 - import-local: 3.2.0 - jest-config: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - jest-util: 29.7.0 - jest-validate: 29.7.0 - yargs: 17.7.2 - transitivePeerDependencies: - - '@types/node' - - babel-plugin-macros - - supports-color - - ts-node - jest-cli@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) @@ -26877,37 +26908,6 @@ snapshots: - babel-plugin-macros - supports-color - jest-config@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)): - dependencies: - '@babel/core': 7.26.10 - '@jest/test-sequencer': 29.7.0 - '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.26.10) - chalk: 4.1.2 - ci-info: 3.9.0 - deepmerge: 4.3.1 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-circus: 29.7.0(babel-plugin-macros@3.1.0) - jest-environment-node: 29.7.0 - jest-get-type: 29.6.3 - jest-regex-util: 29.6.3 - jest-resolve: 29.7.0 - jest-runner: 29.7.0 - jest-util: 29.7.0 - jest-validate: 29.7.0 - micromatch: 4.0.8 - parse-json: 5.2.0 - pretty-format: 29.7.0 - slash: 3.0.0 - strip-json-comments: 3.1.1 - optionalDependencies: - '@types/node': 20.19.9 - ts-node: 10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5) - transitivePeerDependencies: - - babel-plugin-macros - - supports-color - jest-config@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)): dependencies: '@babel/core': 7.26.10 @@ -27040,7 +27040,7 @@ snapshots: jest-mock: 29.7.0 jest-util: 29.7.0 - jest-expo@50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react@18.3.1): + jest-expo@50.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react@18.3.1): dependencies: '@expo/config': 8.5.6 '@expo/json-file': 8.3.3 @@ -27049,7 +27049,7 @@ snapshots: find-up: 5.0.0 jest-environment-jsdom: 29.7.0 jest-watch-select-projects: 2.0.0 - jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5))) + jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5))) json5: 2.2.3 lodash: 4.17.21 react-test-renderer: 18.2.0(react@18.3.1) @@ -27063,7 +27063,7 @@ snapshots: - supports-color - utf-8-validate - jest-expo@51.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(react@18.3.1): + jest-expo@51.0.4(@babel/core@7.26.10)(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(react@18.3.1): dependencies: '@expo/config': 9.0.4 '@expo/json-file': 8.3.3 @@ -27072,7 +27072,7 @@ snapshots: find-up: 5.0.0 jest-environment-jsdom: 29.7.0 jest-watch-select-projects: 2.0.0 - jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5))) + jest-watch-typeahead: 2.2.1(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5))) json5: 2.2.3 lodash: 4.17.21 react-test-renderer: 18.2.0(react@18.3.1) @@ -27635,11 +27635,11 @@ snapshots: chalk: 3.0.0 prompts: 2.4.2 - jest-watch-typeahead@2.2.1(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5))): + jest-watch-typeahead@2.2.1(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5))): dependencies: ansi-escapes: 6.2.1 chalk: 4.1.2 - jest: 29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) + jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) jest-regex-util: 29.6.3 jest-watcher: 29.7.0 slash: 5.1.0 @@ -27712,18 +27712,6 @@ snapshots: - supports-color - ts-node - jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)): - dependencies: - '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - '@jest/types': 29.6.3 - import-local: 3.2.0 - jest-cli: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) - transitivePeerDependencies: - - '@types/node' - - babel-plugin-macros - - supports-color - - ts-node - jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)): dependencies: '@jest/core': 29.7.0(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) @@ -32173,11 +32161,11 @@ snapshots: ts-interface-checker@0.1.13: {} - ts-jest@29.0.5(@babel/core@7.26.10)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(typescript@5.4.5): + ts-jest@29.0.5(@babel/core@7.26.10)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(typescript@5.4.5): dependencies: bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@18.19.86)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) + jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -32210,12 +32198,12 @@ snapshots: '@jest/types': 29.6.3 babel-jest: 29.7.0(@babel/core@7.26.10) - ts-jest@29.3.1(@babel/core@7.26.10)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)))(typescript@5.4.5): + ts-jest@29.3.1(@babel/core@7.26.10)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.26.10))(jest@29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)))(typescript@5.4.5): dependencies: bs-logger: 0.2.6 ejs: 3.1.10 fast-json-stable-stringify: 2.1.0 - jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@18.19.86)(typescript@5.4.5)) + jest: 29.7.0(@types/node@20.19.9)(babel-plugin-macros@3.1.0)(ts-node@10.9.2(@swc/core@1.3.96)(@types/node@20.19.9)(typescript@5.4.5)) jest-util: 29.7.0 json5: 2.2.3 lodash.memoize: 4.1.2 diff --git a/tests/__tests__/utils/compiler.ts b/tests/__tests__/utils/compiler.ts index 02ee430b2ff7..32f25d960098 100644 --- a/tests/__tests__/utils/compiler.ts +++ b/tests/__tests__/utils/compiler.ts @@ -57,8 +57,8 @@ export async function compile Date: Fri, 8 Aug 2025 15:09:13 +0800 Subject: [PATCH 2/6] fix: lib build --- packages/taro-components-library-react/scripts/fix.cjs | 4 ++-- packages/taro-components-library-solid/scripts/fix.cjs | 4 ++-- packages/taro-components-library-vue3/scripts/fix.cjs | 4 ++-- packages/taro-platform-h5/src/program.ts | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/taro-components-library-react/scripts/fix.cjs b/packages/taro-components-library-react/scripts/fix.cjs index b584eafcaee3..452ea6a8e900 100644 --- a/packages/taro-components-library-react/scripts/fix.cjs +++ b/packages/taro-components-library-react/scripts/fix.cjs @@ -1,7 +1,7 @@ const fs = require('@tarojs/helper').fs const path = require('path') -const componentsPath = path.resolve(__dirname, '..', 'src/components.ts') +const componentsPath = path.resolve(__dirname, '..', 'node_modules/@tarojs/components/dist/lib/react/components.ts') // const avoidErrorType = ['Input', 'ScrollView'] if (fs.existsSync(componentsPath)) { @@ -35,5 +35,5 @@ if (fs.existsSync(componentsPath)) { code = code.replace(new RegExp(`export const (${comps.join('|')}) = \\/\\*\\@__PURE__\\*\\/createReactComponent.*`, 'ig'), 'export const $1 = Fragment;') } - fs.writeFileSync(componentsPath, code) + fs.writeFileSync(path.resolve(__dirname, '..', 'src/components.ts'), code) } diff --git a/packages/taro-components-library-solid/scripts/fix.cjs b/packages/taro-components-library-solid/scripts/fix.cjs index 0bd00b46b282..0864bfffc58f 100644 --- a/packages/taro-components-library-solid/scripts/fix.cjs +++ b/packages/taro-components-library-solid/scripts/fix.cjs @@ -1,7 +1,7 @@ const fs = require('@tarojs/helper').fs const path = require('path') -const componentsPath = path.resolve(__dirname, '..', 'src/components.ts') +const componentsPath = path.resolve(__dirname, '..', 'node_modules/@tarojs/components/dist/lib/solid/components.ts') // const avoidErrorType = ['Input', 'ScrollView'] if (fs.existsSync(componentsPath)) { @@ -35,5 +35,5 @@ if (fs.existsSync(componentsPath)) { code = code.replace(new RegExp(`export const (${comps.join('|')}) = \\/\\*\\@__PURE__\\*\\/createSolidComponent.*`, 'ig'), 'export const $1 = Fragment;') } - fs.writeFileSync(componentsPath, code) + fs.writeFileSync(path.resolve(__dirname, '..', 'src/components.ts'), code) } diff --git a/packages/taro-components-library-vue3/scripts/fix.cjs b/packages/taro-components-library-vue3/scripts/fix.cjs index 92cfaad938e4..7aca0e7131e1 100644 --- a/packages/taro-components-library-vue3/scripts/fix.cjs +++ b/packages/taro-components-library-vue3/scripts/fix.cjs @@ -1,7 +1,7 @@ const fs = require('@tarojs/helper').fs const path = require('path') -const componentsPath = path.resolve(__dirname, '..', 'src/components.ts') +const componentsPath = path.resolve(__dirname, '..', 'node_modules/@tarojs/components/dist/lib/vue3/components.ts') if (fs.existsSync(componentsPath)) { const codeBuffer = fs.readFileSync(componentsPath) @@ -18,5 +18,5 @@ if (fs.existsSync(componentsPath)) { code = code.replace(new RegExp(`export const (${comps.join('|')}) = \\/\\*\\@__PURE__\\*\\/ defineContainer[^;]*;`, 'ig'), 'export const $1 = defineComponent((__props, { slots }) => slots.default);') } - fs.writeFileSync(componentsPath, code) + fs.writeFileSync(path.resolve(__dirname, '..', 'src/components.ts'), code) } diff --git a/packages/taro-platform-h5/src/program.ts b/packages/taro-platform-h5/src/program.ts index d868f6cf5ca5..bcfcf44ef481 100644 --- a/packages/taro-platform-h5/src/program.ts +++ b/packages/taro-platform-h5/src/program.ts @@ -179,7 +179,9 @@ export default class H5 extends TaroPlatformWeb { resolve: { alias: [ { find: /@tarojs\/components$/, replacement: that.componentLibrary }, - { find: '@tarojs/components-library-', replacement: that.componentAdapterReact }, + { find: '@tarojs/components-library-react', replacement: that.componentAdapterReact }, + { find: '@tarojs/components-library-solid', replacement: that.componentAdapterSolid }, + { find: '@tarojs/components-library-vue3', replacement: that.componentAdapterVue3 }, { find: /@tarojs\/router$/, replacement: that.routerLibrary }, { find: '@tarojs/taro', replacement: that.apiLibrary }, ], From be724b450ac9a1eb58cae6261de1b632d6186280 Mon Sep 17 00:00:00 2001 From: ian Date: Fri, 29 Aug 2025 00:02:04 +0800 Subject: [PATCH 3/6] style: eslint --- packages/taro-components-react/src/index.react.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/taro-components-react/src/index.react.ts b/packages/taro-components-react/src/index.react.ts index a3e52d690c4b..0c2038816422 100644 --- a/packages/taro-components-react/src/index.react.ts +++ b/packages/taro-components-react/src/index.react.ts @@ -4,6 +4,11 @@ export { default as Image } from './components/image' export { default as Input } from './components/input' export { default as Picker } from './components/picker' export { default as PullDownRefresh } from './components/pull-down-refresh' +export { default as Refresher } from './components/refresher' +export { default as ScrollView } from './components/scroll-view' +export { Swiper, SwiperItem } from './components/swiper' +export { default as Text } from './components/text' +export { default as View } from './components/view' export { Ad } from '@tarojs/components-library-react' export { AdCustom } from '@tarojs/components-library-react' export { AnimationVideo } from '@tarojs/components-library-react' @@ -54,11 +59,6 @@ export { PageContainer } from '@tarojs/components-library-react' export { PageMeta } from '@tarojs/components-library-react' export { PickerView, PickerViewColumn } from '@tarojs/components-library-react' export { Progress } from '@tarojs/components-library-react' -export { default as Refresher } from './components/refresher' -export { default as ScrollView } from './components/scroll-view' -export { Swiper, SwiperItem } from './components/swiper' -export { default as Text } from './components/text' -export { default as View } from './components/view' export { Radio, RadioGroup } from '@tarojs/components-library-react' export { RichText } from '@tarojs/components-library-react' export { RootPortal } from '@tarojs/components-library-react' From 761a90f9ce1bb84747e74aa3127ce1f8bd172ca0 Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 6 Sep 2025 01:25:26 +0800 Subject: [PATCH 4/6] fix: import --- packages/taro-components-library-react/package.json | 3 +++ packages/taro-components-library-solid/package.json | 3 +++ packages/taro-components-library-vue3/package.json | 3 +++ packages/taro-platform-h5/src/program.ts | 4 ++-- packages/taro-platform-harmony-hybrid/src/program.ts | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json index 0aa8c15cf09d..b3b3dae1f730 100644 --- a/packages/taro-components-library-react/package.json +++ b/packages/taro-components-library-react/package.json @@ -4,6 +4,9 @@ "description": "Taro 组件库 React 版本库", "author": "O2Team", "license": "MIT", + "files": [ + "dist" + ], "main": "./dist/index.js", "exports": { ".": { diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json index 3b535a5e0f66..3f57f365e661 100644 --- a/packages/taro-components-library-solid/package.json +++ b/packages/taro-components-library-solid/package.json @@ -2,6 +2,9 @@ "name": "@tarojs/components-library-solid", "version": "4.1.6", "description": "Taro 组件库 Solid 版本库", + "files": [ + "dist" + ], "main": "./dist/index.js", "exports": { ".": { diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json index 75eeff305c7b..082024a57217 100644 --- a/packages/taro-components-library-vue3/package.json +++ b/packages/taro-components-library-vue3/package.json @@ -4,6 +4,9 @@ "description": "Taro 组件库 Vue3 版本库", "author": "O2Team", "license": "MIT", + "files": [ + "dist" + ], "main": "./dist/index.js", "exports": { ".": { diff --git a/packages/taro-platform-h5/src/program.ts b/packages/taro-platform-h5/src/program.ts index b75e82772306..751eba7c7064 100644 --- a/packages/taro-platform-h5/src/program.ts +++ b/packages/taro-platform-h5/src/program.ts @@ -144,7 +144,7 @@ export default class H5 extends TaroPlatformWeb { switch (this.framework) { case 'vue3': - args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/dist/components-loader'\nimport * as list from '@tarojs/components'\n` args[0].loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: @@ -213,7 +213,7 @@ export default class H5 extends TaroPlatformWeb { switch (that.framework) { case 'vue3': - viteCompilerContext.loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + viteCompilerContext.loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/dist/components-loader'\nimport * as list from '@tarojs/components'\n` viteCompilerContext.loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: diff --git a/packages/taro-platform-harmony-hybrid/src/program.ts b/packages/taro-platform-harmony-hybrid/src/program.ts index 1cce8ed0d9f4..f0e49a67be0b 100644 --- a/packages/taro-platform-harmony-hybrid/src/program.ts +++ b/packages/taro-platform-harmony-hybrid/src/program.ts @@ -124,7 +124,7 @@ export default class H5 extends TaroPlatformWeb { switch (this.framework) { case 'vue3': - args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/components-loader'\nimport * as list from '@tarojs/components'\n` + args[0].loaderMeta.extraImportForWeb += `import { initVue3Components } from '@tarojs/components-library-vue3/dist/components-loader'\nimport * as list from '@tarojs/components'\n` args[0].loaderMeta.execBeforeCreateWebApp += `initVue3Components(component, list)\n` break default: From b712146428105c45ad2aad39b80990f7dbcf8124 Mon Sep 17 00:00:00 2001 From: ian Date: Sat, 6 Sep 2025 01:28:06 +0800 Subject: [PATCH 5/6] chore: update [no ci] --- packages/taro-platform-h5/src/program.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/taro-platform-h5/src/program.ts b/packages/taro-platform-h5/src/program.ts index 751eba7c7064..ada73721067b 100644 --- a/packages/taro-platform-h5/src/program.ts +++ b/packages/taro-platform-h5/src/program.ts @@ -179,9 +179,9 @@ export default class H5 extends TaroPlatformWeb { resolve: { alias: [ { find: /@tarojs\/components$/, replacement: that.componentLibrary }, - { find: '@tarojs/components-library-react', replacement: that.componentAdapterReact }, - { find: '@tarojs/components-library-solid', replacement: that.componentAdapterSolid }, - { find: '@tarojs/components-library-vue3', replacement: that.componentAdapterVue3 }, + { find: /@tarojs\/components-library-react$/, replacement: that.componentAdapterReact }, + { find: /@tarojs\/components-library-solid$/, replacement: that.componentAdapterSolid }, + { find: /@tarojs\/components-library-vue3$/, replacement: that.componentAdapterVue3 }, { find: /@tarojs\/router$/, replacement: that.routerLibrary }, { find: '@tarojs/taro', replacement: that.apiLibrary }, ], From c055103f5ed28f648921d509d001c9ecce3598d3 Mon Sep 17 00:00:00 2001 From: ian Date: Tue, 9 Sep 2025 18:41:37 +0800 Subject: [PATCH 6/6] fix: this --- .../src/program/vite/inject-env.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/taro-platform-harmony-cpp/src/program/vite/inject-env.ts b/packages/taro-platform-harmony-cpp/src/program/vite/inject-env.ts index 58cdcd310880..7c8aa3b99b8f 100644 --- a/packages/taro-platform-harmony-cpp/src/program/vite/inject-env.ts +++ b/packages/taro-platform-harmony-cpp/src/program/vite/inject-env.ts @@ -5,16 +5,17 @@ import type * as BabelCore from '@babel/core' import type { PluginOption } from 'vite' import type Harmony from '..' -export default function (platform: Harmony): PluginOption { +export default function (this: Harmony): PluginOption { const packageName = '@tarojs/taro' const bindingName = 'Taro' - const businessId = platform.getConfig().defineConstants?.LOCATION_APIKEY?.replace(/^['"]|['"]$/g, '') + const businessId = this.getConfig().defineConstants?.LOCATION_APIKEY?.replace(/^['"]|['"]$/g, '') + const that = this return { name: 'taro:vite-add-method-env', transform (code, id) { const pluginContext = this - const { runnerUtils } = platform.context + const { runnerUtils } = that.context const { getViteHarmonyCompilerContext } = runnerUtils const compiler = getViteHarmonyCompilerContext(pluginContext) const exts = Array.from(new Set(compiler?.frameworkExts.concat(SCRIPT_EXT)))