diff --git a/.github/workflows/macos-build-fabric-test.yml b/.github/workflows/macos-build-fabric-test.yml new file mode 100644 index 00000000..c34e7cd3 --- /dev/null +++ b/.github/workflows/macos-build-fabric-test.yml @@ -0,0 +1,21 @@ +name: Test new architecture macOS build +on: + pull_request: + paths: + - '.github/workflows/macos-fabric-test.yml' + - 'RNSVG.podspec' + - 'apple/**' + - 'macos-example/package.json' + - 'macos-example/macos/**' + - 'src/fabric/**' + - 'package.json' + push: + branches: + - main + +jobs: + reusable-macos-build: + if: github.repository == 'software-mansion/react-native-svg' + uses: ./.github/workflows/reusable-macos-build.yml + with: + new_arch_enabled: '1' diff --git a/.github/workflows/macos-build-test.yml b/.github/workflows/macos-build-test.yml index 15023f1a..23073b33 100644 --- a/.github/workflows/macos-build-test.yml +++ b/.github/workflows/macos-build-test.yml @@ -1,73 +1,21 @@ -name: Test macOS build +name: Test paper macOS build on: pull_request: paths: - - .github/workflows/macos-build-test.yml - - RNSVG.podspec - - apple/** - - macos-example/package.json - - macos-example/macos/** - - src/fabric/** - - package.json + - '.github/workflows/macos-build-test.yml' + - 'RNSVG.podspec' + - 'apple/**' + - 'macos-example/package.json' + - 'macos-example/macos/**' + - 'src/fabric/**' + - 'package.json' push: branches: - main jobs: - build: + reusable-macos-build: if: github.repository == 'software-mansion/react-native-svg' - runs-on: macos-14 - strategy: - matrix: - working-directory: [macos-example] - fail-fast: false - concurrency: - group: macos-${{ matrix.working-directory }}-${{ github.ref }} - cancel-in-progress: true - steps: - - name: Check out Git repository - uses: actions/checkout@v3 - - - name: Restore react-native-svg node_modules from cache - uses: actions/cache@v3 - with: - path: node_modules - key: ${{ runner.os }}-node-modules-svg-${{ hashFiles('yarn.lock') }} - restore-keys: ${{ runner.os }}-node-modules-svg- - - - name: Install react-native-svg node_modules - run: yarn install - - - name: Restore app node_modules from cache - uses: actions/cache@v3 - with: - path: ${{ matrix.working-directory }}/node_modules - key: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/yarn.lock', matrix.working-directory)) }} - restore-keys: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}- - - - name: Install app node_modules - working-directory: ${{ matrix.working-directory }} - run: yarn install - - - name: Restore Pods from cache - uses: actions/cache@v3 - with: - path: | - ${{ matrix.working-directory }}/macos/Pods - ~/Library/Caches/CocoaPods - ~/.cocoapods - key: ${{ runner.os }}-pods-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/macos/Podfile.lock', matrix.working-directory)) }} - - - name: Install Pods - working-directory: ${{ matrix.working-directory }}/macos - run: pod install - - - name: Restore build artifacts from cache - uses: actions/cache@v3 - with: - path: ~/Library/Developer/Xcode/DerivedData - key: ${{ runner.os }}-macos-derived-data-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/macos/Podfile.lock', matrix.working-directory)) }} - - - name: Build app - working-directory: ${{ matrix.working-directory }} - run: yarn macos + uses: ./.github/workflows/reusable-macos-build.yml + with: + new_arch_enabled: '0' diff --git a/.github/workflows/reusable-macos-build.yml b/.github/workflows/reusable-macos-build.yml new file mode 100644 index 00000000..19722ff6 --- /dev/null +++ b/.github/workflows/reusable-macos-build.yml @@ -0,0 +1,66 @@ +name: Reusable macOS Build + +on: + workflow_call: + inputs: + new_arch_enabled: + required: true + type: string + +jobs: + build: + runs-on: macos-14 + strategy: + matrix: + working-directory: [macos-example] + fail-fast: false + concurrency: + group: macos-${{ matrix.working-directory }}-${{ github.ref }}-${{ inputs.new_arch_enabled }} + cancel-in-progress: true + steps: + - name: Check out Git repository + uses: actions/checkout@v3 + + - name: Restore react-native-svg node_modules from cache + uses: actions/cache@v3 + with: + path: node_modules + key: ${{ runner.os }}-node-modules-svg-${{ hashFiles('yarn.lock') }} + restore-keys: ${{ runner.os }}-node-modules-svg- + + - name: Install react-native-svg node modules + run: yarn install + + - name: Restore app node_modules from cache + uses: actions/cache@v3 + with: + path: ${{ matrix.working-directory }}/node_modules + key: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/yarn.lock', matrix.working-directory)) }} + restore-keys: ${{ runner.os }}-node-modules-${{ matrix.working-directory }}- + + - name: Install app node modules + working-directory: ${{ matrix.working-directory }} + run: yarn install + + - name: Restore Pods from cache + uses: actions/cache@v3 + with: + path: | + ${{ matrix.working-directory }}/macos/Pods + ~/Library/Caches/CocoaPods + ~/.cocoapods + key: ${{ runner.os }}-pods-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/macos/Podfile.lock', matrix.working-directory)) }} + + - name: Install Pods + working-directory: ${{ matrix.working-directory }}/macos + run: RCT_NEW_ARCH_ENABLED=${{ inputs.new_arch_enabled }} pod install + + - name: Restore build artifacts from cache + uses: actions/cache@v3 + with: + path: ~/Library/Developer/Xcode/DerivedData + key: ${{ runner.os }}-macos-derived-data-${{ matrix.working-directory }}-${{ hashFiles(format('{0}/macos/Podfile.lock', matrix.working-directory)) }} + + - name: Build app + working-directory: ${{ matrix.working-directory }} + run: yarn macos diff --git a/apple/Elements/RNSVGClipPath.mm b/apple/Elements/RNSVGClipPath.mm index e1593b70..2eed3175 100644 --- a/apple/Elements/RNSVGClipPath.mm +++ b/apple/Elements/RNSVGClipPath.mm @@ -58,9 +58,9 @@ using namespace facebook::react; - (BOOL)isSimpleClipPath { - NSArray *children = self.subviews; + NSArray *children = self.subviews; if (children.count == 1) { - RNSVGView *child = children[0]; + RNSVGPlatformView *child = children[0]; if ([child class] != [RNSVGGroup class]) { return true; } diff --git a/apple/Elements/RNSVGSvgView.h b/apple/Elements/RNSVGSvgView.h index c70a8d12..a47d33d3 100644 --- a/apple/Elements/RNSVGSvgView.h +++ b/apple/Elements/RNSVGSvgView.h @@ -12,21 +12,12 @@ #import "RNSVGPainter.h" #import "RNSVGVBMOS.h" -#ifdef RCT_NEW_ARCH_ENABLED -#import -#endif // RCT_NEW_ARCH_ENABLED - @class RNSVGNode; @class RNSVGMarker; @class RNSVGMask; @class RNSVGFilter; -@interface RNSVGSvgView : -#ifdef RCT_NEW_ARCH_ENABLED - RCTViewComponentView -#else - RNSVGView -#endif // RCT_NEW_ARCH_ENABLED +@interface RNSVGSvgView : RNSVGView @property (nonatomic, strong) RNSVGLength *bbWidth; @property (nonatomic, strong) RNSVGLength *bbHeight; diff --git a/apple/Elements/RNSVGSvgView.mm b/apple/Elements/RNSVGSvgView.mm index 47ff584d..e6415f20 100644 --- a/apple/Elements/RNSVGSvgView.mm +++ b/apple/Elements/RNSVGSvgView.mm @@ -119,13 +119,13 @@ using namespace facebook::react; rendered = NO; } -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RNSVGView *)childComponentView index:(NSInteger)index { [super mountChildComponentView:childComponentView index:index]; [self invalidate]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RNSVGView *)childComponentView index:(NSInteger)index { [super unmountChildComponentView:childComponentView index:index]; [self invalidate]; @@ -133,14 +133,14 @@ using namespace facebook::react; #endif // RCT_NEW_ARCH_ENABLED -- (void)insertReactSubview:(RNSVGView *)subview atIndex:(NSInteger)atIndex +- (void)insertReactSubview:(RNSVGPlatformView *)subview atIndex:(NSInteger)atIndex { [super insertReactSubview:subview atIndex:atIndex]; [self insertSubview:subview atIndex:atIndex]; [self invalidate]; } -- (void)removeReactSubview:(RNSVGView *)subview +- (void)removeReactSubview:(RNSVGPlatformView *)subview { [super removeReactSubview:subview]; [self invalidate]; @@ -290,7 +290,7 @@ using namespace facebook::react; _viewBoxTransform = CGAffineTransformIdentity; _invviewBoxTransform = CGAffineTransformIdentity; } - for (RNSVGView *node in self.subviews) { + for (RNSVGPlatformView *node in self.subviews) { if ([node isKindOfClass:[RNSVGNode class]]) { RNSVGNode *svg = (RNSVGNode *)node; if (svg.responsible && !self.responsible) { diff --git a/apple/RNSVGNode.h b/apple/RNSVGNode.h index a7abe078..5c2f40a0 100644 --- a/apple/RNSVGNode.h +++ b/apple/RNSVGNode.h @@ -12,10 +12,6 @@ #import #import -#ifdef RCT_NEW_ARCH_ENABLED -#import -#endif // RCT_NEW_ARCH_ENABLED - @class RNSVGGroup; /** @@ -23,12 +19,7 @@ *interfaces for all non-definition nodes. */ -@interface RNSVGNode : -#ifdef RCT_NEW_ARCH_ENABLED - RCTViewComponentView -#else - RNSVGView -#endif // RCT_NEW_ARCH_ENABLED +@interface RNSVGNode : RNSVGView /* N[1/Sqrt[2], 36] The inverse of the square root of 2. diff --git a/apple/RNSVGNode.mm b/apple/RNSVGNode.mm index 390979af..444f5417 100644 --- a/apple/RNSVGNode.mm +++ b/apple/RNSVGNode.mm @@ -46,27 +46,27 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12; return self; } -- (void)insertReactSubview:(RNSVGView *)subview atIndex:(NSInteger)atIndex +- (void)insertReactSubview:(RNSVGPlatformView *)subview atIndex:(NSInteger)atIndex { [super insertReactSubview:subview atIndex:atIndex]; [self insertSubview:subview atIndex:atIndex]; [self invalidate]; } -- (void)removeReactSubview:(RNSVGView *)subview +- (void)removeReactSubview:(RNSVGPlatformView *)subview { [super removeReactSubview:subview]; [self invalidate]; } #ifdef RCT_NEW_ARCH_ENABLED -- (void)mountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)mountChildComponentView:(RNSVGView *)childComponentView index:(NSInteger)index { [super mountChildComponentView:childComponentView index:index]; [self invalidate]; } -- (void)unmountChildComponentView:(UIView *)childComponentView index:(NSInteger)index +- (void)unmountChildComponentView:(RNSVGView *)childComponentView index:(NSInteger)index { [super unmountChildComponentView:childComponentView index:index]; [self invalidate]; @@ -84,7 +84,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12; return; } _dirty = true; - RNSVGView *container = self.superview; + RNSVGPlatformView *container = self.superview; // on Fabric, when the child components are added to hierarchy and their props are set, // their superview is not set yet. if (container != nil) { @@ -240,7 +240,7 @@ CGFloat const RNSVG_DEFAULT_FONT_SIZE = 12; } _matrix = matrix; _invmatrix = CGAffineTransformInvert(matrix); - RNSVGView *container = self.superview; + RNSVGPlatformView *container = self.superview; // on Fabric, when the child components are added to hierarchy and their props are set, // their superview is still their componentView, we change it in `mountChildComponentView` method. if ([container conformsToProtocol:@protocol(RNSVGContainer)]) { diff --git a/apple/RNSVGUIKit.h b/apple/RNSVGUIKit.h index 3562fe46..073e99ba 100644 --- a/apple/RNSVGUIKit.h +++ b/apple/RNSVGUIKit.h @@ -1,5 +1,8 @@ // Most (if not all) of this file could probably go away once react-native-macos's version of RCTUIKit.h makes its way // upstream. https://github.com/microsoft/react-native-macos/issues/242 +#ifdef RCT_NEW_ARCH_ENABLED +#import +#endif // RCT_NEW_ARCH_ENABLED #if !TARGET_OS_OSX @@ -8,7 +11,11 @@ #define RNSVGColor UIColor #define RNSVGPlatformView UIView #define RNSVGTextView UILabel +#ifdef RCT_NEW_ARCH_ENABLED +#define RNSVGView RCTViewComponentView +#else #define RNSVGView UIView +#endif // RCT_NEW_ARCH_ENABLED #else // TARGET_OS_OSX [ @@ -29,7 +36,16 @@ extern "C" { #define RNSVGPlatformView NSView #define RNSVGTextView NSTextView -@interface RNSVGView : RCTUIView +@interface RNSVGColor (CGColor) +- (NSColor *)CGColor; +@end + +@interface RNSVGView : +#ifdef RCT_NEW_ARCH_ENABLED + RCTViewComponentView +#else + RCTUIView +#endif // RCT_NEW_ARCH_ENABLED @property CGPoint center; @property (nonatomic, strong) RNSVGColor *tintColor; diff --git a/apple/Text/RNSVGTSpan.mm b/apple/Text/RNSVGTSpan.mm index 284c22b9..a087ef38 100644 --- a/apple/Text/RNSVGTSpan.mm +++ b/apple/Text/RNSVGTSpan.mm @@ -311,7 +311,7 @@ RNSVGTopAlignedLabel *label; NSString *str = self.content; if (!str) { - for (RNSVGView *node in self.subviews) { + for (RNSVGPlatformView *node in self.subviews) { if ([node isKindOfClass:[RNSVGText class]]) { RNSVGText *text = (RNSVGText *)node; advance += [text getSubtreeTextChunksTotalAdvance]; diff --git a/apple/Text/RNSVGText.mm b/apple/Text/RNSVGText.mm index c3d11bb1..5d064273 100644 --- a/apple/Text/RNSVGText.mm +++ b/apple/Text/RNSVGText.mm @@ -345,7 +345,7 @@ using namespace facebook::react; return cachedAdvance; } CGFloat advance = 0; - for (RNSVGView *node in self.subviews) { + for (RNSVGPlatformView *node in self.subviews) { if ([node isKindOfClass:[RNSVGText class]]) { RNSVGText *text = (RNSVGText *)node; advance += [text getSubtreeTextChunksTotalAdvance]; diff --git a/apple/Utils/RNSVGFabricConversions.h b/apple/Utils/RNSVGFabricConversions.h index abf95512..8c5bd0ae 100644 --- a/apple/Utils/RNSVGFabricConversions.h +++ b/apple/Utils/RNSVGFabricConversions.h @@ -128,7 +128,11 @@ void setCommonNodeProps(const T &nodeProps, RNSVGNode *node) node.pointerEvents = RCTPointerEventsUnspecified; } node.accessibilityIdentifier = RCTNSStringFromStringNilIfEmpty(nodeProps.testId); +#if !TARGET_OS_OSX node.isAccessibilityElement = nodeProps.accessible; +#else + node.accessibilityElement = nodeProps.accessible; +#endif // !TARGET_OS_OSX node.accessibilityLabel = RCTNSStringFromStringNilIfEmpty(nodeProps.accessibilityLabel); } diff --git a/apple/ViewManagers/RNSVGDefsManager.mm b/apple/ViewManagers/RNSVGDefsManager.mm index 38af11fd..cf0a231c 100644 --- a/apple/ViewManagers/RNSVGDefsManager.mm +++ b/apple/ViewManagers/RNSVGDefsManager.mm @@ -18,7 +18,7 @@ RCT_EXPORT_MODULE() return [RNSVGDefs new]; } -- (RNSVGView *)view +- (RNSVGPlatformView *)view { return [self node]; } diff --git a/apple/ViewManagers/RNSVGNodeManager.mm b/apple/ViewManagers/RNSVGNodeManager.mm index f670bc01..0535eebc 100644 --- a/apple/ViewManagers/RNSVGNodeManager.mm +++ b/apple/ViewManagers/RNSVGNodeManager.mm @@ -20,7 +20,7 @@ RCT_EXPORT_MODULE() return [RNSVGNode new]; } -- (RNSVGView *)view +- (RNSVGPlatformView *)view { return [self node]; } diff --git a/apple/ViewManagers/RNSVGSvgViewManager.mm b/apple/ViewManagers/RNSVGSvgViewManager.mm index 203b1427..ee99d911 100644 --- a/apple/ViewManagers/RNSVGSvgViewManager.mm +++ b/apple/ViewManagers/RNSVGSvgViewManager.mm @@ -13,7 +13,7 @@ RCT_EXPORT_MODULE() -- (RNSVGView *)view +- (RNSVGPlatformView *)view { return [RNSVGSvgView new]; } diff --git a/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj b/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj index 3ac290ea..361a4cb0 100644 --- a/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj +++ b/macos-example/macos/MacOSExample.xcodeproj/project.pbxproj @@ -143,7 +143,6 @@ 514201472437B4B30078DB4F /* Resources */, 381D8A6E24576A4E00465D17 /* Bundle React Native code and images */, 2901994A9E17934692292941 /* [CP] Copy Pods Resources */, - 533CA2F184A5D179137907B4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -282,24 +281,6 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native-macos/scripts/react-native-xcode.sh\n"; }; - 533CA2F184A5D179137907B4 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-frameworks.sh", - "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/macosx/hermes.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MacOSExample-macOS/Pods-MacOSExample-macOS-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -478,15 +459,21 @@ ); MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "$(inherited)"; - OTHER_CPLUSPLUSFLAGS = "$(inherited)"; + OTHER_CFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); OTHER_LDFLAGS = ( "$(inherited)", " ", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; - USE_HERMES = true; + USE_HERMES = false; }; name = Debug; }; @@ -539,15 +526,21 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; - OTHER_CFLAGS = "$(inherited)"; - OTHER_CPLUSPLUSFLAGS = "$(inherited)"; + OTHER_CFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); + OTHER_CPLUSPLUSFLAGS = ( + "$(inherited)", + "-DRN_FABRIC_ENABLED", + ); OTHER_LDFLAGS = ( "$(inherited)", " ", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; - USE_HERMES = true; + USE_HERMES = false; VALIDATE_PRODUCT = YES; }; name = Release; diff --git a/macos-example/macos/Podfile b/macos-example/macos/Podfile index 28466089..b3b70a56 100644 --- a/macos-example/macos/Podfile +++ b/macos-example/macos/Podfile @@ -12,8 +12,8 @@ target 'MacOSExample-macOS' do use_react_native!( :path => '../node_modules/react-native-macos', - :hermes_enabled => true, - :fabric_enabled => false, + :hermes_enabled => ENV['RCT_NEW_ARCH_ENABLED'] == '0', + :fabric_enabled => ENV['RCT_NEW_ARCH_ENABLED'] == '1', # Flipper is not compatible w/ macOS :flipper_configuration => FlipperConfiguration.disabled, # An absolute path to your application root. diff --git a/macos-example/macos/Podfile.lock b/macos-example/macos/Podfile.lock index 9d329ebd..955fa16c 100644 --- a/macos-example/macos/Podfile.lock +++ b/macos-example/macos/Podfile.lock @@ -2,13 +2,6 @@ PODS: - boost (1.83.0) - DoubleConversion (1.1.6) - FBLazyVector (0.73.32) - - FBReactNativeSpec (0.73.32): - - RCT-Folly (= 2022.05.16.00) - - RCTRequired (= 0.73.32) - - RCTTypeSafety (= 0.73.32) - - React-Core (= 0.73.32) - - React-jsi (= 0.73.32) - - ReactCommon/turbomodule/core (= 0.73.32) - fmt (9.1.0) - glog (0.3.5) - hermes-engine (0.73.9): @@ -31,12 +24,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - RCT-Folly/Futures (2022.05.16.00): - - boost - - DoubleConversion - - fmt (= 9.1.0) - - glog - - libevent - RCTRequired (0.73.32) - RCTTypeSafety (0.73.32): - FBLazyVector (= 0.73.32) @@ -58,26 +45,29 @@ PODS: - React-callinvoker (0.73.32) - React-Codegen (0.73.32): - DoubleConversion - - FBReactNativeSpec - glog - - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core + - React-debug + - React-Fabric + - React-FabricImage + - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-NativeModulesApple - - React-rncore + - React-rendererdebug + - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - React-Core (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 0.73.32) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -87,11 +77,10 @@ PODS: - Yoga - React-Core/CoreModulesHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -101,10 +90,9 @@ PODS: - Yoga - React-Core/Default (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -114,12 +102,11 @@ PODS: - Yoga - React-Core/DevSupport (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 0.73.32) - React-Core/RCTWebSocket (= 0.73.32) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-jsinspector (= 0.73.32) @@ -130,11 +117,10 @@ PODS: - Yoga - React-Core/RCTActionSheetHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -144,11 +130,10 @@ PODS: - Yoga - React-Core/RCTAnimationHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -158,11 +143,10 @@ PODS: - Yoga - React-Core/RCTBlobHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -172,11 +156,10 @@ PODS: - Yoga - React-Core/RCTImageHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -186,11 +169,10 @@ PODS: - Yoga - React-Core/RCTLinkingHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -200,11 +182,10 @@ PODS: - Yoga - React-Core/RCTNetworkHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -214,11 +195,10 @@ PODS: - Yoga - React-Core/RCTSettingsHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -228,11 +208,10 @@ PODS: - Yoga - React-Core/RCTTextHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -242,11 +221,10 @@ PODS: - Yoga - React-Core/RCTVibrationHeaders (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -256,11 +234,10 @@ PODS: - Yoga - React-Core/RCTWebSocket (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Core/Default (= 0.73.32) - React-cxxreact - - React-hermes + - React-jsc - React-jsi - React-jsiexecutor - React-perflogger @@ -284,7 +261,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.32) - React-debug (= 0.73.32) @@ -298,7 +274,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -320,6 +295,7 @@ PODS: - React-Fabric/textlayoutmanager (= 0.73.32) - React-Fabric/uimanager (= 0.73.32) - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -331,7 +307,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -339,6 +314,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -350,7 +326,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -358,6 +333,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -369,7 +345,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -377,6 +352,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -388,7 +364,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -396,6 +371,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -407,7 +383,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -426,6 +401,7 @@ PODS: - React-Fabric/components/unimplementedview (= 0.73.32) - React-Fabric/components/view (= 0.73.32) - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -437,7 +413,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -445,6 +420,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -456,7 +432,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -464,6 +439,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -475,7 +451,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -483,6 +458,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -494,7 +470,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -502,6 +477,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -513,7 +489,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -521,6 +496,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -532,7 +508,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -540,6 +515,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -551,7 +527,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -559,6 +534,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -570,7 +546,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -578,6 +553,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -589,7 +565,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -597,6 +572,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -608,7 +584,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -616,6 +591,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -627,7 +603,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -635,6 +610,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -647,7 +623,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -655,6 +630,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -666,7 +642,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -674,6 +649,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -685,7 +661,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -693,6 +668,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -704,7 +680,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -712,6 +687,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -723,7 +699,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -731,6 +706,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -742,7 +718,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -750,6 +725,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -761,7 +737,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -769,6 +744,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -780,7 +756,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -789,6 +764,7 @@ PODS: - React-debug - React-Fabric/uimanager - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -800,7 +776,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired - RCTTypeSafety @@ -808,6 +783,7 @@ PODS: - React-cxxreact - React-debug - React-graphics + - React-jsc - React-jsi - React-jsiexecutor - React-logger @@ -819,13 +795,13 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - RCTRequired (= 0.73.32) - RCTTypeSafety (= 0.73.32) - React-Fabric - React-graphics - React-ImageManager + - React-jsc - React-jsi - React-jsiexecutor (= 0.73.32) - React-logger @@ -838,18 +814,6 @@ PODS: - RCT-Folly/Fabric (= 2022.05.16.00) - React-Core/Default (= 0.73.32) - React-utils - - React-hermes (0.73.32): - - DoubleConversion - - fmt (= 9.1.0) - - glog - - hermes-engine - - RCT-Folly (= 2022.05.16.00) - - RCT-Folly/Futures (= 2022.05.16.00) - - React-cxxreact (= 0.73.32) - - React-jsi - - React-jsiexecutor (= 0.73.32) - - React-jsinspector (= 0.73.32) - - React-perflogger (= 0.73.32) - React-ImageManager (0.73.32): - glog - RCT-Folly/Fabric @@ -859,6 +823,11 @@ PODS: - React-graphics - React-rendererdebug - React-utils + - React-jsc (0.73.32): + - React-jsc/Fabric (= 0.73.32) + - React-jsi (= 0.73.32) + - React-jsc/Fabric (0.73.32): + - React-jsi (= 0.73.32) - React-jserrorhandler (0.73.32): - RCT-Folly/Fabric (= 2022.05.16.00) - React-debug @@ -869,18 +838,18 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-jsiexecutor (0.73.32): - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-cxxreact (= 0.73.32) - React-jsi (= 0.73.32) - React-perflogger (= 0.73.32) - React-jsinspector (0.73.32) + - React-jsitracing (0.73.32): + - React-jsi - React-logger (0.73.32): - glog - React-Mapbuffer (0.73.32): @@ -889,10 +858,10 @@ PODS: - React-nativeconfig (0.73.32) - React-NativeModulesApple (0.73.32): - glog - - hermes-engine - React-callinvoker - React-Core - React-cxxreact + - React-jsc - React-jsi - React-runtimeexecutor - ReactCommon/turbomodule/bridging @@ -914,16 +883,22 @@ PODS: - RCTTypeSafety - React-Core - React-CoreModules - - React-hermes + - React-debug + - React-Fabric + - React-graphics + - React-jsc - React-nativeconfig - React-NativeModulesApple - React-RCTFabric - React-RCTImage - React-RCTNetwork + - React-rendererdebug + - React-RuntimeApple + - React-RuntimeCore - React-runtimescheduler + - React-utils - ReactCommon - React-RCTBlob (0.73.32): - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Codegen - React-Core/RCTBlobHeaders @@ -934,7 +909,6 @@ PODS: - ReactCommon - React-RCTFabric (0.73.32): - glog - - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - React-Core - React-debug @@ -942,6 +916,7 @@ PODS: - React-FabricImage - React-graphics - React-ImageManager + - React-jsc - React-jsi - React-nativeconfig - React-RCTImage @@ -998,15 +973,41 @@ PODS: - RCT-Folly (= 2022.05.16.00) - React-debug - React-rncore (0.73.32) + - React-RuntimeApple (0.73.32): + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-callinvoker + - React-Core/Default + - React-CoreModules + - React-cxxreact + - React-jsc + - React-jserrorhandler + - React-jsi + - React-jsiexecutor + - React-Mapbuffer + - React-NativeModulesApple + - React-RCTFabric + - React-RuntimeCore + - React-runtimeexecutor + - React-utils + - React-RuntimeCore (0.73.32): + - glog + - RCT-Folly/Fabric (= 2022.05.16.00) + - React-cxxreact + - React-jsc + - React-jserrorhandler + - React-jsi + - React-jsiexecutor + - React-runtimeexecutor + - React-runtimescheduler - React-runtimeexecutor (0.73.32): - React-jsi (= 0.73.32) - React-runtimescheduler (0.73.32): - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker - React-cxxreact - React-debug + - React-jsc - React-jsi - React-rendererdebug - React-runtimeexecutor @@ -1022,7 +1023,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.32) - React-cxxreact (= 0.73.32) @@ -1035,7 +1035,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.32) - React-cxxreact (= 0.73.32) @@ -1046,7 +1045,6 @@ PODS: - DoubleConversion - fmt (= 9.1.0) - glog - - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-callinvoker (= 0.73.32) - React-cxxreact (= 0.73.32) @@ -1056,10 +1054,55 @@ PODS: - RNReanimated (3.9.0): - glog - RCT-Folly (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen - React-Core + - React-debug + - React-Fabric + - React-graphics + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - RNSVG (15.4.0): - React-Core + - React-debug + - React-Fabric + - React-graphics + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - RNSVG/common (= 15.3.0) + - Yoga + - RNSVG/common (15.3.0): + - glog + - RCT-Folly (= 2022.05.16.00) + - RCTRequired + - RCTTypeSafety + - React-Codegen + - React-Core + - React-debug + - React-Fabric + - React-graphics + - React-ImageManager + - React-jsi + - React-NativeModulesApple + - React-RCTFabric + - React-rendererdebug + - React-utils + - ReactCommon/turbomodule/bridging + - ReactCommon/turbomodule/core + - Yoga - SocketRocket (0.7.0) - Yoga (1.14.0) @@ -1067,11 +1110,8 @@ DEPENDENCIES: - boost (from `../node_modules/react-native-macos/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native-macos/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native-macos/Libraries/FBLazyVector`) - - FBReactNativeSpec (from `../node_modules/react-native-macos/React/FBReactNativeSpec`) - fmt (from `../node_modules/react-native-macos/third-party-podspecs/fmt.podspec`) - glog (from `../node_modules/react-native-macos/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../node_modules/react-native-macos/sdks/hermes-engine/hermes-engine.podspec`) - - libevent (~> 2.1.12) - RCT-Folly (from `../node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec`) - RCT-Folly/Fabric (from `../node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native-macos/Libraries/RCTRequired`) @@ -1087,12 +1127,14 @@ DEPENDENCIES: - React-Fabric (from `../node_modules/react-native-macos/ReactCommon`) - React-FabricImage (from `../node_modules/react-native-macos/ReactCommon`) - React-graphics (from `../node_modules/react-native-macos/ReactCommon/react/renderer/graphics`) - - React-hermes (from `../node_modules/react-native-macos/ReactCommon/hermes`) - React-ImageManager (from `../node_modules/react-native-macos/ReactCommon/react/renderer/imagemanager/platform/ios`) + - React-jsc (from `../node_modules/react-native-macos/ReactCommon/jsc`) + - React-jsc/Fabric (from `../node_modules/react-native-macos/ReactCommon/jsc`) - React-jserrorhandler (from `../node_modules/react-native-macos/ReactCommon/jserrorhandler`) - React-jsi (from `../node_modules/react-native-macos/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native-macos/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native-macos/ReactCommon/jsinspector-modern`) + - React-jsitracing (from `../node_modules/react-native-macos/ReactCommon/hermes/executor/`) - React-logger (from `../node_modules/react-native-macos/ReactCommon/logger`) - React-Mapbuffer (from `../node_modules/react-native-macos/ReactCommon`) - React-nativeconfig (from `../node_modules/react-native-macos/ReactCommon`) @@ -1111,6 +1153,8 @@ DEPENDENCIES: - React-RCTVibration (from `../node_modules/react-native-macos/Libraries/Vibration`) - React-rendererdebug (from `../node_modules/react-native-macos/ReactCommon/react/renderer/debug`) - React-rncore (from `../node_modules/react-native-macos/ReactCommon`) + - React-RuntimeApple (from `../node_modules/react-native-macos/ReactCommon/react/runtime/platform/ios`) + - React-RuntimeCore (from `../node_modules/react-native-macos/ReactCommon/react/runtime`) - React-runtimeexecutor (from `../node_modules/react-native-macos/ReactCommon/runtimeexecutor`) - React-runtimescheduler (from `../node_modules/react-native-macos/ReactCommon/react/renderer/runtimescheduler`) - React-utils (from `../node_modules/react-native-macos/ReactCommon/react/utils`) @@ -1120,10 +1164,6 @@ DEPENDENCIES: - SocketRocket (from `../node_modules/react-native-macos/third-party-podspecs/SocketRocket.podspec`) - Yoga (from `../node_modules/react-native-macos/ReactCommon/yoga`) -SPEC REPOS: - trunk: - - libevent - EXTERNAL SOURCES: boost: :podspec: "../node_modules/react-native-macos/third-party-podspecs/boost.podspec" @@ -1131,15 +1171,10 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native-macos/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: :path: "../node_modules/react-native-macos/Libraries/FBLazyVector" - FBReactNativeSpec: - :path: "../node_modules/react-native-macos/React/FBReactNativeSpec" fmt: :podspec: "../node_modules/react-native-macos/third-party-podspecs/fmt.podspec" glog: :podspec: "../node_modules/react-native-macos/third-party-podspecs/glog.podspec" - hermes-engine: - :podspec: "../node_modules/react-native-macos/sdks/hermes-engine/hermes-engine.podspec" - :tag: hermes-2024-04-29-RNv0.73.8-644c8be78af1eae7c138fa4093fb87f0f4f8db85 RCT-Folly: :podspec: "../node_modules/react-native-macos/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1166,10 +1201,10 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-macos/ReactCommon" React-graphics: :path: "../node_modules/react-native-macos/ReactCommon/react/renderer/graphics" - React-hermes: - :path: "../node_modules/react-native-macos/ReactCommon/hermes" React-ImageManager: :path: "../node_modules/react-native-macos/ReactCommon/react/renderer/imagemanager/platform/ios" + React-jsc: + :path: "../node_modules/react-native-macos/ReactCommon/jsc" React-jserrorhandler: :path: "../node_modules/react-native-macos/ReactCommon/jserrorhandler" React-jsi: @@ -1178,6 +1213,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-macos/ReactCommon/jsiexecutor" React-jsinspector: :path: "../node_modules/react-native-macos/ReactCommon/jsinspector-modern" + React-jsitracing: + :path: "../node_modules/react-native-macos/ReactCommon/hermes/executor/" React-logger: :path: "../node_modules/react-native-macos/ReactCommon/logger" React-Mapbuffer: @@ -1214,6 +1251,10 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-macos/ReactCommon/react/renderer/debug" React-rncore: :path: "../node_modules/react-native-macos/ReactCommon" + React-RuntimeApple: + :path: "../node_modules/react-native-macos/ReactCommon/react/runtime/platform/ios" + React-RuntimeCore: + :path: "../node_modules/react-native-macos/ReactCommon/react/runtime" React-runtimeexecutor: :path: "../node_modules/react-native-macos/ReactCommon/runtimeexecutor" React-runtimescheduler: @@ -1235,7 +1276,6 @@ SPEC CHECKSUMS: boost: 0686b6af8cbd638c784fea5afb789be66699823c DoubleConversion: ca54355f8932558971f6643521d62b9bc8231cee FBLazyVector: ec230eb0579ecfb1f0e0315a1f97161c21098b0e - FBReactNativeSpec: 1ce1c898cc8011f31f4ffd7d090a6817a1b6564b fmt: 03574da4b7ba40de39da59677ca66610ce8c4a02 glog: 3a72874c0322c7caf24931d3a2777cb7a3090529 hermes-engine: ed62e0dcd013bf4a3b487f164feec1c4e705b5b5 @@ -1245,30 +1285,31 @@ SPEC CHECKSUMS: RCTTypeSafety: b8394b9791f4650512e04d6989ef2db232f7ca68 React: 711b4f63092274fd03ca4f29391e02c23ee646e0 React-callinvoker: 32463ee184e9c8cd10afa7fe15eedb8a17f7266f - React-Codegen: 53c10dea773e073013c5b49a282f6a90534d3636 - React-Core: 58d1babffbe7663c404b387f4f48f6541a9c0f45 + React-Codegen: 9c4eb402e9c36acccc99c2e1814ccc7216eb9857 + React-Core: 9e10613a31209303b62c915e52581dbc79bc99a9 React-CoreModules: f045fc42451ce5a3fd2954bd41b9d2bbef59aad9 - React-cxxreact: cf3b4a253f5f3457495975d638701efde5a12f27 + React-cxxreact: 9a58746caa5db3c97b6294f692536e99f9eb39a9 React-debug: efa264368daa8f711aacb2dfc76f994ad61277e4 - React-Fabric: d5485f04710d1b833a305b76d356671b3f3d9be5 - React-FabricImage: 6a0eba67755a6156e05eeb7e1af2dd68b64462fb + React-Fabric: 635ef80857e01e6bba8370fd77ee9307e0965de9 + React-FabricImage: 90df35a409cf973c4856597233b937a79d3327e8 React-graphics: fe4279c945cd8fdafcce094577797d416a984e11 - React-hermes: 3880cfdbc4d7bf6a2ec4384c5346521cb5e09fed React-ImageManager: eff2d4ce58c9a13af776633f363c2e81ccd090a4 + React-jsc: 99e41c0e626efb6bdb52f7115498cc9955608033 React-jserrorhandler: e8ed8d69cba881e670b01c8b42c4d62d150aa47e - React-jsi: 74de32f83429b8ec52f39e7293ce63a58bcb664f - React-jsiexecutor: e50631d008155b7028b0944eea96305370cc16e0 + React-jsi: 66b43acd53b6f55ac522c07311eafa33ac30866f + React-jsiexecutor: 089a4cdd5a50126792971b404f3ac6b40369e6c8 React-jsinspector: 823ba14cfc115ed314241a476bd353208aadcc24 + React-jsitracing: 787e159e27c63513fa3be217cd0b5fafcd18533d React-logger: 9857ddefa5a153042f4ccef6a548c502b1aa4dc7 React-Mapbuffer: 2ecad53dc435ecd00119694f5a4d4a900cbe2c85 React-nativeconfig: 0ca2a63f4d8f8ed4be4fbb9920a4bd1e498c61c9 - React-NativeModulesApple: f42855d35e32e70307f0481b3978cad3b4191115 + React-NativeModulesApple: 27ee9d086da1c19b31b979dccef406da5278de61 React-perflogger: 9ffd71c8dae6a9f7702f9c5c7149c12e26b9a89a React-RCTActionSheet: 60ebd7ce4eca6ddfb3c6f1c7daf84e4b298b04e0 React-RCTAnimation: 8fad4bdf067cbecf3e1512656e19603f0bc6b2af - React-RCTAppDelegate: 470235aa62c0d88ee0af86576dcbeb5d4f7f6855 - React-RCTBlob: 9c00db2148befc29f0564107a47c732f8fc01249 - React-RCTFabric: 26b214506f2d1fb96f8e54aa4b2830dbfb86a55e + React-RCTAppDelegate: 1986d745d2dbf2b10098b439974c86af16b8cbf8 + React-RCTBlob: b868f01e3cfa3043776191cc97e93ebaa3550496 + React-RCTFabric: cfc750296291acf79972ebdb0bb58555a7bd30bf React-RCTImage: e170fa8f5a1ae9241a22bdbccef9d3e03228b6b2 React-RCTLinking: b0d463bac62e169e0aafafcfc6009706f1ea75eb React-RCTNetwork: 3b753e3401b91c3cb2529d20a34727c07049628c @@ -1276,9 +1317,11 @@ SPEC CHECKSUMS: React-RCTText: 4726a251151de491200624aa8238e0a24dcfeaa6 React-RCTVibration: 8daf1b17c54ad3d2485f5055ae4111fe739af1ec React-rendererdebug: 8d801cf66f9a965b98800cc46eda4cb43a2e31d8 - React-rncore: 09c40860b31e3b0fca7095665de23c840268ef48 + React-rncore: e53576be85ee6e9774454e12d095500558b31a7b + React-RuntimeApple: 0e2f3bae12f516a8c1085956fff948cf308ec9ea + React-RuntimeCore: 2eeafecfafd892d66b706fd37f586a9e60a04a19 React-runtimeexecutor: 573cf1a5a27ba24d2a09abcc88c52f159f47ff28 - React-runtimescheduler: ec5d328861896387a906e38d3b8a5e03dc9570e6 + React-runtimescheduler: 508ec4adf3a3a5ffb7b3d10d1f236a2a9022ce5a React-utils: 52afeb88f90c5a40fa42a145df7877595302f6cf ReactCommon: 41305560b33e9d8f059560e65a283d40c6885fa0 RNReanimated: e4276a6afc57c02056daa5ea1afb41a5ec497d9b @@ -1286,6 +1329,6 @@ SPEC CHECKSUMS: SocketRocket: f6c6249082c011e6de2de60ed641ef8bbe0cfac9 Yoga: b734a95cb36e2b7e9e7b5733ce679a97e4f37da4 -PODFILE CHECKSUM: 4ffbc0efb36c61310ce74356fd6f9b4723087186 +PODFILE CHECKSUM: 4cb066d67ae052b77a656a415986727ed0807b80 COCOAPODS: 1.15.2 diff --git a/macos-example/package.json b/macos-example/package.json index 26acb68d..00ac70a3 100644 --- a/macos-example/package.json +++ b/macos-example/package.json @@ -6,7 +6,8 @@ "macos": "react-native run-macos", "lint": "eslint .", "start": "react-native start", - "test": "jest" + "test": "jest", + "postinstall": "patch-package" }, "dependencies": { "react": "18.2.0", @@ -29,6 +30,7 @@ "eslint": "^8.19.0", "jest": "^29.2.1", "metro-react-native-babel-preset": "0.73.5", + "patch-package": "^8.0.0", "prettier": "^2.4.1", "react-test-renderer": "18.2.0", "typescript": "4.8.4" diff --git a/macos-example/patches/react-native-reanimated+3.9.0.patch b/macos-example/patches/react-native-reanimated+3.9.0.patch new file mode 100644 index 00000000..79281a24 --- /dev/null +++ b/macos-example/patches/react-native-reanimated+3.9.0.patch @@ -0,0 +1,16 @@ +diff --git a/node_modules/react-native-reanimated/Common/cpp/NativeModules/NativeReanimatedModule.cpp b/node_modules/react-native-reanimated/Common/cpp/NativeModules/NativeReanimatedModule.cpp +index a1ace04..58d0303 100644 +--- a/node_modules/react-native-reanimated/Common/cpp/NativeModules/NativeReanimatedModule.cpp ++++ b/node_modules/react-native-reanimated/Common/cpp/NativeModules/NativeReanimatedModule.cpp +@@ -37,11 +37,6 @@ + + using namespace facebook; + +-#if REACT_NATIVE_MINOR_VERSION == 73 && defined(RCT_NEW_ARCH_ENABLED) +-// Android can't find the definition of this static field +-bool CoreFeatures::useNativeState; +-#endif +- + namespace reanimated { + + NativeReanimatedModule::NativeReanimatedModule( diff --git a/macos-example/yarn.lock b/macos-example/yarn.lock index df3a3cf7..df7a336d 100644 --- a/macos-example/yarn.lock +++ b/macos-example/yarn.lock @@ -2406,6 +2406,11 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" @@ -2630,6 +2635,11 @@ async-limiter@~1.0.0: resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + available-typed-arrays@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" @@ -2906,7 +2916,7 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== -ci-info@^3.2.0: +ci-info@^3.2.0, ci-info@^3.7.0: version "3.9.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== @@ -3847,6 +3857,13 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" +find-yarn-workspace-root@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd" + integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ== + dependencies: + micromatch "^4.0.2" + flat-cache@^3.0.4: version "3.2.0" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee" @@ -3897,6 +3914,16 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -5009,6 +5036,16 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== +json-stable-stringify@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454" + integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg== + dependencies: + call-bind "^1.0.5" + isarray "^2.0.5" + jsonify "^0.0.1" + object-keys "^1.1.1" + json5@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" @@ -5021,6 +5058,20 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsonify@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" + integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== + "jsx-ast-utils@^2.4.1 || ^3.0.0": version "3.3.5" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -5043,6 +5094,13 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +klaw-sync@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" + integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== + dependencies: + graceful-fs "^4.1.11" + kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -5422,7 +5480,7 @@ metro@0.80.9, metro@^0.80.3: ws "^7.5.1" yargs "^17.6.2" -micromatch@^4.0.4: +micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5" integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q== @@ -5686,7 +5744,7 @@ open@^6.2.0: dependencies: is-wsl "^1.1.0" -open@^7.0.3: +open@^7.0.3, open@^7.4.2: version "7.4.2" resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321" integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q== @@ -5721,6 +5779,11 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" +os-tmpdir@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" + integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== + p-limit@^2.0.0, p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -5791,6 +5854,27 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +patch-package@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-8.0.0.tgz#d191e2f1b6e06a4624a0116bcb88edd6714ede61" + integrity sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA== + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + chalk "^4.1.2" + ci-info "^3.7.0" + cross-spawn "^7.0.3" + find-yarn-workspace-root "^2.0.0" + fs-extra "^9.0.0" + json-stable-stringify "^1.0.2" + klaw-sync "^6.0.0" + minimist "^1.2.6" + open "^7.4.2" + rimraf "^2.6.3" + semver "^7.5.3" + slash "^2.0.0" + tmp "^0.0.33" + yaml "^2.2.2" + path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -6291,6 +6375,13 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== +rimraf@^2.6.3: + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== + dependencies: + glob "^7.1.3" + rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" @@ -6480,6 +6571,11 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +slash@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" + integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A== + slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -6755,6 +6851,13 @@ through2@^2.0.1: readable-stream "~2.3.6" xtend "~4.0.1" +tmp@^0.0.33: + version "0.0.33" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== + dependencies: + os-tmpdir "~1.0.2" + tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -6918,6 +7021,11 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== + unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7143,7 +7251,7 @@ yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yaml@^2.2.1: +yaml@^2.2.1, yaml@^2.2.2: version "2.4.5" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e" integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==