🧨 (revamp) NICE-43 Next RSC, Notion API, & Tailwind [b] [!]

.eslintrc.cjs

@@ -38,14 +38,28 @@ module.exports = {
     }, // ⚙️ sites/jeromefitzgerald.com
     {
       extends: ['@jeromefitz/eslint-config/tailwind.cjs'],
-      files: 'sites/jeromefitzgerald.com/**',
+      files: 'sites/**',
       rules: nextOverrides.rules,
       settings: {
         tailwindcss: {
           config: `${fullCwd}/sites/jeromefitzgerald.com/tailwind.config.js`,
           callees: ['cx', 'tw'],
-          // @todo(eslint-plugin-tailwindcss) submit pr for allowlist
-          whitelist: ['afc', 'afc2', 'icon-custom', 'trap'],
+          /**
+           * @todo(eslint-plugin-tailwindcss) submit pr for allowlist
+           * @note(radix) dynamic variables need to be identified one-by-one here
+           */
+          whitelist: [
+            '_background',
+            '-button',
+            '-radix-',
+            'afc',
+            'afc2',
+            'bg-radix-',
+            'icon-custom',
+            'notion-',
+            'text-radix-',
+            'trap',
+          ],
         },
       },
     },

.github/workflows/pull.yml

@@ -24,12 +24,21 @@ env:
   GH_TOKEN: ${{ secrets.GH_DEPLOY_TOKEN }}
   GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
   LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
-  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN: ${{ secrets.NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN }}
   NEXT_PUBLIC__FATHOM_SITE_ID: ${{ secrets.NEXT_PUBLIC__FATHOM_SITE_ID }}
   NEXT_PUBLIC__SITE: ${{ vars.NEXT_PUBLIC__SITE }}
   NEXT_TELEMETRY_DISABLED: ${{ vars.NEXT_TELEMETRY_DISABLED }}
+  NOTION__DATABASE__BLOG: ${{ secrets.NOTION__DATABASE__BLOG }}
+  NOTION__DATABASE__BOOKS: ${{ secrets.NOTION__DATABASE__BOOKS }}
+  NOTION__DATABASE__EPISODES: ${{ secrets.NOTION__DATABASE__EPISODES }}
+  NOTION__DATABASE__EVENTS: ${{ secrets.NOTION__DATABASE__EVENTS }}
+  NOTION__DATABASE__PAGES: ${{ secrets.NOTION__DATABASE__PAGES }}
+  NOTION__DATABASE__PEOPLE: ${{ secrets.NOTION__DATABASE__PEOPLE }}
+  NOTION__DATABASE__PODCASTS: ${{ secrets.NOTION__DATABASE__PODCASTS }}
+  NOTION__DATABASE__SHOWS: ${{ secrets.NOTION__DATABASE__SHOWS }}
+  NOTION__DATABASE__VENUES: ${{ secrets.NOTION__DATABASE__VENUES }}
   NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   OCTOKIT_TOKEN: ${{ secrets.OCTOKIT_TOKEN }}
   OG_API_KEY: ${{ secrets.OG_API_KEY }}
   PREVIEW_TOKEN: ${{ secrets.PREVIEW_TOKEN }}
@@ -59,12 +68,21 @@ jobs:
       GH_TOKEN: ${{ secrets.GH_DEPLOY_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
       LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
-      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN: ${{ secrets.NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN }}
       NEXT_PUBLIC__FATHOM_SITE_ID: ${{ secrets.NEXT_PUBLIC__FATHOM_SITE_ID }}
       NEXT_PUBLIC__SITE: ${{ vars.NEXT_PUBLIC__SITE }}
       NEXT_TELEMETRY_DISABLED: ${{ vars.NEXT_TELEMETRY_DISABLED }}
+      NOTION__DATABASE__BLOG: ${{ secrets.NOTION__DATABASE__BLOG }}
+      NOTION__DATABASE__BOOKS: ${{ secrets.NOTION__DATABASE__BOOKS }}
+      NOTION__DATABASE__EPISODES: ${{ secrets.NOTION__DATABASE__EPISODES }}
+      NOTION__DATABASE__EVENTS: ${{ secrets.NOTION__DATABASE__EVENTS }}
+      NOTION__DATABASE__PAGES: ${{ secrets.NOTION__DATABASE__PAGES }}
+      NOTION__DATABASE__PEOPLE: ${{ secrets.NOTION__DATABASE__PEOPLE }}
+      NOTION__DATABASE__PODCASTS: ${{ secrets.NOTION__DATABASE__PODCASTS }}
+      NOTION__DATABASE__SHOWS: ${{ secrets.NOTION__DATABASE__SHOWS }}
+      NOTION__DATABASE__VENUES: ${{ secrets.NOTION__DATABASE__VENUES }}
       NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       OCTOKIT_TOKEN: ${{ secrets.OCTOKIT_TOKEN }}
       OG_API_KEY: ${{ secrets.OG_API_KEY }}
       PREVIEW_TOKEN: ${{ secrets.PREVIEW_TOKEN }}

.github/workflows/push.yml

@@ -23,12 +23,21 @@ env:
   GH_TOKEN: ${{ secrets.GH_DEPLOY_TOKEN }}
   GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
   LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
-  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN: ${{ secrets.NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN }}
   NEXT_PUBLIC__FATHOM_SITE_ID: ${{ secrets.NEXT_PUBLIC__FATHOM_SITE_ID }}
   NEXT_PUBLIC__SITE: ${{ vars.NEXT_PUBLIC__SITE }}
   NEXT_TELEMETRY_DISABLED: ${{ vars.NEXT_TELEMETRY_DISABLED }}
+  NOTION__DATABASE__BLOG: ${{ secrets.NOTION__DATABASE__BLOG }}
+  NOTION__DATABASE__BOOKS: ${{ secrets.NOTION__DATABASE__BOOKS }}
+  NOTION__DATABASE__EPISODES: ${{ secrets.NOTION__DATABASE__EPISODES }}
+  NOTION__DATABASE__EVENTS: ${{ secrets.NOTION__DATABASE__EVENTS }}
+  NOTION__DATABASE__PAGES: ${{ secrets.NOTION__DATABASE__PAGES }}
+  NOTION__DATABASE__PEOPLE: ${{ secrets.NOTION__DATABASE__PEOPLE }}
+  NOTION__DATABASE__PODCASTS: ${{ secrets.NOTION__DATABASE__PODCASTS }}
+  NOTION__DATABASE__SHOWS: ${{ secrets.NOTION__DATABASE__SHOWS }}
+  NOTION__DATABASE__VENUES: ${{ secrets.NOTION__DATABASE__VENUES }}
   NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   OCTOKIT_TOKEN: ${{ secrets.OCTOKIT_TOKEN }}
   OG_API_KEY: ${{ secrets.OG_API_KEY }}
   PREVIEW_TOKEN: ${{ secrets.PREVIEW_TOKEN }}
@@ -58,12 +67,21 @@ jobs:
       GH_TOKEN: ${{ secrets.GH_DEPLOY_TOKEN }}
       GITHUB_TOKEN: ${{ secrets.GH_BOT_TOKEN }}
       LHCI_GITHUB_APP_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
-      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN: ${{ secrets.NEXT_PUBLIC__FATHOM_CUSTOM_DOMAIN }}
       NEXT_PUBLIC__FATHOM_SITE_ID: ${{ secrets.NEXT_PUBLIC__FATHOM_SITE_ID }}
       NEXT_PUBLIC__SITE: ${{ vars.NEXT_PUBLIC__SITE }}
       NEXT_TELEMETRY_DISABLED: ${{ vars.NEXT_TELEMETRY_DISABLED }}
+      NOTION__DATABASE__BLOG: ${{ secrets.NOTION__DATABASE__BLOG }}
+      NOTION__DATABASE__BOOKS: ${{ secrets.NOTION__DATABASE__BOOKS }}
+      NOTION__DATABASE__EPISODES: ${{ secrets.NOTION__DATABASE__EPISODES }}
+      NOTION__DATABASE__EVENTS: ${{ secrets.NOTION__DATABASE__EVENTS }}
+      NOTION__DATABASE__PAGES: ${{ secrets.NOTION__DATABASE__PAGES }}
+      NOTION__DATABASE__PEOPLE: ${{ secrets.NOTION__DATABASE__PEOPLE }}
+      NOTION__DATABASE__PODCASTS: ${{ secrets.NOTION__DATABASE__PODCASTS }}
+      NOTION__DATABASE__SHOWS: ${{ secrets.NOTION__DATABASE__SHOWS }}
+      NOTION__DATABASE__VENUES: ${{ secrets.NOTION__DATABASE__VENUES }}
       NOTION_API_KEY: ${{ secrets.NOTION_API_KEY }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       OCTOKIT_TOKEN: ${{ secrets.OCTOKIT_TOKEN }}
       OG_API_KEY: ${{ secrets.OG_API_KEY }}
       PREVIEW_TOKEN: ${{ secrets.PREVIEW_TOKEN }}

.prettierrc.cjs

@@ -1,7 +1,5 @@
-const config = require('@jeromefitz/prettier-config/index.cjs')
+const config = require('@jeromefitz/prettier-config/tailwind.cjs')
 
 module.exports = {
   ...config,
-  plugins: [...config.plugins, require('prettier-plugin-nativewind')],
-  tailwindCustomFunctions: ['cx'],
 }

README.md

@@ -5,8 +5,15 @@
 - 📦️ **Packages**: [`@jeromefitz/packages`](https://github.com/JeromeFitz/packages)
   - 🔧 Configuration
     - `@jeromefitz/eslint-config`
+    - `@jeromefitz/jest-config`
+    - `@jeromefitz/jest-presets`
+    - `@jeromefitz/lighthouse-config`
     - `@jeromefitz/lint-staged`
+    - `@jeromefitz/next-config`
+    - `@jeromefitz/playwright-config`
     - `@jeromefitz/prettier-config`
+    - `@jeromefitz/storybook-config`
+    - `@jeromefitz/tailwind-config`
     - `@jeromefitz/tsconfig`
   - ⚡ Release Management
     - `ccommit`
@@ -18,18 +25,22 @@
     - `@jeromefitz/spotify`
     - `@jeromefitz/utils`
 
-You may be here for the implementation with `@jeromefitz/notion`, you can find more information in the following README:
+You may be here for the Notion CMS with Next, you can find more information in the following README:
 
 - [`./sites/jeromefitzgerald.com`](https://github.com/JeromeFitz/websites/tree/main/sites/jeromefitzgerald.com)
+  - `@jeromefitz/notion`
+  - `next-notion`
 
 ## Overview
 
+- **Analytics**: [Fathom](https://usefathom.com/ref/GKTEFP), Vercel
+  - Note: Referral Link
 - **Content**: Notion ([`@jeromefitz/notion`](https://github.com/JeromeFitz/packages))
 - **Database**: Notion (CMS), Upstash (Redis)
 - **Design System**: Radix UI ([`@jeromefitz/design-system`](https://github.com/JeromeFitz/packages))
 - **Framework**: Next
 - **Hosting**: Vercel
-- **Styling**: Stitches
+- **Styling**: Tailwind
 - ℹ️ **Colophon**: [https://jeromefitzgerald.com/colophon](https://jeromefitzgerald.com/colophon)
 
 ## Monorepo Setup
@@ -38,6 +49,7 @@ You may be here for the implementation with `@jeromefitz/notion`, you can find m
 - :octocat: [`GitHub Actions`](https://github.com/features/actions) for CI/CD (w/ `deploy-to-vercel-action`)
 - 🔺️ [`turborepo`](https://github.com/vercel/turborepo) for monorepo management
 - 🤖️ [`Renovate`](https://github.com/renovatebot/renovate) for Patch + Minor Package Management
+  - Roadmap [`mend`]
 - 🤖️ [`Kodiak`](https://kodiakhq.com) to “Automate (our) GitHub Pull Requests”
 - 🤖️ Automatic [`Semantic Versioning`](https://semver.org) w/ [`Conventional Commits`](https://www.conventionalcommits.org) for release management ([`ccommit`](https://github.com/JeromeFitz/packages)|[`@jeromefitz/semantic`](https://github.com/JeromeFitz/packages))
 

package.json

@@ -10,7 +10,7 @@
   },
   "license": "MIT",
   "private": true,
-  "packageManager": "^pnpm@7.26.1",
+  "packageManager": "^pnpm@8.6.2",
   "engines": {
     "node": ">=18"
   },
@@ -32,27 +32,27 @@
     "@jeromefitz/conventional-gitmoji": "3.3.6",
     "@jeromefitz/eslint-config--custom": "workspace:*",
     "@jeromefitz/lint-staged-config": "workspace:*",
-    "@jeromefitz/prettier-config--custom": "workspace:*",
-    "@jeromefitz/release-notes-generator": "1.2.12",
+    "@jeromefitz/prettier-config": "1.2.0",
+    "@jeromefitz/release-notes-generator": "1.2.13",
     "@jeromefitz/semantic": "9.2.6",
     "@jeromefitz/tsconfig": "1.1.3",
-    "@manypkg/cli": "0.20.0",
+    "@manypkg/cli": "0.21.0",
     "@types/is-ci": "3.0.0",
-    "@types/lodash": "4.14.194",
-    "@types/node": "18.16.13",
+    "@types/lodash": "4.14.195",
+    "@types/node": "20.3.3",
     "ccommit": "1.1.3",
-    "concurrently": "8.0.1",
-    "dotenv": "16.0.3",
+    "concurrently": "8.2.0",
+    "dotenv": "16.3.1",
     "husky": "8.0.3",
     "is-ci": "3.0.1",
     "lodash": "4.17.21",
     "semantic-release": "19.0.5",
     "semantic-release-monorepo": "7.0.5",
     "syncpack": "9.8.6",
     "ts-node": "10.9.1",
-    "tsup": "6.7.0",
-    "turbo": "1.9.8",
-    "typescript": "5.0.4"
+    "tsup": "7.1.0",
+    "turbo": "1.10.7",
+    "typescript": "5.1.6"
   },
   "pnpm": {
     "overrides": {}

packages/design-system/package.json

@@ -16,71 +16,72 @@
   },
   "dependencies": {
     "@heroicons/react": "2.0.18",
-    "@radix-ui/primitive": "1.0.0",
-    "@radix-ui/react-accessible-icon": "1.0.2",
-    "@radix-ui/react-accordion": "1.1.1",
-    "@radix-ui/react-alert-dialog": "1.0.3",
-    "@radix-ui/react-announce": "0.1.7",
-    "@radix-ui/react-arrow": "1.0.2",
-    "@radix-ui/react-aspect-ratio": "1.0.2",
-    "@radix-ui/react-avatar": "1.0.2",
-    "@radix-ui/react-checkbox": "1.0.3",
-    "@radix-ui/react-collapsible": "1.0.2",
-    "@radix-ui/react-collection": "1.0.2",
-    "@radix-ui/react-compose-refs": "1.0.0",
-    "@radix-ui/react-context": "1.0.0",
-    "@radix-ui/react-context-menu": "2.1.3",
-    "@radix-ui/react-dialog": "1.0.3",
-    "@radix-ui/react-direction": "1.0.0",
-    "@radix-ui/react-dismissable-layer": "1.0.3",
-    "@radix-ui/react-dropdown-menu": "2.0.4",
-    "@radix-ui/react-focus-guards": "1.0.0",
-    "@radix-ui/react-focus-scope": "1.0.2",
-    "@radix-ui/react-hover-card": "1.0.5",
+    "@jeromefitz/shared": "workspace:*",
+    "@radix-ui/primitive": "1.0.1",
+    "@radix-ui/react-accessible-icon": "1.0.3",
+    "@radix-ui/react-accordion": "1.1.2",
+    "@radix-ui/react-alert-dialog": "1.0.4",
+    "@radix-ui/react-announce": "0.1.8",
+    "@radix-ui/react-arrow": "1.0.3",
+    "@radix-ui/react-aspect-ratio": "1.0.3",
+    "@radix-ui/react-avatar": "1.0.3",
+    "@radix-ui/react-checkbox": "1.0.4",
+    "@radix-ui/react-collapsible": "1.0.3",
+    "@radix-ui/react-collection": "1.0.3",
+    "@radix-ui/react-compose-refs": "1.0.1",
+    "@radix-ui/react-context": "1.0.1",
+    "@radix-ui/react-context-menu": "2.1.4",
+    "@radix-ui/react-dialog": "1.0.4",
+    "@radix-ui/react-direction": "1.0.1",
+    "@radix-ui/react-dismissable-layer": "1.0.4",
+    "@radix-ui/react-dropdown-menu": "2.0.5",
+    "@radix-ui/react-focus-guards": "1.0.1",
+    "@radix-ui/react-focus-scope": "1.0.3",
+    "@radix-ui/react-hover-card": "1.0.6",
     "@radix-ui/react-icons": "1.3.0",
-    "@radix-ui/react-id": "1.0.0",
-    "@radix-ui/react-label": "2.0.1",
-    "@radix-ui/react-menu": "2.0.4",
-    "@radix-ui/react-navigation-menu": "1.1.2",
-    "@radix-ui/react-popover": "1.0.5",
-    "@radix-ui/react-popper": "1.1.1",
-    "@radix-ui/react-portal": "1.0.2",
-    "@radix-ui/react-presence": "1.0.0",
-    "@radix-ui/react-primitive": "1.0.2",
-    "@radix-ui/react-progress": "1.0.2",
-    "@radix-ui/react-radio-group": "1.1.2",
-    "@radix-ui/react-roving-focus": "1.0.3",
-    "@radix-ui/react-scroll-area": "1.0.3",
-    "@radix-ui/react-select": "1.2.1",
-    "@radix-ui/react-separator": "1.0.2",
-    "@radix-ui/react-slider": "1.1.1",
-    "@radix-ui/react-slot": "1.0.1",
-    "@radix-ui/react-switch": "1.0.2",
-    "@radix-ui/react-tabs": "1.0.3",
-    "@radix-ui/react-toast": "1.1.3",
-    "@radix-ui/react-toggle": "1.0.2",
-    "@radix-ui/react-toggle-group": "1.0.3",
-    "@radix-ui/react-toolbar": "1.0.3",
-    "@radix-ui/react-tooltip": "1.0.5",
-    "@radix-ui/react-use-callback-ref": "1.0.0",
-    "@radix-ui/react-use-controllable-state": "1.0.0",
-    "@radix-ui/react-use-escape-keydown": "1.0.2",
-    "@radix-ui/react-use-layout-effect": "1.0.0",
-    "@radix-ui/react-use-previous": "1.0.0",
-    "@radix-ui/react-use-rect": "1.0.0",
-    "@radix-ui/react-use-size": "1.0.0",
-    "@radix-ui/react-visually-hidden": "1.0.2",
+    "@radix-ui/react-id": "1.0.1",
+    "@radix-ui/react-label": "2.0.2",
+    "@radix-ui/react-menu": "2.0.5",
+    "@radix-ui/react-navigation-menu": "1.1.3",
+    "@radix-ui/react-popover": "1.0.6",
+    "@radix-ui/react-popper": "1.1.2",
+    "@radix-ui/react-portal": "1.0.3",
+    "@radix-ui/react-presence": "1.0.1",
+    "@radix-ui/react-primitive": "1.0.3",
+    "@radix-ui/react-progress": "1.0.3",
+    "@radix-ui/react-radio-group": "1.1.3",
+    "@radix-ui/react-roving-focus": "1.0.4",
+    "@radix-ui/react-scroll-area": "1.0.4",
+    "@radix-ui/react-select": "1.2.2",
+    "@radix-ui/react-separator": "1.0.3",
+    "@radix-ui/react-slider": "1.1.2",
+    "@radix-ui/react-slot": "1.0.2",
+    "@radix-ui/react-switch": "1.0.3",
+    "@radix-ui/react-tabs": "1.0.4",
+    "@radix-ui/react-toast": "1.1.4",
+    "@radix-ui/react-toggle": "1.0.3",
+    "@radix-ui/react-toggle-group": "1.0.4",
+    "@radix-ui/react-toolbar": "1.0.4",
+    "@radix-ui/react-tooltip": "1.0.6",
+    "@radix-ui/react-use-callback-ref": "1.0.1",
+    "@radix-ui/react-use-controllable-state": "1.0.1",
+    "@radix-ui/react-use-escape-keydown": "1.0.3",
+    "@radix-ui/react-use-layout-effect": "1.0.1",
+    "@radix-ui/react-use-previous": "1.0.1",
+    "@radix-ui/react-use-rect": "1.0.1",
+    "@radix-ui/react-use-size": "1.0.1",
+    "@radix-ui/react-visually-hidden": "1.0.3",
     "clsx": "1.2.1",
     "cmdk": "0.2.0",
-    "tailwind-merge": "1.12.0"
+    "tailwind-merge": "1.13.2"
   },
   "devDependencies": {
     "@jeromefitz/jest-config": "workspace:*",
     "@jeromefitz/next-config": "workspace:*",
     "@jeromefitz/storybook-config": "workspace:*",
     "@jeromefitz/tailwind-config": "workspace:*",
-    "@mantine/hooks": "6.0.11",
-    "next": "13.4.3",
+    "@mantine/hooks": "6.0.15",
+    "next": "13.4.8-canary.14",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   }