fix: add back moment rollup patch with default import

- seems like this was causing issues while trying to implement this in Aurelia-Slickgrid with WebPack which tried to load invalid import with default
ghiscoding · Dec 16, 2023 · 2e81421 · 2e81421
1 parent 6bddb4e
commit 2e81421
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/packages/common/src/editors/dateEditor.ts b/packages/common/src/editors/dateEditor.ts
@@ -3,7 +3,8 @@ import { createDomElement, destroyAllElementProps, emptyElement, setDeepValue }
 import flatpickr from 'flatpickr';
 import type { BaseOptions as FlatpickrBaseOptions } from 'flatpickr/dist/types/options';
 import type { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
-import moment from 'moment-mini';
+import * as moment_ from 'moment-mini';
+const moment = (moment_ as any)['default'] || moment_;
 
 import { Constants } from './../constants';
 import { FieldType } from '../enums/index';

diff --git a/packages/common/src/filters/dateFilter.ts b/packages/common/src/filters/dateFilter.ts
@@ -1,7 +1,9 @@
 import { BindingEventService } from '@slickgrid-universal/binding';
 import { createDomElement, destroyAllElementProps, emptyElement, } from '@slickgrid-universal/utils';
 import flatpickr from 'flatpickr';
-import moment from 'moment-mini';
+import * as moment_ from 'moment-mini';
+const moment = (moment_ as any)['default'] || moment_;
+
 import type { BaseOptions as FlatpickrBaseOptions } from 'flatpickr/dist/types/options';
 import type { Instance as FlatpickrInstance } from 'flatpickr/dist/types/instance';
 

diff --git a/packages/common/src/services/utilities.ts b/packages/common/src/services/utilities.ts
@@ -1,6 +1,7 @@
 import type { EventSubscription } from '@slickgrid-universal/event-pub-sub';
 import { flatten } from 'un-flatten-tree';
-import moment from 'moment-mini';
+import * as moment_ from 'moment-mini';
+const moment = (moment_ as any)['default'] || moment_;
 
 import { Constants } from '../constants';
 import { FieldType, type OperatorString, OperatorType } from '../enums/index';

diff --git a/packages/common/src/sortComparers/dateUtilities.ts b/packages/common/src/sortComparers/dateUtilities.ts
@@ -1,24 +1,25 @@
-import moment from 'moment-mini';
+import * as moment_ from 'moment-mini';
+const moment = (moment_ as any)['default'] || moment_;
 
 import { FieldType } from '../enums/fieldType.enum';
 import type { SortComparer } from '../interfaces/index';
 import { mapMomentDateFormatWithFieldType } from '../services/utilities';
 
-export function compareDates(value1: any, value2: any, sortDirection: number, format: string | moment.MomentBuiltinFormat, strict?: boolean) {
+export function compareDates(value1: any, value2: any, sortDirection: number, format: string | moment_.MomentBuiltinFormat, strict?: boolean) {
   let diff = 0;
 
   if (value1 === value2) {
     diff = 0;
   } else {
     // use moment to validate the date
-    let date1: moment.Moment | Date = moment(value1, format, strict);
-    let date2: moment.Moment | Date = moment(value2, format, strict);
+    let date1: moment_.Moment | Date = moment(value1, format, strict);
+    let date2: moment_.Moment | Date = moment(value2, format, strict);
 
     // when moment date is invalid, we'll create a temporary old Date
-    if (!date1.isValid()) {
+    if (!(date1 as moment_.Moment).isValid()) {
       date1 = new Date(1001, 1, 1);
     }
-    if (!date2.isValid()) {
+    if (!(date2 as moment_.Moment).isValid()) {
       date2 = new Date(1001, 1, 1);
     }