merged with new version of master

1 files changed, 3 insertions, 2 deletions

diff --git a/src/fields/DateField.ts b/src/fields/DateField.ts
index 1e5222fb6..f0a851ce6 100644
--- a/src/fields/DateField.ts
+++ b/src/fields/DateField.ts
@@ -1,5 +1,5 @@
+import { serializable, date as serializrDate } from 'serializr';
 import { Deserializable } from '../client/util/SerializationHelper';
-import { serializable, date } from 'serializr';
 import { ObjectField } from './ObjectField';
 import { Copy, ToJavascriptString, ToScriptString, ToString } from './FieldSymbols';
 import { scriptingGlobal, ScriptingGlobals } from '../client/util/ScriptingGlobals';
@@ -7,7 +7,7 @@ import { scriptingGlobal, ScriptingGlobals } from '../client/util/ScriptingGloba
 @scriptingGlobal
 @Deserializable('date')
 export class DateField extends ObjectField {
-    @serializable(date())
+    @serializable(serializrDate())
     readonly date: Date;
 
     constructor(date: Date = new Date()) {
@@ -38,6 +38,7 @@ export class DateField extends ObjectField {
     }
 }
 
+// eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function d(...dateArgs: any[]) {
     return new DateField(new (Date as any)(...dateArgs));
 });