Merge branch 'canary' into react-18-rc2

vercel · Mar 9, 2022 · 2a5a0b0 · 2a5a0b0
2 parents 115fec5 + 81276e2
commit 2a5a0b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -44,7 +44,6 @@ import { regexLikeCss } from './webpack/config/blocks/css'
 import { CopyFilePlugin } from './webpack/plugins/copy-file-plugin'
 import { FlightManifestPlugin } from './webpack/plugins/flight-manifest-plugin'
 import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin'
-import FunctionsManifestPlugin from './webpack/plugins/functions-manifest-plugin'
 import type { Span } from '../trace'
 import { getRawPageExtensions } from './utils'
 import browserslist from 'next/dist/compiled/browserslist'
@@ -1446,14 +1445,6 @@ export default async function getBaseWebpackConfig(
       // replacement is done before its process.env.* handling
       (!isServer || isEdgeRuntime) &&
         new MiddlewarePlugin({ dev, isEdgeRuntime }),
-      process.env.ENABLE_FILE_SYSTEM_API === '1' &&
-        isEdgeRuntime &&
-        new FunctionsManifestPlugin({
-          dev,
-          pagesDir,
-          isEdgeRuntime,
-          pageExtensions: config.pageExtensions,
-        }),
       !isServer &&
         new BuildManifestPlugin({
           buildId,

diff --git a/packages/next/build/webpack/plugins/functions-manifest-plugin.ts b/packages/next/build/webpack/plugins/functions-manifest-plugin.ts
@@ -1,3 +1,5 @@
+// TODO: rewrite against the stable edge functions standard
+
 import { relative } from 'path'
 import { sources, webpack5 } from 'next/dist/compiled/webpack/webpack'
 import { normalizePagePath } from '../../../server/normalize-page-path'

diff --git a/test/integration/react-streaming-and-server-components/test/index.test.js b/test/integration/react-streaming-and-server-components/test/index.test.js
@@ -24,7 +24,6 @@ import css from './css'
 import rsc from './rsc'
 import streaming from './streaming'
 import basic from './basic'
-import functions from './functions'
 import runtime from './runtime'
 
 const documentWithGip = `
@@ -279,8 +278,6 @@ runSuite('CSS', 'prod', cssSuite)
 runSuite('Custom Document', 'dev', documentSuite)
 runSuite('Custom Document', 'prod', documentSuite)
 
-runSuite('Functions manifest', 'build', { runTests: functions })
-
 function runSuite(suiteName, env, options) {
   const context = { appDir, distDir }
   describe(`${suiteName} ${env}`, () => {