Merge e2e test node_modules

move moving node_modules dir simplify simplify
vercel · Sep 27, 2022 · 1354951 · 1354951
1 parent c86a9b9
commit 1354951
Show file tree

Hide file tree

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

diff --git a/run-tests.js b/run-tests.js
@@ -223,8 +223,10 @@ 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({
-      react: reactVersion,
-      'react-dom': reactVersion,
+      dependencies: {
+        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,15 +38,14 @@ describe('app dir - react server components', () => {
     next = await createNext({
       files: new FileRef(path.join(__dirname, './rsc-basic')),
       dependencies: {
-        'styled-components': '6.0.0-alpha.5',
+        'styled-components': '6.0.0-beta.2',
         react: 'experimental',
         'react-dom': 'experimental',
       },
       packageJson: {
         scripts: {
-          setup: `cp -r ./node_modules_bak/* ./node_modules`,
-          build: 'yarn setup && next build',
-          dev: 'yarn setup && next dev',
+          build: 'next build',
+          dev: 'next dev',
           start: 'next start',
         },
       },

diff --git a/...s_bak/conditional-exports-optout/index.js → ...dules/conditional-exports-optout/index.js b/...s_bak/conditional-exports-optout/index.js → ...dules/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/...k/conditional-exports-optout/package.json → ...s/conditional-exports-optout/package.json b/...k/conditional-exports-optout/package.json → ...s/conditional-exports-optout/package.json
diff --git a/...bak/conditional-exports-optout/subpath.js → ...les/conditional-exports-optout/subpath.js b/...bak/conditional-exports-optout/subpath.js → ...les/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/..._modules_bak/conditional-exports/index.js → ...node_modules/conditional-exports/index.js b/..._modules_bak/conditional-exports/index.js → ...node_modules/conditional-exports/index.js
diff --git a/...s_bak/conditional-exports/index.server.js → ...dules/conditional-exports/index.server.js b/...s_bak/conditional-exports/index.server.js → ...dules/conditional-exports/index.server.js
diff --git a/...ules_bak/conditional-exports/package.json → ..._modules/conditional-exports/package.json b/...ules_bak/conditional-exports/package.json → ..._modules/conditional-exports/package.json
diff --git a/...odules_bak/conditional-exports/subpath.js → ...de_modules/conditional-exports/subpath.js b/...odules_bak/conditional-exports/subpath.js → ...de_modules/conditional-exports/subpath.js
diff --git a/...bak/conditional-exports/subpath.server.js → ...les/conditional-exports/subpath.server.js b/...bak/conditional-exports/subpath.server.js → ...les/conditional-exports/subpath.server.js
diff --git a/...odules_bak/non-isomorphic-text/browser.js → ...de_modules/non-isomorphic-text/browser.js b/...odules_bak/non-isomorphic-text/browser.js → ...de_modules/non-isomorphic-text/browser.js
diff --git a/...modules_bak/non-isomorphic-text/index.mjs → ...ode_modules/non-isomorphic-text/index.mjs b/...modules_bak/non-isomorphic-text/index.mjs → ...ode_modules/non-isomorphic-text/index.mjs
diff --git a/...ules_bak/non-isomorphic-text/package.json → ..._modules/non-isomorphic-text/package.json b/...ules_bak/non-isomorphic-text/package.json → ..._modules/non-isomorphic-text/package.json
diff --git a/...dules_bak/random-module-instance/index.js → ...e_modules/random-module-instance/index.js b/...dules_bak/random-module-instance/index.js → ...e_modules/random-module-instance/index.js
diff --git a/...s_bak/random-module-instance/package.json → ...dules/random-module-instance/package.json b/...s_bak/random-module-instance/package.json → ...dules/random-module-instance/package.json
diff --git a/...x/app/node_modules_bak/my-comps/button.js → ...d-jsx/app/node_modules/my-comps/button.js b/...x/app/node_modules_bak/my-comps/button.js → ...d-jsx/app/node_modules/my-comps/button.js
diff --git a/test/e2e/styled-jsx/index.test.ts b/test/e2e/styled-jsx/index.test.ts
@@ -13,23 +13,25 @@ function runTest() {
     beforeAll(async () => {
       next = await createNext({
         files: {
-          node_modules_bak: new FileRef(path.join(appDir, 'node_modules_bak')),
+          node_modules: new FileRef(path.join(appDir, 'node_modules')),
           pages: new FileRef(path.join(appDir, 'pages')),
           '.npmrc': new FileRef(path.join(appDir, '.npmrc')),
         },
         packageJson: {
           scripts: {
-            setup: `cp -r ./node_modules_bak/my-comps ./node_modules;`,
-            build: `yarn setup && next build`,
-            dev: `yarn setup && next dev`,
+            build: 'next build',
+            dev: 'next dev',
             start: 'next start',
           },
         },
         dependencies: {
-          'styled-jsx': '5.0.0', // styled-jsx on user side
+          // 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',
         },
         startCommand: 'yarn ' + ((global as any).isNextDev ? 'dev' : 'start'),
-        buildCommand: `yarn build`,
+        buildCommand: 'yarn build',
+        installCommand: 'yarn',
       })
     })
     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,16 +143,29 @@ export class NextInstance {
       ) {
         await fs.copy(process.env.NEXT_TEST_STARTER, this.testDir)
       } else if (!skipIsolatedNext) {
-        this.testDir = await createNextInstall(
-          finalDependencies,
-          this.installCommand,
-          this.packageJson,
-          this.packageLockPath
-        )
+        this.testDir = await createNextInstall({
+          dependencies: finalDependencies,
+          installCommand: this.installCommand,
+          packageJson: this.packageJson,
+          packageLockPath: 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 nodeModulesStats = await fs.stat(nodeModulesDir)
+    const hasNodeModulesDir = nodeModulesStats.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
@@ -163,6 +176,7 @@ 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)) {
@@ -178,6 +192,12 @@ 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.')
     )