chore: remove unused package.json for wiki and blog

Author: leandromqrs

.github/workflows/deploy-aurora.yml

@@ -22,7 +22,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
 
       - run: npm ci

.github/workflows/deploy-blog.yml

@@ -1,4 +1,4 @@
-# Builds the blog (a sub-project in blog/) and publishes it to the gh-pages
+# Builds the blog (an Astro root in blog/) and publishes it to the gh-pages
 # branch of luminusOS/blog, which serves blog.luminusos.org via GitHub Pages
 # (one Pages site per repo). Requires the BLOG_DEPLOY_TOKEN secret: a
 # fine-grained PAT with "Contents: write" on luminusOS/blog.
@@ -8,26 +8,27 @@ name: Deploy blog site
 on:
   push:
     branches: [main]
-    paths: ['blog/**']
+    paths:
+      - 'blog/**'
+      - 'package.json'
+      - 'package-lock.json'
+      - 'scripts/**'
   workflow_dispatch:
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: blog
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
-          cache-dependency-path: blog/package-lock.json
+          cache-dependency-path: package-lock.json
 
       - run: npm ci
-      - run: npm run build
+      - run: npm run build:blog
 
       - uses: peaceiris/actions-gh-pages@v4
         with:

.github/workflows/deploy-wiki.yml

@@ -1,4 +1,4 @@
-# Builds the wiki (a sub-project in wiki/) and publishes it to the gh-pages
+# Builds the wiki (an Astro root in wiki/) and publishes it to the gh-pages
 # branch of luminusOS/wiki, which serves wiki.luminusos.org via GitHub Pages
 # (one Pages site per repo). Requires the WIKI_DEPLOY_TOKEN secret: a
 # fine-grained PAT with "Contents: write" on luminusOS/wiki.
@@ -8,26 +8,27 @@ name: Deploy wiki site
 on:
   push:
     branches: [main]
-    paths: ['wiki/**']
+    paths:
+      - 'wiki/**'
+      - 'package.json'
+      - 'package-lock.json'
+      - 'scripts/**'
   workflow_dispatch:
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: wiki
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: npm
-          cache-dependency-path: wiki/package-lock.json
+          cache-dependency-path: package-lock.json
 
       - run: npm ci
-      - run: npm run build
+      - run: npm run build:wiki
 
       - uses: peaceiris/actions-gh-pages@v4
         with:

README.md

@@ -17,6 +17,8 @@ Every page exists in English (default) and Brazilian Portuguese:
 | --- | --- |
 | `/` and `/pt-br/` | LuminusOS home: hero, pillars, how it works, editions, download, support |
 | `/aurora/` and `/pt-br/aurora/` | Aurora Shell subpage |
+| `/blog/` | Blog copy embedded in the main website build |
+| `/wiki/` | Wiki copy embedded in the main website build |
 
 All copy lives in a single typed dictionary: `src/i18n/translations.ts`.
 Adding a language = append it to the `languages` array (name + flag, the
@@ -30,8 +32,8 @@ preference, with a header toggle persisted in `localStorage`.
 
 ```sh
 npm install
-npm run dev      # http://localhost:4321
-npm run build    # static output in dist/
+npm run dev      # http://localhost:4321, including /aurora, /blog and /wiki
+npm run build    # static output in dist/, including /blog and /wiki
 npm run preview  # serve dist/ locally
 ```
 
@@ -50,34 +52,33 @@ by editing the `available` check when its first release lands.
 
 ```sh
 npm run build:aurora   # static output in dist-aurora/
+npm run deploy:aurora  # deploy dist-aurora to Cloudflare Pages
 ```
 
 With `SITE_VARIANT=aurora` the Aurora Shell page becomes the site root
 (`/` and `/pt-br/`), cross-links point back to `https://luminusos.org`, and
 `dist-aurora/CNAME` is written as `aurora.luminusos.org`.
 
-`deploy-aurora.yml` pushes that build to the `gh-pages` branch of
-`luminusOS/aurora-shell` (needs the `AURORA_DEPLOY_TOKEN` secret: a
-fine-grained PAT with Contents: write there), since GitHub Pages serves one
-site per repository.
-
 ## Wiki & Blog (sub-projects)
 
-The wiki and the blog live in this repository as independent Astro projects:
+The wiki and the blog live in this repository as Astro roots that share the
+top-level `package.json` and lockfile:
 
 | Site | Folder | Stack |
 | --- | --- | --- |
 | [wiki.luminusos.org](https://wiki.luminusos.org) | `wiki/` | Astro Starlight (sidebar, search, i18n) |
 | [blog.luminusos.org](https://blog.luminusos.org) | `blog/` | Astro content collections, English + Google Translate menu |
 
-Each has its own `package.json` (`cd wiki && npm install && npm run dev`).
-GitHub Pages serves one site per repository, so `deploy-wiki.yml` and
-`deploy-blog.yml` build the sub-project and push its `dist/` to the
-`gh-pages` branch of `luminusOS/wiki` / `luminusOS/blog` (Pages-only repos).
-Setup per subdomain: create the target repo, enable Pages on `gh-pages`,
-point DNS `<sub>.luminusos.org` → `luminusos.github.io`, and add the
-`WIKI_DEPLOY_TOKEN` / `BLOG_DEPLOY_TOKEN` secret here (fine-grained PAT
-with Contents: write on the target repo).
+The root `npm run build` builds both projects with `/blog` and `/wiki` bases
+and copies them into the main website `dist/`. Standalone Cloudflare Pages
+builds use the subdomain versions:
+
+```sh
+npm run build:blog
+npm run deploy:blog
+npm run build:wiki
+npm run deploy:wiki
+```
 
 ## License
 

blog/README.md

@@ -29,8 +29,8 @@ The file name becomes the URL: `my-post.md` → `/posts/my-post/`.
 
 ```sh
 npm install
-npm run dev      # http://localhost:4321
-npm run build    # static output in dist/
+npm run dev           # from the repository root, served at /blog
+npm run build:blog    # static output in blog/dist/
 ```
 
 ## Deployment

blog/astro.config.mjs

@@ -1,7 +1,11 @@
 // @ts-check
 import { defineConfig } from 'astro/config';
 
+const base = process.env.SITE_BASE ?? '';
+const site = process.env.SITE_URL ?? 'https://blog.luminusos.org';
+
 export default defineConfig({
-  site: 'https://blog.luminusos.org',
+  site,
+  base,
   trailingSlash: 'ignore',
 });