Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bf4d342
correct tsdk location after monorepo code&script merge in vscode sett…
ndelangen Dec 22, 2025
13ffe17
remove unneeded array notation
ndelangen Dec 22, 2025
b722e8d
add aliases for theming in main storybook
ndelangen Dec 22, 2025
d991354
upgrades of deps
ndelangen Dec 22, 2025
05f5c3b
no symlinking on CI, as persisting that is somewhat broken
ndelangen Dec 22, 2025
ae44277
run start tasks automatically on CI
ndelangen Dec 22, 2025
6965ca3
remove unused chromatic settings properties
ndelangen Dec 22, 2025
76f87c2
add noEmit to tsconfig becaue we never use tsc to compile
ndelangen Dec 22, 2025
c7bd319
improve type safety of knip config file
ndelangen Dec 22, 2025
c9a5c7c
deal wth execa upgrade
ndelangen Dec 22, 2025
028466c
disable ember sandbox
ndelangen Dec 22, 2025
162a033
linting changes
ndelangen Dec 22, 2025
de1fdd7
Merge branch 'next' into norbert/version-bumps-dec-2025
ndelangen Dec 22, 2025
27ae68c
make build storybook separate step in Ci
ndelangen Dec 22, 2025
04311c9
bigger job for compile
ndelangen Dec 22, 2025
6da5d5d
Update dependencies in yarn.lock to latest versions for @volar/langua…
ndelangen Dec 22, 2025
1eb292d
Upgrade execa dependency to version 9.6.1 across multiple package.jso…
ndelangen Dec 22, 2025
faf138e
Merge branch 'next' into norbert/version-bumps-dec-2025
ndelangen Dec 23, 2025
5d6e9dc
Update yarn.lock: refine version specifications for @typescript-eslin…
ndelangen Dec 23, 2025
a3e17cb
Update dependencies: bump camelcase to version 9.0.0 and diff to vers…
ndelangen Dec 23, 2025
2d8ba9c
Update watchpack dependency to version 2.5.0 in package.json and yarn…
ndelangen Dec 23, 2025
f87137f
Update CircleCI configuration to use 'xlarge' executor class for chec…
ndelangen Dec 23, 2025
cba2a44
Update @happy-dom/global-registrator to version 20.0.11 in package.js…
ndelangen Dec 23, 2025
8ba1e44
fix incorrectly picked changes
ndelangen Dec 24, 2025
6482a7e
Merge branch 'next' into norbert/version-bumps-dec-2025
ndelangen Dec 24, 2025
7b4dfcb
fix incorrectly picked changes, fix typos and apply review comments
ndelangen Dec 24, 2025
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
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench)
build:
executor:
class: large
class: xlarge
name: sb_node_22_classic
steps:
- git-shallow-clone/checkout_advanced:
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
root: /tmp
check:
executor:
class: large
class: xlarge
name: sb_node_22_classic
steps:
- git-shallow-clone/checkout_advanced:
Expand Down Expand Up @@ -299,6 +299,10 @@ jobs:
- checkout
- attach_workspace:
at: /tmp
- run:
command: yarn storybook:ui:build
name: Build Storybook
working_directory: code
- run:
command: yarn storybook:ui:chromatic
name: Running Chromatic
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/jobs/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
executor:
class: large
class: xlarge
name: sb_node_22_classic

steps:
Expand Down
2 changes: 1 addition & 1 deletion .circleci/src/jobs/check.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
executor:
class: large
class: xlarge
name: sb_node_22_classic

steps:
Expand Down
4 changes: 4 additions & 0 deletions .circleci/src/jobs/chromatic-internal-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ steps:
- checkout
- attach_workspace:
at: /tmp
- run:
name: Build Storybook
command: yarn storybook:ui:build
working_directory: code
- run:
name: Running Chromatic
command: yarn storybook:ui:chromatic
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"typescript.preferences.preferTypeOnlyAutoImports": true,
"typescript.preferences.quoteStyle": "single",
"typescript.preferGoToSourceDefinition": true,
"typescript.tsdk": "./code/node_modules/typescript/lib",
"typescript.tsdk": "./typescript/lib",
"vitest.workspaceConfig": "./code/vitest.workspace.ts",
"vitest.rootConfig": "./code/vitest.workspace.ts",
}
2 changes: 1 addition & 1 deletion code/.storybook/bench/bench.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { Meta } from '@storybook/react-vite';
import { safeMetafileArg } from '../../../scripts/bench/safe-args';

// @ts-expect-error - TS doesn't know about import.meta.glob from Vite
const allMetafiles = import.meta.glob(['../../bench/esbuild-metafiles/**/*.json'], {
const allMetafiles = import.meta.glob('../../bench/esbuild-metafiles/**/*.json', {
import: 'default',
});

Expand Down
4 changes: 4 additions & 0 deletions code/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ const currentDirPath = dirname(currentFilePath);

const componentsPath = join(currentDirPath, '../core/src/components/index.ts');
const managerApiPath = join(currentDirPath, '../core/src/manager-api/index.mock.ts');
const themingCreatePath = join(currentDirPath, '../core/src/theming/create.ts');
const themingPath = join(currentDirPath, '../core/src/theming/index.ts');
const imageContextPath = join(currentDirPath, '../frameworks/nextjs/src/image-context.ts');

const config = defineMain({
Expand Down Expand Up @@ -154,6 +156,8 @@ const config = defineMain({
? {
'storybook/internal/components': componentsPath,
'storybook/manager-api': managerApiPath,
'storybook/theming/create': themingCreatePath,
'storybook/theming': themingPath,
'sb-original/image-context': imageContextPath,
}
: {
Expand Down
6 changes: 3 additions & 3 deletions code/addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
},
"devDependencies": {
"@radix-ui/react-tabs": "1.0.4",
"@storybook/icons": "^2.0.0",
"@storybook/icons": "^2.0.1",
"@testing-library/react": "^14.0.0",
"execa": "^9.5.2",
"execa": "^9.6.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-resize-detector": "^7.1.2",
"typescript": "^5.8.3",
"typescript": "^5.9.3",
"vitest-axe": "^0.1.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions code/addons/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"dependencies": {
"@mdx-js/react": "^3.0.0",
"@storybook/csf-plugin": "workspace:*",
"@storybook/icons": "^2.0.0",
"@storybook/icons": "^2.0.1",
"@storybook/react-dom-shim": "workspace:*",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
Expand All @@ -105,7 +105,7 @@
"rehype-slug": "^6.0.0",
"telejson": "8.0.0",
"tocbot": "^4.20.1",
"typescript": "^5.8.3",
"typescript": "^5.9.3",
"vite": "^7.0.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion code/addons/links/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@storybook/global": "^5.0.0"
},
"devDependencies": {
"typescript": "^5.8.3"
"typescript": "^5.9.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
Expand Down
4 changes: 2 additions & 2 deletions code/addons/onboarding/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
],
"devDependencies": {
"@neoconfetti/react": "^1.0.0",
"@storybook/icons": "^2.0.0",
"@storybook/icons": "^2.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-joyride": "^2.8.2",
"typescript": "^5.8.3"
"typescript": "^5.9.3"
},
"peerDependencies": {
"storybook": "workspace:^"
Expand Down
4 changes: 2 additions & 2 deletions code/addons/pseudo-states/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"!src/**/*"
],
"devDependencies": {
"@storybook/icons": "^2.0.0",
"@storybook/icons": "^2.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.8.3"
"typescript": "^5.9.3"
},
"peerDependencies": {
"storybook": "workspace:^"
Expand Down
4 changes: 2 additions & 2 deletions code/addons/themes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@storybook/icons": "^2.0.0",
"@storybook/icons": "^2.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"typescript": "^5.8.3"
"typescript": "^5.9.3"
},
"peerDependencies": {
"storybook": "workspace:^"
Expand Down
10 changes: 5 additions & 5 deletions code/addons/vitest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
],
"dependencies": {
"@storybook/global": "^5.0.0",
"@storybook/icons": "^2.0.0"
"@storybook/icons": "^2.0.1"
},
"devDependencies": {
"@types/istanbul-lib-report": "^3.0.3",
"@types/micromatch": "^4.0.0",
"@types/node": "^22.0.0",
"@types/semver": "^7",
"@types/node": "^22.19.1",
"@types/semver": "^7.7.1",
"@vitest/browser-playwright": "^4.0.14",
"@vitest/runner": "^4.0.14",
"empathic": "^2.0.0",
Expand All @@ -86,13 +86,13 @@
"picocolors": "^1.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"semver": "^7.6.3",
"semver": "^7.7.3",
"sirv": "^2.0.4",
"slash": "^5.0.0",
"tinyglobby": "^0.2.10",
"tree-kill": "^1.2.2",
"ts-dedent": "^2.2.0",
"typescript": "^5.8.3",
"typescript": "^5.9.3",
"vitest": "^4.0.14"
},
"peerDependencies": {
Expand Down
5 changes: 2 additions & 3 deletions code/addons/vitest/src/node/boot-test-runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,8 @@ describe('bootTestRunner', () => {
} as Options;

beforeEach(async () => {
const { experimental_MockUniversalStore: MockUniversalStore } = await import(
'storybook/internal/core-server'
);
const { experimental_MockUniversalStore: MockUniversalStore } =
await import('storybook/internal/core-server');
mockStore = new MockUniversalStore<StoreState, StoreEvent>(storeOptions);
vi.mocked(executeNodeCommand).mockClear();
vi.mocked(log).mockClear();
Expand Down
4 changes: 2 additions & 2 deletions code/builders/builder-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"@types/node": "^22.19.1",
"empathic": "^2.0.0",
"es-module-lexer": "^1.5.0",
"glob": "^10.0.0",
"glob": "^10.5.0",
"knitwork": "^1.1.0",
"magic-string": "^0.30.0",
"pathe": "^1.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ function isUserCode(moduleName: string) {

return Boolean(
!moduleName.startsWith('vite/') &&
!moduleName.startsWith('\0') &&
moduleName !== 'react/jsx-runtime'
!moduleName.startsWith('\0') &&
moduleName !== 'react/jsx-runtime'
);
}

Expand Down
4 changes: 2 additions & 2 deletions code/builders/builder-webpack5/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
"webpack-virtual-modules": "^0.6.0"
},
"devDependencies": {
"@types/node": "^22.0.0",
"@types/node": "^22.19.1",
"@types/pretty-hrtime": "^1.0.0",
"@types/webpack-hot-middleware": "^2.25.6",
"pretty-hrtime": "^1.0.3",
"sirv": "^2.0.4",
"slash": "^5.0.0",
"typescript": "^5.8.3"
"typescript": "^5.9.3"
},
"peerDependencies": {
"storybook": "workspace:^"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import type { LoaderDefinition } from 'webpack';
/**
* A Webpack loader that normalize sb.mock(import(...)) calls to sb.mock(...)
*
* @param source The original source code of the preview config file.
* @this The Webpack loader context.
* @param source The original source code of the preview config file.
*/
const storybookMockTransformLoader: LoaderDefinition = function mockTransformLoaderFn(
source,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ interface AutomockLoaderOptions {
* This loader is intended to be used by `WebpackMockPlugin` when no `__mocks__` file is found for a
* module specified in `sb.mock()`.
*
* @param {string} source The original source code of the module.
* @this {LoaderContext<AutomockLoaderOptions>} The Webpack loader context.
* @param {string} source The original source code of the module.
*/
export default function webpackAutomockLoader(
this: LoaderContext<AutomockLoaderOptions>,
Expand Down
6 changes: 4 additions & 2 deletions code/builders/builder-webpack5/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ export interface TypescriptOptions extends TypeScriptOptionsBase {
checkOptions?: ConstructorParameters<typeof ForkTsCheckerWebpackPlugin>[0];
}

export interface StorybookConfigWebpack
extends Omit<StorybookConfig, 'webpack' | 'webpackFinal' | 'features'> {
export interface StorybookConfigWebpack extends Omit<
StorybookConfig,
'webpack' | 'webpackFinal' | 'features'
> {
/**
* Modify or return a custom Webpack config after the Storybook's default configuration has run
* (mostly used by addons).
Expand Down
3 changes: 0 additions & 3 deletions code/chromatic.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
"$schema": "https://www.chromatic.com/config-file.schema.json",
"projectId": "Project:635781f3500dd2c49e189caf",
"projectToken": "80b312430ec4",
"buildScriptName": "storybook:ui:build",
"onlyChanged": false,
"storybookConfigDir": ".storybook",
"storybookBaseDir": "./code",
"zip": true
}
Loading