Skip to content

Commit f5328b6

Browse files
based-ghostbased-ghost
committed
fixing bad merge that occurred with last PR where old version of isEdgeOrIE() utility function in utils.ts was not removed; bump some dev dependencies; rebuild storybook files
1 parent 40998a4 commit f5328b6

File tree

51 files changed

+187
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+187
-187
lines changed

‎.test/setupTests.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
/* eslint-disable prettier/prettier */
22
import '@testing-library/jest-dom/extend-expect';
33

4+
export interface Global extends NodeJS.Global {
5+
document: Document;
6+
window: Window;
7+
}
8+
9+
declare var global: Global;
10+
411
// React SSR when environment is not js-dom
512
if (global.window !== undefined) {
6-
713
// Global MutationObserver Mocks
814
window.MutationObserver = require('mutation-observer');
915

‎__tests__/ReactSSR.test.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
/**
22
* @jest-environment node
33
*/
4-
54
import React from 'react';
65
import { renderToString } from 'react-dom/server';
76
import { Select } from '../src';
87

9-
test('select element can be rendered using react-dom/server', () => {
10-
8+
test('select element can be rendered using react-dom/server', async () => {
119
expect(() => renderToString(<Select />)).not.toThrow();
12-
1310
});

‎docs/8.112de825cf203f8f02fe.bundle.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/8.112de825cf203f8f02fe.bundle.js renamed to docs/8.19333dda7066392fb427.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/8.19333dda7066392fb427.bundle.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/asset-manifest.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
{
22
"files": {
3-
"main~24120820.js": "./main~24120820.112de825cf203f8f02fe.bundle.js",
4-
"main~24120820.js.map": "./main~24120820.112de825cf203f8f02fe.bundle.js.map",
5-
"runtime~main.js": "./runtime~main.112de825cf203f8f02fe.bundle.js",
6-
"runtime~main.js.map": "./runtime~main.112de825cf203f8f02fe.bundle.js.map",
7-
"vendors~main~1f20a385.js": "./vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js",
8-
"vendors~main~1f20a385.js.map": "./vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js.map",
9-
"vendors~main~253ae210.js": "./vendors~main~253ae210.112de825cf203f8f02fe.bundle.js",
10-
"vendors~main~253ae210.js.map": "./vendors~main~253ae210.112de825cf203f8f02fe.bundle.js.map",
11-
"vendors~main~678f84af.js": "./vendors~main~678f84af.112de825cf203f8f02fe.bundle.js",
12-
"vendors~main~678f84af.js.map": "./vendors~main~678f84af.112de825cf203f8f02fe.bundle.js.map",
13-
"vendors~main~d939e436.js": "./vendors~main~d939e436.112de825cf203f8f02fe.bundle.js",
14-
"vendors~main~d939e436.js.map": "./vendors~main~d939e436.112de825cf203f8f02fe.bundle.js.map",
15-
"vendors~main~db300d2f.js": "./vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js",
16-
"vendors~main~db300d2f.js.map": "./vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js.map",
17-
"vendors~main~ec8c427e.js": "./vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js",
18-
"vendors~main~ec8c427e.js.map": "./vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js.map",
19-
"8.112de825cf203f8f02fe.bundle.js": "./8.112de825cf203f8f02fe.bundle.js",
20-
"8.112de825cf203f8f02fe.bundle.js.map": "./8.112de825cf203f8f02fe.bundle.js.map",
3+
"main~24120820.js": "./main~24120820.19333dda7066392fb427.bundle.js",
4+
"main~24120820.js.map": "./main~24120820.19333dda7066392fb427.bundle.js.map",
5+
"runtime~main.js": "./runtime~main.19333dda7066392fb427.bundle.js",
6+
"runtime~main.js.map": "./runtime~main.19333dda7066392fb427.bundle.js.map",
7+
"vendors~main~1f20a385.js": "./vendors~main~1f20a385.19333dda7066392fb427.bundle.js",
8+
"vendors~main~1f20a385.js.map": "./vendors~main~1f20a385.19333dda7066392fb427.bundle.js.map",
9+
"vendors~main~253ae210.js": "./vendors~main~253ae210.19333dda7066392fb427.bundle.js",
10+
"vendors~main~253ae210.js.map": "./vendors~main~253ae210.19333dda7066392fb427.bundle.js.map",
11+
"vendors~main~678f84af.js": "./vendors~main~678f84af.19333dda7066392fb427.bundle.js",
12+
"vendors~main~678f84af.js.map": "./vendors~main~678f84af.19333dda7066392fb427.bundle.js.map",
13+
"vendors~main~d939e436.js": "./vendors~main~d939e436.19333dda7066392fb427.bundle.js",
14+
"vendors~main~d939e436.js.map": "./vendors~main~d939e436.19333dda7066392fb427.bundle.js.map",
15+
"vendors~main~db300d2f.js": "./vendors~main~db300d2f.19333dda7066392fb427.bundle.js",
16+
"vendors~main~db300d2f.js.map": "./vendors~main~db300d2f.19333dda7066392fb427.bundle.js.map",
17+
"vendors~main~ec8c427e.js": "./vendors~main~ec8c427e.19333dda7066392fb427.bundle.js",
18+
"vendors~main~ec8c427e.js.map": "./vendors~main~ec8c427e.19333dda7066392fb427.bundle.js.map",
19+
"8.19333dda7066392fb427.bundle.js": "./8.19333dda7066392fb427.bundle.js",
20+
"8.19333dda7066392fb427.bundle.js.map": "./8.19333dda7066392fb427.bundle.js.map",
2121
"iframe.html": "./iframe.html",
22-
"precache-manifest.f5fab2899f12d293a220698c94e7aa96.js": "./precache-manifest.f5fab2899f12d293a220698c94e7aa96.js",
22+
"precache-manifest.13a87fdc4bc9609a38abd7c710179ae3.js": "./precache-manifest.13a87fdc4bc9609a38abd7c710179ae3.js",
2323
"service-worker.js": "./service-worker.js",
2424
"static/media/react-logo.svg": "./static/media/react-logo.9f16557d.svg",
25-
"vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js.LICENSE.txt": "./vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js.LICENSE.txt",
26-
"vendors~main~253ae210.112de825cf203f8f02fe.bundle.js.LICENSE.txt": "./vendors~main~253ae210.112de825cf203f8f02fe.bundle.js.LICENSE.txt",
27-
"vendors~main~678f84af.112de825cf203f8f02fe.bundle.js.LICENSE.txt": "./vendors~main~678f84af.112de825cf203f8f02fe.bundle.js.LICENSE.txt",
28-
"vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js.LICENSE.txt": "./vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js.LICENSE.txt",
29-
"vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js.LICENSE.txt": "./vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js.LICENSE.txt"
25+
"vendors~main~1f20a385.19333dda7066392fb427.bundle.js.LICENSE.txt": "./vendors~main~1f20a385.19333dda7066392fb427.bundle.js.LICENSE.txt",
26+
"vendors~main~253ae210.19333dda7066392fb427.bundle.js.LICENSE.txt": "./vendors~main~253ae210.19333dda7066392fb427.bundle.js.LICENSE.txt",
27+
"vendors~main~678f84af.19333dda7066392fb427.bundle.js.LICENSE.txt": "./vendors~main~678f84af.19333dda7066392fb427.bundle.js.LICENSE.txt",
28+
"vendors~main~db300d2f.19333dda7066392fb427.bundle.js.LICENSE.txt": "./vendors~main~db300d2f.19333dda7066392fb427.bundle.js.LICENSE.txt",
29+
"vendors~main~ec8c427e.19333dda7066392fb427.bundle.js.LICENSE.txt": "./vendors~main~ec8c427e.19333dda7066392fb427.bundle.js.LICENSE.txt"
3030
},
3131
"entrypoints": [
32-
"runtime~main.112de825cf203f8f02fe.bundle.js",
33-
"vendors~main~253ae210.112de825cf203f8f02fe.bundle.js",
34-
"vendors~main~d939e436.112de825cf203f8f02fe.bundle.js",
35-
"vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js",
36-
"vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js",
37-
"vendors~main~678f84af.112de825cf203f8f02fe.bundle.js",
38-
"vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js",
39-
"main~24120820.112de825cf203f8f02fe.bundle.js"
32+
"runtime~main.19333dda7066392fb427.bundle.js",
33+
"vendors~main~253ae210.19333dda7066392fb427.bundle.js",
34+
"vendors~main~d939e436.19333dda7066392fb427.bundle.js",
35+
"vendors~main~db300d2f.19333dda7066392fb427.bundle.js",
36+
"vendors~main~1f20a385.19333dda7066392fb427.bundle.js",
37+
"vendors~main~678f84af.19333dda7066392fb427.bundle.js",
38+
"vendors~main~ec8c427e.19333dda7066392fb427.bundle.js",
39+
"main~24120820.19333dda7066392fb427.bundle.js"
4040
]
4141
}

‎docs/iframe.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
}</script><style>#root[hidden],
7272
#docs-root[hidden] {
7373
display: none !important;
74-
}</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~253ae210.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~d939e436.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~db300d2f.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~1f20a385.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~678f84af.112de825cf203f8f02fe.bundle.js"></script><script src="vendors~main~ec8c427e.112de825cf203f8f02fe.bundle.js"></script><script src="main~24120820.112de825cf203f8f02fe.bundle.js"></script></body></html>
74+
}</style></head><body><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script src="runtime~main.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~253ae210.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~d939e436.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~db300d2f.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~1f20a385.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~678f84af.19333dda7066392fb427.bundle.js"></script><script src="vendors~main~ec8c427e.19333dda7066392fb427.bundle.js"></script><script src="main~24120820.19333dda7066392fb427.bundle.js"></script></body></html>

‎docs/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@
7474
}</style><style>#root[hidden],
7575
#docs-root[hidden] {
7676
display: none !important;
77-
}</style></head><body><div id="root"></div><div id="docs-root"></div><script>window['DOCS_MODE'] = false;</script><script src="runtime~main.015293d2bd2970586a57.bundle.js"></script><script src="vendors~main.6d43d6145f9883affefa.bundle.js"></script><script src="main.7f594e8b4ce7013ecf15.bundle.js"></script></body></html>
77+
}</style></head><body><div id="root"></div><div id="docs-root"></div><script>window['DOCS_MODE'] = false;</script><script src="runtime~main.015293d2bd2970586a57.bundle.js"></script><script src="vendors~main.9af2a3356966891eefe0.bundle.js"></script><script src="main.7f594e8b4ce7013ecf15.bundle.js"></script></body></html>

‎docs/main~24120820.112de825cf203f8f02fe.bundle.js‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎docs/main~24120820.112de825cf203f8f02fe.bundle.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)