提交 37404feb 编写于 作者: fxy060608's avatar fxy060608

Merge branch 'dev' of https://github.com/dcloudio/uni-app into alpha

# Conflicts:
#	packages/uni-app-plus-nvue/package.json
#	packages/uni-app-plus/package.json
#	packages/uni-cli-shared/package.json
#	packages/uni-h5-ui/package.json
#	packages/uni-h5/package.json
#	packages/uni-mp-alipay/package.json
#	packages/uni-mp-baidu/package.json
#	packages/uni-mp-qq/package.json
#	packages/uni-mp-toutiao/package.json
#	packages/uni-mp-weixin/package.json
#	packages/uni-stat/package.json
#	packages/uni-template-compiler/package.json
#	packages/vue-cli-plugin-hbuilderx/package.json
#	packages/vue-cli-plugin-uni-optimize/package.json
#	packages/vue-cli-plugin-uni/package.json
#	packages/webpack-uni-mp-loader/package.json
#	packages/webpack-uni-pages-loader/package.json
{
"name": "@dcloudio/uni-app-plus-nvue",
"version": "2.0.0-22420190823021",
"description": "uni-app app-plus-nvue",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-app-plus-nvue",
"version": "1.0.0-alpha-22120190814002",
"description": "uni-app app-plus-nvue",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-app-plus-nvue"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-app-plus",
"version": "2.0.0-22420190823021",
"description": "uni-app app-plus",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-app-plus",
"version": "0.0.253",
"description": "uni-app app-plus",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-app-plus"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-cli-shared",
"version": "2.0.0-22420190823021",
"description": "uni-cli-shared",
"main": "lib/index.js",
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"hash-sum": "^1.0.2",
"strip-json-comments": "^2.0.1"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-cli-shared",
"version": "0.2.994",
"description": "uni-cli-shared",
"main": "lib/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-cli-shared"
},
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"hash-sum": "^1.0.2",
"strip-json-comments": "^2.0.1"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-h5-ui",
"version": "2.0.0-22420190823021",
"description": "uni-app h5 ui",
"main": "dist/index.umd.min.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-h5-ui",
"version": "0.0.1",
"description": "uni-app h5 ui",
"main": "dist/index.umd.min.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-h5-ui"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0"
}
{
"name": "@dcloudio/uni-h5",
"version": "2.0.0-22420190823021",
"description": "uni-app h5",
"main": "dist/index.umd.min.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"base64-arraybuffer": "^0.2.0",
"intersection-observer": "^0.7.0",
"safe-area-insets": "^1.4.1"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-h5",
"version": "0.9.0",
"description": "uni-app h5",
"main": "dist/index.umd.min.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-h5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"base64-arraybuffer": "^0.2.0",
"intersection-observer": "^0.7.0",
"safe-area-insets": "^1.4.1"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-mp-alipay",
"version": "2.0.0-22420190823021",
"description": "uni-app mp-alipay",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-mp-alipay",
"version": "0.0.827",
"description": "uni-app mp-alipay",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-mp-alipay"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-mp-baidu",
"version": "2.0.0-22420190823021",
"description": "uni-app mp-baidu",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-mp-baidu",
"version": "0.0.857",
"description": "uni-app mp-baidu",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-mp-baidu"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-mp-qq",
"version": "2.0.0-22420190823021",
"description": "uni-app mp-qq",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-mp-qq",
"version": "0.0.112",
"description": "uni-app mp-qq",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-mp-qq"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-mp-toutiao",
"version": "2.0.0-22420190823021",
"description": "uni-app mp-toutiao",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-mp-toutiao",
"version": "0.0.352",
"description": "uni-app mp-toutiao",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-mp-toutiao"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-mp-weixin",
"version": "2.0.0-22420190823021",
"description": "uni-app mp-weixin",
"main": "dist/index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-mp-weixin",
"version": "0.0.973",
"description": "uni-app mp-weixin",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-mp-weixin"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/uni-stat",
"version": "2.0.0-22420190823021",
"description": "",
"main": "dist/index.js",
"scripts": {
"dev": "NODE_ENV=development rollup -w -c rollup.config.js",
"build": "NODE_ENV=production rollup -c rollup.config.js"
},
"files": [
"dist",
"package.json",
"LICENSE"
],
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@babel/core": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"eslint": "^6.1.0",
"rollup": "^1.19.3",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-clear": "^2.0.7",
"rollup-plugin-commonjs": "^10.0.2",
"rollup-plugin-copy": "^3.1.0",
"rollup-plugin-eslint": "^7.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-uglify": "^6.0.2"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-stat",
"version": "0.0.113",
"description": "",
"main": "dist/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-stat"
},
"scripts": {
"dev": "NODE_ENV=development rollup -w -c rollup.config.js",
"build": "NODE_ENV=production rollup -c rollup.config.js"
},
"files": [
"dist",
"package.json",
"LICENSE"
],
"author": "",
"license": "Apache-2.0",
"devDependencies": {
"@babel/core": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"eslint": "^6.1.0",
"rollup": "^1.19.3",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-clear": "^2.0.7",
"rollup-plugin-commonjs": "^10.0.2",
"rollup-plugin-copy": "^3.1.0",
"rollup-plugin-eslint": "^7.0.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-uglify": "^6.0.2"
}
}
{
"name": "@dcloudio/uni-template-compiler",
"version": "2.0.0-22420190823021",
"description": "uni-template-compiler",
"main": "lib/index.js",
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"@babel/parser": "^7.3.3",
"@babel/traverse": "^7.3.3",
"@babel/types": "^7.3.3",
"vue-template-compiler": "^2.6.10"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/uni-template-compiler",
"version": "0.9.183",
"description": "uni-template-compiler",
"main": "lib/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/uni-template-compiler"
},
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"@babel/parser": "^7.3.3",
"@babel/traverse": "^7.3.3",
"@babel/types": "^7.3.3",
"vue-template-compiler": "^2.6.10"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/vue-cli-plugin-hbuilderx",
"version": "2.0.0-22420190823021",
"description": "HBuilderX plugin for vue-cli 3",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"acorn": "^5.2.1",
"css": "~2.2.1",
"escodegen": "^1.8.1"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/vue-cli-plugin-hbuilderx",
"version": "1.0.137",
"description": "HBuilderX plugin for vue-cli 3",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/vue-cli-plugin-hbuilderx"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"acorn": "^5.2.1",
"css": "~2.2.1",
"escodegen": "^1.8.1"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/vue-cli-plugin-uni-optimize",
"version": "2.0.0-22420190823021",
"description": "uni-app optimize plugin for vue-cli 3",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/vue-cli-plugin-uni-optimize",
"version": "0.1.9",
"description": "uni-app optimize plugin for vue-cli 3",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/vue-cli-plugin-uni-optimize"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/vue-cli-plugin-uni",
"version": "2.0.0-22420190823021",
"description": "uni-app plugin for vue-cli 3",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"bin": {
"uniapp-cli": "./bin/uniapp-cli.js"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"@dcloudio/uni-stat": "^2.0.0-22420190823021",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.0",
"envinfo": "^6.0.1",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"module-alias": "^2.1.0",
"postcss": "^7.0.7",
"postcss-import": "^12.0.1",
"postcss-selector-parser": "^5.0.0",
"postcss-value-parser": "^3.3.1",
"strip-json-comments": "^2.0.1",
"update-check": "^1.5.3",
"webpack-merge": "^4.1.4",
"wrap-loader": "^0.2.0",
"xregexp": "4.0.0"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/vue-cli-plugin-uni",
"version": "0.9.538",
"description": "uni-app plugin for vue-cli 3",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/vue-cli-plugin-uni"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"bin": {
"uniapp-cli": "./bin/uniapp-cli.js"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"@dcloudio/uni-stat": "*",
"copy-webpack-plugin": "^4.6.0",
"cross-env": "^5.2.0",
"envinfo": "^6.0.1",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"module-alias": "^2.1.0",
"postcss": "^7.0.7",
"postcss-import": "^12.0.1",
"postcss-selector-parser": "^5.0.0",
"postcss-value-parser": "^3.3.1",
"strip-json-comments": "^2.0.1",
"update-check": "^1.5.3",
"webpack-merge": "^4.1.4",
"wrap-loader": "^0.2.0",
"xregexp": "4.0.0"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/webpack-uni-mp-loader",
"version": "2.0.0-22420190823021",
"description": "webpack-uni-mp-loader",
"main": "index.js",
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/webpack-uni-mp-loader",
"version": "0.3.644",
"description": "webpack-uni-mp-loader",
"main": "index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/webpack-uni-mp-loader"
},
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
{
"name": "@dcloudio/webpack-uni-pages-loader",
"version": "2.0.0-22420190823021",
"description": "uni-app pages.json loader",
"main": "lib/index.js",
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"merge": "^1.2.1",
"strip-json-comments": "^2.0.1"
},
"uni-app": {
"compilerVersion": "2.2.7"
},
"gitHead": "921f9aa0175c6fbd7d7d0b896bfb3d90bc0320ab"
{
"name": "@dcloudio/webpack-uni-pages-loader",
"version": "0.2.875",
"description": "uni-app pages.json loader",
"main": "lib/index.js",
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
"directory": "packages/webpack-uni-pages-loader"
},
"files": [
"lib"
],
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "fxy060608",
"license": "Apache-2.0",
"dependencies": {
"merge": "^1.2.1",
"strip-json-comments": "^2.0.1"
},
"uni-app": {
"compilerVersion": "2.2.4"
},
"gitHead": "08ea04b669e93f0db3acb2dfa38138298edd5789"
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册