Skip to content

Commit

Permalink
fix: revert usage of Escalade and yargs@16 as they breaks Node 13 (#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB authored Oct 6, 2020
1 parent 75bf038 commit 7e51ac1
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 88 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Fixes

- `[*]` Revert usage of Escalade and rollback Yargs to v15 as it breaks Node 13 ([#10599](https://github.com/facebook/jest/pull/10599))
- `[jest-circus]` Setup globals before emitting `setup`, and include Jest globals in the `setup` payload ([#10598](https://github.com/facebook/jest/pull/10598))
- `[jest-mock]` Fix typings for `mockResolvedValue`, `mockResolvedValueOnce`, `mockRejectedValue` and `mockRejectedValueOnce` ([#10600](https://github.com/facebook/jest/pull/10600))

Expand Down
2 changes: 1 addition & 1 deletion packages/jest-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"jest-util": "^26.5.0",
"jest-validate": "^26.5.0",
"prompts": "^2.0.1",
"yargs": "^16.0.3"
"yargs": "^15.4.1"
},
"devDependencies": {
"@jest/test-utils": "^26.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"jest-runtime": "^26.5.0",
"jest-validate": "^26.5.0",
"repl": "^0.1.3",
"yargs": "^16.0.3"
"yargs": "^15.4.1"
},
"devDependencies": {
"@jest/test-utils": "^26.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-resolve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"dependencies": {
"@jest/types": "^26.5.0",
"chalk": "^4.0.0",
"escalade": "^3.1.0",
"graceful-fs": "^4.2.4",
"jest-pnp-resolver": "^1.2.2",
"jest-util": "^26.5.0",
"read-pkg-up": "^7.0.1",
"resolve": "^1.17.0",
"slash": "^3.0.0"
},
Expand Down
32 changes: 6 additions & 26 deletions packages/jest-resolve/src/shouldLoadAsEsm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,17 @@
import {dirname, extname} from 'path';
// @ts-expect-error: experimental, not added to the types
import {SyntheticModule} from 'vm';
import {readFileSync} from 'graceful-fs';
import escalade from 'escalade/sync';
import type {Config} from '@jest/types';
import readPkgUp = require('read-pkg-up');

const runtimeSupportsVmModules = typeof SyntheticModule === 'function';

const cachedFileLookups = new Map<string, boolean>();
const cachedDirLookups = new Map<string, boolean>();
const cachedChecks = new Map<string, boolean>();

export function clearCachedLookups(): void {
cachedFileLookups.clear();
cachedDirLookups.clear();
cachedChecks.clear();
}

export default function cachedShouldLoadAsEsm(path: Config.Path): boolean {
Expand Down Expand Up @@ -70,29 +67,12 @@ function shouldLoadAsEsm(path: Config.Path): boolean {
}

function cachedPkgCheck(cwd: Config.Path): boolean {
const pkgPath = escalade(cwd, (_dir, names) => {
if (names.includes('package.json')) {
// will be resolved into absolute
return 'package.json';
}
return false;
});
if (!pkgPath) {
return false;
}
// TODO: can we cache lookups somehow?
const pkg = readPkgUp.sync({cwd, normalize: false});

let hasModuleField = cachedChecks.get(pkgPath);
if (hasModuleField != null) {
return hasModuleField;
}

try {
const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
hasModuleField = pkg.type === 'module';
} catch {
hasModuleField = false;
if (!pkg) {
return false;
}

cachedChecks.set(pkgPath, hasModuleField);
return hasModuleField;
return pkg.packageJson.type === 'module';
}
2 changes: 1 addition & 1 deletion packages/jest-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"jest-validate": "^26.5.0",
"slash": "^3.0.0",
"strip-bom": "^4.0.0",
"yargs": "^16.0.3"
"yargs": "^15.4.1"
},
"devDependencies": {
"@jest/test-utils": "^26.5.0",
Expand Down
65 changes: 7 additions & 58 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5860,17 +5860,6 @@ __metadata:
languageName: node
linkType: hard

"cliui@npm:^7.0.0":
version: 7.0.1
resolution: "cliui@npm:7.0.1"
dependencies:
string-width: ^4.2.0
strip-ansi: ^6.0.0
wrap-ansi: ^7.0.0
checksum: 9c1433067a5860f9b8df76e5e0186a86992a180b8f8dd316357e19aa65b68d46964d448d18991fb598ab638a6c24218ce1331344fa4eec6767fcab40232b19fa
languageName: node
linkType: hard

"clone-deep@npm:^4.0.1":
version: 4.0.1
resolution: "clone-deep@npm:4.0.1"
Expand Down Expand Up @@ -7758,7 +7747,7 @@ __metadata:
languageName: node
linkType: hard

"escalade@npm:^3.0.2, escalade@npm:^3.1.0":
"escalade@npm:^3.1.0":
version: 3.1.0
resolution: "escalade@npm:3.1.0"
checksum: 437c5b2619a412c0b075fb33e590e3516f187f7da8b20035685e08f346e27842722e5740a3398535d7d590ae4fb70068374ed59190d4eb4f9bb06d052e2fc92f
Expand Down Expand Up @@ -9360,7 +9349,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5":
"get-caller-file@npm:^2.0.1":
version: 2.0.5
resolution: "get-caller-file@npm:2.0.5"
checksum: 9dd9e1e2591039ee4c38c897365b904f66f1e650a8c1cb7b7db8ce667fa63e88cc8b13282b74df9d93de481114b3304a0487880d31cd926dfda6efe71455855d
Expand Down Expand Up @@ -11428,7 +11417,7 @@ fsevents@^1.2.7:
jest-util: ^26.5.0
jest-validate: ^26.5.0
prompts: ^2.0.1
yargs: ^16.0.3
yargs: ^15.4.1
bin:
jest: ./bin/jest.js
languageName: unknown
Expand Down Expand Up @@ -11746,7 +11735,7 @@ fsevents@^1.2.7:
jest-runtime: ^26.5.0
jest-validate: ^26.5.0
repl: ^0.1.3
yargs: ^16.0.3
yargs: ^15.4.1
bin:
jest-repl: ./bin/jest-repl.js
languageName: unknown
Expand All @@ -11773,11 +11762,11 @@ fsevents@^1.2.7:
"@types/graceful-fs": ^4.1.3
"@types/resolve": ^1.17.0
chalk: ^4.0.0
escalade: ^3.1.0
graceful-fs: ^4.2.4
jest-haste-map: ^26.5.0
jest-pnp-resolver: ^1.2.2
jest-util: ^26.5.0
read-pkg-up: ^7.0.1
resolve: ^1.17.0
slash: ^3.0.0
languageName: unknown
Expand Down Expand Up @@ -11862,7 +11851,7 @@ fsevents@^1.2.7:
jest-validate: ^26.5.0
slash: ^3.0.0
strip-bom: ^4.0.0
yargs: ^16.0.3
yargs: ^15.4.1
bin:
jest-runtime: ./bin/jest-runtime.js
languageName: unknown
Expand Down Expand Up @@ -19861,17 +19850,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"wrap-ansi@npm:^7.0.0":
version: 7.0.0
resolution: "wrap-ansi@npm:7.0.0"
dependencies:
ansi-styles: ^4.0.0
string-width: ^4.1.0
strip-ansi: ^6.0.0
checksum: 09939dd775ae565bb99a25a6c072fe3775a95fa71751b5533c94265fe986ba3e3ab071a027ab76cf26876bd9afd10ac3c2d06d7c4bcce148bf7d2d9514e3a0df
languageName: node
linkType: hard

"wrappy@npm:1":
version: 1.0.2
resolution: "wrappy@npm:1.0.2"
Expand Down Expand Up @@ -20092,13 +20070,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"y18n@npm:^5.0.1":
version: 5.0.2
resolution: "y18n@npm:5.0.2"
checksum: ba6106061c8ef612d888fa3fca61d094027200c4792275886eca2f82e92b1f24120011cc878d808a38be98c2ed1e3f831117691bf4d526a084e339cbd7c9f587
languageName: node
linkType: hard

"yallist@npm:^2.1.2":
version: 2.1.2
resolution: "yallist@npm:2.1.2"
Expand Down Expand Up @@ -20153,13 +20124,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"yargs-parser@npm:^20.0.0":
version: 20.2.1
resolution: "yargs-parser@npm:20.2.1"
checksum: c4945ade7d792bde00e3f68930f56f1fdd531e501c4ecf944c524c1541c5fe2468c27b4f76b0b459009ef09e338750d01810732f99f0a1fa061af4126cf5f53e
languageName: node
linkType: hard

"yargs@npm:^14.2.0, yargs@npm:^14.2.2":
version: 14.2.3
resolution: "yargs@npm:14.2.3"
Expand All @@ -20179,7 +20143,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"yargs@npm:^15.1.0":
"yargs@npm:^15.1.0, yargs@npm:^15.4.1":
version: 15.4.1
resolution: "yargs@npm:15.4.1"
dependencies:
Expand All @@ -20198,21 +20162,6 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"yargs@npm:^16.0.3":
version: 16.0.3
resolution: "yargs@npm:16.0.3"
dependencies:
cliui: ^7.0.0
escalade: ^3.0.2
get-caller-file: ^2.0.5
require-directory: ^2.1.1
string-width: ^4.2.0
y18n: ^5.0.1
yargs-parser: ^20.0.0
checksum: 39490963e02bceb73ffff285cd9b241e5b019acbedef456586c97027cc18d0cadb743ad1340ccdc9340d0a21e18176c63b9f8bd90eee64c7e1f512c147aab1c2
languageName: node
linkType: hard

"yargs@npm:^2.3.0":
version: 2.3.0
resolution: "yargs@npm:2.3.0"
Expand Down

0 comments on commit 7e51ac1

Please sign in to comment.