Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Storybook 8.2 and general cleanup #124

Merged
merged 12 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .babelrc.js

This file was deleted.

6 changes: 5 additions & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v4
with:
version: 9
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install dependencies
run: yarn
run: pnpm install
- name: Publish to Chromatic
uses: chromaui/action@latest
with:
exitOnceUploaded: true
token: ${{ secrets.GITHUB_TOKEN }}
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
18 changes: 7 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: pnpm/action-setup@v4
with:
version: 9

- uses: actions/checkout@v2
with:
token: ${{ secrets.AUTO_RELEASE_TOKEN_GHENGEVELD }}
Expand All @@ -17,19 +21,11 @@ jobs:
with:
node-version: latest

- name: Cache node modules
uses: actions/cache@v1
with:
path: node_modules
key: yarn-deps-${{ hashFiles('yarn.lock') }}
restore-keys: |
yarn-deps-${{ hashFiles('yarn.lock') }}

- name: Create Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: |
yarn install --frozen-lockfile
yarn prepublish
yarn release
pnpm install
pnpm run prepublish
pnpm run release
7 changes: 5 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: pnpm/action-setup@v4
with:
version: 9
- uses: actions/checkout@v2
- name: Install modules
run: yarn
run: pnpm install
- name: Run tests
run: yarn test
run: pnpm run test
21 changes: 5 additions & 16 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
module.exports = {
stories: ["../stories/**/*.mdx", "../stories/**/*.stories.@(js|jsx|ts|tsx)"],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"../",
"@chromatic-com/storybook",
"@storybook/addon-webpack5-compiler-swc",
],
framework: {
name: "@storybook/react-webpack5",
options: {},
},
docs: {
docsPage: true,
},
addons: ["@chromatic-com/storybook"],
framework: "@storybook/react-vite",
managerEntries: [__dirname + "/../src/manager.ts"],
previewAnnotations: [__dirname + "/../src/preview.ts"],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
}
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
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",
"onlyChanged": true,
"projectId": "Project:6008aabce49a640021858011",
"zip": true
}
55 changes: 23 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@
"types": "dist/index.d.ts",
"exports": {
".": {
"require": "./dist/index.js",
"types": "./dist/index.d.ts",
"import": "./dist/index.mjs",
"types": "./dist/index.d.ts"
"require": "./dist/index.js"
},
"./manager": {
"types": "./dist/manager.d.ts",
"require": "./dist/manager.js",
"import": "./dist/manager.mjs"
"import": "./dist/manager.mjs",
"require": "./dist/manager.js"
},
"./preview": {
"types": "./dist/preview.d.ts",
"require": "./dist/preview.js",
"import": "./dist/preview.mjs"
"import": "./dist/preview.mjs",
"require": "./dist/preview.js"
},
"./package.json": "./package.json"
},
Expand All @@ -43,43 +43,34 @@
"dist/**/*"
],
"scripts": {
"clean": "rimraf ./dist",
"start": "concurrently \"yarn storybook --quiet\" \"yarn build:dist --watch\"",
"storybook": "storybook dev -p 6006",
"test": "jest src",
"build-storybook": "storybook build",
"test": "vitest",
"chromatic": "npx chromatic",
"build:dist": "tsup",
"build:storybook": "storybook build",
"prepublish": "yarn clean && yarn build:dist",
"prepublish": "tsup",
"release": "auto shipit --base-branch=main"
},
"dependencies": {
"@storybook/icons": "^1.2.10"
},
"devDependencies": {
"@babel/preset-env": "^7.24.0",
"@babel/preset-typescript": "^7.23.3",
"@chromatic-com/storybook": "^1.2.1",
"@storybook/addon-essentials": "^8.0.0",
"@storybook/addon-interactions": "^8.0.0",
"@storybook/addon-links": "^8.0.0",
"@storybook/addon-webpack5-compiler-swc": "^1.0.0",
"@storybook/components": "^8.0.0",
"@storybook/core-events": "^8.0.0",
"@storybook/icons": "^1.2.9",
"@storybook/manager-api": "^8.0.0",
"@storybook/preview-api": "^8.0.0",
"@storybook/theming": "^8.0.0",
"@storybook/react-webpack5": "^8.0.0",
"@storybook/types": "^8.0.0",
"@types/jest": "^29.2.4",
"@chromatic-com/storybook": "^1.7.0",
"@storybook/react": "^8.2.9",
"@storybook/react-vite": "^8.2.9",
"@types/node": "^18.19.0",
"@vitejs/plugin-react": "^4.3.1",
"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",
"storybook": "^8.2.9",
"tsup": "^8.0.1",
"typescript": "^4.9.4"
"typescript": "^5.5.4",
"vite": "^5.4.2",
"vitest": "^2.0.5"
},
"peerDependencies": {
"storybook": "^8.2.0"
},
"bundler": {
"exportEntries": [
Expand Down
Loading
Loading