From fb8392e25c2db39e82cfba54954378bc9a4c54c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E7=99=BB=E8=8D=A3?= Date: Sun, 4 Aug 2019 10:17:10 +0800 Subject: [PATCH 1/2] chore: update .editorconfig and add commit msg lint --- .editorconfig | 7 +- commitlint.config.js | 23 ++ gulpfile.js | 5 +- package.json | 7 +- src/component/calendar/index.wxss | 166 +++++------ yarn.lock | 463 +++++++++++++++++++++++++++++- 6 files changed, 569 insertions(+), 102 deletions(-) create mode 100644 commitlint.config.js diff --git a/.editorconfig b/.editorconfig index e72a1df..a18c60a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,5 +5,10 @@ indent_style = sapce indent_size = 2 end_of_line = lf charset = utf-8 +insert_final_newline = true trim_trailing_whitespace = false -insert_final_newline = false \ No newline at end of file +translate_tabs_to_spaces = true + +[*.wxss] +trim_trailing_whitespace = false +indent_size = 4 diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 0000000..95d2902 --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1,23 @@ +module.exports = { + extends: ['@commitlint/config-conventional'], + rules: { + 'subject-case': [0, 'never'], + 'header-max-length': [0, 'always', 70], + 'type-enum': [ + 2, + 'always', + [ + 'docs', // Adds or alters documentation. + 'chore', // Other changes that don't modify src or test files. + 'feat', // Adds a new feature. + 'fix', // Solves a bug. + 'merge', // Merge branch ? of ?. + 'perf', // Improves performance. + 'refactor', // Rewrites code without feature, performance or bug changes. + 'revert', // Reverts a previous commit. + 'style', // Improves formatting, white-space. + 'test' // Adds or modifies tests. + ] + ] + } +}; diff --git a/gulpfile.js b/gulpfile.js index 1a4ed8d..1dc4077 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,13 +2,12 @@ const gulp = require('gulp'); const debug = require('gulp-debug'); const path = require('path'); -// 项目根目录配置 -const projRootDir = path.join(process.cwd(), 'src'); +const rootPath = path.join(__dirname, 'src'); function fileCopy() { return gulp .src(['src/**/*'], { - base: projRootDir + base: rootPath }) .pipe( debug({ diff --git a/package.json b/package.json index 8c50644..feb2b51 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,8 @@ "devDependencies": { "@babel/core": "^7.3.4", "@babel/preset-env": "^7.3.4", + "@commitlint/cli": "^8.1.0", + "@commitlint/config-conventional": "^8.1.0", "babel-eslint": "^8.2.1", "babel-jest": "^24.5.0", "eslint": "^4.17.0", @@ -31,7 +33,7 @@ }, "scripts": { "build": "rm -rf dist && gulp", - "dev": "gulp watch", + "dev": "npm run build && gulp watch", "test": "jest", "lint": "eslint src && stylelint \"src/**/*.wxss\"", "fix": "eslint src --fix && stylelint \"src/**/*.wxss\" --fix" @@ -43,7 +45,8 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "lint-staged", + "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } }, "lint-staged": { diff --git a/src/component/calendar/index.wxss b/src/component/calendar/index.wxss index 9a6ac44..0fb6970 100644 --- a/src/component/calendar/index.wxss +++ b/src/component/calendar/index.wxss @@ -1,206 +1,206 @@ @import './iconfont//iconfont.wxss'; .b { - display: flex; + display: flex; } .lr { - flex-direction: row; + flex-direction: row; } .tb { - flex-direction: column; + flex-direction: column; } .pc { - justify-content: center; + justify-content: center; } .ac { - align-items: center; + align-items: center; } .cc { - align-items: center; - justify-content: center; + align-items: center; + justify-content: center; } .box-wrap { - flex-wrap: wrap; + flex-wrap: wrap; } .flex { - flex-grow: 1; + flex-grow: 1; } .bg { - background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); - overflow: hidden; + background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); + overflow: hidden; } .pink-color { - color: #ff629a; + color: #ff629a; } .white-color { - color: #fff; + color: #fff; } .fs24 { - font-size: 24rpx; + font-size: 24rpx; } .fs28 { - font-size: 28rpx; + font-size: 28rpx; } .fs32 { - font-size: 32rpx; + font-size: 32rpx; } .fs36 { - font-size: 36rpx; + font-size: 36rpx; } .calendar { - width: 100%; - box-sizing: border-box; + width: 100%; + box-sizing: border-box; } .top-handle { - height: 80rpx; + height: 80rpx; } .prev-handle, .next-handle { - padding: 20rpx; + padding: 20rpx; } .date-area { - height: 80rpx; + height: 80rpx; } .weeks { - height: 50rpx; - line-height: 50rpx; - opacity: 0.5; + height: 50rpx; + line-height: 50rpx; + opacity: 0.5; } .week { - text-align: center; + text-align: center; } .grid, .week { - width: 14.286014285714286%; + width: 14.286014285714286%; } .day { - width: 60rpx; - height: 60rpx; - font-size: 26rpx; - font-weight: 200; + width: 60rpx; + height: 60rpx; + font-size: 26rpx; + font-weight: 200; } .normal-day-color { - color: #88d2ac; + color: #88d2ac; } .day-choosed-color { - color: #fff; + color: #fff; } /* todo相关样式 */ .todo-dot { - width: 10rpx; - height: 10rpx; - border-radius: 50%; - background-color: #cc5226; - position: absolute; - left: 50%; - transform: translateX(-50%); + width: 10rpx; + height: 10rpx; + border-radius: 50%; + background-color: #cc5226; + position: absolute; + left: 50%; + transform: translateX(-50%); } .todo-text { - width: 150%; - font-size: 22rpx; - color: #c2c2c2; - position: absolute; - left: 50%; - transform: translateX(-50%); - overflow: hidden; - word-break: break-all; - text-overflow: ellipsis; - white-space: nowrap; - -webkit-line-clamp: 1; - text-align: center; + width: 150%; + font-size: 22rpx; + color: #c2c2c2; + position: absolute; + left: 50%; + transform: translateX(-50%); + overflow: hidden; + word-break: break-all; + text-overflow: ellipsis; + white-space: nowrap; + -webkit-line-clamp: 1; + text-align: center; } .todo-dot-top { - top: 8rpx; + top: 8rpx; } .todo-dot.todo-dot-bottom { - bottom: 0; + bottom: 0; } .todo-text.todo-text-top { - top: -6rpx; + top: -6rpx; } .todo-text.todo-text-bottom { - bottom: -8rpx; + bottom: -8rpx; } .dot-day-height { - height: 72rpx; - position: relative; - left: 0; - top: 0; + height: 72rpx; + position: relative; + left: 0; + top: 0; } /* 不可选日期 */ .disable-day-color { - color: #cacaca; + color: #cacaca; } .disable-day-bg { - background-color: #f6f6f7; + background-color: #f6f6f7; } /* 日期圆圈标记 */ .day-circle { - border: 1rpx solid #88d2ac; - box-sizing: border-box; + border: 1rpx solid #88d2ac; + box-sizing: border-box; } .border-radius { - border-radius: 50%; - position: relative; - left: 0; - top: 0; + border-radius: 50%; + position: relative; + left: 0; + top: 0; } /* 日期选中 */ .day-choosed-bg { - background-color: #ff629a; - transition: all 0.3s; - animation-name: choosed; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: 1; + background-color: #ff629a; + transition: all 0.3s; + animation-name: choosed; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: 1; } @keyframes choosed { - from { - transform: scale(1); - } + from { + transform: scale(1); + } - 50% { - transform: scale(0.9); - } + 50% { + transform: scale(0.9); + } - to { - transform: scale(1); - } + to { + transform: scale(1); + } } diff --git a/yarn.lock b/yarn.lock index 3a7a31d..8e53176 100644 --- a/yarn.lock +++ b/yarn.lock @@ -687,6 +687,136 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@commitlint/cli@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/cli/download/@commitlint/cli-8.1.0.tgz#a3d4236c0ac961d7026a53d728b179c696d6a045" + integrity sha1-o9QjbArJYdcCalPXKLF5xpbWoEU= + dependencies: + "@commitlint/format" "^8.1.0" + "@commitlint/lint" "^8.1.0" + "@commitlint/load" "^8.1.0" + "@commitlint/read" "^8.1.0" + babel-polyfill "6.26.0" + chalk "2.3.1" + get-stdin "7.0.0" + lodash "4.17.14" + meow "5.0.0" + resolve-from "5.0.0" + resolve-global "1.0.0" + +"@commitlint/config-conventional@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/config-conventional/download/@commitlint/config-conventional-8.1.0.tgz#ba61fbf0ad4df52da2b5ee3034470371a2cbf039" + integrity sha1-umH78K1N9S2ite4wNEcDcaLL8Dk= + +"@commitlint/ensure@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/ensure/download/@commitlint/ensure-8.1.0.tgz#6c669f85c3005ed15c8141d83cf5312c43001613" + integrity sha1-bGafhcMAXtFcgUHYPPUxLEMAFhM= + dependencies: + lodash "4.17.14" + +"@commitlint/execute-rule@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/execute-rule/download/@commitlint/execute-rule-8.1.0.tgz#e8386bd0836b3dcdd41ebb9d5904bbeb447e4715" + integrity sha1-6Dhr0INrPc3UHrudWQS760R+RxU= + +"@commitlint/format@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/format/download/@commitlint/format-8.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40commitlint%2Fformat%2Fdownload%2F%40commitlint%2Fformat-8.1.0.tgz#c3f3ca78bb74cbc1cce1368c0974b0cb8f31b98e" + integrity sha1-w/PKeLt0y8HM4TaMCXSwy48xuY4= + dependencies: + chalk "^2.0.1" + +"@commitlint/is-ignored@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/is-ignored/download/@commitlint/is-ignored-8.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40commitlint%2Fis-ignored%2Fdownload%2F%40commitlint%2Fis-ignored-8.1.0.tgz#c0583fa3c641b2d4898be1443e70e9c467429de2" + integrity sha1-wFg/o8ZBstSJi+FEPnDpxGdCneI= + dependencies: + "@types/semver" "^6.0.1" + semver "6.1.1" + +"@commitlint/lint@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/lint/download/@commitlint/lint-8.1.0.tgz#ad10f4885c06f14c71de11dcd6bf2ca54a395141" + integrity sha1-rRD0iFwG8Uxx3hHc1r8spUo5UUE= + dependencies: + "@commitlint/is-ignored" "^8.1.0" + "@commitlint/parse" "^8.1.0" + "@commitlint/rules" "^8.1.0" + babel-runtime "^6.23.0" + lodash "4.17.14" + +"@commitlint/load@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/load/download/@commitlint/load-8.1.0.tgz#63b72ae5bb9152b8fa5b17c5428053032a9a49c8" + integrity sha1-Y7cq5buRUrj6WxfFQoBTAyqaScg= + dependencies: + "@commitlint/execute-rule" "^8.1.0" + "@commitlint/resolve-extends" "^8.1.0" + babel-runtime "^6.23.0" + chalk "2.4.2" + cosmiconfig "^5.2.0" + lodash "4.17.14" + resolve-from "^5.0.0" + +"@commitlint/message@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/message/download/@commitlint/message-8.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40commitlint%2Fmessage%2Fdownload%2F%40commitlint%2Fmessage-8.1.0.tgz#8fb8046ddaa7e5c846a79da7cdbd15cf1a7770ae" + integrity sha1-j7gEbdqn5chGp52nzb0Vzxp3cK4= + +"@commitlint/parse@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/parse/download/@commitlint/parse-8.1.0.tgz#833243c6d848e7a7e775a283b38697166ed2fd22" + integrity sha1-gzJDxthI56fndaKDs4aXFm7S/SI= + dependencies: + conventional-changelog-angular "^1.3.3" + conventional-commits-parser "^2.1.0" + lodash "^4.17.11" + +"@commitlint/read@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/read/download/@commitlint/read-8.1.0.tgz#effe07c965ba1735a5f7f8b7b19ac4d98c887507" + integrity sha1-7/4HyWW6FzWl9/i3sZrE2YyIdQc= + dependencies: + "@commitlint/top-level" "^8.1.0" + "@marionebl/sander" "^0.6.0" + babel-runtime "^6.23.0" + git-raw-commits "^1.3.0" + +"@commitlint/resolve-extends@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/resolve-extends/download/@commitlint/resolve-extends-8.1.0.tgz#ed67f2ee484160ac8e0078bae52f172625157472" + integrity sha1-7Wfy7khBYKyOAHi65S8XJiUVdHI= + dependencies: + "@types/node" "^12.0.2" + import-fresh "^3.0.0" + lodash "4.17.14" + resolve-from "^5.0.0" + resolve-global "^1.0.0" + +"@commitlint/rules@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/rules/download/@commitlint/rules-8.1.0.tgz#009c64a8a23feb4647e5a25057997be62a272c8a" + integrity sha1-AJxkqKI/60ZH5aJQV5l75ionLIo= + dependencies: + "@commitlint/ensure" "^8.1.0" + "@commitlint/message" "^8.1.0" + "@commitlint/to-lines" "^8.1.0" + babel-runtime "^6.23.0" + +"@commitlint/to-lines@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/to-lines/download/@commitlint/to-lines-8.1.0.tgz#5bf2597f46acacec4b1b3dba832ac8934798b22a" + integrity sha1-W/JZf0asrOxLGz26gyrIk0eYsio= + +"@commitlint/top-level@^8.1.0": + version "8.1.0" + resolved "https://registry.npm.taobao.org/@commitlint/top-level/download/@commitlint/top-level-8.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40commitlint%2Ftop-level%2Fdownload%2F%40commitlint%2Ftop-level-8.1.0.tgz#f1950de73a1f76ef5c9e753a6b77402e0755d677" + integrity sha1-8ZUN5zofdu9cnnU6a3dALgdV1nc= + dependencies: + find-up "^4.0.0" + "@jest/console@^24.3.0": version "24.3.0" resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.3.0.tgz#7bd920d250988ba0bf1352c4493a48e1cb97671e" @@ -824,6 +954,15 @@ "@types/istanbul-lib-coverage" "^1.1.0" "@types/yargs" "^12.0.9" +"@marionebl/sander@^0.6.0": + version "0.6.1" + resolved "https://registry.npm.taobao.org/@marionebl/sander/download/@marionebl/sander-0.6.1.tgz#1958965874f24bc51be48875feb50d642fc41f7b" + integrity sha1-GViWWHTyS8Ub5Ih1/rUNZC/EH3s= + dependencies: + graceful-fs "^4.1.3" + mkdirp "^0.5.1" + rimraf "^2.5.2" + "@samverschueren/stream-to-observable@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" @@ -874,6 +1013,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.6.tgz#df929d1bb2eee5afdda598a41930fe50b43eaa6a" integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== +"@types/node@^12.0.2": + version "12.6.9" + resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-12.6.9.tgz#ffeee23afdc19ab16e979338e7b536fdebbbaeaf" + integrity sha1-/+7iOv3BmrFul5M457U2/eu7rq8= + +"@types/semver@^6.0.1": + version "6.0.1" + resolved "https://registry.npm.taobao.org/@types/semver/download/@types/semver-6.0.1.tgz#a984b405c702fa5a7ec6abc56b37f2ba35ef5af6" + integrity sha1-qYS0BccC+lp+xqvFazfyujXvWvY= + "@types/stack-utils@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" @@ -892,6 +1041,14 @@ JSONStream@^0.8.4: jsonparse "0.0.5" through ">=2.2.7 <3" +JSONStream@^1.0.4: + version "1.3.5" + resolved "https://registry.npm.taobao.org/JSONStream/download/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" + integrity sha1-MgjB8I06TZkmGrZPkjArwV4RHKA= + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + abab@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" @@ -1131,6 +1288,11 @@ array-find-index@^1.0.1: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= +array-ify@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/array-ify/download/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece" + integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4= + array-initial@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795" @@ -1337,6 +1499,15 @@ babel-plugin-jest-hoist@^24.3.0: dependencies: "@types/babel__traverse" "^7.0.6" +babel-polyfill@6.26.0: + version "6.26.0" + resolved "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" + integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= + dependencies: + babel-runtime "^6.26.0" + core-js "^2.5.0" + regenerator-runtime "^0.10.5" + babel-preset-jest@^24.3.0: version "24.3.0" resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.3.0.tgz#db88497e18869f15b24d9c0e547d8e0ab950796d" @@ -1345,6 +1516,14 @@ babel-preset-jest@^24.3.0: "@babel/plugin-syntax-object-rest-spread" "^7.0.0" babel-plugin-jest-hoist "^24.3.0" +babel-runtime@^6.23.0, babel-runtime@^6.26.0: + version "6.26.0" + resolved "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + dependencies: + core-js "^2.4.0" + regenerator-runtime "^0.11.0" + babylon@7.0.0-beta.44: version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" @@ -1607,6 +1786,24 @@ ccount@^1.0.0: resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff" integrity sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw== +chalk@2.3.1: + version "2.3.1" + resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" + integrity sha1-Uj/iZ4rsewToBBkJKS/osXBZt5Y= + dependencies: + ansi-styles "^3.2.0" + escape-string-regexp "^1.0.5" + supports-color "^5.2.0" + +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -1618,15 +1815,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - character-entities-html4@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz#c44fdde3ce66b52e8d321d6c1bf46101f0150610" @@ -1848,6 +2036,14 @@ commander@^2.14.1, commander@^2.9.0, commander@~2.19.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== +compare-func@^1.3.1: + version "1.3.2" + resolved "https://registry.npm.taobao.org/compare-func/download/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648" + integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg= + dependencies: + array-ify "^1.0.0" + dot-prop "^3.0.0" + compare-versions@^3.2.1: version "3.4.0" resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.4.0.tgz#e0747df5c9cb7f054d6d3dc3e1dbc444f9e92b26" @@ -1883,6 +2079,27 @@ contains-path@^0.1.0: resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= +conventional-changelog-angular@^1.3.3: + version "1.6.6" + resolved "https://registry.npm.taobao.org/conventional-changelog-angular/download/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f" + integrity sha1-sn8rMVwW0KHyPrGBMJ0OakaY6g8= + dependencies: + compare-func "^1.3.1" + q "^1.5.1" + +conventional-commits-parser@^2.1.0: + version "2.1.7" + resolved "https://registry.npm.taobao.org/conventional-commits-parser/download/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e" + integrity sha1-7KRe1hQNcrqXIu5BMmdNY55kTo4= + dependencies: + JSONStream "^1.0.4" + is-text-path "^1.0.0" + lodash "^4.2.1" + meow "^4.0.0" + split2 "^2.0.0" + through2 "^2.0.0" + trim-off-newlines "^1.0.0" + convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" @@ -1923,6 +2140,11 @@ core-js@3.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.0.0.tgz#a8dbfa978d29bfc263bfb66c556d0ca924c28957" integrity sha512-WBmxlgH2122EzEJ6GH8o9L/FeoUKxxxZ6q6VUxoTlsE4EvbTWKJb447eyVxTEuq0LpXjlq/kCB2qgBvsYRkLvQ== +core-js@^2.4.0, core-js@^2.5.0: + version "2.6.9" + resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.9.tgz?cache=0&sync_timestamp=1560599811627&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" + integrity sha1-a0shRiDINBUuF5Mjcn/Bl0GwhPI= + core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -1962,6 +2184,16 @@ cosmiconfig@^5.0.2, cosmiconfig@^5.0.7: lodash.get "^4.4.2" parse-json "^4.0.0" +cosmiconfig@^5.2.0: + version "5.2.1" + resolved "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" + integrity sha1-BA9yaAnFked6F8CjYmykW08Wixo= + dependencies: + import-fresh "^2.0.0" + is-directory "^0.3.1" + js-yaml "^3.13.1" + parse-json "^4.0.0" + cross-spawn@^5.0.1, cross-spawn@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -2031,6 +2263,13 @@ d@1: dependencies: es5-ext "^0.10.9" +dargs@^4.0.1: + version "4.1.0" + resolved "https://registry.npm.taobao.org/dargs/download/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17" + integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc= + dependencies: + number-is-nan "^1.0.0" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -2259,6 +2498,13 @@ domutils@^1.5.1: dom-serializer "0" domelementtype "1" +dot-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.npm.taobao.org/dot-prop/download/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" + integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc= + dependencies: + is-obj "^1.0.0" + dot-prop@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" @@ -2865,6 +3111,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.npm.taobao.org/find-up/download/find-up-4.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffind-up%2Fdownload%2Ffind-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + findup-sync@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -3021,6 +3275,11 @@ get-own-enumerable-property-symbols@^3.0.0: resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203" integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg== +get-stdin@7.0.0: + version "7.0.0" + resolved "https://registry.npm.taobao.org/get-stdin/download/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" + integrity sha1-jV3pjxUXGhJcXlFmQ8em0OqKlvY= + get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" @@ -3060,6 +3319,17 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +git-raw-commits@^1.3.0: + version "1.3.6" + resolved "https://registry.npm.taobao.org/git-raw-commits/download/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff" + integrity sha1-J8NaMqZ3d8Hs1BKiOabBnXG5Wv8= + dependencies: + dargs "^4.0.1" + lodash.template "^4.0.2" + meow "^4.0.0" + split2 "^2.0.0" + through2 "^2.0.0" + glob-base@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" @@ -3123,6 +3393,13 @@ glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +global-dirs@^0.1.1: + version "0.1.1" + resolved "https://registry.npm.taobao.org/global-dirs/download/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" + integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU= + dependencies: + ini "^1.3.4" + global-modules@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" @@ -3195,6 +3472,11 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== +graceful-fs@^4.1.3: + version "4.2.0" + resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" + integrity sha1-jY/cc5d8sEEEchy1NmbBymTNMos= + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -3429,6 +3711,14 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +import-fresh@^3.0.0: + version "3.1.0" + resolved "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" + integrity sha1-bTP6Hc7235MPrgA0RvM0Fa+QURg= + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-local@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d" @@ -3828,6 +4118,13 @@ is-symbol@^1.0.2: dependencies: has-symbols "^1.0.0" +is-text-path@^1.0.0: + version "1.0.1" + resolved "https://registry.npm.taobao.org/is-text-path/download/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e" + integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4= + dependencies: + text-extensions "^1.0.0" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -4366,6 +4663,14 @@ js-yaml@^3.12.0, js-yaml@^3.4.3, js-yaml@^3.9.0, js-yaml@^3.9.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^3.13.1: + version "3.13.1" + resolved "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" + integrity sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc= + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -4465,6 +4770,11 @@ jsonparse@0.0.5: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64" integrity sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ= +jsonparse@^1.2.0: + version "1.3.1" + resolved "https://registry.npm.taobao.org/jsonparse/download/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" + integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -4714,6 +5024,18 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.npm.taobao.org/locate-path/download/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= + dependencies: + p-locate "^4.1.0" + +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.npm.taobao.org/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" @@ -4724,11 +5046,36 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= +lodash.template@^4.0.2: + version "4.5.0" + resolved "https://registry.npm.taobao.org/lodash.template/download/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha1-+XYZXPPzR9DV9SSDVp/oAxzM6Ks= + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.npm.taobao.org/lodash.templatesettings/download/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha1-5IExDwSdPPbUfpEq0JMTsVTw+zM= + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash@4.17.14: + version "4.17.14" + resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.14.tgz?cache=0&sync_timestamp=1563508077056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.14.tgz#9ce487ae66c96254fe20b599f21b6816028078ba" + integrity sha1-nOSHrmbJYlT+ILWZ8htoFgKAeLo= + lodash@^4.0.0, lodash@^4.1.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.2.1: + version "4.17.15" + resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&sync_timestamp=1563508077056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" + integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg= + log-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" @@ -4876,6 +5223,21 @@ mem@^4.0.0: mimic-fn "^2.0.0" p-is-promise "^2.0.0" +meow@5.0.0: + version "5.0.0" + resolved "https://registry.npm.taobao.org/meow/download/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" + integrity sha1-38c9Y6mvxxSl43F2DrXIi5EHiqQ= + dependencies: + camelcase-keys "^4.0.0" + decamelize-keys "^1.0.0" + loud-rejection "^1.0.0" + minimist-options "^3.0.1" + normalize-package-data "^2.3.4" + read-pkg-up "^3.0.0" + redent "^2.0.0" + trim-newlines "^2.0.0" + yargs-parser "^10.0.0" + meow@^3.3.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -5471,7 +5833,7 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" -p-limit@^2.0.0: +p-limit@^2.0.0, p-limit@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2" integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ== @@ -5492,6 +5854,13 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.npm.taobao.org/p-locate/download/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= + dependencies: + p-limit "^2.2.0" + p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" @@ -5517,6 +5886,13 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.1.0.tgz#c1a0f1030e97de018bb2c718929d2af59463e505" integrity sha512-H2RyIJ7+A3rjkwKC2l5GGtU4H1vkxKCAGsWasNVd0Set+6i4znxbWy6/j16YDPJDWxhsgZiKAstMEP8wCdSpjA== +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI= + dependencies: + callsites "^3.0.0" + parse-entities@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.1.tgz#2c761ced065ba7dc68148580b5a225e4918cdd69" @@ -5607,6 +5983,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.npm.taobao.org/path-exists/download/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -5999,6 +6380,11 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +q@^1.5.1: + version "1.5.1" + resolved "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" + integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -6201,6 +6587,16 @@ regenerate@^1.4.0: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== +regenerator-runtime@^0.10.5: + version "0.10.5" + resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" + integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= + +regenerator-runtime@^0.11.0: + version "0.11.1" + resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk= + regenerator-transform@^0.13.4: version "0.13.4" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.13.4.tgz#18f6763cf1382c69c36df76c6ce122cc694284fb" @@ -6445,6 +6841,11 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1: expand-tilde "^2.0.0" global-modules "^1.0.0" +resolve-from@5.0.0, resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= + resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" @@ -6460,6 +6861,13 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-global@1.0.0, resolve-global@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/resolve-global/download/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255" + integrity sha1-oqed9K8so/Sb93753azTItrRklU= + dependencies: + global-dirs "^0.1.1" + resolve-options@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" @@ -6497,7 +6905,7 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: +rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== @@ -6594,6 +7002,11 @@ semver-greatest-satisfied-range@^1.1.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== +semver@6.1.1: + version "6.1.1" + resolved "https://registry.npm.taobao.org/semver/download/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b" + integrity sha1-U/U9qbMLIQPNTxXqs6GOy8shDJs= + set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" @@ -6789,6 +7202,13 @@ split2@^0.2.1: dependencies: through2 "~0.6.1" +split2@^2.0.0: + version "2.2.0" + resolved "https://registry.npm.taobao.org/split2/download/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" + integrity sha1-GGsldbz4PoW30YRldWI47k7kJJM= + dependencies: + through2 "^2.0.2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -7150,7 +7570,7 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^5.3.0, supports-color@^5.4.0: +supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -7241,6 +7661,11 @@ test-exclude@^5.0.0: read-pkg-up "^4.0.0" require-main-filename "^1.0.1" +text-extensions@^1.0.0: + version "1.9.0" + resolved "https://registry.npm.taobao.org/text-extensions/download/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" + integrity sha1-GFPkX+45yUXOb2w2stZZtaq8KiY= + text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -7267,7 +7692,7 @@ through2@^0.6.1, through2@^0.6.3, through2@~0.6.1: readable-stream ">=1.0.33-1 <1.1.0-0" xtend ">=4.0.0 <4.1.0-0" -through2@^2.0.0, through2@^2.0.3, through2@~2.0.0: +through2@^2.0.0, through2@^2.0.2, through2@^2.0.3, through2@~2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== @@ -7382,6 +7807,11 @@ trim-newlines@^2.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= +trim-off-newlines@^1.0.0: + version "1.0.1" + resolved "https://registry.npm.taobao.org/trim-off-newlines/download/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" + integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= + trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" @@ -7887,6 +8317,13 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== +yargs-parser@^10.0.0: + version "10.1.0" + resolved "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" + integrity sha1-cgImW4n36eny5XZeD+c1qQXtuqg= + dependencies: + camelcase "^4.1.0" + yargs-parser@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" From 9420704bdd94e0574acadd70f2640a66145d24c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E7=99=BB=E8=8D=A3?= Date: Sun, 4 Aug 2019 10:36:34 +0800 Subject: [PATCH 2/2] chore: improves formatting and white-space --- package.json | 14 +- src/component/calendar/iconfont/iconfont.wxss | 24 +- src/pages/calendar/index.wxss | 224 ++++++++-------- src/pages/calendarTemplate/index.wxss | 11 +- src/pages/datepickerTemplate/index.wxss | 20 +- src/pages/index/index.wxss | 38 +-- src/template/calendar/index.wxss | 236 ++++++++-------- src/template/datepicker/index.wxss | 252 +++++++++--------- stylelint.config.js | 2 +- 9 files changed, 411 insertions(+), 410 deletions(-) diff --git a/package.json b/package.json index feb2b51..c6ca383 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,8 @@ "dev": "npm run build && gulp watch", "test": "jest", "lint": "eslint src && stylelint \"src/**/*.wxss\"", - "fix": "eslint src --fix && stylelint \"src/**/*.wxss\" --fix" + "fix:js": "eslint src --fix", + "fix:wxss": "stylelint \"src/**/*.wxss\" --fix" }, "jest": { "setupFiles": [ @@ -50,9 +51,14 @@ } }, "lint-staged": { - "*.{js,css}": [ - "prettier --single-quote --write", - "git add" + "*.js": [ + "npm run fix:js", + "prettier --write", + "git add ." + ], + "*.wxss": [ + "npm run fix:wxss", + "git add ." ] }, "repository": { diff --git a/src/component/calendar/iconfont/iconfont.wxss b/src/component/calendar/iconfont/iconfont.wxss index 4dad5d0..d84a896 100644 --- a/src/component/calendar/iconfont/iconfont.wxss +++ b/src/component/calendar/iconfont/iconfont.wxss @@ -1,30 +1,30 @@ @font-face { - font-family: 'iconfont'; - src: url(data:font/truetype;charset=utf-8;base64,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) format('truetype'); - font-weight: normal; - font-style: normal; + font-family: 'iconfont'; + src: url(data:font/truetype;charset=utf-8;base64,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) format('truetype'); + font-weight: normal; + font-style: normal; } .iconfont { - font-family: "iconfont" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; } .icon-right::before { - content: "\e7eb"; + content: "\e7eb"; } .icon-left::before { - content: "\e7ec"; + content: "\e7ec"; } .icon-doubleleft::before { - content: "\e7ed"; + content: "\e7ed"; } .icon-doubleright::before { - content: "\e7ee"; + content: "\e7ee"; } diff --git a/src/pages/calendar/index.wxss b/src/pages/calendar/index.wxss index 940f400..a8bb506 100644 --- a/src/pages/calendar/index.wxss +++ b/src/pages/calendar/index.wxss @@ -1,291 +1,291 @@ page { - background-color: #fff; - display: flex; - flex-direction: column; - width: 100%; - height: 100%; + background-color: #fff; + display: flex; + flex-direction: column; + width: 100%; + height: 100%; } .box { - display: flex; + display: flex; } .box-lr { - flex-direction: row; + flex-direction: row; } .box-rl { - flex-direction: row-reverse; + flex-direction: row-reverse; } .box-tb { - flex-direction: column; + flex-direction: column; } .box-bt { - flex-direction: column-reverse; + flex-direction: column-reverse; } .box-pack-center { - justify-content: center; + justify-content: center; } .box-pack-start { - justify-content: flex-start; + justify-content: flex-start; } .box-pack-end { - justify-content: flex-end; + justify-content: flex-end; } .box-pack-between { - justify-content: space-between; + justify-content: space-between; } .box-pack-around { - justify-content: space-around; + justify-content: space-around; } .box-align-center { - align-items: center; + align-items: center; } .box-align-start { - align-items: flex-start; + align-items: flex-start; } .box-align-end { - align-items: flex-end; + align-items: flex-end; } .self-align-center { - align-self: center; - margin: 0 auto; + align-self: center; + margin: 0 auto; } .self-align-start { - align-self: flex-start; + align-self: flex-start; } .self-align-end { - align-self: flex-end; + align-self: flex-end; } .self-align-stretch { - align-self: stretch; + align-self: stretch; } .box-wrap { - flex-wrap: wrap; + flex-wrap: wrap; } .box-nowrap { - flex-wrap: nowrap; + flex-wrap: nowrap; } .flex { - flex-grow: 1; + flex-grow: 1; } .shrink { - flex-shrink: 1; + flex-shrink: 1; } .bg { - background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); - overflow: hidden; + background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); + overflow: hidden; } .brown-color { - color: #784344; + color: #784344; } .pink-color { - color: #ff629a; + color: #ff629a; } .white-color { - color: #fff; + color: #fff; } .fs24 { - font-size: 24rpx; + font-size: 24rpx; } .fs28 { - font-size: 28rpx; + font-size: 28rpx; } .fs32 { - font-size: 32rpx; + font-size: 32rpx; } .fs36 { - font-size: 36rpx; + font-size: 36rpx; } .top-handle { - height: 80rpx; + height: 80rpx; } .prev { - text-align: right; - height: 80rpx; + text-align: right; + height: 80rpx; } .next { - height: 80rpx; + height: 80rpx; } .prev-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .next-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .date-area { - width: 50%; - height: 80rpx; - text-align: center; + width: 50%; + height: 80rpx; + text-align: center; } .weeks { - height: 50rpx; - line-height: 50rpx; - opacity: 0.5; + height: 50rpx; + line-height: 50rpx; + opacity: 0.5; } .week { - text-align: center; + text-align: center; } .days { - height: 500rpx; + height: 500rpx; } .grid { - width: 107.1428571429rpx; + width: 107.1428571429rpx; } .day { - width: 60rpx; - height: 60rpx; - color: #88d2ac; - font-size: 26rpx; - font-weight: 200; + width: 60rpx; + height: 60rpx; + color: #88d2ac; + font-size: 26rpx; + font-weight: 200; } .border-radius { - border-radius: 50%; - position: relative; - left: 0; - top: 0; - color: #fff; + border-radius: 50%; + position: relative; + left: 0; + top: 0; + color: #fff; } .day-choosed-bg { - background-color: #ff629a; + background-color: #ff629a; } .purple-bg { - background-color: #b8b8f1; + background-color: #b8b8f1; } .right-triangle::after { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-left-color: #ff629a; - position: absolute; - right: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-left-color: #ff629a; + position: absolute; + right: -22rpx; + top: 18rpx; } .left-triangle::before { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-right-color: #ff629a; - position: absolute; - left: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-right-color: #ff629a; + position: absolute; + left: -22rpx; + top: 18rpx; } .tips { - text-align: center; - margin-top: 20rpx; - margin-bottom: 20rpx; + text-align: center; + margin-top: 20rpx; + margin-bottom: 20rpx; } .types { - background-color: #ffedf4; - height: 50rpx; + background-color: #ffedf4; + height: 50rpx; } .types-desc { - padding: 0 20rpx; + padding: 0 20rpx; } .type-name { - margin-top: 50rpx; - margin-bottom: 30rpx; + margin-top: 50rpx; + margin-bottom: 30rpx; } .type-desc { - padding: 0 35rpx; - line-height: 38rpx; + padding: 0 35rpx; + line-height: 38rpx; } .explain { - border-top: 1px solid #eee; - width: 90%; - margin: 20rpx 5% 20rpx 5%; - padding: 20rpx 0; + border-top: 1px solid #eee; + width: 90%; + margin: 20rpx 5% 20rpx 5%; + padding: 20rpx 0; } .explain-title { - font-weight: bold; - margin-bottom: 15rpx; + font-weight: bold; + margin-bottom: 15rpx; } .explain-item { - padding: 8rpx 20rpx; - color: #fff; + padding: 8rpx 20rpx; + color: #fff; } .left-border-radius { - border-top-left-radius: 20rpx; - border-bottom-left-radius: 20rpx; + border-top-left-radius: 20rpx; + border-bottom-left-radius: 20rpx; } .right-border-radius { - border-top-right-radius: 20rpx; - border-bottom-right-radius: 20rpx; + border-top-right-radius: 20rpx; + border-bottom-right-radius: 20rpx; } .picker-btns { - height: 120rpx; - line-height: 120rpx; - border-bottom: 1rpx solid #ff7ca0; + height: 120rpx; + line-height: 120rpx; + border-bottom: 1rpx solid #ff7ca0; } .picker-confirm { - margin-right: 50rpx; + margin-right: 50rpx; } .picker-cancel { - margin-left: 50rpx; + margin-left: 50rpx; } .picker-view { - color: #ff7ca0; - text-align: center; + color: #ff7ca0; + text-align: center; } diff --git a/src/pages/calendarTemplate/index.wxss b/src/pages/calendarTemplate/index.wxss index f588242..3869262 100644 --- a/src/pages/calendarTemplate/index.wxss +++ b/src/pages/calendarTemplate/index.wxss @@ -1,11 +1,6 @@ @import '../../template/calendar/index.wxss'; .calendar-wrap { - padding: 0 10rpx; - height: 100vh; -} - -.switchView { - width: 300rpx; - margin-top: 50rpx; -} + padding: 0 10rpx; + height: 100vh; +} \ No newline at end of file diff --git a/src/pages/datepickerTemplate/index.wxss b/src/pages/datepickerTemplate/index.wxss index 4c769c5..b821d9f 100644 --- a/src/pages/datepickerTemplate/index.wxss +++ b/src/pages/datepickerTemplate/index.wxss @@ -1,23 +1,23 @@ @import '../../template/datepicker/index.wxss'; .datepicker-box { - margin: 100rpx; + margin: 100rpx; } button { - margin-top: 100rpx; - margin-bottom: 40rpx; + margin-top: 100rpx; + margin-bottom: 40rpx; } .datepicker-input { - width: 300rpx; - height: 50rpx; - border: 1rpx solid #dadada; - border-radius: 10rpx; - padding: 10rpx; - font-size: 28rpx; + width: 300rpx; + height: 50rpx; + border: 1rpx solid #dadada; + border-radius: 10rpx; + padding: 10rpx; + font-size: 28rpx; } /* stylelint-disable-next-line */ .datepicker-input::-webkit-input-placeholder { - color: #dadada; + color: #dadada; } \ No newline at end of file diff --git a/src/pages/index/index.wxss b/src/pages/index/index.wxss index 43f7662..714e854 100644 --- a/src/pages/index/index.wxss +++ b/src/pages/index/index.wxss @@ -1,33 +1,33 @@ page { - width: 100%; - height: 100%; + width: 100%; + height: 100%; } .wrap { - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - align-items: center; - margin-top: 100rpx; + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + align-items: center; + margin-top: 100rpx; } text { - width: 600rpx; - margin-bottom: 100rpx; + width: 600rpx; + margin-bottom: 100rpx; } .comments { - font-size: 28rpx; - color: #dadada; + font-size: 28rpx; + color: #dadada; } .navigator { - width: 500rpx; - height: 100rpx; - text-align: center; - line-height: 100rpx; - background-color: #f40; - color: #fff; - margin-bottom: 20rpx; + width: 500rpx; + height: 100rpx; + text-align: center; + line-height: 100rpx; + background-color: #f40; + color: #fff; + margin-bottom: 20rpx; } diff --git a/src/template/calendar/index.wxss b/src/template/calendar/index.wxss index e40382f..e238e04 100644 --- a/src/template/calendar/index.wxss +++ b/src/template/calendar/index.wxss @@ -1,280 +1,280 @@ /* pages/calendar/calendar.wxss */ .box { - display: flex; + display: flex; } .box-lr { - flex-direction: row; + flex-direction: row; } .box-rl { - flex-direction: row-reverse; + flex-direction: row-reverse; } .box-tb { - flex-direction: column; + flex-direction: column; } .box-pack-center { - justify-content: center; + justify-content: center; } .box-align-center { - align-items: center; + align-items: center; } .box-wrap { - flex-wrap: wrap; + flex-wrap: wrap; } .flex { - flex-grow: 1; + flex-grow: 1; } .bg { - background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); - overflow: hidden; + background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); + overflow: hidden; } .pink-color { - color: #ff629a; + color: #ff629a; } .white-color { - color: #fff; + color: #fff; } .fs24 { - font-size: 24rpx; + font-size: 24rpx; } .fs28 { - font-size: 28rpx; + font-size: 28rpx; } .fs32 { - font-size: 32rpx; + font-size: 32rpx; } .fs36 { - font-size: 36rpx; + font-size: 36rpx; } .calendar { - width: 100%; - box-sizing: border-box; + width: 100%; + box-sizing: border-box; } .top-handle { - height: 80rpx; + height: 80rpx; } .prev { - text-align: right; - height: 80rpx; + text-align: right; + height: 80rpx; } .next { - height: 80rpx; + height: 80rpx; } .prev-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .next-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .date-area { - width: 375rpx; - height: 80rpx; - text-align: center; + width: 375rpx; + height: 80rpx; + text-align: center; } .weeks { - height: 50rpx; - line-height: 50rpx; - opacity: 0.5; + height: 50rpx; + line-height: 50rpx; + opacity: 0.5; } .week { - text-align: center; - line-height: 104rpx; + text-align: center; + line-height: 104rpx; } .grid, .week { - width: 104rpx; - height: 104rpx; + width: 104rpx; + height: 104rpx; } .day { - width: 60rpx; - height: 60rpx; - font-size: 26rpx; - font-weight: 200; + width: 60rpx; + height: 60rpx; + font-size: 26rpx; + font-weight: 200; } .normal-day-color { - color: #88d2ac; + color: #88d2ac; } .day-choosed-color { - color: #fff; + color: #fff; } .todo-dot { - width: 10rpx; - height: 10rpx; - border-radius: 50%; - background-color: #cc5226; + width: 10rpx; + height: 10rpx; + border-radius: 50%; + background-color: #cc5226; } .todo-text { - font-size: 22rpx; - color: #c2c2c2; + font-size: 22rpx; + color: #c2c2c2; } .dot-day-height { - height: 72rpx; + height: 72rpx; } .disable-day-color { - color: #cacaca; + color: #cacaca; } .disable-day-bg { - background-color: #f6f6f7; + background-color: #f6f6f7; } .day-circle { - border: 1rpx solid #88d2ac; - box-sizing: border-box; + border: 1rpx solid #88d2ac; + box-sizing: border-box; } .border-radius { - border-radius: 50%; - position: relative; - left: 0; - top: 0; + border-radius: 50%; + position: relative; + left: 0; + top: 0; } .day-choosed-bg { - background-color: #ff629a; - transition: all 0.3s; - animation-name: choosed; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: 1; + background-color: #ff629a; + transition: all 0.3s; + animation-name: choosed; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: 1; } @keyframes choosed { - from { - transform: scale(1); - } + from { + transform: scale(1); + } - 50% { - transform: scale(0.9); - } + 50% { + transform: scale(0.9); + } - to { - transform: scale(1); - } + to { + transform: scale(1); + } } .purple-bg { - background-color: #b8b8f1; + background-color: #b8b8f1; } .right-triangle::after { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-left-color: #ff629a; - position: absolute; - right: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-left-color: #ff629a; + position: absolute; + right: -22rpx; + top: 18rpx; } .left-triangle::before { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-right-color: #ff629a; - position: absolute; - left: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-right-color: #ff629a; + position: absolute; + left: -22rpx; + top: 18rpx; } .tips { - text-align: center; - margin-top: 20rpx; - margin-bottom: 20rpx; + text-align: center; + margin-top: 20rpx; + margin-bottom: 20rpx; } .types { - background-color: #ffedf4; - height: 50rpx; + background-color: #ffedf4; + height: 50rpx; } .types-desc { - padding: 0 20rpx; + padding: 0 20rpx; } .type-name { - margin-top: 50rpx; - margin-bottom: 30rpx; + margin-top: 50rpx; + margin-bottom: 30rpx; } .type-desc { - padding: 0 35rpx; - line-height: 38rpx; + padding: 0 35rpx; + line-height: 38rpx; } .explain { - border-top: 1px solid #eee; - width: 90%; - margin: 20rpx 5% 20rpx 5%; - padding: 20rpx 0; + border-top: 1px solid #eee; + width: 90%; + margin: 20rpx 5% 20rpx 5%; + padding: 20rpx 0; } .explain-title { - font-weight: bold; - margin-bottom: 15rpx; + font-weight: bold; + margin-bottom: 15rpx; } .explain-item { - padding: 8rpx 20rpx; - color: #fff; + padding: 8rpx 20rpx; + color: #fff; } .left-border-radius { - border-top-left-radius: 20rpx; - border-bottom-left-radius: 20rpx; + border-top-left-radius: 20rpx; + border-bottom-left-radius: 20rpx; } .right-border-radius { - border-top-right-radius: 20rpx; - border-bottom-right-radius: 20rpx; + border-top-right-radius: 20rpx; + border-bottom-right-radius: 20rpx; } .perspective { - perspective: 750rpx; + perspective: 750rpx; } .leftRoate { - transition: all 1s; - transform: rotateY(-5deg); + transition: all 1s; + transform: rotateY(-5deg); } .rightRoate { - transition: all 1s; - transform: rotateY(5deg); + transition: all 1s; + transform: rotateY(5deg); } \ No newline at end of file diff --git a/src/template/datepicker/index.wxss b/src/template/datepicker/index.wxss index 33a50e4..778d701 100644 --- a/src/template/datepicker/index.wxss +++ b/src/template/datepicker/index.wxss @@ -1,294 +1,294 @@ /* pages/calendar/calendar.wxss */ .box { - display: flex; + display: flex; } .box-lr { - flex-direction: row; + flex-direction: row; } .box-rl { - flex-direction: row-reverse; + flex-direction: row-reverse; } .box-tb { - flex-direction: column; + flex-direction: column; } .box-pack-center { - justify-content: center; + justify-content: center; } .box-align-center { - align-items: center; + align-items: center; } .box-wrap { - flex-wrap: wrap; + flex-wrap: wrap; } .flex { - flex-grow: 1; + flex-grow: 1; } .bg { - background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); - overflow: hidden; + background-image: linear-gradient(to bottom, #faefe7, #ffcbd7); + overflow: hidden; } .pink-color { - color: #ff629a; + color: #ff629a; } .white-color { - color: #fff; + color: #fff; } .fs24 { - font-size: 24rpx; + font-size: 24rpx; } .fs28 { - font-size: 28rpx; + font-size: 28rpx; } .fs32 { - font-size: 32rpx; + font-size: 32rpx; } .fs36 { - font-size: 36rpx; + font-size: 36rpx; } .datepicker-bg { - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; + position: fixed; + top: 0; + bottom: 0; + left: 0; + right: 0; } .datepicker-wrap { - background-color: #fff; - box-shadow: 0 4rpx 20rpx 0 #ececec; - position: relative; - padding: 0 10rpx 20rpx; - box-sizing: border-box; + background-color: #fff; + box-shadow: 0 4rpx 20rpx 0 #ececec; + position: relative; + padding: 0 10rpx 20rpx; + box-sizing: border-box; } .calendar { - width: 100%; - box-sizing: border-box; + width: 100%; + box-sizing: border-box; } .top-handle { - height: 80rpx; + height: 80rpx; } .prev { - text-align: right; - height: 80rpx; + text-align: right; + height: 80rpx; } .next { - height: 80rpx; + height: 80rpx; } .prev-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .next-handle { - width: 80rpx; - height: 100%; + width: 80rpx; + height: 100%; } .date-area { - width: 50%; - height: 80rpx; - text-align: center; + width: 50%; + height: 80rpx; + text-align: center; } .weeks { - height: 50rpx; - line-height: 50rpx; - opacity: 0.5; + height: 50rpx; + line-height: 50rpx; + opacity: 0.5; } .week { - text-align: center; + text-align: center; } .grid, .week { - width: 14.285714285714286%; + width: 14.285714285714286%; } .day { - width: 60rpx; - height: 60rpx; - font-size: 26rpx; - font-weight: 200; + width: 60rpx; + height: 60rpx; + font-size: 26rpx; + font-weight: 200; } .normal-day-color { - color: #88d2ac; + color: #88d2ac; } .day-choosed-color { - color: #fff; + color: #fff; } .todo-dot { - width: 10rpx; - height: 10rpx; - border-radius: 50%; - background-color: #cc5226; + width: 10rpx; + height: 10rpx; + border-radius: 50%; + background-color: #cc5226; } .todo-text { - font-size: 22rpx; - color: #c2c2c2; + font-size: 22rpx; + color: #c2c2c2; } .dot-day-height { - height: 72rpx; + height: 72rpx; } .disable-day-color { - color: #cacaca; + color: #cacaca; } .disable-day-bg { - background-color: #f6f6f7; + background-color: #f6f6f7; } .day-circle { - border: 1rpx solid #88d2ac; - box-sizing: border-box; + border: 1rpx solid #88d2ac; + box-sizing: border-box; } .border-radius { - border-radius: 50%; - position: relative; - left: 0; - top: 0; + border-radius: 50%; + position: relative; + left: 0; + top: 0; } .day-choosed-bg { - background-color: #ff629a; - transition: all 0.3s; - animation-name: choosed; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: 1; + background-color: #ff629a; + transition: all 0.3s; + animation-name: choosed; + animation-duration: 0.5s; + animation-timing-function: linear; + animation-iteration-count: 1; } @keyframes choosed { - from { - transform: scale(1); - } + from { + transform: scale(1); + } - 50% { - transform: scale(0.9); - } + 50% { + transform: scale(0.9); + } - to { - transform: scale(1); - } + to { + transform: scale(1); + } } .purple-bg { - background-color: #b8b8f1; + background-color: #b8b8f1; } .right-triangle::after { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-left-color: #ff629a; - position: absolute; - right: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-left-color: #ff629a; + position: absolute; + right: -22rpx; + top: 18rpx; } .left-triangle::before { - content: ''; - display: block; - width: 0; - height: 0; - border: 15rpx solid transparent; - border-right-color: #ff629a; - position: absolute; - left: -22rpx; - top: 18rpx; + content: ''; + display: block; + width: 0; + height: 0; + border: 15rpx solid transparent; + border-right-color: #ff629a; + position: absolute; + left: -22rpx; + top: 18rpx; } .tips { - text-align: center; - margin-top: 20rpx; - margin-bottom: 20rpx; + text-align: center; + margin-top: 20rpx; + margin-bottom: 20rpx; } .types { - background-color: #ffedf4; - height: 50rpx; + background-color: #ffedf4; + height: 50rpx; } .types-desc { - padding: 0 20rpx; + padding: 0 20rpx; } .type-name { - margin-top: 50rpx; - margin-bottom: 30rpx; + margin-top: 50rpx; + margin-bottom: 30rpx; } .type-desc { - padding: 0 35rpx; - line-height: 38rpx; + padding: 0 35rpx; + line-height: 38rpx; } .explain { - border-top: 1px solid #eee; - width: 90%; - margin: 20rpx 5% 20rpx 5%; - padding: 20rpx 0; + border-top: 1px solid #eee; + width: 90%; + margin: 20rpx 5% 20rpx 5%; + padding: 20rpx 0; } .explain-title { - font-weight: bold; - margin-bottom: 15rpx; + font-weight: bold; + margin-bottom: 15rpx; } .explain-item { - padding: 8rpx 20rpx; - color: #fff; + padding: 8rpx 20rpx; + color: #fff; } .left-border-radius { - border-top-left-radius: 20rpx; - border-bottom-left-radius: 20rpx; + border-top-left-radius: 20rpx; + border-bottom-left-radius: 20rpx; } .right-border-radius { - border-top-right-radius: 20rpx; - border-bottom-right-radius: 20rpx; + border-top-right-radius: 20rpx; + border-bottom-right-radius: 20rpx; } .perspective { - perspective: 750rpx; + perspective: 750rpx; } .leftRoate { - transition: all 1s; - transform: rotateY(-5deg); + transition: all 1s; + transform: rotateY(-5deg); } .rightRoate { - transition: all 1s; - transform: rotateY(5deg); + transition: all 1s; + transform: rotateY(5deg); } \ No newline at end of file diff --git a/stylelint.config.js b/stylelint.config.js index 7e01254..f800578 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -4,7 +4,7 @@ module.exports = { plugins: ['stylelint-no-z-index'], rules: { 'at-rule-no-vendor-prefix': true, - indentation: 2, + indentation: 4, 'media-feature-name-no-vendor-prefix': true, 'no-missing-end-of-source-newline': null, 'plugin/no-z-index': 2,