Skip to content

Commit

Permalink
chore: dependency upgrades (#287)
Browse files Browse the repository at this point in the history
* chore: dependency upgrades

* chore: update transitive dependencies

* formatting
  • Loading branch information
geisterfurz007 authored Feb 23, 2024
1 parent 47819c9 commit 7cd0499
Show file tree
Hide file tree
Showing 49 changed files with 3,137 additions and 2,944 deletions.
30 changes: 15 additions & 15 deletions packages/cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@
"prettier:fix": "prettier . --write"
},
"dependencies": {
"@atmina/formbuilder": "^0.0.6",
"@payloadcms/bundler-vite": "^0.1.5",
"@payloadcms/db-postgres": "^0.2.2",
"@payloadcms/richtext-slate": "^1.3.1",
"clsx": "^2.0.0",
"dotenv": "^16.3.1",
"@atmina/formbuilder": "^2.0.0",
"@payloadcms/bundler-vite": "^0.1.6",
"@payloadcms/db-postgres": "^0.6.0",
"@payloadcms/richtext-slate": "^1.4.0",
"clsx": "^2.1.0",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"node-cron": "^3.0.3",
"payload": "^2.5.0",
"payload": "^2.11.1",
"react": "^18.2.0",
"react-hook-form": "^7.49.2",
"react-hook-form": "^7.50.1",
"typesense": "^1.8.0-2"
},
"devDependencies": {
"@atmina/linting": "^2.0.1",
"@types/eslint": "^8.56.0",
"@atmina/linting": "^2.1.2",
"@types/eslint": "^8.56.3",
"@types/express": "^4.17.21",
"@types/node-cron": "^3.0.11",
"@types/passport": "^1.0.16",
"@types/pg": "^8.10.9",
"autoprefixer": "^10.4.16",
"@types/pg": "^8.11.0",
"autoprefixer": "^10.4.17",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
"prettier": "^3.1.1",
"tailwindcss": "^3.4.0",
"ts-node": "10.9.1",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.1",
"ts-node": "10.9.2",
"ts-node-dev": "^2.0.0",
"typescript": "^5.3.3"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import React, {type FC} from 'react';

export const AuthenticatedMishap: FC = () => {
return (
<p>
Well, this should have been moving forward now actually. This is odd, you
shouldn&apos;t see this...
<br />
If you are actually seeing this, you probably know whom to contact.
Contact them with as much information on how to reproduce this as you can!
</p>
);
};
export const AuthenticatedMishap: FC = () => (
<p>
Well, this should have been moving forward now actually. This is odd, you
shouldn&apos;t see this...
<br />
If you are actually seeing this, you probably know whom to contact. Contact
them with as much information on how to reproduce this as you can!
</p>
);
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import React, {type FC} from 'react';

export const MissingCookie: FC = () => {
return (
<p>
You are not logged in on YTF. Click{' '}
<a
href={`${process.env.PAYLOAD_PUBLIC_WEB_FRONTEND_URL}/auth/payload-redirect`}
>
here
</a>{' '}
to log in through Discord.
</p>
);
};
export const MissingCookie: FC = () => (
<p>
You are not logged in on YTF. Click{' '}
<a
href={`${process.env.PAYLOAD_PUBLIC_WEB_FRONTEND_URL}/auth/payload-redirect`}
>
here
</a>{' '}
to log in through Discord.
</p>
);
28 changes: 13 additions & 15 deletions packages/cms/src/components/forms/fields/textarea-field.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,16 @@ export const TextareaField: FC<TextareaFieldProps> = ({
className,
inputClassName,
...formProps
}) => {
return (
<div className={clsx('textarea field-type w-full', className)}>
<label className='textarea-outer'>
<div className='textarea-inner'>
<textarea
className={clsx('textarea-element', inputClassName)}
{...on()}
{...formProps}
/>
</div>
</label>
</div>
);
};
}) => (
<div className={clsx('textarea field-type w-full', className)}>
<label className='textarea-outer'>
<div className='textarea-inner'>
<textarea
className={clsx('textarea-element', inputClassName)}
{...on()}
{...formProps}
/>
</div>
</label>
</div>
);
6 changes: 3 additions & 3 deletions packages/cms/src/lib/get-auth-state-from-request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ type AuthState = {userId: string | null; isLoggedIn: boolean};

const backend = process.env.BACKEND_URL ?? 'http://localhost:5000';

const expressToFetchHeaders = (incoming: IncomingHttpHeaders): HeadersInit => {
return {Cookie: incoming.cookie};
};
const expressToFetchHeaders = (incoming: IncomingHttpHeaders): HeadersInit => ({
Cookie: incoming.cookie,
});

export const getAuthStateFromRequest = async (
req: Request,
Expand Down
10 changes: 5 additions & 5 deletions packages/cms/src/utils/merge-queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ export type QueryFactory<TResult, TResolvedArgs> = (
* }
* })
*/
export const mergeQueries = <TResult, TResolvedArgs>(
queryFactories: Record<string, QueryFactory<TResult, TResolvedArgs>>,
) => {
return (graphql: typeof GraphQL, payload: Payload) => {
export const mergeQueries =
<TResult, TResolvedArgs>(
queryFactories: Record<string, QueryFactory<TResult, TResolvedArgs>>,
) =>
(graphql: typeof GraphQL, payload: Payload) => {
const queries: {
[key: string]: ReturnType<QueryFactory<TResult, TResolvedArgs>>;
} = {};
Expand All @@ -51,4 +52,3 @@ export const mergeQueries = <TResult, TResolvedArgs>(

return queries;
};
};
12 changes: 6 additions & 6 deletions packages/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@yestheory.family/e2e",
"devDependencies": {
"@atmina/linting": "^2.0.1",
"@playwright/test": "^1.41.0",
"@types/eslint": "^8.56.0",
"@types/node": "^20.10.5",
"dotenv": "^16.3.1",
"@atmina/linting": "^2.1.2",
"@playwright/test": "^1.41.2",
"@types/eslint": "^8.56.3",
"@types/node": "^20.11.20",
"dotenv": "^16.4.5",
"eslint": "^8.56.0",
"prettier": "^3.1.1"
"prettier": "^3.2.5"
},
"scripts": {
"lint": "yarn run eslint:fix && yarn run prettier:fix",
Expand Down
10 changes: 5 additions & 5 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
},
"dependencies": {
"@posva/prompts": "^2.4.4",
"dotenv": "^16.3.1",
"dotenv": "^16.4.5",
"html-entities": "^2.4.0",
"node-html-parser": "^6.1.12"
},
"devDependencies": {
"@atmina/linting": "^2.0.1",
"@atmina/linting": "^2.1.2",
"@types/cli-progress": "^3.11.5",
"@types/eslint": "^8.56.1",
"@types/eslint": "^8.56.3",
"eslint": "^8.56.0",
"prettier": "^3.1.1",
"tsx": "^4.7.0",
"prettier": "^3.2.5",
"tsx": "^4.7.1",
"typescript": "^5.3.3"
},
"prettier": "@atmina/linting/prettier"
Expand Down
40 changes: 20 additions & 20 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
},
"dependencies": {
"@answeroverflow/discordjs-mock": "^0.0.13",
"@apollo/server": "^4.9.5",
"@apollo/server": "^4.10.0",
"@as-integrations/koa": "^1.1.1",
"@discordjs/rest": "2.2.0",
"@graphql-tools/delegate": "^10.0.3",
"@graphql-tools/executor-http": "^1.0.5",
"@graphql-tools/stitch": "^9.0.3",
"@graphql-tools/wrap": "^10.0.1",
"@graphql-tools/delegate": "^10.0.4",
"@graphql-tools/executor-http": "^1.0.9",
"@graphql-tools/stitch": "^9.0.5",
"@graphql-tools/wrap": "^10.0.2",
"@koa/cors": "^5.0.0",
"@koa/router": "12.0.1",
"@prisma/client": "5.7.1",
"@prisma/client": "5.10.2",
"discord.js": "14.14.1",
"dotenv": "16.3.1",
"dotenv": "16.4.5",
"glob": "10.3.10",
"grant": "5.4.22",
"graphql": "^16.8.1",
"graphql-fields": "2.0.3",
"graphql-scalars": "1.22.4",
"graphql-scalars": "1.22.5",
"graphql-type-json": "0.3.2",
"koa": "2.14.2",
"koa": "2.15.0",
"koa-bodyparser": "4.4.1",
"koa-mount": "4.0.0",
"koa-session": "6.4.0",
Expand All @@ -45,25 +45,25 @@
"winston": "3.11.0"
},
"devDependencies": {
"@atmina/linting": "^2.0.1",
"@atmina/linting": "^2.1.2",
"@nestjs/class-validator": "0.13.4",
"@types/eslint": "^8.56.0",
"@types/eslint": "^8.56.3",
"@types/graphql-fields": "1.3.9",
"@types/koa": "2.13.12",
"@types/koa": "2.15.0",
"@types/koa-bodyparser": "4.3.12",
"@types/koa-mount": "4.0.5",
"@types/koa-session": "6.4.5",
"@types/koa__cors": "4.0.3",
"@types/koa__cors": "5.0.0",
"@types/koa__router": "12.0.4",
"@types/node": "^20.10.5",
"@types/node": "^20.11.20",
"@types/node-cron": "3.0.11",
"@types/node-fetch": "2.6.9",
"@typescript-eslint/eslint-plugin": "^6.15.0",
"@typescript-eslint/parser": "^6.15.0",
"@types/node-fetch": "2.6.11",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"eslint": "^8.56.0",
"prettier": "^3.1.1",
"prisma": "5.7.1",
"ts-node": "10.9.1",
"prettier": "^3.2.5",
"prisma": "5.10.2",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"typegraphql-prisma": "0.27.1",
"typescript": "^5.3.3"
Expand Down
5 changes: 2 additions & 3 deletions packages/server/src/services/logging/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ const rootLogger = createLogger(loggerOpts);
export const createServerLogger = (
kind: string,
program: string,
): winston.Logger => {
return rootLogger.child({
): winston.Logger =>
rootLogger.child({
kind,
program,
});
};
48 changes: 24 additions & 24 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,55 +19,55 @@
"prettier:fix": "prettier . --write"
},
"devDependencies": {
"@atmina/linting": "^2.0.1",
"@atmina/linting": "^2.1.2",
"@atmina/only-enum-types": "0.7.0",
"@fontsource/roboto": "^5.0.8",
"@graphql-codegen/cli": "5.0.0",
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/near-operation-file-preset": "3.0.0",
"@graphql-codegen/typescript-graphql-request": "^6.1.0",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@graphql-codegen/typescript-graphql-request": "^6.2.0",
"@graphql-codegen/typescript-operations": "^4.2.0",
"@next/bundle-analyzer": "^14.1.0",
"@next/eslint-plugin-next": "14.0.4",
"@storybook/addon-essentials": "7.6.6",
"@storybook/addon-interactions": "7.6.6",
"@storybook/addon-links": "7.6.6",
"@storybook/nextjs": "7.6.6",
"@storybook/react": "7.6.6",
"@next/eslint-plugin-next": "14.1.0",
"@storybook/addon-essentials": "7.6.17",
"@storybook/addon-interactions": "7.6.17",
"@storybook/addon-links": "7.6.17",
"@storybook/nextjs": "7.6.17",
"@storybook/react": "7.6.17",
"@storybook/testing-library": "0.2.2",
"@types/cookie": "0.6.0",
"@types/eslint": "^8.56.0",
"@types/eslint": "^8.56.3",
"@types/prettier": "^3.0.0",
"autoprefixer": "^10.4.16",
"chromatic": "^10.1.0",
"autoprefixer": "^10.4.17",
"chromatic": "^11.0.0",
"cross-env": "^7.0.3",
"env-cmd": "^10.1.0",
"eslint": "^8.56.0",
"eslint-config-next": "^14.0.4",
"eslint-plugin-storybook": "^0.6.15",
"postcss": "^8.4.32",
"prettier": "^3.1.1",
"storybook": "7.6.6",
"tailwindcss": "^3.4.0",
"eslint-config-next": "^14.1.0",
"eslint-plugin-storybook": "^0.8.0",
"postcss": "^8.4.35",
"prettier": "^3.2.5",
"storybook": "7.6.17",
"tailwindcss": "^3.4.1",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "5.3.3"
},
"dependencies": {
"@ebay/nice-modal-react": "^1.2.13",
"@heroicons/react": "^2.1.1",
"@icons-pack/react-simple-icons": "^9.2.0",
"@icons-pack/react-simple-icons": "^9.3.0",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"cookie": "0.6.0",
"framer-motion": "^10.16.16",
"framer-motion": "^11.0.6",
"graphql": "16.8.1",
"graphql-request": "^6.1.0",
"next": "14.0.4",
"next": "14.1.0",
"react": "18.2.0",
"react-animate-height": "^3.2.3",
"react-dom": "18.2.0",
"react-ssr-prepass": "1.5.0",
"sharp": "0.33.1",
"tailwind-merge": "^2.1.0",
"sharp": "0.33.2",
"tailwind-merge": "^2.2.1",
"typesense": "^1.8.0-2"
},
"license": "MIT",
Expand Down
Loading

0 comments on commit 7cd0499

Please sign in to comment.