GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 16:51:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vite-frameworks' into svelte-vite-framework

Browse Source
This commit is contained in:
Michael Shilman 2022-08-22 22:56:44 +08:00
commit 8846a42bc7
11 changed files with 28 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.circleci/config.yml
View File

@ -257,7 +257,7 @@ jobs:
# executor:
# class: large
# name: sb_cypress_8_node_14
# parallelism: 2
# parallelism: 8
# steps:
# - git-shallow-clone/checkout_advanced:
# clone_options: '--depth 1 --verbose'
@ -462,7 +462,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
@ -482,7 +482,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
@ -498,7 +498,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
@ -518,7 +518,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
@ -534,7 +534,7 @@ jobs:
executor:
class: medium+
name: sb_node_14_browsers
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'
@ -549,7 +549,7 @@ jobs:
e2e-sandboxes:
docker:
- image: mcr.microsoft.com/playwright:v1.24.0-focal
parallelism: 2
parallelism: 8
steps:
- git-shallow-clone/checkout_advanced:
clone_options: '--depth 1 --verbose'

6
code/.eslintrc.js
View File

@ -101,5 +101,11 @@ module.exports = {
'jest/no-test-callback': 'off', // These aren't jest tests
},
},
{
files: ['**/builder-vite/input/iframe.html'],
rules: {
'no-undef': 'off', // ignore "window" undef errors
},
},
],
};

1
code/frameworks/react-vite/src/index.ts
View File

@ -1,2 +1 @@
export * from '@storybook/react';
export * from './types';

64
code/frameworks/react-vite/src/types.ts
View File

@ -1,64 +0,0 @@
export * from '@storybook/core-vite';
// import type {
// StorybookConfig as StorybookConfigBase,
// TypescriptOptions as TypescriptOptionsBase,
// } from '@storybook/core-vite';
// export type { BuilderResult } from '@storybook/core-vite';
// type FrameworkName = '@storybook/react-vite';
// type BuilderName = '@storybook/builder-vite';
// export interface FrameworkOptions {
// fastRefresh?: boolean;
// strictMode?: boolean;
// /**
// * Use React's legacy root API to mount components
// * @description
// * React has introduced a new root API with React 18.x to enable a whole set of new features (e.g. concurrent features)
// * If this flag is true, the legacy Root API is used to mount components to make it easier to migrate step by step to React 18.
// * @default false
// */
// legacyRootApi?: boolean;
// }
// type StorybookConfigFramework = {
// framework:
// | FrameworkName
// | {
// name: FrameworkName;
// options: FrameworkOptions;
// };
// core?: StorybookConfigBase['core'] & {
// builder?:
// | BuilderName
// | {
// name: BuilderName;
// options: BuilderOptions;
// };
// };
// typescript?: Partial<TypescriptOptionsBuilder & TypescriptOptionsReact> &
// StorybookConfigBase['typescript'];
// };
// export type TypescriptOptions = TypescriptOptionsBase & {
// /**
// * Sets the type of Docgen when working with React and TypeScript
// *
// * @default `'react-docgen-typescript'`
// */
// reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false;
// /**
// * Configures `react-docgen-typescript-plugin`
// *
// * @default
// * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6
// */
// reactDocgenTypescriptOptions: ReactDocgenTypescriptOptions;
// };
// export type StorybookConfig<TWebpackConfiguration = WebpackConfigurationBase> =
// StorybookConfigBase<TWebpackConfiguration> & {
// typescript?: Partial<TypescriptOptions>;
// };

1
code/frameworks/vue3-vite/src/index.ts
View File

@ -1,2 +1 @@
export * from '@storybook/vue3';
export * from './types';

64
code/frameworks/vue3-vite/src/types.ts
View File

@ -1,64 +0,0 @@
export * from '@storybook/core-vite';
// import type {
// StorybookConfig as StorybookConfigBase,
// TypescriptOptions as TypescriptOptionsBase,
// } from '@storybook/core-vite';
// export type { BuilderResult } from '@storybook/core-vite';
// type FrameworkName = '@storybook/react-vite';
// type BuilderName = '@storybook/builder-vite';
// export interface FrameworkOptions {
// fastRefresh?: boolean;
// strictMode?: boolean;
// /**
// * Use React's legacy root API to mount components
// * @description
// * React has introduced a new root API with React 18.x to enable a whole set of new features (e.g. concurrent features)
// * If this flag is true, the legacy Root API is used to mount components to make it easier to migrate step by step to React 18.
// * @default false
// */
// legacyRootApi?: boolean;
// }
// type StorybookConfigFramework = {
// framework:
// | FrameworkName
// | {
// name: FrameworkName;
// options: FrameworkOptions;
// };
// core?: StorybookConfigBase['core'] & {
// builder?:
// | BuilderName
// | {
// name: BuilderName;
// options: BuilderOptions;
// };
// };
// typescript?: Partial<TypescriptOptionsBuilder & TypescriptOptionsReact> &
// StorybookConfigBase['typescript'];
// };
// export type TypescriptOptions = TypescriptOptionsBase & {
// /**
// * Sets the type of Docgen when working with React and TypeScript
// *
// * @default `'react-docgen-typescript'`
// */
// reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false;
// /**
// * Configures `react-docgen-typescript-plugin`
// *
// * @default
// * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6
// */
// reactDocgenTypescriptOptions: ReactDocgenTypescriptOptions;
// };
// export type StorybookConfig<TWebpackConfiguration = WebpackConfigurationBase> =
// StorybookConfigBase<TWebpackConfiguration> & {
// typescript?: Partial<TypescriptOptions>;
// };

11
code/lib/builder-vite/src/source-loader-plugin.ts
View File

@ -1,13 +1,17 @@
import type { Plugin } from 'vite';
import sourceLoaderTransform from '@storybook/source-loader';
import type { ExtendedOptions } from './types';
import MagicString from 'magic-string';
import type { ExtendedOptions } from './types';
const storyPattern = /\.stories\.[jt]sx?$/;
const storySourcePattern = /var __STORY__ = "(.*)"/;
const storySourceReplacement = '--STORY_SOURCE_REPLACEMENT--';
const mockClassLoader = (id: string) => ({ emitWarning: (message: string) => console.warn(message), resourcePath: id });
const mockClassLoader = (id: string) => ({
// eslint-disable-next-line no-console
emitWarning: (message: string) => console.warn(message),
resourcePath: id,
});
// HACK: Until we can support only node 15+ and use string.prototype.replaceAll
const replaceAll = (str: string, search: string, replacement: string) => {
@ -31,6 +35,7 @@ export function sourceLoaderPlugin(config: ExtendedOptions): Plugin | Plugin[] {
map: s.generateMap({ hires: true, source: id }),
};
}
return undefined;
},
};
}
@ -66,6 +71,7 @@ export function sourceLoaderPlugin(config: ExtendedOptions): Plugin | Plugin[] {
map: s.generateMap(),
};
}
return undefined;
},
},
{
@ -90,6 +96,7 @@ export function sourceLoaderPlugin(config: ExtendedOptions): Plugin | Plugin[] {
map: s.generateMap(),
};
}
return undefined;
},
},
];

3
code/lib/core-server/src/build-dev.ts
View File

@ -119,7 +119,7 @@ export async function buildDevStandalone(options: CLIOptions & LoadOptions & Bui
if (options.smokeTest) {
const warnings: Error[] = [];
warnings.push(...((managerStats && managerStats.toJson().warnings) || []));
warnings.push(...((managerStats && previewStats.toJson().warnings) || []));
warnings.push(...((previewStats && previewStats.toJson().warnings) || []));
const problems = warnings
.filter((warning) => !warning.message.includes(`export 'useInsertionEffect'`))
@ -128,6 +128,7 @@ export async function buildDevStandalone(options: CLIOptions & LoadOptions & Bui
(warning) => !warning.message.includes(`Conflicting values for 'process.env.NODE_ENV'`)
);
// eslint-disable-next-line no-console
console.log(problems.map((p) => p.stack));
process.exit(problems.length > 0 ? 1 : 0);
return;

1
code/package.json
View File

@ -191,6 +191,7 @@
"@storybook/codemod": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/core-vite": "workspace:*",
"@storybook/core-webpack": "workspace:*",
"@storybook/csf-tools": "workspace:*",
"@storybook/docs-tools": "workspace:*",

3
code/yarn.lock
View File

@ -8266,7 +8266,7 @@ __metadata:
languageName: unknown
linkType: soft
"@storybook/core-vite@7.0.0-alpha.23, @storybook/core-vite@workspace:lib/core-vite":
"@storybook/core-vite@7.0.0-alpha.23, @storybook/core-vite@workspace:*, @storybook/core-vite@workspace:lib/core-vite":
version: 0.0.0-use.local
resolution: "@storybook/core-vite@workspace:lib/core-vite"
dependencies:
@ -9222,6 +9222,7 @@ __metadata:
"@storybook/codemod": "workspace:*"
"@storybook/components": "workspace:*"
"@storybook/core-events": "workspace:*"
"@storybook/core-vite": "workspace:*"
"@storybook/core-webpack": "workspace:*"
"@storybook/csf-tools": "workspace:*"
"@storybook/docs-tools": "workspace:*"

2
scripts/build-package.js
View File

@ -113,7 +113,7 @@ async function run() {
}
selection?.filter(Boolean).forEach(async (v) => {
const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prep;
const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prepare;
const cwd = resolve(__dirname, '..', 'code', v.location);
const sub = require('execa').command(
`${commmand}${watchMode ? ' --watch' : ''}${prodMode ? ' --optimized' : ''}`,