From 0ddf24960194fdd15653e34e0a6cef54b1586748 Mon Sep 17 00:00:00 2001 From: zhouyun1 Date: Wed, 20 Sep 2023 11:04:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/seven-tables-flow.md | 7 + .changeset/shaggy-dolphins-run.md | 7 + .changeset/silly-cycles-hunt.md | 5 + package.json | 2 +- .../core-css/src/styles/common/helper.scss | 2 +- .../src/styles/legacy-v3/_mixins.scss | 4 +- packages/ui/badge/src/styles/badge.scss | 6 +- packages/ui/date-picker/package.json | 4 +- .../date-picker/src/styles/date-picker.scss | 6 +- .../ui/scrollbar/src/styles/scrollbar.scss | 6 +- packages/ui/table/package.json | 2 +- packages/utils/request/package.json | 6 +- scripts/calendar-data/package.json | 2 +- scripts/hi-build/lib/build.js | 12 +- yarn.lock | 258 +++++------------- 15 files changed, 113 insertions(+), 216 deletions(-) create mode 100644 .changeset/seven-tables-flow.md create mode 100644 .changeset/shaggy-dolphins-run.md create mode 100644 .changeset/silly-cycles-hunt.md diff --git a/.changeset/seven-tables-flow.md b/.changeset/seven-tables-flow.md new file mode 100644 index 000000000..e1117cc7d --- /dev/null +++ b/.changeset/seven-tables-flow.md @@ -0,0 +1,7 @@ +--- +"@hi-ui/core-css": patch +"@hi-ui/badge": patch +"@hi-ui/scrollbar": patch +--- + +fix: 升级 dart-sass 后修改语法 diff --git a/.changeset/shaggy-dolphins-run.md b/.changeset/shaggy-dolphins-run.md new file mode 100644 index 000000000..03bd341be --- /dev/null +++ b/.changeset/shaggy-dolphins-run.md @@ -0,0 +1,7 @@ +--- +"@hi-ui/date-picker": minor +"@hi-ui/table": minor +"@hi-ui/request": minor +--- + +chore: axios 升级为 1.5.0 diff --git a/.changeset/silly-cycles-hunt.md b/.changeset/silly-cycles-hunt.md new file mode 100644 index 000000000..da1e2771d --- /dev/null +++ b/.changeset/silly-cycles-hunt.md @@ -0,0 +1,5 @@ +--- +"@hi-ui/hiui": minor +--- + +chore: 将 node-sas 升级为 sass diff --git a/package.json b/package.json index 8f44ed796..9706ee0dd 100644 --- a/package.json +++ b/package.json @@ -53,10 +53,10 @@ "concurrently": "^6.1.0", "copyfiles": "^2.4.1", "lerna": "^4.0.0", - "node-sass": "6.0.1", "rimraf": "^3.0.2", "rollup-plugin-postcss-inject-to-css": "^1.0.2", "rucksack-css": "^1.0.2", + "sass": "^1.67.0", "sass-loader": "10.2.1", "storybook-addon-deps": "^2.2.0", "storybook-addon-react-live-edit": "^2.0.4", diff --git a/packages/core/core-css/src/styles/common/helper.scss b/packages/core/core-css/src/styles/common/helper.scss index 085e15f2b..5601e154b 100644 --- a/packages/core/core-css/src/styles/common/helper.scss +++ b/packages/core/core-css/src/styles/common/helper.scss @@ -19,7 +19,7 @@ $valid-keys-string: $valid-keys-string + ']'; - @debug '[WARNING] Use key: ' + $data-key +' is not valid, it should be in range: '+ $valid-keys-string; + @debug '[WARNING] Use key: ' + $data-key + ' is not valid, it should be in range: '+ $valid-keys-string; } @return $result; diff --git a/packages/core/core-css/src/styles/legacy-v3/_mixins.scss b/packages/core/core-css/src/styles/legacy-v3/_mixins.scss index 19c3d1516..1a1d6ddd5 100644 --- a/packages/core/core-css/src/styles/legacy-v3/_mixins.scss +++ b/packages/core/core-css/src/styles/legacy-v3/_mixins.scss @@ -1,6 +1,8 @@ // Author: Sivan[sunxingfan@xiaomi.com] // Description: define mix-ins, functions etc. +@use 'sass:list'; + @import 'common'; /// Slightly lighten a color @@ -156,7 +158,7 @@ // equal to `display: inline` @if not ($display-outside == 'inline' and $display-inside == 'flow') { - font: normal $font-weight-normal #{$font-size-normal}/#{$line-height-size-normal} $font-family-sans; + font: normal $font-weight-normal list.slash($font-size-normal, $line-height-size-normal) $font-family-sans; text-align: left; text-decoration: none; text-indent: 0; diff --git a/packages/ui/badge/src/styles/badge.scss b/packages/ui/badge/src/styles/badge.scss index 5c07710cf..a67af164b 100644 --- a/packages/ui/badge/src/styles/badge.scss +++ b/packages/ui/badge/src/styles/badge.scss @@ -18,7 +18,7 @@ $prefix: '#{$component-prefix}-badge' !default; position: absolute; z-index: 1; right: 0; - top: calc(#{-(($bubbleSize + $borderSize * 2) / 2)}); + top: calc(#{-(($bubbleSize + $borderSize * 2) * 0.5)}); min-width: $bubbleSize - 12px; height: $bubbleSize; line-height: $bubbleSize; @@ -36,8 +36,8 @@ $prefix: '#{$component-prefix}-badge' !default; &__dot { position: absolute; z-index: 1; - top: calc(#{-(($dotSize + $borderSize * 2) / 2)}); - right: calc(#{-(($dotSize + $borderSize * 2) / 2)}); + top: calc(#{-(($dotSize + $borderSize * 2) * 0.5)}); + right: calc(#{-(($dotSize + $borderSize * 2) * 0.5)}); width: $dotSize; height: $dotSize; background-color: use-color-mode('danger'); diff --git a/packages/ui/date-picker/package.json b/packages/ui/date-picker/package.json index b7a774f42..b5f2adb5e 100644 --- a/packages/ui/date-picker/package.json +++ b/packages/ui/date-picker/package.json @@ -50,8 +50,8 @@ "@hi-ui/object-utils": "^4.0.1", "@hi-ui/popper": "^4.0.5", "@hi-ui/time-picker": "^4.0.8", - "axios": "^0.26.0", - "moment": "^2.29.1", + "axios": "^1.5.0", + "moment": "^2.29.4", "react-transition-group": "^4.4.2" }, "peerDependencies": { diff --git a/packages/ui/date-picker/src/styles/date-picker.scss b/packages/ui/date-picker/src/styles/date-picker.scss index 6eec3fc67..9f1745401 100644 --- a/packages/ui/date-picker/src/styles/date-picker.scss +++ b/packages/ui/date-picker/src/styles/date-picker.scss @@ -8,7 +8,7 @@ $cell-class: '#{$prefix}__cell' !default; $calendar-large-indicator-size: 40px !default; $calendar-large-indicator-border-radius: 8px !default; $calendar-large-diff: 6px !default; -$calendar-large-background-border-radius: $calendar-large-indicator-border-radius + $calendar-large-diff/2 !default; +$calendar-large-background-border-radius: $calendar-large-indicator-border-radius + $calendar-large-diff*0.5 !default; .#{$prefix} { position: relative; @@ -555,14 +555,14 @@ $calendar-large-background-border-radius: $calendar-large-indicator-border-radiu &:first-child { .#{$cell-class}-week-indicator { - margin-left: $calendar-large-diff/2; + margin-left: $calendar-large-diff*0.5; border-radius: $calendar-large-indicator-border-radius 0 0 $calendar-large-indicator-border-radius; } } &:last-child { .#{$cell-class}-week-indicator { - margin-left: -$calendar-large-diff/2; + margin-left: -$calendar-large-diff*0.5; border-radius: 0 $calendar-large-indicator-border-radius $calendar-large-indicator-border-radius 0; } } diff --git a/packages/ui/scrollbar/src/styles/scrollbar.scss b/packages/ui/scrollbar/src/styles/scrollbar.scss index 98bdc488d..87ed92613 100644 --- a/packages/ui/scrollbar/src/styles/scrollbar.scss +++ b/packages/ui/scrollbar/src/styles/scrollbar.scss @@ -1,5 +1,5 @@ @import '~@hi-ui/core-css/lib/index.scss'; -@import '~perfect-scrollbar/css/perfect-scrollbar.css'; +@import '~perfect-scrollbar/css/perfect-scrollbar'; $prefix: '#{$component-prefix}-scrollbar' !default; @@ -46,7 +46,7 @@ $prefix: '#{$component-prefix}-scrollbar' !default; & > .ps__rail-y, .ps__thumb-y { width: $thumb-size; - border-radius: $thumb-size/2; + border-radius: $thumb-size*0.5; right: 0; transition: $transition; } @@ -68,7 +68,7 @@ $prefix: '#{$component-prefix}-scrollbar' !default; & > .ps__rail-x, .ps__thumb-x { height: $thumb-size; - border-radius: $thumb-size/2; + border-radius: $thumb-size*0.5; bottom: 0; transition: $transition; } diff --git a/packages/ui/table/package.json b/packages/ui/table/package.json index 511bae7cb..ad438c348 100644 --- a/packages/ui/table/package.json +++ b/packages/ui/table/package.json @@ -72,7 +72,7 @@ "@hi-ui/use-toggle": "^4.0.1", "@hi-ui/use-uncontrolled-state": "^4.0.1", "@hi-ui/use-update-effect": "^4.0.1", - "axios": "^0.24.0", + "axios": "^1.5.0", "react-resizable": "^3.0.4" }, "peerDependencies": { diff --git a/packages/utils/request/package.json b/packages/utils/request/package.json index 025038e2f..8b2004ef6 100644 --- a/packages/utils/request/package.json +++ b/packages/utils/request/package.json @@ -42,10 +42,8 @@ "bugs": { "url": "https://github.com/XiaoMi/hiui/issues" }, - "devDependencies": { - - }, + "devDependencies": {}, "dependencies": { - "axios": "^0.21.1" + "axios": "^1.5.0" } } diff --git a/scripts/calendar-data/package.json b/scripts/calendar-data/package.json index f74f46209..e2a1b3173 100644 --- a/scripts/calendar-data/package.json +++ b/scripts/calendar-data/package.json @@ -10,6 +10,6 @@ "author": "zhouyun1", "license": "ISC", "dependencies": { - "axios": "^1.3.5" + "axios": "^1.5.0" } } diff --git a/scripts/hi-build/lib/build.js b/scripts/hi-build/lib/build.js index c2246cdff..363428e7c 100644 --- a/scripts/hi-build/lib/build.js +++ b/scripts/hi-build/lib/build.js @@ -149,12 +149,12 @@ const getRollupConfig = (input, outputPath, options, pkg) => { ], extensions: ['.scss', '.css'], // Extract styleInject as a external module - inject: !cssExtract ? (variableName) => { - if (isESM) { - return `;import __styleInject__ from 'style-inject';__styleInject__(${variableName});` - } - return `;var __styleInject__=require('style-inject').default;__styleInject__(${variableName});` - } : false, + inject: !cssExtract ? (variableName) => { + if (isESM) { + return `;import __styleInject__ from 'style-inject';__styleInject__(${variableName});` + } + return `;var __styleInject__=require('style-inject').default;__styleInject__(${variableName});` + } : false, extract: cssExtract, modules: cssModules, }), diff --git a/yarn.lock b/yarn.lock index 55f06d8b1..3f69edd63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5625,11 +5625,6 @@ ajv@^8.0.1: require-from-string "^2.0.2" uri-js "^4.2.2" -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.npmmirror.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - integrity sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg== - ansi-align@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/ansi-align/download/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" @@ -5689,7 +5684,7 @@ ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.0, ansi-styles@^3.2.1: +ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.nlark.com/ansi-styles/download/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -5913,10 +5908,6 @@ async-each@^1.0.1: version "1.0.3" resolved "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - async-validator@^4.0.7: version "4.0.7" resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.0.7.tgz#034a0fd2103a6b2ebf010da75183bec299247afe" @@ -5998,23 +5989,14 @@ aws4@^1.8.0: version "1.11.0" resolved "https://registry.nlark.com/aws4/download/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" -axios@^0.21.1: - version "0.21.1" - resolved "https://registry.npm.taobao.org/axios/download/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - dependencies: - follow-redirects "^1.10.0" - -axios@^0.24.0: - version "0.24.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6" - dependencies: - follow-redirects "^1.14.4" - -axios@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.0.tgz#9a318f1c69ec108f8cd5f3c3d390366635e13928" +axios@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.0.tgz#f02e4af823e2e46a9768cfc74691fdd0517ea267" + integrity sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ== dependencies: - follow-redirects "^1.14.8" + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" axobject-query@^2.0.2: version "2.2.0" @@ -6871,7 +6853,7 @@ chalk@4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^1.1.1, chalk@^1.1.3: +chalk@^1.1.3: version "1.1.3" resolved "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -6951,6 +6933,21 @@ chardet@^0.7.0: version "0.7.0" resolved "https://registry.npm.taobao.org/chardet/download/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" +"chokidar@>=3.0.0 <4.0.0": + version "3.5.3" + resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" + integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chokidar@^2.1.8: version "2.1.8" resolved "https://registry.nlark.com/chokidar/download/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -7072,15 +7069,6 @@ cli-width@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/cli-width/download/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" -cliui@^5.0.0: - version "5.0.0" - resolved "https://registry.npmmirror.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" - integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== - dependencies: - string-width "^3.1.0" - strip-ansi "^5.2.0" - wrap-ansi "^5.1.0" - cliui@^6.0.0: version "6.0.0" resolved "https://registry.npm.taobao.org/cliui/download/cliui-6.0.0.tgz?cache=0&sync_timestamp=1604880226973&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -9360,17 +9348,10 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -follow-redirects@^1.10.0: - version "1.14.1" - resolved "https://registry.nlark.com/follow-redirects/download/follow-redirects-1.14.1.tgz?cache=0&sync_timestamp=1620555234886&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - -follow-redirects@^1.14.4: - version "1.14.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.6.tgz#8cfb281bbc035b3c067d6cd975b0f6ade6e855cd" - -follow-redirects@^1.14.8: - version "1.14.9" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" +follow-redirects@^1.15.0: + version "1.15.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" + integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -9431,6 +9412,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -9619,12 +9609,6 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.nlark.com/gaze/download/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - dependencies: - globule "^1.0.0" - generic-names@^2.0.1: version "2.0.1" resolved "https://registry.npm.taobao.org/generic-names/download/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872" @@ -9672,10 +9656,6 @@ get-stdin@8.0.0, get-stdin@^8.0.0: version "8.0.0" resolved "https://registry.nlark.com/get-stdin/download/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.nlark.com/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - get-stdin@^6.0.0: version "6.0.0" resolved "https://registry.nlark.com/get-stdin/download/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" @@ -9804,7 +9784,7 @@ glob-to-regexp@^0.3.0: version "0.3.0" resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@~7.1.1: +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.1.7" resolved "https://registry.nlark.com/glob/download/glob-7.1.7.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob%2Fdownload%2Fglob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" dependencies: @@ -9930,14 +9910,6 @@ globjoin@^0.1.4: version "0.1.4" resolved "https://registry.nlark.com/globjoin/download/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" -globule@^1.0.0: - version "1.3.2" - resolved "https://registry.npm.taobao.org/globule/download/globule-1.3.2.tgz#d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4" - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - gonzales-pe@^4.3.0: version "4.3.0" resolved "https://registry.npm.taobao.org/gonzales-pe/download/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3" @@ -10433,6 +10405,11 @@ immer@8.0.1: version "8.0.1" resolved "https://registry.nlark.com/immer/download/immer-8.0.1.tgz#9c73db683e2b3975c424fb0572af5889877ae656" +immutable@^4.0.0: + version "4.3.4" + resolved "https://registry.npmmirror.com/immutable/-/immutable-4.3.4.tgz#2e07b33837b4bb7662f288c244d1ced1ef65a78f" + integrity sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA== + import-cwd@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92" @@ -11572,11 +11549,6 @@ jest@^27.0.6: import-local "^3.0.2" jest-cli "^27.0.6" -js-base64@^2.1.8: - version "2.6.4" - resolved "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - js-string-escape@^1.0.1: version "1.0.1" resolved "https://registry.npm.taobao.org/js-string-escape/download/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" @@ -12093,7 +12065,7 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@4.x, lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.7.0, lodash@~4.17.10: +lodash@4.x, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.7.0: version "4.17.21" resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -12585,24 +12557,6 @@ meow@^8.0.0: type-fest "^0.18.0" yargs-parser "^20.2.3" -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.npmmirror.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^3.0.0" - read-pkg-up "^7.0.1" - redent "^3.0.0" - trim-newlines "^3.0.0" - type-fest "^0.18.0" - yargs-parser "^20.2.3" - merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" @@ -13003,7 +12957,7 @@ minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2: +minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -13138,9 +13092,10 @@ modify-values@^1.0.0: version "1.0.1" resolved "https://registry.nlark.com/modify-values/download/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" -moment@^2.29.1: - version "2.29.1" - resolved "https://registry.nlark.com/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" +moment@^2.29.4: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== move-concurrently@^1.0.1: version "1.0.1" @@ -13188,7 +13143,7 @@ mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" -nan@^2.12.1, nan@^2.13.2: +nan@^2.12.1: version "2.14.2" resolved "https://registry.nlark.com/nan/download/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" @@ -13345,27 +13300,6 @@ node-releases@^2.0.5: resolved "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== -node-sass@6.0.1: - version "6.0.1" - resolved "https://registry.npmmirror.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe" - integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ== - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^7.0.3" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - lodash "^4.17.15" - meow "^9.0.0" - nan "^2.13.2" - node-gyp "^7.1.0" - npmlog "^4.0.0" - request "^2.88.0" - sass-graph "2.2.5" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - nodemon@^2.0.12: version "2.0.12" resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.12.tgz#5dae4e162b617b91f1873b3bfea215dd71e144d5" @@ -13542,7 +13476,7 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -npmlog@^4.0.0, npmlog@^4.1.2: +npmlog@^4.1.2: version "4.1.2" resolved "https://registry.nlark.com/npmlog/download/npmlog-4.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnpmlog%2Fdownload%2Fnpmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" dependencies: @@ -15171,6 +15105,11 @@ proxy-addr@~2.0.5: forwarded "0.2.0" ipaddr.js "1.9.1" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -16478,16 +16417,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass-graph@2.2.5: - version "2.2.5" - resolved "https://registry.npmmirror.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8" - integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag== - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^13.3.2" - sass-loader@10.2.1: version "10.2.1" resolved "https://registry.npmmirror.com/sass-loader/-/sass-loader-10.2.1.tgz#17e51df313f1a7a203889ce8ff91be362651276e" @@ -16499,6 +16428,15 @@ sass-loader@10.2.1: schema-utils "^3.0.0" semver "^7.3.2" +sass@^1.67.0: + version "1.67.0" + resolved "https://registry.npmmirror.com/sass/-/sass-1.67.0.tgz#fed84d74b9cd708db603b1380d6dc1f71bb24f6f" + integrity sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -16551,14 +16489,6 @@ schema-utils@^3.0.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.npmmirror.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - integrity sha512-dYE8LhncfBUar6POCxMTm0Ln+erjeczqEvCJib5/7XNkdw1FkUGgwMPY360FY0FgPWQxHWCx29Jl3oejyGLM9Q== - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/semver-compare/download/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -16837,7 +16767,7 @@ source-list-map@^2.0.0: version "2.0.1" resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" -source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -16870,13 +16800,6 @@ source-map-url@^0.4.0: version "0.4.1" resolved "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-url%2Fdownload%2Fsource-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" -source-map@^0.4.2: - version "0.4.4" - resolved "https://registry.npmmirror.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - integrity sha512-Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A== - dependencies: - amdefine ">=0.0.4" - source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: version "0.5.7" resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -17016,12 +16939,6 @@ static-extend@^0.1.1: version "1.5.0" resolved "https://registry.nlark.com/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" -stdout-stream@^1.4.0: - version "1.4.1" - resolved "https://registry.nlark.com/stdout-stream/download/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" - dependencies: - readable-stream "^2.0.1" - store2@^2.12.0: version "2.12.0" resolved "https://registry.npm.taobao.org/store2/download/store2-2.12.0.tgz#e1f1b7e1a59b6083b2596a8d067f6ee88fd4d3cf" @@ -17146,7 +17063,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0, string-width@^3.1.0: +string-width@^3.0.0: version "3.1.0" resolved "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1618558856477&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" dependencies: @@ -17265,7 +17182,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.1.0: version "5.2.0" resolved "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&sync_timestamp=1618553351145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" dependencies: @@ -17866,12 +17783,6 @@ trough@^2.0.0: resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876" integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g== -"true-case-path@^1.0.2": - version "1.0.3" - resolved "https://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" - dependencies: - glob "^7.1.2" - ts-dedent@^2.0.0, ts-dedent@^2.1.1: version "2.1.1" resolved "https://registry.npm.taobao.org/ts-dedent/download/ts-dedent-2.1.1.tgz#6dd56870bb5493895171334fa5d7e929107e5bbc" @@ -18793,15 +18704,6 @@ worker-rpc@^0.1.0: dependencies: microevent.ts "~0.1.1" -wrap-ansi@^5.1.0: - version "5.1.0" - resolved "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" - integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== - dependencies: - ansi-styles "^3.2.0" - string-width "^3.0.0" - strip-ansi "^5.0.0" - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-6.2.0.tgz?cache=0&sync_timestamp=1618558923406&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -18936,14 +18838,6 @@ yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3, yargs-parser@^20. version "20.2.9" resolved "https://registry.nlark.com/yargs-parser/download/yargs-parser-20.2.9.tgz?cache=0&sync_timestamp=1624233275366&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" -yargs-parser@^13.1.2: - version "13.1.2" - resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^18.1.2, yargs-parser@^18.1.3: version "18.1.3" resolved "https://registry.nlark.com/yargs-parser/download/yargs-parser-18.1.3.tgz?cache=0&sync_timestamp=1624233275366&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs-parser%2Fdownload%2Fyargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" @@ -18956,22 +18850,6 @@ yargs-parser@^21.0.0: resolved "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^13.3.2: - version "13.3.2" - resolved "https://registry.npmmirror.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" - integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== - dependencies: - cliui "^5.0.0" - find-up "^3.0.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^3.0.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^13.1.2" - yargs@^15.1.0: version "15.4.1" resolved "https://registry.nlark.com/yargs/download/yargs-15.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs%2Fdownload%2Fyargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"