From 72be41f9d54b096fdcd5936b9ef3f2e7f241623c Mon Sep 17 00:00:00 2001 From: Thibault Malbranche Date: Fri, 2 Sep 2022 11:39:19 +0200 Subject: [PATCH 1/4] chore: rename polyfills to js-polyfills --- BUCK | 2 +- Libraries/vendor/core/ErrorUtils.js | 2 +- jest/setup.js | 4 ++-- package.json | 2 +- packages/{polyfills => js-polyfills}/.npmignore | 0 packages/{polyfills => js-polyfills}/BUCK | 4 ++-- packages/{polyfills => js-polyfills}/Object.es8.js | 0 .../__tests__/Object.es8-test.js | 0 packages/{polyfills => js-polyfills}/console.js | 0 packages/{polyfills => js-polyfills}/error-guard.js | 0 packages/{polyfills => js-polyfills}/index.js | 0 packages/{polyfills => js-polyfills}/package.json | 6 +++--- rn-get-polyfills.js | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) rename packages/{polyfills => js-polyfills}/.npmignore (100%) rename packages/{polyfills => js-polyfills}/BUCK (94%) rename packages/{polyfills => js-polyfills}/Object.es8.js (100%) rename packages/{polyfills => js-polyfills}/__tests__/Object.es8-test.js (100%) rename packages/{polyfills => js-polyfills}/console.js (100%) rename packages/{polyfills => js-polyfills}/error-guard.js (100%) rename packages/{polyfills => js-polyfills}/index.js (100%) rename packages/{polyfills => js-polyfills}/package.json (61%) diff --git a/BUCK b/BUCK index f900a2be0e0e42..3553269aba3b7e 100644 --- a/BUCK +++ b/BUCK @@ -762,7 +762,7 @@ rn_library( "//xplat/js/RKJSModules/vendor/scheduler:scheduler", "//xplat/js/react-native-github/packages/assets:assets", "//xplat/js/react-native-github/packages/normalize-color:normalize-color", - "//xplat/js/react-native-github/packages/polyfills:polyfills", + "//xplat/js/react-native-github/packages/js-polyfills:js-polyfills", "//xplat/js/tools/metro/packages/metro-runtime/src/modules:modules", "//xplat/js/tools/metro/packages/metro-runtime/src/polyfills:polyfills", ], diff --git a/Libraries/vendor/core/ErrorUtils.js b/Libraries/vendor/core/ErrorUtils.js index 12530c0eccc6fc..37b0da17cd1881 100644 --- a/Libraries/vendor/core/ErrorUtils.js +++ b/Libraries/vendor/core/ErrorUtils.js @@ -8,7 +8,7 @@ * @flow strict */ -import type {ErrorUtilsT} from '@react-native/polyfills/error-guard'; +import type {ErrorUtilsT} from '@react-native/js-polyfills/error-guard'; /** * The particular require runtime that we are using looks for a global diff --git a/jest/setup.js b/jest/setup.js index 3738bd2c61e516..511c6642a4691f 100644 --- a/jest/setup.js +++ b/jest/setup.js @@ -12,8 +12,8 @@ const MockNativeMethods = jest.requireActual('./MockNativeMethods'); const mockComponent = jest.requireActual('./mockComponent'); -jest.requireActual('@react-native/polyfills/Object.es8'); -jest.requireActual('@react-native/polyfills/error-guard'); +jest.requireActual('@react-native/js-polyfills/Object.es8'); +jest.requireActual('@react-native/js-polyfills/error-guard'); global.__DEV__ = true; diff --git a/package.json b/package.json index efc43ed0877e67..44c118174a57f5 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "@react-native-community/cli-platform-ios": "10.0.0-alpha.3", "@react-native/assets": "1.0.0", "@react-native/normalize-color": "2.1.0", - "@react-native/polyfills": "2.0.0", + "@react-native/polyfills": "^0.72.0", "abort-controller": "^3.0.0", "anser": "^1.4.9", "base64-js": "^1.1.2", diff --git a/packages/polyfills/.npmignore b/packages/js-polyfills/.npmignore similarity index 100% rename from packages/polyfills/.npmignore rename to packages/js-polyfills/.npmignore diff --git a/packages/polyfills/BUCK b/packages/js-polyfills/BUCK similarity index 94% rename from packages/polyfills/BUCK rename to packages/js-polyfills/BUCK index 88ffc9513eee78..5572fdcd9e55a1 100644 --- a/packages/polyfills/BUCK +++ b/packages/js-polyfills/BUCK @@ -21,8 +21,8 @@ yarn_workspace( ) rn_library( - name = "polyfills", - base_path = relative_path_to_js_root() + "node_modules/@react-native/polyfills/", + name = "js-polyfills", + base_path = relative_path_to_js_root() + "node_modules/@react-native/js-polyfills/", is_polyfill = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", diff --git a/packages/polyfills/Object.es8.js b/packages/js-polyfills/Object.es8.js similarity index 100% rename from packages/polyfills/Object.es8.js rename to packages/js-polyfills/Object.es8.js diff --git a/packages/polyfills/__tests__/Object.es8-test.js b/packages/js-polyfills/__tests__/Object.es8-test.js similarity index 100% rename from packages/polyfills/__tests__/Object.es8-test.js rename to packages/js-polyfills/__tests__/Object.es8-test.js diff --git a/packages/polyfills/console.js b/packages/js-polyfills/console.js similarity index 100% rename from packages/polyfills/console.js rename to packages/js-polyfills/console.js diff --git a/packages/polyfills/error-guard.js b/packages/js-polyfills/error-guard.js similarity index 100% rename from packages/polyfills/error-guard.js rename to packages/js-polyfills/error-guard.js diff --git a/packages/polyfills/index.js b/packages/js-polyfills/index.js similarity index 100% rename from packages/polyfills/index.js rename to packages/js-polyfills/index.js diff --git a/packages/polyfills/package.json b/packages/js-polyfills/package.json similarity index 61% rename from packages/polyfills/package.json rename to packages/js-polyfills/package.json index 58a2b3a70494eb..f0333c19901bfe 100644 --- a/packages/polyfills/package.json +++ b/packages/js-polyfills/package.json @@ -1,11 +1,11 @@ { - "name": "@react-native/polyfills", - "version": "2.0.0", + "name": "@react-native/js-polyfills", + "version": "0.71.0", "description": "Polyfills for React Native.", "repository": { "type": "git", "url": "git@github.com:facebook/react-native.git", - "directory": "packages/polyfills" + "directory": "packages/js-polyfills" }, "license": "MIT" } diff --git a/rn-get-polyfills.js b/rn-get-polyfills.js index 9a806bfc138409..c051fd421343ce 100644 --- a/rn-get-polyfills.js +++ b/rn-get-polyfills.js @@ -9,4 +9,4 @@ 'use strict'; -module.exports = require('@react-native/polyfills'); +module.exports = require('@react-native/js-polyfills'); From f65d633d1d9e787840288a82bb4df4df1b290a24 Mon Sep 17 00:00:00 2001 From: Thibault Malbranche Date: Fri, 23 Sep 2022 14:20:05 +0200 Subject: [PATCH 2/4] revert buck changes --- BUCK | 2 +- packages/js-polyfills/BUCK | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BUCK b/BUCK index 3553269aba3b7e..efca5413394aca 100644 --- a/BUCK +++ b/BUCK @@ -762,7 +762,7 @@ rn_library( "//xplat/js/RKJSModules/vendor/scheduler:scheduler", "//xplat/js/react-native-github/packages/assets:assets", "//xplat/js/react-native-github/packages/normalize-color:normalize-color", - "//xplat/js/react-native-github/packages/js-polyfills:js-polyfills", + "//xplat/js/react-native-github/packages/js-polyfills:polyfills", "//xplat/js/tools/metro/packages/metro-runtime/src/modules:modules", "//xplat/js/tools/metro/packages/metro-runtime/src/polyfills:polyfills", ], diff --git a/packages/js-polyfills/BUCK b/packages/js-polyfills/BUCK index 5572fdcd9e55a1..b3881484a9599e 100644 --- a/packages/js-polyfills/BUCK +++ b/packages/js-polyfills/BUCK @@ -21,7 +21,7 @@ yarn_workspace( ) rn_library( - name = "js-polyfills", + name = "polyfills", base_path = relative_path_to_js_root() + "node_modules/@react-native/js-polyfills/", is_polyfill = True, labels = [ From 6f9f9971e1ea381b1aa97ce6f6ebc0d162238894 Mon Sep 17 00:00:00 2001 From: Thibault Malbranche Date: Fri, 23 Sep 2022 14:44:07 +0200 Subject: [PATCH 3/4] revert renaming --- BUCK | 2 +- packages/{js-polyfills => polyfills}/.npmignore | 0 packages/{js-polyfills => polyfills}/BUCK | 2 +- packages/{js-polyfills => polyfills}/Object.es8.js | 0 .../{js-polyfills => polyfills}/__tests__/Object.es8-test.js | 0 packages/{js-polyfills => polyfills}/console.js | 0 packages/{js-polyfills => polyfills}/error-guard.js | 0 packages/{js-polyfills => polyfills}/index.js | 0 packages/{js-polyfills => polyfills}/package.json | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) rename packages/{js-polyfills => polyfills}/.npmignore (100%) rename packages/{js-polyfills => polyfills}/BUCK (97%) rename packages/{js-polyfills => polyfills}/Object.es8.js (100%) rename packages/{js-polyfills => polyfills}/__tests__/Object.es8-test.js (100%) rename packages/{js-polyfills => polyfills}/console.js (100%) rename packages/{js-polyfills => polyfills}/error-guard.js (100%) rename packages/{js-polyfills => polyfills}/index.js (100%) rename packages/{js-polyfills => polyfills}/package.json (84%) diff --git a/BUCK b/BUCK index efca5413394aca..f900a2be0e0e42 100644 --- a/BUCK +++ b/BUCK @@ -762,7 +762,7 @@ rn_library( "//xplat/js/RKJSModules/vendor/scheduler:scheduler", "//xplat/js/react-native-github/packages/assets:assets", "//xplat/js/react-native-github/packages/normalize-color:normalize-color", - "//xplat/js/react-native-github/packages/js-polyfills:polyfills", + "//xplat/js/react-native-github/packages/polyfills:polyfills", "//xplat/js/tools/metro/packages/metro-runtime/src/modules:modules", "//xplat/js/tools/metro/packages/metro-runtime/src/polyfills:polyfills", ], diff --git a/packages/js-polyfills/.npmignore b/packages/polyfills/.npmignore similarity index 100% rename from packages/js-polyfills/.npmignore rename to packages/polyfills/.npmignore diff --git a/packages/js-polyfills/BUCK b/packages/polyfills/BUCK similarity index 97% rename from packages/js-polyfills/BUCK rename to packages/polyfills/BUCK index b3881484a9599e..88ffc9513eee78 100644 --- a/packages/js-polyfills/BUCK +++ b/packages/polyfills/BUCK @@ -22,7 +22,7 @@ yarn_workspace( rn_library( name = "polyfills", - base_path = relative_path_to_js_root() + "node_modules/@react-native/js-polyfills/", + base_path = relative_path_to_js_root() + "node_modules/@react-native/polyfills/", is_polyfill = True, labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", diff --git a/packages/js-polyfills/Object.es8.js b/packages/polyfills/Object.es8.js similarity index 100% rename from packages/js-polyfills/Object.es8.js rename to packages/polyfills/Object.es8.js diff --git a/packages/js-polyfills/__tests__/Object.es8-test.js b/packages/polyfills/__tests__/Object.es8-test.js similarity index 100% rename from packages/js-polyfills/__tests__/Object.es8-test.js rename to packages/polyfills/__tests__/Object.es8-test.js diff --git a/packages/js-polyfills/console.js b/packages/polyfills/console.js similarity index 100% rename from packages/js-polyfills/console.js rename to packages/polyfills/console.js diff --git a/packages/js-polyfills/error-guard.js b/packages/polyfills/error-guard.js similarity index 100% rename from packages/js-polyfills/error-guard.js rename to packages/polyfills/error-guard.js diff --git a/packages/js-polyfills/index.js b/packages/polyfills/index.js similarity index 100% rename from packages/js-polyfills/index.js rename to packages/polyfills/index.js diff --git a/packages/js-polyfills/package.json b/packages/polyfills/package.json similarity index 84% rename from packages/js-polyfills/package.json rename to packages/polyfills/package.json index f0333c19901bfe..00f049e875f0c0 100644 --- a/packages/js-polyfills/package.json +++ b/packages/polyfills/package.json @@ -5,7 +5,7 @@ "repository": { "type": "git", "url": "git@github.com:facebook/react-native.git", - "directory": "packages/js-polyfills" + "directory": "packages/polyfills" }, "license": "MIT" } From 04943ae2c85af1af9689e867febc72a2866efaa4 Mon Sep 17 00:00:00 2001 From: Ruslan Lesiutin Date: Fri, 25 Nov 2022 12:52:00 +0000 Subject: [PATCH 4/4] update(packages/polyfills): bump to 0.72.0 --- package.json | 2 +- packages/polyfills/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 44c118174a57f5..6654d9e4961e27 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "@react-native-community/cli-platform-ios": "10.0.0-alpha.3", "@react-native/assets": "1.0.0", "@react-native/normalize-color": "2.1.0", - "@react-native/polyfills": "^0.72.0", + "@react-native/js-polyfills": "^0.72.0", "abort-controller": "^3.0.0", "anser": "^1.4.9", "base64-js": "^1.1.2", diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json index 00f049e875f0c0..6dfce02834c485 100644 --- a/packages/polyfills/package.json +++ b/packages/polyfills/package.json @@ -1,6 +1,6 @@ { "name": "@react-native/js-polyfills", - "version": "0.71.0", + "version": "0.72.0", "description": "Polyfills for React Native.", "repository": { "type": "git",