jeawin-astro 3.0.5 → 3.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jeawin-astro",
-    "version": "3.0.5",
+    "version": "3.0.8",
     "author": "chaegumi <chaegumi@qq.com>",
     "description": "",
     "license": "MIT",
@@ -25,8 +25,8 @@
         "test": "mocha test"
     },
     "devDependencies": {
-        "@babel/core": "^7.26.7",
-        "@babel/preset-env": "^7.26.7",
+        "@babel/core": "^7.26.9",
+        "@babel/preset-env": "^7.26.9",
         "@rollup/plugin-babel": "^6.0.4",
         "@rollup/plugin-commonjs": "^28.0.2",
         "@rollup/plugin-json": "^6.1.0",
@@ -38,10 +38,10 @@
         "@types/lodash": "^4.17.15",
         "@types/sprintf-js": "^1.1.4",
         "autoprefixer": "^10.4.20",
-        "chai": "^5.1.2",
+        "chai": "^5.2.0",
         "mocha": "^10.8.2",
-        "postcss": "^8.5.1",
-        "rollup": "^4.34.2",
+        "postcss": "^8.5.2",
+        "rollup": "^4.34.8",
         "rollup-plugin-node-externals": "^7.1.3",
         "rollup-plugin-postcss": "^4.0.2",
         "typescript": "^5.7.3"
@@ -58,13 +58,14 @@
         "@iconify-json/fa6-solid": "^1.2.3",
         "@iconify/tools": "^4.1.1",
         "@keyv/compress-brotli": "^2.0.3",
+        "@pagefind/default-ui": "^1.3.0",
         "@tailwindcss/forms": "^0.5.10",
         "@tailwindcss/typography": "^0.5.16",
-        "@tailwindcss/vite": "^4.0.3",
+        "@tailwindcss/vite": "^4.0.6",
         "@types/alpinejs": "^3.13.11",
         "alpinejs": "^3.14.8",
         "aos": "3.0.0-beta.6",
-        "astro": "^5.2.5",
+        "astro": "^5.3.0",
         "astro-color-scheme": "^1.1.5",
         "astro-embed": "^0.9.0",
         "astro-icon": "^1.1.5",
@@ -77,13 +78,15 @@
         "keyv": "^5.2.3",
         "keyv-lru": "^3.0.4",
         "lodash": "^4.17.21",
+        "pagefind": "^1.3.0",
         "photoswipe": "^5.4.4",
+        "sirv": "^3.0.1",
         "smartmenus": "2.0.0-alpha.1",
         "sprintf-js": "^1.1.3",
         "string-strip-html": "^13.4.8",
-        "swiper": "^11.2.2",
+        "swiper": "^11.2.4",
         "tailwind-scrollbar": "^4.0.0",
-        "tailwindcss": "^4.0.3",
+        "tailwindcss": "^4.0.6",
         "tslib": "^2.8.1"
     }
 }

package/src/components/cards/news_grid_card1.astro

@@ -48,7 +48,7 @@ const final_content = truncate(content, {
     always_show_img ? (
       <Fragment>
         <div class="flex justify-center">
-          {img ? <JeawinImage img_html={img_html} /> : <DefaultImage />}
+          {img ? <JeawinImage img_html={img_html} add_classes="border border-gray-200" /> : <DefaultImage />}
         </div>
       </Fragment>
     ) : (

package/src/components/cards/news_grid_card5.astro

@@ -56,7 +56,7 @@ const final_content = truncate(content, {
       always_show_img ? (
         <Fragment>
           {img ? (
-            <JeawinImage img_html={img_html} add_classes="card-img" />
+            <JeawinImage img_html={img_html} add_classes="card-img border border-gray-200" />
           ) : (
             <DefaultImage class="card-img" />
           )}
@@ -66,7 +66,7 @@ const final_content = truncate(content, {
           {img ? (
             <Fragment>
               {!is_default_image(img) ? (
-                <JeawinImage img_html={img_html} add_classes="card-img" />
+                <JeawinImage img_html={img_html} add_classes="card-img border-gray-200" />
               ) : null}
             </Fragment>
           ) : null}

package/src/components/cards/news_list_card.astro

@@ -40,7 +40,7 @@ const final_content = truncate(content, {
   class="flex flex-col md:flex-row gap-5 border-b border-solid border-[#eee] mb-5 pb-5 p-2 md:py-8 md:px-4 bg-white rounded-lg shadow-lg transition-transform duration-300 hover:-translate-y-[5px]"
 >
   <div class="md:w-1/5">
-    {img ? <RenderImage img_html={img_html} /> : <DefaultImage />}
+    {img ? <RenderImage img_html={img_html} add_classes="border border-gray-200" /> : <DefaultImage />}
   </div>
   <div class="md:w-4/5">
     {
@@ -48,7 +48,7 @@ const final_content = truncate(content, {
         <div class="mb-3 text-sm text-[#6c757d]">{category_name}</div>
       ) : null
     }
-    <TitleTag class="text-2xl mb-3 font-bold">
+    <TitleTag class="text-2xl mb-3">
       <a href={render_url(node_url, base)} title={title}>{title}</a>
     </TitleTag>
     <div class="mb-3 text-sm text-[#666] leading-relaxed">

package/src/components/children_categories_list.astro

@@ -47,7 +47,7 @@ const ProductCountLang = render_value(all_langs, "product");
               <div>
                 <JeawinImage
                   img_html={category.category_picurl_html}
-                  add_classes="mx-auto size-full"
+                  add_classes="mx-auto size-full border border-gray-200"
                 />
               </div>
             ) : null}

package/src/components/common_card.astro

@@ -48,7 +48,7 @@ if (render_value(node, "content")) {
           ) : (
             <a href={render_url(node.node_url, base)} title={node.node_title}>
               {node.node_picurl ? (
-                <RenderImage img_html={node.node_picurl_html} />
+                <RenderImage img_html={node.node_picurl_html} add_classes="border border-gray-200" />
               ) : (
                 <DefaultImage />
               )}
@@ -58,7 +58,7 @@ if (render_value(node, "content")) {
       ) : (
         <a href={render_url(node.node_url, base)} title={node.node_title}>
           {node.node_picurl ? (
-            <RenderImage img_html={node.node_picurl_html} />
+            <RenderImage img_html={node.node_picurl_html} add_classes="border border-gray-200" />
           ) : (
             <DefaultImage />
           )}
@@ -67,7 +67,7 @@ if (render_value(node, "content")) {
     }
   </div>
   <div class="mt-7">
-    <TitleTag class="text-center font-bold">
+    <TitleTag class="text-center">
       <a href={render_url(node.node_url, base)} title={node.node_title}
         >{node.node_title}</a
       >

package/src/components/index.ts

@@ -38,6 +38,7 @@ export {default as RelNodesList} from "./rel_nodes_list.astro";
 export {default as RemoteImage} from "./remote_image.astro";
 export {default as SearchInput} from "./search_input.astro";
 export {default as SearchResult} from "./search_result.astro";
+export {default as SearchPagefind} from "./search_pagefind.astro";
 export {default as SectionContainer} from "./section_container.astro";
 export {default as ShareButton} from "./share_button.astro";
 export {default as SidebarSub} from "./sidebar_sub.astro";

package/src/components/news_card.astro

@@ -35,11 +35,11 @@ const TitleTag = title_tag || "div";
     title={title}
     class="flex items-center justify-center mb-3 h-full"
   >
-    {img ? <RenderImage img_html={img_html} /> : <DefaultImage />}
+    {img ? <RenderImage img_html={img_html} add_classes="border border-gray-200" /> : <DefaultImage />}
   </a>
 
   <div class="text-[var(--themeColor)] mb-2">{category_name}</div>
-  <TitleTag class="font-bold mb-3">
+  <TitleTag class="mb-3">
     <a href={render_url(node_url, base)} title={title}>{title}</a>
   </TitleTag>
   <div class="flex items-center gap-3 text-[#6c757d] fill-[#6c757d] text-sm">

package/src/components/product_card.astro

@@ -37,14 +37,14 @@ const RequestBtnText = render_value(all_langs, "request a quote");
   <a
     href={render_url(node_url, base)}
     title={title}
-    class="flex items-center justify-center mb-3 h-full"
+    class="flex items-center justify-center h-full"
   >
-    {img ? <RenderImage img_html={img_html} /> : <DefaultImage />}
+    {img ? <RenderImage img_html={img_html} add_classes="border border-gray-200" /> : <DefaultImage />}
   </a>
 
   <div class="p-3">
     <TitleTag
-      class="my-2 text-[#222] line-clamp-1 font-bold hover:text-[#e53e3e] hover:underline"
+      class="my-2 text-[#222] hover:text-[#e53e3e] hover:underline"
     >
       <a href={render_url(node_url, base)} title={title} class="block text-center"
         >{title}</a

package/src/components/product_category_list.astro

@@ -81,7 +81,7 @@ switch (node_item_component) {
               {
                 category.category_picurl_html ? (
                   <div class:list={["md:w-1/4", {'md:order-2':idx % 2 === 1}]}>
-                    <JeawinImage img_html={category.category_picurl_html} add_classes="size-full" />
+                    <JeawinImage img_html={category.category_picurl_html} add_classes="size-full border border-gray-200" />
                   </div>
                 ) : null
               }

package/src/components/search_pagefind.astro

@@ -0,0 +1,71 @@
+---
+import "@pagefind/default-ui/css/ui.css";
+
+export interface Props {
+  readonly id?: string;
+  readonly className?: string;
+  readonly query?: string;
+  readonly uiOptions?: Record<string, any>;
+}
+
+const { id, className, query, uiOptions = {} } = Astro.props;
+const bundlePath = `${import.meta.env.BASE_URL}pagefind/`;
+---
+<section class="py-12">
+    <div class="max-w-screen-lg mx-auto">
+        <div class="px-4">
+            <div
+                id={id}
+                class:list={[className, "pagefind-init"]}
+                data-pagefind-ui
+                data-bundle-path={bundlePath}
+                data-query={query}
+                data-ui-options={JSON.stringify(uiOptions)}
+            >
+            </div>
+        </div>
+    </div>
+</section>
+<script>
+// @ts-ignore
+import { PagefindUI } from "@pagefind/default-ui";
+
+function initPageFind() {
+    const allSelector = "[data-pagefind-ui]";
+    for (const el of document.querySelectorAll(`${allSelector}.pagefind-init`)) {
+        const elSelector = [
+            ...(el.id ? [`#${el.id}`] : []),
+            ...[...el.classList.values()].map((c) => `.${c}`),
+            allSelector,
+        ].join("");
+        const bundlePath = el.getAttribute("data-bundle-path");
+        const opts = JSON.parse(el.getAttribute("data-ui-options") ?? "{}");
+        new PagefindUI({
+            ...opts,
+            element: elSelector,
+            bundlePath,
+        });
+        el.classList.remove("pagefind-init");
+        let query = el.getAttribute("data-query");
+        const urlSearchParams = new URLSearchParams(window.location.search);
+        const params = Object.fromEntries(urlSearchParams.entries());
+        if(params.q){
+            query = params.q;
+        }
+        if (query) {
+            const input = el.querySelector<HTMLInputElement>(`input[type="text"]`);
+            if (input) {
+                input.value = query;
+                input.dispatchEvent(new Event("input", { bubbles: true }));
+            }
+        }
+    }
+}
+
+document.addEventListener("astro:page-load", initPageFind);
+if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", initPageFind);
+} else {
+    initPageFind();
+}
+</script>

package/src/integrations/index.ts

@@ -1 +1,2 @@
-export {default as jeawinRuntimeConfig} from "./jeawin-runtime-config/index.ts";
+export {default as jeawinRuntimeConfig} from "./jeawin-runtime-config/index.ts";
+export {default as jeawinAstroPagefind} from "./jeawin-astro-pagefind/index.ts";

package/src/integrations/jeawin-astro-pagefind/index.ts

@@ -0,0 +1,93 @@
+import type { AstroIntegration } from "astro";
+import { fileURLToPath } from "node:url";
+import path from "node:path";
+import { createIndex, type PagefindServiceConfig } from "pagefind";
+import sirv from "sirv";
+
+/**
+ * Pagefind Astro integration options.
+ */
+export interface PagefindOptions {
+  /**
+   * `PagefindServiceConfig` passed to pagefind's `createIndex`
+   */
+  indexConfig?: PagefindServiceConfig;
+}
+
+export default function pagefind({ indexConfig }: PagefindOptions = {}): AstroIntegration {
+  let outDir: string;
+  return {
+    name: "pagefind",
+    hooks: {
+      "astro:config:setup": ({ config, logger }: any) => {
+        if (config?.output === "server") {
+          logger.warn(
+            "Output type `server` does not produce static *.html pages in its output and thus will not work with astro-pagefind integration.",
+          );
+          return;
+        }
+
+        if (config.adapter?.name === "@astrojs/cloudflare") {
+          outDir = fileURLToPath(new URL(config.base?.replace(/^\//, ""), config.outDir));
+        } else if (config.adapter?.name === "@astrojs/node") {
+          outDir = fileURLToPath(config.build.client);
+        } else {
+          outDir = fileURLToPath(config.outDir);
+        }
+      },
+      "astro:server:setup": ({ server, logger }) => {
+        if (!outDir) {
+          logger.warn(
+            "astro-pagefind couldn't reliably determine the output directory. Search assets will not be served.",
+          );
+          return;
+        }
+
+        const serve = sirv(outDir, {
+          dev: true,
+          etag: true,
+        });
+        server.middlewares.use((req, res, next) => {
+          if (req.url?.startsWith("/pagefind/")) {
+            serve(req, res, next);
+          } else {
+            next();
+          }
+        });
+      },
+      "astro:build:done": async ({ logger }) => {
+        if (!outDir) {
+          logger.warn(
+            "astro-pagefind couldn't reliably determine the output directory. Search index will not be built.",
+          );
+          return;
+        }
+
+        const { index, errors: createErrors } = await createIndex(indexConfig);
+        if (!index) {
+          logger.error("Pagefind failed to create index");
+          createErrors.forEach((e) => logger.error(e));
+          return;
+        }
+        const { page_count, errors: addErrors } = await index.addDirectory({ path: outDir });
+        if (addErrors.length) {
+          logger.error("Pagefind failed to index files");
+          addErrors.forEach((e) => logger.error(e));
+          return;
+        } else {
+          logger.info(`Pagefind indexed ${page_count} pages`);
+        }
+        const { outputPath, errors: writeErrors } = await index.writeFiles({
+          outputPath: path.join(outDir, "pagefind"),
+        });
+        if (writeErrors.length) {
+          logger.error("Pagefind failed to write index");
+          writeErrors.forEach((e) => logger.error(e));
+          return;
+        } else {
+          logger.info(`Pagefind wrote index to ${outputPath}`);
+        }
+      },
+    },
+  };
+}