From 6cb32882d3c94812a2d66d45c5da6364bb5d9918 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 10:03:54 +0000 Subject: [PATCH 01/17] chore(deps-dev): bump bootstrap from 4.6.1 to 5.0.0 Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.6.1 to 5.0.0. - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v4.6.1...v5.0.0) --- updated-dependencies: - dependency-name: bootstrap dependency-type: direct:development ... 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 5d9aa1ba5..5cdcd883c 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "babel-loader": "^8.2.2", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-require-ignore": "^0.1.1", - "bootstrap": "^4.6.1", + "bootstrap": "^5.0.0", "chai": "^4.3.6", "chai-arrays": "^2.2.0", "chai-as-promised": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 848916b37..9c93b45bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2835,10 +2835,10 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== -bootstrap@^4.6.1: - version "4.6.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2" - integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og== +bootstrap@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.0.tgz#97635ac0e0d6cb466700ebf0fd266bfabf352ed2" + integrity sha512-tmhPET9B9qCl8dCofvHeiIhi49iBt0EehmIsziZib65k1erBW1rHhj2s/2JsuQh5Pq+xz2E9bEbzp9B7xHG+VA== boxen@^5.0.0: version "5.1.2" From c82097c2b61447a142a0a8ae422f35813d9a2539 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Tue, 15 Oct 2024 18:17:18 +0200 Subject: [PATCH 02/17] Upgrade to lobes5 theme for Bootstrap a BS5 theme deployed on our own repo --- package.json | 2 +- src/client/stylesheets/style.scss | 4 +- yarn.lock | 189 ++++++++++++++++++++++++------ 3 files changed, 156 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 5cdcd883c..79b9e1d64 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "influx": "^5.9.3", "isomorphic-dompurify": "^0.13.0", "jsesc": "^3.0.2", - "lobes4": "4.0.1", + "lobes5": "git+https://git@github.com/metabrainz/lobes.git#bootstrap5", "lodash": "^4.17.21", "log": "^6.0.0", "log-node": "^8.0.3", diff --git a/src/client/stylesheets/style.scss b/src/client/stylesheets/style.scss index 55c980ca6..90736a0fd 100644 --- a/src/client/stylesheets/style.scss +++ b/src/client/stylesheets/style.scss @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -@import "lobes4/scss/variables.scss"; +@import "~lobes5/scss/variables.scss"; $navbar-light-color: $gray-400; $brand-secondary: $bookbrainz; @@ -26,7 +26,7 @@ $disabled-bg: lighten(desaturate($bookbrainz,10%),42%); $disabled-color: lighten($disabled-bg,15%); -@import "lobes4/scss/bootstrap.scss"; +@import "~lobes5/scss/bootstrap.scss"; @import "react-datepicker/dist/react-datepicker.css"; @import "./external-services.scss"; diff --git a/yarn.lock b/yarn.lock index 9c93b45bd..a09b86ef5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1717,6 +1717,89 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@parcel/watcher-android-arm64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz#c2c19a3c442313ff007d2d7a9c2c1dd3e1c9ca84" + integrity sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg== + +"@parcel/watcher-darwin-arm64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz#c817c7a3b4f3a79c1535bfe54a1c2818d9ffdc34" + integrity sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA== + +"@parcel/watcher-darwin-x64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz#1a3f69d9323eae4f1c61a5f480a59c478d2cb020" + integrity sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg== + +"@parcel/watcher-freebsd-x64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz#0d67fef1609f90ba6a8a662bc76a55fc93706fc8" + integrity sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w== + +"@parcel/watcher-linux-arm-glibc@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz#ce5b340da5829b8e546bd00f752ae5292e1c702d" + integrity sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA== + +"@parcel/watcher-linux-arm64-glibc@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz#6d7c00dde6d40608f9554e73998db11b2b1ff7c7" + integrity sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA== + +"@parcel/watcher-linux-arm64-musl@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz#bd39bc71015f08a4a31a47cd89c236b9d6a7f635" + integrity sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA== + +"@parcel/watcher-linux-x64-glibc@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz#0ce29966b082fb6cdd3de44f2f74057eef2c9e39" + integrity sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg== + +"@parcel/watcher-linux-x64-musl@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz#d2ebbf60e407170bb647cd6e447f4f2bab19ad16" + integrity sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ== + +"@parcel/watcher-win32-arm64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz#eb4deef37e80f0b5e2f215dd6d7a6d40a85f8adc" + integrity sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg== + +"@parcel/watcher-win32-ia32@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz#94fbd4b497be39fd5c8c71ba05436927842c9df7" + integrity sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw== + +"@parcel/watcher-win32-x64@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz#4bf920912f67cae5f2d264f58df81abfea68dadf" + integrity sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A== + +"@parcel/watcher@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@parcel/watcher/-/watcher-2.4.1.tgz#a50275151a1bb110879c6123589dba90c19f1bf8" + integrity sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA== + dependencies: + detect-libc "^1.0.3" + is-glob "^4.0.3" + micromatch "^4.0.5" + node-addon-api "^7.0.0" + optionalDependencies: + "@parcel/watcher-android-arm64" "2.4.1" + "@parcel/watcher-darwin-arm64" "2.4.1" + "@parcel/watcher-darwin-x64" "2.4.1" + "@parcel/watcher-freebsd-x64" "2.4.1" + "@parcel/watcher-linux-arm-glibc" "2.4.1" + "@parcel/watcher-linux-arm64-glibc" "2.4.1" + "@parcel/watcher-linux-arm64-musl" "2.4.1" + "@parcel/watcher-linux-x64-glibc" "2.4.1" + "@parcel/watcher-linux-x64-musl" "2.4.1" + "@parcel/watcher-win32-arm64" "2.4.1" + "@parcel/watcher-win32-ia32" "2.4.1" + "@parcel/watcher-win32-x64" "2.4.1" + "@polka/url@^1.0.0-next.20": version "1.0.0-next.21" resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" @@ -2490,7 +2573,7 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -anymatch@^3.0.3, anymatch@~3.1.2: +anymatch@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -2498,6 +2581,14 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" +anymatch@~3.1.2: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2782,9 +2873,9 @@ big.js@^5.2.2: integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522" + integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw== bluebird@^3.7.2: version "3.7.2" @@ -3101,7 +3192,7 @@ chokidar@3.5.2: optionalDependencies: fsevents "~2.3.2" -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.5.2: +chokidar@^3.4.0, chokidar@^3.5.2: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -3116,6 +3207,13 @@ chokidar@3.5.2: optionalDependencies: fsevents "~2.3.2" +chokidar@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41" + integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA== + dependencies: + readdirp "^4.0.1" + chrome-trace-event@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" @@ -3706,6 +3804,11 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg== + dezalgo@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" @@ -4875,11 +4978,16 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== +fsevents@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" + integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== + function-bind@^1.1.1, function-bind@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" @@ -5395,9 +5503,9 @@ immutable@^3.8.2: integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= immutable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" - integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== + version "4.3.7" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" + integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" @@ -5582,7 +5690,7 @@ is-date-object@^1.0.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -6127,11 +6235,6 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klona@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc" - integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ== - knex@^2.4.2: version "2.5.1" resolved "https://registry.yarnpkg.com/knex/-/knex-2.5.1.tgz#a6c6b449866cf4229f070c17411f23871ba52ef9" @@ -6203,10 +6306,9 @@ loader-utils@^2.0.0: emojis-list "^3.0.0" json5 "^2.1.2" -lobes4@4.0.1: +"lobes5@git+https://git@github.com/metabrainz/lobes.git#bootstrap5": version "4.0.1" - resolved "https://registry.yarnpkg.com/lobes4/-/lobes4-4.0.1.tgz#923a70f4387228d60026ad652695b82c55a7c4a2" - integrity sha512-ZShyX08yv1MnP7xHZC+4irJvV3ivIHgLxX1Q3CO/6/DKwWyrZ0ClgPL6LUIh4NSD8Bobr2aGmRsPEHiABjzRMw== + resolved "git+https://git@github.com/metabrainz/lobes.git#ea88a92d018351081b19cfde17b3337ec06189a2" locate-path@^3.0.0: version "3.0.0" @@ -6475,7 +6577,7 @@ methods@^1.1.1, methods@^1.1.2, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^4.0.4: +micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -6698,6 +6800,11 @@ nise@^5.1.1: just-extend "^4.0.2" path-to-regexp "^1.7.0" +node-addon-api@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558" + integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ== + node-environment-flags@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" @@ -7223,16 +7330,16 @@ picocolors@^1.0.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -7774,6 +7881,11 @@ readable-stream@^2.0.0, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readdirp@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a" + integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA== + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" @@ -8127,20 +8239,20 @@ safe-regex-test@^1.0.3: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-loader@^13.2.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.0.tgz#80195050f58c9aac63b792fa52acb6f5e0f6bdc3" - integrity sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg== +sass-loader@13.3.3: + version "13.3.3" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" + integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== dependencies: - klona "^2.0.4" neo-async "^2.6.2" -sass@^1.59.2: - version "1.59.2" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.59.2.tgz#537f6d11614d4f20f97696f23ad358ee398b1937" - integrity sha512-jJyO6SmbzkJexF8MUorHx5tAilcgabioYxT/BHbY4+OvoqmbHxsYlrjZ8Adhqcgl6Zqwie0TgMXLCAmPFxXOuw== +sass@1.79.5: + version "1.79.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.79.5.tgz#646c627601cd5f84c64f7b1485b9292a313efae4" + integrity sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g== dependencies: - chokidar ">=3.0.0 <4.0.0" + "@parcel/watcher" "^2.4.1" + chokidar "^4.0.0" immutable "^4.0.0" source-map-js ">=0.6.2 <2.0.0" @@ -8392,7 +8504,12 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0": + version "1.2.1" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46" + integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA== + +source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== From 22c2d9c5ea65eb5b6cb6f153de490a23839f7ee4 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Tue, 15 Oct 2024 18:22:06 +0200 Subject: [PATCH 03/17] Update sass version and deprecated color syntax --- package.json | 4 ++-- src/client/stylesheets/style.scss | 6 ++++-- webpack.client.js | 6 +++++- yarn.lock | 8 ++++---- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 79b9e1d64..3c99265f6 100644 --- a/package.json +++ b/package.json @@ -141,8 +141,8 @@ "redux-mock-store": "^1.5.4", "resolve-url-loader": "^5.0.0", "rewire": "^7.0.0", - "sass": "^1.59.2", - "sass-loader": "^13.2.0", + "sass": "1.79.5", + "sass-loader": "^16", "sinon": "^14.0.0", "typescript": "^4.0.5", "webpack": "^5.94.0", diff --git a/src/client/stylesheets/style.scss b/src/client/stylesheets/style.scss index 90736a0fd..9036bdf7a 100644 --- a/src/client/stylesheets/style.scss +++ b/src/client/stylesheets/style.scss @@ -1,3 +1,5 @@ +@use "sass:color"; + /* * Copyright (C) 2014-2015, 2021-2022 Ben Ockmore * 2015 Leo Verto @@ -22,8 +24,8 @@ $navbar-light-color: $gray-400; $brand-secondary: $bookbrainz; -$disabled-bg: lighten(desaturate($bookbrainz,10%),42%); -$disabled-color: lighten($disabled-bg,15%); +$disabled-bg: color.adjust(desaturate($bookbrainz,10%),$lightness: 42%, $space: hsl); +$disabled-color: color.adjust($disabled-bg,$lightness: 15%, $space: hsl); @import "~lobes5/scss/bootstrap.scss"; diff --git a/webpack.client.js b/webpack.client.js index b8bb3cbb4..db4c08e6d 100644 --- a/webpack.client.js +++ b/webpack.client.js @@ -75,7 +75,11 @@ const clientConfig = { { loader: 'sass-loader', options: { - sourceMap: true + api: "modern", + sourceMap: true, + sassOptions:{ + quietDeps:true, + } } } ] diff --git a/yarn.lock b/yarn.lock index a09b86ef5..770e41244 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8239,10 +8239,10 @@ safe-regex-test@^1.0.3: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sass-loader@13.3.3: - version "13.3.3" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.3.3.tgz#60df5e858788cffb1a3215e5b92e9cba61e7e133" - integrity sha512-mt5YN2F1MOZr3d/wBRcZxeFgwgkH44wVc2zohO2YF6JiOMkiXe4BYRZpSu2sO1g71mo/j16txzUhsKZlqjVGzA== +sass-loader@^16: + version "16.0.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-16.0.2.tgz#e581bc13d7cb5090e27f155c6aa2855c08cafe86" + integrity sha512-Ll6iXZ1EYwYT19SqW4mSBb76vSSi8JgzElmzIerhEGgzB5hRjDQIWsPmuk1UrAXkR16KJHqVY0eH+5/uw9Tmfw== dependencies: neo-async "^2.6.2" From bc17bdca2a8c3faad53693298c56e4759b31124e Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Tue, 15 Oct 2024 19:30:30 +0200 Subject: [PATCH 04/17] Update float utility css classes the names of these have changed, and their function to a lesser degree that doesn't apply for our use. --- src/client/components/forms/deletion.js | 4 ++-- src/client/components/pages/entities/cb-review.js | 4 ++-- src/client/components/pages/entities/edition-table.js | 2 +- src/client/components/pages/entities/title.js | 2 +- src/client/components/pages/entities/work-table.js | 2 +- src/client/components/pages/parts/editor-profile.js | 2 +- src/client/components/pages/parts/revisions-table.js | 2 +- src/client/components/pages/revision.js | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/client/components/forms/deletion.js b/src/client/components/forms/deletion.js index fe34a8327..3d470d4f6 100644 --- a/src/client/components/forms/deletion.js +++ b/src/client/components/forms/deletion.js @@ -97,7 +97,7 @@ class EntityDeletionForm extends React.Component { const footerComponent = ( : null } diff --git a/src/client/entity-editor/button-bar/identifier-button.js b/src/client/entity-editor/button-bar/identifier-button.js index 15332ef06..9a1058701 100644 --- a/src/client/entity-editor/button-bar/identifier-button.js +++ b/src/client/entity-editor/button-bar/identifier-button.js @@ -53,7 +53,7 @@ function IdentifierButton({ } } else if (numIdentifiers > 0) { - textComponent = Edit identifiers {numIdentifiers}; + textComponent = Edit identifiers {numIdentifiers}; } else { textComponent = 'Add Identifiers'; From 863e0a2b578608ec4eb716f92dc1ce4cfcfbd949 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Thu, 17 Oct 2024 17:36:10 +0200 Subject: [PATCH 08/17] RBS: update use of Form elements specifically as="select" is deprecated. Following https://react-bootstrap.github.io/docs/migrating --- .../components/forms/type-editor/identifier-type.tsx | 9 ++++----- .../components/forms/type-editor/relationship-type.tsx | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/client/components/forms/type-editor/identifier-type.tsx b/src/client/components/forms/type-editor/identifier-type.tsx index b07dac5cd..a66ccbb4c 100644 --- a/src/client/components/forms/type-editor/identifier-type.tsx +++ b/src/client/components/forms/type-editor/identifier-type.tsx @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import {Alert, Button, Card, Col, Form, Modal, Row} from 'react-bootstrap'; +import {Alert, Button, Card, Col, Form, FormSelect, Modal, Row} from 'react-bootstrap'; import {IdentifierTypeDataT, IdentifierTypeEditorPropsT, defaultIdentifierTypeData, entityTypeOptions, renderSelectedParentIdentifierType} from './typeUtils'; import React, {ChangeEvent, FormEvent, useCallback, useEffect, useState} from 'react'; @@ -107,7 +107,7 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE })); }, [formData]); - const handleDeprecatedChange = useCallback((event: ChangeEvent) => { + const handleDeprecatedChange = useCallback((event: ChangeEvent) => { const {value} = event.target; setFormData((prevFormData) => ({ ...prevFormData, @@ -351,16 +351,15 @@ function IdentifierTypeEditor({identifierTypeData, parentTypes}: IdentifierTypeE Deprecated - - + diff --git a/src/client/components/forms/type-editor/relationship-type.tsx b/src/client/components/forms/type-editor/relationship-type.tsx index 98db122ac..c80af6db8 100644 --- a/src/client/components/forms/type-editor/relationship-type.tsx +++ b/src/client/components/forms/type-editor/relationship-type.tsx @@ -15,7 +15,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import {Alert, Button, Card, Col, Form, Modal, Row} from 'react-bootstrap'; +import {Alert, Button, Card, Col, Form, FormSelect, Modal, Row} from 'react-bootstrap'; import React, {ChangeEvent, FormEvent, useCallback, useEffect, useState} from 'react'; import {RelationshipTypeDataT, RelationshipTypeEditorPropsT, defaultRelationshipTypeData, entityTypeOptions, renderSelectedParentRelationshipType} from './typeUtils'; @@ -149,7 +149,7 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp })); }, [formData]); - const handleDeprecatedChange = useCallback((event: ChangeEvent) => { + const handleDeprecatedChange = useCallback((event: ChangeEvent) => { const {value} = event.target; setFormData((prevFormData) => ({ ...prevFormData, @@ -409,16 +409,15 @@ function RelationshipTypeEditor({relationshipTypeData, parentTypes, attributeTyp Deprecated - - + From 57a6659069bbd358dc7374b1b1373a7d9b6961ed Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Thu, 17 Oct 2024 17:45:31 +0200 Subject: [PATCH 09/17] RBS: Remove InputGroup.Append Dropped in v2: https://react-bootstrap.github.io/docs/migrating#inputgroup --- .../pages/parts/admin-panel-search-field.tsx | 4 +- .../components/pages/parts/search-field.tsx | 6 +-- src/client/containers/layout.js | 8 ++- .../author-credit-section.tsx | 2 +- .../common/entity-search-field-option.js | 2 +- .../entity-editor/common/new-date-field.js | 53 +++++++++---------- .../entity-editor/common/numeric-field.tsx | 4 +- .../entity-editor/common/sort-name-field.tsx | 6 +-- 8 files changed, 35 insertions(+), 50 deletions(-) diff --git a/src/client/components/pages/parts/admin-panel-search-field.tsx b/src/client/components/pages/parts/admin-panel-search-field.tsx index 013ed826f..e52f6cf77 100644 --- a/src/client/components/pages/parts/admin-panel-search-field.tsx +++ b/src/client/components/pages/parts/admin-panel-search-field.tsx @@ -114,9 +114,7 @@ class AdminPanelSearchField extends React.Component - - {SearchButton} - + {SearchButton} diff --git a/src/client/components/pages/parts/search-field.tsx b/src/client/components/pages/parts/search-field.tsx index 99a472164..7a3cd1736 100644 --- a/src/client/components/pages/parts/search-field.tsx +++ b/src/client/components/pages/parts/search-field.tsx @@ -174,10 +174,8 @@ class SearchField extends React.Component { value={this.state.query} onChange={this.handleChange} /> - - {entityTypeSelect} - {SearchButton} - + {entityTypeSelect} + {SearchButton} diff --git a/src/client/containers/layout.js b/src/client/containers/layout.js index 69a89065b..9b5830d70 100644 --- a/src/client/containers/layout.js +++ b/src/client/containers/layout.js @@ -318,11 +318,9 @@ class Layout extends React.Component { > - - - + ); diff --git a/src/client/entity-editor/author-credit-editor/author-credit-section.tsx b/src/client/entity-editor/author-credit-editor/author-credit-section.tsx index e3bc893f2..78fcd3fe7 100644 --- a/src/client/entity-editor/author-credit-editor/author-credit-section.tsx +++ b/src/client/entity-editor/author-credit-editor/author-credit-section.tsx @@ -183,7 +183,7 @@ function AuthorCreditSection({ type="author" /> - {editButton} + {editButton} {React.cloneElement(wrappedSelect, wrappedSelect.props)} {help && {help}} - {buttonAfter} + {buttonAfter} ); } diff --git a/src/client/entity-editor/common/new-date-field.js b/src/client/entity-editor/common/new-date-field.js index b2b585bea..bffd5c0ab 100644 --- a/src/client/entity-editor/common/new-date-field.js +++ b/src/client/entity-editor/common/new-date-field.js @@ -148,9 +148,7 @@ class DateField extends React.Component { onBlur={this.handleYearInputBlur} onChange={this.handleYearChange} /> - - - - + - - - - - + - - - - - - } - dateFormat="uuuuuu-MM-dd" - disabled={!isCommonEraDate} - dropdownMode="select" - popperModifiers={ - {preventOverflow: { - enabled: true - }}} - popperPlacement="top-end" - selected={isValid(selectedDate) ? selectedDate : null} - timeFormat="false" - onChange={this.handleChangeOfDatePicker} - /> - + + + + } + dateFormat="uuuuuu-MM-dd" + disabled={!isCommonEraDate} + dropdownMode="select" + popperModifiers={ + {preventOverflow: { + enabled: true + }}} + popperPlacement="top-end" + selected={isValid(selectedDate) ? selectedDate : null} + style={{fontSize: 'inherit'}} + timeFormat="false" + onChange={this.handleChangeOfDatePicker} + /> diff --git a/src/client/entity-editor/common/numeric-field.tsx b/src/client/entity-editor/common/numeric-field.tsx index d8df1ee34..1dbe33161 100644 --- a/src/client/entity-editor/common/numeric-field.tsx +++ b/src/client/entity-editor/common/numeric-field.tsx @@ -63,9 +63,7 @@ function NumericField({ {labelElement} - - {addonAfter} - + {addonAfter} ); diff --git a/src/client/entity-editor/common/sort-name-field.tsx b/src/client/entity-editor/common/sort-name-field.tsx index 4da2fe8d7..7d2fc401a 100644 --- a/src/client/entity-editor/common/sort-name-field.tsx +++ b/src/client/entity-editor/common/sort-name-field.tsx @@ -185,10 +185,8 @@ function SortNameField({ onChange={onChange} {...rest} /> - - {guessButton} - {copyButton} - + {guessButton} + {copyButton} ); From b5acaae14fcc66d6c568e22acac42fdfbb5f3683 Mon Sep 17 00:00:00 2001 From: Monkey Do Date: Thu, 17 Oct 2024 17:48:29 +0200 Subject: [PATCH 10/17] RBS: Fix navbar --- src/client/containers/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/containers/layout.js b/src/client/containers/layout.js index 9b5830d70..efa6083c8 100644 --- a/src/client/containers/layout.js +++ b/src/client/containers/layout.js @@ -336,7 +336,7 @@ class Layout extends React.Component { const revisionsClassName = homepage || hideSearch ? 'ml-auto' : null; return ( - + {!(homepage || hideSearch) && this.renderSearchForm()}