diff --git a/README.md b/README.md index 5e15e024a..d4e298e38 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ yarn run test:watch - [x] Remove all Services init method 2nd argument (we can get DataView directly from the Grid object) - [x] The Pagination/Footer width is a little off sometime compare to the width of the grid container - [x] See if we can add the number of chars (text counter) typed in `Editors.longText` +- [x] Upgrade to latest jQuery version `3.5.1` - [ ] See if we can get `DOM Purify` to work in SF, else keep the custom sanitizer - [ ] See if we can get all the vanilla-grid-bundle `instances` as `readonly` class members - [ ] change `Filters` and `Editors` to default index export but move the previous export into the vanilla grid bundle -- [ ] Should also check lib to work with new jQuery `3.5.1` version diff --git a/package.json b/package.json index a2cd5cf76..f26422d9c 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@types/node": "^14.0.26", "@typescript-eslint/eslint-plugin": "^3.7.1", "@typescript-eslint/parser": "^3.7.1", - "cypress": "^4.11.0", + "cypress": "^4.12.0", "eslint": "^7.5.0", "eslint-plugin-import": "^2.22.0", "eslint-plugin-prefer-arrow": "^1.2.2", diff --git a/packages/common/package.json b/packages/common/package.json index d4ca6a537..100760135 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -58,11 +58,11 @@ "dependencies": { "dompurify": "^2.0.12", "flatpickr": "^4.6.3", - "jquery": "^3.4.1", + "jquery": "^3.5.1", "jquery-ui-dist": "^1.12.1", "lodash.isequal": "^4.5.0", "moment-mini": "^2.24.0", - "multiple-select-modified": "^1.3.2", + "multiple-select-modified": "^1.3.3", "slickgrid": "^2.4.27" }, "devDependencies": { diff --git a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip index 808db33c4..d7bd9714b 100644 Binary files a/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip and b/packages/vanilla-bundle/dist-grid-bundle-zip/slickgrid-vanilla-bundle.zip differ diff --git a/test/cypress/integration/example11.spec.js b/test/cypress/integration/example11.spec.js index acf8b7bc9..06713c042 100644 --- a/test/cypress/integration/example11.spec.js +++ b/test/cypress/integration/example11.spec.js @@ -105,7 +105,9 @@ describe('Example 11 - Queued Editing', () => { }); it('should be able to change "Finish" values of row indexes 0-2', () => { - const today = changeTimezone(new Date(), 'America/New_York'); + const now = new Date(); + const tz = Intl.DateTimeFormat().resolvedOptions().timeZone; + const today = changeTimezone(now, tz); const currentDate = today.getDate(); let currentMonth = today.getMonth() + 1; // month is zero based, let's add 1 to it diff --git a/yarn.lock b/yarn.lock index e70d56aab..3adf94d80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7337,10 +7337,10 @@ jquery-ui@>=1.8.0: resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= -jquery@>=1.8.0, jquery@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" - integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== +jquery@>=1.8.0, jquery@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5" + integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg== js-base64@^2.1.8: version "2.5.2" @@ -8509,12 +8509,12 @@ multimatch@^3.0.0: arrify "^1.0.1" minimatch "^3.0.4" -multiple-select-modified@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/multiple-select-modified/-/multiple-select-modified-1.3.2.tgz#96767ef2baaa0475fb3b9f7387004661270e074f" - integrity sha512-84vE54Fd7qo+p5WM5LTQ+/T+C7c/ZoP/WubobuRFaEBh3yYqiVdwT/VNypK6HzSM4zWMhYZPqvNlAQOgY7bxpA== +multiple-select-modified@^1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/multiple-select-modified/-/multiple-select-modified-1.3.3.tgz#1a69e7ee4e0c244b3bb7ece5b3456ef4b0cfca5f" + integrity sha512-H63VINpjRXXrKjrz0ndGr8nRKKa0vkz0S9wBgnsWmucL5MqcG1xx2UUeEUCFZ80IePiruYGRXTpMB5ZOG4JXhg== dependencies: - jquery "^3.4.1" + jquery "^3.5.1" mute-stream@0.0.7: version "0.0.7"