Skip to content

Commit

Permalink
Fix update deps (#260)
Browse files Browse the repository at this point in the history
* chore: updated deps

* style: update gboost package with prettier 3

* style: update gboost-common package with prettier 3

* style: update gboost-infra package with prettier 3

* style: update gboost-node package with prettier 3

* style: update gboost-ui package with prettier 3

* chore: update deps again

* chore: update deps in templates

* chore: update formatting in minimal template based on prettier 3

* fix: pnpm-workspace.yaml format

* fix: prettier formatting

* fix: drizzle type issue

* fix: code formatting of code commit repo definition

* fix: nag suppression static asset bucket deployment not being defined on cdk destroy

* chore: update template package.json minor versions

* chore: remove deprecated server actions config

* chore: update deps

* feat: update to Node.js 20

* chore: update template package.json to latest

* chore: update deps major

* fix: override babel/traverse version for vulnerability

* chore: update cdk-nextjs-standalone
  • Loading branch information
bestickley committed Nov 17, 2023
1 parent 78e0757 commit 4680cc1
Show file tree
Hide file tree
Showing 207 changed files with 3,250 additions and 3,207 deletions.
5 changes: 5 additions & 0 deletions .changeset/honest-flowers-exist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"gboost-infra": minor
---

Update Function construct to Node.js 20
9 changes: 9 additions & 0 deletions .changeset/quiet-planets-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"gboost-common": minor
"gboost-infra": minor
"gboost-node": minor
"gboost-ui": minor
"gboost": minor
---

Update Dependencies
20 changes: 10 additions & 10 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
},
"dependencies": {
"gboost-ui": "workspace:^",
"lucide-react": "^0.268.0",
"next": "13.5.3",
"nextra": "^2.13.1",
"nextra-theme-docs": "^2.13.1",
"lucide-react": "^0.292.0",
"next": "14.0.3",
"nextra": "^2.13.2",
"nextra-theme-docs": "^2.13.2",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@tsconfig/next": "^2.0.0",
"@tsconfig/next": "^2.0.1",
"@tsconfig/strictest": "^2.0.2",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"autoprefixer": "^10.4.16",
"eslint": "^8.50.0",
"eslint-define-config": "^1.23.0",
"eslint": "^8.53.0",
"eslint-define-config": "^2.0.0",
"eslint-plugin-mdx": "^2.2.0",
"eslint-plugin-react": "^7.33.2",
"postcss": "^8.4.31",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.5",
"typescript": "^5.2.2"
}
}
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"@changesets/cli": "^2.26.2",
"@tsconfig/node18": "^18.2.2",
"@tsconfig/strictest": "^2.0.2",
"@types/license-checker": "^25.0.4",
"@types/node": "^18.18.1",
"@types/license-checker": "^25.0.6",
"@types/node": "^20.9.1",
"husky": "^8.0.3",
"lint-staged": "^13.3.0",
"tsx": "^3.13.0",
"lint-staged": "^15.1.0",
"tsx": "^4.1.3",
"typescript": "^5.2.2"
},
"license": "Apache-2.0",
Expand All @@ -33,7 +33,8 @@
"trim@<0.0.3": ">=0.0.3",
"got@<11.8.5": ">=11.8.5",
"fast-xml-parser@<4.2.4": ">=4.2.4",
"semver@<7.2.1": ">=7.2.1"
"semver@<7.2.1": ">=7.2.1",
"@babel/traverse@<7.23.2": ">=7.23.2"
},
"peerDependencyRules": {
"ignoreMissing": [
Expand Down
12 changes: 8 additions & 4 deletions packages/gboost-common/.lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { removeIgnoredFiles } from "../../utils/lintStaged.js"
import { removeIgnoredFiles } from "../../utils/lintStaged.js";

export default {
"*.ts": async (files) => {
const filesToLint = await removeIgnoredFiles(files);
return [`eslint --fix --max-warnings=0 ${filesToLint}`, `vitest related --run ${files}`, "tsc --noEmit"];
}
}
return [
`eslint --fix --max-warnings=0 ${filesToLint}`,
`vitest related --run ${files}`,
"tsc --noEmit",
];
},
};
3 changes: 2 additions & 1 deletion packages/gboost-common/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Green Boost Common Library

![ci](https://github.com/awslabs/green-boost/actions/workflows/ci.yml/badge.svg)

Build Full Stack Serverless Web Apps on AWS Fast
Expand All @@ -11,4 +12,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform

## License

This project is licensed under the Apache-2.0 License.
This project is licensed under the Apache-2.0 License.
18 changes: 9 additions & 9 deletions packages/gboost-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"devDependencies": {
"@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.13.0",
"@types/node": "^20.9.1",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-define-config": "^2.0.0",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.0",
"tsx": "^4.1.3",
"typescript": "^5.2.2",
"vitest": "^0.34.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/gboost-common/src/merge-deep.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function mergeDeep<T extends object>(
} else if (isObject(pVal) && isObject(oVal)) {
result[key] = mergeDeep(
pVal as Record<string, unknown>,
oVal as Record<string, unknown>
oVal as Record<string, unknown>,
);
} else {
result[key] = oVal;
Expand Down
2 changes: 1 addition & 1 deletion packages/gboost-common/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "dist",
"noEmit": false,
"noEmit": false
},
"exclude": ["src/**/*.test.ts", "scripts/**/*"]
}
2 changes: 1 addition & 1 deletion packages/gboost-common/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"incremental": true,
"noEmit": true
},
"include": ["src/**/*", "scripts/**/*"],
"include": ["src/**/*", "scripts/**/*"]
}
12 changes: 8 additions & 4 deletions packages/gboost-infra/.lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { removeIgnoredFiles } from "../../utils/lintStaged.js"
import { removeIgnoredFiles } from "../../utils/lintStaged.js";

export default {
"*.ts": async (files) => {
const filesToLint = await removeIgnoredFiles(files);
return [`eslint --fix --max-warnings=0 ${filesToLint}`, `vitest related --run ${files}`, "tsc --noEmit"];
}
}
return [
`eslint --fix --max-warnings=0 ${filesToLint}`,
`vitest related --run ${files}`,
"tsc --noEmit",
];
},
};
3 changes: 2 additions & 1 deletion packages/gboost-infra/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Green Boost Infrastructure Construct Library

![ci workflow](https://github.com/awslabs/green-boost/actions/workflows/ci.yml/badge.svg)

Build Full Stack Serverless Web Apps on AWS Fast
Expand All @@ -11,4 +12,4 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform

## License

This project is licensed under the Apache-2.0 License.
This project is licensed under the Apache-2.0 License.

Large diffs are not rendered by default.

40 changes: 20 additions & 20 deletions packages/gboost-infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,37 +40,37 @@
},
"dependencies": {
"@aws-cdk/aws-appsync-alpha": "2.54.0-alpha.0",
"@aws-sdk/client-cloudfront": "^3.421.0",
"@aws-sdk/client-cognito-identity-provider": "^3.421.0",
"@aws-sdk/client-cloudfront": "^3.451.0",
"@aws-sdk/client-cognito-identity-provider": "^3.451.0",
"adm-zip": "^0.5.10",
"gboost-common": "workspace:^",
"mime-types": "^2.1.35"
},
"peerDependencies": {
"aws-cdk-lib": "^2.72.1",
"aws-cdk-lib": "^2.110.0",
"cdk-nag": "^2.25.2",
"constructs": "^10.1.300"
},
"devDependencies": {
"@aws-lambda-powertools/logger": "^1.14.0",
"@aws-sdk/client-s3": "^3.421.0",
"@aws-sdk/s3-request-presigner": "^3.421.0",
"@aws-lambda-powertools/logger": "^1.16.0",
"@aws-sdk/client-s3": "^3.451.0",
"@aws-sdk/s3-request-presigner": "^3.451.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.10.2",
"prettier": "^2.8.8",
"tsx": "^3.13.0",
"@types/adm-zip": "^0.5.4",
"@types/aws-lambda": "^8.10.126",
"@types/mime-types": "^2.1.4",
"@types/node": "^20.9.1",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"esbuild": "^0.19.5",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-define-config": "^2.0.0",
"eslint-plugin-prettier": "^5.0.1",
"joi": "^17.11.0",
"prettier": "^3.1.0",
"tsx": "^4.1.3",
"typescript": "^5.2.2",
"vitest": "^0.34.6"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function suppressAwsLambdaBasicExecutionRole(construct: IConstruct) {
"The Lambda Basic Execution Role does not grant excessive access",
},
],
true
true,
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { IConstruct } from "constructs";
export function suppressCdkCustomResourceProvider(construct: IConstruct) {
if (
construct.node.path.endsWith(
"Provider/framework-onEvent/ServiceRole/DefaultPolicy/Resource"
"Provider/framework-onEvent/ServiceRole/DefaultPolicy/Resource",
)
) {
NagSuppressions.addResourceSuppressions(construct, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { IConstruct } from "constructs";
export function suppressCdkLogRetention(construct: IConstruct) {
if (
construct.node.path.match(
/.+LogRetention[a-z0-9]{32}\/ServiceRole\/DefaultPolicy\/Resource$/
/.+LogRetention[a-z0-9]{32}\/ServiceRole\/DefaultPolicy\/Resource$/,
)
) {
NagSuppressions.addResourceSuppressions(construct, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { IConstruct } from "constructs";
export function suppressCdkMonitoringConstructs(construct: IConstruct) {
if (
construct.node.path.endsWith(
"/SecretsManagerMetricsPublisher/Lambda/ServiceRole/DefaultPolicy/Resource"
"/SecretsManagerMetricsPublisher/Lambda/ServiceRole/DefaultPolicy/Resource",
)
) {
NagSuppressions.addResourceSuppressions(construct, [
Expand All @@ -17,7 +17,7 @@ export function suppressCdkMonitoringConstructs(construct: IConstruct) {
}
if (
construct.node.path.endsWith(
"/SecretsManagerMetricsPublisher/Lambda/Resource"
"/SecretsManagerMetricsPublisher/Lambda/Resource",
)
) {
NagSuppressions.addResourceSuppressions(construct, [
Expand Down
4 changes: 2 additions & 2 deletions packages/gboost-infra/src/bucket/bucket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class Bucket extends CdkBucket {
const newProps = mergeDeep(
defaultBucketProps,
constructDefaultProps.bucket,
props
props,
);
super(scope, id, newProps);
this.#id = id;
Expand Down Expand Up @@ -63,7 +63,7 @@ export class Bucket extends CdkBucket {
],
},
],
}
},
);
NagSuppressions.addResourceSuppressions(serverAccessLogsBucket, [
{
Expand Down
6 changes: 3 additions & 3 deletions packages/gboost-infra/src/db-iam-cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class DbIamCluster extends CdkDatabaseCluster {
DBClusterIdentifier: this.clusterIdentifier,
},
physicalResourceId: PhysicalResourceId.fromResponse(
"DBClusters.0.DbClusterResourceId"
"DBClusters.0.DbClusterResourceId",
),
},
policy: AwsCustomResourcePolicy.fromSdkCalls({
Expand All @@ -54,10 +54,10 @@ export class DbIamCluster extends CdkDatabaseCluster {
"Cannot scope resource with cluster identifier (instead of *) b/c it's unknown",
},
],
true
true,
);
this.resourceId = customResource.getResponseField(
"DBClusters.0.DbClusterResourceId"
"DBClusters.0.DbClusterResourceId",
);
}

Expand Down
10 changes: 5 additions & 5 deletions packages/gboost-infra/src/file-upload/createSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export function createSchema(api: GraphqlApi, dataSource: BaseDataSource) {
requestMappingTemplate: MappingTemplate.lambdaRequest(),
responseMappingTemplate: MappingTemplate.lambdaResult(),
returnType: uploadURLType.attribute(),
})
}),
);

api.addQuery(
Expand All @@ -120,7 +120,7 @@ export function createSchema(api: GraphqlApi, dataSource: BaseDataSource) {
requestMappingTemplate: MappingTemplate.lambdaRequest(),
responseMappingTemplate: MappingTemplate.lambdaResult(),
returnType: uploadIdType.attribute(),
})
}),
);

api.addQuery(
Expand All @@ -131,7 +131,7 @@ export function createSchema(api: GraphqlApi, dataSource: BaseDataSource) {
requestMappingTemplate: MappingTemplate.lambdaRequest(),
responseMappingTemplate: MappingTemplate.lambdaResult(),
returnType: uploadURLPartType.attribute(),
})
}),
);

api.addQuery(
Expand All @@ -142,7 +142,7 @@ export function createSchema(api: GraphqlApi, dataSource: BaseDataSource) {
requestMappingTemplate: MappingTemplate.lambdaRequest(),
responseMappingTemplate: MappingTemplate.lambdaResult(),
returnType: completeUploadType.attribute(),
})
}),
);

api.addQuery(
Expand All @@ -153,6 +153,6 @@ export function createSchema(api: GraphqlApi, dataSource: BaseDataSource) {
requestMappingTemplate: MappingTemplate.lambdaRequest(),
responseMappingTemplate: MappingTemplate.lambdaResult(),
returnType: abortUploadType.attribute(),
})
}),
);
}
Loading

0 comments on commit 4680cc1

Please sign in to comment.