Skip to content

Commit

Permalink
Merge pull request #1517 from argos-ci/upgrade-dependencies
Browse files Browse the repository at this point in the history
chore(deps): upgrade dependencies
  • Loading branch information
gregberge authored Jan 5, 2025
2 parents d53fd47 + 7c66a2b commit fa735fa
Show file tree
Hide file tree
Showing 65 changed files with 2,414 additions and 2,562 deletions.
36 changes: 18 additions & 18 deletions apps/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,26 @@
"watch-server": "sleep 2 && concurrently \"npm:watch-server-*\""
},
"dependencies": {
"@apollo/server": "^4.11.2",
"@apollo/server": "^4.11.3",
"@argos/knex-scripts": "workspace:*",
"@argos/tsconfig": "workspace:*",
"@argos/util": "workspace:*",
"@aws-sdk/client-s3": "^3.712.0",
"@aws-sdk/s3-request-presigner": "^3.712.0",
"@gitbeaker/rest": "^41.3.0",
"@graphql-tools/schema": "^10.0.12",
"@aws-sdk/client-s3": "^3.722.0",
"@aws-sdk/s3-request-presigner": "^3.722.0",
"@gitbeaker/rest": "^42.0.2",
"@graphql-tools/schema": "^10.0.15",
"@octokit/auth-app": "^7.1.3",
"@octokit/core": "^6.1.2",
"@octokit/core": "^6.1.3",
"@octokit/openapi-types": "^22.2.0",
"@octokit/plugin-retry": "^7.1.1",
"@octokit/rest": "^21.0.2",
"@octokit/webhooks": "^13.4.1",
"@octokit/webhooks-types": "^7.6.1",
"@react-email/components": "^0.0.31",
"@react-email/render": "^1.0.3",
"@sentry/node": "^8.45.0",
"@sentry/node": "^8.47.0",
"@sindresorhus/slugify": "^2.2.1",
"@slack/bolt": "^4.1.1",
"@slack/bolt": "^4.2.0",
"ajv": "^8.17.1",
"amqplib": "^0.10.5",
"auth-header": "^1.0.0",
Expand All @@ -55,38 +55,38 @@
"cookies": "^0.9.1",
"cors": "^2.8.5",
"dataloader": "^2.2.3",
"discord.js": "^14.16.3",
"discord.js": "^14.17.2",
"dotenv": "^16.4.7",
"express": "^4.21.2",
"express-rate-limit": "^7.4.1",
"express-rate-limit": "^7.5.0",
"google-auth-library": "^9.15.0",
"graphql": "^16.9.0",
"graphql": "^16.10.0",
"graphql-scalars": "^1.24.0",
"graphql-tag": "^2.12.6",
"helmet": "^8.0.0",
"jsonwebtoken": "^9.0.2",
"knex": "^3.1.0",
"lodash-es": "^4.17.21",
"mime": "^4.0.4",
"mime": "^4.0.6",
"minimatch": "^10.0.1",
"moment": "^2.30.1",
"morgan": "^1.10.0",
"objection": "^3.1.4",
"odiff-bin": "^3.2.0",
"p-retry": "^6.2.1",
"p-timeout": "^6.1.3",
"p-timeout": "^6.1.4",
"path-to-regexp": "^8.2.0",
"pg": "^8.13.1",
"rate-limit-redis": "^4.2.0",
"react": "19.0.0",
"redis": "^4.7.0",
"resend": "^4.0.1",
"sharp": "^0.33.5",
"stripe": "^17.4.0",
"stripe": "^17.5.0",
"tmp": "^0.2.3",
"yaml": "^2.6.1",
"yaml": "^2.7.0",
"zod": "^3.24.1",
"zod-openapi": "^4.1.0"
"zod-openapi": "^4.2.2"
},
"devDependencies": {
"@argos/config-types": "workspace:*",
Expand All @@ -100,10 +100,10 @@
"@types/jsonwebtoken": "^9.0.6",
"@types/lodash-es": "^4.17.12",
"@types/morgan": "^1.9.9",
"@types/react": "19.0.1",
"@types/react": "19.0.2",
"@types/supertest": "^6.0.2",
"@types/tmp": "^0.2.6",
"concurrently": "^9.1.0",
"concurrently": "^9.1.2",
"factory-girl-ts": "^2.3.1",
"moment": "^2.30.1",
"openapi3-ts": "^4.4.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/stripe/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ const timestampToISOString = (date: number) =>
new Date(date * 1000).toISOString();

export const stripe = new Stripe(config.get("stripe.apiKey"), {
apiVersion: "2024-11-20.acacia",
apiVersion: "2024-12-18.acacia",
typescript: true,
});

Expand Down
22 changes: 11 additions & 11 deletions apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,51 +11,51 @@
},
"sideEffects": false,
"devDependencies": {
"@apollo/client": "3.11.10",
"@apollo/client": "3.12.4",
"@argos/config-types": "workspace:*",
"@argos/tsconfig": "workspace:*",
"@argos/util": "workspace:*",
"@eslint/js": "^9.17.0",
"@graphql-typed-document-node/core": "^3.2.0",
"@primer/octicons-react": "^19.14.0",
"@radix-ui/colors": "^3.0.0",
"@sentry/react": "^8.45.0",
"@sentry/react": "^8.47.0",
"@sentry/vite-plugin": "^2.22.7",
"@tanstack/react-virtual": "^3.11.1",
"@tanstack/react-virtual": "^3.11.2",
"@types/d3-selection": "^3.0.11",
"@types/d3-zoom": "^3.0.8",
"@types/js-cookie": "^3.0.6",
"@types/react": "19.0.1",
"@types/react": "19.0.2",
"@types/react-dom": "19.0.2",
"@types/react-helmet": "^6.1.11",
"@vitejs/plugin-react-swc": "^3.7.2",
"autoprefixer": "^10.4.20",
"clsx": "^2.1.1",
"d3-selection": "^3.0.0",
"d3-zoom": "^3.0.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react": "^7.37.3",
"eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-tailwindcss": "^3.17.5",
"fast-fuzzy": "^1.12.0",
"graphql": "^16.9.0",
"graphql": "^16.10.0",
"js-cookie": "^3.0.5",
"jwt-decode": "^4.0.0",
"lucide-react": "^0.468.0",
"lucide-react": "^0.469.0",
"moment": "^2.30.1",
"postcss": "^8.4.49",
"react": "19.0.0",
"react-aria": "^3.36.0",
"react-aria-components": "^1.5.0",
"react-dom": "19.0.0",
"react-helmet": "^6.1.0",
"react-hook-form": "^7.54.1",
"react-router-dom": "^7.0.2",
"react-hook-form": "^7.54.2",
"react-router-dom": "^7.1.1",
"react-stately": "^3.34.0",
"tailwindcss": "^3.4.16",
"tailwindcss": "^3.4.17",
"tailwindcss-animate": "^1.0.7",
"use-clipboard-copy": "^0.2.0",
"use-debounce": "^10.0.4",
"vite": "^6.0.3"
"vite": "^6.0.7"
},
"dependencies": {
"@number-flow/react": "^0.4.4",
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/containers/Account/ChangeName.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useApolloClient } from "@apollo/client";
import { FormProvider, SubmitHandler, useForm } from "react-hook-form";

import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";
import { Card, CardBody, CardParagraph, CardTitle } from "@/ui/Card";
import { Form } from "@/ui/Form";
import { FormCardFooter } from "@/ui/FormCardFooter";
import { FormTextInput } from "@/ui/FormTextInput";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountChangeName_Account on Account {
id
name
Expand All @@ -29,11 +29,11 @@ type Inputs = {
};

export const AccountChangeName = (props: {
account: FragmentType<typeof AccountFragment>;
account: DocumentType<typeof _AccountFragment>;
title: React.ReactNode;
description: React.ReactNode;
}) => {
const account = useFragment(AccountFragment, props.account);
const { account } = props;
const client = useApolloClient();
const form = useForm<Inputs>({
defaultValues: {
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/containers/Account/ChangeSlug.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { useApolloClient } from "@apollo/client";
import { FormProvider, SubmitHandler, useForm } from "react-hook-form";
import { useNavigate } from "react-router-dom";

import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";
import { Card, CardBody, CardParagraph, CardTitle } from "@/ui/Card";
import { Form } from "@/ui/Form";
import { FormCardFooter } from "@/ui/FormCardFooter";
import { FormTextInput } from "@/ui/FormTextInput";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountChangeSlug_Account on Account {
id
slug
Expand All @@ -29,11 +29,11 @@ type Inputs = {
};

export const AccountChangeSlug = (props: {
account: FragmentType<typeof AccountFragment>;
account: DocumentType<typeof _AccountFragment>;
title: React.ReactNode;
description: React.ReactNode;
}) => {
const account = useFragment(AccountFragment, props.account);
const { account } = props;
const client = useApolloClient();
const form = useForm<Inputs>({
defaultValues: {
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/containers/Account/GitLab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import { useApolloClient } from "@apollo/client";
import { FormProvider, SubmitHandler, useForm } from "react-hook-form";

import { config } from "@/config";
import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";
import { AccountPermission } from "@/gql/graphql";
import { Card, CardBody, CardParagraph, CardTitle } from "@/ui/Card";
import { Form } from "@/ui/Form";
import { FormCardFooter } from "@/ui/FormCardFooter";
import { FormTextInput } from "@/ui/FormTextInput";
import { Link } from "@/ui/Link";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountGitLab_Account on Account {
id
permissions
Expand All @@ -34,9 +34,9 @@ type Inputs = {
};

export const AccountGitLab = (props: {
account: FragmentType<typeof AccountFragment>;
account: DocumentType<typeof _AccountFragment>;
}) => {
const account = useFragment(AccountFragment, props.account);
const { account } = props;
const client = useApolloClient();
const form = useForm<Inputs>({
defaultValues: {
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/containers/AccountAvatar.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";

import { ImageAvatar } from "./ImageAvatar";
import { InitialAvatar } from "./InitialAvatar";

const AvatarFragment = graphql(`
const _AvatarFragment = graphql(`
fragment AccountAvatarFragment on AccountAvatar {
url(size: 64)
color
Expand All @@ -15,10 +15,10 @@ export function AccountAvatar(props: {
ref?: React.Ref<HTMLElement>;
className?: string;
size?: number;
avatar: FragmentType<typeof AvatarFragment>;
avatar: DocumentType<typeof _AvatarFragment>;
alt?: string;
}) {
const avatar = useFragment(AvatarFragment, props.avatar);
const { avatar } = props;
const size = props.size ?? 32;
if (!avatar.url) {
return (
Expand Down
9 changes: 4 additions & 5 deletions apps/frontend/src/containers/AccountItem.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import clsx from "clsx";

import { AccountPlanChip } from "@/containers/AccountPlanChip";
import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";

import { AccountAvatar } from "./AccountAvatar";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountItem_Account on Account {
id
slug
Expand All @@ -18,16 +18,15 @@ const AccountFragment = graphql(`
`);

export type AccountItemProps = {
account: FragmentType<typeof AccountFragment>;
account: DocumentType<typeof _AccountFragment>;
showPlan?: boolean;
} & Omit<React.ComponentPropsWithRef<"div">, "children">;

export function AccountItem({
account: accountProp,
account,
showPlan = false,
...props
}: AccountItemProps) {
const account = useFragment(AccountFragment, accountProp);
return (
<div
{...props}
Expand Down
8 changes: 4 additions & 4 deletions apps/frontend/src/containers/AccountPlanChip.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";
import { AccountSubscriptionStatus } from "@/gql/graphql";
import { Chip, ChipColor } from "@/ui/Chip";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountPlanChip_Account on Account {
subscriptionStatus
plan {
Expand All @@ -13,10 +13,10 @@ const AccountFragment = graphql(`
`);

export const AccountPlanChip = (props: {
account: FragmentType<typeof AccountFragment>;
account: DocumentType<typeof _AccountFragment>;
className?: string;
}) => {
const account = useFragment(AccountFragment, props.account);
const { account } = props;
const chipProps: { color: ChipColor; children: string } | null = (() => {
switch (account.subscriptionStatus) {
case AccountSubscriptionStatus.Active:
Expand Down
1 change: 1 addition & 0 deletions apps/frontend/src/containers/Apollo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ const ApolloProvider = (props: {
const retryLink = new RetryLink();

return new ApolloClient({
dataMasking: false,
cache: new InMemoryCache({
possibleTypes: fragments.possibleTypes,
typePolicies: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { PlusCircleIcon } from "lucide-react";
import { MenuSection } from "react-aria-components";
import { matchPath, useLocation } from "react-router-dom";

import { FragmentType, graphql, useFragment } from "@/gql";
import { DocumentType, graphql } from "@/gql";
import { BreadcrumbMenuButton } from "@/ui/Breadcrumb";
import {
Menu,
Expand All @@ -18,7 +18,7 @@ import { Popover } from "@/ui/Popover";

import { AccountItem } from "../AccountItem";

const AccountFragment = graphql(`
const _AccountFragment = graphql(`
fragment AccountBreadcrumbMenu_Account on Account {
id
slug
Expand All @@ -39,7 +39,7 @@ const MeQuery = graphql(`
}
`);

type Account = FragmentType<typeof AccountFragment>;
type Account = DocumentType<typeof _AccountFragment>;

function resolveAccountPath(slug: string, pathname: string) {
if (matchPath("/:slug/settings/*", pathname)) {
Expand All @@ -50,7 +50,7 @@ function resolveAccountPath(slug: string, pathname: string) {
}

function AccountMenuItems(props: { accounts: Account[] }) {
const accounts = useFragment(AccountFragment, props.accounts);
const { accounts } = props;
const location = useLocation();
return (
<>
Expand Down
Loading

0 comments on commit fa735fa

Please sign in to comment.