Skip to content

Commit

Permalink
chore(release): 2.6.1 (#3076)
Browse files Browse the repository at this point in the history
  • Loading branch information
Szymon-dziewonski committed Mar 19, 2024
1 parent de186a8 commit 3a59207
Show file tree
Hide file tree
Showing 69 changed files with 1,638 additions and 1,215 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @Szymon-dziewonski @frsgit @dkacper @mattmaribojoc
* @Szymon-dziewonski @frsgit @mattmaribojoc @filrak @skirianov
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ contact_links:
about: Find more information about the project and how to use it.
- name: Discord Chat
url: https://discord.vuestorefront.io/
about: Ask questions and discuss with other Vue Storefront users in real time.
about: Ask questions and discuss with other Alokai users in real time.
23 changes: 21 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
run: cd apps/test/vue; yarn generate-coverage
- name: SonarCloud Scan
if: ${{ env.SONAR_TOKEN_VUE }}
uses: SonarSource/sonarcloud-github-action@v1.9
uses: SonarSource/sonarcloud-github-action@v2.1.1
with:
projectBaseDir: packages/sfui/frameworks/vue
env:
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
run: cd apps/test/react; yarn generate-coverage
- name: SonarCloud Scan
if: ${{ env.SONAR_TOKEN_REACT }}
uses: SonarSource/sonarcloud-github-action@v1.9
uses: SonarSource/sonarcloud-github-action@v2.1.1
with:
projectBaseDir: packages/sfui/frameworks/react
env:
Expand Down Expand Up @@ -303,3 +303,22 @@ jobs:
env:
GH_TOKEN: ${{ github.token }}
run: gh pr merge --auto --merge

gg-scanning:
name: GitGuardian scan
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: GitGuardian scan
uses: GitGuardian/[email protected]
with:
args: -v
env:
GITHUB_PUSH_BEFORE_SHA: ${{ github.event.before }}
GITHUB_PUSH_BASE_SHA: ${{ github.event.base }}
GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }}
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,5 @@ apps/docs/components/utils/components.json
apps/docs/components/utils/showcases.json
apps/docs/components/utils/hooks.json
apps/docs/components/utils/blocks.json

.cache_ggshield
874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.3.cjs

This file was deleted.

875 changes: 875 additions & 0 deletions .yarn/releases/yarn-3.7.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.6.3.cjs
yarnPath: .yarn/releases/yarn-3.7.0.cjs
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Vue Storefront
Copyright (c) 2024 Alokai

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ Knowing this we recommend using `yarn dev` in `root` directory.
- [Playground Vue](https://play-vue.vuestorefront.io)
- [Playground React](https://play-react.vuestorefront.io)
- [Discord](https://discord.vuestorefront.io)
- [Vue Storefront](https://vuestorefront.io)
- [Alokai](https://vuestorefront.io)
2 changes: 1 addition & 1 deletion apps/docs/components/ai-assistant.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ layout: EmbedLayout
<div class="custom-block">
<iframe
src="https://chat.fwdoperators.com/?cid=3fd362f4-2a88-4d27-b2d7-d067265b0280"
style="width: 100%; min-height: 90vh; border: none;"
style="width: 100%; min-height: 90vh; border: none; margin-top: 20px;"
allow="clipboard-write"
/>
</div>
2 changes: 1 addition & 1 deletion apps/docs/components/components/iconbase.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ List of all icons shipped with Storefront UI below. Click on any of the icons to

### Sizes

All Icon components supports various sizes that can be set with the `size` prop: `'xs'`, `'sm'`, `'base'`, `'lg'`, `'xl'`, `'2xl'`, `'3xl'`, `'4xl'`.
All Icon components supports various sizes that can be set with the `size` prop: `'xs'`, `'sm'`, `'base'`, `'lg'`, `'xl'`, `'2xl'`, `'3xl'`, `'4xl'` . Size can be overwritten by applying new styling on icon.

<Showcase showcase-name="IconBase/IconBaseSizes" style="min-height:300px">

Expand Down
147 changes: 74 additions & 73 deletions apps/docs/components/customization/theming.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ hideBreadcrumbs: true

# Theming

To help you build your storefront, Storefront UI adds additional colors following Tailwind's shading conventions. These can be customized customized with CSS variables or Tailwind configuration to match your design system.
UI colors are based on 10-tone Tailwind default color palette, normalized so that each color at the same brightness level meets identical minimum accessibility requirements.

To help you build your storefront, Storefront UI adds additional colors following Tailwind's shading conventions. These can be customized customized with CSS variables or Tailwind configuration to match your design system.

## Default Values

Expand All @@ -17,7 +19,6 @@ In addition to [Tailwind's default colors](https://tailwindcss.com/docs/customiz
You can see all of the default colors, classes, variants, and more in our [Tailwind preset](https://github.com/vuestorefront/storefront-ui/blob/v2/packages/config/tailwind/index.ts)
:::


## Customizing colors

### CSS Variables
Expand Down Expand Up @@ -67,88 +68,88 @@ The CSS classes for Storefront UI colors follow the pattern of `--colors-{color}
```css
:root {
/* Primary */
--colors-primary-50: 240 253 244;
--colors-primary-100: 220 252 231;
--colors-primary-200: 187 247 208;
--colors-primary-300: 134 239 172;
--colors-primary-400: 74 222 128;
--colors-primary-500: 2 198 82;
--colors-primary-600: 10 171 69;
--colors-primary-700: 1 137 55;
--colors-primary-800: 22 101 52;
--colors-primary-900: 20 83 45;
--colors-primary-50: 235 255 242;
--colors-primary-100: 217 253 228;
--colors-primary-200: 171 241 192;
--colors-primary-300: 130 234 158;
--colors-primary-400: 60 224 120;
--colors-primary-500: 19 195 96;
--colors-primary-600: 7 161 79;
--colors-primary-700: 13 127 63;
--colors-primary-800: 16 86 46;
--colors-primary-900: 15 50 30;

/* Secondary */
--colors-secondary-50: 245 243 255;
--colors-secondary-100: 237 233 254;
--colors-secondary-200: 221 214 254;
--colors-secondary-300: 196 181 253;
--colors-secondary-400: 167 139 250;
--colors-secondary-500: 135 92 246;
--colors-secondary-600: 111 64 236;
--colors-secondary-700: 97 49 221;
--colors-secondary-800: 83 30 211;
--colors-secondary-900: 68 21 178;
--colors-secondary-50: 247 245 253;
--colors-secondary-100: 239 236 251;
--colors-secondary-200: 225 218 246;
--colors-secondary-300: 216 203 245;
--colors-secondary-400: 198 177 246;
--colors-secondary-500: 180 151 249;
--colors-secondary-600: 151 111 238;
--colors-secondary-700: 119 79 209;
--colors-secondary-800: 82 52 153;
--colors-secondary-900: 48 32 86;

/* Positive */
--colors-positive-50: 240 253 244;
--colors-positive-100: 220 252 231;
--colors-positive-200: 187 247 208;
--colors-positive-300: 134 239 172;
--colors-positive-400: 74 222 128;
--colors-positive-500: 2 198 82;
--colors-positive-600: 10 171 69;
--colors-positive-700: 1 137 55;
--colors-positive-800: 22 101 52;
--colors-positive-900: 20 83 45;
--colors-positive-50: 235 255 242;
--colors-positive-100: 217 253 228;
--colors-positive-200: 171 241 192;
--colors-positive-300: 130 234 158;
--colors-positive-400: 60 224 120;
--colors-positive-500: 19 195 96;
--colors-positive-600: 7 161 79;
--colors-positive-700: 13 127 63;
--colors-positive-800: 16 86 46;
--colors-positive-900: 15 50 30;

/* Negative */
--colors-negative-50: 255 241 242;
--colors-negative-100: 255 228 230;
--colors-negative-200: 254 205 211;
--colors-negative-300: 253 164 175;
--colors-negative-400: 251 113 133;
--colors-negative-500: 244 63 94;
--colors-negative-600: 225 29 72;
--colors-negative-700: 190 18 60;
--colors-negative-800: 159 18 57;
--colors-negative-900: 136 19 55 1;
--colors-negative-50: 255 245 247;
--colors-negative-100: 255 232 237;
--colors-negative-200: 254 211 219;
--colors-negative-300: 253 193 202;
--colors-negative-400: 255 163 175;
--colors-negative-500: 255 127 143;
--colors-negative-600: 240 59 91;
--colors-negative-700: 208 13 48;
--colors-negative-800: 141 8 33;
--colors-negative-900: 76 15 23;

/* Warning */
--colors-warning-50: 254 252 232;
--colors-warning-100: 254 249 195;
--colors-warning-200: 254 240 138;
--colors-warning-300: 253 224 71;
--colors-warning-400: 250 204 21;
--colors-warning-500: 234 179 8;
--colors-warning-600: 202 138 4;
--colors-warning-700: 161 98 7;
--colors-warning-800: 133 77 14;
--colors-warning-900: 113 63 18;
--colors-warning-50: 254 247 236;
--colors-warning-100: 255 238 211;
--colors-warning-200: 254 220 165;
--colors-warning-300: 254 202 132;
--colors-warning-400: 255 181 77;
--colors-warning-500: 237 153 14;
--colors-warning-600: 191 121 17;
--colors-warning-700: 157 93 3;
--colors-warning-800: 109 63 9;
--colors-warning-900: 62 35 10;

/* Neutral */
--colors-neutral-50: 250 250 250;
--colors-neutral-100: 244 244 245;
--colors-neutral-200: 228 228 231;
--colors-neutral-300: 212 212 216;
--colors-neutral-400: 161 161 170;
--colors-neutral-500: 113 113 122;
--colors-neutral-600: 82 82 91;
--colors-neutral-700: 63 63 70;
--colors-neutral-800: 39 39 42;
--colors-neutral-900: 24 24 27;
--colors-neutral-50: 249 251 250;
--colors-neutral-100: 239 244 241;
--colors-neutral-200: 217 226 220;
--colors-neutral-300: 187 198 190;
--colors-neutral-400: 129 140 133;
--colors-neutral-500: 100 111 104;
--colors-neutral-600: 77 86 79;
--colors-neutral-700: 56 65 59;
--colors-neutral-800: 37 43 39;
--colors-neutral-900: 21 26 22;

/* Disabled */
--colors-disabled-50: 250 250 250;
--colors-disabled-100: 244 244 245;
--colors-disabled-200: 228 228 231;
--colors-disabled-300: 212 212 216;
--colors-disabled-400: 161 161 170;
--colors-disabled-500: 113 113 122;
--colors-disabled-600: 82 82 91;
--colors-disabled-700: 63 63 70;
--colors-disabled-800: 39 39 42;
--colors-disabled-900: 24 24 27;
--colors-disabled-50: 249 251 250;
--colors-disabled-100: 239 244 241;
--colors-disabled-200: 217 226 220;
--colors-disabled-300: 187 198 190;
--colors-disabled-400: 129 140 133;
--colors-disabled-500: 100 111 104;
--colors-disabled-600: 77 86 79;
--colors-disabled-700: 56 65 59;
--colors-disabled-800: 37 43 39;
--colors-disabled-900: 21 26 22;
}
```
</SourceCode>
Expand Down Expand Up @@ -189,4 +190,4 @@ export default {

:::read-more
To learn more about the different ways to declare colors in Tailwind, check out the [Tailwind documentation](https://tailwindcss.com/docs/customizing-colors#using-custom-colors).
:::
:::
2 changes: 1 addition & 1 deletion apps/preview/next/pages/showcases/Footer/FooterBasic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export default function FooterBasic() {
))}
</div>
<p className="flex items-center justify-center py-2 leading-5 text-center typography-text-sm text-white/50 font-body md:ml-6">
@2023 Vue Storefront
@2024 Alokai
</p>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion apps/preview/next/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
sans: 'Red Hat Text, sans-serif',
sans: 'Inter, sans-serif',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion apps/preview/nuxt/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default defineNuxtConfig({
htmlAttrs: {
lang: 'en',
},
title: 'Vue Storefront UI v2',
title: 'Alokai UI v2',
},
},
alias: {
Expand Down
2 changes: 1 addition & 1 deletion apps/preview/nuxt/pages/showcases/Footer/FooterBasic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<p
class="flex items-center justify-center py-2 leading-5 text-center typography-text-sm text-white/50 font-body md:ml-6"
>
@2023 Vue Storefront
@2024 Alokai
</p>
</div>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion apps/preview/nuxt/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default <Config>{
theme: {
extend: {
fontFamily: {
sans: 'Red Hat Text, sans-serif',
sans: 'Inter, sans-serif',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion apps/test/react/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
sans: 'Red Hat Text, sans-serif',
sans: 'Inter, sans-serif',
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion apps/test/vue/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
theme: {
extend: {
fontFamily: {
sans: "Red Hat Text, sans-serif",
sans: "Inter, sans-serif",
},
},
},
Expand Down
7 changes: 4 additions & 3 deletions createIcons.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ const camelize = s => s.replace(/-./g, x => x[1].toUpperCase());
const capitalize = s => s && s[0].toUpperCase() + s.slice(1);
const getSvg = async (svgName, doOptimiziation) => {
const svgPath = path.join(inputDirectoryPath, svgName);
let fileContent = await fsPromise.readFile(svgPath, 'utf8').catch(() => ({}));
const fileContent = await fsPromise.readFile(svgPath, 'utf8').catch(() => ({}));
let optimizedFileContent = fileContent;
if (doOptimiziation) {
try {
fileContent = optimize(fileContent, {
optimizedFileContent = optimize(optimizedFileContent, {
multipass: true,
svg2js: {
pretty: true
Expand All @@ -151,7 +152,7 @@ const getSvg = async (svgName, doOptimiziation) => {
return {
fileName: camelize(fileName),
name: fileName,
content: fileContent.substring(fileContent.indexOf('>') + 1, fileContent.lastIndexOf('<')).replace(/"/g, "'"),
content: optimizedFileContent.substring(optimizedFileContent.indexOf('>') + 1, optimizedFileContent.lastIndexOf('<')).replace(/"/g, "'"),
attrs: {
viewBox: /viewBox="([^"]+)"/.exec(fileContent)?.[1]
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"yarn": ">=1.22.19",
"node": ">=16.0.0 <17.0.0"
},
"packageManager": "yarn@3.6.3",
"packageManager": "yarn@3.7.0",
"config": {
"commitizen": {
"path": "cz-conventional-changelog",
Expand Down
11 changes: 11 additions & 0 deletions packages/config/tailwind/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# @storefront-ui/tailwind-config

## 2.4.0

### Minor Changes

- [#3070](https://github.com/vuestorefront/storefront-ui/pull/3070) [`e15a3f6cb`](https://github.com/vuestorefront/storefront-ui/commit/e15a3f6cb56fd28b2e9a0bd525e9fcbde44d29f6) Thanks [@Szymon-dziewonski](https://github.com/Szymon-dziewonski)! - Change general rules for styling

### Patch Changes

- [#3073](https://github.com/vuestorefront/storefront-ui/pull/3073) [`a40579d26`](https://github.com/vuestorefront/storefront-ui/commit/a40579d26c2912c5d4d05e1a833801e3e87901b3) Thanks [@Szymon-dziewonski](https://github.com/Szymon-dziewonski)! - Change `Inter Display` into `Inter`
2 changes: 1 addition & 1 deletion packages/config/tailwind/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Vue Storefront
Copyright (c) 2024 Alokai

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading

0 comments on commit 3a59207

Please sign in to comment.