Merge branch 'dev' of github.com:dcloudio/uni-app into dev
# Conflicts: # package.json # yarn.lock
Showing
{ | { | ||
"name": "uniapp-js-framework", | "name": "uniapp-js-framework", | ||
"version": "0.0.1", | "version": "0.0.1", | ||
"scripts": { | "scripts": { | ||
"lint": "eslint --fix --config package.json --ext .js --ext .vue --ignore-path .eslintignore build src", | "lint": "eslint --fix --config package.json --ext .js --ext .vue --ignore-path .eslintignore build src", | ||
"dev:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js", | "dev:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js", | ||
"build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js", | "build:h5": "npm run lint && cross-env NODE_ENV=production UNI_WATCH=false UNI_PLATFORM=h5 node build/build.js", | ||
"build:mp-weixin": "npm run lint && cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js", | "build:mp-weixin": "npm run lint && cross-env UNI_PLATFORM=mp-weixin rollup -c build/rollup.config.js", | ||
"build:mp-baidu": "npm run lint && cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js", | "build:mp-baidu": "npm run lint && cross-env UNI_PLATFORM=mp-baidu rollup -c build/rollup.config.js", | ||
"build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js", | "build:mp-alipay": "npm run lint && cross-env UNI_PLATFORM=mp-alipay rollup -c build/rollup.config.js", | ||
"build:mp-toutiao": "npm run lint && cross-env UNI_PLATFORM=mp-toutiao rollup -c build/rollup.config.js", | "build:mp-toutiao": "npm run lint && cross-env UNI_PLATFORM=mp-toutiao rollup -c build/rollup.config.js", | ||
"test:unit": "cross-env NODE_ENV=test UNI_PLATFORM=h5 mocha-webpack --require tests/unit/setup.js --webpack-config build/webpack.config.test.js tests/unit/**/*.spec.js" | "test:unit": "cross-env NODE_ENV=test UNI_PLATFORM=h5 mocha-webpack --require tests/unit/setup.js --webpack-config build/webpack.config.test.js tests/unit/**/*.spec.js" | ||
}, | }, | ||
"dependencies": {}, | "dependencies": {}, | ||
"private": true, | "private": true, | ||
"devDependencies": { | "devDependencies": { | ||
"@vue/cli-plugin-babel": "^3.1.1", | "@vue/cli-plugin-babel": "^3.4.1", | ||
"@vue/cli-plugin-eslint": "^3.1.4", | "@vue/cli-plugin-eslint": "^3.4.1", | ||
"@vue/cli-plugin-unit-mocha": "^3.1.1", | "@vue/cli-plugin-unit-mocha": "^3.4.1", | ||
"@vue/cli-service": "^3.1.2", | "@vue/cli-service": "^3.4.1", | ||
"@vue/test-utils": "^1.0.0-beta.25", | "@vue/test-utils": "^1.0.0-beta.25", | ||
"babel-eslint": "^10.0.1", | "babel-eslint": "^10.0.1", | ||
"babylon": "^6.18.0", | "babylon": "^6.18.0", | ||
"chai": "^4.1.2", | "browserslist": "^4.4.2", | ||
"cross-env": "^5.2.0", | "caniuse-lite": "^1.0.30000940", | ||
"eslint": "^5.5.0", | "chai": "^4.1.2", | ||
"eslint-config-standard": "^12.0.0", | "cross-env": "^5.2.0", | ||
"eslint-loader": "^2.1.0", | "eslint": "^5.5.0", | ||
"eslint-plugin-import": "^2.14.0", | "eslint-config-standard": "^12.0.0", | ||
"eslint-plugin-node": "^7.0.1", | "eslint-loader": "^2.1.0", | ||
"eslint-plugin-promise": "^4.0.0", | "eslint-plugin-import": "^2.14.0", | ||
"eslint-plugin-standard": "^4.0.0", | "eslint-plugin-node": "^7.0.1", | ||
"eslint-plugin-vue": "^4.7.1", | "eslint-plugin-promise": "^4.0.0", | ||
"jsdom": "^13.0.0", | "eslint-plugin-standard": "^4.0.0", | ||
"jsdom-global": "^3.0.2", | "eslint-plugin-vue": "^4.7.1", | ||
"rollup": "^0.67.4", | "jsdom": "^13.0.0", | ||
"rollup-plugin-alias": "^1.4.0", | "jsdom-global": "^3.0.2", | ||
"rollup-plugin-replace": "^2.1.0", | "rollup": "^0.67.4", | ||
"strip-json-comments": "^2.0.1", | "rollup-plugin-alias": "^1.4.0", | ||
"vue": "^2.5.17", | "rollup-plugin-replace": "^2.1.0", | ||
"vue-router": "^3.0.1", | "strip-json-comments": "^2.0.1", | ||
"vue-template-compiler": "^2.5.17", | "vue": "^2.6.8", | ||
"webpack": "^4.18.0", | "vue-router": "^3.0.1", | ||
"webpack-bundle-analyzer": "^3.0.3", | "vue-template-compiler": "^2.6.8", | ||
"webpack-virtual-modules": "^0.1.10" | "webpack": "^4.18.0", | ||
}, | "webpack-bundle-analyzer": "^3.0.3", | ||
"eslintConfig": { | "webpack-virtual-modules": "^0.1.10" | ||
"root": true, | }, | ||
"env": { | "eslintConfig": { | ||
"node": true | "root": true, | ||
}, | "env": { | ||
"extends": [ | "node": true | ||
"plugin:vue/recommended", | }, | ||
"standard" | "extends": [ | ||
], | "plugin:vue/recommended", | ||
"globals": { | "standard" | ||
"getApp": true, | ], | ||
"getCurrentPages": true, | "globals": { | ||
"plus": true, | "App": true, | ||
"uni": true, | "Page": true, | ||
"Vue": true, | "Component": true, | ||
"wx": true, | "getApp": true, | ||
"my": true, | "getCurrentPages": true, | ||
"swan": true, | "plus": true, | ||
"__uniConfig": true, | "uni": true, | ||
"__uniRoutes": true, | "Vue": true, | ||
"UniViewJSBridge": true, | "wx": true, | ||
"UniServiceJSBridge": true, | "my": true, | ||
"__PLATFORM__": true, | "swan": true, | ||
"__VERSION__": true, | "__uniConfig": true, | ||
"__GLOBAL__": true, | "__uniRoutes": true, | ||
"__PLATFORM_TITLE__": true | "UniViewJSBridge": true, | ||
}, | "UniServiceJSBridge": true, | ||
"rules": { | "__PLATFORM__": true, | ||
"no-tabs": 0, | "__VERSION__": true, | ||
"standard/no-callback-literal": 0 | "__GLOBAL__": true, | ||
}, | "__PLATFORM_TITLE__": true | ||
"parserOptions": { | }, | ||
"parser": "babel-eslint" | "rules": { | ||
} | "no-tabs": 0, | ||
}, | "standard/no-callback-literal": 0 | ||
"browserslist": [ | }, | ||
"last 3 versions", | "parserOptions": { | ||
"Android >= 4.1", | "parser": "babel-eslint" | ||
"ios >= 8" | } | ||
], | }, | ||
"license": "Apache-2.0", | "browserslist": [ | ||
"main": "index.js", | "last 3 versions", | ||
"description": "", | "Android >= 4.1", | ||
"author": "" | "ios >= 8" | ||
], | |||
"license": "Apache-2.0", | |||
"main": "index.js", | |||
"description": "", | |||
"author": "" | |||
} | } |
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
src/core/runtime/wrapper/util.js
0 → 100644
想要评论请 注册 或 登录