Skip to content

Commit fc8c9a7

Browse files
authored
Fix conflicting React versions (#263)
1 parent 13e633e commit fc8c9a7

File tree

7 files changed

+1095
-1091
lines changed

7 files changed

+1095
-1091
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ jobs:
5757
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
5858
restore-keys: |
5959
${{ runner.os }}-yarn-
60-
- run: yarn --cwd ./test-projects/browser install --frozen-lockfile --prefer-offline
61-
- run: yarn install --frozen-lockfile --prefer-offline
60+
- run: yarn dev
6261
- run: yarn test
6362
- name: Codecov
6463
uses: codecov/codecov-action@v1
@@ -81,9 +80,7 @@ jobs:
8180
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
8281
restore-keys: |
8382
${{ runner.os }}-yarn-
84-
- run: yarn install --frozen-lockfile --prefer-offline
85-
- run: yarn compile
86-
- run: yarn --cwd ./website install --frozen-lockfile --prefer-offline
83+
- run: yarn dev
8784
- run: yarn --cwd ./website type-check
8885
- run: yarn --cwd ./website build
8986
publish:

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"@testing-library/user-event": "^13.0.7",
4747
"@types/jest": "^26.0.3",
4848
"@types/react": "^17.0.0",
49+
"@types/react-dom": "^17.0.3",
4950
"@typescript-eslint/eslint-plugin": "^4.8.2",
5051
"@typescript-eslint/parser": "^4.8.2",
5152
"eslint": "^7.14.0",
@@ -55,8 +56,8 @@
5556
"jest": "link:./test-projects/browser/node_modules/jest",
5657
"jest-ts-webcompat-resolver": "^1.0.0",
5758
"prettier": "^2.0.2",
58-
"react": "link:./test-projects/browser/node_modules/react",
59-
"react-dom": "link:./test-projects/browser/node_modules/react-dom",
59+
"react": "^17.0.2",
60+
"react-dom": "^17.0.2",
6061
"react-test-renderer": "^17.0.1",
6162
"rugged": "^1.0.0",
6263
"ts-jest": "^26.5.4",

test-projects/browser/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
"@types/jest": "^26.0.21",
99
"@types/jest-environment-puppeteer": "^4.4.1",
1010
"@types/node": "^14.0.0",
11-
"@types/react": "^17.0.0",
12-
"@types/react-dom": "^17.0.0",
11+
"@types/react": "link:../../node_modules/@types/react",
12+
"@types/react-dom": "link:../../node_modules/@types/react-dom",
1313
"jest-puppeteer": "^4.4.0",
1414
"merge": "^2.1.1",
1515
"puppeteer": "^8.0.0",
16-
"react": "^17.0.1",
16+
"react": "link:../../node_modules/react",
1717
"react-accessible-dropdown-menu-hook": "link:../..",
18-
"react-dom": "^17.0.1",
18+
"react-dom": "link:../../node_modules/react-dom",
1919
"react-scripts": "4.0.1",
2020
"ts-jest": "^26.5.4",
2121
"ts-node": "^9.1.1",

test-projects/browser/yarn.lock

Lines changed: 464 additions & 464 deletions
Large diffs are not rendered by default.

website/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@
2020
"@fortawesome/free-solid-svg-icons": "^5.15.3",
2121
"@fortawesome/react-fontawesome": "^0.1.14",
2222
"@mdx-js/react": "^1.6.21",
23+
"@types/react-loadable": "^5.5.5",
24+
"@types/react-router-config": "^5.0.2",
2325
"clsx": "^1.1.1",
24-
"react": "^17.0.2",
26+
"react": "link:../node_modules/react",
2527
"react-accessible-dropdown-menu-hook": "link:../",
26-
"react-dom": "^17.0.2"
28+
"react-dom": "link:../node_modules/react-dom"
2729
},
2830
"browserslist": {
2931
"production": [
@@ -40,7 +42,7 @@
4042
"devDependencies": {
4143
"@docusaurus/module-type-aliases": "^2.0.0-alpha.70",
4244
"@tsconfig/docusaurus": "^1.0.2",
43-
"@types/react": "^17.0.2",
45+
"@types/react": "link:../node_modules/@types/react",
4446
"@types/react-helmet": "^6.1.0",
4547
"@types/react-router-dom": "^5.1.7",
4648
"typescript": "^4.2.2"

0 commit comments

Comments
 (0)