@lightnet/sveltia-admin 4.0.3 → 4.0.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @lightnet/sveltia-admin
 
+## 4.0.5
+
+### Patch Changes
+
+- [#382](https://github.com/LightNetDev/LightNet/pull/382) [`c6c8f31`](https://github.com/LightNetDev/LightNet/commit/c6c8f31adf464a842739f2b99d858aa0ba5d43e9) Thanks [@smn-cds](https://github.com/smn-cds)! - Update dependencies
+
+- [#382](https://github.com/LightNetDev/LightNet/pull/382) [`c6c8f31`](https://github.com/LightNetDev/LightNet/commit/c6c8f31adf464a842739f2b99d858aa0ba5d43e9) Thanks [@smn-cds](https://github.com/smn-cds)! - Add experimental support for Cloudflare-R2 through sveltia admin
+
+## 4.0.4
+
+### Patch Changes
+
+- [#380](https://github.com/LightNetDev/LightNet/pull/380) [`4efb5b5`](https://github.com/LightNetDev/LightNet/commit/4efb5b5bf4fccc1f6314911e1cfb395c0488ff98) Thanks [@smn-cds](https://github.com/smn-cds)! - Update dependencies
+
+- [#380](https://github.com/LightNetDev/LightNet/pull/380) [`4efb5b5`](https://github.com/LightNetDev/LightNet/commit/4efb5b5bf4fccc1f6314911e1cfb395c0488ff98) Thanks [@smn-cds](https://github.com/smn-cds)! - Update pnpm settings to make supply chain attacks less likely
+
 ## 4.0.3
 
 ### Patch Changes

package/package.json

@@ -3,7 +3,7 @@
   "description": "Admin UI for LightNet based on Sveltia CMS.",
   "type": "module",
   "license": "MIT",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "publishConfig": {
     "access": "public"
   },
@@ -33,15 +33,15 @@
     "astro": "^6.0.0"
   },
   "dependencies": {
-    "@sveltia/cms": "0.152.4",
-    "lightnet": "^4.0.5"
+    "@sveltia/cms": "0.156.1",
+    "lightnet": "^4.0.8"
   },
   "devDependencies": {
-    "@internal/e2e-test-utils": "^0.0.1",
     "@playwright/test": "^1.59.1",
-    "astro": "^6.1.5",
+    "astro": "^6.1.8",
     "typescript": "^5.9.3",
-    "vitest": "^4.1.4"
+    "vitest": "^4.1.4",
+    "@internal/e2e-test-utils": "^0.0.1"
   },
   "engines": {
     "node": ">=22"

package/src/astro-integration/config.ts

@@ -5,40 +5,53 @@ const normalizeAdminPath = (path: string) => path.replace(/^\/+|\/+$/g, "")
 /**
  * @see https://sveltiacms.app/en/docs/backends/gitlab
  */
-const gitlabSchema = z
-  .object({
-    name: z.literal("gitlab"),
-    repo: z.string(),
-    appId: z.string().optional(),
-    branch: z.string().default("main"),
-    authType: z.literal("pkce").default("pkce"),
-  })
-  .transform((gitlabConfig) => ({
-    ...gitlabConfig,
-    app_id: gitlabConfig.appId,
-    auth_type: gitlabConfig.authType,
-  }))
+const gitlabSchema = z.object({
+  name: z.literal("gitlab"),
+  repo: z.string(),
+  appId: z.string().optional(),
+  branch: z.string().default("main"),
+  authType: z.literal("pkce").default("pkce"),
+})
 
 /**
  * @see https://sveltiacms.app/en/docs/backends/github
  */
-const githubSchema = z
-  .object({
-    name: z.literal("github"),
-    repo: z.string(),
-    baseUrl: z.string().optional(),
-    branch: z.string().default("main"),
-  })
-  .transform((githubConfig) => ({
-    ...githubConfig,
-    base_url: githubConfig.baseUrl,
-  }))
+const githubSchema = z.object({
+  name: z.literal("github"),
+  repo: z.string(),
+  baseUrl: z.string().optional(),
+  branch: z.string().default("main"),
+})
 
 // Internal testing backend used by the Playwright harness.
 const testRepoSchema = z.object({
   name: z.literal("test-repo"),
 })
 
+const r2Storage = z.object({
+  name: z.literal("cloudflare-r2"),
+  /**
+   * R2 Access Key ID (64 hex characters). Safe to store in config.
+   */
+  accessKeyId: z.string(),
+  /**
+   * The R2 bucket name.
+   */
+  bucket: z.string(),
+  /**
+   * Your Cloudflare account ID. Used to construct the S3 API endpoint.
+   */
+  accountId: z.string(),
+  /**
+   * Public URL for asset previews and downloads. Required because the R2 S3 API always requires authentication.
+   */
+  publicUrl: z.string(),
+  /**
+   * Path prefix within the bucket, e.g. uploads/.
+   */
+  prefix: z.string().optional(),
+})
+
 export const adminConfigSchema = z.object({
   /**
    * Path for the admin page.
@@ -83,7 +96,7 @@ export const adminConfigSchema = z.object({
        * `lightnet({ languages })`.
        *
        * @example
-       * import languages from "./languages.json" assert { type: "json" }
+       * import languages from "./languages.json"
        *
        * export default defineConfig({
        *   integrations: [
@@ -100,6 +113,10 @@ export const adminConfigSchema = z.object({
        * migration path.
        */
       useLanguagesCollection: z.boolean().default(false),
+      /**
+       * Use Cloudflare r2 for content uploads.
+       */
+      fileStorage: r2Storage.optional(),
     })
     .optional(),
 })

package/src/sveltia/collections/content/media-items.ts

@@ -60,14 +60,7 @@ export const mediaItemCollection: Collection = {
               label: "File",
               widget: "file",
               choose_url: false,
-              media_folder: projectPath("public/files"),
-              public_folder: "/files",
-              hint: `Maximum file size is ${sveltiaAdminConfig.maxFileSize} MB.`,
-              media_library: {
-                config: {
-                  max_file_size: sveltiaAdminConfig.maxFileSize * 1000000,
-                },
-              },
+              ...getFileStorage(),
             },
             inlineTranslation({
               name: "label",
@@ -162,3 +155,31 @@ export const mediaItemCollection: Collection = {
     },
   ],
 }
+
+function getFileStorage() {
+  const externalFileStorage = sveltiaAdminConfig.experimental?.fileStorage
+  if (!externalFileStorage) {
+    return {
+      media_folder: projectPath("public/files"),
+      public_folder: "/files",
+      hint: `Maximum file size is ${sveltiaAdminConfig.maxFileSize} MB.`,
+      media_library: {
+        config: {
+          max_file_size: sveltiaAdminConfig.maxFileSize * 1000000,
+        },
+      },
+    }
+  }
+
+  return {
+    media_libraries: {
+      default: false,
+      cloudflare_r2: {
+        ...externalFileStorage,
+        access_key_id: externalFileStorage.accessKeyId,
+        account_id: externalFileStorage.accountId,
+        public_url: externalFileStorage.publicUrl,
+      },
+    },
+  }
+}

package/src/sveltia/sveltia.config.ts

@@ -1,4 +1,4 @@
-import type { CmsConfig } from "@sveltia/cms"
+import type { Backend, CmsConfig } from "@sveltia/cms"
 import { site } from "astro:config/server"
 import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
 
@@ -11,10 +11,7 @@ export function getConfig(
   siteUrl = process.env.LIGHTNET_DEV_SITE_URL ?? site,
 ): CmsConfig {
   return {
-    backend: sveltiaAdminConfig.backend ?? {
-      name: "github",
-      repo: createLocalRepoPath(),
-    },
+    backend: getBackend(),
     media_folder: projectPath("src/assets"),
     public_folder: "/src/assets",
     app_title: "LightNet Admin",
@@ -58,6 +55,33 @@ export function getConfig(
   }
 }
 
+function getBackend(): Backend {
+  const { backend } = sveltiaAdminConfig
+
+  if (!backend) {
+    return {
+      name: "github",
+      repo: createLocalRepoPath(),
+    }
+  }
+
+  if (backend.name === "github") {
+    return {
+      ...backend,
+      base_url: backend.baseUrl,
+    }
+  }
+
+  if (backend.name === "gitlab") {
+    return {
+      ...backend,
+      app_id: backend.appId,
+      auth_type: backend.authType,
+    }
+  }
+  return backend
+}
+
 // Sveltia CMS uses repo as unique site identifier for IndexedDB
 // https://github.com/sveltia/sveltia-cms/issues/630
 // Also it expects repo in format <org>/<repo>