Skip to content

Fix 0.69 not compiling on ReScript 10 #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 5, 2022
Merged

Fix 0.69 not compiling on ReScript 10 #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7399f5c
Fix 0.69.0 changes not compiling on ReScript 10
cknitt Oct 5, 2022
7f361c8
Upgrade rescript dev dependency (not peer) to v10
cknitt Oct 5, 2022
bd48e95
Update package-lock.json
MoOx Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions src/apis/Animated.bs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {};
Expand Down
3 changes: 2 additions & 1 deletion src/components/View.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=?,
Expand Down
2 changes: 2 additions & 0 deletions src/types/HitSlop.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down