diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b1c467403..192cc66f4 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -9,7 +9,6 @@ "christian-kohler.npm-intellisense", "christian-kohler.path-intellisense", "antfu.unocss", - "astro-build.astro-vscode", "unifiedjs.vscode-mdx" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 90194ce05..53daf1e1a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,6 @@ { "eslint.workingDirectories": [{ "pattern": "./apps/*" }, { "pattern": "./packages/*" }], "eslint.validate": ["javascript", "javascriptreact", "astro", "typescript", "typescriptreact"], - "prettier.documentSelectors": ["**/*.astro"], "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { diff --git a/.yarnrc.yml b/.yarnrc.yml index 77aea0556..d7eb258e4 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -11,3 +11,8 @@ plugins: spec: 'https://github.com/Dcard/yarn-plugins/releases/latest/download/plugin-docker-build.js' yarnPath: .yarn/releases/yarn-3.5.0.cjs + +packageExtensions: + '@storybook/core-common@*': + dependencies: + '@storybook/react-vite': '7.0.4' diff --git a/apps/guide/.eslintrc.json b/apps/guide/.eslintrc.json index d4eb55f48..612db2721 100644 --- a/apps/guide/.eslintrc.json +++ b/apps/guide/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["../../.eslintrc.json", "neon/react", "neon/next", "neon/edge", "neon/prettier"], + "extends": ["../../.eslintrc.json", "neon/react", "neon/next", "neon/edge", "@unocss", "neon/prettier"], "settings": { "react": { "version": "detect" diff --git a/apps/guide/.prettierrc.cjs b/apps/guide/.prettierrc.cjs index d23089afe..f004026c7 100644 --- a/apps/guide/.prettierrc.cjs +++ b/apps/guide/.prettierrc.cjs @@ -1,7 +1 @@ -module.exports = { - ...require('../../.prettierrc.json'), - plugins: [ - 'prettier-plugin-tailwindcss', // MUST come last - ], - pluginSearchDirs: false, -}; +module.exports = require('../../.prettierrc.json'); diff --git a/apps/guide/package.json b/apps/guide/package.json index 5f7e7d202..46ad617da 100644 --- a/apps/guide/package.json +++ b/apps/guide/package.json @@ -43,13 +43,13 @@ }, "homepage": "https://discord.js.org", "dependencies": { - "@code-hike/mdx": "^0.8.1", + "@code-hike/mdx": "^0.8.2", "@discordjs/ui": "workspace:^", "@react-icons/all-files": "^4.1.0", "@vercel/analytics": "^0.1.11", - "@vercel/edge-config": "^0.1.6", - "@vercel/og": "^0.5.1", - "ariakit": "^2.0.0-next.43", + "@vercel/edge-config": "^0.1.7", + "@vercel/og": "^0.5.2", + "ariakit": "^2.0.0-next.44", "cmdk": "^0.2.0", "contentlayer": "^0.3.1", "next": "^13.3.0", @@ -73,27 +73,27 @@ "@testing-library/react": "^14.0.0", "@testing-library/user-event": "^14.4.3", "@types/node": "18.15.11", - "@types/react": "^18.0.33", + "@types/react": "^18.0.35", "@types/react-dom": "^18.0.11", - "@unocss/cli": "^0.51.0", - "@unocss/reset": "^0.51.0", + "@unocss/cli": "^0.51.4", + "@unocss/eslint-config": "^0.51.4", + "@unocss/reset": "^0.51.4", "@vitejs/plugin-react": "^3.1.0", - "@vitest/coverage-c8": "^0.29.8", + "@vitest/coverage-c8": "^0.30.1", "concurrently": "^8.0.1", "cross-env": "^7.0.3", "eslint": "^8.38.0", "eslint-config-neon": "^0.1.42", "eslint-formatter-pretty": "^5.0.0", - "happy-dom": "^9.1.9", + "happy-dom": "^9.5.0", "hast-util-to-string": "^2.0.0", "hastscript": "^7.2.0", "html-escaper": "^3.0.3", "lighthouse": "^10.1.0", "prettier": "^2.8.7", - "prettier-plugin-tailwindcss": "^0.2.7", "typescript": "^5.0.4", - "unocss": "^0.51.0", - "vercel": "^28.18.4", + "unocss": "^0.51.4", + "vercel": "^28.18.5", "vitest": "^0.29.8" }, "engines": { diff --git a/apps/guide/src/app/error.tsx b/apps/guide/src/app/error.tsx index 9ccf5a764..cf88c8951 100644 --- a/apps/guide/src/app/error.tsx +++ b/apps/guide/src/app/error.tsx @@ -4,7 +4,7 @@ export default function Error({ error }: { error: Error }) { console.error(error); return ( -