From b08bae8e6c1b43948ec6c76c89adac158313aa36 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:10:22 +0000 Subject: [PATCH 01/20] Bump the babel group with 3 updates Bumps the babel group with 3 updates: [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core), [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) and [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env). Updates `@babel/core` from 7.23.6 to 7.23.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-core) Updates `@babel/plugin-transform-runtime` from 7.23.6 to 7.23.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-plugin-transform-runtime) Updates `@babel/preset-env` from 7.23.6 to 7.23.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.7/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/plugin-transform-runtime" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/preset-env" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: babel ... Signed-off-by: dependabot[bot] --- package.json | 6 +-- yarn.lock | 148 ++++++++++++++++++++++----------------------------- 2 files changed, 67 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 34bbdf6543..db1f71e034 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "test:system:coverage:merge": "nyc merge ./coverage/system-js ./coverage/coverage.json" }, "dependencies": { - "@babel/core": "^7.23.6", - "@babel/plugin-transform-runtime": "^7.23.6", - "@babel/preset-env": "^7.23.6", + "@babel/core": "^7.23.7", + "@babel/plugin-transform-runtime": "^7.23.7", + "@babel/preset-env": "^7.23.7", "@codemirror/autocomplete": "^6.11.1", "@codemirror/commands": "^6.3.2", "@codemirror/language": "^6.9.3", diff --git a/yarn.lock b/yarn.lock index 537e715aca..e892270c18 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,20 +28,20 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.23.6", "@babel/core@^7.7.5": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4" - integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw== +"@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.23.7", "@babel/core@^7.7.5": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f" + integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.23.5" "@babel/generator" "^7.23.6" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.6" + "@babel/helpers" "^7.23.7" "@babel/parser" "^7.23.6" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" + "@babel/traverse" "^7.23.7" "@babel/types" "^7.23.6" convert-source-map "^2.0.0" debug "^4.1.0" @@ -108,10 +108,10 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba" - integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug== +"@babel/helper-define-polyfill-provider@^0.4.4": + version "0.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088" + integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -252,13 +252,13 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a" - integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA== +"@babel/helpers@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.7.tgz#eb543c36f81da2873e47b76ee032343ac83bba60" + integrity sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" + "@babel/traverse" "^7.23.7" "@babel/types" "^7.23.6" "@babel/highlight@^7.23.4": @@ -291,10 +291,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-optional-chaining" "^7.23.3" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098" - integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b" + integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -445,10 +445,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-generator-functions@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a" - integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw== +"@babel/plugin-transform-async-generator-functions@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd" + integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -760,16 +760,16 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-runtime@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.6.tgz#bf853cd0a675c16ee33e6ba2a63b536e75e5d754" - integrity sha512-kF1Zg62aPseQ11orDhFRw+aPG/eynNQtI+TyY+m33qJa2cJ5EEvza2P2BNTIA9E5MyqFABHEyY6CPHwgdy9aNg== +"@babel/plugin-transform-runtime@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.7.tgz#52bbd20054855beb9deae3bee9ceb05289c343e6" + integrity sha512-fa0hnfmiXc9fq/weK34MUV0drz2pOL/vfKWvN7Qw127hiUPabFCUMgAbYWcchRzMJit4o5ARsK/s+5h0249pLw== dependencies: "@babel/helper-module-imports" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" + babel-plugin-polyfill-corejs2 "^0.4.7" + babel-plugin-polyfill-corejs3 "^0.8.7" + babel-plugin-polyfill-regenerator "^0.5.4" semver "^6.3.1" "@babel/plugin-transform-shorthand-properties@^7.23.3": @@ -839,10 +839,10 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.6.tgz#ad0ea799d5a3c07db5b9a172819bbd444092187a" - integrity sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ== +"@babel/preset-env@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.7.tgz#e5d69b9f14db8a13bae4d8e5ce7f360973626241" + integrity sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA== dependencies: "@babel/compat-data" "^7.23.5" "@babel/helper-compilation-targets" "^7.23.6" @@ -850,7 +850,7 @@ "@babel/helper-validator-option" "^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" @@ -871,7 +871,7 @@ "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.4" + "@babel/plugin-transform-async-generator-functions" "^7.23.7" "@babel/plugin-transform-async-to-generator" "^7.23.3" "@babel/plugin-transform-block-scoped-functions" "^7.23.3" "@babel/plugin-transform-block-scoping" "^7.23.4" @@ -919,9 +919,9 @@ "@babel/plugin-transform-unicode-regex" "^7.23.3" "@babel/plugin-transform-unicode-sets-regex" "^7.23.3" "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" + babel-plugin-polyfill-corejs2 "^0.4.7" + babel-plugin-polyfill-corejs3 "^0.8.7" + babel-plugin-polyfill-regenerator "^0.5.4" core-js-compat "^3.31.0" semver "^6.3.1" @@ -955,10 +955,10 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" - integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" + integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== dependencies: "@babel/code-frame" "^7.23.5" "@babel/generator" "^7.23.6" @@ -2843,29 +2843,29 @@ babel-plugin-macros@^3.1.0: cosmiconfig "^7.0.0" resolve "^1.19.0" -babel-plugin-polyfill-corejs2@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" - integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q== +babel-plugin-polyfill-corejs2@^0.4.7: + version "0.4.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz#679d1b94bf3360f7682e11f2cb2708828a24fe8c" + integrity sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.4.4" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz#a75fa1b0c3fc5bd6837f9ec465c0f48031b8cab1" - integrity sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA== +babel-plugin-polyfill-corejs3@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04" + integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" - core-js-compat "^3.32.2" + "@babel/helper-define-polyfill-provider" "^0.4.4" + core-js-compat "^3.33.1" -babel-plugin-polyfill-regenerator@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5" - integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw== +babel-plugin-polyfill-regenerator@^0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz#c6fc8eab610d3a11eb475391e52584bacfc020f4" + integrity sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.4.4" babel-preset-current-node-syntax@^1.0.0: version "1.0.1" @@ -2982,16 +2982,6 @@ browserslist@^4.14.5: node-releases "^2.0.13" update-browserslist-db "^1.0.11" -browserslist@^4.22.1: - version "4.22.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" - integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== - dependencies: - caniuse-lite "^1.0.30001541" - electron-to-chromium "^1.4.535" - node-releases "^2.0.13" - update-browserslist-db "^1.0.13" - browserslist@^4.22.2: version "4.22.2" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b" @@ -3084,11 +3074,6 @@ caniuse-lite@^1.0.30001517: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001533.tgz#1180daeb2518b93c82f19b904d1fefcf82197707" integrity sha512-9aY/b05NKU4Yl2sbcJhn4A7MsGwR1EPfW/nrqsnqVA0Oq50wpmPaGI+R1Z0UKlUl96oxUkGEOILWtOHck0eCWw== -caniuse-lite@^1.0.30001541: - version "1.0.30001549" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001549.tgz#7d1a3dce7ea78c06ed72c32c2743ea364b3615aa" - integrity sha512-qRp48dPYSCYaP+KurZLhDYdVE+yEyht/3NlmcJgVQ2VMGt6JL36ndQ/7rgspdZsJuxDPFIo/OzBT2+GmIJ53BA== - caniuse-lite@^1.0.30001565: version "1.0.30001570" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca" @@ -3344,12 +3329,12 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.31.0, core-js-compat@^3.32.2: - version "3.33.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.33.0.tgz#24aa230b228406450b2277b7c8bfebae932df966" - integrity sha512-0w4LcLXsVEuNkIqwjjf9rjCoPhK8uqA4tMRh4Ge26vfLtUutshn+aRJU21I9LCJlh2QQHfisNToLjw1XEJLTWw== +core-js-compat@^3.31.0, core-js-compat@^3.33.1: + version "3.35.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.35.0.tgz#c149a3d1ab51e743bc1da61e39cb51f461a41873" + integrity sha512-5blwFAddknKeNgsjBzilkdQ0+YK8L1PfqPYq40NOYMYFSS38qj+hpTcLLWwpIwA2A5bje/x5jmVn2tzUMg9IVw== dependencies: - browserslist "^4.22.1" + browserslist "^4.22.2" core-js@^3.34.0: version "3.34.0" @@ -3901,11 +3886,6 @@ electron-to-chromium@^1.4.477: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.515.tgz#f5fec9662106ac5752894af221606cf4db443e70" integrity sha512-VTq6vjk3kCfG2qdzQRd/i9dIyVVm0dbtZIgFzrLgfB73mXDQT2HPKVRc1EoZcAVUv9XhXAu08DWqJuababdGGg== -electron-to-chromium@^1.4.535: - version "1.4.554" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.554.tgz#04e09c2ee31dc0f1546174033809b54cc372740b" - integrity sha512-Q0umzPJjfBrrj8unkONTgbKQXzXRrH7sVV7D9ea2yBV3Oaogz991yhbpfvo2LMNkJItmruXTEzVpP9cp7vaIiQ== - electron-to-chromium@^1.4.601: version "1.4.614" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.614.tgz#2fe789d61fa09cb875569f37c309d0c2701f91c0" From 213f60a4d3184cdaad70039b48ae3cd810edfae2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:10:42 +0000 Subject: [PATCH 02/20] Bump the testing-library group with 1 update Bumps the testing-library group with 1 update: [@testing-library/user-event](https://github.com/testing-library/user-event). Updates `@testing-library/user-event` from 14.5.1 to 14.5.2 - [Release notes](https://github.com/testing-library/user-event/releases) - [Changelog](https://github.com/testing-library/user-event/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/user-event/compare/v14.5.1...v14.5.2) --- updated-dependencies: - dependency-name: "@testing-library/user-event" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: testing-library ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34bbdf6543..c02dbf25ce 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "devDependencies": { "@open-wc/testing-helpers": "^2.3.2", "@testing-library/dom": "^9.3.3", - "@testing-library/user-event": "^14.5.1", + "@testing-library/user-event": "^14.5.2", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "babel-plugin-istanbul": "^6.1.1", diff --git a/yarn.lock b/yarn.lock index 537e715aca..04be28354a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1854,10 +1854,10 @@ lz-string "^1.5.0" pretty-format "^27.0.2" -"@testing-library/user-event@^14.5.1": - version "14.5.1" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f" - integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg== +"@testing-library/user-event@^14.5.2": + version "14.5.2" + resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd" + integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ== "@tootallnate/once@1": version "1.1.2" From dc69fdfb978f9e052fcac28ddca9800dcdff3a47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:11:43 +0000 Subject: [PATCH 03/20] Bump @types/serviceworker from 0.0.81 to 0.0.82 Bumps [@types/serviceworker](https://github.com/microsoft/TypeScript-DOM-Lib-Generator) from 0.0.81 to 0.0.82. - [Release notes](https://github.com/microsoft/TypeScript-DOM-Lib-Generator/releases) - [Commits](https://github.com/microsoft/TypeScript-DOM-Lib-Generator/compare/@types/serviceworker@0.0.81...@types/serviceworker@0.0.82) --- updated-dependencies: - dependency-name: "@types/serviceworker" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34bbdf6543..02465e0cbe 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "@types/dragula": "^3.7.4", "@types/iframe-resizer": "^3.5.13", "@types/jest": "^27.5.0", - "@types/serviceworker": "^0.0.81", + "@types/serviceworker": "^0.0.82", "babel-loader": "^9.1.3", "babel-plugin-macros": "^3.1.0", "bootstrap": "5.3.2", diff --git a/yarn.lock b/yarn.lock index 537e715aca..13ca4e16b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2229,10 +2229,10 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.1.tgz#0480eeb7221eb9bc398ad7432c9d7e14b1a5a367" integrity sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg== -"@types/serviceworker@^0.0.81": - version "0.0.81" - resolved "https://registry.yarnpkg.com/@types/serviceworker/-/serviceworker-0.0.81.tgz#d5c00f3aa957f35c21fd12e3928c60a8a58d7542" - integrity sha512-XZ9gX1AWmOZQyvdvZeAAcWwz1dUqoqE9uXgt6yrVNLpnYWZtTDOUzGyfctsyJtcxoWtJ6U60iwcWYfweNwclCA== +"@types/serviceworker@^0.0.82": + version "0.0.82" + resolved "https://registry.yarnpkg.com/@types/serviceworker/-/serviceworker-0.0.82.tgz#d46dd1a0b4be7c9dd0f4b201ccec59c42124e38c" + integrity sha512-JkHWXMbqUd8sAA8yUxEjabRqgm6yn/rjOY2VZeifryu72e/hbQW2MLsvpZvu8vwhkls8AGczw3U2MVKdnayqng== "@types/stack-utils@^2.0.0": version "2.0.1" From 65a29697245ecba781f9d4285e389096b90d3f2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:12:46 +0000 Subject: [PATCH 04/20] Bump sass from 1.69.5 to 1.69.6 Bumps [sass](https://github.com/sass/dart-sass) from 1.69.5 to 1.69.6. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.69.5...1.69.6) --- updated-dependencies: - dependency-name: sass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34bbdf6543..eb0f29683c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "iframe-resizer": "^4.3.9", "lit": "^3.1.0", "node-polyglot": "^2.5.0", - "sass": "^1.69.5", + "sass": "^1.69.6", "tippy.js": "^6.3.7", "ts-loader": "^9.5.1", "typescript": "^5.3.3", diff --git a/yarn.lock b/yarn.lock index 537e715aca..13fc65034b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7206,10 +7206,10 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sass@^1.69.5: - version "1.69.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" - integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== +sass@^1.69.6: + version "1.69.6" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.6.tgz#88ae1f93facc46d2da9b0bdd652d65068bcfa397" + integrity sha512-qbRr3k9JGHWXCvZU77SD2OTwUlC+gNT+61JOLcmLm+XqH4h/5D+p4IIsxvpkB89S9AwJOyb5+rWNpIucaFxSFQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From 830be3be474c049ee62cdd141ce67a38089b3e8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:23:31 +0000 Subject: [PATCH 05/20] Bump the rubocop group with 2 updates Bumps the rubocop group with 2 updates: [rubocop-minitest](https://github.com/rubocop/rubocop-minitest) and [rubocop-rails](https://github.com/rubocop/rubocop-rails). Updates `rubocop-minitest` from 0.33.0 to 0.34.3 - [Release notes](https://github.com/rubocop/rubocop-minitest/releases) - [Changelog](https://github.com/rubocop/rubocop-minitest/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-minitest/compare/v0.33.0...v0.34.3) Updates `rubocop-rails` from 2.22.2 to 2.23.1 - [Release notes](https://github.com/rubocop/rubocop-rails/releases) - [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.22.2...v2.23.1) --- updated-dependencies: - dependency-name: rubocop-minitest dependency-type: direct:development update-type: version-update:semver-minor dependency-group: rubocop - dependency-name: rubocop-rails dependency-type: direct:development update-type: version-update:semver-minor dependency-group: rubocop ... Signed-off-by: dependabot[bot] --- Gemfile | 4 ++-- Gemfile.lock | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 928fd43598..440d187650 100644 --- a/Gemfile +++ b/Gemfile @@ -179,8 +179,8 @@ group :development do gem 'rb-readline', '~> 0.5.5' # require for irb gem 'rubocop-capybara', '~> 2.19.0' gem 'rubocop-factory_bot', '~> 2.24' - gem 'rubocop-minitest', '~> 0.33.0' - gem 'rubocop-rails', '~> 2.22.2' + gem 'rubocop-minitest', '~> 0.34.3' + gem 'rubocop-rails', '~> 2.23.1' # for opening letters gem 'letter_opener', '~> 1.8.1' diff --git a/Gemfile.lock b/Gemfile.lock index 180df4d50b..62fc0fcc11 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM base64 (0.2.0) bcrypt (3.1.19) bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) bindata (2.4.15) bindex (0.8.1) bootsnap (1.17.0) @@ -233,7 +233,7 @@ GEM activesupport (>= 5.0.0) jsbundling-rails (1.2.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) json-jwt (1.16.3) activesupport (>= 4.2) aes_key_wrap @@ -344,7 +344,7 @@ GEM validate_url webfinger (~> 2.0) orm_adapter (0.5.0) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -429,7 +429,7 @@ GEM rb-readline (0.5.5) rdoc (6.6.0) psych (>= 4.0.0) - regexp_parser (2.8.2) + regexp_parser (2.8.3) reline (0.4.0) io-console (~> 0.5) responders (3.1.1) @@ -437,7 +437,7 @@ GEM railties (>= 5.2) rexml (3.2.6) rouge (4.2.0) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -445,7 +445,7 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) @@ -454,9 +454,10 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-minitest (0.33.0) + rubocop-minitest (0.34.3) rubocop (>= 1.39, < 2.0) - rubocop-rails (2.22.2) + rubocop-ast (>= 1.30.0, < 2.0) + rubocop-rails (2.23.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -621,8 +622,8 @@ DEPENDENCIES rouge (= 4.2.0) rubocop-capybara (~> 2.19.0) rubocop-factory_bot (~> 2.24) - rubocop-minitest (~> 0.33.0) - rubocop-rails (~> 2.22.2) + rubocop-minitest (~> 0.34.3) + rubocop-rails (~> 2.23.1) ruby-saml (~> 1.16.0) rubyzip (~> 2.3.2) selenium-webdriver (~> 4.16.0) From 2069455da68b0a2d121fd76013fcd50814f33dd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 12:24:48 +0000 Subject: [PATCH 06/20] Bump nokogiri from 1.15.5 to 1.16.0 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.15.5 to 1.16.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.15.5...v1.16.0) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 928fd43598..dcff8bb814 100644 --- a/Gemfile +++ b/Gemfile @@ -111,7 +111,7 @@ gem 'httparty', '~> 0.21.0' gem 'slack-notifier', '~> 2.4.0' # css styles for emails -gem 'nokogiri', '~> 1.15.5' +gem 'nokogiri', '~> 1.16.0' gem 'premailer-rails', '~> 1.12.0' # filtering diff --git a/Gemfile.lock b/Gemfile.lock index 180df4d50b..955f55cd82 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,7 +303,7 @@ GEM net-protocol net-ssh (7.1.0) nio4r (2.5.9) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) oauth2 (2.0.8) faraday (>= 0.17.3, < 3.0) @@ -604,7 +604,7 @@ DEPENDENCIES minitest-utils (~> 0.4.8) mocha (~> 2.1.0) mysql2 (~> 0.5.5) - nokogiri (~> 1.15.5) + nokogiri (~> 1.16.0) omniauth-google-oauth2 (~> 1.1.1) omniauth-oauth2 (~> 1.8.0) omniauth-rails_csrf_protection (~> 1.0.1) From c3ac6fccc2d19ac734b4f034a5b17eef76cc1553 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 2 Jan 2024 10:02:27 +0100 Subject: [PATCH 07/20] FIx linting --- app/controllers/activities_controller.rb | 2 +- app/controllers/courses_controller.rb | 2 +- app/models/concerns/cacheable.rb | 10 +++++----- app/models/concerns/tokenable.rb | 2 +- app/models/institution.rb | 6 +++--- test/testhelpers/remote_helper.rb | 2 +- test/testhelpers/stub_helper.rb | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index de3b639af2..d6f81f8d8d 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -109,7 +109,7 @@ def show flash.now[:alert] = I18n.t('activities.show.not_a_member') if @course && !current_user&.member_of?(@course) # Double check if activity still exists within this course (And throw a 404 when it does not) - @course&.activities&.find_by!(id: @activity.id) if current_user&.course_admin?(@course) + @course&.activities&.find(@activity.id) if current_user&.course_admin?(@course) # We still need to check access because an unauthenticated user should be able to see public activities raise Pundit::NotAuthorizedError, 'Not allowed' unless @activity.accessible?(current_user, @course) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index b0641c57e2..c7331cdb0e 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -67,7 +67,7 @@ def index end @courses = @courses.paginate(page: parse_pagination_param(params[:page])) - @membership_status = current_user&.course_memberships&.where(course_id: @courses.pluck(:id))&.map { |c| [c.course_id, c.status] }&.to_h || {} + @membership_status = current_user&.course_memberships&.where(course_id: @courses.pluck(:id)).to_h { |c| [c.course_id, c.status] } @repository = Repository.find(params[:repository_id]) if params[:repository_id] @institution = Institution.find(params[:institution_id]) if params[:institution_id] @copy_courses = params[:copy_courses] diff --git a/app/models/concerns/cacheable.rb b/app/models/concerns/cacheable.rb index 5f7ea56f16..4e083cef1d 100644 --- a/app/models/concerns/cacheable.rb +++ b/app/models/concerns/cacheable.rb @@ -18,18 +18,18 @@ def invalidateable_instance_cacheable(name, cache_string) end[1] end - define_method("invalidate_#{name}".to_sym) do |options = {}| + define_method(:"invalidate_#{name}") do |options = {}| lookup_string = cache_string.call(self, options) Rails.cache.delete(lookup_string) end - define_method("invalidate_delayed_#{name}".to_sym) do |options = {}| + define_method(:"invalidate_delayed_#{name}") do |options = {}| lookup_string = cache_string.call(self, options) value = Rails.cache.read(lookup_string) Rails.cache.write(lookup_string, [true, value[1]], expires_in: CACHE_EXPIRY_TIME) if value.present? && !value[0] end - define_method("old_#{name}".to_sym, calculator) + define_method(:"old_#{name}", calculator) end def updateable_class_cacheable(name, cache_string) @@ -38,7 +38,7 @@ def updateable_class_cacheable(name, cache_string) Rails.cache.fetch(cache_string.call(options)) end - define_singleton_method("update_#{name}".to_sym) do |options = {}| + define_singleton_method(:"update_#{name}") do |options = {}| old = Rails.cache.fetch(cache_string.call(options)) updated = if old.present? updater.call(options, old) @@ -48,7 +48,7 @@ def updateable_class_cacheable(name, cache_string) Rails.cache.write(cache_string.call(options), updated) end - define_singleton_method("old_#{name}".to_sym, updater) + define_singleton_method(:"old_#{name}", updater) end end end diff --git a/app/models/concerns/tokenable.rb b/app/models/concerns/tokenable.rb index 38816a4921..0fa52632f7 100644 --- a/app/models/concerns/tokenable.rb +++ b/app/models/concerns/tokenable.rb @@ -4,7 +4,7 @@ module Tokenable class_methods do def token_generator(name, length: 16, unique: true) token_name = name.to_sym - generate_token_method_name = "generate_#{name}".to_sym + generate_token_method_name = :"generate_#{name}" # Generate a random base64 string, but strip characters which might # look ambiguous. diff --git a/app/models/institution.rb b/app/models/institution.rb index 90ea10a2a8..442e16ebc5 100644 --- a/app/models/institution.rb +++ b/app/models/institution.rb @@ -93,7 +93,7 @@ def self.similarity_matrix .filter { |u| IGNORED_DOMAINS_FOR_SIMILARITY.exclude?(u[:domain]) && u[:count] > 1 } # we group by domain to get all institutions with the same domain, we update the similarity matrix for all pairs of institutions - domains.group_by { |u| u[:domain] }.each do |_, institution| + domains.group_by { |u| u[:domain] }.each_value do |institution| institution.combination(2).each do |i1, i2| overlap = [i1[:count], i2[:count]].min matrix[i1[:institution_id]][i2[:institution_id]] = [matrix[i1[:institution_id]][i2[:institution_id]], overlap].max @@ -101,14 +101,14 @@ def self.similarity_matrix end end - emails.group_by(&:email).each do |_, users| + emails.group_by(&:email).each_value do |users| users.combination(2).each do |u1, u2| matrix[u1.institution_id][u2.institution_id] += 1 matrix[u2.institution_id][u1.institution_id] += 1 end end - usernames.each { |u| u.username.downcase! }.group_by(&:username).each do |_, users| + usernames.each { |u| u.username.downcase! }.group_by(&:username).each_value do |users| users.combination(2).each do |u1, u2| matrix[u1.institution_id][u2.institution_id] += 1 matrix[u2.institution_id][u1.institution_id] += 1 diff --git a/test/testhelpers/remote_helper.rb b/test/testhelpers/remote_helper.rb index 54f656b02d..9cf2338463 100644 --- a/test/testhelpers/remote_helper.rb +++ b/test/testhelpers/remote_helper.rb @@ -15,7 +15,7 @@ class TempRepository < GitRepository REMOTES_LOCATION = Rails.root.join('test/remotes') def initialize - super Dir.mktmpdir + super(Dir.mktmpdir) init_git end diff --git a/test/testhelpers/stub_helper.rb b/test/testhelpers/stub_helper.rb index b134bee6b6..cf5561a8f6 100644 --- a/test/testhelpers/stub_helper.rb +++ b/test/testhelpers/stub_helper.rb @@ -14,7 +14,7 @@ def stub_git(obj) def stub_status(exercise, status) exercise.stubs(:status).returns(status) Exercise.statuses.each_key do |key| - exercise.stubs("#{key}?".to_sym).returns(key == status) + exercise.stubs(:"#{key}?").returns(key == status) end end From 51c1da065bb1578a4c6c5e59f1cf972e8c44a84e Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 09:44:38 +0100 Subject: [PATCH 08/20] Disable selection of line numbers in submission result --- app/assets/stylesheets/models/submissions.css.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/stylesheets/models/submissions.css.scss b/app/assets/stylesheets/models/submissions.css.scss index 51aa436171..b6138e9b54 100644 --- a/app/assets/stylesheets/models/submissions.css.scss +++ b/app/assets/stylesheets/models/submissions.css.scss @@ -199,6 +199,7 @@ td.line-nr { text-align: right; white-space: pre-wrap; + user-select: none; } th { From 93046c99b88c594c9e716d7fcd2bc81d6abdd3a9 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 10:04:38 +0100 Subject: [PATCH 09/20] Fix user label disappearing on global feedback update --- app/controllers/feedbacks_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb index cae8eb7fec..7bb06e26b1 100644 --- a/app/controllers/feedbacks_controller.rb +++ b/app/controllers/feedbacks_controller.rb @@ -75,7 +75,15 @@ def update if updated format.html { redirect_to evaluation_feedback_path(@feedback.evaluation, @feedback) } format.json { render :show, status: :ok, location: @feedback } - format.js { render :show } + format.js do + @user_labels = @feedback.evaluation + .series + .course + .course_memberships + .find_by(user_id: @feedback.user) + .course_labels + render :show + end else format.json { render json: @feedback.errors, status: :unprocessable_entity } format.js { render :show, status: :unprocessable_entity } From 91015f637b7430e7f9b877a1eaca5afc37973fdf Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 10:06:45 +0100 Subject: [PATCH 10/20] Revert "Fix user label disappearing on global feedback update" This reverts commit 93046c99b88c594c9e716d7fcd2bc81d6abdd3a9. --- app/controllers/feedbacks_controller.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/controllers/feedbacks_controller.rb b/app/controllers/feedbacks_controller.rb index 7bb06e26b1..cae8eb7fec 100644 --- a/app/controllers/feedbacks_controller.rb +++ b/app/controllers/feedbacks_controller.rb @@ -75,15 +75,7 @@ def update if updated format.html { redirect_to evaluation_feedback_path(@feedback.evaluation, @feedback) } format.json { render :show, status: :ok, location: @feedback } - format.js do - @user_labels = @feedback.evaluation - .series - .course - .course_memberships - .find_by(user_id: @feedback.user) - .course_labels - render :show - end + format.js { render :show } else format.json { render json: @feedback.errors, status: :unprocessable_entity } format.js { render :show, status: :unprocessable_entity } From 2240b9a34a8f72c9dce8e0913f8a47749bfddde9 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 11:06:36 +0100 Subject: [PATCH 11/20] Fix display of escaped characters in 'restore boilerplate' --- app/views/activities/show.html.erb | 2 +- test/system/activities_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/activities/show.html.erb b/app/views/activities/show.html.erb index 55bc2a069c..a8cb34609e 100644 --- a/app/views/activities/show.html.erb +++ b/app/views/activities/show.html.erb @@ -180,7 +180,7 @@ end %> <%= @course&.id || "null" %>, <%= raw "\"#{@series&.deadline&.httpdate}\"" || "null" %>, "<%= submissions_url %>", - `<%= (@activity.exercise? && @activity.boilerplate&.gsub('`', '\\\\`'))|| "" %>`, + `<%= (@activity.exercise? && @activity.boilerplate&.gsub('\\', '\\\\\\\\')&.gsub('`', '\\\\`'))|| "" %>`, ); }); diff --git a/test/system/activities_test.rb b/test/system/activities_test.rb index 95150cb94a..54733b2f18 100644 --- a/test/system/activities_test.rb +++ b/test/system/activities_test.rb @@ -54,10 +54,10 @@ class ActivitiesTest < ApplicationSystemTestCase end test 'should not break on complex unicode characters' do - Exercise.any_instance.stubs(:boilerplate).returns('``') + Exercise.any_instance.stubs(:boilerplate).returns('`\\n\n\\0`') visit exercise_path(id: @instance.id) - assert_text '``' + assert_text '`\\n\n\\0`' create :submission, exercise: @instance, user: @user, status: :correct, code: 'print("😀")' visit exercise_path(id: @instance.id) @@ -66,6 +66,6 @@ class ActivitiesTest < ApplicationSystemTestCase assert_text 'Restore the initial code.' find('a', text: 'Restore the initial code.').click - assert_text '``' + assert_text '`\\n\n\\0`' end end From ec166c84f62703bf1bfd3495990340f9100ec8f4 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 13:26:07 +0100 Subject: [PATCH 12/20] USe escape javascript --- app/views/activities/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/activities/show.html.erb b/app/views/activities/show.html.erb index a8cb34609e..3e59e6e2ee 100644 --- a/app/views/activities/show.html.erb +++ b/app/views/activities/show.html.erb @@ -180,7 +180,7 @@ end %> <%= @course&.id || "null" %>, <%= raw "\"#{@series&.deadline&.httpdate}\"" || "null" %>, "<%= submissions_url %>", - `<%= (@activity.exercise? && @activity.boilerplate&.gsub('\\', '\\\\\\\\')&.gsub('`', '\\\\`'))|| "" %>`, + `<%= escape_javascript (@activity.exercise? && @activity.boilerplate)|| "" %>`, ); }); From 4cbc8f5b46daac64cd65b80362cf30a4d103a001 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 14:26:50 +0100 Subject: [PATCH 13/20] Translate exercise names in search results --- .../javascripts/state/SavedAnnotations.ts | 12 ++++--- test/system/saved_annotation_test.rb | 34 +++++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/state/SavedAnnotations.ts b/app/assets/javascripts/state/SavedAnnotations.ts index c850e45078..06acb24431 100644 --- a/app/assets/javascripts/state/SavedAnnotations.ts +++ b/app/assets/javascripts/state/SavedAnnotations.ts @@ -34,6 +34,10 @@ class SavedAnnotationState extends State { @stateProperty private paginationByURL = new StateMap(); @stateProperty private byId = new StateMap(); + private get url(): string { + return `/${I18n.locale}${URL}`; + } + private async fetchList(url: string): Promise> { const response = await fetch(url); this.listByURL.set(url, await response.json()); @@ -42,14 +46,14 @@ class SavedAnnotationState extends State { } private async fetch(id: number): Promise { - const url = `${URL}/${id}.json`; + const url = `${this.url}/${id}.json`; const response = await fetch(url); this.byId.set(id, await response.json()); return this.byId.get(id); } async create(data: { from: number, saved_annotation: { title: string, annotation_text: string } }): Promise { - const url = `${URL}.json`; + const url = `${this.url}.json`; const response = await fetch(url, { method: "post", body: JSON.stringify(data), @@ -66,7 +70,7 @@ class SavedAnnotationState extends State { } getList(params?: Map, arrayParams?: Map): Array | undefined { - const url = addParametersToUrl(`${URL}.json`, params, arrayParams); + const url = addParametersToUrl(`${this.url}.json`, params, arrayParams); delayerByURL.get(url)(() => { if (!this.listByURL.has(url)) { this.fetchList(url); @@ -76,7 +80,7 @@ class SavedAnnotationState extends State { } getPagination(params?: Map, arrayParams?: Map): Pagination { - const url = addParametersToUrl(`${URL}.json`, params, arrayParams); + const url = addParametersToUrl(`${this.url}.json`, params, arrayParams); delayerByURL.get(url)(() => { if (!this.paginationByURL.has(url)) { this.fetchList(url); diff --git a/test/system/saved_annotation_test.rb b/test/system/saved_annotation_test.rb index 56f56819be..3de815612c 100644 --- a/test/system/saved_annotation_test.rb +++ b/test/system/saved_annotation_test.rb @@ -110,4 +110,38 @@ class SavedAnnotationsTest < ApplicationSystemTestCase end sign_out @staff end + + test 'searching saved annotations shows activity names in correct language' do + sign_in @staff + exercise = create :exercise, name_en: 'Fools', name_nl: 'Bars' + create :saved_annotation, user: @staff, exercise: exercise, course: @course, title: 'Tetris', annotation_text: 'text' + create :saved_annotation, user: @staff, exercise: exercise, course: @course, title: 'TEST', annotation_text: 'text' + visit(saved_annotations_path) + + assert_text 'Tetris' + assert_text exercise.name_en + assert_no_text exercise.name_nl + + find('input.search-filter').fill_in with: 'TEST' + + # wait for the search to complete + assert_no_text 'Tetris' + + assert_text exercise.name_en + assert_no_text exercise.name_nl + + visit(saved_annotations_path('nl')) + + assert_text 'Tetris' + assert_text exercise.name_nl + assert_no_text exercise.name_en + + find('input.search-filter').fill_in with: 'TEST' + + # wait for the search to complete + assert_no_text 'Tetris' + + assert_text exercise.name_nl + assert_no_text exercise.name_en + end end From 9f592aa7a834ad4362ef05e3f8f14991326abbfb Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 15:27:02 +0100 Subject: [PATCH 14/20] Fix ctrl click for notifications --- app/assets/javascripts/notification.ts | 12 ++++++++++-- app/assets/javascripts/utilities.ts | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/notification.ts b/app/assets/javascripts/notification.ts index 7866e111d1..3fbb8bf5c9 100644 --- a/app/assets/javascripts/notification.ts +++ b/app/assets/javascripts/notification.ts @@ -1,5 +1,5 @@ import { FaviconManager } from "favicon"; -import { fetch } from "utilities"; +import { CTRLKeyState, fetch } from "utilities"; import { InactiveTimeout } from "auto_reload"; /** @@ -20,6 +20,7 @@ export class Notification { private readonly notifiableUrl: string; private readonly faviconManager: FaviconManager; private read: boolean; + private ctrlKeyState = new CTRLKeyState(); constructor(id: number, url: string, read: boolean, notifiableUrl: string, installClickHandler: boolean, manager: FaviconManager) { this.element = document.querySelector(`.notification[data-id="${id}"]`); @@ -42,6 +43,9 @@ export class Notification { // We only want to install the click handler for the full element on the small notification view. if (installClickHandler) { this.element.addEventListener("click", event => { + // The link will already be opened if the user clicked on the link itself. + if (event.target instanceof HTMLAnchorElement) return; + this.visit(); event.stopPropagation(); }); @@ -81,7 +85,11 @@ export class Notification { } visit(): void { - window.location.href = this.notifiableUrl; + if (this.ctrlKeyState.isPressed) { + window.open(this.notifiableUrl, "_blank"); + } else { + window.location.href = this.notifiableUrl; + } } static async checkNotifications(): Promise { diff --git a/app/assets/javascripts/utilities.ts b/app/assets/javascripts/utilities.ts index 491578acb2..739b675363 100644 --- a/app/assets/javascripts/utilities.ts +++ b/app/assets/javascripts/utilities.ts @@ -249,6 +249,22 @@ function executeScript(oldScriptEl: HTMLScriptElement): void { oldScriptEl.parentNode.replaceChild(newScriptEl, oldScriptEl); } +/** + * A class that keeps track of the state of the CTRL key. + */ +class CTRLKeyState { + public isPressed = false; + + constructor() { + window.addEventListener("keydown", event => { + this.isPressed = event.ctrlKey; + }); + window.addEventListener("keyup", event => { + this.isPressed = event.ctrlKey; + }); + } +} + export { createDelayer, delay, @@ -269,4 +285,5 @@ export { getParentByClassName, setHTMLExecuteScripts, replaceHTMLExecuteScripts, + CTRLKeyState }; From 2ce995bc778951a732150c7970a905eadfb4f78c Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 15:43:23 +0100 Subject: [PATCH 15/20] Revert "Fix ctrl click for notifications" This reverts commit 9f592aa7a834ad4362ef05e3f8f14991326abbfb. --- app/assets/javascripts/notification.ts | 12 ++---------- app/assets/javascripts/utilities.ts | 17 ----------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/app/assets/javascripts/notification.ts b/app/assets/javascripts/notification.ts index 3fbb8bf5c9..7866e111d1 100644 --- a/app/assets/javascripts/notification.ts +++ b/app/assets/javascripts/notification.ts @@ -1,5 +1,5 @@ import { FaviconManager } from "favicon"; -import { CTRLKeyState, fetch } from "utilities"; +import { fetch } from "utilities"; import { InactiveTimeout } from "auto_reload"; /** @@ -20,7 +20,6 @@ export class Notification { private readonly notifiableUrl: string; private readonly faviconManager: FaviconManager; private read: boolean; - private ctrlKeyState = new CTRLKeyState(); constructor(id: number, url: string, read: boolean, notifiableUrl: string, installClickHandler: boolean, manager: FaviconManager) { this.element = document.querySelector(`.notification[data-id="${id}"]`); @@ -43,9 +42,6 @@ export class Notification { // We only want to install the click handler for the full element on the small notification view. if (installClickHandler) { this.element.addEventListener("click", event => { - // The link will already be opened if the user clicked on the link itself. - if (event.target instanceof HTMLAnchorElement) return; - this.visit(); event.stopPropagation(); }); @@ -85,11 +81,7 @@ export class Notification { } visit(): void { - if (this.ctrlKeyState.isPressed) { - window.open(this.notifiableUrl, "_blank"); - } else { - window.location.href = this.notifiableUrl; - } + window.location.href = this.notifiableUrl; } static async checkNotifications(): Promise { diff --git a/app/assets/javascripts/utilities.ts b/app/assets/javascripts/utilities.ts index 739b675363..491578acb2 100644 --- a/app/assets/javascripts/utilities.ts +++ b/app/assets/javascripts/utilities.ts @@ -249,22 +249,6 @@ function executeScript(oldScriptEl: HTMLScriptElement): void { oldScriptEl.parentNode.replaceChild(newScriptEl, oldScriptEl); } -/** - * A class that keeps track of the state of the CTRL key. - */ -class CTRLKeyState { - public isPressed = false; - - constructor() { - window.addEventListener("keydown", event => { - this.isPressed = event.ctrlKey; - }); - window.addEventListener("keyup", event => { - this.isPressed = event.ctrlKey; - }); - } -} - export { createDelayer, delay, @@ -285,5 +269,4 @@ export { getParentByClassName, setHTMLExecuteScripts, replaceHTMLExecuteScripts, - CTRLKeyState }; From a678d649bc9a4fa15aef2c652a4dba9cabd75609 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Fri, 5 Jan 2024 15:44:20 +0100 Subject: [PATCH 16/20] Use default browse behavior if the user clicked on the link itself. --- app/assets/javascripts/notification.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/assets/javascripts/notification.ts b/app/assets/javascripts/notification.ts index 7866e111d1..916c188e9b 100644 --- a/app/assets/javascripts/notification.ts +++ b/app/assets/javascripts/notification.ts @@ -42,6 +42,9 @@ export class Notification { // We only want to install the click handler for the full element on the small notification view. if (installClickHandler) { this.element.addEventListener("click", event => { + // Use default browse behavior if the user clicked on the link itself. + if (event.target instanceof HTMLAnchorElement) return; + this.visit(); event.stopPropagation(); }); From 9ea0a1838d6f40e8ed8901282b95c2ef82d6fb44 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Sat, 6 Jan 2024 16:11:50 +0100 Subject: [PATCH 17/20] Update app/assets/javascripts/notification.ts Co-authored-by: Charlotte Van Petegem --- app/assets/javascripts/notification.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/notification.ts b/app/assets/javascripts/notification.ts index 916c188e9b..906bb55ff3 100644 --- a/app/assets/javascripts/notification.ts +++ b/app/assets/javascripts/notification.ts @@ -42,7 +42,7 @@ export class Notification { // We only want to install the click handler for the full element on the small notification view. if (installClickHandler) { this.element.addEventListener("click", event => { - // Use default browse behavior if the user clicked on the link itself. + // Use default browser behavior if the user clicked on the link itself. if (event.target instanceof HTMLAnchorElement) return; this.visit(); From bfe7a45696fb3eb0252914df976c285f7f47d7c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:17:46 +0000 Subject: [PATCH 18/20] Bump core-js from 3.34.0 to 3.35.0 Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.34.0 to 3.35.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.35.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index db1f71e034..308c721d16 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "clipboard": "^2.0.11", "codemirror-lang-prolog": "^0.1.0", "codemirror-lang-r": "^0.1.0-2", - "core-js": "^3.34.0", + "core-js": "^3.35.0", "d3": "^7.8.5", "dayjs": "^1.11.10", "dragula": "^3.7.3", diff --git a/yarn.lock b/yarn.lock index e892270c18..c9906040de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3336,10 +3336,10 @@ core-js-compat@^3.31.0, core-js-compat@^3.33.1: dependencies: browserslist "^4.22.2" -core-js@^3.34.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.34.0.tgz#5705e6ad5982678612e96987d05b27c6c7c274a5" - integrity sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag== +core-js@^3.35.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.0.tgz#58e651688484f83c34196ca13f099574ee53d6b4" + integrity sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg== cosmiconfig@^7.0.0: version "7.1.0" From 41e5f97da81f9a595572fdd9af4f02eb3836f622 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:19:29 +0000 Subject: [PATCH 19/20] Bump the codemirror group with 3 updates Bumps the codemirror group with 3 updates: [@codemirror/commands](https://github.com/codemirror/commands), [@codemirror/language](https://github.com/codemirror/language) and [@lezer/common](https://github.com/lezer-parser/common). Updates `@codemirror/commands` from 6.3.2 to 6.3.3 - [Changelog](https://github.com/codemirror/commands/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/commands/compare/6.3.2...6.3.3) Updates `@codemirror/language` from 6.9.3 to 6.10.0 - [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/language/compare/6.9.3...6.10.0) Updates `@lezer/common` from 1.1.2 to 1.2.0 - [Changelog](https://github.com/lezer-parser/common/blob/main/CHANGELOG.md) - [Commits](https://github.com/lezer-parser/common/compare/1.1.2...1.2.0) --- updated-dependencies: - dependency-name: "@codemirror/commands" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: codemirror - dependency-name: "@codemirror/language" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: codemirror - dependency-name: "@lezer/common" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: codemirror ... Signed-off-by: dependabot[bot] --- package.json | 6 +++--- yarn.lock | 46 +++++++++++++++++++++++----------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index db1f71e034..a1da6197e1 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,14 @@ "@babel/plugin-transform-runtime": "^7.23.7", "@babel/preset-env": "^7.23.7", "@codemirror/autocomplete": "^6.11.1", - "@codemirror/commands": "^6.3.2", - "@codemirror/language": "^6.9.3", + "@codemirror/commands": "^6.3.3", + "@codemirror/language": "^6.10.0", "@codemirror/language-data": "^6.3.1", "@codemirror/state": "^6.3.3", "@codemirror/view": "^6.22.3", "@dodona/papyros": "2.0.0", "@dodona/pyodide-trace-library": "^2.0.7", - "@lezer/common": "^1.1.2", + "@lezer/common": "^1.2.0", "@lezer/highlight": "^1.2.0", "@lezer/lr": "^1.3.14", "@popperjs/core": "^2.11.8", diff --git a/yarn.lock b/yarn.lock index e892270c18..53f263dc32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1003,13 +1003,13 @@ "@codemirror/view" "^6.17.0" "@lezer/common" "^1.0.0" -"@codemirror/commands@^6.3.1", "@codemirror/commands@^6.3.2": - version "6.3.2" - resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.3.2.tgz#9fa47ccdacbea52fcddc6845089dfbf5be03f126" - integrity sha512-tjoi4MCWDNxgIpoLZ7+tezdS9OEB6pkiDKhfKx9ReJ/XBcs2G2RXIu+/FxXBlWsPTsz6C9q/r4gjzrsxpcnqCQ== +"@codemirror/commands@^6.3.1", "@codemirror/commands@^6.3.3": + version "6.3.3" + resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.3.3.tgz#03face5bf5f3de0fc4e09b177b3c91eda2ceb7e9" + integrity sha512-dO4hcF0fGT9tu1Pj1D2PvGvxjeGkbC6RGcZw6Qs74TH+Ed1gw98jmUgd2axWvIZEqTeTuFrg1lEB1KV6cK9h1A== dependencies: "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.2.0" + "@codemirror/state" "^6.4.0" "@codemirror/view" "^6.0.0" "@lezer/common" "^1.1.0" @@ -1218,13 +1218,13 @@ "@codemirror/language" "^6.0.0" "@codemirror/legacy-modes" "^6.1.0" -"@codemirror/language@^6.0.0", "@codemirror/language@^6.3.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0", "@codemirror/language@^6.8.0", "@codemirror/language@^6.9.3": - version "6.9.3" - resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.9.3.tgz#1c127dc43e025d4c9b1ba1b79f4b1ba081d5aeaa" - integrity sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ== +"@codemirror/language@^6.0.0", "@codemirror/language@^6.10.0", "@codemirror/language@^6.3.0", "@codemirror/language@^6.4.0", "@codemirror/language@^6.6.0", "@codemirror/language@^6.8.0", "@codemirror/language@^6.9.3": + version "6.10.0" + resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.10.0.tgz#2d0e818716825ee2ed0dacd04595eaa61bae8f23" + integrity sha512-2vaNn9aPGCRFKWcHPFksctzJ8yS5p7YoaT+jHpc0UGKzNuAIx4qy6R5wiqbP+heEEdyaABA582mNqSHzSoYdmg== dependencies: "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" + "@codemirror/view" "^6.23.0" "@lezer/common" "^1.1.0" "@lezer/highlight" "^1.0.0" "@lezer/lr" "^1.0.0" @@ -1264,10 +1264,10 @@ "@codemirror/view" "^6.0.0" crelt "^1.0.5" -"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4", "@codemirror/state@^6.2.0", "@codemirror/state@^6.3.2", "@codemirror/state@^6.3.3": - version "6.3.3" - resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.3.3.tgz#6a647c2fa62b68604187152de497e91aabf43f82" - integrity sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A== +"@codemirror/state@^6.0.0", "@codemirror/state@^6.3.2", "@codemirror/state@^6.3.3", "@codemirror/state@^6.4.0": + version "6.4.0" + resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.4.0.tgz#8bc3e096c84360b34525a84696a84f86b305363a" + integrity sha512-hm8XshYj5Fo30Bb922QX9hXB/bxOAVH+qaqHBzw5TKa72vOeslyGwd4X8M0c1dJ9JqxlaMceOQ8RsL9tC7gU0A== "@codemirror/theme-one-dark@^6.1.2": version "6.1.2" @@ -1279,12 +1279,12 @@ "@codemirror/view" "^6.0.0" "@lezer/highlight" "^1.0.0" -"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.22.1", "@codemirror/view@^6.22.3": - version "6.22.3" - resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.22.3.tgz#22514a0256d0fbd3e9079d7c49cb97f35593156c" - integrity sha512-rqnq+Zospwoi3x1vZ8BGV1MlRsaGljX+6qiGYmIpJ++M+LCC+wjfDaPklhwpWSgv7pr/qx29KiAKQBH5+DOn4w== +"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.22.1", "@codemirror/view@^6.22.3", "@codemirror/view@^6.23.0": + version "6.23.0" + resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.23.0.tgz#8054a2043273abad7f1587d15accb0623e1960ed" + integrity sha512-/51px9N4uW8NpuWkyUX+iam5+PM6io2fm+QmRnzwqBy5v/pwGg9T0kILFtYeum8hjuvENtgsGNKluOfqIICmeQ== dependencies: - "@codemirror/state" "^6.1.4" + "@codemirror/state" "^6.4.0" style-mod "^4.1.0" w3c-keyname "^2.2.4" @@ -1628,10 +1628,10 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.1.2.tgz#2fc5cd6788094ffc816b539ab2bc55bafacd2abc" - integrity sha512-V+GqBsga5+cQJMfM0GdnHmg4DgWvLzgMWjbldBg0+jC3k9Gu6nJNZDLJxXEBT1Xj8KhRN4jmbC5CY7SIL++sVw== +"@lezer/common@^1.0.0", "@lezer/common@^1.0.2", "@lezer/common@^1.1.0", "@lezer/common@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.2.0.tgz#f10493d12c4a196a02ff5fcf5695a516a4039aae" + integrity sha512-Wmvlm4q6tRpwiy20TnB3yyLTZim38Tkc50dPY8biQRwqE+ati/wD84rm3N15hikvdT4uSg9phs9ubjvcLmkpKg== "@lezer/cpp@^1.0.0": version "1.1.1" From 125a9e8a5b82d8eea4c3d876179c90f32c2ad70c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 08:32:11 +0000 Subject: [PATCH 20/20] Bump factory_bot_rails from 6.4.2 to 6.4.3 Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.4.2 to 6.4.3. - [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases) - [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/main/NEWS.md) - [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.4.2...v6.4.3) --- updated-dependencies: - dependency-name: factory_bot_rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index ffd9a032ea..d82c42e69c 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ group :development, :test do # Use mocha for stubbing and mocking gem 'mocha', '~> 2.1.0' # Factory bot for factories - gem 'factory_bot_rails', '~> 6.4.2' + gem 'factory_bot_rails', '~> 6.4.3' # test template rendering gem 'rails-controller-testing', '~> 1.0.5' diff --git a/Gemfile.lock b/Gemfile.lock index b5afb0a2db..7a29662863 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,9 +183,9 @@ GEM activesupport (>= 5.2, < 8) excon (0.100.0) execjs (2.9.1) - factory_bot (6.4.2) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.4.2) + factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.2) @@ -224,8 +224,8 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - io-console (0.6.0) - irb (1.9.1) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) jbuilder (2.11.5) @@ -358,7 +358,7 @@ GEM premailer (~> 1.7, >= 1.7.9) pretender (0.5.0) actionpack (>= 6.1) - psych (5.1.1.1) + psych (5.1.2) stringio public_suffix (5.0.3) puma (6.4.0) @@ -378,7 +378,7 @@ GEM rack (>= 2.1.0) rack-protection (3.0.4) rack - rack-session (1.0.1) + rack-session (1.0.2) rack (< 3) rack-test (2.1.0) rack (>= 1.3) @@ -427,10 +427,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb-readline (0.5.5) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) regexp_parser (2.8.3) - reline (0.4.0) + reline (0.4.2) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) @@ -505,7 +505,7 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stackprof (0.2.25) - stringio (3.0.9) + stringio (3.1.0) swd (2.0.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -581,7 +581,7 @@ DEPENDENCIES docker-api (~> 2.2.0) ed25519 exception_notification (~> 4.5.0) - factory_bot_rails (~> 6.4.2) + factory_bot_rails (~> 6.4.3) faker (~> 3.2.2) flamegraph (~> 0.9.5) has_scope (~> 0.8.2)