Skip to content

Commit c2ed295

Browse files
authored
Merge pull request #192 from OpenWebhook/dependabot/merge
Dependabot/merge
2 parents d4bcdd6 + a08dbdf commit c2ed295

7 files changed

Lines changed: 3347 additions & 2816 deletions

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
"serve": "vite preview",
1111
"test": "jest",
1212
"predeploy": "yarn build && cp CNAME ./dist/CNAME",
13-
"deploy": "gh-pages -d dist"
13+
"deploy": "gh-pages -d dist",
14+
"postinstall": "patch-package"
1415
},
1516
"dependencies": {
1617
"@apollo/client": "^3.6.9",
17-
"@honeybadger-io/js": "^4.0.3",
18-
"@honeybadger-io/react": "^2.1.0",
19-
"@pluralsight/ps-design-system-appframe": "^6.1.1",
18+
"@honeybadger-io/js": "^5.1.1",
19+
"@honeybadger-io/react": "^5.1.3",
20+
"@pluralsight/ps-design-system-appframe": "^6.1.2",
2021
"@pluralsight/ps-design-system-button": "^24.1.1",
2122
"@pluralsight/ps-design-system-carousel": "^14.1.1",
2223
"@pluralsight/ps-design-system-core": "^10.0.4",
@@ -44,8 +45,8 @@
4445
"lottie-web": "^5.9.6",
4546
"posthog-js": "^1.50.0",
4647
"prismjs": "^1.28.0",
47-
"react": "^18.1.0",
48-
"react-dom": "^18.1.0",
48+
"react": "^18.2.0",
49+
"react-dom": "^18.2.0",
4950
"react-github-btn": "^1.3.0",
5051
"react-table": "^7.7.0"
5152
},
@@ -55,19 +56,21 @@
5556
"@types/express": "^4.17.13",
5657
"@types/jest": "^27.4.1",
5758
"@types/prismjs": "^1.26.0",
58-
"@types/react": "^17.0.43",
59-
"@types/react-dom": "^18.0.5",
59+
"@types/react": "^ 18.0.28",
60+
"@types/react-dom": "^18.0.11",
6061
"@types/react-table": "^7.7.10",
6162
"@types/testing-library__jest-dom": "^5.14.5",
6263
"@vitejs/plugin-react-refresh": "^1.3.6",
6364
"autoprefixer": "^10.4.8",
6465
"gh-pages": "^4.0.0",
6566
"jest": "^27.5.1",
67+
"patch-package": "^6.5.1",
6668
"postcss": "^8.4.21",
69+
"postinstall-postinstall": "^2.1.0",
6770
"rollup-plugin-analyzer": "^4.0.0",
6871
"tailwindcss": "^3.2.7",
6972
"ts-jest": "^27.1.4",
70-
"typescript": "^4.7.4",
73+
"typescript": "^4.9.5",
7174
"vite": "^3.0.9"
7275
}
7376
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/node_modules/@pluralsight/ps-design-system-appframe/dist/esm/react/index.d.ts b/node_modules/@pluralsight/ps-design-system-appframe/dist/esm/react/index.d.ts
2+
index 25aab2a..4ed1b8c 100644
3+
--- a/node_modules/@pluralsight/ps-design-system-appframe/dist/esm/react/index.d.ts
4+
+++ b/node_modules/@pluralsight/ps-design-system-appframe/dist/esm/react/index.d.ts
5+
@@ -25,6 +25,7 @@ interface AppFrameStatics {
6+
interface AppFrameComponent extends RefForwardingComponent<AppFrameProps, HTMLDivElement, AppFrameStatics> {
7+
}
8+
declare const AppFrame: AppFrameComponent;
9+
+//@ts-ignore
10+
interface SideNavProps extends React.HTMLAttributes<HTMLDivElement> {
11+
children: AppFrameProps['sidenav'];
12+
}
13+
@@ -32,6 +33,7 @@ interface SideNavStatics {
14+
variants: typeof vars.sidenavVariants;
15+
}
16+
declare const SideNav: React.FC<SideNavProps> & SideNavStatics;
17+
+//@ts-ignore
18+
interface TopNavProps extends React.HTMLAttributes<HTMLDivElement> {
19+
children: AppFrameProps['topnav'];
20+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/node_modules/@pluralsight/ps-design-system-dropdown/dist/esm/js/index.d.ts b/node_modules/@pluralsight/ps-design-system-dropdown/dist/esm/js/index.d.ts
2+
index 1741a52..f240f44 100644
3+
--- a/node_modules/@pluralsight/ps-design-system-dropdown/dist/esm/js/index.d.ts
4+
+++ b/node_modules/@pluralsight/ps-design-system-dropdown/dist/esm/js/index.d.ts
5+
@@ -286,6 +286,7 @@ export declare const useDropdown: (props: UseDropdownProps, forwardedRef: React.
6+
onAnimationIterationCapture?: ((event: React.AnimationEvent<HTMLButtonElement>) => void) | undefined;
7+
onTransitionEnd?: ((event: React.TransitionEvent<HTMLButtonElement>) => void) | undefined;
8+
onTransitionEndCapture?: ((event: React.TransitionEvent<HTMLButtonElement>) => void) | undefined;
9+
+ //@ts-ignore
10+
css?: import("@emotion/core").InterpolationWithTheme<any>;
11+
appearance: "default" | "subtle" | undefined;
12+
disabled: boolean | undefined;
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff --git a/node_modules/@pluralsight/ps-design-system-theme/dist/esm/react/index.d.ts b/node_modules/@pluralsight/ps-design-system-theme/dist/esm/react/index.d.ts
2+
index 18df805..6d0eae7 100644
3+
--- a/node_modules/@pluralsight/ps-design-system-theme/dist/esm/react/index.d.ts
4+
+++ b/node_modules/@pluralsight/ps-design-system-theme/dist/esm/react/index.d.ts
5+
@@ -7,6 +7,7 @@ declare type Names = typeof names;
6+
export declare const ThemeContext: React.Context<"dark" | "light">;
7+
declare type ThemeProps = {
8+
name?: ValueOf<Names>;
9+
+ children?: React.ReactNode;
10+
};
11+
declare type ThemeStatics = {
12+
defaultName: typeof defaultName;
13+
diff --git a/node_modules/@pluralsight/ps-design-system-theme/src/react/index.tsx b/node_modules/@pluralsight/ps-design-system-theme/src/react/index.tsx
14+
index a2fbd65..10a84ac 100644
15+
--- a/node_modules/@pluralsight/ps-design-system-theme/src/react/index.tsx
16+
+++ b/node_modules/@pluralsight/ps-design-system-theme/src/react/index.tsx
17+
@@ -8,7 +8,7 @@ export { defaultName, names }
18+
type Names = typeof names
19+
export const ThemeContext = React.createContext<ValueOf<Names>>(defaultName)
20+
21+
-type ThemeProps = { name?: ValueOf<Names> }
22+
+type ThemeProps = { name?: ValueOf<Names>; children?: React.ReactNode }
23+
type ThemeStatics = { defaultName: typeof defaultName; names: Names }
24+
type ThemeComponent = React.FC<ThemeProps> & ThemeStatics
25+

src/WebhookDisplay/Paginator.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface PaginatorProps {
1515
table: TableInstance<Webhook>;
1616
}
1717

18-
export const FlexContainer: React.FC = (props) => (
18+
export const FlexContainer = (props: React.PropsWithChildren) => (
1919
<div
2020
style={{ display: "flex", alignItems: "center", justifyContent: "center" }}
2121
{...props}

src/WebhookDisplay/WebhookTable.component.tsx

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,6 @@ import React from "react";
44
import { Webhook } from "./WebhookList.component";
55
import { HeaderGroup, TableInstance } from "react-table";
66

7-
const largePayloadCellStyle: React.CSSProperties = {
8-
width: 500,
9-
maxWidth: 500,
10-
overflow: "hidden",
11-
textOverflow: "ellipsis",
12-
whiteSpace: "nowrap",
13-
};
14-
15-
const FlexContainer: React.FC = (props) => (
16-
<div style={{ display: "flex", alignItems: "center" }} {...props} />
17-
);
18-
19-
const HorzSpacer: React.FC = (props) => (
20-
<div
21-
style={{
22-
display: "inline-block",
23-
width: layout.spacingSmall,
24-
}}
25-
{...props}
26-
/>
27-
);
28-
297
export const WebhookTable: React.FC<{
308
webhooks: Webhook[];
319
setSelectedWebhook: (webhook: Webhook) => void;

0 commit comments

Comments
 (0)