Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 2402a93

Browse files
Ghislain BeaulacGhislain Beaulac
Ghislain Beaulac
authored and
Ghislain Beaulac
committed
refactor(build): fix build warnings & downgrade ng-packgr to build
1 parent a49fd90 commit 2402a93

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
"test:watch": "npm-run-all jest:watch",
3535
"copy:i18n": "cross-env copyfiles -f src/assets/i18n/*.json dist/i18n",
3636
"copy:lib": "cross-env copyfiles --up 2 src/assets/lib/** dist",
37-
"copy-demo:dist": "cross-env copyfiles --up 1 dist/**/*.* ../Angular-Slickgrid-demo/node_modules/angular-slickgrid",
38-
"del-demo:dist": "cross-env rimraf ../Angular-Slickgrid-demo/node_modules/angular-slickgrid",
37+
"copy-demo:dist": "cross-env copyfiles --up 1 dist/**/*.* ../angular-slickgrid-demos/bootstrap3-demo-with-translate/node_modules/angular-slickgrid",
38+
"del-demo:dist": "cross-env rimraf ../angular-slickgrid-demos/bootstrap3-demo-with-translate/node_modules/angular-slickgrid",
3939
"pack-lib": "npm pack ./dist",
4040
"packagr": "ng-packagr -p package.json",
4141
"changelog": "cross-env conventional-changelog -p angular -i doc/CHANGELOG.md -s",
@@ -133,7 +133,7 @@
133133
"jest-extended": "^0.11.1",
134134
"jest-junit": "^6.4.0",
135135
"jest-preset-angular": "^6.0.1",
136-
"ng-packagr": "^5.2.0",
136+
"ng-packagr": "~5.3.0",
137137
"ngx-bootstrap": "^4.3.0",
138138
"node-sass": "^4.12.0",
139139
"npm-run-all": "^4.1.5",

src/app/modules/angular-slickgrid/filter-conditions/executeMappedCondition.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { stringFilterCondition } from './stringFilterCondition';
77
import { FieldType, FilterCondition, FilterConditionOption, OperatorType } from '../models/index';
88
import { mapMomentDateFormatWithFieldType } from './../services/utilities';
99
import { testFilterCondition } from './filterUtilities';
10-
import * as moment from 'moment-mini';
10+
import * as moment_ from 'moment-mini';
11+
const moment = moment_; // patch to fix rollup "moment has no default export" issue, document here https://github.com/rollup/rollup/issues/670
1112

1213
export const executeMappedCondition: FilterCondition = (options: FilterConditionOption) => {
1314
// when using a multi-select ('IN' operator) we will not use the field type but instead go directly with a collection search
@@ -67,8 +68,8 @@ function executeAssociatedDateCondition(options: FilterConditionOption): boolean
6768
const searchTerms = Array.isArray(options.searchTerms) && options.searchTerms || [];
6869

6970
let isRangeSearch = false;
70-
let dateSearch1: moment.Moment;
71-
let dateSearch2: moment.Moment;
71+
let dateSearch1: any;
72+
let dateSearch2: any;
7273

7374
// return when cell value is not a valid date
7475
if (searchTerms.length === 0 || searchTerms[0] === '' || searchTerms[0] === null || !moment(options.cellValue, FORMAT, true).isValid()) {

src/app/modules/angular-slickgrid/sorters/dateUtilities.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import { mapMomentDateFormatWithFieldType } from '../services/utilities';
22
import { FieldType, Sorter } from '../models/index';
3-
import * as moment from 'moment-mini';
3+
import * as moment_ from 'moment-mini';
4+
const moment = moment_; // patch to fix rollup "moment has no default export" issue, document here https://github.com/rollup/rollup/issues/670
45

5-
export function compareDates(value1: any, value2: any, sortDirection: number, format: string | moment.MomentBuiltinFormat, strict?: boolean) {
6+
export function compareDates(value1: any, value2: any, sortDirection: number, format: string | moment_.MomentBuiltinFormat, strict?: boolean) {
67
let diff = 0;
78

89
if (value1 === null || value1 === '' || !moment(value1, format, strict).isValid()) {

0 commit comments

Comments
 (0)