[legacy-framework] Load env variables based on APP_ENV or -e flag

nextjs/packages/next-env/index.ts

@@ -78,7 +78,10 @@ export function loadEnvConfig(
   if (combinedEnv) return { combinedEnv, loadedEnvFiles: cachedLoadedEnvFiles }
 
   const isTest = process.env.NODE_ENV === 'test'
-  const mode = isTest ? 'test' : dev ? 'development' : 'production'
+  let mode = isTest ? 'test' : dev ? 'development' : 'production'
+  if (process.env.APP_ENV) {
+    mode = process.env.APP_ENV
+  }
   const dotenvFiles = [
     `.env.${mode}.local`,
     // Don't include `.env.local` for `test` environment
@@ -106,7 +109,7 @@ export function loadEnvConfig(
         path: envFile,
         contents,
       })
-    } catch (err) {
+    } catch (err: any) {
       if (err.code !== 'ENOENT') {
         log.error(`Failed to load env from ${envFile}`, err)
       }

nextjs/packages/next-env/package.json

@@ -1,7 +1,6 @@
 {
-  "private": true,
   "name": "@next/env",
-  "version": "11.1.0",
+  "version": "0.41.2-canary.4",
   "keywords": [
     "react",
     "next",

nextjs/packages/next/package.json

@@ -74,7 +74,7 @@
     "@babel/helper-module-imports": "^7.0.0",
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.1.0",
+    "@next/env": "0.41.2-canary.4",
     "@next/polyfill-module": "11.1.0",
     "@next/react-dev-overlay": "11.1.0",
     "@next/react-refresh-utils": "11.1.0",

package.json

@@ -8,6 +8,7 @@
       "nextjs/packages/next-mdx",
       "nextjs/packages/eslint-config-next",
       "nextjs/packages/eslint-plugin-next",
+      "nextjs/packages/next-env",
       "examples/*",
       "recipes/*"
     ],
@@ -28,14 +29,16 @@
     "wait:nextjs": "wait-on -d 1000 nextjs/packages/next/dist/build/index.js",
     "wait:nextjs-types": "wait-on -d 1000 nextjs/packages/next/dist/build/index.d.ts",
     "dev:nextjs": "yarn workspace next dev",
+    "dev:next-env": "yarn workspace @next/env dev",
     "dev:nextjs-types": "yarn wait:nextjs && yarn workspace next types && echo 'Finished building nextjs types'",
     "dev:blitz": "cross-env BLITZ_PROD_BUILD=true preconstruct watch",
     "dev:tsc": "yarn dev:nextjs-types && tsc --watch --pretty --preserveWatchOutput",
     "dev:cli": "yarn wait:nextjs-types && yarn workspace @blitzjs/cli dev",
     "dev:templates": "yarn workspace @blitzjs/generator dev",
-    "dev": "concurrently --names \"nextjs,blitz,typecheck,cli,templates\" -c \"magenta,cyan,green,yellow,black\" -p \"{name}\" \"npm:dev:nextjs\" \"npm:dev:blitz\" \"npm:dev:tsc\" \"npm:dev:cli\" \"npm:dev:templates\"",
+    "dev": "concurrently --names \"nextjs,blitz,typecheck,cli,templates,next-env\" -c \"magenta,cyan,green,yellow,black,blue\" -p \"{name}\" \"npm:dev:nextjs\" \"npm:dev:blitz\" \"npm:dev:tsc\" \"npm:dev:cli\" \"npm:dev:templates\" \"npm:dev:next-env\"",
     "build:nextjs": "yarn workspace next prepublish",
-    "build": "yarn build:nextjs && cross-env BLITZ_PROD_BUILD=true preconstruct build && ultra -r --filter \"packages/*\" buildpkg && tsc",
+    "build:next-env": "yarn workspace @next/env prepublish",
+    "build": "yarn build:nextjs && yarn build:next-env && cross-env BLITZ_PROD_BUILD=true preconstruct build && ultra -r --filter \"packages/*\" buildpkg && tsc",
     "lint": "eslint --ext \".js,.ts,.tsx\" .",
     "link-cli": "yarn workspace blitz link",
     "unlink-cli": "yarn workspace blitz unlink",

packages/blitz/src/cli.ts

@@ -33,6 +33,10 @@ async function main() {
 
   const cli = require(cliPkgPath)
 
+  if (options.e || options.env) {
+    process.env.APP_ENV = options.e || options.env
+  }
+
   const hasVersionFlag = options._.length === 0 && (options.v || options.version)
   const hasVerboseFlag = options._.length === 0 && (options.V || options.verbose)
 

packages/cli/src/commands/build.ts

@@ -7,6 +7,10 @@ export class Build extends Command {
 
   static flags = {
     help: flags.help({char: "h"}),
+    env: flags.string({
+      char: "e",
+      description: "Set app environment name",
+    }),
   }
 
   async run() {

packages/cli/src/commands/console.ts

@@ -14,6 +14,10 @@ export class Console extends Command {
 
   static flags = {
     help: flags.help({char: "h"}),
+    env: flags.string({
+      char: "e",
+      description: "Set app environment name",
+    }),
   }
 
   async run() {

packages/cli/src/commands/dev.ts

@@ -21,6 +21,10 @@ export class Dev extends Command {
     "no-incremental-build": flags.boolean({
       description: "Disable incremental build and start from a fresh cache",
     }),
+    env: flags.string({
+      char: "e",
+      description: "Set app environment name",
+    }),
   }
 
   async run() {

packages/cli/src/commands/export.ts

@@ -11,6 +11,10 @@ export class Export extends Command {
       char: "o",
       description: "set the output dir (defaults to 'out')",
     }),
+    env: flags.string({
+      char: "e",
+      description: "Set app environment name",
+    }),
   }
 
   async run() {

packages/cli/src/commands/start.ts

@@ -18,6 +18,10 @@ export class Start extends Command {
     inspect: flags.boolean({
       description: "Enable the Node.js inspector",
     }),
+    env: flags.string({
+      char: "e",
+      description: "Set app environment name",
+    }),
   }
 
   async run() {

yarn.lock

@@ -2958,11 +2958,6 @@
   dependencies:
     webpack-bundle-analyzer "4.3.0"
 
-"@next/[email protected]":
-  version "11.1.0"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-11.1.0.tgz#cae83d8e0a65aa9f2af3368f8269ffd9d911746a"
-  integrity sha512-zPJkMFRenSf7BLlVee8987G0qQXAhxy7k+Lb/5hLAGkPVHAHm+oFFeL+2ipbI2KTEFlazdmGY0M+AlLQn7pWaw==
-
 "@next/[email protected]":
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-11.1.0.tgz#ee6b9117a1f9bb137479dfa51d5a9e38e066a62f"
@@ -4395,6 +4390,13 @@
   resolved "https://registry.yarnpkg.com/@types/dotenv-flow/-/dotenv-flow-3.1.0.tgz#e9ba53f95f3d40bbc0df99b206f649b2acfca0c6"
   integrity sha512-qaWT42KDePdAGZFryYoV7EZnuuYZAO4KPVDWUV9OBOyJx7xCgKKERtVB7jBCM2mtKVI+OMMDK2ef11PWcHJz3g==
 
+"@types/[email protected]":
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/@types/dotenv/-/dotenv-8.2.0.tgz#5cd64710c3c98e82d9d15844375a33bf1b45d053"
+  integrity sha512-ylSC9GhfRH7m1EUXBXofhgx4lUWmFeQDINW5oLuS+gxWdfUeW4zJdeVTYVkexEW+e2VUvlZR2kGnGGipAWR7kw==
+  dependencies:
+    dotenv "*"
+
 "@types/duplexify@*":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/@types/duplexify/-/duplexify-3.6.0.tgz#dfc82b64bd3a2168f5bd26444af165bf0237dcd8"
@@ -5627,6 +5629,11 @@
     async-retry "1.2.3"
     lru-cache "5.1.1"
 
+"@zeit/[email protected]":
+  version "0.20.4"
+  resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9"
+  integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA==
+
 "@zeit/[email protected]":
   version "1.0.2-canary.2"
   resolved "https://registry.yarnpkg.com/@zeit/next-css/-/next-css-1.0.2-canary.2.tgz#0eeb877e7469892b65471c1ec7c14346b8f240df"
@@ -9706,7 +9713,12 @@ dotenv-flow@^3.2.0:
   dependencies:
     dotenv "^8.0.0"
 
-dotenv@^8.0.0, dotenv@^8.2.0:
+dotenv@*:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81"
+  integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==
+
+[email protected], dotenv@^8.0.0, dotenv@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
   integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==