From b161db3ac1b4ba2f7c3caa17fec0e0bbe8ff3947 Mon Sep 17 00:00:00 2001 From: Yves Lavoie Date: Sat, 15 Jun 2024 17:55:48 -0400 Subject: [PATCH 1/2] Upgrade Vue to 3.4.28 --- UI/package.json | 2 +- UI/yarn.lock | 132 +++++++++++++++++++++++------------------------- 2 files changed, 65 insertions(+), 69 deletions(-) diff --git a/UI/package.json b/UI/package.json index 895496004f..8845e8a314 100644 --- a/UI/package.json +++ b/UI/package.json @@ -123,7 +123,7 @@ "undici": "5.28.4", "unix-timestamp": "1.0.4", "unused-webpack-plugin": "2.4.0", - "vue": "3.4.27", + "vue": "3.4.28", "vue-i18n-extract-translations": "0.1.3", "vue-loader": "17.4.2", "vue-router": "4.3.2", diff --git a/UI/yarn.lock b/UI/yarn.lock index ea929e2276..c7b8a6d5bd 100644 --- a/UI/yarn.lock +++ b/UI/yarn.lock @@ -512,11 +512,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.4.tgz#409fbe690c333bb70187e2de4021e1e47a026661" integrity sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ== -"@babel/parser@^7.24.4": - version "7.24.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88" - integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg== - "@babel/parser@^7.24.7": version "7.24.7" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85" @@ -2531,47 +2526,47 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== -"@vue/compiler-core@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz#e69060f4b61429fe57976aa5872cfa21389e4d91" - integrity sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg== +"@vue/compiler-core@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.28.tgz#6f087efbd76434b4f7f2431c623fe81023e9b463" + integrity sha512-yJ6CFFu6qDYB4RrF9LJ1DU7Cq7rgODBrwHoiadvHSBGhMHcROl5AOp9WEPDba5J9OEptUdpSPVZb7q++MO/7vA== dependencies: - "@babel/parser" "^7.24.4" - "@vue/shared" "3.4.27" + "@babel/parser" "^7.24.7" + "@vue/shared" "3.4.28" entities "^4.5.0" estree-walker "^2.0.2" source-map-js "^1.2.0" -"@vue/compiler-dom@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz#d51d35f40d00ce235d7afc6ad8b09dfd92b1cc1c" - integrity sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw== +"@vue/compiler-dom@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.28.tgz#a4325194fbf46bb8f1fd0a59d05d18e2750f64c7" + integrity sha512-CgBwv48EMETKijnzKB8swa00aEkmXFDbEHOZqeUPKPDZE9DM51RlKA+9/9zPStioCP+v3SC+UjzQfARsFefhqw== dependencies: - "@vue/compiler-core" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/compiler-core" "3.4.28" + "@vue/shared" "3.4.28" -"@vue/compiler-sfc@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz#399cac1b75c6737bf5440dc9cf3c385bb2959701" - integrity sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA== +"@vue/compiler-sfc@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.28.tgz#ea6cc993776e511f76856c42254ba3b11aa9a15a" + integrity sha512-k7FSOhEZdXorRSfIC1FCgwffewLuf1hJBP+WxZ7e9C2/bU+djS/C9tyZRfqVksMMvd2IiA5N3oNEbbUjlneWlA== dependencies: - "@babel/parser" "^7.24.4" - "@vue/compiler-core" "3.4.27" - "@vue/compiler-dom" "3.4.27" - "@vue/compiler-ssr" "3.4.27" - "@vue/shared" "3.4.27" + "@babel/parser" "^7.24.7" + "@vue/compiler-core" "3.4.28" + "@vue/compiler-dom" "3.4.28" + "@vue/compiler-ssr" "3.4.28" + "@vue/shared" "3.4.28" estree-walker "^2.0.2" magic-string "^0.30.10" postcss "^8.4.38" source-map-js "^1.2.0" -"@vue/compiler-ssr@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz#2a8ecfef1cf448b09be633901a9c020360472e3d" - integrity sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw== +"@vue/compiler-ssr@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.28.tgz#6e4c67f4899ffc37c51f18454eadc6ddf2cf1c97" + integrity sha512-AlnfXUKDg1xTPxO5ztVdN/L29ujJ97qG5bmqTa+y0D0kfbYxfZNJe/ej/wPi/WqMFv/MFy1RHzRrwQM+MykSHw== dependencies: - "@vue/compiler-dom" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/compiler-dom" "3.4.28" + "@vue/shared" "3.4.28" "@vue/devtools-api@^6.5.0": version "6.5.0" @@ -2583,42 +2578,43 @@ resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83" integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA== -"@vue/reactivity@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.27.tgz#6ece72331bf719953f5eaa95ec60b2b8d49e3791" - integrity sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA== +"@vue/reactivity@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.28.tgz#f94bfc0c75c3539330d3fda9d61c6fe55b4f782c" + integrity sha512-B5uvZK0ArgBMkjK8RA9l5XP+PuQ/x99oqrcHRc78wa0pWyDje5X/isGihuiuSr0nFZTA5guoy78sJ6J8XxZv1A== dependencies: - "@vue/shared" "3.4.27" + "@vue/shared" "3.4.28" -"@vue/runtime-core@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.27.tgz#1b6e1d71e4604ba7442dd25ed22e4a1fc6adbbda" - integrity sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA== +"@vue/runtime-core@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.28.tgz#c9084d1899fda60440ca78fa0ddf1fe74a8be038" + integrity sha512-Corp5aAn5cm9h2cse6w5vRlnlfpy8hBRrsgCzHSoUohStlbqBXvI/uopPVkCivPCgY4fJZhXOufYYJ3DXzpN/w== dependencies: - "@vue/reactivity" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/reactivity" "3.4.28" + "@vue/shared" "3.4.28" -"@vue/runtime-dom@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz#fe8d1ce9bbe8921d5dd0ad5c10df0e04ef7a5ee7" - integrity sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q== +"@vue/runtime-dom@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.28.tgz#e0fbcdeffc41d88479224f047d3d588355498ff7" + integrity sha512-y9lDMMFf2Y5GpYdE8+IuavVl95D1GY1Zp8jU1vZhQ3Z4ga3f0Ym+XxRhcFtqaQAm9u82GwB7zDpBxafWDRq4pw== dependencies: - "@vue/runtime-core" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/reactivity" "3.4.28" + "@vue/runtime-core" "3.4.28" + "@vue/shared" "3.4.28" csstype "^3.1.3" -"@vue/server-renderer@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.27.tgz#3306176f37e648ba665f97dda3ce705687be63d2" - integrity sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA== +"@vue/server-renderer@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.28.tgz#2b7c02dd8494d81f7db950282f8370149d9ceac1" + integrity sha512-H/jZhGQTP29xQMsGU+3BoAH/O/4vbM4uQiPsXU4AZzF5NgZQ/xfEgah0dmOlvFp3/q0r6s8pIaEeOEPnAMb8hw== dependencies: - "@vue/compiler-ssr" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/compiler-ssr" "3.4.28" + "@vue/shared" "3.4.28" -"@vue/shared@3.4.27": - version "3.4.27" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.27.tgz#f05e3cd107d157354bb4ae7a7b5fc9cf73c63b50" - integrity sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA== +"@vue/shared@3.4.28": + version "3.4.28" + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.28.tgz#295bc370fcd3d3c8dc070de3d6d2bb787f06b785" + integrity sha512-2b+Vuv5ichZQZPmRJfniHQkBSNigmRsRkr17bkYqBFy3J88T4lB7dRbAX/rx8qr9v0cr8Adg6yP872xhxGmh0w== "@vue/test-utils@2.4.6": version "2.4.6" @@ -11018,16 +11014,16 @@ vue-router@4.3.2: dependencies: "@vue/devtools-api" "^6.5.1" -vue@3.4.27: - version "3.4.27" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.27.tgz#40b7d929d3e53f427f7f5945386234d2854cc2a1" - integrity sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA== +vue@3.4.28: + version "3.4.28" + resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.28.tgz#f2bcfcf4ceaf266b8264749065bb0d70a7ef9b81" + integrity sha512-LLaTiridyV+6Xnl5PWdPvIX7+PTRoQeo7rVSJfvXJusI5grvB8gmR/fJgCxnWIQq4ztEVIc1faFJnqJWttWtiw== dependencies: - "@vue/compiler-dom" "3.4.27" - "@vue/compiler-sfc" "3.4.27" - "@vue/runtime-dom" "3.4.27" - "@vue/server-renderer" "3.4.27" - "@vue/shared" "3.4.27" + "@vue/compiler-dom" "3.4.28" + "@vue/compiler-sfc" "3.4.28" + "@vue/runtime-dom" "3.4.28" + "@vue/server-renderer" "3.4.28" + "@vue/shared" "3.4.28" w3c-xmlserializer@^4.0.0: version "4.0.0" From 6a0d592260a3337ac757b427421cdd6af817f367 Mon Sep 17 00:00:00 2001 From: Yves Lavoie Date: Sat, 15 Jun 2024 17:57:02 -0400 Subject: [PATCH 2/2] Fix Jest tests --- .../specs/views/__snapshots__/BusinessTypes.spec.js.snap | 8 ++++++++ UI/tests/specs/views/__snapshots__/Countries.spec.js.snap | 8 ++++++++ UI/tests/specs/views/__snapshots__/GIFI.spec.js.snap | 8 ++++++++ UI/tests/specs/views/__snapshots__/Languages.spec.js.snap | 8 ++++++++ .../specs/views/__snapshots__/Pricegroups.spec.js.snap | 4 ++++ UI/tests/specs/views/__snapshots__/SIC.spec.js.snap | 8 ++++++++ .../specs/views/__snapshots__/Warehouses.spec.js.snap | 6 ++++++ 7 files changed, 50 insertions(+) diff --git a/UI/tests/specs/views/__snapshots__/BusinessTypes.spec.js.snap b/UI/tests/specs/views/__snapshots__/BusinessTypes.spec.js.snap index d68b1bfd9c..a791217303 100644 --- a/UI/tests/specs/views/__snapshots__/BusinessTypes.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/BusinessTypes.spec.js.snap @@ -45,6 +45,7 @@ exports[`BusinessTypes - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Big customer" /> @@ -75,6 +77,7 @@ exports[`BusinessTypes - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Bigger customer" /> @@ -164,6 +168,7 @@ exports[`BusinessTypes - register as a component should show dialog with editabl name="description" readonly="" type="text" + value="Big customer" /> @@ -219,6 +225,7 @@ exports[`BusinessTypes - register as a component should show dialog with editabl name="description" readonly="" type="text" + value="Bigger customer" /> diff --git a/UI/tests/specs/views/__snapshots__/Countries.spec.js.snap b/UI/tests/specs/views/__snapshots__/Countries.spec.js.snap index 87758ba86f..afd3fb944c 100644 --- a/UI/tests/specs/views/__snapshots__/Countries.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/Countries.spec.js.snap @@ -45,6 +45,7 @@ exports[`Countries - register as a component should show dialog 1`] = ` name="code" readonly="" type="text" + value="ca" /> @@ -75,6 +77,7 @@ exports[`Countries - register as a component should show dialog 1`] = ` name="code" readonly="" type="text" + value="us" /> @@ -164,6 +168,7 @@ exports[`Countries - register as a component should show dialog with editable da name="code" readonly="" type="text" + value="ca" /> @@ -219,6 +225,7 @@ exports[`Countries - register as a component should show dialog with editable da name="code" readonly="" type="text" + value="us" /> diff --git a/UI/tests/specs/views/__snapshots__/GIFI.spec.js.snap b/UI/tests/specs/views/__snapshots__/GIFI.spec.js.snap index 59ba9b6cae..61ca63165e 100644 --- a/UI/tests/specs/views/__snapshots__/GIFI.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/GIFI.spec.js.snap @@ -46,6 +46,7 @@ exports[`GIFI - register as a component should show dialog 1`] = ` name="accno" readonly="" type="text" + value="0000" /> @@ -76,6 +78,7 @@ exports[`GIFI - register as a component should show dialog 1`] = ` name="accno" readonly="" type="text" + value="0001" /> @@ -247,6 +251,7 @@ exports[`GIFI - register as a component should show dialog with editable data 1` name="accno" readonly="" type="text" + value="0000" /> @@ -302,6 +308,7 @@ exports[`GIFI - register as a component should show dialog with editable data 1` name="accno" readonly="" type="text" + value="0001" /> diff --git a/UI/tests/specs/views/__snapshots__/Languages.spec.js.snap b/UI/tests/specs/views/__snapshots__/Languages.spec.js.snap index 88c2e22e92..6d618ff202 100644 --- a/UI/tests/specs/views/__snapshots__/Languages.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/Languages.spec.js.snap @@ -45,6 +45,7 @@ exports[`Languages should show dialog 1`] = ` name="code" readonly="" type="text" + value="en" /> @@ -75,6 +77,7 @@ exports[`Languages should show dialog 1`] = ` name="code" readonly="" type="text" + value="fr" /> @@ -164,6 +168,7 @@ exports[`Languages should show dialog with editable data 1`] = ` name="code" readonly="" type="text" + value="en" /> @@ -219,6 +225,7 @@ exports[`Languages should show dialog with editable data 1`] = ` name="code" readonly="" type="text" + value="fr" /> diff --git a/UI/tests/specs/views/__snapshots__/Pricegroups.spec.js.snap b/UI/tests/specs/views/__snapshots__/Pricegroups.spec.js.snap index 46002cb93d..cc39e51454 100644 --- a/UI/tests/specs/views/__snapshots__/Pricegroups.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/Pricegroups.spec.js.snap @@ -42,6 +42,7 @@ exports[`Pricegroups - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Price group 1" /> @@ -62,6 +63,7 @@ exports[`Pricegroups - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Price group 2" /> @@ -138,6 +140,7 @@ exports[`Pricegroups - register as a component should show dialog with editable name="description" readonly="" type="text" + value="Price group 1" /> @@ -183,6 +186,7 @@ exports[`Pricegroups - register as a component should show dialog with editable name="description" readonly="" type="text" + value="Price group 2" /> diff --git a/UI/tests/specs/views/__snapshots__/SIC.spec.js.snap b/UI/tests/specs/views/__snapshots__/SIC.spec.js.snap index 1bcd6f3d7a..2d13232244 100644 --- a/UI/tests/specs/views/__snapshots__/SIC.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/SIC.spec.js.snap @@ -45,6 +45,7 @@ exports[`SIC - register as a component should show dialog 1`] = ` name="code" readonly="" type="text" + value="541330" /> @@ -75,6 +77,7 @@ exports[`SIC - register as a component should show dialog 1`] = ` name="code" readonly="" type="text" + value="611430" /> @@ -249,6 +253,7 @@ exports[`SIC - register as a component should show dialog with editable data 1`] name="code" readonly="" type="text" + value="541330" /> @@ -304,6 +310,7 @@ exports[`SIC - register as a component should show dialog with editable data 1`] name="code" readonly="" type="text" + value="611430" /> diff --git a/UI/tests/specs/views/__snapshots__/Warehouses.spec.js.snap b/UI/tests/specs/views/__snapshots__/Warehouses.spec.js.snap index 80197091a7..7e77011325 100644 --- a/UI/tests/specs/views/__snapshots__/Warehouses.spec.js.snap +++ b/UI/tests/specs/views/__snapshots__/Warehouses.spec.js.snap @@ -42,6 +42,7 @@ exports[`Warehouses - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Modern warehouse" /> @@ -62,6 +63,7 @@ exports[`Warehouses - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Huge warehouse" /> @@ -82,6 +84,7 @@ exports[`Warehouses - register as a component should show dialog 1`] = ` name="description" readonly="" type="text" + value="Moon warehouse" /> @@ -158,6 +161,7 @@ exports[`Warehouses - register as a component should show dialog with editable d name="description" readonly="" type="text" + value="Modern warehouse" /> @@ -203,6 +207,7 @@ exports[`Warehouses - register as a component should show dialog with editable d name="description" readonly="" type="text" + value="Huge warehouse" /> @@ -248,6 +253,7 @@ exports[`Warehouses - register as a component should show dialog with editable d name="description" readonly="" type="text" + value="Moon warehouse" />