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

Merge pull request #15925 from vdh/fix-define-plugin

Browse Source 
Core: Replaced `process.env` override in `DefinePlugin` config
This commit is contained in:
Michael Shilman 2021-09-07 17:49:31 +08:00 committed by GitHub
commit 06450c4f10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/vue-kitchen-sink/webpack.config.js
View File

@ -85,9 +85,7 @@ if (process.env.NODE_ENV === 'production') {
// http://vue-loader.vuejs.org/en/workflow/production.html
module.exports.plugins = (module.exports.plugins || []).concat([
new webpack.DefinePlugin({
'process.env': {
NODE_ENV: '"production"',
},
'process.env.NODE_ENV': '"production"',
}),
new webpack.optimize.UglifyJsPlugin({
sourceMap: true,

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

@ -18,7 +18,7 @@ import themingPaths from '@storybook/theming/paths';
import {
toRequireContextString,
stringifyEnvs,
stringifyProcessEnvs,
es6Transpiler,
interpolate,
nodeModulesPaths,
@ -178,7 +178,7 @@ export default async ({
template,
}),
new DefinePlugin({
'process.env': stringifyEnvs(envs),
...stringifyProcessEnvs(envs),
NODE_ENV: JSON.stringify(envs.NODE_ENV),
}),
isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths),

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

@ -14,7 +14,7 @@ import themingPaths from '@storybook/theming/paths';
import {
toRequireContextString,
es6Transpiler,
stringifyEnvs,
stringifyProcessEnvs,
nodeModulesPaths,
interpolate,
Options,
@ -178,7 +178,7 @@ export default async ({
template,
}),
new DefinePlugin({
'process.env': stringifyEnvs(envs),
...stringifyProcessEnvs(envs),
NODE_ENV: JSON.stringify(process.env.NODE_ENV),
}),
isProd ? null : new WatchMissingNodeModulesPlugin(nodeModulesPaths),

13
lib/core-common/src/utils/envs.ts
View File

@ -42,8 +42,21 @@ export function loadEnvs(
};
}
/** @deprecated use `stringifyProcessEnvs` */
export const stringifyEnvs = (raw: Record<string, string>): Record<string, string> =>
Object.entries(raw).reduce<Record<string, string>>((acc, [key, value]) => {
acc[key] = JSON.stringify(value);
return acc;
}, {});
export const stringifyProcessEnvs = (raw: Record<string, string>): Record<string, string> =>
Object.entries(raw).reduce<Record<string, string>>(
(acc, [key, value]) => {
acc[`process.env.${key}`] = JSON.stringify(value);
return acc;
},
{
// Default fallback
'process.env.XSTORYBOOK_EXAMPLE_APP': '""',
}
);

4
lib/manager-webpack4/src/presets/manager-preset.ts
View File

@ -15,7 +15,7 @@ import readPackage from 'read-pkg-up';
import {
loadManagerOrAddonsFile,
resolvePathInStorybookCache,
stringifyEnvs,
stringifyProcessEnvs,
es6Transpiler,
getManagerHeadTemplate,
getManagerMainTemplate,
@ -113,7 +113,7 @@ export async function managerWebpack(
(new Dotenv({ silent: true }) as any) as WebpackPluginInstance,
// graphql sources check process variable
new DefinePlugin({
'process.env': stringifyEnvs(envs),
...stringifyProcessEnvs(envs),
NODE_ENV: JSON.stringify(envs.NODE_ENV),
}) as WebpackPluginInstance,
// isProd &&

4
lib/manager-webpack5/src/presets/manager-preset.ts
View File

@ -14,7 +14,7 @@ import readPackage from 'read-pkg-up';
import {
loadManagerOrAddonsFile,
resolvePathInStorybookCache,
stringifyEnvs,
stringifyProcessEnvs,
es6Transpiler,
getManagerHeadTemplate,
getManagerMainTemplate,
@ -113,7 +113,7 @@ export async function managerWebpack(
hasDotenv() ? new Dotenv({ silent: true }) : null,
// graphql sources check process variable
new DefinePlugin({
'process.env': stringifyEnvs(envs),
...stringifyProcessEnvs(envs),
NODE_ENV: JSON.stringify(envs.NODE_ENV),
}) as WebpackPluginInstance,
// isProd &&