From d63e73fae670cda865f8de184007806721e0a31f Mon Sep 17 00:00:00 2001 From: Ashesh <3626859+Ashesh3@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:07:18 +0530 Subject: [PATCH] Migrate bs-webapi to rescript-webapi (#3544) * Migrate bs-webapi to rescript-webapi * Include yarn.lock * Revert "Include yarn.lock" This reverts commit 18616dc2b1e0c3c469bd5fb08327ecf932938236. * Add package-lock --- bsconfig.json | 2 +- package-lock.json | 42 +++++-------------- package.json | 2 +- .../components/Prescription__Picker.res | 4 +- src/Components/Common/utils/WindowUtils.res | 2 +- .../IOBalance/IOBalance__UnitPicker.res | 4 +- 6 files changed, 18 insertions(+), 38 deletions(-) diff --git a/bsconfig.json b/bsconfig.json index 95043685928..4800e23276d 100644 --- a/bsconfig.json +++ b/bsconfig.json @@ -20,7 +20,7 @@ "bs-dependencies": [ "@rescript/react", "@glennsl/bs-json", - "bs-webapi", + "rescript-webapi", "rescript-material-ui" ], "ppx-flags": [], diff --git a/package-lock.json b/package-lock.json index 28e989383a0..413a40af6eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,6 @@ "@yaireo/ui-range": "^2.1.15", "axios": "^0.27.2", "browser-image-compression": "^2.0.0", - "bs-webapi": "^0.19.0", "clsx": "^1.1.1", "cross-env": "^7.0.3", "date-fns": "^2.16.1", @@ -78,6 +77,7 @@ "redux": "^4.1.0", "redux-thunk": "^2.3.0", "rescript-material-ui": "^2.1.2", + "rescript-webapi": "^0.6.1", "resolve": "^1.20.0", "save": "^2.4.0", "screenfull": "^5.1.0", @@ -6945,23 +6945,6 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, - "node_modules/bs-fetch": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/bs-fetch/-/bs-fetch-0.6.2.tgz", - "integrity": "sha512-VXEjp8kY3vHPckaoy3d96Bx0KYjJAPLNISBwfpwMN26K6DtuZYwI2HKhx7zeHBajz1bRArfx7O8OOLcdtujMvg==" - }, - "node_modules/bs-webapi": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/bs-webapi/-/bs-webapi-0.19.1.tgz", - "integrity": "sha512-sRhkNdHFBxzoiLH+r8rhlW9XSafBbbGCkvsxtTJ1QMABEaHKj8TejwA7TuBZH2ZYL2ur3sk291ukkge5qFm3Uw==", - "deprecated": "Use https://www.npmjs.com/package/rescript-webapi", - "dependencies": { - "bs-fetch": "^0.6.2" - }, - "peerDependencies": { - "bsdoc": "^6.0.4-alpha" - } - }, "node_modules/bser": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", @@ -24304,6 +24287,11 @@ "object-assign": "^4.1.1" } }, + "node_modules/rescript-webapi": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/rescript-webapi/-/rescript-webapi-0.6.1.tgz", + "integrity": "sha512-I/eeHOcsUfWbCf6u15zd+rKxMz9awSjjdRa8eFtl2X+HjDNs0mJxoC4uFFK9dIazYcmY2VpuK5TTpOPXvdkhDw==" + }, "node_modules/resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -33523,19 +33511,6 @@ "picocolors": "^1.0.0" } }, - "bs-fetch": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/bs-fetch/-/bs-fetch-0.6.2.tgz", - "integrity": "sha512-VXEjp8kY3vHPckaoy3d96Bx0KYjJAPLNISBwfpwMN26K6DtuZYwI2HKhx7zeHBajz1bRArfx7O8OOLcdtujMvg==" - }, - "bs-webapi": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/bs-webapi/-/bs-webapi-0.19.1.tgz", - "integrity": "sha512-sRhkNdHFBxzoiLH+r8rhlW9XSafBbbGCkvsxtTJ1QMABEaHKj8TejwA7TuBZH2ZYL2ur3sk291ukkge5qFm3Uw==", - "requires": { - "bs-fetch": "^0.6.2" - } - }, "bser": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", @@ -46497,6 +46472,11 @@ } } }, + "rescript-webapi": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/rescript-webapi/-/rescript-webapi-0.6.1.tgz", + "integrity": "sha512-I/eeHOcsUfWbCf6u15zd+rKxMz9awSjjdRa8eFtl2X+HjDNs0mJxoC4uFFK9dIazYcmY2VpuK5TTpOPXvdkhDw==" + }, "resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", diff --git a/package.json b/package.json index 077bdaf9e9b..d4bf7f027e0 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,6 @@ "@yaireo/ui-range": "^2.1.15", "axios": "^0.27.2", "browser-image-compression": "^2.0.0", - "bs-webapi": "^0.19.0", "clsx": "^1.1.1", "cross-env": "^7.0.3", "date-fns": "^2.16.1", @@ -99,6 +98,7 @@ "redux": "^4.1.0", "redux-thunk": "^2.3.0", "rescript-material-ui": "^2.1.2", + "rescript-webapi": "^0.6.1", "resolve": "^1.20.0", "save": "^2.4.0", "screenfull": "^5.1.0", diff --git a/src/Components/Common/prescription-builder/components/Prescription__Picker.res b/src/Components/Common/prescription-builder/components/Prescription__Picker.res index 6678383a5ee..bf2e7fc3c92 100644 --- a/src/Components/Common/prescription-builder/components/Prescription__Picker.res +++ b/src/Components/Common/prescription-builder/components/Prescription__Picker.res @@ -60,10 +60,10 @@ let make = (~id, ~value, ~updateCB, ~placeholder, ~selectables) => { React.useEffect1(() => { let curriedFunction = onWindowClick(showDropdown, setShowDropdown) - let removeEventListener = () => Window.removeEventListener("click", curriedFunction, window) + let removeEventListener = () => Window.removeEventListener(window, "click", curriedFunction) if showDropdown { - Window.addEventListener("click", curriedFunction, window) + Window.addEventListener(window, "click", curriedFunction) Some(removeEventListener) } else { removeEventListener() diff --git a/src/Components/Common/utils/WindowUtils.res b/src/Components/Common/utils/WindowUtils.res index 430a7ebb21a..e8eb1ceb4dc 100644 --- a/src/Components/Common/utils/WindowUtils.res +++ b/src/Components/Common/utils/WindowUtils.res @@ -1,7 +1,7 @@ let confirm = (~onCancel=?, message, f) => if { open Webapi.Dom - window |> Window.confirm(message) + window -> Window.confirm(message) } { f() } else { diff --git a/src/Components/CriticalCareRecording/IOBalance/IOBalance__UnitPicker.res b/src/Components/CriticalCareRecording/IOBalance/IOBalance__UnitPicker.res index 6678383a5ee..bf2e7fc3c92 100644 --- a/src/Components/CriticalCareRecording/IOBalance/IOBalance__UnitPicker.res +++ b/src/Components/CriticalCareRecording/IOBalance/IOBalance__UnitPicker.res @@ -60,10 +60,10 @@ let make = (~id, ~value, ~updateCB, ~placeholder, ~selectables) => { React.useEffect1(() => { let curriedFunction = onWindowClick(showDropdown, setShowDropdown) - let removeEventListener = () => Window.removeEventListener("click", curriedFunction, window) + let removeEventListener = () => Window.removeEventListener(window, "click", curriedFunction) if showDropdown { - Window.addEventListener("click", curriedFunction, window) + Window.addEventListener(window, "click", curriedFunction) Some(removeEventListener) } else { removeEventListener()