Skip to content

Commit 4ab46b9

Browse files
authored
Merge branch 'main' into fix-auto-config
2 parents c7aa5a1 + 3a5aa2b commit 4ab46b9

File tree

8 files changed

+44
-85
lines changed

8 files changed

+44
-85
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
with:
1212
fetch-depth: 0
1313

14-
- name: Use Node.js 22.x
14+
- name: Setup Node
1515
uses: actions/setup-node@v3
1616

1717
- uses: pnpm/action-setup@v4
@@ -20,12 +20,10 @@ jobs:
2020
run: pnpm install
2121

2222
- name: Build
23-
run: |
24-
pnpm build
23+
run: pnpm build
2524

2625
- name: Release
2726
env:
2827
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2928
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
30-
run: |
31-
pnpm release
29+
run: pnpm run release

.nvmrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
22.12
1+
22.16.0
2+

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# v3.0.0 (Thu Nov 13 2025)
2+
3+
#### 💥 Breaking Change
4+
5+
- Upgrade addon to be compatible with Storybook v10 [#33](https://github.com/storybookjs/addon-styling-webpack/pull/33) ([@MaxLikesCode](https://github.com/MaxLikesCode) [@ndelangen](https://github.com/ndelangen))
6+
7+
#### 🐛 Bug Fix
8+
9+
- Update Node.js version [#36](https://github.com/storybookjs/addon-styling-webpack/pull/36) ([@ndelangen](https://github.com/ndelangen))
10+
11+
#### Authors: 2
12+
13+
- Max ([@MaxLikesCode](https://github.com/MaxLikesCode))
14+
- Norbert de Langen ([@ndelangen](https://github.com/ndelangen))
15+
16+
---
17+
118
# v2.0.0 (Tue Jun 03 2025)
219

320
#### 💥 Breaking Change

auto.config.cjs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module.exports = {
2+
baseBranch: 'main',
3+
labels: [
4+
{
5+
name: 'documentation',
6+
releaseType: 'none',
7+
},
8+
],
9+
prereleaseBranches: ['next', 'prerelease'],
10+
versionBranches: true,
11+
};

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-styling-webpack",
3-
"version": "2.0.0",
3+
"version": "3.0.0",
44
"description": "A base addon for configuring popular styling tools in Webpack",
55
"keywords": [
66
"style",
@@ -49,7 +49,6 @@
4949
"auto": "^11.3.0",
5050
"picocolors": "^1.1.0",
5151
"prettier": "^3.5.3",
52-
"rimraf": "^6.0.1",
5352
"storybook": "^10.0.0",
5453
"tsup": "^8.5.0",
5554
"typescript": "^5.9.3",

pnpm-lock.yaml

Lines changed: 2 additions & 64 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.json

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,16 @@
33
"esModuleInterop": true,
44
"skipLibCheck": true,
55
"target": "esnext",
6-
"allowJs": true,
76
"resolveJsonModule": true,
8-
"moduleDetection": "force",
97
"moduleResolution": "bundler",
10-
"module": "preserve",
8+
"module": "es2015",
119
"jsx": "react",
1210
"isolatedModules": true,
1311
"verbatimModuleSyntax": true,
1412
"strict": true,
1513
"noUncheckedIndexedAccess": true,
16-
"noImplicitOverride": true,
17-
"noImplicitAny": true,
18-
"lib": ["es2023", "dom", "dom.iterable"],
19-
"baseUrl": ".",
20-
"rootDir": "./src"
14+
"lib": ["esnext", "dom", "dom.iterable"],
15+
"rootDir": "."
2116
},
22-
"include": ["src/**/*"]
17+
"include": ["src/**/*", "tsup.config.ts"]
2318
}

tsup.config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { defineConfig } from 'tsup';
22

3-
export default defineConfig((options) => [
3+
export default defineConfig(() => [
44
{
55
entry: ['src/index.ts', 'src/preset.ts'],
66
outDir: './dist',
77
splitting: true,
88
format: ['esm'],
9-
dts: true,
9+
dts: true,
1010
treeshake: true,
1111
sourcemap: false,
1212
/*
@@ -22,10 +22,10 @@ dts: true,
2222
{
2323
entry: ['src/postinstall.ts'],
2424
outDir: './bin',
25-
splitting: true,
25+
splitting: true,
2626
format: ['esm'],
2727
treeshake: true,
28-
target: 'node20',
28+
target: 'node22',
2929
clean: false,
3030
platform: 'node',
3131
esbuildOptions(options) {

0 commit comments

Comments
 (0)