Skip to content

Commit dcad809

Browse files
corymharpercorymharper
committed
Merge branch 'master' into demo-site-crash-fix
2 parents 58657e5 + fc8c9a7 commit dcad809

File tree

7 files changed

+531
-522
lines changed

7 files changed

+531
-522
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 & 5 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,10 +42,8 @@
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",
45-
"@types/react-loadable": "^5.5.5",
46-
"@types/react-router-config": "^5.0.2",
4747
"@types/react-router-dom": "^5.1.7",
4848
"typescript": "^4.2.2"
4949
}

‎website/yarn.lock‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,7 +1859,7 @@
18591859
dependencies:
18601860
"@types/react" "*"
18611861

1862-
"@types/react@*", "@types/react@^17.0.2":
1862+
"@types/react@*":
18631863
version "17.0.3"
18641864
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
18651865
integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
@@ -1868,6 +1868,10 @@
18681868
"@types/scheduler" "*"
18691869
csstype "^3.0.2"
18701870

1871+
"@types/react@link:../node_modules/@types/react":
1872+
version "0.0.0"
1873+
uid ""
1874+
18711875
"@types/sax@^1.2.1":
18721876
version "1.2.1"
18731877
resolved "https://registry.yarnpkg.com/@types/sax/-/sax-1.2.1.tgz#e0248be936ece791a82db1a57f3fb5f7c87e8172"
@@ -2679,13 +2683,13 @@ browserslist@4.14.2:
26792683
node-releases "^1.1.61"
26802684

26812685
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.16.4, browserslist@^4.6.4:
2682-
version "4.16.4"
2683-
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.4.tgz#7ebf913487f40caf4637b892b268069951c35d58"
2684-
integrity sha512-d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ==
2686+
version "4.16.5"
2687+
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.5.tgz#952825440bca8913c62d0021334cbe928ef062ae"
2688+
integrity sha512-C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A==
26852689
dependencies:
2686-
caniuse-lite "^1.0.30001208"
2690+
caniuse-lite "^1.0.30001214"
26872691
colorette "^1.2.2"
2688-
electron-to-chromium "^1.3.712"
2692+
electron-to-chromium "^1.3.719"
26892693
escalade "^3.1.1"
26902694
node-releases "^1.1.71"
26912695

@@ -2882,7 +2886,7 @@ caniuse-api@^3.0.0:
28822886
lodash.memoize "^4.1.2"
28832887
lodash.uniq "^4.5.0"
28842888

2885-
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001208:
2889+
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001196, caniuse-lite@^1.0.30001214:
28862890
version "1.0.30001214"
28872891
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz#70f153c78223515c6d37a9fde6cd69250da9d872"
28882892
integrity sha512-O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg==
@@ -3325,22 +3329,22 @@ copy-webpack-plugin@^6.4.1:
33253329
webpack-sources "^1.4.3"
33263330

33273331
core-js-compat@^3.9.0, core-js-compat@^3.9.1:
3328-
version "3.10.2"
3329-
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.10.2.tgz#0a675b4e1cde599616322a72c8886bcf696f3ec3"
3330-
integrity sha512-IGHnpuaM1N++gLSPI1F1wu3WXICPxSyj/Q++clcwsIOnUVp5uKUIPl/+6h0TQ112KU3fMiSxqJuM+OrCyKj5+A==
3332+
version "3.11.0"
3333+
resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.11.0.tgz#635683f43480a0b41e3f6be3b1c648dadb8b4390"
3334+
integrity sha512-3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA==
33313335
dependencies:
33323336
browserslist "^4.16.4"
33333337
semver "7.0.0"
33343338

33353339
core-js-pure@^3.0.0:
3336-
version "3.10.2"
3337-
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.10.2.tgz#065304f8547bf42008d4528dfff973c38bd6a332"
3338-
integrity sha512-uu18pVHQ21n4mzfuSlCXpucu5VKsck3j2m5fjrBOBqqdgWAxwdCgUuGWj6cDDPN1zLj/qtiqKvBMxWgDeeu49Q==
3340+
version "3.11.0"
3341+
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.11.0.tgz#e07f25a8f616d178ec16b0354b008ad28b20b2f0"
3342+
integrity sha512-PxEiQGjzC+5qbvE7ZIs5Zn6BynNeZO9zHhrrWmkRff2SZLq0CE/H5LuZOJHhmOQ8L38+eMzEHAmPYWrUtDfuDQ==
33393343

33403344
core-js@^3.9.1:
3341-
version "3.10.2"
3342-
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.2.tgz#17cb038ce084522a717d873b63f2b3ee532e2cd5"
3343-
integrity sha512-W+2oVYeNghuBr3yTzZFQ5rfmjZtYB/Ubg87R5YOmlGrIb+Uw9f7qjUbhsj+/EkXhcV7eOD3jiM4+sgraX3FZUw==
3345+
version "3.11.0"
3346+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926"
3347+
integrity sha512-bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw==
33443348

33453349
core-util-is@~1.0.0:
33463350
version "1.0.2"
@@ -3980,7 +3984,7 @@ ee-first@1.1.1:
39803984
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
39813985
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
39823986

3983-
electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.712:
3987+
electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.719:
39843988
version "1.3.719"
39853989
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.719.tgz#87166fee347a46a2557f19aadb40a1d68241e61c"
39863990
integrity sha512-heM78GKSqrIzO9Oz0/y22nTBN7bqSP1Pla2SyU9DiSnQD+Ea9SyyN5RWWlgqsqeBLNDkSlE9J9EHFmdMPzxB/g==
@@ -7760,9 +7764,9 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2
77607764
supports-color "^6.1.0"
77617765

77627766
postcss@^8.2.10, postcss@^8.2.7:
7763-
version "8.2.10"
7764-
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b"
7765-
integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==
7767+
version "8.2.12"
7768+
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.12.tgz#81248a1a87e0f575cc594a99a08207fd1c4addc4"
7769+
integrity sha512-BJnGT5+0q2tzvs6oQfnY2NpEJ7rIXNfBnZtQOKCIsweeWXBXeDd5k31UgTdS3d/c02ouspufn37mTaHWkJyzMQ==
77667770
dependencies:
77677771
colorette "^1.2.2"
77687772
nanoid "^3.1.22"
@@ -8061,14 +8065,9 @@ react-dev-utils@^11.0.1:
80618065
strip-ansi "6.0.0"
80628066
text-table "0.2.0"
80638067

8064-
react-dom@^17.0.2:
8065-
version "17.0.2"
8066-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
8067-
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
8068-
dependencies:
8069-
loose-envify "^1.1.0"
8070-
object-assign "^4.1.1"
8071-
scheduler "^0.20.2"
8068+
"react-dom@link:../node_modules/react-dom":
8069+
version "0.0.0"
8070+
uid ""
80728071

80738072
react-error-overlay@^6.0.9:
80748073
version "6.0.9"
@@ -8181,13 +8180,9 @@ react-toggle@^4.1.2:
81818180
dependencies:
81828181
classnames "^2.2.5"
81838182

8184-
react@^17.0.2:
8185-
version "17.0.2"
8186-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
8187-
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
8188-
dependencies:
8189-
loose-envify "^1.1.0"
8190-
object-assign "^4.1.1"
8183+
"react@link:../node_modules/react":
8184+
version "0.0.0"
8185+
uid ""
81918186

81928187
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
81938188
version "2.3.7"

‎yarn.lock‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,14 @@
704704
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
705705
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
706706

707-
"@types/react@^17.0.0":
707+
"@types/react-dom@^17.0.3":
708+
version "17.0.3"
709+
resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.3.tgz#7fdf37b8af9d6d40127137865bb3fff8871d7ee1"
710+
integrity sha512-4NnJbCeWE+8YBzupn/YrJxZ8VnjcJq5iR1laqQ1vkpQgBiA7bwk0Rp24fxsdNinzJY2U+HHS4dJJDPdoMjdJ7w==
711+
dependencies:
712+
"@types/react" "*"
713+
714+
"@types/react@*", "@types/react@^17.0.0":
708715
version "17.0.3"
709716
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
710717
integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
@@ -3930,9 +3937,14 @@ queue-microtask@^1.2.2:
39303937
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
39313938
integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
39323939

3933-
"react-dom@link:./test-projects/browser/node_modules/react-dom":
3934-
version "0.0.0"
3935-
uid ""
3940+
react-dom@^17.0.2:
3941+
version "17.0.2"
3942+
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
3943+
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
3944+
dependencies:
3945+
loose-envify "^1.1.0"
3946+
object-assign "^4.1.1"
3947+
scheduler "^0.20.2"
39363948

39373949
"react-is@^16.12.0 || ^17.0.0", react-is@^17.0.1, react-is@^17.0.2:
39383950
version "17.0.2"
@@ -3962,9 +3974,13 @@ react-test-renderer@^17.0.1:
39623974
react-shallow-renderer "^16.13.1"
39633975
scheduler "^0.20.2"
39643976

3965-
"react@link:./test-projects/browser/node_modules/react":
3966-
version "0.0.0"
3967-
uid ""
3977+
react@^17.0.2:
3978+
version "17.0.2"
3979+
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
3980+
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
3981+
dependencies:
3982+
loose-envify "^1.1.0"
3983+
object-assign "^4.1.1"
39683984

39693985
read-pkg-up@^7.0.1:
39703986
version "7.0.1"

0 commit comments

Comments
 (0)