feat: Introduces JSON type to non-public env variables (#757)

* Introduces JSON type to non-public env * Uses json(...) as the directive * Uses dotenv-expand for var interpolation --------- Co-authored-by: Craig Slusher <[email protected]> Co-authored-by: L <[email protected]>
PlasmoHQ · Sep 8, 2023 · 377e0ab · 377e0ab
1 parent a124a2b
commit 377e0ab
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/cli/plasmo/src/features/env/env-config.ts b/cli/plasmo/src/features/env/env-config.ts
@@ -51,20 +51,25 @@ function cascadeEnv(loadedEnvFiles: LoadedEnvFiles) {
     try {
       envFileSet.add(name)
       const result = dotenvExpand({
+        ignoreProcessEnv: true,
         parsed: dotenv.parse(contents)
       })
 
       if (!!result.parsed) {
         vLog(`Loaded env from ${name}`)
         const resultData = result.parsed || {}
 
-        for (const envKey of Object.keys(resultData)) {
+        for (const [envKey, envValue] of Object.entries(resultData)) {
           if (typeof parsed[envKey] === "undefined") {
-            parsed[envKey] = resultData[envKey]
+            try {
+              parsed[envKey] = maybeParseJSON(envValue)
+            } catch (ex) {
+              eLog(`Failed to parse JSON directive ${envKey} in ${name}:`, ex.message)
+            }
 
             // Pass through internal env variables
             if (envKey.startsWith(INTERNAL_ENV_PREFIX)) {
-              process.env[envKey] = resultData[envKey]
+              process.env[envKey] = envValue
             }
           }
         }
@@ -77,6 +82,13 @@ function cascadeEnv(loadedEnvFiles: LoadedEnvFiles) {
   return parsed
 }
 
+const JSON_DIRECTIVE_RE = /^\s*json\((.+)\)\s*$/si
+
+function maybeParseJSON(value: string): any {
+  const match = value.match(JSON_DIRECTIVE_RE)
+  return match ? JSON.parse(match[1]) : value
+}
+
 export const getEnvFileNames = () => {
   const nodeEnv = process.env.NODE_ENV
   const flagMap = getFlagMap()