Skip to content

Commit 5b9c1cd

Browse files
authored
Merge pull request #31675 from storybookjs/version-patch-from-9.0.5
Release: Patch 9.0.6
2 parents 9ccce78 + d6e06e2 commit 5b9c1cd

File tree

7 files changed

+26
-12
lines changed

7 files changed

+26
-12
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 9.0.6
2+
3+
- Addon Docs: Fix reference to global JSX namespace - [#31671](https://github.com/storybookjs/storybook/pull/31671), thanks @mrginglymus!
4+
- Angular: Improve Vite compatibility - [#31686](https://github.com/storybookjs/storybook/pull/31686), thanks @ndelangen!
5+
- Preview: Fix type issues - [#31537](https://github.com/storybookjs/storybook/pull/31537), thanks @mrginglymus!
6+
- Telemetry: Improve error handling - [#31656](https://github.com/storybookjs/storybook/pull/31656), thanks @ndelangen!
7+
18
## 9.0.5
29

310
- Addon A11y: Briefly disable highlights while Axe is running - [#31621](https://github.com/storybookjs/storybook/pull/31621), thanks @ghengeveld!

code/addons/docs/src/types.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import type { JSX } from 'react';
2+
13
import type { ModuleExport, ModuleExports } from 'storybook/internal/types';
24

35
type StoryBlockParameters = {
@@ -65,7 +67,7 @@ type CanvasBlockParameters = {
6567
className?: string;
6668
disabled?: boolean;
6769
onClick: () => void;
68-
title: string | JSX.Element;
70+
title: string | React.JSX.Element;
6971
}[];
7072
/** Provide HTML class(es) to the preview element, for custom styling. */
7173
className?: string;

code/core/src/telemetry/package-json.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ export const getActualPackageVersion = async (packageName: string) => {
2121
};
2222

2323
export const getActualPackageJson = async (packageName: string) => {
24-
const resolvedPackageJson = require.resolve(join(packageName, 'package.json'), {
25-
paths: [process.cwd()],
26-
});
27-
const packageJson = JSON.parse(await readFile(resolvedPackageJson, { encoding: 'utf8' }));
28-
return packageJson;
24+
try {
25+
const resolvedPackageJson = require.resolve(join(packageName, 'package.json'), {
26+
paths: [process.cwd()],
27+
});
28+
const packageJson = JSON.parse(await readFile(resolvedPackageJson, { encoding: 'utf8' }));
29+
return packageJson;
30+
} catch (err) {
31+
return null;
32+
}
2933
};

code/frameworks/angular/src/preset.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ export const previewAnnotations: PresetProperty<'previewAnnotations'> = async (
1616
entries = [],
1717
options
1818
) => {
19-
const annotations = [...entries, require.resolve('./client/config')];
19+
const annotations = [...entries, require.resolve('./client/config.mjs')];
2020

2121
if ((options as any as StandaloneOptions).enableProdMode) {
22-
annotations.unshift(require.resolve('./client/preview-prod'));
22+
annotations.unshift(require.resolve('./client/preview-prod.mjs'));
2323
}
2424

2525
const docsConfig = await options.presets.apply('docs', {}, options);
2626
const docsEnabled = Object.keys(docsConfig).length > 0;
2727
if (docsEnabled) {
28-
annotations.push(require.resolve('./client/docs/config'));
28+
annotations.push(require.resolve('./client/docs/config.mjs'));
2929
}
3030
return annotations;
3131
};

code/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,5 +283,6 @@
283283
"Dependency Upgrades"
284284
]
285285
]
286-
}
286+
},
287+
"deferredNextVersion": "9.0.6"
287288
}

code/renderers/react/src/entry-preview-argtypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { enhanceArgTypes, extractComponentDescription } from 'storybook/internal
22
import type { ArgTypesEnhancer } from 'storybook/internal/types';
33

44
import { extractArgTypes } from './extractArgTypes';
5-
import type { ReactRenderer } from './public-types';
5+
import type { ReactRenderer } from './types';
66

77
export const parameters = {
88
docs: {

docs/versions/latest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"9.0.5","info":{"plain":"- Addon A11y: Briefly disable highlights while Axe is running - [#31621](https://github.com/storybookjs/storybook/pull/31621), thanks @ghengeveld!\n- CLI: Consider Storybook React Native packages in upgrade command - [#31645](https://github.com/storybookjs/storybook/pull/31645), thanks @yannbf!\n- Next.js: Fix module transpilation - [#31501](https://github.com/storybookjs/storybook/pull/31501), thanks @valentinpalkovic!\n- Svelte: Fix source view always using `<wrapper ...>` - [#31639](https://github.com/storybookjs/storybook/pull/31639), thanks @JReinhold!\n- Testing: Fix `toSatisfy`-matcher implementation - [#31664](https://github.com/storybookjs/storybook/pull/31664), thanks @ndelangen!"}}
1+
{"version":"9.0.6","info":{"plain":"- Addon Docs: Fix reference to global JSX namespace - [#31671](https://github.com/storybookjs/storybook/pull/31671), thanks @mrginglymus!\n- Angular: Improve Vite compatibility - [#31686](https://github.com/storybookjs/storybook/pull/31686), thanks @ndelangen!\n- Preview: Fix type issues - [#31537](https://github.com/storybookjs/storybook/pull/31537), thanks @mrginglymus!\n- Telemetry: Improve error handling - [#31656](https://github.com/storybookjs/storybook/pull/31656), thanks @ndelangen!"}}

0 commit comments

Comments
 (0)