Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: 2024-04-18 #403

Merged
merged 25 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7181a35
vercel config
JoeKarow Apr 12, 2024
1ecea86
fix(deps): update next.js to v14.2.1
renovate[bot] Apr 15, 2024
4b49eb1
fix(deps): update next.js to v14.2.1 (#395)
kodiakhq[bot] Apr 15, 2024
98b5d3e
fix(deps): update all non-major dependencies
renovate[bot] Apr 15, 2024
c788bfb
fix(deps): update all non-major dependencies (#389)
kodiakhq[bot] Apr 15, 2024
b6fa4ab
chore(deps): update pnpm to v9
renovate[bot] Apr 17, 2024
375308f
chore(deps): update pnpm to v9 (#396)
kodiakhq[bot] Apr 17, 2024
5e5dc78
chore(deps): pin dependencies
renovate[bot] Apr 18, 2024
3488a1a
chore(deps): pin dependencies (#397)
kodiakhq[bot] Apr 18, 2024
1eb3b7f
setup relative-ci
JoeKarow Apr 18, 2024
dcd6312
style: format code with Prettier
deepsource-autofix[bot] Apr 18, 2024
1c4116f
chore: lint & format
InReach-svc Apr 18, 2024
0f5d634
style: format code with Prettier
deepsource-autofix[bot] Apr 18, 2024
b881022
disable prettier on deepsource
JoeKarow Apr 18, 2024
b66ef49
chore: lint & format
InReach-svc Apr 18, 2024
afda5ed
chore: relative-ci (#399)
kodiakhq[bot] Apr 18, 2024
333416f
chore(deps): update github actions
renovate[bot] Apr 18, 2024
8584b2a
chore(deps): update github actions (#398)
kodiakhq[bot] Apr 18, 2024
f2ad4df
chore(deps): update all non-major dependencies
renovate[bot] Apr 18, 2024
a329310
fix(deps): update next.js to v14.2.2
renovate[bot] Apr 18, 2024
7fd1d44
update lockfile
JoeKarow Apr 18, 2024
95ea212
update lockfile
JoeKarow Apr 18, 2024
fd70a1e
chore(deps): update all non-major dependencies (#400)
kodiakhq[bot] Apr 18, 2024
d9c4cf7
Merge branch 'dev' into renovate/next.js
JoeKarow Apr 18, 2024
372ecca
fix(deps): update next.js to v14.2.2 (#401)
kodiakhq[bot] Apr 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions .deepsource.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
version = 1

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

[[analyzers]]
name = "secrets"
name = "secrets"

[[analyzers]]
name = "javascript"
name = "javascript"

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

[[transformers]]
name = "prettier"
# [[transformers]]
# name = "prettier"
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@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3
uses: github/codeql-action/init@c7f9125735019aa87cfc361530512d50ea439c71 # v3
- name: 🚀 Perform CodeQL Analysis
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3
uses: github/codeql-action/analyze@c7f9125735019aa87cfc361530512d50ea439c71 # 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 @@ -66,7 +66,7 @@ jobs:
run: npx -p nextjs-bundle-analysis report

- name: Upload bundle
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4
uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4
with:
name: bundle
path: .next/analyze/__bundle_analysis.json
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12.1
20.12.2
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: "react-docgen-typescript", //'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')))
}
38 changes: 19 additions & 19 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
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 { 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 = {
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 @@ -38,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
}
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
"typescript.tsdk": "node_modules/typescript/lib",
"markdownlint.config": {
"MD033": false
},
"sonarlint.connectedMode.project": {
"connectionId": "inreach",
"projectKey": "weareinreach_GLAAD"
}
}
11 changes: 10 additions & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* eslint-disable turbo/no-undeclared-env-vars */
// @ts-check
import bundleAnalyze from '@next/bundle-analyzer'
import { RelativeCiAgentWebpackPlugin } from '@relative-ci/agent'
import nextRoutes from 'nextjs-routes/config'

import i18nConfig from './next-i18next.config.js'
Expand All @@ -12,7 +13,9 @@ import i18nConfig from './next-i18next.config.js'
!process.env.SKIP_ENV_VALIDATION && (await import('./src/env/server.mjs'))

const withRoutes = nextRoutes({ outDir: 'src/types' })
const withBundleAnalyzer = bundleAnalyze({ enabled: process.env.ANALYZE === 'true' })
const withBundleAnalyzer = bundleAnalyze({
enabled: process.env.ANALYZE === 'true',
})

/** @type {import('next').NextConfig} */
const config = {
Expand All @@ -34,6 +37,12 @@ const config = {
},
eslint: { ignoreDuringBuilds: process.env.VERCEL_ENV !== 'production' },
typescript: { ignoreBuildErrors: process.env.VERCEL_ENV !== 'production' },
webpack: (config, { dev, isServer }) => {
if (!dev && !isServer) {
config.plugins.push(new RelativeCiAgentWebpackPlugin())
}
return config
},
}
/**
* Wraps NextJS config with the Bundle Analyzer config.
Expand Down
59 changes: 30 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
"with-env": "dotenv -e ./.env --"
},
"dependencies": {
"@crowdin/crowdin-api-client": "1.33.0",
"@crowdin/crowdin-api-client": "1.33.1",
"@emotion/react": "11.11.4",
"@emotion/server": "11.11.0",
"@mantine/carousel": "6.0.21",
"@mantine/core": "6.0.21",
"@mantine/form": "6.0.21",
"@mantine/hooks": "6.0.21",
"@mantine/next": "6.0.21",
"@neondatabase/serverless": "0.9.0",
"@next/bundle-analyzer": "14.1.4",
"@neondatabase/serverless": "0.9.1",
"@next/bundle-analyzer": "14.2.2",
"@prisma/adapter-neon": "5.12.1",
"@prisma/client": "5.12.1",
"@storybook/test": "8.0.6",
"@storybook/test": "8.0.8",
"@tabler/icons-react": "2.47.0",
"@tanstack/react-query": "4.36.1",
"@tanstack/react-query-devtools": "4.36.1",
Expand All @@ -55,12 +55,12 @@
"@vercel/speed-insights": "1.0.10",
"embla-carousel-auto-height": "7.1.0",
"embla-carousel-react": "7.1.0",
"i18next": "23.11.0",
"i18next": "23.11.2",
"i18next-browser-languagedetector": "7.2.1",
"i18next-http-backend": "2.5.0",
"i18next-http-backend": "2.5.1",
"nanoid": "5.0.7",
"next": "14.1.4",
"next-i18next": "15.2.0",
"next": "14.2.2",
"next-i18next": "15.3.0",
"next-sitemap": "4.2.3",
"nextjs-routes": "2.1.0",
"react": "18.2.0",
Expand All @@ -74,29 +74,30 @@
"devDependencies": {
"@faker-js/faker": "7.6.0",
"@paralleldrive/cuid2": "2.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",
"@relative-ci/agent": "4.2.6",
"@storybook/addon-a11y": "8.0.8",
"@storybook/addon-essentials": "8.0.8",
"@storybook/addon-interactions": "8.0.8",
"@storybook/addon-links": "8.0.8",
"@storybook/addon-viewport": "8.0.8",
"@storybook/blocks": "8.0.8",
"@storybook/nextjs": "8.0.8",
"@storybook/react": "8.0.8",
"@tomfreudenberg/next-auth-mock": "0.5.6",
"@types/luxon": "3.4.2",
"@types/node": "20.12.5",
"@types/react": "18.2.74",
"@types/react-dom": "18.2.24",
"@types/node": "20.12.7",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@types/umami": "0.1.5",
"@types/ws": "8.5.10",
"@typescript-eslint/eslint-plugin": "7.5.0",
"@typescript-eslint/parser": "7.5.0",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"boxen": "7.1.1",
"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-next": "14.2.2",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-github": "1.1.4",
"eslint-import-resolver-typescript": "3.6.1",
Expand All @@ -108,27 +109,27 @@
"eslint-plugin-storybook": "0.8.0",
"eslint-plugin-turbo": "1.13.2",
"husky": "9.0.11",
"knip": "5.9.1",
"knip": "5.9.4",
"lint-staged": "15.2.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.14",
"prettier-plugin-packagejson": "2.5.0",
"prettier-plugin-prisma": "5.0.0",
"prisma": "5.12.1",
"react-docgen-typescript": "2.2.2",
"storybook": "8.0.6",
"storybook": "8.0.8",
"tsx": "4.7.2",
"turbo": "1.13.2",
"type-fest": "4.15.0",
"typescript": "5.4.4"
"typescript": "5.4.5"
},
"packageManager": "pnpm@8.15.6",
"packageManager": "pnpm@9.0.2",
"engines": {
"node": "^20.0.0",
"pnpm": "^8.0.0"
"node": "20.12.2",
"pnpm": "9.0.2"
},
"ct3aMetadata": {
"initVersion": "7.3.2"
Expand Down
Loading
Loading