Merge remote-tracking branch 'origin/master' into 2.6.0

.github/workflows/upload-release-package.yml

@@ -0,0 +1,39 @@
+name: "Upload release package"
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php:
+          - "7.4"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer:2.2
+          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
+          ini-values: "date.timezone=Europe/Paris"
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create the package
+        run: make release VERSION=${{ github.event.release.tag_name }}
+
+      - name: Upload the package to the release
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: /tmp/wllbg-release/wallabag-${{ github.event.release.tag_name }}.tar.gz

RELEASE_PROCESS.md

@@ -16,13 +16,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 
 #### Create a new release on GitHub
 
-- Run this command to create the package:
+- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports).
-
-```
-make release VERSION=$LAST_WALLABAG_RELEASE
-```
-
-- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports). You have to upload the package (generated previously).
 - Update nginx config to change the redirect rule for `https://wllbg.org/latest-v2-package` & `http://wllbg.org/latest-v2` (they both redirect to the asset of the GitHub release)
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
 - Update wallabag.org website (downloads, MD5 sum, releases and new blog post)

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hr.yml

@@ -18,7 +18,7 @@ export_pdf: Aktiviraj PDF izvoz
 matomo_enabled: Aktiviraj Matomo
 import_with_redis: Aktiviraj Redis za asinkroni uvoz podataka
 restricted_access: Aktiviraj autentifikaciju za naplatne web-stranice
-export_mobi: Aktiviraj .mobi izvoz
+export_mobi: Aktiviraj .mobi izvoz (zastarjelo, uskoro će se ukloniti)
 demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju)
 carrot: Aktiviraj dijeljenje na Carrot
 diaspora_url: diaspora* URL, ako je usluga aktivirana

package.json

@@ -53,17 +53,17 @@
     "postcss": "^8.4.14",
     "postcss-loader": "^7.0.0",
     "postcss-scss": "^4.0.4",
-    "sass": "^1.52.2",
+    "sass": "^1.52.3",
     "sass-loader": "^13.0.0",
     "style-loader": "^3.3.1",
-    "stylelint": "^14.8.5",
+    "stylelint": "^14.9.1",
     "stylelint-config-standard": "^25.0.0",
     "stylelint-scss": "^4.2.0",
     "stylelint-webpack-plugin": "^3.3.0",
     "terser-webpack-plugin": "^5.3.3",
     "url-loader": "^4.1.1",
     "webpack": "^5.73.0",
-    "webpack-cli": "^4.9.2",
+    "webpack-cli": "^4.10.0",
     "webpack-dev-server": "^4.9.2",
     "webpack-manifest-plugin": "^5.0.0",
     "webpack-merge": "^5.7.3"
@@ -79,7 +79,7 @@
     "jr-qrcode": "^1.0.7",
     "material-design-icons-iconfont": "^6.7.0",
     "materialize-css": "^0.98.1",
-    "mathjax": "^3.2.1",
+    "mathjax": "^3.2.2",
     "mousetrap": "^1.6.0",
     "ptsans-npm-webfont": "^0.0.4",
     "roboto-fontface": "^0.10.0",

scripts/release.sh

@@ -9,12 +9,12 @@ ENV=$4
 
 rm -rf "${TMP_FOLDER:?}"/"$RELEASE_FOLDER"
 mkdir "$TMP_FOLDER"/"$RELEASE_FOLDER"
-git clone git@github.com:wallabag/wallabag.git "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION"
+git clone https://github.com/wallabag/wallabag.git "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION"
 cd "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION" && SYMFONY_ENV="$ENV" COMPOSER_MEMORY_LIMIT=-1 composer install -n --no-dev
 cd "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION" && php bin/console wallabag:install --env="$ENV" -n
 cd "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION" && php bin/console assets:install --env="$ENV" --symlink --relative
 cd "$TMP_FOLDER"/"$RELEASE_FOLDER" && tar czf "$VERSION".tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" "$VERSION"
 echo "MD5 checksum of the package for wallabag $VERSION"
-md5 "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION".tar.gz
+md5sum "$VERSION".tar.gz
 echo "Package to upload to the release server:"
 echo "$TMP_FOLDER"/"$RELEASE_FOLDER"/"$VERSION".tar.gz

src/Wallabag/CoreBundle/Resources/translations/messages.de.yml

@@ -37,6 +37,7 @@ menu:
         theme_toggle_auto: Automatisches Design
         theme_toggle_dark: Dunkles Design
         theme_toggle_light: Helles Design
+        with_annotations: Mit Anmerkungen
     top:
         add_new_entry: Neuen Artikel hinzufügen
         search: Suche
@@ -240,6 +241,8 @@ entry:
         filtered_search: 'Gefiltert nach Suche:'
         untagged: Nicht markierte Einträge
         all: Alle Einträge
+        with_annotations: Einträge mit Anmerkungen
+        same_domain: Gleiche Domain
     list:
         number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
         reading_time: geschätzte Lesezeit
@@ -253,6 +256,8 @@ entry:
         toogle_as_star: Favoriten-Status ändern
         delete: Löschen
         export_title: Exportieren
+        assign_search_tag: Weise diese Suche als einen Tag zu jedem Ergebnis hinzu
+        show_same_domain: Zeigt Artikel mit der gleichen Domain
     filters:
         title: Filter
         status_label: Status
@@ -277,6 +282,7 @@ entry:
         action:
             clear: Zurücksetzen
             filter: Filtern
+        annotated_label: Angemerkt
     view:
         left_menu:
             back_to_top: Nach oben
@@ -532,6 +538,10 @@ import:
     elcurator:
         page_title: Importieren > elCurator
         description: Dieses Tool wird all deine ElCurator-Artikel importieren. Öffne die Einstellungen in deinem ElCurator-Konto und exportiere dort den Inhalt; du wirst eine JSON-Datei erhalten.
+    delicious:
+        page_title: Import > del.icio.us
+        how_to: Bitte wählen deinen Delicious-Export aus und klicke den u.s. Button zum Importieren.
+        description: Dieser Importer wird alle deine Delicious-Lesezeichen importieren. Seit 2021 kannst du deine Daten wieder von der Exportseite (https://del.icio.us/export) bekommen. Wähle das "JSON"-Format aus und lade es herunter (z.B. "delicious_export.2021.02.06_21.10.json").
 developer:
     page_title: API-Client-Verwaltung
     welcome_message: Willkomen zur wallabag API

src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml

@@ -62,7 +62,7 @@ import:
         how_to: 'Odaberi datoteku sigurnosne kopije zabilježaka i pritisni donji gumb za uvoz datoteke. Napomena: uvoz može potrajati, jer se moraju dohvatiti svi članci.'
         description: 'Ovaj uvoznik uvozi sve tvoje zabilješke iz Chromea. Mjesto datoteke ovisi o tvom operacijskom sustavu: Na Linuxu sustavu idi u mapu <code>~/.config/chromium/Default/</code></li><li>Na Windows sustavu mapa bi se trebala nalziti u <code>%LOCALAPPDATA%\Google\Chrome\User Data\Default</code></li><li>Na OS X sustavu trebala bi biti u <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Kad stigneš tamo, kopiraj datoteku <code>Bookmarks</code> na neko mjesto gdje ćeš je pronaći.<em><br>Ako koristiš Chromium umjesto Chromea, morat ćeš u skladu s time ispraviti staze.</em></p>'
     readability:
-        how_to: Odaberi Readability izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        how_to: Odaberi Readability izvoz i pritisni donji gumb za slanje i uvoz datoteke.
         page_title: Uvoz > Readability
         description: Ovaj uvoznik uvozi sve tvoje Readability članke. Na stranici alata (https://www.readability.com/tools/), pritisni „Izvezi svoje podatke” u odjeljku „Izvoz podataka”. Primit ćeš e-mail za preuzimanje json-a (što zapravo ne završava s .json).
     worker:
@@ -70,11 +70,11 @@ import:
         download_images_warning: Aktivirao(la) si preuzimanje slika za članke. U kombinaciji s klasičnim uvozom, postupak može potrajati godinama (ili možda ne uspije). <strong>Preporučujemo</strong> aktivirati asinkroniziran uvoz za izbjegavanje grešaka.
     pinboard:
         page_title: Uvoz > Pinboard
-        how_to: Odaberi Pinboard izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        how_to: Odaberi Pinboard izvoz i pritisni donji gumb za slanje i uvoz datoteke.
         description: Ovaj uvoznik uvozi sve tvoje Pinboard članke. Na stranici sigurnosne kopije (https://pinboard.in/settings/backup), pritisni „JSON” u odjeljku „Zabilješke”. Preuzet će se JSON datoteka (poput „pinboard_export”).
     instapaper:
         page_title: Uvoz > Instapaper
-        how_to: Odaberi Instapaper izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        how_to: Odaberi Instapaper izvoz i pritisni donji gumb za slanje i uvoz datoteke.
         description: Ovaj uvoznik uvozi sve tvoje Instapaper članke. Na stranici postavki (https://www.instapaper.com/user) pritisni „Preuzmi .CSV datoteku” u odjeljku „Izvoz”. Preuzet će se CSV datoteka (poput „instapaper-export.csv”).
     pocket:
         config_missing:
@@ -82,7 +82,7 @@ import:
             description: Uvoz iz Pocketa nije konfiguriran.
             user_message: Administrator tvog poslužitelja mora definirati ključ za sučelje za Pocket.
         description: Ovaj uvoznik uvozi sve tvoje Pocket podatke. Pocket nam ne dopušta dohvaćanje sadržaja iz njihove usluge, stoga će se čitljiv sadržaj svakog članka ponovno dohvatiti pomoću wallabaga.
-        authorize_message: Tvoje podatke možeš uvesti s tvog Pocket računa. Jednostavno pritisni donji gumb i autoriziraj program, da se poveže s getpocket.com.
+        authorize_message: Tvoje podatke možeš uvesti s tvog Pocket računa. Jednostavno pritisni donji gumb i autoriziraj program da se poveže na getpocket.com.
         connect_to_pocket: Spoji se na Pocket i uvezi podatke
         page_title: Uvoz > Pocket
     form:
@@ -92,7 +92,7 @@ import:
         save_label: Prenesi datoteku
     wallabag_v1:
         page_title: Uvoz > Wallabag v1
-        how_to: Odaberi wallabag izvoz i pritisni donji gumb za preuzimanje i uvoz datoteke.
+        how_to: Odaberi wallabag izvoz i pritisni donji gumb za slanje i uvoz datoteke.
         description: Ovaj uvoznik uvozi sve tvoje članke wallabaga verzije 1. Na tvojoj stranici konfiguracije, pritisni „JSON izvoz” u odjeljku „Izvezi svoje wallabag podatke”. Dobit ćeš datoteku „wallabag-export-1-xxxx-xx-xx.json”.
     page_description: Dobro došao/dobro došla u uvoznik wallabaga. Odaberi prethodnu uslugu s koje želiš premjestiti podatke.
     action:
@@ -100,6 +100,10 @@ import:
     elcurator:
         description: Ovaj će uvoznik uvesti sve tvoje elCurator članke. Prijeđi na postavke na tvom elCurator računu, a zatim izvezi sadržaj. Dobit ćete JSON datoteku.
         page_title: Uvezi > elCurator
+    delicious:
+        page_title: Uvoz > del.icio.us
+        description: Ovaj će uvoznik uvesti sve tvoje „Delicious” zabilješke. Od 2021. godine nadalje, iz njega možeš ponovo izvesti podatke pomoću stranice za izvoz (https://del.icio.us/export). Odaberi format „JSON” i preuzmi ga (npr. „delicious_export.2021.02.06_21.10.json”).
+        how_to: Odaberi Delicious izvoz i pritisni donji gumb za slanje i uvoz datoteke.
 about:
     helping:
         by_contributing: 'doprinošenjem projektu:'
@@ -478,6 +482,7 @@ entry:
         http_status_label: Stanje HTTP-a
         title: Filtri
         unread_label: Nepročitani
+        annotated_label: S napomenom
     list:
         delete: Izbriši
         reading_time_less_one_minute: 'procijenjeno vrijeme čitanja: &lt; 1 min'
@@ -491,6 +496,8 @@ entry:
         toogle_as_read: Uklj/Isklj oznaku kao pročitano
         number_of_tags: '{1}i još jedna druga oznaka|]1,Inf[i %count% druge oznake'
         reading_time_less_one_minute_short: '&lt; 1 min'
+        show_same_domain: Prikaži članke s istom domenom
+        assign_search_tag: Dodijeli ovo pretraživanje kao oznaku svakom rezultatu
     view:
         left_menu:
             set_as_starred: Uklj/Isklj omiljene
@@ -531,6 +538,8 @@ entry:
         untagged: Zapisi bez oznaka
         filtered_tags: 'Filtrirano po oznakama:'
         filtered_search: 'Filtrirano po pretrazi:'
+        with_annotations: Unosi s napomenama
+        same_domain: Ista domena
     metadata:
         reading_time_minutes_short: '%readingTime% min'
         added_on: Dodano
@@ -663,6 +672,7 @@ menu:
         theme_toggle_auto: Automatska tema
         theme_toggle_dark: Tamna tema
         theme_toggle_light: Svijetla tema
+        with_annotations: S napomenama
     top:
         add_new_entry: Dodaj novi zapis
         filter_entries: Filtriraj zapise

src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml

@@ -141,6 +141,9 @@ config:
         feed_link:
             all: Todos
         feed_limit: Número de itens no feed
+    otp:
+        app:
+            cancel: Cancelar
 entry:
     default_title: 'Título da entrada'
     page_titles:

yarn.lock

@@ -905,6 +905,11 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@csstools/selector-specificity@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz#b6b8d81780b9a9f6459f4bfe9226ac6aefaefe87"
+  integrity sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==
+
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
@@ -1324,22 +1329,22 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.1.1":
+"@webpack-cli/configtest@^1.2.0":
-  version "1.1.1"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
 
-"@webpack-cli/info@^1.4.1":
+"@webpack-cli/info@^1.5.0":
-  version "1.4.1"
+  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
+  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.6.1":
+"@webpack-cli/serve@^1.7.0":
-  version "1.6.1"
+  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -2078,7 +2083,7 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-css-functions-list@^3.0.1:
+css-functions-list@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
   integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
@@ -3843,10 +3848,10 @@ materialize-css@^0.98.1:
     jquery "^2.1.4"
     node-archiver "^0.3.0"
 
-mathjax@^3.2.1:
+mathjax@^3.2.2:
-  version "3.2.1"
+  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-3.2.1.tgz#b74b0cec928322dff6a3c74a757c534e69916d25"
+  resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-3.2.2.tgz#c754d7b46a679d7f3fa03543d6b8bf124ddf9f6b"
-  integrity sha512-blUch14trKnfQHjDjy1kdg5bN8jK0bdHbkerQBKCrZ3Anpb81zZ7xnj5J55vsqQoG+Irz3BHBDzRssjeehkzxg==
+  integrity sha512-Bt+SSVU8eBG27zChVewOicYs7Xsdt40qm4+UpHyX7k0/O9NliPc+x77k1/FEsPsjKPZGJvtRZM1vO+geW0OhGw==
 
 mathml-tag-names@^2.1.3:
   version "2.1.3"
@@ -4883,10 +4888,10 @@ sass-loader@^13.0.0:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@^1.52.2:
+sass@^1.52.3:
-  version "1.52.2"
+  version "1.52.3"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.2.tgz#cd1f03e0e7be5bb2cebcf1c34d735f087d790936"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.52.3.tgz#b7cc7ffea2341ccc9a0c4fd372bf1b3f9be1b6cb"
-  integrity sha512-mfHB2VSeFS7sZlPv9YohB9GB7yWIgQNTGniQwfQ04EoQN0wsQEv7SwpCwy/x48Af+Z3vDeFXz+iuXM3HK/phZQ==
+  integrity sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -5186,11 +5191,6 @@ spdy@^4.0.2:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
-specificity@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
-  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
-
 sshpk@^1.7.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
@@ -5344,15 +5344,16 @@ stylelint-webpack-plugin@^3.3.0:
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
 
-stylelint@^14.8.5:
+stylelint@^14.9.1:
-  version "14.8.5"
+  version "14.9.1"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.5.tgz#0fcbf5b6821283b5a249dde36d70f1158da0a2a3"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.9.1.tgz#6494ed38f148b1e75b402d678a3b6a8aae86dfda"
-  integrity sha512-e3t4H/hlWlspkcNUrkhf44RU3OpPTA7uBOoREGBzSwdEF+2g/+gbZq7WEpMP7BpopcSe/uLaTvDuL+URL7cdnQ==
+  integrity sha512-RdAkJdPiLqHawCSnu21nE27MjNXaVd4WcOHA4vK5GtIGjScfhNnaOuWR2wWdfKFAvcWQPOYe311iveiVKSmwsA==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.1"
     balanced-match "^2.0.0"
     colord "^2.9.2"
     cosmiconfig "^7.0.1"
-    css-functions-list "^3.0.1"
+    css-functions-list "^3.1.0"
     debug "^4.3.4"
     execall "^2.0.0"
     fast-glob "^3.2.11"
@@ -5380,7 +5381,6 @@ stylelint@^14.8.5:
     postcss-selector-parser "^6.0.10"
     postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
-    specificity "^0.4.1"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
     style-search "^0.1.0"
@@ -5731,18 +5731,18 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webpack-cli@^4.9.2:
+webpack-cli@^4.10.0:
-  version "4.9.2"
+  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
-  integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==
+  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.1"
+    "@webpack-cli/configtest" "^1.2.0"
-    "@webpack-cli/info" "^1.4.1"
+    "@webpack-cli/info" "^1.5.0"
-    "@webpack-cli/serve" "^1.6.1"
+    "@webpack-cli/serve" "^1.7.0"
     colorette "^2.0.14"
     commander "^7.0.0"
-    execa "^5.0.0"
+    cross-spawn "^7.0.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"