Merge branch 'master' into app-config-js

joelgallant · joelgallant · commit 497ca7799688 · 2021-02-24T18:59:40.000-07:00
diff --git a/app-config-extensions/src/index.ts b/app-config-extensions/src/index.ts
@@ -226,7 +226,7 @@ export function timestampDirective(dateSource: () => Date = () => new Date()): P
         } else if (typeof value === 'object') {
           const { locale, ...options } = value;
 
-          formatted = date.toLocaleDateString(locale, options);
+          formatted = date.toLocaleDateString(locale, options as Intl.DateTimeFormatOptions);
         } else {
           throw new AppConfigError('$timestamp was provided an invalid option');
         }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ export function timestampDirective(dateSource: () => Date = () => new Date()): P`
`226`	`226`	`} else if (typeof value === 'object') {`
`227`	`227`	`const { locale, ...options } = value;`
`228`	`228`
`229`		`- formatted = date.toLocaleDateString(locale, options);`
	`229`	`+ formatted = date.toLocaleDateString(locale, options as Intl.DateTimeFormatOptions);`
`230`	`230`	`} else {`
`231`	`231`	`throw new AppConfigError('$timestamp was provided an invalid option');`
`232`	`232`	`}`