From 0f68490e67b45fe4a4484db011d4522febd34e80 Mon Sep 17 00:00:00 2001 From: Omer Gery <68545675+OmerGery@users.noreply.github.com> Date: Thu, 12 Sep 2024 08:54:01 +0300 Subject: [PATCH] upgrade rn fixes (#849) * pod install works * Update app_test.yml * clean ups --- .github/workflows/app_test.yml | 4 ++-- examples/client/Locomotion/.node-version | 1 - .nvmrc => examples/client/Locomotion/.nvmrc | 0 .../.watchman-cookie-Hilats-MacBook-Pro.local-10404-6574 | 0 examples/client/Locomotion/ios/.xcode.env | 1 + examples/client/Locomotion/package-lock.json | 6 +++--- examples/client/Locomotion/package.json | 2 +- .../client/Locomotion/patches/react-native+0.71.0.patch | 2 +- examples/client/Locomotion/yarn.lock | 7 ++++++- 9 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 examples/client/Locomotion/.node-version rename .nvmrc => examples/client/Locomotion/.nvmrc (100%) delete mode 100755 examples/client/Locomotion/.watchman-cookie-Hilats-MacBook-Pro.local-10404-6574 create mode 100644 examples/client/Locomotion/ios/.xcode.env diff --git a/.github/workflows/app_test.yml b/.github/workflows/app_test.yml index 658391771..94975c115 100644 --- a/.github/workflows/app_test.yml +++ b/.github/workflows/app_test.yml @@ -19,12 +19,12 @@ jobs: - name: Use Node.js uses: actions/setup-node@v1 with: - node-version: 14 + node-version: 20 always-auth: true registry-url: https://registry.npmjs.org - name: Install NPM dependencies - run: npm install + run: npm install --legacy-peer-deps - run: npm run linter diff --git a/examples/client/Locomotion/.node-version b/examples/client/Locomotion/.node-version deleted file mode 100644 index 119f15a0a..000000000 --- a/examples/client/Locomotion/.node-version +++ /dev/null @@ -1 +0,0 @@ -20.15.1 \ No newline at end of file diff --git a/.nvmrc b/examples/client/Locomotion/.nvmrc similarity index 100% rename from .nvmrc rename to examples/client/Locomotion/.nvmrc diff --git a/examples/client/Locomotion/.watchman-cookie-Hilats-MacBook-Pro.local-10404-6574 b/examples/client/Locomotion/.watchman-cookie-Hilats-MacBook-Pro.local-10404-6574 deleted file mode 100755 index e69de29bb..000000000 diff --git a/examples/client/Locomotion/ios/.xcode.env b/examples/client/Locomotion/ios/.xcode.env new file mode 100644 index 000000000..772b339b4 --- /dev/null +++ b/examples/client/Locomotion/ios/.xcode.env @@ -0,0 +1 @@ +export NODE_BINARY=$(command -v node) diff --git a/examples/client/Locomotion/package-lock.json b/examples/client/Locomotion/package-lock.json index 893eb659f..c23a2792a 100644 --- a/examples/client/Locomotion/package-lock.json +++ b/examples/client/Locomotion/package-lock.json @@ -1,11 +1,11 @@ { - "name": "Locomotion", + "name": "locomotion", "version": "0.0.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "Locomotion", + "name": "locomotion", "version": "0.0.1", "hasInstallScript": true, "dependencies": { @@ -21547,4 +21547,4 @@ } } } -} \ No newline at end of file +} diff --git a/examples/client/Locomotion/package.json b/examples/client/Locomotion/package.json index 45f472a5f..e62195c86 100644 --- a/examples/client/Locomotion/package.json +++ b/examples/client/Locomotion/package.json @@ -1,5 +1,5 @@ { - "name": "Locomotion", + "name": "locomotion", "version": "0.0.1", "private": true, "scripts": { diff --git a/examples/client/Locomotion/patches/react-native+0.71.0.patch b/examples/client/Locomotion/patches/react-native+0.71.0.patch index 767ba2069..ecdd20567 100644 --- a/examples/client/Locomotion/patches/react-native+0.71.0.patch +++ b/examples/client/Locomotion/patches/react-native+0.71.0.patch @@ -14,7 +14,7 @@ index 247bc11..c9dffc4 100644 # set tarball as hermes engine source[:http] = "file://#{destination_path}" -elsif File.exists?(hermestag_file) && isInCI -+elsif File.exists(hermestag_file) && isInCI ++elsif File.exist?(hermestag_file) && isInCI Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source but fetched from tag...'.yellow if Object.const_defined?("Pod::UI") hermestag = File.read(hermestag_file).strip source[:git] = git diff --git a/examples/client/Locomotion/yarn.lock b/examples/client/Locomotion/yarn.lock index d934b4652..d71d11281 100644 --- a/examples/client/Locomotion/yarn.lock +++ b/examples/client/Locomotion/yarn.lock @@ -6318,7 +6318,7 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^1.2.7, fsevents@^2.3.2: +fsevents@^1.2.7: version "1.2.13" resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz" integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== @@ -6326,6 +6326,11 @@ fsevents@^1.2.7, fsevents@^2.3.2: bindings "^1.5.0" nan "^2.12.1" +fsevents@^2.3.2: + version "2.3.3" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"