From 095a401adf2fc041a07ec4dc815259a3a9566724 Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Tue, 24 May 2022 16:53:22 +0800 Subject: [PATCH] fix(comp:all): fix CI lint error --- .eslintrc.js | 7 ++++--- package.json | 2 +- packages/components/form/style/layout.less | 6 +++--- packages/site/src/components/layout/LayoutSider.vue | 1 + .../src/components/layout/header/LayoutHeaderSearchBox.vue | 1 + packages/site/src/main.ts | 1 + 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index ba10fd132..b5e4a6739 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,4 +1,5 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires +const { resolve } = require('path') + const prettierConfig = require('./.prettierrc.js') module.exports = { @@ -28,8 +29,8 @@ module.exports = { 'import/resolver': { 'eslint-import-resolver-custom-alias': { alias: { - '@idux': './packages', - '@tests': './tests', + '@idux': resolve(__dirname, './packages'), + '@tests': resolve(__dirname, './tests'), }, extensions: ['.js', '.jsx', '.mjs', '.ts', '.tsx', '.vue', '.md'], packages: ['packages/*'], diff --git a/package.json b/package.json index 896d73b27..0c1647fcf 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "resolve-bin": "^1.0.0", "rollup": "^2.70.2", "rollup-plugin-typescript2": "^0.31.2", - "stylelint": "^14.7.1", + "stylelint": "^14.8.3", "stylelint-config-prettier": "^9.0.3", "stylelint-config-standard": "^24.0.0", "svgo": "^2.8.0", diff --git a/packages/components/form/style/layout.less b/packages/components/form/style/layout.less index 2909e5d55..75bc39fe7 100644 --- a/packages/components/form/style/layout.less +++ b/packages/components/form/style/layout.less @@ -43,10 +43,10 @@ } } +// when labelCol is 24, it is a vertical form .@{form-prefix}-vertical .@{form-item-prefix}-label, - // when labelCol is 24, it is a vertical form - .@{idux-prefix}-col-24.@{form-item-prefix}-label, - .@{idux-prefix}-col-xl-24.@{form-item-prefix}-label { +.@{idux-prefix}-col-24.@{form-item-prefix}-label, +.@{idux-prefix}-col-xl-24.@{form-item-prefix}-label { .form-vertical-layout-label(); } diff --git a/packages/site/src/components/layout/LayoutSider.vue b/packages/site/src/components/layout/LayoutSider.vue index e4f39b2a0..ba9548db8 100644 --- a/packages/site/src/components/layout/LayoutSider.vue +++ b/packages/site/src/components/layout/LayoutSider.vue @@ -13,6 +13,7 @@ import { computed, inject } from 'vue' import { appContextToken } from '../../context' +// eslint-disable-next-line import/no-unresolved import { config } from '../../sideNav' const { breakpoints, lang, page, path } = inject(appContextToken)! diff --git a/packages/site/src/components/layout/header/LayoutHeaderSearchBox.vue b/packages/site/src/components/layout/header/LayoutHeaderSearchBox.vue index 54c5312b9..b0982345f 100644 --- a/packages/site/src/components/layout/header/LayoutHeaderSearchBox.vue +++ b/packages/site/src/components/layout/header/LayoutHeaderSearchBox.vue @@ -20,6 +20,7 @@ import { computed, inject } from 'vue' import { useRouter } from 'vue-router' import { appContextToken } from '../../../context' +// eslint-disable-next-line import/no-unresolved import { config } from '../../../sideNav' const router = useRouter() diff --git a/packages/site/src/main.ts b/packages/site/src/main.ts index 60cdce0a9..8b1e4fc32 100644 --- a/packages/site/src/main.ts +++ b/packages/site/src/main.ts @@ -9,6 +9,7 @@ import App from './App.vue' // eslint-disable-next-line import/no-unassigned-import import './index.less' +// eslint-disable-next-line import/no-unresolved import { routes } from './router' const router = createRouter({