Website Update

.github/workflows/preview.yml

@@ -49,7 +49,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install Vercel CLI
-        run: npm install --global vercel@latest
+        run: pnpm install --global vercel@latest
 
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}

.github/workflows/prod.yml

@@ -50,7 +50,7 @@ jobs:
             ${{ runner.os }}-pnpm-store-
 
       - name: Install Vercel CLI
-        run: npm install --global vercel@latest
+        run: pnpm install --global vercel@latest
 
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}

.gitignore

@@ -1,8 +1,9 @@
 # build output
-dist/
+dist
+.astro
 
 # dependencies
-node_modules/
+node_modules
 .pnpm-store
 
 # logs

.gitpod.Dockerfile

@@ -1 +1,3 @@
-FROM gitpod/workspace-node-lts
+FROM gitpod/workspace-node-lts
+
+RUN npm i -g vercel

.prettierignore

@@ -1,8 +1,9 @@
 # build output
-dist/
+dist
+.astro
 
 # dependencies
-node_modules/
+node_modules
 .pnpm-store
 
 # logs

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "files.associations": {
+    "*.mdoc": "markdown"
+  },
+  "typescript.tsdk": "node_modules/typescript/lib"
+}

astro.config.mjs

@@ -1,62 +1,52 @@
-import { defineConfig } from 'astro/config'
+import { defineConfig, sharpImageService } from 'astro/config'
 
 // Astro integrations
 import react from '@astrojs/react'
 import sitemap from '@astrojs/sitemap'
 import AstroPWA from '@vite-pwa/astro'
-import mdx from '@astrojs/mdx'
+import markdoc from '@astrojs/markdoc'
+import vercel from '@astrojs/vercel/serverless'
 
 // Vite plugins
 import Icons from 'unplugin-icons/vite'
 import svgr from 'vite-plugin-svgr'
-import yaml from '@modyfi/vite-plugin-yaml'
+
+// Other imports
+import manifest from './src/includes/manifest.json' assert { type: 'json' }
 
 // https://astro.build/config
 export default defineConfig({
-  site: 'https://www.sentralbisnisdigital.co.id',
+  site: 'https://www.sbdigital.id',
   integrations: [
     react(),
-    mdx(),
+    markdoc(),
     sitemap(),
     AstroPWA({
+      disable: true,
       strategies: 'injectManifest',
-      srcDir: 'src/assets',
+      srcDir: 'src/includes',
       filename: 'sw.ts',
       registerType: 'autoUpdate',
-      manifest: {
-        name: 'Sentral Bisnis Digital',
-        short_name: 'Sentral Bisnis Digital',
-        description: '',
-        theme_color: '#ffffff',
-        icons: [
-          {
-            src: 'pwa-192x192.png',
-            sizes: '192x192',
-            type: 'image/png',
-          },
-          {
-            src: 'pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-          },
-          {
-            src: 'pwa-512x512.png',
-            sizes: '512x512',
-            type: 'image/png',
-            purpose: 'any maskable',
-          },
-        ],
-      },
+      manifest,
     }),
   ],
+
   vite: {
     plugins: [
-      yaml(),
       svgr(),
       Icons({
         compiler: 'jsx',
         jsx: 'react',
       }),
     ],
   },
+  experimental: {
+    assets: true,
+  },
+  image: {
+    service: sharpImageService(),
+  },
+  compressHTML: true,
+  output: 'hybrid',
+  adapter: vercel(),
 })

markdoc.config.mjs

@@ -0,0 +1,19 @@
+import { defineMarkdocConfig, nodes, component } from '@astrojs/markdoc/config'
+
+export default defineMarkdocConfig({
+  nodes: {
+    document: {
+      ...nodes.document,
+      render: null,
+    },
+  },
+
+  tags: {
+    wrapper: {
+      render: component('./src/components/wrapper'),
+      attributes: {
+        class: { class: String },
+      },
+    },
+  },
+})

package.json

@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "astro": "astro",
-    "check": "pnpm dlx npm-run-all -s check:*",
     "build": "astro build",
+    "check": "pnpm dlx npm-run-all -s check:*",
     "check:astro": "astro check && tsc --noEmit",
     "check:style": "pnpm exec prettier --plugin-search-dir=. --check .",
     "dev": "astro dev",
@@ -15,34 +15,38 @@
     "start": "pnpm dlx npm-run-all -s build preview"
   },
   "dependencies": {
-    "@astrojs/mdx": "0.19.7",
-    "@astrojs/react": "2.3.2",
-    "@astrojs/sitemap": "1.4.0",
-    "@fontsource/red-hat-display": "4.5.12",
-    "@fontsource/righteous": "4.5.7",
+    "@astrojs/markdoc": "^0.4.4",
+    "@astrojs/react": "2.2.1",
+    "@astrojs/sitemap": "2.0.1",
+    "@astrojs/vercel": "^3.8.0",
+    "@fontsource-variable/inter": "^5.0.8",
+    "@fontsource-variable/red-hat-display": "^5.0.9",
+    "@iconify/json": "2.2.98",
+    "@radix-ui/react-avatar": "^1.0.3",
+    "@radix-ui/react-navigation-menu": "^1.1.3",
+    "@svgr/core": "8.0.0",
     "@tailwindcss/typography": "0.5.9",
-    "@vite-pwa/astro": "0.1.2",
-    "astro": "2.10.15",
-    "astro-seo": "0.8.0",
-    "autoprefixer": "10.4.15",
-    "daisyui": "2.52.0",
-    "flamethrower-router": "0.0.0-meme.12",
-    "postcss": "8.4.29",
+    "@types/marked": "^5.0.1",
+    "@types/react": "18.2.18",
+    "@types/react-dom": "^18.2.7",
+    "@vite-pwa/astro": "0.1.1",
+    "astro": "2.10.1",
+    "astro-seo": "0.7.5",
+    "autoprefixer": "10.4.14",
+    "daisyui": "3.5.1",
+    "html-react-parser": "^4.2.0",
+    "marked": "^6.0.0",
+    "postcss": "8.4.27",
+    "postcss-preset-env": "^9.1.1",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "sass": "1.66.1",
-    "tailwindcss": "3.3.3"
-  },
-  "devDependencies": {
-    "@iconify/json": "2.2.110",
-    "@modyfi/vite-plugin-yaml": "1.0.4",
-    "@svgr/core": "6.5.1",
-    "@types/node": "18.17.14",
-    "@types/react": "18.2.21",
-    "typescript": "5.2.2",
-    "unplugin-icons": "0.17.0",
+    "sass": "1.64.2",
+    "sharp": "^0.32.4",
+    "tailwindcss": "3.3.3",
+    "typescript": "5.1.6",
+    "unplugin-icons": "0.16.5",
     "vite-plugin-pwa": "0.16.4",
-    "vite-plugin-svgr": "2.4.0",
+    "vite-plugin-svgr": "3.2.0",
     "workbox-cacheable-response": "7.0.0",
     "workbox-core": "7.0.0",
     "workbox-expiration": "7.0.0",