Skip to content

Commit d3aef65

Browse files
authored
Upgrade to NPM 8.1 (#316)
* Upgrade to NPM 8.1
1 parent c18aac5 commit d3aef65

File tree

10 files changed

+72996
-1754
lines changed

10 files changed

+72996
-1754
lines changed

Apps/PackageTest/0.63.1/package-lock.json

Lines changed: 15493 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Apps/PackageTest/0.64.0/package-lock.json

Lines changed: 17141 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Apps/Playground/ios/Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ SPEC CHECKSUMS:
469469
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
470470
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
471471
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
472-
FBReactNativeSpec: 41c2862d3cf2b290d1e02d6e871a482e2979677b
472+
FBReactNativeSpec: 1bd5828a2fe244ae5237884ef2d1b7cca26d1599
473473
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
474474
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
475475
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
@@ -480,7 +480,7 @@ SPEC CHECKSUMS:
480480
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
481481
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
482482
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
483-
Permission-Camera: 358081c7b8210849958af181ce9ddeb11932aa82
483+
Permission-Camera: 119b01de97a5b3edb637999e38476b68143b9d17
484484
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
485485
RCTRequired: ec2ebc96b7bfba3ca5c32740f5a0c6a014a274d2
486486
RCTTypeSafety: 22567f31e67c3e088c7ac23ea46ab6d4779c0ea5
@@ -492,8 +492,8 @@ SPEC CHECKSUMS:
492492
React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
493493
React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
494494
React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
495-
react-native-babylon: 55ec3f5e14b0baa1ae5978334b8faa58842abe68
496-
react-native-slider: e45c8376012e5ace012e5eef62e9c85c68e50a0f
495+
react-native-babylon: b5496ddaa5c53c76791a34ce50751802153e1b5e
496+
react-native-slider: ae891b9fca8c9b4a99691f6d45731f0ef2bb1866
497497
React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
498498
React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a
499499
React-RCTAnimation: ba0a1c3a2738be224a08092fa7f1b444ab77d309
@@ -506,7 +506,7 @@ SPEC CHECKSUMS:
506506
React-RCTVibration: 4b99a7f5c6c0abbc5256410cc5425fb8531986e1
507507
React-runtimeexecutor: ff951a0c241bfaefc4940a3f1f1a229e7cb32fa6
508508
ReactCommon: bedc99ed4dae329c4fcf128d0c31b9115e5365ca
509-
RNPermissions: 350964d19150b183796a88180fb7ec62a1e41422
509+
RNPermissions: 99dd8d4a30ff13509b949ca63cd1f69edc461775
510510
Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
511511
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
512512

Apps/Playground/metro.config.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,13 @@ function processModuleSymLinks() {
4242
const packageInfoData = fs.readFileSync(packagePath);
4343
const packageInfo = JSON.parse(packageInfoData);
4444

45-
// Search for any dev dependencies of the package. They should be excluded from metro so the packages don't get
46-
// imported twice in the bundle
47-
for (const devDependency in packageInfo.devDependencies) {
45+
const dependencies = packageInfo.dependencies ? Object.keys(packageInfo.dependencies) : [];
46+
const peerDependencies = packageInfo.peerDependencies ? Object.keys(packageInfo.peerDependencies) : [];
47+
const devDependencies = packageInfo.devDependencies ? Object.keys(packageInfo.devDependencies) : [];
48+
49+
// Exclude dependencies that appear in devDependencies or peerDependencies but not in dependencies. Otherwise,
50+
// the metro bundler will package those devDependencies/peerDependencies as unintended copies.
51+
for (const devDependency of devDependencies.concat(peerDependencies).filter(dependency => !dependencies.includes(dependency))) {
4852
moduleExclusions.push(new RegExp(escapeRegExp(path.join(linkPath, "node_modules", devDependency)) + "\/.*"));
4953
}
5054
}

0 commit comments

Comments
 (0)