Skip to content

Commit

Permalink
chore: 去掉循环依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
luckyadam committed Jul 9, 2020
1 parent 0644075 commit cf0a444
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion packages/babel-plugin-transform-taroapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test": "jest"
},
"devDependencies": {
"@tarojs/taro-h5": "^2.2.10",
"@tarojs/taro-h5": "2.2.10",
"@types/babel-core": "^6.25.5",
"@types/babel-traverse": "^6.25.4",
"@types/babel-types": "^7.0.4",
Expand Down
16 changes: 8 additions & 8 deletions packages/taro-h5/__test__/tabbar-test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Nerv, { nextTick } from 'nervjs'
import {
import {
hideTabBar,
hideTabBarRedDot,
initTabBarApis,
Expand All @@ -11,7 +11,7 @@ import {
showTabBarRedDot,
switchTab
} from '../src/api/tabBar'
import Tabbar from '@tarojs/components/src/components/tabbar/index'
import Tabbar from '../../taro-components/src/components/tabbar/index'
import Taro from '../src/taro/index'

const tabbarConfig = {
Expand All @@ -20,14 +20,14 @@ const tabbarConfig = {
backgroundColor: '#fff',
borderStyle: 'black',
list: [{
pagePath: "/pages/index/index", text: "首页"
pagePath: '/pages/index/index', text: '首页'
}, {
pagePath: "/pages/about/about", text: "关于我们"
pagePath: '/pages/about/about', text: '关于我们'
}],
mode: "hash",
basename: "/test/app",
mode: 'hash',
basename: '/test/app',
customRoutes: {
"/pages/about/index": "/about"
'/pages/about/index': '/about'
}
}

Expand Down Expand Up @@ -159,4 +159,4 @@ describe('tabbar', () => {
done()
})
})
})
})
1 change: 0 additions & 1 deletion packages/taro-h5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"@babel/plugin-proposal-object-rest-spread": "^7.3.4",
"@babel/plugin-transform-react-jsx": "^7.2.2",
"@babel/preset-env": "^7.3.4",
"@tarojs/components": "2.2.10",
"@tarojs/taro": "2.2.10",
"babel-core": "7.0.0-bridge.0",
"babel-jest": "24.4.0",
Expand Down

0 comments on commit cf0a444

Please sign in to comment.