Merge branch 'main' into main

NervJS · Sep 16, 2024 · 7c3dc35 · 7c3dc35
2 parents 0eabddf + d6f98fe
commit 7c3dc35
Show file tree

Hide file tree

Showing 126 changed files with 1,662 additions and 696 deletions.
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -113,11 +113,6 @@ jobs:
         run: pnpm test
         env:
           CI: true
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-
       # 以下 coverage 流程通过 artifact 拆分文件作为单独 job 上传时间损耗过长，因此在在 node test 后直接继续执行
       - name: Upload [taro-cli] coverage to Codecov
         uses: codecov/codecov-action@v4

diff --git a/crates/native_binding/package.json b/crates/native_binding/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Node binding for taro",
   "main": "binding.js",
   "typings": "binding.d.ts",

diff --git a/examples/mini-program-example/src/pages/index/index.tsx b/examples/mini-program-example/src/pages/index/index.tsx
@@ -49,21 +49,20 @@ export default function Index() {
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
-            indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/performance/index/index'
+          Taro.navigateTo({
+            url: 'pages/harmony-hybrid/mix-router/home/index'
           })
         }}>
-        多实例（多SPA跳转）：性能列表页
+        多实例及混合路由测试页
       </Button>
       <Button
         onClick={()=>{
-          nativeApi.harmonyNavigateTo({
+          nativeApi.navigateToTaroHybrid({
             indexHtmlPath: '/spa/new/index.html',
-            taroPath: 'pages/api/index/index'
+            taroPath: '/pages/index/index'
           })
         }}>
-        单实例（单SPA）：接口列表页
+        单实例（单SPA）：首页
       </Button>
     </View>
   )

diff --git a/examples/mini-program-example/src/util/nativeApi.ts b/examples/mini-program-example/src/util/nativeApi.ts
@@ -1,13 +1,14 @@
 // @ts-ignore
-const decorator = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
+const sync = window.MethodChannel && window.MethodChannel.jsBridgeMode({ isAsync: false, autoRelease: true }) || (target => target)
 
 // @proxyClassSign('')
 class NativeApi {
-  // @ts-ignore
-  @decorator
-  harmonyNavigateTo(options: any) {
-    return options
-  }
+  @sync
+  navigateToTaroHybrid(_options: any) {}
+
+
+  @sync
+  navigateToNative(_options: any){}
 }
 
 const nativeApi = new NativeApi()

diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-arm64",
   "description": "Native binding for taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "os": [
     "darwin"
   ],

diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-darwin-x64",
   "description": "Native binding for taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "os": [
     "darwin"
   ],

diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-linux-x64-gnu",
   "description": "Native binding for taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "os": [
     "linux"
   ],

diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/binding-linux-x64-musl",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "os": [
     "linux"
   ],

diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tarojs/binding-win32-x64-msvc",
   "description": "Native binding for taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "os": [
     "win32"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "开放式跨端跨框架开发解决方案",
   "homepage": "https://github.com/NervJS/taro#readme",
   "author": "O2Team",
@@ -29,7 +29,7 @@
     "lint:style": "stylelint ./packages/**/*.{css,scss}",
     "format": "prettier --write --cache .",
     "format:check": "prettier --check --cache .",
-    "test": "pnpm --if-present -r --aggregate-output --filter=./packages/* test:ci",
+    "test": "pnpm --if-present -r --aggregate-output --filter=./packages/* --filter=./tests test:ci",
     "test:binding": "pnpm --filter @tarojs/binding run test",
     "updateSnapshot": "pnpm --if-present -r --aggregate-output --filter=./tests --filter=./packages/* updateSnapshot",
     "version": "run-s version:*",

diff --git a/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json b/packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/babel-plugin-transform-solid-jsx/package.json b/packages/babel-plugin-transform-solid-jsx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "babel-plugin-transform-solid-jsx",
   "description": "A JSX to DOM plugin that wraps expressions for fine grained change detection",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/babel-plugin-transform-taroapi/package.json b/packages/babel-plugin-transform-taroapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/babel-preset-taro/package.json b/packages/babel-preset-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro babel preset",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/create-app/package.json b/packages/create-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/create-app",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "create taro app with one command",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/css-to-react-native/package.json b/packages/css-to-react-native/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "author": "O2Team",
   "license": "MIT",
   "main": "dist/index.js",

diff --git a/packages/eslint-config-taro/package.json b/packages/eslint-config-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro specific linting rules for ESLint",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/jest-helper/package.json b/packages/jest-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jest-taro-helper",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "jest helper for taro",
   "private": true,
   "author": "O2Team",

diff --git a/packages/postcss-html-transform/package.json b/packages/postcss-html-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-html-transform",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "transform html tag name selector",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/postcss-plugin-constparse/package.json b/packages/postcss-plugin-constparse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-plugin-constparse",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "parse constants defined in config",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/postcss-pxtransform/package.json b/packages/postcss-pxtransform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-pxtransform",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "PostCSS plugin px 转小程序 rpx及h5 rem 单位",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/postcss-unit-transform/package.json b/packages/postcss-unit-transform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "postcss-taro-unit-transform",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "小程序单位转换",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/rollup-plugin-copy/package.json b/packages/rollup-plugin-copy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-copy",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "rollup-plugin-copy for taro",
   "private": true,
   "author": "O2Team",

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/shared",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro utils internal use.",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/stylelint-config-taro-rn/package.json b/packages/stylelint-config-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-config-taro-rn",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Shareable stylelint config for React Native CSS modules",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/stylelint-taro-rn/package.json b/packages/stylelint-taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro-rn",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "A collection of React Native specific rules for stylelint",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/stylelint-taro/package.json b/packages/stylelint-taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stylelint-taro",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro stylelint 规则集合",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-api/package.json b/packages/taro-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/api",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro common API",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-cli-convertor/package.json b/packages/taro-cli-convertor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli-convertor",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "cli tool for taro-convert",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "cli tool for taro",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-cli/templates/default/_gitignore b/packages/taro-cli/templates/default/_gitignore
@@ -4,4 +4,5 @@ deploy_versions/
 .rn_temp/
 node_modules/
 .DS_Store
-.swc
+.swc
+*.local
diff --git a/packages/taro-cli/templates/default/template_creator.js b/packages/taro-cli/templates/default/template_creator.js
@@ -17,6 +17,9 @@ const handler = {
   '/types/vue.d.ts' (err, { framework, typescript }) {
     return ['Vue3'].includes(framework) && !!typescript
   },
+  '/types/solid.d.ts' (err, { framework, typescript }) {
+    return ['Solid'].includes(framework) && !!typescript
+  },
   '/src/pages/index/index.jsx' (err, { pageDir = '', pageName = '', subPkg = '' }) {
     return {
       setPageName: normalizePath(path.join(PAGES_ENTRY, pageDir, pageName, 'index.jsx')),

diff --git a/packages/taro-cli/templates/default/tsconfig.json b/packages/taro-cli/templates/default/tsconfig.json
@@ -14,9 +14,10 @@
     "strictNullChecks": true,
     "sourceMap": true,
     "rootDir": ".",
-    "jsx": "{{#if (includes "Vue3" s=framework)}}preserve{{else}}react-jsx{{/if}}",{{#if (eq framework "Preact") }}
+    "jsx": "{{#if (includes "Vue3" s=framework)}}preserve{{else if (eq framework 'Solid')}}preserve{{else}}react-jsx{{/if}}",{{#if (eq framework "Preact") }}
     "skipLibCheck": true,{{/if}}
-    "allowJs": true,
+    "allowJs": true,{{#if (eq framework "Solid")}}
+    "jsxImportSource": "solid-js",{{/if}}
     "resolveJsonModule": true,
     "typeRoots": [
       "node_modules/@types"

diff --git a/packages/taro-cli/templates/default/types/global.d.ts b/packages/taro-cli/templates/default/types/global.d.ts
@@ -29,4 +29,7 @@ declare namespace NodeJS {
 {{#if (includes "Vue3" s=framework)}}
 declare module '@tarojs/components' {
   export * from '@tarojs/components/types/index.vue3'
+}{{else if (includes "Solid" s=framework)}}
+declare module '@tarojs/components' {
+  export * from '@tarojs/components/types/index.solid'
 }{{/if}}
diff --git a/packages/taro-cli/templates/default/types/solid.d.ts b/packages/taro-cli/templates/default/types/solid.d.ts
@@ -0,0 +1,12 @@
+export { }
+
+declare module 'solid-js' {
+  namespace JSX {
+    interface Directives {
+      /** Note:如果需要定义自定义指令的类型，可以在这里做
+       * 参考官网文档https://docs.solidjs.com/reference/jsx-attributes/use
+       * model: [() => any, (v: any) => any]
+       */
+    }
+  }
+}
diff --git a/packages/taro-components-advanced/package.json b/packages/taro-components-advanced/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "",
   "author": "O2Team",
   "license": "MIT",

diff --git a/packages/taro-components-library-react/package.json b/packages/taro-components-library-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-react",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro 组件库 React 版本库",
   "private": true,
   "author": "O2Team",

diff --git a/packages/taro-components-library-solid/package.json b/packages/taro-components-library-solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-solid",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro 组件库 Solid 版本库",
   "private": true,
   "main": "index.js",

diff --git a/packages/taro-components-library-vue3/package.json b/packages/taro-components-library-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-library-vue3",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Taro 组件库 Vue3 版本库",
   "private": true,
   "author": "O2Team",

diff --git a/packages/taro-components-react/package.json b/packages/taro-components-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-react",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "",
   "main:h5": "dist/index.js",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "@tarojs/components": "workspace:*",
     "@babel/runtime": "^7.24.4",
     "classnames": "^2.2.5",
-    "swiper": "6.8.0",
+    "swiper": "11.1.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {