From c02a061ac7c282a459574d8cb70067bfcb3ab588 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Sun, 20 Nov 2022 21:55:16 -0500 Subject: [PATCH] Fallback for XSTORYBOOK_EXAMPLE_APP no longer needed --- code/lib/builder-vite/src/envs.ts | 28 ++++++++++---------------- code/lib/core-common/src/utils/envs.ts | 14 ++++--------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/code/lib/builder-vite/src/envs.ts b/code/lib/builder-vite/src/envs.ts index c7c067866fe..c6f37d011c2 100644 --- a/code/lib/builder-vite/src/envs.ts +++ b/code/lib/builder-vite/src/envs.ts @@ -19,24 +19,18 @@ const allowedEnvVariables = [ */ export function stringifyProcessEnvs(raw: Builder_EnvsRaw, envPrefix: UserConfig['envPrefix']) { const updatedRaw: Builder_EnvsRaw = {}; - const envs = Object.entries(raw).reduce( - (acc: Builder_EnvsRaw, [key, value]) => { - // Only add allowed values OR values from array OR string started with allowed prefixes - if ( - allowedEnvVariables.includes(key) || - (Array.isArray(envPrefix) && !!envPrefix.find((prefix) => key.startsWith(prefix))) || - (typeof envPrefix === 'string' && key.startsWith(envPrefix)) - ) { - acc[`import.meta.env.${key}`] = JSON.stringify(value); - updatedRaw[key] = value; - } - return acc; - }, - { - // Default fallback - 'process.env.XSTORYBOOK_EXAMPLE_APP': '""', + const envs = Object.entries(raw).reduce((acc: Builder_EnvsRaw, [key, value]) => { + // Only add allowed values OR values from array OR string started with allowed prefixes + if ( + allowedEnvVariables.includes(key) || + (Array.isArray(envPrefix) && !!envPrefix.find((prefix) => key.startsWith(prefix))) || + (typeof envPrefix === 'string' && key.startsWith(envPrefix)) + ) { + acc[`import.meta.env.${key}`] = JSON.stringify(value); + updatedRaw[key] = value; } - ); + return acc; + }, {}); return envs; } diff --git a/code/lib/core-common/src/utils/envs.ts b/code/lib/core-common/src/utils/envs.ts index d354a890fca..1fc6a5ac641 100644 --- a/code/lib/core-common/src/utils/envs.ts +++ b/code/lib/core-common/src/utils/envs.ts @@ -50,16 +50,10 @@ export const stringifyEnvs = (raw: Record): Record): Record => { - const envs = Object.entries(raw).reduce>( - (acc, [key, value]) => { - acc[`process.env.${key}`] = JSON.stringify(value); - return acc; - }, - { - // Default fallback - 'process.env.XSTORYBOOK_EXAMPLE_APP': '""', - } - ); + const envs = Object.entries(raw).reduce>((acc, [key, value]) => { + acc[`process.env.${key}`] = JSON.stringify(value); + return acc; + }, {}); // FIXME: something like this is necessary to support destructuring like: // // const { foo } = process.env;