fix dedupe deps for sdk 44

nandorojo · Dec 15, 2021 · f100138 · f100138
1 parent 4383563
commit f100138
Show file tree

Hide file tree

Showing 11 changed files with 675 additions and 723 deletions.
diff --git a/examples/with-expo/__generated__/AppEntry.js b/examples/with-expo/__generated__/AppEntry.js
diff --git a/examples/with-expo/index.js b/examples/with-expo/index.js
@@ -1,8 +1,13 @@
-import { registerRootComponent } from "expo";
+// @generated by expo-yarn-workspaces
 
-import App from "./src/App";
+import 'expo/build/Expo.fx'
+import { activateKeepAwake } from 'expo-keep-awake'
+import registerRootComponent from 'expo/build/launch/registerRootComponent'
 
-// registerRootComponent calls AppRegistry.registerComponent('main', () => App);
-// It also ensures that whether you load the app in the Expo client or in a native build,
-// the environment is set up appropriately
-registerRootComponent(App);
+import App from './App'
+
+if (__DEV__) {
+  activateKeepAwake()
+}
+
+registerRootComponent(App)
diff --git a/examples/with-expo/metro.config.js b/examples/with-expo/metro.config.js
@@ -1,4 +1,25 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-const { createMetroConfiguration } = require('expo-yarn-workspaces')
+// Learn more https://docs.expo.io/guides/customizing-metro
+/**
+ * @type {import('expo/metro-config')}
+ */
+const { getDefaultConfig } = require('expo/metro-config')
+const path = require('path')
 
-module.exports = createMetroConfiguration(__dirname)
+const projectRoot = __dirname
+const workspaceRoot = path.resolve(__dirname, '../..')
+
+const config = getDefaultConfig(__dirname)
+
+config.watchFolders = [workspaceRoot]
+config.resolver.nodeModulesPath = [
+  path.resolve(projectRoot, 'node_modules'),
+  path.resolve(workspaceRoot, 'node_modules'),
+]
+
+// config.transformer = {
+//   ...config.transformer,
+//   minifierPath: 'metro-minify-esbuild',
+//   minifierConfig: {},
+// }
+
+module.exports = config
diff --git a/examples/with-expo/package.json b/examples/with-expo/package.json
@@ -3,14 +3,12 @@
   "description": "Example app for moti",
   "version": "0.16.1",
   "private": true,
-  "main": "__generated__/AppEntry.js",
   "scripts": {
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "expo start --web",
     "start": "expo start",
-    "test": "jest",
-    "postinstall": "expo-yarn-workspaces postinstall"
+    "test": "jest"
   },
   "dependencies": {
     "@motify/interactions": "^0.16.1",

diff --git a/examples/with-expo/src/Moti.HelloWorld.tsx b/examples/with-expo/src/Moti.HelloWorld.tsx
@@ -27,7 +27,7 @@ export default function HelloWorld() {
 
   return (
     <Pressable onPress={toggle} style={styles.container}>
-      {visible && <Shape />}
+      {/* {visible && <Shape />} */}
     </Pressable>
   )
 }

diff --git a/examples/with-next/__generated__/AppEntry.js b/examples/with-next/__generated__/AppEntry.js
diff --git a/examples/with-next/metro.config.js b/examples/with-next/metro.config.js
diff --git a/examples/with-next/package.json b/examples/with-next/package.json
@@ -8,10 +8,9 @@
     "next-compose-plugins": "^2.2.0",
     "next-transpile-modules": "3.3.0",
     "raf": "^3.4.1",
-    "react": "~16.13.1",
-    "react-dom": "~16.13.1",
-    "react-native": "0.63.4",
-    "react-native-reanimated": "~2.2.0",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native-reanimated": "~2.3.0",
     "react-native-unimodules": "~0.9.0",
     "react-native-web": "0.15.3"
   },
@@ -24,8 +23,7 @@
     "android": "expo start --android",
     "ios": "expo start --ios",
     "web": "yarn next dev",
-    "eject": "expo eject",
-    "postinstall": "expo-yarn-workspaces postinstall"
+    "eject": "expo eject"
   },
   "private": true
 }
diff --git a/package.json b/package.json
@@ -27,11 +27,6 @@
     "example": "yarn --cwd example",
     "prepare": "lerna run prepare"
   },
-  "resolutions": {
-    "react": "17.0.1",
-    "react-native": "0.63.4",
-    "@types/react": "17.0.1"
-  },
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
@@ -90,11 +85,9 @@
     "commitlint": "^11.0.0",
     "eslint": "^7.18.0",
     "eslint-config-nando": "^1.0.10",
-    "expo-yarn-workspaces": "^1.3.1",
     "husky": "^4.3.8",
     "jest": "^26.6.1",
     "lerna": "^3.22.1",
-    "metro-react-native-babel-preset": "^0.63.0",
     "prettier": "^2.2.1",
     "typescript": "^4.0.3"
   },

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -54,13 +54,12 @@
   "devDependencies": {
     "@react-spring/native": "^9.0.0-rc.3",
     "@testing-library/react-native": "^7.1.0",
-    "@types/react": "^16.9.53",
+    "@types/react": "17.0.1",
     "@types/react-dom": "^16.9.8",
     "@types/react-native": "^0.63.30",
     "expo": "^40.0.0-beta.5",
     "react": "17.0.1",
     "react-dom": "17.0.1",
-    "react-native": "0.63.4",
     "react-native-builder-bob": "^0.17.0",
     "react-native-gesture-handler": "~2.1.0",
     "react-native-reanimated": "~2.3.0",