From 8f1c85e7904c3beefd124f67a4fb4d8d45cab6f5 Mon Sep 17 00:00:00 2001 From: jihchi Date: Thu, 11 May 2023 18:54:38 +0200 Subject: [PATCH 1/2] Upgrade rescript to v11 --- package-lock.json | 18 ++++++++++-------- package.json | 2 +- tests/App_test.res | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 14ceb9a..a0bc484 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@testing-library/react": "^14.0.0", "@vitejs/plugin-react": "^4.0.0", "jsdom": "^22.0.0", - "rescript": "^10.1.4", + "rescript": "^11.0.0-alpha.6", "rescript-vitest": "^1.2.0", "vite": "^4.3.5", "vitest": "^0.31.0" @@ -2558,15 +2558,17 @@ "dev": true }, "node_modules/rescript": { - "version": "10.1.4", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.4.tgz", - "integrity": "sha512-FFKlS9AG/XrLepWsyw7B+A9DtQBPWEPDPDKghV831Y2KGbie+eeFBOS0xtRHp0xbt7S0N2Dm6hhX+kTZQ/3Ybg==", + "version": "11.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-alpha.6.tgz", + "integrity": "sha512-516p5A+ybndzdxjKbOVJNrSd+p+U3FZ5Lm9U7SfGREzJXKACY3e69dk9ey/wDO4fh6Ge8j+NIXhHOTjFhMx4sw==", "hasInstallScript": true, "bin": { "bsc": "bsc", - "bsrefmt": "bsrefmt", "bstracing": "lib/bstracing", "rescript": "rescript" + }, + "engines": { + "node": ">=10" } }, "node_modules/rescript-vitest": { @@ -4950,9 +4952,9 @@ "dev": true }, "rescript": { - "version": "10.1.4", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-10.1.4.tgz", - "integrity": "sha512-FFKlS9AG/XrLepWsyw7B+A9DtQBPWEPDPDKghV831Y2KGbie+eeFBOS0xtRHp0xbt7S0N2Dm6hhX+kTZQ/3Ybg==" + "version": "11.0.0-alpha.6", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-alpha.6.tgz", + "integrity": "sha512-516p5A+ybndzdxjKbOVJNrSd+p+U3FZ5Lm9U7SfGREzJXKACY3e69dk9ey/wDO4fh6Ge8j+NIXhHOTjFhMx4sw==" }, "rescript-vitest": { "version": "1.2.0", diff --git a/package.json b/package.json index ae51d21..632ef3d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@testing-library/react": "^14.0.0", "@vitejs/plugin-react": "^4.0.0", "jsdom": "^22.0.0", - "rescript": "^10.1.4", + "rescript": "^11.0.0-alpha.6", "rescript-vitest": "^1.2.0", "vite": "^4.3.5", "vitest": "^0.31.0" diff --git a/tests/App_test.res b/tests/App_test.res index 8fbc2d4..d0bbcbd 100644 --- a/tests/App_test.res +++ b/tests/App_test.res @@ -6,6 +6,6 @@ open JsDom testAsync("renders component without crashing", async t => { t->assertions(1) render() - let _ = await screen->findByText("Hello Vite + React + ReScript!"); + (await screen->findByText("Hello Vite + React + ReScript!"))->ignore screen->getByText("count is: 0")->expect->toBeInTheDocument }) From a86cde10f89b920473eff7fe0fc94ee7e8f74f74 Mon Sep 17 00:00:00 2001 From: jihchi Date: Fri, 16 Jun 2023 18:49:04 +0200 Subject: [PATCH 2/2] Upgrade rescript to v11 (beta.2) --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0bc484..4f5b1bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "@testing-library/react": "^14.0.0", "@vitejs/plugin-react": "^4.0.0", "jsdom": "^22.0.0", - "rescript": "^11.0.0-alpha.6", + "rescript": "^11.0.0-beta.2", "rescript-vitest": "^1.2.0", "vite": "^4.3.5", "vitest": "^0.31.0" @@ -2558,9 +2558,9 @@ "dev": true }, "node_modules/rescript": { - "version": "11.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-alpha.6.tgz", - "integrity": "sha512-516p5A+ybndzdxjKbOVJNrSd+p+U3FZ5Lm9U7SfGREzJXKACY3e69dk9ey/wDO4fh6Ge8j+NIXhHOTjFhMx4sw==", + "version": "11.0.0-beta.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-beta.2.tgz", + "integrity": "sha512-Tcf72sR4EQ+eVMAwMWDSW5VPfg8YOS6bRJQ1Sf4u6jMy7Ui18mZyy0rusQmeq8vf2spgNulMcOw+HzQ9bEiz7g==", "hasInstallScript": true, "bin": { "bsc": "bsc", @@ -4952,9 +4952,9 @@ "dev": true }, "rescript": { - "version": "11.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-alpha.6.tgz", - "integrity": "sha512-516p5A+ybndzdxjKbOVJNrSd+p+U3FZ5Lm9U7SfGREzJXKACY3e69dk9ey/wDO4fh6Ge8j+NIXhHOTjFhMx4sw==" + "version": "11.0.0-beta.2", + "resolved": "https://registry.npmjs.org/rescript/-/rescript-11.0.0-beta.2.tgz", + "integrity": "sha512-Tcf72sR4EQ+eVMAwMWDSW5VPfg8YOS6bRJQ1Sf4u6jMy7Ui18mZyy0rusQmeq8vf2spgNulMcOw+HzQ9bEiz7g==" }, "rescript-vitest": { "version": "1.2.0", diff --git a/package.json b/package.json index 632ef3d..b033c2c 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@testing-library/react": "^14.0.0", "@vitejs/plugin-react": "^4.0.0", "jsdom": "^22.0.0", - "rescript": "^11.0.0-alpha.6", + "rescript": "^11.0.0-beta.2", "rescript-vitest": "^1.2.0", "vite": "^4.3.5", "vitest": "^0.31.0"