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: vendor micromatch under @jest/micromatch #8046

Closed
wants to merge 6 commits into from
Closed
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 .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bin/
flow-typed/**
packages/*/build/**
packages/*/build-es5/**
packages/micromatch/**
website/blog
website/build
website/node_modules
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"types": "build/index.d.ts",
"dependencies": {
"@babel/core": "^7.1.0",
"@jest/micromatch": "^24.1.0",
"@jest/types": "^24.5.0",
"babel-jest": "^24.5.0",
"chalk": "^2.0.1",
Expand All @@ -23,7 +24,6 @@
"jest-resolve": "^24.5.0",
"jest-util": "^24.5.0",
"jest-validate": "^24.5.0",
"micromatch": "^3.1.10",
"pretty-format": "^24.5.0",
"realpath-native": "^1.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-config/src/normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {Config} from '@jest/types';
import {ValidationError, validate} from 'jest-validate';
import {clearLine, replacePathSepForGlob} from 'jest-util';
import chalk from 'chalk';
import micromatch from 'micromatch';
import micromatch from '@jest/micromatch';
import {sync as realpath} from 'realpath-native';
import Resolver from 'jest-resolve';
import {replacePathSepForRegex} from 'jest-regex-util';
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"types": "build/jest.d.ts",
"dependencies": {
"@jest/console": "^24.3.0",
"@jest/micromatch": "^24.1.0",
"@jest/reporters": "^24.5.0",
"@jest/test-result": "^24.5.0",
"@jest/transform": "^24.5.0",
Expand All @@ -26,7 +27,6 @@
"jest-util": "^24.5.0",
"jest-validate": "^24.5.0",
"jest-watcher": "^24.5.0",
"micromatch": "^3.1.10",
"p-each-series": "^1.0.0",
"pirates": "^4.0.1",
"realpath-native": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-core/src/SearchSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import path from 'path';
import micromatch from 'micromatch';
import micromatch from '@jest/micromatch';
import {Context} from 'jest-runtime';
import {Config} from '@jest/types';
import {Test} from 'jest-runner';
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-haste-map/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
"main": "build/index.js",
"types": "build/index.d.ts",
"dependencies": {
"@jest/micromatch": "^24.1.0",
"@jest/types": "^24.5.0",
"fb-watchman": "^2.0.0",
"graceful-fs": "^4.1.15",
"invariant": "^2.2.4",
"jest-serializer": "^24.4.0",
"jest-util": "^24.5.0",
"jest-worker": "^24.4.0",
"micromatch": "^3.1.10",
"sane": "^4.0.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-haste-map/src/HasteFS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

import micromatch from 'micromatch';
import micromatch from '@jest/micromatch';
import {replacePathSepForGlob} from 'jest-util';
import {Config} from '@jest/types';
import {FileData} from './types';
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-message-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"types": "build/index.d.ts",
"dependencies": {
"@babel/code-frame": "^7.0.0",
"@jest/micromatch": "^24.1.0",
"@jest/test-result": "^24.5.0",
"@jest/types": "^24.5.0",
"@types/stack-utils": "^1.0.1",
"chalk": "^2.0.1",
"micromatch": "^3.1.10",
"slash": "^2.0.0",
"stack-utils": "^1.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-message-util/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import path from 'path';
import {Config} from '@jest/types';
import {AssertionResult, SerializableError} from '@jest/test-result';
import chalk from 'chalk';
import micromatch from 'micromatch';
import micromatch from '@jest/micromatch';
import slash from 'slash';
import {codeFrameColumns} from '@babel/code-frame';
import StackUtils from 'stack-utils';
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-transform/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"main": "build/index.js",
"dependencies": {
"@babel/core": "^7.1.0",
"@jest/micromatch": "^24.1.0",
"@jest/types": "^24.5.0",
"babel-plugin-istanbul": "^5.1.0",
"chalk": "^2.0.1",
Expand All @@ -19,7 +20,6 @@
"jest-haste-map": "^24.5.0",
"jest-regex-util": "^24.3.0",
"jest-util": "^24.5.0",
"micromatch": "^3.1.10",
"realpath-native": "^1.1.0",
"slash": "^2.0.0",
"source-map": "^0.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-transform/src/shouldInstrument.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import path from 'path';
import {Config} from '@jest/types';
import {escapePathForRegex} from 'jest-regex-util';
import {replacePathSepForGlob} from 'jest-util';
import micromatch from 'micromatch';
import micromatch from '@jest/micromatch';
import {ShouldInstrumentOptions} from './types';

const MOCKS_PATTERN = new RegExp(
Expand Down
2 changes: 2 additions & 0 deletions packages/micromatch/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import micromatch = require('micromatch');
export default micromatch;
Loading