Skip to content

Reclassify renderer CSS as for-frameworks (#58788) #58788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coado wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Reclassify renderer CSS as for-frameworks (#58788) #58788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/react-native/ReactAndroid/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ val preparePrefab by
Pair("../ReactCommon/react/renderer/core/React/", "React/"),
// react_renderer_css
Pair("../ReactCommon/react/renderer/css/", "react/renderer/css/"),
Pair("../ReactCommon/react/renderer/css/React/", "React/"),
// react_debug
Pair("../ReactCommon/react/debug/", "react/debug/"),
Pair("../ReactCommon/react/debug/React/", "React/"),
Expand Down
3 changes: 2 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/CSS.h>
#include <React/Debug.h>
#include <React/RendererCore.h>
#include <React/View.h>
Expand All @@ -18,6 +17,8 @@
#include <react/renderer/attributedstring/ParagraphAttributes.h>
#include <react/renderer/attributedstring/TextAttributes.h>
#include <react/renderer/attributedstring/primitives.h>
#include <react/renderer/css/CSSFontVariant.h>
#include <react/renderer/css/CSSValueParser.h>
#include <unordered_map>

#ifdef RN_SERIALIZABLE_STATE
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSAngle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <cmath>
#include <cstdint>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <variant>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <algorithm>
#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSCompoundDataType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/css/CSSDataType.h>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSDataType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <any>
#include <concepts>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <array>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/css/CSSDataType.h>
#include <react/renderer/css/CSSKeyword.h>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <string_view>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <cstdint>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSLength.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSLengthPercentage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>
#include <react/renderer/css/CSSCompoundDataType.h>
#include <react/renderer/css/CSSLength.h>
#include <react/renderer/css/CSSPercentage.h>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <cstdint>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <type_traits>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <string_view>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSNumber.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSPercentage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSRatio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <variant>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <tuple>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSSyntaxParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <concepts>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSToken.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <string_view>

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSTokenizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <cmath>
#include <string_view>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <array>
#include <optional>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSTransformOrigin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <type_traits>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSValueParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>
#include <type_traits>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSZero.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#include <optional>

Expand Down
6 changes: 0 additions & 6 deletions packages/react-native/ReactCommon/react/renderer/css/React-renderercss.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,5 @@ Pod::Spec.new do |s|
add_dependency(s, "React-utils")
s.dependency "React-cxxstableapi"

s.subspec "cssUmbrella" do |ss|
ss.source_files = "React/*.h"
ss.header_dir = ""
ss.header_mappings_dir = "."
end

mark_as_react_native_build(s)
end
62 changes: 0 additions & 62 deletions packages/react-native/ReactCommon/react/renderer/css/React/CSS.h
View file
Open in desktop

This file was deleted.

30 changes: 30 additions & 0 deletions packages/react-native/scripts/ios-prebuild/__tests__/headers-config-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @flow strict-local
* @format
*/

'use strict';

const {PodspecExceptions} = require('../headers-config');

describe('React renderer CSS headers', () => {
test('publishes fine-grained headers without a stable umbrella', () => {
const rendererCss =
PodspecExceptions[
'ReactCommon/react/renderer/css/React-renderercss.podspec'
];

expect(rendererCss.subSpecs).toEqual([
{
name: 'css',
headerPatterns: ['*.h'],
headerDir: 'react/renderer/css',
},
]);
});
});
5 changes: 0 additions & 5 deletions packages/react-native/scripts/ios-prebuild/headers-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,11 +655,6 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
headerPatterns: ['*.h'],
headerDir: 'react/renderer/css',
},
{
name: 'cssUmbrella',
headerPatterns: ['React/*.h'],
headerDir: 'React',
},
],
},
'ReactCommon/react/utils/React-utils.podspec': {
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/scripts/ios-prebuild/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ async function setup(
link('ReactCommon/react/renderer/componentregistry/React', 'React');
link('ReactCommon/react/renderer/core');
link('ReactCommon/react/renderer/core/React', 'React');
link('ReactCommon/react/renderer/css/React', 'React');
link('ReactCommon/react/renderer/components/image/React', 'React');
link('ReactCommon/react/renderer/mapbuffer/React', 'React');
link('ReactCommon/react/bridging');
Expand Down
Loading