Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@
depTypeList: ["peerDependencies"],
enabled: false,
},
{
packageNames: ["jquery"],
allowedVersions: "3.5.1",
},
{
packageNames: ["jquery-ui"],
allowedVersions: "1.12.1",
},
{
packageNames: ["jquery-ui-dist"],
allowedVersions: "1.12.1",
},
// allow Node14/npm8 until its EOL June 2023
{
packageNames: ["node"],
Expand All @@ -33,6 +21,6 @@
allowedVersions: "6.14.13",
},
],
schedule: ["on Friday", "every weekend"],
schedule: ["on Friday"],
ignoreDeps: ["typescript"],
}
39 changes: 19 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,19 @@
}
},
"dependencies": {
"@slickgrid-universal/common": "^1.2.6",
"@slickgrid-universal/custom-footer-component": "^1.2.6",
"@slickgrid-universal/empty-warning-component": "^1.2.6",
"@slickgrid-universal/event-pub-sub": "^1.2.6",
"@slickgrid-universal/pagination-component": "^1.2.6",
"@slickgrid-universal/row-detail-view-plugin": "^1.2.6",
"@slickgrid-universal/rxjs-observable": "^1.2.6",
"@slickgrid-universal/common": "^1.3.0",
"@slickgrid-universal/custom-footer-component": "^1.3.0",
"@slickgrid-universal/empty-warning-component": "^1.3.0",
"@slickgrid-universal/event-pub-sub": "^1.3.0",
"@slickgrid-universal/pagination-component": "^1.3.0",
"@slickgrid-universal/row-detail-view-plugin": "^1.3.0",
"@slickgrid-universal/rxjs-observable": "^1.3.0",
"@types/dompurify": "^2.3.3",
"@types/jquery": "^3.5.14",
"dequal": "^2.0.2",
"dompurify": "^2.3.8",
"font-awesome": "^4.7.0",
"jquery": "^3.5.1",
"jquery-ui-dist": "^1.12.1",
"jquery": "^3.6.0",
"moment-mini": "^2.24.0",
"rxjs": "^7.5.5"
},
Expand Down Expand Up @@ -117,17 +116,17 @@
"@ng-select/ng-select": "^8.3.0",
"@ngx-translate/core": "^14.0.0",
"@ngx-translate/http-loader": "^7.0.0",
"@slickgrid-universal/composite-editor-component": "^1.2.6",
"@slickgrid-universal/custom-tooltip-plugin": "^1.2.6",
"@slickgrid-universal/excel-export": "^1.2.6",
"@slickgrid-universal/graphql": "^1.2.6",
"@slickgrid-universal/odata": "^1.2.6",
"@slickgrid-universal/text-export": "^1.2.6",
"@slickgrid-universal/composite-editor-component": "^1.3.0",
"@slickgrid-universal/custom-tooltip-plugin": "^1.3.0",
"@slickgrid-universal/excel-export": "^1.3.0",
"@slickgrid-universal/graphql": "^1.3.0",
"@slickgrid-universal/odata": "^1.3.0",
"@slickgrid-universal/text-export": "^1.3.0",
"@types/flatpickr": "^3.1.2",
"@types/fnando__sparkline": "^0.3.4",
"@types/jest": "^28.1.1",
"@types/jest": "^28.1.2",
"@types/moment": "^2.13.0",
"@types/node": "^17.0.33",
"@types/node": "^18.0.0",
"@types/text-encoding-utf-8": "^1.0.2",
"@typescript-eslint/eslint-plugin": "^5.28.0",
"@typescript-eslint/parser": "^5.28.0",
Expand All @@ -137,13 +136,13 @@
"copyfiles": "^2.4.1",
"cross-env": "^7.0.3",
"custom-event-polyfill": "^1.0.7",
"eslint": "^8.17.0",
"eslint": "^8.18.0",
"jest": "^28.1.1",
"jest-extended": "^2.0.0",
"jest-preset-angular": "^12.1.0",
"ng-packagr": "^13.3.1",
"ngx-bootstrap": "^8.0.0",
"npm-run-all2": "^6.0.0",
"npm-run-all2": "^6.0.1",
"postcss": "^8.4.14",
"postcss-cli": "^9.1.0",
"rimraf": "^3.0.2",
Expand All @@ -153,7 +152,7 @@
"ts-node": "^10.8.1",
"tslib": "^2.4.0",
"typescript": "~4.4.4",
"zone.js": "~0.11.5"
"zone.js": "~0.11.6"
},
"engines": {
"node": ">=14.17.0",
Expand Down
4 changes: 2 additions & 2 deletions test/cypress/e2e/example16.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('Example 16: Grid State & Presets using Local Storage', { retries: 1 },
.children('.slick-header-column:nth(3)')
.should('contain', 'Duration')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('#grid16')
.find('.slick-header-columns')
Expand All @@ -96,7 +96,7 @@ describe('Example 16: Grid State & Presets using Local Storage', { retries: 1 },
cy.get('.slick-header-columns')
.children('.slick-header-column:nth(5)')
.trigger('mousemove', 'bottomLeft')
.trigger('mouseup', 'bottomLeft', { force: true });
.trigger('mouseup', 'bottomLeft', { which: 1, force: true });
});

it('should hide the "Start" column from the Column Picker', () => {
Expand Down
10 changes: 5 additions & 5 deletions test/cypress/e2e/example17.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
cy.get('@moveIconTask3').should('have.length', 1);

cy.get('@moveIconTask3')
.trigger('mousedown', { button: 0, force: true })
.trigger('mousedown', { which: 1, force: true })
.trigger('mousemove', 'bottomRight');

cy.get('@moveIconTask1')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('@moveIconTask2').trigger('mouseover', { force: true });

Expand Down Expand Up @@ -84,12 +84,12 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
cy.get('@moveIconTask3').should('have.length', 1);

cy.get('@moveIconTask3')
.trigger('mousedown', { button: 0, force: true })
.trigger('mousedown', { which: 1, force: true })
.trigger('mousemove', 'bottomRight');

cy.get('@moveIconTask5')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('.slick-viewport-top.slick-viewport-left')
.scrollTo('top');
Expand Down Expand Up @@ -119,7 +119,7 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
.children('.slick-header-column:nth(6)')
.should('contain', 'Finish')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });

cy.get('#grid17')
.find('.slick-header-columns')
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/example19.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe('Example 19 - Draggable Grouping & Aggregators', { retries: 1 }, () =>
cy.get('.slick-dropped-grouping:nth(1) div')
.contains('Effort-Driven')
.trigger('mousemove', 'bottomRight')
.trigger('mouseup', 'bottomRight', { force: true });
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
});

it('should expect the grouping to be swapped as well in the grid', () => {
Expand Down
4 changes: 2 additions & 2 deletions test/cypress/e2e/example33.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ describe('Example 33 - Regular & Custom Tooltips', { retries: 1 }, () => {
it('should Group by 1st column "Currency" and expect 2 groups with Totals when collapsed', () => {
cy.get('.slick-column-name')
.first()
.trigger('mousedown', { button: 1, force: true })
.trigger('mousedown', { which: 1, force: true })

cy.get('.slick-draggable-dropbox-toggle-placeholder')
.trigger('mousemove', 'center')
.trigger('mouseup', 'center', { force: true });
.trigger('mouseup', 'center', { which: 1, force: true });

cy.get('.slick-group-toggle-all')
.click();
Expand Down
Loading