Skip to content

Commit

Permalink
Fix cdk nextjs (#255)
Browse files Browse the repository at this point in the history
* fix: remove deprecated @tsconfig/esm

* feat: upgrade to cdk-nextjs-standalone@4.0.0-beta.3

* fix: update deps to fix CVEs

* fix: add required crossOrigin field to Amplify UI components
  • Loading branch information
bestickley authored Oct 2, 2023
1 parent eb04b54 commit d3f4685
Show file tree
Hide file tree
Showing 27 changed files with 3,251 additions and 2,665 deletions.
5 changes: 5 additions & 0 deletions .changeset/quiet-dots-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"gboost": minor
---

Update cdk-nextjs-standalone
5 changes: 5 additions & 0 deletions .changeset/red-cats-sort.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"gboost": patch
---

Remove deprecated @tsconfig/esm
24 changes: 12 additions & 12 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@
"dependencies": {
"gboost-ui": "workspace:^",
"lucide-react": "^0.268.0",
"next": "13.4.12",
"nextra": "^2.10.0",
"nextra-theme-docs": "^2.10.0",
"next": "13.5.3",
"nextra": "^2.13.1",
"nextra-theme-docs": "^2.13.1",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@tsconfig/next": "^2.0.0",
"@tsconfig/strictest": "^2.0.1",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"autoprefixer": "^10.4.15",
"eslint": "^8.45.0",
"eslint-define-config": "^1.21.0",
"@tsconfig/strictest": "^2.0.2",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"autoprefixer": "^10.4.16",
"eslint": "^8.50.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-mdx": "^2.2.0",
"eslint-plugin-react": "^7.33.1",
"postcss": "^8.4.27",
"eslint-plugin-react": "^7.33.2",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.3",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.2",
"@tsconfig/node18": "^18.2.0",
"@tsconfig/strictest": "^2.0.1",
"@types/license-checker": "^25.0.3",
"@types/node": "^18.16.19",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@types/license-checker": "^25.0.4",
"@types/node": "^18.18.1",
"husky": "^8.0.3",
"lint-staged": "^13.2.3",
"tsx": "^3.12.7",
"typescript": "^5.1.6"
"lint-staged": "^13.3.0",
"tsx": "^3.13.0",
"typescript": "^5.2.2"
},
"license": "Apache-2.0",
"pnpm": {
Expand Down
22 changes: 11 additions & 11 deletions packages/gboost-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.0",
"@tsconfig/strictest": "^2.0.1",
"@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-define-config": "^1.21.0",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@types/node": "^18.18.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.10.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^4.2.1",
"prettier": "^2.8.8",
"tsx": "^3.12.7",
"typescript": "^5.1.6",
"vitest": "^0.33.0"
"tsx": "^3.13.0",
"typescript": "^5.2.2",
"vitest": "^0.34.6"
},
"repository": {
"type": "git",
Expand Down
42 changes: 21 additions & 21 deletions packages/gboost-infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
},
"dependencies": {
"@aws-cdk/aws-appsync-alpha": "2.54.0-alpha.0",
"@aws-sdk/client-cloudfront": "^3.363.0",
"@aws-sdk/client-cognito-identity-provider": "^3.363.0",
"@aws-sdk/client-cloudfront": "^3.421.0",
"@aws-sdk/client-cognito-identity-provider": "^3.421.0",
"adm-zip": "^0.5.10",
"gboost-common": "workspace:^",
"mime-types": "^2.1.35"
Expand All @@ -52,27 +52,27 @@
"constructs": "^10.1.300"
},
"devDependencies": {
"@aws-lambda-powertools/logger": "^1.11.0",
"@aws-sdk/client-s3": "^3.367.0",
"@aws-sdk/s3-request-presigner": "^3.367.0",
"@tsconfig/node18": "^18.2.0",
"@tsconfig/strictest": "^2.0.1",
"@types/adm-zip": "^0.5.0",
"@types/aws-lambda": "^8.10.119",
"@types/mime-types": "^2.1.1",
"@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"esbuild": "^0.18.11",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-define-config": "^1.21.0",
"@aws-lambda-powertools/logger": "^1.14.0",
"@aws-sdk/client-s3": "^3.421.0",
"@aws-sdk/s3-request-presigner": "^3.421.0",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@types/adm-zip": "^0.5.2",
"@types/aws-lambda": "^8.10.122",
"@types/mime-types": "^2.1.2",
"@types/node": "^18.18.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"esbuild": "^0.18.20",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.10.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^4.2.1",
"joi": "^17.9.2",
"joi": "^17.10.2",
"prettier": "^2.8.8",
"tsx": "^3.12.7",
"typescript": "^5.1.6",
"vitest": "^0.33.0"
"tsx": "^3.13.0",
"typescript": "^5.2.2",
"vitest": "^0.34.6"
},
"repository": {
"type": "git",
Expand Down
20 changes: 10 additions & 10 deletions packages/gboost-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
"gboost-common": "workspace:^"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.0",
"@tsconfig/strictest": "^2.0.1",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-define-config": "^1.21.0",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.50.0",
"eslint-config-prettier": "^8.10.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^4.2.1",
"prettier": "^2.8.8",
"tsx": "^3.12.7",
"typescript": "^5.1.6",
"vitest": "^0.33.0"
"tsx": "^3.13.0",
"typescript": "^5.2.2",
"vitest": "^0.34.6"
},
"repository": {
"type": "git",
Expand Down
52 changes: 26 additions & 26 deletions packages/gboost-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
"dependencies": {
"@mantine/hooks": "^5.10.4",
"@radix-ui/colors": "^0.1.9",
"@radix-ui/react-dialog": "^1.0.4",
"@radix-ui/react-hover-card": "^1.0.6",
"@radix-ui/react-portal": "^1.0.3",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-hover-card": "^1.0.7",
"@radix-ui/react-portal": "^1.0.4",
"@stitches/react": "^1.2.8",
"clsx": "^1.2.1",
"gboost-common": "workspace:^",
"react-icons": "^4.10.1",
"react-icons": "^4.11.0",
"react-transition-group": "^4.4.5"
},
"peerDependencies": {
Expand Down Expand Up @@ -90,35 +90,35 @@
}
},
"devDependencies": {
"@aws-sdk/client-s3": "^3.367.0",
"@hookform/resolvers": "^3.1.1",
"@tanstack/react-query": "^4.29.19",
"@trpc/server": "^10.34.0",
"@aws-sdk/client-s3": "^3.421.0",
"@hookform/resolvers": "^3.3.1",
"@tanstack/react-query": "^4.35.7",
"@trpc/server": "^10.38.5",
"@tsconfig/next": "^2.0.0",
"@tsconfig/strictest": "^2.0.1",
"@types/react": "^18.2.14",
"@types/react-dom": "^18.2.6",
"@types/react-transition-group": "^4.4.6",
"@typescript-eslint/eslint-plugin": "^5.61.0",
"@typescript-eslint/parser": "^5.61.0",
"aws-amplify": "^5.3.3",
"eslint": "^8.44.0",
"@tsconfig/strictest": "^2.0.2",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"@types/react-transition-group": "^4.4.7",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"aws-amplify": "^5.3.11",
"eslint": "^8.50.0",
"eslint-config-next": "13.4.12",
"eslint-config-prettier": "^8.8.0",
"eslint-config-prettier": "^8.10.0",
"eslint-config-react-app": "^7.0.1",
"eslint-define-config": "^1.21.0",
"eslint-define-config": "^1.23.0",
"eslint-plugin-prettier": "^4.2.1",
"graphql": "^16.7.1",
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6",
"next": "13.4.12",
"next": "13.5.3",
"prettier": "^2.8.8",
"react-hook-form": "^7.45.1",
"react-router-dom": "^6.14.1",
"react-hook-form": "^7.47.0",
"react-router-dom": "^6.16.0",
"rimraf": "^4.4.1",
"tsx": "^3.12.7",
"typescript": "^5.1.6",
"vitest": "^0.33.0",
"zod": "^3.21.4"
"tsx": "^3.13.0",
"typescript": "^5.2.2",
"vitest": "^0.34.6",
"zod": "^3.22.2"
},
"repository": {
"type": "git",
Expand Down
1 change: 1 addition & 0 deletions packages/gboost-ui/src/FileUpload/FileName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export function FileName(props: FileNameProps): ReactElement {
const { notify } = useNotifications();
return (
<StyledTextField
crossOrigin
isDisabled={isDisabled}
ref={props.inputRef}
labelHidden={true}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export function FilterValue({
} else {
element = (
<TextField
crossOrigin
disabled={!comparator}
label="Value"
labelHidden
Expand All @@ -72,6 +73,7 @@ export function FilterValue({
} else {
element = (
<TextField
crossOrigin
disabled
label="Value"
labelHidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export function FilterValue({
} else {
element = (
<TextField
crossOrigin
disabled={!comparator}
label="Value"
labelHidden
Expand All @@ -68,7 +69,9 @@ export function FilterValue({
);
}
} else {
element = <TextField disabled label="Value" labelHidden value="" />;
element = (
<TextField crossOrigin disabled label="Value" labelHidden value="" />
);
}
return element;
}
1 change: 1 addition & 0 deletions packages/gboost-ui/src/SmartFields/SmartCheckboxField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export function SmartCheckboxField<T extends FieldValues>(
loadingHeight={32}
>
<CheckboxField
crossOrigin
{...normalizeProps(checkboxFieldProps)}
id={id}
ref={ref}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export function SmartPhoneNumberField<T extends FieldValues>(
className="amplify-textfield"
>
<PhoneNumberField
crossOrigin
{...normalizeProps(phoneNumberFieldProps)}
id={id}
ref={ref}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function SmartRadioGroupField<T extends FieldValues>(
value={value}
>
{options.map((o) => (
<Radio key={o.value} value={o.value}>
<Radio crossOrigin key={o.value} value={o.value}>
{o.label}
</Radio>
))}
Expand Down
1 change: 1 addition & 0 deletions packages/gboost-ui/src/SmartFields/SmartTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export function SmartTextField<T extends FieldValues>(
className="amplify-textfield"
>
<TextField
crossOrigin
{...normalizeProps(textFieldProps)}
id={id}
ref={ref}
Expand Down
2 changes: 1 addition & 1 deletion packages/gboost-ui/src/components/Fields/DateTimeField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function _DateTimeField(
const { type = "datetime-local" } = props;
// as any b/c TextField thinks it has to support HTMLTextField but we don't need that
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return <TextField ref={ref as any} {...props} type={type} />;
return <TextField crossOrigin ref={ref as any} {...props} type={type} />;
}

// https://fettblog.eu/typescript-react-generic-forward-refs/#option-1%3A-type-assertion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export function IFileUploadField(
onClick={(e) => (e.currentTarget.value = "")}
/>
<TextField
crossOrigin
{...textFieldProps}
id={id}
isReadOnly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ export function MultiCheckboxField(
{options.map((o) => (
<CheckboxContainer key={o.value}>
<CheckboxField
crossOrigin
{...checkboxFields}
label={o.label}
name={o.value}
Expand Down
Loading

0 comments on commit d3f4685

Please sign in to comment.