diff --git a/jscomp/gentype_tests/typescript-react-example/package-lock.json b/jscomp/gentype_tests/typescript-react-example/package-lock.json index 2dd8fbba05..a322751c5e 100644 --- a/jscomp/gentype_tests/typescript-react-example/package-lock.json +++ b/jscomp/gentype_tests/typescript-react-example/package-lock.json @@ -8,7 +8,7 @@ "name": "typescript-react-example", "version": "0.1.0", "dependencies": { - "@rescript/react": "^0.11.0", + "@rescript/react": "^0.12.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, @@ -22,6 +22,26 @@ "typescript": "^5.2.2" } }, + "../../..": { + "name": "rescript", + "version": "11.0.1", + "dev": true, + "hasInstallScript": true, + "license": "SEE LICENSE IN LICENSE", + "bin": { + "bsc": "bsc", + "bstracing": "lib/bstracing", + "rescript": "rescript" + }, + "devDependencies": { + "mocha": "10.1.0", + "nyc": "15.0.0", + "prettier": "2.7.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -156,9 +176,9 @@ } }, "node_modules/@rescript/react": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.11.0.tgz", - "integrity": "sha512-RzoAO+3cJwXE2D7yodMo4tBO2EkeDYCN/I/Sj/yRweI3S1CY1ZBOF/GMcVtjeIurJJt7KMveqQXTaRrqoGZBBg==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0.tgz", + "integrity": "sha512-EBLsf5rD7sJOjgfLLGwuLw/hONszc3UtYnIVgv7OdTyUNR41/m4deVm62PI0agvr3kWakXz4KchKRSd+19/bRA==", "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" @@ -1399,19 +1419,8 @@ } }, "node_modules/rescript": { - "version": "11.0.0-rc.8", - "resolved": "file:../../..", - "dev": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "engines": { - "node": ">=10" - } + "resolved": "../../..", + "link": true }, "node_modules/resolve-from": { "version": "4.0.0", diff --git a/jscomp/gentype_tests/typescript-react-example/package.json b/jscomp/gentype_tests/typescript-react-example/package.json index 2bd24b2215..172eb2a18f 100644 --- a/jscomp/gentype_tests/typescript-react-example/package.json +++ b/jscomp/gentype_tests/typescript-react-example/package.json @@ -10,7 +10,7 @@ "lint": "eslint src" }, "dependencies": { - "@rescript/react": "^0.11.0", + "@rescript/react": "^0.12.0", "react": "^18.2.0", "react-dom": "^18.2.0" }, diff --git a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res index 9a46abfc8a..bce9f6c9fc 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/Hooks.res +++ b/jscomp/gentype_tests/typescript-react-example/src/Hooks.res @@ -99,7 +99,7 @@ module ForwardRef = { ) } -@genType type callback<'input, 'output> = React.callback<'input, 'output> +@genType type callback<'input, 'output> = 'input => 'output @genType type testReactContext = React.Context.t diff --git a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res index 74ebf6164a..c706483c60 100644 --- a/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res +++ b/jscomp/gentype_tests/typescript-react-example/src/V3Compatibility.res @@ -1,4 +1,4 @@ open ReactV3 @genType -type cb = React.callback +type cb = int => string diff --git a/packages/playground-bundling/package-lock.json b/packages/playground-bundling/package-lock.json index bd21cab48a..d3a1faa332 100644 --- a/packages/playground-bundling/package-lock.json +++ b/packages/playground-bundling/package-lock.json @@ -10,7 +10,7 @@ "license": "ISC", "dependencies": { "@rescript/core": "^0.6.0", - "@rescript/react": "^0.12.0-alpha.3" + "@rescript/react": "^0.12.0" } }, "node_modules/@rescript/core": { @@ -22,9 +22,9 @@ } }, "node_modules/@rescript/react": { - "version": "0.12.0-alpha.3", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0-alpha.3.tgz", - "integrity": "sha512-/S1uj77RPDzuLg3Ofb8KKU3Vppqy97/vF6bBdBZ+saIO9bpHVlsmmJyJG8QXjGZKE+aMynrrR3Tj4+9+5OzLdw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0.tgz", + "integrity": "sha512-EBLsf5rD7sJOjgfLLGwuLw/hONszc3UtYnIVgv7OdTyUNR41/m4deVm62PI0agvr3kWakXz4KchKRSd+19/bRA==", "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" @@ -104,9 +104,9 @@ "requires": {} }, "@rescript/react": { - "version": "0.12.0-alpha.3", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0-alpha.3.tgz", - "integrity": "sha512-/S1uj77RPDzuLg3Ofb8KKU3Vppqy97/vF6bBdBZ+saIO9bpHVlsmmJyJG8QXjGZKE+aMynrrR3Tj4+9+5OzLdw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.12.0.tgz", + "integrity": "sha512-EBLsf5rD7sJOjgfLLGwuLw/hONszc3UtYnIVgv7OdTyUNR41/m4deVm62PI0agvr3kWakXz4KchKRSd+19/bRA==", "requires": {} }, "js-tokens": { diff --git a/packages/playground-bundling/package.json b/packages/playground-bundling/package.json index 2a6b591f68..c876bf1172 100644 --- a/packages/playground-bundling/package.json +++ b/packages/playground-bundling/package.json @@ -12,6 +12,6 @@ "license": "ISC", "dependencies": { "@rescript/core": "^0.6.0", - "@rescript/react": "^0.12.0-alpha.3" + "@rescript/react": "^0.12.0" } }