Merge pull request #20606 from storybookjs/cli-repro-envs

fix: cli repros creation not working on windows
storybookjs · Jan 13, 2023 · dd78738 · dd78738
2 parents 94bdf09 + e9b0fa1
commit dd78738
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/code/lib/cli/src/repro-generators/configs.ts b/code/lib/cli/src/repro-generators/configs.ts
@@ -23,6 +23,8 @@ export interface Parameters {
   typescript?: boolean;
   /** Merge configurations to main.js before running the tests */
   mainOverrides?: Partial<StorybookConfig> & Record<string, any>;
+  /** Environment variables to inject while running generator */
+  envs?: Record<string, string>;
 }
 
 const fromDeps = (...args: string[]): string =>
@@ -45,11 +47,12 @@ export const cra: Parameters = {
   version: 'latest',
   generator: [
     // Force npm otherwise we have a mess between Yarn 1, Yarn 2 and NPM
-    'npm_config_user_agent=npm npx -p create-react-app@{{version}} create-react-app {{appName}}',
+    'npx -p create-react-app@{{version}} create-react-app {{appName}}',
     'cd {{appName}}',
     'echo "FAST_REFRESH=true" > .env',
     'echo "SKIP_PREFLIGHT_CHECK=true" > .env',
   ].join(' && '),
+  envs: { npm_config_user_agent: 'npm' },
 };
 
 export const cra_typescript: Parameters = {
@@ -58,8 +61,9 @@ export const cra_typescript: Parameters = {
   version: 'latest',
   generator: [
     // Force npm otherwise we have a mess between Yarn 1, Yarn 2 and NPM
-    'npm_config_user_agent=npm npx -p create-react-app@{{version}} create-react-app {{appName}} --template typescript',
+    'npx -p create-react-app@{{version}} create-react-app {{appName}} --template typescript',
   ].join(' && '),
+  envs: { npm_config_user_agent: 'npm' },
 };
 
 export const react: Parameters = {

diff --git a/code/lib/cli/src/repro-generators/scripts.ts b/code/lib/cli/src/repro-generators/scripts.ts
@@ -31,6 +31,8 @@ export interface Parameters {
   }[];
   /** Add typescript dependency and creates a tsconfig.json file */
   typescript?: boolean;
+  /** Environment variables to inject while running generator */
+  envs?: Record<string, string>;
 }
 
 interface Configuration {
@@ -165,13 +167,13 @@ const configureYarn2ForE2E = async ({ cwd }: Options) => {
   );
 };
 
-const generate = async ({ cwd, name, appName, version, generator }: Options) => {
+const generate = async ({ cwd, name, appName, version, generator, envs }: Options) => {
   // eslint-disable-next-line @typescript-eslint/no-shadow
   const command = generator.replace(/{{appName}}/g, appName).replace(/{{version}}/g, version);
 
   await exec(
     command,
-    { cwd },
+    { cwd, env: { ...process.env, ...envs } },
     {
       startMessage: `🏗 Bootstrapping ${name} project (this might take a few minutes)`,
       errorMessage: `🚨 Bootstrapping ${name} failed`,