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

Merge pull request #14271 from storybookjs/fix/14269-module-mainfield-missing

Browse Source 
Webpack: Fix missing `module` mainField
This commit is contained in:
Michael Shilman 2021-03-19 10:15:21 +08:00 committed by GitHub
commit ae910f8294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 70 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/preact/src/client/preview/types-6-0.ts
View File

@ -2,7 +2,7 @@ import { AnyComponent } from 'preact';
import { Args as DefaultArgs, Annotations, BaseMeta, BaseStory } from '@storybook/addons';
import { StoryFnPreactReturnType } from './types';
export { Args, ArgTypes, Parameters, StoryContext } from '@storybook/addons';
export type { Args, ArgTypes, Parameters, StoryContext } from '@storybook/addons';
type PreactComponent = AnyComponent<any, any>;
type PreactReturnType = StoryFnPreactReturnType;

2
lib/builder-webpack4/src/preview/iframe-webpack.config.ts
View File

@ -194,7 +194,7 @@ export default async ({
resolve: {
extensions: ['.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
modules: ['node_modules'].concat(envs.NODE_PATH || []),
mainFields: isProd ? undefined : ['browser', 'main'],
mainFields: ['browser', 'module', 'main'],
alias: {
...themingPaths,
...storybookPaths,

2
lib/builder-webpack5/src/preview/iframe-webpack.config.ts
View File

@ -195,7 +195,7 @@ export default async ({
resolve: {
extensions: ['.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
modules: ['node_modules'].concat(envs.NODE_PATH || []),
mainFields: ['browser', 'main'],
mainFields: ['browser', 'module', 'main'],
alias: {
...themingPaths,
...storybookPaths,

118
lib/cli/src/versions.json
View File

@ -1,61 +1,61 @@
{
"@storybook/addon-a11y": "6.2.0-rc.2",
"@storybook/addon-actions": "6.2.0-rc.2",
"@storybook/addon-backgrounds": "6.2.0-rc.2",
"@storybook/addon-controls": "6.2.0-rc.2",
"@storybook/addon-cssresources": "6.2.0-rc.2",
"@storybook/addon-design-assets": "6.2.0-rc.2",
"@storybook/addon-docs": "6.2.0-rc.2",
"@storybook/addon-essentials": "6.2.0-rc.2",
"@storybook/addon-events": "6.2.0-rc.2",
"@storybook/addon-google-analytics": "6.2.0-rc.2",
"@storybook/addon-graphql": "6.2.0-rc.2",
"@storybook/addon-jest": "6.2.0-rc.2",
"@storybook/addon-knobs": "6.2.0-rc.2",
"@storybook/addon-links": "6.2.0-rc.2",
"@storybook/addon-queryparams": "6.2.0-rc.2",
"@storybook/addon-storyshots": "6.2.0-rc.2",
"@storybook/addon-storyshots-puppeteer": "6.2.0-rc.2",
"@storybook/addon-storysource": "6.2.0-rc.2",
"@storybook/addon-toolbars": "6.2.0-rc.2",
"@storybook/addon-viewport": "6.2.0-rc.2",
"@storybook/addons": "6.2.0-rc.2",
"@storybook/angular": "6.2.0-rc.2",
"@storybook/api": "6.2.0-rc.2",
"@storybook/aurelia": "6.2.0-rc.2",
"@storybook/builder-webpack4": "6.2.0-rc.2",
"@storybook/builder-webpack5": "6.2.0-rc.2",
"@storybook/channel-postmessage": "6.2.0-rc.2",
"@storybook/channel-websocket": "6.2.0-rc.2",
"@storybook/channels": "6.2.0-rc.2",
"@storybook/cli": "6.2.0-rc.2",
"@storybook/client-api": "6.2.0-rc.2",
"@storybook/client-logger": "6.2.0-rc.2",
"@storybook/codemod": "6.2.0-rc.2",
"@storybook/components": "6.2.0-rc.2",
"@storybook/core": "6.2.0-rc.2",
"@storybook/core-client": "6.2.0-rc.2",
"@storybook/core-common": "6.2.0-rc.2",
"@storybook/core-events": "6.2.0-rc.2",
"@storybook/core-server": "6.2.0-rc.2",
"@storybook/ember": "6.2.0-rc.2",
"@storybook/html": "6.2.0-rc.2",
"@storybook/marionette": "6.2.0-rc.2",
"@storybook/marko": "6.2.0-rc.2",
"@storybook/mithril": "6.2.0-rc.2",
"@storybook/node-logger": "6.2.0-rc.2",
"@storybook/postinstall": "6.2.0-rc.2",
"@storybook/preact": "6.2.0-rc.2",
"@storybook/rax": "6.2.0-rc.2",
"@storybook/react": "6.2.0-rc.2",
"@storybook/riot": "6.2.0-rc.2",
"@storybook/router": "6.2.0-rc.2",
"@storybook/server": "6.2.0-rc.2",
"@storybook/source-loader": "6.2.0-rc.2",
"@storybook/svelte": "6.2.0-rc.2",
"@storybook/theming": "6.2.0-rc.2",
"@storybook/ui": "6.2.0-rc.2",
"@storybook/vue": "6.2.0-rc.2",
"@storybook/vue3": "6.2.0-rc.2",
"@storybook/web-components": "6.2.0-rc.2"
"@storybook/addon-a11y": "6.2.0-rc.3",
"@storybook/addon-actions": "6.2.0-rc.3",
"@storybook/addon-backgrounds": "6.2.0-rc.3",
"@storybook/addon-controls": "6.2.0-rc.3",
"@storybook/addon-cssresources": "6.2.0-rc.3",
"@storybook/addon-design-assets": "6.2.0-rc.3",
"@storybook/addon-docs": "6.2.0-rc.3",
"@storybook/addon-essentials": "6.2.0-rc.3",
"@storybook/addon-events": "6.2.0-rc.3",
"@storybook/addon-google-analytics": "6.2.0-rc.3",
"@storybook/addon-graphql": "6.2.0-rc.3",
"@storybook/addon-jest": "6.2.0-rc.3",
"@storybook/addon-knobs": "6.2.0-rc.3",
"@storybook/addon-links": "6.2.0-rc.3",
"@storybook/addon-queryparams": "6.2.0-rc.3",
"@storybook/addon-storyshots": "6.2.0-rc.3",
"@storybook/addon-storyshots-puppeteer": "6.2.0-rc.3",
"@storybook/addon-storysource": "6.2.0-rc.3",
"@storybook/addon-toolbars": "6.2.0-rc.3",
"@storybook/addon-viewport": "6.2.0-rc.3",
"@storybook/addons": "6.2.0-rc.3",
"@storybook/angular": "6.2.0-rc.3",
"@storybook/api": "6.2.0-rc.3",
"@storybook/aurelia": "6.2.0-rc.3",
"@storybook/builder-webpack4": "6.2.0-rc.3",
"@storybook/builder-webpack5": "6.2.0-rc.3",
"@storybook/channel-postmessage": "6.2.0-rc.3",
"@storybook/channel-websocket": "6.2.0-rc.3",
"@storybook/channels": "6.2.0-rc.3",
"@storybook/cli": "6.2.0-rc.3",
"@storybook/client-api": "6.2.0-rc.3",
"@storybook/client-logger": "6.2.0-rc.3",
"@storybook/codemod": "6.2.0-rc.3",
"@storybook/components": "6.2.0-rc.3",
"@storybook/core": "6.2.0-rc.3",
"@storybook/core-client": "6.2.0-rc.3",
"@storybook/core-common": "6.2.0-rc.3",
"@storybook/core-events": "6.2.0-rc.3",
"@storybook/core-server": "6.2.0-rc.3",
"@storybook/ember": "6.2.0-rc.3",
"@storybook/html": "6.2.0-rc.3",
"@storybook/marionette": "6.2.0-rc.3",
"@storybook/marko": "6.2.0-rc.3",
"@storybook/mithril": "6.2.0-rc.3",
"@storybook/node-logger": "6.2.0-rc.3",
"@storybook/postinstall": "6.2.0-rc.3",
"@storybook/preact": "6.2.0-rc.3",
"@storybook/rax": "6.2.0-rc.3",
"@storybook/react": "6.2.0-rc.3",
"@storybook/riot": "6.2.0-rc.3",
"@storybook/router": "6.2.0-rc.3",
"@storybook/server": "6.2.0-rc.3",
"@storybook/source-loader": "6.2.0-rc.3",
"@storybook/svelte": "6.2.0-rc.3",
"@storybook/theming": "6.2.0-rc.3",
"@storybook/ui": "6.2.0-rc.3",
"@storybook/vue": "6.2.0-rc.3",
"@storybook/vue3": "6.2.0-rc.3",
"@storybook/web-components": "6.2.0-rc.3"
}

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

@ -90,11 +90,15 @@ export async function buildDevStandalone(options: CLIOptions & LoadOptions & Bui
}
if (options.smokeTest) {
const hasManagerWarnings = managerStats && managerStats.toJson().warnings.length > 0;
const managerWarnings = (managerStats && managerStats.toJson().warnings) || [];
if (managerWarnings.length > 0) logger.warn(`manager: ${managerWarnings}`);
// I'm a little reticent to import webpack types in this file :shrug:
// @ts-ignore
const hasPreviewWarnings = previewStats && previewStats.toJson().warnings.length > 0;
process.exit(hasManagerWarnings || (hasPreviewWarnings && !options.ignorePreview) ? 1 : 0);
const previewWarnings = (previewStats && previewStats.toJson().warnings) || [];
if (previewWarnings.length > 0) logger.warn(`preview: ${previewWarnings}`);
process.exit(
managerWarnings.length > 0 || (previewWarnings.length > 0 && !options.ignorePreview) ? 1 : 0
);
return;
}

2
lib/core-server/src/manager/manager-webpack.config.ts
View File

@ -149,7 +149,7 @@ export default async ({
resolve: {
extensions: ['.mjs', '.js', '.jsx', '.json', '.cjs', '.ts', '.tsx'],
modules: ['node_modules'].concat(envs.NODE_PATH || []),
mainFields: ['module', 'main'],
mainFields: ['browser', 'module', 'main'],
alias: {
...themingPaths,
...uiPaths,