Merge pull request #425 from netlify/fix/remove-feature-flag

Author: ehmicky

src/all.js

@@ -11,26 +11,19 @@ export const parseAllRedirects = async function ({
   netlifyConfigPath,
   configRedirects = [],
   minimal = false,
-  featureFlags = {},
 }) {
   const [
     { redirects: fileRedirects, errors: fileParseErrors },
     { redirects: parsedConfigRedirects, errors: configParseErrors },
-  ] = await Promise.all([getFileRedirects(redirectsFiles, featureFlags), getConfigRedirects(netlifyConfigPath)])
-  const { redirects: normalizedFileRedirects, errors: fileNormalizeErrors } = normalizeRedirects(
-    fileRedirects,
-    minimal,
-    featureFlags,
-  )
+  ] = await Promise.all([getFileRedirects(redirectsFiles), getConfigRedirects(netlifyConfigPath)])
+  const { redirects: normalizedFileRedirects, errors: fileNormalizeErrors } = normalizeRedirects(fileRedirects, minimal)
   const { redirects: normalizedParsedConfigRedirects, errors: parsedConfigNormalizeErrors } = normalizeRedirects(
     parsedConfigRedirects,
     minimal,
-    featureFlags,
   )
   const { redirects: normalizedConfigRedirects, errors: configNormalizeErrors } = normalizeRedirects(
     configRedirects,
     minimal,
-    featureFlags,
   )
   const { redirects, errors: mergeErrors } = mergeRedirects({
     fileRedirects: normalizedFileRedirects,
@@ -47,10 +40,8 @@ export const parseAllRedirects = async function ({
   return { redirects, errors }
 }
 
-const getFileRedirects = async function (redirectsFiles, featureFlags) {
-  const resultsArrays = await Promise.all(
-    redirectsFiles.map((redirectFile) => parseFileRedirects(redirectFile, featureFlags)),
-  )
+const getFileRedirects = async function (redirectsFiles) {
+  const resultsArrays = await Promise.all(redirectsFiles.map((redirectFile) => parseFileRedirects(redirectFile)))
   return concatResults(resultsArrays)
 }
 

src/line_parser.js

@@ -24,12 +24,12 @@ import { isUrl } from './url.js'
 //     - "Sign" is a special condition
 // Unlike "redirects" in "netlify.toml", the "headers" and "edge_handlers"
 // cannot be specified.
-export const parseFileRedirects = async function (redirectFile, featureFlags) {
-  const results = await parseRedirects(redirectFile, featureFlags)
+export const parseFileRedirects = async function (redirectFile) {
+  const results = await parseRedirects(redirectFile)
   return splitResults(results)
 }
 
-const parseRedirects = async function (redirectFile, featureFlags) {
+const parseRedirects = async function (redirectFile) {
   if (!(await pathExists(redirectFile))) {
     return []
   }
@@ -42,7 +42,7 @@ const parseRedirects = async function (redirectFile, featureFlags) {
     .split('\n')
     .map(normalizeLine)
     .filter(hasRedirect)
-    .map((redirectLine) => parseRedirect(redirectLine, featureFlags))
+    .map((redirectLine) => parseRedirect(redirectLine))
 }
 
 const readRedirectFile = async function (redirectFile) {
@@ -61,9 +61,9 @@ const hasRedirect = function ({ line }) {
   return line !== '' && !isComment(line)
 }
 
-const parseRedirect = function ({ line, index }, featureFlags) {
+const parseRedirect = function ({ line, index }) {
   try {
-    return parseRedirectLine(line, featureFlags)
+    return parseRedirectLine(line)
   } catch (error) {
     return new Error(`Could not parse redirect line ${index + 1}:
   ${line}
@@ -72,7 +72,7 @@ ${error.message}`)
 }
 
 // Parse a single redirect line
-const parseRedirectLine = function (line, featureFlags) {
+const parseRedirectLine = function (line) {
   const [from, ...parts] = trimComment(line.split(LINE_TOKENS_REGEXP))
 
   if (parts.length === 0) {
@@ -86,7 +86,7 @@ const parseRedirectLine = function (line, featureFlags) {
   } = parseParts(from, parts)
 
   const query = parsePairs(queryParts)
-  const { status, force } = parseStatus(statusPart, featureFlags)
+  const { status, force } = parseStatus(statusPart)
   const { Sign, signed = Sign, ...conditions } = parsePairs(conditionsParts)
   return { from, query, to, status, force, conditions, signed }
 }
@@ -129,14 +129,14 @@ const isToPart = function (part) {
 }
 
 // Parse the `status` part
-const parseStatus = function (statusPart, featureFlags) {
+const parseStatus = function (statusPart) {
   if (statusPart === undefined) {
     return {}
   }
 
   const status = transtypeStatusCode(statusPart)
 
-  if (featureFlags.redirects_parser_normalize_status && !isValidStatusCode(status)) {
+  if (!isValidStatusCode(status)) {
     return { status: statusPart, force: false }
   }
 

src/normalize.js

@@ -9,23 +9,23 @@ import { isUrl } from './url.js'
 // Validate and normalize an array of `redirects` objects.
 // This step is performed after `redirects` have been parsed from either
 // `netlify.toml` or `_redirects`.
-export const normalizeRedirects = function (redirects, minimal, featureFlags) {
+export const normalizeRedirects = function (redirects, minimal) {
   if (!Array.isArray(redirects)) {
     const error = new TypeError(`Redirects must be an array not: ${redirects}`)
     return splitResults([error])
   }
 
-  const results = redirects.map((obj, index) => parseRedirect(obj, index, minimal, featureFlags))
+  const results = redirects.map((obj, index) => parseRedirect(obj, index, minimal))
   return splitResults(results)
 }
 
-const parseRedirect = function (obj, index, minimal, featureFlags) {
+const parseRedirect = function (obj, index, minimal) {
   if (!isPlainObj(obj)) {
     return new TypeError(`Redirects must be objects not: ${obj}`)
   }
 
   try {
-    return parseRedirectObject(obj, minimal, featureFlags)
+    return parseRedirectObject(obj, minimal)
   } catch (error) {
     return new Error(`Could not parse redirect number ${index + 1}:
   ${JSON.stringify(obj)}
@@ -56,7 +56,6 @@ const parseRedirectObject = function (
     headers = {},
   },
   minimal,
-  featureFlags,
 ) {
   if (from === undefined) {
     throw new Error('Missing "from" field')
@@ -66,7 +65,7 @@ const parseRedirectObject = function (
     throw new Error('"headers" field must be an object')
   }
 
-  const statusA = featureFlags.redirects_parser_normalize_status ? normalizeStatus(status) : status
+  const statusA = normalizeStatus(status)
   const finalTo = addForwardRule(from, statusA, to)
   const { scheme, host, path } = parseFrom(from)
   const proxy = isProxy(statusA, finalTo)

tests/helpers/main.js

@@ -26,7 +26,6 @@ const parseRedirects = async function ({ redirectsFiles, netlifyConfigPath, conf
     ...(netlifyConfigPath && { netlifyConfigPath: addConfigFixtureDir(netlifyConfigPath) }),
     configRedirects,
     minimal,
-    featureFlags: { redirects_parser_normalize_status: true },
   })
 }