Merge pull request #967 from estruyf/beta

estruyf · web-flow · commit b31550afe339 · 2025-07-01T09:15:38.000+02:00
10.9.0 merge
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Change Log
 
+## [10.9.0] - 2025-07-01 - [Release notes](https://beta.frontmatter.codes/updates/v10.9.0)
+
+### 🎨 Enhancements
+
+- [#962](https://github.com/estruyf/vscode-front-matter/issues/962): Added Simplified Chinese localization thanks to [Randerion(HaoJun0823)](https://github.com/HaoJun0823)
+
+### ⚡️ Optimizations
+
+- [#922](https://github.com/estruyf/vscode-front-matter/issues/922): Added the `{{slugifiedFileName}}` for better naming
+
+### 🐞 Fixes
+
+- [#933](https://github.com/estruyf/vscode-front-matter/issues/933): Timezone setting integration in the DateTime field
+- [#942](https://github.com/estruyf/vscode-front-matter/issues/942): Fix to typo on welcome screen thanks to [Stephanie Wertman](https://github.com/stephanie-wertman)
+- [#957](https://github.com/estruyf/vscode-front-matter/issues/957): Fix media assets retrieval where `mtime` is not defined. Fallback to the `mtimeMs` property if available.
+
 ## [10.8.0] - 2025-02-27 - [Release notes](https://beta.frontmatter.codes/updates/v10.8.0)
 
 ### 🎨 Enhancements
diff --git a/l10n/bundle.l10n.zh-cn.json b/l10n/bundle.l10n.zh-cn.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "displayName": "Front Matter CMS",
   "description": "Front Matter is a CMS that runs within Visual Studio Code. It gives you the power and control of a full-blown CMS while also providing you the flexibility and speed of the static site generator of your choice like: Hugo, Jekyll, Docusaurus, NextJs, Gatsby, and many more...",
   "icon": "assets/frontmatter-teal-128x128.png",
-  "version": "10.8.0",
+  "version": "10.9.0",
   "preview": false,
   "publisher": "eliostruyf",
   "galleryBanner": {
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
diff --git a/src/helpers/DateHelper.ts b/src/helpers/DateHelper.ts
@@ -1,4 +1,5 @@
 import { parse, parseISO, parseJSON, format } from 'date-fns';
+import { formatInTimeZone } from 'date-fns-tz';
 
 export class DateHelper {
   public static formatUpdate(value: string | null | undefined): string | null {
@@ -19,6 +20,20 @@ export class DateHelper {
     return format(date, DateHelper.formatUpdate(dateFormat) as string);
   }
 
+  public static formatInTimezone(
+    date?: Date,
+    dateFormat?: string,
+    timezone?: string
+  ): string | null {
+    if (!date || !dateFormat) {
+      return null;
+    }
+
+    return timezone
+      ? formatInTimeZone(date, timezone, DateHelper.formatUpdate(dateFormat) as string)
+      : format(date, DateHelper.formatUpdate(dateFormat) as string);
+  }
+
   public static tryParse(date: any, format?: string): Date | null {
     if (!date) {
       return null;
diff --git a/src/helpers/MediaHelpers.ts b/src/helpers/MediaHelpers.ts
@@ -172,7 +172,14 @@ export class MediaHelpers {
         }
       })
     );
-    files = files.filter((f) => f.mtime !== undefined);
+    files = files
+      .filter((f) => f.mtime !== undefined || f.mtimeMs !== undefined)
+      .map((f) => {
+        if (f.mtime === undefined && f.mtimeMs !== undefined) {
+          return { ...f, mtime: new Date(f.mtimeMs as number) };
+        }
+        return f;
+      });
 
     // Sort the files
     if (crntSort?.type === SortType.string) {
diff --git a/src/helpers/PanelSettings.ts b/src/helpers/PanelSettings.ts
@@ -1,4 +1,5 @@
 import {
+  SETTING_GLOBAL_TIMEZONE,
   SETTING_PANEL_ACTIONS_DISABLED,
   SETTING_SPONSORS_AI_ENABLED,
   SETTING_WEBSITE_URL
@@ -68,7 +69,8 @@ export class PanelSettings {
           updateFileName: !!Settings.get<boolean>(SETTING_SLUG_UPDATE_FILE_NAME)
         },
         date: {
-          format: Settings.get<string>(SETTING_DATE_FORMAT) || ''
+          format: Settings.get<string>(SETTING_DATE_FORMAT) || '',
+          timezone: Settings.get<string>(SETTING_GLOBAL_TIMEZONE) || ''
         },
         tags: (await TaxonomyHelper.get(TaxonomyType.Tag)) || [],
         categories: (await TaxonomyHelper.get(TaxonomyType.Category)) || [],
diff --git a/src/helpers/SlugHelper.ts b/src/helpers/SlugHelper.ts
@@ -40,6 +40,11 @@ export class SlugHelper {
         const fileName = SlugHelper.slugify(file.name);
         const regex = new RegExp('{{sluggedFileName}}', 'g');
         slugTemplate = slugTemplate.replace(regex, fileName);
+      } else if (slugTemplate.includes(`{{slugifiedFileName}}`)) {
+        const file = parse(filePath || '');
+        const fileName = SlugHelper.slugify(file.name);
+        const regex = new RegExp('{{slugifiedFileName}}', 'g');
+        slugTemplate = slugTemplate.replace(regex, fileName);
       }
 
       const dateFormat = Settings.get(SETTING_DATE_FORMAT) as string;
diff --git a/src/listeners/dashboard/SsgListener.ts b/src/listeners/dashboard/SsgListener.ts
@@ -114,7 +114,12 @@ export class SsgListener extends BaseListener {
     }
 
     // https://github.com/withastro/astro/blob/defab70cb2a0c67d5e9153542490d2749046b151/packages/astro/src/content/utils.ts#L450
-    const contentConfig = await workspace.findFiles(`**/src/content/config.*`);
+    let contentConfig = await workspace.findFiles(`**/src/content/config.*`);
+    
+    // Also search for content.config.* files (newer pattern)
+    if (contentConfig.length === 0) {
+      contentConfig = await workspace.findFiles(`**/content.config.*`);
+    }
 
     if (contentConfig.length === 0) {
       SsgListener.sendRequest(command as any, requestId, []);
diff --git a/src/models/MediaPaths.ts b/src/models/MediaPaths.ts
@@ -16,6 +16,7 @@ export interface MediaInfo {
   dimensions?: ISizeCalculationResult | undefined;
   mimeType?: string | undefined;
   mtime?: Date;
+  mtimeMs?: number;
   ctime?: Date;
   size?: number;
 
diff --git a/src/models/PanelSettings.ts b/src/models/PanelSettings.ts
@@ -177,6 +177,7 @@ export interface WhenClause {
 
 export interface DateInfo {
   format: string;
+  timezone?: string;
 }
 
 export interface SEO {
diff --git a/src/panelWebView/components/Fields/DateTimeField.tsx b/src/panelWebView/components/Fields/DateTimeField.tsx
@@ -11,6 +11,7 @@ import { LocalizationKey } from '../../../localization';
 
 export interface IDateTimeFieldProps extends BaseFieldProps<Date | null> {
   format?: string;
+  timezone?: string;
   onChange: (date: string) => void;
 }
 
@@ -30,6 +31,7 @@ export const DateTimeField: React.FunctionComponent<IDateTimeFieldProps> = ({
   value,
   required,
   format,
+  timezone,
   onChange
 }: React.PropsWithChildren<IDateTimeFieldProps>) => {
   const DEFAULT_FORMAT = 'MM/dd/yyyy HH:mm';
@@ -38,7 +40,7 @@ export const DateTimeField: React.FunctionComponent<IDateTimeFieldProps> = ({
   const onDateChange = React.useCallback((date: Date) => {
     setDateValue(date);
     if (format) {
-      onChange(DateHelper.format(date, format) || "");
+      onChange(DateHelper.formatInTimezone(date, format, timezone) || "");
     } else {
       onChange(date.toISOString());
     }
diff --git a/src/panelWebView/components/Fields/WrapperField.tsx b/src/panelWebView/components/Fields/WrapperField.tsx
@@ -193,6 +193,7 @@ export const WrapperField: React.FunctionComponent<IWrapperFieldProps> = ({
           required={!!field.required}
           format={field.dateFormat || settings?.date?.format}
           onChange={onFieldChange}
+          timezone={settings?.date?.timezone}
         />
       </FieldBoundary>
     );
diff --git a/src/utils/formatInTimezone.ts b/src/utils/formatInTimezone.ts
@@ -1,11 +1,7 @@
-import { format } from 'date-fns';
-import { formatInTimeZone } from 'date-fns-tz';
 import { SETTING_GLOBAL_TIMEZONE } from '../constants';
 import { DateHelper, Settings } from '../helpers';
 
 export const formatInTimezone = (date: Date, dateFormat: string) => {
   const timezone = Settings.get<string>(SETTING_GLOBAL_TIMEZONE);
-  return timezone
-    ? formatInTimeZone(date, timezone, DateHelper.formatUpdate(dateFormat) as string)
-    : format(date, DateHelper.formatUpdate(dateFormat) as string);
+  return DateHelper.formatInTimezone(date, dateFormat, timezone) || '';
 };
