expo sdk43 (#352)

* expo sdk43

* dependency upgrades

* cleanup

* update dependencies

* updates

* 16.13

* add gitattributes

* lint check

* adds builder bob again

* update comment flow

* updates

* 16.13

* fix

* v43.0.0

Co-authored-by: Peter Piekarczyk <[email protected]>

.gitattributes

@@ -1,3 +1,11 @@
 *.pbxproj -text
 # specific for windows script files
-*.bat text eol=crlf
+*.bat text eol=crlf
+*.pbxproj binary linguist-generated
+ios/Exponent.xcodeproj/project.pbxproj merge=union -text diff linguist-generated
+apps/bare-expo/ios/BareExpo.xcodeproj/project.pbxproj merge=union -text diff linguist-generated
+apps/bare-sandbox/ios/bare-sandbox.xcodeproj/project.pbxproj merge=union -text diff linguist-generated
+templates/expo-template-bare-minimum/ios/HelloWorld.xcodeproj/project.pbxproj merge=union -text diff linguist-generated
+packages/*/build/** -diff linguist-generated
+packages/*/plugin/build/** -diff linguist-generated
+packages/@*/*/build/** -diff linguist-generated

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 16.13
           registry-url: https://registry.npmjs.org/
 
       # With lerna/workspaces, the cache is at the monorepo level.

.nvmrc

@@ -1 +1 @@
-14
+16.13

example/.editorconfig

@@ -0,0 +1,3 @@
+# Windows files
+[*.bat]
+end_of_line = crlf

example/.gitattributes

@@ -0,0 +1,3 @@
+# Windows files should use crlf line endings
+# https://help.github.com/articles/dealing-with-line-endings/
+*.bat text eol=crlf

example/babel.config.js

@@ -1,6 +1,5 @@
 module.exports = function (api) {
   api.cache(true);
-
   return {
     presets: ["babel-preset-expo"],
   };

example/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@draftbit/example",
   "description": "Example app for @draftbit/ui",
-  "version": "42.5.2",
+  "version": "43.0.0",
   "private": true,
   "main": "__generated__/AppEntry.js",
   "scripts": {
@@ -15,29 +15,29 @@
     "clean:modules": "rimraf node_modules"
   },
   "dependencies": {
-    "@draftbit/ui": "^42.5.2",
-    "@expo/vector-icons": "^12.0.4",
+    "@draftbit/ui": "^43.0.0",
+    "@expo/vector-icons": "^12.0.5",
     "@react-native-community/datetimepicker": "3.5.2",
-    "@react-native-picker/picker": "^2.1.0",
+    "@react-native-picker/picker": "2.1.0",
     "@react-navigation/drawer": "^5.7.7",
     "@react-navigation/native": "^5.4.2",
-    "expo": "^42.0.0",
-    "expo-app-loading": "^1.0.1",
-    "expo-font": "~9.2.1",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "react-native": "0.63.4",
+    "expo": "~43.0.2",
+    "expo-app-loading": "~1.2.1",
+    "expo-font": "~10.0.3",
+    "expo-status-bar": "~1.1.0",
+    "react": "17.0.1",
+    "react-dom": "17.0.1",
+    "react-native": "0.64.3",
     "react-native-gesture-handler": "~1.10.2",
     "react-native-reanimated": "~2.2.0",
-    "react-native-safe-area-context": "3.2.0",
-    "react-native-screens": "~3.4.0",
+    "react-native-safe-area-context": "3.3.2",
+    "react-native-screens": "~3.8.0",
     "react-native-svg": "12.1.1",
-    "react-native-unimodules": "~0.14.5",
-    "react-native-web": "~0.13.12"
+    "react-native-web": "0.17.1"
   },
   "devDependencies": {
-    "@babel/core": "~7.9.0",
-    "@babel/runtime": "^7.11.2",
-    "@types/react-native": "~0.63.2"
+    "@babel/core": "^7.12.9",
+    "@types/react": "~17.0.21",
+    "@types/react-native": "~0.64.12"
   }
 }

example/src/PickerExample.js

@@ -151,7 +151,7 @@ function PickerExample({ theme }) {
           style={{
             fontSize: 30,
             color: "red",
-            fontFamily: "Calibri",
+            fontFamily: "Courier New",
           }}
         />
       </Section>

example/src/TextFieldExample.js

@@ -89,7 +89,7 @@ export default function TextFieldExample() {
             style={{
               fontSize: 30,
               color: "red",
-              fontFamily: "Calibri",
+              fontFamily: "Courier New",
             }}
           />
           <TextField

example/tsconfig.json

@@ -1,14 +1,6 @@
 {
+  "extends": "expo/tsconfig.base",
   "compilerOptions": {
-    "jsx": "react-native",
-    "target": "esnext",
-    "lib": ["esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "allowSyntheticDefaultImports": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
-    "moduleResolution": "node"
-  },
-  "extends": "expo/tsconfig.base"
+    "strict": true
+  }
 }

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "42.5.2",
+  "version": "43.0.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

package.json

@@ -1,15 +1,16 @@
 {
   "name": "react-native-jigsaw",
-  "description": "Root package.json for workspaces",
+  "version": "0.0.0",
   "private": true,
+  "description": "Root package.json for workspaces",
   "license": "MIT",
   "author": "Draftbit <[email protected]> (https://draftbit.com)",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "postinstall": "expo-yarn-workspaces check-workspace-dependencies",
+    "postinstall": "yarn-deduplicate && expo-yarn-workspaces check-workspace-dependencies",
     "example": "yarn --cwd example",
     "bootstrap": "lerna bootstrap",
     "crosslink": "lerna link",
@@ -27,7 +28,8 @@
     "version:major": "lerna version minor --no-push",
     "version:minor": "lerna version patch --no-push",
     "version:patch": "echo \"No patch versions: See root README.md\"",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "tsc": "echo 'You are trying to run \"tsc\" in the workspace root. Run it from an individual package instead.' && exit 1"
   },
   "workspaces": [
     "example",
@@ -40,19 +42,21 @@
     "dotenv": "^9.0.2",
     "eslint": "^7.26.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "expo-yarn-workspaces": "^1.5.2",
+    "expo-yarn-workspaces": "*",
     "husky": ">=6",
     "jest": "^26.6.3",
     "json-server": "^0.16.3",
     "lerna": "^4.0.0",
     "lint-staged": ">=10",
     "node-fetch": "^2.6.1",
     "prettier": "^2.3.0",
+    "react-native-builder-bob": "^0.18.2",
     "rimraf": "^3.0.2",
     "snack-sdk": "^3.4.1",
     "ts-node": "^10.0.0",
-    "typescript": "^4.2.4",
-    "utility-types": "^3.10.0"
+    "typescript": "~4.3.5",
+    "utility-types": "^3.10.0",
+    "yarn-deduplicate": "^3.1.0"
   },
   "eslintConfig": {
     "extends": [
@@ -105,7 +109,6 @@
     "*.{js,ts,tsx,json,mcss,md}": "prettier --write"
   },
   "engines": {
-    "node": "^14"
-  },
-  "version": "0.0.0"
+    "node": "16.13"
+  }
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/core",
-  "version": "42.5.2",
+  "version": "43.0.0",
   "description": "Core (non-native) Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -41,44 +41,28 @@
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",
     "@draftbit/react-theme-provider": "^2.1.1",
-    "@draftbit/types": "^42.2.1",
+    "@draftbit/types": "^43.0.0",
     "@material-ui/core": "^4.11.0",
     "@material-ui/pickers": "^3.2.10",
-    "@react-native-community/slider": "4.0.0-rc.3",
+    "@react-native-community/slider": "4.1.7",
     "@react-native-picker/picker": "^2.1.0",
     "color": "^3.1.2",
     "date-fns": "^2.16.1",
     "dateformat": "^3.0.3",
     "lodash.isnumber": "^3.0.3",
     "lodash.omit": "^4.5.0",
     "lodash.tonumber": "^4.0.3",
-    "react-native-modal-datetime-picker": "^10.0.0",
+    "react-native-modal-datetime-picker": "^13.0.0",
     "react-native-typography": "^1.4.1",
     "react-native-web-swiper": "^2.2.1"
   },
   "devDependencies": {
-    "@react-native-community/datetimepicker": "~3.0.0",
     "@react-native-picker/picker": "^2.1.0",
     "@types/color": "^3.0.1",
     "@types/dateformat": "^3.0.1",
     "@types/lodash.isnumber": "^3.0.6",
     "@types/lodash.omit": "^4.5.6",
-    "@types/lodash.tonumber": "^4.0.6",
-    "@types/react": "^16.9.36",
-    "@types/react-native": "^0.63.40",
-    "react": "16.13.1",
-    "react-dom": "16.13.1",
-    "react-native": "~0.63.2",
-    "react-native-builder-bob": "^0.18.1",
-    "typescript": "~4.2.3"
-  },
-  "peerDependencies": {
-    "@react-native-community/datetimepicker": "~3.0.0",
-    "@react-native-picker/picker": "^2.1.0",
-    "react": "*",
-    "react-native": "*",
-    "react-native-modal-datetime-picker": "^10.0.0",
-    "react-native-svg": "~12.1.0"
+    "@types/lodash.tonumber": "^4.0.6"
   },
   "react-native-builder-bob": {
     "source": "src",

packages/core/src/styles/fonts.tsx

@@ -59,9 +59,9 @@ const fontConfig = {
   },
 };
 
-export default function configureFonts(
-  config?: { [platform in PlatformOSType | "default"]?: Fonts }
-): Fonts {
+export default function configureFonts(config?: {
+  [platform in PlatformOSType | "default"]?: Fonts;
+}): Fonts {
   const fonts = Platform.select({ ...fontConfig, ...config }) as Fonts;
   return fonts;
 }

packages/native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/native",
-  "version": "42.3.1",
+  "version": "43.0.0",
   "description": "Draftbit UI Components that Depend on Native Components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -36,16 +36,11 @@
   },
   "homepage": "https://github.com/draftbit/react-native-jigsaw#readme",
   "dependencies": {
-    "@draftbit/types": "^42.2.1",
-    "@expo/vector-icons": "^12.0.4",
-    "@react-native-community/slider": "4.0.0-rc.3",
-    "expo-av": "9.2.3",
-    "react-native-webview": "11.6.5"
-  },
-  "peerDependencies": {
-    "@expo/vector-icons": "^12.0.4",
-    "react": "*",
-    "react-native": "*"
+    "@draftbit/types": "^43.0.0",
+    "@expo/vector-icons": "^12.0.0",
+    "@react-native-community/slider": "4.1.7",
+    "expo-av": "~10.1.3",
+    "react-native-webview": "11.13.0"
   },
   "react-native-builder-bob": {
     "source": "src",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/types",
-  "version": "42.2.1",
+  "version": "43.0.0",
   "description": "Shared constants and types between native and core components",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@draftbit/ui",
-  "version": "42.5.2",
+  "version": "43.0.0",
   "description": "Draftbit UI Library",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -43,12 +43,8 @@
   },
   "homepage": "https://github.com/draftbit/react-native-jigsaw#readme",
   "dependencies": {
-    "@draftbit/core": "^42.5.2",
-    "@draftbit/native": "^42.3.1"
-  },
-  "peerDependencies": {
-    "react": "*",
-    "react-native": "*"
+    "@draftbit/core": "^43.0.0",
+    "@draftbit/native": "^43.0.0"
   },
   "react-native-builder-bob": {
     "source": "src",

scripts/upload-to-snack.ts

@@ -185,7 +185,7 @@ function getSnackSpecificDependencies() {
     "react-native-typography": "1.4.1",
     "@react-navigation/bottom-tabs": "*",
     "@react-native-picker/picker": "^2.1.0",
-    "@react-native-community/slider": "4.0.0-rc.3",
+    "@react-native-community/slider": "4.1.7",
     "@react-native-community/datetimepicker": "3.2.0",
     "react-native-gesture-handler": "*",
     "@react-native-community/masked-view": "0.1.10",