npm - @lightnet/sveltia-admin - Versions diffs - 4.0.15 → 4.1.0 - Mend

@lightnet/sveltia-admin 4.0.15 → 4.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/CHANGELOG.md +40 -0
package/package.json +4 -4
package/src/Admin.astro +10 -1
package/src/astro-integration/config.ts +68 -1
package/src/astro-integration/integration.ts +1 -14
package/src/collections/categories.ts +35 -0
package/src/{sveltia/collections/content → collections}/languages.ts +13 -9
package/src/{sveltia/collections/content → collections}/media-collections.ts +11 -7
package/src/collections/media-items.ts +203 -0
package/src/{sveltia/collections/content → collections}/media-types.ts +10 -6
package/src/config.json.ts +2 -2
package/src/{sveltia/sveltia.config.ts → sveltia.config.ts} +30 -18
package/src/utils/is-defined.ts +5 -0
package/src/utils/path-with-base.ts +15 -0
package/src/utils/paths.ts +6 -15
package/src/astro-integration/media-item-edit-button-controller.ts +0 -27
package/src/sveltia/collections/content/categories.ts +0 -31
package/src/sveltia/collections/content/index.ts +0 -12
package/src/sveltia/collections/content/media-items.ts +0 -180
package/src/sveltia/utils/path.ts +0 -6
/package/src/{sveltia/utils → collections/fields}/inline-translation.ts +0 -0

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,45 @@
 # @lightnet/sveltia-admin
+## 4.1.0
+### Minor Changes
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Automatically generate new entry slugs from entry name or title.
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Improve edit button handling
+  - header icon menu will now show admin button
+  - details page will show edit button for all admin ui paths
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Support gif uploads through admin ui.
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Add experimental options to hide/show admin UI collections and fields:
+  Hiding:
+  - `experimental.hideCategoriesCollection` (default: `false`): Hide `categories` collection.
+  - `experimental.hideMediaTypesCollection` (default: `false`): Hide `media-types` collection.
+  - `experimental.hideMediaCollectionsCollection` (default: `false`): Hide `media-collections` collection.
+  - `experimental.hideAuthorsField` (default: `false`): Hide authors field in the media item editor.
+  - `experimental.hideCategoriesField` (default: `false`): Hide categories field in the media item editor.
+  Showing:
+  - `experimental.showContentLabelField` (default: `true`): Show `content[].label` field in the media item editor.
+  - `experimental.showDateCreatedField` (default: `true`): Show `dateCreated` field in the media item editor.
+  - `experimental.showCommonIdField` (default: `true`): Show `commonId` field in the media item editor.
+  - `experimental.showSlugField` (default: `true`): Show `slug` field editor for new collection entries.
+### Patch Changes
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Update dependencies.
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Reduce max image dimension to 1024px for sveltia image uploads.
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Disable image transforms for content file uploads.
+- [#421](https://github.com/LightNetDev/LightNet/pull/421) [`9935fa9`](https://github.com/LightNetDev/LightNet/commit/9935fa94b22a4f70d09ac7118ee9abc1c63bfad3) - Improve hints and descriptions in Sveltia based Admin UI.
 ## 4.0.15
 ### Patch Changes

package/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
   "description": "Admin UI for LightNet based on Sveltia CMS.",
   "type": "module",
   "license": "MIT",
-  "version": "4.0.15",
+  "version": "4.1.0",
   "publishConfig": {
     "access": "public"
   },
@@ -34,15 +34,15 @@
     "lightnet": "^4.0.0"
   },
   "dependencies": {
-    "@sveltia/cms": "0.167.3"
+    "@sveltia/cms": "0.169.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.61.0",
+    "@playwright/test": "^1.61.1",
     "astro": "^6.4.8",
     "typescript": "^6.0.3",
     "vitest": "^4.1.9",
     "@internal/e2e-test-utils": "^0.0.1",
-    "lightnet": "^4.5.0"
+    "lightnet": "^4.5.1"
   },
   "engines": {
     "node": ">=22"

package/src/Admin.astro CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 import config from "virtual:lightnet/sveltiaAdminConfig"
-import { pathWithBase } from "./utils/paths"
+import { pathWithBase } from "./utils/path-with-base"
 ---
 <!doctype html>
@@ -20,6 +20,15 @@ import { pathWithBase } from "./utils/paths"
     <script>
       import { init } from "@sveltia/cms"
       init({})
+      window.localStorage.setItem(
+        "ln.adminPaths",
+        JSON.stringify({
+          rootPath: window.location.pathname,
+          mediaItemPath:
+            window.location.pathname +
+            "#/collections/media/entries/{{mediaId}}",
+        }),
+      )
     </script>
   </body>
 </html>

package/src/astro-integration/config.ts CHANGED Viewed

@@ -113,12 +113,79 @@ export const adminConfigSchema = z.object({
        * migration path.
        */
       useLanguagesCollection: z.boolean().default(false),
+      /**
+       * Hide `categories` collection.
+       *
+       * @default false
+       */
+      hideCategoriesCollection: z.boolean().default(false),
+      /**
+       * Hide `media-collections` collection.
+       *
+       * @default false
+       */
+      hideMediaCollectionsCollection: z.boolean().default(false),
+      /**
+       * Hide `media-types` collection.
+       *
+       * @default false
+       */
+      hideMediaTypesCollection: z.boolean().default(false),
+      /**
+       * Hide `authors` field in the media item editor.
+       *
+       * @default false
+       */
+      hideAuthorsField: z.boolean().default(false),
+      /**
+       * Hide `categories` field in the media item editor.
+       *
+       * @default false
+       */
+      hideCategoriesField: z.boolean().default(false),
+      /**
+       * Show `content[].label` field in the media item editor.
+       *
+       * @default true
+       */
+      showContentLabelField: z.boolean().default(true),
+      /**
+       * Show `dateCreated` field in the media item editor.
+       *
+       * @default true
+       */
+      showDateCreatedField: z.boolean().default(true),
+      /**
+       * Show `commonI`d field in the media item editor.
+       *
+       * @default true
+       */
+      showCommonIdField: z.boolean().default(true),
+      /**
+       * Show `slug` field editor for new collection entries.
+       *
+       * @default true
+       */
+      showSlugField: z.boolean().default(true),
       /**
        * Use Cloudflare r2 for content uploads.
        */
       fileStorage: r2Storage.optional(),
     })
-    .optional(),
+    // we need to provide defaults because we cannot short circuit flags that default to `true`.
+    // experimental object can be made optional when we move flags out or change all defaults to `false`.
+    .default({
+      useLanguagesCollection: false,
+      hideCategoriesCollection: false,
+      hideMediaCollectionsCollection: false,
+      hideMediaTypesCollection: false,
+      hideAuthorsField: false,
+      hideCategoriesField: false,
+      showCommonIdField: true,
+      showContentLabelField: true,
+      showDateCreatedField: true,
+      showSlugField: true,
+    }),
 })
 export type SveltiaAdminConfig = z.input<typeof adminConfigSchema>

package/src/astro-integration/integration.ts CHANGED Viewed

@@ -1,5 +1,3 @@
-import { fileURLToPath } from "node:url"
 import type { AstroIntegration, ViteUserConfig } from "astro"
 import { AstroError } from "astro/errors"
@@ -56,14 +54,7 @@ export default function lightnetSveltiaAdmin(
 }
 const CONFIG = "virtual:lightnet/sveltiaAdminConfig"
-const MEDIA_ITEM_EDIT_BUTTON_CONTROLLER =
-  "virtual:lightnet/components/media-item-edit-button-controller"
-const MEDIA_ITEM_EDIT_BUTTON_CONTROLLER_PATH = JSON.stringify(
-  fileURLToPath(
-    new URL("./media-item-edit-button-controller.ts", import.meta.url),
-  ),
-)
-const VIRTUAL_MODULES = [CONFIG, MEDIA_ITEM_EDIT_BUTTON_CONTROLLER] as const
+const VIRTUAL_MODULES = [CONFIG] as const
 function vitePluginSveltiaAdminConfig(
   userConfig: ExtendedSveltiaAdminConfig,
@@ -80,10 +71,6 @@ function vitePluginSveltiaAdminConfig(
       switch (module) {
         case CONFIG:
           return `export default ${JSON.stringify(userConfig)};`
-        case MEDIA_ITEM_EDIT_BUTTON_CONTROLLER:
-          return userConfig.path === "admin"
-            ? `export { default } from ${MEDIA_ITEM_EDIT_BUTTON_CONTROLLER_PATH};`
-            : "export default undefined;"
       }
     },
   }

package/src/collections/categories.ts ADDED Viewed

@@ -0,0 +1,35 @@
+import type { Collection } from "@sveltia/cms"
+import config from "virtual:lightnet/config"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
+import { projectPath } from "../utils/paths"
+import { inlineTranslation } from "./fields/inline-translation"
+export const categoriesCollection: Collection = {
+  name: "categories",
+  label: "Categories",
+  description:
+    "Use categories to group related media items by topic. Examples: discipleship, youth, prayer. [Read documentation](https://docs.lightnet.community/content/categories/)",
+  label_singular: "Category",
+  folder: projectPath("src/content/categories"),
+  create: true,
+  hide: adminConfig.experimental.hideCategoriesCollection,
+  format: "json",
+  slug: adminConfig.experimental.showSlugField
+    ? "{{fields._slug}}"
+    : `{{label.${config.defaultLocale}}}`,
+  summary: `{{label.${config.defaultLocale}}}`,
+  fields: [
+    inlineTranslation({ name: "label", label: "Name" }),
+    {
+      name: "image",
+      label: "Image",
+      required: false,
+      choose_url: false,
+      widget: "image",
+      media_folder: "./images",
+      accept: "image/png, image/jpeg, image/webp, image/gif",
+      hint: "Upload an image for this category. A square image works best. LightNet may resize it and change the file format.",
+    },
+  ],
+}

package/src/{sveltia/collections/content → collections}/languages.ts RENAMED Viewed

@@ -1,15 +1,20 @@
 import type { CollectionFile } from "@sveltia/cms"
 import config from "virtual:lightnet/config"
-import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
-import { inlineTranslation } from "../../utils/inline-translation"
-import { projectPath } from "../../utils/path"
+import { projectPath } from "../utils/paths"
+import { inlineTranslation } from "./fields/inline-translation"
 export const languagesSelect = () => {
-  if (sveltiaAdminConfig.experimental?.useLanguagesCollection) {
+  const commonProperties = {
+    name: "language",
+    label: "Content Language",
+    hint: "Choose the content language for this item. It should match the content you add.",
+  }
+  if (adminConfig.experimental.useLanguagesCollection) {
     return {
-      name: "language",
-      label: "Language",
+      ...commonProperties,
       widget: "relation",
       collection: "_singletons",
       file: "languages",
@@ -20,8 +25,7 @@ export const languagesSelect = () => {
     }
   } else {
     return {
-      name: "language",
-      label: "Language",
+      ...commonProperties,
       widget: "select",
       options: config.languages.map(({ code, label }) => {
         return {
@@ -34,7 +38,7 @@ export const languagesSelect = () => {
 }
 export const defineLanguagesCollection = () => {
-  if (!sveltiaAdminConfig.experimental?.useLanguagesCollection) {
+  if (!adminConfig.experimental.useLanguagesCollection) {
     return
   }
   return languagesCollection

package/src/{sveltia/collections/content → collections}/media-collections.ts RENAMED Viewed

@@ -1,31 +1,36 @@
 import type { Collection } from "@sveltia/cms"
 import config from "virtual:lightnet/config"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
-import { inlineTranslation } from "../../utils/inline-translation"
-import { projectPath } from "../../utils/path"
+import { projectPath } from "../utils/paths"
+import { inlineTranslation } from "./fields/inline-translation"
 export const mediaCollectionCollection: Collection = {
   name: "media-collections",
   label: "Media Collections",
   description:
-    "Group related media items in a specific order. Examples: a course, a series, a study path. [Read documentation](https://docs.lightnet.community/content/media-collections/)",
+    "Use media collections to group related media items in order. Examples: a course, a series, a study path. [Read documentation](https://docs.lightnet.community/content/media-collections/)",
   label_singular: "Media Collection",
   create: true,
+  hide: adminConfig.experimental.hideMediaCollectionsCollection,
   folder: projectPath("src/content/media-collections"),
   format: "json",
-  slug: "{{fields._slug}}",
-  summary: `{{label.${config.defaultLocale}}}  ({{slug}})`,
+  slug: adminConfig.experimental.showSlugField
+    ? "{{fields._slug}}"
+    : `{{label.${config.defaultLocale}}}`,
+  summary: `{{label.${config.defaultLocale}}}`,
   fields: [
     inlineTranslation({
       name: "label",
       label: "Name",
+      hint: "Enter the name people should see for this collection.",
     }),
     {
       name: "mediaItems",
       label: "Media Items",
       label_singular: "Media Item",
       widget: "list",
-      hint: "The list order defines the item order in this collection.",
+      hint: "Add the media items in the order people should see them.",
       summary: "{{fields.mediaItem}}",
       collapsed: true,
       field: {
@@ -33,7 +38,6 @@ export const mediaCollectionCollection: Collection = {
         label: "Media Item",
         widget: "relation",
         collection: "media",
-        value_field: "{{slug}}",
         display_fields: ["{{title}} ({{slug}})"],
         search_fields: ["{{title}}", "{{slug}}"],
         dropdown_threshold: 1,

package/src/collections/media-items.ts ADDED Viewed

@@ -0,0 +1,203 @@
+import type { Collection } from "@sveltia/cms"
+import config from "virtual:lightnet/config"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
+import { isDefined } from "../utils/is-defined"
+import { projectPath } from "../utils/paths"
+import { inlineTranslation } from "./fields/inline-translation"
+import { languagesSelect } from "./languages"
+export const mediaItemCollection: Collection = {
+  name: "media",
+  label: "Media Items",
+  description:
+    "Use media items to add resources people can open or download. Examples: a book PDF, a YouTube link. [Read documentation](https://docs.lightnet.community/content/media-items/)",
+  label_singular: "Media Item",
+  folder: projectPath("src/content/media"),
+  create: true,
+  preview_path: `${config.defaultLocale}/media/{{filename}}`,
+  format: "json",
+  sortable_fields: ["title", "dateCreated", "language"],
+  slug: adminConfig.experimental.showSlugField
+    ? "{{fields._slug}}"
+    : "{{title}}-{{language}}",
+  view_groups: [
+    { label: "Language", field: "language", pattern: ".*" },
+    { label: "Type", field: "type", pattern: ".*" },
+  ],
+  fields: [
+    {
+      name: "title",
+      label: "Title",
+      widget: "string",
+      hint: "Enter the title in the content language.",
+    },
+    {
+      name: "type",
+      label: "Media Type",
+      widget: "relation",
+      hint: "Choose the kind of media this content represents.",
+      collection: "media-types",
+      display_fields: [`{{label.${config.defaultLocale}}} ({{slug}})`],
+    },
+    languagesSelect(),
+    {
+      name: "image",
+      label: "Image",
+      widget: "image",
+      choose_url: false,
+      media_folder: "./images",
+      accept: "image/png, image/jpeg, image/webp, image/gif",
+      hint: "Upload a cover image for this item. LightNet may resize it and change the file format.",
+    },
+    {
+      name: "content",
+      label: "Content",
+      widget: "list",
+      hint: "Add one or more files or links. The first item becomes the main resource people will open or download.",
+      min: 1,
+      summary: "{{types.url}}",
+      types: [
+        {
+          name: "upload",
+          label: "File Upload",
+          fields: [
+            {
+              name: "url",
+              label: "File",
+              widget: "file",
+              choose_url: false,
+              ...getFileStorage(),
+            },
+            adminConfig.experimental.showContentLabelField &&
+              inlineTranslation({
+                name: "label",
+                label: "Visible Name",
+                hint: "Optional. Add a clearer label if you do not want to show the file name.",
+                required: false,
+                collapsed: "auto",
+              }),
+          ].filter(isDefined),
+        },
+        {
+          name: "link",
+          label: "Link",
+          summary: "{{url}}",
+          fields: [
+            {
+              name: "url",
+              label: "Url",
+              widget: "string",
+              type: "url",
+              pattern: ["^https?://", "Link must start with http(s)://"],
+            },
+            adminConfig.experimental.showContentLabelField &&
+              inlineTranslation({
+                name: "label",
+                label: "Visible Name",
+                required: false,
+                hint: "Optional. Add a clearer label if you do not want to show the website name.",
+                collapsed: "auto",
+              }),
+          ].filter(isDefined),
+        },
+      ],
+    },
+    adminConfig.experimental.showDateCreatedField
+      ? {
+          name: "dateCreated",
+          label: "Created On",
+          widget: "datetime",
+          time_format: false,
+          required: true,
+          default: "{{now}}",
+          picker_utc: true,
+          hint: "Choose when this item was added to the media library.",
+        }
+      : {
+          name: "dateCreated",
+          widget: "hidden",
+          default: "{{datetime | date('YYYY-MM-DD')}}",
+        },
+    !adminConfig.experimental.hideAuthorsField && {
+      name: "authors",
+      label: "Authors",
+      label_singular: "Author",
+      required: false,
+      collapsed: true,
+      default: [],
+      widget: "list",
+      summary: "{{fields.name}}",
+      hint: "Add the author names in the content language.",
+      field: { label: "Name", name: "name", widget: "string" },
+    },
+    adminConfig.experimental.showCommonIdField && {
+      name: "commonId",
+      label: "Translation Group (Common ID)",
+      widget: "string",
+      required: false,
+      hint: "Optional. Use the same value for matching items in different languages so LightNet can treat them as translations of each other.",
+    },
+    !adminConfig.experimental.hideCategoriesField && {
+      name: "categories",
+      label: "Categories",
+      required: false,
+      widget: "relation",
+      multiple: true,
+      collection: "categories",
+      display_fields: [`{{label.${config.defaultLocale}}}`],
+    },
+    {
+      name: "description",
+      label: "Description",
+      widget: "markdown",
+      hint: "Write a short description in the content language.",
+      required: false,
+      editor_components: [],
+      buttons: [
+        "heading-two",
+        "heading-three",
+        "heading-four",
+        "heading-five",
+        "heading-six",
+        "bold",
+        "italic",
+        "bulleted-list",
+        "numbered-list",
+        "quote",
+        "link",
+      ],
+    },
+  ].filter(isDefined),
+}
+function getFileStorage() {
+  const externalFileStorage = adminConfig.experimental.fileStorage
+  if (!externalFileStorage) {
+    return {
+      media_folder: projectPath("public/files"),
+      public_folder: "/files",
+      hint: `Upload a file up to ${adminConfig.maxFileSize} MB.`,
+      media_libraries: {
+        default: {
+          config: {
+            max_file_size: adminConfig.maxFileSize * 1_000_000,
+            transformations: {},
+          },
+        },
+      },
+    }
+  }
+  return {
+    media_libraries: {
+      default: false,
+      cloudflare_r2: {
+        ...externalFileStorage,
+        access_key_id: externalFileStorage.accessKeyId,
+        account_id: externalFileStorage.accountId,
+        public_url: externalFileStorage.publicUrl,
+      },
+    },
+  }
+}

package/src/{sveltia/collections/content → collections}/media-types.ts RENAMED Viewed

@@ -1,19 +1,23 @@
 import type { Collection } from "@sveltia/cms"
 import config from "virtual:lightnet/config"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
-import { inlineTranslation } from "../../utils/inline-translation"
-import { projectPath } from "../../utils/path"
+import { projectPath } from "../utils/paths"
+import { inlineTranslation } from "./fields/inline-translation"
 export const mediaTypeCollection: Collection = {
   name: "media-types",
   label: "Media Types",
   description:
-    "Define different content formats. Examples: books, videos, audio. [Read documentation](https://docs.lightnet.community/content/media-types/)",
+    "Use media types to organize media items by format. Examples: books, videos, audio. [Read documentation](https://docs.lightnet.community/content/media-types/)",
   label_singular: "Media Type",
   folder: projectPath("src/content/media-types"),
   format: "json",
-  slug: "{{fields._slug}}",
-  summary: `{{label.${config.defaultLocale}}}  ({{slug}})`,
+  hide: adminConfig.experimental.hideMediaTypesCollection,
+  slug: adminConfig.experimental.showSlugField
+    ? "{{fields._slug}}"
+    : `{{label.${config.defaultLocale}}}`,
+  summary: `{{label.${config.defaultLocale}}}`,
   fields: [
     inlineTranslation({ name: "label", label: "Name" }),
     {
@@ -24,7 +28,7 @@ export const mediaTypeCollection: Collection = {
         "Icon name must start with mdi-- or lucide--",
       ],
       widget: "string",
-      hint: "Browse Lucide icons at https://lucide.dev/icons/ and enter the icon name with the 'lucide--' prefix, for example 'lucide--book-open'.",
+      hint: "Enter an Lucide icon name such as 'lucide--book-open'. Browse Lucide icons at https://lucide.dev/icons/.",
     },
     {
       name: "coverImageStyle",

package/src/config.json.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import type { APIRoute } from "astro"
-import { getConfig } from "./sveltia/sveltia.config"
+import { createConfig } from "./sveltia.config"
 export const GET: APIRoute = () => {
-  return new Response(JSON.stringify(getConfig()))
+  return new Response(JSON.stringify(createConfig()))
 }

package/src/{sveltia/sveltia.config.ts → sveltia.config.ts} RENAMED Viewed

@@ -1,13 +1,17 @@
 import type { Backend, CmsConfig } from "@sveltia/cms"
 import { site } from "astro:config/server"
-import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
+import adminConfig from "virtual:lightnet/sveltiaAdminConfig"
-import lightnetLogo from "../assets/lightnet-logo.svg?url"
-import { contentCollections } from "./collections/content"
-import { defineLanguagesCollection } from "./collections/content/languages"
-import { projectPath } from "./utils/path"
+import lightnetLogo from "./assets/lightnet-logo.svg?url"
+import { categoriesCollection } from "./collections/categories"
+import { defineLanguagesCollection } from "./collections/languages"
+import { mediaCollectionCollection } from "./collections/media-collections"
+import { mediaItemCollection } from "./collections/media-items"
+import { mediaTypeCollection } from "./collections/media-types"
+import { isDefined } from "./utils/is-defined"
+import { projectPath } from "./utils/paths"
-export function getConfig(
+export function createConfig(
   siteUrl = process.env.LIGHTNET_DEV_SITE_URL ?? site,
 ): CmsConfig {
   return {
@@ -27,14 +31,11 @@ export function getConfig(
       },
       default: {
         config: {
-          max_file_size: sveltiaAdminConfig.maxFileSize * 1_000_000,
+          max_file_size: adminConfig.maxFileSize * 1_000_000,
           transformations: {
-            raster_image: {
-              format: "webp",
-              quality: 85,
-              width: 2048,
-              height: 2048,
-            },
+            jpeg: optimizedImage,
+            png: optimizedImage,
+            webp: optimizedImage,
             svg: {
               optimize: true,
             },
@@ -52,13 +53,26 @@ export function getConfig(
       encoding: "ascii",
       maxlength: 60,
     },
-    collections: [...contentCollections],
-    singletons: [defineLanguagesCollection()].filter((c) => !!c),
+    collections: [
+      mediaItemCollection,
+      { divider: true },
+      categoriesCollection,
+      mediaCollectionCollection,
+      mediaTypeCollection,
+    ],
+    singletons: [defineLanguagesCollection()].filter(isDefined),
   }
 }
+const optimizedImage = {
+  format: "webp",
+  quality: 85,
+  width: 1024,
+  height: 1024,
+} as const
 function getBackend(): Backend {
-  const { backend } = sveltiaAdminConfig
+  const { backend } = adminConfig
   if (!backend) {
     return {
@@ -97,5 +111,3 @@ function createLocalRepoPath() {
       .replaceAll(".", "-") + "/local-repository"
   )
 }
-export const config = getConfig()

package/src/utils/is-defined.ts ADDED Viewed

@@ -0,0 +1,5 @@
+export const isDefined = <TInput>(
+  input: TInput | undefined | false,
+): input is TInput => {
+  return input !== false && input !== undefined
+}

package/src/utils/path-with-base.ts ADDED Viewed

@@ -0,0 +1,15 @@
+/**
+ * Prefix a site-internal path with Astro's configured base path.
+ *
+ * This helper trims any trailing slash from `BASE_URL`, ensures the input
+ * path starts with a leading slash, and concatenates the two values.
+ * Absolute URLs are out of scope for this helper.
+ *
+ * @param path internal path such as "/en/media", "/api/internal/search.json", or "/"
+ * @returns base-aware internal path
+ */
+export function pathWithBase(path: string) {
+  const normalizedBase = import.meta.env.BASE_URL.replace(/\/+$/, "")
+  const normalizedPath = path.startsWith("/") ? path : `/${path}`
+  return `${normalizedBase}${normalizedPath}`
+}

package/src/utils/paths.ts CHANGED Viewed

@@ -1,15 +1,6 @@
-/**
- * Prefix a site-internal path with Astro's configured base path.
- *
- * This helper trims any trailing slash from `BASE_URL`, ensures the input
- * path starts with a leading slash, and concatenates the two values.
- * Absolute URLs are out of scope for this helper.
- *
- * @param path internal path such as "/en/media", "/api/internal/search.json", or "/"
- * @returns base-aware internal path
- */
-export function pathWithBase(path: string) {
-  const normalizedBase = import.meta.env.BASE_URL.replace(/\/+$/, "")
-  const normalizedPath = path.startsWith("/") ? path : `/${path}`
-  return `${normalizedBase}${normalizedPath}`
-}
+import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
+const basePath: string = sveltiaAdminConfig.siteRootInRepo
+export const projectPath = (path: string) =>
+  `${basePath}${basePath.endsWith("/") || path.startsWith("/") ? "" : "/"}${path}`

package/src/astro-integration/media-item-edit-button-controller.ts DELETED Viewed

@@ -1,27 +0,0 @@
-import { pathWithBase } from "../utils/paths"
-const parseCachedUser = () => {
-  try {
-    const cachedUser = localStorage.getItem("sveltia-cms.user")
-    return cachedUser ? JSON.parse(cachedUser) : undefined
-  } catch {
-    return undefined
-  }
-}
-export default {
-  shouldShow: () => {
-    if (import.meta.env.DEV) {
-      return true
-    }
-    const cachedUser = parseCachedUser()
-    return (
-      typeof cachedUser === "object" &&
-      cachedUser !== null &&
-      typeof cachedUser.backendName === "string"
-    )
-  },
-  createHref: (mediaId: string) =>
-    `${pathWithBase("/admin")}#/collections/media/entries/${encodeURIComponent(mediaId)}`,
-}

package/src/sveltia/collections/content/categories.ts DELETED Viewed

@@ -1,31 +0,0 @@
-import type { Collection } from "@sveltia/cms"
-import config from "virtual:lightnet/config"
-import { inlineTranslation } from "../../utils/inline-translation"
-import { projectPath } from "../../utils/path"
-export const categoriesCollection: Collection = {
-  name: "categories",
-  label: "Categories",
-  description:
-    "Organize and filter media items by topic. Examples: discipleship, youth, prayer. [Read documentation](https://docs.lightnet.community/content/categories/)",
-  label_singular: "Category",
-  folder: projectPath("src/content/categories"),
-  create: true,
-  format: "json",
-  slug: "{{fields._slug}}",
-  summary: `{{label.${config.defaultLocale}}}  ({{slug}})`,
-  fields: [
-    inlineTranslation({ name: "label", label: "Name" }),
-    {
-      name: "image",
-      label: "Image",
-      required: false,
-      choose_url: false,
-      widget: "image",
-      media_folder: "./images",
-      accept: "image/png, image/jpeg, image/webp",
-      hint: "When you upload an image, it is automatically resized (up to 2048 pixels) and saved in a web-friendly format.",
-    },
-  ],
-}

package/src/sveltia/collections/content/index.ts DELETED Viewed

@@ -1,12 +0,0 @@
-import { categoriesCollection } from "./categories"
-import { mediaCollectionCollection } from "./media-collections"
-import { mediaItemCollection } from "./media-items"
-import { mediaTypeCollection } from "./media-types"
-export const contentCollections = [
-  mediaItemCollection,
-  { divider: true },
-  categoriesCollection,
-  mediaCollectionCollection,
-  mediaTypeCollection,
-]

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

@@ -1,180 +0,0 @@
-import type { Collection } from "@sveltia/cms"
-import config from "virtual:lightnet/config"
-import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
-import { inlineTranslation } from "../../utils/inline-translation"
-import { projectPath } from "../../utils/path"
-import { languagesSelect } from "./languages"
-export const mediaItemCollection: Collection = {
-  name: "media",
-  label: "Media Items",
-  description:
-    "Add content entries to the media library. Examples: a book PDF, a YouTube link. [Read documentation](https://docs.lightnet.community/content/media-items/)",
-  label_singular: "Media Item",
-  folder: projectPath("src/content/media"),
-  create: true,
-  preview_path: `${config.defaultLocale}/media/{{filename}}`,
-  format: "json",
-  slug: "{{fields._slug}}",
-  sortable_fields: ["slug", "dateCreated", "language"],
-  summary: "{{title}} ({{slug}})",
-  view_groups: [
-    { label: "Language", field: "language", pattern: ".*" },
-    { label: "Type", field: "type", pattern: ".*" },
-  ],
-  fields: [
-    { name: "title", label: "Title", widget: "string" },
-    {
-      name: "type",
-      label: "Type",
-      widget: "relation",
-      collection: "media-types",
-      value_field: "{{slug}}",
-      display_fields: [`{{label.${config.defaultLocale}}} ({{slug}})`],
-    },
-    languagesSelect(),
-    {
-      name: "image",
-      label: "Image",
-      widget: "image",
-      choose_url: false,
-      media_folder: "./images",
-      accept: "image/png, image/jpeg, image/webp",
-      hint: "When you upload an image, it is automatically resized (up to 2048 pixels) and saved in a web-friendly format.",
-    },
-    {
-      name: "content",
-      label: "Content",
-      widget: "list",
-      hint: "Add files or weblinks. First item in the list is the main content.",
-      min: 1,
-      summary: "{{types.url}}",
-      types: [
-        {
-          name: "upload",
-          label: "File Upload",
-          fields: [
-            {
-              name: "url",
-              label: "File",
-              widget: "file",
-              choose_url: false,
-              ...getFileStorage(),
-            },
-            inlineTranslation({
-              name: "label",
-              label: "Label",
-              hint: "Optional. Defaults to the file name, for example 'bible' from 'bible.pdf'.",
-              required: false,
-              collapsed: "auto",
-            }),
-          ],
-        },
-        {
-          name: "link",
-          label: "Link",
-          summary: "{{url}}",
-          fields: [
-            {
-              name: "url",
-              label: "Url",
-              widget: "string",
-              type: "url",
-              pattern: ["^https?://", "Link must start with http(s)://"],
-            },
-            inlineTranslation({
-              name: "label",
-              label: "Label",
-              required: false,
-              hint: "Optional. Defaults to the file name or link domain, for example 'youtube.com'.",
-              collapsed: "auto",
-            }),
-          ],
-        },
-      ],
-    },
-    {
-      name: "dateCreated",
-      label: "Date Created",
-      widget: "datetime",
-      time_format: false,
-      required: true,
-      default: "{{now}}",
-      picker_utc: true,
-      hint: "The date this item was added to this media library.",
-    },
-    {
-      name: "authors",
-      label: "Authors",
-      label_singular: "Author",
-      required: false,
-      collapsed: true,
-      default: [],
-      widget: "list",
-      summary: "{{fields.name}}",
-      field: { label: "Name", name: "name", widget: "string" },
-    },
-    {
-      name: "commonId",
-      label: "Common ID",
-      widget: "string",
-      required: false,
-      hint: "Optional: Use a shared Common ID to link translated versions of a media item.",
-    },
-    {
-      name: "categories",
-      label: "Categories",
-      required: false,
-      widget: "relation",
-      multiple: true,
-      collection: "categories",
-      display_fields: ["{{slug}}"],
-      search_fields: ["{{slug}}"],
-    },
-    {
-      name: "description",
-      label: "Description",
-      widget: "markdown",
-      required: false,
-      editor_components: [],
-      buttons: [
-        "heading-one",
-        "heading-two",
-        "heading-three",
-        "heading-four",
-        "heading-five",
-        "heading-six",
-        "bold",
-        "italic",
-        "bulleted-list",
-        "numbered-list",
-        "quote",
-        "link",
-      ],
-    },
-  ],
-}
-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.`,
-    }
-  }
-  return {
-    media_libraries: {
-      default: false,
-      cloudflare_r2: {
-        ...externalFileStorage,
-        access_key_id: externalFileStorage.accessKeyId,
-        account_id: externalFileStorage.accountId,
-        public_url: externalFileStorage.publicUrl,
-      },
-    },
-  }
-}

package/src/sveltia/utils/path.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import sveltiaAdminConfig from "virtual:lightnet/sveltiaAdminConfig"
-const basePath: string = sveltiaAdminConfig.siteRootInRepo
-export const projectPath = (path: string) =>
-  `${basePath}${basePath.endsWith("/") || path.startsWith("/") ? "" : "/"}${path}`

/package/src/{sveltia/utils → collections/fields}/inline-translation.ts RENAMED Viewed

File without changes