Skip to content

Commit

Permalink
Merge branch 'main' into l10n_main
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Apr 11, 2024
2 parents 5eda5e0 + dd6feb0 commit 1e2a5c1
Show file tree
Hide file tree
Showing 11 changed files with 2,092 additions and 2,523 deletions.
23 changes: 23 additions & 0 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version = 1

exclude_patterns = [
"prisma/migrations/**",
"prisma/data-migrations/**",
"prisma/_queries/**"
]

[[analyzers]]
name = "secrets"

[[analyzers]]
name = "javascript"

[analyzers.meta]
plugins = ["react"]
environment = [
"nodejs",
"browser"
]

[[transformers]]
name = "prettier"
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install dependencies
run: pnpm install
- name: Publish to Chromatic
uses: chromaui/action@da24ada70a2efc3f0b6e1af46fe1b39d2c9d06cf # v11
uses: chromaui/action@3dcb6636a4f8eed347ef6214f5d74d2b5fee45e4 # v11
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
onlyChanged: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
- name: ⤵️ Check out code from GitHub
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: 🏗 Initialize CodeQL
uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f # v3
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3
- name: 🚀 Perform CodeQL Analysis
uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f # v3
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3
2 changes: 1 addition & 1 deletion .github/workflows/nextjs_bundle_analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
echo "$(cat .next/analyze/__bundle_analysis_comment.txt)" >> $GITHUB_STEP_SUMMARY
- name: Find Comment
uses: peter-evans/find-comment@d5fe37641ad8451bdd80312415672ba26c86575e # v3
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
if: success() && github.event.number
id: fc
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🏷 Verify PR has a valid label
uses: mheap/github-action-required-labels@80a96a4863886addcbc9f681b5b295ba7f5424e1 # v5
uses: mheap/github-action-required-labels@132879b972cb7f2ac593006455875098e73cc7f2 # v5
with:
labels: 'breaking-change, bugfix, documentation, enhancement, refactor, performance, new-feature, maintenance, ci, dependencies, translations, changelog-ignore'
mode: minimum
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.11.1
20.12.1
38 changes: 19 additions & 19 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import { type StorybookConfig } from '@storybook/nextjs'
import { merge } from 'merge-anything'
import { type StorybookConfig } from "@storybook/nextjs";
import { merge } from "merge-anything";

import { dirname, join } from 'path'
import { dirname, join } from "path";

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
staticDirs: [
{
from: '../public',
to: '/',
from: "../public",
to: "/",
},
],
addons: [
getAbsolutePath('@storybook/addon-a11y'),
getAbsolutePath('@storybook/addon-links'),
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@storybook/addon-interactions'),
getAbsolutePath("@storybook/addon-a11y"),
getAbsolutePath("@storybook/addon-links"),
getAbsolutePath("@storybook/addon-essentials"),
getAbsolutePath("@storybook/addon-interactions"),
],
framework: {
name: '@storybook/nextjs',
name: "@storybook/nextjs",
options: {},
},
docs: {
autodocs: 'tag',
autodocs: "tag",
},
typescript: {
check: true,
reactDocgen: false, //'react-docgen-typescript',
reactDocgen: "react-docgen-typescript", //'react-docgen-typescript',
reactDocgenTypescriptOptions: {
shouldExtractLiteralValuesFromEnum: true,
shouldExtractValuesFromUnion: true,
Expand All @@ -42,14 +42,14 @@ const config: StorybookConfig = {
// 'next-i18next': 'react-i18next',
},
},
}
const mergedConfig = merge(config, configAdditions)
return mergedConfig
};
const mergedConfig = merge(config, configAdditions);
return mergedConfig;
},
}
};

export default config
export default config;

function getAbsolutePath(value: string): string {
return dirname(require.resolve(join(value, 'package.json')))
return dirname(require.resolve(join(value, "package.json")));
}
39 changes: 19 additions & 20 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,34 @@
import { Global, MantineProvider, TypographyStylesProvider } from '@mantine/core'
import { type MantineProviderProps } from '@mantine/core'
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport'
import { type StoryFn } from '@storybook/react'
import { type ReactNode } from 'react'
import { I18nextProvider } from 'react-i18next'
import { Global, MantineProvider } from "@mantine/core";
import { type MantineProviderProps } from "@mantine/core";
import { INITIAL_VIEWPORTS } from "@storybook/addon-viewport";
import { type StoryFn } from "@storybook/react";
import { type ReactNode } from "react";
import { I18nextProvider } from "react-i18next";

import { i18n, i18nLocales } from './i18next'
import { storybookFont } from '../src/styles'
import { theme } from '../src/styles/theme'
import { i18n, i18nLocales } from "./i18next";
import { storybookFont } from "../src/styles";
import { theme } from "../src/styles/theme";

export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' },
layout: 'centered',
layout: "centered",
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
i18n,
locale: 'en',
locale: "en",
locales: i18nLocales,
viewport: {
viewports: INITIAL_VIEWPORTS,
},
}
const mantineProviderProps: Omit<MantineProviderProps, 'children'> = {
};
const mantineProviderProps: Omit<MantineProviderProps, "children"> = {
withCSSVariables: false,
withGlobalStyles: true,
withNormalizeCSS: false,
}
};

const ThemeWrapper = ({ children }: DecoratorProps) => {
return (
Expand All @@ -39,17 +38,17 @@ const ThemeWrapper = ({ children }: DecoratorProps) => {
<I18nextProvider i18n={i18n}>{children}</I18nextProvider>
{/* </TypographyStylesProvider> */}
</MantineProvider>
)
}
);
};

export const decorators = [
(Story: StoryFn) => (
<ThemeWrapper>
<Story />
</ThemeWrapper>
),
]
];

type DecoratorProps = {
children: ReactNode
}
children: ReactNode;
};
75 changes: 35 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"with-env": "dotenv -e ./.env --"
},
"dependencies": {
"@crowdin/crowdin-api-client": "1.30.0",
"@crowdin/crowdin-api-client": "1.33.0",
"@emotion/react": "11.11.4",
"@emotion/server": "11.11.0",
"@mantine/carousel": "6.0.21",
Expand All @@ -41,8 +41,9 @@
"@mantine/next": "6.0.21",
"@neondatabase/serverless": "0.9.0",
"@next/bundle-analyzer": "14.1.4",
"@prisma/adapter-neon": "5.11.0",
"@prisma/client": "5.11.0",
"@prisma/adapter-neon": "5.12.1",
"@prisma/client": "5.12.1",
"@storybook/test": "8.0.6",
"@tabler/icons-react": "2.47.0",
"@tanstack/react-query": "4.36.1",
"@tanstack/react-query-devtools": "4.36.1",
Expand All @@ -54,10 +55,10 @@
"@vercel/speed-insights": "1.0.10",
"embla-carousel-auto-height": "7.1.0",
"embla-carousel-react": "7.1.0",
"i18next": "23.10.1",
"i18next-browser-languagedetector": "7.2.0",
"i18next": "23.11.0",
"i18next-browser-languagedetector": "7.2.1",
"i18next-http-backend": "2.5.0",
"nanoid": "5.0.6",
"nanoid": "5.0.7",
"next": "14.1.4",
"next-i18next": "15.2.0",
"next-sitemap": "4.2.3",
Expand All @@ -73,59 +74,58 @@
"devDependencies": {
"@faker-js/faker": "7.6.0",
"@paralleldrive/cuid2": "2.2.2",
"@storybook/addon-a11y": "7.6.17",
"@storybook/addon-essentials": "7.6.17",
"@storybook/addon-interactions": "7.6.17",
"@storybook/addon-links": "7.6.17",
"@storybook/addon-viewport": "7.6.17",
"@storybook/blocks": "7.6.17",
"@storybook/nextjs": "7.6.17",
"@storybook/react": "7.6.17",
"@storybook/testing-library": "0.2.2",
"@storybook/addon-a11y": "8.0.6",
"@storybook/addon-essentials": "8.0.6",
"@storybook/addon-interactions": "8.0.6",
"@storybook/addon-links": "8.0.6",
"@storybook/addon-viewport": "8.0.6",
"@storybook/blocks": "8.0.6",
"@storybook/nextjs": "8.0.6",
"@storybook/react": "8.0.6",
"@tomfreudenberg/next-auth-mock": "0.5.6",
"@types/luxon": "3.4.2",
"@types/node": "20.11.30",
"@types/prettier": "2.7.3",
"@types/react": "18.2.67",
"@types/react-dom": "18.2.22",
"@types/node": "20.12.5",
"@types/react": "18.2.74",
"@types/react-dom": "18.2.24",
"@types/umami": "0.1.5",
"@types/ws": "8.5.10",
"@typescript-eslint/eslint-plugin": "7.3.1",
"@typescript-eslint/parser": "7.3.1",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@typescript-eslint/parser": "7.5.0",
"boxen": "7.1.1",
"chromatic": "11.2.0",
"chromatic": "11.3.0",
"dotenv": "16.4.5",
"dotenv-cli": "7.4.1",
"eslint": "8.57.0",
"eslint-config-next": "14.1.4",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-github": "1.1.4",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-codegen": "0.26.0",
"eslint-plugin-codegen": "0.28.0",
"eslint-plugin-i18next": "6.0.3",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-import": "npm:eslint-plugin-i@2.29.1",
"eslint-plugin-node": "npm:eslint-plugin-n@16.6.2",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-storybook": "0.8.0",
"eslint-plugin-turbo": "1.12.5",
"eslint-plugin-turbo": "1.13.2",
"husky": "9.0.11",
"knip": "5.9.1",
"lint-staged": "15.2.2",
"listr2": "8.0.2",
"listr2": "8.2.1",
"luxon": "3.4.4",
"merge-anything": "5.1.7",
"prettier": "3.2.5",
"prettier-plugin-jsdoc": "1.3.0",
"prettier-plugin-packagejson": "2.4.12",
"prettier-plugin-packagejson": "2.4.14",
"prettier-plugin-prisma": "5.0.0",
"prisma": "5.11.0",
"prisma": "5.12.1",
"react-docgen-typescript": "2.2.2",
"storybook": "7.6.17",
"tsx": "4.7.1",
"turbo": "1.12.5",
"type-fest": "4.13.1",
"typescript": "5.4.2"
"storybook": "8.0.6",
"tsx": "4.7.2",
"turbo": "1.13.2",
"type-fest": "4.15.0",
"typescript": "5.4.4"
},
"packageManager": "pnpm@8.15.5",
"packageManager": "pnpm@8.15.6",
"engines": {
"node": "^20.0.0",
"pnpm": "^8.0.0"
Expand All @@ -138,10 +138,5 @@
"budgetPercentIncreaseRed": 20,
"minimumChangeThreshold": 512,
"showDetails": true
},
"pnpm": {
"overrides": {
"eslint-plugin-import": "npm:eslint-plugin-i"
}
}
}
Loading

0 comments on commit 1e2a5c1

Please sign in to comment.