From fa9002655c2a0fea1d11fc5496ef5b9bd054d4e6 Mon Sep 17 00:00:00 2001 From: Hoishin Date: Tue, 26 Mar 2019 19:44:48 +0900 Subject: [PATCH 1/5] chore(dependencies): move internal dependencies from peer to dependencies --- packages/jest-resolve-dependencies/package.json | 8 ++------ packages/jest-resolve/package.json | 7 ++----- packages/jest-snapshot/package.json | 5 +---- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/packages/jest-resolve-dependencies/package.json b/packages/jest-resolve-dependencies/package.json index 75bfe8374613..25f44591e534 100644 --- a/packages/jest-resolve-dependencies/package.json +++ b/packages/jest-resolve-dependencies/package.json @@ -11,18 +11,14 @@ "types": "build/index.d.ts", "dependencies": { "@jest/types": "^24.5.0", + "jest-haste-map": "^24.5.0", "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.5.0", "jest-snapshot": "^24.5.0" }, "devDependencies": { - "jest-haste-map": "^24.5.0", - "jest-resolve": "^24.5.0", "jest-runtime": "^24.5.0" }, - "peerDependencies": { - "jest-haste-map": "^24.0.0", - "jest-resolve": "^24.1.0" - }, "engines": { "node": ">= 6" }, diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index 0ba9af0062f4..455f90300e8f 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -13,15 +13,12 @@ "@jest/types": "^24.5.0", "browser-resolve": "^1.11.3", "chalk": "^2.0.1", + "jest-haste-map": "^24.5.0", "jest-pnp-resolver": "^1.2.1", "realpath-native": "^1.1.0" }, "devDependencies": { - "@types/browser-resolve": "^0.0.5", - "jest-haste-map": "^24.5.0" - }, - "peerDependencies": { - "jest-haste-map": "^24.0.0" + "@types/browser-resolve": "^0.0.5" }, "engines": { "node": ">= 6" diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index c6c28de213a2..261980d3c8f6 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -15,6 +15,7 @@ "chalk": "^2.0.1", "expect": "^24.5.0", "jest-diff": "^24.5.0", + "jest-haste-map": "^24.5.0", "jest-matcher-utils": "^24.5.0", "jest-message-util": "^24.5.0", "jest-resolve": "^24.5.0", @@ -23,15 +24,11 @@ "pretty-format": "^24.5.0", "semver": "^5.5.0" }, - "peerDependencies": { - "jest-haste-map": "^24.0.0" - }, "devDependencies": { "@types/mkdirp": "^0.5.2", "@types/natural-compare": "^1.4.0", "@types/prettier": "^1.16.1", "@types/semver": "^5.5.0", - "jest-haste-map": "^24.5.0", "prettier": "^1.13.4" }, "engines": { From ab893e4b2f5b4daab9d83f8f71a712232b3dd462 Mon Sep 17 00:00:00 2001 From: Hoishin Date: Tue, 26 Mar 2019 19:54:40 +0900 Subject: [PATCH 2/5] update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 944c19d56f65..672a39bda887 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ - `[pretty-format]` Print `BigInt` as a readable number instead of `{}` ([#8138](https://github.com/facebook/jest/pull/8138)) - `[jest-core]` Fix ability to transform dependencies required from globalSetup script [#8143](https://github.com/facebook/jest/pull/8143) - `[@jest/reporters]` Fix Cannot read property converageData of null ([#8168](https://github.com/facebook/jest/pull/8168)) +- `[jest-resolve-dependencies]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) +- `[jest-resolve]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) +- `[jest-snapshot]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) ### Chore & Maintenance From e171279f2e95452f1d66776cfea7359bcba4dce2 Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Tue, 26 Mar 2019 20:13:23 +0900 Subject: [PATCH 3/5] Revert "update changelog" This reverts commit ab893e4b2f5b4daab9d83f8f71a712232b3dd462. --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8db9b63b284c..944c19d56f65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,10 +20,6 @@ - `[pretty-format]` Print `BigInt` as a readable number instead of `{}` ([#8138](https://github.com/facebook/jest/pull/8138)) - `[jest-core]` Fix ability to transform dependencies required from globalSetup script [#8143](https://github.com/facebook/jest/pull/8143) - `[@jest/reporters]` Fix Cannot read property converageData of null ([#8168](https://github.com/facebook/jest/pull/8168)) -- `[jest-worker]` `JEST_WORKER_ID` starts at 1 ([#8205](https://github.com/facebook/jest/pull/8205)) -- `[jest-resolve-dependencies]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) -- `[jest-resolve]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) -- `[jest-snapshot]`: Move internal peer dependencies to dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) ### Chore & Maintenance From d0aa69da08bd9d5617f497fcdee53e72d9db3834 Mon Sep 17 00:00:00 2001 From: Hoishin Date: Tue, 26 Mar 2019 19:44:48 +0900 Subject: [PATCH 4/5] Revert "chore(dependencies): move internal dependencies from peer to dependencies" This reverts commit fa9002655c2a0fea1d11fc5496ef5b9bd054d4e6. --- packages/jest-resolve-dependencies/package.json | 8 ++++++-- packages/jest-resolve/package.json | 7 +++++-- packages/jest-snapshot/package.json | 5 ++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/jest-resolve-dependencies/package.json b/packages/jest-resolve-dependencies/package.json index 25f44591e534..75bfe8374613 100644 --- a/packages/jest-resolve-dependencies/package.json +++ b/packages/jest-resolve-dependencies/package.json @@ -11,14 +11,18 @@ "types": "build/index.d.ts", "dependencies": { "@jest/types": "^24.5.0", - "jest-haste-map": "^24.5.0", "jest-regex-util": "^24.3.0", - "jest-resolve": "^24.5.0", "jest-snapshot": "^24.5.0" }, "devDependencies": { + "jest-haste-map": "^24.5.0", + "jest-resolve": "^24.5.0", "jest-runtime": "^24.5.0" }, + "peerDependencies": { + "jest-haste-map": "^24.0.0", + "jest-resolve": "^24.1.0" + }, "engines": { "node": ">= 6" }, diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index 455f90300e8f..0ba9af0062f4 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -13,12 +13,15 @@ "@jest/types": "^24.5.0", "browser-resolve": "^1.11.3", "chalk": "^2.0.1", - "jest-haste-map": "^24.5.0", "jest-pnp-resolver": "^1.2.1", "realpath-native": "^1.1.0" }, "devDependencies": { - "@types/browser-resolve": "^0.0.5" + "@types/browser-resolve": "^0.0.5", + "jest-haste-map": "^24.5.0" + }, + "peerDependencies": { + "jest-haste-map": "^24.0.0" }, "engines": { "node": ">= 6" diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index 261980d3c8f6..c6c28de213a2 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -15,7 +15,6 @@ "chalk": "^2.0.1", "expect": "^24.5.0", "jest-diff": "^24.5.0", - "jest-haste-map": "^24.5.0", "jest-matcher-utils": "^24.5.0", "jest-message-util": "^24.5.0", "jest-resolve": "^24.5.0", @@ -24,11 +23,15 @@ "pretty-format": "^24.5.0", "semver": "^5.5.0" }, + "peerDependencies": { + "jest-haste-map": "^24.0.0" + }, "devDependencies": { "@types/mkdirp": "^0.5.2", "@types/natural-compare": "^1.4.0", "@types/prettier": "^1.16.1", "@types/semver": "^5.5.0", + "jest-haste-map": "^24.5.0", "prettier": "^1.13.4" }, "engines": { From e69dcf9d32c8ded7881d1cf1fec59fbb6faa5126 Mon Sep 17 00:00:00 2001 From: Keiichiro Amemiya Date: Tue, 26 Mar 2019 20:27:57 +0900 Subject: [PATCH 5/5] Remove monorepo internal dependencies --- CHANGELOG.md | 3 +++ packages/jest-resolve-dependencies/package.json | 4 ---- packages/jest-resolve-dependencies/src/index.ts | 4 ++-- packages/jest-resolve/package.json | 3 --- packages/jest-resolve/src/index.ts | 2 +- packages/jest-snapshot/package.json | 3 --- packages/jest-snapshot/src/index.ts | 2 +- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 944c19d56f65..bad0185960de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,9 @@ - `[pretty-format]` Print `BigInt` as a readable number instead of `{}` ([#8138](https://github.com/facebook/jest/pull/8138)) - `[jest-core]` Fix ability to transform dependencies required from globalSetup script [#8143](https://github.com/facebook/jest/pull/8143) - `[@jest/reporters]` Fix Cannot read property converageData of null ([#8168](https://github.com/facebook/jest/pull/8168)) +- `[jest-resolve-dependencies]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) +- `[jest-resolve]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) +- `[jest-snapshot]`: Remove internal peer dependencies ([#8215](https://github.com/facebook/jest/pull/8215)) ### Chore & Maintenance diff --git a/packages/jest-resolve-dependencies/package.json b/packages/jest-resolve-dependencies/package.json index 75bfe8374613..40d175990326 100644 --- a/packages/jest-resolve-dependencies/package.json +++ b/packages/jest-resolve-dependencies/package.json @@ -19,10 +19,6 @@ "jest-resolve": "^24.5.0", "jest-runtime": "^24.5.0" }, - "peerDependencies": { - "jest-haste-map": "^24.0.0", - "jest-resolve": "^24.1.0" - }, "engines": { "node": ">= 6" }, diff --git a/packages/jest-resolve-dependencies/src/index.ts b/packages/jest-resolve-dependencies/src/index.ts index a3bad4d4965b..0454d2205787 100644 --- a/packages/jest-resolve-dependencies/src/index.ts +++ b/packages/jest-resolve-dependencies/src/index.ts @@ -6,8 +6,8 @@ */ import {Config} from '@jest/types'; -import {FS as HasteFS} from 'jest-haste-map'; -import Resolver from 'jest-resolve'; +import {FS as HasteFS} from 'jest-haste-map'; // eslint-disable-line import/no-extraneous-dependencies +import Resolver from 'jest-resolve'; // eslint-disable-line import/no-extraneous-dependencies import {isSnapshotPath, SnapshotResolver} from 'jest-snapshot'; namespace DependencyResolver { diff --git a/packages/jest-resolve/package.json b/packages/jest-resolve/package.json index 0ba9af0062f4..c75468e6448f 100644 --- a/packages/jest-resolve/package.json +++ b/packages/jest-resolve/package.json @@ -20,9 +20,6 @@ "@types/browser-resolve": "^0.0.5", "jest-haste-map": "^24.5.0" }, - "peerDependencies": { - "jest-haste-map": "^24.0.0" - }, "engines": { "node": ">= 6" }, diff --git a/packages/jest-resolve/src/index.ts b/packages/jest-resolve/src/index.ts index 658995ce2d0a..857325fc8d85 100644 --- a/packages/jest-resolve/src/index.ts +++ b/packages/jest-resolve/src/index.ts @@ -7,7 +7,7 @@ import path from 'path'; import {Config} from '@jest/types'; -import {ModuleMap} from 'jest-haste-map'; +import {ModuleMap} from 'jest-haste-map'; // eslint-disable-line import/no-extraneous-dependencies import {sync as realpath} from 'realpath-native'; import chalk from 'chalk'; import nodeModulesPaths from './nodeModulesPaths'; diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index c6c28de213a2..ccc9ac28eea9 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -23,9 +23,6 @@ "pretty-format": "^24.5.0", "semver": "^5.5.0" }, - "peerDependencies": { - "jest-haste-map": "^24.0.0" - }, "devDependencies": { "@types/mkdirp": "^0.5.2", "@types/natural-compare": "^1.4.0", diff --git a/packages/jest-snapshot/src/index.ts b/packages/jest-snapshot/src/index.ts index 59ec5af859bc..8d3d12398c8f 100644 --- a/packages/jest-snapshot/src/index.ts +++ b/packages/jest-snapshot/src/index.ts @@ -7,7 +7,7 @@ import fs from 'fs'; import {Config} from '@jest/types'; -import {FS as HasteFS} from 'jest-haste-map'; +import {FS as HasteFS} from 'jest-haste-map'; // eslint-disable-line import/no-extraneous-dependencies import {MatcherState} from 'expect'; import diff from 'jest-diff';