Skip to content

Commit 2968c5c

Browse files
authored
Merge pull request #106 from Howard86/feature/bump-all-dependencies-0915
Feature/bump all dependencies 0915
2 parents ce35f61 + 107b7c3 commit 2968c5c

File tree

20 files changed

+2702
-2294
lines changed

20 files changed

+2702
-2294
lines changed

.circleci/config.yml

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
# https://circleci.com/docs/2.0/language-javascript/
22
version: 2.1
3+
34
orbs:
4-
codecov: codecov/[email protected]
5-
cypress: cypress-io/[email protected]
6-
executors:
7-
cypress-node:
8-
docker:
9-
- image: 'cypress/base:16.18.1'
5+
codecov: codecov/[email protected]
6+
cypress: cypress-io/[email protected]
7+
108
jobs:
11-
'node-16':
9+
unit-test-and-check-coverage:
1210
docker:
13-
- image: cimg/node:16.20.0
11+
- image: cimg/node:18.17.1
1412
resource_class: large
15-
parallelism: 1
1613

1714
steps:
1815
- checkout
@@ -23,8 +20,8 @@ jobs:
2320
- run:
2421
name: Install pnpm package manager
2522
command: |
26-
corepack enable
27-
corepack prepare pnpm@latest --activate
23+
sudo corepack enable
24+
sudo corepack prepare pnpm@8.7.0 --activate
2825
2926
- run:
3027
name: Install Dependencies
@@ -48,16 +45,44 @@ jobs:
4845
name: Verify coverages are meeting standards
4946
command: pnpm turbo run cov:check --filter=next-api-handler
5047

48+
- store_test_results:
49+
path: packages/next-api-handler/coverage
50+
51+
install-cypress-and-persist:
52+
executor:
53+
name: cypress/default
54+
node-version: 18.17.1
55+
steps:
56+
- cypress/install:
57+
cypress-cache-key: cypress-cache-{{ arch }}-{{ checksum "../../packages/next-api-handler/package.json" }}-{{ checksum "package.json" }}
58+
working-directory: apps/example
59+
install-command: sudo corepack enable && sudo corepack prepare [email protected] --activate && pnpm install --frozen-lockfile=false
60+
post-install: pnpm turbo run build --filter=example
61+
- persist_to_workspace:
62+
root: ~/
63+
paths:
64+
- .cache/Cypress
65+
- project
66+
67+
run-test-in-parallel:
68+
executor:
69+
name: cypress/default
70+
node-version: 18.17.1
71+
steps:
72+
- attach_workspace:
73+
at: ~/
74+
- cypress/run-tests:
75+
working-directory: apps/example
76+
start-command: pnpm turbo run start --filter=example
77+
cypress-command: pnpm cypress:headless --record --parallel --ci-build-id $CIRCLE_WORKFLOW_ID
78+
5179
workflows:
52-
version: 2
53-
build:
80+
build-and-test:
5481
jobs:
55-
- 'node-16'
56-
- cypress/run:
57-
executor: cypress-node
58-
working_directory: apps/example
59-
record: true
60-
tags: circleci
61-
build: cd ../.. && pnpm turbo run build --filter=example
62-
start: cd ../.. && pnpm turbo run start --filter=example
63-
install-command: npm i -g pnpm && pnpm install --frozen-lockfile=false
82+
- unit-test-and-check-coverage
83+
- install-cypress-and-persist:
84+
requires:
85+
- unit-test-and-check-coverage
86+
- run-test-in-parallel:
87+
requires:
88+
- install-cypress-and-persist

apps/doc/package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
},
1414
"browserslist": "defaults, not ie <= 11",
1515
"dependencies": {
16-
"@docsearch/react": "^3.3.3",
17-
"@headlessui/react": "^1.7.13",
18-
"@markdoc/markdoc": "^0.2.2",
19-
"@markdoc/next.js": "^0.2.2",
20-
"@sindresorhus/slugify": "^2.2.0",
21-
"clsx": "^1.2.1",
16+
"@docsearch/react": "^3.5.2",
17+
"@headlessui/react": "^1.7.17",
18+
"@markdoc/markdoc": "^0.3.2",
19+
"@markdoc/next.js": "^0.3.3",
20+
"@sindresorhus/slugify": "^2.2.1",
21+
"clsx": "^2.0.0",
2222
"focus-visible": "^5.2.0",
23-
"next": "^13.2.4",
24-
"prism-react-renderer": "^1.3.5",
23+
"next": "^13.4.19",
24+
"prism-react-renderer": "^2.0.6",
2525
"react": "^18.2.0",
2626
"react-dom": "^18.2.0"
2727
},
2828
"devDependencies": {
29-
"@algolia/client-search": "^4.15.0",
30-
"@tailwindcss/typography": "^0.5.9",
31-
"@types/react": "^18.0.28",
32-
"@types/react-dom": "^18.0.11",
33-
"autoprefixer": "^10.4.14",
29+
"@algolia/client-search": "^4.20.0",
30+
"@tailwindcss/typography": "^0.5.10",
31+
"@types/react": "^18.2.21",
32+
"@types/react-dom": "^18.2.7",
33+
"autoprefixer": "^10.4.15",
3434
"eslint-config-custom": "workspace:*",
35-
"postcss": "^8.4.21",
36-
"postcss-focus-visible": "^8.0.2",
35+
"postcss": "^8.4.29",
36+
"postcss-focus-visible": "^9.0.0",
3737
"postcss-import": "^15.1.0",
38-
"prettier": "^2.8.4",
39-
"prettier-plugin-tailwindcss": "^0.2.4",
40-
"tailwindcss": "^3.2.7",
38+
"prettier": "^3.0.3",
39+
"prettier-plugin-tailwindcss": "^0.5.4",
40+
"tailwindcss": "^3.3.3",
4141
"tsconfig": "workspace:*"
4242
}
4343
}

apps/doc/prettier.config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
const base = require('../../prettier.config');
2+
13
module.exports = {
2-
singleQuote: true,
3-
plugins: [require('prettier-plugin-tailwindcss')],
4+
...base,
5+
plugins: ['prettier-plugin-tailwindcss'],
46
};

apps/doc/src/components/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type DefaultLinkProps = Omit<
1616

1717
type ButtonOrLinkProps<
1818
IsLink extends boolean,
19-
IsExternal extends boolean = false
19+
IsExternal extends boolean = false,
2020
> = IsLink extends true
2121
? IsExternal extends true
2222
? DefaultLinkProps

apps/doc/src/components/Fence.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Highlight, { defaultProps, Language } from 'prism-react-renderer';
1+
import { Highlight, Language } from 'prism-react-renderer';
22
import { Fragment } from 'react';
33

44
interface FenceProps {
@@ -8,12 +8,7 @@ interface FenceProps {
88

99
export function Fence({ children, language }: FenceProps) {
1010
return (
11-
<Highlight
12-
{...defaultProps}
13-
code={children.trimEnd()}
14-
language={language}
15-
theme={undefined}
16-
>
11+
<Highlight code={children.trimEnd()} language={language} theme={undefined}>
1712
{({ className, style, tokens, getTokenProps }) => (
1813
<pre className={className} style={style}>
1914
<code>

apps/doc/src/components/Hero.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import clsx from 'clsx';
22
import Image from 'next/image';
3-
import Highlight, { defaultProps } from 'prism-react-renderer';
3+
import { Highlight } from 'prism-react-renderer';
44
import { Fragment } from 'react';
55

66
import { Button } from '@/components/Button';
@@ -42,11 +42,11 @@ function TrafficLightsIcon(props: React.SVGProps<SVGSVGElement>) {
4242
export function Hero() {
4343
return (
4444
<div className="overflow-hidden bg-slate-900 dark:-mb-32 dark:mt-[-4.5rem] dark:pb-32 dark:pt-[4.5rem] dark:lg:mt-[-4.75rem] dark:lg:pt-[4.75rem]">
45-
<div className="py-16 sm:px-2 lg:relative lg:py-20 lg:px-0">
46-
<div className="mx-auto grid max-w-2xl grid-cols-1 items-center gap-y-16 gap-x-8 px-4 lg:max-w-8xl lg:grid-cols-2 lg:px-8 xl:gap-x-16 xl:px-12">
45+
<div className="py-16 sm:px-2 lg:relative lg:px-0 lg:py-20">
46+
<div className="mx-auto grid max-w-2xl grid-cols-1 items-center gap-x-8 gap-y-16 px-4 lg:max-w-8xl lg:grid-cols-2 lg:px-8 xl:gap-x-16 xl:px-12">
4747
<div className="relative z-10 md:text-center lg:text-left">
4848
<Image
49-
className="absolute bottom-full right-full -mr-72 -mb-56 opacity-50"
49+
className="absolute bottom-full right-full -mb-56 -mr-72 opacity-50"
5050
src={blurCyanImage}
5151
alt=""
5252
width={530}
@@ -72,12 +72,12 @@ export function Hero() {
7272
</div>
7373
</div>
7474
<div className="relative lg:static xl:pl-10">
75-
<div className="absolute inset-x-[-50vw] -top-32 -bottom-48 [mask-image:linear-gradient(transparent,white,white)] dark:[mask-image:linear-gradient(transparent,white,transparent)] lg:left-[calc(50%+14rem)] lg:right-0 lg:-top-32 lg:-bottom-32 lg:[mask-image:none] lg:dark:[mask-image:linear-gradient(white,white,transparent)]">
76-
<HeroBackground className="absolute top-1/2 left-1/2 -translate-y-1/2 -translate-x-1/2 lg:left-0 lg:translate-x-0 lg:translate-y-[-60%]" />
75+
<div className="absolute inset-x-[-50vw] -bottom-48 -top-32 [mask-image:linear-gradient(transparent,white,white)] dark:[mask-image:linear-gradient(transparent,white,transparent)] lg:-bottom-32 lg:-top-32 lg:left-[calc(50%+14rem)] lg:right-0 lg:[mask-image:none] lg:dark:[mask-image:linear-gradient(white,white,transparent)]">
76+
<HeroBackground className="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 lg:left-0 lg:translate-x-0 lg:translate-y-[-60%]" />
7777
</div>
7878
<div className="relative">
7979
<Image
80-
className="absolute -top-64 -right-64"
80+
className="absolute -right-64 -top-64"
8181
src={blurCyanImage}
8282
alt=""
8383
width={530}
@@ -138,7 +138,6 @@ export function Hero() {
138138
))}
139139
</div>
140140
<Highlight
141-
{...defaultProps}
142141
code={code}
143142
language={codeLanguage}
144143
theme={undefined}

apps/doc/src/components/Layout.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ export function Layout({ children, title, tableOfContents }: LayoutProps) {
123123
<div className="relative mx-auto flex max-w-8xl justify-center sm:px-2 lg:px-8 xl:px-12">
124124
<div className="hidden lg:relative lg:block lg:flex-none">
125125
<div className="absolute inset-y-0 right-0 w-[50vw] bg-slate-50 dark:hidden" />
126-
<div className="absolute top-16 bottom-0 right-0 hidden h-12 w-px bg-gradient-to-t from-slate-800 dark:block" />
127-
<div className="absolute top-28 bottom-0 right-0 hidden w-px bg-slate-800 dark:block" />
126+
<div className="absolute bottom-0 right-0 top-16 hidden h-12 w-px bg-gradient-to-t from-slate-800 dark:block" />
127+
<div className="absolute bottom-0 right-0 top-28 hidden w-px bg-slate-800 dark:block" />
128128
<div className="sticky top-[4.5rem] -ml-0.5 h-[calc(100vh-4.5rem)] overflow-y-auto overflow-x-hidden py-16 pl-0.5">
129129
<Navigation
130130
navigation={navigation}
131131
className="w-64 pr-8 xl:w-72 xl:pr-16"
132132
/>
133133
</div>
134134
</div>
135-
<div className="min-w-0 max-w-2xl flex-auto px-4 py-16 lg:max-w-none lg:pr-0 lg:pl-8 xl:px-16">
135+
<div className="min-w-0 max-w-2xl flex-auto px-4 py-16 lg:max-w-none lg:pl-8 lg:pr-0 xl:px-16">
136136
<article>
137137
{(title || section) && (
138138
<header className="mb-9 space-y-1">

apps/doc/src/components/MobileNavigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export function MobileNavigation({
7777
className="fixed inset-0 z-50 flex items-start overflow-y-auto bg-slate-900/50 pr-10 backdrop-blur lg:hidden"
7878
aria-label="Navigation"
7979
>
80-
<Dialog.Panel className="min-h-full w-full max-w-xs bg-white px-4 pt-5 pb-12 dark:bg-slate-900 sm:px-6">
80+
<Dialog.Panel className="min-h-full w-full max-w-xs bg-white px-4 pb-12 pt-5 dark:bg-slate-900 sm:px-6">
8181
<div className="flex items-center">
8282
<button
8383
type="button"

apps/doc/src/components/ThemeSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export function ThemeSelector(props: React.ComponentProps<typeof Listbox>) {
9090
<LightIcon className="hidden h-4 w-4 fill-slate-400 [:not(.dark)[data-theme=system]_&]:block" />
9191
<DarkIcon className="hidden h-4 w-4 fill-slate-400 [.dark[data-theme=system]_&]:block" />
9292
</Listbox.Button>
93-
<Listbox.Options className="absolute top-full left-1/2 mt-3 w-36 -translate-x-1/2 space-y-1 rounded-xl bg-white p-3 text-sm font-medium shadow-md shadow-black/5 ring-1 ring-black/5 dark:bg-slate-800 dark:ring-white/5">
93+
<Listbox.Options className="absolute left-1/2 top-full mt-3 w-36 -translate-x-1/2 space-y-1 rounded-xl bg-white p-3 text-sm font-medium shadow-md shadow-black/5 ring-1 ring-black/5 dark:bg-slate-800 dark:ring-white/5">
9494
{themes.map((theme) => (
9595
<Listbox.Option
9696
key={theme.value}

apps/doc/src/pages/docs/utility-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ export type TypedObject<T = unknown> = Record<string, T>;
2020

2121
export type NextApiHandlerWithMiddleware<
2222
T = unknown,
23-
M extends TypedObject = TypedObject
23+
M extends TypedObject = TypedObject,
2424
> = (
2525
req: NextApiRequestWithMiddleware<M>,
2626
res: NextApiResponse
2727
) => T | Promise<T> | void;
2828

2929
export interface NextApiRequestWithMiddleware<
30-
M extends TypedObject = TypedObject
30+
M extends TypedObject = TypedObject,
3131
> extends NextApiRequest {
3232
middleware: M;
3333
}

0 commit comments

Comments
 (0)