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

Commit c486df1

Browse files
authored
Merge pull request #938 from ghiscoding/feat/jquery36
feat(core): upgrade to jQuery 3.6 and jQuery-UI 1.13
2 parents 37aa2d2 + 0ec85ca commit c486df1

File tree

7 files changed

+145
-137
lines changed

7 files changed

+145
-137
lines changed

.github/renovate.json5

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
depTypeList: ["peerDependencies"],
1212
enabled: false,
1313
},
14-
{
15-
packageNames: ["jquery"],
16-
allowedVersions: "3.5.1",
17-
},
18-
{
19-
packageNames: ["jquery-ui"],
20-
allowedVersions: "1.12.1",
21-
},
22-
{
23-
packageNames: ["jquery-ui-dist"],
24-
allowedVersions: "1.12.1",
25-
},
2614
// allow Node14/npm8 until its EOL June 2023
2715
{
2816
packageNames: ["node"],
@@ -33,6 +21,6 @@
3321
allowedVersions: "6.14.13",
3422
},
3523
],
36-
schedule: ["on Friday", "every weekend"],
24+
schedule: ["on Friday"],
3725
ignoreDeps: ["typescript"],
3826
}

package.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,19 @@
7474
}
7575
},
7676
"dependencies": {
77-
"@slickgrid-universal/common": "^1.2.6",
78-
"@slickgrid-universal/custom-footer-component": "^1.2.6",
79-
"@slickgrid-universal/empty-warning-component": "^1.2.6",
80-
"@slickgrid-universal/event-pub-sub": "^1.2.6",
81-
"@slickgrid-universal/pagination-component": "^1.2.6",
82-
"@slickgrid-universal/row-detail-view-plugin": "^1.2.6",
83-
"@slickgrid-universal/rxjs-observable": "^1.2.6",
77+
"@slickgrid-universal/common": "^1.3.0",
78+
"@slickgrid-universal/custom-footer-component": "^1.3.0",
79+
"@slickgrid-universal/empty-warning-component": "^1.3.0",
80+
"@slickgrid-universal/event-pub-sub": "^1.3.0",
81+
"@slickgrid-universal/pagination-component": "^1.3.0",
82+
"@slickgrid-universal/row-detail-view-plugin": "^1.3.0",
83+
"@slickgrid-universal/rxjs-observable": "^1.3.0",
8484
"@types/dompurify": "^2.3.3",
8585
"@types/jquery": "^3.5.14",
8686
"dequal": "^2.0.2",
8787
"dompurify": "^2.3.8",
8888
"font-awesome": "^4.7.0",
89-
"jquery": "^3.5.1",
90-
"jquery-ui-dist": "^1.12.1",
89+
"jquery": "^3.6.0",
9190
"moment-mini": "^2.24.0",
9291
"rxjs": "^7.5.5"
9392
},
@@ -117,17 +116,17 @@
117116
"@ng-select/ng-select": "^8.3.0",
118117
"@ngx-translate/core": "^14.0.0",
119118
"@ngx-translate/http-loader": "^7.0.0",
120-
"@slickgrid-universal/composite-editor-component": "^1.2.6",
121-
"@slickgrid-universal/custom-tooltip-plugin": "^1.2.6",
122-
"@slickgrid-universal/excel-export": "^1.2.6",
123-
"@slickgrid-universal/graphql": "^1.2.6",
124-
"@slickgrid-universal/odata": "^1.2.6",
125-
"@slickgrid-universal/text-export": "^1.2.6",
119+
"@slickgrid-universal/composite-editor-component": "^1.3.0",
120+
"@slickgrid-universal/custom-tooltip-plugin": "^1.3.0",
121+
"@slickgrid-universal/excel-export": "^1.3.0",
122+
"@slickgrid-universal/graphql": "^1.3.0",
123+
"@slickgrid-universal/odata": "^1.3.0",
124+
"@slickgrid-universal/text-export": "^1.3.0",
126125
"@types/flatpickr": "^3.1.2",
127126
"@types/fnando__sparkline": "^0.3.4",
128127
"@types/jest": "^28.1.2",
129128
"@types/moment": "^2.13.0",
130-
"@types/node": "^17.0.33",
129+
"@types/node": "^18.0.0",
131130
"@types/text-encoding-utf-8": "^1.0.2",
132131
"@typescript-eslint/eslint-plugin": "^5.28.0",
133132
"@typescript-eslint/parser": "^5.28.0",

test/cypress/e2e/example16.cy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('Example 16: Grid State & Presets using Local Storage', { retries: 1 },
6969
.children('.slick-header-column:nth(3)')
7070
.should('contain', 'Duration')
7171
.trigger('mousemove', 'bottomRight')
72-
.trigger('mouseup', 'bottomRight', { force: true });
72+
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
7373

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

102102
it('should hide the "Start" column from the Column Picker', () => {

test/cypress/e2e/example17.cy.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ describe('Example 17 - Row Move & Checkbox Selector Selector Plugins', { retries
3232
cy.get('@moveIconTask3').should('have.length', 1);
3333

3434
cy.get('@moveIconTask3')
35-
.trigger('mousedown', { button: 0, force: true })
35+
.trigger('mousedown', { which: 1, force: true })
3636
.trigger('mousemove', 'bottomRight');
3737

3838
cy.get('@moveIconTask1')
3939
.trigger('mousemove', 'bottomRight')
40-
.trigger('mouseup', 'bottomRight', { force: true });
40+
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
4141

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

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

8686
cy.get('@moveIconTask3')
87-
.trigger('mousedown', { button: 0, force: true })
87+
.trigger('mousedown', { which: 1, force: true })
8888
.trigger('mousemove', 'bottomRight');
8989

9090
cy.get('@moveIconTask5')
9191
.trigger('mousemove', 'bottomRight')
92-
.trigger('mouseup', 'bottomRight', { force: true });
92+
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
9393

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

124124
cy.get('#grid17')
125125
.find('.slick-header-columns')

test/cypress/e2e/example19.cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('Example 19 - Draggable Grouping & Aggregators', { retries: 1 }, () =>
7373
cy.get('.slick-dropped-grouping:nth(1) div')
7474
.contains('Effort-Driven')
7575
.trigger('mousemove', 'bottomRight')
76-
.trigger('mouseup', 'bottomRight', { force: true });
76+
.trigger('mouseup', 'bottomRight', { which: 1, force: true });
7777
});
7878

7979
it('should expect the grouping to be swapped as well in the grid', () => {

test/cypress/e2e/example33.cy.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ describe('Example 33 - Regular & Custom Tooltips', { retries: 1 }, () => {
4949
it('should Group by 1st column "Currency" and expect 2 groups with Totals when collapsed', () => {
5050
cy.get('.slick-column-name')
5151
.first()
52-
.trigger('mousedown', { button: 1, force: true })
52+
.trigger('mousedown', { which: 1, force: true })
5353

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

5858
cy.get('.slick-group-toggle-all')
5959
.click();

0 commit comments

Comments
 (0)