Merge branch 'master' into master

tschoffelen · Apr 2, 2024 · 714457a · 714457a
2 parents aa5aa1a + 9fe43fc
commit 714457a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "jest": "^29.7.0",
     "metro-react-native-babel-preset": "^0.77.0",
     "prettier": "^3.2.5",
+    "react": "^18.2.0",
     "react-native": "^0.73.4",
     "react-native-typescript-transformer": "^1.2.13",
     "semantic-release": "^23.0.2",
@@ -74,8 +75,7 @@
       "js"
     ],
     "transform": {
-      "^.+\\.(js)$": "<rootDir>/node_modules/babel-jest",
-      "\\.(ts|tsx)$": "ts-jest"
+      "^.+\\.(js|ts|tsx)$": "<rootDir>/node_modules/babel-jest"
     },
     "setupFiles": [
       "./tests/setup.ts"

diff --git a/tests/setup.ts b/tests/setup.ts
@@ -10,4 +10,10 @@ jest.mock('react-native', () => ({
   Platform: {
     OS: 'ios',
   },
+  StyleSheet: {
+    create: (r) => r,
+  },
+  Dimensions: {
+    get: () => ({width: 375, height: 667}),
+  },
 }));
diff --git a/yarn.lock b/yarn.lock
@@ -8010,6 +8010,13 @@ react-shallow-renderer@^16.15.0:
     object-assign "^4.1.1"
     react-is "^16.12.0 || ^17.0.0 || ^18.0.0"
 
+react@^18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
+  dependencies:
+    loose-envify "^1.1.0"
+
 read-cmd-shim@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb"