Skip to content
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
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

2 changes: 2 additions & 0 deletions packaging/desktop/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

1 change: 1 addition & 0 deletions packaging/desktop/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "package-desktop",
"packageManager": "yarn@3.6.4",
"version": "1.0.0",
"description": "",
"main": "index.js",
Expand Down
2 changes: 2 additions & 0 deletions protocol/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

1 change: 1 addition & 0 deletions protocol/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "keybase-protocol",
"packageManager": "yarn@3.6.4",
"version": "1.0.0",
"description": "An IDL and protocol generator for Keybase components",
"main": "bin/compile.iced",
Expand Down
2 changes: 2 additions & 0 deletions rnmodules/react-native-kb/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

1 change: 1 addition & 0 deletions rnmodules/react-native-kb/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "react-native-kb",
"packageManager": "yarn@3.6.4",
"version": "0.1.1",
"description": "misc kb",
"main": "src/index",
Expand Down
1 change: 1 addition & 0 deletions shared/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ main.jsbundle
.eslintcache
.metro-health-check*
.expo
.yarn

coverage-ts
temp.log
2 changes: 2 additions & 0 deletions shared/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules

7 changes: 5 additions & 2 deletions shared/jenkins_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,17 @@ has_js_files() {
js_tests() {
echo 'js-tests'
node --version
npm i -g yarn
# reset this in case we're still building yarn classic branches
corepack disable
corepack enable
corepack prepare yarn@1.22.19 --activate
has_js_files

echo 'cleanup'
rm -rf node_modules

echo 'yarn install'
yarn install --network-concurrency 1 --prefer-offline --pure-lockfile --ignore-optional --ignore-engines
yarn install --prefer-offline --immutable --ignore-engines
yarn modules --ignore-engines
check_rc $? 'yarn install fail' 1

Expand Down
12 changes: 4 additions & 8 deletions shared/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "keybase",
"packageManager": "yarn@3.6.4",
"version": "1.0.1",
"description": "",
"scripts": {
Expand Down Expand Up @@ -50,7 +51,7 @@
"rn-jsbuild-ios": "mkdir -p ios/dist && react-native bundle --platform ios --dev false --entry-file index.ios.js --bundle-output ios/dist/main.jsbundle --sourcemap-output ios/dist/main.jsbundle.sourcemap",
"rn-jsbuild-android": "mkdir -p android/dist && react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output android/dist/main.jsbundle --sourcemap-output android/dist/main.jsbundle.sourcemap",
"tsc": "node --max-old-space-size=4096 ./node_modules/.bin/tsc --project ./tsconfig.json ",
"modules": "yarn install --pure-lockfile --ignore-optional --ignore-scripts && yarn postinstall && cd node_modules/electron && yarn postinstall",
"modules": "yarn install --mode=skip-build && yarn postinstall && cd node_modules/electron && yarn postinstall",
"log-to-trace": "yarn _node desktop/yarn-helper/log-to-trace",
"pod-clean": "pod cache clean --all ; rm -rf ios/build; rm -rf ios/Pods; rm -f ios/.xcode.env.local; rm -rf ../rnmodules/react-native-kb/node_modules",
"pod-install": "cd ios; pod install --repo-update",
Expand Down Expand Up @@ -116,14 +117,14 @@
"react-list": "0.8.18",
"react-native": "0.81.5",
"react-native-gesture-handler": "2.30.0",
"react-native-keyboard-controller": "1.20.2",
"react-native-kb": "file:../rnmodules/react-native-kb",
"react-native-keyboard-controller": "1.20.2",
"react-native-reanimated": "4.2.1",
"react-native-worklets": "0.7.1",
"react-native-safe-area-context": "5.6.2",
"react-native-screens": "4.18.0",
"react-native-web": "0.21.2",
"react-native-webview": "13.16.0",
"react-native-worklets": "0.7.1",
"react-native-zoom-toolkit": "5.0.1",
"react-window": "2.2.3",
"shallowequal": "1.1.0",
Expand Down Expand Up @@ -192,11 +193,6 @@
"webpack-dev-server": "5.2.2",
"webpack-merge": "6.0.1"
},
"resolutions": {
"**/purepack": "keybase/nullModule",
"**/@khanacademy/perseus-core": "keybase/nullModule",
"**/@types/react": "19.2.7"
},
"typecoverage": {
"detail": true,
"strict": true
Expand Down
27,052 changes: 15,801 additions & 11,251 deletions shared/yarn.lock

Large diffs are not rendered by default.