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(jest-resolve): replace process.versions.pnp type declaration with @types/pnpapi devDependency #12783

Merged
merged 5 commits into from
Apr 30, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Chore & Maintenance

- `[@jest-reporters]` Move helper functions from `utils.ts` into separate files ([#12782](https://github.com/facebook/jest/pull/12782))
- `[jest-resolve]` Replace `process.versions.pnp` type declaration with `@types/pnpapi` devDependency ([#12783](https://github.com/facebook/jest/pull/12783))

### Performance

Expand Down
1 change: 1 addition & 0 deletions packages/jest-resolve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"devDependencies": {
"@tsd/typescript": "~4.6.2",
"@types/graceful-fs": "^4.1.3",
"@types/pnpapi": "^0.0.2",
"@types/resolve": "^1.20.2",
"tsd-lite": "^0.5.1"
},
Expand Down
9 changes: 0 additions & 9 deletions packages/jest-resolve/src/defaultResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,6 @@ export type AsyncResolver = (

export type Resolver = SyncResolver | AsyncResolver;

// https://github.com/facebook/jest/pull/10617
declare global {
namespace NodeJS {
export interface ProcessVersions {
pnp?: any;
}
}
}

const defaultResolver: SyncResolver = (path, options) => {
// Yarn 2 adds support to `resolve` automatically so the pnpResolver is only
// needed for Yarn 1 which implements version 1 of the pnp spec
Expand Down
8 changes: 4 additions & 4 deletions packages/jest-util/src/preRunMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import chalk = require('chalk');
import clearLine from './clearLine';
import isInteractive from './isInteractive';

export const print = (stream: NodeJS.WriteStream): void => {
export function print(stream: NodeJS.WriteStream): void {
if (isInteractive) {
stream.write(chalk.bold.dim('Determining test suites to run...'));
}
};
}

export const remove = (stream: NodeJS.WriteStream): void => {
export function remove(stream: NodeJS.WriteStream): void {
if (isInteractive) {
clearLine(stream);
}
};
}
12 changes: 6 additions & 6 deletions packages/jest-watcher/src/lib/patternModeHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ import ansiEscapes = require('ansi-escapes');
import chalk = require('chalk');
import stringLength = require('string-length');

export const printPatternCaret = (
export function printPatternCaret(
pattern: string,
pipe: NodeJS.WritableStream,
): void => {
): void {
const inputText = `${chalk.dim(' pattern \u203A')} ${pattern}`;

pipe.write(ansiEscapes.eraseDown);
pipe.write(inputText);
pipe.write(ansiEscapes.cursorSavePosition);
};
}

export const printRestoredPatternCaret = (
export function printRestoredPatternCaret(
pattern: string,
currentUsageRows: number,
pipe: NodeJS.WritableStream,
): void => {
): void {
const inputText = `${chalk.dim(' pattern \u203A')} ${pattern}`;

pipe.write(
ansiEscapes.cursorTo(stringLength(inputText), currentUsageRows - 1),
);
pipe.write(ansiEscapes.cursorRestorePosition);
};
}
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5221,6 +5221,13 @@ __metadata:
languageName: node
linkType: hard

"@types/pnpapi@npm:^0.0.2":
version: 0.0.2
resolution: "@types/pnpapi@npm:0.0.2"
checksum: b58ec37cfaebe99ca7d1fa3200c57d8f8d51da58f6152c1b8ef6d03e00fa8595a937ae36234a0ff6f52306740bf4ddfd2633d62d5693eb9af41edb6181ef3d02
languageName: node
linkType: hard

"@types/prettier@npm:*, @types/prettier@npm:^2.1.5":
version: 2.4.4
resolution: "@types/prettier@npm:2.4.4"
Expand Down Expand Up @@ -13392,6 +13399,7 @@ __metadata:
dependencies:
"@tsd/typescript": ~4.6.2
"@types/graceful-fs": ^4.1.3
"@types/pnpapi": ^0.0.2
"@types/resolve": ^1.20.2
chalk: ^4.0.0
graceful-fs: ^4.2.9
Expand Down