diff --git a/package.json b/package.json index 1c4c9078b..578919377 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "license": "MIT", "dependencies": { "@babel/runtime": "^7.1.5", - "@vant/icons": "^1.0.1", + "@vant/icons": "^1.0.2", "vue-lazyload": "1.2.3" }, "peerDependencies": { @@ -70,21 +70,21 @@ "@babel/plugin-syntax-dynamic-import": "^7.0.0", "@babel/plugin-transform-object-assign": "^7.0.0", "@babel/plugin-transform-runtime": "^7.1.0", - "@babel/polyfill": "^7.0.0", - "@babel/preset-env": "^7.1.6", + "@babel/polyfill": "^7.2.5", + "@babel/preset-env": "^7.2.3", "@vant/compiler": "^1.0.0", "@vant/doc": "^1.0.20", - "@vant/eslint-config": "^1.0.7", + "@vant/eslint-config": "^1.0.8", "@vant/markdown-loader": "^1.0.3", "@vue/server-test-utils": "^1.0.0-beta.26", "@vue/test-utils": "^1.0.0-beta.26", - "autoprefixer": "^9.3.1", + "autoprefixer": "^9.4.3", "babel-core": "^7.0.0-0", "babel-jest": "^23.6.0", "babel-loader": "^8.0.4", "codecov": "^3.1.0", "cross-env": "^5.2.0", - "css-loader": "^2.0.1", + "css-loader": "^2.0.2", "dependency-tree": "^6.3.0", "eslint": "^5.9.0", "fast-glob": "^2.2.4", @@ -101,7 +101,7 @@ "less-loader": "^4.1.0", "lint-staged": "^8.1.0", "markdown-vetur": "0.0.5", - "postcss": "^7.0.6", + "postcss": "^7.0.7", "postcss-loader": "^3.0.0", "progress-bar-webpack-plugin": "^1.11.0", "rimraf": "^2.5.4", @@ -119,7 +119,7 @@ "vue-server-renderer": "^2.5.17", "vue-template-compiler": "2.5.21", "vue-template-es2015-compiler": "^1.6.0", - "webpack": "^4.26.1", + "webpack": "^4.28.1", "webpack-cli": "^3.1.2", "webpack-serve": "^2.0.3" }, diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue index de63edefe..c14a86f23 100644 --- a/packages/address-edit/Detail.vue +++ b/packages/address-edit/Detail.vue @@ -27,7 +27,7 @@ :key="express.name + express.address" :title="express.name" :label="express.address" - icon="location" + icon="location-o" clickable @click="onSelect(express)" /> diff --git a/packages/address-edit/test/index.spec.js b/packages/address-edit/test/index.spec.js index c05bb375f..d40656d2e 100644 --- a/packages/address-edit/test/index.spec.js +++ b/packages/address-edit/test/index.spec.js @@ -195,7 +195,7 @@ test('show search result', async () => { const input = field.element; field.trigger('focus'); - const items = wrapper.findAll('.van-icon-location'); + const items = wrapper.findAll('.van-icon-location-o'); items.at(0).element.parentNode.click(); expect(input.value).toEqual('address1 name1'); items.at(1).element.parentNode.click(); diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue index 751d430d4..5e56301f0 100644 --- a/packages/sku/components/SkuImgUploader.vue +++ b/packages/sku/components/SkuImgUploader.vue @@ -12,7 +12,7 @@ diff --git a/packages/sku/index.less b/packages/sku/index.less index 51d346674..e8b98db6f 100644 --- a/packages/sku/index.less +++ b/packages/sku/index.less @@ -179,11 +179,12 @@ display: inline-block; &__header { + color: @text-color; padding: 0 10px; - border: 1px solid @border-color; + font-size: 12px; line-height: 24px; border-radius: 3px; - font-size: 12px; + border: 1px solid @border-color; .van-icon { top: 3px; diff --git a/yarn.lock b/yarn.lock index 137230705..88bf3901c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,16 +496,16 @@ "@babel/helper-regex" "^7.0.0" regexpu-core "^4.1.3" -"@babel/polyfill@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.0.0.tgz#c8ff65c9ec3be6a1ba10113ebd40e8750fb90bff" +"@babel/polyfill@^7.2.5": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.2.5.tgz#6c54b964f71ad27edddc567d065e57e87ed7fa7d" dependencies: core-js "^2.5.7" - regenerator-runtime "^0.11.1" + regenerator-runtime "^0.12.0" -"@babel/preset-env@^7.1.6": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.2.0.tgz#a5030e7e4306af5a295dd5d7c78dc5464af3fee2" +"@babel/preset-env@^7.2.3": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.2.3.tgz#948c8df4d4609c99c7e0130169f052ea6a7a8933" dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" @@ -696,18 +696,18 @@ nprogress "^0.2.0" shelljs "^0.8.2" -"@vant/eslint-config@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-1.0.7.tgz#57a91567998a459b98baf8d459163c1c0f40a5c8" +"@vant/eslint-config@^1.0.8": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@vant/eslint-config/-/eslint-config-1.0.8.tgz#213358538f6335c06cf8f944b01e308f2aec2aef" dependencies: babel-eslint "^10.0.1" eslint-config-airbnb-base "^13.1.0" eslint-plugin-import "^2.14.0" eslint-plugin-vue "^5.0.0" -"@vant/icons@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.0.1.tgz#e098f90b8420655b7caf0047b2e33c6115bf5c5c" +"@vant/icons@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vant/icons/-/icons-1.0.2.tgz#13d58d06a88609d036364e0ab657cb1e8136d402" "@vant/markdown-loader@^1.0.3": version "1.0.3" @@ -1262,7 +1262,7 @@ atob@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" -autoprefixer@^9.0.0, autoprefixer@^9.3.1: +autoprefixer@^9.0.0: version "9.4.2" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.2.tgz#0234d20900684fc4bfb67926493deb68384067f5" dependencies: @@ -1273,6 +1273,17 @@ autoprefixer@^9.0.0, autoprefixer@^9.3.1: postcss "^7.0.6" postcss-value-parser "^3.3.1" +autoprefixer@^9.4.3: + version "9.4.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9" + dependencies: + browserslist "^4.3.6" + caniuse-lite "^1.0.30000921" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.6" + postcss-value-parser "^3.3.1" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -1637,6 +1648,14 @@ browserslist@^4.3.4, browserslist@^4.3.5: electron-to-chromium "^1.3.86" node-releases "^1.0.5" +browserslist@^4.3.6: + version "4.3.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a" + dependencies: + caniuse-lite "^1.0.30000921" + electron-to-chromium "^1.3.92" + node-releases "^1.1.1" + bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" @@ -1772,6 +1791,10 @@ caniuse-lite@^1.0.30000912, caniuse-lite@^1.0.30000914: version "1.0.30000919" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000919.tgz#ddbb34d20103b210048ad725b47805700c4deb4b" +caniuse-lite@^1.0.30000921: + version "1.0.30000923" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000923.tgz#148f9bda508024b5ce957b463ae2e8302b451bb2" + capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -2270,16 +2293,16 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" -css-loader@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.0.1.tgz#2e51a15449ab3f7195b7e1bc00a407460016a3b3" +css-loader@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.0.2.tgz#5b02031745ba6d6721bcecad39daaea9804e30d3" dependencies: icss-utils "^4.0.0" loader-utils "^1.0.2" lodash "^4.17.11" postcss "^7.0.6" postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^2.0.2" + postcss-modules-local-by-default "^2.0.3" postcss-modules-scope "^2.0.0" postcss-modules-values "^2.0.0" postcss-value-parser "^3.3.0" @@ -2768,6 +2791,10 @@ electron-to-chromium@^1.3.86: version "1.3.91" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.91.tgz#d74437a753b122aa6eca7c722055004d3627635d" +electron-to-chromium@^1.3.92: + version "1.3.96" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a" + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -6268,6 +6295,12 @@ node-releases@^1.0.5: dependencies: semver "^5.3.0" +node-releases@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.2.tgz#93c17fba5eec8650ad908de5433fa8763baebe4d" + dependencies: + semver "^5.3.0" + node-source-walk@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-4.1.0.tgz#f30bc418a80b6daf45365d0f8ab8b46d4a90c16d" @@ -6944,9 +6977,9 @@ postcss-modules-extract-imports@^2.0.0: dependencies: postcss "^7.0.5" -postcss-modules-local-by-default@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.2.tgz#edfd6a874d326b52daaa3014bfc11e9e4b0cfafc" +postcss-modules-local-by-default@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.3.tgz#6a199d596ec3ef57b8f5ced96d786b8cb16a7dec" dependencies: css-selector-tokenizer "^0.7.0" postcss "^7.0.6" @@ -7042,6 +7075,14 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.3, postcss@^7.0.5, source-map "^0.6.1" supports-color "^5.5.0" +postcss@^7.0.7: + version "7.0.7" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614" + dependencies: + chalk "^2.4.1" + source-map "^0.6.1" + supports-color "^5.5.0" + precinct@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/precinct/-/precinct-5.1.0.tgz#fdcea2c66852d42e4e1c749b1f9c6a462fdd4952" @@ -7393,7 +7434,7 @@ regenerate@^1.2.1, regenerate@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" -regenerator-runtime@^0.11.0, regenerator-runtime@^0.11.1: +regenerator-runtime@^0.11.0: version "0.11.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" @@ -9195,9 +9236,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.26.1: - version "4.27.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.27.1.tgz#5f2e2db446d2266376fa15d7d2277a1a9c2e12bb" +webpack@^4.28.1: + version "4.28.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.28.1.tgz#d0e2856e75d1224b170bf16c30b6ca9b75f0d958" dependencies: "@webassemblyjs/ast" "1.7.11" "@webassemblyjs/helper-module-context" "1.7.11"