Fix/metro config expo (#1712)

* fix: fix metro-config for expo usage
akveo · Apr 10, 2023 · d5b9b5a · d5b9b5a
1 parent 07bb149
commit d5b9b5a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/components/ui/menu/menuGroup.component.tsx b/src/components/ui/menu/menuGroup.component.tsx
@@ -102,7 +102,7 @@ export class MenuGroup extends React.Component<MenuGroupProps, State> {
     return this.expandAnimation._value;
   }
 
-  private get expandToRotateInterpolation(): Animated.AnimatedInterpolation {
+  private get expandToRotateInterpolation(): Animated.AnimatedInterpolation<string> {
     return this.expandAnimation.interpolate({
       inputRange: [-this.state.submenuHeight, CHEVRON_DEG_EXPANDED],
       outputRange: [`${CHEVRON_DEG_COLLAPSED}deg`, `${CHEVRON_DEG_EXPANDED}deg`],

diff --git a/src/components/ui/select/select.component.tsx b/src/components/ui/select/select.component.tsx
@@ -239,7 +239,7 @@ export class Select extends React.Component<SelectProps, State> {
     return Array.isArray(this.props.selectedIndex) ? this.props.selectedIndex : [this.props.selectedIndex];
   }
 
-  private get expandToRotateInterpolation(): Animated.AnimatedInterpolation {
+  private get expandToRotateInterpolation(): Animated.AnimatedInterpolation<string> {
     return this.expandAnimation.interpolate({
       inputRange: [CHEVRON_DEG_COLLAPSED, CHEVRON_DEG_EXPANDED],
       outputRange: [`${CHEVRON_DEG_COLLAPSED}deg`, `${CHEVRON_DEG_EXPANDED}deg`],

diff --git a/src/components/ui/spinner/animation.ts b/src/components/ui/spinner/animation.ts
@@ -85,9 +85,9 @@ export class SpinnerAnimation extends Animation<SpinnerAnimationConfig, SpinnerA
    * @returns {SpinnerAnimationStyle} - an object that contains container, start and end arcs transform styles.
    */
   public toProps(): SpinnerAnimationStyle {
-    const containerInterpolation: Animated.AnimatedInterpolation = this.createContainerInterpolation();
-    const startArcInterpolation: Animated.AnimatedInterpolation = this.createArcInterpolation(StartArcEasing);
-    const endArcInterpolation: Animated.AnimatedInterpolation = this.createArcInterpolation(EndArcEasing);
+    const containerInterpolation: Animated.AnimatedInterpolation<number> = this.createContainerInterpolation();
+    const startArcInterpolation: Animated.AnimatedInterpolation<number> = this.createArcInterpolation(StartArcEasing);
+    const endArcInterpolation: Animated.AnimatedInterpolation<number> = this.createArcInterpolation(EndArcEasing);
 
     return {
       container: this.toStyleTransformProp(containerInterpolation),
@@ -108,7 +108,7 @@ export class SpinnerAnimation extends Animation<SpinnerAnimationConfig, SpinnerA
     return new Array(numberOfFrames).fill(0);
   };
 
-  private createContainerInterpolation = (): Animated.AnimatedInterpolation => {
+  private createContainerInterpolation = (): Animated.AnimatedInterpolation<number> => {
     return this.animationValue.interpolate({
       inputRange: [0, 1],
       outputRange: [
@@ -118,7 +118,7 @@ export class SpinnerAnimation extends Animation<SpinnerAnimationConfig, SpinnerA
     });
   };
 
-  private createArcInterpolation = (easing: EasingFunction): Animated.AnimatedInterpolation => {
+  private createArcInterpolation = (easing: EasingFunction): Animated.AnimatedInterpolation<number> => {
     return this.animationValue.interpolate({
       inputRange: this.createArcInterpolationInputRange(),
       outputRange: this.createArcInterpolationOutputRange(easing),
@@ -156,7 +156,8 @@ export class SpinnerAnimation extends Animation<SpinnerAnimationConfig, SpinnerA
    * @param {ViewStyle} source - initial StyleSheet object.
    * @returns a final StyleSheet object with a `rotate` animation value.
    */
-  private toStyleTransformProp = (rotate: Animated.AnimatedInterpolation, source: ViewStyle = {}): ViewStyle => {
+  private toStyleTransformProp = (rotate: Animated.AnimatedInterpolation<number | string>,
+    source: ViewStyle = {}): ViewStyle => {
     const transform = [...(source.transform || []), { rotate }];
 
     // @ts-ignore: AnimatedInterpolation does not fit RotateTransform type declaration

diff --git a/src/metro-config/index.ts b/src/metro-config/index.ts
@@ -1,6 +1,5 @@
 import Fs from 'fs';
 import LodashMerge from 'lodash.merge';
-import MetroConfig from 'metro-config/src/defaults';
 import BootstrapService from './services/bootstrap.service';
 import { EvaConfig } from './services/eva-config.service';
 import ProjectService from './services/project.service';
@@ -13,7 +12,6 @@ type MetroConfigType = {
   watchFolders?: Array<string>;
 };
 
-const defaultMetroConfig = MetroConfig.getDefaultValues();
 const customMappingWatchOptions = {
   /*
    * How often the custom mapping should be polled in milliseconds
@@ -50,7 +48,7 @@ const customMappingWatchOptions = {
 export const create = (evaConfig: EvaConfig, metroConfig?: MetroConfigType): MetroConfigType => {
 
   const handleMetroEvent = (event): void => {
-    const reporter = metroConfig?.reporter || defaultMetroConfig.reporter;
+    const reporter = metroConfig?.reporter;
 
     if (reporter?.update) {
       reporter.update(event);

diff --git a/tsconfig.json b/tsconfig.json
@@ -19,8 +19,9 @@
     }
   },
   "include": [
+    "./src",
     ".eslintrc.js",
-    "./src/**/*"
+    "./src/**/package.json"
   ],
   "exclude": [
     "./src/template-js",