chore: use destr for env var flags

Author: ascorbic

package-lock.json

@@ -15,6 +15,7 @@
     "@netlify/ipx": "^1.2.5",
     "@vercel/node-bridge": "^2.1.0",
     "chalk": "^4.1.2",
+    "destr": "^1.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^10.0.0",
     "globby": "^11.0.4",
@@ -63,4 +64,4 @@
   "engines": {
     "node": ">=12.0.0"
   }
-}
+}

packages/runtime/package.json

@@ -4,6 +4,7 @@ import { resolve, join } from 'path'
 
 import type { NetlifyConfig, NetlifyPluginConstants } from '@netlify/build'
 import { greenBright } from 'chalk'
+import destr from 'destr'
 import { copy, copyFile, emptyDir, ensureDir, readJSON, readJson, writeJSON, writeJson } from 'fs-extra'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin'
 import type { RouteHas } from 'next/dist/lib/load-custom-routes'
@@ -206,12 +207,7 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
   await copy(getEdgeTemplatePath('../edge-shared'), join(edgeFunctionRoot, 'edge-shared'))
   await writeJSON(join(edgeFunctionRoot, 'edge-shared', 'nextConfig.json'), nextConfig)
 
-  if (
-    process.env.NEXT_DISABLE_EDGE_IMAGES !== '1' &&
-    process.env.NEXT_DISABLE_EDGE_IMAGES !== 'true' &&
-    process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' &&
-    process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1'
-  ) {
+  if (!destr(process.env.NEXT_DISABLE_EDGE_IMAGES) && !destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
     console.log(
       'Using Netlify Edge Functions for image format detection. Set env var "NEXT_DISABLE_EDGE_IMAGES=true" to disable.',
     )
@@ -227,7 +223,7 @@ export const writeEdgeFunctions = async (netlifyConfig: NetlifyConfig) => {
       path: '/_next/image*',
     })
   }
-  if (process.env.NEXT_DISABLE_NETLIFY_EDGE !== 'true' && process.env.NEXT_DISABLE_NETLIFY_EDGE !== '1') {
+  if (!destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)) {
     const middlewareManifest = await loadMiddlewareManifest(netlifyConfig)
     if (!middlewareManifest) {
       console.error("Couldn't find the middleware manifest")

packages/runtime/src/helpers/edge.ts

@@ -3,6 +3,7 @@ import { join, relative } from 'path'
 
 import type { NetlifyPlugin } from '@netlify/build'
 import { bold, redBright } from 'chalk'
+import destr from 'destr'
 import { existsSync, readFileSync } from 'fs-extra'
 import { outdent } from 'outdent'
 
@@ -86,7 +87,7 @@ const plugin: NetlifyPlugin = {
     if (
       middlewareManifest?.functions &&
       Object.keys(middlewareManifest.functions).length !== 0 &&
-      process.env.NEXT_DISABLE_NETLIFY_EDGE
+      destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)
     ) {
       failBuild(outdent`
         You are using Next.js experimental edge runtime, but have set NEXT_DISABLE_NETLIFY_EDGE to true. This is not supported.
@@ -97,7 +98,7 @@ const plugin: NetlifyPlugin = {
     if (
       middlewareManifest?.middleware &&
       Object.keys(middlewareManifest.middleware).length !== 0 &&
-      process.env.NEXT_DISABLE_NETLIFY_EDGE
+      destr(process.env.NEXT_DISABLE_NETLIFY_EDGE)
     ) {
       console.log(
         redBright(outdent`
@@ -149,7 +150,7 @@ const plugin: NetlifyPlugin = {
 
     await patchNextFiles(basePath)
 
-    if (!process.env.SERVE_STATIC_FILES_FROM_ORIGIN) {
+    if (!destr(process.env.SERVE_STATIC_FILES_FROM_ORIGIN)) {
       await moveStaticPages({ target, netlifyConfig, i18n, basePath })
     }