From 981c306977ffa7b860f1cfc8840fdd27594453a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Oct 2022 03:00:21 +0000 Subject: [PATCH 1/4] Bump tom-select from 2.1.0 to 2.2.1 Bumps [tom-select](https://github.com/orchidjs/tom-select) from 2.1.0 to 2.2.1. - [Release notes](https://github.com/orchidjs/tom-select/releases) - [Commits](https://github.com/orchidjs/tom-select/compare/v2.1.0...v2.2.1) --- updated-dependencies: - dependency-name: tom-select dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 422fd00959..04a4ec28c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,10 +2066,17 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@orchidjs/sifter@^0.9.2": - version "0.9.2" - resolved "https://registry.yarnpkg.com/@orchidjs/sifter/-/sifter-0.9.2.tgz#86c84589fe42c46bb1f5ec1ab8f747a4c928a83b" - integrity sha512-8eR1aNWPhDt+cqOevGUajriiZbMzs6nGGdErUjSr99vMAxwMBRztnJu72OT8M7emyHTVjBB8BPjj4rJIoXQgKA== +"@orchidjs/sifter@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@orchidjs/sifter/-/sifter-1.0.1.tgz#9a401546d80e3592f78f0640290d51b82f89ca64" + integrity sha512-gciY+iuk2hBAyzsPBMCvGJa+JVrssWOit6Pveke4KqkY/6JTinvztAESmPDM0UJBPNmc1m1tC15VVKrZ3v8nrw== + dependencies: + "@orchidjs/unicode-variants" "^1.0.2" + +"@orchidjs/unicode-variants@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@orchidjs/unicode-variants/-/unicode-variants-1.0.2.tgz#3d4355fe9796ed00ca9709e6bd85caf4f6da8c53" + integrity sha512-Q0DDoAwywdCE3dOBl8PlMWci8OwEwZG22WxLB48xfLPpM1hC+gQRnUAKMEUBZqPN/Rk/FrdAcem4VQe8qfuPHQ== "@rails/actioncable@>= 6.0": version "7.0.3" @@ -12129,11 +12136,12 @@ toidentifier@1.0.0: integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== tom-select@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.1.0.tgz#93316cf042a69d9462027b8d6380f18f2a002e9d" - integrity sha512-NtE8kACBlMv4QaDakYfnXtEAgM/AVmM7Hw5FNQmij0uwgRgyXC/2kpNJPD1AdT5q/l6mUNkTnInQpTmrwX/tWQ== + version "2.2.1" + resolved "https://registry.yarnpkg.com/tom-select/-/tom-select-2.2.1.tgz#7abab1fdd074fefa96653e60eb89b6292e4cf9f2" + integrity sha512-wdYe/baQrztDJEjUtB0p3eZFFyr3jljoWPh31KEdqUEsdHGQ3UyqUYyGzT//F7WlvZc7Qmg+hLGT5qKFWAqgIA== dependencies: - "@orchidjs/sifter" "^0.9.2" + "@orchidjs/sifter" "^1.0.1" + "@orchidjs/unicode-variants" "^1.0.2" tough-cookie@^4.0.0: version "4.0.0" From db70c47a317a91c0dac156e923cd529598af3f2b Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 10 Oct 2022 16:09:43 +0200 Subject: [PATCH 2/4] Specify IE 11 as a target Comes from error using tom-select: ``` ERROR in ./node_modules/tom-select/dist/esm/tom-select.js Module build failed (from ./node_modules/babel-loader/lib/index.js): Error: /Users/jibees/dev/openfoodnetwork/node_modules/tom-select/dist/esm/tom-select.js: unknown Statement of type "ForOfStatement" ``` --- .browserslistrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.browserslistrc b/.browserslistrc index e94f8140cc..4ad54fdc91 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1 +1,2 @@ defaults +IE 11 From 4140e3d153dd43ab256f8f12e51bd3f0ccdfbc9f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 10 Oct 2022 16:10:33 +0200 Subject: [PATCH 3/4] Import tom-select file directly can't use "tom-select" anymore, due to a mis-configuration with babel I guess --- app/webpacker/controllers/tom_select_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/webpacker/controllers/tom_select_controller.js b/app/webpacker/controllers/tom_select_controller.js index 006db371f1..d520df3a3c 100644 --- a/app/webpacker/controllers/tom_select_controller.js +++ b/app/webpacker/controllers/tom_select_controller.js @@ -1,5 +1,5 @@ import { Controller } from "stimulus"; -import TomSelect from "tom-select"; +import TomSelect from "tom-select/dist/esm/tom-select"; export default class extends Controller { static values = { options: Object }; From 1f329e85bc1913caedc873fb30e559b0cfe15aba Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 10 Oct 2022 17:15:46 +0200 Subject: [PATCH 4/4] Also include plugins --- app/webpacker/controllers/tom_select_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/webpacker/controllers/tom_select_controller.js b/app/webpacker/controllers/tom_select_controller.js index d520df3a3c..1639832fd2 100644 --- a/app/webpacker/controllers/tom_select_controller.js +++ b/app/webpacker/controllers/tom_select_controller.js @@ -1,5 +1,5 @@ import { Controller } from "stimulus"; -import TomSelect from "tom-select/dist/esm/tom-select"; +import TomSelect from "tom-select/dist/esm/tom-select.complete"; export default class extends Controller { static values = { options: Object };