Skip to content

Commit

Permalink
chore: updates (#298)
Browse files Browse the repository at this point in the history
* chore: updates

* fix: story compile issue

* chore: upgrade playwright image
  • Loading branch information
geisterfurz007 committed May 1, 2024
1 parent 252266b commit 14c20aa
Show file tree
Hide file tree
Showing 13 changed files with 2,732 additions and 2,692 deletions.
2 changes: 1 addition & 1 deletion docker-compose.e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ services:
- "typesense-data:/data"

playwright:
image: mcr.microsoft.com/playwright:v1.42.1-focal
image: mcr.microsoft.com/playwright:v1.43.1-focal
entrypoint: "/bin/bash"
command: "./wait-for-it.sh -t 30 --strict server:5000 -- ./install-and-run.sh"
working_dir: /e2e
Expand Down
30 changes: 15 additions & 15 deletions packages/cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,34 @@
},
"dependencies": {
"@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",
"@payloadcms/bundler-vite": "^0.1.7",
"@payloadcms/db-postgres": "^0.8.2",
"@payloadcms/richtext-slate": "^1.5.1",
"clsx": "^2.1.1",
"dotenv": "^16.4.5",
"express": "^4.18.2",
"express": "^4.19.2",
"node-cron": "^3.0.3",
"payload": "^2.11.1",
"react": "^18.2.0",
"react-hook-form": "^7.50.1",
"typesense": "^1.8.0-2"
"payload": "^2.14.2",
"react": "^18.3.1",
"react-hook-form": "^7.51.3",
"typesense": "^1.8.2"
},
"devDependencies": {
"@atmina/linting": "^2.1.2",
"@types/eslint": "^8.56.3",
"@atmina/linting": "^2.2.0",
"@types/eslint": "^8.56.10",
"@types/express": "^4.17.21",
"@types/node-cron": "^3.0.11",
"@types/passport": "^1.0.16",
"@types/pg": "^8.11.0",
"autoprefixer": "^10.4.17",
"@types/pg": "^8.11.5",
"autoprefixer": "^10.4.19",
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
"prettier": "^3.2.5",
"tailwindcss": "^3.4.1",
"tailwindcss": "^3.4.3",
"ts-node": "10.9.2",
"ts-node-dev": "^2.0.0",
"typescript": "^5.3.3"
"typescript": "^5.4.5"
},
"prettier": "@atmina/linting/prettier"
}
8 changes: 4 additions & 4 deletions packages/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@yestheory.family/e2e",
"devDependencies": {
"@atmina/linting": "^2.1.2",
"@playwright/test": "^1.41.2",
"@types/eslint": "^8.56.3",
"@types/node": "^20.11.20",
"@atmina/linting": "^2.2.0",
"@playwright/test": "^1.43.1",
"@types/eslint": "^8.56.10",
"@types/node": "^20.12.7",
"dotenv": "^16.4.5",
"eslint": "^8.56.0",
"prettier": "^3.2.5"
Expand Down
12 changes: 6 additions & 6 deletions packages/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
"dependencies": {
"@posva/prompts": "^2.4.4",
"dotenv": "^16.4.5",
"html-entities": "^2.4.0",
"node-html-parser": "^6.1.12"
"html-entities": "^2.5.2",
"node-html-parser": "^6.1.13"
},
"devDependencies": {
"@atmina/linting": "^2.1.2",
"@atmina/linting": "^2.2.0",
"@types/cli-progress": "^3.11.5",
"@types/eslint": "^8.56.3",
"@types/eslint": "^8.56.10",
"eslint": "^8.56.0",
"prettier": "^3.2.5",
"tsx": "^4.7.1",
"typescript": "^5.3.3"
"tsx": "^4.8.2",
"typescript": "^5.4.5"
},
"prettier": "@atmina/linting/prettier"
}
32 changes: 16 additions & 16 deletions packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,57 +16,57 @@
},
"dependencies": {
"@answeroverflow/discordjs-mock": "^0.0.13",
"@apollo/server": "^4.10.0",
"@apollo/server": "^4.10.4",
"@as-integrations/koa": "^1.1.1",
"@discordjs/rest": "2.2.0",
"@graphql-tools/delegate": "^10.0.4",
"@graphql-tools/delegate": "^10.0.7",
"@graphql-tools/executor-http": "^1.0.9",
"@graphql-tools/stitch": "^9.0.5",
"@graphql-tools/wrap": "^10.0.2",
"@graphql-tools/stitch": "^9.2.4",
"@graphql-tools/wrap": "^10.0.5",
"@koa/cors": "^5.0.0",
"@koa/router": "12.0.1",
"@prisma/client": "5.10.2",
"@prisma/client": "5.13.0",
"discord.js": "14.14.1",
"dotenv": "16.4.5",
"glob": "10.3.10",
"glob": "10.3.12",
"grant": "5.4.22",
"graphql": "^16.8.1",
"graphql-fields": "2.0.3",
"graphql-scalars": "1.22.5",
"graphql-scalars": "1.23.0",
"graphql-type-json": "0.3.2",
"koa": "2.15.0",
"koa": "2.15.3",
"koa-bodyparser": "4.4.1",
"koa-mount": "4.0.0",
"koa-session": "6.4.0",
"node-cron": "3.0.3",
"reflect-metadata": "0.2.1",
"reflect-metadata": "0.2.2",
"type-graphql": "2.0.0-beta.3",
"typedi": "0.10.0",
"winston": "3.11.0"
"winston": "3.13.0"
},
"devDependencies": {
"@atmina/linting": "^2.1.2",
"@atmina/linting": "^2.2.0",
"@nestjs/class-validator": "0.13.4",
"@types/eslint": "^8.56.3",
"@types/eslint": "^8.56.10",
"@types/graphql-fields": "1.3.9",
"@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": "5.0.0",
"@types/koa__router": "12.0.4",
"@types/node": "^20.11.20",
"@types/node": "^20.12.7",
"@types/node-cron": "3.0.11",
"@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.2.5",
"prisma": "5.10.2",
"prisma": "5.13.0",
"ts-node": "10.9.2",
"ts-node-dev": "2.0.0",
"typegraphql-prisma": "0.27.1",
"typescript": "^5.3.3"
"typegraphql-prisma": "0.27.2",
"typescript": "^5.4.5"
},
"prettier": "@atmina/linting/prettier"
}
9 changes: 5 additions & 4 deletions packages/web/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ const config: StorybookConfig = {
'@storybook/addon-essentials',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
framework: '@storybook/nextjs',
docs: {
autodocs: 'tag',
},
typescript: {
reactDocgen: 'react-docgen-typescript',
},
webpackFinal: (config) => {
config.resolve ??= {};
config.resolve.plugins ??= [];
Expand All @@ -27,4 +27,5 @@ const config: StorybookConfig = {
return config;
},
};

export default config;
13 changes: 7 additions & 6 deletions packages/web/next.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
const analyzerPlugin = require('@next/bundle-analyzer');
const {PHASE_DEVELOPMENT_SERVER} = require('next/constants');

const withBundleAnalyzer = analyzerPlugin({
enabled: process.env.ANALYZE === 'true',
});
const withBundleAnalyzer = analyzerPlugin();

/** @returns {import("next").NextConfig} */
const config = (phase) => ({
Expand Down Expand Up @@ -31,7 +29,7 @@ const config = (phase) => ({
},
],
},
rewrites: () => [
rewrites: async () => [
{
source: '/graphql',
destination: 'http://localhost:5000/graphql',
Expand All @@ -45,7 +43,7 @@ const config = (phase) => ({
destination: 'http://localhost:5000/oauth/:slug*',
},
],
headers: () => [
headers: async () => [
{
source: '/:path*',
headers: [
Expand All @@ -61,4 +59,7 @@ const config = (phase) => ({
],
});

module.exports = (...args) => withBundleAnalyzer(config(...args));
module.exports = (...args) =>
process.env.ANALYZE === 'true'
? withBundleAnalyzer(config(...args))
: config(...args);
58 changes: 29 additions & 29 deletions packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "next build",
"chromatic": "env-cmd -f .env.local chromatic",
"codegen": "graphql-codegen",
"dev": "yarn codegen && yarn next",
"dev": "yarn codegen && yarn next --turbo",
"lint": "yarn run eslint:fix && yarn run prettier:fix",
"start": "next start",
"storybook": "storybook dev -p 6006",
Expand All @@ -19,56 +19,56 @@
"prettier:fix": "prettier . --write"
},
"devDependencies": {
"@atmina/linting": "^2.1.2",
"@atmina/only-enum-types": "0.7.0",
"@fontsource/roboto": "^5.0.8",
"@atmina/linting": "^2.2.0",
"@atmina/only-enum-types": "0.8.0",
"@fontsource/roboto": "^5.0.13",
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/near-operation-file-preset": "3.0.0",
"@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.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",
"@next/bundle-analyzer": "^14.2.3",
"@next/eslint-plugin-next": "14.2.3",
"@storybook/addon-essentials": "^8.0.9",
"@storybook/addon-interactions": "^8.0.9",
"@storybook/addon-links": "^8.0.9",
"@storybook/nextjs": "^8.0.9",
"@storybook/react": "^8.0.9",
"@types/cookie": "0.6.0",
"@types/eslint": "^8.56.3",
"@types/eslint": "^8.56.10",
"@types/prettier": "^3.0.0",
"autoprefixer": "^10.4.17",
"chromatic": "^11.0.0",
"autoprefixer": "^10.4.19",
"chromatic": "^11.3.0",
"cross-env": "^7.0.3",
"env-cmd": "^10.1.0",
"eslint": "^8.56.0",
"eslint-config-next": "^14.1.0",
"eslint-config-next": "^14.2.3",
"eslint-plugin-storybook": "^0.8.0",
"postcss": "^8.4.35",
"postcss": "^8.4.38",
"prettier": "^3.2.5",
"storybook": "7.6.17",
"tailwindcss": "^3.4.1",
"storybook": "^8.0.9",
"tailwindcss": "^3.4.3",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "5.3.3"
"typescript": "5.4.5"
},
"dependencies": {
"@ebay/nice-modal-react": "^1.2.13",
"@heroicons/react": "^2.1.1",
"@icons-pack/react-simple-icons": "^9.3.0",
"@heroicons/react": "^2.1.3",
"@icons-pack/react-simple-icons": "^9.4.1",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@storybook/test": "8.0.9",
"cookie": "0.6.0",
"framer-motion": "^11.0.6",
"framer-motion": "^11.1.7",
"graphql": "16.8.1",
"graphql-request": "^6.1.0",
"next": "14.1.0",
"react": "18.2.0",
"next": "14.2.3",
"react": "18.3.1",
"react-animate-height": "^3.2.3",
"react-dom": "18.2.0",
"react-dom": "18.3.1",
"react-ssr-prepass": "1.5.0",
"sharp": "0.33.2",
"tailwind-merge": "^2.2.1",
"typesense": "^1.8.0-2"
"sharp": "0.33.3",
"tailwind-merge": "^2.3.0",
"typesense": "^1.8.2"
},
"license": "MIT",
"prettier": "@atmina/linting/prettier"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const MobileNavigation: FC<NavigationProps> = ({
transform: 'translateX(100%)',
transitionProperty: 'transform',
}}
className='fixed inset-0 z-[50] bg-brand-800'
className='fixed inset-0 z-50 bg-brand-800'
>
<div className='flex flex-col text-white'>
<MobileHeadline
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {type Meta, type StoryObj} from '@storybook/react';
import {userEvent, within} from '@storybook/testing-library';
import {userEvent, within} from '@storybook/test';
import {
ScrollToActionContainer,
type ScrollToActionContainerProps,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const ScrollToActionContainer: FC<
>
{children}
<button
className='left absolute bottom-3 left-[50%] flex -translate-x-1/2 cursor-pointer flex-col items-center text-brand-800'
className='left absolute bottom-3 left-1/2 flex -translate-x-1/2 cursor-pointer flex-col items-center text-brand-800'
onClick={scrollToContent}
>
<p className='text-xs uppercase'>{text}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const config = {
tags: ['autodocs'],
args: {
label: 'Toggle me!',
onChange: () => undefined,
},
} satisfies Meta<ToggleButtonProps>;

Expand Down

0 comments on commit 14c20aa

Please sign in to comment.