From 7f1417b35632ff60df5e95d1fae74784fb34a498 Mon Sep 17 00:00:00 2001 From: Thibault Malbranche Date: Fri, 2 Sep 2022 11:02:37 +0200 Subject: [PATCH] chore: rename normalize-color to normalize-colors (umbrella discussion 480) --- BUCK | 2 +- Libraries/StyleSheet/__tests__/normalizeColor-test.js | 6 +++--- Libraries/StyleSheet/normalizeColor.js | 2 +- package.json | 2 +- packages/{normalize-color => normalize-colors}/.npmignore | 0 packages/{normalize-color => normalize-colors}/BUCK | 2 +- .../__tests__/normalizeColor-test.js | 0 packages/{normalize-color => normalize-colors}/index.js | 0 .../{normalize-color => normalize-colors}/index.js.flow | 0 packages/{normalize-color => normalize-colors}/package.json | 4 ++-- 10 files changed, 9 insertions(+), 9 deletions(-) rename packages/{normalize-color => normalize-colors}/.npmignore (100%) rename packages/{normalize-color => normalize-colors}/BUCK (96%) rename packages/{normalize-color => normalize-colors}/__tests__/normalizeColor-test.js (100%) rename packages/{normalize-color => normalize-colors}/index.js (100%) rename packages/{normalize-color => normalize-colors}/index.js.flow (100%) rename packages/{normalize-color => normalize-colors}/package.json (69%) diff --git a/BUCK b/BUCK index 96daf1f839c66f..a9be35d9b64393 100644 --- a/BUCK +++ b/BUCK @@ -766,7 +766,7 @@ rn_library( "//xplat/js/RKJSModules/vendor/react-test-renderer:react-test-renderer", "//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/normalize-colors:normalize-colors", "//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/Libraries/StyleSheet/__tests__/normalizeColor-test.js b/Libraries/StyleSheet/__tests__/normalizeColor-test.js index 244fff9c38fdb0..e26eeaafe69c63 100644 --- a/Libraries/StyleSheet/__tests__/normalizeColor-test.js +++ b/Libraries/StyleSheet/__tests__/normalizeColor-test.js @@ -13,11 +13,11 @@ const {OS} = require('../../Utilities/Platform'); const normalizeColor = require('../normalizeColor'); -it('forwards calls to @react-native/normalize-color', () => { - jest.resetModules().mock('@react-native/normalize-color', () => jest.fn()); +it('forwards calls to @react-native/normalize-colors', () => { + jest.resetModules().mock('@react-native/normalize-colors', () => jest.fn()); expect(require('../normalizeColor')('#abc')).not.toBe(null); - expect(require('@react-native/normalize-color')).toBeCalled(); + expect(require('@react-native/normalize-colors')).toBeCalled(); }); describe('iOS', () => { diff --git a/Libraries/StyleSheet/normalizeColor.js b/Libraries/StyleSheet/normalizeColor.js index 46df7d988c7582..be8000902d4071 100755 --- a/Libraries/StyleSheet/normalizeColor.js +++ b/Libraries/StyleSheet/normalizeColor.js @@ -10,7 +10,7 @@ /* eslint no-bitwise: 0 */ -import _normalizeColor from '@react-native/normalize-color'; +import _normalizeColor from '@react-native/normalize-colors'; import type {ColorValue} from './StyleSheet'; import type {ProcessedColorValue} from './processColor'; diff --git a/package.json b/package.json index b3307805f7a3e2..4758937ad757f1 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "@react-native-community/cli-platform-android": "^9.0.0", "@react-native-community/cli-platform-ios": "^9.0.0", "@react-native/assets": "1.0.0", - "@react-native/normalize-color": "2.0.0", + "@react-native/normalize-colors": "^0.71.0", "@react-native/polyfills": "2.0.0", "abort-controller": "^3.0.0", "anser": "^1.4.9", diff --git a/packages/normalize-color/.npmignore b/packages/normalize-colors/.npmignore similarity index 100% rename from packages/normalize-color/.npmignore rename to packages/normalize-colors/.npmignore diff --git a/packages/normalize-color/BUCK b/packages/normalize-colors/BUCK similarity index 96% rename from packages/normalize-color/BUCK rename to packages/normalize-colors/BUCK index 17fbdd53bd8da7..351425ef2dacc0 100644 --- a/packages/normalize-color/BUCK +++ b/packages/normalize-colors/BUCK @@ -2,7 +2,7 @@ load("@fbsource//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace") load("@fbsource//xplat/js:JS_DEFS.bzl", "rn_library") rn_library( - name = "normalize-color", + name = "normalize-colors", labels = [ "pfh:ReactNative_CommonInfrastructurePlaceholder", "supermodule:xplat/default/public.react_native.core", diff --git a/packages/normalize-color/__tests__/normalizeColor-test.js b/packages/normalize-colors/__tests__/normalizeColor-test.js similarity index 100% rename from packages/normalize-color/__tests__/normalizeColor-test.js rename to packages/normalize-colors/__tests__/normalizeColor-test.js diff --git a/packages/normalize-color/index.js b/packages/normalize-colors/index.js similarity index 100% rename from packages/normalize-color/index.js rename to packages/normalize-colors/index.js diff --git a/packages/normalize-color/index.js.flow b/packages/normalize-colors/index.js.flow similarity index 100% rename from packages/normalize-color/index.js.flow rename to packages/normalize-colors/index.js.flow diff --git a/packages/normalize-color/package.json b/packages/normalize-colors/package.json similarity index 69% rename from packages/normalize-color/package.json rename to packages/normalize-colors/package.json index 7ecb89c6b89cbe..513ec2acd04a55 100644 --- a/packages/normalize-color/package.json +++ b/packages/normalize-colors/package.json @@ -1,11 +1,11 @@ { - "name": "@react-native/normalize-color", + "name": "@react-native/normalize-colors", "version": "2.0.0", "description": "Color normalization for React Native.", "repository": { "type": "git", "url": "git@github.com:facebook/react-native.git", - "directory": "packages/normalize-color" + "directory": "packages/normalize-colors" }, "license": "MIT" }