Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade dependencies and land changes for yarn berry #9545

Merged
merged 9 commits into from
Feb 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 100 additions & 45 deletions .yarn/releases/yarn-1.21.1.js → .yarn/releases/yarn-1.22.0.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@


lastUpdateCheck 1576854265612
yarn-path ".yarn/releases/yarn-1.21.1.js"
yarn-path ".yarn/releases/yarn-1.22.0.js"
14 changes: 7 additions & 7 deletions examples/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
},
"private": true,
"dependencies": {
"@angular/common": "^8.2.5",
"@angular/compiler": "^8.2.5",
"@angular/core": "^8.2.5",
"@angular/forms": "^8.2.5",
"@angular/platform-browser": "^8.2.5",
"@angular/platform-browser-dynamic": "^8.2.5",
"@angular/common": "^9.0.0",
"@angular/compiler": "^9.0.0",
"@angular/core": "^9.0.0",
"@angular/forms": "^9.0.0",
"@angular/platform-browser": "^9.0.0",
"@angular/platform-browser-dynamic": "^9.0.0",
"core-js": "^3.2.1",
"rxjs": "^6.5.3",
"typescript": "*",
"zone.js": "~0.9.1"
"zone.js": "~0.10.2"
},
"devDependencies": {
"@babel/core": "*",
Expand Down
5 changes: 4 additions & 1 deletion jest.config.ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ module.exports = {
'jest-junit',
{outputDirectory: 'reports/junit', outputName: 'js-test-results.xml'},
],
['jest-silent-reporter', {useDots: true}],
[
'jest-silent-reporter',
{showPaths: true, showWarnings: true, useDots: true},
],
],
};
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.0.0",
"@babel/register": "^7.0.0",
"@jest/test-utils": "^25.1.0",
"@types/babel__core": "^7.0.0",
"@types/babel__generator": "^7.0.0",
"@types/babel__template": "^7.0.0",
Expand Down Expand Up @@ -52,7 +53,7 @@
"istanbul-lib-report": "^3.0.0",
"istanbul-reports": "^3.0.0",
"jest-junit": "^10.0.0",
"jest-silent-reporter": "^0.1.2",
"jest-silent-reporter": "^0.2.1",
"jest-snapshot-serializer-raw": "^1.1.0",
"jest-watch-typeahead": "^0.4.0",
"jquery": "^3.2.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/babel-plugin-jest-hoist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"@types/babel__traverse": "^7.0.6"
},
"devDependencies": {
"@babel/types": "^7.3.3"
"@babel/types": "^7.3.3",
"@types/node": "*"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 2 additions & 1 deletion packages/diff-sequences/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
},
"devDependencies": {
"benchmark": "^2.1.4",
"diff": "^4.0.1"
"diff": "^4.0.1",
"fast-check": "^1.13.0"
},
"publishConfig": {
"access": "public"
Expand Down
3 changes: 3 additions & 0 deletions packages/expect/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"jest-regex-util": "^25.1.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"chalk": "^3.0.0",
"fast-check": "^1.13.0",
"immutable": "^4.0.0-rc.12"
},
"engines": {
Expand Down
2 changes: 2 additions & 0 deletions packages/jest-circus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"throat": "^5.0.0"
},
"devDependencies": {
"@babel/core": "^7.1.0",
"@babel/register": "^7.0.0",
"@jest/test-utils": "^25.1.0",
"@types/babel__traverse": "^7.0.4",
"@types/co": "^4.6.0",
Expand Down
1 change: 1 addition & 0 deletions packages/jest-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"yargs": "^15.0.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"@types/exit": "^0.1.30",
"@types/is-ci": "^2.0.0",
"@types/prompts": "^2.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/jest-cli/src/cli/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {Config} from '@jest/types';
import {isJSONString} from 'jest-config';
import isCI = require('is-ci');

export const check = (argv: Config.Argv): true => {
export function check(argv: Config.Argv): true {
if (argv.runInBand && argv.hasOwnProperty('maxWorkers')) {
throw new Error(
'Both --runInBand and --maxWorkers were specified, but these two ' +
Expand Down Expand Up @@ -61,7 +61,7 @@ export const check = (argv: Config.Argv): true => {
}

return true;
};
}

export const usage =
'Usage: $0 [--config=<pathToConfigFile>] [TestPathPattern]';
Expand Down
3 changes: 3 additions & 0 deletions packages/jest-console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
"jest-util": "^25.1.0",
"slash": "^3.0.0"
},
"devDependencies": {
"@types/node": "*"
},
"engines": {
"node": ">= 8.3"
},
Expand Down
4 changes: 3 additions & 1 deletion packages/jest-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"@types/exit": "^0.1.30",
"@types/graceful-fs": "^4.1.2",
"@types/micromatch": "^4.0.0",
"@types/rimraf": "^2.0.2"
"@types/node": "*",
"@types/rimraf": "^2.0.2",
"jest-snapshot-serializer-raw": "^1.1.0"
},
"engines": {
"node": ">= 8.3"
Expand Down
6 changes: 3 additions & 3 deletions packages/jest-core/src/cli/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const {print: preRunMessagePrint} = preRunMessage;

type OnCompleteCallback = (results: AggregatedResult) => void;

export const runCLI = async (
export async function runCLI(
argv: Config.Argv,
projects: Array<Config.Path>,
): Promise<{
results: AggregatedResult;
globalConfig: Config.GlobalConfig;
}> => {
}> {
const realFs = require('fs');
const fs = require('graceful-fs');
fs.gracefulify(realFs);
Expand Down Expand Up @@ -109,7 +109,7 @@ export const runCLI = async (
}

return {globalConfig, results};
};
}

const buildContextsAndHasteMaps = async (
configs: Array<Config.ProjectConfig>,
Expand Down
1 change: 1 addition & 0 deletions packages/jest-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"pretty-format": "^25.1.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"strip-ansi": "^6.0.0"
},
"engines": {
Expand Down
3 changes: 3 additions & 0 deletions packages/jest-docblock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"dependencies": {
"detect-newline": "^3.0.0"
},
"devDependencies": {
"@types/node": "*"
},
"engines": {
"node": ">= 8.3"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/jest-fake-timers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"lolex": "^5.0.0"
},
"devDependencies": {
"@types/lolex": "^5.1.0"
"@types/lolex": "^5.1.0",
"@types/node": "*"
},
"engines": {
"node": ">= 8.3"
Expand Down
2 changes: 2 additions & 0 deletions packages/jest-haste-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
"walker": "^1.0.7"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"@types/anymatch": "^1.3.1",
"@types/fb-watchman": "^2.0.0",
"@types/graceful-fs": "^4.1.2",
"@types/micromatch": "^4.0.0",
"@types/node": "*",
"@types/sane": "^2.0.0"
},
"optionalDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/jest-jasmine2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"throat": "^5.0.0"
},
"devDependencies": {
"@types/babel__traverse": "^7.0.4"
"@types/babel__traverse": "^7.0.4",
"@types/co": "^4.6.2"
},
"engines": {
"node": ">= 8.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-jasmine2/src/jasmine/Env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ export default function(j$: Jasmine) {
if (arguments.length !== 1 || typeof description !== 'string') {
throw new ErrorWithStack(
'Todo must be called with only a description.',
test.todo,
this.todo,
);
}

Expand Down
4 changes: 4 additions & 0 deletions packages/jest-matcher-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
"jest-get-type": "^25.1.0",
"pretty-format": "^25.1.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"@types/node": "*"
},
"publishConfig": {
"access": "public"
},
Expand Down
3 changes: 3 additions & 0 deletions packages/jest-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
"dependencies": {
"@jest/types": "^25.1.0"
},
"devDependencies": {
"@types/node": "*"
},
"license": "MIT",
"main": "build/index.js",
"types": "build/index.d.ts",
Expand Down
3 changes: 3 additions & 0 deletions packages/jest-regex-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"url": "https://github.com/facebook/jest.git",
"directory": "packages/jest-regex-util"
},
"devDependencies": {
"@types/node": "*"
},
"engines": {
"node": ">= 8.3"
},
Expand Down
1 change: 1 addition & 0 deletions packages/jest-repl/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"yargs": "^15.0.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"@types/yargs": "^15.0.0"
},
"bin": "./bin/jest-repl.js",
Expand Down
6 changes: 4 additions & 2 deletions packages/jest-repl/src/cli/args.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,18 @@
*
*/

import {Options} from 'yargs';
import Runtime = require('jest-runtime');

export const usage = 'Usage: $0 [--config=<pathToConfigFile>]';

export const options = Object.assign({}, Runtime.getCLIOptions(), {
export const options: Record<string, Options> = {
...Runtime.getCLIOptions(),
replname: {
alias: 'r',
description:
'The "name" of the file given to transformers to be ' +
'transformed. For example, "repl.ts" if using a TypeScript transformer.',
type: 'string',
},
});
};
1 change: 1 addition & 0 deletions packages/jest-reporters/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"@types/istanbul-lib-source-maps": "^1.2.1",
"@types/istanbul-reports": "^1.1.0",
"@types/node-notifier": "^5.4.0",
"mock-fs": "^4.4.1",
"strip-ansi": "^6.0.0"
},
"optionalDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/jest-runner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"devDependencies": {
"@types/exit": "^0.1.30",
"@types/graceful-fs": "^4.1.2",
"@types/node": "*",
"@types/source-map-support": "^0.5.0"
},
"engines": {
Expand Down
6 changes: 5 additions & 1 deletion packages/jest-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@
"yargs": "^15.0.0"
},
"devDependencies": {
"@jest/test-utils": "^25.1.0",
"@types/exit": "^0.1.30",
"@types/glob": "^7.1.1",
"@types/graceful-fs": "^4.1.2",
"jest-environment-node": "^25.1.0"
"@types/yargs": "^15.0.3",
"execa": "^3.2.0",
"jest-environment-node": "^25.1.0",
"jest-snapshot-serializer-raw": "^1.1.0"
},
"bin": "./bin/jest-runtime.js",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/jest-runtime/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class Runtime {
return cliRun(args, info);
}

static getCLIOptions() {
static getCLIOptions(): typeof cliOptions {
return cliOptions;
}

Expand Down Expand Up @@ -587,7 +587,7 @@ class Runtime {
this._v8CoverageResult = await this._v8CoverageInstrumenter.stopInstrumenting();
}

getAllCoverageInfoCopy() {
getAllCoverageInfoCopy(): JestEnvironment['global']['__coverage__'] {
return deepCyclicCopy(this._environment.global.__coverage__);
}

Expand Down
3 changes: 3 additions & 0 deletions packages/jest-serializer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"url": "https://github.com/facebook/jest.git",
"directory": "packages/jest-serializer"
},
"devDependencies": {
"@types/node": "*"
},
"engines": {
"node": ">= 8.3"
},
Expand Down
2 changes: 2 additions & 0 deletions packages/jest-snapshot/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
"@babel/traverse": "^7.3.4",
"@types/natural-compare": "^1.4.0",
"@types/semver": "^6.0.1",
"ansi-regex": "^5.0.0",
"ansi-styles": "^4.2.0",
"jest-haste-map": "^25.1.0",
"prettier": "^1.13.4"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/jest-snapshot/src/inline_snapshots.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ export type InlineSnapshot = {
frame: Frame;
};

export const saveInlineSnapshots = (
export function saveInlineSnapshots(
snapshots: Array<InlineSnapshot>,
prettier: typeof import('prettier') | null,
babelTraverse: Function,
): void => {
): void {
if (!prettier) {
throw new Error(
`Jest: Inline Snapshots requires Prettier.\n` +
Expand All @@ -54,7 +54,7 @@ export const saveInlineSnapshots = (
babelTraverse,
);
}
};
}

const saveSnapshotsForFile = (
snapshots: Array<InlineSnapshot>,
Expand Down
3 changes: 2 additions & 1 deletion packages/jest-transform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"@types/graceful-fs": "^4.1.2",
"@types/micromatch": "^4.0.0",
"@types/write-file-atomic": "^3.0.0",
"dedent": "^0.7.0"
"dedent": "^0.7.0",
"jest-snapshot-serializer-raw": "^1.1.0"
},
"engines": {
"node": ">= 8.3"
Expand Down
Loading