Unverified Commit 1bf4cf3e authored by Shu Ding's avatar Shu Ding Committed by GitHub

Upgrade jest-worker (#23077)

This PR upgrades `jest-worker` and `jest-cli` to the latest pre-release version, also removed `jest-circus` which is included in Jest by default. `jest-worker@next` includes a fix for memory leak that we need (https://github.com/facebook/jest/pull/11187). 

Fixes #22925. This will also improve the OOM issue for `next dev` #15855.
parent 091d56ad
module.exports = { module.exports = {
// this will become default in jest 27:
testRunner: 'jest-circus/runner',
testMatch: ['**/*.test.js'], testMatch: ['**/*.test.js'],
verbose: true, verbose: true,
rootDir: 'test', rootDir: 'test',
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
"async-sema": "3.0.1", "async-sema": "3.0.1",
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.0.3", "babel-eslint": "10.0.3",
"babel-jest": "24.9.0", "babel-jest": "27.0.0-next.5",
"browserslist": "^4.14.7", "browserslist": "^4.14.7",
"browserstack-local": "1.4.0", "browserstack-local": "1.4.0",
"cheerio": "0.22.0", "cheerio": "0.22.0",
...@@ -87,8 +87,7 @@ ...@@ -87,8 +87,7 @@
"image-size": "0.9.3", "image-size": "0.9.3",
"is-animated": "2.0.0", "is-animated": "2.0.0",
"isomorphic-unfetch": "3.0.0", "isomorphic-unfetch": "3.0.0",
"jest-circus": "26.0.1", "jest-cli": "27.0.0-next.5",
"jest-cli": "24.9.0",
"ky": "0.19.1", "ky": "0.19.1",
"ky-universal": "0.6.0", "ky-universal": "0.6.0",
"lerna": "4.0.0", "lerna": "4.0.0",
......
...@@ -2,7 +2,7 @@ import { loadEnvConfig } from '@next/env' ...@@ -2,7 +2,7 @@ import { loadEnvConfig } from '@next/env'
import chalk from 'chalk' import chalk from 'chalk'
import crypto from 'crypto' import crypto from 'crypto'
import { promises, writeFileSync } from 'fs' import { promises, writeFileSync } from 'fs'
import Worker from 'jest-worker' import { Worker } from 'jest-worker'
import devalue from 'next/dist/compiled/devalue' import devalue from 'next/dist/compiled/devalue'
import escapeStringRegexp from 'next/dist/compiled/escape-string-regexp' import escapeStringRegexp from 'next/dist/compiled/escape-string-regexp'
import findUp from 'next/dist/compiled/find-up' import findUp from 'next/dist/compiled/find-up'
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
sources, sources,
} from 'next/dist/compiled/webpack/webpack' } from 'next/dist/compiled/webpack/webpack'
import pLimit from 'p-limit' import pLimit from 'p-limit'
import jestWorker from 'jest-worker' import { Worker } from 'jest-worker'
import crypto from 'crypto' import crypto from 'crypto'
import cacache from 'next/dist/compiled/cacache' import cacache from 'next/dist/compiled/cacache'
import { spans } from '../../profiling-plugin' import { spans } from '../../profiling-plugin'
...@@ -192,13 +192,10 @@ class TerserPlugin { ...@@ -192,13 +192,10 @@ class TerserPlugin {
return initializedWorker return initializedWorker
} }
initializedWorker = new jestWorker( initializedWorker = new Worker(path.join(__dirname, './minify.js'), {
path.join(__dirname, './minify.js'), numWorkers: numberOfWorkers,
{ enableWorkerThreads: true,
numWorkers: numberOfWorkers, })
enableWorkerThreads: true,
}
)
initializedWorker.getStdout().pipe(process.stdout) initializedWorker.getStdout().pipe(process.stdout)
initializedWorker.getStderr().pipe(process.stderr) initializedWorker.getStderr().pipe(process.stderr)
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
module.exports=(()=>{var r={192:(r,e,t)=>{var s=t(622);r.exports=function(r,e){if(e){var t=e.map(function(e){return s.resolve(r,e)})}else{var t=r}var n=t.slice(1).reduce(function(r,e){if(!e.match(/^([A-Za-z]:)?\/|\\/)){throw new Error("relative path without a basedir")}var t=e.split(/\/+|\\+/);for(var s=0;r[s]===t[s]&&s<Math.min(r.length,t.length);s++);return r.slice(0,s)},t[0].split(/\/+|\\+/));return n.length>1?n.join("/"):"/"}},19:(r,e,t)=>{"use strict";const s=t(622);const n=t(747);const o=t(192);const c=t(860);const i=t(240);const{env:a,cwd:u}=process;const d=r=>{try{n.accessSync(r,n.constants.W_OK);return true}catch(r){return false}};function useDirectory(r,e){if(e.create){i.sync(r)}if(e.thunk){return(...e)=>s.join(r,...e)}return r}function getNodeModuleDirectory(r){const e=s.join(r,"node_modules");if(!d(e)&&(n.existsSync(e)||!d(s.join(r)))){return}return e}r.exports=((r={})=>{if(a.CACHE_DIR&&!["true","false","1","0"].includes(a.CACHE_DIR)){return useDirectory(s.join(a.CACHE_DIR,"find-cache-dir"),r)}let{cwd:e=u()}=r;if(r.files){e=o(e,r.files)}e=c.sync(e);if(!e){return}const t=getNodeModuleDirectory(e);if(!t){return undefined}return useDirectory(s.join(e,"node_modules",".cache",r.name),r)})},240:(r,e,t)=>{"use strict";const s=t(747);const n=t(622);const{promisify:o}=t(669);const c=t(519);const i=c.satisfies(process.version,">=10.12.0");const a=r=>{if(process.platform==="win32"){const e=/[<>:"|?*]/.test(r.replace(n.parse(r).root,""));if(e){const e=new Error(`Path contains invalid characters: ${r}`);e.code="EINVAL";throw e}}};const u=r=>{const e={mode:511&~process.umask(),fs:s};return{...e,...r}};const d=r=>{const e=new Error(`operation not permitted, mkdir '${r}'`);e.code="EPERM";e.errno=-4048;e.path=r;e.syscall="mkdir";return e};const f=async(r,e)=>{a(r);e=u(e);const t=o(e.fs.mkdir);const c=o(e.fs.stat);if(i&&e.fs.mkdir===s.mkdir){const s=n.resolve(r);await t(s,{mode:e.mode,recursive:true});return s}const f=async r=>{try{await t(r,e.mode);return r}catch(e){if(e.code==="EPERM"){throw e}if(e.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(e.message.includes("null bytes")){throw e}await f(n.dirname(r));return f(r)}try{const t=await c(r);if(!t.isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw e}return r}};return f(n.resolve(r))};r.exports=f;r.exports.sync=((r,e)=>{a(r);e=u(e);if(i&&e.fs.mkdirSync===s.mkdirSync){const t=n.resolve(r);s.mkdirSync(t,{mode:e.mode,recursive:true});return t}const t=r=>{try{e.fs.mkdirSync(r,e.mode)}catch(s){if(s.code==="EPERM"){throw s}if(s.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(s.message.includes("null bytes")){throw s}t(n.dirname(r));return t(r)}try{if(!e.fs.statSync(r).isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw s}}return r};return t(n.resolve(r))})},860:(r,e,t)=>{"use strict";const s=t(622);const n=t(442);const o=async r=>{const e=await n("package.json",{cwd:r});return e&&s.dirname(e)};r.exports=o;r.exports.default=o;r.exports.sync=(r=>{const e=n.sync("package.json",{cwd:r});return e&&s.dirname(e)})},747:r=>{"use strict";r.exports=require("fs")},442:r=>{"use strict";r.exports=require("next/dist/compiled/find-up")},519:r=>{"use strict";r.exports=require("next/dist/compiled/semver")},622:r=>{"use strict";r.exports=require("path")},669:r=>{"use strict";r.exports=require("util")}};var e={};function __nccwpck_require__(t){if(e[t]){return e[t].exports}var s=e[t]={exports:{}};var n=true;try{r[t](s,s.exports,__nccwpck_require__);n=false}finally{if(n)delete e[t]}return s.exports}__nccwpck_require__.ab=__dirname+"/";return __nccwpck_require__(19)})(); module.exports=(()=>{var r={192:(r,e,t)=>{var s=t(622);r.exports=function(r,e){if(e){var t=e.map(function(e){return s.resolve(r,e)})}else{var t=r}var n=t.slice(1).reduce(function(r,e){if(!e.match(/^([A-Za-z]:)?\/|\\/)){throw new Error("relative path without a basedir")}var t=e.split(/\/+|\\+/);for(var s=0;r[s]===t[s]&&s<Math.min(r.length,t.length);s++);return r.slice(0,s)},t[0].split(/\/+|\\+/));return n.length>1?n.join("/"):"/"}},19:(r,e,t)=>{"use strict";const s=t(622);const n=t(747);const o=t(192);const c=t(477);const i=t(293);const{env:a,cwd:u}=process;const d=r=>{try{n.accessSync(r,n.constants.W_OK);return true}catch(r){return false}};function useDirectory(r,e){if(e.create){i.sync(r)}if(e.thunk){return(...e)=>s.join(r,...e)}return r}function getNodeModuleDirectory(r){const e=s.join(r,"node_modules");if(!d(e)&&(n.existsSync(e)||!d(s.join(r)))){return}return e}r.exports=((r={})=>{if(a.CACHE_DIR&&!["true","false","1","0"].includes(a.CACHE_DIR)){return useDirectory(s.join(a.CACHE_DIR,"find-cache-dir"),r)}let{cwd:e=u()}=r;if(r.files){e=o(e,r.files)}e=c.sync(e);if(!e){return}const t=getNodeModuleDirectory(e);if(!t){return undefined}return useDirectory(s.join(e,"node_modules",".cache",r.name),r)})},293:(r,e,t)=>{"use strict";const s=t(747);const n=t(622);const{promisify:o}=t(669);const c=t(519);const i=c.satisfies(process.version,">=10.12.0");const a=r=>{if(process.platform==="win32"){const e=/[<>:"|?*]/.test(r.replace(n.parse(r).root,""));if(e){const e=new Error(`Path contains invalid characters: ${r}`);e.code="EINVAL";throw e}}};const u=r=>{const e={mode:511&~process.umask(),fs:s};return{...e,...r}};const d=r=>{const e=new Error(`operation not permitted, mkdir '${r}'`);e.code="EPERM";e.errno=-4048;e.path=r;e.syscall="mkdir";return e};const f=async(r,e)=>{a(r);e=u(e);const t=o(e.fs.mkdir);const c=o(e.fs.stat);if(i&&e.fs.mkdir===s.mkdir){const s=n.resolve(r);await t(s,{mode:e.mode,recursive:true});return s}const f=async r=>{try{await t(r,e.mode);return r}catch(e){if(e.code==="EPERM"){throw e}if(e.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(e.message.includes("null bytes")){throw e}await f(n.dirname(r));return f(r)}try{const t=await c(r);if(!t.isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw e}return r}};return f(n.resolve(r))};r.exports=f;r.exports.sync=((r,e)=>{a(r);e=u(e);if(i&&e.fs.mkdirSync===s.mkdirSync){const t=n.resolve(r);s.mkdirSync(t,{mode:e.mode,recursive:true});return t}const t=r=>{try{e.fs.mkdirSync(r,e.mode)}catch(s){if(s.code==="EPERM"){throw s}if(s.code==="ENOENT"){if(n.dirname(r)===r){throw d(r)}if(s.message.includes("null bytes")){throw s}t(n.dirname(r));return t(r)}try{if(!e.fs.statSync(r).isDirectory()){throw new Error("The path is not a directory")}}catch(r){throw s}}return r};return t(n.resolve(r))})},477:(r,e,t)=>{"use strict";const s=t(622);const n=t(442);const o=async r=>{const e=await n("package.json",{cwd:r});return e&&s.dirname(e)};r.exports=o;r.exports.default=o;r.exports.sync=(r=>{const e=n.sync("package.json",{cwd:r});return e&&s.dirname(e)})},747:r=>{"use strict";r.exports=require("fs")},442:r=>{"use strict";r.exports=require("next/dist/compiled/find-up")},519:r=>{"use strict";r.exports=require("next/dist/compiled/semver")},622:r=>{"use strict";r.exports=require("path")},669:r=>{"use strict";r.exports=require("util")}};var e={};function __nccwpck_require__(t){if(e[t]){return e[t].exports}var s=e[t]={exports:{}};var n=true;try{r[t](s,s.exports,__nccwpck_require__);n=false}finally{if(n)delete e[t]}return s.exports}__nccwpck_require__.ab=__dirname+"/";return __nccwpck_require__(19)})();
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
readFileSync, readFileSync,
writeFileSync, writeFileSync,
} from 'fs' } from 'fs'
import Worker from 'jest-worker' import { Worker } from 'jest-worker'
import { cpus } from 'os' import { cpus } from 'os'
import { dirname, join, resolve, sep } from 'path' import { dirname, join, resolve, sep } from 'path'
import { promisify } from 'util' import { promisify } from 'util'
......
import { loadEnvConfig } from '@next/env' import { loadEnvConfig } from '@next/env'
import Worker from 'jest-worker' import { Worker } from 'jest-worker'
import findUp from 'next/dist/compiled/find-up' import findUp from 'next/dist/compiled/find-up'
import { init as initWebpack } from 'next/dist/compiled/webpack/webpack' import { init as initWebpack } from 'next/dist/compiled/webpack/webpack'
import { CONFIG_FILE, PHASE_DEVELOPMENT_SERVER } from '../lib/constants' import { CONFIG_FILE, PHASE_DEVELOPMENT_SERVER } from '../lib/constants'
......
import JestWorker from 'jest-worker' import { Worker } from 'jest-worker'
import * as path from 'path' import * as path from 'path'
import { execOnce } from '../../../lib/utils' import { execOnce } from '../../../lib/utils'
import ImageData from './image_data' import ImageData from './image_data'
const getWorker = execOnce( const getWorker = execOnce(
() => () =>
new JestWorker(path.resolve(__dirname, 'impl'), { new Worker(path.resolve(__dirname, 'impl'), {
enableWorkerThreads: true, enableWorkerThreads: true,
}) })
) )
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
"etag": "1.8.1", "etag": "1.8.1",
"find-cache-dir": "3.3.1", "find-cache-dir": "3.3.1",
"get-orientation": "1.1.2", "get-orientation": "1.1.2",
"jest-worker": "24.9.0", "jest-worker": "27.0.0-next.5",
"native-url": "0.3.4", "native-url": "0.3.4",
"node-fetch": "2.6.1", "node-fetch": "2.6.1",
"node-html-parser": "1.4.9", "node-html-parser": "1.4.9",
......
...@@ -2,7 +2,7 @@ import { ReactDevOverlay } from '@next/react-dev-overlay/lib/client' ...@@ -2,7 +2,7 @@ import { ReactDevOverlay } from '@next/react-dev-overlay/lib/client'
import crypto from 'crypto' import crypto from 'crypto'
import fs from 'fs' import fs from 'fs'
import { IncomingMessage, ServerResponse } from 'http' import { IncomingMessage, ServerResponse } from 'http'
import Worker from 'jest-worker' import { Worker } from 'jest-worker'
import AmpHtmlValidator from 'next/dist/compiled/amphtml-validator' import AmpHtmlValidator from 'next/dist/compiled/amphtml-validator'
import findUp from 'next/dist/compiled/find-up' import findUp from 'next/dist/compiled/find-up'
import { join as pathJoin, relative, resolve as pathResolve, sep } from 'path' import { join as pathJoin, relative, resolve as pathResolve, sep } from 'path'
...@@ -55,7 +55,7 @@ export default class DevServer extends Server { ...@@ -55,7 +55,7 @@ export default class DevServer extends Server {
private isCustomServer: boolean private isCustomServer: boolean
protected sortedRoutes?: string[] protected sortedRoutes?: string[]
protected staticPathsWorker: import('jest-worker').default & { protected staticPathsWorker: import('jest-worker').Worker & {
loadStaticPaths: typeof import('./static-paths-worker').loadStaticPaths loadStaticPaths: typeof import('./static-paths-worker').loadStaticPaths
} }
...@@ -102,7 +102,7 @@ export default class DevServer extends Server { ...@@ -102,7 +102,7 @@ export default class DevServer extends Server {
this.staticPathsWorker = new Worker( this.staticPathsWorker = new Worker(
require.resolve('./static-paths-worker'), require.resolve('./static-paths-worker'),
{ {
maxRetries: 0, maxRetries: 1,
numWorkers: this.nextConfig.experimental.cpus, numWorkers: this.nextConfig.experimental.cpus,
forkOptions: { forkOptions: {
env: { env: {
......
...@@ -23,7 +23,7 @@ const PROD_TEST_EXT = '.prod.test.js' ...@@ -23,7 +23,7 @@ const PROD_TEST_EXT = '.prod.test.js'
// which types we have configured to run separate // which types we have configured to run separate
const configuredTestTypes = [UNIT_TEST_EXT] const configuredTestTypes = [UNIT_TEST_EXT]
;(async () => { async function main() {
let concurrencyIdx = process.argv.indexOf('-c') let concurrencyIdx = process.argv.indexOf('-c')
const concurrency = const concurrency =
parseInt(process.argv[concurrencyIdx + 1], 10) || DEFAULT_CONCURRENCY parseInt(process.argv[concurrencyIdx + 1], 10) || DEFAULT_CONCURRENCY
...@@ -167,7 +167,7 @@ const configuredTestTypes = [UNIT_TEST_EXT] ...@@ -167,7 +167,7 @@ const configuredTestTypes = [UNIT_TEST_EXT]
const sema = new Sema(concurrency, { capacity: testNames.length }) const sema = new Sema(concurrency, { capacity: testNames.length })
const jestPath = path.join( const jestPath = path.join(
path.dirname(require.resolve('jest-cli/package')), path.dirname(require.resolve('jest-cli/package.json')),
'bin/jest.js' 'bin/jest.js'
) )
const children = new Set() const children = new Set()
...@@ -319,4 +319,9 @@ const configuredTestTypes = [UNIT_TEST_EXT] ...@@ -319,4 +319,9 @@ const configuredTestTypes = [UNIT_TEST_EXT]
} }
} }
} }
})() }
main().catch((err) => {
console.error(err)
process.exit(1)
})
...@@ -104,7 +104,7 @@ describe('Build Output', () => { ...@@ -104,7 +104,7 @@ describe('Build Output', () => {
expect(parseFloat(err404FirstLoad)).toBeCloseTo(67.8, 0) expect(parseFloat(err404FirstLoad)).toBeCloseTo(67.8, 0)
expect(err404FirstLoad.endsWith('kB')).toBe(true) expect(err404FirstLoad.endsWith('kB')).toBe(true)
expect(parseFloat(sharedByAll)).toBeCloseTo(64.3, 1) expect(parseFloat(sharedByAll)).toBeCloseTo(64.4, 1)
expect(sharedByAll.endsWith('kB')).toBe(true) expect(sharedByAll.endsWith('kB')).toBe(true)
if (_appSize.endsWith('kB')) { if (_appSize.endsWith('kB')) {
......
/* eslint-env jest */ /* eslint-env jest */
import { writeFile } from 'fs' import { createFile, exists, readFile, writeFile, remove } from 'fs-extra'
import { createFile, exists, readFile, remove } from 'fs-extra'
import { nextBuild } from 'next-test-utils' import { nextBuild } from 'next-test-utils'
import path from 'path' import path from 'path'
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment