Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

✨ Self-Hosting Update (#842)

Luke Vella7a5f9ae474b7
diff --git a/.github/workflows/docker-image-manual.yml b/.github/workflows/docker-image-manual.yml
index ff655cb15..870fe1b1d 100644
--- a/.github/workflows/docker-image-manual.yml
+++ b/.github/workflows/docker-image-manual.yml
@@ -37,3 +37,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
APP_VERSION=${{ github.ref_name }}
+ SELF_HOSTED=true
diff --git a/.github/workflows/docker-image-version-release.yml b/.github/workflows/docker-image-version-release.yml
index cf6252f82..38b0a2818 100644
--- a/.github/workflows/docker-image-version-release.yml
+++ b/.github/workflows/docker-image-version-release.yml
@@ -39,3 +39,4 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
build-args: |
APP_VERSION=${{ github.ref_name }}
+ SELF_HOSTED=true
diff --git a/apps/docs/contribute/donations.mdx b/apps/docs/contribute/donations.mdx
index a14065844..62e9cf21f 100644
--- a/apps/docs/contribute/donations.mdx
+++ b/apps/docs/contribute/donations.mdx
@@ -6,18 +6,15 @@ description: Help fund this project and keep it ad-free
## Why should I donate?
-> Rallly is available free and without ads.
-> But free software doesn't mean it's without cost.
-> Someone has to develop, maintain, and support it.
-> With the help of generous people like you, we can keep Rallly ad-free for everyone and continue to make it even better.
->
-> -- [Luke Vella](https://twitter.com/imlukevella), Creator of Rallly
+Most users of Rallly use it for free, and that's great!
+However, running Rallly costs money.
+By donating, you can help keep Rallly running and ad-free.
## How can I donate?
You can donate using any of the following methods:
-<CardGroup cols={2}>
+<CardGroup cols={3}>
<Card
title="Donate with PayPal"
icon="paypal"
diff --git a/apps/docs/mint.json b/apps/docs/mint.json
index 77157ae42..60d63d944 100644
--- a/apps/docs/mint.json
+++ b/apps/docs/mint.json
@@ -12,13 +12,13 @@
"anchors": { "from": "#878AFA", "to": "#4347F1" }
},
"topbarCtaButton": {
- "name": "Get Started",
- "url": "https://rallly.co/new"
+ "name": "Go to App",
+ "url": "https://app.rallly.co"
},
"topbarLinks": [
{
- "name": "Contact",
- "url": "/contact/support"
+ "name": "Home",
+ "url": "https://rallly.co"
}
],
"anchors": [
@@ -63,6 +63,7 @@
"group": "Self-Hosting",
"pages": [
"self-hosting/introduction",
+ "self-hosting/pricing",
"self-hosting/managed-hosting",
"self-hosting/configuration-options"
]
diff --git a/apps/docs/self-hosting/configuration-options.mdx b/apps/docs/self-hosting/configuration-options.mdx
index 62809d96d..d9cb524ab 100644
--- a/apps/docs/self-hosting/configuration-options.mdx
+++ b/apps/docs/self-hosting/configuration-options.mdx
@@ -1,4 +1,5 @@
---
+icon: gear
title: Configuration Options
description: Using environment variable to configure a self-hosted instance of Rallly.
---
@@ -12,33 +13,39 @@ This page lists all environment variables supported by Rallly.
These variables need to be configured for Rallly to run and function properly.
-<ParamField path="DATABASE_URL" default="">
+<ParamField path="DATABASE_URL" required>
Postgres database connection string
</ParamField>
-<ParamField path="NEXT_PUBLIC_BASE_URL" default="http://localhost:3000">
+<ParamField path="NEXT_PUBLIC_BASE_URL" required>
The base url where this instance is accessible, including the scheme (eg.
`http://` or `https://`), the domain name, and optionally a port.
</ParamField>
-<ParamField path="SECRET_PASSWORD">
+<ParamField path="SECRET_PASSWORD" required>
A random 32-character secret key used to encrypt user sessions
</ParamField>
+<ParamField path="ALLOWED_EMAILS">
+ Comma separated list of email addresses that are allowed to register and
+ login. Wildcard characters are supported. Example: Setting it to
+ `*@example.com` to allow anyone with a `@example.com` email address.
+</ParamField>
+
### Email Configuration
These variables need to be configured to let Rallly send out transactional emails.
-<ParamField path="NOREPLY_EMAIL" default="">
+<ParamField path="NOREPLY_EMAIL">
This email is used as the sender for all transactional emails. If not set,
`SUPPORT_EMAIL` will be used instead.
</ParamField>
-<ParamField path="SUPPORT_EMAIL" default="">
+<ParamField path="SUPPORT_EMAIL" required>
This email will be shown as the contact email for support queries.
</ParamField>
-<ParamField path="SMTP_HOST" default="localhost">
+<ParamField path="SMTP_HOST" required>
The host address of your SMTP server
</ParamField>
@@ -46,7 +53,7 @@ These variables need to be configured to let Rallly send out transactional email
The port of your SMTP server
</ParamField>
-<ParamField path="SMTP_SECURE" default={"false"}>
+<ParamField path="SMTP_SECURE" default="false">
Set to "true" if SSL is enabled for your SMTP connection
</ParamField>
@@ -61,21 +68,3 @@ These variables need to be configured to let Rallly send out transactional email
<ParamField path="SMTP_TLS_ENABLED" default={"false"}>
Enable TLS for your SMTP connection
</ParamField>
-
-### Custom Configuration
-
-These variables allow you to change Rallly's default behavior.
-
-<ParamField path="ALLOWED_EMAILS" default="">
- Comma separated list of email addresses that are allowed to register and
- login. Wildcard characters are supported. Example: `*@yourcompany.com`
-</ParamField>
-
-<ParamField path="AUTH_REQUIRED" default={"false"}>
- Set to `true` to require authentication for creating new polls and accessing
- admin pages
-</ParamField>
-
-<ParamField path="DISABLE_LANDING_PAGE" default={"false"}>
- Whether or not to disable the landing page
-</ParamField>
diff --git a/apps/docs/self-hosting/introduction.mdx b/apps/docs/self-hosting/introduction.mdx
index 2a1863ee5..4a6a7fb1e 100644
--- a/apps/docs/self-hosting/introduction.mdx
+++ b/apps/docs/self-hosting/introduction.mdx
@@ -1,13 +1,29 @@
---
+icon: server
title: Introduction
-description: How to run your own instance of Rallly.
+description: How to Self-Host Rallly
---
-## What is Self-Hosting?
+Rallly is 100% open-source and available under the [GNU Affero General Public License v3.0 (AGPL-3.0)](https://github.com/lukevella/rallly/blob/main/LICENSE)
+which allows you to run your own instance of Rallly for free for both personal and commercial use.
-Self-hosting refers to the practice of running your own instance of Rallly on your own server.
+## Official Docker Image
-The main advantage of self-hosting is the autonomy it affords, but it also requires more technical knowledge and maintenance, as well as the potential security risks of managing your own infrastructure.
+The best way to self-host Rallly is using the [official Docker image](https://hub.docker.com/r/lukevella/rallly).
+This image contains a build that is specifically intended for self-hosting.
+It is updated regularly but it is _not_ guaranteed to be up-to-date with the latest version of Rallly.
+If you want to have access to the latest features and bug fixes, you should consider using the [official managed service](https://rallly.co).
+
+<Note>
+ Though it is technically possible to build and run Rallly from its
+ [source-code](https://github.com/lukevella/rallly), it is not recommended and
+ we do not provide support for this.
+</Note>
+
+## Pricing
+
+Rallly is **completely free** to self-host but for users who wish to contribute to the project,
+please check out the [pricing](/self-hosting/pricing) page.
## Get Started
@@ -22,7 +38,7 @@ Depending on how comfortable you are with technical things, you can either run R
Host your own instance of Rallly on your own server using Docker.
</Card>
<Card
- icon="server"
+ icon="cloud"
title="Using a hosting provider"
href="/self-hosting/managed-hosting"
>
diff --git a/apps/docs/self-hosting/managed-hosting.mdx b/apps/docs/self-hosting/managed-hosting.mdx
index f8ee712f8..83ee018ca 100644
--- a/apps/docs/self-hosting/managed-hosting.mdx
+++ b/apps/docs/self-hosting/managed-hosting.mdx
@@ -1,4 +1,5 @@
---
+icon: cloud
title: Managed Hosting
description: Using a managed hosting service to self-host Rallly.
---
diff --git a/apps/docs/self-hosting/pricing.mdx b/apps/docs/self-hosting/pricing.mdx
new file mode 100644
index 000000000..6d46752c0
--- /dev/null
+++ b/apps/docs/self-hosting/pricing.mdx
@@ -0,0 +1,55 @@
+---
+icon: coins
+title: Pricing
+description: How much does it cost to self-host Rallly?
+---
+
+Rallly is **completely free** to self-host.
+But free software doesn’t mean it’s without cost.
+Someone has to develop, maintain, and support it.
+If you find Rallly useful you can help support further development by paying a one-time fee.
+
+## Suggested Price
+
+We believe $42 USD is a very fair price for the time and effort that's gone into making this product.
+It's also the cost of a yearly subscription to the [official managed service](https://rallly.co).
+If you find Rallly useful and can afford to pay, please consider paying this amount.
+
+<CardGroup cols={1}>
+ <Card
+ title="Pay $42 USD"
+ icon="cart-shopping"
+ href="https://buy.stripe.com/9AQ0411zW9BZ5nqaEK"
+ >
+ One-time payment for Rallly Self-Hosted
+ </Card>
+</CardGroup>
+
+## Pay What You Want
+
+Alternatively, you can choose to pay **any amount** you want. Your support is appreciated regardless of how much you are able to pay.
+
+<CardGroup cols={3}>
+ <Card
+ icon="dollar-sign"
+ title="Pay in USD"
+ href="https://buy.stripe.com/5kAdURdiEeWj5nqeV4"
+ >
+ One-time payment
+ </Card>
+ <Card
+ icon="euro-sign"
+ title="Pay in EUR"
+ href="https://buy.stripe.com/aEU2c92E0aG33fi7sA"
+ >
+ One-time payment
+ </Card>
+ <Card
+ icon="sterling-sign"
+ title="Pay in GBP"
+ href="https://buy.stripe.com/fZeeYV2E0bK7g246ox"
+ >
+ One-time payment
+ </Card>
+
+</CardGroup>
diff --git a/apps/landing/declarations/environment.d.ts b/apps/landing/declarations/environment.d.ts
index 9a8ee49de..2258f7b3b 100644
--- a/apps/landing/declarations/environment.d.ts
+++ b/apps/landing/declarations/environment.d.ts
@@ -64,10 +64,6 @@ declare global {
* Example: "[email protected], *@example.com, *@*.example.com"
*/
ALLOWED_EMAILS?: string;
- /**
- * "true" to require authentication for creating new polls and accessing admin pages
- */
- AUTH_REQUIRED?: string;
/**
* Determines what email provider to use. "smtp" or "ses"
*/
diff --git a/apps/landing/package.json b/apps/landing/package.json
index 84e81b7b0..c2c9ce8e6 100644
--- a/apps/landing/package.json
+++ b/apps/landing/package.json
@@ -36,8 +36,7 @@
"react-i18next": "^12.1.4",
"react-use": "^17.4.0",
"remark": "^14.0.3",
- "remark-html": "^15.0.2",
- "typescript": "^4.9.4"
+ "remark-html": "^15.0.2"
},
"devDependencies": {
"@next/bundle-analyzer": "^12.3.4",
@@ -50,11 +49,8 @@
"@types/react-dom": "^18.0.11",
"@types/react-linkify": "^1.0.1",
"@types/smoothscroll-polyfill": "^0.3.1",
- "@typescript-eslint/eslint-plugin": "^5.21.0",
- "@typescript-eslint/parser": "^5.50.0",
"cheerio": "^1.0.0-rc.12",
"cross-env": "^7.0.3",
- "eslint": "^7.26.0",
"eslint-config-next": "^13.0.1",
"eslint-config-turbo": "^0.0.9",
"eslint-import-resolver-typescript": "^2.7.0",
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 86f1769a3..db6a231e7 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -21,6 +21,9 @@ RUN yarn db:generate
ARG APP_VERSION
ENV NEXT_PUBLIC_APP_VERSION=$APP_VERSION
+ARG SELF_HOSTED
+ENV NEXT_PUBLIC_SELF_HOSTED=$SELF_HOSTED
+
RUN yarn build
FROM node:18 AS runner
@@ -48,4 +51,7 @@ COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/standalone ./
COPY --from=installer --chown=nextjs:nodejs /app/apps/web/.next/static ./apps/web/.next/static
COPY --from=installer --chown=nextjs:nodejs /app/apps/web/public ./apps/web/public
+ARG SELF_HOSTED
+ENV NEXT_PUBLIC_SELF_HOSTED=$SELF_HOSTED
+
CMD ["./docker-start.sh"]
diff --git a/apps/web/declarations/environment.d.ts b/apps/web/declarations/environment.d.ts
index 770ce9be5..02a71d140 100644
--- a/apps/web/declarations/environment.d.ts
+++ b/apps/web/declarations/environment.d.ts
@@ -33,10 +33,6 @@ declare global {
* Crisp website ID
*/
NEXT_PUBLIC_CRISP_WEBSITE_ID?: string;
- /**
- * When `true` it will show the feedback button and pull the changelog from featurebase
- */
- NEXT_PUBLIC_FEEDBACK_ENABLED?: string;
/**
* Users of your instance will see this as their support email
*/
@@ -68,10 +64,6 @@ declare global {
* Example: "[email protected], *@example.com, *@*.example.com"
*/
ALLOWED_EMAILS?: string;
- /**
- * "true" to require authentication for creating new polls and accessing admin pages
- */
- AUTH_REQUIRED?: string;
/**
* Determines what email provider to use. "smtp" or "ses"
*/
diff --git a/apps/web/package.json b/apps/web/package.json
index d2d33ad35..313bd229a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -33,6 +33,7 @@
"@tailwindcss/typography": "^0.5.9",
"@tanstack/react-table": "^8.9.1",
"@vercel/analytics": "^0.1.8",
+ "@vercel/og": "^0.5.13",
"accept-language-parser": "^1.5.0",
"autoprefixer": "^10.4.13",
"class-variance-authority": "^0.6.0",
@@ -67,7 +68,6 @@
"spacetime": "^7.4.7",
"superjson": "^1.12.2",
"timezone-soft": "^1.4.1",
- "typescript": "^4.9.4",
"zod": "^3.20.2"
},
"devDependencies": {
@@ -81,11 +81,8 @@
"@types/react-dom": "^18.0.11",
"@types/react-linkify": "^1.0.1",
"@types/smoothscroll-polyfill": "^0.3.1",
- "@typescript-eslint/eslint-plugin": "^5.21.0",
- "@typescript-eslint/parser": "^5.50.0",
"cheerio": "^1.0.0-rc.12",
"cross-env": "^7.0.3",
- "eslint": "^7.26.0",
"eslint-config-next": "^13.0.1",
"eslint-config-turbo": "^0.0.9",
"eslint-import-resolver-typescript": "^2.7.0",
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.json
index be68dd528..d83a7a0d1 100644
--- a/apps/web/public/locales/en/app.json
+++ b/apps/web/public/locales/en/app.json
@@ -103,7 +103,6 @@
"addComment": "Add Comment",
"profile": "Profile",
"polls": "Polls",
- "showLess": "Show less…",
"showMore": "Show more…",
"timeZoneSelect__defaultValue": "Select time zone…",
"timeZoneSelect__noOption": "No option found",
@@ -205,14 +204,8 @@
"duplicateTitleDescription": "Hint: Give your new poll a unique title",
"proFeature": "Pro Feature",
"upgradeOverlaySubtitle2": "Please upgrade to a paid plan to use this feature. This is how we keep the lights on :)",
- "savePercent": "Save {percent}%",
- "priceIncreaseSoon": "Price increase soon.",
- "lockPrice": "Upgrade today to keep this price forever.",
- "noAds": "No ads",
"upgrade": "Upgrade",
"notToday": "Not Today",
- "supportProject": "Support this project",
- "features": "Get access to all current and future Pro features!",
"continueAsGuest": "Continue as Guest",
"scrollLeft": "Scroll Left",
"scrollRight": "Scroll Right",
@@ -231,5 +224,12 @@
"accessAllFeatures": "Access all features",
"earlyAccess": "Get early access to new features",
"earlyAdopterDescription": "As an early adopter, you'll lock in your subscription rate and won't be affected by future price increases.",
- "upgradeNowSaveLater": "Upgrade now, save later"
+ "upgradeNowSaveLater": "Upgrade now, save later",
+ "savePercent": "Save {percent}%",
+ "priceIncreaseSoon": "Price increase soon.",
+ "lockPrice": "Upgrade today to keep this price forever.",
+ "features": "Get access to all current and future Pro features!",
+ "noAds": "No ads",
+ "supportProject": "Support this project",
+ "pricing": "Pricing"
}
diff --git a/apps/web/src/components/auth/auth-layout.tsx b/apps/web/src/components/auth/auth-layout.tsx
index b2110783c..2b1ef8ba1 100644
--- a/apps/web/src/components/auth/auth-layout.tsx
+++ b/apps/web/src/components/auth/auth-layout.tsx
@@ -1,25 +1,21 @@
-import Image from "next/image";
import Link from "next/link";
import { Trans } from "next-i18next";
import React from "react";
+import { Logo } from "@/components/logo";
+import { IfCloudHosted } from "@/contexts/environment";
+
export const AuthLayout = ({ children }: { children?: React.ReactNode }) => {
return (
<div className="h-full p-3 sm:p-8">
<div className="mx-auto max-w-lg">
<div className="overflow-hidden rounded-lg border bg-white shadow-sm">
- <div className="bg-pattern border-t-primary-600 border-b border-t-4 bg-gray-500/5 p-4 text-center sm:p-8">
- <Image
- src="/static/logo.svg"
- height={30}
- width={150}
- alt="Rallly"
- className="text-primary-600 inline-block h-7"
- />
+ <div className="bg-pattern border-t-primary-600 flex justify-center border-b border-t-4 bg-gray-500/5 p-4 text-center sm:p-8">
+ <Logo />
</div>
<div className="p-4 sm:p-6">{children}</div>
</div>
- {process.env.AUTH_REQUIRED === "true" ? null : (
+ <IfCloudHosted>
<p className="mt-8 text-center">
<Link
href="/polls"
@@ -28,7 +24,7 @@ export const AuthLayout = ({ children }: { children?: React.ReactNode }) => {
<Trans i18nKey="continueAsGuest" defaults="Continue as Guest" />
</Link>
</p>
- )}
+ </IfCloudHosted>
</div>
</div>
);
diff --git a/apps/web/src/components/billing/billing-plans.tsx b/apps/web/src/components/billing/billing-plans.tsx
index 4858c81d5..75e627920 100644
--- a/apps/web/src/components/billing/billing-plans.tsx
+++ b/apps/web/src/components/billing/billing-plans.tsx
@@ -141,7 +141,7 @@ export const BillingPlans = () => {
</div>
</Tabs>
<div className="rounded-md border border-cyan-200 bg-cyan-50 px-4 py-3 text-cyan-800">
- <div className="mb-2 flex items-start justify-between">
+ <div className="mb-2">
<TrendingUpIcon className="text-indigo mr-2 mt-0.5 h-6 w-6 shrink-0" />
</div>
<div className="mb-2 flex items-center gap-x-2">
diff --git a/apps/web/src/components/featurebase.tsx b/apps/web/src/components/featurebase.tsx
index b83d97c7d..38be6b20f 100644
--- a/apps/web/src/components/featurebase.tsx
+++ b/apps/web/src/components/featurebase.tsx
@@ -13,7 +13,7 @@ const FeaturebaseScript = () => (
<Script src="https://do.featurebase.app/js/sdk.js" id="featurebase-sdk" />
);
-export const Changelog = ({ className }: { className?: string }) => {
+export const FeaturebaseChangelog = ({ className }: { className?: string }) => {
React.useEffect(() => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const win = window as any;
@@ -37,7 +37,7 @@ export const Changelog = ({ className }: { className?: string }) => {
<>
<FeaturebaseScript />
<Tooltip>
- <TooltipTrigger>
+ <TooltipTrigger asChild>
<Button
className={cn(
"hidden sm:inline-flex [&>*]:pointer-events-none",
diff --git a/apps/web/src/components/layouts/profile-layout.tsx b/apps/web/src/components/layouts/profile-layout.tsx
index 9a543c3a9..d8b80537a 100644
--- a/apps/web/src/components/layouts/profile-layout.tsx
+++ b/apps/web/src/components/layouts/profile-layout.tsx
@@ -1,16 +1,26 @@
-import { CreditCardIcon, Settings2Icon, UserIcon } from "@rallly/icons";
+import {
+ CreditCardIcon,
+ MenuIcon,
+ Settings2Icon,
+ UserIcon,
+} from "@rallly/icons";
+import { cn } from "@rallly/ui";
+import { Button } from "@rallly/ui/button";
import { Card } from "@rallly/ui/card";
import clsx from "clsx";
import Link from "next/link";
import { useRouter } from "next/router";
import React from "react";
import { Trans } from "react-i18next";
+import { useToggle } from "react-use";
import { Container } from "@/components/container";
import { StandardLayout } from "@/components/layouts/standard-layout";
+import { IfCloudHosted } from "@/contexts/environment";
+import { Plan } from "@/contexts/plan";
import { IconComponent, NextPageWithLayout } from "../../types";
-import { IfAuthenticated } from "../user-provider";
+import { useUser } from "../user-provider";
const MenuItem = (props: {
icon: IconComponent;
@@ -21,40 +31,69 @@ const MenuItem = (props: {
return (
<Link
className={clsx(
- "flex items-center gap-x-2.5 text-sm font-medium",
+ "flex min-w-0 items-center gap-x-2.5 px-2.5 py-1.5 text-sm font-medium",
router.asPath === props.href
- ? "text-foreground"
- : "text-gray-500 hover:text-gray-800",
+ ? "bg-gray-200"
+ : "text-gray-500 hover:bg-gray-100 hover:text-gray-800",
)}
href={props.href}
>
- <props.icon className="h-5 w-5" />
- {props.children}
+ <props.icon className="h-4 w-4 shrink-0" />
+ <span className="truncate">{props.children}</span>
</Link>
);
};
export const ProfileLayout = ({ children }: React.PropsWithChildren) => {
+ const { user } = useUser();
+
+ // reset toggle whenever route changes
+ const router = useRouter();
+
+ const [isMenuOpen, toggle] = useToggle(false);
+
+ React.useEffect(() => {
+ toggle(false);
+ }, [router.asPath, toggle]);
+
return (
<div>
<Container className="p-2 sm:py-8">
- <Card className="mx-auto max-w-4xl overflow-hidden">
- <div className="flex gap-4 gap-x-6 border-b bg-gray-50 px-3 py-4 md:px-4">
- <IfAuthenticated>
- <MenuItem href="/settings/profile" icon={UserIcon}>
- <Trans i18nKey="profile" defaults="Profile" />
- </MenuItem>
- </IfAuthenticated>
- <MenuItem href="/settings/preferences" icon={Settings2Icon}>
- <Trans i18nKey="preferences" defaults="Preferences" />
- </MenuItem>
- <IfAuthenticated>
- <MenuItem href="/settings/billing" icon={CreditCardIcon}>
- <Trans i18nKey="billing" defaults="Billing" />
- </MenuItem>
- </IfAuthenticated>
+ <Card className="mx-auto flex flex-col overflow-hidden md:min-h-[600px]">
+ <div className="border-b bg-gray-50 p-3 md:hidden">
+ <Button onClick={toggle} icon={MenuIcon} />
+ </div>
+ <div className="relative flex grow md:divide-x">
+ <div
+ className={cn(
+ "absolute inset-0 z-10 grow bg-gray-50 md:static md:block md:shrink-0 md:grow-0 md:basis-56 md:px-5 md:py-4",
+ {
+ hidden: !isMenuOpen,
+ },
+ )}
+ >
+ <div className="grid gap-1">
+ <div className="flex items-center justify-between gap-x-2.5 gap-y-2 p-3">
+ <div className="truncate text-sm font-semibold">
+ {user.name}
+ </div>
+ <Plan />
+ </div>
+ <MenuItem href="/settings/profile" icon={UserIcon}>
+ <Trans i18nKey="profile" defaults="Profile" />
+ </MenuItem>
+ <MenuItem href="/settings/preferences" icon={Settings2Icon}>
+ <Trans i18nKey="preferences" defaults="Preferences" />
+ </MenuItem>
+ <IfCloudHosted>
+ <MenuItem href="/settings/billing" icon={CreditCardIcon}>
+ <Trans i18nKey="billing" defaults="Billing" />
+ </MenuItem>
+ </IfCloudHosted>
+ </div>
+ </div>
+ <div className="max-w-2xl grow">{children}</div>
</div>
- {children}
</Card>
</Container>
</div>
diff --git a/apps/web/src/components/layouts/standard-layout.tsx b/apps/web/src/components/layouts/standard-layout.tsx
index 9fcc32b9e..9a33b7a2d 100644
--- a/apps/web/src/components/layouts/standard-layout.tsx
+++ b/apps/web/src/components/layouts/standard-layout.tsx
@@ -1,9 +1,8 @@
-import { ListIcon, LogInIcon, SparklesIcon } from "@rallly/icons";
+import { ListIcon, SparklesIcon } from "@rallly/icons";
import { cn } from "@rallly/ui";
import { Button } from "@rallly/ui/button";
import clsx from "clsx";
import { AnimatePresence, m } from "framer-motion";
-import Image from "next/image";
import Link from "next/link";
import { useRouter } from "next/router";
import React from "react";
@@ -11,13 +10,18 @@ import { Toaster } from "react-hot-toast";
import { Clock, ClockPreferences } from "@/components/clock";
import { Container } from "@/components/container";
-import { Changelog, FeaturebaseIdentify } from "@/components/featurebase";
+import {
+ FeaturebaseChangelog,
+ FeaturebaseIdentify,
+} from "@/components/featurebase";
import FeedbackButton from "@/components/feedback";
+import { Logo } from "@/components/logo";
import { Spinner } from "@/components/spinner";
import { Trans } from "@/components/trans";
import { UserDropdown } from "@/components/user-dropdown";
+import { IfCloudHosted } from "@/contexts/environment";
import { IfFreeUser } from "@/contexts/plan";
-import { isFeedbackEnabled } from "@/utils/constants";
+import { appVersion, isFeedbackEnabled } from "@/utils/constants";
import { DayjsProvider } from "@/utils/dayjs";
import { IconComponent, NextPageWithLayout } from "../../types";
@@ -73,7 +77,7 @@ const Upgrade = () => {
);
};
-const Logo = () => {
+const LogoArea = () => {
const router = useRouter();
const [isBusy, setIsBusy] = React.useState(false);
React.useEffect(() => {
@@ -87,20 +91,14 @@ const Logo = () => {
};
}, [router.events]);
return (
- <div className="relative flex items-center justify-center gap-4">
+ <div className="relative flex items-center justify-center gap-x-4">
<Link
href="/polls"
className={clsx(
"inline-block transition-transform active:translate-y-1",
)}
>
- <Image
- priority={true}
- src="/static/logo.svg"
- width={120}
- height={22}
- alt="Rallly"
- />
+ <Logo size="sm" />
</Link>
<div
className={cn(
@@ -114,6 +112,10 @@ const Logo = () => {
);
};
+const Changelog = () => {
+ return <FeaturebaseChangelog />;
+};
+
const MainNav = () => {
return (
<m.div
@@ -127,8 +129,8 @@ const MainNav = () => {
className="border-b bg-gray-50/50"
>
<Container className="flex h-14 items-center justify-between gap-x-2.5">
- <div className="flex shrink-0">
- <Logo />
+ <div className="flex shrink-0 gap-x-4">
+ <LogoArea />
<nav className="hidden gap-x-2 sm:flex">
<NavMenuItem
icon={ListIcon}
@@ -137,11 +139,13 @@ const MainNav = () => {
/>
</nav>
</div>
- <div className="flex items-center gap-x-4">
+ <div className="flex items-center gap-x-2.5">
<nav className="flex items-center gap-x-1 sm:gap-x-1.5">
- <IfFreeUser>
- <Upgrade />
- </IfFreeUser>
+ <IfCloudHosted>
+ <IfFreeUser>
+ <Upgrade />
+ </IfFreeUser>
+ </IfCloudHosted>
<IfGuest>
<Button
size="sm"
@@ -150,12 +154,13 @@ const MainNav = () => {
className="hidden sm:flex"
>
<Link href="/login">
- <LogInIcon className="h-4 w-4" />
<Trans i18nKey="login" defaults="Login" />
</Link>
</Button>
</IfGuest>
- <Changelog />
+ <IfCloudHosted>
+ <Changelog />
+ </IfCloudHosted>
<ClockPreferences>
<Button size="sm" variant="ghost">
<Clock />
@@ -198,6 +203,17 @@ export const StandardLayout: React.FunctionComponent<{
{children}
</m.div>
</AnimatePresence>
+ {appVersion ? (
+ <div className="fixed bottom-0 right-0 z-50 rounded-tl-md bg-gray-200/90">
+ <Link
+ className="px-2 py-1 text-xs tabular-nums tracking-tight"
+ target="_blank"
+ href={`https://github.com/lukevella/rallly/releases/${appVersion}`}
+ >
+ {`${appVersion}`}
+ </Link>
+ </div>
+ ) : null}
</div>
{isFeedbackEnabled ? (
<>
diff --git a/apps/web/src/components/logo.tsx b/apps/web/src/components/logo.tsx
index 752d9d3ff..71e699045 100644
--- a/apps/web/src/components/logo.tsx
+++ b/apps/web/src/components/logo.tsx
@@ -1,25 +1,25 @@
-import clsx from "clsx";
+import Image from "next/image";
-export const Logo = (props: { className?: string; color?: boolean }) => {
- const { color = true } = props;
+const sizes = {
+ sm: {
+ width: 120,
+ height: 22,
+ },
+ md: {
+ width: 150,
+ height: 30,
+ },
+};
+
+export const Logo = ({ size = "md" }: { size?: keyof typeof sizes }) => {
return (
- <span className="inline-flex select-none items-center">
- <span
- className={clsx(
- "font-semibold uppercase tracking-widest",
- {
- "text-primary-600": color,
- },
- props.className,
- )}
- >
- Rallly
- </span>
- {process.env.NEXT_PUBLIC_BETA === "1" ? (
- <span className="ml-2 inline-block rounded bg-rose-500 px-1 text-xs lowercase tracking-tight text-gray-50">
- beta
- </span>
- ) : null}
- </span>
+ <Image
+ priority={true}
+ className="mx"
+ src="/static/logo.svg"
+ width={sizes[size].width}
+ height={sizes[size].height}
+ alt="Rallly"
+ />
);
};
diff --git a/apps/web/src/components/open-beta-modal.tsx b/apps/web/src/components/open-beta-modal.tsx
deleted file mode 100644
index 0bb06057f..000000000
--- a/apps/web/src/components/open-beta-modal.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { Logo } from "./logo";
-
-const OpenBeta = () => {
- return (
- <div>
- <div className="bg-pattern border-b px-4 py-8 text-center text-2xl">
- <Logo />
- </div>
- <div className="max-w-3xl p-3 sm:p-6">
- <div>
- <p className="mb-4">
- The open beta allows you to test out new features before they are
- officially released to the general public. By participating you,
- will have the opportunity to provide feedback and help shape the
- future of Rallly!
- </p>
- </div>
- <div>
- <h2 className="mb-4">Feedback</h2>
- <ul className="grid grid-cols-1 gap-4 md:grid-cols-2">
- <a
- href="https://github.com/lukevella/rallly/issues/new?assignees=&labels=bug&template=---bug-report.md&title="
- className="hover:text-primary-600 rounded border p-3"
- >
- 🐞 Submit a bug report
- </a>
- <a
- href="https://github.com/lukevella/rallly/discussions/new/choose"
- className="hover:text-primary-600 rounded border p-3"
- >
- 📢 Open a discussion with the community
- </a>
- <a
- href="https://discord.gg/uzg4ZcHbuM"
- className="hover:text-primary-600 rounded border p-3"
- >
- 💬 Chat on Discord
- </a>
- <a
- href="mailto:[email protected]"
- className="hover:text-primary-600 rounded border p-3"
- >
- ✉️ Send an email
- </a>
- </ul>
- <div className="mt-4 rounded border bg-gray-50 p-4">
- <h2 className="mb-4 text-gray-800">Important</h2>
- <p className="mb-4">
- <strong>
- You should not rely on the beta for any important data or
- information.
- </strong>
- </p>
- <p className="mb-4">
- The beta should be used exclusively for testing purposes.
- Features, polls, accounts, or data may be removed at any time
- without prior notice.
- </p>
- <p className="m-0">
- Any data or information saved on the beta website cannot be
- accessed on the production website and vice versa.
- </p>
- </div>
- </div>
- </div>
- </div>
- );
-};
-
-export default OpenBeta;
diff --git a/apps/web/src/components/settings/settings-section.tsx b/apps/web/src/components/settings/settings-section.tsx
deleted file mode 100644
index ec8d6d557..000000000
--- a/apps/web/src/components/settings/settings-section.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-export const SettingsSection = (props: {
- title: React.ReactNode;
- description: React.ReactNode;
- children: React.ReactNode;
-}) => {
- return (
- <div className="grid max-w-7xl grid-cols-1 gap-x-8 gap-y-4 p-3 sm:p-6 md:grid-cols-3">
- <div>
- <h2 className="text-base font-semibold">{props.title}</h2>
- <p className="mt-1 text-sm text-gray-500">{props.description}</p>
- </div>
- <div className="md:col-span-2">{props.children}</div>
- </div>
- );
-};
diff --git a/apps/web/src/components/settings/settings.tsx b/apps/web/src/components/settings/settings.tsx
new file mode 100644
index 000000000..b5cb61cee
--- /dev/null
+++ b/apps/web/src/components/settings/settings.tsx
@@ -0,0 +1,70 @@
+import { InfoIcon } from "@rallly/icons";
+import { cn } from "@rallly/ui";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";
+
+export const Settings = ({ children }: React.PropsWithChildren) => {
+ return <div className="px-4 py-3 md:p-6">{children}</div>;
+};
+
+export const SettingsHeader = ({ children }: React.PropsWithChildren) => {
+ return (
+ <div className="mb-4 md:mb-8">
+ <h2>{children}</h2>
+ </div>
+ );
+};
+
+export const SettingsContent = ({ children }: React.PropsWithChildren) => {
+ return <div className="space-y-8">{children}</div>;
+};
+
+export const SettingsSection = (props: {
+ title: React.ReactNode;
+ description: React.ReactNode;
+ children: React.ReactNode;
+}) => {
+ return (
+ <div className="grid gap-3 md:gap-4">
+ <div>
+ <h2 className="mb-1 text-base font-semibold">{props.title}</h2>
+ <p className="text-muted-foreground text-sm">{props.description}</p>
+ </div>
+ <div>{props.children}</div>
+ </div>
+ );
+};
+
+export const SettingsGroup = ({ children }: React.PropsWithChildren) => {
+ return <dl className="grid gap-3 md:gap-6">{children}</dl>;
+};
+
+export const SettingsItem = ({ children }: React.PropsWithChildren) => {
+ return <div className="grid gap-1.5">{children}</div>;
+};
+export const SettingsItemTitle = ({
+ children,
+ hint,
+}: React.PropsWithChildren<{ hint?: React.ReactNode }>) => {
+ return (
+ <div className="flex items-center gap-x-2">
+ <dt className="text-sm font-medium text-gray-500">{children}</dt>
+ {hint ? (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <InfoIcon className="inline-block h-4 w-4 text-gray-500" />
+ </TooltipTrigger>
+ <TooltipContent side="right" className="max-w-sm">
+ {hint}
+ </TooltipContent>
+ </Tooltip>
+ ) : null}
+ </div>
+ );
+};
+
+export const SettingsItemValue = ({
+ children,
+ className,
+}: React.PropsWithChildren<{ className?: string }>) => {
+ return <dd className={cn("text-sm text-gray-900", className)}>{children}</dd>;
+};
diff --git a/apps/web/src/components/text-summary.tsx b/apps/web/src/components/text-summary.tsx
deleted file mode 100644
index d9f83e7fe..000000000
--- a/apps/web/src/components/text-summary.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from "react";
-
-import { Trans } from "@/components/trans";
-
-export const TextSummary = ({
- max = Infinity,
- text,
-}: {
- text: string;
- max?: number;
-}) => {
- const [isExpanded, setExpanded] = React.useState(false);
- if (text.length <= max) {
- return <p>{text}</p>;
- }
- const summary = text.substring(0, text.lastIndexOf(" ", max)) + "…";
- return (
- <>
- <p className="leading-relaxed text-gray-600">
- {isExpanded ? <>{text}</> : <>{summary}</>}
- </p>
- {isExpanded ? (
- <button
- className="mt-2 border px-1 text-sm font-medium tracking-tight hover:text-gray-800 hover:underline active:text-gray-900"
- onClick={() => setExpanded(false)}
- >
- <Trans defaults="Show less…" i18nKey="showLess" />
- </button>
- ) : (
- <button
- className="mt-2 border px-1 text-sm font-medium tracking-tight hover:text-gray-800 hover:underline active:text-gray-900"
- onClick={() => setExpanded(true)}
- >
- <Trans defaults="Show more…" i18nKey="showMore" />
- </button>
- )}
- </>
- );
-};
diff --git a/apps/web/src/components/upgrade-button.tsx b/apps/web/src/components/upgrade-button.tsx
index 849befd47..f2290feef 100644
--- a/apps/web/src/components/upgrade-button.tsx
+++ b/apps/web/src/components/upgrade-button.tsx
@@ -12,20 +12,36 @@ export const UpgradeButton = ({
const posthog = usePostHog();
return (
- <Button
- className="w-full"
- variant="primary"
- asChild
- onClick={() => {
- posthog?.capture("click upgrade button");
- }}
- >
- <Link
- href={`/api/stripe/checkout?period=${
- annual ? "yearly" : "monthly"
- }&return_path=${encodeURIComponent(window.location.pathname)}`}
+ <form method="POST" action="/api/stripe/checkout">
+ <input
+ type="hidden"
+ name="period"
+ value={annual ? "yearly" : "monthly"}
+ />
+ <input
+ type="hidden"
+ name="return_path"
+ value={encodeURIComponent(window.location.pathname)}
+ />
+ <Button
+ className="w-full"
+ type="submit"
+ variant="primary"
+ onClick={() => {
+ posthog?.capture("click upgrade button");
+ }}
>
{children || <Trans i18nKey="upgrade" defaults="Upgrade" />}
+ </Button>
+ </form>
+ );
+};
+
+export const UpgradeLink = ({}) => {
+ return (
+ <Button variant="primary" asChild>
+ <Link href="/settings/billing">
+ <Trans i18nKey="upgrade" defaults="Upgrade" />
</Link>
</Button>
);
diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsx
index 658b86129..f06baed11 100644
--- a/apps/web/src/components/user-dropdown.tsx
+++ b/apps/web/src/components/user-dropdown.tsx
@@ -1,6 +1,7 @@
import {
ChevronDown,
CreditCardIcon,
+ GemIcon,
LifeBuoyIcon,
ListIcon,
LogInIcon,
@@ -24,6 +25,7 @@ import Link from "next/link";
import { Trans } from "@/components/trans";
import { CurrentUserAvatar } from "@/components/user";
+import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";
import { Plan } from "@/contexts/plan";
import { isFeedbackEnabled } from "@/utils/constants";
@@ -34,7 +36,7 @@ export const UserDropdown = () => {
return (
<DropdownMenu modal={false}>
<DropdownMenuTrigger asChild className="group">
- <Button className="rounded-full">
+ <Button variant="ghost" className="rounded-full">
<CurrentUserAvatar size="sm" className="-ml-1" />
<ChevronDown className="h-4 w-4" />
</Button>
@@ -52,17 +54,18 @@ export const UserDropdown = () => {
</div>
</DropdownMenuLabel>
<DropdownMenuSeparator />
- <IfAuthenticated>
- <DropdownMenuItem asChild={true}>
- <Link
- href="/settings/profile"
- className="flex items-center gap-x-2"
- >
- <UserIcon className="h-4 w-4" />
- <Trans i18nKey="profile" defaults="Profile" />
- </Link>
- </DropdownMenuItem>
- </IfAuthenticated>
+ <DropdownMenuItem asChild={true}>
+ <Link href="/polls" className="flex items-center gap-x-2 sm:hidden">
+ <ListIcon className="h-4 w-4" />
+ <Trans i18nKey="polls" defaults="Polls" />
+ </Link>
+ </DropdownMenuItem>
+ <DropdownMenuItem asChild={true}>
+ <Link href="/settings/profile" className="flex items-center gap-x-2">
+ <UserIcon className="h-4 w-4" />
+ <Trans i18nKey="profile" defaults="Profile" />
+ </Link>
+ </DropdownMenuItem>
<DropdownMenuItem asChild={true}>
<Link
href="/settings/preferences"
@@ -72,7 +75,7 @@ export const UserDropdown = () => {
<Trans i18nKey="preferences" defaults="Preferences" />
</Link>
</DropdownMenuItem>
- <IfAuthenticated>
+ <IfCloudHosted>
<DropdownMenuItem asChild={true}>
<Link
href="/settings/billing"
@@ -82,13 +85,7 @@ export const UserDropdown = () => {
<Trans i18nKey="Billing" defaults="Billing" />
</Link>
</DropdownMenuItem>
- </IfAuthenticated>
- <DropdownMenuItem asChild={true}>
- <Link href="/polls" className="flex items-center gap-x-2 sm:hidden">
- <ListIcon className="h-4 w-4" />
- <Trans i18nKey="polls" defaults="Polls" />
- </Link>
- </DropdownMenuItem>
+ </IfCloudHosted>
<DropdownMenuSeparator />
<DropdownMenuItem asChild={true}>
<Link
@@ -100,6 +97,18 @@ export const UserDropdown = () => {
<Trans i18nKey="support" defaults="Support" />
</Link>
</DropdownMenuItem>
+ <IfSelfHosted>
+ <DropdownMenuItem asChild={true}>
+ <Link
+ target="_blank"
+ href="https://support.rallly.co/self-hosting/pricing"
+ className="flex items-center gap-x-2"
+ >
+ <GemIcon className="h-4 w-4" />
+ <Trans i18nKey="pricing" defaults="Pricing" />
+ </Link>
+ </DropdownMenuItem>
+ </IfSelfHosted>
{isFeedbackEnabled ? (
<DropdownMenuItem asChild={true}>
<Link
diff --git a/apps/web/src/components/user-provider.tsx b/apps/web/src/components/user-provider.tsx
index dd7bc8d64..a2298d660 100644
--- a/apps/web/src/components/user-provider.tsx
+++ b/apps/web/src/components/user-provider.tsx
@@ -8,7 +8,7 @@ import { useWhoAmI } from "@/contexts/whoami";
import { useRequiredContext } from "./use-required-context";
export const UserContext = React.createContext<{
- user: UserSession & { shortName: string };
+ user: UserSession & { name: string };
refresh: () => void;
ownsObject: (obj: { userId: string | null }) => boolean;
} | null>(null);
@@ -50,23 +50,22 @@ export const UserProvider = (props: { children?: React.ReactNode }) => {
const queryClient = trpc.useContext();
const user = useWhoAmI();
- const subscriptionQuery = trpc.user.subscription.useQuery();
const { data: userPreferences } = trpc.userPreferences.get.useQuery();
- const shortName = user
+ const name = user
? user.isGuest === false
- ? user.name.split(" ")[0]
+ ? user.name
: user.id.substring(0, 10)
: t("guest");
- if (!user || userPreferences === undefined || !subscriptionQuery.isFetched) {
+ if (!user || userPreferences === undefined) {
return null;
}
return (
<UserContext.Provider
value={{
- user: { ...user, shortName },
+ user: { ...user, name },
refresh: () => {
return queryClient.whoami.invalidate();
},
diff --git a/apps/web/src/contexts/environment.tsx b/apps/web/src/contexts/environment.tsx
new file mode 100644
index 000000000..ffbcdb6d6
--- /dev/null
+++ b/apps/web/src/contexts/environment.tsx
@@ -0,0 +1,9 @@
+export const isSelfHosted = process.env.NEXT_PUBLIC_SELF_HOSTED === "true";
+
+export const IfSelfHosted = ({ children }: React.PropsWithChildren) => {
+ return isSelfHosted ? <>{children}</> : null;
+};
+
+export const IfCloudHosted = ({ children }: React.PropsWithChildren) => {
+ return isSelfHosted ? null : <>{children}</>;
+};
diff --git a/apps/web/src/contexts/plan.tsx b/apps/web/src/contexts/plan.tsx
index b24ed7ad3..db556d205 100644
--- a/apps/web/src/contexts/plan.tsx
+++ b/apps/web/src/contexts/plan.tsx
@@ -3,9 +3,33 @@ import { Badge } from "@rallly/ui/badge";
import React from "react";
import { Trans } from "@/components/trans";
+import { useUser } from "@/components/user-provider";
+import { isSelfHosted } from "@/utils/constants";
+
+export const useSubscription = () => {
+ const { user } = useUser();
+
+ const { data } = trpc.user.subscription.useQuery(undefined, {
+ enabled: !isSelfHosted && user.isGuest === false,
+ });
+
+ if (isSelfHosted) {
+ return {
+ active: true,
+ };
+ }
+
+ if (user.isGuest) {
+ return {
+ active: false,
+ };
+ }
+
+ return data;
+};
export const usePlan = () => {
- const { data } = trpc.user.subscription.useQuery();
+ const data = useSubscription();
const isPaid = data?.active === true;
@@ -34,6 +58,7 @@ export const Plan = () => {
</Badge>
);
}
+
return (
<Badge variant="secondary">
<Trans i18nKey="planFree" defaults="Free" />
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index 55d9698cf..d49d858e3 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -10,26 +10,37 @@ const publicPaths = ["/login", "/register", "/invite", "/auth"];
// these paths always require authentication
const protectedPaths = ["/settings/billing", "/settings/profile"];
-export async function middleware(req: NextRequest) {
- const { headers, cookies, nextUrl } = req;
- const newUrl = nextUrl.clone();
- const res = NextResponse.next();
+const checkLoginRequirements = async (req: NextRequest, res: NextResponse) => {
const session = await getSession(req, res);
+ const isGuest = session.user?.isGuest !== false;
- // a protected path is one that requires to be logged in
- const isProtectedPath = protectedPaths.some((protectedPath) =>
- req.nextUrl.pathname.includes(protectedPath),
- );
+ if (!isGuest) {
+ // already logged in
+ return false;
+ }
- const isProtectedPathDueToRequiredAuth =
- process.env.AUTH_REQUIRED === "true" &&
- !publicPaths.some((publicPath) =>
+ // TODO (Luke Vella) [2023-09-11]: We should handle this on the client-side
+ if (process.env.NEXT_PUBLIC_SELF_HOSTED === "true") {
+ // when self-hosting, only public paths don't require login
+ return !publicPaths.some((publicPath) =>
req.nextUrl.pathname.startsWith(publicPath),
);
+ } else {
+ // when using the hosted version, only protected paths require login
+ return protectedPaths.some((protectedPath) =>
+ req.nextUrl.pathname.includes(protectedPath),
+ );
+ }
+};
- const isGuest = session.user?.isGuest !== false;
+export async function middleware(req: NextRequest) {
+ const { headers, cookies, nextUrl } = req;
+ const newUrl = nextUrl.clone();
+ const res = NextResponse.next();
+
+ const isLoginRequired = await checkLoginRequirements(req, res);
- if (isGuest && (isProtectedPathDueToRequiredAuth || isProtectedPath)) {
+ if (isLoginRequired) {
newUrl.pathname = "/login";
newUrl.searchParams.set("redirect", req.nextUrl.pathname);
return NextResponse.redirect(newUrl);
diff --git a/apps/web/src/pages/admin/[urlId].tsx b/apps/web/src/pages/admin/[urlId].tsx
index 307933c75..76c2c09b1 100644
--- a/apps/web/src/pages/admin/[urlId].tsx
+++ b/apps/web/src/pages/admin/[urlId].tsx
@@ -59,7 +59,7 @@ const Page: NextPageWithLayout<{ userId: string; pollId: string }> = ({
<ArrowRightIcon className="text-muted-foreground h-4 w-4" />
<div className="flex items-center gap-x-2.5">
<CurrentUserAvatar />
- <div>{user.shortName}</div>
+ <div>{user.name}</div>
</div>
</div>
</PageDialogContent>
diff --git a/apps/web/src/pages/api/stripe/checkout.ts b/apps/web/src/pages/api/stripe/checkout.ts
index 4361bc2a5..9e30c38d9 100644
--- a/apps/web/src/pages/api/stripe/checkout.ts
+++ b/apps/web/src/pages/api/stripe/checkout.ts
@@ -20,17 +20,19 @@ export default async function handler(
res: NextApiResponse,
) {
const userSession = await getSession(req, res);
+ const { period = "monthly", return_path } = inputSchema.parse(req.body);
if (userSession.user?.isGuest !== false) {
// You need to be logged in to subscribe
- return res
- .status(403)
- .redirect(
- `/login${req.url ? `?redirect=${encodeURIComponent(req.url)}` : ""}`,
- );
- }
+ res.redirect(
+ 303,
+ `/login${
+ return_path ? `?redirect=${encodeURIComponent(return_path)}` : ""
+ }`,
+ );
- const { period = "monthly", return_path } = inputSchema.parse(req.query);
+ return;
+ }
const user = await prisma.user.findUnique({
where: {
@@ -48,12 +50,14 @@ export default async function handler(
});
if (!user) {
- return res.status(403).redirect("/logout");
+ res.redirect(303, "/logout");
+ return;
}
if (user.subscription?.active === true) {
// User already has an active subscription. Take them to customer portal
- return res.redirect("/api/stripe/portal");
+ res.redirect(303, "/api/stripe/portal");
+ return;
}
const session = await stripe.checkout.sessions.create({
@@ -99,10 +103,11 @@ export default async function handler(
if (session.url) {
// redirect to checkout session
- return res.status(303).redirect(session.url);
+ res.redirect(303, session.url);
+ return;
}
- return res
+ res
.status(500)
.json({ error: "Something went wrong while creating a checkout session" });
}
diff --git a/apps/web/src/pages/api/stripe/portal.ts b/apps/web/src/pages/api/stripe/portal.ts
index 93fdbbc57..a53db38ff 100644
--- a/apps/web/src/pages/api/stripe/portal.ts
+++ b/apps/web/src/pages/api/stripe/portal.ts
@@ -18,11 +18,12 @@ export default async function handler(
if (userSession.user?.isGuest !== false) {
// You need to be logged in to subscribe
- return res
+ res
.status(403)
.redirect(
`/login${req.url ? `?redirect=${encodeURIComponent(req.url)}` : ""}`,
);
+ return;
}
const user = await prisma.user.findUnique({
@@ -36,7 +37,8 @@ export default async function handler(
});
if (!user) {
- return res.status(403).redirect("/logout");
+ res.status(403).redirect("/logout");
+ return;
}
const { session_id: sessionId, return_path } = inputSchema.parse(req.query);
diff --git a/apps/web/src/pages/api/stripe/webhook.ts b/apps/web/src/pages/api/stripe/webhook.ts
index 4f57bde2e..d1be6bf43 100644
--- a/apps/web/src/pages/api/stripe/webhook.ts
+++ b/apps/web/src/pages/api/stripe/webhook.ts
@@ -35,15 +35,18 @@ export default async function handler(
res: NextApiResponse,
) {
if (req.method !== "POST") {
- return res.status(405).end();
+ res.status(405).end();
+ return;
}
if (!endpointSecret) {
- return res.status(400).send("No endpoint secret");
+ res.status(400).send("No endpoint secret");
+ return;
}
const event = await validatedWebhook(req);
if (!event) {
- return res.status(400).send("Invalid signature");
+ res.status(400).send("Invalid signature");
+ return;
}
switch (event.type) {
@@ -52,7 +55,8 @@ export default async function handler(
const { userId } = metadataSchema.parse(checkoutSession.metadata);
if (!userId) {
- return res.status(400).send("Missing client reference ID");
+ res.status(400).send("Missing client reference ID");
+ return;
}
await prisma.user.update({
diff --git a/apps/web/src/pages/settings/billing.tsx b/apps/web/src/pages/settings/billing.tsx
index 56706947d..74b6b42eb 100644
--- a/apps/web/src/pages/settings/billing.tsx
+++ b/apps/web/src/pages/settings/billing.tsx
@@ -1,19 +1,28 @@
import { trpc } from "@rallly/backend";
-import { ArrowUpRight, CreditCardIcon } from "@rallly/icons";
+import { ArrowUpRight, CreditCardIcon, SendIcon } from "@rallly/icons";
import { Button } from "@rallly/ui/button";
import { Card } from "@rallly/ui/card";
import { Label } from "@rallly/ui/label";
import dayjs from "dayjs";
+import { GetStaticProps } from "next";
import Head from "next/head";
import Link from "next/link";
import { useTranslation } from "next-i18next";
import { BillingPlans } from "@/components/billing/billing-plans";
import { getProfileLayout } from "@/components/layouts/profile-layout";
-import { SettingsSection } from "@/components/settings/settings-section";
+import {
+ Settings,
+ SettingsContent,
+ SettingsGroup,
+ SettingsHeader,
+ SettingsItem,
+ SettingsItemTitle,
+ SettingsSection,
+} from "@/components/settings/settings";
import { Trans } from "@/components/trans";
-import { useUser } from "@/components/user-provider";
-import { Plan } from "@/contexts/plan";
+import { useSubscription } from "@/contexts/plan";
+import { isSelfHosted } from "@/utils/constants";
import { NextPageWithLayout } from "../../types";
import { getStaticTranslations } from "../../utils/with-page-translations";
@@ -28,9 +37,13 @@ declare global {
const BillingPortal = () => {
return (
<div>
- <Label className="mb-2">
- <Trans i18nKey="billingPortal" />
- </Label>
+ <SettingsGroup>
+ <SettingsItem>
+ <SettingsItemTitle>
+ <Trans i18nKey="billingStatus" />
+ </SettingsItemTitle>
+ </SettingsItem>
+ </SettingsGroup>
<p className="text-sm">
<Trans
i18nKey="activeSubscription"
@@ -40,10 +53,12 @@ const BillingPortal = () => {
<div className="mt-6">
<Button asChild>
<Link
+ target="_blank"
href={`/api/stripe/portal?return_path=${encodeURIComponent(
window.location.pathname,
)}`}
>
+ <CreditCardIcon className="h-4 w-4" />
<span>
<Trans i18nKey="billingPortal" defaults="Billing Portal" />
</span>
@@ -62,28 +77,14 @@ export const proPlanIdYearly = process.env
.NEXT_PUBLIC_PRO_PLAN_ID_YEARLY as string;
const SubscriptionStatus = () => {
- const { user } = useUser();
-
- const { data } = trpc.user.subscription.useQuery();
+ const data = useSubscription();
if (!data) {
return null;
}
- if (user.isGuest) {
- return <>You need to be logged in.</>;
- }
-
return (
<div className="space-y-6">
- <div>
- <Label className="mb-2">
- <Trans i18nKey="currentPlan" />
- </Label>
- <div>
- <Plan />
- </div>
- </div>
{!data.active ? (
<div>
<Label className="mb-4">
@@ -214,54 +215,89 @@ const LegacyBilling = () => {
);
};
+<SettingsSection
+ title={<Trans i18nKey="support" defaults="Support" />}
+ description={
+ <Trans i18nKey="supportDescription" defaults="Need help with anything?" />
+ }
+>
+ <div className="space-y-6">
+ <p className="text-sm">
+ <Trans
+ i18nKey="supportBilling"
+ defaults="Please reach out if you need any assistance."
+ />
+ </p>
+ <Button asChild>
+ <Link href="mailto:[email protected]">
+ <SendIcon className="h-4 w-4" />
+ <Trans i18nKey="contactSupport" defaults="Contact Support" />
+ </Link>
+ </Button>
+ </div>
+</SettingsSection>;
+
const Page: NextPageWithLayout = () => {
const { t } = useTranslation();
return (
- <div className="divide-y">
+ <Settings>
+ <SettingsHeader>
+ <Trans i18nKey="billing" />
+ </SettingsHeader>
<Head>
<title>{t("billing")}</title>
</Head>
- <SettingsSection
- title={<Trans i18nKey="billingStatus" defaults="Billing Status" />}
- description={
- <Trans
- i18nKey="billingStatusDescription"
- defaults="Manage your subscription and billing details."
- />
- }
- >
- <SubscriptionStatus />
- </SettingsSection>
- <SettingsSection
- title={<Trans i18nKey="support" defaults="Support" />}
- description={
- <Trans
- i18nKey="supportDescription"
- defaults="Need help with anything?"
- />
- }
- >
- <div className="space-y-6">
- <p className="text-sm">
+ <SettingsContent>
+ <SettingsSection
+ title={<Trans i18nKey="billingStatus" defaults="Billing Status" />}
+ description={
<Trans
- i18nKey="supportBilling"
- defaults="Please reach out if you need any assistance."
+ i18nKey="billingStatusDescription"
+ defaults="Manage your subscription and billing details."
/>
- </p>
- <Button asChild>
- <Link href="mailto:[email protected]">
- <Trans i18nKey="contactSupport" defaults="Contact Support" />
- </Link>
- </Button>
- </div>
- </SettingsSection>
- </div>
+ }
+ >
+ <SubscriptionStatus />
+ </SettingsSection>
+ <SettingsSection
+ title={<Trans i18nKey="support" defaults="Support" />}
+ description={
+ <Trans
+ i18nKey="supportDescription"
+ defaults="Need help with anything?"
+ />
+ }
+ >
+ <div className="space-y-6">
+ <p className="text-sm">
+ <Trans
+ i18nKey="supportBilling"
+ defaults="Please reach out if you need any assistance."
+ />
+ </p>
+ <Button asChild>
+ <Link href="mailto:[email protected]">
+ <SendIcon className="h-4 w-4" />
+ <Trans i18nKey="contactSupport" defaults="Contact Support" />
+ </Link>
+ </Button>
+ </div>
+ </SettingsSection>
+ </SettingsContent>
+ </Settings>
);
};
Page.getLayout = getProfileLayout;
-export const getStaticProps = getStaticTranslations;
+export const getStaticProps: GetStaticProps = async (ctx) => {
+ if (isSelfHosted) {
+ return {
+ notFound: true,
+ };
+ }
+ return await getStaticTranslations(ctx);
+};
export default Page;
diff --git a/apps/web/src/pages/settings/preferences.tsx b/apps/web/src/pages/settings/preferences.tsx
index 4117819fe..e8283a5f7 100644
--- a/apps/web/src/pages/settings/preferences.tsx
+++ b/apps/web/src/pages/settings/preferences.tsx
@@ -4,7 +4,12 @@ import { useTranslation } from "next-i18next";
import { getProfileLayout } from "@/components/layouts/profile-layout";
import { DateTimePreferences } from "@/components/settings/date-time-preferences";
import { LanguagePreference } from "@/components/settings/language-preference";
-import { SettingsSection } from "@/components/settings/settings-section";
+import {
+ Settings,
+ SettingsContent,
+ SettingsHeader,
+ SettingsSection,
+} from "@/components/settings/settings";
import { Trans } from "@/components/trans";
import { NextPageWithLayout } from "../../types";
@@ -14,33 +19,38 @@ const Page: NextPageWithLayout = () => {
const { t } = useTranslation();
return (
- <div className="divide-y">
- <Head>
- <title>{t("settings")}</title>
- </Head>
- <SettingsSection
- title={<Trans i18nKey="language" defaults="Language" />}
- description={
- <Trans
- i18nKey="languageDescription"
- defaults="Change your preferred language"
- />
- }
- >
- <LanguagePreference />
- </SettingsSection>
- <SettingsSection
- title={<Trans i18nKey="dateAndTime" defaults="Date & Time" />}
- description={
- <Trans
- i18nKey="dateAndTimeDescription"
- defaults="Change your preferred date and time settings"
- />
- }
- >
- <DateTimePreferences />
- </SettingsSection>
- </div>
+ <Settings>
+ <SettingsHeader>
+ <Trans i18nKey="preferences" />
+ </SettingsHeader>
+ <SettingsContent>
+ <Head>
+ <title>{t("settings")}</title>
+ </Head>
+ <SettingsSection
+ title={<Trans i18nKey="language" defaults="Language" />}
+ description={
+ <Trans
+ i18nKey="languageDescription"
+ defaults="Change your preferred language"
+ />
+ }
+ >
+ <LanguagePreference />
+ </SettingsSection>
+ <SettingsSection
+ title={<Trans i18nKey="dateAndTime" defaults="Date & Time" />}
+ description={
+ <Trans
+ i18nKey="dateAndTimeDescription"
+ defaults="Change your preferred date and time settings"
+ />
+ }
+ >
+ <DateTimePreferences />
+ </SettingsSection>
+ </SettingsContent>
+ </Settings>
);
};
diff --git a/apps/web/src/pages/settings/profile.tsx b/apps/web/src/pages/settings/profile.tsx
index 0467aa93e..38c4fbe40 100644
--- a/apps/web/src/pages/settings/profile.tsx
+++ b/apps/web/src/pages/settings/profile.tsx
@@ -3,7 +3,11 @@ import { useTranslation } from "next-i18next";
import { getProfileLayout } from "@/components/layouts/profile-layout";
import { ProfileSettings } from "@/components/settings/profile-settings";
-import { SettingsSection } from "@/components/settings/settings-section";
+import {
+ Settings,
+ SettingsHeader,
+ SettingsSection,
+} from "@/components/settings/settings";
import { Trans } from "@/components/trans";
import { useUser } from "@/components/user-provider";
@@ -18,10 +22,13 @@ const Page: NextPageWithLayout = () => {
return null;
}
return (
- <div className="divide-y">
+ <Settings>
<Head>
- <title>{t("settings")}</title>
+ <title>{t("profile")}</title>
</Head>
+ <SettingsHeader>
+ <Trans i18nKey="profile" />
+ </SettingsHeader>
<SettingsSection
title={<Trans i18nKey="profile" defaults="Profile" />}
description={
@@ -59,7 +66,7 @@ const Page: NextPageWithLayout = () => {
<Trans i18nKey="deleteMyAccount" defaults="Yes, delete my account" />
</Button>
</SettingsSection> */}
- </div>
+ </Settings>
);
};
diff --git a/apps/web/src/utils/constants.ts b/apps/web/src/utils/constants.ts
index bba934c50..237d10546 100644
--- a/apps/web/src/utils/constants.ts
+++ b/apps/web/src/utils/constants.ts
@@ -4,8 +4,11 @@ export const planIdMonthly = process.env
export const planIdYearly = process.env
.NEXT_PUBLIC_PRO_PLAN_ID_YEARLY as string;
-export const isFeedbackEnabled =
- process.env.NEXT_PUBLIC_FEEDBACK_ENABLED === "true";
+export const isSelfHosted = process.env.NEXT_PUBLIC_SELF_HOSTED === "true";
+
+export const isFeedbackEnabled = !isSelfHosted;
export const monthlyPriceUsd = 7;
+
export const annualPriceUsd = 42;
+export const appVersion = process.env.NEXT_PUBLIC_APP_VERSION;
diff --git a/docker-compose.yml b/docker-compose.yml
index f2576ab5b..3b5419452 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
rallly:
build:
+ args:
+ - SELF_HOSTED=true
context: .
dockerfile: ./apps/web/Dockerfile
restart: always
diff --git a/package.json b/package.json
index c94d3a684..bb9255fba 100644
--- a/package.json
+++ b/package.json
@@ -28,10 +28,14 @@
"dependencies": {
"next": "^13.2.4",
"react": "^18.2.0",
- "react-dom": "^18.2.0"
+ "react-dom": "^18.2.0",
+ "typescript": "^5.2.2"
},
"devDependencies": {
+ "@typescript-eslint/eslint-plugin": "^6.6.0",
+ "@typescript-eslint/parser": "^6.6.0",
"dotenv-cli": "^7.1.0",
+ "eslint": "^8.48.0",
"prettier": "^2.8.4",
"turbo": "^1.10.7"
},
diff --git a/packages/backend/session-config.ts b/packages/backend/session-config.ts
index b4fee8e5e..b2bfe774a 100644
--- a/packages/backend/session-config.ts
+++ b/packages/backend/session-config.ts
@@ -2,7 +2,7 @@ export const sessionConfig = {
password: process.env.SECRET_PASSWORD ?? "",
cookieName: "rallly-session",
cookieOptions: {
- secure: process.env.NODE_ENV === "production",
+ secure: process.env.NEXT_PUBLIC_BASE_URL?.startsWith("https://") ?? false,
},
ttl: 60 * 60 * 24 * 30, // 30 days
};
diff --git a/packages/backend/trpc/context.ts b/packages/backend/trpc/context.ts
index 1d0bd4fbd..c6abcc8f5 100644
--- a/packages/backend/trpc/context.ts
+++ b/packages/backend/trpc/context.ts
@@ -19,7 +19,13 @@ export async function createContext(
opts.req.session.user = user;
await opts.req.session.save();
}
- return { user, session: opts.req.session, req: opts.req, res: opts.res };
+ return {
+ user,
+ session: opts.req.session,
+ req: opts.req,
+ res: opts.res,
+ isSelfHosted: process.env.NEXT_PUBLIC_SELF_HOSTED === "true",
+ };
}
export type Context = trpc.inferAsyncReturnType<typeof createContext>;
diff --git a/packages/backend/trpc/routers/polls.ts b/packages/backend/trpc/routers/polls.ts
index 51c1d5184..c25ef46c1 100644
--- a/packages/backend/trpc/routers/polls.ts
+++ b/packages/backend/trpc/routers/polls.ts
@@ -9,7 +9,6 @@ import utc from "dayjs/plugin/utc";
import * as ics from "ics";
import { z } from "zod";
-import { getSubscriptionStatus } from "../../utils/auth";
import { getTimeZoneAbbreviation } from "../../utils/date";
import { nanoid } from "../../utils/nanoid";
import {
@@ -74,8 +73,6 @@ export const polls = router({
const participantUrlId = nanoid();
const pollId = nanoid();
- const { active: isPro } = await getSubscriptionStatus(ctx.user.id);
-
const poll = await prisma.poll.create({
select: {
adminUrlId: true,
@@ -117,13 +114,9 @@ export const polls = router({
})),
},
},
- ...(isPro
- ? {
- hideParticipants: input.hideParticipants,
- disableComments: input.disableComments,
- hideScores: input.hideScores,
- }
- : undefined),
+ hideParticipants: input.hideParticipants,
+ disableComments: input.disableComments,
+ hideScores: input.hideScores,
},
});
@@ -171,11 +164,9 @@ export const polls = router({
hideScores: z.boolean().optional(),
}),
)
- .mutation(async ({ ctx, input }) => {
+ .mutation(async ({ input }) => {
const pollId = await getPollIdFromAdminUrlId(input.urlId);
- const { active: isPro } = await getSubscriptionStatus(ctx.user.id);
-
if (input.optionsToDelete && input.optionsToDelete.length > 0) {
await prisma.option.deleteMany({
where: {
@@ -218,13 +209,9 @@ export const polls = router({
description: input.description,
timeZone: input.timeZone,
closed: input.closed,
- ...(isPro
- ? {
- hideScores: input.hideScores,
- hideParticipants: input.hideParticipants,
- disableComments: input.disableComments,
- }
- : undefined),
+ hideScores: input.hideScores,
+ hideParticipants: input.hideParticipants,
+ disableComments: input.disableComments,
},
});
}),
diff --git a/packages/backend/trpc/trpc.ts b/packages/backend/trpc/trpc.ts
index 61cb15c35..170009109 100644
--- a/packages/backend/trpc/trpc.ts
+++ b/packages/backend/trpc/trpc.ts
@@ -19,7 +19,8 @@ export const middleware = t.middleware;
export const possiblyPublicProcedure = t.procedure.use(
middleware(async ({ ctx, next }) => {
- if (process.env.AUTH_REQUIRED === "true" && ctx.user.isGuest) {
+ // On self-hosted instances, these procedures require login
+ if (ctx.isSelfHosted && ctx.user.isGuest) {
throw new TRPCError({
code: "UNAUTHORIZED",
message: "Login is required",
@@ -38,6 +39,11 @@ export const proProcedure = t.procedure.use(
});
}
+ if (ctx.isSelfHosted) {
+ // Self-hosted instances don't have paid subscriptions
+ return next();
+ }
+
const { active: isPro } = await getSubscriptionStatus(ctx.user.id);
if (!isPro) {
diff --git a/packages/backend/utils/auth.ts b/packages/backend/utils/auth.ts
index 4f838d1fa..81ad4bcf1 100644
--- a/packages/backend/utils/auth.ts
+++ b/packages/backend/utils/auth.ts
@@ -18,8 +18,8 @@ export const getSubscriptionStatus = async (userId: string) => {
if (user?.subscription?.active === true) {
return {
active: true,
- expiresAt: user.subscription.periodEnd,
- };
+ legacy: false,
+ } as const;
}
const userPaymentData = await prisma.userPaymentData.findFirst({
@@ -34,18 +34,14 @@ export const getSubscriptionStatus = async (userId: string) => {
},
});
- if (
- userPaymentData?.endDate &&
- userPaymentData.endDate.getTime() > Date.now()
- ) {
+ if (userPaymentData) {
return {
active: true,
legacy: true,
- expiresAt: userPaymentData.endDate,
- };
+ } as const;
}
return {
active: false,
- };
+ } as const;
};
diff --git a/packages/database/package.json b/packages/database/package.json
index b4603f0ea..920202a95 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -19,7 +19,6 @@
"@rallly/tsconfig": "*",
"@types/node": "^18.15.10",
"prisma": "^5.0.0",
- "ts-node": "^10.9.1",
- "typescript": "^5.0.2"
+ "ts-node": "^10.9.1"
}
}
diff --git a/packages/tsconfig/environment.d.ts b/packages/tsconfig/environment.d.ts
index 32922c242..2b3f1977d 100644
--- a/packages/tsconfig/environment.d.ts
+++ b/packages/tsconfig/environment.d.ts
@@ -68,10 +68,6 @@ declare global {
* Example: "[email protected], *@example.com, *@*.example.com"
*/
ALLOWED_EMAILS?: string;
- /**
- * "true" to require authentication for creating new polls and accessing admin pages
- */
- AUTH_REQUIRED?: string;
/**
* Determines what email provider to use. "smtp" or "ses"
*/
diff --git a/sample.env b/sample.env
index 091d14f52..4342974b0 100644
--- a/sample.env
+++ b/sample.env
@@ -26,12 +26,8 @@ SMTP_PWD=
# OPTIONAL CONFIG
-# Set to `true` to require authentication for creating new polls and accessing admin pages
-AUTH_REQUIRED=false
# Comma separated list of email addresses that are allowed to register and login.
# You can use wildcard syntax to match a range of email addresses.
# Example: "[email protected],[email protected]" or "*@example.com"
ALLOWED_EMAILS=
-# Whether or not to disable the landing page
-DISABLE_LANDING_PAGE=false
diff --git a/scripts/vercel.sh b/scripts/vercel.sh
index 610d8fd5f..318cc0f9f 100755
--- a/scripts/vercel.sh
+++ b/scripts/vercel.sh
@@ -1,7 +1,5 @@
#!/bin/sh
set -e
-export NEXT_PUBLIC_APP_VERSION=v$(node -p "require('./package.json').version")
-echo "Set NEXT_PUBLIC_APP_VERSION=$NEXT_PUBLIC_APP_VERSION"
yarn prisma generate
yarn build
# Deploy migration using direct database connection (no connection pool)
diff --git a/turbo.json b/turbo.json
index 23b445ef0..2e9976da1 100644
--- a/turbo.json
+++ b/turbo.json
@@ -51,7 +51,6 @@
"ALLOWED_EMAILS",
"ANALYZE",
"API_SECRET",
- "AUTH_REQUIRED",
"AWS_ACCESS_KEY_ID",
"AWS_REGION",
"AWS_SECRET_ACCESS_KEY",
@@ -65,12 +64,12 @@
"NEXT_PUBLIC_CRISP_WEBSITE_ID",
"NEXT_PUBLIC_ENABLE_ANALYTICS",
"NEXT_PUBLIC_ENABLE_FINALIZATION",
- "NEXT_PUBLIC_FEEDBACK_ENABLED",
"NEXT_PUBLIC_LANDING_PAGE_URL",
"NEXT_PUBLIC_MAINTENANCE_MODE",
"NEXT_PUBLIC_PADDLE_SANDBOX",
"NEXT_PUBLIC_PADDLE_VENDOR_ID",
"NEXT_PUBLIC_POSTHOG_API_HOST",
+ "NEXT_PUBLIC_SELF_HOSTED",
"NEXT_PUBLIC_POSTHOG_API_KEY",
"NEXT_PUBLIC_PRO_PLAN_ID_MONTHLY",
"NEXT_PUBLIC_PRO_PLAN_ID_YEARLY",
diff --git a/yarn.lock b/yarn.lock
index 002f3f27c..c65038a85 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,11 @@
# yarn lockfile v1
+"@aashutoshrathi/word-wrap@^1.2.3":
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
"@alloc/quick-lru@^5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
@@ -730,13 +735,6 @@
"@aws-sdk/types" "3.292.0"
tslib "^2.3.1"
- version "7.12.11"
- resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
- integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
- dependencies:
- "@babel/highlight" "^7.10.4"
-
"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
version "7.18.6"
resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
@@ -960,11 +958,6 @@
resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"
integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-"@babel/helper-validator-identifier@^7.22.5":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
- integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
-
"@babel/helper-validator-option@^7.18.6", "@babel/helper-validator-option@^7.21.0":
version "7.21.0"
resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz"
@@ -989,15 +982,6 @@
"@babel/traverse" "^7.21.0"
"@babel/types" "^7.21.0"
-"@babel/highlight@^7.10.4":
- version "7.22.5"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
- integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
- dependencies:
- "@babel/helper-validator-identifier" "^7.22.5"
- chalk "^2.0.0"
- js-tokens "^4.0.0"
-
"@babel/highlight@^7.18.6":
version "7.18.6"
resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"
@@ -1876,21 +1860,38 @@
resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz#6ec594468610c176933da1387c609558371d37e0"
integrity sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==
-"@eslint/eslintrc@^0.4.3":
- version "0.4.3"
- resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"
- integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+ integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+ dependencies:
+ eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1":
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.8.0.tgz#11195513186f68d42fbf449f9a7136b2c0c92005"
+ integrity sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==
+
+"@eslint/eslintrc@^2.1.2":
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
+ integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
dependencies:
ajv "^6.12.4"
- debug "^4.1.1"
- espree "^7.3.0"
- globals "^13.9.0"
- ignore "^4.0.6"
+ debug "^4.3.2"
+ espree "^9.6.0"
+ globals "^13.19.0"
+ ignore "^5.2.0"
import-fresh "^3.2.1"
- js-yaml "^3.13.1"
- minimatch "^3.0.4"
+ js-yaml "^4.1.0"
+ minimatch "^3.1.2"
strip-json-comments "^3.1.1"
+"@eslint/[email protected]":
+ version "8.48.0"
+ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb"
+ integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==
+
"@faker-js/faker@^7.6.0":
version "7.6.0"
resolved "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz"
@@ -2019,16 +2020,21 @@
resolved "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.1.0.tgz"
integrity sha512-z0A8K+Nxq+f83Whm/ajlwE6VtQlp/yPHZnXw7XWVPIGm1Vx0QV8KThU3BpbBRfAZ7/dYqCKKBNnQh85BkmBKkA==
-"@humanwhocodes/config-array@^0.5.0":
- version "0.5.0"
- resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
- integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.10":
+ version "0.11.11"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.11.tgz#88a04c570dbbc7dd943e4712429c3df09bc32844"
+ integrity sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==
dependencies:
- "@humanwhocodes/object-schema" "^1.2.0"
+ "@humanwhocodes/object-schema" "^1.2.1"
debug "^4.1.1"
- minimatch "^3.0.4"
+ minimatch "^3.0.5"
-"@humanwhocodes/object-schema@^1.2.0":
+"@humanwhocodes/module-importer@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+ integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^1.2.1":
version "1.2.1"
resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -2198,7 +2204,7 @@
resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
version "1.2.8"
resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -3771,10 +3777,10 @@
resolved "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.7.tgz"
integrity sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==
-"@types/json-schema@^7.0.9":
- version "7.0.11"
- resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
- integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+"@types/json-schema@^7.0.12":
+ version "7.0.12"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+ integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
"@types/json5@^0.0.29":
version "0.0.29"
@@ -3932,10 +3938,10 @@
resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz"
integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-"@types/semver@^7.3.12":
- version "7.3.13"
- resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
- integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+"@types/semver@^7.5.0":
+ version "7.5.1"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.1.tgz#0480eeb7221eb9bc398ad7432c9d7e14b1a5a367"
+ integrity sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==
"@types/serve-static@*":
version "1.15.1"
@@ -3960,23 +3966,24 @@
resolved "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz"
integrity sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA==
-"@typescript-eslint/eslint-plugin@^5.21.0":
- version "5.54.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.0.tgz"
- integrity sha512-+hSN9BdSr629RF02d7mMtXhAJvDTyCbprNYJKrXETlul/Aml6YZwd90XioVbjejQeHbb3R8Dg0CkRgoJDxo8aw==
+"@typescript-eslint/eslint-plugin@^6.6.0":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz#19ba09aa34fd504696445100262e5a9e1b1d7024"
+ integrity sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==
dependencies:
- "@typescript-eslint/scope-manager" "5.54.0"
- "@typescript-eslint/type-utils" "5.54.0"
- "@typescript-eslint/utils" "5.54.0"
+ "@eslint-community/regexpp" "^4.5.1"
+ "@typescript-eslint/scope-manager" "6.6.0"
+ "@typescript-eslint/type-utils" "6.6.0"
+ "@typescript-eslint/utils" "6.6.0"
+ "@typescript-eslint/visitor-keys" "6.6.0"
debug "^4.3.4"
- grapheme-splitter "^1.0.4"
- ignore "^5.2.0"
- natural-compare-lite "^1.4.0"
- regexpp "^3.2.0"
- semver "^7.3.7"
- tsutils "^3.21.0"
+ graphemer "^1.4.0"
+ ignore "^5.2.4"
+ natural-compare "^1.4.0"
+ semver "^7.5.4"
+ ts-api-utils "^1.0.1"
-"@typescript-eslint/parser@^5.42.0", "@typescript-eslint/parser@^5.50.0":
+"@typescript-eslint/parser@^5.42.0":
version "5.54.0"
resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.0.tgz"
integrity sha512-aAVL3Mu2qTi+h/r04WI/5PfNWvO6pdhpeMRWk9R7rEV4mwJNzoWf5CCU5vDKBsPIFQFjEq1xg7XBI2rjiMXQbQ==
@@ -3986,6 +3993,17 @@
"@typescript-eslint/typescript-estree" "5.54.0"
debug "^4.3.4"
+"@typescript-eslint/parser@^6.6.0":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.6.0.tgz#fe323a7b4eafb6d5ea82b96216561810394a739e"
+ integrity sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==
+ dependencies:
+ "@typescript-eslint/scope-manager" "6.6.0"
+ "@typescript-eslint/types" "6.6.0"
+ "@typescript-eslint/typescript-estree" "6.6.0"
+ "@typescript-eslint/visitor-keys" "6.6.0"
+ debug "^4.3.4"
+
"@typescript-eslint/[email protected]":
version "5.54.0"
resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.0.tgz"
@@ -3994,21 +4012,34 @@
"@typescript-eslint/types" "5.54.0"
"@typescript-eslint/visitor-keys" "5.54.0"
-"@typescript-eslint/[email protected]":
- version "5.54.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.0.tgz"
- integrity sha512-WI+WMJ8+oS+LyflqsD4nlXMsVdzTMYTxl16myXPaCXnSgc7LWwMsjxQFZCK/rVmTZ3FN71Ct78ehO9bRC7erYQ==
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz#57105d4419d6de971f7d2c30a2ff4ac40003f61a"
+ integrity sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==
dependencies:
- "@typescript-eslint/typescript-estree" "5.54.0"
- "@typescript-eslint/utils" "5.54.0"
+ "@typescript-eslint/types" "6.6.0"
+ "@typescript-eslint/visitor-keys" "6.6.0"
+
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz#14f651d13b884915c4fca0d27adeb652a4499e86"
+ integrity sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==
+ dependencies:
+ "@typescript-eslint/typescript-estree" "6.6.0"
+ "@typescript-eslint/utils" "6.6.0"
debug "^4.3.4"
- tsutils "^3.21.0"
+ ts-api-utils "^1.0.1"
"@typescript-eslint/[email protected]":
version "5.54.0"
resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.0.tgz"
integrity sha512-nExy+fDCBEgqblasfeE3aQ3NuafBUxZxgxXcYfzYRZFHdVvk5q60KhCSkG0noHgHRo/xQ/BOzURLZAafFpTkmQ==
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.6.0.tgz#95e7ea650a2b28bc5af5ea8907114a48f54618c2"
+ integrity sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==
+
"@typescript-eslint/[email protected]":
version "5.54.0"
resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.0.tgz"
@@ -4022,19 +4053,31 @@
semver "^7.3.7"
tsutils "^3.21.0"
-"@typescript-eslint/[email protected]":
- version "5.54.0"
- resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.0.tgz"
- integrity sha512-cuwm8D/Z/7AuyAeJ+T0r4WZmlnlxQ8wt7C7fLpFlKMR+dY6QO79Cq1WpJhvZbMA4ZeZGHiRWnht7ZJ8qkdAunw==
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz#373c420d2e12c28220f4a83352280a04823a91b7"
+ integrity sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==
dependencies:
- "@types/json-schema" "^7.0.9"
- "@types/semver" "^7.3.12"
- "@typescript-eslint/scope-manager" "5.54.0"
- "@typescript-eslint/types" "5.54.0"
- "@typescript-eslint/typescript-estree" "5.54.0"
- eslint-scope "^5.1.1"
- eslint-utils "^3.0.0"
- semver "^7.3.7"
+ "@typescript-eslint/types" "6.6.0"
+ "@typescript-eslint/visitor-keys" "6.6.0"
+ debug "^4.3.4"
+ globby "^11.1.0"
+ is-glob "^4.0.3"
+ semver "^7.5.4"
+ ts-api-utils "^1.0.1"
+
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.6.0.tgz#2d686c0f0786da6362d909e27a9de1c13ba2e7dc"
+ integrity sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.4.0"
+ "@types/json-schema" "^7.0.12"
+ "@types/semver" "^7.5.0"
+ "@typescript-eslint/scope-manager" "6.6.0"
+ "@typescript-eslint/types" "6.6.0"
+ "@typescript-eslint/typescript-estree" "6.6.0"
+ semver "^7.5.4"
"@typescript-eslint/[email protected]":
version "5.54.0"
@@ -4044,6 +4087,14 @@
"@typescript-eslint/types" "5.54.0"
eslint-visitor-keys "^3.3.0"
+"@typescript-eslint/[email protected]":
+ version "6.6.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz#1109088b4346c8b2446f3845db526374d9a3bafc"
+ integrity sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==
+ dependencies:
+ "@typescript-eslint/types" "6.6.0"
+ eslint-visitor-keys "^3.4.1"
+
"@vercel/analytics@^0.1.8":
version "0.1.11"
resolved "https://registry.npmjs.org/@vercel/analytics/-/analytics-0.1.11.tgz"
@@ -4058,6 +4109,15 @@
satori "0.10.3"
yoga-wasm-web "0.3.3"
+"@vercel/og@^0.5.13":
+ version "0.5.13"
+ resolved "https://registry.yarnpkg.com/@vercel/og/-/og-0.5.13.tgz#0c28794d5a3f1aa3c0e211c4c5ea7552cdbecc84"
+ integrity sha512-okWQ2Jt+155Hn518Y8Tt4Iqb7QdNFoPvH/n4sMpC4K4bcijjo2RAEwXwlhTYHAAkoiJ0AEEeWeknZj1aBgOOqw==
+ dependencies:
+ "@resvg/resvg-wasm" "2.4.1"
+ satori "0.10.4"
+ yoga-wasm-web "0.3.3"
+
"@xobotyi/scrollbar-width@^1.9.5":
version "1.9.5"
resolved "https://registry.npmjs.org/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz"
@@ -4085,7 +4145,7 @@ acorn-dynamic-import@^4.0.0:
resolved "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"
integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
version "5.3.2"
resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -4123,16 +4183,16 @@ acorn-walk@^8.0.0, acorn-walk@^8.1.1:
resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-acorn@^7.4.0:
- version "7.4.1"
- resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
- integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
acorn@^8.0.4, acorn@^8.4.1:
version "8.8.2"
resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"
integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.9.0:
+ version "8.10.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+ integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+
agent-base@6:
version "6.0.2"
resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
@@ -4140,7 +4200,7 @@ agent-base@6:
dependencies:
debug "4"
-ajv@^6.10.0, ajv@^6.12.4:
+ajv@^6.12.4:
version "6.12.6"
resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4150,16 +4210,6 @@ ajv@^6.10.0, ajv@^6.12.4:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ajv@^8.0.1:
- version "8.12.0"
- resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz"
- integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
- dependencies:
- fast-deep-equal "^3.1.1"
- json-schema-traverse "^1.0.0"
- require-from-string "^2.0.2"
- uri-js "^4.2.2"
-
align-text@^0.1.1, align-text@^0.1.3:
version "0.1.4"
resolved "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
@@ -4169,11 +4219,6 @@ align-text@^0.1.1, align-text@^0.1.3:
longest "^1.0.1"
repeat-string "^1.5.2"
-ansi-colors@^4.1.1:
- version "4.1.3"
- resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
- integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
-
ansi-regex@^5.0.1:
version "5.0.1"
resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
@@ -4186,7 +4231,7 @@ ansi-styles@^3.2.1:
dependencies:
color-convert "^1.9.0"
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.1.0:
version "4.3.0"
resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
@@ -4243,6 +4288,11 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"
+argparse@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+ integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
aria-hidden@^1.1.1, aria-hidden@^1.1.3:
version "1.2.2"
resolved "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.2.tgz"
@@ -4358,11 +4408,6 @@ ast-types-flow@^0.0.7:
resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz"
integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==
-astral-regex@^2.0.0:
- version "2.0.0"
- resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
- integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
autoprefixer@^10.4.13:
version "10.4.13"
resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
@@ -5063,7 +5108,7 @@ dayjs@^1.11.8:
resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.8.tgz"
integrity sha512-LcgxzFoWMEPO7ggRv1Y2N31hUf2R0Vj7fuy/m+Bg1K8rr+KAs1AEy4y9jd5DXe8pbHgX+srkHNS7TH6Q6ZhYeQ==
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -5335,11 +5380,6 @@ emoji-regex@^10.2.1:
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f"
integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==
-emoji-regex@^8.0.0:
- version "8.0.0"
- resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
- integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
emoji-regex@^9.2.2:
version "9.2.2"
resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz"
@@ -5365,13 +5405,6 @@ enhanced-resolve@^5.10.0:
graceful-fs "^4.2.4"
tapable "^2.2.0"
-enquirer@^2.3.5:
- version "2.3.6"
- resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
- integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
- dependencies:
- ansi-colors "^4.1.1"
-
ensure-type@^1.5.0:
version "1.5.1"
resolved "https://registry.npmjs.org/ensure-type/-/ensure-type-1.5.1.tgz"
@@ -5674,97 +5707,75 @@ [email protected]:
resolved "https://registry.npmjs.org/eslint-plugin-turbo/-/eslint-plugin-turbo-0.0.9.tgz"
integrity sha512-fEsuSnYU3GLtT+s66mUuzDL1LaSieIx5uk3tPO0ToGv7hI2XzOfP24aPkQItTBGl7kq2JaVkRzPwcnfz8hkp0w==
-eslint-scope@^5.1.1:
- version "5.1.1"
- resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
- integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+eslint-scope@^7.2.2:
+ version "7.2.2"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+ integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
dependencies:
esrecurse "^4.3.0"
- estraverse "^4.1.1"
-
-eslint-utils@^2.1.0:
- version "2.1.0"
- resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
- integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
- dependencies:
- eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"
- integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
- dependencies:
- eslint-visitor-keys "^2.0.0"
-
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
- version "1.3.0"
- resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
- integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
-
-eslint-visitor-keys@^2.0.0:
- version "2.1.0"
- resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
- integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+ estraverse "^5.2.0"
eslint-visitor-keys@^3.3.0:
version "3.3.0"
resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
-eslint@^7.26.0:
- version "7.32.0"
- resolved "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
- integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
- dependencies:
- "@babel/code-frame" "7.12.11"
- "@eslint/eslintrc" "^0.4.3"
- "@humanwhocodes/config-array" "^0.5.0"
- ajv "^6.10.0"
+eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+ integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
+
+eslint@^8.48.0:
+ version "8.48.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155"
+ integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==
+ dependencies:
+ "@eslint-community/eslint-utils" "^4.2.0"
+ "@eslint-community/regexpp" "^4.6.1"
+ "@eslint/eslintrc" "^2.1.2"
+ "@eslint/js" "8.48.0"
+ "@humanwhocodes/config-array" "^0.11.10"
+ "@humanwhocodes/module-importer" "^1.0.1"
+ "@nodelib/fs.walk" "^1.2.8"
+ ajv "^6.12.4"
chalk "^4.0.0"
cross-spawn "^7.0.2"
- debug "^4.0.1"
+ debug "^4.3.2"
doctrine "^3.0.0"
- enquirer "^2.3.5"
escape-string-regexp "^4.0.0"
- eslint-scope "^5.1.1"
- eslint-utils "^2.1.0"
- eslint-visitor-keys "^2.0.0"
- espree "^7.3.1"
- esquery "^1.4.0"
+ eslint-scope "^7.2.2"
+ eslint-visitor-keys "^3.4.3"
+ espree "^9.6.1"
+ esquery "^1.4.2"
esutils "^2.0.2"
fast-deep-equal "^3.1.3"
file-entry-cache "^6.0.1"
- functional-red-black-tree "^1.0.1"
- glob-parent "^5.1.2"
- globals "^13.6.0"
- ignore "^4.0.6"
- import-fresh "^3.0.0"
+ find-up "^5.0.0"
+ glob-parent "^6.0.2"
+ globals "^13.19.0"
+ graphemer "^1.4.0"
+ ignore "^5.2.0"
imurmurhash "^0.1.4"
is-glob "^4.0.0"
- js-yaml "^3.13.1"
+ is-path-inside "^3.0.3"
+ js-yaml "^4.1.0"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.4.1"
lodash.merge "^4.6.2"
- minimatch "^3.0.4"
+ minimatch "^3.1.2"
natural-compare "^1.4.0"
- optionator "^0.9.1"
- progress "^2.0.0"
- regexpp "^3.1.0"
- semver "^7.2.1"
- strip-ansi "^6.0.0"
- strip-json-comments "^3.1.0"
- table "^6.0.9"
+ optionator "^0.9.3"
+ strip-ansi "^6.0.1"
text-table "^0.2.0"
- v8-compile-cache "^2.0.3"
-espree@^7.3.0, espree@^7.3.1:
- version "7.3.1"
- resolved "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"
- integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.6.0, espree@^9.6.1:
+ version "9.6.1"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+ integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
dependencies:
- acorn "^7.4.0"
- acorn-jsx "^5.3.1"
- eslint-visitor-keys "^1.3.0"
+ acorn "^8.9.0"
+ acorn-jsx "^5.3.2"
+ eslint-visitor-keys "^3.4.1"
esprima-next@^5.7.0:
version "5.8.4"
@@ -5776,10 +5787,10 @@ esprima@^4.0.0:
resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
-esquery@^1.4.0:
- version "1.4.2"
- resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.2.tgz"
- integrity sha512-JVSoLdTlTDkmjFmab7H/9SL9qGSyjElT3myyKp7krqjVFQCDLmj1QFaCLRFBszBKI0XVZaiiXvuPIX3ZwHe1Ng==
+esquery@^1.4.2:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+ integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
dependencies:
estraverse "^5.1.0"
@@ -5790,11 +5801,6 @@ esrecurse@^4.3.0:
dependencies:
estraverse "^5.2.0"
-estraverse@^4.1.1:
- version "4.3.0"
- resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
- integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
-
estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0:
version "5.3.0"
resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
@@ -5943,6 +5949,14 @@ find-up@^4.1.0:
locate-path "^5.0.0"
path-exists "^4.0.0"
+find-up@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+ integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+ dependencies:
+ locate-path "^6.0.0"
+ path-exists "^4.0.0"
+
flat-cache@^3.0.4:
version "3.0.4"
resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
@@ -6068,11 +6082,6 @@ function.prototype.name@^1.1.5:
es-abstract "^1.19.0"
functions-have-names "^1.2.2"
-functional-red-black-tree@^1.0.1:
- version "1.0.1"
- resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
- integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-
functions-have-names@^1.2.2:
version "1.2.3"
resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
@@ -6221,10 +6230,10 @@ globals@^11.1.0:
resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-globals@^13.6.0, globals@^13.9.0:
- version "13.20.0"
- resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"
- integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+globals@^13.19.0:
+ version "13.21.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571"
+ integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==
dependencies:
type-fest "^0.20.2"
@@ -6290,10 +6299,10 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.5, graceful-fs@^4.1.6, graceful-fs@^4.2.0,
resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-grapheme-splitter@^1.0.4:
- version "1.0.4"
- resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
- integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphemer@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+ integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
gray-matter@^4.0.3:
version "4.0.3"
@@ -6627,12 +6636,7 @@ ieee754@^1.1.13, ieee754@^1.2.1:
resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
-ignore@^4.0.6:
- version "4.0.6"
- resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
- integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
-ignore@^5.2.0:
+ignore@^5.2.0, ignore@^5.2.4:
version "5.2.4"
resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
@@ -6642,7 +6646,7 @@ immediate@~3.0.5:
resolved "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"
integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
version "3.3.0"
resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -6840,11 +6844,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-is-fullwidth-code-point@^3.0.0:
- version "3.0.0"
- resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
- integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
is-glob@^3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
@@ -6898,6 +6897,11 @@ is-number@^7.0.0:
resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+is-path-inside@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+ integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
is-plain-obj@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
@@ -7122,6 +7126,13 @@ js-yaml@^3.13.1, js-yaml@^3.6.1:
argparse "^1.0.7"
esprima "^4.0.0"
+js-yaml@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+ integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+ dependencies:
+ argparse "^2.0.1"
+
jsesc@^2.5.1:
version "2.5.2"
resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
@@ -7142,11 +7153,6 @@ json-schema-traverse@^0.4.1:
resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
-json-schema-traverse@^1.0.0:
- version "1.0.0"
- resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
- integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
@@ -7339,6 +7345,13 @@ locate-path@^5.0.0:
dependencies:
p-locate "^4.1.0"
+locate-path@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+ integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+ dependencies:
+ p-locate "^5.0.0"
+
lodash-es@^4.17.21:
version "4.17.21"
resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"
@@ -7364,11 +7377,6 @@ lodash.merge@^4.6.2:
resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-lodash.truncate@^4.4.2:
- version "4.4.2"
- resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
- integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
-
lodash@^4.0.0, lodash@^4.17.20, lodash@^4.17.21:
version "4.17.21"
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
@@ -7799,7 +7807,7 @@ mimic-fn@^2.1.0:
resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
version "3.1.2"
resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -7900,11 +7908,6 @@ nanoid@^4.0.0:
resolved "https://registry.npmjs.org/nanoid/-/nanoid-4.0.1.tgz"
integrity sha512-udKGtCCUafD3nQtJg9wBhRP3KMbPglUsgV5JVsXhvyBs/oefqb4sqMEhKBBgqZncYowu58p1prsZQBYvAj/Gww==
-natural-compare-lite@^1.4.0:
- version "1.4.0"
- resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
- integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
@@ -8179,17 +8182,17 @@ opener@^1.5.2:
resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz"
integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
-optionator@^0.9.1:
- version "0.9.1"
- resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
- integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+ version "0.9.3"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+ integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
dependencies:
+ "@aashutoshrathi/word-wrap" "^1.2.3"
deep-is "^0.1.3"
fast-levenshtein "^2.0.6"
levn "^0.4.1"
prelude-ls "^1.2.1"
type-check "^0.4.0"
- word-wrap "^1.2.3"
version "5.4.1"
@@ -8220,6 +8223,13 @@ p-limit@^2.2.0:
dependencies:
p-try "^2.0.0"
+p-limit@^3.0.2:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+ dependencies:
+ yocto-queue "^0.1.0"
+
p-locate@^4.1.0:
version "4.1.0"
resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
@@ -8227,6 +8237,13 @@ p-locate@^4.1.0:
dependencies:
p-limit "^2.2.0"
+p-locate@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+ integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+ dependencies:
+ p-limit "^3.0.2"
+
p-try@^2.0.0:
version "2.2.0"
resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
@@ -8488,7 +8505,7 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-progress@^2.0.0, progress@^2.0.3:
+progress@^2.0.3:
version "2.0.3"
resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -8884,11 +8901,6 @@ regexp.prototype.flags@^1.4.3:
define-properties "^1.1.3"
functions-have-names "^1.2.2"
-regexpp@^3.1.0, regexpp@^3.2.0:
- version "3.2.0"
- resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
- integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
regexpu-core@^5.3.1:
version "5.3.1"
resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.1.tgz"
@@ -8979,11 +8991,6 @@ replace-ext@^1.0.0:
resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
-require-from-string@^2.0.2:
- version "2.0.2"
- resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
- integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
@@ -9142,6 +9149,22 @@ [email protected]:
postcss-value-parser "^4.2.0"
yoga-wasm-web "^0.3.3"
+ version "0.10.4"
+ resolved "https://registry.yarnpkg.com/satori/-/satori-0.10.4.tgz#ba2b050b5cd00757e02dede45710d8b0a58aac04"
+ integrity sha512-GJNIsuiXhiC9kWGLvz04Op5DZy2UFYZAWsuUtkTlQt3r15o0K96PeD+FMfGN4luMPUHc4uV9gXqAoPxOK0omSw==
+ dependencies:
+ "@shuding/opentype.js" "1.4.0-beta.0"
+ css-background-parser "^0.1.0"
+ css-box-shadow "1.0.0-3"
+ css-to-react-native "^3.0.0"
+ emoji-regex "^10.2.1"
+ escape-html "^1.0.3"
+ linebreak "^1.1.0"
+ parse-css-color "^0.2.1"
+ postcss-value-parser "^4.2.0"
+ yoga-wasm-web "^0.3.3"
+
scheduler@^0.23.0:
version "0.23.0"
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz"
@@ -9179,7 +9202,7 @@ semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.2.1, semver@^7.3.7:
+semver@^7.3.7, semver@^7.5.4:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
@@ -9267,15 +9290,6 @@ slash@^4.0.0:
resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-slice-ansi@^4.0.0:
- version "4.0.0"
- resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
- integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
- dependencies:
- ansi-styles "^4.0.0"
- astral-regex "^2.0.0"
- is-fullwidth-code-point "^3.0.0"
-
smoothscroll-polyfill@^0.4.4:
version "0.4.4"
resolved "https://registry.npmjs.org/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz"
@@ -9422,15 +9436,6 @@ stream-shift@^1.0.0:
resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
-string-width@^4.2.3:
- version "4.2.3"
- resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
- integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
- dependencies:
- emoji-regex "^8.0.0"
- is-fullwidth-code-point "^3.0.0"
- strip-ansi "^6.0.1"
-
string.prototype.codepointat@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
@@ -9512,7 +9517,7 @@ strip-final-newline@^2.0.0:
resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
version "3.1.1"
resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -9617,17 +9622,6 @@ tabbable@^6.0.1:
resolved "https://registry.npmjs.org/tabbable/-/tabbable-6.1.1.tgz"
integrity sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==
-table@^6.0.9:
- version "6.8.1"
- resolved "https://registry.npmjs.org/table/-/table-6.8.1.tgz"
- integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
- dependencies:
- ajv "^8.0.1"
- lodash.truncate "^4.4.2"
- slice-ansi "^4.0.0"
- string-width "^4.2.3"
- strip-ansi "^6.0.1"
-
tailwind-merge@^1.12.0:
version "1.12.0"
resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-1.12.0.tgz"
@@ -9822,6 +9816,11 @@ trough@^2.0.0:
resolved "https://registry.yarnpkg.com/trough/-/trough-2.1.0.tgz#0f7b511a4fde65a46f18477ab38849b22c554876"
integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
+ts-api-utils@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.2.tgz#7c094f753b6705ee4faee25c3c684ade52d66d99"
+ integrity sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==
+
ts-easing@^0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/ts-easing/-/ts-easing-0.2.0.tgz"
@@ -9956,15 +9955,10 @@ typescript@^3.0.0:
resolved "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz"
integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
-typescript@^4.9.4:
- version "4.9.5"
- resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz"
- integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-
-typescript@^5.0.2:
- version "5.0.2"
- resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz"
- integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
+typescript@^5.2.2:
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+ integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
uc.micro@^1.0.1:
version "1.0.6"
@@ -10224,11 +10218,6 @@ v8-compile-cache-lib@^3.0.1:
resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
-v8-compile-cache@^2.0.3:
- version "2.3.0"
- resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
- integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
-
validate-npm-package-license@^3.0.1:
version "3.0.4"
resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
@@ -10435,7 +10424,7 @@ which@^2.0.1, which@^2.0.2:
dependencies:
isexe "^2.0.0"
-word-wrap@^1.1.0, word-wrap@^1.2.3:
+word-wrap@^1.1.0:
version "1.2.4"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
@@ -10485,6 +10474,11 @@ [email protected]:
resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+yocto-queue@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
[email protected], yoga-wasm-web@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/yoga-wasm-web/-/yoga-wasm-web-0.3.3.tgz#eb8e9fcb18e5e651994732f19a220cb885d932ba"