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

Release: Prerelease 8.2.0-alpha.8 #28190

Merged
merged 47 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
c2162f6
Add intiialGlobals to @storybook/csf
shilman Jun 3, 2024
c44371a
Prefer preview.js initialGlobals to deprecated globals
shilman Jun 3, 2024
e54f5ab
ConfigFile: Fix removing field from a default export variable reference
shilman Jun 3, 2024
f280d8e
Add initialGlobals to MIGRATION.md
shilman Jun 3, 2024
1979c9b
initialGlobals automigration
shilman Jun 3, 2024
9d83f46
Upgrade CSF for initialGlobals
shilman Jun 3, 2024
686626e
Incorporate review feedback
shilman Jun 5, 2024
84079ea
Make the "Learn more" link clickable
deiga Jun 6, 2024
61d6ee7
Merge branch 'next' into shilman/initial-globals
shilman Jun 6, 2024
33c4d49
Document package structure changes across major versions
shilman Jun 7, 2024
d89481e
Fixing tests WIP
shilman Jun 7, 2024
e8a5c24
Merge pull request #28020 from deiga/patch-1
shilman Jun 10, 2024
877257e
Content tweaks
kylegach Jun 10, 2024
41254ac
Merge branch 'next' into shilman/package-structure-changes
kylegach Jun 10, 2024
a496ec4
Merge pull request #28136 from storybookjs/shilman/package-structure-…
kylegach Jun 10, 2024
7563fd2
Fix portable stories & failing tests
shilman Jun 11, 2024
567ca27
Merge branch 'next' into shilman/initial-globals
shilman Jun 11, 2024
55a74b5
Fix TS check
shilman Jun 11, 2024
a783ad9
Try to fix yarn linking
shilman Jun 11, 2024
6ef32d0
dev upgrades
ndelangen Jun 11, 2024
dd657b3
sync deps
ndelangen Jun 11, 2024
ba52208
Merge pull request #28197 from storybookjs/norbert/sync-deps
ndelangen Jun 11, 2024
5b921d7
Merge branch 'next' into norbert/upgrades-june-2024
ndelangen Jun 11, 2024
130ff18
fix linting problems and missing deps
ndelangen Jun 11, 2024
4e5b715
bumbp esbuild version
ndelangen Jun 11, 2024
0b5a960
downgrade tsup to v6
ndelangen Jun 11, 2024
5a11ab1
Code review
shilman Jun 11, 2024
32224e4
Convert addon globals to initialGlobals
shilman Jun 11, 2024
87a2d51
bump
ndelangen Jun 11, 2024
f68b857
Merge branch 'next' into shilman/initial-globals
shilman Jun 11, 2024
8dbd2d3
update yarn.lock
shilman Jun 11, 2024
29f649b
Merge pull request #27517 from storybookjs/shilman/initial-globals
shilman Jun 11, 2024
708c873
Merge branch 'next' into norbert/upgrades-june-2024
ndelangen Jun 12, 2024
c32ff81
bumb for cache
ndelangen Jun 12, 2024
aceb905
Merge pull request #28196 from storybookjs/norbert/upgrades-june-2024
ndelangen Jun 12, 2024
25fa7d6
cleanup some dev deps
ndelangen Jun 12, 2024
f7c18ef
Merge pull request #28219 from storybookjs/norbert/deps-cleanup
ndelangen Jun 12, 2024
8cb9bf7
more cleanup
ndelangen Jun 12, 2024
d8eb99b
remove ts-node
ndelangen Jun 12, 2024
79e4e34
Update CHANGELOG.md for v8.1.7 [skip ci]
storybook-bot Jun 12, 2024
42e1ba4
remove unused dependencies
ndelangen Jun 12, 2024
280e9a4
Merge pull request #28220 from storybookjs/norbert/cleanup-dev-deps-p…
ndelangen Jun 12, 2024
7495940
move to happy-dom, use vitest node-environment by default
ndelangen Jun 12, 2024
bb3d8cc
Merge pull request #28222 from storybookjs/norbert/happy-dom
ndelangen Jun 12, 2024
6f1110f
CLI: Fix `init --skip-install`
shilman Jun 12, 2024
3385570
Merge pull request #28226 from storybookjs/shilman/27096-fix-init-ski…
shilman Jun 12, 2024
495e0f1
Write changelog for 8.2.0-alpha.8 [skip ci]
storybook-bot Jun 12, 2024
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 8.1.7

- Addon-actions: Only log spies with names - [#28091](https://github.com/storybookjs/storybook/pull/28091), thanks @kasperpeulen!
- CLI: Fix typo in React Docgen migration - [#27536](https://github.com/storybookjs/storybook/pull/27536), thanks @jonniebigodes!
- Portable Stories: Add tags to composed story - [#27708](https://github.com/storybookjs/storybook/pull/27708), thanks @yannbf!
- Test: Display toHaveBeenCalledWith expected / received values on failure - [#28088](https://github.com/storybookjs/storybook/pull/28088), thanks @kasperpeulen!

## 8.1.6

- CLI: Only log the UpgradeStorybookToSameVersionError but continue the upgrade as normal - [#27217](https://github.com/storybookjs/storybook/pull/27217), thanks @kasperpeulen!
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.prerelease.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 8.2.0-alpha.8

- Automigrations: Make VTA "learn more" link clickable - [#28020](https://github.com/storybookjs/storybook/pull/28020), thanks @deiga!
- CLI: Fix `init --skip-install` - [#28226](https://github.com/storybookjs/storybook/pull/28226), thanks @shilman!
- CSF: Rename `preview.js` `globals` to `initialGlobals` - [#27517](https://github.com/storybookjs/storybook/pull/27517), thanks @shilman!

## 8.2.0-alpha.7

- Angular: Allow outputPath object syntax - [#28144](https://github.com/storybookjs/storybook/pull/28144), thanks @valentinpalkovic!
Expand Down
63 changes: 47 additions & 16 deletions MIGRATION.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<h1>Migration</h1>

- [From version 8.1.x to 8.2.x](#from-version-81x-to-82x)
- [Preview.js globals renamed to initialGlobals](#previewjs-globals-renamed-to-initialglobals)
- [From version 8.0.x to 8.1.x](#from-version-80x-to-81x)
- [Portable stories](#portable-stories)
- [@storybook/nextjs requires specific path aliases to be setup](#storybooknextjs-requires-specific-path-aliases-to-be-setup)
Expand All @@ -17,6 +19,7 @@
- [Manager addons are now rendered with React 18](#manager-addons-are-now-rendered-with-react-18)
- [Removal of `storiesOf`-API](#removal-of-storiesof-api)
- [Removed deprecated shim packages](#removed-deprecated-shim-packages)
- [Deprecated `@storybook/testing-library` package](#deprecated-storybooktesting-library-package)
- [Framework-specific Vite plugins have to be explicitly added](#framework-specific-vite-plugins-have-to-be-explicitly-added)
- [For React:](#for-react)
- [For Vue:](#for-vue)
Expand Down Expand Up @@ -97,17 +100,17 @@
- [Tab addons cannot manually route, Tool addons can filter their visibility via tabId](#tab-addons-cannot-manually-route-tool-addons-can-filter-their-visibility-via-tabid)
- [Removed `config` preset](#removed-config-preset-1)
- [From version 7.5.0 to 7.6.0](#from-version-750-to-760)
- [CommonJS with Vite is deprecated](#commonjs-with-vite-is-deprecated)
- [Using implicit actions during rendering is deprecated](#using-implicit-actions-during-rendering-is-deprecated)
- [typescript.skipBabel deprecated](#typescriptskipbabel-deprecated)
- [Primary doc block accepts of prop](#primary-doc-block-accepts-of-prop)
- [Addons no longer need a peer dependency on React](#addons-no-longer-need-a-peer-dependency-on-react)
- [CommonJS with Vite is deprecated](#commonjs-with-vite-is-deprecated)
- [Using implicit actions during rendering is deprecated](#using-implicit-actions-during-rendering-is-deprecated)
- [typescript.skipBabel deprecated](#typescriptskipbabel-deprecated)
- [Primary doc block accepts of prop](#primary-doc-block-accepts-of-prop)
- [Addons no longer need a peer dependency on React](#addons-no-longer-need-a-peer-dependency-on-react)
- [From version 7.4.0 to 7.5.0](#from-version-740-to-750)
- [`storyStoreV6` and `storiesOf` is deprecated](#storystorev6-and-storiesof-is-deprecated)
- [`storyIndexers` is replaced with `experimental_indexers`](#storyindexers-is-replaced-with-experimental_indexers)
- [`storyStoreV6` and `storiesOf` is deprecated](#storystorev6-and-storiesof-is-deprecated)
- [`storyIndexers` is replaced with `experimental_indexers`](#storyindexers-is-replaced-with-experimental_indexers)
- [From version 7.0.0 to 7.2.0](#from-version-700-to-720)
- [Addon API is more type-strict](#addon-api-is-more-type-strict)
- [Addon-controls hideNoControlsWarning parameter is deprecated](#addon-controls-hidenocontrolswarning-parameter-is-deprecated)
- [Addon API is more type-strict](#addon-api-is-more-type-strict)
- [Addon-controls hideNoControlsWarning parameter is deprecated](#addon-controls-hidenocontrolswarning-parameter-is-deprecated)
- [From version 6.5.x to 7.0.0](#from-version-65x-to-700)
- [7.0 breaking changes](#70-breaking-changes)
- [Dropped support for Node 15 and below](#dropped-support-for-node-15-and-below)
Expand All @@ -133,7 +136,7 @@
- [Deploying build artifacts](#deploying-build-artifacts)
- [Dropped support for file URLs](#dropped-support-for-file-urls)
- [Serving with nginx](#serving-with-nginx)
- [Ignore story files from node\_modules](#ignore-story-files-from-node_modules)
- [Ignore story files from node_modules](#ignore-story-files-from-node_modules)
- [7.0 Core changes](#70-core-changes)
- [7.0 feature flags removed](#70-feature-flags-removed)
- [Story context is prepared before for supporting fine grained updates](#story-context-is-prepared-before-for-supporting-fine-grained-updates)
Expand All @@ -147,7 +150,7 @@
- [Addon-interactions: Interactions debugger is now default](#addon-interactions-interactions-debugger-is-now-default)
- [7.0 Vite changes](#70-vite-changes)
- [Vite builder uses Vite config automatically](#vite-builder-uses-vite-config-automatically)
- [Vite cache moved to node\_modules/.cache/.vite-storybook](#vite-cache-moved-to-node_modulescachevite-storybook)
- [Vite cache moved to node_modules/.cache/.vite-storybook](#vite-cache-moved-to-node_modulescachevite-storybook)
- [7.0 Webpack changes](#70-webpack-changes)
- [Webpack4 support discontinued](#webpack4-support-discontinued)
- [Babel mode v7 exclusively](#babel-mode-v7-exclusively)
Expand Down Expand Up @@ -197,7 +200,7 @@
- [Dropped addon-docs manual babel configuration](#dropped-addon-docs-manual-babel-configuration)
- [Dropped addon-docs manual configuration](#dropped-addon-docs-manual-configuration)
- [Autoplay in docs](#autoplay-in-docs)
- [Removed STORYBOOK\_REACT\_CLASSES global](#removed-storybook_react_classes-global)
- [Removed STORYBOOK_REACT_CLASSES global](#removed-storybook_react_classes-global)
- [7.0 Deprecations and default changes](#70-deprecations-and-default-changes)
- [storyStoreV7 enabled by default](#storystorev7-enabled-by-default)
- [`Story` type deprecated](#story-type-deprecated)
Expand Down Expand Up @@ -410,6 +413,20 @@
- [Packages renaming](#packages-renaming)
- [Deprecated embedded addons](#deprecated-embedded-addons)

## From version 8.1.x to 8.2.x

### Preview.js globals renamed to initialGlobals

Starting in 8.2 `preview.js` `globals` are deprecated and have been renamed to `initialGlobals`. We will remove `preview.js` `globals` in 9.0.

```diff
// .storybook/preview.js
export default {
- globals: [ a: 1, b: 2 ],
+ initiaGlobals: [ a: 1, b: 2 ],
}
```

## From version 8.0.x to 8.1.x

### Portable stories
Expand Down Expand Up @@ -439,6 +456,7 @@ The `docs.autodocs` setting in `main.js` is deprecated in 8.1 and will be remove
It has been replaced with a tags-based system which is more flexible than before.

`docs.autodocs` takes three values:

- `true`: generate autodocs for every component
- `false`: don't generate autodocs at all
- `tag`: generate autodocs for components that have been tagged `'autodocs'`.
Expand All @@ -448,8 +466,8 @@ Starting in 8.1, to generate autodocs for every component (`docs.autodocs = true
```js
// .storybook/preview.js
export default {
tags: ['autodocs'],
}
tags: ["autodocs"],
};
```

Tags cascade, so setting `'autodocs'` at the project level automatically propagates to every component and story. If you set autodocs globally and want to opt-out for a particular component, you can remove the `'autodocs'` tag for a component like this:
Expand All @@ -458,8 +476,8 @@ Tags cascade, so setting `'autodocs'` at the project level automatically propaga
// Button.stories.ts
export default {
component: Button,
tags: ['!autodocs'],
}
tags: ["!autodocs"],
};
```

If you had set `docs.autodocs = 'tag'`, the default setting, you can remove the setting from `.storybook/main.js`. That is now the default behavior.
Expand Down Expand Up @@ -602,6 +620,19 @@ These sections explain the rationale, and the required changes you might have to
- [New Addons API](#new-addons-api)
- [`addons.setConfig` should now be imported from `@storybook/manager-api`.](#addonssetconfig-should-now-be-imported-from-storybookmanager-api)

### Deprecated `@storybook/testing-library` package

In Storybook 8, `@storybook/testing-library` has been integrated to a new package called `@storybook/test`, which uses Vitest APIs for an improved experience. When upgrading to Storybook 8 with 'npx storybook@latest upgrade', you will get prompted and will get an automigration for the new package. Please migrate when you can.

To migrate by hand, install `@storybook/test` and replace `@storybook/testing-libary` imports globally:

```ts
- import { userEvent } from '@storybook/testing-library';
+ import { userEvent } from '@storybook/test';
```

For more information on the change, see the [announcement post](https://storybook.js.org/blog/storybook-test/).

### Framework-specific Vite plugins have to be explicitly added

In Storybook 7, we would automatically add frameworks-specific Vite plugins, e.g. `@vitejs/plugin-react` if not installed.
Expand Down
3 changes: 1 addition & 2 deletions code/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ module.exports = {
},
},
{
// this package depends on a lot of peerDependencies we don't want to specify, because npm would install them
files: ['**/addons/docs/**/*'],
files: ['**/template/**/*', '**/vitest.config.ts', '**/addons/docs/**/*'],
rules: {
'import/no-extraneous-dependencies': 'off',
},
Expand Down
2 changes: 1 addition & 1 deletion code/addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"./src/preview.tsx"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Accessibility",
"icon": "https://user-images.githubusercontent.com/263385/101991665-47042f80-3c7c-11eb-8f00-64b5a18f498a.png",
Expand Down
2 changes: 2 additions & 0 deletions code/addons/a11y/src/components/A11YPanel.test.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// @vitest-environment happy-dom

import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
import React from 'react';
import { render, waitFor, fireEvent, act, cleanup } from '@testing-library/react';
Expand Down
2 changes: 2 additions & 0 deletions code/addons/a11y/src/components/A11yContext.test.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// @vitest-environment happy-dom

import { describe, beforeEach, afterEach, it, expect, vi } from 'vitest';
import * as React from 'react';
import type { AxeResults } from 'axe-core';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// @vitest-environment happy-dom

import { describe, it, expect, afterEach, vi } from 'vitest';
import React from 'react';
import { render, fireEvent, cleanup } from '@testing-library/react';
Expand Down
4 changes: 1 addition & 3 deletions code/addons/a11y/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"./src/preview.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Actions",
"unsupportedFrameworks": [
Expand Down
4 changes: 1 addition & 3 deletions code/addons/actions/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"./src/preview.tsx"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Backgrounds",
"icon": "https://user-images.githubusercontent.com/263385/101991667-479cc600-3c7c-11eb-96d3-410e936252e7.png",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/src/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export const parameters = {
},
};

export const globals = {
export const initialGlobals = {
[PARAM_KEY]: null as any,
};
4 changes: 1 addition & 3 deletions code/addons/backgrounds/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/controls/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"./src/manager.tsx"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Controls",
"icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png",
Expand Down
4 changes: 1 addition & 3 deletions code/addons/controls/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"./src/mdx-loader.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Docs",
"icon": "https://user-images.githubusercontent.com/263385/101991672-48355c80-3c7c-11eb-82d9-95fa12438f64.png",
Expand Down
4 changes: 1 addition & 3 deletions code/addons/docs/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/essentials/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@
"./src/viewport/preview.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17"
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
}
4 changes: 1 addition & 3 deletions code/addons/essentials/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/gfm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@
"./src/index.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17"
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16"
}
4 changes: 1 addition & 3 deletions code/addons/gfm/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/highlight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"./src/preview.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"sbmodern": "dist/modern/index.js",
"storybook": {
"displayName": "Highlight",
Expand Down
4 changes: 1 addition & 3 deletions code/addons/highlight/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"./src/preset.ts"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Interactions",
"unsupportedFrameworks": [
Expand Down
4 changes: 1 addition & 3 deletions code/addons/interactions/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
2 changes: 1 addition & 1 deletion code/addons/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"./src/manager.tsx"
]
},
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae17",
"gitHead": "e6a7fd8a655c69780bc20b9749c2699e44beae16",
"storybook": {
"displayName": "Jest",
"icon": "https://pbs.twimg.com/profile_images/821713465245102080/mMtKIMax_400x400.jpg",
Expand Down
4 changes: 1 addition & 3 deletions code/addons/jest/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { vitestCommonConfig } from '../../vitest.workspace';
export default mergeConfig(
vitestCommonConfig,
defineConfig({
test: {
environment: 'jsdom',
},
// Add custom config here
})
);
Loading