Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
ghengeveld committed Mar 4, 2024
2 parents 386c3b7 + 3baec49 commit ee0fbdf
Show file tree
Hide file tree
Showing 18 changed files with 3,183 additions and 2,454 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/check-labels.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Check PR Labels
on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]

jobs:
check-labels:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v3
with:
node-version: 20
- uses: chromaui/pr-label-checker-action@main
with:
one-of: |
major, minor, patch
release, skip-release
none-of: DO NOT MERGE
8 changes: 5 additions & 3 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install dependencies
run: yarn
- name: Publish to Chromatic
uses: chromaui/action-next@v1
uses: chromaui/action@latest
with:
token: ${{ secrets.GITHUB_TOKEN }}
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
buildScriptName: 'build:storybook'
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Prepare repository
run: git fetch --unshallow --tags

- name: Use Node.js 18.x
uses: actions/setup-node@v3
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 18.x
node-version: latest

- name: Cache node modules
uses: actions/cache@v1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ node_modules/
storybook-static/
build-storybook.log
.env
package-lock.json
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"../",
"@chromaui/addon-visual-tests",
"@chromatic-com/storybook",
"@storybook/addon-webpack5-compiler-swc",
],
framework: {
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
# v2.2.0 (Mon Mar 04 2024)

#### 🚀 Enhancement

- Support grouping rules like @media and @layer and fix shadow DOM support [#103](https://github.com/chromaui/storybook-addon-pseudo-states/pull/103) ([@m-akinc](https://github.com/m-akinc))

#### 🐛 Bug Fix

- Fix CI config [#106](https://github.com/chromaui/storybook-addon-pseudo-states/pull/106) ([@ghengeveld](https://github.com/ghengeveld))
- Exclude ::-webkit-slider-thumb pseudo-element from rewrites [#104](https://github.com/chromaui/storybook-addon-pseudo-states/pull/104) ([@m-akinc](https://github.com/m-akinc))

#### Authors: 2

- [@m-akinc](https://github.com/m-akinc)
- Gert Hengeveld ([@ghengeveld](https://github.com/ghengeveld))

---

# v2.1.2 (Wed Oct 11 2023)

#### 🐛 Bug Fix
Expand Down
2 changes: 1 addition & 1 deletion chromatic.config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"buildScriptName": "build:storybook",
"projectId": "Project:6008aabce49a640021858011",
"projectToken": "uskf6kz75lb"
"zip": true
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-addon-pseudo-states",
"version": "3.0.0-next.0",
"version": "2.2.0",
"description": "CSS pseudo states for Storybook",
"keywords": [
"storybook-addons",
Expand Down Expand Up @@ -51,33 +51,33 @@
"release": "auto shipit --base-branch=main"
},
"devDependencies": {
"@chromaui/addon-visual-tests": "^0.0.105",
"@storybook/addon-essentials": "^8.0.0-alpha.12",
"@storybook/addon-interactions": "^8.0.0-alpha.12",
"@storybook/addon-links": "^8.0.0-alpha.12",
"@chromatic-com/storybook": "^1.2.1",
"@storybook/addon-essentials": "^8.0.0-rc.1",
"@storybook/addon-interactions": "^8.0.0-rc.1",
"@storybook/addon-links": "^8.0.0-rc.1",
"@storybook/addon-webpack5-compiler-swc": "^1.0.0",
"@storybook/react": "^8.0.0-alpha.12",
"@storybook/react-webpack5": "^8.0.0-alpha.12",
"@storybook/test": "^8.0.0-alpha.12",
"@storybook/types": "^8.0.0-alpha.12",
"@storybook/react": "^8.0.0-rc.1",
"@storybook/react-webpack5": "^8.0.0-rc.1",
"@storybook/test": "^8.0.0-rc.1",
"@storybook/types": "^8.0.0-rc.1",
"@types/jest": "^29.2.4",
"@types/node": "^18.19.0",
"auto": "^10.16.8",
"auto": "^11.1.1",
"concurrently": "^5.3.0",
"jest": "^27.5.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^3.0.2",
"storybook": "^8.0.0-alpha.12",
"tsup": "^6.7.0",
"storybook": "^8.0.0-rc.1",
"tsup": "^8.0.1",
"typescript": "^4.9.4"
},
"peerDependencies": {
"@storybook/components": "^8.0.0-alpha.12",
"@storybook/core-events": "^8.0.0-alpha.12",
"@storybook/manager-api": "^8.0.0-alpha.12",
"@storybook/preview-api": "^8.0.0-alpha.12",
"@storybook/theming": "^8.0.0-alpha.12",
"@storybook/components": "^8.0.0-rc.1",
"@storybook/core-events": "^8.0.0-rc.1",
"@storybook/manager-api": "^8.0.0-rc.1",
"@storybook/preview-api": "^8.0.0-rc.1",
"@storybook/theming": "^8.0.0-rc.1",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export const PARAM_KEY = "pseudo"

// Pseudo-elements which are not allowed to have classes applied on them
// E.g. ::-webkit-scrollbar-thumb.pseudo-hover is not a valid selector
export const EXCLUDED_PSEUDO_ELEMENTS = ["::-webkit-scrollbar-thumb"]
export const EXCLUDED_PSEUDO_ELEMENTS = ["::-webkit-scrollbar-thumb", "::-webkit-slider-thumb"]

// Dynamic pseudo-classes
// @see https://www.w3.org/TR/2018/REC-selectors-3-20181106/#dynamic-pseudos
Expand Down
Loading

0 comments on commit ee0fbdf

Please sign in to comment.