From 7399f5cd9753b3f812da13fc88aa6eee6794b08d Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 5 Oct 2022 08:49:35 +0200 Subject: [PATCH 1/3] Fix 0.69.0 changes not compiling on ReScript 10 --- src/components/View.res | 3 ++- src/types/HitSlop.res | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/View.res b/src/components/View.res index 715f6f28..0cf2e513 100644 --- a/src/components/View.res +++ b/src/components/View.res @@ -5,7 +5,8 @@ include NativeElement type edgeInsets = Rect.t // @todo in 0.70 -// @deprecated("Use `Rect.t` or `HitSlop.t` type instead") @obj +// @deprecated("Use `Rect.t` or `HitSlop.t` type instead") +@obj external edgeInsets: ( ~left: float=?, ~right: float=?, diff --git a/src/types/HitSlop.res b/src/types/HitSlop.res index 53b7f391..7395c419 100644 --- a/src/types/HitSlop.res +++ b/src/types/HitSlop.res @@ -6,7 +6,9 @@ type t = { } // hitSlop prop accept number and edge inset object +@obj external rect: (~left: float=?, ~right: float=?, ~top: float=?, ~bottom: float=?, unit) => t = "" + // @todo in 0.70 // external float: float => t = "" let float = (value: float) => { From 7f361c8d0667c1690d1b5a3e123c39e9f5b48838 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Wed, 5 Oct 2022 08:48:47 +0200 Subject: [PATCH 2/3] Upgrade rescript dev dependency (not peer) to v10 --- package-lock.json | 18 +++++++----------- package.json | 8 ++++---- src/apis/Animated.bs.js | 3 --- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e49cdcb..880ded66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "rescript-react-native", "version": "0.69.0", "license": "MIT", "devDependencies": { @@ -15,7 +14,7 @@ "npm-run-all": "^3.0.0", "npmpub": "^5.0.0", "prettier": "^2.0.0", - "rescript": "^9.1.4" + "rescript": "^10.0.0" }, "funding": { "url": "https://github.com/rescript-react-native/rescript-react-native?sponsor=1" @@ -9216,9 +9215,9 @@ "peer": true }, "node_modules/rescript": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.4.tgz", - "integrity": "sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", + "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", "dev": true, "hasInstallScript": true, "bin": { @@ -16851,7 +16850,6 @@ "integrity": "sha512-OMp77TUUZAoiuUv5uKNc08AnJNQxD28k92eQvo8tPcA8Wx6OZlEUvL7M7SFkef2mEYJ0vnrRjOamSnbBuq/+1w==", "peer": true, "requires": { - "@babel/core": "^7.14.0", "@babel/plugin-proposal-async-generator-functions": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", @@ -16898,7 +16896,6 @@ "integrity": "sha512-hMnN0MOgVloAk94YuXN7sLeDaZ51Y6xIcJXxIU1s/KaygAGXk6o7VAdwf2MY/IV1SIct5lkW4Gn71u/9/EvfXA==", "peer": true, "requires": { - "@babel/core": "^7.14.0", "babel-preset-fbjs": "^3.4.0", "hermes-parser": "0.8.0", "metro-babel-transformer": "0.72.1", @@ -16925,7 +16922,6 @@ "integrity": "sha512-DlvMw2tFrCqD9OXBoN11fPM09kHC22FZpnkTmG4Pr4kecV+aDmEGxwakjUcjELrX1JCXz2MLPvqeJkbiP1f5CA==", "peer": true, "requires": { - "@babel/core": "^7.14.0", "@babel/plugin-proposal-async-generator-functions": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", @@ -18280,9 +18276,9 @@ "peer": true }, "rescript": { - "version": "9.1.4", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-9.1.4.tgz", - "integrity": "sha512-aXANK4IqecJzdnDpJUsU6pxMViCR5ogAxzuqS0mOr8TloMnzAjJFu63fjD6LCkWrKAhlMkFFzQvVQYaAaVkFXw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.0.1.tgz", + "integrity": "sha512-XwO1GPDtoEU4H03xQE5bp0/qtSVR6YLaJRPxWKrfFgKc+LI36ODOCie7o9UJfgzQdoMYkkZyiTGZ4N9OQEaiUw==", "dev": true }, "resolve": { diff --git a/package.json b/package.json index d819ebbe..d497f718 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "version": "0.69.0", "peerDependencies": { "@rescript/react": ">=0.10.0", - "rescript": ">=9.1.4", - "react-native": ">=0.69.0" + "react-native": ">=0.69.0", + "rescript": ">=9.1.4" }, "overrides": { "react": "17.0.2" @@ -39,12 +39,12 @@ }, "devDependencies": { "@rescript/react": "^0.10.0", - "rescript": "^9.1.4", "husky": "^4.0.0", "lint-staged": "^10.0.0", "npm-run-all": "^3.0.0", "npmpub": "^5.0.0", - "prettier": "^2.0.0" + "prettier": "^2.0.0", + "rescript": "^10.0.0" }, "prettier": { "trailingComma": "all" diff --git a/src/apis/Animated.bs.js b/src/apis/Animated.bs.js index b3fa90b2..c9a400a3 100644 --- a/src/apis/Animated.bs.js +++ b/src/apis/Animated.bs.js @@ -94,17 +94,14 @@ function decay(prim0, prim1) { function start(prim0, prim1, prim2) { prim0.start(prim1 !== undefined ? Caml_option.valFromOption(prim1) : undefined); - } function stop(prim) { prim.stop(); - } function reset(prim) { prim.reset(); - } var StyleProp = {}; From bd48e95913751fd0b9d349e9a146e48f68289c5a Mon Sep 17 00:00:00 2001 From: Maxime Thirouin Date: Wed, 5 Oct 2022 12:13:48 +0200 Subject: [PATCH 3/3] Update package-lock.json --- package-lock.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package-lock.json b/package-lock.json index 880ded66..0821bef0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "rescript-react-native", "version": "0.69.0", "license": "MIT", "devDependencies": { @@ -16850,6 +16851,7 @@ "integrity": "sha512-OMp77TUUZAoiuUv5uKNc08AnJNQxD28k92eQvo8tPcA8Wx6OZlEUvL7M7SFkef2mEYJ0vnrRjOamSnbBuq/+1w==", "peer": true, "requires": { + "@babel/core": "^7.14.0", "@babel/plugin-proposal-async-generator-functions": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0", @@ -16896,6 +16898,7 @@ "integrity": "sha512-hMnN0MOgVloAk94YuXN7sLeDaZ51Y6xIcJXxIU1s/KaygAGXk6o7VAdwf2MY/IV1SIct5lkW4Gn71u/9/EvfXA==", "peer": true, "requires": { + "@babel/core": "^7.14.0", "babel-preset-fbjs": "^3.4.0", "hermes-parser": "0.8.0", "metro-babel-transformer": "0.72.1", @@ -16922,6 +16925,7 @@ "integrity": "sha512-DlvMw2tFrCqD9OXBoN11fPM09kHC22FZpnkTmG4Pr4kecV+aDmEGxwakjUcjELrX1JCXz2MLPvqeJkbiP1f5CA==", "peer": true, "requires": { + "@babel/core": "^7.14.0", "@babel/plugin-proposal-async-generator-functions": "^7.0.0", "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-export-default-from": "^7.0.0",