move all content of website folder to root (#1641)

* move public

* move website

* rest

* update node

.eslintrc.cjs

@@ -2,7 +2,7 @@ module.exports = {
   root: true,
   overrides: [
     {
-      files: ["website/**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}"],
+      files: ["**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts}"],
       extends: ["plugin:tailwindcss/recommended"],
       parser: "@typescript-eslint/parser",
       parserOptions: {
@@ -14,11 +14,6 @@ module.exports = {
       },
       settings: {
         tailwindcss: {
-          config: "website/tailwind.config.ts",
-          cssFiles: [
-            "website/node_modules/nextra-theme-docs/dist/style.css",
-            "website/src/globals.css",
-          ],
           whitelist: ["roboto-mono"],
         },
       },

.github/workflows/prettier.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: the-guild-org/shared-config/setup@main
         name: setup env
         with:
-          nodeVersion: 20.1.0
+          nodeVersion: 20.9.0
           packageManager: pnpm
           workingDirectory: ./
           packageManagerVersion: 8.15.5

.gitignore

@@ -5,7 +5,6 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-old
 # Runtime data
 pids
 *.pid
@@ -21,15 +20,6 @@ coverage
 # nyc test coverage
 .nyc_output
 
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
@@ -61,12 +51,6 @@ static/img/__og-image/*
 # Mac files
 .DS_Store
 
-# Yarn
-.pnp/
-.pnp.js
-# Yarn Integrity file
-.yarn-integrity
-
 # Swap files
 *.swp
 
@@ -75,6 +59,5 @@ src/__generated__/
 
 .idea/
 .next/
-static/sitemap.xml
-website/out/
-/public/
+public/sitemap.xml
+out/

.node-version

@@ -1 +1 @@
-18.16.0
+20.9.0

.prettierignore

@@ -1,4 +1 @@
-.cache
-package.json
-package-lock.json
 public

website/next.config.js → next.config.js

@@ -2,7 +2,7 @@ import nextra from "nextra"
 import path from "node:path"
 import withLess from "next-with-less"
 import { remarkGraphiQLComment } from "./src/remark-graphiql-comment.js"
-import vercelJSON from "../vercel.json" assert { type: "json" }
+import vercelJSON from "./vercel.json" assert { type: "json" }
 
 const withNextra = nextra({
   theme: "nextra-theme-docs",
@@ -39,7 +39,6 @@ export default withLess(
     images: {
       unoptimized: true,
     },
-    distDir: process.env.NODE_ENV === "production" ? "../public" : undefined,
     trailingSlash: true,
     // `statusCode` is not undefined or valid statusCode for route {"source":"/conf/attendee/:path*","destination":"https://graphql-conf-attendee-nextjs.vercel.app/:path*","statusCode":200}
     // `statusCode` is not undefined or valid statusCode for route {"source":"/swapi-graphql/:path*","destination":"https://graphql.github.io/swapi-graphql/:path*","statusCode":200}

package.json

@@ -3,12 +3,17 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "build": "cd website && pnpm i && pnpm build",
+    "dev": "next",
+    "//prebuild": "tsx --env-file=.env src/get-github-info.ts",
+    "build": "next build",
+    "postbuild": "next-sitemap --config next-sitemap.config.cjs",
+    "start": "next start",
     "format": "pnpm format:check --write",
     "format:check": "prettier --cache --check \"**/*.{js,jsx,ts,tsx,json,md}\"",
     "lint": "eslint --ignore-path .gitignore .",
     "test": "echo \"no tests\" && exit 1"
   },
+  "type": "module",
   "resolutions": {
     "graphql": "16.6.0"
   },
@@ -21,14 +26,49 @@
     "numbro": "2.3.6",
     "parser-front-matter": "1.6.4",
     "string-similarity": "^4.0.4",
-    "timeago.js": "4.0.2"
+    "timeago.js": "4.0.2",
+    "@radix-ui/react-radio-group": "^1.1.3",
+    "leaflet": "^1.9.4",
+    "iframe-resizer-react": "^1.1.0",
+    "gray-matter": "^4.0.3",
+    "@headlessui/react": "^1.7.17",
+    "@heroicons/react": "^2.0.18",
+    "@radix-ui/react-icons": "^1.3.0",
+    "clsx": "^2.1.0",
+    "fast-glob": "^3.3.2",
+    "markdown-to-jsx": "^7.4.0",
+    "next": "^14.1.4",
+    "next-query-params": "^5.0.0",
+    "next-sitemap": "^4.2.3",
+    "next-with-less": "^3.0.1",
+    "nextra": "3.0.0-alpha.22",
+    "nextra-theme-docs": "3.0.0-alpha.22",
+    "p-limit": "^4.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "server-only": "0.0.1",
+    "server-only-context": "^0.1.0",
+    "string-strip-html": "^13.4.5",
+    "unist-util-visit": "^5.0.0",
+    "use-query-params": "^2.2.1",
+    "tailwindcss": "^3.4.1",
+    "@tailwindcss/nesting": "0.0.0-insiders.565cd3e",
+    "@tailwindcss/typography": "^0.5.10",
+    "postcss": "^8.4.33",
+    "@svgr/webpack": "^8.0.1",
+    "@types/node": "^20.11.30",
+    "@types/react": "^18.2.73",
+    "autoprefixer": "^10.4.17",
+    "tsx": "^4.7.0",
+    "react-medium-image-zoom": "5.1.8",
+    "date-fns": "^2.30.0"
   },
   "devDependencies": {
     "@types/codemirror": "5.60.7",
-    "@types/string-similarity": "^4.0.0",
-    "@typescript-eslint/parser": "5.59.7",
-    "eslint": "8.42.0",
-    "eslint-plugin-tailwindcss": "3.14.0",
+    "@types/string-similarity": "^4.0.2",
+    "@typescript-eslint/parser": "7.4.0",
+    "eslint": "8.57.0",
+    "eslint-plugin-tailwindcss": "3.15.1",
     "prettier": "3.2.4",
     "typescript": "^5.3.3"
   }