Skip to content

chore: use yarn pnpm mode #2366

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
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
935 changes: 935 additions & 0 deletions .yarn/releases/yarn-4.7.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules
nodeLinker: pnpm

yarnPath: .yarn/releases/yarn-4.9.0.cjs
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,9 @@
"hermes-eslint": "0.25.1",
"hermes-transform": "0.25.1",
"inquirer": "^7.1.0",
"invariant": "^2.2.4",
"jest": "^29.6.3",
"jest-config": "^29.7.0",
"jest-diff": "^29.7.0",
"jest-junit": "^10.0.0",
"jest-snapshot": "^29.7.0",
Expand Down
23 changes: 6 additions & 17 deletions packages/react-native/local-cli/runMacOS/runMacOS.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,8 @@

const chalk = require('chalk');
const child_process = require('child_process');
const { error } = require('console');
const path = require('path');
const {logger, CLIError, getDefaultUserTerminal} = (() => {
const cli = require.resolve('@react-native-community/cli/package.json');
const options = {paths: [path.dirname(cli)]};
const tools = require.resolve('@react-native-community/cli-tools', options);
return require(tools);
})();

/**
* @param {string} sourceDir
Expand All @@ -59,7 +54,7 @@ function getXcodeProjectPath(sourceDir, xcodeProject) {
*/
function parseArgs(ctx, args) {
if (args.configuration) {
logger.warn(
console.warn(
'Argument --configuration has been deprecated and will be removed in a future release, please use --mode instead.',
);

Expand All @@ -70,13 +65,13 @@ function parseArgs(ctx, args) {

const {sourceDir, xcodeProject} = ctx.project?.macos ?? {};
if (!sourceDir) {
throw new CLIError(
throw new error(
'macOS project folder not found. Are you sure this is a React Native project?',
);
}

if (!xcodeProject) {
throw new CLIError(
throw new error(
'Xcode project for macOS not found. Did you forget to run `pod install`?',
);
}
Expand Down Expand Up @@ -220,7 +215,7 @@ function buildProject(sourceDir, xcodeProject, scheme, args) {
}
if (code !== 0) {
reject(
new CLIError(
new error(
`
Failed to build macOS project.

Expand Down Expand Up @@ -273,7 +268,7 @@ function getBuildSettings(sourceDir, xcodeProject, configuration, scheme) {
}
}

throw new CLIError('Failed to get the target build settings.');
throw new error('Failed to get the target build settings.');
}

function xcprettyAvailable() {
Expand Down Expand Up @@ -374,12 +369,6 @@ module.exports = [
default: process.env.RCT_METRO_PORT || 8081,
parse: (/** @type {string} */ val) => Number(val),
},
{
name: '--terminal [string]',
description:
'Launches the Metro Bundler in a new window using the specified terminal path.',
default: getDefaultUserTerminal,
},
],
},
];
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
},
"dependencies": {
"@jest/create-cache-key-function": "^29.6.3",
"@react-native-community/cli-platform-apple": "^17.0.0",
"@react-native-mac/virtualized-lists": "workspace:*",
"@react-native/assets-registry": "0.77.0-main",
"@react-native/codegen": "0.77.0-main",
Expand Down
118 changes: 59 additions & 59 deletions packages/rn-tester/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1840,7 +1840,7 @@ SPEC CHECKSUMS:
boost: 7d49a506d1ac47358fea28558d184dd6431170ca
DoubleConversion: 10f51d3e1238973c033faac2d84c0ea114942f53
fast_float: 44983b3bddb2d2ed3021a98be86f60ec8abc9ffd
FBLazyVector: 7957081d13d3354df9c2a3ecd2d8518718da5180
FBLazyVector: 2636e9ef11cad35934d4182642872d0b53d38377
fmt: f6af2d677a106e3e44c9536a4c0c7f03ab53c854
glog: b7594b792ee4e02ed1f44b01d046ca25fa713e3d
MyNativeView: 220b07fdb474463617228482de814e5e1c6f6665
Expand All @@ -1849,67 +1849,67 @@ SPEC CHECKSUMS:
OSSLibraryExample: 2cea5ca49141236e00068c598a0173f773200be4
RCT-Folly: e8b53d8c0d2d9df4a6a8b0a368a1a91fc62a88cb
RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
RCTRequired: 06a896e2aebd14632686c52d795d25e6b22d55d7
RCTTypeSafety: 20df90ec91442cb348c2215bd1da368c9fa2c141
React: 2819b8409f873370e0ddb532075ad1617acb5ddd
React-callinvoker: 293133663ff5be25c57c10628cbc4de6840519ae
React-Core: e5394534bab6680a8e64ec7a4b07aa530ec27997
React-CoreModules: 841231ab7084fe2cb06c746a17d4851325977d07
React-cxxreact: 3a64078df398e504f998d1b8376e3dcf3c3a6ec5
React-debug: a436d27c2c657a51ea0edd86ae325d510ab8cfd8
React-defaultsnativemodule: 220e915826d8b238f0b486bdabda837443fa8711
React-domnativemodule: 2f1e8075d30424d736936b484d13489c89011e4a
React-Fabric: d024562bf23f21a8d8f7a4d65b2aa68299da3669
React-FabricComponents: 33893d966ffc3bf54c7766093ab5237ad904f7d6
React-FabricImage: 5f3089dd0002363e1d8c61e233597ecbc591c290
React-featureflags: 057068b5603ab6d2593507d64379fd894a378424
React-featureflagsnativemodule: 997f8a03329ee3e6d9f327d29fada1989f70a3ec
React-graphics: 6d50c5b7bd32d4e20202fd6f48496fdd07bd145a
React-idlecallbacksnativemodule: 0d89269792195eff6ed8979d0b6b76da0095a869
React-ImageManager: dc406b995b0746abbdf1855f74dc71951444c6c8
React-jsc: ada850f8391aa2ddc1add5eccfa7f9422b62a22b
React-jserrorhandler: 99f3bc2086f889ded9752cbc79539a422367d682
React-jsi: 91a79b559522703977f6ab0dd599c70811b9bd2a
React-jsiexecutor: b08cd9c82114e3ed2b300eb3674417a062157d5e
React-jsinspector: ae4965cb5c805c0e9411379732c0c6f55a5519a5
React-jsinspectortracing: 28dc11536b1bb57010d9391b70c0afd7768d8705
React-jsitracing: 613d5da0a45c2241359053de26ab239474cbbaa3
React-logger: 2a5c2f8403f233f409464b72b28b82eeba149b28
React-Mapbuffer: abfb1cac2cc1d28428e99157dcaad70b79ca60c1
React-microtasksnativemodule: 8a615b7cfaaf2ddfe3b1a5fbad14a5000db0379e
React-NativeModulesApple: 3963148d71e242541e1c283060b56a579080cac4
React-perflogger: 8b45d52b90d140e99536e8052d350f0ee4ac9342
React-performancetimeline: 454b00e3b9561707669e73ea73cfbe3e9a1c3b10
React-RCTActionSheet: 38b70a961ee8a5c2886973cb2eea67168815181f
React-RCTAnimation: 27905f99f079c75da96a2dec0e323885df78ef6e
React-RCTAppDelegate: 9b981cd23eb6f452e17354fed291f067e255dfe5
React-RCTBlob: cf47dadb73e0e3478354472f8cc2e30021f9019a
React-RCTFabric: f9109fcf926e7e83173945857f70216e11fd337e
React-RCTFBReactNativeSpec: 9710040f9adb4ba903bdd440d68a1a7f82be62ce
React-RCTImage: 5af83832f8c7f214a8ae7af1b0350622120bd0b9
React-RCTLinking: 1f55f19f9b289c2787b3db9669e8cd5c7055569c
React-RCTNetwork: 860d83f5d5510ce0be9e93dc6784e0de9f12cb3c
React-RCTPushNotification: db90af8549d9786049d4e32134ba9b12cd20529e
React-RCTSettings: 93fd7b92d6ff023dc0190589659b9c4d3461ee5d
React-RCTTest: 6bead214ea72b3b4852d063c35f5a1f702b797ee
React-RCTText: 960416b87a7c700199c0601770ef5e6aad4f01fc
React-RCTVibration: 4c841a9b3af3d8e990d98c1e7fb963c1bdd47f55
React-rendererconsistency: b794927fcfe38480fbce5d594a5983b23290fa44
React-rendererdebug: a25ece9c2a4353e596300bf0c4d8a630d1d22f8c
React-rncore: 9cdb867af164bec266f175f714e23869f6a1e595
React-RuntimeApple: ca7a82ea452843a18615d67aafa849d5ad5c99ab
React-RuntimeCore: e4f34f48d915c6c49d288900ebba9f6a506210c7
React-runtimeexecutor: b826aeee43590df9be3d91daa5ae2f653eecd11b
React-runtimescheduler: a3bd418927fa4538a1b775aaa361ae7d01e5bd6e
React-timing: a3a179aafd2408a3e8b80f51469796126df3f086
React-utils: 3f9395c97d4fbeaf50233a61862fd2e71c40772b
ReactAppDependencyProvider: b4290074d7653498199f6625fefcd0dedbc5cc86
RCTRequired: fb0f0aef8ddbe3aea2a6c407748b51d014ffe492
RCTTypeSafety: 71232144f99ab70fe89b61bfd69e76c5659f8505
React: 5a00167e278eeb0626e8fda7fb23103f6e48f349
React-callinvoker: c68cd8375a76d1c045eb2cc2c25c660e2ac6a55d
React-Core: fd1741bce77053a66072ef8b3f41f9233c8dd150
React-CoreModules: 377921619938ef907e78decafdc420d1713329bc
React-cxxreact: 0b98499a64491a5e5ce169ec919d9da7138d8d14
React-debug: a5e34bf83664680be9d8b657fed561f72b336884
React-defaultsnativemodule: ae81e91cb30c334d0e97aa26ab8f3ef7e5613e81
React-domnativemodule: 98f52be83bf0a563f14e91dbb93460f671d6bfc7
React-Fabric: 9ae3209cf411adbd4651acd3103383182637b319
React-FabricComponents: 7ce658033fb43163323fc0a5d662eb84bc539fb9
React-FabricImage: df3a71d01b28252f4fc9d765a1761fe797c63d63
React-featureflags: 3b47d6e501e6c5a2f2fecf9ee48064da64858c29
React-featureflagsnativemodule: 15decac03a15823071f9924e9c7dce0f1503f9a0
React-graphics: 6b8731055abe3ce59628e4ce94e2dfff96eb3cf7
React-idlecallbacksnativemodule: dea3e3f8a9f337064260a8d2e7866313378c36c0
React-ImageManager: 2e4be1ab9565ef0e62e31ff0b7c5791cc1452fb6
React-jsc: 5f3e98969b76817009df04d7ff2dc18fcb4f2fb7
React-jserrorhandler: f4d18b61c2aece95c71c534898432b33c7cd1ea3
React-jsi: 532e581234e30b9ffe868f90f72b7226036ac943
React-jsiexecutor: 9b0b45f88268c3b8d514bdedb3e67528fa9a2a94
React-jsinspector: 8bbecd8acbc24d64109099d3970fbb66733035a6
React-jsinspectortracing: f7c94f110ba93dd55aa1cf2464c50c6364d72fbf
React-jsitracing: acb297c449dea7ddeee616e68f31568b49519f91
React-logger: d7392b10ecd855ae0a774080b6c1cbe23a49ce92
React-Mapbuffer: 81b2f8dd0b10938f84fc146d82b69de6592c4b44
React-microtasksnativemodule: 06ab0716b3aff54089fb0ae0902d7e9c282c7e9a
React-NativeModulesApple: 3072295f64805edfd6f887c18156c7072f1e9d65
React-perflogger: a48ed389f24abcf87bbd8949d0234e3131a5da77
React-performancetimeline: 18069129556bb6cd854881d6d4e5aa689c236dcb
React-RCTActionSheet: 9c395758f8bd25856938476fc5aa82cdc5ae7bc7
React-RCTAnimation: e572feff389c2da2730e5e124cad8f7123aa5051
React-RCTAppDelegate: b204c694d99c7980357e793b8798a08f174e6b60
React-RCTBlob: ed5ac1b775b977024ec08f23d044252528968824
React-RCTFabric: 508429464dd3f5896ac39ecd36374edf4f054a65
React-RCTFBReactNativeSpec: 33f481eaf0a30910a1533b1c79bb6d49ef9753eb
React-RCTImage: 2a4a5c6bbe9bfd3fb171c5bfa12c51136f826ed8
React-RCTLinking: 9ec06a3c890a508bc06a58232848aff1e5bcea6b
React-RCTNetwork: e27fadde5f2c42c765115d3a54764e6acafbb338
React-RCTPushNotification: 83f93548d6f496af62c3f3bed3b09b8d295da043
React-RCTSettings: 67126f00b82d15921a15f048ccab19551ad6bcb0
React-RCTTest: c3d4920bb9216fb02a420c21fe7013425d166000
React-RCTText: f22277f2723ecb0c8dc77116ceabb45ed23096a7
React-RCTVibration: 0a8fe07f38bcde11124ac4ff9c174428ea950443
React-rendererconsistency: 90a3aca5c7832111c375f69f50627b1c3994727c
React-rendererdebug: 9cf86017c0b43b09159137853967d306d2fa8d78
React-rncore: d93dde8dded57d3e843fe847fc3fd67f8b512f05
React-RuntimeApple: 859a52e136bafaeb7f2015f41950ad0bdbb81c82
React-RuntimeCore: 8aea12c6d2096bf742a93a49b87b1a5dfd1f976c
React-runtimeexecutor: ea623af981ef9541f43f5996b8a5ac5167a6801a
React-runtimescheduler: 0694becb2d9e9382eeac1d4ec1ca230eda0c4ca9
React-timing: 536bc903fba1589a79b72c94c4c896d2bd29b04a
React-utils: 358642f1ee6181ab707da715f20e4e11e82b3680
ReactAppDependencyProvider: 0d263f82c43dc7910e50c6690f436fa03e240b7a
ReactCodegen: 5c75b821e4b72ddae397b20868c9092a065daa10
ReactCommon: cadcd516511bb895d7e9af99e6c63b00b448c11c
ReactCommon-Samples: 0edbd09678cd4a76b5a3be96fc0d30fe4492614e
ReactCommon: 04a75f81cb1b4f36954430503ba4e34ecf410ad2
ReactCommon-Samples: 730cd1b8ae4b1649652c30581e6d58c8dfd23339
ScreenshotManager: 51c98822e02b9136488f11fe86067c26b443991c
SocketRocket: 03f7111df1a343b162bf5b06ead333be808e1e0a
Yoga: ddcbef454479b6899c9d2ebed43a7a7c207992c5
Yoga: 826308d4fed13354e6fd9ff7e3d8aff915d85645

PODFILE CHECKSUM: c0012ff6f93277dc7f718398353cf47bdb949c21

Expand Down
74 changes: 73 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2379,6 +2379,18 @@ __metadata:
languageName: node
linkType: hard

"@react-native-community/cli-config-apple@npm:17.0.0":
version: 17.0.0
resolution: "@react-native-community/cli-config-apple@npm:17.0.0"
dependencies:
"@react-native-community/cli-tools": "npm:17.0.0"
chalk: "npm:^4.1.2"
execa: "npm:^5.0.0"
fast-glob: "npm:^3.3.2"
checksum: 10c0/1c3ccca0a00fde8e10df77a321aac146873447f92144d527330bfa4bd30e505b5cecf9ef66fd60c8ae786a27b86be8e19f150e1b0ff0d3b16497511e8bb9ec5f
languageName: node
linkType: hard

"@react-native-community/cli-config@npm:15.0.0-alpha.2":
version: 15.0.0-alpha.2
resolution: "@react-native-community/cli-config@npm:15.0.0-alpha.2"
Expand Down Expand Up @@ -2454,6 +2466,19 @@ __metadata:
languageName: node
linkType: hard

"@react-native-community/cli-platform-apple@npm:^17.0.0":
version: 17.0.0
resolution: "@react-native-community/cli-platform-apple@npm:17.0.0"
dependencies:
"@react-native-community/cli-config-apple": "npm:17.0.0"
"@react-native-community/cli-tools": "npm:17.0.0"
chalk: "npm:^4.1.2"
execa: "npm:^5.0.0"
fast-xml-parser: "npm:^4.4.1"
checksum: 10c0/1dae5bdd2c487f666791c339003619f06d9e79ca0e15734c69a0630131ab37fe41351de6ce0ace90fd5f6ddc19a41bf4a15d7c62a0d7f2b6e4486ecf69dbdf4e
languageName: node
linkType: hard

"@react-native-community/cli-platform-ios@npm:15.0.0-alpha.2":
version: 15.0.0-alpha.2
resolution: "@react-native-community/cli-platform-ios@npm:15.0.0-alpha.2"
Expand Down Expand Up @@ -2498,6 +2523,24 @@ __metadata:
languageName: node
linkType: hard

"@react-native-community/cli-tools@npm:17.0.0":
version: 17.0.0
resolution: "@react-native-community/cli-tools@npm:17.0.0"
dependencies:
"@vscode/sudo-prompt": "npm:^9.0.0"
appdirsjs: "npm:^1.2.4"
chalk: "npm:^4.1.2"
execa: "npm:^5.0.0"
find-up: "npm:^5.0.0"
launch-editor: "npm:^2.9.1"
mime: "npm:^2.4.1"
ora: "npm:^5.4.1"
prompts: "npm:^2.4.2"
semver: "npm:^7.5.2"
checksum: 10c0/a01dbc9d4653ae87b06dbc7b18890d785a68319216c85f661d3c637d6684d8b685455146304dc26773ea5997d681426f22fcad3af4b2115e54f35e389daab469
languageName: node
linkType: hard

"@react-native-community/cli-types@npm:15.0.0-alpha.2":
version: 15.0.0-alpha.2
resolution: "@react-native-community/cli-types@npm:15.0.0-alpha.2"
Expand Down Expand Up @@ -2579,7 +2622,9 @@ __metadata:
hermes-eslint: "npm:0.25.1"
hermes-transform: "npm:0.25.1"
inquirer: "npm:^7.1.0"
invariant: "npm:^2.2.4"
jest: "npm:^29.6.3"
jest-config: "npm:^29.7.0"
jest-diff: "npm:^29.7.0"
jest-junit: "npm:^10.0.0"
jest-snapshot: "npm:^29.7.0"
Expand Down Expand Up @@ -3747,6 +3792,13 @@ __metadata:
languageName: node
linkType: hard

"@vscode/sudo-prompt@npm:^9.0.0":
version: 9.3.1
resolution: "@vscode/sudo-prompt@npm:9.3.1"
checksum: 10c0/680f0c0d16303bf2f7b28fda83a3e6725e75a593461521460a56365af0ca619595e2b6dcc56b1fa4ba24f8be4030fb1b015c31a92773c09ca55c49da89490e38
languageName: node
linkType: hard

"@yarnpkg/lockfile@npm:^1.1.0":
version: 1.1.0
resolution: "@yarnpkg/lockfile@npm:1.1.0"
Expand Down Expand Up @@ -8830,6 +8882,16 @@ __metadata:
languageName: node
linkType: hard

"launch-editor@npm:^2.9.1":
version: 2.10.0
resolution: "launch-editor@npm:2.10.0"
dependencies:
picocolors: "npm:^1.0.0"
shell-quote: "npm:^1.8.1"
checksum: 10c0/8b5a26be6b0da1da039ed2254b837dea0651a6406ea4dc4c9a5b28ea72862f1b12880135c495baf9d8a08997473b44034172506781744cf82e155451a40b7d51
languageName: node
linkType: hard

"leven@npm:^3.1.0":
version: 3.1.0
resolution: "leven@npm:3.1.0"
Expand Down Expand Up @@ -10630,6 +10692,7 @@ __metadata:
resolution: "react-native-macos@workspace:packages/react-native"
dependencies:
"@jest/create-cache-key-function": "npm:^29.6.3"
"@react-native-community/cli-platform-apple": "npm:^17.0.0"
"@react-native-mac/virtualized-lists": "workspace:*"
"@react-native/assets-registry": "npm:0.77.0-main"
"@react-native/codegen": "npm:0.77.0-main"
Expand Down Expand Up @@ -11153,7 +11216,7 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:2 >=2.2.1 || 3.x || 4 || 5 || 7, semver@npm:^7.0.0, semver@npm:^7.1.3, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
"semver@npm:2 >=2.2.1 || 3.x || 4 || 5 || 7, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0":
version: 7.6.3
resolution: "semver@npm:7.6.3"
bin:
Expand All @@ -11180,6 +11243,15 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:^7.1.3":
version: 7.7.1
resolution: "semver@npm:7.7.1"
bin:
semver: bin/semver.js
checksum: 10c0/fd603a6fb9c399c6054015433051bdbe7b99a940a8fb44b85c2b524c4004b023d7928d47cb22154f8d054ea7ee8597f586605e05b52047f048278e4ac56ae958
languageName: node
linkType: hard

"semver@npm:~7.5.4":
version: 7.5.4
resolution: "semver@npm:7.5.4"
Expand Down
Loading