Merge branch 'dev' of https://github.com/dcloudio/uni-app into v3
# Conflicts: # packages/uni-h5/dist/index.umd.min.js # src/core/view/plugins/index.js # src/platforms/app-plus-nvue/service/api/index.js # src/platforms/app-plus-nvue/service/api/route/util.js # src/platforms/app-plus/service/api/route/navigate-to.js # src/platforms/app-plus/service/api/route/switch-tab.js # src/platforms/app-plus/service/constants.js # src/platforms/app-plus/service/framework/app.js
Showing
... | @@ -67,6 +67,7 @@ | ... | @@ -67,6 +67,7 @@ |
"rollup-plugin-commonjs": "^10.0.1", | "rollup-plugin-commonjs": "^10.0.1", | ||
"rollup-plugin-node-resolve": "^5.2.0", | "rollup-plugin-node-resolve": "^5.2.0", | ||
"rollup-plugin-replace": "^2.1.0", | "rollup-plugin-replace": "^2.1.0", | ||
"shell-exec": "^1.0.2", | |||
"strip-json-comments": "^2.0.1", | "strip-json-comments": "^2.0.1", | ||
"vue": "^2.6.8", | "vue": "^2.6.8", | ||
"vue-router": "^3.0.1", | "vue-router": "^3.0.1", | ||
... | ... |
想要评论请 注册 或 登录