fix(h5): 统一运行时 router & tabbar 工具方法

packages/taro-components/package.json

@@ -42,6 +42,7 @@
     "@stencil/core": "~2.13.0",
     "@stencil/sass": "1.5.2",
     "@tarojs/taro": "workspace:*",
+    "@tarojs/router": "workspace:*",
     "better-scroll": "^1.14.1",
     "classnames": "^2.2.5",
     "hls.js": "^1.1.5",

packages/taro-components/src/components/tabbar/tabbar.tsx

@@ -1,25 +1,13 @@
 import { Component, Prop, h, ComponentInterface, Host, State, Event, EventEmitter, Element } from '@stencil/core'
 import Taro from '@tarojs/taro'
+import { addLeadingSlash, stripBasename, stripSuffix } from '@tarojs/router/dist/utils'
 import { IH5RouterConfig } from '@tarojs/taro/types/compile'
 import classNames from 'classnames'
 import resolvePathname from 'resolve-pathname'
 
 import { splitUrl } from '../../utils'
 import { TabbarItem } from './tabbar-item'
 
-// const removeLeadingSlash = str => str.replace(/^\.?\//, '')
-// const removeTrailingSearch = str => str.replace(/\?[\s\S]*$/, '')
-const addLeadingSlash = (str = '') => str[0] === '/' ? str : `/${str}`
-
-const hasBasename = (path = '', prefix = '') =>
-  new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path)
-
-const stripBasename = (path = '', prefix = '') =>
-  hasBasename(path, prefix) ? path.substr(prefix.length) : path
-
-const stripSuffix = (path = '', suffix = '') =>
-  path.includes(suffix) ? path.substring(0, path.length - suffix.length) : path
-
 const STATUS_SHOW = 0
 const STATUS_HIDE = 1
 const STATUS_SLIDEOUT = 2

packages/taro-h5/package.json

@@ -37,7 +37,6 @@
     "@tarojs/router": "workspace:*",
     "@tarojs/runtime": "workspace:*",
     "base64-js": "^1.3.0",
-    "dingtalk-jsapi": "~2.15.2",
     "jsonp-retry": "^1.0.3",
     "query-string": "^7.1.1",
     "whatwg-fetch": "^3.4.0"

packages/taro-router/package.json

@@ -30,6 +30,7 @@
   "dependencies": {
     "@tarojs/runtime": "workspace:*",
     "@tarojs/taro": "workspace:*",
+    "dingtalk-jsapi": "~2.15.2",
     "history": "^5.1.0",
     "mobile-detect": "^1.4.2",
     "query-string": "^7.1.1",

packages/taro-router/src/utils/index.ts

@@ -1,13 +1,19 @@
+// export const removeLeadingSlash = (str = '') => str.replace(/^\.?\//, '')
+// export const removeTrailingSearch = (str = '') => str.replace(/\?[\s\S]*$/, '')
+
 export const addLeadingSlash = (url = '') => (url.charAt(0) === '/' ? url : '/' + url)
 
 export const hasBasename = (path = '', prefix = '') =>
   new RegExp('^' + prefix + '(\\/|\\?|#|$)', 'i').test(path) || path === prefix
 
 export const stripBasename = (path = '', prefix = '') =>
-  hasBasename(path, prefix) ? path.substr(prefix.length) : path
+  hasBasename(path, prefix) ? path.substring(prefix.length) : path
 
 export const stripTrailing = (str = '') => str.replace(/[?#][\s\S]*$/, '')
 
+export const stripSuffix = (path = '', suffix = '') =>
+  path.includes(suffix) ? path.substring(0, path.length - suffix.length) : path
+
 class RoutesAlias {
   conf: Array<string[]> = []
 

packages/taro-webpack-runner/src/config/base.conf.ts

@@ -13,7 +13,7 @@ export default (_appPath: string, _config: Partial<BuildConfig>) => {
       alias: {
         '@tarojs/taro': '@tarojs/taro-h5',
         // 开发组件库时 link 到本地调试，runtime 包需要指向本地 node_modules 顶层的 runtime，保证闭包值 Current 一致，shared 也一样
-        '@tarojs/router': require.resolve('@tarojs/router'),
+        '@tarojs/router$': require.resolve('@tarojs/router'),
         '@tarojs/runtime': require.resolve('@tarojs/runtime'),
         '@tarojs/shared': require.resolve('@tarojs/shared/dist/shared.esm.js')
       }

packages/taro-webpack5-runner/src/webpack/H5BaseConfig.ts

@@ -21,7 +21,7 @@ export class H5BaseConfig extends BaseConfig {
         alias: {
           '@tarojs/taro': '@tarojs/taro-h5',
           // 开发组件库时 link 到本地调试，runtime 包需要指向本地 node_modules 顶层的 runtime，保证闭包值 Current 一致，shared 也一样
-          '@tarojs/router': require.resolve('@tarojs/router'),
+          '@tarojs/router$': require.resolve('@tarojs/router'),
           '@tarojs/runtime': require.resolve('@tarojs/runtime'),
           '@tarojs/shared': require.resolve('@tarojs/shared/dist/shared.esm.js')
         }