Rename test suite and add worker_threads config

vercel · Oct 28, 2019 · 6d30574 · 6d30574
1 parent 684c8ff
commit 6d30574
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 12 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -337,7 +337,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
 
   const staticCheckWorkers = new Worker(staticCheckWorker, {
     numWorkers: config.experimental.cpus,
-    enableWorkerThreads: config.experimental.cpus > 1,
+    enableWorkerThreads: config.experimental.workerThreads,
   })
 
   const analysisBegin = process.hrtime()

diff --git a/packages/next/build/webpack/plugins/terser-webpack-plugin/src/TaskRunner.js b/packages/next/build/webpack/plugins/terser-webpack-plugin/src/TaskRunner.js
@@ -29,7 +29,7 @@ export default class TaskRunner {
     if (this.maxConcurrentWorkers > 1) {
       this.workers = new Worker(worker, {
         numWorkers: this.maxConcurrentWorkers,
-        enableWorkerThreads: this.maxConcurrentWorkers > 1,
+        enableWorkerThreads: true,
       })
       this.boundWorkers = options => this.workers.default(options)
     } else {

diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
@@ -267,7 +267,7 @@ export default async function(
     {
       maxRetries: 0,
       numWorkers: threads,
-      enableWorkerThreads: threads > 1,
+      enableWorkerThreads: nextConfig.experimental.workerThreads,
       exposedMethods: ['default'],
     }
   ) as any

diff --git a/packages/next/next-server/server/config.ts b/packages/next/next-server/server/config.ts
@@ -48,6 +48,7 @@ const defaultConfig: { [key: string]: any } = {
     publicDirectory: false,
     sprFlushToDisk: true,
     deferScripts: false,
+    workerThreads: true,
   },
   future: {
     excludeDefaultMomentLocales: false,

diff --git a/...irebase-only-sequentially/pages/page-1.js → ...integration/firebase-grpc/pages/page-1.js b/...irebase-only-sequentially/pages/page-1.js → ...integration/firebase-grpc/pages/page-1.js
diff --git a/...irebase-only-sequentially/pages/page-2.js → ...integration/firebase-grpc/pages/page-2.js b/...irebase-only-sequentially/pages/page-2.js → ...integration/firebase-grpc/pages/page-2.js
diff --git a/...base-only-sequentially/test/index.test.js → ...egration/firebase-grpc/test/index.test.js b/...base-only-sequentially/test/index.test.js → ...egration/firebase-grpc/test/index.test.js
@@ -9,29 +9,25 @@ const appDir = path.join(__dirname, '..')
 const nextConfig = path.join(appDir, 'next.config.js')
 
 describe('Builds with firebase dependency only sequentially', () => {
-  it('Throws an error when building with firebase dependency in parallel', async () => {
-    await fs.writeFile(
-      nextConfig,
-      `module.exports = { experimental: { cpus: 2 } }`
-    )
+  it('Throws an error when building with firebase dependency with worker_threads', async () => {
+    await fs.remove(nextConfig)
     const results = await nextBuild(appDir, [], { stdout: true, stderr: true })
     expect(results.stdout + results.stderr).toMatch(/Build error occurred/)
     expect(results.stdout + results.stderr).toMatch(
       /grpc_node\.node\. Module did not self-register\./
     )
-    await fs.remove(nextConfig)
   })
 
-  it('Throws no error when building with firebase dependency in sequence', async () => {
+  it('Throws no error when building with firebase dependency without worker_threads', async () => {
     await fs.writeFile(
       nextConfig,
-      `module.exports = { experimental: { cpus: 1 } }`
+      `module.exports = { experimental: { workerThreads: false } }`
     )
     const results = await nextBuild(appDir, [], { stdout: true, stderr: true })
+    await fs.remove(nextConfig)
     expect(results.stdout + results.stderr).not.toMatch(/Build error occurred/)
     expect(results.stdout + results.stderr).not.toMatch(
       /grpc_node\.node\. Module did not self-register\./
     )
-    await fs.remove(nextConfig)
   })
 })