daml-react: allow for React 17 (digital-asset#11463)

See digital-asset#11358. CHANGELOG_BEGIN - [@daml/react] Our React bindings now request the `react` library as a peer dependency, and will accept React 17 in addition to the current React 16. For new projects, the `create-daml-app` template now uses React 17. CHANGELOG_END
TuranDev · Nov 1, 2021 · 7a0198b · 7a0198b
1 parent c415d9d
commit 7a0198b
Show file tree

Hide file tree

Showing 4 changed files with 844 additions and 1,047 deletions.
diff --git a/language-support/ts/daml-react/package.json b/language-support/ts/daml-react/package.json
@@ -20,8 +20,10 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@daml/ledger": "0.0.0-SDKVERSION",
-    "@daml/types": "0.0.0-SDKVERSION",
-    "react": "^16.12.0"
+    "@daml/types": "0.0.0-SDKVERSION"
+  },
+  "peerDependencies": {
+    "react": "^16.12.0 || ^17.0.0"
   },
   "scripts": {
     "build": "tsc --build",
@@ -32,12 +34,12 @@
   "devDependencies": {
     "@testing-library/react-hooks": "^3.2.1",
     "@types/jest": "^26.0.23",
-    "@types/react": "^16.9.20",
+    "@types/react": "^16.9.20 || ^17.0.0",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "eslint": "^6.8.0",
     "jest": "^27.0.5",
-    "react-test-renderer": "^16.12.0",
+    "react-test-renderer": "^16.12.0 || ^17.0.0",
     "ts-jest": "^27.0.3",
     "typescript": "~3.8.3"
   }

diff --git a/language-support/ts/packages/package.json b/language-support/ts/packages/package.json
@@ -6,8 +6,8 @@
     "events": "^3.1.0",
     "isomorphic-ws": "^4.0.1",
     "jwt-simple": "^0.5.6",
-    "react": "^16.12.0",
-    "react-test-renderer": "^16.12.0",
+    "react": "^16.12.0 || ^17.0.0",
+    "react-test-renderer": "^16.12.0 || ^17.0.0",
     "typescript": "~3.9.7",
     "ws": "^7.4.6"
   },
@@ -16,7 +16,7 @@
     "@bazel/typescript": "^4.4.0",
     "@types/jest": "^26.0.23",
     "@types/lodash": "4.14.161",
-    "@types/react": "^16.9.20",
+    "@types/react": "^16.9.20 || ^17.0.0",
     "@types/ws": "^7.2.1",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
@@ -30,7 +30,7 @@
   "resolutions": {
     "marked": "^2.0.0",
     "**/y18n": "^4.0.1",
-    "**/@types/react-test-renderer": "^16.9.3",
+    "**/@types/react-test-renderer": "^16.9.3 || ^17.0.0",
     "**/hosted-git-info": "^4.0.2",
     "**/string-width": "^4.2.3",
     "**/strip-ansi": "^6.0.1",