Skip to content

Commit

Permalink
WIP - yarn3 update
Browse files Browse the repository at this point in the history
- needs to be yarn4
- detox patch not working, need to forward port to yarn patch
- lerna layer on top of yarn2+ not functional
- android crashing after a while locally on API34 emu / m2 air. Why? Unknown
- ios seems to work
- yarn caching strategy unresolved
- workflow scripts not updated

CI will probably blow apart but unknown
  • Loading branch information
mikehardy committed Oct 24, 2023
1 parent e8b7b6a commit 8449b52
Show file tree
Hide file tree
Showing 11 changed files with 22,352 additions and 16,143 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/scripts/functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "functions",
"scripts": {
"build": "tsc",
"serve": "npm run build && firebase emulators:start --only functions",
"shell": "npm run build && firebase functions:shell",
"start": "npm run shell",
"serve": "build && firebase emulators:start --only functions",
"shell": "build && firebase functions:shell",
"start": "shell",
"deploy": "firebase deploy --only functions",
"logs": "firebase functions:log"
},
Expand Down
18 changes: 17 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -559,4 +559,20 @@ website/.cache
website/public

# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*
.metro-health-check*

# Yarn2+ items
.yarn/*
# !.yarn/cache
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
**/.yarn/*
# !**/.yarn/cache
!**/.yarn/patches
!**/.yarn/plugins
!**/.yarn/releases
!**/.yarn/sdks
!**/.yarn/versions
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
yarnPath: .yarn/releases/yarn-3.6.4.cjs
nodeLinker: node-modules
nmHoistingLimits: "workspaces"
47 changes: 5 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-class-properties": "^7.22.5",
"@babel/preset-env": "^7.23.2",
"@firebase/rules-unit-testing": "^3.0.1",
"@octokit/core": "^5.0.1",
"@tsconfig/node-lts": "^18.1.0",
"@types/react": "^18.2.31",
Expand All @@ -72,6 +73,8 @@
"eslint-plugin-mocha": "^10.2.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"firebase": "^10.5.0",
"firebase-tools": "^12.7.0",
"genversion": "^3.1.1",
"google-java-format": "^1.1.0",
"inquirer": "^8.2.6",
Expand All @@ -91,47 +94,7 @@
"packages": [
"packages/*",
"tests"
],
"nohoist": [
"**/sinon",
"**/sinon/**",
"**/should",
"**/should/**",
"**/should-sinon",
"**/should-sinon/**",
"detox",
"**/detox",
"**/detox/**",
"**/prop-types/**",
"**/react-native-device-info",
"**/react-native-device-info/**",
"**/react-native-port-patcher/**",
"**/@react-native-firebase/private-tests-helpers",
"**/@react-native-firebase/private-tests-helpers/**",
"**/babel-plugin-istanbul",
"**/babel-plugin-istanbul/**",
"**/patch-package",
"**/patch-package/**",
"**/pretty-format",
"**/pretty-format/**",
"**/jet",
"**/jet/**",
"**/nyc",
"**/nyc/**",
"**/react",
"**/react/**",
"**/react-native",
"**/react-native/**",
"**/@react-native",
"**/@react-native/**",
"**/metro-react-native-babel-preset",
"**/metro-react-native-babel-preset/**",
"**/metro-runtime",
"**/metro-runtime/**",
"**/stacktrace-js",
"**/stacktrace-js/**",
"**/superstruct",
"**/superstruct/**"
]
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/firestore/e2e/issues.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

const COLLECTION = 'firestore';
const { getE2eEmulatorHost } = require('@react-native-firebase/app/e2e/helpers');
const { getE2eEmulatorHost } = require('../../app/e2e/helpers');
const jsFirebase = require('firebase/compat/app');
require('firebase/compat/firestore');

Expand Down
2 changes: 1 addition & 1 deletion tests/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ dependencies {
* ------------------------ */
androidTestImplementation(project(path: ':detox'))

def firebaseBomVersion = new JsonSlurper().parseText(new File('../../node_modules/@react-native-firebase/app/package.json').text).sdkVersions.android.firebase
def firebaseBomVersion = new JsonSlurper().parseText(new File('../node_modules/@react-native-firebase/app/package.json').text).sdkVersions.android.firebase
androidTestImplementation platform("com.google.firebase:firebase-bom:${firebaseBomVersion}")
androidTestImplementation "com.google.firebase:firebase-appcheck-debug-testing"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'json'

# Settings to test various overrides if desired
appPackage = JSON.parse(File.read(File.join('..', '..', 'node_modules', '@react-native-firebase', 'app', 'package.json')))
appPackage = JSON.parse(File.read(File.join('..', 'node_modules', '@react-native-firebase', 'app', 'package.json')))
$FirebaseSDKVersion = appPackage['sdkVersions']['ios']['firebase']
#$FirebaseSDKVersion = '8.0.0' # https://firebase.google.com/support/release-notes/ios
Pod::UI.puts "react-native-firebase/tests: Using Firebase SDK version '#{$FirebaseSDKVersion}'"
Expand Down
2 changes: 1 addition & 1 deletion tests/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,6 @@ SPEC CHECKSUMS:
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603

PODFILE CHECKSUM: 88877703287dd82ed7ab256d7d76f5aabbb947df
PODFILE CHECKSUM: a7d7492d035b0f7120b4bc2b2fe1570801d9dc09

COCOAPODS: 1.13.0
38 changes: 19 additions & 19 deletions tests/package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
{
"name": "react-native-firebase-tests",
"version": "18.5.0",
"version": "link:../packages/",
"private": true,
"scripts": {
"build:clean": "rimraf dist && rimraf android/build && rimraf android/app/build && rimraf android/.gradle && rimraf ios/build",
"prepare": "patch-package"
},
"dependencies": {
"@react-native-firebase/analytics": "18.5.0",
"@react-native-firebase/app": "18.5.0",
"@react-native-firebase/app-check": "18.5.0",
"@react-native-firebase/app-distribution": "18.5.0",
"@react-native-firebase/analytics": "link:../packages/analytics",
"@react-native-firebase/app": "link:../packages/app",
"@react-native-firebase/app-check": "link:../packages/app-check",
"@react-native-firebase/app-distribution": "link:../packages/app-distribution",
"@react-native-firebase/app-types": "6.7.2",
"@react-native-firebase/auth": "18.5.0",
"@react-native-firebase/crashlytics": "18.5.0",
"@react-native-firebase/database": "18.5.0",
"@react-native-firebase/dynamic-links": "18.5.0",
"@react-native-firebase/firestore": "18.5.0",
"@react-native-firebase/functions": "18.5.0",
"@react-native-firebase/in-app-messaging": "18.5.0",
"@react-native-firebase/installations": "18.5.0",
"@react-native-firebase/messaging": "18.5.0",
"@react-native-firebase/ml": "18.5.0",
"@react-native-firebase/perf": "18.5.0",
"@react-native-firebase/remote-config": "18.5.0",
"@react-native-firebase/storage": "18.5.0",
"@react-native-firebase/auth": "link:../packages/auth",
"@react-native-firebase/crashlytics": "link:../packages/crashlytics",
"@react-native-firebase/database": "link:../packages/database",
"@react-native-firebase/dynamic-links": "link:../packages/dynamic-links",
"@react-native-firebase/firestore": "link:../packages/firestore",
"@react-native-firebase/functions": "link:../packages/functions",
"@react-native-firebase/in-app-messaging": "link:../packages/in-app-messaging",
"@react-native-firebase/installations": "link:../packages/installations",
"@react-native-firebase/messaging": "link:../packages/messaging",
"@react-native-firebase/ml": "link:../packages/ml",
"@react-native-firebase/perf": "link:../packages/perf",
"@react-native-firebase/remote-config": "link:../packages/remote-config",
"@react-native-firebase/storage": "link:../packages/storage",
"postinstall-postinstall": "2.1.0",
"react": "18.2.0",
"react-native": "0.72.6",
"react-native-device-info": "^10.11.0"
},
"devDependencies": {
"@firebase/rules-unit-testing": "^3.0.1",
"@react-native-firebase/private-tests-helpers": "0.0.13",
"@react-native-firebase/private-tests-helpers": "^1.0.0",
"@react-native/metro-config": "^0.74.0",
"a2a": "^0.2.1",
"babel-plugin-istanbul": "^6.0.0",
Expand Down
Loading

0 comments on commit 8449b52

Please sign in to comment.