feat: remove ff project_deploy_configuration_api_use_per_function_configuration_files (#1355)

Author: khendrikse

src/config.ts

@@ -5,7 +5,6 @@ import isPathInside from 'is-path-inside'
 // @ts-expect-error Typescript cannot find definition
 import mergeOptions from 'merge-options'
 
-import type { FeatureFlags } from './feature_flags.js'
 import { FunctionSource } from './function.js'
 import type { NodeBundlerType } from './runtimes/node/bundlers/types.js'
 import type { NodeVersionString } from './runtimes/node/index.js'
@@ -47,20 +46,16 @@ const getConfigForFunction = async ({
   config,
   configFileDirectories,
   func,
-  featureFlags,
 }: {
   config?: Config
   configFileDirectories?: string[]
   func: FunctionWithoutConfig
-  featureFlags: FeatureFlags
 }): Promise<FunctionConfig> => {
   const fromConfig = getFromMainConfig({ config, func })
 
   // We try to read from a function config file if the function directory is
   // inside one of `configFileDirectories`.
-  const shouldReadConfigFile =
-    featureFlags.project_deploy_configuration_api_use_per_function_configuration_files &&
-    configFileDirectories?.some((directory) => isPathInside(func.mainFile, directory))
+  const shouldReadConfigFile = configFileDirectories?.some((directory) => isPathInside(func.mainFile, directory))
 
   if (!shouldReadConfigFile) {
     return fromConfig

src/feature_flags.ts

@@ -18,9 +18,6 @@ export const defaultFlags: Record<string, boolean> = {
   // `.mjs` extension.
   zisi_pure_esm_mjs: false,
 
-  // Load configuration from per-function JSON files.
-  project_deploy_configuration_api_use_per_function_configuration_files: false,
-
   // Output CJS file extension
   zisi_output_cjs_extension: false,
 

src/runtimes/index.ts

@@ -120,7 +120,7 @@ export const getFunctionsFromPaths = async (
     }
   }, Promise.resolve({ functions: [], remainingPaths: paths } as { functions: FunctionTupleWithoutConfig[]; remainingPaths: string[] }))
   const functionConfigs = await Promise.all(
-    functions.map(([, func]) => getConfigForFunction({ config, configFileDirectories, func, featureFlags })),
+    functions.map(([, func]) => getConfigForFunction({ config, configFileDirectories, func })),
   )
   const functionsWithConfig: FunctionTuple[] = functions.map(([name, func], index) => [
     name,
@@ -150,7 +150,6 @@ export const getFunctionFromPath = async (
         config,
         configFileDirectories,
         func: { ...func, runtime },
-        featureFlags,
       })
 
       return {

tests/list_function.test.ts

@@ -26,9 +26,6 @@ describe('listFunction', () => {
     const mainFile = join(dir, 'simple.js')
     const func = await listFunction(mainFile, {
       configFileDirectories: [dir],
-      featureFlags: {
-        project_deploy_configuration_api_use_per_function_configuration_files: true,
-      },
     })
 
     expect(func).toEqual({

tests/list_functions.test.ts

@@ -91,9 +91,6 @@ describe('listFunctions', () => {
     const dir = join(FIXTURES_DIR, 'json-config/.netlify/functions-internal/')
     const [func] = await listFunctions([dir], {
       configFileDirectories: [dir],
-      featureFlags: {
-        project_deploy_configuration_api_use_per_function_configuration_files: true,
-      },
     })
 
     expect(func.displayName).toBe('A Display Name')

tests/list_functions_files.test.ts

@@ -256,9 +256,6 @@ describe('listFunctionsFiles', () => {
     const dir = join(FIXTURES_DIR, 'json-config/.netlify/functions-internal/')
     const [func] = await listFunctionsFiles([dir], {
       configFileDirectories: [dir],
-      featureFlags: {
-        project_deploy_configuration_api_use_per_function_configuration_files: true,
-      },
     })
 
     expect(func.displayName).toBe('A Display Name')

tests/main.test.ts

@@ -2301,7 +2301,6 @@ describe('zip-it-and-ship-it', () => {
       const opts = merge(options, {
         basePath: join(FIXTURES_DIR, fixtureName),
         configFileDirectories: [join(FIXTURES_DIR, pathInternal)],
-        featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
       })
       const { files, tmpDir } = await zipFixture([pathInternal, pathNotInternal, pathUser], {
         length: 4,
@@ -2359,7 +2358,6 @@ describe('zip-it-and-ship-it', () => {
         basePath: join(FIXTURES_DIR, fixtureName),
         manifest: manifestPath,
         configFileDirectories: [join(FIXTURES_DIR, pathInternal)],
-        featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
       })
       await zipFixture([pathInternal, pathNotInternal, pathUser], {
         length: 4,
@@ -2383,7 +2381,6 @@ describe('zip-it-and-ship-it', () => {
       const opts = merge(options, {
         basePath: join(FIXTURES_DIR, fixtureName),
         configFileDirectories: [join(FIXTURES_DIR, pathInternal)],
-        featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
         config: {
           'internal-function': {
             schedule: '@hourly',