Monorepo [10/?] - remove reanimated2 directory

apps/fabric-example/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "build": "yarn patch-package",
+    "build": "",
     "android": "react-native run-android",
     "ios": "react-native run-ios",
     "lint": "eslint --max-warnings=0 .",

apps/paper-example/ios/Podfile.lock

@@ -935,7 +935,7 @@ PODS:
   - React-Mapbuffer (0.74.0):
     - glog
     - React-debug
-  - react-native-pager-view (6.3.1):
+  - react-native-pager-view (6.3.0):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1515,7 +1515,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 36a2bbc272300313653d980de5ab700ec86c534a
   React-logger: 03f2f7b955cfe24593a2b8c9705c23e142d1ad24
   React-Mapbuffer: 5e05d78fe6505f4a054b86f415733d4ad02dd314
-  react-native-pager-view: e2b7c31147cdc1750cb3867d37a145e487653c34
+  react-native-pager-view: c1e29e1a6105a02807392ba822ad322447a72f55
   react-native-safe-area-context: 71e343069c879133ea9c194097261830f6d23478
   react-native-slider: ce295d2bf830a7990af05b0bd70ab28c133e230c
   React-nativeconfig: 951ec32f632e81cbd7d40aebb3211313251c092e

apps/tvos-example/package.json

@@ -28,11 +28,11 @@
     "@types/react": "^18.2.6",
     "@types/react-test-renderer": "^18.0.0",
     "babel-jest": "^29.6.3",
-    "eslint": "^8.0.0-0",
+    "eslint": "^8.57.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
     "react-test-renderer": "18.2.0",
-    "typescript": "5.0.4"
+    "typescript": "~5.3.0"
   },
   "engines": {
     "node": ">=18"

packages/eslint-plugin-reanimated/types/index.d.ts

@@ -1,8 +1,4 @@
 import type { TSESLint } from '@typescript-eslint/utils';
 export declare const rules: {
-  'animated-style-non-animated-component': TSESLint.RuleModule<
-    'animatedStyle' | 'sharedValue',
-    [],
-    TSESLint.RuleListener
-  >;
+    'animated-style-non-animated-component': TSESLint.RuleModule<"animatedStyle" | "sharedValue", [], TSESLint.RuleListener>;
 };

packages/react-native-reanimated/scripts/set-reanimated-version.js

@@ -75,7 +75,7 @@ fs.writeFileSync(
   'utf-8'
 );
 
-const jsVersionPath = 'src/reanimated2/platform-specific/jsVersion.ts';
+const jsVersionPath = 'src/platform-specific/jsVersion.ts';
 const before = cat(jsVersionPath);
 const after = before.replace(
   /jsVersion = '(.*)';/g,

packages/react-native-reanimated/src/Animated.ts

@@ -1,7 +1,7 @@
 'use strict';
-import type { Extrapolate as _Extrapolate } from './reanimated2/interpolateColor';
-import type { SharedValue as _SharedValue } from './reanimated2/commonTypes';
-import type { DerivedValue as _DerivedValue } from './reanimated2/hook/useDerivedValue';
+import type { Extrapolate as _Extrapolate } from './interpolateColor';
+import type { SharedValue as _SharedValue } from './commonTypes';
+import type { DerivedValue as _DerivedValue } from './hook/useDerivedValue';
 import type {
   TransformStyleTypes as _TransformStyleTypes,
   Adaptable as _Adaptable,
@@ -10,18 +10,18 @@ import type {
   AnimateStyle as _AnimateStyle,
   StylesOrDefault as _StylesOrDefault,
   AnimateProps as _AnimateProps,
-} from './reanimated2/helperTypes';
-import type { EasingFunction as _EasingFunction } from './reanimated2/Easing';
+} from './helperTypes';
+import type { EasingFunction as _EasingFunction } from './Easing';
 
-import type { AnimatedScrollViewProps as _AnimatedScrollViewProps } from './reanimated2/component/ScrollView';
-import type { FlatListPropsWithLayout as _FlatListPropsWithLayout } from './reanimated2/component/FlatList';
+import type { AnimatedScrollViewProps as _AnimatedScrollViewProps } from './component/ScrollView';
+import type { FlatListPropsWithLayout as _FlatListPropsWithLayout } from './component/FlatList';
 
 export { createAnimatedComponent } from './createAnimatedComponent';
-export { AnimatedText as Text } from './reanimated2/component/Text';
-export { AnimatedView as View } from './reanimated2/component/View';
-export { AnimatedScrollView as ScrollView } from './reanimated2/component/ScrollView';
-export { AnimatedImage as Image } from './reanimated2/component/Image';
-export { ReanimatedFlatList as FlatList } from './reanimated2/component/FlatList';
+export { AnimatedText as Text } from './component/Text';
+export { AnimatedView as View } from './component/View';
+export { AnimatedScrollView as ScrollView } from './component/ScrollView';
+export { AnimatedImage as Image } from './component/Image';
+export { ReanimatedFlatList as FlatList } from './component/FlatList';
 export {
   addWhitelistedNativeProps,
   addWhitelistedUIProps,

packages/react-native-reanimated/src/ConfigHelper.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { PropsAllowlists } from './propsAllowlists';
-import { jsiConfigureProps } from './reanimated2/core';
+import { jsiConfigureProps } from './core';
 function assertNoOverlapInLists() {
   for (const key in PropsAllowlists.NATIVE_THREAD_PROPS_WHITELIST) {
     if (key in PropsAllowlists.UI_THREAD_PROPS_WHITELIST) {

packages/react-native-reanimated/src/reanimated2/NativeReanimated/NativeReanimated.ts → packages/react-native-reanimated/src/NativeReanimated/NativeReanimated.ts

@@ -13,7 +13,7 @@ import { isFabric } from '../PlatformChecker';
 import type React from 'react';
 import { getShadowNodeWrapperFromRef } from '../fabricUtils';
 import type { LayoutAnimationBatchItem } from '../layoutReanimation/animationBuilder/commonTypes';
-import ReanimatedModule from '../../specs/NativeReanimatedModule';
+import ReanimatedModule from '../specs/NativeReanimatedModule';
 
 // this is the type of `__reanimatedModuleProxy` which is injected using JSI
 export interface NativeReanimatedModule {

packages/react-native-reanimated/src/reanimated2/PropAdapters.ts → packages/react-native-reanimated/src/PropAdapters.ts

@@ -1,5 +1,5 @@
 'use strict';
-import { addWhitelistedNativeProps } from '../ConfigHelper';
+import { addWhitelistedNativeProps } from './ConfigHelper';
 import type {
   AnimatedPropsAdapterFunction,
   AnimatedPropsAdapterWorklet,

packages/react-native-reanimated/src/reanimated2/animation/decay/utils.ts → packages/react-native-reanimated/src/animation/decay/utils.ts

@@ -6,7 +6,7 @@ import type {
   ReduceMotion,
   Timestamp,
   RequiredKeys,
-} from '../../../reanimated2/commonTypes';
+} from '../../commonTypes';
 import { isWeb } from '../../PlatformChecker';
 
 const IS_WEB = isWeb();

packages/react-native-reanimated/src/animationBuilder.tsx

@@ -3,8 +3,8 @@ import type {
   ILayoutAnimationBuilder,
   LayoutAnimationFunction,
   LayoutAnimationsValues,
-} from './reanimated2/layoutReanimation';
-import type { StyleProps } from './reanimated2/commonTypes';
+} from './layoutReanimation';
+import type { StyleProps } from './commonTypes';
 import type { NestedArray } from './createAnimatedComponent/commonTypes';
 
 const mockTargetValues: LayoutAnimationsValues = {

packages/react-native-reanimated/src/reanimated2/component/FlatList.tsx → packages/react-native-reanimated/src/component/FlatList.tsx

@@ -8,7 +8,7 @@ import type {
 } from 'react-native';
 import { FlatList } from 'react-native';
 import { AnimatedView } from './View';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
+import { createAnimatedComponent } from '../createAnimatedComponent';
 import type { ILayoutAnimationBuilder } from '../layoutReanimation/animationBuilder/commonTypes';
 import { LayoutAnimationConfig } from './LayoutAnimationConfig';
 import type { AnimatedProps, AnimatedStyle } from '../helperTypes';

packages/react-native-reanimated/src/reanimated2/component/Image.ts → packages/react-native-reanimated/src/component/Image.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { Image } from 'react-native';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
+import { createAnimatedComponent } from '../createAnimatedComponent';
 
 // Since createAnimatedComponent return type is ComponentClass that has the props of the argument,
 // but not things like NativeMethods, etc. we need to add them manually by extending the type.

packages/react-native-reanimated/src/reanimated2/component/PerformanceMonitor.tsx → packages/react-native-reanimated/src/component/PerformanceMonitor.tsx

@@ -6,8 +6,8 @@ import { TextInput, StyleSheet, View } from 'react-native';
 import type { FrameInfo } from '../frameCallback';
 import type { SharedValue } from '../commonTypes';
 import { useSharedValue, useAnimatedProps, useFrameCallback } from '../hook';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
-import { addWhitelistedNativeProps } from '../../ConfigHelper';
+import { createAnimatedComponent } from '../createAnimatedComponent';
+import { addWhitelistedNativeProps } from '../ConfigHelper';
 
 type CircularBuffer = ReturnType<typeof createCircularDoublesBuffer>;
 function createCircularDoublesBuffer(size: number) {

packages/react-native-reanimated/src/reanimated2/component/ScrollView.tsx → packages/react-native-reanimated/src/component/ScrollView.tsx

@@ -3,7 +3,7 @@ import type { ForwardedRef } from 'react';
 import React, { forwardRef } from 'react';
 import type { ScrollViewProps } from 'react-native';
 import { ScrollView } from 'react-native';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
+import { createAnimatedComponent } from '../createAnimatedComponent';
 import type { SharedValue } from '../commonTypes';
 import type { AnimatedRef } from '../hook';
 import { useAnimatedRef, useScrollViewOffset } from '../hook';

packages/react-native-reanimated/src/reanimated2/component/Text.ts → packages/react-native-reanimated/src/component/Text.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { Text } from 'react-native';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
+import { createAnimatedComponent } from '../createAnimatedComponent';
 
 // Since createAnimatedComponent return type is ComponentClass that has the props of the argument,
 // but not things like NativeMethods, etc. we need to add them manually by extending the type.

packages/react-native-reanimated/src/reanimated2/component/View.ts → packages/react-native-reanimated/src/component/View.ts

@@ -1,6 +1,6 @@
 'use strict';
 import { View } from 'react-native';
-import { createAnimatedComponent } from '../../createAnimatedComponent';
+import { createAnimatedComponent } from '../createAnimatedComponent';
 
 // Since createAnimatedComponent return type is ComponentClass that has the props of the argument,
 // but not things like NativeMethods, etc. we need to add them manually by extending the type.

packages/react-native-reanimated/src/createAnimatedComponent/InlinePropManager.ts

@@ -1,22 +1,19 @@
 'use strict';
-import type { StyleProps } from '../reanimated2';
+import type { StyleProps } from '../commonTypes';
 import type {
   IAnimatedComponentInternal,
   AnimatedComponentProps,
   IInlinePropManager,
   ViewInfo,
 } from './commonTypes';
 import { flattenArray } from './utils';
-import { makeViewDescriptorsSet } from '../reanimated2/ViewDescriptorsSet';
-import type {
-  ViewDescriptorsSet,
-  ViewRefSet,
-} from '../reanimated2/ViewDescriptorsSet';
+import { makeViewDescriptorsSet } from '../ViewDescriptorsSet';
+import type { ViewDescriptorsSet, ViewRefSet } from '../ViewDescriptorsSet';
 import { adaptViewConfig } from '../ConfigHelper';
-import updateProps from '../reanimated2/UpdateProps';
-import { stopMapper, startMapper } from '../reanimated2/mappers';
-import { isSharedValue } from '../reanimated2/isSharedValue';
-import { shouldBeUseWeb } from '../reanimated2/PlatformChecker';
+import updateProps from '../UpdateProps';
+import { stopMapper, startMapper } from '../mappers';
+import { isSharedValue } from '../isSharedValue';
+import { shouldBeUseWeb } from '../PlatformChecker';
 
 const SHOULD_BE_USE_WEB = shouldBeUseWeb();
 

packages/react-native-reanimated/src/createAnimatedComponent/JSPropsUpdater.ts

@@ -1,9 +1,9 @@
 'use strict';
 import { NativeEventEmitter, Platform, findNodeHandle } from 'react-native';
 import type { NativeModule } from 'react-native';
-import { shouldBeUseWeb } from '../reanimated2/PlatformChecker';
-import type { StyleProps } from '../reanimated2';
-import { runOnJS, runOnUIImmediately } from '../reanimated2/threads';
+import { shouldBeUseWeb } from '../PlatformChecker';
+import type { StyleProps } from '../commonTypes';
+import { runOnJS, runOnUIImmediately } from '../threads';
 import type {
   AnimatedComponentProps,
   IAnimatedComponentInternal,

packages/react-native-reanimated/src/createAnimatedComponent/PropsFilter.tsx

@@ -1,11 +1,11 @@
 'use strict';
 
-import { shallowEqual } from '../reanimated2/hook/utils';
-import type { StyleProps } from '../reanimated2/commonTypes';
-import { isSharedValue } from '../reanimated2/isSharedValue';
-import { isChromeDebugger } from '../reanimated2/PlatformChecker';
-import { WorkletEventHandler } from '../reanimated2/WorkletEventHandler';
-import { initialUpdaterRun } from '../reanimated2/animation';
+import { shallowEqual } from '../hook/utils';
+import type { StyleProps } from '../commonTypes';
+import { isSharedValue } from '../isSharedValue';
+import { isChromeDebugger } from '../PlatformChecker';
+import { WorkletEventHandler } from '../WorkletEventHandler';
+import { initialUpdaterRun } from '../animation';
 import { hasInlineStyles, getInlineStyle } from './InlinePropManager';
 import type {
   AnimatedComponentProps,

packages/react-native-reanimated/src/createAnimatedComponent/commonTypes.ts

@@ -1,20 +1,19 @@
 'use strict';
 import type { Ref, Component } from 'react';
 import type {
+  ShadowNodeWrapper,
+  SharedValue,
   StyleProps,
+} from '../commonTypes';
+import type { ViewConfig } from '../ConfigHelper';
+import type { ViewDescriptorsSet, ViewRefSet } from '../ViewDescriptorsSet';
+import type {
   BaseAnimationBuilder,
-  ILayoutAnimationBuilder,
   EntryExitAnimationFunction,
+  ILayoutAnimationBuilder,
   SharedTransition,
-  SharedValue,
-} from '../reanimated2';
-import type {
-  ViewDescriptorsSet,
-  ViewRefSet,
-} from '../reanimated2/ViewDescriptorsSet';
-import type { SkipEnteringContext } from '../reanimated2/component/LayoutAnimationConfig';
-import type { ShadowNodeWrapper } from '../reanimated2/commonTypes';
-import type { ViewConfig } from '../ConfigHelper';
+} from '../layoutReanimation';
+import type { SkipEnteringContext } from '../component/LayoutAnimationConfig';
 
 export interface AnimatedProps extends Record<string, unknown> {
   viewDescriptors?: ViewDescriptorsSet;

packages/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx

@@ -8,23 +8,20 @@ import type {
 } from 'react';
 import React from 'react';
 import { findNodeHandle, Platform } from 'react-native';
-import { WorkletEventHandler } from '../reanimated2/WorkletEventHandler';
-import '../reanimated2/layoutReanimation/animationsManager';
+import { WorkletEventHandler } from '../WorkletEventHandler';
+import '../layoutReanimation/animationsManager';
 import invariant from 'invariant';
 import { adaptViewConfig } from '../ConfigHelper';
-import { RNRenderer } from '../reanimated2/platform-specific/RNRenderer';
-import { enableLayoutAnimations } from '../reanimated2/core';
-import {
-  SharedTransition,
-  LayoutAnimationType,
-} from '../reanimated2/layoutReanimation';
-import type { StyleProps, ShadowNodeWrapper } from '../reanimated2/commonTypes';
-import { getShadowNodeWrapperFromRef } from '../reanimated2/fabricUtils';
-import { removeFromPropsRegistry } from '../reanimated2/PropsRegistry';
-import { getReduceMotionFromConfig } from '../reanimated2/animation/util';
+import { RNRenderer } from '../platform-specific/RNRenderer';
+import { enableLayoutAnimations } from '../core';
+import { SharedTransition, LayoutAnimationType } from '../layoutReanimation';
+import type { StyleProps, ShadowNodeWrapper } from '../commonTypes';
+import { getShadowNodeWrapperFromRef } from '../fabricUtils';
+import { removeFromPropsRegistry } from '../PropsRegistry';
+import { getReduceMotionFromConfig } from '../animation/util';
 import { maybeBuild } from '../animationBuilder';
-import { SkipEnteringContext } from '../reanimated2/component/LayoutAnimationConfig';
-import type { AnimateProps } from '../reanimated2';
+import { SkipEnteringContext } from '../component/LayoutAnimationConfig';
+import type { AnimateProps } from '../helperTypes';
 import JSPropsUpdater from './JSPropsUpdater';
 import type {
   AnimatedComponentProps,
@@ -36,12 +33,7 @@ import type {
 } from './commonTypes';
 import { has, flattenArray } from './utils';
 import setAndForwardRef from './setAndForwardRef';
-import {
-  isFabric,
-  isJest,
-  isWeb,
-  shouldBeUseWeb,
-} from '../reanimated2/PlatformChecker';
+import { isFabric, isJest, isWeb, shouldBeUseWeb } from '../PlatformChecker';
 import { InlinePropManager } from './InlinePropManager';
 import { PropsFilter } from './PropsFilter';
 import {
@@ -50,11 +42,11 @@ import {
   configureWebLayoutAnimations,
   getReducedMotionFromConfig,
   saveSnapshot,
-} from '../reanimated2/layoutReanimation/web';
-import { updateLayoutAnimations } from '../reanimated2/UpdateLayoutAnimations';
-import type { CustomConfig } from '../reanimated2/layoutReanimation/web/config';
+} from '../layoutReanimation/web';
+import { updateLayoutAnimations } from '../UpdateLayoutAnimations';
+import type { CustomConfig } from '../layoutReanimation/web/config';
 import type { FlatList, FlatListProps } from 'react-native';
-import { addHTMLMutationObserver } from '../reanimated2/layoutReanimation/web/domUtils';
+import { addHTMLMutationObserver } from '../layoutReanimation/web/domUtils';
 import { getViewInfo } from './getViewInfo';
 
 const IS_WEB = isWeb();