Skip to content

Commit

Permalink
feat: upgrade deps, including stylelint up to 14 (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
ViZhe authored Nov 22, 2021
1 parent 1f82195 commit 978d87d
Show file tree
Hide file tree
Showing 106 changed files with 2,656 additions and 3,225 deletions.
8 changes: 7 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,11 @@
"vue/html-indent": "warn",

"@typescript-eslint/explicit-function-return-type": "error"
}
},
"overrides": [
{
"files": ["./stories/**/*"],
"rules": { "no-console": 0 }
}
]
}
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '14.x'
node-version: '16.x'

- name: Cache dependencies
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: '14.x'
node-version: '16.x'

- name: Cache dependencies
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.17.6
16.13.0
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.nvmrc
/public
/dist
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/src/normalize.scss
/dist
22 changes: 11 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
- Demonstrating empathy and kindness toward other people
- Being respectful of differing opinions, viewpoints, and experiences
- Giving and gracefully accepting constructive feedback
- Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the
- Focusing on what is best not just for us as individuals, but for the
overall community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or
- The use of sexualized language or imagery, and sexual attention or
advances of any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email
- Trolling, insulting or derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or email
address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities
Expand Down Expand Up @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within
Expand Down
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,26 +146,27 @@ Please refer to each component's [Stories](https://qvant-lab.github.io/qui-max/)
## Using with Nuxt 3

Create a file in your plugins folder:

```ts
// plugins/qui.ts
import { defineNuxtPlugin } from '#app'
import Qui from '@qvant/qui-max'
import { defineNuxtPlugin } from '#app';
import Qui from '@qvant/qui-max';

export default defineNuxtPlugin(nuxtApp => {
nuxtApp.vueApp.use(Qui)
nuxtApp.vueApp.use(Qui);
});
```

Add configuration to your `nuxt.config.ts` file:

```ts
import { defineNuxtConfig } from 'nuxt3'
import { defineNuxtConfig } from 'nuxt3';

export default defineNuxtConfig({
css: ['@qvant/qui-max/styles'],
build: {
transpile: ['@qvant/qui-max']
}
css: ['@qvant/qui-max/styles'],
build: {
transpile: ['@qvant/qui-max']
}
});
```

Expand Down
82 changes: 41 additions & 41 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,65 +24,65 @@
},
"dependencies": {
"@popperjs/core": "^2.10.2",
"async-validator": "^4.0.3",
"colord": "^2.8.0",
"date-fns": "^2.24.0",
"async-validator": "^4.0.7",
"colord": "^2.9.1",
"date-fns": "^2.26.0",
"focus-visible": "^5.2.0",
"lodash-es": "^4.17.21"
},
"peerDependencies": {
"vue": "^3.2.11"
"vue": "^3.2.22"
},
"devDependencies": {
"@babel/core": "^7.15.8",
"@commitlint/cli": "^13.2.0",
"@commitlint/config-conventional": "^13.2.0",
"@babel/core": "^7.16.0",
"@commitlint/cli": "^15.0.0",
"@commitlint/config-conventional": "^15.0.0",
"@qvant/prettier-config": "^0.0.1",
"@qvant/stylelint-config": "^0.0.1",
"@storybook/addon-actions": "^6.3.8",
"@storybook/addon-essentials": "^6.3.8",
"@storybook/addon-links": "^6.3.8",
"@storybook/addon-storysource": "^6.3.8",
"@storybook/builder-webpack5": "^6.3.8",
"@storybook/manager-webpack5": "^6.3.10",
"@qvant/stylelint-config": "^0.1.3",
"@storybook/addon-actions": "^6.3.12",
"@storybook/addon-essentials": "^6.3.12",
"@storybook/addon-links": "^6.3.12",
"@storybook/addon-storysource": "^6.3.12",
"@storybook/builder-webpack5": "^6.3.12",
"@storybook/manager-webpack5": "^6.3.12",
"@storybook/preset-scss": "^1.0.3",
"@storybook/storybook-deployer": "^2.8.10",
"@storybook/vue3": "^6.3.10",
"@storybook/vue3": "^6.3.12",
"@types/lodash-es": "^4.17.5",
"@types/node": "^16.10.3",
"@types/sass": "^1.16.1",
"@typescript-eslint/eslint-plugin": "^4.32.0",
"@typescript-eslint/parser": "^4.32.0",
"@vitejs/plugin-vue": "^1.9.3",
"@vue/compiler-sfc": "^3.2.19",
"@vue/eslint-config-typescript": "^7.0.0",
"@types/node": "^16.11.9",
"@types/sass": "^1.43.0",
"@typescript-eslint/eslint-plugin": "^5.4.0",
"@typescript-eslint/parser": "^5.4.0",
"@vitejs/plugin-vue": "^1.9.4",
"@vue/compiler-sfc": "^3.2.22",
"@vue/eslint-config-typescript": "^9.1.0",
"@vuedx/typescript-plugin-vue": "^0.7.4",
"babel-loader": "^8.2.2",
"css-loader": "^6.3.0",
"eslint": "^7.32.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-config-airbnb-typescript": "^14.0.0",
"babel-loader": "^8.2.3",
"css-loader": "^6.5.1",
"eslint": "^8.3.0",
"eslint-config-airbnb": "^19.0.0",
"eslint-config-airbnb-typescript": "^16.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^7.19.0",
"husky": "^7.0.2",
"lint-staged": "^11.2.0",
"eslint-plugin-vue": "^8.1.1",
"husky": "^7.0.4",
"lint-staged": "^12.1.2",
"prettier": "^2.4.1",
"release-it": "^14.11.6",
"release-it": "^14.11.8",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-sass": "^1.2.9",
"rollup-plugin-typescript2": "^0.30.0",
"rollup-plugin-typescript2": "^0.31.0",
"rollup-plugin-vue": "^6.0.0",
"sass": "^1.42.1",
"sass-loader": "^12.1.0",
"style-loader": "^3.3.0",
"stylelint": "^13.13.1",
"typescript": "^4.4.3",
"vite": "^2.6.3",
"vite-plugin-dts": "^0.8.2",
"vue": "^3.2.11",
"sass": "^1.43.4",
"sass-loader": "^12.3.0",
"style-loader": "^3.3.1",
"stylelint": "^14.1.0",
"typescript": "^4.5.2",
"vite": "^2.6.14",
"vite-plugin-dts": "^0.9.5",
"vue": "^3.2.22",
"vue-loader": "^15.9.8"
},
"files": ["dist"],
Expand Down
68 changes: 34 additions & 34 deletions src/components.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
@import './qComponents/QBreadcrumbs/src/q-breadcrumbs.scss';
@import './qComponents/QButton/src/q-button.scss';
@import './qComponents/QCascader/src/q-cascader.scss';
@import './qComponents/QCheckbox/src/q-checkbox.scss';
@import './qComponents/QCheckboxGroup/src/q-checkbox-group.scss';
@import './qComponents/QCol/src/q-col.scss';
@import './qComponents/QCollapse/src/q-collapse.scss';
@import './qComponents/QCollapseItem/src/q-collapse-item.scss';
@import './qComponents/QColorPicker/src/q-color-picker.scss';
@import './qComponents/QContextMenu/src/q-context-menu.scss';
@import './qComponents/QDatePicker/src/q-date-picker.scss';
@import './qComponents/QDialog/src/q-dialog.scss';
@import './qComponents/QDrawer/src/q-drawer.scss';
@import './qComponents/QForm/src/q-form.scss';
@import './qComponents/QFormItem/src/q-form-item.scss';
@import './qComponents/QInput/src/q-input.scss';
@import './qComponents/QInputNumber/src/q-input-number.scss';
@import './qComponents/QMessageBox/src/q-message-box.scss';
@import './qComponents/QNotification/src/q-notification.scss';
@import './qComponents/QOption/src/q-option.scss';
@import './qComponents/QPagination/src/q-pagination.scss';
@import './qComponents/QPopover/src/q-popover.scss';
@import './qComponents/QProgressIndicatior/src/q-progress-indicatior.scss';
@import './qComponents/QRadio/src/q-radio.scss';
@import './qComponents/QRadioGroup/src/q-radio-group.scss';
@import './qComponents/QRow/src/q-row.scss';
@import './qComponents/QScrollbar/src/q-scrollbar.scss';
@import './qComponents/QSelect/src/q-select.scss';
@import './qComponents/QTable/src/q-table.scss';
@import './qComponents/QTabPane/src/q-tab-pane.scss';
@import './qComponents/QTabs/src/q-tabs.scss';
@import './qComponents/QTag/src/q-tag.scss';
@import './qComponents/QTextarea/src/q-textarea.scss';
@import './qComponents/QUpload/src/q-upload.scss';
@import './qComponents/QBreadcrumbs/src/q-breadcrumbs';
@import './qComponents/QButton/src/q-button';
@import './qComponents/QCascader/src/q-cascader';
@import './qComponents/QCheckbox/src/q-checkbox';
@import './qComponents/QCheckboxGroup/src/q-checkbox-group';
@import './qComponents/QCol/src/q-col';
@import './qComponents/QCollapse/src/q-collapse';
@import './qComponents/QCollapseItem/src/q-collapse-item';
@import './qComponents/QColorPicker/src/q-color-picker';
@import './qComponents/QContextMenu/src/q-context-menu';
@import './qComponents/QDatePicker/src/q-date-picker';
@import './qComponents/QDialog/src/q-dialog';
@import './qComponents/QDrawer/src/q-drawer';
@import './qComponents/QForm/src/q-form';
@import './qComponents/QFormItem/src/q-form-item';
@import './qComponents/QInput/src/q-input';
@import './qComponents/QInputNumber/src/q-input-number';
@import './qComponents/QMessageBox/src/q-message-box';
@import './qComponents/QNotification/src/q-notification';
@import './qComponents/QOption/src/q-option';
@import './qComponents/QPagination/src/q-pagination';
@import './qComponents/QPopover/src/q-popover';
@import './qComponents/QProgressIndicatior/src/q-progress-indicatior';
@import './qComponents/QRadio/src/q-radio';
@import './qComponents/QRadioGroup/src/q-radio-group';
@import './qComponents/QRow/src/q-row';
@import './qComponents/QScrollbar/src/q-scrollbar';
@import './qComponents/QSelect/src/q-select';
@import './qComponents/QTable/src/q-table';
@import './qComponents/QTabPane/src/q-tab-pane';
@import './qComponents/QTabs/src/q-tabs';
@import './qComponents/QTag/src/q-tag';
@import './qComponents/QTextarea/src/q-textarea';
@import './qComponents/QUpload/src/q-upload';
18 changes: 9 additions & 9 deletions src/fonts/fonts.scss
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
$--base-path: '..' !default;
$-base-path: '..' !default;

@font-face {
font-family: 'Gilroy';
font-family: Gilroy;
font-style: normal;
font-weight: 800;
src: local('Gilroy ExtraBold'), local('Gilroy-ExtraBold'),
url('#{$--base-path}/fonts/Gilroy-ExtraBold.woff?29042020') format('woff');
url('#{$-base-path}/fonts/Gilroy-ExtraBold.woff?29042020') format('woff');
font-display: swap;
}

@font-face {
font-family: 'Gilroy';
font-family: Gilroy;
font-style: normal;
font-weight: 600;
src: local('Gilroy Bold'), local('Gilroy-Bold'),
url('#{$--base-path}/fonts/Gilroy-Bold.woff?29042020') format('woff');
url('#{$-base-path}/fonts/Gilroy-Bold.woff?29042020') format('woff');
font-display: swap;
}

@font-face {
font-family: 'Gilroy';
font-family: Gilroy;
font-style: normal;
font-weight: 500;
src: local('Gilroy Medium'), local('Gilroy-Medium'),
url('#{$--base-path}/fonts/Gilroy-Medium.woff?29042020') format('woff');
url('#{$-base-path}/fonts/Gilroy-Medium.woff?29042020') format('woff');
font-display: swap;
}

@font-face {
font-family: 'Gilroy';
font-family: Gilroy;
font-style: normal;
font-weight: 400;
src: local('Gilroy Regular'), local('Gilroy-Regular'),
url('#{$--base-path}/fonts/Gilroy-Regular.woff?29042020') format('woff');
url('#{$-base-path}/fonts/Gilroy-Regular.woff?29042020') format('woff');
font-display: swap;
}
9 changes: 5 additions & 4 deletions src/icons/icons.scss
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
$--base-path: '..' !default;
$-base-path: '..' !default;

@font-face {
font-family: 'qicon';
font-family: qicon;
font-style: normal;
font-weight: 400;
src: url('#{$--base-path}/icons/qicon.woff?06092021') format('woff');
src: url('#{$-base-path}/icons/qicon.woff?06092021') format('woff');
font-display: block;
}

[class^='q-icon-'],
[class*=' q-icon-'] {
display: inline-block;

// use !important to prevent issues with browser extensions that change fonts
// stylelint-disable-next-line font-family-no-missing-generic-family-keyword
font-family: 'qicon' !important;
font-family: qicon !important;
font-style: normal;
font-weight: 400;
font-variant: normal;
Expand Down
10 changes: 5 additions & 5 deletions src/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import './normalize.scss';
@import './vars.scss';
@import './transition.scss';
@import './normalize';
@import './vars';
@import './transition';

*,
*::before,
Expand All @@ -16,11 +16,11 @@ body,

body {
margin: 0;
font-family: 'Gilroy', sans-serif;
font-family: Gilroy, sans-serif;
font-size: var(--font-size-base);
font-weight: var(--font-weight-base);
line-height: var(--line-height-base);
color: rgba(var(--color-rgb-gray), 0.64);
color: rgb(var(--color-rgb-gray) / 64%);
letter-spacing: var(--letter-spacing-base);
background-color: var(--color-tertiary-gray-lighter);
}
Expand Down
Loading

0 comments on commit 978d87d

Please sign in to comment.