Skip to content

Commit fd9787e

Browse files
cpojerfacebook-github-bot
authored andcommitted
Remove fbjs-scripts in favor of @jest/create-cache-key-function
Summary: Changelog: [Internal] Reviewed By: GijsWeterings Differential Revision: D24129817 fbshipit-source-id: fe1c4a8abdb1cc73b031120b1f8f9722d04ba620
1 parent dffb61d commit fd9787e

File tree

4 files changed

+16
-127
lines changed

4 files changed

+16
-127
lines changed

jest/assetFileTransformer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
/* eslint-env node */
1313

1414
const path = require('path');
15-
const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
15+
const createCacheKeyFunction = require('@jest/create-cache-key-function')
16+
.default;
1617

1718
module.exports = {
1819
// Mocks asset requires to return the filename. Makes it possible to test that
@@ -21,7 +22,7 @@ module.exports = {
2122
// the Jest snapshot.
2223
process: (_, filename) =>
2324
`module.exports = {
24-
testUri:
25+
testUri:
2526
${JSON.stringify(
2627
path.relative(__dirname, filename).replace(/\\/g, '/'),
2728
)}

jest/preprocessor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
'use strict';
1414

1515
const babelRegisterOnly = require('metro-babel-register');
16-
const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
16+
const createCacheKeyFunction = require('@jest/create-cache-key-function')
17+
.default;
1718

1819
const {transformSync: babelTransformSync} = require('@babel/core');
1920
const generate = require('@babel/generator').default;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
"react": "16.13.1"
8585
},
8686
"dependencies": {
87+
"@jest/create-cache-key-function": "^26.5.0",
8788
"@react-native-community/cli": "^4.13.0",
8889
"@react-native-community/cli-platform-android": "^4.13.0",
8990
"@react-native-community/cli-platform-ios": "^4.13.0",
@@ -94,7 +95,6 @@
9495
"anser": "^1.4.9",
9596
"base64-js": "^1.1.2",
9697
"event-target-shim": "^5.0.1",
97-
"fbjs-scripts": "^1.1.0",
9898
"hermes-engine": "~0.7.0",
9999
"invariant": "^2.2.4",
100100
"jsc-android": "^245459.0.0",

yarn.lock

Lines changed: 10 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -848,6 +848,11 @@
848848
slash "^3.0.0"
849849
strip-ansi "^6.0.0"
850850

851+
"@jest/create-cache-key-function@^26.5.0":
852+
version "26.5.0"
853+
resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.5.0.tgz#1d07947adc51ea17766d9f0ccf5a8d6ea94c47dc"
854+
integrity sha512-DJ+pEBUIqarrbv1W/C39f9YH0rJ4wsXZ/VC6JafJPlHW2HOucKceeaqTOQj9MEDQZjySxMLkOq5mfXZXNZcmWw==
855+
851856
"@jest/environment@^26.3.0":
852857
version "26.3.0"
853858
resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
@@ -1346,20 +1351,6 @@ anser@^1.4.9:
13461351
resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
13471352
integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
13481353

1349-
ansi-colors@^1.0.1:
1350-
version "1.1.0"
1351-
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
1352-
integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
1353-
dependencies:
1354-
ansi-wrap "^0.1.0"
1355-
1356-
ansi-cyan@^0.1.1:
1357-
version "0.1.1"
1358-
resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
1359-
integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
1360-
dependencies:
1361-
ansi-wrap "0.1.0"
1362-
13631354
ansi-escapes@^3.0.0:
13641355
version "3.1.0"
13651356
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -1381,20 +1372,6 @@ ansi-fragments@^0.2.1:
13811372
slice-ansi "^2.0.0"
13821373
strip-ansi "^5.0.0"
13831374

1384-
ansi-gray@^0.1.1:
1385-
version "0.1.1"
1386-
resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
1387-
integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
1388-
dependencies:
1389-
ansi-wrap "0.1.0"
1390-
1391-
ansi-red@^0.1.1:
1392-
version "0.1.1"
1393-
resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
1394-
integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
1395-
dependencies:
1396-
ansi-wrap "0.1.0"
1397-
13981375
ansi-regex@^2.0.0:
13991376
version "2.1.1"
14001377
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1430,11 +1407,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
14301407
"@types/color-name" "^1.1.1"
14311408
color-convert "^2.0.1"
14321409

1433-
ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
1434-
version "0.1.0"
1435-
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
1436-
integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
1437-
14381410
anymatch@^2.0.0:
14391411
version "2.0.0"
14401412
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1479,29 +1451,16 @@ aria-query@^3.0.0:
14791451
ast-types-flow "0.0.7"
14801452
commander "^2.11.0"
14811453

1482-
arr-diff@^1.0.1:
1483-
version "1.1.0"
1484-
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
1485-
integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
1486-
dependencies:
1487-
arr-flatten "^1.0.1"
1488-
array-slice "^0.2.3"
1489-
14901454
arr-diff@^4.0.0:
14911455
version "4.0.0"
14921456
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
14931457
integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
14941458

1495-
arr-flatten@^1.0.1, arr-flatten@^1.1.0:
1459+
arr-flatten@^1.1.0:
14961460
version "1.1.0"
14971461
resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
14981462
integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
14991463

1500-
arr-union@^2.0.1:
1501-
version "2.1.0"
1502-
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
1503-
integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
1504-
15051464
arr-union@^3.1.0:
15061465
version "3.1.0"
15071466
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -1530,11 +1489,6 @@ array-reduce@~0.0.0:
15301489
resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
15311490
integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
15321491

1533-
array-slice@^0.2.3:
1534-
version "0.2.3"
1535-
resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
1536-
integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
1537-
15381492
array-unique@^0.3.2:
15391493
version "0.3.2"
15401494
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1704,7 +1658,7 @@ babel-preset-current-node-syntax@^0.1.3:
17041658
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
17051659
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
17061660

1707-
babel-preset-fbjs@^3.0.0, babel-preset-fbjs@^3.3.0:
1661+
babel-preset-fbjs@^3.3.0:
17081662
version "3.3.0"
17091663
resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
17101664
integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
@@ -2117,11 +2071,6 @@ color-name@~1.1.4:
21172071
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
21182072
integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
21192073

2120-
color-support@^1.1.3:
2121-
version "1.1.3"
2122-
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
2123-
integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
2124-
21252074
colorette@^1.0.7:
21262075
version "1.0.7"
21272076
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.0.7.tgz#7adf43c445ee63a541b4a4aef7d13f03df1e0cc0"
@@ -2266,15 +2215,6 @@ cross-spawn@^4.0.2:
22662215
lru-cache "^4.0.1"
22672216
which "^1.2.9"
22682217

2269-
cross-spawn@^5.1.0:
2270-
version "5.1.0"
2271-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
2272-
integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
2273-
dependencies:
2274-
lru-cache "^4.0.1"
2275-
shebang-command "^1.2.0"
2276-
which "^1.2.9"
2277-
22782218
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
22792219
version "6.0.5"
22802220
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2934,13 +2874,6 @@ expect@^26.4.2:
29342874
jest-message-util "^26.3.0"
29352875
jest-regex-util "^26.0.0"
29362876

2937-
extend-shallow@^1.1.2:
2938-
version "1.1.4"
2939-
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
2940-
integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
2941-
dependencies:
2942-
kind-of "^1.1.0"
2943-
29442877
extend-shallow@^2.0.1:
29452878
version "2.0.1"
29462879
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2998,15 +2931,6 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
29982931
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
29992932
integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
30002933

3001-
fancy-log@^1.3.2:
3002-
version "1.3.2"
3003-
resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
3004-
integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
3005-
dependencies:
3006-
ansi-gray "^0.1.1"
3007-
color-support "^1.1.3"
3008-
time-stamp "^1.0.0"
3009-
30102934
fast-deep-equal@^3.1.1:
30112935
version "3.1.1"
30122936
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -3039,22 +2963,6 @@ fbjs-css-vars@^1.0.0:
30392963
resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz#836d876e887d702f45610f5ebd2fbeef649527fc"
30402964
integrity sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==
30412965

3042-
fbjs-scripts@^1.1.0:
3043-
version "1.1.0"
3044-
resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.1.0.tgz#d9e855aed19b572be9dfe39da70d8aece724eed9"
3045-
integrity sha512-VMCpHJd76YI2nYOfVM/d9LDAIFTH4uw4/7sAIGEgxk6kaNmirgTY9bLgpla9DTu+DvV2+ufvDxehGbl2U9bYCA==
3046-
dependencies:
3047-
"@babel/core" "^7.0.0"
3048-
ansi-colors "^1.0.1"
3049-
babel-preset-fbjs "^3.0.0"
3050-
core-js "^2.4.1"
3051-
cross-spawn "^5.1.0"
3052-
fancy-log "^1.3.2"
3053-
object-assign "^4.0.1"
3054-
plugin-error "^0.1.2"
3055-
semver "^5.1.0"
3056-
through2 "^2.0.0"
3057-
30582966
fbjs@^1.0.0:
30592967
version "1.0.0"
30602968
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
@@ -4588,11 +4496,6 @@ jsx-ast-utils@^2.0.1:
45884496
dependencies:
45894497
array-includes "^3.0.3"
45904498

4591-
kind-of@^1.1.0:
4592-
version "1.1.0"
4593-
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
4594-
integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
4595-
45964499
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
45974500
version "3.2.2"
45984501
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5488,7 +5391,7 @@ ob1@0.63.0:
54885391
resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.63.0.tgz#2f34b178b5918028a0d76072a7b155b91f9cb6bd"
54895392
integrity sha512-y7AtRIuISHuA5sc0Alcw/Cj2azU1ruuAmJIKSKk//IryxmHtmyA/M5DFcmpDAisaIB255bBt/P9aqc8jr1ocsg==
54905393

5491-
object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
5394+
object-assign@^4.1.0, object-assign@^4.1.1:
54925395
version "4.1.1"
54935396
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
54945397
integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5810,17 +5713,6 @@ plist@^3.0.1:
58105713
xmlbuilder "^9.0.7"
58115714
xmldom "0.1.x"
58125715

5813-
plugin-error@^0.1.2:
5814-
version "0.1.2"
5815-
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
5816-
integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
5817-
dependencies:
5818-
ansi-cyan "^0.1.1"
5819-
ansi-red "^0.1.1"
5820-
arr-diff "^1.0.1"
5821-
arr-union "^2.0.1"
5822-
extend-shallow "^1.1.2"
5823-
58245716
posix-character-classes@^0.1.0:
58255717
version "0.1.1"
58265718
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6383,7 +6275,7 @@ scheduler@0.19.1, scheduler@^0.19.1:
63836275
loose-envify "^1.1.0"
63846276
object-assign "^4.1.1"
63856277

6386-
"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
6278+
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
63876279
version "5.7.1"
63886280
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
63896281
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6977,7 +6869,7 @@ throat@^5.0.0:
69776869
resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
69786870
integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
69796871

6980-
through2@^2.0.0, through2@^2.0.1:
6872+
through2@^2.0.1:
69816873
version "2.0.5"
69826874
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
69836875
integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -6990,11 +6882,6 @@ through@^2.3.6:
69906882
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
69916883
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
69926884

6993-
time-stamp@^1.0.0:
6994-
version "1.1.0"
6995-
resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
6996-
integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
6997-
69986885
tmp@^0.0.33:
69996886
version "0.0.33"
70006887
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"

0 commit comments

Comments
 (0)