Revert "Merge e2e test node_modules (#40926)" (#40974)

This reverts commit b508fef. Fixes: https://github.com/vercel/next.js/actions/runs/3139454323/jobs/5100342131 We aren't able to modify the filesystem for E2E deployments so this reverts the change introduced in the above PR to ensure deployment tests are able to run correctly with custom `node_modules`.
vercel · Sep 28, 2022 · 070239e · 070239e
1 parent 91f0a7c
commit 070239e
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 51 deletions.
diff --git a/packages/next/server/config-schema.ts b/packages/next/server/config-schema.ts
@@ -240,12 +240,6 @@ const configSchema = {
         appDir: {
           type: 'boolean',
         },
-        optoutServerComponentsBundle: {
-          items: {
-            type: 'string',
-          },
-          type: 'array',
-        },
         browsersListForSwc: {
           type: 'boolean',
         },
@@ -326,6 +320,12 @@ const configSchema = {
         optimisticClientCache: {
           type: 'boolean',
         },
+        optoutServerComponentsBundle: {
+          items: {
+            type: 'string',
+          },
+          type: 'array',
+        },
         outputFileTracingRoot: {
           minLength: 1,
           type: 'string',

diff --git a/run-tests.js b/run-tests.js
@@ -223,10 +223,8 @@ async function main() {
     console.log('Creating Next.js install for isolated tests')
     const reactVersion = process.env.NEXT_TEST_REACT_VERSION || 'latest'
     const testStarter = await createNextInstall({
-      dependencies: {
-        react: reactVersion,
-        'react-dom': reactVersion,
-      },
+      react: reactVersion,
+      'react-dom': reactVersion,
     })
     process.env.NEXT_TEST_STARTER = testStarter
   }

diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic.test.ts
@@ -38,14 +38,15 @@ describe('app dir - react server components', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, './rsc-basic')),
       dependencies: {
-        'styled-components': '6.0.0-beta.2',
+        'styled-components': '6.0.0-alpha.5',
         react: 'experimental',
         'react-dom': 'experimental',
       },
       packageJson: {
         scripts: {
-          build: 'next build',
-          dev: 'next dev',
+          setup: `cp -r ./node_modules_bak/* ./node_modules`,
+          build: 'yarn setup && next build',
+          dev: 'yarn setup && next dev',
           start: 'next start',
         },
       },

diff --git a/...dules/conditional-exports-optout/index.js → ...s_bak/conditional-exports-optout/index.js b/...dules/conditional-exports-optout/index.js → ...s_bak/conditional-exports-optout/index.js
diff --git a/...onditional-exports-optout/index.server.js → ...onditional-exports-optout/index.server.js b/...onditional-exports-optout/index.server.js → ...onditional-exports-optout/index.server.js
diff --git a/...s/conditional-exports-optout/package.json → ...k/conditional-exports-optout/package.json b/...s/conditional-exports-optout/package.json → ...k/conditional-exports-optout/package.json
diff --git a/...les/conditional-exports-optout/subpath.js → ...bak/conditional-exports-optout/subpath.js b/...les/conditional-exports-optout/subpath.js → ...bak/conditional-exports-optout/subpath.js
diff --git a/...ditional-exports-optout/subpath.server.js → ...ditional-exports-optout/subpath.server.js b/...ditional-exports-optout/subpath.server.js → ...ditional-exports-optout/subpath.server.js
diff --git a/...node_modules/conditional-exports/index.js → ..._modules_bak/conditional-exports/index.js b/...node_modules/conditional-exports/index.js → ..._modules_bak/conditional-exports/index.js
diff --git a/...dules/conditional-exports/index.server.js → ...s_bak/conditional-exports/index.server.js b/...dules/conditional-exports/index.server.js → ...s_bak/conditional-exports/index.server.js
diff --git a/..._modules/conditional-exports/package.json → ...ules_bak/conditional-exports/package.json b/..._modules/conditional-exports/package.json → ...ules_bak/conditional-exports/package.json
diff --git a/...de_modules/conditional-exports/subpath.js → ...odules_bak/conditional-exports/subpath.js b/...de_modules/conditional-exports/subpath.js → ...odules_bak/conditional-exports/subpath.js
diff --git a/...les/conditional-exports/subpath.server.js → ...bak/conditional-exports/subpath.server.js b/...les/conditional-exports/subpath.server.js → ...bak/conditional-exports/subpath.server.js
diff --git a/...de_modules/non-isomorphic-text/browser.js → ...odules_bak/non-isomorphic-text/browser.js b/...de_modules/non-isomorphic-text/browser.js → ...odules_bak/non-isomorphic-text/browser.js
diff --git a/...ode_modules/non-isomorphic-text/index.mjs → ...modules_bak/non-isomorphic-text/index.mjs b/...ode_modules/non-isomorphic-text/index.mjs → ...modules_bak/non-isomorphic-text/index.mjs
diff --git a/..._modules/non-isomorphic-text/package.json → ...ules_bak/non-isomorphic-text/package.json b/..._modules/non-isomorphic-text/package.json → ...ules_bak/non-isomorphic-text/package.json
diff --git a/...e_modules/random-module-instance/index.js → ...dules_bak/random-module-instance/index.js b/...e_modules/random-module-instance/index.js → ...dules_bak/random-module-instance/index.js
diff --git a/...dules/random-module-instance/package.json → ...s_bak/random-module-instance/package.json b/...dules/random-module-instance/package.json → ...s_bak/random-module-instance/package.json
diff --git a/...d-jsx/app/node_modules/my-comps/button.js → ...x/app/node_modules_bak/my-comps/button.js b/...d-jsx/app/node_modules/my-comps/button.js → ...x/app/node_modules_bak/my-comps/button.js
diff --git a/test/e2e/styled-jsx/index.test.ts b/test/e2e/styled-jsx/index.test.ts
@@ -13,25 +13,23 @@ function runTest() {
     beforeAll(async () => {
       next = await createNext({
         files: {
-          node_modules: new FileRef(path.join(appDir, 'node_modules')),
+          node_modules_bak: new FileRef(path.join(appDir, 'node_modules_bak')),
           pages: new FileRef(path.join(appDir, 'pages')),
           '.npmrc': new FileRef(path.join(appDir, '.npmrc')),
         },
         packageJson: {
           scripts: {
-            build: 'next build',
-            dev: 'next dev',
+            setup: `cp -r ./node_modules_bak/my-comps ./node_modules;`,
+            build: `yarn setup && next build`,
+            dev: `yarn setup && next dev`,
             start: 'next start',
           },
         },
         dependencies: {
-          // A different version of styled-jsx on user side,
-          // using a different patch version comparing to the one from next.js
-          'styled-jsx': '5.0.0',
+          'styled-jsx': '5.0.0', // styled-jsx on user side
         },
         startCommand: 'yarn ' + ((global as any).isNextDev ? 'dev' : 'start'),
-        buildCommand: 'yarn build',
-        installCommand: 'yarn',
+        buildCommand: `yarn build`,
       })
     })
     afterAll(() => next.destroy())

diff --git a/test/lib/create-next-install.js b/test/lib/create-next-install.js
@@ -7,12 +7,12 @@ const { randomBytes } = require('crypto')
 const { linkPackages } =
   require('../../.github/actions/next-stats-action/src/prepare/repo-setup')()
 
-async function createNextInstall({
+async function createNextInstall(
   dependencies,
   installCommand,
   packageJson = {},
-  packageLockPath = '',
-}) {
+  packageLockPath = ''
+) {
   const tmpDir = await fs.realpath(process.env.NEXT_TEST_DIR || os.tmpdir())
   const origRepoDir = path.join(__dirname, '../../')
   const installDir = path.join(

diff --git a/test/lib/next-modes/base.ts b/test/lib/next-modes/base.ts
@@ -143,30 +143,16 @@ export class NextInstance {
       ) {
         await fs.copy(process.env.NEXT_TEST_STARTER, this.testDir)
       } else if (!skipIsolatedNext) {
-        this.testDir = await createNextInstall({
-          dependencies: finalDependencies,
-          installCommand: this.installCommand,
-          packageJson: this.packageJson,
-          packageLockPath: this.packageLockPath,
-        })
+        this.testDir = await createNextInstall(
+          finalDependencies,
+          this.installCommand,
+          this.packageJson,
+          this.packageLockPath
+        )
       }
       require('console').log('created next.js install, writing test files')
     }
 
-    const tempNodeModulesFolder = 'node_modules_bak'
-    // Merge customized node_modules and installed node_modules.
-    // Move files[node_modules] to a temporary folder node_modules_back,
-    // then copy the modules back to node_modules after installation.
-    const tempNodeModulesPath = path.join(this.testDir, tempNodeModulesFolder)
-    const nodeModulesDir = path.join(this.testDir, 'node_modules')
-    const hasNodeModulesDir =
-      fs.existsSync(nodeModulesDir) &&
-      (await fs.stat(nodeModulesDir)).isDirectory()
-    if (hasNodeModulesDir) {
-      // Move node_modules to temp folder
-      await fs.move(nodeModulesDir, tempNodeModulesPath)
-    }
-
     if (this.files instanceof FileRef) {
       // if a FileRef is passed directly to `files` we copy the
       // entire folder to the test directory
@@ -177,7 +163,6 @@ export class NextInstance {
           `FileRef passed to "files" in "createNext" is not a directory ${this.files.fsPath}`
         )
       }
-
       await fs.copy(this.files.fsPath, this.testDir)
     } else {
       for (const filename of Object.keys(this.files)) {
@@ -193,12 +178,6 @@ export class NextInstance {
       }
     }
 
-    if (hasNodeModulesDir) {
-      // Move node_modules from temp back to origin
-      await fs.copy(tempNodeModulesPath, nodeModulesDir)
-      await fs.remove(tempNodeModulesPath)
-    }
-
     let nextConfigFile = Object.keys(this.files).find((file) =>
       file.startsWith('next.config.')
     )