style

README.md

@@ -1,35 +1,29 @@
 [main-version]: https://img.shields.io/github/package-json/v/7rs/pages/main?style=flat-square&label=main&labelColor=000&color=blue
 [main-modified]: https://flat.badgen.net/github/last-commit/7rs/pages/main?label&color=purple
-[pre-version]: https://img.shields.io/github/package-json/v/7rs/pages/pre?style=flat-square&label=pre&labelColor=000&color=blue
-[pre-modified]: https://flat.badgen.net/github/last-commit/7rs/pages/pre?label&color=purple
 [dev-version]: https://img.shields.io/github/package-json/v/7rs/pages/dev?style=flat-square&label=dev&labelColor=000&color=blue
 [dev-modified]: https://flat.badgen.net/github/last-commit/7rs/pages/dev?label&color=purple
 
-<!--
 <picture>
   <source srcset=".github/assets/banner.avif" />
   <source srcset=".github/assets/banner.webp" />
   <img src=".github/assets/banner.jpg" alt="banner" />
 </picture>
--->
 
 ![Version][main-version]![Last commit][main-modified]
-![Version][pre-version]![Last commit][pre-modified]
 ![Version][dev-version]![Last commit][dev-modified]  
+[![Astro](https://astro.badg.es/v2/built-with-astro/large.svg)](https://astro.build/)
 
 # [Pages](https://7rs.dev/)  
 
   **Fast**, **Readable** and **Flexible**.  
-  A tool to create awesome websites. And an website.  
+  The tools to create awesome websites. And an website.  
 
 ## What's new  
 
   This project is **under development**.
   There are **breaking changes** and **many bugs**.  
   Please create an issue or report to the discord server If you have any issues.
 
-<br />
-
 [pagespeed-insights]: https://pagespeed.web.dev/
 
 ## 🎁 Features (Goals)  
@@ -58,8 +52,6 @@
 - [Color schemes](https://en.wikipedia.org/wiki/Light-on-dark_color_scheme)
 <!--  -->
 
-<br />
-
 ## 💡 Getting Started  
 
   If cloning over HTTPS, replace to this url:
@@ -77,29 +69,20 @@
   pnpm dev  
   ```  
 
-[astro-badge]: https://astro.badg.es/v2/built-with-astro/large.svg
-[unsplash-badge]: https://img.shields.io/badge/Unsplash-black?style=for-the-badge&logo=unsplash
 [cc0]: https://creativecommons.org/publicdomain/zero/1.0/
+[unsplash-badge]: https://img.shields.io/badge/Unsplash-black?style=for-the-badge&logo=unsplash
 [stackshare-badge]: https://img.shields.io/badge/stackshare-0690FA?style=for-the-badge&logo=stackshare&logoColor=white
 [license-badge]: https://img.shields.io/badge/license-black?style=for-the-badge
 
-### ⚖️ License  
+## ⚖️ License  
 
   [Pages](https://github.com/7rs/pages) is published under [CC0][cc0] except for asset files.  
 
-  [![Built with Astro][astro-badge]](https://astro.build/)
-
   [![License][license-badge]](https://github.com/7rs/pages/blob/main/LICENSE)
   [![Unsplash][unsplash-badge]](https://unsplash.com/license)
-  [![stackshare-badge][stackshare-badge]](https://stackshare.io/7rs/pages)
-
-### ️🖋️ Author  
-
-<!--  -->
-- [Cbrnex](https://github.com/7rs)  
-<!--  -->
+  [![Stackshare][stackshare-badge]](https://stackshare.io/7rs/pages)
 
-### 🛠️ Contributing  
+## 🛠️ Contributing  
 
   Please use **Japanese** or **English**.  
 

astro.config.ts

@@ -3,7 +3,6 @@ import path from 'node:path';
 
 import svelte from '@astrojs/svelte';
 import mdx from '@astrojs/mdx';
-import pagefind from 'astro-pagefind';
 import icon from 'astro-icon';
 
 import robotsTxt from 'astro-robots-txt';
@@ -31,17 +30,7 @@ export default defineConfig({
     },
   },
   site: 'https://7rs.dev',
-  integrations: [
-    svelte({ emitCss: false }),
-    mdx(),
-    pagefind(),
-    icon({ iconDir: 'src/icons' }),
-    // Metadata
-    robotsTxt(),
-    sitemap(),
-    // Compress
-    purgecss(),
-  ],
+  integrations: [svelte({ emitCss: false }), mdx(), icon({ iconDir: 'src/icons' }), robotsTxt(), sitemap(), purgecss()],
   // https://vitejs.dev/config/
   vite: {
     resolve: {

package.json

@@ -1,20 +1,24 @@
 {
     "type": "module",
     "name": "root",
-    "version": "0.4.2",
-    "description": "A tool to create awesome websites.",
-    "keywords": ["pages", "pagesjs", "7rs.dev"],
+    "version": "0.4.3",
+    "description": "The tools to create awesome websites.",
+    "keywords": [
+        "pages",
+        "pagesjs",
+        "7rs.dev"
+    ],
     "homepage": "https://7rs.dev/",
     "bugs": "https://github.com/7rs/pages/issues",
     "license": "CC0-1.0",
     "repository": "github:7rs/pages",
     "scripts": {
         "dev": "astro dev",
-        "build": "astro build",
+        "build": "astro build && pagefind --site dist --force-language en",
         "preview": "astro preview",
         "sync": "astro sync",
         "check": "astro check",
-        "search": "pnpm pagefind --site dist",
+        "search": "pagefind --site dist",
         "benchmark": "lighthouse http://localhost:2999/ --quiet --view --emulated-form-factor mobile --output-path mobile-lighthouse.html"
     },
     "dependencies": {
@@ -30,11 +34,11 @@
         "@iconify-json/simple-icons": "^1.1.101",
         "@iconify/svelte": "^4.0.2",
         "@pagesjs/cli": "workspace:^",
+        "@pagesjs/pagefind": "workspace:^",
         "@pagesjs/ui": "workspace:^",
         "@webcomponents/template-shadowroot": "^0.2.1",
         "astro": "^4.8.2",
         "astro-icon": "^1.1.0",
-        "astro-pagefind": "^1.5.0",
         "astro-purgecss": "^4.1.1",
         "astro-robots-txt": "^1.0.0",
         "autoprefixer": "^10.4.19",
@@ -63,5 +67,7 @@
         "pnpm": ">=8"
     },
     "private": true,
-    "workspaces": ["packages/*"]
+    "workspaces": [
+        "packages/*"
+    ]
 }

packages/pagefind/package.json

@@ -0,0 +1,36 @@
+{
+    "type": "module",
+    "name": "@pagesjs/pagefind",
+    "version": "0.0.1",
+    "description": "The scripts and components for pagefind.",
+    "keywords": ["pages", "pagesjs", "7rs.dev"],
+    "homepage": "https://7rs.dev/",
+    "bugs": "https://github.com/7rs/pages/issues",
+    "license": "CC0-1.0",
+    "main": "./src/index.ts",
+    "exports": {
+        ".": {
+            "import": "./src/index.ts",
+            "types": "./dist/index.d.ts"
+        }
+    },
+    "repository": "github:7rs/pages",
+    "scripts": {
+        "build": "tsc"
+    },
+    "devDependencies": {
+        "@types/node": "^20.12.11",
+        "stylus": "^0.63.0",
+        "ts-node": "^10.9.2",
+        "typescript": "^5.4.5"
+    },
+    "dependencies": {
+        "@iconify/svelte": "^4.0.2",
+        "qs": "^6.12.1",
+        "svelte": "^4.2.16"
+    },
+    "engines": {
+        "node": ">=18",
+        "pnpm": ">=8"
+    }
+}

scripts/lib/pagefind/error.ts → packages/pagefind/src/error.ts

@@ -1,5 +1,5 @@
 export const PagefindErrors = {
-  FailedImport: "Couldn't import pagefind script",
+  FailedImport: "Pagefind script couldn't be imported.",
   FailedSearch: 'Searching is failed.',
 } as const;
 

packages/pagefind/tsconfig.json

@@ -0,0 +1,9 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "include": ["./src/*.ts", "./src/*.svelte"],
+    "exclude": ["*node_modules*"],
+    "compilerOptions": {
+        "rootDir": "./",
+        "outDir": "./dist"
+    }
+}

packages/ui/src/color-scheme/ColorSchemeButton.svelte

@@ -4,7 +4,6 @@
 
   import Icon from '@iconify/svelte';
 
-
   import { activeColorScheme } from './state.ts';
   import { initColorScheme, advanceColorScheme } from './main.ts';
   import { getColorSchemeIcon } from "./icon.ts"