From 84b09dc8ba7c78c14e0ae563cd560eec46973a4b Mon Sep 17 00:00:00 2001 From: ghiscoding Date: Wed, 8 Jun 2022 11:50:41 -0400 Subject: [PATCH] feat(core): upgrade to jQuery 3.6 and jQuery-UI 1.13 - finally found how to upgrade both jQuery/jQueryUI and get all Cypress E2E tests pass --- .github/renovate.json5 | 12 ---- .../webpack-demo-vanilla-bundle/package.json | 2 +- package.json | 7 --- packages/common/package.json | 6 +- packages/vanilla-bundle/package.json | 4 +- pnpm-lock.yaml | 55 +++++++++---------- test/cypress/integration/example03.spec.js | 2 +- test/cypress/integration/example07.spec.js | 12 ++-- test/cypress/integration/example18.spec.js | 4 +- 9 files changed, 42 insertions(+), 62 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index d18e1655e..f27bd282f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -10,18 +10,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'], diff --git a/examples/webpack-demo-vanilla-bundle/package.json b/examples/webpack-demo-vanilla-bundle/package.json index 764aa7c7a..a41b5dd94 100644 --- a/examples/webpack-demo-vanilla-bundle/package.json +++ b/examples/webpack-demo-vanilla-bundle/package.json @@ -48,7 +48,7 @@ "@slickgrid-universal/vanilla-force-bundle": "workspace:*", "bulma": "^0.9.4", "dompurify": "^2.3.8", - "jquery": "^3.5.1", + "jquery": "^3.6.0", "moment-mini": "^2.24.0", "rxjs": "^7.5.5", "whatwg-fetch": "^3.6.2" diff --git a/package.json b/package.json index 84f12d8dd..1e66d968c 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,6 @@ "ts-jest": "^28.0.4", "typescript": "^4.7.3" }, - "pnpm": { - "overrides": { - "jquery": "3.5.1", - "jquery-ui": "1.12.1", - "jquery-ui-dist": "1.12.1" - } - }, "packageManager": "pnpm@7.1.9", "engines": { "node": ">=14.17.0", diff --git a/packages/common/package.json b/packages/common/package.json index 36c5bddb2..8bd505a2c 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -74,9 +74,9 @@ "dequal": "^2.0.2", "dompurify": "^2.3.8", "flatpickr": "^4.6.13", - "jquery": "^3.5.1", - "jquery-ui": "^1.12.1", - "jquery-ui-dist": "^1.12.1", + "jquery": "^3.6.0", + "jquery-ui": "^1.13.1", + "jquery-ui-dist": "^1.13.1", "moment-mini": "^2.24.0", "multiple-select-modified": "^1.3.17", "slickgrid": "^2.4.44", diff --git a/packages/vanilla-bundle/package.json b/packages/vanilla-bundle/package.json index fb32d8feb..4b7886bd9 100644 --- a/packages/vanilla-bundle/package.json +++ b/packages/vanilla-bundle/package.json @@ -52,8 +52,8 @@ "@slickgrid-universal/utils": "workspace:*", "dequal": "^2.0.2", "flatpickr": "^4.6.13", - "jquery": "^3.5.1", - "jquery-ui": "^1.12.1", + "jquery": "^3.6.0", + "jquery-ui": "^1.13.1", "slickgrid": "^2.4.44", "whatwg-fetch": "^3.6.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d1db3fae..efa001103 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,10 +1,5 @@ lockfileVersion: 5.4 -overrides: - jquery: 3.5.1 - jquery-ui: 1.12.1 - jquery-ui-dist: 1.12.1 - importers: .: @@ -86,7 +81,7 @@ importers: fork-ts-checker-webpack-plugin: ^7.2.11 html-loader: ^3.1.0 html-webpack-plugin: 5.5.0 - jquery: 3.5.1 + jquery: ^3.6.0 mini-css-extract-plugin: ^2.6.0 moment-mini: ^2.24.0 rxjs: ^7.5.5 @@ -114,7 +109,7 @@ importers: '@slickgrid-universal/vanilla-force-bundle': link:../../packages/vanilla-force-bundle bulma: 0.9.4 dompurify: 2.3.8 - jquery: 3.5.1 + jquery: 3.6.0 moment-mini: 2.24.0 rxjs: 7.5.5 whatwg-fetch: 3.6.2 @@ -168,9 +163,9 @@ importers: dequal: ^2.0.2 dompurify: ^2.3.8 flatpickr: ^4.6.13 - jquery: 3.5.1 - jquery-ui: 1.12.1 - jquery-ui-dist: 1.12.1 + jquery: ^3.6.0 + jquery-ui: ^1.13.1 + jquery-ui-dist: ^1.13.1 moment-mini: ^2.24.0 multiple-select-modified: ^1.3.17 nodemon: ^2.0.16 @@ -186,9 +181,9 @@ importers: dequal: 2.0.2 dompurify: 2.3.8 flatpickr: 4.6.13 - jquery: 3.5.1 - jquery-ui: 1.12.1 - jquery-ui-dist: 1.12.1 + jquery: 3.6.0 + jquery-ui: 1.13.1 + jquery-ui-dist: 1.13.1 moment-mini: 2.24.0 multiple-select-modified: 1.3.17 slickgrid: 2.4.44 @@ -396,8 +391,8 @@ importers: cross-env: ^7.0.3 dequal: ^2.0.2 flatpickr: ^4.6.13 - jquery: 3.5.1 - jquery-ui: 1.12.1 + jquery: ^3.6.0 + jquery-ui: ^1.13.1 npm-run-all2: ^5.0.2 slickgrid: ^2.4.44 whatwg-fetch: ^3.6.2 @@ -411,8 +406,8 @@ importers: '@slickgrid-universal/utils': link:../utils dequal: 2.0.2 flatpickr: 4.6.13 - jquery: 3.5.1 - jquery-ui: 1.12.1 + jquery: 3.6.0 + jquery-ui: 1.13.1 slickgrid: 2.4.44 whatwg-fetch: 3.6.2 devDependencies: @@ -5422,7 +5417,7 @@ packages: dependencies: html-minifier-terser: 6.1.0 parse5: 6.0.1 - webpack: 5.73.0 + webpack: 5.73.0_webpack-cli@4.9.2 dev: true /html-minifier-terser/6.1.0: @@ -6543,16 +6538,20 @@ packages: engines: {node: '>=10'} dev: true - /jquery-ui-dist/1.12.1: - resolution: {integrity: sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo=} + /jquery-ui-dist/1.13.1: + resolution: {integrity: sha512-Y711Pu4BRVrAlL58KSxX4ail74jaCJZaZcdNDLava+MgZeNwmVWmyYiK7KxyoJu1MB73eSunjJvYDbOuNrOA7w==} + dependencies: + jquery: 3.6.0 dev: false - /jquery-ui/1.12.1: - resolution: {integrity: sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=} + /jquery-ui/1.13.1: + resolution: {integrity: sha512-2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA==} + dependencies: + jquery: 3.6.0 dev: false - /jquery/3.5.1: - resolution: {integrity: sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==} + /jquery/3.6.0: + resolution: {integrity: sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==} dev: false /js-tokens/4.0.0: @@ -7332,7 +7331,7 @@ packages: /multiple-select-modified/1.3.17: resolution: {integrity: sha512-PbF++gNu4gIT0gYrlX82NXOVnw/Xz0M8ilVHVWRRDZgTsX/FBNeHg94pIM4mbsQ4JKO4ggSGLoYG4GheuUG2/Q==} dependencies: - jquery: 3.5.1 + jquery: 3.6.0 dev: false /mute-stream/0.0.8: @@ -8995,8 +8994,8 @@ packages: /slickgrid/2.4.44: resolution: {integrity: sha512-DF7ePE5bwitJrRdJSNrV+qAnQsfds0GbRA02ywy6TQrQewkm9DSHGDUxJaoJk2WUMlyQ7Odrf2o1PCZM50BcSg==} dependencies: - jquery: 3.5.1 - jquery-ui: 1.12.1 + jquery: 3.6.0 + jquery-ui: 1.13.1 dev: false /smart-buffer/4.2.0: @@ -9412,7 +9411,7 @@ packages: serialize-javascript: 6.0.0 source-map: 0.6.1 terser: 5.13.1 - webpack: 5.73.0 + webpack: 5.73.0_webpack-cli@4.9.2 dev: true /terser/5.13.1: diff --git a/test/cypress/integration/example03.spec.js b/test/cypress/integration/example03.spec.js index 98d95b181..16d3b3928 100644 --- a/test/cypress/integration/example03.spec.js +++ b/test/cypress/integration/example03.spec.js @@ -89,7 +89,7 @@ describe('Example 03 - Draggable Grouping', { 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', () => { diff --git a/test/cypress/integration/example07.spec.js b/test/cypress/integration/example07.spec.js index ccf6d827f..23b00c036 100644 --- a/test/cypress/integration/example07.spec.js +++ b/test/cypress/integration/example07.spec.js @@ -78,12 +78,12 @@ describe('Example 07 - 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('input[type="checkbox"]:checked') .should('have.length', 4); @@ -130,12 +130,12 @@ describe('Example 07 - 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'); @@ -310,7 +310,7 @@ describe('Example 07 - Row Move & Checkbox Selector Selector Plugins', { retries .children('.slick-header-column:nth(7)') .should('contain', 'Finish') .trigger('mousemove', 'bottomRight') - .trigger('mouseup', 'bottomRight', { force: true }); + .trigger('mouseup', 'bottomRight', { which: 1, force: true }); cy.get('.grid7') .find('.slick-header-columns') @@ -733,7 +733,7 @@ describe('Example 07 - Row Move & Checkbox Selector Selector Plugins', { retries .children('.slick-header-column:nth(8)') .should('contain', 'Completed') .trigger('mousemove', 'bottomRight') - .trigger('mouseup', 'bottomRight', { force: true }); + .trigger('mouseup', 'bottomRight', { which: 1, force: true }); cy.get('.grid7') .find('.slick-header-columns') diff --git a/test/cypress/integration/example18.spec.js b/test/cypress/integration/example18.spec.js index 6c4f95e45..730d90646 100644 --- a/test/cypress/integration/example18.spec.js +++ b/test/cypress/integration/example18.spec.js @@ -49,11 +49,11 @@ describe('Example 18 - Real-Time Trading Platform', { 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();