Merge branch 'canary' into issues/54008-Nginx-decoded-URIs-breaks-slu…

…gs-client-side
vercel · Oct 2, 2023 · de8c7c7 · de8c7c7
2 parents 49c9869 + 98432a4
commit de8c7c7
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 33 deletions.
diff --git a/test/integration/config-mjs/next.config.mjs b/test/integration/config-mjs/next.config.mjs
@@ -13,13 +13,4 @@ export default {
   env: {
     customVar: 'hello',
   },
-  webpack(config, { buildId, webpack }) {
-    config.plugins.push(
-      new webpack.DefinePlugin({
-        'process.env.CONFIG_BUILD_ID': JSON.stringify(buildId),
-      })
-    )
-
-    return config
-  },
 }
diff --git a/test/integration/config-mjs/pages/build-id.js b/test/integration/config-mjs/pages/build-id.js
diff --git a/test/integration/config-mjs/test/index.test.js b/test/integration/config-mjs/test/index.test.js
@@ -28,7 +28,6 @@ describe('Configuration', () => {
     // pre-build all pages at the start
     await Promise.all([
       renderViaHTTP(context.appPort, '/next-config'),
-      renderViaHTTP(context.appPort, '/build-id'),
       renderViaHTTP(context.appPort, '/module-only-component'),
     ])
   })
@@ -58,11 +57,6 @@ describe('Configuration', () => {
     expect($('#server-and-client').text()).toBe('/static')
   })
 
-  test('renders the build id in development mode', async () => {
-    const $ = await get$('/build-id')
-    expect($('#buildId').text()).toBe('development')
-  })
-
   test('correctly imports a package that defines `module` but no `main` in package.json', async () => {
     const $ = await get$('/module-only-content')
     expect($('#messageInAPackage').text()).toBe('OK')

diff --git a/test/integration/config/next.config.js b/test/integration/config/next.config.js
@@ -13,13 +13,4 @@ module.exports = {
   env: {
     customVar: 'hello',
   },
-  webpack(config, { buildId, webpack }) {
-    config.plugins.push(
-      new webpack.DefinePlugin({
-        'process.env.CONFIG_BUILD_ID': JSON.stringify(buildId),
-      })
-    )
-
-    return config
-  },
 }
diff --git a/test/integration/config/test/index.test.js b/test/integration/config/test/index.test.js
@@ -28,7 +28,6 @@ describe('Configuration', () => {
     // pre-build all pages at the start
     await Promise.all([
       renderViaHTTP(context.appPort, '/next-config'),
-      renderViaHTTP(context.appPort, '/build-id'),
       renderViaHTTP(context.appPort, '/module-only-component'),
     ])
   })
@@ -58,11 +57,6 @@ describe('Configuration', () => {
     expect($('#server-and-client').text()).toBe('/static')
   })
 
-  test('renders the build id in development mode', async () => {
-    const $ = await get$('/build-id')
-    expect($('#buildId').text()).toBe('development')
-  })
-
   test('correctly imports a package that defines `module` but no `main` in package.json', async () => {
     const $ = await get$('/module-only-content')
     expect($('#messageInAPackage').text()).toBe('OK')