From 5cef4a89ad11bb56252771e067e45ff6433cc628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=B0=91?= Date: Mon, 29 Aug 2022 10:10:49 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8Cpolyfill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +- packages/vantui-cli/package.json | 8 +- .../site/docs/components/markdown/index.less | 7 + .../docs/components/pageLayout/index.less | 1 + .../vantui-cli/src/compiler/compile-script.ts | 2 +- packages/vantui-cli/tsconfig.cjs.json | 10 + .../vantui-demo/config/webpack/h5Chain.js | 2 +- .../vantui-demo/config/webpack/miniChain.js | 2 +- packages/vantui-demo/package.json | 8 +- packages/vantui-demo/src/app.less | 21 + packages/vantui-demo/tsconfig.json | 52 -- packages/vantui-doc/docs/premium.md | 4 +- packages/vantui-doc/docs/quickstart.md | 2 + packages/vantui/package.json | 3 +- packages/vantui/src/button/index.less | 13 +- packages/vantui/src/calendar/index.less | 3 +- packages/vantui/src/card/index.less | 1 + packages/vantui/src/cell-group/index.less | 1 + packages/vantui/src/cell/index.less | 1 + packages/vantui/src/checkbox/index.less | 1 + packages/vantui/src/circle/index.less | 1 + packages/vantui/src/circle/index.tsx | 32 +- packages/vantui/src/collapse-item/index.less | 1 + packages/vantui/src/count-down/index.less | 1 + packages/vantui/src/dialog/index.less | 1 + packages/vantui/src/divider/index.less | 1 + packages/vantui/src/dropdown-item/index.less | 1 + packages/vantui/src/dropdown-menu/index.less | 3 +- packages/vantui/src/empty/index.less | 1 + packages/vantui/src/field/index.less | 2 + packages/vantui/src/form-item/index.less | 1 + .../vantui/src/goods-action-button/index.less | 1 + .../vantui/src/goods-action-icon/index.less | 1 + packages/vantui/src/goods-action/index.less | 1 + packages/vantui/src/grid-item/index.less | 1 + packages/vantui/src/icon/index.less | 1 + packages/vantui/src/image/index.less | 1 + packages/vantui/src/index-anchor/index.less | 1 + packages/vantui/src/index-bar/index.less | 1 + packages/vantui/src/info/index.less | 1 + packages/vantui/src/loading/index.less | 17 +- packages/vantui/src/mini-nav-bar/index.less | 12 +- packages/vantui/src/nav-bar/index.less | 10 + packages/vantui/src/notice-bar/index.less | 1 + packages/vantui/src/notify/index.less | 1 + .../vantui/src/number-keyboard/index.less | 4 + packages/vantui/src/overlay/index.less | 1 + packages/vantui/src/pagination/index.less | 8 + packages/vantui/src/picker-column/index.less | 1 + packages/vantui/src/picker/index.less | 12 +- packages/vantui/src/popup/index.less | 1 + packages/vantui/src/progress/index.less | 1 + packages/vantui/src/radio/index.less | 1 + packages/vantui/src/rate/index.less | 1 + packages/vantui/src/row/index.tsx | 7 +- packages/vantui/src/search/index.less | 3 + packages/vantui/src/sidebar-item/index.less | 1 + packages/vantui/src/sidebar/index.less | 1 + packages/vantui/src/skeleton/index.less | 1 + packages/vantui/src/slider/index.less | 1 + packages/vantui/src/stepper/index.less | 4 +- packages/vantui/src/steps/index.less | 1 + packages/vantui/src/sticky/index.less | 1 + packages/vantui/src/style/base.less | 1 + .../vantui/src/style/mixins/ellipsis.less | 1 + packages/vantui/src/style/var.less | 2 +- packages/vantui/src/submit-bar/index.less | 1 + packages/vantui/src/switch/index.less | 1 + packages/vantui/src/tabbar/index.less | 1 + packages/vantui/src/tabs/index.less | 1 + packages/vantui/src/tag/index.less | 3 +- packages/vantui/src/toast/index.less | 1 + packages/vantui/src/tree-select/index.less | 1 + packages/vantui/src/unite-context/index.tsx | 29 - packages/vantui/src/unite/index.tsx | 317 ----------- packages/vantui/src/uploader/index.less | 1 + packages/vantui/types/index.d.ts | 2 - packages/vantui/types/unite-context.d.ts | 18 - packages/vantui/types/unite.d.ts | 135 ----- .../tsconfig.json => tsconfig.base.json | 29 +- tsconfig.json | 47 +- yarn.lock | 535 +++++------------- 82 files changed, 342 insertions(+), 1079 deletions(-) create mode 100644 packages/vantui-cli/tsconfig.cjs.json delete mode 100644 packages/vantui-demo/tsconfig.json delete mode 100644 packages/vantui/src/unite-context/index.tsx delete mode 100644 packages/vantui/src/unite/index.tsx delete mode 100644 packages/vantui/types/unite-context.d.ts delete mode 100644 packages/vantui/types/unite.d.ts rename packages/vantui-cli/tsconfig.json => tsconfig.base.json (61%) diff --git a/package.json b/package.json index e45dfe7e4..5c3abade6 100644 --- a/package.json +++ b/package.json @@ -104,9 +104,9 @@ "packages/*" ], "dependencies": { - "@antmjs/eslint": "^1.21.3", - "@antmjs/stylelint": "^1.21.3", - "@antmjs/warning": "^1.21.3", + "@antmjs/eslint": "^2.0.1", + "@antmjs/stylelint": "^2.0.1", + "@antmjs/warning": "^2.0.1", "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", "all-contributors-cli": "^6.20.0", @@ -120,7 +120,7 @@ "npm-run-all": "^4.1.5", "prettier": "^2.7.1", "rimraf": "^3.0.2", - "stylelint": "^13.13.1", + "stylelint": "^14.11.0", "typescript": "^4.7.4" } } diff --git a/packages/vantui-cli/package.json b/packages/vantui-cli/package.json index 32664fa3e..9e4f24812 100644 --- a/packages/vantui-cli/package.json +++ b/packages/vantui-cli/package.json @@ -8,7 +8,7 @@ "antm-vantui-cli": "./bin.js" }, "engines": { - "node": ">=12", + "node": ">=14", "npm": ">=6.4", "yarn": ">=1.22" }, @@ -28,8 +28,8 @@ "antmjs" ], "scripts": { - "watch": "tsc --watch", - "build": "tsc", + "watch": "rm -rf dest && npx tsc -p tsconfig.cjs.json --watch --sourceMap", + "build": "rm -rf dest && npx tsc -p tsconfig.cjs.json", "test:watch": "", "test": "" }, @@ -44,7 +44,7 @@ "@types/prettier": "^2.6.1" }, "dependencies": { - "@antmjs/babel-preset": "1.21.3", + "@antmjs/babel-preset": "2.0.1", "@babel/core": "^7.16.0", "@babel/plugin-transform-runtime": "^7.17.10", "@babel/plugin-transform-typescript": "^7.16.8", diff --git a/packages/vantui-cli/site/docs/components/markdown/index.less b/packages/vantui-cli/site/docs/components/markdown/index.less index 18e393c2a..0462e9764 100644 --- a/packages/vantui-cli/site/docs/components/markdown/index.less +++ b/packages/vantui-cli/site/docs/components/markdown/index.less @@ -48,12 +48,14 @@ border-radius: 50%; content: ''; } + blockquote { margin: 16px 0 0; padding: 16px; background-color: #ecf9ff; border-radius: 20px; } + p a, ul a, table a, @@ -210,6 +212,7 @@ &:first-child { padding-left: 0; } + tr { td { font-size: 14px; @@ -217,15 +220,18 @@ font-style: normal; -webkit-font-smoothing: auto; } + td { padding: 8px; font-style: normal !important; border-top: 1px solid #f1f4f8; + &:nth-child(1) { max-width: 160px; word-wrap: break-word; word-break: normal; } + code { -webkit-font-smoothing: antialiased; background-color: #f7f8fa; @@ -243,6 +249,7 @@ white-space: pre-wrap; } } + em { font-style: normal !important; color: #4fc08d; diff --git a/packages/vantui-cli/site/docs/components/pageLayout/index.less b/packages/vantui-cli/site/docs/components/pageLayout/index.less index e47c43869..7bf0dfe7f 100644 --- a/packages/vantui-cli/site/docs/components/pageLayout/index.less +++ b/packages/vantui-cli/site/docs/components/pageLayout/index.less @@ -3,6 +3,7 @@ font-family: Open Sans, -apple-system, BlinkMacSystemFont, Helvetica Neue, Helvetica, Segoe UI, Arial, Roboto, PingFang SC, miui, Hiragino Sans GB, Microsoft Yahei, sans-serif; + &-header { background: #001838; color: #ffffff; diff --git a/packages/vantui-cli/src/compiler/compile-script.ts b/packages/vantui-cli/src/compiler/compile-script.ts index 19568ce69..34a48791d 100644 --- a/packages/vantui-cli/src/compiler/compile-script.ts +++ b/packages/vantui-cli/src/compiler/compile-script.ts @@ -64,7 +64,7 @@ export async function compileScript( }, runtime: { absoluteRuntime: false, - corejs: { version: 3, proposals: false }, + corejs: false, helpers: true, // 使用到@babel/runtime regenerator: true, // 使用到@babel/runtime useESModules: false, diff --git a/packages/vantui-cli/tsconfig.cjs.json b/packages/vantui-cli/tsconfig.cjs.json new file mode 100644 index 000000000..c290b5076 --- /dev/null +++ b/packages/vantui-cli/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "target": "ES2017", + "module": "ES2022", + "baseUrl": "./", + "outDir": "dest" + }, + "include": ["src"] +} diff --git a/packages/vantui-demo/config/webpack/h5Chain.js b/packages/vantui-demo/config/webpack/h5Chain.js index ff4936496..56e3df3e3 100644 --- a/packages/vantui-demo/config/webpack/h5Chain.js +++ b/packages/vantui-demo/config/webpack/h5Chain.js @@ -11,7 +11,7 @@ module.exports = function (chain) { /css-loader/.test(filename) || (/node_modules/.test(filename) && !( - /(taro)|(react-spring)/.test(filename) && + /(taro)|(react-spring)|(@antmjs)/.test(filename) && !/tarojs[\\/](runtime|shared|plugin-platform)/.test(filename) )), ) diff --git a/packages/vantui-demo/config/webpack/miniChain.js b/packages/vantui-demo/config/webpack/miniChain.js index f48f5c19d..567840e08 100644 --- a/packages/vantui-demo/config/webpack/miniChain.js +++ b/packages/vantui-demo/config/webpack/miniChain.js @@ -24,7 +24,7 @@ module.exports = function (chain) { /css-loader/.test(filename) || (/node_modules/.test(filename) && !( - /(taro)|(react-spring)/.test(filename) && + /(taro)|(react-spring)|(@antmjs)/.test(filename) && !/tarojs[\\/](runtime|shared|plugin-platform)/.test(filename) )), ) diff --git a/packages/vantui-demo/package.json b/packages/vantui-demo/package.json index fec464a5f..1d5ff3d18 100644 --- a/packages/vantui-demo/package.json +++ b/packages/vantui-demo/package.json @@ -82,7 +82,7 @@ }, "author": "", "dependencies": { - "@antmjs/mini-fix": "^1.21.3", + "@antmjs/mini-fix": "^2.0.1", "@antmjs/vantui": "1.9.23", "@babel/runtime": "^7.7.7", "@tarojs/components": "3.5.3", @@ -109,9 +109,9 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@antmjs/iconfont": "^1.21.3", - "@antmjs/plugin-global-fix": "^1.21.3", - "@antmjs/plugin-mini-fix": "^1.21.3", + "@antmjs/iconfont": "^2.0.1", + "@antmjs/plugin-global-fix": "^2.0.1", + "@antmjs/plugin-mini-fix": "^2.0.1", "@babel/core": "^7.8.0", "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", diff --git a/packages/vantui-demo/src/app.less b/packages/vantui-demo/src/app.less index fbfae83b6..0622bb6b3 100644 --- a/packages/vantui-demo/src/app.less +++ b/packages/vantui-demo/src/app.less @@ -2,11 +2,13 @@ /* stylelint-disable font-family-no-missing-generic-family-keyword */ /* stylelint-disable selector-type-no-unknown, selector-max-type */ @import '@antmjs/vantui/es/style/base.less'; + page, body { background-color: #f7f8fa; font-size: 28px; } + body taro-button-core { width: initial; } @@ -37,6 +39,7 @@ taro-button-core + taro-button-core { .pages-icon-index { background-color: #ffffff; + .van-col { display: flex; align-items: center; @@ -102,6 +105,7 @@ taro-button-core + taro-button-core { .pages-image-index { background-color: #ffffff; + .van-col { color: #7d7e80; display: flex; @@ -131,6 +135,7 @@ taro-button-core + taro-button-core { align-items: center; justify-content: center; } + .block { width: 200px; height: 200px; @@ -146,15 +151,18 @@ taro-button-core + taro-button-core { background-color: #ffffff; text-align: center; } + .van-popup--center { width: 200px; height: 200px; } + .van-popup--top, .van-popup--bottom { width: 100%; height: 30%; } + .van-popup--left, .van-popup--right { width: 30%; @@ -182,6 +190,7 @@ taro-button-core + taro-button-core { .demo-block { margin-bottom: 40px; } + .customButton { width: 112px; color: #ffffff; @@ -209,6 +218,7 @@ taro-button-core + taro-button-core { .pages-sticky-index { position: relative; + .demo-block:last-child { padding-bottom: 1800px !important; } @@ -311,9 +321,11 @@ taro-button-core + taro-button-core { .scroll-container { display: flex; flex-direction: column; + .scroll-container-content { flex: 1; overflow: scroll; + & > scroll-view, & > taro-scroll-view-core { height: 100%; @@ -336,6 +348,7 @@ taro-button-core + taro-button-core { padding-top: 30vh; text-align: center; color: #cccccc; + .loadingWrapper { font-size: 24px; margin-bottom: 24px; @@ -350,12 +363,20 @@ taro-button-core + taro-button-core { position: sticky; top: 0; left: 0; + .left { flex: auto; } + .right { flex: none; padding-left: 12px; } } } + +.pages-dropdown-menu-index { + .demo-block--padding { + padding: 0 !important; + } +} diff --git a/packages/vantui-demo/tsconfig.json b/packages/vantui-demo/tsconfig.json deleted file mode 100644 index c0c7ca70e..000000000 --- a/packages/vantui-demo/tsconfig.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "compilerOptions": { - /** type checking */ - "strict": true, - // 默认false,是否检测定义了但是没使用的变量 - "noUnusedLocals": true, - // 用于检查是否有在函数体中没有使用的参数 - "noUnusedParameters": true, - "allowUnreachableCode": false, - "allowUnusedLabels": false, - "noFallthroughCasesInSwitch": true, - "noImplicitOverride": false, - "noImplicitReturns": true, - "noImplicitAny": false, - "noPropertyAccessFromIndexSignature": true, - "noUncheckedIndexedAccess": true, - /** module */ - "baseUrl": "./", - "module": "commonjs", - // default: module === AMD or UMD or System or ES6, then Classic otherwise Node - "moduleResolution": "Node", - "target": "es5", - "lib": ["ESNext", "dom"], - /** emit */ - "noEmit": true, - /** Interop Constraints */ - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, - // "isolatedModules": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "jsx": "react-jsx", - "skipLibCheck": false, - "paths": { - // 指定模块的路径，和baseUrl有关联，和webpack中resolve.alias配置一样 - "@/*": ["./src/*"] - } - }, - "include": [ - "./src", - "./config", - "./types", - "./babel.config.js", - "./eslint.config.js", - "./lint-staged.config.js", - "./stylelint.config.js", - "./_antm.config.js", - "./antm.config.js" - ], - "compileOnSave": false -} diff --git a/packages/vantui-doc/docs/premium.md b/packages/vantui-doc/docs/premium.md index 3a32f17f0..984f69627 100644 --- a/packages/vantui-doc/docs/premium.md +++ b/packages/vantui-doc/docs/premium.md @@ -32,13 +32,13 @@ - 默认封装了 Request 请求，统一规范，通过 TS 的加持，使得响应标准一致 - 默认添加了三种类型的页面模版(能覆盖百分之七八十的业务)，普通模版（自动下拉刷新）、分页模版（自动下拉刷新、上划分页），Tabs 分页模版（自动下拉刷新、上划分页、tab 切换及搜索） - 集成了开箱即用的主题变更逻辑 -- 通过@antmjs/vantui 的 Unite“组件”以空间换时间的方案加快研发速度，同时保证 TS 类型安全 +- 通过@antmjs/unite 的 Unite“组件”以空间换时间的方案加快研发速度，同时保证 TS 类型安全 ### Unite 是什么 ```jsx // 代码不多，可以自己看源码 -import { Unite } from '@antmjs/vantui' +import { Unite } from '@antmjs/unite' // 和UI无关的全局数据定义在这里面，具体可以看项目模版 import {} from '@/cache' // 和UI相关的全局数据定义在这里面，具体可以看项目模版 diff --git a/packages/vantui-doc/docs/quickstart.md b/packages/vantui-doc/docs/quickstart.md index c4ba7e503..18bb33865 100644 --- a/packages/vantui-doc/docs/quickstart.md +++ b/packages/vantui-doc/docs/quickstart.md @@ -47,6 +47,8 @@ ## 开始使用 +> 2.0 版本起内部不再注入 polyfill 逻辑，需要兼容低版本的请自行进行 polyfill。 + ### 通过 npm/yarn 安装 ```bash diff --git a/packages/vantui/package.json b/packages/vantui/package.json index c724fc730..dacb2c6b0 100644 --- a/packages/vantui/package.json +++ b/packages/vantui/package.json @@ -47,7 +47,6 @@ "test": "" }, "dependencies": { - "@babel/runtime-corejs3": "^7.14.7", "@vant/icons": "^1.7.1", "classnames": "^2.3.1", "dayjs": "^1.10.6", @@ -55,7 +54,7 @@ "use-deep-compare-effect": "^1.8.1" }, "devDependencies": { - "@antmjs/iconfont": "^1.21.3", + "@antmjs/iconfont": "^2.0.1", "@antmjs/vantui-cli": "1.9.23", "@tarojs/components": "^3.5.3", "@tarojs/taro": "^3.5.3", diff --git a/packages/vantui/src/button/index.less b/packages/vantui/src/button/index.less index 0a801624a..cc0659ed8 100644 --- a/packages/vantui/src/button/index.less +++ b/packages/vantui/src/button/index.less @@ -3,12 +3,12 @@ /* stylelint-disable selector-max-attribute */ /* stylelint-disable selector-max-type */ @import '../style/var.less'; + taro-button-core { position: relative; display: block; margin-left: auto; margin-right: auto; - -webkit-box-sizing: border-box; box-sizing: border-box; text-align: center; text-decoration: none; @@ -16,7 +16,7 @@ taro-button-core { width: 100%; border-width: 0; outline: 0; - -webkit-appearance: none; + appearance: none; } taro-button-core:focus { @@ -30,11 +30,8 @@ taro-button-core::after { position: absolute; top: 0; left: 0; - -webkit-transform: scale(0.5); transform: scale(0.5); - -webkit-transform-origin: 0 0; transform-origin: 0 0; - -webkit-box-sizing: border-box; box-sizing: border-box; } @@ -67,8 +64,8 @@ taro-button-core[loading] .weui-loading { padding: 0; text-align: center; vertical-align: middle; - -webkit-appearance: none; - -webkit-text-size-adjust: 100%; + appearance: none; + text-size-adjust: 100%; // reset weapp default border &::after { @@ -210,6 +207,7 @@ taro-button-core[loading] .weui-loading { .theme(border, '@button-border-width solid @button-warning-background-color'); } } + &--active:not(&--disabled) { filter: brightness(0.9); } @@ -218,6 +216,7 @@ taro-button-core[loading] .weui-loading { display: none; } } + .van-button + .van-button { margin-top: 0; } diff --git a/packages/vantui/src/calendar/index.less b/packages/vantui/src/calendar/index.less index 987ae6685..3ad94aaf7 100644 --- a/packages/vantui/src/calendar/index.less +++ b/packages/vantui/src/calendar/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-calendar { display: flex; flex-direction: column; @@ -168,7 +169,7 @@ right: 0; bottom: 0; left: 0; - background-color: currentColor; + background-color: currentcolor; content: ''; .theme(opacity, '@calendar-range-middle-background-opacity'); diff --git a/packages/vantui/src/card/index.less b/packages/vantui/src/card/index.less index fd35dbc30..4f2dd9301 100644 --- a/packages/vantui/src/card/index.less +++ b/packages/vantui/src/card/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-card { position: relative; box-sizing: border-box; diff --git a/packages/vantui/src/cell-group/index.less b/packages/vantui/src/cell-group/index.less index 9af57371c..5cb80c813 100644 --- a/packages/vantui/src/cell-group/index.less +++ b/packages/vantui/src/cell-group/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-cell-group { &--inset { .theme(margin, '@cell-group-inset-padding'); diff --git a/packages/vantui/src/cell/index.less b/packages/vantui/src/cell/index.less index 0c434248f..c8e331f56 100644 --- a/packages/vantui/src/cell/index.less +++ b/packages/vantui/src/cell/index.less @@ -1,5 +1,6 @@ @import '../style/var.less'; @import '../style/hairline.less'; + .van-cell { position: relative; display: flex; diff --git a/packages/vantui/src/checkbox/index.less b/packages/vantui/src/checkbox/index.less index 9239a93d6..e51c5f49b 100644 --- a/packages/vantui/src/checkbox/index.less +++ b/packages/vantui/src/checkbox/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-checkbox { display: flex; align-items: center; diff --git a/packages/vantui/src/circle/index.less b/packages/vantui/src/circle/index.less index 6ee34a56c..374b01481 100644 --- a/packages/vantui/src/circle/index.less +++ b/packages/vantui/src/circle/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-circle { position: relative; display: inline-block; diff --git a/packages/vantui/src/circle/index.tsx b/packages/vantui/src/circle/index.tsx index 3584cd19b..ecaed5929 100644 --- a/packages/vantui/src/circle/index.tsx +++ b/packages/vantui/src/circle/index.tsx @@ -72,31 +72,21 @@ export function Circle(props: CircleProps) { }, []) useEffect(() => { - /* eslint-disable-next-line */ - // @ts-ignore - if (process.env.LIBRARY_ENV === 'react') { - setTimeout(() => { - if (process.env.TARO_ENV === 'h5') { - setState((state) => { - return { - ...state, - ready: true, - } - }) - } - }, 100) - } + setTimeout(() => { + if (process.env.TARO_ENV === 'h5') { + setState((state) => { + return { + ...state, + ready: true, + } + }) + } + }, 100) // eslint-disable-next-line react-hooks/exhaustive-deps }, []) const getContext = useCallback(() => { - /* eslint-disable-next-line */ - // @ts-ignore - if (process.env.LIBRARY_ENV === 'react') { - /* eslint-disable-next-line */ - // @ts-ignore - Current.page = { path: `page-${state.unitag}` } - } + Current.page = Current.page ?? { path: `page-${state.unitag}` } let ctx: any = null try { ctx = createCanvasContext(state.unitag) diff --git a/packages/vantui/src/collapse-item/index.less b/packages/vantui/src/collapse-item/index.less index d8bef30c1..0252c154e 100644 --- a/packages/vantui/src/collapse-item/index.less +++ b/packages/vantui/src/collapse-item/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-collapse-item { &__title { .van-cell__right-icon { diff --git a/packages/vantui/src/count-down/index.less b/packages/vantui/src/count-down/index.less index 0c55f4962..1fba8d5e7 100644 --- a/packages/vantui/src/count-down/index.less +++ b/packages/vantui/src/count-down/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-count-down { .theme(color, '@count-down-text-color'); .theme(font-size, '@count-down-font-size'); diff --git a/packages/vantui/src/dialog/index.less b/packages/vantui/src/dialog/index.less index a62470129..f5c882b35 100644 --- a/packages/vantui/src/dialog/index.less +++ b/packages/vantui/src/dialog/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-dialog { top: 45% !important; overflow: hidden; diff --git a/packages/vantui/src/divider/index.less b/packages/vantui/src/divider/index.less index d718b5700..50933c4ab 100644 --- a/packages/vantui/src/divider/index.less +++ b/packages/vantui/src/divider/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-divider { display: flex; align-items: center; diff --git a/packages/vantui/src/dropdown-item/index.less b/packages/vantui/src/dropdown-item/index.less index 98a90087b..90f14e6c3 100644 --- a/packages/vantui/src/dropdown-item/index.less +++ b/packages/vantui/src/dropdown-item/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-dropdown-item { position: fixed; right: 0; diff --git a/packages/vantui/src/dropdown-menu/index.less b/packages/vantui/src/dropdown-menu/index.less index 970ec6353..8179d90b0 100644 --- a/packages/vantui/src/dropdown-menu/index.less +++ b/packages/vantui/src/dropdown-menu/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-dropdown-menu { display: flex; user-select: none; @@ -44,7 +45,7 @@ right: -8px; margin-top: -10px; border: 6px solid; - border-color: transparent transparent currentColor currentColor; + border-color: transparent transparent currentcolor currentcolor; transform: rotate(-45deg); opacity: 0.8; content: ''; diff --git a/packages/vantui/src/empty/index.less b/packages/vantui/src/empty/index.less index a7d1e9344..7b8e15caa 100644 --- a/packages/vantui/src/empty/index.less +++ b/packages/vantui/src/empty/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-empty { display: flex; flex-direction: column; diff --git a/packages/vantui/src/field/index.less b/packages/vantui/src/field/index.less index 705adbbb7..074086399 100644 --- a/packages/vantui/src/field/index.less +++ b/packages/vantui/src/field/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity, selector-max-type */ @import '../style/var.less'; + .van-field { &__label { .theme(color, '@field-label-color'); @@ -18,6 +19,7 @@ padding: 6px 0; line-height: 1.2em; .theme(min-height, '@cell-line-height'); + textarea { resize: none; } diff --git a/packages/vantui/src/form-item/index.less b/packages/vantui/src/form-item/index.less index aa5bba0ff..5f32f5550 100644 --- a/packages/vantui/src/form-item/index.less +++ b/packages/vantui/src/form-item/index.less @@ -27,6 +27,7 @@ &-vertical { flex-direction: column; + .vant-form-formItem-controll-item { margin-top: @form-vertical-controll-margin-top; } diff --git a/packages/vantui/src/goods-action-button/index.less b/packages/vantui/src/goods-action-button/index.less index b94239f17..4f2d3e8f3 100644 --- a/packages/vantui/src/goods-action-button/index.less +++ b/packages/vantui/src/goods-action-button/index.less @@ -10,6 +10,7 @@ &--warning { .theme(background,'@goods-action-button-warning-color'); } + &--danger { .theme(background, '@goods-action-button-danger-color'); } diff --git a/packages/vantui/src/goods-action-icon/index.less b/packages/vantui/src/goods-action-icon/index.less index d2cb00935..b36ad048d 100644 --- a/packages/vantui/src/goods-action-icon/index.less +++ b/packages/vantui/src/goods-action-icon/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-goods-action-icon { display: flex !important; flex-direction: column; diff --git a/packages/vantui/src/goods-action/index.less b/packages/vantui/src/goods-action/index.less index 4b9a27429..e6f54ef42 100644 --- a/packages/vantui/src/goods-action/index.less +++ b/packages/vantui/src/goods-action/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-goods-action { position: fixed; right: 0; diff --git a/packages/vantui/src/grid-item/index.less b/packages/vantui/src/grid-item/index.less index 2c338c022..2473ad66d 100644 --- a/packages/vantui/src/grid-item/index.less +++ b/packages/vantui/src/grid-item/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-grid-item { position: relative; float: left; diff --git a/packages/vantui/src/icon/index.less b/packages/vantui/src/icon/index.less index 9b6dba01b..fd2d902b3 100644 --- a/packages/vantui/src/icon/index.less +++ b/packages/vantui/src/icon/index.less @@ -4,6 +4,7 @@ .van-icon { /* stylelint-disable-next-line */ font: normal normal normal 28px 'vant-icon'; + &--image { width: 1em; height: 1em; diff --git a/packages/vantui/src/image/index.less b/packages/vantui/src/image/index.less index 3f653e96a..0efcaaa9f 100644 --- a/packages/vantui/src/image/index.less +++ b/packages/vantui/src/image/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-image { position: relative; display: inline-block; diff --git a/packages/vantui/src/index-anchor/index.less b/packages/vantui/src/index-anchor/index.less index 4c7a2f496..761ff8e6c 100644 --- a/packages/vantui/src/index-anchor/index.less +++ b/packages/vantui/src/index-anchor/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-index-anchor { .theme(padding, '@index-anchor-padding'); .theme(color, '@index-anchor-text-color'); diff --git a/packages/vantui/src/index-bar/index.less b/packages/vantui/src/index-bar/index.less index 235660efe..c5d5f46df 100644 --- a/packages/vantui/src/index-bar/index.less +++ b/packages/vantui/src/index-bar/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-index-bar { position: relative; diff --git a/packages/vantui/src/info/index.less b/packages/vantui/src/info/index.less index 271d0d039..08839f3cc 100644 --- a/packages/vantui/src/info/index.less +++ b/packages/vantui/src/info/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-info { position: absolute; top: 0; diff --git a/packages/vantui/src/loading/index.less b/packages/vantui/src/loading/index.less index 3651bccd1..0a14ea2d7 100644 --- a/packages/vantui/src/loading/index.less +++ b/packages/vantui/src/loading/index.less @@ -22,8 +22,8 @@ &--circular { border: 2px solid transparent; - border-top-color: currentColor; - border-left-color: currentColor; + border-top-color: currentcolor; + border-left-color: currentcolor; border-radius: 100%; } } @@ -59,7 +59,7 @@ width: 4px; height: 25%; margin: 0 auto; - background-color: currentColor; + background-color: currentcolor; border-radius: 40%; content: ' '; } @@ -78,46 +78,57 @@ transform: rotate(30deg); opacity: 1; } + .van-loading__dot:nth-of-type(2) { transform: rotate(60deg); opacity: 0.9375; } + .van-loading__dot:nth-of-type(3) { transform: rotate(90deg); opacity: 0.875; } + .van-loading__dot:nth-of-type(4) { transform: rotate(120deg); opacity: 0.8125; } + .van-loading__dot:nth-of-type(5) { transform: rotate(150deg); opacity: 0.75; } + .van-loading__dot:nth-of-type(6) { transform: rotate(180deg); opacity: 0.6875; } + .van-loading__dot:nth-of-type(7) { transform: rotate(210deg); opacity: 0.625; } + .van-loading__dot:nth-of-type(8) { transform: rotate(240deg); opacity: 0.5625; } + .van-loading__dot:nth-of-type(9) { transform: rotate(270deg); opacity: 0.5; } + .van-loading__dot:nth-of-type(10) { transform: rotate(300deg); opacity: 0.4375; } + .van-loading__dot:nth-of-type(11) { transform: rotate(330deg); opacity: 0.375; } + .van-loading__dot:nth-of-type(12) { transform: rotate(360deg); opacity: 0.3125; diff --git a/packages/vantui/src/mini-nav-bar/index.less b/packages/vantui/src/mini-nav-bar/index.less index ca75e5eab..7a5077b4a 100644 --- a/packages/vantui/src/mini-nav-bar/index.less +++ b/packages/vantui/src/mini-nav-bar/index.less @@ -1,5 +1,6 @@ @import '../style/var.less'; @import '../style/hairline.less'; + .van-nav-bar { position: relative; text-align: center; @@ -51,6 +52,7 @@ .theme(font-weight, '@font-weight-bold'); .theme(font-size, '@nav-bar-title-font-size'); } + &__title-h5 { display: flex; height: 100%; @@ -127,6 +129,7 @@ align-items: center; .theme(font-size, '@font-size-md'); } + &__left-menu { display: flex; justify-content: center; @@ -135,18 +138,23 @@ border-radius: 50%; font-weight: bold; box-sizing: border-box; + .van-icon-arrow-left { padding-right: 4px; } + .van-icon-wap-home { padding-bottom: 4px; } + &:nth-child(2) { margin-left: 14px; } + &-white { background-color: rgba(255, 255, 255, 0.6); color: #000000; + &::after { .hairline(rgba(151,151,151, 0.2)); @@ -156,11 +164,13 @@ border-width: 1PX; } } + &-black { background-color: rgba(0, 0, 0, 0.15); color: #ffffff; + &::after { - .hairline(rgba(255,255,255, 0.25)); + .hairline(rgba(255, 255, 255, 0.25)); border-radius: 50%; diff --git a/packages/vantui/src/nav-bar/index.less b/packages/vantui/src/nav-bar/index.less index ca75e5eab..97380c83e 100644 --- a/packages/vantui/src/nav-bar/index.less +++ b/packages/vantui/src/nav-bar/index.less @@ -1,5 +1,6 @@ @import '../style/var.less'; @import '../style/hairline.less'; + .van-nav-bar { position: relative; text-align: center; @@ -51,6 +52,7 @@ .theme(font-weight, '@font-weight-bold'); .theme(font-size, '@nav-bar-title-font-size'); } + &__title-h5 { display: flex; height: 100%; @@ -127,6 +129,7 @@ align-items: center; .theme(font-size, '@font-size-md'); } + &__left-menu { display: flex; justify-content: center; @@ -135,18 +138,23 @@ border-radius: 50%; font-weight: bold; box-sizing: border-box; + .van-icon-arrow-left { padding-right: 4px; } + .van-icon-wap-home { padding-bottom: 4px; } + &:nth-child(2) { margin-left: 14px; } + &-white { background-color: rgba(255, 255, 255, 0.6); color: #000000; + &::after { .hairline(rgba(151,151,151, 0.2)); @@ -156,9 +164,11 @@ border-width: 1PX; } } + &-black { background-color: rgba(0, 0, 0, 0.15); color: #ffffff; + &::after { .hairline(rgba(255,255,255, 0.25)); diff --git a/packages/vantui/src/notice-bar/index.less b/packages/vantui/src/notice-bar/index.less index d30324a33..e6f307ec6 100644 --- a/packages/vantui/src/notice-bar/index.less +++ b/packages/vantui/src/notice-bar/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-notice-bar { display: flex; align-items: center; diff --git a/packages/vantui/src/notify/index.less b/packages/vantui/src/notify/index.less index e535f7530..896ffeb0c 100644 --- a/packages/vantui/src/notify/index.less +++ b/packages/vantui/src/notify/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-notify { text-align: center; word-wrap: break-word; diff --git a/packages/vantui/src/number-keyboard/index.less b/packages/vantui/src/number-keyboard/index.less index 37caee195..2654fca2f 100644 --- a/packages/vantui/src/number-keyboard/index.less +++ b/packages/vantui/src/number-keyboard/index.less @@ -7,6 +7,7 @@ display: flex; flex-wrap: wrap; flex: 1; + &.confirmed-style .sign-key { background-color: @number-keyboard-sign-background-color; } @@ -26,10 +27,12 @@ padding: 0 24px; color: @number-keyboard-week-color; background-color: #ffffff; + &-close-button { padding: 0 24px; font-size: 24px; } + &.with-title { justify-content: space-between; .@{class-prefix-number-keyboard}-header-close-button { @@ -102,6 +105,7 @@ &.extra-key, &.number-key { background-color: #ffffff; + &:active::before { opacity: 0.1; } diff --git a/packages/vantui/src/overlay/index.less b/packages/vantui/src/overlay/index.less index 24db7739f..cd178b3cb 100644 --- a/packages/vantui/src/overlay/index.less +++ b/packages/vantui/src/overlay/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-overlay { position: fixed; top: 0; diff --git a/packages/vantui/src/pagination/index.less b/packages/vantui/src/pagination/index.less index 345d4610b..ff3fad90e 100644 --- a/packages/vantui/src/pagination/index.less +++ b/packages/vantui/src/pagination/index.less @@ -4,15 +4,18 @@ display: flex; font-size: @pagination-font-size; color: @pagination-color; + &-contain { display: flex; } + &-simple { height: 78px; width: 248px; line-height: 78px; text-align: center; } + &-prev, &-item, &-next { @@ -28,23 +31,28 @@ border: @pagination-item-border-width solid @pagination-item-border-color; cursor: pointer; } + &-prev, &-item { border-right: none; } + &-prev, &-next { padding: @pagination-prev-next-padding; } + .simple-border { border-right: @pagination-item-border-width solid @pagination-item-border-color; } + .active { color: @white; border: none; background: @pagination-active-background-color; } + .disabled { color: @pagination-disable-color; background-color: @pagination-disable-background-color; diff --git a/packages/vantui/src/picker-column/index.less b/packages/vantui/src/picker-column/index.less index 4f070cb29..ccf76547b 100644 --- a/packages/vantui/src/picker-column/index.less +++ b/packages/vantui/src/picker-column/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-picker-column { overflow: hidden; text-align: center; diff --git a/packages/vantui/src/picker/index.less b/packages/vantui/src/picker/index.less index 3fd45b7f8..ebcf48846 100644 --- a/packages/vantui/src/picker/index.less +++ b/packages/vantui/src/picker/index.less @@ -1,7 +1,9 @@ @import '../style/var.less'; + .van-picker { position: relative; overflow: hidden; + /* stylelint-disable-next-line property-no-vendor-prefix */ -webkit-text-size-adjust: 100%; /* avoid iOS text size adjust */ user-select: none; .theme(background-color, '@picker-background-color'); @@ -70,10 +72,14 @@ height: 100%; background-image: linear-gradient( 180deg, - hsla(0, 0%, 100%, 0.9), - hsla(0, 0%, 100%, 0.4) + hsla(0deg, 0%, 100%, 0.9), + hsla(0deg, 0%, 100%, 0.4) ), - linear-gradient(0deg, hsla(0, 0%, 100%, 0.9), hsla(0, 0%, 100%, 0.4)); + linear-gradient( + 0deg, + hsla(0deg, 0%, 100%, 0.9), + hsla(0deg, 0%, 100%, 0.4) + ); background-repeat: no-repeat; background-position: top, bottom; backface-visibility: hidden; diff --git a/packages/vantui/src/popup/index.less b/packages/vantui/src/popup/index.less index 1007ff922..732778df7 100644 --- a/packages/vantui/src/popup/index.less +++ b/packages/vantui/src/popup/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-popup { position: fixed; box-sizing: border-box; diff --git a/packages/vantui/src/progress/index.less b/packages/vantui/src/progress/index.less index 39bbd4cd8..2c5308dd4 100644 --- a/packages/vantui/src/progress/index.less +++ b/packages/vantui/src/progress/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-progress { position: relative; .theme(height, '@progress-height'); diff --git a/packages/vantui/src/radio/index.less b/packages/vantui/src/radio/index.less index 1dc7644c8..2ac22e39e 100644 --- a/packages/vantui/src/radio/index.less +++ b/packages/vantui/src/radio/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-radio { display: flex; align-items: center; diff --git a/packages/vantui/src/rate/index.less b/packages/vantui/src/rate/index.less index be7abb11f..b3071beaf 100644 --- a/packages/vantui/src/rate/index.less +++ b/packages/vantui/src/rate/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-rate { display: inline-flex; user-select: none; diff --git a/packages/vantui/src/row/index.tsx b/packages/vantui/src/row/index.tsx index ddd567833..21120acce 100644 --- a/packages/vantui/src/row/index.tsx +++ b/packages/vantui/src/row/index.tsx @@ -1,5 +1,5 @@ import { View } from '@tarojs/components' -import React, { useMemo } from 'react' +import { useMemo, cloneElement } from 'react' import toArray from 'rc-util/lib/Children/toArray' import classNames from 'classnames' import * as utils from '../wxs/utils' @@ -10,8 +10,9 @@ export function Row(props: RowProps): JSX.Element { const { gutter, children, className, style, ...others } = props const newChildren: React.ReactElement[] = useMemo(() => { - return toArray(children).map((node: React.ReactElement) => - React.cloneElement(node, { + return toArray(children).map((node: React.ReactElement, i) => + cloneElement(node, { + key: i, gutter: gutter, }), ) diff --git a/packages/vantui/src/search/index.less b/packages/vantui/src/search/index.less index 1426eb19c..7c604578d 100644 --- a/packages/vantui/src/search/index.less +++ b/packages/vantui/src/search/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-search { display: flex; align-items: center; @@ -46,9 +47,11 @@ .theme(background-color, '@active-color'); } } + .van-cell__title { display: none; } + .weui-input { height: 100%; } diff --git a/packages/vantui/src/sidebar-item/index.less b/packages/vantui/src/sidebar-item/index.less index f503c00c2..28df9b037 100644 --- a/packages/vantui/src/sidebar-item/index.less +++ b/packages/vantui/src/sidebar-item/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-sidebar-item { display: block; box-sizing: border-box; diff --git a/packages/vantui/src/sidebar/index.less b/packages/vantui/src/sidebar/index.less index c68617ecf..05ffc02d4 100644 --- a/packages/vantui/src/sidebar/index.less +++ b/packages/vantui/src/sidebar/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-sidebar { .theme(width, '@sidebar-width'); } diff --git a/packages/vantui/src/skeleton/index.less b/packages/vantui/src/skeleton/index.less index 5899a47ac..ddb762259 100644 --- a/packages/vantui/src/skeleton/index.less +++ b/packages/vantui/src/skeleton/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-skeleton { display: flex; box-sizing: border-box; diff --git a/packages/vantui/src/slider/index.less b/packages/vantui/src/slider/index.less index 2f5f76f20..a1c71ad0c 100644 --- a/packages/vantui/src/slider/index.less +++ b/packages/vantui/src/slider/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-slider { position: relative; .theme(height, '@slider-bar-height'); diff --git a/packages/vantui/src/stepper/index.less b/packages/vantui/src/stepper/index.less index 03d7702b9..79e37e14e 100644 --- a/packages/vantui/src/stepper/index.less +++ b/packages/vantui/src/stepper/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-stepper { font-size: 0; @@ -35,7 +36,7 @@ bottom: 0; left: 0; margin: auto; - background-color: currentColor; + background-color: currentcolor; content: ''; } @@ -117,6 +118,7 @@ border: 0; border-width: 2px 0; border-radius: 0; + /* stylelint-disable-next-line property-no-vendor-prefix */ -webkit-appearance: none; .theme(font-size, '@stepper-input-font-size'); .theme(color, '@stepper-input-text-color'); diff --git a/packages/vantui/src/steps/index.less b/packages/vantui/src/steps/index.less index 7a5efdd9a..d3269f922 100644 --- a/packages/vantui/src/steps/index.less +++ b/packages/vantui/src/steps/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-steps { overflow: hidden; .theme(background-color, '@steps-background-color'); diff --git a/packages/vantui/src/sticky/index.less b/packages/vantui/src/sticky/index.less index d2f0da3db..ffd8c8f4c 100644 --- a/packages/vantui/src/sticky/index.less +++ b/packages/vantui/src/sticky/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-sticky { position: relative; z-index: @sticky-z-index; diff --git a/packages/vantui/src/style/base.less b/packages/vantui/src/style/base.less index 44c88b6fe..b22adbac4 100644 --- a/packages/vantui/src/style/base.less +++ b/packages/vantui/src/style/base.less @@ -8,6 +8,7 @@ @import './ellipsis.less'; @import './clearfix.less'; @import './hairline.less'; + html, body, page { diff --git a/packages/vantui/src/style/mixins/ellipsis.less b/packages/vantui/src/style/mixins/ellipsis.less index 44b97b728..5a4c30867 100644 --- a/packages/vantui/src/style/mixins/ellipsis.less +++ b/packages/vantui/src/style/mixins/ellipsis.less @@ -1,4 +1,5 @@ .multi-ellipsis(@lines) { + /* stylelint-disable-next-line value-no-vendor-prefix */ display: -webkit-box; overflow: hidden; text-overflow: ellipsis; diff --git a/packages/vantui/src/style/var.less b/packages/vantui/src/style/var.less index 2ab2165ed..aaf5c02d2 100644 --- a/packages/vantui/src/style/var.less +++ b/packages/vantui/src/style/var.less @@ -268,7 +268,7 @@ @form-background-color: @white; @form-space-horizontal: 24px; @form-space-vertical: 24px; -@form-border-bottom: 2px solid #eeeeee; +@form-border-bottom: 2px solid @gray-3; @form-line-height: 50px; @form-label-color: @gray-7; @form-label-width: 146px; diff --git a/packages/vantui/src/submit-bar/index.less b/packages/vantui/src/submit-bar/index.less index a7b960267..f9e3f2380 100644 --- a/packages/vantui/src/submit-bar/index.less +++ b/packages/vantui/src/submit-bar/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-submit-bar { position: fixed; bottom: 0; diff --git a/packages/vantui/src/switch/index.less b/packages/vantui/src/switch/index.less index ae9246d36..112ca9619 100644 --- a/packages/vantui/src/switch/index.less +++ b/packages/vantui/src/switch/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-switch { position: relative; display: inline-block; diff --git a/packages/vantui/src/tabbar/index.less b/packages/vantui/src/tabbar/index.less index 736a5774f..548026415 100644 --- a/packages/vantui/src/tabbar/index.less +++ b/packages/vantui/src/tabbar/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-tabbar { display: flex; box-sizing: content-box; diff --git a/packages/vantui/src/tabs/index.less b/packages/vantui/src/tabs/index.less index d52258bfa..7d96ea392 100644 --- a/packages/vantui/src/tabs/index.less +++ b/packages/vantui/src/tabs/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-tabs { position: relative; -webkit-tap-highlight-color: transparent; diff --git a/packages/vantui/src/tag/index.less b/packages/vantui/src/tag/index.less index 97d6db94b..3af9108d8 100644 --- a/packages/vantui/src/tag/index.less +++ b/packages/vantui/src/tag/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-tag { position: relative; display: inline-flex; @@ -58,7 +59,7 @@ right: 0; bottom: 0; left: 0; - border: 2px solid currentColor; + border: 2px solid currentcolor; border-radius: inherit; content: ''; pointer-events: none; diff --git a/packages/vantui/src/toast/index.less b/packages/vantui/src/toast/index.less index 8995990b6..be4d67053 100644 --- a/packages/vantui/src/toast/index.less +++ b/packages/vantui/src/toast/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-toast { display: flex; flex-direction: column; diff --git a/packages/vantui/src/tree-select/index.less b/packages/vantui/src/tree-select/index.less index 4d212403e..09dca3925 100644 --- a/packages/vantui/src/tree-select/index.less +++ b/packages/vantui/src/tree-select/index.less @@ -1,4 +1,5 @@ @import '../style/var.less'; + .van-tree-select { position: relative; display: flex; diff --git a/packages/vantui/src/unite-context/index.tsx b/packages/vantui/src/unite-context/index.tsx deleted file mode 100644 index 0c90581d2..000000000 --- a/packages/vantui/src/unite-context/index.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { createContext } from 'react' - -export const UniteContext = createContext({ - uniteConfig: { - page: false, - }, - onRefresh: () => {}, - error: undefined, - setError: (value: any) => { - console.log(value) - }, -}) as React.Context<{ - uniteConfig: { - page?: boolean - } - onRefresh: ( - catchRefresh?: T, - ) => T extends true - ? Promise<{ code: string; message: string; data: any }> - : void - error?: { code: string; message: string; data: any } - setError: React.Dispatch< - React.SetStateAction< - { code: string; message: string; data: any } | undefined - > - > -}> - -export default UniteContext diff --git a/packages/vantui/src/unite/index.tsx b/packages/vantui/src/unite/index.tsx deleted file mode 100644 index 6c4b5bb5b..000000000 --- a/packages/vantui/src/unite/index.tsx +++ /dev/null @@ -1,317 +0,0 @@ -import React, { useEffect, useRef, useState } from 'react' -import { - nextTick, - useDidHide, - useDidShow, - useReady, - useRouter, -} from '@tarojs/taro' -import { UniteContext } from '../unite-context' -import { parse } from '../utils' - -function useContainer(config: any, props: any, options: any) { - // 兼容react-refresh - const cfgRef = useRef({}) as React.MutableRefObject - cfgRef.current = config - - // 通过ref初始化实例对象 - const insRef = useRef({ - loading: {}, - hooks: {}, - }) as React.MutableRefObject - - // 初始化state - const [state, setState]: any = useState(cfgRef.current.state) - - // 定义错误收集器，页面级展示的错误可以设置到这里面 - const [error, setError]: any = useState() - - // 定义加载收集器 - const [loading, setLoading]: any = useState({}) - - // 通过ref定义一些开关 - const flagRef = useRef({ - __refresh: false, - __mounted: false, - __init: false, - __refactor: function () { - insRef.current.setState = function (res: any): void { - if (flagRef.current.__mounted) { - if (toString.call(res) === '[object Object]') { - setState((preState: any) => { - return { ...preState, ...res } - }) - } else { - setState(res as any) - } - } - } - - insRef.current.setError = function (res: any) { - if (flagRef.current.__mounted) { - setError(res) - } - } - - const _setLoading = function (obj: any): void { - if (flagRef.current.__mounted) { - setLoading((preState: any) => { - return { ...preState, ...obj } - }) - } - } - for (const item in cfgRef.current) { - if (typeof cfgRef.current[item] === 'function') { - const copyFunc = cfgRef.current[item] - const _defined = function (this: any, ...args: any[]): any { - let res: any - try { - if (!options?.cancelInterception?.[item]) { - if (insRef.current.loading[item]) { - return new Promise(() => {}) - } - } - res = copyFunc!.call(this, ...args) - if (typeof res?.then !== 'function') { - return res - } - const loadingTrue = { - [item]: true, - } as any - const loadingFalse = { - [item]: false, - } as any - return new Promise(function (resolve, reject) { - insRef.current.loading[item] = true - _setLoading(loadingTrue) - res - .then(function (result: any) { - insRef.current.loading[item] = false - _setLoading(loadingFalse) - resolve(result) - }) - .catch(function (err: any) { - const allLoading: any = {} - Object.keys(insRef.current.loading).map((xitem) => { - insRef.current.loading[xitem] = false - allLoading[xitem] = false - }) - _setLoading(allLoading) - if ( - flagRef.current.__refresh && - (item === 'onLoad' || - item === 'onReady' || - item === 'onShow') - ) { - flagRef.current.__refresh = false - reject({ - code: err.code || 'JSError', - message: err.message || '语法出现了小故障', - data: err.data || err, - }) - } else { - setError({ - code: err.code || 'JSError', - message: err.message || '语法出现了小故障', - data: err.data || err, - }) - } - }) - }) - } catch (err) { - const allLoading: any = {} - Object.keys(insRef.current.loading).map((xitem) => { - insRef.current.loading[xitem] = false - allLoading[xitem] = false - }) - _setLoading(allLoading) - if ( - flagRef.current.__refresh && - (item === 'onLoad' || item === 'onReady' || item === 'onShow') - ) { - flagRef.current.__refresh = false - throw { - code: 'JSError', - message: '语法出现了小故障', - data: err, - } - } else { - setError({ - code: 'JSError', - message: '语法出现了小故障', - data: err, - }) - } - } - } - insRef.current[item] = _defined.bind(insRef.current) - } else if (item !== 'state') { - insRef.current[item] = cfgRef.current[item] - } - } - insRef.current.onRefresh = function (catchRefresh?: boolean) { - if (catchRefresh) { - flagRef.current.__refresh = true - } - return new Promise((resolve: (value?: any) => void) => { - let isPromise = false - let asyncFuncCount = 0 - let execAsyncFuncCount = 0 - try { - if (typeof insRef.current?.onLoad === 'function') { - const res = insRef.current.onLoad() - if (res.then) { - isPromise = true - asyncFuncCount++ - res - .then((data: any) => { - execAsyncFuncCount++ - if (execAsyncFuncCount === asyncFuncCount) { - resolve({ code: '200', message: '请求成功', data: data }) - } - }) - .catch((e: any) => { - resolve({ code: e.code, message: e.message, data: e.data }) - }) - } - } - if (typeof insRef.current?.onReady === 'function') { - const res = insRef.current.onReady() - if (res.then) { - isPromise = true - asyncFuncCount++ - res - .then((data: any) => { - execAsyncFuncCount++ - if (execAsyncFuncCount === asyncFuncCount) { - resolve({ code: '200', message: '请求成功', data: data }) - } - }) - .catch((e: any) => { - resolve({ code: e.code, message: e.message, data: e.data }) - }) - } - } - if (typeof insRef.current?.onShow === 'function') { - const res = insRef.current.onShow() - if (res.then) { - isPromise = true - asyncFuncCount++ - res - .then((data: any) => { - execAsyncFuncCount++ - if (execAsyncFuncCount === asyncFuncCount) { - resolve({ code: '200', message: '请求成功', data: data }) - } - }) - .catch((e: any) => { - resolve({ code: e.code, message: e.message, data: e.data }) - }) - } - } - } catch (error: any) { - resolve({ - code: error.code || 'JSError', - message: error.message || '语法出现了小故障', - data: error.data, - }) - } - if (!isPromise) { - flagRef.current.__refresh = false - resolve({ code: '200', message: '请求成功', data: null }) - } - }) - } - insRef.current.setHooks = function (hooks: any) { - insRef.current.hooks = Object.assign(insRef.current.hooks, hooks) - } - }, - }) as React.MutableRefObject - - // 初始化 - if (!flagRef.current.__init) { - flagRef.current.__init = true - flagRef.current.__refactor() - } - - // 将loading直接赋值给实例对象，方便开发通过this.loading取值 - insRef.current.loading = loading - - // 将state直接赋值给实例对象，方便开发通过this.state取值 - insRef.current.state = state - - // 将props直接赋值给实例对象，方便开发通过this.props取值 - insRef.current.props = props - - // 将路由信息挂在到实例对象，方便开发通过this.location取值 - const routerInfo: Taro.RouterInfo = useRouter() - if (process.env.TARO_ENV === 'h5') { - const query = parse(location.search ? location.search.slice(1) : '') - routerInfo.params = { ...routerInfo.params, ...query } - } - insRef.current.location = routerInfo - - // 将页面级错误也挂到实例对象，方便开发通过this.error取值 - // 一般不需要用到，因为页面级的错误通常是传递给render函数去渲染错误页面即可 - insRef.current.error = error - - useEffect(function () { - const onUnload = flagRef.current?.onUnload - flagRef.current.__mounted = true - insRef.current?.onLoad?.() - - return function (): void { - setError(undefined) - onUnload?.() - } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, []) - - useReady(function () { - insRef.current?.onReady?.() - }) - - useDidShow(function () { - flagRef.current.__mounted = true - nextTick(() => { - insRef.current?.onShow?.() - }) - }) - - useDidHide(function () { - insRef.current?.onHide?.() - }) - - return { - onRefresh: insRef.current.onRefresh, - renderData: { state, events: insRef.current, loading, error: error }, - } -} - -function HackComponent(props: any) { - return props.render(props.data, props.prevProps) -} - -// 使用此框架后不支持React Refresh，useRef useState的初始值都是外边传递进去的，useState({}) => 生效 | const st = {} useState(st) => 不生效 -export function Unite(config: any, render: any, options: any = {}) { - // 返回函数式组件 - return function Index(props: any) { - const { renderData, onRefresh } = useContainer(config, props, options) - - // 执行业务侧函数式组件 - return ( - - - - ) - } -} - -export default Unite diff --git a/packages/vantui/src/uploader/index.less b/packages/vantui/src/uploader/index.less index c57f4417e..eea603b58 100644 --- a/packages/vantui/src/uploader/index.less +++ b/packages/vantui/src/uploader/index.less @@ -1,5 +1,6 @@ /* stylelint-disable no-descending-specificity */ @import '../style/var.less'; + .van-uploader { position: relative; display: inline-block; diff --git a/packages/vantui/types/index.d.ts b/packages/vantui/types/index.d.ts index 103625774..2de87a671 100644 --- a/packages/vantui/types/index.d.ts +++ b/packages/vantui/types/index.d.ts @@ -62,7 +62,5 @@ export { Card } from './card' export { Form, FormItem } from './form' export { PowerScrollView } from './power-scroll-view' export { NumberKeyboard } from './number-keyboard' -export { Unite } from './unite' -export { UniteContext } from './unite-context' export { Table, IColumns } from './table' export { Pagination, PaginationProps } from './pagination' diff --git a/packages/vantui/types/unite-context.d.ts b/packages/vantui/types/unite-context.d.ts deleted file mode 100644 index 2e06496f5..000000000 --- a/packages/vantui/types/unite-context.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare const UniteContext: React.Context<{ - uniteConfig: { - page?: boolean - } - onRefresh: ( - catchRefresh?: T, - ) => T extends true - ? Promise<{ code: string; message: string; data: any }> - : void - error?: { code: string; message: string; data: any } - setError: React.Dispatch< - React.SetStateAction< - { code: string; message: string; data: any } | undefined - > - > -}> - -export { UniteContext } diff --git a/packages/vantui/types/unite.d.ts b/packages/vantui/types/unite.d.ts deleted file mode 100644 index 900c72ea1..000000000 --- a/packages/vantui/types/unite.d.ts +++ /dev/null @@ -1,135 +0,0 @@ -declare namespace Unite { - type IAnyObject = Record - type IFunctionObject = Record any> - type IError = { code: string; message: string; data: any } - - interface State { - /** 组件的内部数据，和 `properties` 一同用于组件的模板渲染 */ - state: StateOpt - } - interface ILifetime { - onLoad(): Promise - onShow(): Promise - onReady(): Promise - onHide(): void | Promise - onUnload(): void | Promise - onReachBottom(): void | Promise - } - - interface Inner { - __mounted: boolean - __init: boolean - setLoading: ( - obj: Partial<{ [K in keyof PromiseProperties]: boolean }>, - ) => void - } - - interface InstanceMethods { - setState: ( - state: Partial> | React.SetStateAction>, - ) => void - setError: React.Dispatch> - onRefresh: ( - catchRefresh?: T, - ) => T extends true - ? Promise<{ code: string; message: string; data: any }> - : void - setHooks: (hooks: IAnyObject) => void - } - interface InstanceProperty< - TAll extends IAnyObject, - TProps extends IAnyObject, - > { - error: IError - props: TProps - hooks: IAnyObject - location: Taro.RouterInfo - loading: Partial< - { [K in keyof PromiseProperties]: boolean } & { - pullDownRefresh: boolean - } - > - } - - type StateOpt = { - [K in keyof T]: T[K] extends null | undefined - ? any - : T[K] extends never[] - ? any[] - : T[K] extends IAnyObject - ? T[K] & IAnyObject - : T[K] - } - type FunctionPropertyNames = { - [K in keyof T]: T[K] extends (...args: any) => any ? K : never - }[keyof T] - type PromisePropertyNames = { - [K in keyof T]: ReturnType extends Promise ? K : never - }[keyof T] - type FunctionProperties = Pick< - T, - FunctionPropertyNames - > - type PromiseProperties = Pick< - T, - PromisePropertyNames> - > - type DefinedMatch = { - [K in keyof TObject]: TObject[K] extends VType ? never : TObject[K] - } - type DefinedExculdeMatch = { - [K in keyof TObject]: K extends keyof VObject ? never : TObject[K] - } - - type Instance< - TState extends IAnyObject, - TAll extends IAnyObject, - TProps extends IAnyObject, - > = State & - InstanceProperty & - InstanceMethods & - StateOpt - - type Option< - TState extends IAnyObject, - TAll extends IAnyObject, - TProps extends IAnyObject, - > = State & - Partial & - DefinedExculdeMatch< - TAll, - Inner & InstanceMethods & InstanceProperty - > & - ThisType, 'setHooks'>> - - type EventEnhancementResponse< - TAll extends IAnyObject, - TState extends IAnyObject, - > = { - events: FunctionProperties & InstanceMethods - loading: Partial<{ [K in keyof PromiseProperties]: boolean }> - } - - type Response = { - state: StateOpt - error: IError | undefined - } & EventEnhancementResponse -} - -declare function Unite< - TState extends Unite.IAnyObject, - TAll extends Unite.IAnyObject, - TProps extends Unite.IAnyObject, - // eslint-disable-next-line @typescript-eslint/no-explicit-any ->( - config: Unite.Option, - render: (data: Unite.Response, props: TProps) => JSX.Element, - options?: { - page?: boolean - cancelInterception?: Partial<{ - [K in keyof Unite.PromiseProperties]: boolean - }> - }, -): (props: TProps) => any - -export { Unite } diff --git a/packages/vantui-cli/tsconfig.json b/tsconfig.base.json similarity index 61% rename from packages/vantui-cli/tsconfig.json rename to tsconfig.base.json index 0971e793c..87e242799 100644 --- a/packages/vantui-cli/tsconfig.json +++ b/tsconfig.base.json @@ -1,7 +1,10 @@ { "compilerOptions": { - /** type checking */ + "target": "ES2017", + "module": "ES2022", "strict": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, // 默认false,是否检测定义了但是没使用的变量 "noUnusedLocals": true, // 用于检查是否有在函数体中没有使用的参数 @@ -11,29 +14,17 @@ "noFallthroughCasesInSwitch": true, "noImplicitOverride": false, "noImplicitReturns": true, - // "noImplicitAny": false, + "noImplicitAny": false, "noPropertyAccessFromIndexSignature": true, "noUncheckedIndexedAccess": true, - /** module */ - "baseUrl": "./", - "module": "esnext", - // default: module === AMD or UMD or System or ES6, then Classic otherwise Node "moduleResolution": "Node", - "outDir": "./dest", - "lib": ["ESNext", "dom"], - /** Interop Constraints */ - "esModuleInterop": true, + "removeComments": true, + "skipLibCheck": true, "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - // declaration和allowJs不能同时设为true - // "allowJs": true, - "jsx": "react-jsx", - "skipLibCheck": true, - - "target": "ES2019", - "declaration": true + "allowJs": true, + "jsx": "react-jsx" }, - "include": ["src/**/*"] + "compileOnSave": false } diff --git a/tsconfig.json b/tsconfig.json index 2c4632041..36ff96842 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,54 +1,21 @@ { + "extends": "./tsconfig.base.json", "compilerOptions": { - /** type checking */ - "strict": true, - // 默认false,是否检测定义了但是没使用的变量 - "noUnusedLocals": true, - // 用于检查是否有在函数体中没有使用的参数 - "noUnusedParameters": true, - "allowUnreachableCode": false, - "allowUnusedLabels": false, - "noFallthroughCasesInSwitch": true, - "noImplicitOverride": false, - "noImplicitReturns": true, - "noImplicitAny": false, - "noPropertyAccessFromIndexSignature": true, - "noUncheckedIndexedAccess": true, - /** module */ "baseUrl": "./", - "module": "esnext", - // default: module === AMD or UMD or System or ES6, then Classic otherwise Node - "moduleResolution": "Node", - "target": "ES2019", - "lib": ["ESNext", "dom"], - /** emit */ "noEmit": true, - /** Interop Constraints */ - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, - // "isolatedModules": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - // declaration和allowJs不能同时设为true - "allowJs": true, - "jsx": "react-jsx", "skipLibCheck": false - // "paths": { - // // 指定模块的路径，和baseUrl有关联，和webpack中resolve.alias配置一样 - // "@/*": ["./src/*"] - // } }, "include": [ "*.js", "packages/*/*.js", "packages/*/*.d.ts", "packages/**/src", - "packages/**/scripts", - "packages/**/docs", - "packages/**/types", "packages/**/config", + "packages/**/site", + "packages/**/utils", + "packages/**/ui", + "packages/**/types", + "packages/**/sample", "packages/**/__test__" - ], - "compileOnSave": false + ] } diff --git a/yarn.lock b/yarn.lock index 4d782c13f..464cb6a1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -133,10 +133,10 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@antmjs/babel-preset@1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/babel-preset/-/babel-preset-1.21.3.tgz#556a53ea66521cebde9ef1268883d4dea7404868" - integrity sha512-8MPekrC4QWnw99xzL+7U0xs56zBZhgMltiTtXcTb8dK0zYVbjUJsvaPkOHOsESsPjSCHCgMD7UMNQhvLCbVbcQ== +"@antmjs/babel-preset@2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/babel-preset/-/babel-preset-2.0.1.tgz#65912a6abc10457863e38c5af93d9c67e2848802" + integrity sha512-ebo/2hbtowSTx4WHkSKwkr1WKJsqEsRUGehUfFmaR94AbztIy1NIEWTWfJNdBVESC1poaZkZKNe2x2KcQMQ9wA== dependencies: "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-decorators" "^7.14.5" @@ -150,10 +150,10 @@ core-js "^3.15.2" react-refresh "^0.10.0" -"@antmjs/eslint@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/eslint/-/eslint-1.21.3.tgz#6baee106a421d39946a43c8f9e594bcf44d68a0d" - integrity sha512-odTQw2Vkm/MuE9DhkVbsHFokPHEDSSzAnq35EoEi7z+827iP8yflfFRMtBr0H6FtnlWRM0r6+fwpgqgDo3AWqg== +"@antmjs/eslint@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/eslint/-/eslint-2.0.1.tgz#ff8832490d673b0d38406ceeeba43b3289e3a69b" + integrity sha512-9y1STBjY+cn/6nbGKd3OKUatfnr7xgfHwfOynkf0do6Mm/T1iLgwvFfWYZtXoNpgNiy6k2hWfaUSYLTrnIiLjA== dependencies: "@graphql-eslint/eslint-plugin" "^3.10.7" "@typescript-eslint/eslint-plugin" "^5.33.0" @@ -166,48 +166,46 @@ eslint-plugin-react "^7.30.1" eslint-plugin-react-hooks "^4.6.0" -"@antmjs/iconfont@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/iconfont/-/iconfont-1.21.3.tgz#b0f1474432a9c2f9dff139cece1fb31bb4921133" - integrity sha512-vjr+lDJeyA5ePK0IC3hZwjkdAb4VuDG+TneAejfoGTQMmC6xggdwEmysxb2/u/0PgNrEztyACVwFHKjN3k4tiw== +"@antmjs/iconfont@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/iconfont/-/iconfont-2.0.1.tgz#520d3c9b83dc09dfa33834c9269da0ee2dd5b6f9" + integrity sha512-vL7KjvCGoP/rltuDmPV/PlhfU4L0fQh2yE5azs/QCKcf6r7vJlmqbjC0RX53aCYbT41/DvSQB0Dv3cANaBca8g== -"@antmjs/mini-fix@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/mini-fix/-/mini-fix-1.21.3.tgz#a326fa44de7f63bea3ed90aaae8991148f19ff8c" - integrity sha512-ujdemtxOiJR4fptVRrlFUQ5ip6Z0GYszZu4BmOVDH4ke45KgRWzkE8rOy9SVyPrVNblhhwYe4DaeTAZIRqKo7Q== +"@antmjs/mini-fix@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/mini-fix/-/mini-fix-2.0.1.tgz#5998b799ac02c9dbe9335a03fdf4ff0c43404cfc" + integrity sha512-tK7W903DQ841Rj+e2P+sT53nd4TQCgwmIabStgZITMbjgVAMEukXLTleMugFRJ2CRbfSsW6u+atpuiM1g955jA== dependencies: - "@antmjs/utils" "1.21.3" - "@babel/runtime-corejs3" "^7.14.7" + "@antmjs/utils" "2.0.1" -"@antmjs/plugin-global-fix@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/plugin-global-fix/-/plugin-global-fix-1.21.3.tgz#14d9ac9c70362cecd9f3b75daf8e8702e8c7515a" - integrity sha512-VDKe44qrqG9+W62gVn63wZkp17AFpTCz9U+j/3HDq0d9UXPaGfkGm/92J/i46/GkHfk/8IWUHF/OrmOt1kyP5w== +"@antmjs/plugin-global-fix@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/plugin-global-fix/-/plugin-global-fix-2.0.1.tgz#b3533cdd4b9e76060b8a9f0d4982f104fb099695" + integrity sha512-GRwSL3TcWRe6M9sY6zxiUcHdYkFWNZtCm7R5Hji8ShjI30xvUaVttMLZeYOhP2qhIZ5NbpFPOFKxHz8TuL4KRA== -"@antmjs/plugin-mini-fix@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/plugin-mini-fix/-/plugin-mini-fix-1.21.3.tgz#7973090361fc966424bfaadd581b07ae68b4722d" - integrity sha512-huz/HwIpFt4xH0gqKI+66eN6rgQLbZRV9zHokZdHLH72Iq4yFU5VP0+8jdVnwGK4xdnMyGK2XDtA8vdqtM8bxw== +"@antmjs/plugin-mini-fix@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/plugin-mini-fix/-/plugin-mini-fix-2.0.1.tgz#ff26608e801062a2ccaa29cfc172a81e0ffaaf5c" + integrity sha512-kC7QdVljUn8T+KDgV2rSb9+OsRCeYOTZtQOxx2D7vlAP2yAcRVq+OndrHxyg0pFzDUxjvINQ9TzjOmJ+gIWCZQ== -"@antmjs/stylelint@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/stylelint/-/stylelint-1.21.3.tgz#db0d2f4c8067de19338ca4eb930b8aa0d6558b5a" - integrity sha512-FpKzRGnzaUEU1XNq/KmuJUum0qCQoLRj/SowPr+FkZGy6Q03Y7bGgLSwijmxoC7/45+rY3Q6vt2r1NJ+3VTn3w== +"@antmjs/stylelint@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/stylelint/-/stylelint-2.0.1.tgz#3d1134c349814a96970d825e995998d0cd222e46" + integrity sha512-6xA49DP3h7mYxlo/rY+Inz9YIJwm3KW3EZN1U49a2SN6j8VxJfbatw4S0AerMLNYDIpgRmUBGxrCpykMr3+oVw== dependencies: - stylelint-config-prettier "^8.0.2" - stylelint-config-standard "^22.0.0" + postcss-less "^6.0.0" + stylelint-config-prettier "^9.0.3" + stylelint-config-standard "^28.0.0" -"@antmjs/utils@1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/utils/-/utils-1.21.3.tgz#d1671532c800844ac6859b879f2f9c2811ce8a79" - integrity sha512-gF0NDYADDl0zSUAMF0YZdQulbgVAAtiM9VE6tPqauLYSz7RYjJVvGyCLWRn5t6WE0zIXfZJNZy/eh9DBZvgc4A== - dependencies: - "@babel/runtime-corejs3" "^7.14.7" +"@antmjs/utils@2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/utils/-/utils-2.0.1.tgz#02d4afab3ee7a0e3fda9a2198b64edf009f53b13" + integrity sha512-75lHv621apX7UwjdfVxaG9HkVMnU1OLBvxm5dWgg/Vifn+a4y+bgOfdR/CafiUwC9gpxKnvSnOON+PboRSrZMQ== -"@antmjs/warning@^1.21.3": - version "1.21.3" - resolved "https://registry.npmmirror.com/@antmjs/warning/-/warning-1.21.3.tgz#23eb68c882e8f19d9d55b1c62d92d1d57c894d01" - integrity sha512-u75IfdVmhZ2rz/jd4knkn1dQXxbClDQP4gKbSxtJ1vh4OdUX1cEYfvssDHpwRjAfUl0w8Yy0A+rlh3UrRTD37g== +"@antmjs/warning@^2.0.1": + version "2.0.1" + resolved "https://registry.npmmirror.com/@antmjs/warning/-/warning-2.0.1.tgz#d758b89afc0b73fff237b8a5bbb731b9765adffa" + integrity sha512-46bI2dpmknY+Xv1VNbNdyyuhUhTsg830iz5MY7BbNdsOR5P9UYZhoLjnE4SdgKs8tfShQhC084V8NMrJlm+Bsg== dependencies: chalk "^4.1.2" commander "^8.1.0" @@ -240,7 +238,7 @@ resolved "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.18.8.tgz" integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ== -"@babel/core@^7.14.0", "@babel/core@^7.14.5", "@babel/core@^7.16.0", "@babel/core@^7.17.9", "@babel/core@^7.8.0": +"@babel/core@^7.14.0", "@babel/core@^7.14.5", "@babel/core@^7.16.0", "@babel/core@^7.8.0": version "7.18.10" resolved "https://registry.npmmirror.com/@babel/core/-/core-7.18.10.tgz" integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw== @@ -1568,6 +1566,11 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" +"@csstools/selector-specificity@^2.0.2": + version "2.0.2" + resolved "https://registry.npmmirror.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" + integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== + "@docsearch/css@3.0.0-alpha.41": version "3.0.0-alpha.41" resolved "https://registry.npmmirror.com/@docsearch/css/-/css-3.0.0-alpha.41.tgz" @@ -3090,21 +3093,6 @@ resolved "https://registry.npmmirror.com/@stencil/sass/-/sass-1.5.2.tgz" integrity sha512-nJ93pUSylsGsMX0eLmhxh1oEljcUjj5mYjhB9ziCdoaydAdjukrUoqDCC7tdVbOcBo2hKptQyWqCtETnBGYsXQ== -"@stylelint/postcss-css-in-js@^0.37.2": - version "0.37.3" - resolved "https://registry.npmmirror.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz" - integrity sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg== - dependencies: - "@babel/core" "^7.17.9" - -"@stylelint/postcss-markdown@^0.36.2": - version "0.36.2" - resolved "https://registry.npmmirror.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz" - integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ== - dependencies: - remark "^13.0.0" - unist-util-find-all-after "^3.0.2" - "@swc/core-android-arm-eabi@1.2.224": version "1.2.224" resolved "https://registry.npmmirror.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.224.tgz#ee31c1855f2ac6583258d3b20da884868128a295" @@ -3876,13 +3864,6 @@ "@types/linkify-it" "*" "@types/mdurl" "*" -"@types/mdast@^3.0.0": - version "3.0.10" - resolved "https://registry.npmmirror.com/@types/mdast/-/mdast-3.0.10.tgz" - integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== - dependencies: - "@types/unist" "*" - "@types/mdurl@*": version "1.0.2" resolved "https://registry.npmmirror.com/@types/mdurl/-/mdurl-1.0.2.tgz" @@ -4003,11 +3984,6 @@ dependencies: "@types/node" "*" -"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": - version "2.0.6" - resolved "https://registry.npmmirror.com/@types/unist/-/unist-2.0.6.tgz" - integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== - "@types/vinyl@^2.0.4": version "2.0.6" resolved "https://registry.npmmirror.com/@types/vinyl/-/vinyl-2.0.6.tgz" @@ -4896,7 +4872,7 @@ autoprefixer@^10.4.7: picocolors "^1.0.0" postcss-value-parser "^4.2.0" -autoprefixer@^9.7.4, autoprefixer@^9.8.6: +autoprefixer@^9.7.4: version "9.8.8" resolved "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-9.8.8.tgz" integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA== @@ -6173,13 +6149,6 @@ clone-deep@^4.0.1: kind-of "^6.0.2" shallow-clone "^3.0.0" -clone-regexp@^2.1.0: - version "2.2.0" - resolved "https://registry.npmmirror.com/clone-regexp/-/clone-regexp-2.2.0.tgz" - integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q== - dependencies: - is-regexp "^2.0.0" - clone-response@1.0.2: version "1.0.2" resolved "https://registry.npmmirror.com/clone-response/-/clone-response-1.0.2.tgz" @@ -6277,7 +6246,7 @@ color-support@^1.1.3: resolved "https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -colord@^2.9.1: +colord@^2.9.1, colord@^2.9.3: version "2.9.3" resolved "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz" integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== @@ -6849,6 +6818,11 @@ css-declaration-sorter@^6.3.0: resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz" integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og== +css-functions-list@^3.1.0: + version "3.1.0" + resolved "https://registry.npmmirror.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b" + integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w== + css-loader@6.5.1: version "6.5.1" resolved "https://registry.npmmirror.com/css-loader/-/css-loader-6.5.1.tgz" @@ -7119,7 +7093,7 @@ debug@2.6.9, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6. dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: +debug@4, debug@4.3.4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -7519,14 +7493,6 @@ dom-converter@^0.2.0: dependencies: utila "~0.4" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - dom-serializer@^1.0.1: version "1.4.1" resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz" @@ -7543,11 +7509,6 @@ dom7@^3.0.0: dependencies: ssr-window "^3.0.0-alpha.1" -domelementtype@1, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.3.0" resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz" @@ -7560,13 +7521,6 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.npmmirror.com/domhandler/-/domhandler-2.4.2.tgz" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" - domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: version "4.3.1" resolved "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz" @@ -7574,14 +7528,6 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: dependencies: domelementtype "^2.2.0" -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.npmmirror.com/domutils/-/domutils-1.7.0.tgz" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" resolved "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz" @@ -7746,11 +7692,6 @@ enquirer@^2.3.6, enquirer@~2.3.6: dependencies: ansi-colors "^4.1.1" -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - entities@^2.0.0: version "2.2.0" resolved "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz" @@ -8445,13 +8386,6 @@ execa@^4.0.2: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execall@^2.0.0: - version "2.0.0" - resolved "https://registry.npmmirror.com/execall/-/execall-2.0.0.tgz" - integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow== - dependencies: - clone-regexp "^2.1.0" - exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.npmmirror.com/exit-hook/-/exit-hook-1.1.1.tgz" @@ -8634,7 +8568,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.2, fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9: +fast-glob@^3.1.1, fast-glob@^3.2.11, fast-glob@^3.2.2, fast-glob@^3.2.7, fast-glob@^3.2.9: version "3.2.11" resolved "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.11.tgz" integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== @@ -8655,9 +8589,9 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fastest-levenshtein@^1.0.12: +fastest-levenshtein@^1.0.16: version "1.0.16" - resolved "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz" + resolved "https://registry.npmmirror.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== fastq@^1.6.0: @@ -9170,11 +9104,6 @@ get-stdin@^4.0.1: resolved "https://registry.npmmirror.com/get-stdin/-/get-stdin-4.0.1.tgz" integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw== -get-stdin@^8.0.0: - version "8.0.0" - resolved "https://registry.npmmirror.com/get-stdin/-/get-stdin-8.0.0.tgz" - integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== - get-stream@3.0.0, get-stream@^3.0.0: version "3.0.0" resolved "https://registry.npmmirror.com/get-stream/-/get-stream-3.0.0.tgz" @@ -9558,13 +9487,6 @@ globs@^0.1.4: dependencies: glob "^7.1.1" -gonzales-pe@^4.3.0: - version "4.3.0" - resolved "https://registry.npmmirror.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz" - integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ== - dependencies: - minimist "^1.2.5" - goober@^2.1.10: version "2.1.10" resolved "https://registry.npmmirror.com/goober/-/goober-2.1.10.tgz" @@ -9957,9 +9879,9 @@ html-minifier@^4.0.0: relateurl "^0.2.7" uglify-js "^3.5.1" -html-tags@^3.1.0: +html-tags@^3.2.0: version "3.2.0" - resolved "https://registry.npmmirror.com/html-tags/-/html-tags-3.2.0.tgz" + resolved "https://registry.npmmirror.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== html-webpack-plugin@5.5.0, html-webpack-plugin@^5.5.0: @@ -9980,18 +9902,6 @@ html@^1.0.0: dependencies: concat-stream "^1.4.7" -htmlparser2@^3.10.0: - version "3.10.1" - resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - htmlparser2@^6.1.0: version "6.1.0" resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz" @@ -10156,7 +10066,7 @@ ignore@^4.0.3, ignore@^4.0.6: resolved "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.1.9, ignore@^5.2.0: +ignore@^5.0.4, ignore@^5.1.4, ignore@^5.1.9, ignore@^5.2.0: version "5.2.0" resolved "https://registry.npmmirror.com/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -10522,11 +10432,6 @@ is-buffer@^1.1.4, is-buffer@^1.1.5, is-buffer@~1.1.6: resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.0: - version "2.0.5" - resolved "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz" - integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== - is-callable@^1.1.4, is-callable@^1.2.4: version "1.2.4" resolved "https://registry.npmmirror.com/is-callable/-/is-callable-1.2.4.tgz" @@ -10834,11 +10739,6 @@ is-regexp@^1.0.0: resolved "https://registry.npmmirror.com/is-regexp/-/is-regexp-1.0.0.tgz" integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA== -is-regexp@^2.0.0: - version "2.1.0" - resolved "https://registry.npmmirror.com/is-regexp/-/is-regexp-2.1.0.tgz" - integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== - is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.npmmirror.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz" @@ -11340,10 +11240,10 @@ klona@^2.0.4, klona@^2.0.5: resolved "https://registry.npmmirror.com/klona/-/klona-2.0.5.tgz" integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== -known-css-properties@^0.21.0: - version "0.21.0" - resolved "https://registry.npmmirror.com/known-css-properties/-/known-css-properties-0.21.0.tgz" - integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw== +known-css-properties@^0.25.0: + version "0.25.0" + resolved "https://registry.npmmirror.com/known-css-properties/-/known-css-properties-0.25.0.tgz#6ebc4d4b412f602e5cfbeb4086bd544e34c0a776" + integrity sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA== latest-version@^3.0.0: version "3.1.0" @@ -11716,7 +11616,7 @@ loglevel@^1.6.6: resolved "https://registry.npmmirror.com/loglevel/-/loglevel-1.8.0.tgz" integrity sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA== -longest-streak@^2.0.0, longest-streak@^2.0.1: +longest-streak@^2.0.1: version "2.0.4" resolved "https://registry.npmmirror.com/longest-streak/-/longest-streak-2.0.4.tgz" integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== @@ -11936,34 +11836,6 @@ mdast-util-compact@^1.0.0: dependencies: unist-util-visit "^1.1.0" -mdast-util-from-markdown@^0.8.0: - version "0.8.5" - resolved "https://registry.npmmirror.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz" - integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^2.0.0" - micromark "~2.11.0" - parse-entities "^2.0.0" - unist-util-stringify-position "^2.0.0" - -mdast-util-to-markdown@^0.6.0: - version "0.6.5" - resolved "https://registry.npmmirror.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz" - integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ== - dependencies: - "@types/unist" "^2.0.0" - longest-streak "^2.0.0" - mdast-util-to-string "^2.0.0" - parse-entities "^2.0.0" - repeat-string "^1.0.0" - zwitch "^1.0.0" - -mdast-util-to-string@^2.0.0: - version "2.0.0" - resolved "https://registry.npmmirror.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz" - integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== - mdn-data@2.0.14: version "2.0.14" resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz" @@ -12155,14 +12027,6 @@ metro-react-native-babel-preset@^0.67.0: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -micromark@~2.11.0: - version "2.11.4" - resolved "https://registry.npmmirror.com/micromark/-/micromark-2.11.4.tgz" - integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA== - dependencies: - debug "^4.0.0" - parse-entities "^2.0.0" - micromatch@^3.1.10: version "3.1.10" resolved "https://registry.npmmirror.com/micromatch/-/micromatch-3.1.10.tgz" @@ -12182,7 +12046,7 @@ micromatch@^3.1.10: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2, micromatch@^4.0.4: +micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -12719,11 +12583,6 @@ normalize-range@^0.1.2: resolved "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz" integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== -normalize-selector@^0.2.0: - version "0.2.0" - resolved "https://registry.npmmirror.com/normalize-selector/-/normalize-selector-0.2.0.tgz" - integrity sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw== - normalize-url@2.0.1: version "2.0.1" resolved "https://registry.npmmirror.com/normalize-url/-/normalize-url-2.0.1.tgz" @@ -13469,18 +13328,6 @@ parse-entities@^1.0.2: is-decimal "^1.0.0" is-hexadecimal "^1.0.0" -parse-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.npmmirror.com/parse-entities/-/parse-entities-2.0.0.tgz" - integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== - dependencies: - character-entities "^1.0.0" - character-entities-legacy "^1.0.0" - character-reference-invalid "^1.0.0" - is-alphanumerical "^1.0.0" - is-decimal "^1.0.0" - is-hexadecimal "^1.0.0" - parse-json@5.2.0, parse-json@^5.0.0: version "5.2.0" resolved "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz" @@ -13867,13 +13714,6 @@ postcss-html-transform@3.5.3: dependencies: postcss "^6.0.22" -postcss-html@^0.36.0: - version "0.36.0" - resolved "https://registry.npmmirror.com/postcss-html/-/postcss-html-0.36.0.tgz" - integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw== - dependencies: - htmlparser2 "^3.10.0" - postcss-import@12.0.1: version "12.0.1" resolved "https://registry.npmmirror.com/postcss-import/-/postcss-import-12.0.1.tgz" @@ -13884,12 +13724,10 @@ postcss-import@12.0.1: read-cache "^1.0.0" resolve "^1.1.7" -postcss-less@^3.1.4: - version "3.1.4" - resolved "https://registry.npmmirror.com/postcss-less/-/postcss-less-3.1.4.tgz" - integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA== - dependencies: - postcss "^7.0.14" +postcss-less@^6.0.0: + version "6.0.0" + resolved "https://registry.npmmirror.com/postcss-less/-/postcss-less-6.0.0.tgz#463b34c60f53b648c237f569aeb2e09149d85af4" + integrity sha512-FPX16mQLyEjLzEuuJtxA8X3ejDLNGGEG503d2YGZR5Ask1SpDN8KmZUMpzCvyalWRywAn1n1VOA5dcqfCLo5rg== postcss-load-config@^3.1.0: version "3.1.4" @@ -14105,29 +13943,12 @@ postcss-resolve-nested-selector@^0.1.1: resolved "https://registry.npmmirror.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz" integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== -postcss-safe-parser@^4.0.2: - version "4.0.2" - resolved "https://registry.npmmirror.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz" - integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g== - dependencies: - postcss "^7.0.26" - -postcss-sass@^0.4.4: - version "0.4.4" - resolved "https://registry.npmmirror.com/postcss-sass/-/postcss-sass-0.4.4.tgz" - integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg== - dependencies: - gonzales-pe "^4.3.0" - postcss "^7.0.21" - -postcss-scss@^2.1.1: - version "2.1.1" - resolved "https://registry.npmmirror.com/postcss-scss/-/postcss-scss-2.1.1.tgz" - integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA== - dependencies: - postcss "^7.0.6" +postcss-safe-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.npmmirror.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" + integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.10" resolved "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== @@ -14143,11 +13964,6 @@ postcss-svgo@^5.1.0: postcss-value-parser "^4.2.0" svgo "^2.7.0" -postcss-syntax@^0.36.2: - version "0.36.2" - resolved "https://registry.npmmirror.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz" - integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w== - postcss-taro-unit-transform@1.2.15: version "1.2.15" resolved "https://registry.npmmirror.com/postcss-taro-unit-transform/-/postcss-taro-unit-transform-1.2.15.tgz" @@ -14201,7 +14017,7 @@ postcss@^6.0.21, postcss@^6.0.22: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6: +postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.32, postcss@^7.0.35: version "7.0.39" resolved "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz" integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA== @@ -14209,7 +14025,7 @@ postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.2 picocolors "^0.2.1" source-map "^0.6.1" -postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.7: +postcss@^8.1.10, postcss@^8.2.15, postcss@^8.3.11, postcss@^8.3.5, postcss@^8.4.16, postcss@^8.4.7: version "8.4.16" resolved "https://registry.npmmirror.com/postcss/-/postcss-8.4.16.tgz" integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== @@ -14991,13 +14807,6 @@ remark-parse@^3.0.0: vfile-location "^2.0.0" xtend "^4.0.1" -remark-parse@^9.0.0: - version "9.0.0" - resolved "https://registry.npmmirror.com/remark-parse/-/remark-parse-9.0.0.tgz" - integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw== - dependencies: - mdast-util-from-markdown "^0.8.0" - remark-stringify@^3.0.0: version "3.0.1" resolved "https://registry.npmmirror.com/remark-stringify/-/remark-stringify-3.0.1.tgz" @@ -15018,22 +14827,6 @@ remark-stringify@^3.0.0: unherit "^1.0.4" xtend "^4.0.1" -remark-stringify@^9.0.0: - version "9.0.1" - resolved "https://registry.npmmirror.com/remark-stringify/-/remark-stringify-9.0.1.tgz" - integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg== - dependencies: - mdast-util-to-markdown "^0.6.0" - -remark@^13.0.0: - version "13.0.0" - resolved "https://registry.npmmirror.com/remark/-/remark-13.0.0.tgz" - integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA== - dependencies: - remark-parse "^9.0.0" - remark-stringify "^9.0.0" - unified "^9.1.0" - remark@^7.0.1: version "7.0.1" resolved "https://registry.npmmirror.com/remark/-/remark-7.0.1.tgz" @@ -15064,7 +14857,7 @@ repeat-element@^1.1.2: resolved "https://registry.npmmirror.com/repeat-element/-/repeat-element-1.1.4.tgz" integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== -repeat-string@^1.0.0, repeat-string@^1.5.4, repeat-string@^1.6.1: +repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.npmmirror.com/repeat-string/-/repeat-string-1.6.1.tgz" integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== @@ -15968,11 +15761,6 @@ spdy@^4.0.2: select-hose "^2.0.0" spdy-transport "^3.0.0" -specificity@^0.4.1: - version "0.4.1" - resolved "https://registry.npmmirror.com/specificity/-/specificity-0.4.1.tgz" - integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg== - split-on-first@^1.0.0: version "1.1.0" resolved "https://registry.npmmirror.com/split-on-first/-/split-on-first-1.1.0.tgz" @@ -16372,76 +16160,66 @@ stylehacks@^5.1.0: browserslist "^4.16.6" postcss-selector-parser "^6.0.4" -stylelint-config-prettier@^8.0.2: - version "8.0.2" - resolved "https://registry.npmmirror.com/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz" - integrity sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A== +stylelint-config-prettier@^9.0.3: + version "9.0.3" + resolved "https://registry.npmmirror.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.3.tgz#0dccebeff359dcc393c9229184408b08964d561c" + integrity sha512-5n9gUDp/n5tTMCq1GLqSpA30w2sqWITSSEiAWQlpxkKGAUbjcemQ0nbkRvRUa0B1LgD3+hCvdL7B1eTxy1QHJg== -stylelint-config-recommended@^5.0.0: - version "5.0.0" - resolved "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz" - integrity sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA== +stylelint-config-recommended@^9.0.0: + version "9.0.0" + resolved "https://registry.npmmirror.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40" + integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ== -stylelint-config-standard@^22.0.0: - version "22.0.0" - resolved "https://registry.npmmirror.com/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz" - integrity sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw== +stylelint-config-standard@^28.0.0: + version "28.0.0" + resolved "https://registry.npmmirror.com/stylelint-config-standard/-/stylelint-config-standard-28.0.0.tgz#7e1926c232631a8445eafee7b186d276d42d7b15" + integrity sha512-q/StuowDdDmFCravzGHAwgS9pjX0bdOQUEBBDIkIWsQuYGgYz/xsO8CM6eepmIQ1fc5bKdDVimlJZ6MoOUcJ5Q== dependencies: - stylelint-config-recommended "^5.0.0" + stylelint-config-recommended "^9.0.0" -stylelint@^13.13.1: - version "13.13.1" - resolved "https://registry.npmmirror.com/stylelint/-/stylelint-13.13.1.tgz" - integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ== +stylelint@^14.11.0: + version "14.11.0" + resolved "https://registry.npmmirror.com/stylelint/-/stylelint-14.11.0.tgz#e2ecb28bbacab05e1fbeb84cbba23883b27499cc" + integrity sha512-OTLjLPxpvGtojEfpESWM8Ir64Z01E89xsisaBMUP/ngOx1+4VG2DPRcUyCCiin9Rd3kPXPsh/uwHd9eqnvhsYA== dependencies: - "@stylelint/postcss-css-in-js" "^0.37.2" - "@stylelint/postcss-markdown" "^0.36.2" - autoprefixer "^9.8.6" + "@csstools/selector-specificity" "^2.0.2" balanced-match "^2.0.0" - chalk "^4.1.1" - cosmiconfig "^7.0.0" - debug "^4.3.1" - execall "^2.0.0" - fast-glob "^3.2.5" - fastest-levenshtein "^1.0.12" + colord "^2.9.3" + cosmiconfig "^7.0.1" + css-functions-list "^3.1.0" + debug "^4.3.4" + fast-glob "^3.2.11" + fastest-levenshtein "^1.0.16" file-entry-cache "^6.0.1" - get-stdin "^8.0.0" global-modules "^2.0.0" - globby "^11.0.3" + globby "^11.1.0" globjoin "^0.1.4" - html-tags "^3.1.0" - ignore "^5.1.8" + html-tags "^3.2.0" + ignore "^5.2.0" import-lazy "^4.0.0" imurmurhash "^0.1.4" - known-css-properties "^0.21.0" - lodash "^4.17.21" - log-symbols "^4.1.0" + is-plain-object "^5.0.0" + known-css-properties "^0.25.0" mathml-tag-names "^2.1.3" meow "^9.0.0" - micromatch "^4.0.4" - normalize-selector "^0.2.0" - postcss "^7.0.35" - postcss-html "^0.36.0" - postcss-less "^3.1.4" + micromatch "^4.0.5" + normalize-path "^3.0.0" + picocolors "^1.0.0" + postcss "^8.4.16" postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" - postcss-safe-parser "^4.0.2" - postcss-sass "^0.4.4" - postcss-scss "^2.1.1" - postcss-selector-parser "^6.0.5" - postcss-syntax "^0.36.2" - postcss-value-parser "^4.1.0" + postcss-safe-parser "^6.0.0" + postcss-selector-parser "^6.0.10" + postcss-value-parser "^4.2.0" resolve-from "^5.0.0" - slash "^3.0.0" - specificity "^0.4.1" - string-width "^4.2.2" - strip-ansi "^6.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" style-search "^0.1.0" - sugarss "^2.0.0" + supports-hyperlinks "^2.2.0" svg-tags "^1.0.0" - table "^6.6.0" + table "^6.8.0" v8-compile-cache "^2.3.0" - write-file-atomic "^3.0.3" + write-file-atomic "^4.0.2" stylus-loader@6.2.0: version "6.2.0" @@ -16466,13 +16244,6 @@ stylus@^0.55.0: semver "^6.3.0" source-map "^0.7.3" -sugarss@^2.0.0: - version "2.0.0" - resolved "https://registry.npmmirror.com/sugarss/-/sugarss-2.0.0.tgz" - integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ== - dependencies: - postcss "^7.0.2" - supports-color@8.1.1, supports-color@^8.0.0: version "8.1.1" resolved "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz" @@ -16566,9 +16337,9 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -table@^6.6.0: +table@^6.8.0: version "6.8.0" - resolved "https://registry.npmmirror.com/table/-/table-6.8.0.tgz" + resolved "https://registry.npmmirror.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== dependencies: ajv "^8.0.1" @@ -17141,18 +16912,6 @@ unified@^6.0.0: vfile "^2.0.0" x-is-string "^0.1.0" -unified@^9.1.0: - version "9.2.2" - resolved "https://registry.npmmirror.com/unified/-/unified-9.2.2.tgz" - integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ== - dependencies: - bail "^1.0.0" - extend "^3.0.0" - is-buffer "^2.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" - union-value@^1.0.0: version "1.0.1" resolved "https://registry.npmmirror.com/union-value/-/union-value-1.0.1.tgz" @@ -17191,23 +16950,11 @@ unique-string@^2.0.0: dependencies: crypto-random-string "^2.0.0" -unist-util-find-all-after@^3.0.2: - version "3.0.2" - resolved "https://registry.npmmirror.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz" - integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ== - dependencies: - unist-util-is "^4.0.0" - unist-util-is@^3.0.0: version "3.0.0" resolved "https://registry.npmmirror.com/unist-util-is/-/unist-util-is-3.0.0.tgz" integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A== -unist-util-is@^4.0.0: - version "4.1.0" - resolved "https://registry.npmmirror.com/unist-util-is/-/unist-util-is-4.1.0.tgz" - integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== - unist-util-remove-position@^1.0.0: version "1.1.4" resolved "https://registry.npmmirror.com/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz" @@ -17220,13 +16967,6 @@ unist-util-stringify-position@^1.0.0, unist-util-stringify-position@^1.1.1: resolved "https://registry.npmmirror.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz" integrity sha512-pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ== -unist-util-stringify-position@^2.0.0: - version "2.0.3" - resolved "https://registry.npmmirror.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz" - integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== - dependencies: - "@types/unist" "^2.0.2" - unist-util-visit-parents@^2.0.0: version "2.1.2" resolved "https://registry.npmmirror.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz" @@ -17493,14 +17233,6 @@ vfile-message@^1.0.0: dependencies: unist-util-stringify-position "^1.1.1" -vfile-message@^2.0.0: - version "2.0.4" - resolved "https://registry.npmmirror.com/vfile-message/-/vfile-message-2.0.4.tgz" - integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== - dependencies: - "@types/unist" "^2.0.0" - unist-util-stringify-position "^2.0.0" - vfile@^2.0.0: version "2.3.0" resolved "https://registry.npmmirror.com/vfile/-/vfile-2.3.0.tgz" @@ -17511,16 +17243,6 @@ vfile@^2.0.0: unist-util-stringify-position "^1.0.0" vfile-message "^1.0.0" -vfile@^4.0.0: - version "4.2.1" - resolved "https://registry.npmmirror.com/vfile/-/vfile-4.2.1.tgz" - integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== - dependencies: - "@types/unist" "^2.0.0" - is-buffer "^2.0.0" - unist-util-stringify-position "^2.0.0" - vfile-message "^2.0.0" - vinyl-file@^3.0.0: version "3.0.0" resolved "https://registry.npmmirror.com/vinyl-file/-/vinyl-file-3.0.0.tgz" @@ -17955,7 +17677,7 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.4.2: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@^3.0.0, write-file-atomic@^3.0.3: +write-file-atomic@^3.0.0: version "3.0.3" resolved "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz" integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== @@ -17973,6 +17695,14 @@ write-file-atomic@^4.0.0, write-file-atomic@^4.0.1: imurmurhash "^0.1.4" signal-exit "^3.0.7" +write-file-atomic@^4.0.2: + version "4.0.2" + resolved "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" + integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^3.0.7" + write-json-file@^3.2.0: version "3.2.0" resolved "https://registry.npmmirror.com/write-json-file/-/write-json-file-3.2.0.tgz" @@ -18220,8 +17950,3 @@ yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -zwitch@^1.0.0: - version "1.0.5" - resolved "https://registry.npmmirror.com/zwitch/-/zwitch-1.0.5.tgz" - integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==