storyloco 1.13.2 → 1.13.4

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "storyloco",
-   "version": "1.13.2",
+   "version": "1.13.4",
    "description": "A collection of slick Storyblok field plugins built with Svelte 5, TypeScript, and Tailwind CSS",
    "keywords": [
       "storyblok",

package/packages/shared/dist/global.css

@@ -137,9 +137,11 @@
 	* {
 		@apply border-border outline-ring/50;
 	}
+
 	body {
-		@apply bg-background text-foreground text-base;
+		@apply !bg-background text-foreground text-base;
 	}
+
 	button {
 		cursor: pointer;
 	}
@@ -157,6 +159,8 @@
 	}
 
 	[data-theme='dark'] {
+		color-scheme: dark;
+
 		select {
 			background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%23ffffff' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpolyline points='6 9 12 15 18 9'%3E%3C/polyline%3E%3C/svg%3E");
 		}

package/packages/vite/dist/redirects/handle.js

@@ -1,17 +1,27 @@
 import { match, compile } from "path-to-regexp";
+import { access, readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { cwd } from "node:process";
+import { logger } from "./plugin.js";
 // Lazy load the redirects map to avoid import errors during dev
 let redirects_map = null;
 async function load_redirects_map() {
     if (redirects_map)
         return redirects_map;
+    // Try to find and import the redirects file from the project root. Allow some time
+    // for the Vite plugin to generate it on first boot.
+    const project_root = cwd();
+    const redirects_file_json = join(project_root, ".svelte-kit", "storyblok", "redirects.build.json");
     try {
-        const { redirects_map: map } = await import("../../../.svelte-kit/storyblok/redirects.build.js");
-        redirects_map = map;
-        return map;
+        await access(redirects_file_json);
+        const content = await readFile(redirects_file_json, "utf-8");
+        const entries = JSON.parse(content);
+        redirects_map = new Map(entries);
+        return redirects_map;
     }
-    catch (error) {
-        // During dev or if file doesn't exist yet, return empty map
-        console.warn("Redirects file not found, using empty redirects map");
+    catch (err) {
+        logger.warn(`Redirects file not found, using empty redirects map`);
+        logger.warn(String(err));
         redirects_map = new Map();
         return redirects_map;
     }

package/packages/vite/dist/redirects/plugin.d.ts

@@ -1,4 +1,6 @@
 import { type Plugin } from "vite";
+import { Logger } from "../shared/logger.js";
+export declare const logger: Logger;
 interface Options {
     datasource?: string;
     public_storyblok_access_token?: string;

package/packages/vite/dist/redirects/plugin.js

@@ -2,9 +2,8 @@ import { loadEnv } from "vite";
 import { writeFile, readFile, access, constants } from "node:fs/promises";
 import path from "node:path";
 import { Logger } from "../shared/logger.js";
-import * as prettier from "prettier";
 const name = "vite-storyblok-redirects";
-const logger = new Logger(name);
+export const logger = new Logger(name);
 async function get_redirects(datasource = "redirects", public_storyblok_access_token) {
     const env_token = loadEnv("", "", "").PUBLIC_STORYBLOK_ACCESS_TOKEN;
     const token = public_storyblok_access_token ?? env_token;
@@ -106,19 +105,20 @@ export default function redirects({ datasource = "redirects", public_storyblok_a
             const run = async () => {
                 try {
                     const { datasource_entries } = await get_redirects(datasource, public_storyblok_access_token);
-                    const ts_content = generate_ts_file(datasource_entries);
-                    const output = path.resolve(".svelte-kit", "storyblok", "redirects.build.ts");
-                    const prettier_config = await prettier.resolveConfig(output);
-                    const formatted = await prettier.format(ts_content, {
-                        ...(prettier_config ?? {}),
-                        filepath: output,
-                    });
-                    const current_norm = normalize_content(formatted);
+                    const output_dir = path.resolve(".svelte-kit", "storyblok");
+                    const output_json = path.join(output_dir, "redirects.build.json");
+                    const entries = Array.from(new Map(datasource_entries
+                        .filter((e) => Boolean(e?.name) && Boolean(e?.value))
+                        .map((e) => [e.name, e.value])).entries());
+                    const entries_json = JSON.stringify(entries, null, 2);
+                    const current_norm = normalize_content(entries_json);
                     if (current_norm !== last_written) {
                         logger.start("Generating redirects");
-                        await writeFile(output, formatted);
+                        // ensure directory exists
+                        await (await import("node:fs/promises")).mkdir(output_dir, { recursive: true });
+                        await writeFile(output_json, entries_json);
                         last_written = current_norm;
-                        logger.succeed("Redirects TS generated");
+                        logger.succeed("Redirects JSON generated");
                     }
                 }
                 catch (err) {
@@ -135,27 +135,27 @@ export default function redirects({ datasource = "redirects", public_storyblok_a
             }
             try {
                 const { datasource_entries } = await get_redirects(datasource, public_storyblok_access_token);
-                const ts_content = generate_ts_file(datasource_entries);
-                const output = path.resolve(".svelte-kit", "storyblok", "redirects.build.ts");
-                const prettier_config = await prettier.resolveConfig(output);
-                const formatted = await prettier.format(ts_content, {
-                    ...(prettier_config ?? {}),
-                    filepath: output,
-                });
+                const output_dir = path.resolve(".svelte-kit", "storyblok");
+                const output_json = path.join(output_dir, "redirects.build.json");
                 let previous = "";
                 try {
-                    await access(output, constants.F_OK);
-                    previous = await readFile(output, "utf8");
+                    await access(output_json, constants.F_OK);
+                    previous = await readFile(output_json, "utf8");
                 }
                 catch {
                     // file doesn't exist, that's fine
                 }
+                const entries = Array.from(new Map(datasource_entries
+                    .filter((e) => Boolean(e?.name) && Boolean(e?.value))
+                    .map((e) => [e.name, e.value])).entries());
+                const entries_json = JSON.stringify(entries, null, 2);
                 const previous_norm = normalize_content(previous);
-                const current_norm = normalize_content(formatted);
+                const current_norm = normalize_content(entries_json);
                 if (previous_norm !== current_norm) {
                     logger.start("Generating redirects");
-                    await writeFile(output, formatted);
-                    logger.succeed("Redirects TS generated");
+                    await (await import("node:fs/promises")).mkdir(output_dir, { recursive: true });
+                    await writeFile(output_json, entries_json);
+                    logger.succeed("Redirects JSON generated");
                 }
             }
             catch (err) {
@@ -166,31 +166,3 @@ export default function redirects({ datasource = "redirects", public_storyblok_a
         closeBundle() { },
     };
 }
-function generate_ts_file(entries) {
-    const map_entries = entries
-        .filter((e) => Boolean(e?.name) && Boolean(e?.value))
-        .map((e) => `\t[${JSON.stringify(e.name)}, ${JSON.stringify(e.value)}]`)
-        .join(",\n");
-    return `/**
- * AUTO-GENERATED FILE. DO NOT EDIT.
- * Generated by ${name} plugin on ${new Date().toISOString()}.
- * Any changes will be overwritten.
- */
-
-/**
- * Redirects map
- *
- * Maps a source pathname pattern to a target pathname template.
- *
- * - key: source pattern (supports '*' as a single-segment wildcard)
- * - value: target template (each '*' is replaced by the corresponding capture)
- *
- * Notes:
- * - Keys may be provided without a leading slash (e.g. foo == /foo).
- * - Self-redirects (target resolves to the same pathname) are ignored.
- */
-export const redirects_map: Map<string, string> = new Map([
-${map_entries}
-])
-`;
-}

package/packages/vite/dist/schema/plugin.js

@@ -129,7 +129,7 @@ export default function schema({ output_path, interval_ms, storyblok_personal_ac
                     // Generate types
                     logger.start("Generating TypeScript definitions...");
                     await $ `chmod u+w ${schema_ts_file}`.quiet().nothrow();
-                    await $ `${x} storyblok@4.6.6 ts generate -s ${storyblok_space_id} -p .svelte-kit/storyblok --compiler-options ${here("compiler_options.js")} --custom-fields-parser ${here("custom_fields_parser.js")} --strict`;
+                    await $ `${x} storyblok@4.6.6 ts generate -s ${storyblok_space_id} -p .svelte-kit/storyblok --compiler-options ${here("compiler_options.js")} --custom-fields-parser ${here("custom_fields_parser.js")} --strict`.quiet();
                     logger.succeed("TypeScript definitions generated.");
                     // Get generated files
                     let component_types;