Skip to content

Commit 19a68df

Browse files
valentinpalkovicvalentinpalkovic
authored
Merge branch 'next' into jsmike/angular-sourceDecorator
2 parents 6f19cac + 5d4791c commit 19a68df

File tree

122 files changed

+1088
-254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1088
-254
lines changed

‎CHANGELOG.prerelease.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 8.3.0-beta.4
2+
3+
- Test: Rename vitest plugin entrypoint - [#29067](https://github.com/storybookjs/storybook/pull/29067), thanks @yannbf!
4+
- UI: Fix sidebar not wrapping - [#29055](https://github.com/storybookjs/storybook/pull/29055), thanks @JReinhold!
5+
16
## 8.3.0-beta.3
27

38
- Addon Test: Improve messages and post install script handling - [#29036](https://github.com/storybookjs/storybook/pull/29036), thanks @yannbf!

‎code/addons/a11y/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-a11y",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Test component compliance with web accessibility standards",
55
"keywords": [
66
"a11y",

‎code/addons/actions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-actions",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Get UI feedback when an action is performed on an interactive element",
55
"keywords": [
66
"storybook",

‎code/addons/backgrounds/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-backgrounds",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Switch backgrounds to view components in different settings",
55
"keywords": [
66
"addon",

‎code/addons/controls/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-controls",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Interact with component inputs dynamically in the Storybook UI",
55
"keywords": [
66
"addon",

‎code/addons/docs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-docs",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Document component usage and properties in Markdown",
55
"keywords": [
66
"addon",

‎code/addons/essentials/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-essentials",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Curated addons to bring out the best of Storybook",
55
"keywords": [
66
"addon",

‎code/addons/gfm/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-mdx-gfm",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "GitHub Flavored Markdown in Storybook",
55
"keywords": [
66
"addon",

‎code/addons/highlight/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-highlight",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Highlight DOM nodes within your stories",
55
"keywords": [
66
"storybook-addons",

‎code/addons/interactions/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-interactions",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Automate, test and debug user interactions",
55
"keywords": [
66
"storybook-addons",

‎code/addons/jest/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-jest",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "React storybook addon that show component jest report",
55
"keywords": [
66
"addon",

‎code/addons/links/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-links",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Link stories together to build demos and prototypes with your UI components",
55
"keywords": [
66
"addon",

‎code/addons/measure/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-measure",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Inspect layouts by visualizing the box model",
55
"keywords": [
66
"storybook-addons",

‎code/addons/onboarding/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-onboarding",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Storybook Addon Onboarding - Introduces a new onboarding experience",
55
"keywords": [
66
"storybook-addons",

‎code/addons/outline/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-outline",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Outline all elements with CSS to help with layout placement and alignment",
55
"keywords": [
66
"storybook-addons",

‎code/addons/storysource/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-storysource",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "View a story’s source code to see how it works and paste into your app",
55
"keywords": [
66
"addon",

‎code/addons/test/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/experimental-addon-test",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Integrate Vitest with Storybook",
55
"keywords": [
66
"storybook-addons",

‎code/addons/themes/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-themes",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Switch between multiple themes for you components in Storybook",
55
"keywords": [
66
"css",

‎code/addons/toolbars/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-toolbars",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Create your own toolbar items that control story rendering",
55
"keywords": [
66
"addon",

‎code/addons/viewport/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/addon-viewport",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "Build responsive components by adjusting Storybook’s viewport size and orientation",
55
"keywords": [
66
"addon",

‎code/builders/builder-vite/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@storybook/builder-vite",
3-
"version": "8.3.0-beta.3",
3+
"version": "8.3.0-beta.4",
44
"description": "A plugin to run and build Storybooks with Vite",
55
"homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme",
66
"bugs": {

‎code/builders/builder-vite/src/codegen-modern-iframe-script.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { getFrameworkName, loadPreviewOrConfigFile } from 'storybook/internal/co
22
import type { Options, PreviewAnnotation } from 'storybook/internal/types';
33

44
import { processPreviewAnnotation } from './utils/process-preview-annotation';
5-
import { virtualAddonSetupFile, virtualStoriesFile } from './virtual-file-names';
5+
import { SB_VIRTUAL_FILES, getResolvedVirtualModuleId } from './virtual-file-names';
66

77
export async function generateModernIframeScriptCode(options: Options, projectRoot: string) {
88
const { presets, configDir } = options;
@@ -45,7 +45,7 @@ export async function generateModernIframeScriptCode(options: Options, projectRo
4545

4646
return `
4747
if (import.meta.hot) {
48-
import.meta.hot.accept('${virtualStoriesFile}', (newModule) => {
48+
import.meta.hot.accept('${getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE)}', (newModule) => {
4949
// importFn has changed so we need to patch the new one in
5050
window.__STORYBOOK_PREVIEW__.onStoriesChanged({ importFn: newModule.importFn });
5151
});
@@ -68,8 +68,8 @@ export async function generateModernIframeScriptCode(options: Options, projectRo
6868
*/
6969
const code = `
7070
import { composeConfigs, PreviewWeb, ClientApi } from 'storybook/internal/preview-api';
71-
import '${virtualAddonSetupFile}';
72-
import { importFn } from '${virtualStoriesFile}';
71+
import '${SB_VIRTUAL_FILES.VIRTUAL_ADDON_SETUP_FILE}';
72+
import { importFn } from '${SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE}';
7373
7474
${getPreviewAnnotationsFunction}
7575

‎code/builders/builder-vite/src/plugins/code-generator-plugin.ts

+19-20
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,7 @@ import { generateImportFnScriptCode } from '../codegen-importfn-script';
88
import { generateModernIframeScriptCode } from '../codegen-modern-iframe-script';
99
import { generateAddonSetupCode } from '../codegen-set-addon-channel';
1010
import { transformIframeHtml } from '../transform-iframe-html';
11-
import {
12-
virtualAddonSetupFile,
13-
virtualFileId,
14-
virtualPreviewFile,
15-
virtualStoriesFile,
16-
} from '../virtual-file-names';
11+
import { SB_VIRTUAL_FILES, getResolvedVirtualModuleId } from '../virtual-file-names';
1712

1813
export function codeGeneratorPlugin(options: Options): Plugin {
1914
const iframePath = require.resolve('@storybook/builder-vite/input/iframe.html');
@@ -28,11 +23,15 @@ export function codeGeneratorPlugin(options: Options): Plugin {
2823
// invalidate the whole vite-app.js script on every file change.
2924
// (this might be a little too aggressive?)
3025
server.watcher.on('change', () => {
31-
const appModule = server.moduleGraph.getModuleById(virtualFileId);
26+
const appModule = server.moduleGraph.getModuleById(
27+
getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_APP_FILE)
28+
);
3229
if (appModule) {
3330
server.moduleGraph.invalidateModule(appModule);
3431
}
35-
const storiesModule = server.moduleGraph.getModuleById(virtualStoriesFile);
32+
const storiesModule = server.moduleGraph.getModuleById(
33+
getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE)
34+
);
3635
if (storiesModule) {
3736
server.moduleGraph.invalidateModule(storiesModule);
3837
}
@@ -45,7 +44,7 @@ export function codeGeneratorPlugin(options: Options): Plugin {
4544
// TODO maybe use the stories declaration in main
4645
if (/\.stories\.([tj])sx?$/.test(path) || /\.mdx$/.test(path)) {
4746
// We need to emit a change event to trigger HMR
48-
server.watcher.emit('change', virtualStoriesFile);
47+
server.watcher.emit('change', SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE);
4948
}
5049
});
5150
},
@@ -69,34 +68,34 @@ export function codeGeneratorPlugin(options: Options): Plugin {
6968
iframeId = `${config.root}/iframe.html`;
7069
},
7170
resolveId(source) {
72-
if (source === virtualFileId) {
73-
return `${virtualFileId}`;
71+
if (source === SB_VIRTUAL_FILES.VIRTUAL_APP_FILE) {
72+
return getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_APP_FILE);
7473
}
7574
if (source === iframePath) {
7675
return iframeId;
7776
}
78-
if (source === virtualStoriesFile) {
79-
return `${virtualStoriesFile}`;
77+
if (source === SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE) {
78+
return getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE);
8079
}
81-
if (source === virtualPreviewFile) {
82-
return virtualPreviewFile;
80+
if (source === SB_VIRTUAL_FILES.VIRTUAL_PREVIEW_FILE) {
81+
return getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_PREVIEW_FILE);
8382
}
84-
if (source === virtualAddonSetupFile) {
85-
return `${virtualAddonSetupFile}`;
83+
if (source === SB_VIRTUAL_FILES.VIRTUAL_ADDON_SETUP_FILE) {
84+
return getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_ADDON_SETUP_FILE);
8685
}
8786

8887
return undefined;
8988
},
9089
async load(id, config) {
91-
if (id === `${virtualStoriesFile}`) {
90+
if (id === getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_STORIES_FILE)) {
9291
return generateImportFnScriptCode(options);
9392
}
9493

95-
if (id === `${virtualAddonSetupFile}`) {
94+
if (id === getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_ADDON_SETUP_FILE)) {
9695
return generateAddonSetupCode();
9796
}
9897

99-
if (id === `${virtualFileId}`) {
98+
if (id === getResolvedVirtualModuleId(SB_VIRTUAL_FILES.VIRTUAL_APP_FILE)) {
10099
return generateModernIframeScriptCode(options, projectRoot);
101100
}
102101

‎code/builders/builder-vite/src/plugins/external-globals-plugin.test.ts

+16
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ const cases = [
1212
input: `import { Rain, Jour as Day, Nuit as Night, Sun } from "${packageName}"`,
1313
output: `const { Rain, Jour: Day, Nuit: Night, Sun } = ${globals[packageName]}`,
1414
},
15+
{
16+
globals,
17+
packageName,
18+
input: `import {
19+
Rain,
20+
Jour as Day,
21+
Nuit as Night,
22+
Sun
23+
} from "${packageName}"`,
24+
output: `const {
25+
Rain,
26+
Jour: Day,
27+
Nuit: Night,
28+
Sun
29+
} = ${globals[packageName]}`,
30+
},
1531
{
1632
globals,
1733
packageName,

‎code/builders/builder-vite/src/plugins/external-globals-plugin.ts

+1-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,7 @@ export async function externalGlobalsPlugin(externals: Record<string, string>) {
9191

9292
return {
9393
code: src.toString(),
94-
map: src.generateMap({
95-
source: id,
96-
hires: true,
97-
}),
94+
map: null,
9895
};
9996
},
10097
} satisfies Plugin;

0 commit comments

Comments
 (0)