From d4919040c2568a5e9163b16ababde8be9de3f8ef Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Fri, 8 Mar 2024 20:01:45 +0000 Subject: [PATCH 001/795] Updates to pattern design tutorial for clarity and flow --- .../pattern-design/part2/drawing-the-straps/en.md | 2 +- markdown/dev/tutorials/pattern-design/part2/en.md | 2 ++ .../pattern-design/part2/our-first-design/en.md | 10 +++++----- .../pattern-design/part2/our-first-part/en.md | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md index 5a03fa78692..aa6ba757ab4 100644 --- a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md @@ -1,6 +1,6 @@ --- title: Drawing the straps -order: 230 +order: 93 --- All we have to do now is flip a bunch of points on the other side, diff --git a/markdown/dev/tutorials/pattern-design/part2/en.md b/markdown/dev/tutorials/pattern-design/part2/en.md index 11b4a19ee4a..7ca4526cfb6 100644 --- a/markdown/dev/tutorials/pattern-design/part2/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/en.md @@ -43,3 +43,5 @@ Depending on the choice you made, you will need to edit files in a different fol - Edit files in `design/tutorial` if you are using the **Tutorial** template You can choose either, or even switch back and forth between both. + +To follow along step-by-step with the tutorial, go to the `design/from-scratch` folder. \ No newline at end of file diff --git a/markdown/dev/tutorials/pattern-design/part2/our-first-design/en.md b/markdown/dev/tutorials/pattern-design/part2/our-first-design/en.md index 1a7d1f4faab..e35ee1a3f63 100644 --- a/markdown/dev/tutorials/pattern-design/part2/our-first-design/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/our-first-design/en.md @@ -27,7 +27,7 @@ const FromScratch = new Design({ name: 'fromScratch', version: '0.0.1', }, - parts: [ bib ], + parts: [bib], }) export { bib, FromScratch, i18n } @@ -82,7 +82,7 @@ If you are not familiar with this syntax, you'll get the hang of it soon enough. ## Design constructor -finally the most interesting part of this file is the middle part where we are +Finally, the most interesting part of this file is the middle part where we are creating a new design: ```src/index.mjs @@ -91,7 +91,7 @@ const FromScratch = new Design({ name: 'fromScratch', version: '0.0.1', }, - parts: [ bib ], + parts: [bib], }) ``` @@ -104,14 +104,14 @@ to be more accurate, that you can use with the `new` keyword. It's a convention that constructor names start with an **C**apital letter. -We are passing some info to a this `Design` function, but the `data` we are +We are passing some info to this `Design` function, but the `data` we are passing is optional. If we strip that away for a moment, and don't bother assigning the result to a variable, we reveal the essence of what it takes to create a new FreeSewing design: ```src/index.mjs new Design({ - parts: [ bib ], + parts: [bib], }) ``` diff --git a/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md b/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md index 820d3d9a1b3..325f2c360c1 100644 --- a/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md @@ -86,4 +86,4 @@ This structure of putting the draft method at the top of the file and the part object at the bottom is a bit of a convention in FreeSewing. - +We'll take a look at our part's *draft method* soon. For now, let's look at adding measurements to our part. From 70d3f260d38df3dc665640a96798e28cc4fc394a Mon Sep 17 00:00:00 2001 From: Benjamin Fan Date: Fri, 8 Mar 2024 13:34:27 -0800 Subject: [PATCH 002/795] fix(shared): Use "Bookmark this" translation strings --- sites/shared/components/account/en.yaml | 2 ++ sites/shared/components/bookmarks.mjs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index aa929831353..3b1e87bb6ba 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -204,6 +204,8 @@ customBookmark: Custom Bookmarks yourBookmarks: Your bookmarks bookmarkThisThing: Bookmark this { thing } page: Page +doc: Documentation +pattern: Pattern # sets set: Measurements Set diff --git a/sites/shared/components/bookmarks.mjs b/sites/shared/components/bookmarks.mjs index 9b4bba7010c..223ef6690ea 100644 --- a/sites/shared/components/bookmarks.mjs +++ b/sites/shared/components/bookmarks.mjs @@ -36,7 +36,7 @@ export const CreateBookmark = ({ type, title, slug }) => { return ( <> -

{t('account:bookmarkThisPage')}

+

{t('account:bookmarkThisThing', { thing: t(`account:${type}`) })}

{ labelBL={url} /> ) From e1729128791f4d496925c4f576a3a8abb03743ac Mon Sep 17 00:00:00 2001 From: Benjamin Fan Date: Fri, 8 Mar 2024 13:35:38 -0800 Subject: [PATCH 003/795] fix(markdown): Typo in Bookmark Type documentation --- markdown/org/docs/about/site/bookmarks/type/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/en.md b/markdown/org/docs/about/site/bookmarks/type/en.md index c08efa9d315..38a0eabfb8e 100644 --- a/markdown/org/docs/about/site/bookmarks/type/en.md +++ b/markdown/org/docs/about/site/bookmarks/type/en.md @@ -6,5 +6,5 @@ Every bookmark has a **type** attribute that is mandatory. When you manually create a bookmark, the type is always **custom** so you cannot choose it. -Other types include **pattern**, **docs**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From d219387c3c7a333ff10688d3a7a3172c6ef6246e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 9 Mar 2024 19:27:50 +0100 Subject: [PATCH 004/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/site/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/nl.md b/markdown/org/docs/about/site/nl.md index ba15261424b..6c5639680ef 100644 --- a/markdown/org/docs/about/site/nl.md +++ b/markdown/org/docs/about/site/nl.md @@ -61,7 +61,7 @@ Schakel [Two-Factor Authentication](/account/mfa/) in om je FreeSewing account t ## Maak het je eigen -Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: +Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Now that you have a FreeSewing account, there's more you can do on FreeSewing.org. Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: Klik door voor meer informatie over de volgende functies: - [Account](/docs/about/site/account) - [Maten sets](/docs/about/site/sets) From 2305d9c1f10fae10b86c3a740c4609ae1cb77351 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Sun, 10 Mar 2024 16:17:26 +0100 Subject: [PATCH 005/795] Remove unused import (fix ESLint warning) --- sites/shared/components/designs/linedrawings/index.mjs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sites/shared/components/designs/linedrawings/index.mjs b/sites/shared/components/designs/linedrawings/index.mjs index 643fc6fe6ba..98698777dec 100644 --- a/sites/shared/components/designs/linedrawings/index.mjs +++ b/sites/shared/components/designs/linedrawings/index.mjs @@ -38,11 +38,7 @@ import { } from 'shared/components/designs/linedrawings/cornelius.mjs' import { Diana, DianaFront, DianaBack } from 'shared/components/designs/linedrawings/diana.mjs' import { Florence, FlorenceFront } from 'shared/components/designs/linedrawings/florence.mjs' -import { - Florent, - FlorentFront, - FlorentBack, -} from 'shared/components/designs/linedrawings/florent.mjs' +import { Florent, FlorentFront } from 'shared/components/designs/linedrawings/florent.mjs' import { Lucy, LucyFront } from 'shared/components/designs/linedrawings/lucy.mjs' import { Lumina, LuminaFront, LuminaBack } from 'shared/components/designs/linedrawings/lumina.mjs' import { Lumira, LumiraFront, LumiraBack } from 'shared/components/designs/linedrawings/lumira.mjs' From c43f2d8de35ce270d7e90bfd2bd76b5f89847d71 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Sun, 10 Mar 2024 18:42:47 +0100 Subject: [PATCH 006/795] Fix typo in changelog.yaml --- config/changelog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index f69fdc2eeca..152b3645ad4 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -157,8 +157,8 @@ Unreleased: date: 2023-09-30 Changed: all: - - All FreeSewing pacakges are now ESM only. - - All FreeSewing pacakges now use named exports. + - All FreeSewing packages are now ESM only. + - All FreeSewing packages now use named exports. - Dropped support for NodeJS 14. NodeJS 18 (LTS/hydrogen) or more recent is now required. Removed: From 8dc4b9451bdfecdbabaf3b7c2fc45e717f20c74b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 04:53:32 +0000 Subject: [PATCH 007/795] Bump yarn from 1.22.21 to 1.22.22 Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.22.21 to 1.22.22. - [Release notes](https://github.com/yarnpkg/yarn/releases) - [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md) - [Commits](https://github.com/yarnpkg/yarn/compare/v1.22.21...v1.22.22) --- updated-dependencies: - dependency-name: yarn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 9e444752d86..5a57fc4ac3c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14470,9 +14470,9 @@ yargs@^15.0.1, yargs@^15.0.2, yargs@^15.3.1: yargs-parser "^18.1.2" yarn@^1.22.19: - version "1.22.21" - resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.21.tgz" - integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg== + version "1.22.22" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.22.tgz#ac34549e6aa8e7ead463a7407e1c7390f61a6610" + integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg== yocto-queue@^0.1.0: version "0.1.0" From a5309cdffb27db2b97e8a6f6e2f6615ab4460915 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 04:54:48 +0000 Subject: [PATCH 008/795] Bump i18next from 23.10.0 to 23.10.1 Bumps [i18next](https://github.com/i18next/i18next) from 23.10.0 to 23.10.1. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.10.0...v23.10.1) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/lab/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/lab/package.json b/sites/lab/package.json index 72570b1409c..a0f2e3d170a 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -36,7 +36,7 @@ "d3-drag": "3.0.0", "d3-selection": "3.0.0", "daisyui": "4.7.2", - "i18next": "23.10.0", + "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/sde/package.json b/sites/sde/package.json index a27659a7940..600148cc20a 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -54,7 +54,7 @@ "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", - "i18next": "23.10.0", + "i18next": "23.10.1", "jotai": "2.7.0", "jotai-location": "0.5.4", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index 9e444752d86..b2a9b82e313 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7157,10 +7157,10 @@ i18next-fs-backend@^2.3.1: resolved "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.1.tgz" integrity sha512-tvfXskmG/9o+TJ5Fxu54sSO5OkY6d+uMn+K6JiUGLJrwxAVfer+8V3nU8jq3ts9Pe5lXJv4b1N7foIjJ8Iy2Gg== -i18next@23.10.0: - version "23.10.0" - resolved "https://registry.npmjs.org/i18next/-/i18next-23.10.0.tgz" - integrity sha512-/TgHOqsa7/9abUKJjdPeydoyDc0oTi/7u9F8lMSj6ufg4cbC1Oj3f/Jja7zj7WRIhEQKB7Q4eN6y68I9RDxxGQ== +i18next@23.10.1: + version "23.10.1" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.10.1.tgz#217ce93b75edbe559ac42be00a20566b53937df6" + integrity sha512-NDiIzFbcs3O9PXpfhkjyf7WdqFn5Vq6mhzhtkXzj51aOcNuPNcTwuYNuXCpHsanZGHlHKL35G7huoFeVic1hng== dependencies: "@babel/runtime" "^7.23.2" From 0cea078695ba3444ed38905cde95af1eb1890074 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:25:16 +0100 Subject: [PATCH 009/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/bee/cutting/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/bee/cutting/de.md b/markdown/org/docs/designs/bee/cutting/de.md index dbe0ce12299..3cb517b0b32 100644 --- a/markdown/org/docs/designs/bee/cutting/de.md +++ b/markdown/org/docs/designs/bee/cutting/de.md @@ -38,6 +38,6 @@ Es gibt drei Varianten dieses Musters. **One Colour**, bei dem das Bikiniobertei -Dieses Muster lässt sich leicht wenden, indem du einen ähnlichen Stoff wie den Hauptstoff kaufst und ihn als Kontrast verwendest. To save confusion on instructions it will be referred to as the lining fabric. +Dieses Muster lässt sich leicht wenden, indem du einen ähnlichen Stoff wie den Hauptstoff kaufst und ihn als Kontrast verwendest. Um Verwirrung zu vermeiden, wird er in der folgenden Anleitung als Futterstoff bezeichnet. From e5b7062f7d4f4b722a37ae8e10d42c50507ca592 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:25:17 +0100 Subject: [PATCH 010/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/bee/fabric/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/bee/fabric/de.md b/markdown/org/docs/designs/bee/fabric/de.md index 4e1c5e14a71..a9cf346115b 100644 --- a/markdown/org/docs/designs/bee/fabric/de.md +++ b/markdown/org/docs/designs/bee/fabric/de.md @@ -8,6 +8,6 @@ Der Haupt- und der Futterstoff sind aus demselben Material. Bee wird aus Bademod -You only need lining fabric if you intend to make the pattern reversible or if you want the band for the cross back tie variant to be a contrasting fabric. Ansonsten kannst du alle benötigten Teile aus deinem Hauptstoff zuschneiden. +Du brauchst nur dann einen Futterstoff, wenn du das Schnittmuster wendbar machen willst oder wenn du das Band für die Kreuzbindervariante aus einem Kontraststoff machen willst. Ansonsten kannst du alle benötigten Teile aus deinem Hauptstoff zuschneiden. From ac061dc91971c443358c4dc14c45c376a7bb6fcb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:25:18 +0100 Subject: [PATCH 011/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/bee/instructions/de.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/markdown/org/docs/designs/bee/instructions/de.md b/markdown/org/docs/designs/bee/instructions/de.md index c70c90c9827..62e51c30bd0 100644 --- a/markdown/org/docs/designs/bee/instructions/de.md +++ b/markdown/org/docs/designs/bee/instructions/de.md @@ -8,7 +8,7 @@ Achte darauf, dass du einen Stretchstich verwendest -When making a reversible top the second colour will be referred to as the lining fabric. +Wenn du ein wendbares Oberteil anfertigst, wird die zweite Farbe als Futterstoff bezeichnet. Die Kerben in diesem Muster wirken eher wie Punkte, also **klammere** sie nicht, um sie zu markieren. @@ -30,7 +30,7 @@ Die Kerben in diesem Muster wirken eher wie Punkte, also **klammere** sie nicht, - Schneide die Nahtzugaben zurück und schneide die Ecken ab. - Drehe dich von innen nach außen. Presse. -Repeat this for the remaining neck tie pieces +Wiederhole diesen Vorgang für die restlichen Krawattenstücke ### Schritt 2: Die Becher @@ -51,9 +51,9 @@ Die Kerben in diesem Muster wirken eher wie Punkte, also **klammere** sie nicht, Wenn deine Nahtzugabe breit ist, musst du die Nahtzugaben der Lücken vielleicht ein wenig kürzen, damit sie nicht zu groß werden. -If you are having trouble turning the cups you can try one of these methods: +Wenn du Probleme beim Wenden der Körbchen hast, kannst du eine der folgenden Methoden ausprobieren: -- Create a 2.5cm (1") gap in the front or side seam and turn through that, either _slipstitch_-ing the gap closed or _edgestitch_-ing it closed during Step 7. +- Erstelle eine 2,5 cm breite Lücke in der Vorder- oder Seitennaht und wende sie, indem du die Lücke entweder mit einem _Rutschstich_ schließt oder sie in Schritt 7 mit einem _Stich_ schließt. - Verbreitere eine der vorhandenen Lücken und biege durch sie hindurch. Dann wird beim Wenden _Gestich_ oder _Rutschstich_ der verbreiterte Teil geschlossen. @@ -85,7 +85,7 @@ Außerdem gibt es auf beiden Seiten der Mitte des Bandes Einkerbungen, die dir e -Du kannst es auch vorziehen, den einen Becher in der Mitte über den anderen zu wickeln. To do this place the sides of the cups at the outer notches and lay their fronts pass the midpoint with the left on top. +Du kannst es auch vorziehen, den einen Becher in der Mitte über den anderen zu wickeln. Dazu legst du die Seiten der Becher an den anderen Kerben an und legst ihre Vorderseiten über die Mitte, wobei die linke oben liegt. From 86b248bffb42e2c5a6ca29f8798a5345c9c792b6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:11 +0100 Subject: [PATCH 012/795] New translations en.md (German) skip-build --- .../org/docs/designs/bent/options/shoulderslopereduction/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/bent/options/shoulderslopereduction/de.md b/markdown/org/docs/designs/bent/options/shoulderslopereduction/de.md index 1c0fcf340cc..bdaf4d2a1de 100644 --- a/markdown/org/docs/designs/bent/options/shoulderslopereduction/de.md +++ b/markdown/org/docs/designs/bent/options/shoulderslopereduction/de.md @@ -2,7 +2,7 @@ title: "Verringerung der Schulterneigung" --- -This pattern adapts to sloped shoulder by taking the shoulder slope measurement into account. +Dieses Muster passt sich an schräge Schultern an, indem die Schulterschräge-Messung berücksichtigt wird. Für Jacken oder Mantel kann es jedoch sein, dass man mehr Platz an den Schultern schaffen möchte, um Schulterpolster zu ermöglichen. Mit dieser Option können Sie zusätzlichen Platz an den Schultern erstellen, indem Sie die Menge der Schultern verkleinern. From 2d38eaf484dfdddbb7185465f8a7a2567988f253 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:16 +0100 Subject: [PATCH 013/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/bob/instructions/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/bob/instructions/de.md b/markdown/org/docs/designs/bob/instructions/de.md index 269e1117e27..925bc5a8dc8 100644 --- a/markdown/org/docs/designs/bob/instructions/de.md +++ b/markdown/org/docs/designs/bob/instructions/de.md @@ -25,7 +25,7 @@ Achte darauf, dass du dicht an der Kante nähst, damit die Stiche später unter ## Schritt 2: Schrägband anbringen -We're going to apply bias tape as a finish around the entire edge of the bib. +Wir werden den gesamten Rand des Lätzchens mit Schrägband abschließen. Wahrscheinlich möchtest du am unteren Träger beginnen, denn so wird die Naht des Schrägbandes verdeckt, wenn das Lätzchen getragen wird. From f084798a012148bc435a5cd6cbfa20fca82af7c2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:21 +0100 Subject: [PATCH 014/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/bob/options/widthratio/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/bob/options/widthratio/de.md b/markdown/org/docs/designs/bob/options/widthratio/de.md index a23c197fbe3..e32435e23c7 100644 --- a/markdown/org/docs/designs/bob/options/widthratio/de.md +++ b/markdown/org/docs/designs/bob/options/widthratio/de.md @@ -5,7 +5,7 @@ title: Breitenverhältnis Steuert die Breite des Latzes. - Erhöhe den Prozentsatz, um die Breite des Lätzchens zu vergrößern. -- Decrease the percentage to constrict the width of the bib. +- Verringere den Prozentsatz, um die Breite des Lätzchens einzuschränken. From b0f4ca49942b570fc2574f678eb1f4e7a6d2a221 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:34 +0100 Subject: [PATCH 015/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/breanna/options/shoulderdart/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/breanna/options/shoulderdart/de.md b/markdown/org/docs/designs/breanna/options/shoulderdart/de.md index 39ecc2f612e..461ec226d27 100644 --- a/markdown/org/docs/designs/breanna/options/shoulderdart/de.md +++ b/markdown/org/docs/designs/breanna/options/shoulderdart/de.md @@ -2,7 +2,7 @@ title: "Schulterabnäher" --- -Whether or not to include a back shoulder dart to round the back. +Ob du einen Schulterabnäher einfügen willst, um den Rücken abzurunden oder nicht. From cc0b18ba303e8cfeb363bc5c5cafcb70631673ae Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:44 +0100 Subject: [PATCH 016/795] New translations en.md (German) skip-build --- .../org/docs/designs/breanna/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/breanna/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/breanna/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/breanna/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/breanna/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 95e54b14b8476b7c02992ff75580b8c1b812c759 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:26:50 +0100 Subject: [PATCH 017/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/breanna/options/waistdart/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/breanna/options/waistdart/de.md b/markdown/org/docs/designs/breanna/options/waistdart/de.md index 1bd7e6faa92..4f63fc1ddad 100644 --- a/markdown/org/docs/designs/breanna/options/waistdart/de.md +++ b/markdown/org/docs/designs/breanna/options/waistdart/de.md @@ -2,7 +2,7 @@ title: "Taillenabnäher" --- -Whether or not to include a back waist dart to round the back. +Ob du einen Abnäher in der Taille einfügen willst, um den Rücken abzurunden oder nicht. From aa7e5ab91a331c49e018186f512e7443f477b686 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:27:13 +0100 Subject: [PATCH 018/795] New translations en.md (German) skip-build --- .../org/docs/designs/brian/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/brian/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/brian/options/sleevecapq3spread1/de.md index 387fa243527..858ceaab78d 100644 --- a/markdown/org/docs/designs/brian/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/brian/options/sleevecapq3spread1/de.md @@ -4,7 +4,7 @@ title: "Armkugel Q3 Spreizung nach oben" *** -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 7907b4af69fad3f72c4025e613a900a1a861a4ea Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:29:26 +0100 Subject: [PATCH 019/795] New translations en.md (German) skip-build --- .../org/docs/designs/diana/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/diana/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/diana/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/diana/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/diana/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 6d3abf3c3b545c2a64dd66c4d45cfa70726f8519 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:30:34 +0100 Subject: [PATCH 020/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/huey/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/huey/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/huey/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/huey/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/huey/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From ecef24926d51252d548e393813126409e6f7fe70 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:33:29 +0100 Subject: [PATCH 021/795] New translations en.md (German) skip-build --- .../org/docs/designs/simon/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/simon/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/simon/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/simon/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/simon/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From faff141cb871818150126783f80de3b1be2c3125 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:34:19 +0100 Subject: [PATCH 022/795] New translations en.md (German) skip-build --- .../org/docs/designs/simone/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/simone/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/simone/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/simone/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/simone/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From a4ec956300a39cb7a3b6d07438628bd947a5e954 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:34:49 +0100 Subject: [PATCH 023/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/sven/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/sven/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/sven/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/sven/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/sven/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 59e27e8fd148348f0d212aca3b12b689f98ceb75 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:35:22 +0100 Subject: [PATCH 024/795] New translations en.md (German) skip-build --- .../org/docs/designs/teagan/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/teagan/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/teagan/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/teagan/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/teagan/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 1ed302aed6e4fb8791cce8670a62da1985e7be1b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 11 Mar 2024 08:37:00 +0100 Subject: [PATCH 025/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/yuri/options/sleevecapq3spread1/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/yuri/options/sleevecapq3spread1/de.md b/markdown/org/docs/designs/yuri/options/sleevecapq3spread1/de.md index 5a47a3fa2a3..79a52d50baf 100644 --- a/markdown/org/docs/designs/yuri/options/sleevecapq3spread1/de.md +++ b/markdown/org/docs/designs/yuri/options/sleevecapq3spread1/de.md @@ -2,7 +2,7 @@ title: "Armkugel Q3 Spreizung nach oben" --- -![The upward spread in the third quadrant of the sleevecap](./sleevecapq3spread1.svg) +![Die Aufwärtsverteilung im dritten Quadranten der Ärmel](./sleevecapq3spread1.svg) Diese Option steuert die Aufwärtsverteilung im dritten Quadranten der Ärmel. From 2e216f020a0a36df88646d485885f23df8baf5dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 09:42:11 +0000 Subject: [PATCH 026/795] Bump daisyui from 4.7.2 to 4.7.3 Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.7.2...v4.7.3) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 59d1b7b5d10..6d399123963 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -35,7 +35,7 @@ "@next/bundle-analyzer": "14.1.3", "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", - "daisyui": "4.7.2", + "daisyui": "4.7.3", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index a0f2e3d170a..844b597319b 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.2", + "daisyui": "4.7.3", "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index dc4a0e48ea5..9ce2c93fea5 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,7 +37,7 @@ "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.7.2", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.7.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 600148cc20a..04427ad1800 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,7 +50,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.2", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", diff --git a/sites/shared/package.json b/sites/shared/package.json index 027354f4a60..be0964d4bd9 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,7 +23,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.2", + "daisyui": "4.7.3", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", diff --git a/yarn.lock b/yarn.lock index ae0f6e178ac..a04453c751a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4697,10 +4697,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.7.2: - version "4.7.2" - resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.7.2.tgz" - integrity sha512-9UCss12Zmyk/22u+JbkVrHHxOzFOyY17HuqP5LeswI4hclbj6qbjJTovdj2zRy8cCH6/n6Wh0lTLjriGnyGh0g== +daisyui@4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.7.3.tgz#2d75b71d1c52f643914dea9b12930acc51ed9f49" + integrity sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g== dependencies: css-selector-tokenizer "^0.8" culori "^3" From 6a000fd36555032a30a883d226d64ab56efd7052 Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Tue, 12 Mar 2024 02:02:06 +0000 Subject: [PATCH 027/795] Minor updates to pattern design tutorial for clarity and consistency --- .../part2/adding-measurements/en.md | 2 - .../pattern-design/part2/adding-options/en.md | 11 ++---- .../part2/constructing-the-neck-opening/en.md | 8 +--- .../pattern-design/part2/draft-method/en.md | 6 +-- .../part2/fitting-the-neck-opening/en.md | 38 +++++++++++++------ .../pattern-design/part2/our-first-part/en.md | 2 +- 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md b/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md index 2c6d3d08c80..875cb46030e 100644 --- a/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md @@ -32,9 +32,7 @@ function draftBib({ part }) => { export const bib = { name: 'fromscratch.bib', draft: draftBib, - // highlight-start measurements: [ 'head' ], - // highlight-end } ``` diff --git a/markdown/dev/tutorials/pattern-design/part2/adding-options/en.md b/markdown/dev/tutorials/pattern-design/part2/adding-options/en.md index 748d6f4bb72..c1babd679f5 100644 --- a/markdown/dev/tutorials/pattern-design/part2/adding-options/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/adding-options/en.md @@ -32,7 +32,6 @@ export const bib = { name: 'fromscratch.bib', draft: draftBib, measurements: [ 'head' ], - // highlight-start options: { neckRatio: { pct: 80, @@ -41,7 +40,6 @@ export const bib = { menu: 'fit' }, }, - // highlight-end } ``` @@ -50,7 +48,7 @@ Can you guess what it means? - We've added the `options` property to our `bib` object - On the `options` property, we have added `neckRatio` which holds the configuration for our option - It is a `pct` option -- which means it's a percentage -- Its default value is 90% +- Its default value is 80% - Its minimum value is 70% - Its maximum value is 90% @@ -64,8 +62,7 @@ They are all documented [in the part reference docs](/reference/api/part/config/ The `menu` property on our option is *extra*. It will be ignored by FreeSewing's core library and if we leave it out, our design will produce the same result. -Instead, this `menu` property is there for the benefit FreeSewing's development -environment which will use this to build a menu structure for the various +Instead, this `menu` property is there for the benefit of FreeSewing's development environment which will use this to build a menu structure for the various options. This is covered in more detail in [Part 3](/tutorials/pattern-design/part3) of this tutorial. @@ -92,7 +89,6 @@ export const bib = { max: 90, menu: 'fit' }, - // highlight-start widthRatio: { pct: 45, min: 35, @@ -105,12 +101,11 @@ export const bib = { max: 85, menu: 'style' }, - // highlight-end }, } ``` -This pretty much the exact same thing, except that are placing this in the `style` menu. +This is pretty much the exact same thing, except that are placing these in the `style` menu. Later, I will test-drive our pattern to see how it behaves when we adapt the options between their minimum and maximum values. At that time, I may need to tweak these values. diff --git a/markdown/dev/tutorials/pattern-design/part2/constructing-the-neck-opening/en.md b/markdown/dev/tutorials/pattern-design/part2/constructing-the-neck-opening/en.md index ff71f0c80ad..f5e8fb3c695 100644 --- a/markdown/dev/tutorials/pattern-design/part2/constructing-the-neck-opening/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/constructing-the-neck-opening/en.md @@ -15,16 +15,14 @@ We'll be adding some points to our pattern to do just that. But we want to have access to our measurements and options to do so. For this, we first destructure `measurements` and `options` so we can access them: -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, paths, points, - // highlight-start measurements, options, - // highlight-end part, }) { @@ -39,7 +37,7 @@ Great. Now let's get to work. Let's add some points, and use them to draw our first curve: -```js +```src/bib.mjs function draftBib({ Path, Point, @@ -50,7 +48,6 @@ function draftBib({ part, }) { - // highlight-start /* * Construct the quarter neck opening */ @@ -79,7 +76,6 @@ function draftBib({ points.bottomCp2, points.bottom ) - // highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md b/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md index 60e14e89e4f..df1124957d2 100644 --- a/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md @@ -20,7 +20,7 @@ does. If you're not familiar with the `({ part })` syntax you see above, this is a technique called *parameter destructuring* or more generally, [object -destructuring](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment) +destructuring](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Destructuring_assignment). The draft method receives only 1 parameter: An object that holds everything we need to draft our method. Destructuring is a way to *pull things out of the @@ -63,12 +63,10 @@ Change the function to look like this: ```src/bib.mjs function draftBib({ - // highlight-start Path, Point, paths, points, - // highlight-end part, }) { @@ -76,7 +74,7 @@ function draftBib({ } ``` -That's bunch of new lines, but each of one gives us something we'll use in this +That's a bunch of new lines, but each of one gives us something we'll use in this tutorial. For a complete list of what you can access via destructuring like this, refer diff --git a/markdown/dev/tutorials/pattern-design/part2/fitting-the-neck-opening/en.md b/markdown/dev/tutorials/pattern-design/part2/fitting-the-neck-opening/en.md index b606584b8f8..d3e315c466e 100644 --- a/markdown/dev/tutorials/pattern-design/part2/fitting-the-neck-opening/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/fitting-the-neck-opening/en.md @@ -8,7 +8,7 @@ going to make sure it is. Here's how we'll make sure the neck opening is _just right_: -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, @@ -19,29 +19,43 @@ function draftBib({ part, }) { - // Construct the quarter neck opening - // highlight-start + /* + * Construct the quarter neck opening + */ let tweak = 1 let target = (measurements.head * options.neckRatio) /4 let delta do { - // highlight-end - points.right = new Point(tweak * measurements.head / 10, 0) - points.bottom = new Point(0, tweak * measurements.head / 12) + points.right = new Point( + tweak * measurements.head / 10, + 0 + ) + points.bottom = new Point( + 0, + tweak * measurements.head / 12 + ) - points.rightCp1 = points.right.shift(90, points.bottom.dy(points.right)/2) - points.bottomCp2 = points.bottom.shift(0, points.bottom.dx(points.right)/2) + points.rightCp1 = points.right.shift( + 90, + points.bottom.dy(points.right) / 2 + ) + points.bottomCp2 = points.bottom.shift( + 0, + points.bottom.dx(points.right) / 2 + ) paths.quarterNeck = new Path() .move(points.right) - .curve(points.rightCp1, points.bottomCp2, points.bottom) + .curve( + points.rightCp1, + points.bottomCp2, + points.bottom + ) - // highlight-start delta = paths.quarterNeck.length() - target if (delta > 0) tweak = tweak * 0.99 else tweak = tweak * 1.02 } while (Math.abs(delta) > 1) - // highlight-end return part } @@ -71,4 +85,4 @@ We keep on doing this until `Math.abs(delta)` is less than 1. Meaning that we are within 1 mm of our target value. Now that we're happy with the length of our quarter neck opening, let's -construct the entire neck opening. +complete the entire neck opening. diff --git a/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md b/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md index 325f2c360c1..f8c72140c80 100644 --- a/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/our-first-part/en.md @@ -86,4 +86,4 @@ This structure of putting the draft method at the top of the file and the part object at the bottom is a bit of a convention in FreeSewing. -We'll take a look at our part's *draft method* soon. For now, let's look at adding measurements to our part. +We'll take a deeper look at our part's draft method soon. For now, let's look at adding measurements to our part. From c8cc78ce1dc97fffee9ea5eff0dd413ebcd51282 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Tue, 12 Mar 2024 14:57:56 +0100 Subject: [PATCH 028/795] fix(markdown): Fix order of steps in dev pattern design tutorial. Fixes #6232 --- .../dev/tutorials/pattern-design/part2/drawing-the-straps/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md index 5a03fa78692..aa6ba757ab4 100644 --- a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md @@ -1,6 +1,6 @@ --- title: Drawing the straps -order: 230 +order: 93 --- All we have to do now is flip a bunch of points on the other side, From 8c887ced9cdff9375d60a30c6d578b24f090f520 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Tue, 12 Mar 2024 18:52:06 +0100 Subject: [PATCH 029/795] fix(shared): No need to divide config.dflt by 100 again --- .../shared/components/workbench/menus/design-options/inputs.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/menus/design-options/inputs.mjs b/sites/shared/components/workbench/menus/design-options/inputs.mjs index 7a6c1837bdf..c439c92d59e 100644 --- a/sites/shared/components/workbench/menus/design-options/inputs.mjs +++ b/sites/shared/components/workbench/menus/design-options/inputs.mjs @@ -12,7 +12,7 @@ import { const PctOptionInput = (props) => { const { config, settings, changed } = props - const currentOrDefault = changed ? props.current : config.dflt / 100 + const currentOrDefault = changed ? props.current : config.dflt return ( From 5fc5cf400ffe9a12be155e09d314dacf719aa798 Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Wed, 13 Mar 2024 01:19:02 +0000 Subject: [PATCH 030/795] Minor updates to pattern design tutorial --- .../part2/completing-the-neck-opening/en.md | 39 ++++++++++++------- .../part2/creating-the-closure/en.md | 37 ++++++++++++------ .../part2/drawing-the-bib-outline/en.md | 36 ++++++++++++----- .../part2/shaping-the-straps/en.md | 33 +++++++++++----- 4 files changed, 101 insertions(+), 44 deletions(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/completing-the-neck-opening/en.md b/markdown/dev/tutorials/pattern-design/part2/completing-the-neck-opening/en.md index 0d7e8503b81..a2c40beb350 100644 --- a/markdown/dev/tutorials/pattern-design/part2/completing-the-neck-opening/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/completing-the-neck-opening/en.md @@ -14,7 +14,7 @@ as it is, and simply chose to not show it. To accomplish this, we'll call the `hide()` method on our path: -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, @@ -28,8 +28,8 @@ function draftBib({ /* * Construct the quarter neck opening */ - const target = (measurements.head * options.neckRatio) /4 let tweak = 1 + let target = (measurements.head * options.neckRatio) /4 let delta do { points.right = new Point( @@ -57,9 +57,7 @@ function draftBib({ points.bottomCp2, points.bottom ) - // highlight-start .hide() - // highlight-end delta = paths.quarterNeck.length() - target if (delta > 0) tweak = tweak * 0.99 @@ -86,7 +84,7 @@ Let's add some more points, and then construct the complete path for the neck opening. -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, @@ -100,18 +98,35 @@ function draftBib({ /* * Construct the quarter neck opening */ - const target = (measurements.head * options.neckRatio) /4 let tweak = 1 + let target = (measurements.head * options.neckRatio) /4 let delta do { - points.right = new Point(tweak * measurements.head / 10, 0) - points.bottom = new Point(0, tweak * measurements.head / 12) - points.rightCp1 = points.right.shift( 90, points.bottom.dy(points.right) / 2) - points.bottomCp2 = points.bottom.shift( 0, points.bottom.dx(points.right) / 2) + points.right = new Point( + tweak * measurements.head / 10, + 0 + ) + points.bottom = new Point( + 0, + tweak * measurements.head / 12 + ) + points.rightCp1 = points.right.shift( + 90, + points.bottom.dy(points.right) / 2 + ) + points.bottomCp2 = points.bottom.shift( + 0, + points.bottom.dx(points.right) / 2 + ) + paths.quarterNeck = new Path() .move(points.right) - .curve(points.rightCp1, points.bottomCp2, points.bottom) + .curve( + points.rightCp1, + points.bottomCp2, + points.bottom + ) .hide() delta = paths.quarterNeck.length() - target @@ -119,7 +134,6 @@ function draftBib({ else tweak = tweak * 1.02 } while (Math.abs(delta) > 1) - // highlight-start /* * Construct the complete neck opening */ @@ -140,7 +154,6 @@ function draftBib({ .curve(points.rightCp2, points.topCp1, points.top) .close() .addClass('fabric') - // highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md index feb31709e2d..7715728eadd 100644 --- a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md @@ -27,7 +27,7 @@ Like our neck opening, we've only drawn half since we can simply copy the points to the other side. -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, @@ -35,27 +35,42 @@ function draftBib({ points, measurements, options, - // highlight-start macro, - // highlight-end part, }) { /* * Construct the quarter neck opening */ - const target = (measurements.head * options.neckRatio) /4 let tweak = 1 + let target = (measurements.head * options.neckRatio) /4 let delta do { - points.right = new Point(tweak * measurements.head / 10, 0) - points.bottom = new Point(0, tweak * measurements.head / 12) - points.rightCp1 = points.right.shift( 90, points.bottom.dy(points.right) / 2) - points.bottomCp2 = points.bottom.shift( 0, points.bottom.dx(points.right) / 2) - + points.right = new Point( + tweak * measurements.head / 10, + 0 + ) + points.bottom = new Point( + 0, + tweak * measurements.head / 12 + ) + + points.rightCp1 = points.right.shift( + 90, + points.bottom.dy(points.right) / 2 + ) + points.bottomCp2 = points.bottom.shift( + 0, + points.bottom.dx(points.right) / 2 + ) + paths.quarterNeck = new Path() .move(points.right) - .curve(points.rightCp1, points.bottomCp2, points.bottom) + .curve( + points.rightCp1, + points.bottomCp2, + points.bottom + ) .hide() delta = paths.quarterNeck.length() - target @@ -134,7 +149,6 @@ function draftBib({ .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) .close() - // highlight-start // Round the straps const strap = points.edgeTop.dy(points.top) @@ -156,7 +170,6 @@ function draftBib({ via: points.tipRightBottom, hide: false }) - // highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md b/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md index 3c9420e2114..b38f1227944 100644 --- a/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md @@ -22,23 +22,41 @@ function draftBib({ let target = (measurements.head * options.neckRatio) /4 let delta do { - points.right = new Point(tweak * measurements.head / 10, 0) - points.bottom = new Point(0, tweak * measurements.head / 12) - - points.rightCp1 = points.right.shift(90, points.bottom.dy(points.right)/2) - points.bottomCp2 = points.bottom.shift(0, points.bottom.dx(points.right)/2) + points.right = new Point( + tweak * measurements.head / 10, + 0 + ) + points.bottom = new Point( + 0, + tweak * measurements.head / 12 + ) + + points.rightCp1 = points.right.shift( + 90, + points.bottom.dy(points.right) / 2 + ) + points.bottomCp2 = points.bottom.shift( + 0, + points.bottom.dx(points.right) / 2 + ) paths.quarterNeck = new Path() .move(points.right) - .curve(points.rightCp1, points.bottomCp2, points.bottom) - .hide() // Add this line + .curve( + points.rightCp1, + points.bottomCp2, + points.bottom + ) + .hide() delta = paths.quarterNeck.length() - target if (delta > 0) tweak = tweak * 0.99 else tweak = tweak * 1.02 } while (Math.abs(delta) > 1) - // Construct the complete neck opening + /* + * Construct the complete neck opening + */ points.rightCp2 = points.rightCp1.flipY() points.bottomCp1 = points.bottomCp2.flipX() points.left = points.right.flipX() @@ -57,7 +75,6 @@ function draftBib({ .close() .addClass('fabric') - // highlight-start // Drawing the bib outline const width = measurements.head * options.widthRatio const length = measurements.head * options.lengthRatio @@ -78,7 +95,6 @@ function draftBib({ .line(points.topLeft) .close() .addClass('fabric') - // highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md index 0467cc28c4b..e86b59b142a 100644 --- a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md @@ -17,7 +17,7 @@ As always, [the API docs](/reference/api/point/) have all the details. -```design/src/bib.mjs +```src/bib.mjs function draftBib({ Path, Point, @@ -31,18 +31,35 @@ function draftBib({ /* * Construct the quarter neck opening */ - const target = (measurements.head * options.neckRatio) /4 let tweak = 1 + let target = (measurements.head * options.neckRatio) /4 let delta do { - points.right = new Point(tweak * measurements.head / 10, 0) - points.bottom = new Point(0, tweak * measurements.head / 12) - points.rightCp1 = points.right.shift( 90, points.bottom.dy(points.right) / 2) - points.bottomCp2 = points.bottom.shift( 0, points.bottom.dx(points.right) / 2) + points.right = new Point( + tweak * measurements.head / 10, + 0 + ) + points.bottom = new Point( + 0, + tweak * measurements.head / 12 + ) + + points.rightCp1 = points.right.shift( + 90, + points.bottom.dy(points.right) / 2 + ) + points.bottomCp2 = points.bottom.shift( + 0, + points.bottom.dx(points.right) / 2 + ) paths.quarterNeck = new Path() .move(points.right) - .curve(points.rightCp1, points.bottomCp2, points.bottom) + .curve( + points.rightCp1, + points.bottomCp2, + points.bottom + ) .hide() delta = paths.quarterNeck.length() - target @@ -94,7 +111,6 @@ function draftBib({ .close() .addClass('fabric') - // highlight-start /* * Shape the straps */ @@ -121,7 +137,6 @@ function draftBib({ .line(points.edgeRight) .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) .close() - // highlight-end return part } From 2748fab861bcb63d0411b427ea0221c77f0a5fbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 04:29:01 +0000 Subject: [PATCH 031/795] Bump @prisma/client from 5.10.2 to 5.11.0 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.10.2 to 5.11.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.11.0/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index f08c02126e3..e517f36561d 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.529.1", - "@prisma/client": "5.10.2", + "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index a04453c751a..94ed41ee82d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1900,10 +1900,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.10.2": - version "5.10.2" - resolved "https://registry.npmjs.org/@prisma/client/-/client-5.10.2.tgz" - integrity sha512-ef49hzB2yJZCvM5gFHMxSFL9KYrIP9udpT5rYo0CsHD4P9IKj473MbhU1gjKKftiwWBTIyrt9jukprzZXazyag== +"@prisma/client@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d" + integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== "@prisma/debug@5.10.2": version "5.10.2" From 34c0cf4489a9bcbf297e7e5f4f82dacef82394bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 04:29:21 +0000 Subject: [PATCH 032/795] Bump @commitlint/config-conventional from 19.0.3 to 19.1.0 Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional) from 19.0.3 to 19.1.0. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.1.0/@commitlint/config-conventional) --- updated-dependencies: - dependency-name: "@commitlint/config-conventional" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a04453c751a..f9c04943560 100644 --- a/yarn.lock +++ b/yarn.lock @@ -943,9 +943,9 @@ yargs "^17.0.0" "@commitlint/config-conventional@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.0.3.tgz" - integrity sha512-vh0L8XeLaEzTe8VCxSd0gAFvfTK0RFolrzw4o431bIuWJfi/yRCHJlsDwus7wW2eJaFFDR0VFXJyjGyDQhi4vA== + version "19.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-19.1.0.tgz#6b4b7938aa3bc308214a683247520f602e55961e" + integrity sha512-KIKD2xrp6Uuk+dcZVj3++MlzIr/Su6zLE8crEDQCZNvWHNQSeeGbzOlNtsR32TUy6H3JbP7nWgduAHCaiGQ6EA== dependencies: "@commitlint/types" "^19.0.3" conventional-changelog-conventionalcommits "^7.0.2" From dfe41a70d4aea236037271f8f5ce9ca10fe4436d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 04:29:46 +0000 Subject: [PATCH 033/795] Bump @commitlint/cli from 19.0.3 to 19.1.0 Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 19.0.3 to 19.1.0. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.1.0/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index a04453c751a..cd30c07cfd0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -930,13 +930,13 @@ integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== "@commitlint/cli@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/cli/-/cli-19.0.3.tgz" - integrity sha512-mGhh/aYPib4Vy4h+AGRloMY+CqkmtdeKPV9poMcZeImF5e3knQ5VYaSeAM0mEzps1dbKsHvABwaDpafLUuM96g== + version "19.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.1.0.tgz#56d7baa098a29e2a909b46e35021f2ab68ec5a51" + integrity sha512-SYGm8HGbVzrlSYeB6oo6pG1Ec6bOMJcDsXgNGa4vgZQsPj6nJkcbTWlIRmtmIk0tHi0d5sCljGuQ+g/0NCPv7w== dependencies: "@commitlint/format" "^19.0.3" - "@commitlint/lint" "^19.0.3" - "@commitlint/load" "^19.0.3" + "@commitlint/lint" "^19.1.0" + "@commitlint/load" "^19.1.0" "@commitlint/read" "^19.0.3" "@commitlint/types" "^19.0.3" execa "^8.0.1" @@ -991,24 +991,24 @@ "@commitlint/types" "^19.0.3" semver "^7.6.0" -"@commitlint/lint@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/lint/-/lint-19.0.3.tgz" - integrity sha512-uHPyRqIn57iIplYa5xBr6oNu5aPXKGC4WLeuHfqQHclwIqbJ33g3yA5fIA+/NYnp5ZM2EFiujqHFaVUYj6HlKA== +"@commitlint/lint@^19.1.0": + version "19.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-19.1.0.tgz#0f4b26b1452d59a92a28b5fa6de9bdbee18399a1" + integrity sha512-ESjaBmL/9cxm+eePyEr6SFlBUIYlYpI80n+Ltm7IA3MAcrmiP05UMhJdAD66sO8jvo8O4xdGn/1Mt2G5VzfZKw== dependencies: "@commitlint/is-ignored" "^19.0.3" "@commitlint/parse" "^19.0.3" "@commitlint/rules" "^19.0.3" "@commitlint/types" "^19.0.3" -"@commitlint/load@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/load/-/load-19.0.3.tgz" - integrity sha512-18Tk/ZcDFRKIoKfEcl7kC+bYkEQ055iyKmGsYDoYWpKf6FUvBrP9bIWapuy/MB+kYiltmP9ITiUx6UXtqC9IRw== +"@commitlint/load@^19.1.0": + version "19.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-19.1.0.tgz#08403b6ea33e50b013dba0ab9631fd67fde67e30" + integrity sha512-rWqnvNDpeshX8JfUC/qjpDkQB78qF+4uHcJmIRJMwvlj6zWce08SP/TPKN3GlNKgXhAawwcAPxXL9qOTTdiOBA== dependencies: "@commitlint/config-validator" "^19.0.3" "@commitlint/execute-rule" "^19.0.0" - "@commitlint/resolve-extends" "^19.0.3" + "@commitlint/resolve-extends" "^19.1.0" "@commitlint/types" "^19.0.3" chalk "^5.3.0" cosmiconfig "^8.3.6" @@ -1041,10 +1041,10 @@ git-raw-commits "^4.0.0" minimist "^1.2.8" -"@commitlint/resolve-extends@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.0.3.tgz" - integrity sha512-18BKmta8OC8+Ub+Q3QGM9l27VjQaXobloVXOrMvu8CpEwJYv62vC/t7Ka5kJnsW0tU9q1eMqJFZ/nN9T/cOaIA== +"@commitlint/resolve-extends@^19.1.0": + version "19.1.0" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-19.1.0.tgz#fa5b8f921e9c8d76f53624c35bf25b9676bd73fa" + integrity sha512-z2riI+8G3CET5CPgXJPlzftH+RiWYLMYv4C9tSLdLXdr6pBNimSKukYP9MS27ejmscqCTVA4almdLh0ODD2KYg== dependencies: "@commitlint/config-validator" "^19.0.3" "@commitlint/types" "^19.0.3" From bd004f1959b6396aee6f49910137b98fe2e3ee75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 04:30:58 +0000 Subject: [PATCH 034/795] Bump prisma from 5.10.2 to 5.11.0 Bumps [prisma](https://github.com/prisma/prisma/tree/HEAD/packages/cli) from 5.10.2 to 5.11.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.11.0/packages/cli) --- updated-dependencies: - dependency-name: prisma dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 66 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index f08c02126e3..8804f9844dd 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -53,7 +53,7 @@ "mocha": "10.3.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.10.2" + "prisma": "5.11.0" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/yarn.lock b/yarn.lock index a04453c751a..e4da85e480a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1905,41 +1905,41 @@ resolved "https://registry.npmjs.org/@prisma/client/-/client-5.10.2.tgz" integrity sha512-ef49hzB2yJZCvM5gFHMxSFL9KYrIP9udpT5rYo0CsHD4P9IKj473MbhU1gjKKftiwWBTIyrt9jukprzZXazyag== -"@prisma/debug@5.10.2": - version "5.10.2" - resolved "https://registry.npmjs.org/@prisma/debug/-/debug-5.10.2.tgz" - integrity sha512-bkBOmH9dpEBbMKFJj8V+Zp8IZHIBjy3fSyhLhxj4FmKGb/UBSt9doyfA6k1UeUREsMJft7xgPYBbHSOYBr8XCA== +"@prisma/debug@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.11.0.tgz#80e3f9d5a8f678c67a8783f7fcdda3cbbb8dd091" + integrity sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A== -"@prisma/engines-version@5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9": - version "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9.tgz" - integrity sha512-uCy/++3Jx/O3ufM+qv2H1L4tOemTNqcP/gyEVOlZqTpBvYJUe0tWtW0y3o2Ueq04mll4aM5X3f6ugQftOSLdFQ== +"@prisma/engines-version@5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102": + version "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz#a7aa218b1ebf1077798c931632461aae8ce6a8f7" + integrity sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA== -"@prisma/engines@5.10.2": - version "5.10.2" - resolved "https://registry.npmjs.org/@prisma/engines/-/engines-5.10.2.tgz" - integrity sha512-HkSJvix6PW8YqEEt3zHfCYYJY69CXsNdhU+wna+4Y7EZ+AwzeupMnUThmvaDA7uqswiHkgm5/SZ6/4CStjaGmw== +"@prisma/engines@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.11.0.tgz#96e941c5c81ce68f3a8b4c481007d397564c5d4b" + integrity sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw== dependencies: - "@prisma/debug" "5.10.2" - "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - "@prisma/fetch-engine" "5.10.2" - "@prisma/get-platform" "5.10.2" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/fetch-engine" "5.11.0" + "@prisma/get-platform" "5.11.0" -"@prisma/fetch-engine@5.10.2": - version "5.10.2" - resolved "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.10.2.tgz" - integrity sha512-dSmXcqSt6DpTmMaLQ9K8ZKzVAMH3qwGCmYEZr/uVnzVhxRJ1EbT/w2MMwIdBNq1zT69Rvh0h75WMIi0mrIw7Hg== +"@prisma/fetch-engine@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz#cd7a2fa5b5d89f1da0689e329c56fa69223fba7d" + integrity sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w== dependencies: - "@prisma/debug" "5.10.2" - "@prisma/engines-version" "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9" - "@prisma/get-platform" "5.10.2" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/get-platform" "5.11.0" -"@prisma/get-platform@5.10.2": - version "5.10.2" - resolved "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.10.2.tgz" - integrity sha512-nqXP6vHiY2PIsebBAuDeWiUYg8h8mfjBckHh6Jezuwej0QJNnjDiOq30uesmg+JXxGk99nqyG3B7wpcOODzXvg== +"@prisma/get-platform@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.11.0.tgz#19a768127b1712c27f5dec8a0a79a4c9675829eb" + integrity sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw== dependencies: - "@prisma/debug" "5.10.2" + "@prisma/debug" "5.11.0" "@resvg/resvg-js-android-arm-eabi@2.6.0": version "2.6.0" @@ -11411,12 +11411,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.10.2: - version "5.10.2" - resolved "https://registry.npmjs.org/prisma/-/prisma-5.10.2.tgz" - integrity sha512-hqb/JMz9/kymRE25pMWCxkdyhbnIWrq+h7S6WysJpdnCvhstbJSNP/S6mScEcqiB8Qv2F+0R3yG+osRaWqZacQ== +prisma@5.11.0: + version "5.11.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.11.0.tgz#ef3891f79921a2deec6f540eba13a3cc8525f6d2" + integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== dependencies: - "@prisma/engines" "5.10.2" + "@prisma/engines" "5.11.0" proc-log@^3.0.0: version "3.0.0" From 9499da6b9534257d1505914c3102622cf95a68e6 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Wed, 13 Mar 2024 16:07:50 +0100 Subject: [PATCH 035/795] fix(markdown): Link Uma design measurements in documentation properly. Fixes #6246 --- markdown/org/docs/designs/uma/measurements/de.md | 4 +--- markdown/org/docs/designs/uma/measurements/en.md | 4 +--- markdown/org/docs/designs/uma/measurements/es.md | 4 +--- markdown/org/docs/designs/uma/measurements/fr.md | 4 +--- markdown/org/docs/designs/uma/measurements/nl.md | 4 +--- markdown/org/docs/designs/uma/measurements/uk.md | 4 +--- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/markdown/org/docs/designs/uma/measurements/de.md b/markdown/org/docs/designs/uma/measurements/de.md index faaf474efc5..d3b06ea62fe 100644 --- a/markdown/org/docs/designs/uma/measurements/de.md +++ b/markdown/org/docs/designs/uma/measurements/de.md @@ -2,6 +2,4 @@ title: "Uma Unterhosen: Erforderliche Maße" --- - -Uma benötigt keine Messungen - + diff --git a/markdown/org/docs/designs/uma/measurements/en.md b/markdown/org/docs/designs/uma/measurements/en.md index 999fdfafa69..cd8df4348fb 100644 --- a/markdown/org/docs/designs/uma/measurements/en.md +++ b/markdown/org/docs/designs/uma/measurements/en.md @@ -2,6 +2,4 @@ title: "Uma undies: Required Measurements" --- - -Uma does not require any measurements - + diff --git a/markdown/org/docs/designs/uma/measurements/es.md b/markdown/org/docs/designs/uma/measurements/es.md index c3a5a70b3e2..e58624d0ba2 100644 --- a/markdown/org/docs/designs/uma/measurements/es.md +++ b/markdown/org/docs/designs/uma/measurements/es.md @@ -2,6 +2,4 @@ title: "Ropa interior Uma: Medidas requeridas" --- - -Uma no necesita ninguna medida - + diff --git a/markdown/org/docs/designs/uma/measurements/fr.md b/markdown/org/docs/designs/uma/measurements/fr.md index 0f32a3b987a..b019f708a0a 100644 --- a/markdown/org/docs/designs/uma/measurements/fr.md +++ b/markdown/org/docs/designs/uma/measurements/fr.md @@ -2,6 +2,4 @@ title: "Sous-vêtements Uma : Mesures requises" --- - -Uma ne nécessite aucune mesure - + diff --git a/markdown/org/docs/designs/uma/measurements/nl.md b/markdown/org/docs/designs/uma/measurements/nl.md index 71c25af46a8..6bb1da62c5b 100644 --- a/markdown/org/docs/designs/uma/measurements/nl.md +++ b/markdown/org/docs/designs/uma/measurements/nl.md @@ -2,6 +2,4 @@ title: "Uma ondergoed: Vereiste afmetingen" --- - -Uma heeft geen metingen nodig - + diff --git a/markdown/org/docs/designs/uma/measurements/uk.md b/markdown/org/docs/designs/uma/measurements/uk.md index 13049083de2..8f87b07121f 100644 --- a/markdown/org/docs/designs/uma/measurements/uk.md +++ b/markdown/org/docs/designs/uma/measurements/uk.md @@ -2,6 +2,4 @@ title: "Ума роздягається: Необхідні виміри" --- - -Ума не потребує жодних вимірів - + From ba1977ddc54a938864e573ae8509a1f368e156ce Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Wed, 13 Mar 2024 16:30:40 +0100 Subject: [PATCH 036/795] fix(shared): Allow bookmarking measurement sets from other users. Fixes #6321 --- sites/shared/components/account/sets.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index c035218c637..1863e1ed639 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -340,7 +340,7 @@ export const Mset = ({ id, publicOnly = false }) => { ) : ( )} - {account.control > 2 && mset.userId === account.id ? ( + {account.control > 2 ? ( ) : null} + {loading ? : } From 3971f9a710ae4e7adaa2238ddd812f92dcc0a2a3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 16 Mar 2024 17:21:47 +0100 Subject: [PATCH 066/795] Update source file en.md skip-build --- markdown/org/showcase/an-early-bee-bikini-top/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/an-early-bee-bikini-top/en.md b/markdown/org/showcase/an-early-bee-bikini-top/en.md index 5da1d834dd7..df9c9ca6816 100644 --- a/markdown/org/showcase/an-early-bee-bikini-top/en.md +++ b/markdown/org/showcase/an-early-bee-bikini-top/en.md @@ -1,5 +1,5 @@ --- -maker: "unknown" +author: 8 caption: "An early Bee bikini top" date: "2021-10-18" intro: "A FreeSewing maker made this Bee bikini top. She used the default settings and reported a great fit with no gaping/coverage issues, but mentioned that she typically does not need a lot of support." From 7012f0c08f0631bf0dcb199ddfa06d2d883363af Mon Sep 17 00:00:00 2001 From: Rachel Ostic <65781290+rachelostic@users.noreply.github.com> Date: Sat, 16 Mar 2024 16:28:19 -0400 Subject: [PATCH 067/795] Add author tag --- markdown/org/showcase/rostic-wahid/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/rostic-wahid/en.md b/markdown/org/showcase/rostic-wahid/en.md index b2e1b060c78..3566446d42b 100644 --- a/markdown/org/showcase/rostic-wahid/en.md +++ b/markdown/org/showcase/rostic-wahid/en.md @@ -1,5 +1,6 @@ --- maker: "rostic" +author: 23524 caption: "This lovely Wahid was made from floral cotton" date: "2022-01-22" intro: "Rostic made this great Wahid waistcoat! You won't want to miss the detail pictures below." From a98b869175381703fd694e5a44cceed72b6d5890 Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Sat, 16 Mar 2024 21:06:19 +0000 Subject: [PATCH 068/795] More tutorial updates --- .../pattern-design/part2/adding-measurements/en.md | 2 +- .../pattern-design/part2/avoiding-overlap/en.md | 11 ++++++++--- .../pattern-design/part2/creating-the-closure/en.md | 7 +++++-- .../part2/drawing-the-bib-outline/en.md | 8 ++++++-- .../pattern-design/part2/rounding-the-corners/en.md | 2 ++ .../pattern-design/part2/shaping-the-straps/en.md | 5 ++++- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md b/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md index 2d57ecf62e7..0922e62750c 100644 --- a/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md @@ -25,7 +25,7 @@ I am using [*the official name* of the measurement](/reference/measurements) her circumference, that name is `head`. -The `design/src/bib.mjs` "language" title is out of date. It is used in the tutorial from this point forward to maintain syntax-highlight not yet available for the `src/bib.mjs` title, but should be replaced with `src/bib.mjs`. +The `design/src/bib.mjs` "language" title on the code snippets is out of date. It is used in the tutorial from this point forward to maintain syntax-highlight not yet available for the `src/bib.mjs` title, but should be replaced with `src/bib.mjs`. ```design/src/bib.mjs diff --git a/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md b/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md index 703976fb661..684d36ddc77 100644 --- a/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md @@ -53,7 +53,7 @@ we'll capture these return values from the `round` macros and create easy-to-remember points from them: -```src/bib.mjs +```design/src/bib.mjs function draftBib({ Path, Point, @@ -61,7 +61,9 @@ function draftBib({ points, measurements, options, +// highlight-start utils, +// highlight-end macro, part, }) { @@ -126,7 +128,9 @@ function draftBib({ .close() .addClass('fabric') - // Drawing the bib outline + /* + * Drawing the bib outline + */ const width = measurements.head * options.widthRatio const length = measurements.head * options.lengthRatio @@ -169,6 +173,7 @@ function draftBib({ points.tipRightTop = new Point(points.tipRight.x, points.edgeTop.y) points.tipRightBottom = new Point(points.tipRight.x, points.top.y) + // highlight-start /* * Macros will return the auto-generated IDs */ @@ -197,7 +202,7 @@ function draftBib({ points[`${side}${utils.capitalize(id)}`] = points[ids1[side].points[id]].copy() } } - + // highlight-end /* * Always draw your path at the end * after you've manipulated your points diff --git a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md index 7715728eadd..5e82b6e65b2 100644 --- a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md @@ -27,7 +27,7 @@ Like our neck opening, we've only drawn half since we can simply copy the points to the other side. -```src/bib.mjs +```design/src/bib.mjs function draftBib({ Path, Point, @@ -35,7 +35,9 @@ function draftBib({ points, measurements, options, + // highlight-start macro, + // highlight-end part, }) { @@ -149,6 +151,7 @@ function draftBib({ .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) .close() + // highlight-start // Round the straps const strap = points.edgeTop.dy(points.top) @@ -170,7 +173,7 @@ function draftBib({ via: points.tipRightBottom, hide: false }) - + // highlight-end return part } ``` diff --git a/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md b/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md index b38f1227944..175f4cbc829 100644 --- a/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/drawing-the-bib-outline/en.md @@ -6,7 +6,7 @@ order: 88 With our neck opening in place, let us draw the basic outline of our bib. -```src/bib.mjs +```design/src/bib.mjs function draftBib({ Path, Point, @@ -75,7 +75,10 @@ function draftBib({ .close() .addClass('fabric') - // Drawing the bib outline +// highlight-start + /* + * Drawing the bib outline + */ const width = measurements.head * options.widthRatio const length = measurements.head * options.lengthRatio @@ -95,6 +98,7 @@ function draftBib({ .line(points.topLeft) .close() .addClass('fabric') +// highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md b/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md index 26189ce4eef..6b889b73227 100644 --- a/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md @@ -8,6 +8,8 @@ We already know how to round corners, we'll have the `round` macro take care of With our corners rounded, we should also update our path. Fortunately, we merely have to update the start of it. +We'll rename `paths.rect` to `paths.seam`. + ```design/src/bib.mjs function draftBib({ diff --git a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md index e86b59b142a..e291b121287 100644 --- a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md @@ -17,7 +17,7 @@ As always, [the API docs](/reference/api/point/) have all the details. -```src/bib.mjs +```design/src/bib.mjs function draftBib({ Path, Point, @@ -111,6 +111,7 @@ function draftBib({ .close() .addClass('fabric') +// highlight-start /* * Shape the straps */ @@ -138,6 +139,8 @@ function draftBib({ .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) .close() +// highlight-end + return part } ``` From 23b87ad20861c47697e7b9e68b156c8c68388860 Mon Sep 17 00:00:00 2001 From: Benjamin Fan Date: Sat, 16 Mar 2024 21:39:31 -0700 Subject: [PATCH 069/795] fix(markdown): Typo in doc for utils.beamIntersectsCurve() --- markdown/dev/reference/api/utils/beamintersectscurve/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/dev/reference/api/utils/beamintersectscurve/en.md b/markdown/dev/reference/api/utils/beamintersectscurve/en.md index 16d4d102319..a27527e2b16 100644 --- a/markdown/dev/reference/api/utils/beamintersectscurve/en.md +++ b/markdown/dev/reference/api/utils/beamintersectscurve/en.md @@ -4,7 +4,7 @@ title: utils.beamIntersectsCurve() The `utils.beamIntersectsCurve()` function finds the intersection between an endless line and a curve described by points -`start`, `cp1`, `cp2, and `end\`. +`start`, `cp1`, `cp2`, and `end`. From 1506975447ccb868859a7a49b98881c2dff48191 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 11:18:21 +0100 Subject: [PATCH 070/795] feat(shared): Support import/clone of measuremnts set --- sites/org/pages/account/import.mjs | 59 +++++++++++ sites/shared/components/account/en.yaml | 14 +++ sites/shared/components/account/import.mjs | 109 +++++++++++++++++++++ sites/shared/components/account/links.mjs | 17 +++- sites/shared/components/account/sets.mjs | 43 ++++++++ sites/shared/components/icons.mjs | 6 ++ sites/shared/components/inputs.mjs | 67 ++++++++++++- sites/shared/components/mdx/highlight.mjs | 2 +- sites/shared/components/mdx/meta.mjs | 8 -- sites/shared/components/yaml.mjs | 4 +- sites/shared/hooks/use-account.mjs | 2 +- 11 files changed, 314 insertions(+), 17 deletions(-) create mode 100644 sites/org/pages/account/import.mjs create mode 100644 sites/shared/components/account/import.mjs diff --git a/sites/org/pages/account/import.mjs b/sites/org/pages/account/import.mjs new file mode 100644 index 00000000000..50b3d1ce376 --- /dev/null +++ b/sites/org/pages/account/import.mjs @@ -0,0 +1,59 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as setsNs } from 'shared/components/account/bookmarks.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, authNs, pageNs) + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicImporter = dynamic( + () => import('shared/components/account/import.mjs').then((mod) => mod.Importer), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const AccountImporterPage = ({ page }) => { + const { t } = useTranslation(ns) + + return ( + + + + + + ) +} + +export default AccountImporterPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'import'], + }, + }, + } +} diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index aa929831353..ad51802e334 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -58,6 +58,7 @@ updatePattern: Update pattern reload: Reload account export: Export your data +import: Import data exportMsg: Click below to export your personal data exportNote: The EU's General Data Protection Regulation (GDPR) ensures your so-called right to data portability — the right to obtain and reuse your personal data for your own purposes, or across different services. exportDownload: "Your data was exported and is available for download at the following location:" @@ -333,3 +334,16 @@ ownPublicPattern: This is the public view on one of your own patterns. For more ownPrivatePattern: This is the private view on your pattern. The public view will work for you even when the pattern is private. It will only work for others when the pattern is public. privateView: Private view publicView: Public view + +importHere: This page allows you to import data into your FreeSewing account. +importSupported: Currently, we support importing the following types of data +importSets: Import Measurements Sets +importSet: Import Measurements Set +cloneSet: Clone Measurements Set +measieFile: Measurements file +dragAndDropFileHere: Drag and drop your file here +importSetTip1: To import a measurement set, you should have a JSON or YAML file that has the following structure +importSetTip2: Your file can either contain a single measurements set, or an array of multiple measurements sets. +importing: Importing +imported: Imported +importFailed: Import failed diff --git a/sites/shared/components/account/import.mjs b/sites/shared/components/account/import.mjs new file mode 100644 index 00000000000..763bb2766b1 --- /dev/null +++ b/sites/shared/components/account/import.mjs @@ -0,0 +1,109 @@ +// Dependencies +import { useState, useContext } from 'react' +import { useTranslation } from 'next-i18next' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Hooks +import { useAccount } from 'shared/hooks/use-account.mjs' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Components +import { Icons, welcomeSteps, BackToAccountButton } from './shared.mjs' +import { SaveSettingsButton } from 'shared/components/buttons/save-settings-button.mjs' +import { ContinueButton } from 'shared/components/buttons/continue-button.mjs' +import { FileInput } from 'shared/components/inputs.mjs' +import { DynamicMdx } from 'shared/components/mdx/dynamic.mjs' +import { TipIcon } from 'shared/components/icons.mjs' +import { Yaml } from 'shared/components/yaml.mjs' +import { Json } from 'shared/components/json.mjs' +import { Popout } from 'shared/components/popout/index.mjs' +import { linkClasses } from 'shared/components/link.mjs' + +export const ns = ['account', 'status'] + +export const Importer = () => { + // Hooks + const { account, setAccount } = useAccount() + const backend = useBackend() + const { t, i18n } = useTranslation(ns) + const { setLoadingStatus } = useContext(LoadingStatusContext) + + // State + const [setData, setSetData] = useState() + const [error, setError] = useState(false) + + // Helper method to upload/save a set + const uploadSet = async (upload) => { + setLoadingStatus([true, 'processingUpdate']) + let data + try { + const chunks = upload.split(',') + if (chunks[0].includes('json')) data = JSON.parse(atob(chunks[1])) + else data = yaml.parse(atob(chunks[1])) + setSetData(data) + if (!Array.isArray(data)) data = [data] + /* + * Treat each set + */ + for (const set of data) { + if (set.measurements) { + const name = set.name || 'J. Doe' + setLoadingStatus([true, `Importing ${name}`]) + const result = await backend.createSet({ + name: set.name || 'J. Doe', + units: set.units || 'metric', + notes: set.notes || '', + measies: set.measurements || {}, + userId: account.id, + }) + if (result.success) setLoadingStatus([true, `Imported ${name}`, true, true]) + else setLoadingStatus([true, `Import of ${name} failed`, true, false]) + } + } + } catch (err) { + setError(err) + console.log(err) + } + } + + return ( +
+

{t('account:importHere')}

+

{t('account:importSupported')}

+ +

{t('account:importSets')}

+ + +

{t('account:importSetTip1')}

+ +

{t('account:importSetTip2')}

+ +
+ ) +} diff --git a/sites/shared/components/account/links.mjs b/sites/shared/components/account/links.mjs index 921eccff0bf..bf7b96d8314 100644 --- a/sites/shared/components/account/links.mjs +++ b/sites/shared/components/account/links.mjs @@ -23,6 +23,7 @@ import { ShieldIcon, FingerprintIcon, GitHubIcon, + ImportIcon, InstagramIcon, MastodonIcon, TwitterIcon, @@ -40,6 +41,8 @@ import { BoolNoIcon, OkIcon, WrenchIcon, + UploadIcon, + DownloadIcon, } from 'shared/components/icons.mjs' import { cloudflareImageUrl, capitalize } from 'shared/utils.mjs' import { ControlScore } from 'shared/components/control/score.mjs' @@ -245,17 +248,23 @@ export const AccountLinks = () => {

{t('actions')}

{control > 2 && ( - - - {t('reload')} + + + {t('import')} )} {control > 2 && ( - + {t('export')} )} + {control > 2 && ( + + + {t('reload')} + + )} {control > 3 && ( diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index 1863e1ed639..7fbe9b44ff9 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -38,6 +38,7 @@ import { CsetIcon, BoolYesIcon, BoolNoIcon, + CloneIcon, } from 'shared/components/icons.mjs' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' import { Mdx } from 'shared/components/mdx/dynamic.mjs' @@ -310,6 +311,23 @@ export const Mset = ({ id, publicOnly = false }) => { } else setLoadingStatus([true, 'backendError', true, false]) } + const importSet = async () => { + setLoadingStatus([true, t('account.importing')]) + // Compile data + const data = { + ...mset, + userId: account.id, + measies: { ...mset.measies }, + } + delete data.img + const result = await backend.createSet(data) + if (result.success) { + setMset(result.data.set) + setEdit(false) + setLoadingStatus([true, 'nailedIt', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } + const docs = {} for (const option of ['name', 'units', 'public', 'notes', 'image']) { docs[option] = @@ -340,6 +358,14 @@ export const Mset = ({ id, publicOnly = false }) => { ) : ( )} + {account.control > 2 && mset.public && mset.userId !== account.id ? ( + + ) : null} {account.control > 2 ? ( ) : null} @@ -402,6 +428,14 @@ export const Mset = ({ id, publicOnly = false }) => { )} )} + {account.control > 2 && mset.userId === account.id ? ( + + ) : null}
@@ -723,6 +757,15 @@ export const Sets = () => { {sets.length > 0 ? ( <>

+ + + {t('account:importSets')} + ( ) +export const ImportIcon = (props) => ( + + + +) + export const IncludeIcon = (props) => ( diff --git a/sites/shared/components/inputs.mjs b/sites/shared/components/inputs.mjs index 7b2f69fd9f3..b546cb580d7 100644 --- a/sites/shared/components/inputs.mjs +++ b/sites/shared/components/inputs.mjs @@ -529,8 +529,8 @@ export const MeasieInput = ({ typeof original === 'undefined' ? original : isDegree - ? Number(original) - : measurementAsUnits(original, units) + ? Number(original) + : measurementAsUnits(original, units) ) const [validatedVal, setValidatedVal] = useState(measurementAsUnits(original, units)) const [valid, setValid] = useState(null) @@ -587,3 +587,66 @@ export const MeasieInput = ({ ) } + +export const FileInput = ({ + label, // The label + valid = () => true, // Method that should return whether the value is valid or not + update, // The onChange handler + current, // The current value + original, // The original value + id = '', // An id to tie the input to the label + dropzoneConfig = {}, // Configuration for react-dropzone +}) => { + /* + * Ondrop handler + */ + const onDrop = useCallback( + (acceptedFiles) => { + const reader = new FileReader() + reader.onload = async () => update(reader.result) + acceptedFiles.forEach((file) => reader.readAsDataURL(file)) + }, + [update] + ) + + /* + * Dropzone hook + */ + const { getRootProps, getInputProps } = useDropzone({ onDrop, ...dropzoneConfig }) + + /* + * If we have a current file, return this + */ + if (current) + return ( + +

+ +
+ + ) + + /* + * Return upload form + */ + return ( + +
+ +

Drag and drop your file here

+ +
+ + ) +} diff --git a/sites/shared/components/mdx/highlight.mjs b/sites/shared/components/mdx/highlight.mjs index 94de2efc05d..4ae4540d39c 100644 --- a/sites/shared/components/mdx/highlight.mjs +++ b/sites/shared/components/mdx/highlight.mjs @@ -39,7 +39,7 @@ export const Highlight = (props) => { px-4 py-1 mb-2 lg:text-sm `} > - {names[language] ? names[language] : language} + {props.title ? props.title : names[language] ? names[language] : language} {status ? : } 
{props.children}
diff --git a/sites/shared/components/mdx/meta.mjs b/sites/shared/components/mdx/meta.mjs index 0d32e54a8dd..70b4552bb51 100644 --- a/sites/shared/components/mdx/meta.mjs +++ b/sites/shared/components/mdx/meta.mjs @@ -74,14 +74,6 @@ export const MdxMetaData = ({ frontmatter, locale, slug }) => { frontmatter.maintainers = ['joostdecock'] locale = i18n.language - /* - * FIXME - * - * The link to the translator status pages on this page links to - * next.freesewing.org because this content is not available on the current - * freesewing.org. - */ - return (
{localControl > 2 && ( diff --git a/sites/shared/components/yaml.mjs b/sites/shared/components/yaml.mjs index 3a76c3324c8..af8e5447b65 100644 --- a/sites/shared/components/yaml.mjs +++ b/sites/shared/components/yaml.mjs @@ -9,5 +9,7 @@ export const Yaml = (props) => { else if (props.js) code = yaml.dump(props.js) else code = props.children - return + return ( + + ) } diff --git a/sites/shared/hooks/use-account.mjs b/sites/shared/hooks/use-account.mjs index 3958d961e69..9af79fddd8b 100644 --- a/sites/shared/hooks/use-account.mjs +++ b/sites/shared/hooks/use-account.mjs @@ -55,6 +55,6 @@ export function useAccount() { clearAdmin, impersonate, stopImpersonating, - control: account.control || 2, + control: account?.control || 2, } } From 42ff051b2f3ecb313d1dd52056ac78dbc5702b40 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 11:18:35 +0100 Subject: [PATCH 071/795] chore: Author update --- config/authors.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/authors.mjs b/config/authors.mjs index 7b802ee7dc2..c9dc6fef527 100644 --- a/config/authors.mjs +++ b/config/authors.mjs @@ -15,6 +15,7 @@ export const authors = { 'Prof. dr. Sorcha Ní Dhubhghaill': { id: 9, name: 'Prof. dr. Sorcha Ní Dhubhghaill' }, woutervdub: { id: 132, name: 'Wouter van Wageningen' }, tangerineshark: { id: 13050, name: 'tangerineshark' }, + Zee: { id: 13460, name: 'Zee' }, Natalia: { id: 19867, name: 'Natalia Sayang' }, // The old guard @@ -46,7 +47,6 @@ export const authors = { */ 'Annie Kao': { id: 8, name: 'Annie Kao' }, Bart: { id: 8, name: 'Bart' }, - Zee: { id: 8, name: 'Zee' }, 'James Bradbury': { id: 8, name: 'James Bradbury' }, 'Glenn Matthews': { id: 8, name: 'Glenn Matthews' }, 'Raphael Sizemore': { id: 8, name: 'Raphael Sizemore' }, From 13a56a3a80cde1fc91009bb1418dfc03eea34002 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:20:58 +0000 Subject: [PATCH 072/795] docs: update CONTRIBUTORS.md [skip ci] --- CONTRIBUTORS.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 96094770cbe..d4a465bbda1 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -100,68 +100,69 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Quentin FELIX
Quentin FELIX
💻 🎨 + Rachel Ostic
Rachel Ostic
📖 Rik Hekker
Rik Hekker
🐛 Sam Livingston-Gray
Sam Livingston-Gray
📖 Sanne
Sanne
💻 📖 Sara Latorre
Sara Latorre
🌍 SeaZeeZee
SeaZeeZee
📖 💻 - SimonbJohnson
SimonbJohnson
🐛 + SimonbJohnson
SimonbJohnson
🐛 SirCharlotte
SirCharlotte
🌍 Slylele
Slylele
📖 🌍 Soazillon
Soazillon
🌍 Soham Tembhurne
Soham Tembhurne
💻 SoneaTheBest
SoneaTheBest
🌍 Sophia
Sophia
💻 - Stefan Sydow
Stefan Sydow
🌍 📖 💻 + Stefan Sydow
Stefan Sydow
🌍 📖 💻 Stefano
Stefano
📖 Sushmita Biswas
Sushmita Biswas
💻 Tanay Toshniwal
Tanay Toshniwal
💻 Trent Trama
Trent Trama
💻 Tríona
Tríona
📖 Unmutual
Unmutual
📖 - Vili Sinervä
Vili Sinervä
💻 + Vili Sinervä
Vili Sinervä
💻 Vili Sinervä
Vili Sinervä
💻 Wouter van Wageningen
Wouter van Wageningen
💻 🎨 🔧 Yash Anil Ambekar
Yash Anil Ambekar
📖 amysews
amysews
📖 anna-puk
anna-puk
💻 beautifulsummermoon
beautifulsummermoon
🌍 - berce
berce
📖 + berce
berce
📖 biou
biou
💻 bobgeorgethe3rd
bobgeorgethe3rd
💻 📖 🎨 brmlyklr
brmlyklr
📖 chri5b
chri5b
💻 ⚠️ dingcycle
dingcycle
🌍 drowned-in-books
drowned-in-books
💬 - econo202
econo202
📖 + econo202
econo202
📖 ericamattos
ericamattos
🌍 evilrobotfromouterspace
evilrobotfromouterspace
🐛 fightingrabbit
fightingrabbit
💻 gaylyndie
gaylyndie
📖 grimlokason
grimlokason
💻 hellgy
hellgy
🎨 - jackseye
jackseye
📖 + jackseye
jackseye
📖 marckiesel
marckiesel
🌍 marpants
marpants
💻 mergerg
mergerg
📖 mesil
mesil
🐛 starfetch
starfetch
💻 📖 🌍 🎨 timorl
timorl
💻 - ttimearl
ttimearl
🖋 + ttimearl
ttimearl
🖋 tuesgloomsday
tuesgloomsday
📖 valadaptive
valadaptive
💻 viocky
viocky
🌍 From 50cebff5920352bbe7d7e8ecfeef920f8ebbecf0 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 17 Mar 2024 10:20:59 +0000 Subject: [PATCH 073/795] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index fed4b15978d..b675311ba4b 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1158,6 +1158,15 @@ "contributions": [ "code" ] + }, + { + "login": "rachelostic", + "name": "Rachel Ostic", + "avatar_url": "https://avatars.githubusercontent.com/u/65781290?v=4", + "profile": "https://rachel.ostic.ca", + "contributions": [ + "doc" + ] } ], "skipCi": true, From 4f50920e4f4245dc82fd8061cf09ecf76006f857 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 11:24:12 +0100 Subject: [PATCH 074/795] chore: Changelog update for #6340 --- config/changelog.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/changelog.yaml b/config/changelog.yaml index 152b3645ad4..b56785b65bc 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -12,6 +12,8 @@ Unreleased: - Always load plugin-bust due to its changes in how it handle conditionality. tamiko: - Always load plugin-bust due to its changes in how it handle conditionality. + wahid: + - Add a warning when waist and hip reduction are both zero, so no back dart is required Deprecated: plugin-bust: From 6f069efd11e998d9b356463298978f4ff0e3cb4e Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 11:36:53 +0100 Subject: [PATCH 075/795] chore: Handle YAML/JSON export for own sets. Closes #6329 --- sites/shared/components/account/sets.mjs | 34 +++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index 7fbe9b44ff9..3b5854fc15f 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -25,6 +25,8 @@ import { ModalContext } from 'shared/context/modal-context.mjs' import { Popout } from 'shared/components/popout/index.mjs' import { BackToAccountButton } from './shared.mjs' import { AnchorLink, PageLink, Link } from 'shared/components/link.mjs' +import { Json } from 'shared/components/json.mjs' +import { Yaml } from 'shared/components/yaml.mjs' import { OkIcon, NoIcon, @@ -340,7 +342,7 @@ export const Mset = ({ id, publicOnly = false }) => {
- {account.control > 3 && mset.public ? ( + {account.control > 3 && mset.public && mset.userId !== account.id ? (
{ ) : ( )} + {account.control > 3 && mset.userId === account.id ? ( +
+ + +
+ ) : ( + + )} {account.control > 2 && mset.public && mset.userId !== account.id ? ( +
{mset.public && ( @@ -540,6 +544,28 @@ export const Mset = ({ id, publicOnly = false }) => { )} {control >= controlLevels.sets.id && {mset.id}} + + {Object.keys(mset.measies).length > 0 && ( + <> +

{t('measies')}

+ setDisplayAsMetric(!displayAsMetric)} + current={displayAsMetric} + /> + {Object.entries(mset.measies).map(([m, val]) => + val > 0 ? ( + } + key={m} + > + {t(m)} + + ) : null + )} + + )}
) diff --git a/sites/shared/components/inputs.mjs b/sites/shared/components/inputs.mjs index b546cb580d7..3aeb020c027 100644 --- a/sites/shared/components/inputs.mjs +++ b/sites/shared/components/inputs.mjs @@ -650,3 +650,40 @@ export const FileInput = ({ ) } + +/* + * Input for booleans + */ +export const ToggleInput = ({ + label, // Label to use + update, // onChange handler + current, // The current value + disabled = false, // Allows rendering a disabled view + list = [true, false], // The values to chose between + labels = ['Yes', 'No'], // The labels for the values + on = true, // The value that should show the toggle in the 'on' state + id = '', // An id to tie the input to the label + labelTR = false, // Top-Right label + labelBL = false, // Bottom-Left label + labelBR = false, // Bottom-Right label +}) => ( + + update(list.indexOf(current) === 0 ? list[1] : list[0])} + className="toggle my-3 toggle-primary" + checked={list.indexOf(current) === 0 ? true : false} + /> + +) From 1f2efcdd8283cc17f74d75747471b08ecaef6851 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 17:02:00 +0100 Subject: [PATCH 090/795] fix(shared): Include conditional options in docs Closes #6121 This adds an extra parameter to the method that generated the menu structure for options to include all options. Which means that conditional options will be sorted under a 'conditional' menu heading. --- .../org/docs/designs/brian/options/draftforhighbust/en.md | 4 ++-- sites/shared/components/designs/info.mjs | 2 +- sites/shared/components/workbench/en.yaml | 1 + sites/shared/utils.mjs | 6 ++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/en.md b/markdown/org/docs/designs/brian/options/draftforhighbust/en.md index 1e3e20a59c3..07e73c86b57 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/en.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/en.md @@ -1,8 +1,8 @@ --- -title: undefined +title: Draft for high bust --- -undefined +Draft the pattern for the high bust measurement (if available) rather than the (full) chest. This will result in a more fitted garment for people with breasts. diff --git a/sites/shared/components/designs/info.mjs b/sites/shared/components/designs/info.mjs index ef63bdd2114..bd855033b95 100644 --- a/sites/shared/components/designs/info.mjs +++ b/sites/shared/components/designs/info.mjs @@ -59,7 +59,7 @@ const OptionGroup = ({ id, group, t, design }) => ( ) export const SimpleOptionsList = ({ options, t, design }) => { - const structure = optionsMenuStructure(options, {}) + const structure = optionsMenuStructure(options, {}, true) const output = [] for (const [key, entry] of Object.entries(structure)) { const shared = { key, t, design, id: key } diff --git a/sites/shared/components/workbench/en.yaml b/sites/shared/components/workbench/en.yaml index a36cd235bfc..345443782e3 100644 --- a/sites/shared/components/workbench/en.yaml +++ b/sites/shared/components/workbench/en.yaml @@ -23,6 +23,7 @@ clearTimingData: Clear timing data closure: Closure collar: Collar columns: columns +conditional: Conditional configurePattern: Configure pattern construction: Construction continueEditingTitle: Continue editing diff --git a/sites/shared/utils.mjs b/sites/shared/utils.mjs index 26d8377efc7..84e8ce1ff14 100644 --- a/sites/shared/utils.mjs +++ b/sites/shared/utils.mjs @@ -190,7 +190,7 @@ export const measurementAsMm = (value, units = 'metric') => { } } -export const optionsMenuStructure = (options, settings) => { +export const optionsMenuStructure = (options, settings, asFullList = false) => { if (!options) return options const sorted = {} for (const [name, option] of Object.entries(options)) { @@ -205,7 +205,9 @@ export const optionsMenuStructure = (options, settings) => { option.dflt = option.dflt || option[oType] if (oType === 'pct') option.dflt /= 100 if (typeof option.menu === 'function') - option.menu = option.menu(settings, mergeOptions(settings, options)) + option.menu = asFullList + ? 'conditional' + : option.menu(settings, mergeOptions(settings, options)) if (option.menu) { // Handle nested groups that don't have any direct children if (option.menu.includes('.')) { From cfe633d438b31da4f4822766c141abadfd6c363a Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 17:15:40 +0100 Subject: [PATCH 091/795] chore(backend): Keep userId in public sets --- sites/backend/src/models/set.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/sites/backend/src/models/set.mjs b/sites/backend/src/models/set.mjs index e44d11112db..4a75662ed2d 100644 --- a/sites/backend/src/models/set.mjs +++ b/sites/backend/src/models/set.mjs @@ -377,7 +377,6 @@ SetModel.prototype.asPublicSet = function () { about: 'Contains measurements in mm as well as metadata', ...this.asSet(), } - delete data.userId data.measurements = data.measies delete data.measies data.units = data.imperial ? 'imperial' : 'metric' From 6bd3009e9fb4292286a89f076b1810c4d0147cf5 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 17:16:08 +0100 Subject: [PATCH 092/795] chore(shared): Show JSON/YAML buttons on public sets --- sites/shared/components/account/sets.mjs | 30 +++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/sites/shared/components/account/sets.mjs b/sites/shared/components/account/sets.mjs index 9a0890d6e6f..8a9463e6b5e 100644 --- a/sites/shared/components/account/sets.mjs +++ b/sites/shared/components/account/sets.mjs @@ -353,7 +353,7 @@ export const Mset = ({ id, publicOnly = false }) => {
- {account.control > 3 && mset.public && mset.userId !== account.id ? ( + {account.control > 2 && mset.public && mset.userId !== account.id ? ( - + {mset.userId === account.id && ( + +
+ {mset.public ? ( + + ) : ( + + )} + +
+ + )} {mset.public && ( From 32a95de88cf201d906a395f670260baf53e223c4 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 17:16:30 +0100 Subject: [PATCH 093/795] chore(shared): Set control of anon users to 3 --- sites/shared/hooks/use-account.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/hooks/use-account.mjs b/sites/shared/hooks/use-account.mjs index 9af79fddd8b..4198f2d8ecb 100644 --- a/sites/shared/hooks/use-account.mjs +++ b/sites/shared/hooks/use-account.mjs @@ -4,7 +4,7 @@ import useLocalStorageState from 'use-local-storage-state' /* * Make it possible to always check for account.username and account.control */ -const noAccount = { username: false, control: 2 } +const noAccount = { username: false, control: 3 } /* * The useAccount hook From 789a5109b26b73a98544d9ef0d2f2b1956c43979 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 17:59:58 +0100 Subject: [PATCH 094/795] New translations en.yaml (French) skip-build --- sites/shared/components/account/fr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/fr.yaml b/sites/shared/components/account/fr.yaml index c5e6f8a71aa..cc7e7a2c3c3 100644 --- a/sites/shared/components/account/fr.yaml +++ b/sites/shared/components/account/fr.yaml @@ -123,6 +123,7 @@ metricUnitsd: Choisis cette option si tu préfères les centimètres aux pouces. imperialUnits: Unités impériales (pouces) imperialUnitsd: Choisis cette option si tu préfères les pouces aux centimètres. unitsTitle: Quelles sont les unités que tu préfères ? +displayUnits: Display units #username usernameTitle: Quel nom d'utilisateur aimerais-tu ? usernameAvailable: Le nom d'utilisateur est disponible @@ -247,6 +248,8 @@ csetNameMsg: Chaque ensemble curaté a un nom. Tu peux proposer ton propre nom o missing: Manquant andMore: et plus unitsMustSave: "Remarque : tu dois enregistrer après avoir modifié les unités pour que le changement prenne effet sur cette page." +makePublic: Make public +makePrivate: Make private patternNew: Génère un nouveau modèle patternNewInfo: Choisis un modèle, ajoute ton jeu de mesures, et nous générerons pour toi un patron de couture sur mesure. designNew: Créer un nouveau dessin From e2709b144cc30426b3659a5fc8256e523e2e31e4 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 18:01:43 +0100 Subject: [PATCH 095/795] feat(shared): Add bookmark button to pattern view. Fixes #6322 --- sites/shared/components/account/patterns.mjs | 31 +++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/patterns.mjs b/sites/shared/components/account/patterns.mjs index edcc4f79b64..c5415d7bee1 100644 --- a/sites/shared/components/account/patterns.mjs +++ b/sites/shared/components/account/patterns.mjs @@ -42,6 +42,7 @@ import { BoolNoIcon, LockIcon, PatternIcon, + BookmarkIcon, } from 'shared/components/icons.mjs' import { DisplayRow } from './shared.mjs' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' @@ -59,6 +60,7 @@ export const ShowPattern = ({ id }) => { const { setLoadingStatus } = useContext(LoadingStatusContext) const backend = useBackend() const { t, i18n } = useTranslation(ns) + const { account } = useAccount() // State const [pattern, setPattern] = useState() @@ -73,7 +75,7 @@ export const ShowPattern = ({ id }) => { result = await backend.getPattern(id) if (result.success) { setPattern(result.data.pattern) - setIsOwn(true) + if (result.data.pattern.userId === account.userId) setIsOwn(true) setLoadingStatus([true, 'backendLoadingCompleted', true, true]) } else { result = await backend.getPublicPattern(id) @@ -90,6 +92,26 @@ export const ShowPattern = ({ id }) => { if (id) getPattern() }, [id]) + const bookmarkPattern = async () => { + setLoadingStatus([true, 'creatingBookmark']) + const result = await backend.createBookmark({ + type: 'pattern', + title: pattern.name, + url: `/patterns?id=${pattern.id}`, + }) + if (result.success) { + const id = result.data.bookmark.id + setLoadingStatus([ + true, + <> + {t('status:bookmarkCreated')} [#{id}] + , + true, + true, + ]) + } else setLoadingStatus([true, 'backendError', true, false]) + } + if (!pattern) return

loading

return ( @@ -130,6 +152,13 @@ export const ShowPattern = ({ id }) => { + {account.id ? ( + + ) : null} Date: Sun, 17 Mar 2024 18:06:27 +0100 Subject: [PATCH 096/795] chore(markdown): Author update. Closes #6295 --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md index 6d6e703ec0c..d730ad2e06e 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A handsome pair of Bruce boxer briefs" date: "2022-04-27" intro: "FreeSewing maker Gaëlle made these handsome Bruce boxer briefs for a friend, with a little customisation. The result is excellent!" From 1fc0676115304f001d460eebf78df5b8b7fc81e9 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 18:09:18 +0100 Subject: [PATCH 097/795] chore(markdown): Author updates for Gaelle Closes #6294 Closes #6293 Closes #6292 Closes #6291 Closes #6290 Closes #6289 Closes #6288 Closes #6287 --- markdown/org/showcase/a-jaeger-and-charlie-set/en.md | 2 +- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md | 2 +- markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md | 2 +- markdown/org/showcase/hi-by-gaelle/en.md | 2 +- markdown/org/showcase/hugo-by-gaelle/en.md | 2 +- markdown/org/showcase/pyjama-paco-by-gaelle/en.md | 2 +- markdown/org/showcase/simone-by-gaelle/en.md | 2 +- markdown/org/showcase/tamiko-by-gaelle/en.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/en.md b/markdown/org/showcase/a-jaeger-and-charlie-set/en.md index 2cde7edf457..0557d8ba8b1 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/en.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger and Charlie in a fun corduroy fabric" date: "2023-05-03" intro: "This handsome Jaeger and Waralee set are made all with a cotton corduroy, and cupro lining." diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md index ab6bb9fa4d2..68958db0517 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A fashionable Hi" date: "2023-05-03" intro: "The color scheme, embroidered eyes, and tiny teeth are some of the details on this mini-Hi." diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md index cd5f343bfa0..bcfbf24f984 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "An Aaron with a lovely print" date: "2022-04-27" intro: "This attractive Aaron A-shirt was made by fearless sewist Gaëlle, who basically started sewing 10 days ago! It was done without a serger." diff --git a/markdown/org/showcase/hi-by-gaelle/en.md b/markdown/org/showcase/hi-by-gaelle/en.md index 2de3346733d..720e1926a53 100644 --- a/markdown/org/showcase/hi-by-gaelle/en.md +++ b/markdown/org/showcase/hi-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Made with jean fabric" date: "2022-07-29" intro: "Hi by Gaëlle" diff --git a/markdown/org/showcase/hugo-by-gaelle/en.md b/markdown/org/showcase/hugo-by-gaelle/en.md index 2bbe00d43e3..368396f9e20 100644 --- a/markdown/org/showcase/hugo-by-gaelle/en.md +++ b/markdown/org/showcase/hugo-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Gaëlle's friend in their new Hugo hoodie" date: "2023-02-15" intro: "Gaëlle made this Hugo covered in cheerful little ...well I'm not sure what to call these squiggly little monsters, but they're clearly great. It's for a friend, and we would be delighted to receive something this fabulous. Check out that awesome coordinated striped ribbing." diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/en.md b/markdown/org/showcase/pyjama-paco-by-gaelle/en.md index aeb5af8282e..56f95332812 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/en.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pyjama pants" date: "2022-12-11" intro: "Here’s a pyjama Paco by Gaëlle, without pockets or elasticated cuffs." diff --git a/markdown/org/showcase/simone-by-gaelle/en.md b/markdown/org/showcase/simone-by-gaelle/en.md index 366b654f25b..1b224d25b2a 100644 --- a/markdown/org/showcase/simone-by-gaelle/en.md +++ b/markdown/org/showcase/simone-by-gaelle/en.md @@ -4,7 +4,7 @@ caption: "A lovely Simone shirt with beautiful details" date: 20231017 intro: "This Simone shirt features beautiful details, including coordinated buttons and custom labels." designs: ["simone"] -maker: Natalia +author: 27669 --- The talented Gaëlle shared this Simone shirt. Don't miss the the detail photos. diff --git a/markdown/org/showcase/tamiko-by-gaelle/en.md b/markdown/org/showcase/tamiko-by-gaelle/en.md index 32829de2dc5..cfcaac7a2f3 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/en.md +++ b/markdown/org/showcase/tamiko-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A slightly customized Tamiko" date: "2022-06-09" intro: "Gaëlle made this lovely Tamiko for a friend!" From f47120134c6e18043f6b30a617170a6815340590 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 18:19:13 +0100 Subject: [PATCH 098/795] New translations en.yaml (Spanish) skip-build --- sites/shared/components/account/es.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/es.yaml b/sites/shared/components/account/es.yaml index d7c80f84d43..16e8048ac78 100644 --- a/sites/shared/components/account/es.yaml +++ b/sites/shared/components/account/es.yaml @@ -123,6 +123,7 @@ metricUnitsd: Elige esta opción si prefieres los centímetros a las pulgadas. imperialUnits: Unidades imperiales (pulgadas) imperialUnitsd: Elige esta opción si prefieres las pulgadas a los centímetros. unitsTitle: '¿Qué unidades prefieres?' +displayUnits: Display units #username usernameTitle: '¿Qué nombre de usuario te gustaría?' usernameAvailable: El nombre de usuario está disponible @@ -247,6 +248,8 @@ csetNameMsg: Cada conjunto curado tiene un nombre. Puedes sugerir tu propio nomb missing: Missing andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." +makePublic: Make public +makePrivate: Make private patternNew: Generar un nuevo patrón patternNewInfo: Elige un diseño, añade tu juego de medidas y generaremos un patrón de costura a medida para ti. designNew: Crear un nuevo diseño From ef775605ebeef1f9fd2971df556f4d17a6d24b09 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 18:38:25 +0100 Subject: [PATCH 099/795] New translations en.yaml (German) skip-build --- sites/shared/components/account/de.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/de.yaml b/sites/shared/components/account/de.yaml index dc7d4b1e3fb..e1b2c702704 100644 --- a/sites/shared/components/account/de.yaml +++ b/sites/shared/components/account/de.yaml @@ -123,6 +123,7 @@ metricUnitsd: Wähle dies, wenn du Zentimeter gegenüber Zoll bevorzugst. imperialUnits: Imperiale Einheiten (inch) imperialUnitsd: Wähle diese Option, wenn du Zoll statt Zentimeter bevorzugst. unitsTitle: Welche Einheiten bevorzugst du? +displayUnits: Display units #username usernameTitle: Welchen Benutzernamen hättest du gerne? usernameAvailable: Benutzername ist verfügbar @@ -247,6 +248,8 @@ csetNameMsg: Jedes kuratierte Set hat einen Namen. Du kannst deinen eigenen Name missing: Missing andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." +makePublic: Make public +makePrivate: Make private patternNew: Ein neues Muster generieren patternNewInfo: Wähle ein Design, füge deine Maße hinzu und wir erstellen ein maßgeschneidertes Nähmuster für dich. designNew: Ein neues Design erstellen From abf2e2129478e58c9a4592b117a476d3db8cb3c8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 18:57:20 +0100 Subject: [PATCH 100/795] New translations en.yaml (Dutch) skip-build --- sites/shared/components/account/nl.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/nl.yaml b/sites/shared/components/account/nl.yaml index 054c2c38662..a4e61e52e90 100644 --- a/sites/shared/components/account/nl.yaml +++ b/sites/shared/components/account/nl.yaml @@ -123,6 +123,7 @@ metricUnitsd: Kies deze optie als je de voorkeur geeft aan centimeters over duim imperialUnits: Imperiale (Engelse) eenheden (duim) imperialUnitsd: Kies deze optie als je de voorkeur geeft aan duimen boven centimeters. unitsTitle: Welke eenheden hebben jouw voorkeur? +displayUnits: Display units #username usernameTitle: Welke gebruikersnaam wil je? usernameAvailable: Gebruikersnaam is beschikbaar @@ -247,6 +248,8 @@ csetNameMsg: Elke gecureerde set heeft een naam. Je kunt je eigen naam of een ps missing: Missing andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." +makePublic: Make public +makePrivate: Make private patternNew: Een nieuw patroon genereren patternNewInfo: Kies een ontwerp, voeg je maatset toe en wij maken een naaipatroon op maat voor je. designNew: Een nieuw ontwerp creëren From 48c9bb63d9e8dba4eaebc15fcb189854f29b2a3b Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Sun, 17 Mar 2024 19:00:54 +0100 Subject: [PATCH 101/795] clarify documentation of waist-to-upper-leg measurement --- markdown/org/docs/measurements/waisttoupperleg/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/en.md b/markdown/org/docs/measurements/waisttoupperleg/en.md index 72cfda0c41f..f34060d60e7 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/en.md +++ b/markdown/org/docs/measurements/waisttoupperleg/en.md @@ -2,5 +2,5 @@ title: Waist to upper leg --- -The **waist to upper leg** is measured from your waist down to the top of your leg. Measure it at the side of your body. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Measure it at the side of your body. From b9b1e45e9ddb82e5b0792b22518196234265b8cb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:16:32 +0100 Subject: [PATCH 102/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/components/account/uk.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/uk.yaml b/sites/shared/components/account/uk.yaml index 392620576a4..ba12849400f 100644 --- a/sites/shared/components/account/uk.yaml +++ b/sites/shared/components/account/uk.yaml @@ -123,6 +123,7 @@ metricUnitsd: Виберіть це, якщо ви віддаєте перева imperialUnits: Імперські одиниці (дюйм) imperialUnitsd: Виберіть цей параметр, якщо ви віддаєте перевагу дюймам, а не сантиметрам. unitsTitle: Яким одиницям ви віддаєте перевагу? +displayUnits: Display units #username usernameTitle: Яке ім'я користувача ви б хотіли? usernameAvailable: Ім'я користувача доступне @@ -247,6 +248,8 @@ csetNameMsg: Кожна кураторська добірка має назву. missing: Missing andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." +makePublic: Make public +makePrivate: Make private patternNew: Створіть новий шаблон patternNewInfo: Виберіть дизайн, додайте свої мірки, і ми створимо для вас індивідуальну викрійку. designNew: Створіть новий дизайн From b354b189d63ce9d07d3c72fb9533ea4a40e30d77 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 19:19:56 +0100 Subject: [PATCH 103/795] feat(shared): Auto-generate jargon list. Closes #6102 --- markdown/dev/guides/markdown/jargon/en.md | 41 ++- markdown/dev/reference/terms/cjs/en.md | 1 + markdown/dev/reference/terms/esm/en.md | 1 + markdown/dev/reference/terms/variadic/en.md | 1 + markdown/org/docs/about/site/account/id/en.md | 2 + .../org/docs/about/site/account/role/en.md | 1 + .../docs/sewing/basic-sewing-supplies/en.md | 1 + markdown/org/docs/sewing/basting/en.md | 1 + markdown/org/docs/sewing/coverlock/en.md | 1 + markdown/org/docs/sewing/cutting/en.md | 1 + markdown/org/docs/sewing/darts/en.md | 1 + .../org/docs/sewing/double-welt-pockets/en.md | 1 + markdown/org/docs/sewing/ease/en.md | 1 + markdown/org/docs/sewing/edgestitching/en.md | 1 + markdown/org/docs/sewing/fabric-grain/en.md | 1 + .../org/docs/sewing/good-sides-together/en.md | 1 + markdown/org/docs/sewing/hemming/en.md | 1 + markdown/org/docs/sewing/hps/en.md | 1 + markdown/org/docs/sewing/jersey/en.md | 1 + markdown/org/docs/sewing/knit-fabric/en.md | 1 + markdown/org/docs/sewing/on-the-fold/en.md | 1 + markdown/org/docs/sewing/pinning/en.md | 1 + markdown/org/docs/sewing/rayon/en.md | 1 + markdown/org/docs/sewing/seam-allowance/en.md | 1 + markdown/org/docs/sewing/serger/en.md | 1 + markdown/org/docs/sewing/slipstitch/en.md | 1 + markdown/org/docs/sewing/topstitching/en.md | 1 + markdown/org/docs/sewing/trimming/en.md | 1 + markdown/org/docs/sewing/twin-needle/en.md | 1 + markdown/org/docs/sewing/zig-zag-stitch/en.md | 1 + sites/dev/components/jargon.mjs | 27 -- sites/org/components/jargon.mjs | 237 ------------------ sites/shared/components/mdx/index.mjs | 6 +- sites/shared/prebuild/markdown.mjs | 35 +++ 34 files changed, 109 insertions(+), 267 deletions(-) delete mode 100644 sites/dev/components/jargon.mjs delete mode 100644 sites/org/components/jargon.mjs diff --git a/markdown/dev/guides/markdown/jargon/en.md b/markdown/dev/guides/markdown/jargon/en.md index 8a445aa848a..87722e31cbc 100644 --- a/markdown/dev/guides/markdown/jargon/en.md +++ b/markdown/dev/guides/markdown/jargon/en.md @@ -8,9 +8,46 @@ jargon/terms for us. This page shows you how to use it. Think of jargon as glossary terms -## Defined terms +## Defining terms -The list of terminology that is defined differs from site to site: +To define a term, we need to establish a link between the term itself, and the documentation page that defines it. + +In the most common scenario, the term is the title of the page. +For example, the title of this page is `Using jargon and terms`: + +```mdx +--- +title: Using jargon and terms +--- +``` + +If we wanted to make it available as jargon, we only need to add the `jargon` frontmatter: + +```mdx +--- +title: Using jargon and terms +jargon: true +--- +``` + +## Multiple terms for the same page + +We can add additional terms that point to the same page by setting the `terms` in frontmatter to a comma-seperated list of terms. + +For example to make both `jargon` and `term` point to this page, we can do this: + + +```mdx +--- +title: Using jargon and terms +jargon: true +terms: jargon, term +--- +``` + +## Terminology per site + +The following pages show a list of all terminology per site: | Site | Terminology List | | ---- | ---------------- | diff --git a/markdown/dev/reference/terms/cjs/en.md b/markdown/dev/reference/terms/cjs/en.md index 67155f12abf..7d9da894f6d 100644 --- a/markdown/dev/reference/terms/cjs/en.md +++ b/markdown/dev/reference/terms/cjs/en.md @@ -1,5 +1,6 @@ --- title: cjs +jargon: true --- **cjs** stands for **CommonJS**. It is a module system for JavaScript that was diff --git a/markdown/dev/reference/terms/esm/en.md b/markdown/dev/reference/terms/esm/en.md index cf567646179..0d4f6b611fa 100644 --- a/markdown/dev/reference/terms/esm/en.md +++ b/markdown/dev/reference/terms/esm/en.md @@ -1,5 +1,6 @@ --- title: esm +jargon: true --- **esm** stands for **ECMAScript Modules** and is the official module system of diff --git a/markdown/dev/reference/terms/variadic/en.md b/markdown/dev/reference/terms/variadic/en.md index 558a14dae8a..eea9f7f4471 100644 --- a/markdown/dev/reference/terms/variadic/en.md +++ b/markdown/dev/reference/terms/variadic/en.md @@ -1,5 +1,6 @@ --- title: Variadic +jargon: true --- A **variadic** function is a function that accepts a variable number of arguments. diff --git a/markdown/org/docs/about/site/account/id/en.md b/markdown/org/docs/about/site/account/id/en.md index 01349e6fb1e..6e4d2fd8526 100644 --- a/markdown/org/docs/about/site/account/id/en.md +++ b/markdown/org/docs/about/site/account/id/en.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. diff --git a/markdown/org/docs/about/site/account/role/en.md b/markdown/org/docs/about/site/account/role/en.md index 2cbaf78db71..ce748fda987 100644 --- a/markdown/org/docs/about/site/account/role/en.md +++ b/markdown/org/docs/about/site/account/role/en.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/en.md b/markdown/org/docs/sewing/basic-sewing-supplies/en.md index 85704f56ce8..a629a553d27 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/en.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/en.md @@ -1,5 +1,6 @@ --- title: Basic sewing supplies +jargon: true --- > What exactly constitutes the bare necessities for sewing is subject to debate. diff --git a/markdown/org/docs/sewing/basting/en.md b/markdown/org/docs/sewing/basting/en.md index 586164da67c..9dc34a9e4b1 100644 --- a/markdown/org/docs/sewing/basting/en.md +++ b/markdown/org/docs/sewing/basting/en.md @@ -1,6 +1,7 @@ --- layout: onecol title: Basting +jargon: true --- ![The shape of this denim back pocket is basted before the pocket is topstitched to the garment](basting.jpg) diff --git a/markdown/org/docs/sewing/coverlock/en.md b/markdown/org/docs/sewing/coverlock/en.md index 9a2e8675c6f..285f0176155 100644 --- a/markdown/org/docs/sewing/coverlock/en.md +++ b/markdown/org/docs/sewing/coverlock/en.md @@ -1,5 +1,6 @@ --- title: Coverlock +jargon: true --- ![A hem on a T-shirt, made with a coverlock machine](coverlock-hem.jpg) diff --git a/markdown/org/docs/sewing/cutting/en.md b/markdown/org/docs/sewing/cutting/en.md index 8dded41295c..5429993c230 100644 --- a/markdown/org/docs/sewing/cutting/en.md +++ b/markdown/org/docs/sewing/cutting/en.md @@ -1,6 +1,7 @@ --- layout: onecol title: Cutting +jargon: true --- ![Me cutting out some T-shirts](cutting.jpg) diff --git a/markdown/org/docs/sewing/darts/en.md b/markdown/org/docs/sewing/darts/en.md index cd4fe66387f..14f70314526 100644 --- a/markdown/org/docs/sewing/darts/en.md +++ b/markdown/org/docs/sewing/darts/en.md @@ -1,5 +1,6 @@ --- title: Darts +jargon: true --- ![Bust darts on a blouse](dart.jpg) diff --git a/markdown/org/docs/sewing/double-welt-pockets/en.md b/markdown/org/docs/sewing/double-welt-pockets/en.md index 4b85f4891e6..db7cc383446 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/en.md +++ b/markdown/org/docs/sewing/double-welt-pockets/en.md @@ -1,5 +1,6 @@ --- title: Double welt pockets +jargon: true --- ## Video diff --git a/markdown/org/docs/sewing/ease/en.md b/markdown/org/docs/sewing/ease/en.md index 36bcd55016c..0265d06e89b 100644 --- a/markdown/org/docs/sewing/ease/en.md +++ b/markdown/org/docs/sewing/ease/en.md @@ -1,5 +1,6 @@ --- title: Ease +jargon: true --- ![Without ease, you would not be able to raise your arm](ease-plus.jpg) diff --git a/markdown/org/docs/sewing/edgestitching/en.md b/markdown/org/docs/sewing/edgestitching/en.md index c4cd29a4109..007fcafda79 100644 --- a/markdown/org/docs/sewing/edgestitching/en.md +++ b/markdown/org/docs/sewing/edgestitching/en.md @@ -1,5 +1,6 @@ --- title: Edgestitching +jargon: true --- Edgestitching is a specific type of _topstitching_. diff --git a/markdown/org/docs/sewing/fabric-grain/en.md b/markdown/org/docs/sewing/fabric-grain/en.md index c840a12b776..91aae582a0d 100644 --- a/markdown/org/docs/sewing/fabric-grain/en.md +++ b/markdown/org/docs/sewing/fabric-grain/en.md @@ -1,5 +1,6 @@ --- title: Fabric grain +jargon: true --- ![The grainline runs parallel to the selvedge](fabric-grain.jpg) diff --git a/markdown/org/docs/sewing/good-sides-together/en.md b/markdown/org/docs/sewing/good-sides-together/en.md index e6a088a96ab..e2701768c90 100644 --- a/markdown/org/docs/sewing/good-sides-together/en.md +++ b/markdown/org/docs/sewing/good-sides-together/en.md @@ -1,5 +1,6 @@ --- title: Good sides together +jargon: true --- When I refer to good sides together that can refer to either cutting or sewing: diff --git a/markdown/org/docs/sewing/hemming/en.md b/markdown/org/docs/sewing/hemming/en.md index 4e82bcee16f..f18c0923989 100644 --- a/markdown/org/docs/sewing/hemming/en.md +++ b/markdown/org/docs/sewing/hemming/en.md @@ -1,5 +1,6 @@ --- title: Hemming +jargon: true --- ![The hem at the bottom of a T-shirt](coverlock-hem.jpg) diff --git a/markdown/org/docs/sewing/hps/en.md b/markdown/org/docs/sewing/hps/en.md index f026e27aa62..62c010abf17 100644 --- a/markdown/org/docs/sewing/hps/en.md +++ b/markdown/org/docs/sewing/hps/en.md @@ -1,5 +1,6 @@ --- title: High Point Shoulder (HPS) +jargon: true --- The _high point shoulder_ or _HPS_ point is used as the base for several vertical measurements. diff --git a/markdown/org/docs/sewing/jersey/en.md b/markdown/org/docs/sewing/jersey/en.md index 8f7521282db..a80cd39d059 100644 --- a/markdown/org/docs/sewing/jersey/en.md +++ b/markdown/org/docs/sewing/jersey/en.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: true --- ![A piece of grey jersey](knit-fabric.jpg) diff --git a/markdown/org/docs/sewing/knit-fabric/en.md b/markdown/org/docs/sewing/knit-fabric/en.md index db92eb0004f..8eeb6cfb811 100644 --- a/markdown/org/docs/sewing/knit-fabric/en.md +++ b/markdown/org/docs/sewing/knit-fabric/en.md @@ -1,5 +1,6 @@ --- title: Knit fabric +jargon: true --- ![A piece of grey (French Terry) jersey, a knit fabric](fabric.jpg) diff --git a/markdown/org/docs/sewing/on-the-fold/en.md b/markdown/org/docs/sewing/on-the-fold/en.md index 03c1c077414..81037e8a770 100644 --- a/markdown/org/docs/sewing/on-the-fold/en.md +++ b/markdown/org/docs/sewing/on-the-fold/en.md @@ -1,5 +1,6 @@ --- title: On the fold +jargon: true --- When you have a pattern piece that is symmetric, the instructions might tell you that it is to be cut _on the fold_. diff --git a/markdown/org/docs/sewing/pinning/en.md b/markdown/org/docs/sewing/pinning/en.md index 589c6fcbdc3..50cd0a2e1f5 100644 --- a/markdown/org/docs/sewing/pinning/en.md +++ b/markdown/org/docs/sewing/pinning/en.md @@ -1,5 +1,6 @@ --- title: Pinning +jargon: true --- ![Sewing pins are part of the basic sewing supplies](sewing-pins.jpg) diff --git a/markdown/org/docs/sewing/rayon/en.md b/markdown/org/docs/sewing/rayon/en.md index 65253dbb6cb..8e066061f12 100644 --- a/markdown/org/docs/sewing/rayon/en.md +++ b/markdown/org/docs/sewing/rayon/en.md @@ -1,5 +1,6 @@ --- title: Rayon +jargon: true --- ![I use rayon for my underwear](rayon.jpg) diff --git a/markdown/org/docs/sewing/seam-allowance/en.md b/markdown/org/docs/sewing/seam-allowance/en.md index a1dafd63a92..367741c4bf8 100644 --- a/markdown/org/docs/sewing/seam-allowance/en.md +++ b/markdown/org/docs/sewing/seam-allowance/en.md @@ -1,5 +1,6 @@ --- title: Seam allowance +jargon: true --- ![The inside of the leg on a pair of jeans. The SA is the dark narrow stretch of fabric next to the seam. It has been zig-zagged to keep it from fraying](zig-zag.jpg) diff --git a/markdown/org/docs/sewing/serger/en.md b/markdown/org/docs/sewing/serger/en.md index c306171c103..fd3e1f3dba3 100644 --- a/markdown/org/docs/sewing/serger/en.md +++ b/markdown/org/docs/sewing/serger/en.md @@ -1,5 +1,6 @@ --- title: Serger +jargon: true --- ![The finished backside of a serged seam](serged-seam.jpg) diff --git a/markdown/org/docs/sewing/slipstitch/en.md b/markdown/org/docs/sewing/slipstitch/en.md index b10596cd5d1..64b10e277b9 100644 --- a/markdown/org/docs/sewing/slipstitch/en.md +++ b/markdown/org/docs/sewing/slipstitch/en.md @@ -1,5 +1,6 @@ --- title: Slipstitch +jargon: true --- A slipstitch is a hand-sewing technique that allows you to join layers diff --git a/markdown/org/docs/sewing/topstitching/en.md b/markdown/org/docs/sewing/topstitching/en.md index d8b169abea2..e3519cb2fe3 100644 --- a/markdown/org/docs/sewing/topstitching/en.md +++ b/markdown/org/docs/sewing/topstitching/en.md @@ -1,5 +1,6 @@ --- title: Topstitching +jargon: true --- ![I used plenty of topstitching in a contrasting red thread on these jeans for my godson Akki](topstitching.jpg) diff --git a/markdown/org/docs/sewing/trimming/en.md b/markdown/org/docs/sewing/trimming/en.md index 60e1feb9bf5..79d24ac73a5 100644 --- a/markdown/org/docs/sewing/trimming/en.md +++ b/markdown/org/docs/sewing/trimming/en.md @@ -1,5 +1,6 @@ --- title: Trimming +jargon: true --- ![Seam allowance being trimmed](trimming.jpg) diff --git a/markdown/org/docs/sewing/twin-needle/en.md b/markdown/org/docs/sewing/twin-needle/en.md index 95dc4908990..c64f38dc3cc 100644 --- a/markdown/org/docs/sewing/twin-needle/en.md +++ b/markdown/org/docs/sewing/twin-needle/en.md @@ -1,5 +1,6 @@ --- title: Twin needle +jargon: true --- ![A twin needle from Schmetz](twin-needle.jpg) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/en.md b/markdown/org/docs/sewing/zig-zag-stitch/en.md index 3e2f47d0c3d..329dca324a5 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/en.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/en.md @@ -1,5 +1,6 @@ --- title: Zig-zag stitch +jargon: true --- ![A zig-zag stitch is used to prevent the SA of the denim from fraying](zig-zag.jpg) diff --git a/sites/dev/components/jargon.mjs b/sites/dev/components/jargon.mjs deleted file mode 100644 index 1965ed41c04..00000000000 --- a/sites/dev/components/jargon.mjs +++ /dev/null @@ -1,27 +0,0 @@ -import { Term as SharedTerm, termList } from 'shared/components/jargon.mjs' - -/* - * This object holds jargon terminology for FreeSewing.dev - * - * This object holds key/value pairs per language where: - * - key: holds the jargon term (make sure to lowercase it and strip dots) - * - value: holds the path to the documentation page as when browsing the website - * - * To be clear: - * - You need to first create a markdown page explaining the term. - * - Only afterwards can you add it here - * - Since this uses dynamic MDX loaded from GitHub,it won't work until pushed - */ -const jargon = { - en: { - cjs: 'reference/terms/cjs', - esm: 'reference/terms/esm', - variadic: 'reference/terms/variadic', - }, -} - -/* - * DO NOT CHANGE ANYTHING BELOW THIS LINE - */ -export const Term = ({ children }) => -export const TermList = termList(jargon, 'dev') diff --git a/sites/org/components/jargon.mjs b/sites/org/components/jargon.mjs deleted file mode 100644 index b983fccdbda..00000000000 --- a/sites/org/components/jargon.mjs +++ /dev/null @@ -1,237 +0,0 @@ -import { Term as SharedTerm, termList } from 'shared/components/jargon.mjs' - -/* - * This object holds jargon terminology for FreeSewing.dev - * - * This object holds key/value pairs per language where: - * - key: holds the jargon term (make sure to lowercase it and strip dots) - * - value: holds the path to the documentation page as when browsing the website - * - * To be clear: - * - You need to first create a markdown page explaining the term. - * - Only afterwards can you add it here - * - Since this uses dynamic MDX loaded from GitHub,it won't work until pushed - */ -// prettier-ignore -export const jargon = { - en: { - // Sewing - 'basic sewing supplies': 'docs/sewing/basic-sewing-supplies', - 'basting': 'docs/sewing/basting', - 'coverlock': 'docs/sewing/coverlock', - 'cutting': 'docs/sewing/cutting', - 'darts': 'docs/sewing/darts', - 'double welt pockets': 'docs/sewing/double-welt-pockets', - 'ease': 'docs/sewing/ease', - 'edgestitching': 'docs/sewing/edgestitching', - 'fabric grain': 'docs/sewing/fabric-grain', - 'good sides together': 'docs/sewing/good-sides-together', - 'hemming': 'docs/sewing/hemming', - 'highpoint shoulder': 'docs/sewing/hps', - 'hps': 'docs/sewing/hps', - 'jersey': 'docs/sewing/jersey', - 'knit binding': 'docs/sewing/knit-binding', - 'knit fabric': 'docs/sewing/knit-fabric', - 'on the fold': 'docs/sewing/on-the-fold', - 'pinning': 'docs/sewing/pinning', - 'rayon': 'docs/sewing/rayon', - 'sa': 'docs/sewing/seam-allowance', - 'seam allowance': 'docs/sewing/seam-allowance', - 'serger': 'docs/sewing/serger', - 'slipstitch': 'docs/sewing/slipstitch', - 'topstitching': 'docs/sewing/topstitching', - 'trimming': 'docs/sewing/trimming', - 'twin needle': 'docs/sewing/twin-needle', - 'zig-zag stitch': 'docs/sewing/zig-zag-stitch', - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - 'user id': 'docs/about/site/account/id', - 'role': 'docs/about/site/account/role', - }, - de: { - // Sewing - 'abnäher': 'docs/sewing/darts', - 'coverlock': 'docs/sewing/coverlock', - 'doppelpaspeltaschen': 'docs/sewing/double-welt- pockets', - 'fadenlauf': 'docs/sewing/fabric-grain', - 'grundlegendes nähzubehör': 'docs/sewing/basic-sewing-supplies', - 'gute seiten zusammen': 'docs/sewing/good-sides-together', - 'heften': 'docs/sewing/basting', - 'hochpunkt schulter': 'docs/sewing/hps', - 'hps': 'docs/sewing/hps', - 'im stoffbruch': 'docs/sewing/on-the-fold', - 'jersey': 'docs/sewing/jersey', - 'nahtzugabe': 'docs/sewing/seam-allowance', - 'randnaht': 'docs/sewing/edgestitching', - 'rayon': 'docs/sewing/rayon', - 'serger': 'docs/sewing/serger', - 'stecken': 'docs/sewing/pinning', - 'steppstich': 'docs/sewing/slipstitch', - 'strickbindung': 'docs/sewing/knit-binding', - 'strickstoff': 'docs/sewing/knit-fabric', - 'säumen': 'docs/sewing/hemming', - 'topstitching': 'docs/sewing/topstitching', - 'zickzackstich': 'docs/sewing/zig-zag-stitch', - 'zugabe': 'docs/sewing/ease', - 'zurückschneiden': 'docs/sewing/trimming', - 'zuschnitt': 'docs/sewing/cutting', - 'zwillingsnadel': 'docs/sewing/twin-needle', - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - 'benutzerkennung': 'docs/about/site/account/id', - 'benutzer-id': 'docs/about/site/account/id', - 'benutzer id': 'docs/about/site/account/id', - 'rolle': 'docs/about/site/account/role', - }, - es: { - // Sewing - 'aguja gemela': "docs/sewing/twin-needle", - 'basting': "docs/sewing/basting", - 'bolsillos de doble soldadura': "docs/sewing/double-welt-pockets", - 'buenas partes juntas': "docs/sewing/good-sides-together", - 'cobertura': "docs/sewing/coverlock", - 'corte': "docs/sewing/cutting", - 'costura de bordes': "docs/sewing/edgestitching", - 'dardos': "docs/sewing/darts", - 'en el pliegue': "docs/sewing/on-the-fold", - 'fijar': "docs/sewing/pinning", - 'grano de tela': "docs/sewing/fabric-grain", - 'hemming': "docs/sewing/hemming", - 'hombro de punto alto': "docs/sewing/hps", - 'hps': "docs/sewing/hps", - 'jersey': "docs/sewing/jersey", - 'margen de costura': "docs/sewing/seam-allowance", - 'punto elástico': "docs/sewing/slipstitch", - 'rayon': "docs/sewing/rayon", - 'sargento': "docs/sewing/serger", - 'suministros básicos de costura': "docs/sewing/basic-sewing-supplies", - 'tela de tejidos': "docs/sewing/knit-fabric", - 'topstitching': "docs/sewing/topstitching", - 'trampa': "docs/sewing/trimming", - 'vinculación de nudo': "docs/sewing/knit-binding", - 'zig-zag stitch': "docs/sewing/zig-zag-stitch", - 'único': "docs/sewing/ease", - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - 'id de usuario': 'docs/about/site/account/id', - 'identificador de usuario': 'docs/about/site/account/id', - 'id usuario': 'docs/about/site/account/id', - 'papel': 'docs/about/site/account/role', - }, - fr: { - // Sewing - 'aiguilles doubles': "docs/sewing/twin-needle", - 'aisance': "docs/sewing/ease", - 'au pli': "docs/sewing/on-the-fold", - 'biais de jersey': "docs/sewing/knit-binding", - 'bâtir': "docs/sewing/basting", - 'coupe': "docs/sewing/cutting", - 'droit fil': "docs/sewing/fabric-grain", - 'dégarnir': "docs/sewing/trimming", - 'endroit contre endroit': "docs/sewing/good-sides-together", - 'fourniture de base pour la couture': "docs/sewing/basic-sewing-supplies", - 'jersey': "docs/sewing/jersey", - 'marge de couture': "docs/sewing/seam-allowance", - 'ourlet': "docs/sewing/hemming", - 'pinces': "docs/sewing/darts", - 'poche passepoilée': "docs/sewing/double-welt-pockets", - 'point glissé': "docs/sewing/slipstitch", - 'point zig-zag': "docs/sewing/zig-zag-stitch", - 'rayonne': "docs/sewing/rayon", - 'viscose': "docs/sewing/rayon", - 'recouvreuse': "docs/sewing/coverlock", - 'sommet de l’épaule': "docs/sewing/hps", - 'phe': "docs/sewing/hps", - 'surjeteuse': "docs/sewing/serger", - 'surpiqûre': "docs/sewing/topstitching", - 'surpiqûre nervure': "docs/sewing/edgestitching", - 'tissu maille': "docs/sewing/knit-fabric", - 'épingler': "docs/sewing/pinning", - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - "id de l'utilisateur": 'docs/about/site/account/id', - "identifiant de l'utilisateur": 'docs/about/site/account/id', - 'rôle': 'docs/about/site/account/role', - }, - nl: { - // Sewing - 'aan de stofvouw': "docs/sewing/on-the-fold", - 'basis naaimateriaal': "docs/sewing/basic-sewing-supplies", - 'bijknippen': "docs/sewing/trimming", - 'coverlock': "docs/sewing/coverlock", - 'draadrichting': "docs/sewing/fabric-grain", - 'driegen': "docs/sewing/basting", - 'dubbele paspelzak': "docs/sewing/double-welt-pockets", - 'gebreide stof': "docs/sewing/knit-fabric", - 'goede kanten op elkaar': "docs/sewing/good-sides-together", - 'hoog punt schouder': "docs/sewing/hps", - 'hps': "docs/sewing/hps", - 'jersey': "docs/sewing/jersey", - 'jersey biezen': "docs/sewing/knit-binding", - 'knippen': "docs/sewing/cutting", - 'naadtoeslag': "docs/sewing/seam-allowance", - 'nepen': "docs/sewing/darts", - 'overwijdte': "docs/sewing/ease", - 'rayon': "docs/sewing/rayon", - 'serger/overlock': "docs/sewing/serger", - 'sierstiksel': "docs/sewing/topstitching", - 'spelden': "docs/sewing/pinning", - 'stiksels': "docs/sewing/edgestitching", - 'stiksteek': "docs/sewing/slipstitch", - 'tweelingnaald': "docs/sewing/twin-needle", - 'zigzagsteek': "docs/sewing/zig-zag-stitch", - 'zomen': "docs/sewing/hemming", - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - "gebruikersid": 'docs/about/site/account/id', - "gebruikers id": 'docs/about/site/account/id', - "gebruiker id": 'docs/about/site/account/id', - 'rol': 'docs/about/site/account/role', - }, - uk: { - // Sewing - 'базові матеріали для шиття': 'docs/sewing/basic-sewing-supplies', - 'виточки': 'docs/sewing/darts', - 'джерсі': 'docs/sewing/jersey', - 'закріплення': 'docs/sewing/pinning', - 'зметування': 'docs/sewing/basting', - 'кишеня з подвійною листочкою': 'docs/sewing/double-welt-pockets', - 'коверлок': 'docs/sewing/coverlock', - 'крайовий шов': 'docs/sewing/edgestitching', - 'крій': 'docs/sewing/cutting', - 'лицьові сторони одна до одної': 'docs/sewing/good-sides-together', - 'на згині': 'docs/sewing/on-the-fold', - 'найвища точка плеча': 'docs/sewing/hps', - 'обрізка': 'docs/sewing/trimming', - 'поверхневий шов': 'docs/sewing/topstitching', - 'подвійна голка': 'docs/sewing/twin-needle', - 'припуск на шов': 'docs/sewing/seam-allowance', - 'підшивання краю': 'docs/sewing/hemming', - 'район': 'docs/sewing/rayon', - 'свобода облягання': 'docs/sewing/ease', - 'сергер': 'docs/sewing/serger', - 'строчка зигзаг': 'docs/sewing/zig-zag-stitch', - 'ткацьке переплетення': 'docs/sewing/fabric-grain', - 'трикотажна бийка': 'docs/sewing/knit-binding', - 'трикотажна тканина': 'docs/sewing/knit-fabric', - 'шовний стібок': 'docs/sewing/slipstitch', - // Account - id: 'docs/about/site/account/id', - uid: 'docs/about/site/account/id', - "ідентифікатор користувача": 'docs/about/site/account/id', - "ім'я користувача": 'docs/about/site/account/id', - "ID користувача": 'docs/about/site/account/id', - 'роль': 'docs/about/site/account/role', - }, -} - -/* - * DO NOT CHANGE ANYTHING BELOW THIS LINE - */ -export const Term = ({ children }) => -export const TermList = termList(jargon, 'org') diff --git a/sites/shared/components/mdx/index.mjs b/sites/shared/components/mdx/index.mjs index c412606f2f4..70aa30baacf 100644 --- a/sites/shared/components/mdx/index.mjs +++ b/sites/shared/components/mdx/index.mjs @@ -17,7 +17,11 @@ import { DesignMeasurements } from './design-measurements.mjs' import { DesignOptions } from './design-options.mjs' import { MeasieImage } from 'shared/components/measurements/image.mjs' // Dev/Org jargon -import { Term, TermList } from 'site/components/jargon.mjs' +import { Term as SharedTerm, termList } from 'shared/components/jargon.mjs' +import { jargon, site } from 'site/prebuild/jargon.mjs' + +export const Term = ({ children }) => +export const TermList = termList(jargon, site) export const components = (site = 'org', slug = []) => { const base = { diff --git a/sites/shared/prebuild/markdown.mjs b/sites/shared/prebuild/markdown.mjs index 6124daed1cd..008dbe64d71 100644 --- a/sites/shared/prebuild/markdown.mjs +++ b/sites/shared/prebuild/markdown.mjs @@ -144,12 +144,38 @@ const loadUsers = async (list, store) => { const loadDocs = async (site) => { const folder = site === 'org' ? 'docs' : '' const titles = await loadFolderFrontmatter('title', site, folder) + const terms = await loadFolderFrontmatter('jargon', site, folder) // Order is the same for all languages, so only grab EN files const order = await loadFolderFrontmatter('order', site, folder, false, 'en') + const jargon = await loadFolderFrontmatter('jargon', site, folder) return mergeOrder(titles, order) } +/* + * Loads jargon and terms + */ +const loadJargon = async (site, docs) => { + const folder = site === 'org' ? 'docs' : '' + const jargon = await loadFolderFrontmatter('jargon', site, folder) + const terms = await loadFolderFrontmatter('terms', site, folder) + + const data = {} + for (const lang in jargon) { + data[lang] = {} + for (const slug in jargon[lang]) { + data[lang][docs[lang][slug].t.toLowerCase()] = slug + if (terms[lang]?.[slug]) { + for (const term of terms[lang][slug].split(',').map((term) => term.trim())) { + data[lang][term.toLowerCase()] = slug + } + } + } + } + + return data +} + /* * Loads all blog posts, titles and order */ @@ -290,6 +316,15 @@ const writeFile = async (filename, exportname, site, content) => { export const prebuildDocs = async (store) => { store.docs = await loadDocs(store.site) await writeFiles('docs', store.site, store.docs) + + // Handle jargon + store.jargon = await loadJargon(store.site, store.docs) + fs.writeFileSync( + path.resolve('..', store.site, 'prebuild', `jargon.mjs`), + `${header} +export const site = "${store.site}" +export const jargon = ${JSON.stringify(store.jargon, null, 2)}` + ) } /* From cd54b0884a81000c3e693b2271718b78735720fe Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 19:24:41 +0100 Subject: [PATCH 104/795] chore(shared): Remove unused vars --- sites/shared/prebuild/markdown.mjs | 2 -- 1 file changed, 2 deletions(-) diff --git a/sites/shared/prebuild/markdown.mjs b/sites/shared/prebuild/markdown.mjs index 008dbe64d71..6f5c3bb048b 100644 --- a/sites/shared/prebuild/markdown.mjs +++ b/sites/shared/prebuild/markdown.mjs @@ -144,10 +144,8 @@ const loadUsers = async (list, store) => { const loadDocs = async (site) => { const folder = site === 'org' ? 'docs' : '' const titles = await loadFolderFrontmatter('title', site, folder) - const terms = await loadFolderFrontmatter('jargon', site, folder) // Order is the same for all languages, so only grab EN files const order = await loadFolderFrontmatter('order', site, folder, false, 'en') - const jargon = await loadFolderFrontmatter('jargon', site, folder) return mergeOrder(titles, order) } From 9d196dbf15d895b8cb78ecbd7b826b04d1a5c242 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 19:33:05 +0100 Subject: [PATCH 105/795] chore(markdown): Attribution for Ramoth's showcases The real ones: Closes #6386 Closes #6385 Closes #6384 Closes #6383 And the fake one: Closes #6369 --- markdown/org/showcase/ramoth-cathrin-corset/en.md | 2 +- markdown/org/showcase/ramoth-short-sleeve-simon/en.md | 2 +- markdown/org/showcase/ramoth-simon-flannel/en.md | 2 +- markdown/org/showcase/simon-by-ramoth/en.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/en.md b/markdown/org/showcase/ramoth-cathrin-corset/en.md index 0573a8262b0..79495687079 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/en.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth Cathrin Corset ...with butterflies!" date: "2023-01-31" intro: "Here's a fantastic butterfly Cathrin corset made by Ramoth - their very first! They shared this about future alterations:" diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md index fa8bee14072..6796caf33d7 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth's short-sleeve Simon with most of the shaping shifted to the back darts" date: "2021-09-30" intro: "Ramoth's short-sleeve Simon shirt" diff --git a/markdown/org/showcase/ramoth-simon-flannel/en.md b/markdown/org/showcase/ramoth-simon-flannel/en.md index 568fb826e44..7af7ec0f032 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/en.md +++ b/markdown/org/showcase/ramoth-simon-flannel/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Love the moths on this beautiful Simon flannel" date: "2023-02-03" intro: "Ramoth's Simon Flannel" diff --git a/markdown/org/showcase/simon-by-ramoth/en.md b/markdown/org/showcase/simon-by-ramoth/en.md index d97aea69d2e..2701c4546d6 100644 --- a/markdown/org/showcase/simon-by-ramoth/en.md +++ b/markdown/org/showcase/simon-by-ramoth/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth's impressive first Simon" date: "2021-08-24" intro: "Ramoth made this fantastic first draft of the Simon shirt and generously shared some helpful fit notes. They said:" From 6ad082dd709ff3e5554d217b47bbb28afd7a649b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:35:01 +0100 Subject: [PATCH 106/795] Update source file en.yaml skip-build --- sites/shared/components/account/en.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index ad51802e334..b6e0cb5d7e8 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -133,6 +133,7 @@ metricUnitsd: Pick this if you prefer centimeters over inches. imperialUnits: Imperial units (inch) imperialUnitsd: Pick this if you prefer inches over centimeters. unitsTitle: Which units do you prefer? +displayUnits: Display units # username usernameTitle: What username would you like? @@ -266,6 +267,8 @@ csetNameMsg: Each curated set has a name. You can suggest your own name or a pse missing: Missing andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." +makePublic: Make public +makePrivate: Make private patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From 3f21caec7083d913b75305ffb96c233e62930a2a Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 17 Mar 2024 19:42:24 +0100 Subject: [PATCH 107/795] fix(huey): Fix for #6238 --- config/changelog.yaml | 2 ++ designs/huey/src/back.mjs | 2 +- designs/huey/src/front.mjs | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index b56785b65bc..6b3ba6e122e 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -20,6 +20,8 @@ Unreleased: - The `withCondition` named export is deprecated and will always return true. Fixed: + huey: + - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes #6238 hugo: - Add missing dimension id attributes uma: diff --git a/designs/huey/src/back.mjs b/designs/huey/src/back.mjs index 299e9ff0d71..f66548c08b8 100644 --- a/designs/huey/src/back.mjs +++ b/designs/huey/src/back.mjs @@ -28,7 +28,7 @@ function draftHueyBack({ // Shape side seam points.hips.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hem.x = points.hips.x - points.hemCp2 = new Point(points.hips.x, points.cbWaist.y) + points.hemCp2 = new Point(points.hips.x, Math.min(points.cbWaist.y, points.hem.y)) // Store length of the neck seam store.set( diff --git a/designs/huey/src/front.mjs b/designs/huey/src/front.mjs index a90b2c78f2e..fc2dd31b267 100644 --- a/designs/huey/src/front.mjs +++ b/designs/huey/src/front.mjs @@ -29,14 +29,14 @@ function draftHueyFront({ // Shape side seam points.hips.x = (measurements.hips * (1 + options.hipsEase)) / 4 points.hem.x = points.hips.x - points.hemCp2 = new Point(points.hips.x, points.cfWaist.y) + points.hemCp2 = new Point(points.hips.x, Math.min(points.cfWaist.y, points.hem.y)) // Front pocket points.pocketCfTop = points.cfNeck.shiftFractionTowards(points.cfHem, 1 - options.pocketHeight) points.pocketTopRight = points.pocketCfTop.shift(0, points.hem.x * options.pocketWidth) points.pocketTip = new Point( points.pocketTopRight.x * 1.2, - points.cfWaist.y + points.cfWaist.dy(points.hem) * 0.7 + points.pocketTopRight.y + (points.hem.y - points.pocketTopRight.y) * 0.9 ) points.pocketHem = new Point( points.pocketTopRight.x + points.pocketTopRight.dx(points.pocketTip) / 2, From 0bdd345a0f9829a7462c891980c76223651dc9f3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:50:26 +0100 Subject: [PATCH 108/795] New translations en.md (French) skip-build --- .../org/docs/designs/brian/options/draftforhighbust/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/fr.md b/markdown/org/docs/designs/brian/options/draftforhighbust/fr.md index 35111cd94c8..f85b65d12c0 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/fr.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/fr.md @@ -1,8 +1,8 @@ --- -title: indéfini +title: Tracé pour le buste supérieur --- -indéfini +Dessiner le patron pour la mesure de la poitrine (si disponible) plutôt que pour le torse (entier). Cela permet d'obtenir un vêtement plus ajusté pour les personnes ayant une poitrine. From db7f67e0383e0b111cad32b7c8e2d4d586cbfa26 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:42 +0100 Subject: [PATCH 109/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/hps/fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/docs/sewing/hps/fr.md b/markdown/org/docs/sewing/hps/fr.md index cc332efb91b..946165ff58c 100644 --- a/markdown/org/docs/sewing/hps/fr.md +++ b/markdown/org/docs/sewing/hps/fr.md @@ -1,5 +1,6 @@ --- -title: Sommet de l’Épaule (ou PHE) +title: Point Haut de l'Épaule (ou PHE) +jargon: vrai --- _Le sommet de l'épaule_ ou _HPS_ est utilisée comme base pour plusieurs mesures verticales. From 94cded6438e5f9710d26c27edf029da25473d20f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:56 +0100 Subject: [PATCH 110/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/fr.md b/markdown/org/docs/sewing/basic-sewing-supplies/fr.md index 0cd5d063744..f4843304a57 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/fr.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/fr.md @@ -1,5 +1,6 @@ --- title: Fourniture de base pour la couture +jargon: vrai --- > Ce qui constitue exactement le strict nécessaire à la couture est sujet à débat. Certaines personnes aiment avoir beaucoup de matériel, d'autres disent que même une machine à coudre est optionnelle car vous pouvez coudre à la main. From 88b9462c39bc6059c461a3cda2a45dabc8ab1a28 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:57 +0100 Subject: [PATCH 111/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/basting/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/fr.md b/markdown/org/docs/sewing/basting/fr.md index 520c5d00c9f..9a45986389b 100644 --- a/markdown/org/docs/sewing/basting/fr.md +++ b/markdown/org/docs/sewing/basting/fr.md @@ -1,6 +1,7 @@ --- layout: onecol title: Bâtir +jargon: vrai --- ![La forme de cette poche en denim est bâtie avant que la poche ne soit surpiquée sur le vêtement](basting.jpg) From a04ed4c524bbb2540d2a824ca5287f1abad2113b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:58 +0100 Subject: [PATCH 112/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/coverlock/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/fr.md b/markdown/org/docs/sewing/coverlock/fr.md index 95b067b6d1c..4e469adb052 100644 --- a/markdown/org/docs/sewing/coverlock/fr.md +++ b/markdown/org/docs/sewing/coverlock/fr.md @@ -1,5 +1,6 @@ --- title: Recouvreuse +jargon: vrai --- ![Un ourlet sur un T-shirt, fait à la recouvreuse](coverlock-hem.jpg) From b64a1de5c3c1685f8d86f6b28adc145c3a4e50d2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:59 +0100 Subject: [PATCH 113/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/cutting/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/fr.md b/markdown/org/docs/sewing/cutting/fr.md index 68f5585a74b..a2ab03daa2e 100644 --- a/markdown/org/docs/sewing/cutting/fr.md +++ b/markdown/org/docs/sewing/cutting/fr.md @@ -1,6 +1,7 @@ --- layout: onecol title: Coupe +jargon: vrai --- ![Moi coupant un T-shirt](cutting.jpg) From 2c0f7bc2561a86a57f6cca66522de38da2704ca9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 19:59:59 +0100 Subject: [PATCH 114/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/darts/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/fr.md b/markdown/org/docs/sewing/darts/fr.md index c109b29d23f..140324fbdca 100644 --- a/markdown/org/docs/sewing/darts/fr.md +++ b/markdown/org/docs/sewing/darts/fr.md @@ -1,5 +1,6 @@ --- title: Pinces +jargon: vrai --- ![Pinces poitrine sur une blouse](dart.jpg) From f2179db6ade6175ad9268b0a4bfcda63f974993d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:01 +0100 Subject: [PATCH 115/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/double-welt-pockets/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/fr.md b/markdown/org/docs/sewing/double-welt-pockets/fr.md index ef45515969d..ab603008663 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/fr.md +++ b/markdown/org/docs/sewing/double-welt-pockets/fr.md @@ -1,5 +1,6 @@ --- title: Poche passepoilée +jargon: vrai --- ## Vidéo From aab052e7a1151598900c975264636f940079b68e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:02 +0100 Subject: [PATCH 116/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/ease/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/fr.md b/markdown/org/docs/sewing/ease/fr.md index 1174314a4d6..e9afe015126 100644 --- a/markdown/org/docs/sewing/ease/fr.md +++ b/markdown/org/docs/sewing/ease/fr.md @@ -1,5 +1,6 @@ --- title: Aisance +jargon: vrai --- ![Sans aisance, vous ne seriez pas en mesure de lever votre bras](ease-plus.jpg) From 05d087797482bff98e1f8d118b1fc783b2618fb4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:03 +0100 Subject: [PATCH 117/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/edgestitching/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/fr.md b/markdown/org/docs/sewing/edgestitching/fr.md index 629844765ba..2ef12f0735a 100644 --- a/markdown/org/docs/sewing/edgestitching/fr.md +++ b/markdown/org/docs/sewing/edgestitching/fr.md @@ -1,5 +1,6 @@ --- title: Surpiqûre nervure +jargon: vrai --- La surpiqûre nervure est un type spécifique de _surpiqûre_. Elle est spécifique en raison de son emplacement. Faire une surpiqûre nervure signifie faire une surpiqûre juste à côté d'une couture, généralement environ 3 mm ou 1/8 de pouce à côté de celle-ci. From 346e0ce0001bde49486b36ac6d1fa272ce753744 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:04 +0100 Subject: [PATCH 118/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/fabric-grain/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/fr.md b/markdown/org/docs/sewing/fabric-grain/fr.md index 9ce6101142e..33966634c1e 100644 --- a/markdown/org/docs/sewing/fabric-grain/fr.md +++ b/markdown/org/docs/sewing/fabric-grain/fr.md @@ -1,5 +1,6 @@ --- title: Droit fil +jargon: vrai --- ![La ligne de droit fil est parallèle au bord de la lisière](fabric-grain.jpg) From 6f58a284ad91a51c2a09cf6ad9c4fe649df56aa5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:05 +0100 Subject: [PATCH 119/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/good-sides-together/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/fr.md b/markdown/org/docs/sewing/good-sides-together/fr.md index 0321b8825af..5418eacc0b0 100644 --- a/markdown/org/docs/sewing/good-sides-together/fr.md +++ b/markdown/org/docs/sewing/good-sides-together/fr.md @@ -1,5 +1,6 @@ --- title: Endroit contre Endroit +jargon: vrai --- Lorsque je parle 'endroit contre endroit, je veux parler de coupe ou de couture : From 73013d96814ef132f8b2c16b0d31d89feac2ae04 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:06 +0100 Subject: [PATCH 120/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/hemming/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hemming/fr.md b/markdown/org/docs/sewing/hemming/fr.md index f89786fb73b..dc2261680c2 100644 --- a/markdown/org/docs/sewing/hemming/fr.md +++ b/markdown/org/docs/sewing/hemming/fr.md @@ -1,5 +1,6 @@ --- title: Ourlet +jargon: vrai --- ![L'ourlet au bas d'un T-shirt](coverlock-hem.jpg) From 220e3c520df97cfb8e4fa2ed9cd4acb6e96010a2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:07 +0100 Subject: [PATCH 121/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/jersey/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/fr.md b/markdown/org/docs/sewing/jersey/fr.md index 7b12fec1d3d..6e970ee6df4 100644 --- a/markdown/org/docs/sewing/jersey/fr.md +++ b/markdown/org/docs/sewing/jersey/fr.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: vrai --- ![Un morceau de jersey gris](knit-fabric.jpg) From 5b84aac924494ccab7f6ba682a350db2aa7c6d96 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:08 +0100 Subject: [PATCH 122/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/knit-fabric/fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/docs/sewing/knit-fabric/fr.md b/markdown/org/docs/sewing/knit-fabric/fr.md index 70f17d2e652..6da5746e8a0 100644 --- a/markdown/org/docs/sewing/knit-fabric/fr.md +++ b/markdown/org/docs/sewing/knit-fabric/fr.md @@ -1,5 +1,6 @@ --- -title: Tissu Maille +title: Tissu Tricoté +jargon: vrai --- ![Un morceau de jersey (French Terry) gris, un tissu maille (tricoté)](fabric.jpg) From 0644d41fc17fc7d79b65dafd0d61bf53088cda9a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:09 +0100 Subject: [PATCH 123/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/on-the-fold/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/fr.md b/markdown/org/docs/sewing/on-the-fold/fr.md index a4e4dbce2af..5ab4a676ef0 100644 --- a/markdown/org/docs/sewing/on-the-fold/fr.md +++ b/markdown/org/docs/sewing/on-the-fold/fr.md @@ -1,5 +1,6 @@ --- title: Au pli +jargon: vrai --- Quand vous avez un patron qui est symétrique, les instructions peuvent vous demander de le couper _au pli_. From 0a4403583ac30ea1a7f14433b509899c603e39de Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:10 +0100 Subject: [PATCH 124/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/pinning/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/fr.md b/markdown/org/docs/sewing/pinning/fr.md index 4d7a97ecefe..29ddbfe9597 100644 --- a/markdown/org/docs/sewing/pinning/fr.md +++ b/markdown/org/docs/sewing/pinning/fr.md @@ -1,5 +1,6 @@ --- title: Épingler +jargon: vrai --- ![Les épingles de couture font partie des fournitures de base en couture](sewing-pins.jpg) From 56e2b7e4215684183c827774ae221804865a09a7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:11 +0100 Subject: [PATCH 125/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/rayon/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/fr.md b/markdown/org/docs/sewing/rayon/fr.md index e4bc1701fb4..d1ba456b493 100644 --- a/markdown/org/docs/sewing/rayon/fr.md +++ b/markdown/org/docs/sewing/rayon/fr.md @@ -1,5 +1,6 @@ --- title: Rayonne ou viscose +jargon: vrai --- ![J'utilise la rayonne pour mes sous-vêtements](rayon.jpg) From af8da045f45d84dc680fedab53d6253e23c996d1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:12 +0100 Subject: [PATCH 126/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/seam-allowance/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/fr.md b/markdown/org/docs/sewing/seam-allowance/fr.md index cb666e10a6e..0a65906ab1b 100644 --- a/markdown/org/docs/sewing/seam-allowance/fr.md +++ b/markdown/org/docs/sewing/seam-allowance/fr.md @@ -1,5 +1,6 @@ --- title: Marge de couture +jargon: vrai --- ![L'intérieur de la jambe sur un jean. La marge de couture est la partie sombre près de la couture. Elle a été zig-zaggée pour l'empêcher de s'effilocher](zig-zag.jpg) From a533304ed5f1e82980e627367c87ebe7aa36f4f6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:13 +0100 Subject: [PATCH 127/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/serger/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/fr.md b/markdown/org/docs/sewing/serger/fr.md index 6b6cf59064f..597682d13c8 100644 --- a/markdown/org/docs/sewing/serger/fr.md +++ b/markdown/org/docs/sewing/serger/fr.md @@ -1,5 +1,6 @@ --- title: Surjeteuse +jargon: vrai --- ![L'arrière d'une couture faite à la surjeteuse](serged-seam.jpg) From 7e28c0ff83f2261c8c245df2f79f08ba0055f606 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:14 +0100 Subject: [PATCH 128/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/slipstitch/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/fr.md b/markdown/org/docs/sewing/slipstitch/fr.md index 1846a1be3c2..4ffae0df227 100644 --- a/markdown/org/docs/sewing/slipstitch/fr.md +++ b/markdown/org/docs/sewing/slipstitch/fr.md @@ -1,5 +1,6 @@ --- title: Point glissé +jargon: vrai --- Un point glissé est une technique de couture à la main qui vous permet de joindre les épaisseurs de tissu avec un point invisible de l'extérieur. Un point glissé est _glissé_ entre les épaisseurs de tissu où il coud ensemble les marges de coutures. From c4e42ddb2e17ea8127938abf4b4bf2aaeb6b2755 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:14 +0100 Subject: [PATCH 129/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/topstitching/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/fr.md b/markdown/org/docs/sewing/topstitching/fr.md index 8af02b44293..6a8925ed56e 100644 --- a/markdown/org/docs/sewing/topstitching/fr.md +++ b/markdown/org/docs/sewing/topstitching/fr.md @@ -1,5 +1,6 @@ --- title: Surpiqûre +jargon: vrai --- ![J'ai utilisé beaucoup de surpiqûres dans un fil rouge contrastant sur ce jean pour mon godson Akki](topstitching.jpg) From cc5dca479805749f18f163d3246dff1ef61865a0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:15 +0100 Subject: [PATCH 130/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/trimming/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/fr.md b/markdown/org/docs/sewing/trimming/fr.md index a98b994572c..0464fab8b7a 100644 --- a/markdown/org/docs/sewing/trimming/fr.md +++ b/markdown/org/docs/sewing/trimming/fr.md @@ -1,5 +1,6 @@ --- title: Dégarnir +jargon: vrai --- ![Dégarnissage en cours](trimming.jpg) From 62bfc80685fc4408c2da7bb2f772b76c0604e02d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:16 +0100 Subject: [PATCH 131/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/twin-needle/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/fr.md b/markdown/org/docs/sewing/twin-needle/fr.md index 67ed914b5f9..c11d4e33ad5 100644 --- a/markdown/org/docs/sewing/twin-needle/fr.md +++ b/markdown/org/docs/sewing/twin-needle/fr.md @@ -1,5 +1,6 @@ --- title: Aiguilles doubles +jargon: vrai --- ![Une aiguille double de Schmetz](twin-needle.jpg) From 2e7653476bbc5423a35e1f857c04ab2101f04388 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:00:17 +0100 Subject: [PATCH 132/795] New translations en.md (French) skip-build --- markdown/org/docs/sewing/zig-zag-stitch/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/fr.md b/markdown/org/docs/sewing/zig-zag-stitch/fr.md index e919266b9aa..fd7ea7ee7e3 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/fr.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/fr.md @@ -1,5 +1,6 @@ --- title: Point zig-zag +jargon: vrai --- ![Un point de zig-zag utilisé pour empêcher la marge de couture du denim de s'effilocher](zig-zag.jpg) From 661de5b5e3a9c4492cda6c3815f6559516446046 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:01:25 +0100 Subject: [PATCH 133/795] New translations en.md (French) skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/fr.md b/markdown/org/showcase/a-jaeger-and-charlie-set/fr.md index 0fb49b20758..e051a8f509d 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/fr.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger et Charlie dans un tissu velours côtelé amusant." date: "03-05-2023" intro: "Ce bel ensemble Jaeger et Waralee est fait d'un velours côtelé en coton et d'une doublure en cupro." From 1e49dd572701f88e9ce5265bb6b15fc7e34ba381 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:01:28 +0100 Subject: [PATCH 134/795] New translations en.md (French) skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/fr.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/fr.md index 277075d26f8..f2378beba17 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/fr.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Un Hi à la mode" date: "03-05-2023" intro: "Les couleurs, les yeux brodés et les dents minuscules sont quelques-uns des détails de ce mini-Hi." From 1aca903a2646c6ef80e84030d1449680c632a075 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:01:31 +0100 Subject: [PATCH 135/795] New translations en.md (French) skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/fr.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/fr.md index 5dd9ff34e51..cf52a73e40c 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/fr.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Un Aaron avec une belle impression" date: "2022-04-27" intro: "Ce joli Aaron A-shirt a été réalisé par l'intrépide couturière Gaëlle, qui a commencé à coudre il y a 10 jours ! Il a été réalisé sans surjeteuse." From 8fda327a9a7c73b7200426431920c43d4c8252ce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:01:48 +0100 Subject: [PATCH 136/795] New translations en.md (French) skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/fr.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/fr.md index a55dd4df515..ce1946336b3 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/fr.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Une belle paire de caleçons Bruce" date: "2022-04-27" intro: "Gaëlle, la couturière de FreeSewing, a confectionné ce beau boxer Bruce pour un ami, en le personnalisant un peu. Le résultat est excellent !" From 273db51a99280b0e15aacce5ddaa2d421174d0e6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:02:17 +0100 Subject: [PATCH 137/795] New translations en.md (French) skip-build --- markdown/org/showcase/hi-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/fr.md b/markdown/org/showcase/hi-by-gaelle/fr.md index 915906013a4..8a2b09f443e 100644 --- a/markdown/org/showcase/hi-by-gaelle/fr.md +++ b/markdown/org/showcase/hi-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Fabriqué avec de la toile de jean" date: "2022-07-29" intro: "Salut par Gaëlle" From 2287a89dc25d79c4709cb7c664b3a3eb162da3b1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:02:22 +0100 Subject: [PATCH 138/795] New translations en.md (French) skip-build --- markdown/org/showcase/hugo-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/fr.md b/markdown/org/showcase/hugo-by-gaelle/fr.md index e38ef302f07..b704b01730d 100644 --- a/markdown/org/showcase/hugo-by-gaelle/fr.md +++ b/markdown/org/showcase/hugo-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "L'ami de Gaëlle dans son nouveau sweat à capuche Hugo" date: "02-15-2023" intro: "Gaëlle a réalisé ce Hugo recouvert de joyeux petits ...enfin je ne sais pas trop comment appeler ces petits monstres gribouillés, mais ils sont clairement géniaux. C'est pour une amie, et nous serions ravies de recevoir quelque chose d'aussi fabuleux. Regarde ces superbes côtes rayées coordonnées." From 9e170c7a25dee2a2535f16d79d4c98cf3ba98a52 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:02:38 +0100 Subject: [PATCH 139/795] New translations en.md (French) skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/fr.md b/markdown/org/showcase/pyjama-paco-by-gaelle/fr.md index 0e2688bb529..45a1eb78be6 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/fr.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pantalon de pyjama" date: "12-11-2022" intro: "Voici un pyjama Paco de Gaëlle, sans poches ni poignets élastiques." From 04f00125cda2ba26bbbb63d32ed166b8e4fc951a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:02:52 +0100 Subject: [PATCH 140/795] New translations en.md (French) skip-build --- markdown/org/showcase/tamiko-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/fr.md b/markdown/org/showcase/tamiko-by-gaelle/fr.md index a1cd218f9be..e57542e99d2 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/fr.md +++ b/markdown/org/showcase/tamiko-by-gaelle/fr.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Une Tamiko légèrement personnalisée" date: "06-09-2022" intro: "Gaëlle a réalisé ce joli Tamiko pour une amie !" From 0d59e23f39b931d270a8197db4794546689c06ee Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:03:13 +0100 Subject: [PATCH 141/795] New translations en.yaml (French) skip-build --- sites/shared/components/account/fr.yaml | 32 ++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sites/shared/components/account/fr.yaml b/sites/shared/components/account/fr.yaml index cc7e7a2c3c3..97902c0df80 100644 --- a/sites/shared/components/account/fr.yaml +++ b/sites/shared/components/account/fr.yaml @@ -56,7 +56,7 @@ clonePattern: Clone le patron updatePattern: Mettre à jour le patron reload: Recharger le compte export: Exportez vos données -import: Import data +import: Importer des données exportMsg: Clique ci-dessous pour exporter tes données personnelles exportNote: Le règlement général sur la protection des données (RGPD) de l'UE garantit ce que l'on appelle ton droit à la portabilité des données - le droit d'obtenir et de réutiliser tes données personnelles à tes propres fins, ou à travers différents services. exportDownload: "Tes données ont été exportées et sont disponibles au téléchargement à l'endroit suivant :" @@ -123,7 +123,7 @@ metricUnitsd: Choisis cette option si tu préfères les centimètres aux pouces. imperialUnits: Unités impériales (pouces) imperialUnitsd: Choisis cette option si tu préfères les pouces aux centimètres. unitsTitle: Quelles sont les unités que tu préfères ? -displayUnits: Display units +displayUnits: Unités d'affichage #username usernameTitle: Quel nom d'utilisateur aimerais-tu ? usernameAvailable: Le nom d'utilisateur est disponible @@ -248,8 +248,8 @@ csetNameMsg: Chaque ensemble curaté a un nom. Tu peux proposer ton propre nom o missing: Manquant andMore: et plus unitsMustSave: "Remarque : tu dois enregistrer après avoir modifié les unités pour que le changement prenne effet sur cette page." -makePublic: Make public -makePrivate: Make private +makePublic: Rendre public +makePrivate: Rendre privé patternNew: Génère un nouveau modèle patternNewInfo: Choisis un modèle, ajoute ton jeu de mesures, et nous générerons pour toi un patron de couture sur mesure. designNew: Créer un nouveau dessin @@ -303,15 +303,15 @@ ownPublicPattern: Voici la vue publique d'un de tes propres modèles. Pour plus ownPrivatePattern: Il s'agit de la vue privée de ton modèle. La vue publique fonctionnera pour toi même si le modèle est privé. Elle ne fonctionnera pour les autres que lorsque le modèle sera public. privateView: Vue privée publicView: Vue du public -importHere: This page allows you to import data into your FreeSewing account. -importSupported: Currently, we support importing the following types of data -importSets: Import Measurements Sets -importSet: Import Measurements Set -cloneSet: Clone Measurements Set -measieFile: Measurements file -dragAndDropFileHere: Drag and drop your file here -importSetTip1: To import a measurement set, you should have a JSON or YAML file that has the following structure -importSetTip2: Your file can either contain a single measurements set, or an array of multiple measurements sets. -importing: Importing -imported: Imported -importFailed: Import failed +importHere: Cette page te permet d'importer des données dans ton compte FreeSewing. +importSupported: Actuellement, nous prenons en charge l'importation des types de données suivants +importSets: Importer des ensembles de mesures +importSet: Importer des ensembles de mesures +cloneSet: Duplique tes ensembles de mesures +measieFile: Fichier de mesures +dragAndDropFileHere: Faites glisser et déposez votre fichier ici +importSetTip1: Pour importer un jeu de mesures, tu dois disposer d'un fichier JSON ou YAML qui a la structure suivante +importSetTip2: Ton fichier peut contenir un seul jeu de mesures ou un tableau de plusieurs jeux de mesures. +importing: Importation en cours +imported: Importé +importFailed: Échec de l'importation From 9fa889f872aa06b5af94d01250b03e7f4abf87cf Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:03:17 +0100 Subject: [PATCH 142/795] New translations en.yaml (French) skip-build --- sites/shared/components/workbench/fr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/fr.yaml b/sites/shared/components/workbench/fr.yaml index c5b6368a2ee..2a8d2241fca 100644 --- a/sites/shared/components/workbench/fr.yaml +++ b/sites/shared/components/workbench/fr.yaml @@ -23,6 +23,7 @@ clearTimingData: Efface les données de temps closure: Fermeture collar: Col columns: colonnes +conditional: Conditionnel configurePattern: Configurer le modèle construction: Construction continueEditingTitle: Continuer l'édition From 0cc17517757fe79dee61148e46f8a9d43f974a8e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:05:51 +0100 Subject: [PATCH 143/795] New translations en.md (French) skip-build --- markdown/org/showcase/simone-by-gaelle/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/fr.md b/markdown/org/showcase/simone-by-gaelle/fr.md index a43665c513d..3871ffca462 100644 --- a/markdown/org/showcase/simone-by-gaelle/fr.md +++ b/markdown/org/showcase/simone-by-gaelle/fr.md @@ -5,7 +5,7 @@ date: 20231017 intro: "Cette chemise Simone présente de magnifiques détails, notamment des boutons coordonnés et des étiquettes personnalisées." designs: - "simone" -maker: Natalia +author: 27669 --- La talentueuse Gaëlle a partagé cette chemise Simone. Ne manque pas les photos de détail. From 9bed50aefa0fd43ea2dcdd382c786b92e7522cca Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:09:15 +0100 Subject: [PATCH 144/795] New translations en.md (Spanish) skip-build --- .../org/docs/designs/brian/options/draftforhighbust/es.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/es.md b/markdown/org/docs/designs/brian/options/draftforhighbust/es.md index d4ff5ff2365..1e5bda0bbc5 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/es.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/es.md @@ -1,8 +1,8 @@ --- -title: sin definir +title: Borrador para alta caída --- -sin definir +Redacta el patrón para la medida del busto alto (si lo tienes) en lugar del pecho (completo). El resultado será una prenda más ajustada para las personas con senos. From 2ba134af4fa39ae0e7623be36aa635d624ef919f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:18:46 +0100 Subject: [PATCH 145/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/hps/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hps/es.md b/markdown/org/docs/sewing/hps/es.md index dfb3efcec01..e392935fc70 100644 --- a/markdown/org/docs/sewing/hps/es.md +++ b/markdown/org/docs/sewing/hps/es.md @@ -1,5 +1,6 @@ --- title: Hombro de punto alto (HPS) +jargon: true --- El hombro de _punto alto_ o _HPS_ se utiliza como base para varias medidas verticales. From cb2ced5f45df343e31981add093be0de176a1a6e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:00 +0100 Subject: [PATCH 146/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/es.md b/markdown/org/docs/sewing/basic-sewing-supplies/es.md index baa1b386a08..b578e0eb83b 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/es.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/es.md @@ -1,5 +1,6 @@ --- title: Suministros básicos de costura +jargon: true --- > Lo que constituye exactamente la necesidad de coser es objeto de debate. Algunas personas como más herramientas, otras dicen que incluso una máquina de coser es opcional ya que se puede coser a mano. From f239992ae75aee94098101c4fd88ba0b2d331c17 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:00 +0100 Subject: [PATCH 147/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/basting/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/es.md b/markdown/org/docs/sewing/basting/es.md index 19b3b9d0f6e..82a119c06c5 100644 --- a/markdown/org/docs/sewing/basting/es.md +++ b/markdown/org/docs/sewing/basting/es.md @@ -1,6 +1,7 @@ --- layout: en ecol title: Basting +jargon: true --- ![La forma de este bolsillo se funde antes de que el bolsillo esté unido a la ropa](basting.jpg) From 06e4a5398562f4367b51810357a117a5ccd85cc3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:01 +0100 Subject: [PATCH 148/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/coverlock/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/es.md b/markdown/org/docs/sewing/coverlock/es.md index 76e4da3ba3f..2cb9c2e29be 100644 --- a/markdown/org/docs/sewing/coverlock/es.md +++ b/markdown/org/docs/sewing/coverlock/es.md @@ -1,5 +1,6 @@ --- title: Cobertura +jargon: true --- ![Una lluvia en una camiseta, hecha con una máquina de cierre](coverlock-hem.jpg) From 16be5519210bf60407f7da12f413be99af07165a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:02 +0100 Subject: [PATCH 149/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/cutting/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/es.md b/markdown/org/docs/sewing/cutting/es.md index d8c34a3c168..c10a0621d19 100644 --- a/markdown/org/docs/sewing/cutting/es.md +++ b/markdown/org/docs/sewing/cutting/es.md @@ -1,6 +1,7 @@ --- layout: en ecol title: Corte +jargon: true --- ![Cortando camisetas](cutting.jpg) From d5e2efa59d20c9e321c34a83a04e12b03edb430c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:03 +0100 Subject: [PATCH 150/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/darts/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/es.md b/markdown/org/docs/sewing/darts/es.md index ee42923660f..84faed15ca2 100644 --- a/markdown/org/docs/sewing/darts/es.md +++ b/markdown/org/docs/sewing/darts/es.md @@ -1,5 +1,6 @@ --- title: Dardos +jargon: true --- ![Artes de polvo en una blusa](dart.jpg) From dc1a94ec806a6a4e4e39ff1f7a0fa282e1efa2df Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:04 +0100 Subject: [PATCH 151/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/double-welt-pockets/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/es.md b/markdown/org/docs/sewing/double-welt-pockets/es.md index 8f7c902db6d..d81744a2f9b 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/es.md +++ b/markdown/org/docs/sewing/double-welt-pockets/es.md @@ -1,5 +1,6 @@ --- title: Bolsillos de doble soldadura +jargon: true --- ## Vídeo From 16b2055e151a6c1d916f16b418e5e93e4bd8ea6c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:05 +0100 Subject: [PATCH 152/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/ease/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/es.md b/markdown/org/docs/sewing/ease/es.md index 1fe61814910..eca09d1f5f1 100644 --- a/markdown/org/docs/sewing/ease/es.md +++ b/markdown/org/docs/sewing/ease/es.md @@ -1,5 +1,6 @@ --- title: Único +jargon: true --- ![Sin facilidad, no podrías levantar tu brazo](ease-plus.jpg) From 65e1e032e58f3cb4dfe33a9846be9698c7cad6e5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:06 +0100 Subject: [PATCH 153/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/edgestitching/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/es.md b/markdown/org/docs/sewing/edgestitching/es.md index 9572c975c7a..c3854fda597 100644 --- a/markdown/org/docs/sewing/edgestitching/es.md +++ b/markdown/org/docs/sewing/edgestitching/es.md @@ -1,5 +1,6 @@ --- title: Costura de bordes +jargon: true --- Edgestitching is a specific type of _topstitching_. Es específico por su ubicación. To edgestitch means to topstitch right next to a seam, typically about 3mm or 1/8 inch next to it. From e647ea8799adeb7b6728c21e5c9138ed670b4e21 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:07 +0100 Subject: [PATCH 154/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/fabric-grain/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/es.md b/markdown/org/docs/sewing/fabric-grain/es.md index 5a2dfad6a31..189614b4481 100644 --- a/markdown/org/docs/sewing/fabric-grain/es.md +++ b/markdown/org/docs/sewing/fabric-grain/es.md @@ -1,5 +1,6 @@ --- title: Grano de tela +jargon: true --- ![La graína corre paralela a la vanguardia](fabric-grain.jpg) From 6946a0db2c4b9eb49013d739188de02d140de0f4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:08 +0100 Subject: [PATCH 155/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/good-sides-together/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/es.md b/markdown/org/docs/sewing/good-sides-together/es.md index 1da00f6480e..c55b73aacdd 100644 --- a/markdown/org/docs/sewing/good-sides-together/es.md +++ b/markdown/org/docs/sewing/good-sides-together/es.md @@ -1,5 +1,6 @@ --- title: Buenas partes juntas +jargon: true --- Cuando me refiero a las buenas partes juntas puede referirse al corte o a la cobertura: From 5ac781fd771875807b317d826b7408f06baefce7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:09 +0100 Subject: [PATCH 156/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/hemming/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hemming/es.md b/markdown/org/docs/sewing/hemming/es.md index 1fb947f812a..42101bb4bfa 100644 --- a/markdown/org/docs/sewing/hemming/es.md +++ b/markdown/org/docs/sewing/hemming/es.md @@ -1,5 +1,6 @@ --- title: Hemming +jargon: true --- ![La lluvia en la parte inferior de una camisa](coverlock-hem.jpg) From 4c3051c3f186dc89af13bcfef7ece7762b976a41 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:10 +0100 Subject: [PATCH 157/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/jersey/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/es.md b/markdown/org/docs/sewing/jersey/es.md index 02a0a638e3c..810d7ebd0ad 100644 --- a/markdown/org/docs/sewing/jersey/es.md +++ b/markdown/org/docs/sewing/jersey/es.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: true --- ![Una pieza de jersey gris](knit-fabric.jpg) From 6935db780a84d36798ab7dfc5c80186876e94cbe Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:11 +0100 Subject: [PATCH 158/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/knit-fabric/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/knit-fabric/es.md b/markdown/org/docs/sewing/knit-fabric/es.md index 0d5557ed190..6f54817e672 100644 --- a/markdown/org/docs/sewing/knit-fabric/es.md +++ b/markdown/org/docs/sewing/knit-fabric/es.md @@ -1,5 +1,6 @@ --- title: Tela de tejidos +jargon: true --- ![Un pedazo de jerea gris (Terry Francés), un tejido de tejidos](fabric.jpg) From b3ede792495f14f6107419487bd40b5866c6ea16 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:12 +0100 Subject: [PATCH 159/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/on-the-fold/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/es.md b/markdown/org/docs/sewing/on-the-fold/es.md index 2e906d2f1de..012dd475db4 100644 --- a/markdown/org/docs/sewing/on-the-fold/es.md +++ b/markdown/org/docs/sewing/on-the-fold/es.md @@ -1,5 +1,6 @@ --- title: En el pliegue +jargon: true --- Cuando tienes un patrón que es simétrico, las instrucciones pueden decirte que se debe cortar _en el pliegue_. From 47df1df42eea4d0e33a157112a89097bdedb9f45 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:13 +0100 Subject: [PATCH 160/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/pinning/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/es.md b/markdown/org/docs/sewing/pinning/es.md index 5ac38fc4316..e25e9b64380 100644 --- a/markdown/org/docs/sewing/pinning/es.md +++ b/markdown/org/docs/sewing/pinning/es.md @@ -1,5 +1,6 @@ --- title: Fijar +jargon: true --- ![Los alfileres de coser son parte de los suministros básicos de coser](sewing-pins.jpg) From 585d7680d2bb9ce44dc9371e2e192ae52d2d8456 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:14 +0100 Subject: [PATCH 161/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/rayon/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/es.md b/markdown/org/docs/sewing/rayon/es.md index 65a7f377363..de8f958e5a2 100644 --- a/markdown/org/docs/sewing/rayon/es.md +++ b/markdown/org/docs/sewing/rayon/es.md @@ -1,5 +1,6 @@ --- title: Rayon +jargon: true --- ![Uso rayón para mi ropa interior](rayon.jpg) From 43183a807ce03c700c5c258b505edb7a3185d07f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:15 +0100 Subject: [PATCH 162/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/seam-allowance/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/es.md b/markdown/org/docs/sewing/seam-allowance/es.md index ed67c2c09a6..4c34f6248a5 100644 --- a/markdown/org/docs/sewing/seam-allowance/es.md +++ b/markdown/org/docs/sewing/seam-allowance/es.md @@ -1,5 +1,6 @@ --- title: Margen de costura +jargon: true --- ![El interior de la pierna en un par de vaqueros. La SA es el estrecho oscuro canal de tela junto a la costura. Ha sido zig-zagged para evitar que se fríe](zig-zag.jpg) From 0cc22b2949581586f653e10a7bfec51d1cf95e76 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:15 +0100 Subject: [PATCH 163/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/serger/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/es.md b/markdown/org/docs/sewing/serger/es.md index f098af79199..990172c31a9 100644 --- a/markdown/org/docs/sewing/serger/es.md +++ b/markdown/org/docs/sewing/serger/es.md @@ -1,5 +1,6 @@ --- title: Sargento +jargon: true --- ![La parte trasera acabada de una costura sergada](serged-seam.jpg) From 9274bab3cb6d701558ff046e2c976c03c2ac8d0c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:16 +0100 Subject: [PATCH 164/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/slipstitch/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/es.md b/markdown/org/docs/sewing/slipstitch/es.md index f6ce0776b91..45b1b14d20f 100644 --- a/markdown/org/docs/sewing/slipstitch/es.md +++ b/markdown/org/docs/sewing/slipstitch/es.md @@ -1,5 +1,6 @@ --- title: Punto elástico +jargon: true --- A slipstitch is a hand-sewing technique that allows you to join layers of fabric with a stitch that is invisible from the outside. A slipstitch is _slipped_ in between the layers of fabric where it sews together the seam allowance. From a959f9a9bfb7ebfc8b09df6c9e00cf8af9085ed9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:17 +0100 Subject: [PATCH 165/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/topstitching/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/es.md b/markdown/org/docs/sewing/topstitching/es.md index b5796185369..1db0a087c6f 100644 --- a/markdown/org/docs/sewing/topstitching/es.md +++ b/markdown/org/docs/sewing/topstitching/es.md @@ -1,5 +1,6 @@ --- title: Topstitching +jargon: true --- ![He usado un montón de cantos en un hilo rojo contraste en estos vaqueros para mi dios Akki](topstitching.jpg) From 292b405a9793080c170088ae20b46854e39df652 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:18 +0100 Subject: [PATCH 166/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/trimming/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/es.md b/markdown/org/docs/sewing/trimming/es.md index 099f2d8bdf7..bf4434f09ac 100644 --- a/markdown/org/docs/sewing/trimming/es.md +++ b/markdown/org/docs/sewing/trimming/es.md @@ -1,5 +1,6 @@ --- title: Trampa +jargon: true --- ![Permiso de costura siendo recortado](trimming.jpg) From cab3e09f6b112fcc6537cd737c1ad3af0cd54d99 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:19 +0100 Subject: [PATCH 167/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/twin-needle/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/es.md b/markdown/org/docs/sewing/twin-needle/es.md index 8e7aa39b2dd..9a91d0cdbe6 100644 --- a/markdown/org/docs/sewing/twin-needle/es.md +++ b/markdown/org/docs/sewing/twin-needle/es.md @@ -1,5 +1,6 @@ --- title: Aguja gemela +jargon: true --- ![Una aguja gemela de Schmetz](twin-needle.jpg) From c6faeb80faa77665d0a6f010052e95bb11345a1b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:19:20 +0100 Subject: [PATCH 168/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/sewing/zig-zag-stitch/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/es.md b/markdown/org/docs/sewing/zig-zag-stitch/es.md index 5da2aa883d2..1d46d1f870c 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/es.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/es.md @@ -1,5 +1,6 @@ --- title: Zig-zag stitch +jargon: true --- ![Una unión zig-zag se utiliza para evitar que el SA de la denim se fríe](zig-zag.jpg) From e102b70da287310cd899a187fbae0d25e9f0495f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:20:29 +0100 Subject: [PATCH 169/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/es.md b/markdown/org/showcase/a-jaeger-and-charlie-set/es.md index 9e1c9f0dc6d..e10491e49e6 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/es.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger y Charlie en un divertido tejido de pana" date: "2023-05-03" intro: "Este bonito conjunto de Jaeger y Waralee está confeccionado con pana de algodón y forro de cupro." From d360e7ce817eeb732ae673f41530f8c84a05af79 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:20:32 +0100 Subject: [PATCH 170/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/es.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/es.md index 12ec8caf4c7..264bd937297 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/es.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Una Hi de moda" date: "2023-05-03" intro: "La combinación de colores, los ojos bordados y los diminutos dientes son algunos de los detalles de esta mini-Hi." From 806bd5ac11d87742173dad08a201a7682780e95c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:20:35 +0100 Subject: [PATCH 171/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/es.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/es.md index e6cfa6a2bc7..50cecb84650 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/es.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Un Aarón con un estampado precioso" date: "2022-04-27" intro: "Esta atractiva camiseta Aaron A fue confeccionada por la intrépida costurera Gaëlle, ¡que básicamente empezó a coser hace 10 días! Se hizo sin serger." From d648d2194e81bcda3c22a4bf8c35432ff8e4625e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:20:52 +0100 Subject: [PATCH 172/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/es.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/es.md index 62760defd69..1e9d2e4fdd0 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/es.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Un bonito par de calzoncillos bóxer Bruce" date: "2022-04-27" intro: "La costurera de FreeSewing Gaëlle hizo estos bonitos calzoncillos bóxer Bruce para un amigo, con un poco de personalización. ¡El resultado es excelente!" From a399cb9238a81af5420de09c24e7135b192854dd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:21:22 +0100 Subject: [PATCH 173/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/hi-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/es.md b/markdown/org/showcase/hi-by-gaelle/es.md index 41d04bceac7..3e9d121fb6e 100644 --- a/markdown/org/showcase/hi-by-gaelle/es.md +++ b/markdown/org/showcase/hi-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Fabricado con tejido vaquero" date: "2022-07-29" intro: "Hola por Gaëlle" From 1a61e9d8b88457270ffdb4c6aaa8f7b36f693110 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:21:28 +0100 Subject: [PATCH 174/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/hugo-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/es.md b/markdown/org/showcase/hugo-by-gaelle/es.md index 356dcfc8f01..5dc95b41341 100644 --- a/markdown/org/showcase/hugo-by-gaelle/es.md +++ b/markdown/org/showcase/hugo-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "La amiga de Gaëlle con su nueva sudadera Hugo" date: "2023-02-15" intro: "Gaëlle hizo este Hugo cubierto de alegres monstruitos... bueno, no sé muy bien cómo llamar a estos monstruitos garabateados, pero está claro que son geniales. Es para una amiga, y nos encantaría recibir algo tan fabuloso. Fíjate en ese impresionante canalé a rayas coordinado." From 22ccbb3a004b8cf906f23d9478bbb97c6013e5c5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:21:44 +0100 Subject: [PATCH 175/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/es.md b/markdown/org/showcase/pyjama-paco-by-gaelle/es.md index 092ad19e342..5b39cee2faa 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/es.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pantalones de pijama" date: "2022-12-11" intro: "Aquí tienes un pijama Paco de Gaëlle, sin bolsillos ni puños elásticos." From 646af82441ade3e9ba694a11e765cae197d80792 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:21:58 +0100 Subject: [PATCH 176/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/tamiko-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/es.md b/markdown/org/showcase/tamiko-by-gaelle/es.md index ba0babe2bed..8c6bc36992e 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/es.md +++ b/markdown/org/showcase/tamiko-by-gaelle/es.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Un Tamiko ligeramente personalizado" date: "2022-06-09" intro: "¡Gaëlle hizo este precioso Tamiko para una amiga!" From a1f42d99e5fb5e428fa7c04a1b2a7dd5d179d010 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:22:22 +0100 Subject: [PATCH 177/795] New translations en.yaml (Spanish) skip-build --- sites/shared/components/workbench/es.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/es.yaml b/sites/shared/components/workbench/es.yaml index 2c2016e002b..506396161c8 100644 --- a/sites/shared/components/workbench/es.yaml +++ b/sites/shared/components/workbench/es.yaml @@ -23,6 +23,7 @@ clearTimingData: Clear timing data closure: Cierre collar: Cuello columns: columnas +conditional: Conditional configurePattern: Configurar patrón construction: Construcción continueEditingTitle: Seguir editando From 04550464f614d0491c5ba76a702314648cd44c47 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:24:55 +0100 Subject: [PATCH 178/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/simone-by-gaelle/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/es.md b/markdown/org/showcase/simone-by-gaelle/es.md index ceb32a2594f..f23db5abc17 100644 --- a/markdown/org/showcase/simone-by-gaelle/es.md +++ b/markdown/org/showcase/simone-by-gaelle/es.md @@ -5,7 +5,7 @@ date: 20231017 intro: "Esta camisa Simone tiene bonitos detalles, como botones coordinados y etiquetas personalizadas." designs: - "simone" -maker: Natalia +author: 27669 --- La talentosa Gaëlle compartió esta camiseta de Simone. No te pierdas las fotos de los detalles. From 37386f922e1cf99afa59d66781977e299fc22fa9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:28:25 +0100 Subject: [PATCH 179/795] New translations en.md (German) skip-build --- .../org/docs/designs/brian/options/draftforhighbust/de.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/de.md b/markdown/org/docs/designs/brian/options/draftforhighbust/de.md index 5602fb9ba6a..11ad86d8dc2 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/de.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/de.md @@ -1,8 +1,8 @@ --- -title: undefiniert +title: Schnittkonstruktion für Oberbrustumfang --- -undefiniert +Erstelle das Schnittmuster aufgrund des Maßes des Oberbrustumfanges (wenn vorhanden) und nicht nach dem Brustumfang (an der stärksten Stelle). Das Kleidungsstück wird figurbetonter ausfallen für Personen mit Brüsten. From ad0180480a392eb4bf65a677aaa4cd93be18714b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:37:54 +0100 Subject: [PATCH 180/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/hps/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hps/de.md b/markdown/org/docs/sewing/hps/de.md index 62b70630483..2197002b89c 100644 --- a/markdown/org/docs/sewing/hps/de.md +++ b/markdown/org/docs/sewing/hps/de.md @@ -1,5 +1,6 @@ --- title: Hochpunkt Schulter (HPS) +jargon: stimmt --- Der _Hochpunkt der Schulter_ oder _HPS_ wird als Basis für mehrere vertikale Messungen verwendet. From ce58c0cc9688ee856fc791f62784588a76bc34c7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:07 +0100 Subject: [PATCH 181/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/de.md b/markdown/org/docs/sewing/basic-sewing-supplies/de.md index 14b2f03a309..a84951cf6ad 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/de.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/de.md @@ -1,5 +1,6 @@ --- title: Grundlegendes Nähzubehör +jargon: stimmt --- > Was genau die unerlässliche Grundausstattung fürs Nähen umfasst, ist umstritten. Einige Leute mögen mehr Zubehör, andere sagen selbst die Nähmaschine sei nicht wirklich nötig, da auch von Hand genäht werden kann. From 5db5c948639ee843ae790cd2a6d979ac21f82c3f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:08 +0100 Subject: [PATCH 182/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/basting/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/de.md b/markdown/org/docs/sewing/basting/de.md index 544d09fe7fb..8abea9573cf 100644 --- a/markdown/org/docs/sewing/basting/de.md +++ b/markdown/org/docs/sewing/basting/de.md @@ -1,6 +1,7 @@ --- layout: onecol title: Heften +jargon: stimmt --- ![Die Form dieser Jeans-Rücktasche ist geheftet bevor die Tasche an das Kleidungsstück abgesteppt wird](basting.jpg) From 288b4092448d9669bedb92fb7b87e129197c267f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:09 +0100 Subject: [PATCH 183/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/coverlock/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/de.md b/markdown/org/docs/sewing/coverlock/de.md index 914825afaf0..3d3d09288cc 100644 --- a/markdown/org/docs/sewing/coverlock/de.md +++ b/markdown/org/docs/sewing/coverlock/de.md @@ -1,5 +1,6 @@ --- title: Coverlock +jargon: stimmt --- ![Ein Saum eines T-Shirts, hergestellt mit einer Coverlock-Maschine](coverlock-hem.jpg) From dc3b3a3a074cbe5227fc3d56fe3a051d790afbb1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:10 +0100 Subject: [PATCH 184/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/cutting/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/de.md b/markdown/org/docs/sewing/cutting/de.md index 0008418b8e0..c36e48e16ec 100644 --- a/markdown/org/docs/sewing/cutting/de.md +++ b/markdown/org/docs/sewing/cutting/de.md @@ -1,6 +1,7 @@ --- layout: onecol title: Zuschnitt +jargon: stimmt --- ![Ich, wie ich ein paar T-Shirts ausschneide](cutting.jpg) From 1bd08108c24e0207843ec621a722e1f80e6967a0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:11 +0100 Subject: [PATCH 185/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/darts/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/de.md b/markdown/org/docs/sewing/darts/de.md index 9d123c05338..aed8b1d7929 100644 --- a/markdown/org/docs/sewing/darts/de.md +++ b/markdown/org/docs/sewing/darts/de.md @@ -1,5 +1,6 @@ --- title: Abnäher +jargon: stimmt --- ![Brustabnäher auf einer Bluse](dart.jpg) From 7bc87476996dd3a8beb5de997fb9a296cd301129 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:12 +0100 Subject: [PATCH 186/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/double-welt-pockets/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/de.md b/markdown/org/docs/sewing/double-welt-pockets/de.md index 0aedff5e39b..32aa332a1a3 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/de.md +++ b/markdown/org/docs/sewing/double-welt-pockets/de.md @@ -1,5 +1,6 @@ --- title: Doppelpaspeltaschen +jargon: stimmt --- ## Video From cfe312f45bd9a611be238a411bcd6437dcf2125f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:13 +0100 Subject: [PATCH 187/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/ease/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/de.md b/markdown/org/docs/sewing/ease/de.md index 5c8ba7b47c5..d5e9fa7da04 100644 --- a/markdown/org/docs/sewing/ease/de.md +++ b/markdown/org/docs/sewing/ease/de.md @@ -1,5 +1,6 @@ --- title: Zugabe +jargon: stimmt --- ![Ohne eine Zugabe wärst du nicht in der Lage, deinen Arm zu heben](ease-plus.jpg) From a661486be8432384d58230e577b81590f39f41f6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:14 +0100 Subject: [PATCH 188/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/edgestitching/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/de.md b/markdown/org/docs/sewing/edgestitching/de.md index f22056f053f..0aedc21d052 100644 --- a/markdown/org/docs/sewing/edgestitching/de.md +++ b/markdown/org/docs/sewing/edgestitching/de.md @@ -1,5 +1,6 @@ --- title: Randnaht +jargon: stimmt --- Edgestitching is a specific type of _topstitching_. Sie ist aufgrund ihrer Lage besonders. Hierbei wird je nach Abstand zur Naht unter anderem das knappkantige (ca. 3mm bzw. 1/8 inch), oder auch das füßchenbreite (Nähfußkante als Abstandhalter) Absteppen unterschieden. From 41b0af8c940df38110f8f8a6e5587162c88e07a7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:15 +0100 Subject: [PATCH 189/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/fabric-grain/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/de.md b/markdown/org/docs/sewing/fabric-grain/de.md index 2bc6095c6ef..7c3ea70c0ce 100644 --- a/markdown/org/docs/sewing/fabric-grain/de.md +++ b/markdown/org/docs/sewing/fabric-grain/de.md @@ -1,5 +1,6 @@ --- title: Fadenlauf +jargon: stimmt --- ![Der Fadenlauf verläuft parallel zum Webrand](fabric-grain.jpg) From cb0a6da1522c8d96c0f075e9f2b9e3d991f605ba Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:16 +0100 Subject: [PATCH 190/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/good-sides-together/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/de.md b/markdown/org/docs/sewing/good-sides-together/de.md index fa34f0dfcc9..380e083a75b 100644 --- a/markdown/org/docs/sewing/good-sides-together/de.md +++ b/markdown/org/docs/sewing/good-sides-together/de.md @@ -1,5 +1,6 @@ --- title: Gute Seiten zusammen +jargon: stimmt --- Wenn ich von guten Seiten spreche, dann kann man sich entweder auf Schnitt oder Nähen beziehen: From 7412c0f3d2d6428e6c82a18e18a4dbe2af7275fa Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:17 +0100 Subject: [PATCH 191/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/hemming/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hemming/de.md b/markdown/org/docs/sewing/hemming/de.md index 85dcd18bd0f..a12aee0c50f 100644 --- a/markdown/org/docs/sewing/hemming/de.md +++ b/markdown/org/docs/sewing/hemming/de.md @@ -1,5 +1,6 @@ --- title: Säumen +jargon: stimmt --- ![Der Saum am unteren Ende eines T-Shirts](coverlock-hem.jpg) From a0fe45bdb09e4b99f46850d23f27a637c9c52924 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:18 +0100 Subject: [PATCH 192/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/jersey/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/de.md b/markdown/org/docs/sewing/jersey/de.md index 1d1d2ef6f34..1a563b15c5e 100644 --- a/markdown/org/docs/sewing/jersey/de.md +++ b/markdown/org/docs/sewing/jersey/de.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: stimmt --- ![Ein Stück grauer Jersey](knit-fabric.jpg) From 8e08486120fe8dc7c135830776bbbfaef5a4bb6b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:19 +0100 Subject: [PATCH 193/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/knit-fabric/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/knit-fabric/de.md b/markdown/org/docs/sewing/knit-fabric/de.md index 4b3d3f594b3..2cf116d241d 100644 --- a/markdown/org/docs/sewing/knit-fabric/de.md +++ b/markdown/org/docs/sewing/knit-fabric/de.md @@ -1,5 +1,6 @@ --- title: Strickstoff +jargon: stimmt --- ![Ein Stück graues (Französisch Terry) Trikot, ein Strickstoff](fabric.jpg) From 349a545db872a811b76bf96f8a841d4fdd0dbbd0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:20 +0100 Subject: [PATCH 194/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/on-the-fold/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/de.md b/markdown/org/docs/sewing/on-the-fold/de.md index a9954f961c9..5e9e1940f58 100644 --- a/markdown/org/docs/sewing/on-the-fold/de.md +++ b/markdown/org/docs/sewing/on-the-fold/de.md @@ -1,5 +1,6 @@ --- title: Im Stoffbruch +jargon: stimmt --- Wenn du ein symmetrisches Schnittmusterstück hast, sagt dir die Anleitung vielleicht, es _im Stoffbruch_ zu schneiden. From f469897fef723ceba1ddf26eeb872639abc622c1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:21 +0100 Subject: [PATCH 195/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/pinning/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/de.md b/markdown/org/docs/sewing/pinning/de.md index 59e7ceb0dfa..86ba01139fd 100644 --- a/markdown/org/docs/sewing/pinning/de.md +++ b/markdown/org/docs/sewing/pinning/de.md @@ -1,5 +1,6 @@ --- title: Stecken +jargon: stimmt --- ![Stecknadeln sind Teil der Grundausstattung des Nähzubehörs](sewing-pins.jpg) From 535cf0882d4f1a5b43588c474d3b1c7ac363eeb3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:22 +0100 Subject: [PATCH 196/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/rayon/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/de.md b/markdown/org/docs/sewing/rayon/de.md index 925eed90d74..0f6c496efb4 100644 --- a/markdown/org/docs/sewing/rayon/de.md +++ b/markdown/org/docs/sewing/rayon/de.md @@ -1,5 +1,6 @@ --- title: Rayon +jargon: stimmt --- ![Ich benutze Strahlen für meine Unterwäsche](rayon.jpg) From 104ed1eea94e5cd76e06467cc998454452939b72 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:22 +0100 Subject: [PATCH 197/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/seam-allowance/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/de.md b/markdown/org/docs/sewing/seam-allowance/de.md index f1b261c8b1f..e4f5a90c937 100644 --- a/markdown/org/docs/sewing/seam-allowance/de.md +++ b/markdown/org/docs/sewing/seam-allowance/de.md @@ -1,5 +1,6 @@ --- title: Nahtzugabe +jargon: stimmt --- ![Die Innenseite des Beins bei einem Paar Jeans. Die Nahtzugabe ist der dunkle, schmale Streifen neben der Naht. Sie wurde gezick-zackt, um sie vorm Ausfransen zu bewahren](zig-zag.jpg) From e1208a95b50a8085afb02f35b83674c63daafc76 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:23 +0100 Subject: [PATCH 198/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/serger/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/de.md b/markdown/org/docs/sewing/serger/de.md index 5096520538f..eed25933d5c 100644 --- a/markdown/org/docs/sewing/serger/de.md +++ b/markdown/org/docs/sewing/serger/de.md @@ -1,5 +1,6 @@ --- title: Serger +jargon: stimmt --- ![Die fertige Rückseite einer gesenkten Naht](serged-seam.jpg) From ceba11a635474ddfeb5c1d9de11a5939764eaf66 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:24 +0100 Subject: [PATCH 199/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/slipstitch/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/de.md b/markdown/org/docs/sewing/slipstitch/de.md index 201cad7f912..e7a156b7d15 100644 --- a/markdown/org/docs/sewing/slipstitch/de.md +++ b/markdown/org/docs/sewing/slipstitch/de.md @@ -1,5 +1,6 @@ --- title: Steppstich +jargon: stimmt --- Ein Steppstich ist eine Handnähtechnik, mit der du Stofflagen mit einem von außen unsichtbaren Stich verbinden kannst. Ein Steppstich ist __ zwischen die Stofflagen geschoben, wo er die Nahtzugabe zusammennäht. From 59671a2bd1feb78926143863f86cc029369f5dbb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:25 +0100 Subject: [PATCH 200/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/topstitching/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/de.md b/markdown/org/docs/sewing/topstitching/de.md index d6d777a2c6d..6510bed94ea 100644 --- a/markdown/org/docs/sewing/topstitching/de.md +++ b/markdown/org/docs/sewing/topstitching/de.md @@ -1,5 +1,6 @@ --- title: Topstitching +jargon: stimmt --- ![Ich habe für meinen Gottessohn Akki in einem kontrastierten, roten Faden auf diesen Jeans viel Stich verwendet](topstitching.jpg) From a6c83cca109048030b87c5b27bab38f53304ad8f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:26 +0100 Subject: [PATCH 201/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/trimming/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/de.md b/markdown/org/docs/sewing/trimming/de.md index c7a9826b7f4..bb85fd175b6 100644 --- a/markdown/org/docs/sewing/trimming/de.md +++ b/markdown/org/docs/sewing/trimming/de.md @@ -1,5 +1,6 @@ --- title: Zurückschneiden +jargon: stimmt --- ![Nahtzugabe, die zurückgeschnitten wird](trimming.jpg) From e5c9e32a6530ef9e8e0fdb6ad7273522595c0eb9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:27 +0100 Subject: [PATCH 202/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/twin-needle/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/de.md b/markdown/org/docs/sewing/twin-needle/de.md index 72660ec9ef4..ccf43a4255b 100644 --- a/markdown/org/docs/sewing/twin-needle/de.md +++ b/markdown/org/docs/sewing/twin-needle/de.md @@ -1,5 +1,6 @@ --- title: Zwillingsnadel +jargon: stimmt --- ![Eine Zwillingsnadel von Schmetz](twin-needle.jpg) From 40a63994e79657db617a6dc292b8874870a2ef95 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:38:27 +0100 Subject: [PATCH 203/795] New translations en.md (German) skip-build --- markdown/org/docs/sewing/zig-zag-stitch/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/de.md b/markdown/org/docs/sewing/zig-zag-stitch/de.md index 0a81f107d57..349f9a363c8 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/de.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/de.md @@ -1,5 +1,6 @@ --- title: Zickzackstich +jargon: stimmt --- ![Eine Zick-Zack-Stich wird verwendet, um die Nahtzugabe des Denims am Ausfransen zu hindern](zig-zag.jpg) From acd2a7ac5183d279a2b0511ecac4f3a62b110440 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:39:36 +0100 Subject: [PATCH 204/795] New translations en.md (German) skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/de.md b/markdown/org/showcase/a-jaeger-and-charlie-set/de.md index b9118a1aa66..e5d31829503 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/de.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger und Charlie in einem lustigen Kordstoff" date: "03.05.2023" intro: "Dieses hübsche Set von Jaeger und Waralee besteht aus einem Baumwollcord und einem Cupro-Futter." From 83b86fe3c1918a3cf3b98b3bb988f0493303f2e6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:39:38 +0100 Subject: [PATCH 205/795] New translations en.md (German) skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/de.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/de.md index 91a07e61918..e4b3b798d27 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/de.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Eine modische Hi" date: "03.05.2023" intro: "Das Farbschema, die gestickten Augen und die winzigen Zähne sind nur einige der Details dieses Mini-Hi." From bd18d14f72db5fcaf51d9c514dccc19fc6af2b6a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:39:42 +0100 Subject: [PATCH 206/795] New translations en.md (German) skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/de.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/de.md index 24c6f7c623d..967b99b69c6 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/de.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Ein Aaron mit einem schönen Aufdruck" date: "2022-04-27" intro: "Dieses attraktive Aaron A-Shirt wurde von der furchtlosen Näherin Gaëlle genäht, die vor 10 Tagen mit dem Nähen angefangen hat! Es wurde ohne einen Serger gemacht." From cefef74c98958a83cd2d3b01a1a3928bf5ebfc2f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:39:59 +0100 Subject: [PATCH 207/795] New translations en.md (German) skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/de.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/de.md index e82e3577db3..977995717d8 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/de.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Ein hübsches Paar Bruce Boxershorts" date: "2022-04-27" intro: "FreeSewing-Macherin Gaëlle hat diese hübschen Bruce-Boxershorts für einen Freund genäht und ein wenig angepasst. Das Ergebnis ist hervorragend!" From 25222b98160d00bef5e85c316428930bf9768f3b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:40:28 +0100 Subject: [PATCH 208/795] New translations en.md (German) skip-build --- markdown/org/showcase/hi-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/de.md b/markdown/org/showcase/hi-by-gaelle/de.md index d330ff18b96..f42510410a8 100644 --- a/markdown/org/showcase/hi-by-gaelle/de.md +++ b/markdown/org/showcase/hi-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Hergestellt aus Jeansstoff" date: "2022-07-29" intro: "Hallo von Gaëlle" From f0d92b132d52db5e643a03ada1b2868caab30f39 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:40:34 +0100 Subject: [PATCH 209/795] New translations en.md (German) skip-build --- markdown/org/showcase/hugo-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/de.md b/markdown/org/showcase/hugo-by-gaelle/de.md index 21469e90775..92eddeaec3f 100644 --- a/markdown/org/showcase/hugo-by-gaelle/de.md +++ b/markdown/org/showcase/hugo-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Gaëlles Freundin in ihrem neuen Hugo-Kapuzenpulli" date: "2023-02-15" intro: "Gaëlle hat diesen Hugo gebastelt, der mit fröhlichen kleinen ... na ja, ich weiß nicht, wie man diese verschnörkelten kleinen Monster nennen soll, aber sie sind auf jeden Fall toll. Es ist für eine Freundin und wir würden uns sehr freuen, so etwas Tolles zu bekommen. Sieh dir das tolle gestreifte Bündchen an." From 1d93cb628a3e149804f52afcfa05a86b687ec031 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:40:49 +0100 Subject: [PATCH 210/795] New translations en.md (German) skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/de.md b/markdown/org/showcase/pyjama-paco-by-gaelle/de.md index 2fae5b9b739..8cebe123887 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/de.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pyjamahose" date: "2022-12-11" intro: "Hier ist ein Pyjama Paco von Gaëlle, ohne Taschen und elastische Bündchen." From 9761878790092b854791026a054f3f6a09b66bbd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:41:04 +0100 Subject: [PATCH 211/795] New translations en.md (German) skip-build --- markdown/org/showcase/tamiko-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/de.md b/markdown/org/showcase/tamiko-by-gaelle/de.md index ce29f5eb066..2a71249000b 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/de.md +++ b/markdown/org/showcase/tamiko-by-gaelle/de.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Ein leicht angepasstes Tamiko" date: "09.06.2022" intro: "Gaëlle hat dieses schöne Tamiko für eine Freundin gemacht!" From d41e68b30b31cfa27a31b15067e6c113ea6047da Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:41:29 +0100 Subject: [PATCH 212/795] New translations en.yaml (German) skip-build --- sites/shared/components/workbench/de.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/de.yaml b/sites/shared/components/workbench/de.yaml index b9d735553f0..4d2655184a9 100644 --- a/sites/shared/components/workbench/de.yaml +++ b/sites/shared/components/workbench/de.yaml @@ -23,6 +23,7 @@ clearTimingData: Timingdaten löschen closure: Verschluss collar: Kragen columns: Spalten +conditional: Conditional configurePattern: Muster konfigurieren construction: Konstruktion continueEditingTitle: Weiter bearbeiten From 258287df0b51acfc0dff27761dbc54ea302151b9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:44:03 +0100 Subject: [PATCH 213/795] New translations en.md (German) skip-build --- markdown/org/showcase/simone-by-gaelle/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/de.md b/markdown/org/showcase/simone-by-gaelle/de.md index cce17c33b19..a4e5e32c5dc 100644 --- a/markdown/org/showcase/simone-by-gaelle/de.md +++ b/markdown/org/showcase/simone-by-gaelle/de.md @@ -5,7 +5,7 @@ date: 20231017 intro: "Dieses Hemd von Simone hat schöne Details wie koordinierte Knöpfe und individuelle Etiketten." designs: - "simone" -maker: Natalia +author: 27669 --- Die talentierte Gaëlle hat dieses Simone-Shirt geteilt. Verpasse nicht die Detailfotos. From 3ea12fa716fdb36c7cbd628ca3880331d4292e6e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:47:31 +0100 Subject: [PATCH 214/795] New translations en.md (Dutch) skip-build --- .../org/docs/designs/brian/options/draftforhighbust/nl.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/nl.md b/markdown/org/docs/designs/brian/options/draftforhighbust/nl.md index 556ba7465e1..2992fb29f63 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/nl.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/nl.md @@ -1,8 +1,8 @@ --- -title: ongedefinieerd +title: Teken voor hoge buste --- -ongedefinieerd +Stel het patroon op voor de hoge borstomvang (indien beschikbaar) in plaats van de (volle) borst. Dit resulteert in een beter passend kledingstuk voor mensen met borsten. From f0ee6da9985f6eae756a4b2dbd061e713ff125db Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:42 +0100 Subject: [PATCH 215/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/hps/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hps/nl.md b/markdown/org/docs/sewing/hps/nl.md index 35ebad583b6..84791c0890d 100644 --- a/markdown/org/docs/sewing/hps/nl.md +++ b/markdown/org/docs/sewing/hps/nl.md @@ -1,5 +1,6 @@ --- title: Hoog Punt Schouder (HPS) +jargon: true --- Het _hoog punt schouder_ of _HPS_ punt wordt gebruikt als basis voor verschillende verticale metingen. From 5409ab78bb440c77b67369eee0669b08977cba7b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:56 +0100 Subject: [PATCH 216/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/nl.md b/markdown/org/docs/sewing/basic-sewing-supplies/nl.md index 995831fdd07..8b1e0b87509 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/nl.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/nl.md @@ -1,5 +1,6 @@ --- title: Basis naaimateriaal +jargon: true --- > Over wat je exact kan verstaan onder 'basismateriaal' wordt wel eens gedebatteerd. Sommige mensen hebben graag meer spullen, anderen zeggen dat zelfs een naaimachine optioneel is als je met de hand kan naaien. From 606618077b1dc0428b21b24e9b9cc68952a3aaf1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:57 +0100 Subject: [PATCH 217/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/basting/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/nl.md b/markdown/org/docs/sewing/basting/nl.md index 2c2ff64c562..ecb9496454b 100644 --- a/markdown/org/docs/sewing/basting/nl.md +++ b/markdown/org/docs/sewing/basting/nl.md @@ -1,6 +1,7 @@ --- layout: opecol title: Driegen +jargon: true --- ![De vorm van deze achterzak is gedriegd voor de zak op de jeansbroek gestikt wordt](basting.jpg) From 9b54e91f0bc99f4fd3d99cbbd556debb7b59e5cc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:58 +0100 Subject: [PATCH 218/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/coverlock/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/nl.md b/markdown/org/docs/sewing/coverlock/nl.md index 4724ee04180..cfe3ebc2e28 100644 --- a/markdown/org/docs/sewing/coverlock/nl.md +++ b/markdown/org/docs/sewing/coverlock/nl.md @@ -1,5 +1,6 @@ --- title: Coverlock +jargon: true --- ![Een zoom van een t-shirt, genaaid met een coverlock](coverlock-hem.jpg) From 4d50ac1a01fc51dabb4e7d4ebcf4cc8dc6024e08 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:59 +0100 Subject: [PATCH 219/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/cutting/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/nl.md b/markdown/org/docs/sewing/cutting/nl.md index c19c64f7374..f3159056692 100644 --- a/markdown/org/docs/sewing/cutting/nl.md +++ b/markdown/org/docs/sewing/cutting/nl.md @@ -1,6 +1,7 @@ --- layout: opecol title: Knippen +jargon: true --- ![Ik, druk t-shirts aan het uitknippen](cutting.jpg) From ff8a93a17178aa1072096cd6c7372295f4e22d65 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:56:59 +0100 Subject: [PATCH 220/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/darts/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/nl.md b/markdown/org/docs/sewing/darts/nl.md index fc90221a96e..50ab3f8821a 100644 --- a/markdown/org/docs/sewing/darts/nl.md +++ b/markdown/org/docs/sewing/darts/nl.md @@ -1,5 +1,6 @@ --- title: Nepen +jargon: true --- ![Bustenepen op een blouse](dart.jpg) From e4e0f76fb7b247cd99a6c46dd9fe515b9c6df944 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:00 +0100 Subject: [PATCH 221/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/double-welt-pockets/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/nl.md b/markdown/org/docs/sewing/double-welt-pockets/nl.md index ce9d21cc22e..95b328353e4 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/nl.md +++ b/markdown/org/docs/sewing/double-welt-pockets/nl.md @@ -1,5 +1,6 @@ --- title: Dubbele paspelzak +jargon: true --- ## Video From 41b71681bf6210abbe4ca2dc3206c56cd8623eba Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:01 +0100 Subject: [PATCH 222/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/ease/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/nl.md b/markdown/org/docs/sewing/ease/nl.md index 52f3354fdad..56d562d4c3a 100644 --- a/markdown/org/docs/sewing/ease/nl.md +++ b/markdown/org/docs/sewing/ease/nl.md @@ -1,5 +1,6 @@ --- title: Overwijdte +jargon: true --- ![Zonder overwijdte zou je je arm niet kunnen optillen](ease-plus.jpg) From edd1e6c0b5438a3aaf3ee7d616a08a795f5f336a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:02 +0100 Subject: [PATCH 223/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/edgestitching/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/nl.md b/markdown/org/docs/sewing/edgestitching/nl.md index 08861b2a6bd..f868c416554 100644 --- a/markdown/org/docs/sewing/edgestitching/nl.md +++ b/markdown/org/docs/sewing/edgestitching/nl.md @@ -1,5 +1,6 @@ --- title: Stiksels +jargon: true --- Edgestitching is a specific type of _topstitching_. Het is specifiek vanwege de locatie. To edgestitch means to topstitch right next to a seam, typically about 3mm or 1/8 inch next to it. From c4e5c36775ca0f546d0b6981adb610207cb5d91a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:03 +0100 Subject: [PATCH 224/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/fabric-grain/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/nl.md b/markdown/org/docs/sewing/fabric-grain/nl.md index 735a0a79ea9..4ed670a8428 100644 --- a/markdown/org/docs/sewing/fabric-grain/nl.md +++ b/markdown/org/docs/sewing/fabric-grain/nl.md @@ -1,5 +1,6 @@ --- title: Draadrichting +jargon: true --- ![De draadrichting loopt parallel met de zelfkant](fabric-grain.jpg) From 601c1cefab75ed4708a2921229b312290ed0a1e3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:04 +0100 Subject: [PATCH 225/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/good-sides-together/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/nl.md b/markdown/org/docs/sewing/good-sides-together/nl.md index cc6053b5074..80416150852 100644 --- a/markdown/org/docs/sewing/good-sides-together/nl.md +++ b/markdown/org/docs/sewing/good-sides-together/nl.md @@ -1,5 +1,6 @@ --- title: Goede kanten op elkaar +jargon: true --- Als ik het heb over 'goede kanten op elkaar' kan dat zowel naar knippen als naar naaien verwijzen: From 193310a2ab8fc3ccd9c86f9d420757b3af591362 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:05 +0100 Subject: [PATCH 226/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/hemming/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hemming/nl.md b/markdown/org/docs/sewing/hemming/nl.md index 3e63c7581f9..6f6b5d5aaf9 100644 --- a/markdown/org/docs/sewing/hemming/nl.md +++ b/markdown/org/docs/sewing/hemming/nl.md @@ -1,5 +1,6 @@ --- title: Zomen +jargon: true --- ![De zoom aan de onderrand van een t-shirt](coverlock-hem.jpg) From 658a1fda48d97a90cac1aceb4299100c12823a12 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:06 +0100 Subject: [PATCH 227/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/jersey/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/nl.md b/markdown/org/docs/sewing/jersey/nl.md index 50e70611273..cd9507b91ef 100644 --- a/markdown/org/docs/sewing/jersey/nl.md +++ b/markdown/org/docs/sewing/jersey/nl.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: true --- ![Een stuk grijze jersey](knit-fabric.jpg) From 0864ec0e9739c89aed604b145e9e8b769fa6858a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:07 +0100 Subject: [PATCH 228/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/knit-fabric/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/knit-fabric/nl.md b/markdown/org/docs/sewing/knit-fabric/nl.md index c10af078f44..de3492bcb7a 100644 --- a/markdown/org/docs/sewing/knit-fabric/nl.md +++ b/markdown/org/docs/sewing/knit-fabric/nl.md @@ -1,5 +1,6 @@ --- title: Gebreide stof +jargon: true --- ![Een stuk grijze (French Terry) jersey, een jersey stof](fabric.jpg) From 71cf56fa080f06e1f72729c4110543129584cda0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:08 +0100 Subject: [PATCH 229/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/on-the-fold/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/nl.md b/markdown/org/docs/sewing/on-the-fold/nl.md index 8cb7c4abee8..13e27a32813 100644 --- a/markdown/org/docs/sewing/on-the-fold/nl.md +++ b/markdown/org/docs/sewing/on-the-fold/nl.md @@ -1,5 +1,6 @@ --- title: Aan de stofvouw +jargon: true --- Wanneer je een symmetrisch patroondeel hebt kan het dat de instructies zeggen dat je het _aan de stofvouw_ moet knippen. From 67b16a81a40f71b5dcf2ef60398ba1034832d191 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:09 +0100 Subject: [PATCH 230/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/pinning/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/nl.md b/markdown/org/docs/sewing/pinning/nl.md index 4730db747ba..a3fb1f9e85f 100644 --- a/markdown/org/docs/sewing/pinning/nl.md +++ b/markdown/org/docs/sewing/pinning/nl.md @@ -1,5 +1,6 @@ --- title: Spelden +jargon: true --- ![Kopspelden maken deel uit van de basisbenodigdheden](sewing-pins.jpg) From 0068f01f7ecce04f8450efc58efafe8eee2a6ea4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:10 +0100 Subject: [PATCH 231/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/rayon/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/nl.md b/markdown/org/docs/sewing/rayon/nl.md index 2b7c4ca9989..c582186fd8a 100644 --- a/markdown/org/docs/sewing/rayon/nl.md +++ b/markdown/org/docs/sewing/rayon/nl.md @@ -1,5 +1,6 @@ --- title: Rayon +jargon: true --- ![Ik gebruik rayon voor mijn ondergoed](rayon.jpg) From 21632b1fa0c6fdedf904a9bbe284a13b4b152ff2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:11 +0100 Subject: [PATCH 232/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/seam-allowance/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/nl.md b/markdown/org/docs/sewing/seam-allowance/nl.md index fc76cfe60f4..a24fde1a6eb 100644 --- a/markdown/org/docs/sewing/seam-allowance/nl.md +++ b/markdown/org/docs/sewing/seam-allowance/nl.md @@ -1,5 +1,6 @@ --- title: Naadtoeslag +jargon: true --- ![De binnenkant van de pijp van een jeansbroek. De NT is het smalle stukje donkere stof naast de naad. Het is met een zigzagsteek afgewerkt zodat het niet uitrafelt](zig-zag.jpg) From abf18eadb4e7217c2b4ddb2d489ef3ea52fad022 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:12 +0100 Subject: [PATCH 233/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/serger/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/nl.md b/markdown/org/docs/sewing/serger/nl.md index 1bf3f01f4c6..13a07e0d14d 100644 --- a/markdown/org/docs/sewing/serger/nl.md +++ b/markdown/org/docs/sewing/serger/nl.md @@ -1,5 +1,6 @@ --- title: Serger/overlock +jargon: true --- ![De afgewerkte achterkant van een gelockte naad](serged-seam.jpg) From b36f082a0b09071227c499cabeabe528acd0d805 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:12 +0100 Subject: [PATCH 234/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/slipstitch/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/nl.md b/markdown/org/docs/sewing/slipstitch/nl.md index a01c19819e1..cfcd9c9004c 100644 --- a/markdown/org/docs/sewing/slipstitch/nl.md +++ b/markdown/org/docs/sewing/slipstitch/nl.md @@ -1,5 +1,6 @@ --- title: Stiksteek +jargon: true --- A slipstitch is a hand-sewing technique that allows you to join layers of fabric with a stitch that is invisible from the outside. A slipstitch is _slipped_ in between the layers of fabric where it sews together the seam allowance. From 5eee5a8cb6ad5a9fdfe53389c6fa622973bf2e58 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:13 +0100 Subject: [PATCH 235/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/topstitching/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/nl.md b/markdown/org/docs/sewing/topstitching/nl.md index a8ec68c2530..c72704b6b28 100644 --- a/markdown/org/docs/sewing/topstitching/nl.md +++ b/markdown/org/docs/sewing/topstitching/nl.md @@ -1,5 +1,6 @@ --- title: Sierstiksel +jargon: true --- ![Ik gebruikte een hoop contrasterend rood sierstiksel op deze jeans voor mijn petekind Akki](topstitching.jpg) From fdb9f9f02e3e872eb661fa6a1d34314b26b247bf Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:14 +0100 Subject: [PATCH 236/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/trimming/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/nl.md b/markdown/org/docs/sewing/trimming/nl.md index d3fb5497b53..ddb1732bf82 100644 --- a/markdown/org/docs/sewing/trimming/nl.md +++ b/markdown/org/docs/sewing/trimming/nl.md @@ -1,5 +1,6 @@ --- title: Bijknippen +jargon: true --- ![Naadtoeslag wordt bijgeknipt](trimming.jpg) From 64159930d7067a8487fc1d8918ce3691132ffd31 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:15 +0100 Subject: [PATCH 237/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/twin-needle/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/nl.md b/markdown/org/docs/sewing/twin-needle/nl.md index fdb8c0edcef..bfcd933e412 100644 --- a/markdown/org/docs/sewing/twin-needle/nl.md +++ b/markdown/org/docs/sewing/twin-needle/nl.md @@ -1,5 +1,6 @@ --- title: Tweelingnaald +jargon: true --- ![Een tweelingnaald van Schmetz](twin-needle.jpg) From 07ed2aa7511ee3bbfa5b648f73bf1e835e4ccf9b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:57:16 +0100 Subject: [PATCH 238/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/sewing/zig-zag-stitch/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/nl.md b/markdown/org/docs/sewing/zig-zag-stitch/nl.md index 71a1cc1e227..c32c0b7b012 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/nl.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/nl.md @@ -1,5 +1,6 @@ --- title: Zigzagsteek +jargon: true --- ![Een zigzagsteek wordt gebruikt om te voorkomen dat de NT van de jeansstof uitrafelt](zig-zag.jpg) From 06d72565ebad1df67f08977dc779a5e6d3ffff7e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:58:24 +0100 Subject: [PATCH 239/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/nl.md b/markdown/org/showcase/a-jaeger-and-charlie-set/nl.md index c45681933cf..c8ccb1da221 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/nl.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger en Charlie in een leuke ribfluwelen stof" date: "2023-05-03" intro: "Deze mooie set van Jaeger en Waralee is gemaakt van katoenen ribfluweel en cupro voering." From 68242e2301742911b35c6fcbfe501214fe647e19 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:58:26 +0100 Subject: [PATCH 240/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/nl.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/nl.md index 81af0f37b62..83981a84a5b 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/nl.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Een modieuze Hi" date: "2023-05-03" intro: "Het kleurenschema, de geborduurde ogen en de kleine tandjes zijn enkele van de details op deze mini-Hi." From 2e9ab136a5e3323598cdde163c69e7caefb08451 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:58:30 +0100 Subject: [PATCH 241/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/nl.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/nl.md index e48941b5d89..99208a68743 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/nl.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Een Aaron met een prachtige print" date: "2022-04-27" intro: "Dit aantrekkelijke Aaron A-shirt is gemaakt door de onverschrokken naaister Gaëlle, die eigenlijk 10 dagen geleden is begonnen met naaien! Het is gedaan zonder overlockmachine." From ba3db0934e054e08c239f90663f7d9983d9888fc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:58:46 +0100 Subject: [PATCH 242/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/nl.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/nl.md index 898210d90e6..80c1db2a919 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/nl.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Een mooie Bruce boxerslip" date: "2022-04-27" intro: "FreeSewing maakster Gaëlle maakte deze mooie Bruce boxerslip voor een vriend, met een beetje maatwerk. Het resultaat is uitstekend!" From 79a3ecef85a899311047628875a189fdab33268c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:59:15 +0100 Subject: [PATCH 243/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/hi-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/nl.md b/markdown/org/showcase/hi-by-gaelle/nl.md index 34ff4d2256c..f4316452b32 100644 --- a/markdown/org/showcase/hi-by-gaelle/nl.md +++ b/markdown/org/showcase/hi-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Gemaakt van jeansstof" date: "2022-07-29" intro: "Hoi door Gaëlle" From 2057f2b1fbf18c976bd5bbfa5c4efb4ac7719307 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:59:20 +0100 Subject: [PATCH 244/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/hugo-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/nl.md b/markdown/org/showcase/hugo-by-gaelle/nl.md index b9095ec0c88..6d951a2a630 100644 --- a/markdown/org/showcase/hugo-by-gaelle/nl.md +++ b/markdown/org/showcase/hugo-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Gaëlle's vriend in hun nieuwe Hugo hoodie" date: "2023-02-15" intro: "Gaëlle maakte deze Hugo bedekt met vrolijke kleine ...nou ja, ik weet niet precies hoe ik deze kronkelende monstertjes moet noemen, maar ze zijn duidelijk geweldig. Het is voor een vriendin en we zouden het geweldig vinden om zoiets geweldigs te ontvangen. Kijk eens naar die geweldige gestreepte ribboord." From cccdb8ce1d23c103871427881d443312e4caaa4f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:59:35 +0100 Subject: [PATCH 245/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/nl.md b/markdown/org/showcase/pyjama-paco-by-gaelle/nl.md index 7ac5e6564b1..c1104d100d8 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/nl.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pyjamabroek" date: "2022-12-11" intro: "Hier is een pyjama Paco van Gaëlle, zonder zakken of elastische boorden." From 7053811e6a3ab00014e96679a4e5653fe9da6aa7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 20:59:50 +0100 Subject: [PATCH 246/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/tamiko-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/nl.md b/markdown/org/showcase/tamiko-by-gaelle/nl.md index 88c219264b3..aaaca647789 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/nl.md +++ b/markdown/org/showcase/tamiko-by-gaelle/nl.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Een licht aangepaste Tamiko" date: "2022-06-09" intro: "Gaëlle maakte deze mooie Tamiko voor een vriendin!" From fe3939d8aa3f395d8a4efea17743a22d8bcc196c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:00:15 +0100 Subject: [PATCH 247/795] New translations en.yaml (Dutch) skip-build --- sites/shared/components/workbench/nl.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/nl.yaml b/sites/shared/components/workbench/nl.yaml index 702e2737587..5f46bdcc215 100644 --- a/sites/shared/components/workbench/nl.yaml +++ b/sites/shared/components/workbench/nl.yaml @@ -23,6 +23,7 @@ clearTimingData: Timing gegevens leegmaken closure: Sluiting collar: Kraag columns: kolommen +conditional: Conditional configurePattern: Patroon configureren construction: Constructie continueEditingTitle: Doorgaan met bewerken From 75f645ca27a8c019252ab9fb17c7ba8883e3be80 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:02:47 +0100 Subject: [PATCH 248/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/simone-by-gaelle/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/nl.md b/markdown/org/showcase/simone-by-gaelle/nl.md index 39102e419e7..990770c8b53 100644 --- a/markdown/org/showcase/simone-by-gaelle/nl.md +++ b/markdown/org/showcase/simone-by-gaelle/nl.md @@ -5,7 +5,7 @@ date: 20231017 intro: "Dit Simone overhemd heeft prachtige details, waaronder gecoördineerde knopen en aangepaste labels." designs: - "simone" -maker: Natalia +author: 27669 --- De getalenteerde Gaëlle deelde dit shirt van Simone. Mis de detailfoto's niet. From 1958c31f3c635a1eb3dc7eb2f7462098d827f5e6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:06:15 +0100 Subject: [PATCH 249/795] New translations en.md (Ukrainian) skip-build --- .../org/docs/designs/brian/options/draftforhighbust/uk.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/uk.md b/markdown/org/docs/designs/brian/options/draftforhighbust/uk.md index 7d83ef92cb3..2b27dcc34f7 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/uk.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/uk.md @@ -1,8 +1,8 @@ --- -title: невизначений +title: Проект для високого бюста --- -невизначений +Складіть викрійку для високого обхвату грудей (якщо є), а не для (повних) грудей. Це дозволить отримати більш облягаючий одяг для людей з грудьми. From 0e95e03bd99b572e7682394c2e939eb875c75e32 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:15:59 +0100 Subject: [PATCH 250/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/hps/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hps/uk.md b/markdown/org/docs/sewing/hps/uk.md index 1c2cd421f75..c72f08d99fc 100644 --- a/markdown/org/docs/sewing/hps/uk.md +++ b/markdown/org/docs/sewing/hps/uk.md @@ -1,5 +1,6 @@ --- title: Найвища точка плеча +jargon: це правда --- _Найвища точка плеча_ використовується для зняття декількох вертикальних мірок. Такі мірки починаються на "від плеча до...". From 944044296d01bc63c2bf804b28760d63def911d0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:13 +0100 Subject: [PATCH 251/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/uk.md b/markdown/org/docs/sewing/basic-sewing-supplies/uk.md index e4b5783172a..2ecf77972f8 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/uk.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/uk.md @@ -1,5 +1,6 @@ --- title: Базові матеріали для шиття +jargon: це правда --- > Що саме є найнеобхіднішим для шиття — питання дискусійне. Деякі люди полюбляють усілякі інструменти, в той час як інші кажуть, що навіть швейна машинка є необов'язковою, оскільки шити можна вручну. From 7e3ef7dcde8e1688099748f8f3e4c9b7c9773463 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:14 +0100 Subject: [PATCH 252/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/basting/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/uk.md b/markdown/org/docs/sewing/basting/uk.md index 91747d59f42..6fc276c9f4e 100644 --- a/markdown/org/docs/sewing/basting/uk.md +++ b/markdown/org/docs/sewing/basting/uk.md @@ -1,6 +1,7 @@ --- layout: onecol title: Зметування +jargon: це правда --- ![Ця задня джинсова кишеня наметана перед тим, як пришити її до виробу](basting.jpg) From 254b0e05eee2d8bc1f50c3ac94df60bceb52fb12 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:15 +0100 Subject: [PATCH 253/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/coverlock/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/uk.md b/markdown/org/docs/sewing/coverlock/uk.md index a39e50d4d2b..3be150ba1b3 100644 --- a/markdown/org/docs/sewing/coverlock/uk.md +++ b/markdown/org/docs/sewing/coverlock/uk.md @@ -1,5 +1,6 @@ --- title: Коверлок +jargon: це правда --- ![Край футболки, зроблений коверлоком](coverlock-hem.jpg) From 406b1acd3e4b4d32f44358aacd4be6617181a03a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:16 +0100 Subject: [PATCH 254/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/cutting/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/uk.md b/markdown/org/docs/sewing/cutting/uk.md index 36f331f1364..2f4dffa0601 100644 --- a/markdown/org/docs/sewing/cutting/uk.md +++ b/markdown/org/docs/sewing/cutting/uk.md @@ -1,6 +1,7 @@ --- layout: onecol title: Крій +jargon: це правда --- ![Я вирізаю футболки](cutting.jpg) From 14565e4a96510b6be5d8a3fee98006e81947edfa Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:17 +0100 Subject: [PATCH 255/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/darts/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/uk.md b/markdown/org/docs/sewing/darts/uk.md index d3c1ef28ba6..7bd2c25a18b 100644 --- a/markdown/org/docs/sewing/darts/uk.md +++ b/markdown/org/docs/sewing/darts/uk.md @@ -1,5 +1,6 @@ --- title: Виточки +jargon: це правда --- ![Блузка з виточками на грудях](dart.jpg) From 50f75436ef2dddb916f11954ab46fc0b09357fb3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:18 +0100 Subject: [PATCH 256/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/double-welt-pockets/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/uk.md b/markdown/org/docs/sewing/double-welt-pockets/uk.md index c6cbed86f58..237025184ad 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/uk.md +++ b/markdown/org/docs/sewing/double-welt-pockets/uk.md @@ -1,5 +1,6 @@ --- title: Кишеня з подвійною листочкою +jargon: це правда --- ## Відео From d45b173a679093b51150234e4fb98a4e86c8bb72 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:19 +0100 Subject: [PATCH 257/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/ease/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/uk.md b/markdown/org/docs/sewing/ease/uk.md index 3294ecbf42a..b7c1e19d4b8 100644 --- a/markdown/org/docs/sewing/ease/uk.md +++ b/markdown/org/docs/sewing/ease/uk.md @@ -1,5 +1,6 @@ --- title: Свобода облягання +jargon: це правда --- ![Без свободи облягання Ви не змогли б підняти руку](ease-plus.jpg) From 03f2ac5917e72908c87742580a357aff7f5f9837 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:19 +0100 Subject: [PATCH 258/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/edgestitching/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/uk.md b/markdown/org/docs/sewing/edgestitching/uk.md index 3ad5fed3525..e450d0d86ee 100644 --- a/markdown/org/docs/sewing/edgestitching/uk.md +++ b/markdown/org/docs/sewing/edgestitching/uk.md @@ -1,5 +1,6 @@ --- title: Крайовий шов +jargon: це правда --- Edgestitching is a specific type of _topstitching_. Він відрізняється своїм розташуванням. Крайовий шов є поверхневим швом, простьобаним відразу коло основного шва — зазвичай на відстані 3 мм чи 1/8 дюйма. From c0336e07117e74e3ea20d0b605f1f7e0a2a5ae31 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:21 +0100 Subject: [PATCH 259/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/fabric-grain/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/uk.md b/markdown/org/docs/sewing/fabric-grain/uk.md index 936f229975c..e5abe4f5022 100644 --- a/markdown/org/docs/sewing/fabric-grain/uk.md +++ b/markdown/org/docs/sewing/fabric-grain/uk.md @@ -1,5 +1,6 @@ --- title: Ткацьке переплетення +jargon: це правда --- ![Напрям основи розміщується паралельно крайці](fabric-grain.jpg) From 4825a6395d3cb9fdd1f3b9e9819fd84d00a52557 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:22 +0100 Subject: [PATCH 260/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/good-sides-together/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/uk.md b/markdown/org/docs/sewing/good-sides-together/uk.md index 7a0b043dcb8..0c4e6231e5b 100644 --- a/markdown/org/docs/sewing/good-sides-together/uk.md +++ b/markdown/org/docs/sewing/good-sides-together/uk.md @@ -1,5 +1,6 @@ --- title: Лицьові сторони одна до одної +jargon: це правда --- Фраза "лицьові сторони одна до одної" може стосуватися крою чи зшивання: From f50ba3323534385eace031c49d22af861eda8721 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:23 +0100 Subject: [PATCH 261/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/hemming/uk.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/docs/sewing/hemming/uk.md b/markdown/org/docs/sewing/hemming/uk.md index 36dc347331e..47a976d8d5f 100644 --- a/markdown/org/docs/sewing/hemming/uk.md +++ b/markdown/org/docs/sewing/hemming/uk.md @@ -1,5 +1,6 @@ --- -title: Підшивання краю +title: Хеммінг. +jargon: це правда --- ![Поділ внизу футболки](coverlock-hem.jpg) From f5c1f59df45fcfa86a7e559b515b1f71686b35bb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:23 +0100 Subject: [PATCH 262/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/jersey/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/uk.md b/markdown/org/docs/sewing/jersey/uk.md index 8d2be1fc8b8..aa829598a01 100644 --- a/markdown/org/docs/sewing/jersey/uk.md +++ b/markdown/org/docs/sewing/jersey/uk.md @@ -1,5 +1,6 @@ --- title: Джерсі +jargon: це правда --- ![Шматок сірої джерсі](knit-fabric.jpg) From 1277db84901d4adf36ad3a562c533b79c5b70a33 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:25 +0100 Subject: [PATCH 263/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/knit-fabric/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/knit-fabric/uk.md b/markdown/org/docs/sewing/knit-fabric/uk.md index e15a9dbf116..c72407368bd 100644 --- a/markdown/org/docs/sewing/knit-fabric/uk.md +++ b/markdown/org/docs/sewing/knit-fabric/uk.md @@ -1,5 +1,6 @@ --- title: Трикотажна тканина +jargon: це правда --- ![Шматок сірого трикотажу (французька махра), трикотажна тканина](fabric.jpg) From 907d95ac1202e858fe69b8a20ecf5c0c88bcf1c1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:26 +0100 Subject: [PATCH 264/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/on-the-fold/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/uk.md b/markdown/org/docs/sewing/on-the-fold/uk.md index 378d3629776..ca1d481ef7d 100644 --- a/markdown/org/docs/sewing/on-the-fold/uk.md +++ b/markdown/org/docs/sewing/on-the-fold/uk.md @@ -1,5 +1,6 @@ --- title: На згині +jargon: це правда --- Якщо у вас є симетрична деталь, в інструкції може бути вказано, що її потрібно розрізати _по згину_. From 4adf7d156dd273b24289791eb155aff2661e5e86 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:27 +0100 Subject: [PATCH 265/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/pinning/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/uk.md b/markdown/org/docs/sewing/pinning/uk.md index 9f8c195af0c..38544f5f086 100644 --- a/markdown/org/docs/sewing/pinning/uk.md +++ b/markdown/org/docs/sewing/pinning/uk.md @@ -1,5 +1,6 @@ --- title: Закріплення +jargon: це правда --- ![Швейні шпильки є частиною основного швейного приладдя](sewing-pins.jpg) From f7f32694b1602813fc01eb43786bafb1f7e13808 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:28 +0100 Subject: [PATCH 266/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/rayon/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/uk.md b/markdown/org/docs/sewing/rayon/uk.md index 5f6a9b0e9e0..10da50415d1 100644 --- a/markdown/org/docs/sewing/rayon/uk.md +++ b/markdown/org/docs/sewing/rayon/uk.md @@ -1,5 +1,6 @@ --- title: Район +jargon: це правда --- ![Я використовую віскозу для нижньої білизни](rayon.jpg) From 15e9858c223bdb8a52000fd7c1718c8ed3e414bd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:28 +0100 Subject: [PATCH 267/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/seam-allowance/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/uk.md b/markdown/org/docs/sewing/seam-allowance/uk.md index db79ec619f7..4651dc1c908 100644 --- a/markdown/org/docs/sewing/seam-allowance/uk.md +++ b/markdown/org/docs/sewing/seam-allowance/uk.md @@ -1,5 +1,6 @@ --- title: Припуск на шов +jargon: це правда --- ![Внутрішня частина штанини на джинсах. СА - це темна вузька смужка тканини біля шва. Він має зигзагоподібну форму, щоб запобігти його зношуванню](zig-zag.jpg) From eadf7f3a84161fe008b3f3ab2ebb15444164ffb9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:29 +0100 Subject: [PATCH 268/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/serger/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/uk.md b/markdown/org/docs/sewing/serger/uk.md index a8a7ab6a672..4087a95c348 100644 --- a/markdown/org/docs/sewing/serger/uk.md +++ b/markdown/org/docs/sewing/serger/uk.md @@ -1,5 +1,6 @@ --- title: Сергер +jargon: це правда --- ![Готовий виворітний бік зшитого шва](serged-seam.jpg) From f7977e9438d4ba5e6c552c90ec4556bf24573e32 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:30 +0100 Subject: [PATCH 269/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/slipstitch/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/uk.md b/markdown/org/docs/sewing/slipstitch/uk.md index 9f2f128ab43..154534bd3a7 100644 --- a/markdown/org/docs/sewing/slipstitch/uk.md +++ b/markdown/org/docs/sewing/slipstitch/uk.md @@ -1,5 +1,6 @@ --- title: Шовний стібок. +jargon: це правда --- Сліпстіч - це техніка ручного шиття, яка дозволяє з'єднувати шари тканини невидимим ззовні стібком. Човниковий стібок - це _просунутий_ між шарами тканини , де він зшиває припуски на шви. From 9de482bc2936a6030d41d91868bdcb0c07e17bf8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:31 +0100 Subject: [PATCH 270/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/topstitching/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/uk.md b/markdown/org/docs/sewing/topstitching/uk.md index 46175c94bf9..bbbb6b848f4 100644 --- a/markdown/org/docs/sewing/topstitching/uk.md +++ b/markdown/org/docs/sewing/topstitching/uk.md @@ -1,5 +1,6 @@ --- title: Поверхневий шов +jargon: це правда --- ![На цих джинсах для свого хрещеника Аккі я зробив багацько поверхневих швів контрастною червоною ниткою](topstitching.jpg) From d5d1a61f075afe133701182e276dd583aa587de9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:32 +0100 Subject: [PATCH 271/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/trimming/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/uk.md b/markdown/org/docs/sewing/trimming/uk.md index 2e42474f909..c9da00275a8 100644 --- a/markdown/org/docs/sewing/trimming/uk.md +++ b/markdown/org/docs/sewing/trimming/uk.md @@ -1,5 +1,6 @@ --- title: Обрізка +jargon: це правда --- ![Обрізання припуску на шов](trimming.jpg) From 01eac0d0d61ff7f22b6a1df27d87d28cc2f8ae69 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:33 +0100 Subject: [PATCH 272/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/twin-needle/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/uk.md b/markdown/org/docs/sewing/twin-needle/uk.md index 6037af3a407..d42b9391de8 100644 --- a/markdown/org/docs/sewing/twin-needle/uk.md +++ b/markdown/org/docs/sewing/twin-needle/uk.md @@ -1,5 +1,6 @@ --- title: Подвійна голка +jargon: це правда --- ![Голка-близнюк від Schmetz](twin-needle.jpg) From 5c4b464e6b722d7e8990c08a48ff94daee9a883f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:16:34 +0100 Subject: [PATCH 273/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/sewing/zig-zag-stitch/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/uk.md b/markdown/org/docs/sewing/zig-zag-stitch/uk.md index ec866e6044a..646f3d956d7 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/uk.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/uk.md @@ -1,5 +1,6 @@ --- title: Строчка "зигзаг +jargon: це правда --- ![Строчка зигзагоподібна, щоб запобігти стиранню СА джинсової тканини](zig-zag.jpg) From e965cc561b13ee5f9b8ddd7950ae2a8181119e47 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:17:44 +0100 Subject: [PATCH 274/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/uk.md b/markdown/org/showcase/a-jaeger-and-charlie-set/uk.md index dcc7db0a843..21a46be42b3 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/uk.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Єгер і Чарлі у веселій вельветовій тканині" date: "2023-05-03" intro: "Цей гарний комплект Jaeger і Waralee виготовлений з бавовняного вельвету та підкладки з купро." From 68c760a8beb0a98397bfef83ac831ccc0b9583b3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:17:46 +0100 Subject: [PATCH 275/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/uk.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/uk.md index d0abb5ec7c7..1bd54b69d85 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/uk.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Модний привіт" date: "2023-05-03" intro: "Кольорова гама, вишиті очі та крихітні зубки - ось деякі деталі цього міні-привітання." From 9a753da765922f6b482e31f8ba910022eeae1a32 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:17:50 +0100 Subject: [PATCH 276/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/uk.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/uk.md index 68623fb472c..67e927ea7a2 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/uk.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Аарон з чудовим принтом" date: "2022-04-27" intro: "Цю привабливу футболку Aaron A пошила безстрашна швачка Гаель, яка почала шити лише 10 днів тому! Це було зроблено без серпанку." From 5da2e979917a50a3f1bbffc2aaeee811593a969b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:18:07 +0100 Subject: [PATCH 277/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/uk.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/uk.md index d7e8b531d5c..d90522b1692 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/uk.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Гарна пара трусів-боксерів Bruce" date: "2022-04-27" intro: "Майстриня з FreeSewing Гаель пошила ці красиві труси-боксери Bruce для свого друга, трохи підкоригувавши їх. Результат чудовий!" From 0f965be929a31590aad49e52181dd4286bab3f7e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:18:38 +0100 Subject: [PATCH 278/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/hi-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/uk.md b/markdown/org/showcase/hi-by-gaelle/uk.md index 0e37aa0ada4..ed7cb905356 100644 --- a/markdown/org/showcase/hi-by-gaelle/uk.md +++ b/markdown/org/showcase/hi-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Зроблено з джинсової тканини" date: "2022-07-29" intro: "Привіт від Гаель" From 83a72712b7ed77145414bba96f1cc23d39870ea9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:18:43 +0100 Subject: [PATCH 279/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/hugo-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/uk.md b/markdown/org/showcase/hugo-by-gaelle/uk.md index 27f73b19c53..2da38d2247e 100644 --- a/markdown/org/showcase/hugo-by-gaelle/uk.md +++ b/markdown/org/showcase/hugo-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Подруга Гаель у новому худі Hugo" date: "2023-02-15" intro: "Гаель зробила цього Г'юго вкритим веселими маленькими ... ну, я не впевнена, як назвати цих маленьких хвилястих монстрів, але вони, безумовно, чудові. Це для друга, і ми були б раді отримати щось таке казкове. Погляньте на цю дивовижну узгоджену смугасту обробку." From df72cbda79464b5bb8e71218c336c07a3b1e893c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:18:59 +0100 Subject: [PATCH 280/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/uk.md b/markdown/org/showcase/pyjama-paco-by-gaelle/uk.md index 0701770258e..8c9899db8a8 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/uk.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Піжамні штани" date: "2022-12-11" intro: "Ось піжама Paco від Gaëlle, без кишень та еластичних манжетів." From 0181503d829bb7d9f5852ae57399cc8985805fe6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:19:14 +0100 Subject: [PATCH 281/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/tamiko-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/uk.md b/markdown/org/showcase/tamiko-by-gaelle/uk.md index 699048ebfd8..a5f7982e167 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/uk.md +++ b/markdown/org/showcase/tamiko-by-gaelle/uk.md @@ -1,5 +1,5 @@ --- -maker: "Галле." +author: 27669 caption: "Трохи налаштована Таміко" date: "2022-06-09" intro: "Гаель зробила цю чудову Таміко для подруги!" From 2a1d66df94aa15337e6fd68da2ef9e8b2f907ac0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:19:38 +0100 Subject: [PATCH 282/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/components/workbench/uk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/uk.yaml b/sites/shared/components/workbench/uk.yaml index ac047e4c1a8..2308f9b66c2 100644 --- a/sites/shared/components/workbench/uk.yaml +++ b/sites/shared/components/workbench/uk.yaml @@ -23,6 +23,7 @@ clearTimingData: Clear timing data closure: Закриття collar: Комір columns: колонки +conditional: Conditional configurePattern: Налаштувати шаблон construction: Конструкція continueEditingTitle: Продовжити редагування From 01574fe726a9c5dcc66012526f39ae08fd59e2d8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:22:18 +0100 Subject: [PATCH 283/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/simone-by-gaelle/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/uk.md b/markdown/org/showcase/simone-by-gaelle/uk.md index 0a300d56e63..e8628e443c5 100644 --- a/markdown/org/showcase/simone-by-gaelle/uk.md +++ b/markdown/org/showcase/simone-by-gaelle/uk.md @@ -5,7 +5,7 @@ date: 20231017 intro: "Ця сорочка від Simone вирізняється красивими деталями, зокрема узгодженими ґудзиками та спеціальними етикетками." designs: - "симона" -maker: Наталя +author: 27669 --- Талановита Гаель поділилася цією сорочкою Сімони. Не пропустіть детальні фото. From cfad392802e0705de3849085605512065d12177b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:15 +0100 Subject: [PATCH 284/795] New translations en.md (French) skip-build --- markdown/org/docs/about/site/account/id/fr.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/fr.md b/markdown/org/docs/about/site/account/id/fr.md index 74496bca616..d9ce7fda204 100644 --- a/markdown/org/docs/about/site/account/id/fr.md +++ b/markdown/org/docs/about/site/account/id/fr.md @@ -1,5 +1,7 @@ --- title: ID de l'utilisateur +jargon: true +terms: id, uid --- Chaque utilisateur de FreeSewing a un identifiant, parfois appelé `UID` ou simplement `ID`. From b8a834e99156a6e2aec93d101058aa7861847b96 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:16 +0100 Subject: [PATCH 285/795] New translations en.md (French) skip-build --- markdown/org/docs/about/site/account/role/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/fr.md b/markdown/org/docs/about/site/account/role/fr.md index a532f2ad240..63c2a680f14 100644 --- a/markdown/org/docs/about/site/account/role/fr.md +++ b/markdown/org/docs/about/site/account/role/fr.md @@ -1,5 +1,6 @@ --- title: Rôle +jargon: true --- Chaque utilisateur de FreeSewing a un rôle qui détermine ses privilèges sur le site. From ff86473aa7f690ac8f7589958bf4aca458ef0009 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:19 +0100 Subject: [PATCH 286/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/about/site/account/id/es.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/es.md b/markdown/org/docs/about/site/account/id/es.md index 0282f9974fd..27c46af4e27 100644 --- a/markdown/org/docs/about/site/account/id/es.md +++ b/markdown/org/docs/about/site/account/id/es.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. From b1cda523be1b83779e629972086d5196eed89138 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:20 +0100 Subject: [PATCH 287/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/about/site/account/role/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/es.md b/markdown/org/docs/about/site/account/role/es.md index 489c932e970..91b26883370 100644 --- a/markdown/org/docs/about/site/account/role/es.md +++ b/markdown/org/docs/about/site/account/role/es.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. From 3eac183a7cb8c797e0d7138bb2dba7fa34db861b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:23 +0100 Subject: [PATCH 288/795] New translations en.md (German) skip-build --- markdown/org/docs/about/site/account/id/de.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/de.md b/markdown/org/docs/about/site/account/id/de.md index 0282f9974fd..27c46af4e27 100644 --- a/markdown/org/docs/about/site/account/id/de.md +++ b/markdown/org/docs/about/site/account/id/de.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. From 9fedbbdaf89a96387269619cdbb517dd12bc22aa Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:24 +0100 Subject: [PATCH 289/795] New translations en.md (German) skip-build --- markdown/org/docs/about/site/account/role/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/de.md b/markdown/org/docs/about/site/account/role/de.md index c54bc3af0a3..8b92a51d145 100644 --- a/markdown/org/docs/about/site/account/role/de.md +++ b/markdown/org/docs/about/site/account/role/de.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. From 49d7b4898a2c52d71e87b01b09bce67951153737 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:28 +0100 Subject: [PATCH 290/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/site/account/id/nl.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/nl.md b/markdown/org/docs/about/site/account/id/nl.md index 0282f9974fd..27c46af4e27 100644 --- a/markdown/org/docs/about/site/account/id/nl.md +++ b/markdown/org/docs/about/site/account/id/nl.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. From 348813091bc252bbc5396261b1d4de5546f070ce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:29 +0100 Subject: [PATCH 291/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/site/account/role/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/nl.md b/markdown/org/docs/about/site/account/role/nl.md index 8ded3ab562b..58df5ccbc84 100644 --- a/markdown/org/docs/about/site/account/role/nl.md +++ b/markdown/org/docs/about/site/account/role/nl.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. From 900164c97f0edf360167e4100602f36ac59a71d4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:32 +0100 Subject: [PATCH 292/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/about/site/account/id/uk.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/uk.md b/markdown/org/docs/about/site/account/id/uk.md index 0282f9974fd..27c46af4e27 100644 --- a/markdown/org/docs/about/site/account/id/uk.md +++ b/markdown/org/docs/about/site/account/id/uk.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. From ef7ea05ba6441da0bdbf278cadaad09da2db57ed Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 21:27:33 +0100 Subject: [PATCH 293/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/about/site/account/role/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/uk.md b/markdown/org/docs/about/site/account/role/uk.md index ff2a306f0cf..0e9ff51d05e 100644 --- a/markdown/org/docs/about/site/account/role/uk.md +++ b/markdown/org/docs/about/site/account/role/uk.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. From ad62ec55f6676ca0265c3f31be95001d7998b3dc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:25:35 +0100 Subject: [PATCH 294/795] Update source file en.md skip-build --- markdown/org/docs/about/site/account/id/en.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/about/site/account/id/en.md b/markdown/org/docs/about/site/account/id/en.md index 01349e6fb1e..6e4d2fd8526 100644 --- a/markdown/org/docs/about/site/account/id/en.md +++ b/markdown/org/docs/about/site/account/id/en.md @@ -1,5 +1,7 @@ --- title: User ID +jargon: true +terms: id, uid --- Every FreeSewing user has a user ID, sometimes referred to as `UID` or just `ID`. From 92ff0e95564c82661858a0756230d22b96f5d6da Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:25:37 +0100 Subject: [PATCH 295/795] Update source file en.md skip-build --- markdown/org/docs/about/site/account/role/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/about/site/account/role/en.md b/markdown/org/docs/about/site/account/role/en.md index 2cbaf78db71..ce748fda987 100644 --- a/markdown/org/docs/about/site/account/role/en.md +++ b/markdown/org/docs/about/site/account/role/en.md @@ -1,5 +1,6 @@ --- title: Role +jargon: true --- Every FreeSewing user has a role that determines their privileges on the site. From 64bcf384d78423bc6226bcae6880ebf14495d735 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:26:22 +0100 Subject: [PATCH 296/795] Update source file en.md skip-build --- .../org/docs/designs/brian/options/draftforhighbust/en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/brian/options/draftforhighbust/en.md b/markdown/org/docs/designs/brian/options/draftforhighbust/en.md index 1e3e20a59c3..07e73c86b57 100644 --- a/markdown/org/docs/designs/brian/options/draftforhighbust/en.md +++ b/markdown/org/docs/designs/brian/options/draftforhighbust/en.md @@ -1,8 +1,8 @@ --- -title: undefined +title: Draft for high bust --- -undefined +Draft the pattern for the high bust measurement (if available) rather than the (full) chest. This will result in a more fitted garment for people with breasts. From bd6555d559652dec7958ee5078c7d04bed91eec3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:12 +0100 Subject: [PATCH 297/795] Update source file en.md skip-build --- markdown/org/docs/sewing/basic-sewing-supplies/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basic-sewing-supplies/en.md b/markdown/org/docs/sewing/basic-sewing-supplies/en.md index 85704f56ce8..a629a553d27 100644 --- a/markdown/org/docs/sewing/basic-sewing-supplies/en.md +++ b/markdown/org/docs/sewing/basic-sewing-supplies/en.md @@ -1,5 +1,6 @@ --- title: Basic sewing supplies +jargon: true --- > What exactly constitutes the bare necessities for sewing is subject to debate. From 43c639f0f5cbc2b7964f0b29f1408b3ad92bd41e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:13 +0100 Subject: [PATCH 298/795] Update source file en.md skip-build --- markdown/org/docs/sewing/basting/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/basting/en.md b/markdown/org/docs/sewing/basting/en.md index 586164da67c..9dc34a9e4b1 100644 --- a/markdown/org/docs/sewing/basting/en.md +++ b/markdown/org/docs/sewing/basting/en.md @@ -1,6 +1,7 @@ --- layout: onecol title: Basting +jargon: true --- ![The shape of this denim back pocket is basted before the pocket is topstitched to the garment](basting.jpg) From e2fb6ccec905b7379cc0ddb1b57fc90fd96f4e06 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:13 +0100 Subject: [PATCH 299/795] Update source file en.md skip-build --- markdown/org/docs/sewing/coverlock/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/coverlock/en.md b/markdown/org/docs/sewing/coverlock/en.md index 9a2e8675c6f..285f0176155 100644 --- a/markdown/org/docs/sewing/coverlock/en.md +++ b/markdown/org/docs/sewing/coverlock/en.md @@ -1,5 +1,6 @@ --- title: Coverlock +jargon: true --- ![A hem on a T-shirt, made with a coverlock machine](coverlock-hem.jpg) From 417f0fc0e97efa794ce79229dfb5da3220e1087e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:14 +0100 Subject: [PATCH 300/795] Update source file en.md skip-build --- markdown/org/docs/sewing/cutting/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/cutting/en.md b/markdown/org/docs/sewing/cutting/en.md index 8dded41295c..5429993c230 100644 --- a/markdown/org/docs/sewing/cutting/en.md +++ b/markdown/org/docs/sewing/cutting/en.md @@ -1,6 +1,7 @@ --- layout: onecol title: Cutting +jargon: true --- ![Me cutting out some T-shirts](cutting.jpg) From e16190af3518f3e4ef5c4dee45e8b373207d40ec Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:14 +0100 Subject: [PATCH 301/795] Update source file en.md skip-build --- markdown/org/docs/sewing/darts/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/darts/en.md b/markdown/org/docs/sewing/darts/en.md index cd4fe66387f..14f70314526 100644 --- a/markdown/org/docs/sewing/darts/en.md +++ b/markdown/org/docs/sewing/darts/en.md @@ -1,5 +1,6 @@ --- title: Darts +jargon: true --- ![Bust darts on a blouse](dart.jpg) From 26238486c5327b134823628ba81d0f78b25c58a2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:15 +0100 Subject: [PATCH 302/795] Update source file en.md skip-build --- markdown/org/docs/sewing/double-welt-pockets/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/double-welt-pockets/en.md b/markdown/org/docs/sewing/double-welt-pockets/en.md index 4b85f4891e6..db7cc383446 100644 --- a/markdown/org/docs/sewing/double-welt-pockets/en.md +++ b/markdown/org/docs/sewing/double-welt-pockets/en.md @@ -1,5 +1,6 @@ --- title: Double welt pockets +jargon: true --- ## Video From ab918dd817bdb249294ea0ea2609b502754e3cc4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:15 +0100 Subject: [PATCH 303/795] Update source file en.md skip-build --- markdown/org/docs/sewing/ease/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/ease/en.md b/markdown/org/docs/sewing/ease/en.md index 36bcd55016c..0265d06e89b 100644 --- a/markdown/org/docs/sewing/ease/en.md +++ b/markdown/org/docs/sewing/ease/en.md @@ -1,5 +1,6 @@ --- title: Ease +jargon: true --- ![Without ease, you would not be able to raise your arm](ease-plus.jpg) From 55f5b55a98797d0c88a2502c8d09826e635404dc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:16 +0100 Subject: [PATCH 304/795] Update source file en.md skip-build --- markdown/org/docs/sewing/edgestitching/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/edgestitching/en.md b/markdown/org/docs/sewing/edgestitching/en.md index c4cd29a4109..007fcafda79 100644 --- a/markdown/org/docs/sewing/edgestitching/en.md +++ b/markdown/org/docs/sewing/edgestitching/en.md @@ -1,5 +1,6 @@ --- title: Edgestitching +jargon: true --- Edgestitching is a specific type of _topstitching_. From eb366843f0f41c819fc1888330993502dc488c8f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:16 +0100 Subject: [PATCH 305/795] Update source file en.md skip-build --- markdown/org/docs/sewing/fabric-grain/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/fabric-grain/en.md b/markdown/org/docs/sewing/fabric-grain/en.md index c840a12b776..91aae582a0d 100644 --- a/markdown/org/docs/sewing/fabric-grain/en.md +++ b/markdown/org/docs/sewing/fabric-grain/en.md @@ -1,5 +1,6 @@ --- title: Fabric grain +jargon: true --- ![The grainline runs parallel to the selvedge](fabric-grain.jpg) From a1585f283ccc111e023affea28386a75dae201cb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:17 +0100 Subject: [PATCH 306/795] Update source file en.md skip-build --- markdown/org/docs/sewing/good-sides-together/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/good-sides-together/en.md b/markdown/org/docs/sewing/good-sides-together/en.md index e6a088a96ab..e2701768c90 100644 --- a/markdown/org/docs/sewing/good-sides-together/en.md +++ b/markdown/org/docs/sewing/good-sides-together/en.md @@ -1,5 +1,6 @@ --- title: Good sides together +jargon: true --- When I refer to good sides together that can refer to either cutting or sewing: From 614d0c50d5bd994ab624d8a5aa7a9d65b11e60a2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:17 +0100 Subject: [PATCH 307/795] Update source file en.md skip-build --- markdown/org/docs/sewing/hemming/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hemming/en.md b/markdown/org/docs/sewing/hemming/en.md index 4e82bcee16f..f18c0923989 100644 --- a/markdown/org/docs/sewing/hemming/en.md +++ b/markdown/org/docs/sewing/hemming/en.md @@ -1,5 +1,6 @@ --- title: Hemming +jargon: true --- ![The hem at the bottom of a T-shirt](coverlock-hem.jpg) From 6a5a22b98a858dfddde598e127f171fc897ff113 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:18 +0100 Subject: [PATCH 308/795] Update source file en.md skip-build --- markdown/org/docs/sewing/hps/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/hps/en.md b/markdown/org/docs/sewing/hps/en.md index f026e27aa62..62c010abf17 100644 --- a/markdown/org/docs/sewing/hps/en.md +++ b/markdown/org/docs/sewing/hps/en.md @@ -1,5 +1,6 @@ --- title: High Point Shoulder (HPS) +jargon: true --- The _high point shoulder_ or _HPS_ point is used as the base for several vertical measurements. From 969ae5fdd1369c115edbe2e755f82b1c14ea2ec2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:18 +0100 Subject: [PATCH 309/795] Update source file en.md skip-build --- markdown/org/docs/sewing/jersey/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/jersey/en.md b/markdown/org/docs/sewing/jersey/en.md index 8f7521282db..a80cd39d059 100644 --- a/markdown/org/docs/sewing/jersey/en.md +++ b/markdown/org/docs/sewing/jersey/en.md @@ -1,5 +1,6 @@ --- title: Jersey +jargon: true --- ![A piece of grey jersey](knit-fabric.jpg) From 2674e3e4a3abd8cc163928c0b728f6745f45229c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:19 +0100 Subject: [PATCH 310/795] Update source file en.md skip-build --- markdown/org/docs/sewing/knit-fabric/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/knit-fabric/en.md b/markdown/org/docs/sewing/knit-fabric/en.md index db92eb0004f..8eeb6cfb811 100644 --- a/markdown/org/docs/sewing/knit-fabric/en.md +++ b/markdown/org/docs/sewing/knit-fabric/en.md @@ -1,5 +1,6 @@ --- title: Knit fabric +jargon: true --- ![A piece of grey (French Terry) jersey, a knit fabric](fabric.jpg) From b983f5aefed4af3cbf2b12d52163b3fe85ea3d01 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:19 +0100 Subject: [PATCH 311/795] Update source file en.md skip-build --- markdown/org/docs/sewing/on-the-fold/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/on-the-fold/en.md b/markdown/org/docs/sewing/on-the-fold/en.md index 03c1c077414..81037e8a770 100644 --- a/markdown/org/docs/sewing/on-the-fold/en.md +++ b/markdown/org/docs/sewing/on-the-fold/en.md @@ -1,5 +1,6 @@ --- title: On the fold +jargon: true --- When you have a pattern piece that is symmetric, the instructions might tell you that it is to be cut _on the fold_. From 209c0ea663bc0b3d0c0fa1a7568bce3066e02e80 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:20 +0100 Subject: [PATCH 312/795] Update source file en.md skip-build --- markdown/org/docs/sewing/pinning/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/pinning/en.md b/markdown/org/docs/sewing/pinning/en.md index 589c6fcbdc3..50cd0a2e1f5 100644 --- a/markdown/org/docs/sewing/pinning/en.md +++ b/markdown/org/docs/sewing/pinning/en.md @@ -1,5 +1,6 @@ --- title: Pinning +jargon: true --- ![Sewing pins are part of the basic sewing supplies](sewing-pins.jpg) From 359d5e4c8bfd89271662493745a0942857370e54 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:20 +0100 Subject: [PATCH 313/795] Update source file en.md skip-build --- markdown/org/docs/sewing/rayon/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/rayon/en.md b/markdown/org/docs/sewing/rayon/en.md index 65253dbb6cb..8e066061f12 100644 --- a/markdown/org/docs/sewing/rayon/en.md +++ b/markdown/org/docs/sewing/rayon/en.md @@ -1,5 +1,6 @@ --- title: Rayon +jargon: true --- ![I use rayon for my underwear](rayon.jpg) From bbf1f390cfaf0b97077df5c4d5032e0216fdbf70 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:21 +0100 Subject: [PATCH 314/795] Update source file en.md skip-build --- markdown/org/docs/sewing/seam-allowance/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/seam-allowance/en.md b/markdown/org/docs/sewing/seam-allowance/en.md index a1dafd63a92..367741c4bf8 100644 --- a/markdown/org/docs/sewing/seam-allowance/en.md +++ b/markdown/org/docs/sewing/seam-allowance/en.md @@ -1,5 +1,6 @@ --- title: Seam allowance +jargon: true --- ![The inside of the leg on a pair of jeans. The SA is the dark narrow stretch of fabric next to the seam. It has been zig-zagged to keep it from fraying](zig-zag.jpg) From dd71b36e46638faff5249a723bfe15a2840dd4b5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:21 +0100 Subject: [PATCH 315/795] Update source file en.md skip-build --- markdown/org/docs/sewing/serger/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/serger/en.md b/markdown/org/docs/sewing/serger/en.md index c306171c103..fd3e1f3dba3 100644 --- a/markdown/org/docs/sewing/serger/en.md +++ b/markdown/org/docs/sewing/serger/en.md @@ -1,5 +1,6 @@ --- title: Serger +jargon: true --- ![The finished backside of a serged seam](serged-seam.jpg) From 562845134c260157132778715b91a9929988d98f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:21 +0100 Subject: [PATCH 316/795] Update source file en.md skip-build --- markdown/org/docs/sewing/slipstitch/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/slipstitch/en.md b/markdown/org/docs/sewing/slipstitch/en.md index b10596cd5d1..64b10e277b9 100644 --- a/markdown/org/docs/sewing/slipstitch/en.md +++ b/markdown/org/docs/sewing/slipstitch/en.md @@ -1,5 +1,6 @@ --- title: Slipstitch +jargon: true --- A slipstitch is a hand-sewing technique that allows you to join layers From fe288bbbc4f1999d8b4a79f8e6668874d4e6216c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:22 +0100 Subject: [PATCH 317/795] Update source file en.md skip-build --- markdown/org/docs/sewing/topstitching/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/topstitching/en.md b/markdown/org/docs/sewing/topstitching/en.md index d8b169abea2..e3519cb2fe3 100644 --- a/markdown/org/docs/sewing/topstitching/en.md +++ b/markdown/org/docs/sewing/topstitching/en.md @@ -1,5 +1,6 @@ --- title: Topstitching +jargon: true --- ![I used plenty of topstitching in a contrasting red thread on these jeans for my godson Akki](topstitching.jpg) From edf859bfdd28f87766bddc5846c8a1f42526b6d1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:22 +0100 Subject: [PATCH 318/795] Update source file en.md skip-build --- markdown/org/docs/sewing/trimming/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/trimming/en.md b/markdown/org/docs/sewing/trimming/en.md index 60e1feb9bf5..79d24ac73a5 100644 --- a/markdown/org/docs/sewing/trimming/en.md +++ b/markdown/org/docs/sewing/trimming/en.md @@ -1,5 +1,6 @@ --- title: Trimming +jargon: true --- ![Seam allowance being trimmed](trimming.jpg) From d0ce5ccaf520cc15f682d89bc60a82048cd087d9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:23 +0100 Subject: [PATCH 319/795] Update source file en.md skip-build --- markdown/org/docs/sewing/twin-needle/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/twin-needle/en.md b/markdown/org/docs/sewing/twin-needle/en.md index 95dc4908990..c64f38dc3cc 100644 --- a/markdown/org/docs/sewing/twin-needle/en.md +++ b/markdown/org/docs/sewing/twin-needle/en.md @@ -1,5 +1,6 @@ --- title: Twin needle +jargon: true --- ![A twin needle from Schmetz](twin-needle.jpg) From c30f8efe2c47f7358d110a05a0eeff740399df0a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:23 +0100 Subject: [PATCH 320/795] Update source file en.md skip-build --- markdown/org/docs/sewing/zig-zag-stitch/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/docs/sewing/zig-zag-stitch/en.md b/markdown/org/docs/sewing/zig-zag-stitch/en.md index 3e2f47d0c3d..329dca324a5 100644 --- a/markdown/org/docs/sewing/zig-zag-stitch/en.md +++ b/markdown/org/docs/sewing/zig-zag-stitch/en.md @@ -1,5 +1,6 @@ --- title: Zig-zag stitch +jargon: true --- ![A zig-zag stitch is used to prevent the SA of the denim from fraying](zig-zag.jpg) From a0e519556aa860b2224e84883b36b04aa2bf7e2f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:28 +0100 Subject: [PATCH 321/795] Update source file en.md skip-build --- markdown/org/showcase/a-jaeger-and-charlie-set/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-jaeger-and-charlie-set/en.md b/markdown/org/showcase/a-jaeger-and-charlie-set/en.md index 2cde7edf457..0557d8ba8b1 100644 --- a/markdown/org/showcase/a-jaeger-and-charlie-set/en.md +++ b/markdown/org/showcase/a-jaeger-and-charlie-set/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Jaeger and Charlie in a fun corduroy fabric" date: "2023-05-03" intro: "This handsome Jaeger and Waralee set are made all with a cotton corduroy, and cupro lining." From 567275b633b5239d1726bda2f56627d70b71588c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:29 +0100 Subject: [PATCH 322/795] Update source file en.md skip-build --- markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md index ab6bb9fa4d2..68958db0517 100644 --- a/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md +++ b/markdown/org/showcase/a-mini-hi-with-embroidered-eyes/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A fashionable Hi" date: "2023-05-03" intro: "The color scheme, embroidered eyes, and tiny teeth are some of the details on this mini-Hi." From 5bc0871651a3b38d07aa2027f70fc871c5bfa078 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:31 +0100 Subject: [PATCH 323/795] Update source file en.md skip-build --- markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md b/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md index cd5f343bfa0..bcfbf24f984 100644 --- a/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md +++ b/markdown/org/showcase/aaron-a-shirt-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "An Aaron with a lovely print" date: "2022-04-27" intro: "This attractive Aaron A-shirt was made by fearless sewist Gaëlle, who basically started sewing 10 days ago! It was done without a serger." From 71da856d6246b49ac5717e41db961467b30db055 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:41 +0100 Subject: [PATCH 324/795] Update source file en.md skip-build --- markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md index 6d6e703ec0c..d730ad2e06e 100644 --- a/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md +++ b/markdown/org/showcase/bruce-boxer-briefs-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A handsome pair of Bruce boxer briefs" date: "2022-04-27" intro: "FreeSewing maker Gaëlle made these handsome Bruce boxer briefs for a friend, with a little customisation. The result is excellent!" From c5498e3cf9c6919efe6afff4b72132a67b40e31b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:56 +0100 Subject: [PATCH 325/795] Update source file en.md skip-build --- markdown/org/showcase/hi-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hi-by-gaelle/en.md b/markdown/org/showcase/hi-by-gaelle/en.md index 2de3346733d..720e1926a53 100644 --- a/markdown/org/showcase/hi-by-gaelle/en.md +++ b/markdown/org/showcase/hi-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Made with jean fabric" date: "2022-07-29" intro: "Hi by Gaëlle" From c9b7de5c679bb93c7c154ba232d8bf4d3c8cb0f2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:30:58 +0100 Subject: [PATCH 326/795] Update source file en.md skip-build --- markdown/org/showcase/hugo-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/hugo-by-gaelle/en.md b/markdown/org/showcase/hugo-by-gaelle/en.md index 2bbe00d43e3..368396f9e20 100644 --- a/markdown/org/showcase/hugo-by-gaelle/en.md +++ b/markdown/org/showcase/hugo-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Gaëlle's friend in their new Hugo hoodie" date: "2023-02-15" intro: "Gaëlle made this Hugo covered in cheerful little ...well I'm not sure what to call these squiggly little monsters, but they're clearly great. It's for a friend, and we would be delighted to receive something this fabulous. Check out that awesome coordinated striped ribbing." From 841b8bd515cff35e292eb719845e41f9025be3cb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:31:08 +0100 Subject: [PATCH 327/795] Update source file en.md skip-build --- markdown/org/showcase/pyjama-paco-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/pyjama-paco-by-gaelle/en.md b/markdown/org/showcase/pyjama-paco-by-gaelle/en.md index aeb5af8282e..56f95332812 100644 --- a/markdown/org/showcase/pyjama-paco-by-gaelle/en.md +++ b/markdown/org/showcase/pyjama-paco-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "Pyjama pants" date: "2022-12-11" intro: "Here’s a pyjama Paco by Gaëlle, without pockets or elasticated cuffs." From f9db6571c03411d1a02ff9d7e42d229c462a4254 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:31:17 +0100 Subject: [PATCH 328/795] Update source file en.md skip-build --- markdown/org/showcase/simone-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simone-by-gaelle/en.md b/markdown/org/showcase/simone-by-gaelle/en.md index 366b654f25b..1b224d25b2a 100644 --- a/markdown/org/showcase/simone-by-gaelle/en.md +++ b/markdown/org/showcase/simone-by-gaelle/en.md @@ -4,7 +4,7 @@ caption: "A lovely Simone shirt with beautiful details" date: 20231017 intro: "This Simone shirt features beautiful details, including coordinated buttons and custom labels." designs: ["simone"] -maker: Natalia +author: 27669 --- The talented Gaëlle shared this Simone shirt. Don't miss the the detail photos. From 2293d0a23d6af371d9dbb7250999171f091ab3fb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:31:19 +0100 Subject: [PATCH 329/795] Update source file en.md skip-build --- markdown/org/showcase/tamiko-by-gaelle/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/tamiko-by-gaelle/en.md b/markdown/org/showcase/tamiko-by-gaelle/en.md index 32829de2dc5..cfcaac7a2f3 100644 --- a/markdown/org/showcase/tamiko-by-gaelle/en.md +++ b/markdown/org/showcase/tamiko-by-gaelle/en.md @@ -1,5 +1,5 @@ --- -maker: "Gaëlle" +author: 27669 caption: "A slightly customized Tamiko" date: "2022-06-09" intro: "Gaëlle made this lovely Tamiko for a friend!" From 3008f9d5df5d0119050a785683774310c67bb224 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:31:33 +0100 Subject: [PATCH 330/795] Update source file en.yaml skip-build --- sites/shared/components/workbench/en.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/workbench/en.yaml b/sites/shared/components/workbench/en.yaml index a36cd235bfc..345443782e3 100644 --- a/sites/shared/components/workbench/en.yaml +++ b/sites/shared/components/workbench/en.yaml @@ -23,6 +23,7 @@ clearTimingData: Clear timing data closure: Closure collar: Collar columns: columns +conditional: Conditional configurePattern: Configure pattern construction: Construction continueEditingTitle: Continue editing From 7c6d87e48cad7ad902dca5784f56fe8de1d82870 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 22:47:50 +0100 Subject: [PATCH 331/795] New translations en.md (French) skip-build --- markdown/org/docs/measurements/waisttoupperleg/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/fr.md b/markdown/org/docs/measurements/waisttoupperleg/fr.md index 5e38ffe3787..1f190ca88d6 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/fr.md +++ b/markdown/org/docs/measurements/waisttoupperleg/fr.md @@ -2,5 +2,5 @@ title: Hauteur taille cuisse --- -La **hauteur taille cuisse** est mesurée de votre tour à la taille jusqu'au sommet de votre jambe. Elle se mesure sur le côté du corps. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Elle se mesure sur le côté du corps. From 1cf123d32de4488b0f1d94fb232ed9fffbd893d8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 23:06:48 +0100 Subject: [PATCH 332/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/measurements/waisttoupperleg/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/es.md b/markdown/org/docs/measurements/waisttoupperleg/es.md index 7d9628edbcf..598415543ad 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/es.md +++ b/markdown/org/docs/measurements/waisttoupperleg/es.md @@ -2,5 +2,5 @@ title: Ira a la pierna superior --- -La cintura **a la pierna superior** se mide desde la cintura hasta la parte superior de la pierna. Mídela a un lado de tu cuerpo. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Mídela a un lado de tu cuerpo. From 093c400d016e0273940ee14cf90402dc8bfa6e4d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 23:25:28 +0100 Subject: [PATCH 333/795] New translations en.md (German) skip-build --- markdown/org/docs/measurements/waisttoupperleg/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/de.md b/markdown/org/docs/measurements/waisttoupperleg/de.md index 8e480044d70..e4f05193f56 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/de.md +++ b/markdown/org/docs/measurements/waisttoupperleg/de.md @@ -2,5 +2,5 @@ title: Taille bis Oberschenkel --- -Das **Taille zum oberen Bein** Maß wird von der Taille bis zum Beginn deines Beines gemessen. Miss dies an der Seite deines Körpers aus. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Miss dies an der Seite deines Körpers aus. From ef8b0192baa8f514e1d73d576f935907e347870e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 17 Mar 2024 23:44:18 +0100 Subject: [PATCH 334/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/measurements/waisttoupperleg/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/nl.md b/markdown/org/docs/measurements/waisttoupperleg/nl.md index d173312713a..e1860099040 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/nl.md +++ b/markdown/org/docs/measurements/waisttoupperleg/nl.md @@ -2,5 +2,5 @@ title: Taille tot bovenbeen --- -De afmeting **taille tot bovenbeen ** is de afstand van je natuurlijke taille tot aan je bovenbeen. Neem deze maat aan de zijkant van je lichaam. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Neem deze maat aan de zijkant van je lichaam. From 7cd1d1c81c00f1d7c59222051eb04750bca1a6ce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 18 Mar 2024 00:03:05 +0100 Subject: [PATCH 335/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/measurements/waisttoupperleg/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/uk.md b/markdown/org/docs/measurements/waisttoupperleg/uk.md index 9c8648fbfd2..84ada7dccb6 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/uk.md +++ b/markdown/org/docs/measurements/waisttoupperleg/uk.md @@ -2,5 +2,5 @@ title: Від талії до початку ноги --- -Вимір **від талії до початку ноги** знімається від лінії талії до вершечка ноги. Знімайте цю мірку збоку. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Знімайте цю мірку збоку. From 5edbe7619df087f9931efabe5b77c54e6780ac14 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 18 Mar 2024 00:36:42 +0100 Subject: [PATCH 336/795] Update source file en.md skip-build --- markdown/org/docs/measurements/waisttoupperleg/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/en.md b/markdown/org/docs/measurements/waisttoupperleg/en.md index 72cfda0c41f..f34060d60e7 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/en.md +++ b/markdown/org/docs/measurements/waisttoupperleg/en.md @@ -2,5 +2,5 @@ title: Waist to upper leg --- -The **waist to upper leg** is measured from your waist down to the top of your leg. Measure it at the side of your body. +The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Measure it at the side of your body. From d8b625a37a67c562504924d79c5f1cbb7faa06a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:42:00 +0000 Subject: [PATCH 337/795] chore(deps): Bump axios from 1.6.7 to 1.6.8 Bumps [axios](https://github.com/axios/axios) from 1.6.7 to 1.6.8. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.6.7...v1.6.8) --- updated-dependencies: - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- packages/new-design/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 17 ++++++----------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/new-design/package.json b/packages/new-design/package.json index d3625279932..58bf5a02726 100644 --- a/packages/new-design/package.json +++ b/packages/new-design/package.json @@ -36,7 +36,7 @@ }, "peerDependencies": {}, "dependencies": { - "axios": "1.6.7", + "axios": "1.6.8", "chalk": "5.3.0", "execa": "8.0.1", "mustache": "4.2.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 04427ad1800..cb6389c4f45 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -46,7 +46,7 @@ "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "0.5.10", "autoprefixer": "10.4.18", - "axios": "1.6.7", + "axios": "1.6.8", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 9b7dd609a7c..427b2181cb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3394,12 +3394,12 @@ axe-core@=4.7.0: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@1.6.7, axios@^1.5.1, axios@^1.6.0: - version "1.6.7" - resolved "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz" - integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== +axios@1.6.8, axios@^1.5.1, axios@^1.6.0: + version "1.6.8" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" + integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== dependencies: - follow-redirects "^1.15.4" + follow-redirects "^1.15.6" form-data "^4.0.0" proxy-from-env "^1.1.0" @@ -3746,11 +3746,6 @@ chai-http@4.4.0: qs "^6.11.2" superagent "^8.0.9" -chai-string@1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz" - integrity sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw== - chai@5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz" @@ -6144,7 +6139,7 @@ flatted@^3.2.9: resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz" integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== -follow-redirects@^1.15.4: +follow-redirects@^1.15.6: version "1.15.6" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== From 4656fcb3dee2e3bab8c720440eebb06177ff8270 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:42:23 +0000 Subject: [PATCH 338/795] chore(deps): Bump jotai from 2.7.0 to 2.7.1 Bumps [jotai](https://github.com/pmndrs/jotai) from 2.7.0 to 2.7.1. - [Release notes](https://github.com/pmndrs/jotai/releases) - [Commits](https://github.com/pmndrs/jotai/compare/v2.7.0...v2.7.1) --- updated-dependencies: - dependency-name: jotai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 13 ++++--------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 9ce2c93fea5..0bd243b5d90 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -40,7 +40,7 @@ "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", - "jotai": "2.7.0", + "jotai": "2.7.1", "jotai-location": "0.5.4", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 04427ad1800..366fdc6e388 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -55,7 +55,7 @@ "echarts-for-react": "3.0.2", "file-saver": "2.0.5", "i18next": "23.10.1", - "jotai": "2.7.0", + "jotai": "2.7.1", "jotai-location": "0.5.4", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", diff --git a/sites/shared/package.json b/sites/shared/package.json index be0964d4bd9..494849575ba 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -29,7 +29,7 @@ "front-matter": "4.0.2", "highlight.js": "11.9.0", "github-slugger": "2.0.0", - "jotai": "2.7.0", + "jotai": "2.7.1", "jotai-location": "0.5.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", diff --git a/yarn.lock b/yarn.lock index 9b7dd609a7c..81c0d84a402 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3746,11 +3746,6 @@ chai-http@4.4.0: qs "^6.11.2" superagent "^8.0.9" -chai-string@1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz" - integrity sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw== - chai@5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz" @@ -7962,10 +7957,10 @@ jotai-location@0.5.4: resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@2.7.0: - version "2.7.0" - resolved "https://registry.npmjs.org/jotai/-/jotai-2.7.0.tgz" - integrity sha512-4qsyFKu4MprI39rj2uoItyhu24NoCHzkOV7z70PQr65SpzV6CSyhQvVIfbNlNqOIOspNMdf5OK+kTXLvqe63Jw== +jotai@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" + integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== js-base64@^2.1.9: version "2.6.4" From 6acfe6dbab9311a1941d65edb8f70629ec3c0355 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:43:00 +0000 Subject: [PATCH 339/795] chore(deps-dev): Bump postcss from 8.4.35 to 8.4.36 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.35 to 8.4.36. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.35...8.4.36) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- yarn.lock | 23 +++++++++-------------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 6d399123963..3f30652c96b 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -61,7 +61,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.35", + "postcss": "8.4.36", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/lab/package.json b/sites/lab/package.json index 844b597319b..0f28f449229 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -62,7 +62,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.35", + "postcss": "8.4.36", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/org/package.json b/sites/org/package.json index 9ce2c93fea5..ff54e44819d 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -69,7 +69,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.35", + "postcss": "8.4.36", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/yarn.lock b/yarn.lock index 9b7dd609a7c..2a391ec3ff9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3746,11 +3746,6 @@ chai-http@4.4.0: qs "^6.11.2" superagent "^8.0.9" -chai-string@1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz" - integrity sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw== - chai@5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz" @@ -11362,14 +11357,14 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@8.4.35, postcss@^8.4.23: - version "8.4.35" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz" - integrity sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA== +postcss@8.4.36, postcss@^8.4.23: + version "8.4.36" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.36.tgz#dba513c3c3733c44e0288a712894f8910bbaabc6" + integrity sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" - source-map-js "^1.0.2" + source-map-js "^1.1.0" postcss@^5.0.0, postcss@^5.0.21: version "5.2.18" @@ -12705,10 +12700,10 @@ sort-keys@^2.0.0: dependencies: is-plain-obj "^1.0.0" -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map-js@^1.0.2, source-map-js@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.1.0.tgz#9e7d5cb46f0689fb6691b30f226937558d0fa94b" + integrity sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw== source-map@^0.5.6: version "0.5.7" From f13c5f80b4f3d8b3e915fd8d3c8d2d22b13be89d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 04:43:59 +0000 Subject: [PATCH 340/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.533.0 to 3.535.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.533.0 to 3.535.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.535.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 1369 ++++++++++++++++++------------------ 2 files changed, 683 insertions(+), 688 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 714085646e6..648429cc644 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.533.0", + "@aws-sdk/client-sesv2": "3.535.0", "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index 9b7dd609a7c..f9b8411ef90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -197,374 +197,374 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.533.0.tgz#953967e236c55d80164fc8f8bb2104c0c1d11f29" - integrity sha512-JfRVHlma4oeeeLMls2EBv0+AAl0xpafPKQ4t1lEqHlugNwcYw/4XeFuEjKmCs4JWCH3zWizWsgFMkpLhySjRjA== +"@aws-sdk/client-sesv2@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.535.0.tgz#66ffd54ab4e612be84f4e63670304d2d83ca12a1" + integrity sha512-K0WZf/o4R+A20RFHJW+YyMg0cMK8GMHe2MHURpPvLJoq5JF0RpCdsMTgRiYIoAFCLoy8qFH9G0MebxR8JZvD+A== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.533.0" - "@aws-sdk/core" "3.533.0" - "@aws-sdk/credential-provider-node" "3.533.0" - "@aws-sdk/middleware-host-header" "3.533.0" - "@aws-sdk/middleware-logger" "3.533.0" - "@aws-sdk/middleware-recursion-detection" "3.533.0" - "@aws-sdk/middleware-user-agent" "3.533.0" - "@aws-sdk/region-config-resolver" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@aws-sdk/util-endpoints" "3.533.0" - "@aws-sdk/util-user-agent-browser" "3.533.0" - "@aws-sdk/util-user-agent-node" "3.533.0" - "@smithy/config-resolver" "^2.1.5" - "@smithy/core" "^1.3.8" - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/hash-node" "^2.1.4" - "@smithy/invalid-dependency" "^2.1.4" - "@smithy/middleware-content-length" "^2.1.4" - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-retry" "^2.1.7" - "@smithy/middleware-serde" "^2.2.1" - "@smithy/middleware-stack" "^2.1.4" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - "@smithy/util-base64" "^2.2.1" - "@smithy/util-body-length-browser" "^2.1.1" - "@smithy/util-body-length-node" "^2.2.2" - "@smithy/util-defaults-mode-browser" "^2.1.7" - "@smithy/util-defaults-mode-node" "^2.2.7" - "@smithy/util-endpoints" "^1.1.5" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-retry" "^2.1.4" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/credential-provider-node" "3.535.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.533.0.tgz#a4a3ad2c50a8852119c28b7dc5aa43b6aac9570f" - integrity sha512-jxG+L81bcuH6JJkls+VSRsOTpixvNEQ8clpUglal/XC+qiV09yZUnOi+Fxf2q7OAB7bfM9DB3Wy8YwbhaR2wYg== +"@aws-sdk/client-sso-oidc@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz#64666c2f7bed8510938ba2b481429fea8f97473d" + integrity sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.533.0" - "@aws-sdk/core" "3.533.0" - "@aws-sdk/middleware-host-header" "3.533.0" - "@aws-sdk/middleware-logger" "3.533.0" - "@aws-sdk/middleware-recursion-detection" "3.533.0" - "@aws-sdk/middleware-user-agent" "3.533.0" - "@aws-sdk/region-config-resolver" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@aws-sdk/util-endpoints" "3.533.0" - "@aws-sdk/util-user-agent-browser" "3.533.0" - "@aws-sdk/util-user-agent-node" "3.533.0" - "@smithy/config-resolver" "^2.1.5" - "@smithy/core" "^1.3.8" - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/hash-node" "^2.1.4" - "@smithy/invalid-dependency" "^2.1.4" - "@smithy/middleware-content-length" "^2.1.4" - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-retry" "^2.1.7" - "@smithy/middleware-serde" "^2.2.1" - "@smithy/middleware-stack" "^2.1.4" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - "@smithy/util-base64" "^2.2.1" - "@smithy/util-body-length-browser" "^2.1.1" - "@smithy/util-body-length-node" "^2.2.2" - "@smithy/util-defaults-mode-browser" "^2.1.7" - "@smithy/util-defaults-mode-node" "^2.2.7" - "@smithy/util-endpoints" "^1.1.5" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-retry" "^2.1.4" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" -"@aws-sdk/client-sso@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.533.0.tgz#ff0fd1631ed26d577e4ba28601699131d3c285e0" - integrity sha512-qO+PCEM3fGS/3uBJQjQ01oAI+ashN0CHTJF8X0h3ycVsv3VAAYrpZigpylOOgv7c253s7VrSwjvdKIE8yTbelw== +"@aws-sdk/client-sso@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz#c405aaf880cb695aa2f5070a8827955274fc9df2" + integrity sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.533.0" - "@aws-sdk/middleware-host-header" "3.533.0" - "@aws-sdk/middleware-logger" "3.533.0" - "@aws-sdk/middleware-recursion-detection" "3.533.0" - "@aws-sdk/middleware-user-agent" "3.533.0" - "@aws-sdk/region-config-resolver" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@aws-sdk/util-endpoints" "3.533.0" - "@aws-sdk/util-user-agent-browser" "3.533.0" - "@aws-sdk/util-user-agent-node" "3.533.0" - "@smithy/config-resolver" "^2.1.5" - "@smithy/core" "^1.3.8" - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/hash-node" "^2.1.4" - "@smithy/invalid-dependency" "^2.1.4" - "@smithy/middleware-content-length" "^2.1.4" - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-retry" "^2.1.7" - "@smithy/middleware-serde" "^2.2.1" - "@smithy/middleware-stack" "^2.1.4" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - "@smithy/util-base64" "^2.2.1" - "@smithy/util-body-length-browser" "^2.1.1" - "@smithy/util-body-length-node" "^2.2.2" - "@smithy/util-defaults-mode-browser" "^2.1.7" - "@smithy/util-defaults-mode-node" "^2.2.7" - "@smithy/util-endpoints" "^1.1.5" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-retry" "^2.1.4" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" -"@aws-sdk/client-sts@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.533.0.tgz#a792fc321509dee0b104a3470653663315068bce" - integrity sha512-Z/z76T/pEq0DsBpoyWSMQdS7R6IRpq2ZV6dfZwr+HZ2vho2Icd70nIxwiNzZxaV16aVIhu5/l/5v5Ns9ZCfyOA== +"@aws-sdk/client-sts@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz#0f518fe338c6b7a8b8a897e2ccee65d06dc0040f" + integrity sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.533.0" - "@aws-sdk/middleware-host-header" "3.533.0" - "@aws-sdk/middleware-logger" "3.533.0" - "@aws-sdk/middleware-recursion-detection" "3.533.0" - "@aws-sdk/middleware-user-agent" "3.533.0" - "@aws-sdk/region-config-resolver" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@aws-sdk/util-endpoints" "3.533.0" - "@aws-sdk/util-user-agent-browser" "3.533.0" - "@aws-sdk/util-user-agent-node" "3.533.0" - "@smithy/config-resolver" "^2.1.5" - "@smithy/core" "^1.3.8" - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/hash-node" "^2.1.4" - "@smithy/invalid-dependency" "^2.1.4" - "@smithy/middleware-content-length" "^2.1.4" - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-retry" "^2.1.7" - "@smithy/middleware-serde" "^2.2.1" - "@smithy/middleware-stack" "^2.1.4" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - "@smithy/util-base64" "^2.2.1" - "@smithy/util-body-length-browser" "^2.1.1" - "@smithy/util-body-length-node" "^2.2.2" - "@smithy/util-defaults-mode-browser" "^2.1.7" - "@smithy/util-defaults-mode-node" "^2.2.7" - "@smithy/util-endpoints" "^1.1.5" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-retry" "^2.1.4" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/middleware-host-header" "3.535.0" + "@aws-sdk/middleware-logger" "3.535.0" + "@aws-sdk/middleware-recursion-detection" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/region-config-resolver" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-user-agent-browser" "3.535.0" + "@aws-sdk/util-user-agent-node" "3.535.0" + "@smithy/config-resolver" "^2.2.0" + "@smithy/core" "^1.4.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/hash-node" "^2.2.0" + "@smithy/invalid-dependency" "^2.2.0" + "@smithy/middleware-content-length" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-body-length-browser" "^2.2.0" + "@smithy/util-body-length-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-endpoints" "^1.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" -"@aws-sdk/core@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.533.0.tgz#222dd8eed4fe93904462dc094d35bc67f5eaaac7" - integrity sha512-m3jq9WJbIvlDOnN5KG5U/org1MwOwXzfyU2Rr/48rRey6/+kNSm5QzYZMT0Htsk8V5Ukp325dzs/XR8DyO9uMQ== +"@aws-sdk/core@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.535.0.tgz#f3a726c297cea9634d19a1db4e958c918c506c8b" + integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== dependencies: - "@smithy/core" "^1.3.8" - "@smithy/protocol-http" "^3.2.2" - "@smithy/signature-v4" "^2.1.4" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" + "@smithy/core" "^1.4.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/signature-v4" "^2.2.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" - tslib "^2.5.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-env@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.533.0.tgz#d246b17f1206cf77d4d55651116b3b0d637a45e9" - integrity sha512-opj7hfcCeNosSmxfJkJr0Af0aSxlqwkdCPlLEvOTwbHmdkovD+SyEpaI4/0ild0syZDMifuJAU6I6K0ukbcm3g== +"@aws-sdk/credential-provider-env@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz#26248e263a8107953d5496cb3760d4e7c877abcf" + integrity sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/property-provider" "^2.1.4" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.533.0.tgz#bf403804e956d32ea405f7dd3f2cbf9c9a089fe8" - integrity sha512-m5z3V9MRO77t1CF312QKaQSfYG2MM/USqZ1Jj6srb+kJBX+GuVXbkc0+NwrpG5+j8Iukgxy1tms+0p3Wjatu6A== +"@aws-sdk/credential-provider-http@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz#0a42f6b1a61d927bbce9f4afd25112f486bd05da" + integrity sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/property-provider" "^2.1.4" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/util-stream" "^2.1.5" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-stream" "^2.2.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.533.0.tgz#3018cf2d26b0153a3599a375037220254ca0506c" - integrity sha512-xQ7TMY+j99zxOph+LJJhGPIav6RpydESZgIp5cp/pFY4Liwe5e84M7SaCgkFLck2HE9s7MhP42c8xmC6u9PIuw== +"@aws-sdk/credential-provider-ini@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz#b121b1aba2916e3f45745cd690b4082421a7c286" + integrity sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA== dependencies: - "@aws-sdk/client-sts" "3.533.0" - "@aws-sdk/credential-provider-env" "3.533.0" - "@aws-sdk/credential-provider-process" "3.533.0" - "@aws-sdk/credential-provider-sso" "3.533.0" - "@aws-sdk/credential-provider-web-identity" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@smithy/credential-provider-imds" "^2.2.6" - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/credential-provider-env" "3.535.0" + "@aws-sdk/credential-provider-process" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.533.0.tgz#96d6fcbef83520bd270a5797d9ca8ba7517e05d0" - integrity sha512-Tn2grwFfFDLV5Hr8sZvZY5pjEmDUOm/e+ipnyxxCBB/K7t2ru2R4jG/RUa6+dZXSH/pi+TNte9cYq/Lx2Szjlw== +"@aws-sdk/credential-provider-node@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz#6739b4b52a9cce29dc8e70c9a7290b89cdc4b904" + integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== dependencies: - "@aws-sdk/credential-provider-env" "3.533.0" - "@aws-sdk/credential-provider-http" "3.533.0" - "@aws-sdk/credential-provider-ini" "3.533.0" - "@aws-sdk/credential-provider-process" "3.533.0" - "@aws-sdk/credential-provider-sso" "3.533.0" - "@aws-sdk/credential-provider-web-identity" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@smithy/credential-provider-imds" "^2.2.6" - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/credential-provider-env" "3.535.0" + "@aws-sdk/credential-provider-http" "3.535.0" + "@aws-sdk/credential-provider-ini" "3.535.0" + "@aws-sdk/credential-provider-process" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-process@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.533.0.tgz#e7fa3e721fb7e82fd9c1c33dd9b224b16e5cf8b9" - integrity sha512-9Iuhp8dhMqEv7kPsZlc9KFhC5XvuB/jFv3IZoTtRgbACW4cdxng7OwJEWdeZGrcjy9x40Tc2DT9KcmCE895KpQ== +"@aws-sdk/credential-provider-process@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz#ea1e8a38a32e36bbdc3f75eb03352e6eafa0c659" + integrity sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.533.0.tgz#ede23bde4e871ad1c3a234c7b364ed3c010d851a" - integrity sha512-1zPZQnFUoZ0fWuLPW2X2L3jPKyd+qW8VzFO1k26oX1KJuiEZJzoYbfap08soy6vhFI+n4NfsAgvoA1IMsqG0Pg== +"@aws-sdk/credential-provider-sso@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz#dfc7c2f39f9ca965becd7e5b9414cd1bb2217490" + integrity sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg== dependencies: - "@aws-sdk/client-sso" "3.533.0" - "@aws-sdk/token-providers" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/client-sso" "3.535.0" + "@aws-sdk/token-providers" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.533.0.tgz#f7c8c27e07d881ac9b702f14bad0849ba9f9e184" - integrity sha512-utemXrFmvFxBvX+WCznlh5wGdXRIfwEyeNIDFs+WLRn8NIR/6gqCipi7rlC9ZbFFkBhkCTssa6+ruXG+kUQcMg== +"@aws-sdk/credential-provider-web-identity@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz#f1d3a72ff958cbd7e052c5109755379745ac35e0" + integrity sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg== dependencies: - "@aws-sdk/client-sts" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@smithy/property-provider" "^2.1.4" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/middleware-host-header@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.533.0.tgz#227b785e632a92ec9e6a261a523c9e7d215af9fd" - integrity sha512-y9JaPjvz3pk4DZcFB6Nud//Hc6y4BkkSwiGXfthwFv5kxfaaksHKd8smDjL3RUPqDKl8AI9vxHzTz1UrQQkpQw== +"@aws-sdk/middleware-host-header@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz#d5264f813592f5e77df25e5a14bbb0e6441812db" + integrity sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/protocol-http" "^3.2.2" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/middleware-logger@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.533.0.tgz#259915eceaf158f00b9a4f925c442bde3d6462af" - integrity sha512-W+ou4YgqnHn/xVNcBgfwAUCtXTHGJjjsFffdt69s1Tb7rP5U4gXnl8wHHADajy9tXiKK48fRc2SGF42EthjQIA== +"@aws-sdk/middleware-logger@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz#1a8ffd6c368edd6cb32e1edf7b1dced95c1820ee" + integrity sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/middleware-recursion-detection@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.533.0.tgz#ac48fdce1e3f7c3e106c41d16a784596695418eb" - integrity sha512-dobVdJ4g1avrVG6QTRHndfvdTxUeloDCn32WLwyOV11XF/2x5p8QJ1VZS+K24xsl29DoJ8bXibZf9xZ7MPwRLg== +"@aws-sdk/middleware-recursion-detection@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz#6aa1e1bd1e84730d58a73021b745e20d4341a92d" + integrity sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/protocol-http" "^3.2.2" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.533.0.tgz#0cad8c5a4220170d3368708a589ded997a12256d" - integrity sha512-H5vbkgwFVgp9egQ/CR+gLRXhVJ/jHqq+J9TTug/To4ev183fcNc2OE15ojiNek8phuSsBZITLaQB+DWBTydsAA== +"@aws-sdk/middleware-user-agent@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz#2877ff5e42d943dd0c488e8b1ad82bd9da121227" + integrity sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog== dependencies: - "@aws-sdk/types" "3.533.0" - "@aws-sdk/util-endpoints" "3.533.0" - "@smithy/protocol-http" "^3.2.2" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@aws-sdk/util-endpoints" "3.535.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/region-config-resolver@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.533.0.tgz#86f922a7888eff36411ab5507b7a1fd39c08696d" - integrity sha512-1FLLcohz23aVV+lK3iCUJpjKO/4adXjre0KMg9tvHWwCkOD/sZgLjzlv+BW5Fx2vH3Dgo0kDQ04+XEsbuVC2xA== +"@aws-sdk/region-config-resolver@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz#20a30fb5fbbe27ab70f2ed16327bae7e367b5cec" + integrity sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/types" "^2.11.0" - "@smithy/util-config-provider" "^2.2.1" - "@smithy/util-middleware" "^2.1.4" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-config-provider" "^2.3.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" -"@aws-sdk/token-providers@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.533.0.tgz#7cfca598d77931bb3cbdaefca72c24d2133c10ec" - integrity sha512-mHaZUeJ6zfbkW0E64dUmzDwReO1LoDYRful+FT1dbKqQr0p+9Q8o4n6fAswwAVfCYHaAeIt68vE0zVkAlbGCqA== +"@aws-sdk/token-providers@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz#0d5aa221449d5b56730427b28d3319005c5700ed" + integrity sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg== dependencies: - "@aws-sdk/client-sso-oidc" "3.533.0" - "@aws-sdk/types" "3.533.0" - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/client-sso-oidc" "3.535.0" + "@aws-sdk/types" "3.535.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/types@3.533.0", "@aws-sdk/types@^3.222.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.533.0.tgz#4c4ade8f41f153295c69f1dea812dcd6154613e3" - integrity sha512-mFb0701oLRcJ7Y2unlrszzk9rr2P6nt2A4Bdz4K5WOsY4f4hsdbcYkrzA1NPmIUTEttU9JT0YG+8z0XxLEX4Aw== +"@aws-sdk/types@3.535.0", "@aws-sdk/types@^3.222.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.535.0.tgz#5e6479f31299dd9df170e63f4d10fe739008cf04" + integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg== dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.533.0.tgz#b9751fef5436caabdf0f168534b84c4a61df4d7d" - integrity sha512-pmjRqWqno6X61RaJ/iEbSSql79Jyaq9d9SvTkyvo8Ce8Kb+49cflzUY1PP0s40Caj4H+bUkpksVHwO7t2qIakw== +"@aws-sdk/util-endpoints@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz#46f4b61b2661d6414ded8c98e4ad3c82a0bf597b" + integrity sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/types" "^2.11.0" - "@smithy/util-endpoints" "^1.1.5" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" + "@smithy/util-endpoints" "^1.2.0" + tslib "^2.6.2" "@aws-sdk/util-locate-window@^3.0.0": version "3.495.0" @@ -573,25 +573,25 @@ dependencies: tslib "^2.5.0" -"@aws-sdk/util-user-agent-browser@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.533.0.tgz#323da7e2cae11528adcdab98573f1e4196e97cb6" - integrity sha512-wyzDxH89yQ89+Q/9rWZeYBeegaXkB4nhb9Bd+xG4J3KgaNVuVvaYT6Nbzjg4oPtuC+pPeQp1iSXKs/2QTlsqPA== +"@aws-sdk/util-user-agent-browser@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz#d67d72e8b933051620f18ddb1c2be225f79f588f" + integrity sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/types" "^2.11.0" + "@aws-sdk/types" "3.535.0" + "@smithy/types" "^2.12.0" bowser "^2.11.0" - tslib "^2.5.0" + tslib "^2.6.2" -"@aws-sdk/util-user-agent-node@3.533.0": - version "3.533.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.533.0.tgz#14e65837096544f7504953831a7a45a6a29525b2" - integrity sha512-Tu79n4+q1MAPPFEtu7xTgiTQGzOAPe4c2p8vSyrIJEBHclf7cyvZxgziQAyM9Yy4DoRdtnnAeeybao3U4d+CzA== +"@aws-sdk/util-user-agent-node@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz#f5c26fb6f3f561d3cf35f96f303b1775afad0a5b" + integrity sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ== dependencies: - "@aws-sdk/types" "3.533.0" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@aws-sdk/types" "3.535.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" "@aws-sdk/util-utf8-browser@^3.0.0": version "3.259.0" @@ -2146,383 +2146,383 @@ resolved "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz" integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ== -"@smithy/abort-controller@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.1.4.tgz#7c65f910ce59abc9715cba8347dd454dbf5538a9" - integrity sha512-66HO817oIZ2otLIqy06R5muapqZjkgF1jfU0wyNko8cuqZNu8nbS9ljlhcRYw/M/uWRJzB9ih81DLSHhYbBLlQ== +"@smithy/abort-controller@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.2.0.tgz#18983401a5e2154b5c94057730024a7d14cbcd35" + integrity sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw== dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@smithy/config-resolver@^2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.1.5.tgz#51d047d2ff7b69cbb8d8b1a197f0edc2a17fbc1b" - integrity sha512-LcBB5JQC3Tx2ZExIJzfvWaajhFIwHrUNQeqxhred2r5nnqrdly9uoCrvM1sxOOdghYuWWm2Kr8tBCDOmxsgeTA== +"@smithy/config-resolver@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.2.0.tgz#54f40478bb61709b396960a3535866dba5422757" + integrity sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA== dependencies: - "@smithy/node-config-provider" "^2.2.5" - "@smithy/types" "^2.11.0" - "@smithy/util-config-provider" "^2.2.1" - "@smithy/util-middleware" "^2.1.4" - tslib "^2.5.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-config-provider" "^2.3.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" -"@smithy/core@^1.3.8": - version "1.3.8" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.3.8.tgz#91e432bf78fe79ef80b0314e4dec12de92b7b561" - integrity sha512-6cFhQ9ChU7MxvOXJn6nuUSONacpNsGHWhfueROQuM/0vibDdZA9FWEdNbVkuVuc+BFI5BnaX3ltERUlpUirpIA== +"@smithy/core@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.0.tgz#5f9f86b681b9cbf23904041dad6f0531efe8375e" + integrity sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw== dependencies: - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-retry" "^2.1.7" - "@smithy/middleware-serde" "^2.2.1" - "@smithy/protocol-http" "^3.2.2" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/util-middleware" "^2.1.4" - tslib "^2.5.0" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" -"@smithy/credential-provider-imds@^2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.2.6.tgz#a518575d5b830370fa76a270c376ce9f208d4c74" - integrity sha512-+xQe4Pite0kdk9qn0Vyw5BRVh0iSlj+T4TEKRXr4E1wZKtVgIzGlkCrfICSjiPVFkPxk4jMpVboMYdEiiA88/w== +"@smithy/credential-provider-imds@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz#326ce401b82e53f3c7ee4862a066136959a06166" + integrity sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w== dependencies: - "@smithy/node-config-provider" "^2.2.5" - "@smithy/property-provider" "^2.1.4" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - tslib "^2.5.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + tslib "^2.6.2" -"@smithy/eventstream-codec@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.1.4.tgz#ba8855fcd53d06a456ec2e59f11eadd1eb7ffa62" - integrity sha512-UkiieTztP7adg8EuqZvB0Y4LewdleZCJU7Kgt9RDutMsRYqO32fMpWeQHeTHaIMosmzcRZUykMRrhwGJe9mP3A== +"@smithy/eventstream-codec@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz#63d74fa817188995eb55e792a38060b0ede98dc4" + integrity sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw== dependencies: "@aws-crypto/crc32" "3.0.0" - "@smithy/types" "^2.11.0" - "@smithy/util-hex-encoding" "^2.1.1" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-hex-encoding" "^2.2.0" + tslib "^2.6.2" -"@smithy/fetch-http-handler@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.4.5.tgz#e036f6653259e742841d10280fc049c337e739e8" - integrity sha512-FR1IMGdo0yRFs1tk71zRGSa1MznVLQOVNaPjyNtx6dOcy/u0ovEnXN5NVz6slw5KujFlg3N1w4+UbO8F3WyYUg== +"@smithy/fetch-http-handler@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac" + integrity sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw== dependencies: - "@smithy/protocol-http" "^3.2.2" - "@smithy/querystring-builder" "^2.1.4" - "@smithy/types" "^2.11.0" - "@smithy/util-base64" "^2.2.1" - tslib "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/querystring-builder" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/util-base64" "^2.3.0" + tslib "^2.6.2" -"@smithy/hash-node@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.1.4.tgz#a2cc973ca9a074085d3b70969b5be186a0d5ee94" - integrity sha512-uvCcpDLXaTTL0X/9ezF8T8sS77UglTfZVQaUOBiCvR0QydeSyio3t0Hj3QooVdyFsKTubR8gCk/ubLk3vAyDng== +"@smithy/hash-node@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.2.0.tgz#df29e1e64811be905cb3577703b0e2d0b07fc5cc" + integrity sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g== dependencies: - "@smithy/types" "^2.11.0" - "@smithy/util-buffer-from" "^2.1.1" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" -"@smithy/invalid-dependency@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.1.4.tgz#aa58540c21b39fbedf58192fb34e6fb49cc736ca" - integrity sha512-QzlNBl6jt3nb9jNnE51wTegReVvUdozyMMrFEyb/rc6AzPID1O+qMJYjAAoNw098y0CZVfCpEnoK2+mfBOd8XA== +"@smithy/invalid-dependency@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz#ee3d8980022cb5edb514ac187d159b3e773640f0" + integrity sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q== dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@smithy/is-array-buffer@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.1.1.tgz" - integrity sha512-xozSQrcUinPpNPNPds4S7z/FakDTh1MZWtRP/2vQtYB/u3HYrX2UXuZs+VhaKBd6Vc7g2XPr2ZtwGBNDN6fNKQ== +"@smithy/is-array-buffer@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111" + integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA== dependencies: - tslib "^2.5.0" + tslib "^2.6.2" -"@smithy/middleware-content-length@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.1.4.tgz#0939d7b36f029f075a118ac1673db2655f51ff81" - integrity sha512-C6VRwfcr0w9qRFhDGCpWMVhlEIBFlmlPRP1aX9Cv9xDj9SUwlDrNvoV1oP1vjRYuLxCDgovBBynCwwcluS2wLw== +"@smithy/middleware-content-length@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz#a82e97bd83d8deab69e07fea4512563bedb9461a" + integrity sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ== dependencies: - "@smithy/protocol-http" "^3.2.2" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@smithy/middleware-endpoint@^2.4.6": - version "2.4.6" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.4.6.tgz#18fbae774b722d47d4d40dad73466893a035a072" - integrity sha512-AsXtUXHPOAS0EGZUSFOsVJvc7p0KL29PGkLxLfycPOcFVLru/oinYB6yvyL73ZZPX2OB8sMYUMrj7eH2kI7V/w== +"@smithy/middleware-endpoint@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz#9f1459e9b4cbf00fadfd99e98f88d4b1a2aeb987" + integrity sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA== dependencies: - "@smithy/middleware-serde" "^2.2.1" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - "@smithy/url-parser" "^2.1.4" - "@smithy/util-middleware" "^2.1.4" - tslib "^2.5.0" + "@smithy/middleware-serde" "^2.3.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + "@smithy/url-parser" "^2.2.0" + "@smithy/util-middleware" "^2.2.0" + tslib "^2.6.2" -"@smithy/middleware-retry@^2.1.7": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.1.7.tgz#ad49013c40f0b3593ad8140dd7b50368a1e2ce42" - integrity sha512-8fOP/cJN4oMv+5SRffZC8RkqfWxHqGgn/86JPINY/1DnTRegzf+G5GT9lmIdG1YasuSbU7LISfW9PXil3isPVw== +"@smithy/middleware-retry@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz#ff48ac01ad57394eeea15a0146a86079cf6364b7" + integrity sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA== dependencies: - "@smithy/node-config-provider" "^2.2.5" - "@smithy/protocol-http" "^3.2.2" - "@smithy/service-error-classification" "^2.1.4" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-retry" "^2.1.4" - tslib "^2.5.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/service-error-classification" "^2.1.5" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-retry" "^2.2.0" + tslib "^2.6.2" uuid "^8.3.2" -"@smithy/middleware-serde@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.2.1.tgz#b4a6a757e3f6f62e432f53020a06d27eabe8f424" - integrity sha512-VAWRWqnNjgccebndpyK94om4ZTYzXLQxUmNCXYzM/3O9MTfQjTNBgtFtQwyIIez6z7LWcCsXmnKVIOE9mLqAHQ== +"@smithy/middleware-serde@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz#a7615ba646a88b6f695f2d55de13d8158181dd13" + integrity sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q== dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" -"@smithy/middleware-stack@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.1.4.tgz#eb475eb31ad6fed0aa21ee0896c3c80114b73507" - integrity sha512-Qqs2ba8Ax1rGKOSGJS2JN23fhhox2WMdRuzx0NYHtXzhxbJOIMmz9uQY6Hf4PY8FPteBPp1+h0j5Fmr+oW12sg== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/node-config-provider@^2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.2.5.tgz#39c7a06e798f763722d12fccab6160896b2ee08b" - integrity sha512-CxPf2CXhjO79IypHJLBATB66Dw6suvr1Yc2ccY39hpR6wdse3pZ3E8RF83SODiNH0Wjmkd0ze4OF8exugEixgA== - dependencies: - "@smithy/property-provider" "^2.1.4" - "@smithy/shared-ini-file-loader" "^2.3.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/node-http-handler@^2.4.3": - version "2.4.3" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.4.3.tgz#f9cc5a2197098a78be5a31776829b82a01b34276" - integrity sha512-bD5zRdEl1u/4vAAMeQnGEUNbH1seISV2Z0Wnn7ltPRl/6B2zND1R9XzTfsOnH1R5jqghpochF/mma8u7uXz0qQ== - dependencies: - "@smithy/abort-controller" "^2.1.4" - "@smithy/protocol-http" "^3.2.2" - "@smithy/querystring-builder" "^2.1.4" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/property-provider@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.1.4.tgz#0f127125c4b6f3ae0ddb4777946926f0bd8f0ca1" - integrity sha512-nWaY/MImj1BiXZ9WY65h45dcxOx8pl06KYoHxwojDxDL+Q9yLU1YnZpgv8zsHhEftlj9KhePENjQTlNowWVyug== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/protocol-http@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.2.2.tgz#af001dcc61e6ce6374315c907ad5bbd09bd3c810" - integrity sha512-xYBlllOQcOuLoxzhF2u8kRHhIFGQpDeTQj/dBSnw4kfI29WMKL5RnW1m9YjnJAJ49miuIvrkJR+gW5bCQ+Mchw== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/querystring-builder@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.1.4.tgz#f9cc5f389671d030701dc6ee66e2eaf309642eab" - integrity sha512-LXSL0J/nRWvGT+jIj+Fip3j0J1ZmHkUyBFRzg/4SmPNCLeDrtVu7ptKOnTboPsFZu5BxmpYok3kJuQzzRdrhbw== - dependencies: - "@smithy/types" "^2.11.0" - "@smithy/util-uri-escape" "^2.1.1" - tslib "^2.5.0" - -"@smithy/querystring-parser@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.1.4.tgz#17202a1d4844ac2691bc88d676eb0969b5c01265" - integrity sha512-U2b8olKXgZAs0eRo7Op11jTNmmcC/sqYmsA7vN6A+jkGnDvJlEl7AetUegbBzU8q3D6WzC5rhR/joIy8tXPzIg== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/service-error-classification@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.1.4.tgz#19ba871fcfb654ac03256b885e3184d69ec11a13" - integrity sha512-JW2Hthy21evnvDmYYk1kItOmbp3X5XI5iqorXgFEunb6hQfSDZ7O1g0Clyxg7k/Pcr9pfLk5xDIR2To/IohlsQ== - dependencies: - "@smithy/types" "^2.11.0" - -"@smithy/shared-ini-file-loader@^2.3.5": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.3.5.tgz#3e2f6f5fcfb1edf934f531dbf17429e2631e3a21" - integrity sha512-oI99+hOvsM8oAJtxAGmoL/YCcGXtbP0fjPseYGaNmJ4X5xOFTer0KPk7AIH3AL6c5AlYErivEi1X/X78HgTVIw== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/signature-v4@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.1.4.tgz#e83b426ab4138cbb06c755c14a152ed514e1d052" - integrity sha512-gnu9gCn0qQ8IdhNjs6o3QVCXzUs33znSDYwVMWo3nX4dM6j7z9u6FC302ShYyVWfO4MkVMuGCCJ6nl3PcH7V1Q== - dependencies: - "@smithy/eventstream-codec" "^2.1.4" - "@smithy/is-array-buffer" "^2.1.1" - "@smithy/types" "^2.11.0" - "@smithy/util-hex-encoding" "^2.1.1" - "@smithy/util-middleware" "^2.1.4" - "@smithy/util-uri-escape" "^2.1.1" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" - -"@smithy/smithy-client@^2.4.5": - version "2.4.5" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.4.5.tgz#63cf9e12c94c113de200cc99f2cecca8a0cda822" - integrity sha512-igXOM4kPXPo6b5LZXTUqTnrGk20uVd8OXoybC3f89gczzGfziLK4yUNOmiHSdxY9OOMOnnhVe5MpTm01MpFqvA== - dependencies: - "@smithy/middleware-endpoint" "^2.4.6" - "@smithy/middleware-stack" "^2.1.4" - "@smithy/protocol-http" "^3.2.2" - "@smithy/types" "^2.11.0" - "@smithy/util-stream" "^2.1.5" - tslib "^2.5.0" - -"@smithy/types@^2.11.0": - version "2.11.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.11.0.tgz#d40c27302151be243d3a7319a154b7d7d5775021" - integrity sha512-AR0SXO7FuAskfNhyGfSTThpLRntDI5bOrU0xrpVYU0rZyjl3LBXInZFMTP/NNSd7IS6Ksdtar0QvnrPRIhVrLQ== - dependencies: - tslib "^2.5.0" - -"@smithy/url-parser@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.1.4.tgz#b24c13d80677b1cbcf61172f1c3dd49402ff6a07" - integrity sha512-1hTy6UYRYqOZlHKH2/2NzdNQ4NNmW2Lp0sYYvztKy+dEQuLvZL9w88zCzFQqqFer3DMcscYOshImxkJTGdV+rg== - dependencies: - "@smithy/querystring-parser" "^2.1.4" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-base64@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.2.1.tgz#215634c4ab9dd48abf4dad6bb328fadc14c488c3" - integrity sha512-troGfokrpoqv8TGgsb8p4vvM71vqor314514jyQ0i9Zae3qs0jUVbSMCIBB1tseVynXFRcZJAZ9hPQYlifLD5A== - dependencies: - "@smithy/util-buffer-from" "^2.1.1" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" - -"@smithy/util-body-length-browser@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.1.1.tgz" - integrity sha512-ekOGBLvs1VS2d1zM2ER4JEeBWAvIOUKeaFch29UjjJsxmZ/f0L3K3x0dEETgh3Q9bkZNHgT+rkdl/J/VUqSRag== - dependencies: - tslib "^2.5.0" - -"@smithy/util-body-length-node@^2.2.2": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.2.2.tgz#33924882adcc8f4e083cc4ec789210b033d4cca1" - integrity sha512-U7DooaT1SfW7XHrOcxthYJnQ+WMaefRrFPxW5Qmypw38Ivv+TKvfVuVHA9V162h8BeW9rzOJwOunjgXd0DdB4w== - dependencies: - tslib "^2.5.0" - -"@smithy/util-buffer-from@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.1.1.tgz" - integrity sha512-clhNjbyfqIv9Md2Mg6FffGVrJxw7bgK7s3Iax36xnfVj6cg0fUG7I4RH0XgXJF8bxi+saY5HR21g2UPKSxVCXg== - dependencies: - "@smithy/is-array-buffer" "^2.1.1" - tslib "^2.5.0" - -"@smithy/util-config-provider@^2.2.1": - version "2.2.1" - resolved "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.2.1.tgz" - integrity sha512-50VL/tx9oYYcjJn/qKqNy7sCtpD0+s8XEBamIFo4mFFTclKMNp+rsnymD796uybjiIquB7VCB/DeafduL0y2kw== - dependencies: - tslib "^2.5.0" - -"@smithy/util-defaults-mode-browser@^2.1.7": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.1.7.tgz#a14cb2d585bcb01a9b36b93819fe042460cfc612" - integrity sha512-vvIpWsysEdY77R0Qzr6+LRW50ye7eii7AyHM0OJnTi0isHYiXo5M/7o4k8gjK/b1upQJdfjzSBoJVa2SWrI+2g== - dependencies: - "@smithy/property-provider" "^2.1.4" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - bowser "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-defaults-mode-node@^2.2.7": - version "2.2.7" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.2.7.tgz#f92aa2de80a5bb469cc3fdbc4ff000bbccead0bc" - integrity sha512-qzXkSDyU6Th+rNNcNkG4a7Ix7m5HlMOtSCPxTVKlkz7eVsqbSSPggegbFeQJ2MVELBB4wnzNPsVPJIrpIaJpXA== - dependencies: - "@smithy/config-resolver" "^2.1.5" - "@smithy/credential-provider-imds" "^2.2.6" - "@smithy/node-config-provider" "^2.2.5" - "@smithy/property-provider" "^2.1.4" - "@smithy/smithy-client" "^2.4.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-endpoints@^1.1.5": - version "1.1.5" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.1.5.tgz#2f07510013353299b95f483842c59115c0a01e00" - integrity sha512-tgDpaUNsUtRvNiBulKU1VnpoXU1GINMfZZXunRhUXOTBEAufG1Wp79uDXLau2gg1RZ4dpAR6lXCkrmddihCGUg== - dependencies: - "@smithy/node-config-provider" "^2.2.5" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-hex-encoding@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.1.1.tgz" - integrity sha512-3UNdP2pkYUUBGEXzQI9ODTDK+Tcu1BlCyDBaRHwyxhA+8xLP8agEKQq4MGmpjqb4VQAjq9TwlCQX0kP6XDKYLg== - dependencies: - tslib "^2.5.0" - -"@smithy/util-middleware@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.1.4.tgz#eb5f8d3f3639c1c2ff6fae574353249c174f1c03" - integrity sha512-5yYNOgCN0DL0OplME0pthoUR/sCfipnROkbTO7m872o0GHCVNJj5xOFJ143rvHNA54+pIPMLum4z2DhPC2pVGA== - dependencies: - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-retry@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.1.4.tgz#cfbe7aa7609f92eecdce562be5308599a2f6537b" - integrity sha512-JRZwhA3fhkdenSEYIWatC8oLwt4Bdf2LhHbNQApqb7yFoIGMl4twcYI3BcJZ7YIBZrACA9jGveW6tuCd836XzQ== - dependencies: - "@smithy/service-error-classification" "^2.1.4" - "@smithy/types" "^2.11.0" - tslib "^2.5.0" - -"@smithy/util-stream@^2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.1.5.tgz#8fa752e55b30209de47d00aed40f93b9b781fae1" - integrity sha512-FqvBFeTgx+QC4+i8USHqU8Ifs9nYRpW/OBfksojtgkxPIQ2H7ypXDEbnQRAV7PwoNHWcSwPomLYi0svmQQG5ow== - dependencies: - "@smithy/fetch-http-handler" "^2.4.5" - "@smithy/node-http-handler" "^2.4.3" - "@smithy/types" "^2.11.0" - "@smithy/util-base64" "^2.2.1" - "@smithy/util-buffer-from" "^2.1.1" - "@smithy/util-hex-encoding" "^2.1.1" - "@smithy/util-utf8" "^2.2.0" - tslib "^2.5.0" - -"@smithy/util-uri-escape@^2.1.1": - version "2.1.1" - resolved "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.1.1.tgz" - integrity sha512-saVzI1h6iRBUVSqtnlOnc9ssU09ypo7n+shdQ8hBTZno/9rZ3AuRYvoHInV57VF7Qn7B+pFJG7qTzFiHxWlWBw== - dependencies: - tslib "^2.5.0" - -"@smithy/util-utf8@^2.2.0": +"@smithy/middleware-stack@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.2.0.tgz#e352a81adc0491fbdc0086a00950d7e8333e211f" - integrity sha512-hBsKr5BqrDrKS8qy+YcV7/htmMGxriA1PREOf/8AGBhHIZnfilVv1Waf1OyKhSbFW15U/8+gcMUQ9/Kk5qwpHQ== + resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz#3fb49eae6313f16f6f30fdaf28e11a7321f34d9f" + integrity sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA== dependencies: - "@smithy/util-buffer-from" "^2.1.1" - tslib "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/node-config-provider@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz#9fac0c94a14c5b5b8b8fa37f20c310a844ab9922" + integrity sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg== + dependencies: + "@smithy/property-provider" "^2.2.0" + "@smithy/shared-ini-file-loader" "^2.4.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/node-http-handler@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz#7b5e0565dd23d340380489bd5fe4316d2bed32de" + integrity sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA== + dependencies: + "@smithy/abort-controller" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/querystring-builder" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/property-provider@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.2.0.tgz#37e3525a3fa3e11749f86a4f89f0fd7765a6edb0" + integrity sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/protocol-http@^3.3.0": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.3.0.tgz#a37df7b4bb4960cdda560ce49acfd64c455e4090" + integrity sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/querystring-builder@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz#22937e19fcd0aaa1a3e614ef8cb6f8e86756a4ef" + integrity sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A== + dependencies: + "@smithy/types" "^2.12.0" + "@smithy/util-uri-escape" "^2.2.0" + tslib "^2.6.2" + +"@smithy/querystring-parser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz#24a5633f4b3806ff2888d4c2f4169e105fdffd79" + integrity sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/service-error-classification@^2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz#0568a977cc0db36299d8703a5d8609c1f600c005" + integrity sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ== + dependencies: + "@smithy/types" "^2.12.0" + +"@smithy/shared-ini-file-loader@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz#1636d6eb9bff41e36ac9c60364a37fd2ffcb9947" + integrity sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/signature-v4@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.0.tgz#8fe6a574188b71fba6056111b88d50c84babb060" + integrity sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg== + dependencies: + "@smithy/eventstream-codec" "^2.2.0" + "@smithy/is-array-buffer" "^2.2.0" + "@smithy/types" "^2.12.0" + "@smithy/util-hex-encoding" "^2.2.0" + "@smithy/util-middleware" "^2.2.0" + "@smithy/util-uri-escape" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@smithy/smithy-client@^2.5.0": + version "2.5.0" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.0.tgz#8de4fff221d232dda34a8e706d6a4f2911dffe2e" + integrity sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g== + dependencies: + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-stack" "^2.2.0" + "@smithy/protocol-http" "^3.3.0" + "@smithy/types" "^2.12.0" + "@smithy/util-stream" "^2.2.0" + tslib "^2.6.2" + +"@smithy/types@^2.12.0": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.12.0.tgz#c44845f8ba07e5e8c88eda5aed7e6a0c462da041" + integrity sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw== + dependencies: + tslib "^2.6.2" + +"@smithy/url-parser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.2.0.tgz#6fcda6116391a4f61fef5580eb540e128359b3c0" + integrity sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ== + dependencies: + "@smithy/querystring-parser" "^2.2.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-base64@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.3.0.tgz#312dbb4d73fb94249c7261aee52de4195c2dd8e2" + integrity sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw== + dependencies: + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@smithy/util-body-length-browser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz#25620645c6b62b42594ef4a93b66e6ab70e27d2c" + integrity sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w== + dependencies: + tslib "^2.6.2" + +"@smithy/util-body-length-node@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz#d065a9b5e305ff899536777bbfe075cdc980136f" + integrity sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw== + dependencies: + tslib "^2.6.2" + +"@smithy/util-buffer-from@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b" + integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA== + dependencies: + "@smithy/is-array-buffer" "^2.2.0" + tslib "^2.6.2" + +"@smithy/util-config-provider@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz#bc79f99562d12a1f8423100ca662a6fb07cde943" + integrity sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-defaults-mode-browser@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz#963a9d3c3351272764dd1c5dc07c26f2c8abcb02" + integrity sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g== + dependencies: + "@smithy/property-provider" "^2.2.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + bowser "^2.11.0" + tslib "^2.6.2" + +"@smithy/util-defaults-mode-node@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz#5005058ca0a299f0948b47c288f7c3d4f36cb26e" + integrity sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw== + dependencies: + "@smithy/config-resolver" "^2.2.0" + "@smithy/credential-provider-imds" "^2.3.0" + "@smithy/node-config-provider" "^2.3.0" + "@smithy/property-provider" "^2.2.0" + "@smithy/smithy-client" "^2.5.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-endpoints@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz#b8b805f47e8044c158372f69b88337703117665d" + integrity sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ== + dependencies: + "@smithy/node-config-provider" "^2.3.0" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-hex-encoding@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085" + integrity sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ== + dependencies: + tslib "^2.6.2" + +"@smithy/util-middleware@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.2.0.tgz#80cfad40f6cca9ffe42a5899b5cb6abd53a50006" + integrity sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw== + dependencies: + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-retry@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.2.0.tgz#e8e019537ab47ba6b2e87e723ec51ee223422d85" + integrity sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g== + dependencies: + "@smithy/service-error-classification" "^2.1.5" + "@smithy/types" "^2.12.0" + tslib "^2.6.2" + +"@smithy/util-stream@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.2.0.tgz#b1279e417992a0f74afa78d7501658f174ed7370" + integrity sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA== + dependencies: + "@smithy/fetch-http-handler" "^2.5.0" + "@smithy/node-http-handler" "^2.5.0" + "@smithy/types" "^2.12.0" + "@smithy/util-base64" "^2.3.0" + "@smithy/util-buffer-from" "^2.2.0" + "@smithy/util-hex-encoding" "^2.2.0" + "@smithy/util-utf8" "^2.3.0" + tslib "^2.6.2" + +"@smithy/util-uri-escape@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406" + integrity sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA== + dependencies: + tslib "^2.6.2" + +"@smithy/util-utf8@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" + integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== + dependencies: + "@smithy/util-buffer-from" "^2.2.0" + tslib "^2.6.2" "@swc/helpers@0.5.2": version "0.5.2" @@ -3746,11 +3746,6 @@ chai-http@4.4.0: qs "^6.11.2" superagent "^8.0.9" -chai-string@1.5.0: - version "1.5.0" - resolved "https://registry.npmjs.org/chai-string/-/chai-string-1.5.0.tgz" - integrity sha512-sydDC3S3pNAQMYwJrs6dQX0oBQ6KfIPuOZ78n7rocW0eJJlsHPh2t3kwW7xfwYA/1Bf6/arGtSUo16rxR2JFlw== - chai@5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/chai/-/chai-5.1.0.tgz" From cd21bdcb44373b469388569a3e308f32fc8b4324 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 18 Mar 2024 10:29:10 +0100 Subject: [PATCH 341/795] New translations en.md (French) skip-build --- markdown/org/docs/measurements/waisttoupperleg/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/measurements/waisttoupperleg/fr.md b/markdown/org/docs/measurements/waisttoupperleg/fr.md index 1f190ca88d6..fbf3cbbee6f 100644 --- a/markdown/org/docs/measurements/waisttoupperleg/fr.md +++ b/markdown/org/docs/measurements/waisttoupperleg/fr.md @@ -2,5 +2,5 @@ title: Hauteur taille cuisse --- -The **waist to upper leg** is measured from your waist down to where your upper leg circumference measurement is. Elle se mesure sur le côté du corps. +**De la taille a la cuisse** est mesuré à partir de la taille vers la cuisse, à la hauteur de la mesure de la circonférence de la cuisse. Elle se mesure sur le côté du corps. From c98f9c68fee2d63f2cb38b2d4148c84ff929c86b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 04:48:40 +0000 Subject: [PATCH 342/795] chore(deps-dev): Bump @commitlint/cli from 19.2.0 to 19.2.1 Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 19.2.0 to 19.2.1. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.2.1/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5f9828350bd..4fa857619b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -930,14 +930,14 @@ integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== "@commitlint/cli@^19.0.3": - version "19.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.2.0.tgz#90a77b5b27b29d0f78960406b483e9d2da673e68" - integrity sha512-8XnQDMyQR+1/ldbmIyhonvnDS2enEw48Wompo/967fsEvy9Vj5/JbDutzmSBKxANWDVeEbR9QQm0yHpw6ArrFw== + version "19.2.1" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.2.1.tgz#8f00d27a8b7c7780e75b06fd4658fdc1e9209f1b" + integrity sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg== dependencies: "@commitlint/format" "^19.0.3" "@commitlint/lint" "^19.1.0" "@commitlint/load" "^19.2.0" - "@commitlint/read" "^19.2.0" + "@commitlint/read" "^19.2.1" "@commitlint/types" "^19.0.3" execa "^8.0.1" yargs "^17.0.0" @@ -1031,10 +1031,10 @@ conventional-changelog-angular "^7.0.0" conventional-commits-parser "^5.0.0" -"@commitlint/read@^19.2.0": - version "19.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-19.2.0.tgz#68b1ff24ed315b0078499615e97b8048e1b12b1a" - integrity sha512-HlGeEd/jyp2a5Fb9mvtsaDm5hFCmj80dJYjLQkpG3DzWneWBc37YU3kM8Za1D1HUazZaTkdsWq73M3XDE4CvCA== +"@commitlint/read@^19.2.1": + version "19.2.1" + resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-19.2.1.tgz#7296b99c9a989e60e5927fff8388a1dd44299c2f" + integrity sha512-qETc4+PL0EUv7Q36lJbPG+NJiBOGg7SSC7B5BsPWOmei+Dyif80ErfWQ0qXoW9oCh7GTpTNRoaVhiI8RbhuaNw== dependencies: "@commitlint/top-level" "^19.0.0" "@commitlint/types" "^19.0.3" From e6ddb4ee256d0a5530aae3237fe457491d3a8429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 04:49:51 +0000 Subject: [PATCH 343/795] chore(deps-dev): Bump eslint-plugin-jsonc from 2.13.0 to 2.14.1 Bumps [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) from 2.13.0 to 2.14.1. - [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases) - [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md) - [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.13.0...v2.14.1) --- updated-dependencies: - dependency-name: eslint-plugin-jsonc dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 5f9828350bd..547f2d62103 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5416,10 +5416,10 @@ escape-string-regexp@^5.0.0: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz" integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw== -eslint-compat-utils@^0.4.0: - version "0.4.1" - resolved "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.4.1.tgz" - integrity sha512-5N7ZaJG5pZxUeNNJfUchurLVrunD1xJvyg5kYOIVF8kg1f3ajTikmAu/5fZ9w100omNPOoMjngRszh/Q/uFGMg== +eslint-compat-utils@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz#f7b2eb2befec25a370fac76934d3f9189f312a65" + integrity sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg== dependencies: semver "^7.5.4" @@ -5509,12 +5509,12 @@ eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: tsconfig-paths "^3.15.0" eslint-plugin-jsonc@^2.4.0: - version "2.13.0" - resolved "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.13.0.tgz" - integrity sha512-2wWdJfpO/UbZzPDABuUVvlUQjfMJa2p2iQfYt/oWxOMpXCcjuiMUSaA02gtY/Dbu82vpaSqc+O7Xq6ECHwtIxA== + version "2.14.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.14.1.tgz#1ad123c9b28e91b76b5b5fefaa71c46bd6a1d981" + integrity sha512-Tei6G4N7pZulP5MHi0EIdtseiCqUPkDMd0O8Zrw4muMIlsjJ5/B9X+U3Pfo6B7l0mTL9LN9FwuWT70dRJ6z7tg== dependencies: "@eslint-community/eslint-utils" "^4.2.0" - eslint-compat-utils "^0.4.0" + eslint-compat-utils "^0.5.0" espree "^9.6.1" graphemer "^1.4.0" jsonc-eslint-parser "^2.0.4" From 2d93bd20642fd414d892a99a7e04b1b63db519b9 Mon Sep 17 00:00:00 2001 From: Benjamin Fan Date: Tue, 19 Mar 2024 09:49:16 -0700 Subject: [PATCH 344/795] fix(org,shared): Use singular words for page titles --- sites/org/pages/account/bookmark.mjs | 2 +- sites/org/pages/account/pattern.mjs | 2 +- sites/org/pages/account/set.mjs | 2 +- sites/shared/components/account/en.yaml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sites/org/pages/account/bookmark.mjs b/sites/org/pages/account/bookmark.mjs index dc780e69fc9..13406a58df1 100644 --- a/sites/org/pages/account/bookmark.mjs +++ b/sites/org/pages/account/bookmark.mjs @@ -58,7 +58,7 @@ const BookmarkPage = ({ page }) => { }, [id, backend, setLoadingStatus]) return ( - + diff --git a/sites/org/pages/account/pattern.mjs b/sites/org/pages/account/pattern.mjs index c226b8faa90..8049ef58733 100644 --- a/sites/org/pages/account/pattern.mjs +++ b/sites/org/pages/account/pattern.mjs @@ -43,7 +43,7 @@ const PatternPage = ({ page }) => { }, [id]) return ( - + diff --git a/sites/org/pages/account/set.mjs b/sites/org/pages/account/set.mjs index 7fbfcabde02..28d5148d76a 100644 --- a/sites/org/pages/account/set.mjs +++ b/sites/org/pages/account/set.mjs @@ -43,7 +43,7 @@ const SetPage = ({ page }) => { }, [id]) return ( - + diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index b6e0cb5d7e8..d8e7aeecc54 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -270,6 +270,7 @@ unitsMustSave: "Note: You must save after changing Units to have the change take makePublic: Make public makePrivate: Make private +pattern: Pattern patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From dbddaafb6ff87c33a77198d7c53f872e7cb84220 Mon Sep 17 00:00:00 2001 From: Karl Nippoldt Date: Tue, 19 Mar 2024 17:23:19 -0700 Subject: [PATCH 345/795] Added links to sew along on Vimeo since the blog post is currently down. --- markdown/org/docs/designs/simon/instructions/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index 06c8f6096ef..d9b263370b1 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -12,7 +12,7 @@ If you're looking to make this pattern, Kelly and Julian can guide you start to You can find all the material's on Kelly's site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Step 1: Fuse interfacing From b2cf5ccde4c98bbd30b3c5f409136119e2420a42 Mon Sep 17 00:00:00 2001 From: Karl Nippoldt Date: Tue, 19 Mar 2024 17:36:57 -0700 Subject: [PATCH 346/795] Fix typo and update fabric description on front piece to match other pieces --- designs/simon/src/front.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designs/simon/src/front.mjs b/designs/simon/src/front.mjs index 7cfc29b8435..61a48265570 100644 --- a/designs/simon/src/front.mjs +++ b/designs/simon/src/front.mjs @@ -141,7 +141,7 @@ function simonFront({ * Annotations */ // Cutlist - store.cutlist.setCut({ cut: 1, from: 'farbic' }) + store.cutlist.setCut({ cut: 1, from: 'main fabric' }) // Grainline const grainlineDistance = (points.hem.x - points.cfHem.x) * 0.2 From 05ad74490e3d1f9c44a39a4fb6d3b59739fcb3ab Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Wed, 20 Mar 2024 00:49:55 +0000 Subject: [PATCH 347/795] Minor pattern tutorial edits --- .../part2/avoiding-overlap/en.md | 34 +++--------------- .../part2/creating-the-closure/en.md | 36 ++++++++----------- .../pattern-design/part2/draft-method/en.md | 2 ++ .../part2/drawing-the-straps/en.md | 18 +++------- .../part2/rounding-the-corners/en.md | 2 -- .../part2/shaping-the-straps/en.md | 6 ++++ 6 files changed, 32 insertions(+), 66 deletions(-) diff --git a/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md b/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md index 684d36ddc77..1b1017a45a3 100644 --- a/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md @@ -142,15 +142,6 @@ function draftBib({ points.bottomLeft = points.topLeft.shift(-90, length) points.bottomRight = points.topRight.shift(-90, length) - paths.rect = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) - .line(points.topRight) - .line(points.topLeft) - .close() - .addClass('fabric') - /* * Shape the straps */ @@ -203,11 +194,8 @@ function draftBib({ } } // highlight-end + /* - * Always draw your path at the end - * after you've manipulated your points - */ - /* * Now, adapt our `rect` path so it's no longer a rectangle: */ paths.rect = new Path() @@ -227,7 +215,7 @@ function draftBib({ Once we have our list of points to rotate, we can rotate them. How far? Until the strap no longer overlaps. -```src/bib.mjs +```design/src/bib.mjs function draftBib({ Path, Point, @@ -312,15 +300,6 @@ function draftBib({ points.bottomLeft = points.topLeft.shift(-90, length) points.bottomRight = points.topRight.shift(-90, length) - paths.rect = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) - .line(points.topRight) - .line(points.topLeft) - .close() - .addClass('fabric') - /* * Shape the straps */ @@ -372,6 +351,7 @@ function draftBib({ } } + // highlight-start /* * This is the list of points we need to rotate * to move our strap out of the way @@ -427,15 +407,10 @@ function draftBib({ hide: false, classes: 'contrast dotted', }) - + // highlight-end /* - * Always draw your path at the end - * after you've manipulated your points - */ - /* * Now, adapt our `rect` path so it's no longer a rectangle: */ - paths.rect = new Path() .move(points.edgeTop) .curve(points.edgeTopLeftCp, points.edgeLeftCp, points.edgeLeft) @@ -444,7 +419,6 @@ function draftBib({ .line(points.edgeRight) .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) .close() - // highlight-end return part } diff --git a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md index 5e82b6e65b2..298fb527992 100644 --- a/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/creating-the-closure/en.md @@ -115,15 +115,6 @@ function draftBib({ points.bottomLeft = points.topLeft.shift(-90, length) points.bottomRight = points.topRight.shift(-90, length) - paths.rect = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) - .line(points.topRight) - .line(points.topLeft) - .close() - .addClass('fabric') - /* * Shape the straps */ @@ -139,18 +130,6 @@ function draftBib({ ) points.edgeTopRightCp = points.edgeTopLeftCp.flipX() - /* - * Now, adapt our `rect` path so it's no longer a rectangle: - */ - paths.rect = new Path() - .move(points.edgeTop) - .curve(points.edgeTopLeftCp, points.edgeLeftCp, points.edgeLeft) - .line(points.bottomLeft) - .line(points.bottomRight) - .line(points.edgeRight) - .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) - .close() - // highlight-start // Round the straps const strap = points.edgeTop.dy(points.top) @@ -174,7 +153,22 @@ function draftBib({ hide: false }) // highlight-end + + /* + * Now, adapt our `rect` path so it's no longer a rectangle: + */ + paths.rect = new Path() + .move(points.edgeTop) + .curve(points.edgeTopLeftCp, points.edgeLeftCp, points.edgeLeft) + .line(points.bottomLeft) + .line(points.bottomRight) + .line(points.edgeRight) + .curve(points.edgeRightCp, points.edgeTopRightCp, points.edgeTop) + .close() + return part } ``` + +Notice that we always draw our path at the end after we've manipulated our points. \ No newline at end of file diff --git a/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md b/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md index 36aad0f4f89..22fdbb3f67c 100644 --- a/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/draft-method/en.md @@ -63,10 +63,12 @@ Change the function to look like this: ```design/src/bib.mjs function draftBib({ +// highlight-start Path, Point, paths, points, +// highlight-end part, }) { diff --git a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md index 1b5b85d3468..509f6e1a8dc 100644 --- a/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/drawing-the-straps/en.md @@ -104,19 +104,6 @@ function draftBib({ points.bottomLeft = points.topLeft.shift(-90, length) points.bottomRight = points.topRight.shift(-90, length) - // strikeout-start - /* Remove this path - paths.rect = new Path() - .move(points.topLeft) - .line(points.bottomLeft) - .line(points.bottomRight) - .line(points.topRight) - .line(points.topLeft) - .close() - .addClass('fabric') - */ - // strikeout-end - /* * Shape the straps */ @@ -180,6 +167,11 @@ function draftBib({ } } + /* + * This is the list of points we need to rotate + * to move our strap out of the way + */ + const rotateThese = [ "edgeTopLeftCp", "edgeTop", diff --git a/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md b/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md index 6b889b73227..26189ce4eef 100644 --- a/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/rounding-the-corners/en.md @@ -8,8 +8,6 @@ We already know how to round corners, we'll have the `round` macro take care of With our corners rounded, we should also update our path. Fortunately, we merely have to update the start of it. -We'll rename `paths.rect` to `paths.seam`. - ```design/src/bib.mjs function draftBib({ diff --git a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md index e291b121287..ee607993267 100644 --- a/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md +++ b/markdown/dev/tutorials/pattern-design/part2/shaping-the-straps/en.md @@ -102,6 +102,10 @@ function draftBib({ points.bottomLeft = points.topLeft.shift(-90, length) points.bottomRight = points.topRight.shift(-90, length) +// strikeout-start +/* +* Remove this path + paths.rect = new Path() .move(points.topLeft) .line(points.bottomLeft) @@ -110,6 +114,8 @@ function draftBib({ .line(points.topLeft) .close() .addClass('fabric') +*/ +// strikeout-end // highlight-start /* From 0e14b0e927b8a183ca474bd3212433d92a00e25f Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Wed, 20 Mar 2024 01:30:20 +0000 Subject: [PATCH 348/795] Adds Gozer, Hi, and Holmes line drawings --- .../components/designs/linedrawings/gozer.mjs | 178 ++++++++++++++++++ .../components/designs/linedrawings/hi.mjs | 119 ++++++++++++ .../designs/linedrawings/holmes.mjs | 156 +++++++++++++++ .../components/designs/linedrawings/index.mjs | 10 + 4 files changed, 463 insertions(+) create mode 100644 sites/shared/components/designs/linedrawings/gozer.mjs create mode 100644 sites/shared/components/designs/linedrawings/hi.mjs create mode 100644 sites/shared/components/designs/linedrawings/holmes.mjs diff --git a/sites/shared/components/designs/linedrawings/gozer.mjs b/sites/shared/components/designs/linedrawings/gozer.mjs new file mode 100644 index 00000000000..258b282fb91 --- /dev/null +++ b/sites/shared/components/designs/linedrawings/gozer.mjs @@ -0,0 +1,178 @@ +import { LineDrawingWrapper, thin, dashed } from './shared.mjs' + +const strokeScale = 0.5 + +export const Gozer = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + + ) +} + +/* + * React component for the front + */ +export const GozerFront = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * React component for the back + */ +export const GozerBack = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * SVG elements for the front + */ +export const Front = ({ stroke }) => ( + <> + + + +) + +/* + * SVG elements for the back + */ +const Back = ({ stroke }) => ( + <> + + + +) diff --git a/sites/shared/components/designs/linedrawings/hi.mjs b/sites/shared/components/designs/linedrawings/hi.mjs new file mode 100644 index 00000000000..4ca5b917bc7 --- /dev/null +++ b/sites/shared/components/designs/linedrawings/hi.mjs @@ -0,0 +1,119 @@ +import { LineDrawingWrapper } from './shared.mjs' + +const strokeScale = 0.5 + +export const Hi = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * React component for the front + */ +export const HiFront = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * SVG elements for the front + */ +export const Front = ({ stroke }) => ( + <> + + + +) diff --git a/sites/shared/components/designs/linedrawings/holmes.mjs b/sites/shared/components/designs/linedrawings/holmes.mjs new file mode 100644 index 00000000000..1d89a33c35c --- /dev/null +++ b/sites/shared/components/designs/linedrawings/holmes.mjs @@ -0,0 +1,156 @@ +import { LineDrawingWrapper, thin, dashed } from './shared.mjs' + +const strokeScale = 0.6 + +export const Holmes = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * React component for the front + */ +export const HolmesFront = ({ + className = 'w-64', // CSS classes to apply + stroke = 1, // Stroke width to use +}) => { + // Normalize stroke across designs + stroke = stroke * strokeScale + + return ( + + + + ) +} + +/* + * SVG elements for the front + */ +export const Front = ({ stroke }) => ( + <> + + + + +) diff --git a/sites/shared/components/designs/linedrawings/index.mjs b/sites/shared/components/designs/linedrawings/index.mjs index 643fc6fe6ba..679a4e0c167 100644 --- a/sites/shared/components/designs/linedrawings/index.mjs +++ b/sites/shared/components/designs/linedrawings/index.mjs @@ -43,6 +43,9 @@ import { FlorentFront, FlorentBack, } from 'shared/components/designs/linedrawings/florent.mjs' +import { Gozer, GozerFront, GozerBack } from 'shared/components/designs/linedrawings/gozer.mjs' +import { Hi, HiFront } from 'shared/components/designs/linedrawings/hi.mjs' +import { Holmes, HolmesFront } from 'shared/components/designs/linedrawings/holmes.mjs' import { Lucy, LucyFront } from 'shared/components/designs/linedrawings/lucy.mjs' import { Lumina, LuminaFront, LuminaBack } from 'shared/components/designs/linedrawings/lumina.mjs' import { Lumira, LumiraFront, LumiraBack } from 'shared/components/designs/linedrawings/lumira.mjs' @@ -77,6 +80,9 @@ export const lineDrawingsFront = { diana: DianaFront, florence: FlorenceFront, florent: FlorentFront, + gozer: GozerFront, + hi: HiFront, + holmes: HolmesFront, lucy: LucyFront, lumina: LuminaFront, lumira: LumiraFront, @@ -102,6 +108,7 @@ export const lineDrawingsBack = { charlie: CharlieBack, cornelius: CorneliusBack, diana: DianaBack, + gozer: GozerBack, lumina: LuminaBack, lumira: LumiraBack, noble: NobleBack, @@ -130,6 +137,9 @@ export const lineDrawings = { diana: Diana, florence: Florence, florent: Florent, + gozer: Gozer, + hi: Hi, + holmes: Holmes, lucy: Lucy, lumina: Lumina, lumira: Lumira, From 4d1862f4ef7d347c255c935951e01ea968df28dc Mon Sep 17 00:00:00 2001 From: Benjamin Fan Date: Tue, 19 Mar 2024 19:39:27 -0700 Subject: [PATCH 349/795] fix(jaeger,paco,sandy): Typo --- designs/jaeger/src/front.mjs | 2 +- designs/paco/src/back.mjs | 2 +- designs/sandy/src/straight-waistband.mjs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/designs/jaeger/src/front.mjs b/designs/jaeger/src/front.mjs index 98b703757f2..d89f9cd3bec 100644 --- a/designs/jaeger/src/front.mjs +++ b/designs/jaeger/src/front.mjs @@ -431,7 +431,7 @@ function jaegerFront({ .line(points.frontPocketTopLeft) .line(points.frontPocketBottomLeft) .line(points.frontPocketBottomEnd) - .attr('class', 'farbic dashed') + .attr('class', 'fabric dashed') paths.chestPiece = new Path() .move(points.lapelBreakPoint) diff --git a/designs/paco/src/back.mjs b/designs/paco/src/back.mjs index 339ccef8292..60eaf7e4357 100644 --- a/designs/paco/src/back.mjs +++ b/designs/paco/src/back.mjs @@ -173,7 +173,7 @@ function pacoBack({ paths.pocket = new Path() .move(points.pocketLeft) .line(points.pocketRight) - .attr('class', 'farbic lashed') + .attr('class', 'fabric lashed') paths.pocketBag = new Path() .move(points.pocketBagWaistLeft) .line(points.pocketBagBottomLeft) diff --git a/designs/sandy/src/straight-waistband.mjs b/designs/sandy/src/straight-waistband.mjs index 6e652d90db5..9a1f541ae4f 100644 --- a/designs/sandy/src/straight-waistband.mjs +++ b/designs/sandy/src/straight-waistband.mjs @@ -77,7 +77,7 @@ export function draftStraightWaistband({ * Annotations */ // Cutlist - store.cutlist.setCut({ cut: 1, from: 'farbic' }) + store.cutlist.setCut({ cut: 1, from: 'fabric' }) // Title points.title = points.center.shiftFractionTowards(points.centerRight, 0.5) From f71d4af33cb38a01efb6ac2f50258e5580c76086 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 04:55:02 +0000 Subject: [PATCH 350/795] chore(deps): Bump @babel/eslint-parser from 7.23.10 to 7.24.1 Bumps [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) from 7.23.10 to 7.24.1. - [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.24.1/eslint/babel-eslint-parser) --- updated-dependencies: - dependency-name: "@babel/eslint-parser" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index accca58196f..ee1087b0513 100644 --- a/yarn.lock +++ b/yarn.lock @@ -635,9 +635,9 @@ semver "^6.3.1" "@babel/eslint-parser@^7.22.15": - version "7.23.10" - resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz" - integrity sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32" + integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" eslint-visitor-keys "^2.1.0" From 329b11e5de2cf4a6966281ecb59a0ead287dfa93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 04:55:57 +0000 Subject: [PATCH 351/795] chore(deps): Bump html-react-parser from 5.1.8 to 5.1.9 Bumps [html-react-parser](https://github.com/remarkablemark/html-react-parser) from 5.1.8 to 5.1.9. - [Release notes](https://github.com/remarkablemark/html-react-parser/releases) - [Changelog](https://github.com/remarkablemark/html-react-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/remarkablemark/html-react-parser/compare/v5.1.8...v5.1.9) --- updated-dependencies: - dependency-name: html-react-parser dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index accca58196f..d57beba121e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7018,14 +7018,14 @@ html-parse-stringify@^3.0.1: void-elements "3.1.0" html-react-parser@^5.0.7: - version "5.1.8" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.1.8.tgz#b8a294854845bce96627aa4f2ba738362c0ebcf8" - integrity sha512-oAXgUB4JYHFg4le3RQZtoge1TGMkwXSZPiWiexwdx3AuldgG+QEvbwMrscSViu90JNje3V4Zq5gCUSoTxa0W0A== + version "5.1.9" + resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.1.9.tgz#7a8eb3a0b243bddf68f1a77bba5e423933b64161" + integrity sha512-MP0MQDEGlzkJT0OwY//tKYrgIzBM1frYLxx9RF7ALdIjI+MCMumydcNovXDX4X/iDi1zfgaU28VxoNXZn7EPjQ== dependencies: domhandler "5.0.3" html-dom-parser "5.0.8" react-property "2.0.2" - style-to-js "1.1.10" + style-to-js "1.1.11" html-to-text@^9.0.5: version "9.0.5" @@ -13071,10 +13071,10 @@ stubs@^3.0.0: resolved "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== -style-to-js@1.1.10: - version "1.1.10" - resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.10.tgz" - integrity sha512-VC7MBJa+y0RZhpnLKDPmVRLRswsASLmixkiZ5R8xZpNT9VyjeRzwnXd2pBzAWdgSGv/pCNNH01gPCCUsB9exYg== +style-to-js@1.1.11: + version "1.1.11" + resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.11.tgz#7ba66214cab556fdded4786e80de0baccfa0e942" + integrity sha512-yHpYzXzEkx7iDjGEmE8Eyl4K/hWIm36FXPdRsl2NHEpbigLeawLVsv6tcYp+2xNhfpCrut4w08dYqeCxWMdRxw== dependencies: style-to-object "1.0.5" From 07ce491ac178f6817c6fd3033a9ebb782a837d78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 04:57:10 +0000 Subject: [PATCH 352/795] chore(deps): Bump @babel/preset-react from 7.23.3 to 7.24.1 Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.23.3 to 7.24.1. - [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.24.1/packages/babel-preset-react) --- updated-dependencies: - dependency-name: "@babel/preset-react" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/yarn.lock b/yarn.lock index accca58196f..8c296790e46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -709,10 +709,10 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" -"@babel/helper-plugin-utils@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" + integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== "@babel/helper-simple-access@^7.22.5": version "7.22.5" @@ -738,7 +738,7 @@ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== -"@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": +"@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== @@ -780,12 +780,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-react-display-name@^7.23.3": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz" - integrity sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw== +"@babel/plugin-transform-react-display-name@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" + integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-transform-react-jsx-development@^7.22.5": version "7.22.5" @@ -794,7 +794,7 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.22.5" -"@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5": +"@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.23.4": version "7.23.4" resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz" integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA== @@ -805,25 +805,25 @@ "@babel/plugin-syntax-jsx" "^7.23.3" "@babel/types" "^7.23.4" -"@babel/plugin-transform-react-pure-annotations@^7.23.3": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz" - integrity sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ== +"@babel/plugin-transform-react-pure-annotations@^7.24.1": + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470" + integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/preset-react@^7.22.15": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz" - integrity sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95" + integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" - "@babel/helper-validator-option" "^7.22.15" - "@babel/plugin-transform-react-display-name" "^7.23.3" - "@babel/plugin-transform-react-jsx" "^7.22.15" + "@babel/helper-plugin-utils" "^7.24.0" + "@babel/helper-validator-option" "^7.23.5" + "@babel/plugin-transform-react-display-name" "^7.24.1" + "@babel/plugin-transform-react-jsx" "^7.23.4" "@babel/plugin-transform-react-jsx-development" "^7.22.5" - "@babel/plugin-transform-react-pure-annotations" "^7.23.3" + "@babel/plugin-transform-react-pure-annotations" "^7.24.1" "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.18.9", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.9", "@babel/runtime@^7.7.6": version "7.23.9" From 10f3d74d3a529fa105a6ddb0188dc1197c9f32ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 05:01:43 +0000 Subject: [PATCH 353/795] chore(deps): Bump @next/bundle-analyzer from 14.1.3 to 14.1.4 Bumps [@next/bundle-analyzer](https://github.com/vercel/next.js/tree/HEAD/packages/next-bundle-analyzer) from 14.1.3 to 14.1.4. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.1.4/packages/next-bundle-analyzer) --- updated-dependencies: - dependency-name: "@next/bundle-analyzer" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 3f30652c96b..d99d1d8a523 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@next/bundle-analyzer": "14.1.3", + "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "daisyui": "4.7.3", diff --git a/yarn.lock b/yarn.lock index accca58196f..b30374bda10 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1472,10 +1472,10 @@ resolved "https://registry.npmjs.org/@mdx-js/util/-/util-2.0.0-next.1.tgz" integrity sha512-F36kWTFdFXrbNIsM77dhVwYZsZonUIKHkYyYgnuw1NWskBfEn1ET5B5Z5mm58ckKNf7SimchnxR9sKCCtH38WA== -"@next/bundle-analyzer@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.1.3.tgz#2aa561c16838b72af792029e0c7a9d52f794f9c5" - integrity sha512-QjMT5RGqvaObprL4Oim4SsjWUW6DxxfG+Fhq9arGw4CHbPBsjQkNWgUtW3WWW/Bjh4VhT+YBsJfxTyBVPHIlVw== +"@next/bundle-analyzer@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.1.4.tgz#d10e4599f76ea8c00289341763d6208a729e80a3" + integrity sha512-IpF/18HcAOcfHRr24tqPOUpMmVKIqvkCxIubMeRYWCXs3jm7niPGrt8Mu74yMDzfGlUwgQA6Xd6BUc5+jQxcEg== dependencies: webpack-bundle-analyzer "4.10.1" From f43603236c5598e7f321f13a3dbb47b39aa6819f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 05:02:31 +0000 Subject: [PATCH 354/795] chore(deps-dev): Bump postcss from 8.4.36 to 8.4.37 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.36 to 8.4.37. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.36...8.4.37) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- yarn.lock | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 3f30652c96b..faf0049d928 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -61,7 +61,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.36", + "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/lab/package.json b/sites/lab/package.json index 0f28f449229..c9f76b49bb3 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -62,7 +62,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.36", + "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/org/package.json b/sites/org/package.json index 25f662c3bd7..1672f97c284 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -69,7 +69,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.36", + "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/yarn.lock b/yarn.lock index accca58196f..88b81b72bf1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11357,14 +11357,14 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@8.4.36, postcss@^8.4.23: - version "8.4.36" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.36.tgz#dba513c3c3733c44e0288a712894f8910bbaabc6" - integrity sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw== +postcss@8.4.37, postcss@^8.4.23: + version "8.4.37" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.37.tgz#4505f992cd0c20e03d25f13b31901640b2db731a" + integrity sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" - source-map-js "^1.1.0" + source-map-js "^1.2.0" postcss@^5.0.0, postcss@^5.0.21: version "5.2.18" @@ -12700,10 +12700,10 @@ sort-keys@^2.0.0: dependencies: is-plain-obj "^1.0.0" -source-map-js@^1.0.2, source-map-js@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.1.0.tgz#9e7d5cb46f0689fb6691b30f226937558d0fa94b" - integrity sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw== +source-map-js@^1.0.2, source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== source-map@^0.5.6: version "0.5.7" From bbc4e963914ba554923b6dd89460916342f65c20 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 05:03:25 +0000 Subject: [PATCH 355/795] chore(deps): Bump @babel/plugin-syntax-import-assertions Bumps [@babel/plugin-syntax-import-assertions](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-syntax-import-assertions) from 7.23.3 to 7.24.1. - [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.24.1/packages/babel-plugin-syntax-import-assertions) --- updated-dependencies: - dependency-name: "@babel/plugin-syntax-import-assertions" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index accca58196f..ee110e4de76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -709,10 +709,10 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" -"@babel/helper-plugin-utils@^7.22.5": - version "7.22.5" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz" - integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" + integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== "@babel/helper-simple-access@^7.22.5": version "7.22.5" @@ -767,11 +767,11 @@ integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== "@babel/plugin-syntax-import-assertions@^7.22.5": - version "7.23.3" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz" - integrity sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw== + version "7.24.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971" + integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ== dependencies: - "@babel/helper-plugin-utils" "^7.22.5" + "@babel/helper-plugin-utils" "^7.24.0" "@babel/plugin-syntax-jsx@^7.23.3": version "7.23.3" From 88f0eed4bf173ad1c162872d68dcebbbcdfc2306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 05:04:09 +0000 Subject: [PATCH 356/795] chore(deps): Bump eslint-config-next from 14.1.3 to 14.1.4 Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.1.3 to 14.1.4. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.1.4/packages/eslint-config-next) --- updated-dependencies: - dependency-name: eslint-config-next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index accca58196f..c789d0a0606 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1484,10 +1484,10 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.3.tgz#73007b64d487bbb95ed83145195f734fc1182d10" integrity sha512-VhgXTvrgeBRxNPjyfBsDIMvgsKDxjlpw4IAUsHCX8Gjl1vtHUYRT3+xfQ/wwvLPDd/6kqfLqk9Pt4+7gysuCKQ== -"@next/eslint-plugin-next@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.1.3.tgz#31ffb36dbd5d04537aff83eb69ec23007d081608" - integrity sha512-VCnZI2cy77Yaj3L7Uhs3+44ikMM1VD/fBMwvTBb3hIaTIuqa+DmG4dhUDq+MASu3yx97KhgsVJbsas0XuiKyww== +"@next/eslint-plugin-next@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.1.4.tgz#d7372b5ffede0e466af8af2ff534386418827fc8" + integrity sha512-n4zYNLSyCo0Ln5b7qxqQeQ34OZKXwgbdcx6kmkQbywr+0k6M3Vinft0T72R6CDAcDrne2IAgSud4uWCzFgc5HA== dependencies: glob "10.3.10" @@ -5424,11 +5424,11 @@ eslint-compat-utils@^0.5.0: semver "^7.5.4" eslint-config-next@^14.0.1: - version "14.1.3" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.1.3.tgz#f5c75c088c5df35da2a02129cbf5dec9defb3f13" - integrity sha512-sUCpWlGuHpEhI0pIT0UtdSLJk5Z8E2DYinPTwsBiWaSYQomchdl0i60pjynY48+oXvtyWMQ7oE+G3m49yrfacg== + version "14.1.4" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.1.4.tgz#22f2ba4c0993e991249d863656a64c204bae542c" + integrity sha512-cihIahbhYAWwXJwZkAaRPpUi5t9aOi/HdfWXOjZeUOqNWXHD8X22kd1KG58Dc3MVaRx3HoR/oMGk2ltcrqDn8g== dependencies: - "@next/eslint-plugin-next" "14.1.3" + "@next/eslint-plugin-next" "14.1.4" "@rushstack/eslint-patch" "^1.3.3" "@typescript-eslint/parser" "^5.4.2 || ^6.0.0" eslint-import-resolver-node "^0.3.6" From 08df5b0196e674fd7f9878caf4dc90e99f990f49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 05:04:57 +0000 Subject: [PATCH 357/795] chore(deps): Bump @next/mdx from 14.1.3 to 14.1.4 Bumps [@next/mdx](https://github.com/vercel/next.js/tree/HEAD/packages/next-mdx) from 14.1.3 to 14.1.4. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.1.4/packages/next-mdx) --- updated-dependencies: - dependency-name: "@next/mdx" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 494849575ba..3ea149a0c2d 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -16,7 +16,7 @@ "scripts": {}, "peerDependencies": {}, "dependencies": { - "@next/mdx": "14.1.3", + "@next/mdx": "14.1.4", "@resvg/resvg-js": "2.6.0", "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", diff --git a/yarn.lock b/yarn.lock index accca58196f..c5a6cb8cd96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1491,10 +1491,10 @@ dependencies: glob "10.3.10" -"@next/mdx@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.1.3.tgz#4a593e98c4828881e194d336730fc69e589a449a" - integrity sha512-KrfpZ1Iz9SCIW8Qu3uWCIkVUGgIjiPRlxKksr8IgKKlMUEV9D88JNkS1MUfgSdbVgKLED3mPnLoO0gzoQz1yDw== +"@next/mdx@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.1.4.tgz#e0f0f776ca524904e8090262daf80aa1f1be388b" + integrity sha512-FyuDXPTEmuIqtj/AxaKLvwiEZb6hDviq6Ywn8ZlsZOlvYSWpcZGuQrYrDulrdIm/I48hHXANor7EiJzTbVig8Q== dependencies: source-map "^0.7.0" From 3c0547fdaff7bc762958aa497fd88a86c44f06f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 19:04:59 +0000 Subject: [PATCH 358/795] chore(deps): Bump next from 14.1.3 to 14.1.4 Bumps [next](https://github.com/vercel/next.js) from 14.1.3 to 14.1.4. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.1.3...v14.1.4) --- updated-dependencies: - dependency-name: next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 108 ++++++++++++++++++++--------------------- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index baa2adf60f0..3e9d233e4a9 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -39,7 +39,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.1.3", + "next": "14.1.4", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-dom": "18.2.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index c9f76b49bb3..70b0a7f711a 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -40,7 +40,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.1.3", + "next": "14.1.4", "next-i18next": "15.2.0", "ora": "8.0.1", "react": "18.2.0", diff --git a/sites/org/package.json b/sites/org/package.json index 1672f97c284..a9cee377b41 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -46,7 +46,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "luxon": "3.4.4", - "next": "14.1.3", + "next": "14.1.4", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 54bf13a3dbf..f072b9a050f 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -63,7 +63,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "mustache": "4.2.0", - "next": "14.1.3", + "next": "14.1.4", "next-i18next": "15.2.0", "pdfkit": "0.14.0", "postcss-for": "2.1.1", diff --git a/yarn.lock b/yarn.lock index 3706d9ceed4..db835b17458 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1479,10 +1479,10 @@ dependencies: webpack-bundle-analyzer "4.10.1" -"@next/env@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.3.tgz#73007b64d487bbb95ed83145195f734fc1182d10" - integrity sha512-VhgXTvrgeBRxNPjyfBsDIMvgsKDxjlpw4IAUsHCX8Gjl1vtHUYRT3+xfQ/wwvLPDd/6kqfLqk9Pt4+7gysuCKQ== +"@next/env@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.4.tgz#432e80651733fbd67230bf262aee28be65252674" + integrity sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ== "@next/eslint-plugin-next@14.1.4": version "14.1.4" @@ -1498,50 +1498,50 @@ dependencies: source-map "^0.7.0" -"@next/swc-darwin-arm64@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.3.tgz#b4c218fdb49275972d91e9a9a0ccadba243b6739" - integrity sha512-LALu0yIBPRiG9ANrD5ncB3pjpO0Gli9ZLhxdOu6ZUNf3x1r3ea1rd9Q+4xxUkGrUXLqKVK9/lDkpYIJaCJ6AHQ== +"@next/swc-darwin-arm64@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.4.tgz#a3bca0dc4393ac4cf3169bbf24df63441de66bb7" + integrity sha512-ubmUkbmW65nIAOmoxT1IROZdmmJMmdYvXIe8211send9ZYJu+SqxSnJM4TrPj9wmL6g9Atvj0S/2cFmMSS99jg== -"@next/swc-darwin-x64@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.3.tgz#aa0d4357179d68daaa6f400708b76666708ffec9" - integrity sha512-E/9WQeXxkqw2dfcn5UcjApFgUq73jqNKaE5bysDm58hEUdUGedVrnRhblhJM7HbCZNhtVl0j+6TXsK0PuzXTCg== +"@next/swc-darwin-x64@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.4.tgz#ba3683d4e2d30099f3f2864dd7349a4d9f440140" + integrity sha512-b0Xo1ELj3u7IkZWAKcJPJEhBop117U78l70nfoQGo4xUSvv0PJSTaV4U9xQBLvZlnjsYkc8RwQN1HoH/oQmLlQ== -"@next/swc-linux-arm64-gnu@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.3.tgz#1ba8df39c04368ede185f268c3a817a8f4290e4c" - integrity sha512-USArX9B+3rZSXYLFvgy0NVWQgqh6LHWDmMt38O4lmiJNQcwazeI6xRvSsliDLKt+78KChVacNiwvOMbl6g6BBw== +"@next/swc-linux-arm64-gnu@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.4.tgz#3519969293f16379954b7e196deb0c1eecbb2f8b" + integrity sha512-457G0hcLrdYA/u1O2XkRMsDKId5VKe3uKPvrKVOyuARa6nXrdhJOOYU9hkKKyQTMru1B8qEP78IAhf/1XnVqKA== -"@next/swc-linux-arm64-musl@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.3.tgz#2fa8fe435862eb186aca6d6068c8aef2126ab11e" - integrity sha512-esk1RkRBLSIEp1qaQXv1+s6ZdYzuVCnDAZySpa62iFTMGTisCyNQmqyCTL9P+cLJ4N9FKCI3ojtSfsyPHJDQNw== +"@next/swc-linux-arm64-musl@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.4.tgz#4bb3196bd402b3f84cf5373ff1021f547264d62f" + integrity sha512-l/kMG+z6MB+fKA9KdtyprkTQ1ihlJcBh66cf0HvqGP+rXBbOXX0dpJatjZbHeunvEHoBBS69GYQG5ry78JMy3g== -"@next/swc-linux-x64-gnu@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.3.tgz#57a687b44337af219e07a79ecc8c63a3c1b2d020" - integrity sha512-8uOgRlYEYiKo0L8YGeS+3TudHVDWDjPVDUcST+z+dUzgBbTEwSSIaSgF/vkcC1T/iwl4QX9iuUyUdQEl0Kxalg== +"@next/swc-linux-x64-gnu@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.4.tgz#1b3372c98c83dcdab946cdb4ee06e068b8139ba3" + integrity sha512-BapIFZ3ZRnvQ1uWbmqEGJuPT9cgLwvKtxhK/L2t4QYO7l+/DxXuIGjvp1x8rvfa/x1FFSsipERZK70pewbtJtw== -"@next/swc-linux-x64-musl@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.3.tgz#8c057f8f7fb9679915df25eda6ab0ea1b7af85ff" - integrity sha512-DX2zqz05ziElLoxskgHasaJBREC5Y9TJcbR2LYqu4r7naff25B4iXkfXWfcp69uD75/0URmmoSgT8JclJtrBoQ== +"@next/swc-linux-x64-musl@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.4.tgz#8459088bdc872648ff78f121db596f2533df5808" + integrity sha512-mqVxTwk4XuBl49qn2A5UmzFImoL1iLm0KQQwtdRJRKl21ylQwwGCxJtIYo2rbfkZHoSKlh/YgztY0qH3wG1xIg== -"@next/swc-win32-arm64-msvc@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.3.tgz#5367333e701f722009592013502aa8e735bee782" - integrity sha512-HjssFsCdsD4GHstXSQxsi2l70F/5FsRTRQp8xNgmQs15SxUfUJRvSI9qKny/jLkY3gLgiCR3+6A7wzzK0DBlfA== +"@next/swc-win32-arm64-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.4.tgz#84280a08c00cc3be24ddd3a12f4617b108e6dea6" + integrity sha512-xzxF4ErcumXjO2Pvg/wVGrtr9QQJLk3IyQX1ddAC/fi6/5jZCZ9xpuL9Tzc4KPWMFq8GGWFVDMshZOdHGdkvag== -"@next/swc-win32-ia32-msvc@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.3.tgz#dc455021fee85e037f6fb4134e85895dce5a0495" - integrity sha512-DRuxD5axfDM1/Ue4VahwSxl1O5rn61hX8/sF0HY8y0iCbpqdxw3rB3QasdHn/LJ6Wb2y5DoWzXcz3L1Cr+Thrw== +"@next/swc-win32-ia32-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.4.tgz#23ff7f4bd0a27177428669ef6fa5c3923c738031" + integrity sha512-WZiz8OdbkpRw6/IU/lredZWKKZopUMhcI2F+XiMAcPja0uZYdMTZQRoQ0WZcvinn9xZAidimE7tN9W5v9Yyfyw== -"@next/swc-win32-x64-msvc@14.1.3": - version "14.1.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.3.tgz#4a8d4384901f0c48ece9dbb60cb9aea107d39e7c" - integrity sha512-uC2DaDoWH7h1P/aJ4Fok3Xiw6P0Lo4ez7NbowW2VGNXw/Xv6tOuLUcxhBYZxsSUJtpeknCi8/fvnSpyCFp4Rcg== +"@next/swc-win32-x64-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.4.tgz#bccf5beccfde66d6c66fa4e2509118c796385eda" + integrity sha512-4Rto21sPfw555sZ/XNLqfxDUNeLhNYGO2dlPqsnuCg8N8a2a9u1ltqBOPQ4vj1Gf7eJC0W2hHG2eYUHuiXgY2w== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -10155,12 +10155,12 @@ next-i18next@15.2.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -next@14.1.3: - version "14.1.3" - resolved "https://registry.yarnpkg.com/next/-/next-14.1.3.tgz#465bb21a1a6e703e776ca53ea71d05642867fdb5" - integrity sha512-oexgMV2MapI0UIWiXKkixF8J8ORxpy64OuJ/J9oVUmIthXOUCcuVEZX+dtpgq7wIfIqtBwQsKEDXejcjTsan9g== +next@14.1.4: + version "14.1.4" + resolved "https://registry.yarnpkg.com/next/-/next-14.1.4.tgz#203310f7310578563fd5c961f0db4729ce7a502d" + integrity sha512-1WTaXeSrUwlz/XcnhGTY7+8eiaFvdet5z9u3V2jb+Ek1vFo0VhHKSAIJvDWfQpttWjnyw14kBeq28TPq7bTeEQ== dependencies: - "@next/env" "14.1.3" + "@next/env" "14.1.4" "@swc/helpers" "0.5.2" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -10168,15 +10168,15 @@ next@14.1.3: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.1.3" - "@next/swc-darwin-x64" "14.1.3" - "@next/swc-linux-arm64-gnu" "14.1.3" - "@next/swc-linux-arm64-musl" "14.1.3" - "@next/swc-linux-x64-gnu" "14.1.3" - "@next/swc-linux-x64-musl" "14.1.3" - "@next/swc-win32-arm64-msvc" "14.1.3" - "@next/swc-win32-ia32-msvc" "14.1.3" - "@next/swc-win32-x64-msvc" "14.1.3" + "@next/swc-darwin-arm64" "14.1.4" + "@next/swc-darwin-x64" "14.1.4" + "@next/swc-linux-arm64-gnu" "14.1.4" + "@next/swc-linux-arm64-musl" "14.1.4" + "@next/swc-linux-x64-gnu" "14.1.4" + "@next/swc-linux-x64-musl" "14.1.4" + "@next/swc-win32-arm64-msvc" "14.1.4" + "@next/swc-win32-ia32-msvc" "14.1.4" + "@next/swc-win32-x64-msvc" "14.1.4" nise@^5.1.5: version "5.1.9" From 13a45284788f7fbcc18599d938b5adc98e4951d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:42:38 +0000 Subject: [PATCH 359/795] chore(deps): Bump autoprefixer from 10.4.18 to 10.4.19 Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.18 to 10.4.19. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.4.18...10.4.19) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index baa2adf60f0..bc3b01cfa42 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -59,7 +59,7 @@ "strip-markdown": "6.0.0" }, "devDependencies": { - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "js-yaml": "4.1.0", "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index c9f76b49bb3..69497f34440 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -60,7 +60,7 @@ "remark-mdx-frontmatter": "4.0.0" }, "devDependencies": { - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "js-yaml": "4.1.0", "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", diff --git a/sites/org/package.json b/sites/org/package.json index 1672f97c284..7f4242ca69e 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -67,7 +67,7 @@ "yaml-loader": "0.8.1" }, "devDependencies": { - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "js-yaml": "4.1.0", "postcss": "8.4.37", "remark-extract-frontmatter": "3.2.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 54bf13a3dbf..079071d1f6c 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -45,7 +45,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "0.5.10", - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 3706d9ceed4..88197c4c85a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3372,13 +3372,13 @@ attr-accept@^2.2.2: resolved "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.2.tgz" integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== -autoprefixer@10.4.18: - version "10.4.18" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.18.tgz#fcb171a3b017be7cb5d8b7a825f5aacbf2045163" - integrity sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g== +autoprefixer@10.4.19: + version "10.4.19" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f" + integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew== dependencies: browserslist "^4.23.0" - caniuse-lite "^1.0.30001591" + caniuse-lite "^1.0.30001599" fraction.js "^4.3.7" normalize-range "^0.1.2" picocolors "^1.0.0" @@ -3722,10 +3722,10 @@ camelcase@^6.0.0: resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001591: - version "1.0.30001593" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz#7cda1d9e5b0cad6ebab4133b1f239d4ea44fe659" - integrity sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ== +caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599: + version "1.0.30001599" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz#571cf4f3f1506df9bf41fcbb6d10d5d017817bce" + integrity sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA== ccount@^2.0.0: version "2.0.1" From 4a8bf14ade8811ce7b801e0caaecb55eda5cb320 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:43:38 +0000 Subject: [PATCH 360/795] chore(deps): Bump express from 4.18.3 to 4.19.1 Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.1. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.3...4.19.1) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 648429cc644..d5402230213 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -33,7 +33,7 @@ "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", - "express": "4.18.3", + "express": "4.19.1", "js-yaml": "4.1.0", "lodash.get": "4.4.2", "mustache": "4.2.0", diff --git a/yarn.lock b/yarn.lock index 3706d9ceed4..e3e4eae7c9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4271,10 +4271,10 @@ cookie-signature@1.0.6: resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz" integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== +cookie@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== cookiejar@^2.1.4: version "2.1.4" @@ -5892,17 +5892,17 @@ exponential-backoff@^3.1.1: resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -express@4.18.3: - version "4.18.3" - resolved "https://registry.npmjs.org/express/-/express-4.18.3.tgz" - integrity sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw== +express@4.19.1: + version "4.19.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.1.tgz#4700635795e911600a45596138cf5b0320e78256" + integrity sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w== dependencies: accepts "~1.3.8" array-flatten "1.1.1" body-parser "1.20.2" content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.5.0" + cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" From 202b341e9560ce58b1ee4e396690c85fad9f5585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 04:44:31 +0000 Subject: [PATCH 361/795] chore(deps-dev): Bump postcss from 8.4.37 to 8.4.38 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.37 to 8.4.38. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.37...8.4.38) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index baa2adf60f0..4cb0a40b706 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -61,7 +61,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.37", + "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/lab/package.json b/sites/lab/package.json index c9f76b49bb3..5759eaf166b 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -62,7 +62,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.37", + "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/sites/org/package.json b/sites/org/package.json index 1672f97c284..2ceda7cf5c7 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -69,7 +69,7 @@ "devDependencies": { "autoprefixer": "10.4.18", "js-yaml": "4.1.0", - "postcss": "8.4.37", + "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", "tailwindcss": "3.4.1", diff --git a/yarn.lock b/yarn.lock index 3706d9ceed4..40218ca4a63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11357,10 +11357,10 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" -postcss@8.4.37, postcss@^8.4.23: - version "8.4.37" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.37.tgz#4505f992cd0c20e03d25f13b31901640b2db731a" - integrity sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ== +postcss@8.4.38, postcss@^8.4.23: + version "8.4.38" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== dependencies: nanoid "^3.3.7" picocolors "^1.0.0" From 2090ccb34fb728c983323b8f1fb793452d662db2 Mon Sep 17 00:00:00 2001 From: Natalia Sayang Date: Thu, 21 Mar 2024 21:11:17 +0000 Subject: [PATCH 362/795] Add entries to FAQ --- .../docs/about/faq/measurements-issues/en.md | 55 +++++++++++++++++++ .../org/docs/about/faq/seam-allowance/en.md | 7 +++ .../about/faq/standard-measurements/en.md | 9 +++ 3 files changed, 71 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/en.md create mode 100644 markdown/org/docs/about/faq/seam-allowance/en.md create mode 100644 markdown/org/docs/about/faq/standard-measurements/en.md diff --git a/markdown/org/docs/about/faq/measurements-issues/en.md b/markdown/org/docs/about/faq/measurements-issues/en.md new file mode 100644 index 00000000000..b3a2edb9efd --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/en.md @@ -0,0 +1,55 @@ +--- +title: I'm having trouble with measurements. What should I check? +--- + +Each of our [measurements](https://freesewing.org/docs/measurements) is documented with a description and two visuals. Referencing these resolves most issues. + +We are working on QA functionality that detects possible issues and brings them to the user's attention in a way that *makes sense*. + +In the meantime, here are some places to start looking if you're having trouble with your measurements. + +### General notes + +Trouser problems are almost always caused by vertical measurements that determine the room we have to construct the pants top. For example, waist to upper leg *must* be longer than waist to seat; otherwise there is negative room to construct the pants. + +The waist measurement is an important vertical plane of reference. It doesn't matter that much where you take it, as long as you consistently measure all vertical measurements (waist to seat, waist to hips, HPS to waist, waist to floor, ...) from that same horizontal plane. + +### Trouble measurements + +There are a few measurements we've noticed tend to cause problems. + +#### Waist to armpit + +The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +#### High bust + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +#### Shoulder slope + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) \ No newline at end of file diff --git a/markdown/org/docs/about/faq/seam-allowance/en.md b/markdown/org/docs/about/faq/seam-allowance/en.md new file mode 100644 index 00000000000..4b1248776f3 --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/en.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) \ No newline at end of file diff --git a/markdown/org/docs/about/faq/standard-measurements/en.md b/markdown/org/docs/about/faq/standard-measurements/en.md new file mode 100644 index 00000000000..a6e13774c3e --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/en.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). \ No newline at end of file From 58dd09710fe1b9e949b21c346157a5d71514da69 Mon Sep 17 00:00:00 2001 From: Natalia Sayang <48160791+nataliasayang@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:51:36 -0400 Subject: [PATCH 363/795] Add measurement photos --- .../about/faq/measurements-issues/highbust.jpg | Bin 0 -> 73074 bytes .../about/faq/measurements-issues/highbust2.jpg | Bin 0 -> 59178 bytes .../docs/about/faq/measurements-issues/hps.jpg | Bin 0 -> 77908 bytes .../docs/about/faq/measurements-issues/hps2.jpg | Bin 0 -> 48214 bytes .../faq/measurements-issues/waisttoarmpit.jpg | Bin 0 -> 78443 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 markdown/org/docs/about/faq/measurements-issues/highbust.jpg create mode 100644 markdown/org/docs/about/faq/measurements-issues/highbust2.jpg create mode 100644 markdown/org/docs/about/faq/measurements-issues/hps.jpg create mode 100644 markdown/org/docs/about/faq/measurements-issues/hps2.jpg create mode 100644 markdown/org/docs/about/faq/measurements-issues/waisttoarmpit.jpg diff --git a/markdown/org/docs/about/faq/measurements-issues/highbust.jpg b/markdown/org/docs/about/faq/measurements-issues/highbust.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6974e1246042155f3e34810cce427576ef89ff97 GIT binary patch literal 73074 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 z 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

GfwpRvLFq1)$0=k=XcjH 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 z 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 Ky%@FU|4jgSYZP$+ literal 0 HcmV?d00001 diff --git a/markdown/org/docs/about/faq/measurements-issues/hps.jpg b/markdown/org/docs/about/faq/measurements-issues/hps.jpg new file mode 100644 index 0000000000000000000000000000000000000000..03908de01adfe620aec4a479a9d3aa6dc3575557 GIT binary patch literal 77908 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

m*ldEnUUl_K^Ge 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 Cy3lX{ literal 0 HcmV?d00001 diff --git a/markdown/org/docs/about/faq/measurements-issues/waisttoarmpit.jpg b/markdown/org/docs/about/faq/measurements-issues/waisttoarmpit.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8dbe21eec54440af5cc9920dd74bc2b1318f0648 GIT binary patch literal 78443 zcmex=o+2Ft9TSF)}kSGBAL# z6eBB`PGVqSkcP6e7#J8dplX;I7#Iv0nHYE(7#NBe7#NHgnHWSE7#JED7#K3!S-^Uy zFhIaLCI$v!1_lNg?e6ItpkSnDXrO0o#=u}?U}R!tU~FY%s90UaI3sxE0D0hk^)#sNw%$0gl~X?bAC~(f{C7qo`J4wMP`|ilAVH0QA(Os zkc%7Cgrbx*TP3Jd%gf94%8m8%i_-NCEiEne4UF`SjC6}q(sYX}^GXscbn}XpVJ5hw z7AF^F7L;V>=P7_pOiaozEwNQnf*MFRfC6Gy0Df!8nDOO;nfuV_!v1w|W zu2Gs{qOOUdg`sYesfCfQg^{62nz^A_vXQ9;%pA|W;*!L?~q-$wzX{KvzkYt`@o|K%JWSXj^kdkcWmS2>cSYoS`nVXoN zs-IPmny#b(3NI_i08d*bBRvBsHy|gmBrU%v*H$S!GcP5-ycjATl9`(tT#^V1J416r zLj!Xo0~1pdOG{%zGpLHN)S}|d{5+6h;QR!3zLj%PYGO%#QAmD%j;#{NLU4A2$oZz0 zB&H;mB)TM)q}nPWa$g86_vsp#SQ!{V73Zg9rd1MB3d%>I-L zq=Ev^z{o_`z*yJF5E=?brb_yD3O4$nj0o|DJ~#s+`4B9JlxbnggIwG|OmL|IDnaZN zM!{$ZjE2By2#kinXb6mkz{m>$MAsxWFU3}=T*=<<|0AXip3ctk0YUz5o<6P&jEoEn zObc?7bBkFV7#MQ%N{WKqofIM>qZHU*FfcQSF)%XdF)$@27Z>;jyM=%{MA-4SYv7(2 z!)0BNS=iO!6y;4xEly@&U{qjWU~ot-C@NuKU`$|OU@$8$DFCr&FfcHPBxfY1FfcH# zVPIg;DT;`UVqjpr0TNGwu-|~#>0mY!$Rd%VkRWFU1}0G7P$3*5$<0e)U|@=Xuv0+n8W1}-r!*O4AhdtVlbRPA3=(HxV31*OXYge3We8wUU`S#p zWyoa6VJKnHWyoa6V^ClyW(Z<%XK=!yUka>0fT5Hji6Ms}lOdTwfx(3#pCOka5v-p9 z6bBG{5n)@LW^4o&W8`sSU|_xX|Nm!I1_t)Y3=DrK{Qv)Z;s5`C7cnp}-(g@lkcZHp zzkq?k;wu9K^8|#L%6tX}{uTy?ZATDdNz)k^wzo4dNZc$)EJ_611L|!vrKK@2d|J-H zz#GZHAbf#=fh!skZVU_zAbEzx*BKZ>Y8V)N&N48}oW;PPmd?PyAA`f+pdLRw-0-S_ zhTs3&49*P9OiUoe%*@Qf%*?{d!OF_Q!pgD$2tzE+Hl&AtWLy0y2b=nT3Uwg_V<)l~aV5n^%Nn@c$5lAP3`5#xKl_f(%T8 zjLd?J|Bo=pFfcH(GJ^6EIK&tj7+4sYm|5A_894qQVUT8o0hlZUBNHzuEB zVXM|G*pccO^x{`&>9Z`$^xD z?v6~hCEX&-Zq0p~=Cgbaqyw(H<-FRtF>Slml-!0$St;rErE5b3SXowNdFH6hi+FhD zifhpR3dMv;yDnW(y!8I(rr+nU#1toHMCAp`hK5dlwc^gwv!<)rs`4$fwZwM%EWRl! z=#pXlP8dCf}qvGcX? z8LM?ZuVQ*^?mY44cB$i~Gj>IKz2a-_*&oXGEGgRKWyCC>JLi^uD^01?&iK*P?r|+E zbMBQxB{Sx-&&pZ&=wP>^QEO4R!3&=oS6@o#tvXWBa!KQoiou@A&QfM2Mw4S+U(9=K z7U3N~yLhgk1EG~P1!#C%ZrN5p{|pqbZ#nbJE8SW?RoEbHwVT#)>yKvsfILxAx1~RGj#A-RQZ}qpaN~D~or$ zDBE~HpQ9sZme_QwXPd5cRfp-rRCRQ`UbymUdKIl`Cuc!M7)V+1$?0 zpTGC#;;c!hFJ)$LE)*^F=UcUE(`46KpH>G6-7~HZpDrmCn0v13%(aFCKezrV7oWdG z=DV4x%Ep`gizn0;oa#F+#OJcSWr>lXY5B|>I~Pe+L={X}zVi6ld3V~CZ@t>{J$-Ii zjr{ry3TS7w?nbUHIevvU^eD1$H~vel31pzvIWHDuYv#6xzF8Lso36OzG=9x%CuR zmSvc2oS2Q~k-wX!o!ON8aoyze>x`e)CjQ%g{{5bJuYSB*t(fl6%&|1(TH2|zCzXR| z#n^3{HOnF;=v}yY&}_Zz%IABRMP2+{J4;{pex3EJclPFQ`yw=apKZQ=esv`V&0*}8z%o?MN`hmJ3FwQ%2V*OA*6`_C%f@|X3Q$GZyV2ThRL@>5_< zjE}j`wr9WR?vNLanlO!(uW{j~J4fT@{9bb~H_lpg#udw5^~Y;-&p+F{;YeWoHOAM^ z&+V`NDEaQm!ATx2iyV&5iF7cnZ;w4BlK3*DU{NQR&7*%?Qzwajz4URdxoq|my|Z~6 z9pW5MM@nv;9BjF4k^aX3u2Xw`#d7VIs?Cdyw^CbXzvTJt^pYHNtG38s*B|fK@BFiU zm!^bkuKW7=mVdt=5q?p5JEziMVzMG@_e%&7P&KT^31POtauz}J)QMT z=<_G}==z`X3uRm#N}EdOeE+^*fPd+;p2!$Yp{-h{EmU62iRwt0v}MJbuj!`7U*~L^ z?vcIy)$<&!fM;9THcwuf<{8yJF_r6(>QXhWZ#$3fZ&TG>V{9gvbswB$jjK}U7S8Qy-ppEKYz&{I==Gk{_>A6_ucPl{BSVg zD@(|_m7j~!(&j5?^7Be5v^1~zHT&}OGbLxYcVCmsu)KHe+|i!iv|3+-s$Df__};Da z{cdf*E1;6LU3)8U^c|VxDuY;&ui-+9Qlfhf3!eI_{yE;=^=ExeVeYdRd)`lG{k?vo z^LLwIK~7;uuI2>WCz_5u3KL%ix^XBRbXxO%fAy1`{ifemKV7%1_*)6zJ-KdCvoPo5K+ni}ZpE+?gM`DpL_=+DB>zF+zIpTRl& z^h@vikKWtPpSA7I)49@eIs4XaH=dvO+Sp25Ten$fN-N(}wWag&CNr2k`zy)YwqoIw zStpr<7F^U?f9U(y{O9(WTGmGY8QiCypIveO=ASv!U;L|nTI#QrYVeS4ft9~ZQdpOk z#_|>^&8%`hyKT?C1zxMh*&cc{d0l0>=cOO7RFjgoR;w!(zP1t6)mxVBy86s%&%(PB zvQfSVr>@lP**U9+b(%(x@uS~W%Rk5OxRu2pP=3z(TfJWQm;GkT;x&uB_Nm$mG2B!t z%uEWk(OCKTcng=czJ7>bPMWs4;PtO_%41kfE4!o~o85ePv2u>Wg<79^SEprcxcKbi z%X7P8wmrCJnCQ*xvGPd4%ditg-%oxkegABKnat+<&Qt$0oPQ;rld?bgv(f!kKYIf= z=NdC#SW!|L(;RW?(ae3JHeIXc34CZ?z4`MCzszE%v+v*QZQK{Pap#WT3*H?3viEk& zv|ta{HTRaPJ)M@^6{|qz!H5L~C`xkDf zx486}_1AiH-CzG1W_;-jJ2=5;o|%+!1(ez^d9iFS6O}9GrWrkjtu4M8xkyJ@vn<_?6!3XyCS8vqM zsQqcV+BS02=N!A4$Nz19_IQ8tr*j<&o;fOBu33WI5zTW`R;^gxYNPa1pzvotq3w);iA>zi&M>2i%d@A8Qfi-4m3CCjc{PRySj93j`!_O#YCZAFgChaXXbB2EeN z;)~bT8~kOfzI^Wa`K2efJ^Rn#`}vdnmY;TvO{o)Qe4Hk)2rBB#3_aej)S=PTQSmb7 z*Y$37-*dZ7kDlA~+DLTH>`Ny%o<5vaY`HYHW!ZdFWzI_vzpc6AeB@TYl#aWPfJ9$#NILF0J=@|S*|JXvW)X>2OntTk(Rp3S+vY{ge)#|d41ow5RglP>kyxU1CV z-F5z1|HAo-_OvxS0?X%IfAJ^6|6Wbz-^ug%k$2%Vo0KRN5#$KHkr3{jd4i zruY?xv-Z5wbLSVDD-KVL z%-iGU|2h1{V4=mueYwutir-ayn15lP$Tm+cLGK4EC4E+IdVKRL<3oQre~yaa!+bwC zROA*{FH7aQ^2PR?U3U7cLl*@)*4=YjJ!j7j-#cjsu6Mj?4rE^#)Ge1W&2{DL!vYy` zu~zY)Z`DQkD<%8E`wf;??KfB)N&!_i#93A{2lh#gL{B+5=9mo7cLjr{l z`*SFMDfuqGUS@`0<|5tnStTWQQa3(dnZ}=JDz-$_YpbYxN|bXzNTNb|$HAw1wreJP z^lh=2B`+5n{`vgw?9bNIS$=Ley7HG#X8Eu3=Q-u`d6znd`CQ6~P5rRxgI`roXrPNf zufT`)n|1!B-xnW0yDROtuy)?Wl27TzyWeD0OQu}qof@Lb;+PsY;fe@Dzz> zxjc;KFlxSN@?QE!{`QqW{J~%9t=z5nH_uo9xA5m9>*CVMK`KUV5lg~!mg?(1FSxX` zrs9)AdyBxY-$!?!clItW6%NTbv3h#z-OOi87wYi4Ww9A_wXav^T+088_2Yh9MtT zb%N5=ui)vip>v~Bg{q~wob|1y&wO8AAlA3=tBpz5?Bw8s-`qn#GOdZa$?Ki6q(SJH z%7$2BUGc|u`!0XBds%t&$Ge!OugNq2Gx+`aTEDx=EB8!^<2>EX!G(<$@U%oJ(_Dc~xYB$mAIRsExDoCS0*P)6$T#;;nyhkW>ou?0lCjKGF2X z1u?IV9r&tlJN5VzyM32G?R#l?-z#30^W|~#e=|QY{IbiqvSiZnrBai1c5$8EvNiCq zW&YuQxp*ZxfsfZMOMZ!5KeNEMql#riWWnFa>eQP{yi51= zI3@;d6_K|xJGhlIqG;=%<(FT`_x{S+SeSmad0*xJFa3@2U-uk5{NS&AvD=1c_iwPa z9~IdXKkY)Gi%rFc_P(jTe@&-Nau&=AbmVv7!W6ZW$9SX_PM>_ud1;8|+7 z(BK=Dy86nZ3nf!(6(i@yiQYQNG~r49^L^99|5bi%d&~N|u}bI9@8|n3{8LT8`@x2> zR&&?XZ6V1~wMn~{^jRM-4O+0|bD+_wkB^V{EuLGedhQ;pqL?QSXIO+yTK|ly*kw=4 z@|r!?aL+rxaj#))pst&~_o>NCyYk4xE*6_eqn3#=O9P_S-kqoBUQR zJ7t>qeDSv#`|tj#dH>2T>-Z|s9KkecUAql7_t^WMh)w883-oICcwjZ-g;c3s^$W>q zFQN>LR;_YqNH#3~yu5<(!sdk`HPN?LzMPP>+kC~dYq`NIS$p^;wpMJv#l7aNaP!0i z@%lG!{%4p`yX)P}+^EWO@yM>f$4{K8+x&En(QIa&Wm4Ip263j&y{T{H_82sqX-1d{ zw4J!V`0a|LuVdb>l1=%v)~_>=huzQcR^eZB50f=VuSHM0msPyBEpN{98?`A_Up%HGkfA zFJI;a>l05dol1YYKT7qu-n757Gg)*| zkdZg^xb5?`HoNYo8}}xC3~G^E{9=-h)|x86iMvcn`J!K4)?d`MTQ|wt)0W}JZ$s0Q zyL{4)KPh{bZ}l>A$z`Uk#=lQaw7GJu-0XY!b)#+kyoSve&|e+8dDQIU5!?7hS0#do#ex$vi0YhT>af6B9FuDRp&)YG-oQg#U# z@ieWdO0v^3F_TP}y*%;DgwSibe|cS9-!02uvf)(bf=9P9rwRJWm`Xdk*jSauKb2p! z`O{nF6ZV<&{_?la|Igs^!&POKt*zG5(?$0!&l)ei`0UQl&ojSeJAe9^d?!6S{Bp!i z?UZTqeAAb|uq^GqSCDG6p~;<(b%D;-E?eW@(`GuhWvx%$wOKbWYIE#n=RIeZ9pAkB z*i=pqsdf3E&>+UOaV=fkcjqn+O)O=j6#3vCOy z85s6a(L&NY!uL$yTeFqgDcc0OG*u@v9re=>`WN}jmjCSi)dzk}nV)?2wEgnB(q95j zDyEh4x*^`x*IwD$W`FFeR}-J-CY<$eSGUqhqe=4m-j^&kOuMGG(O`)>1N%1=(~S6!~-vE|Paxl);s zEe$hw@2m2tJ^5iN-#z!UV=4$Pk@A0NIHm>sZ$A^FSTiuA_ zbDOM@^LySe_RsnI6Cb`-Q>-!b*?RAt>Q|pIt8sK5`&4cJ>j=9M7EHZ+|uvoj%@G zu{EG1rLR+b<1=6FOO=a0U-vBBIO&k*%c~r=Eg?6R+LxS66uqi(DWzm*oxJnnpS2=q zlXnH~O7E)WpAxsR(0##1Q*VWv8T;qe-d;cTh5m&7cGnobe|&cTn!Q=Rk7-P!j;G8H zzNqJx*E^5*i+pgM{Mx}O$-Zo0`c}_tiJ7|S-LqP`yx8|YFZ)KQPlyQYT>nS@_Qe{1-|5`;(rOy}_SM|} zb^O`f7tfWtluVVUZMS+9v#m+a#-}Ry>%?V?rdbL^{VJE-d@ASGrgQnGm#a1B8l`{P z=yal4kV{raRnP10TEz{aD#d+u|F%E+Dz3j~{dAR0Sw-*5`&I9sx7mE;8*7nVl>EuR zvC|KKi~PAI-tZ33>+`efL;k$_^}|YW>k;*Zn~L7W8X2v)`1mBRSZVU%#aR|oCsx1i zpZVf!^`0C5W-5jGhLv1>I{Rgh-^-VwQJyBLrhd~lxNMoL`p;Q;THmet=2u?b^E<7{ z@k%aGRbrfRN_{%$;cp>Aiwv&xy_W%4=9Yja8)OJ}b*{c?e~#@T!;&C-a87ow)m z+~@eJseI3ezq;vilT0;j&qPiA>~i9g6WhX#vraEL_d0H8|9Yvm#`CG0&0qd}{pRPQ zm6dFZSe*5ewzpOO>eE;xuJ~uyTK*M(J>Go!`}5I~{HnT5q9?ZNx=*-TcJP(^>}eO~ z7R`@jwidUITpRY~=j*pW^HwfCnpWcKG-o)kD71*w240|5tad za?|C{OLmz($o+gKdu_UpaFK39h&Q9BSiPlrzvG9i%TK>few463{Zq9Is0WAsd0Kuw_VJh0yx9E0#X^w_@(y3feYUu=JLc3zfyz~PQ)E9b z{&;ThpX;wqcA0yYKD{8TZu$55N&c_)Mzx7ojhq&xDtr=sFvp5(Gy9!xQwhJ^?Y5KW z3a!8MTl>7lKI`;7`*y|cJoC%q<)67vd(}6em*0HOX8me2=a(8F$ zukCWL`}wQvbW~uSCYi4J^txuRNl(GWWXID*&QqVwp1$gQ-?^t3KlXkt*!XmJpX~bD zxXQZzDK=Ry)1F$TZaS`WI7eOm>XL?nZ}ZRZ3|e#f+47xAi>|Oe+qPzv*|f+!X=65X zwsO9}pH}M4<@NmK{~5F^=3lSbv;XzK)c*`|>315r?7V)5YidjPe#)zkm=`Q?`^1?? zA)oCoKHWa~P29)V@2Z%W`8?lcx98hDdGEb8{=fb+Snal&Eb{kB-ptu%*2$e2IUS2t z^7(V-{J!`3WqRo4v_R_<w?D0KpH1ZUxOhlI=$y&(eRVg_SLd$S|Y=ZHR++o^lz)D$bevm%#Mcii)GowefJlDTqMb{}QWXN_NeAWG~^Lt~e~ zSC^w7UQc{@b))ZP-a7^YO^e#({~uv66kuRtWMN_i&(bk4Gctgtx)@jlg;<3Z*+i5C z42?vU4HQ(29aT-7*u|Vp|KDQZU}R)qWMyKJvda`uNWGbs$Wpji;%-aUo6FHr9-(h~ zk1M)eu)0;~oy_}p>5+*g6_0;Nul^}~Y1@SLEA*2e2RA>;(@)dV;ZCvi^L(CU78*5C+G_(ZT)iIr(eZ8ruELIV}A@~nq%}D zBxSExCT*^aJ9pM%H>axJhJzjpnu4U%H%=6D*4x0Y%(bekX7!?uXGzB*TTH79;v%Kb zyed+;r*uzlO4?%kotl47rW{tv_1Li@n(fukn=`J@(O4-nS@FmE$;+}d4lHN5kk8Dv zxuM_Bv#E)W_T_7Dub;bJTC^ulzW>RZ>l3#;*ejoT^zb8& zcT2N7D=i$?x!#V{m05U7QCq}JtbXgk!bhhpRnih3t`wSZ<*nzZ0Pm0+*EHPL9g7OS zk)oyLy-@1jCl21T2eOKmoU)TVni5>OqRwC-w8l9GQ|os#gBW8_r@Po-SYTy?)gvO zu3aqr_PRm*RE%)gx20JhW3FBi59WNkj%#hR>C^p^@7E`6jP86|vgq#QXvYWtUK@W6 zT5VkN@3vQ|>!ms0Em^1MhLs;J+J403^R(2WV@?uxLQ=YdyLcSaPa1{)3kcqRrb|9u zS@NuqhpP^Y3+r!#HGe#BE!wnW-hwYjpIqf%JS9YK?xwayO&YC*?<>ChEEY5OJbBq! zNOw-yX19%u5l4&a=d-51U6c3Ec=xl$qu!F0hOLvYc=CKK`nHz$y1vN7s2g%Ka{jK- zd6_Kp>D$^V(E(iAaa(nt+3Tx$?LXuAZCks;$whZ#QZ1zya@~o^D@oIQwDrpLo1fQm zZd5k#N;L}NI?AT)l43He@u|leMz1Y5qTa5qvwQYw?O*jm)#zV-ceVKRuHBmIbgh1| zY1h$gzsAo$1QJL zg4-+>T%0voI$3nBkmjDCSsL0FvTZXv7e+m6pLodea^kGBX`BCsJ^TGtNW1^Z-Y@4{ zqpfe`KT6|LO|JOky6WF*`KdeoZs^>v4vCo~yZq13PjS_iEIld)OBC*&EVrDw^=(Fi zwzGoQtF67uw>Y^TJ;3^e=VI@Y>#OGO)}FHKYU+ffva^ECnwK_j^(b4smg};~#W_Dr zw;Fe4W-iS-xp;DX{=y}atLx`nSRbQuE!+O${Pjf!I@%^RSIjm>t=9;P$kV$g{>8rZ zy&B)DOVe#?c5dGun_=dA=azcZ_lUy3{*}tsyWLY+T+Y0d>zeq;eyio3=wngyTwQnV z>AAKnI9YDh`Ngq!JiAYthl_mTN_=`kNT=qTZX{y1F$ta?Ow1=Zbxd z#NRC1VI5z1^5UBR3`|;zvm$fP)Lebz-u(2ua&G#`!zYxteGjwCz99Ih>1~AU9G9Q- zY#2-fE0(M=i=6hVZt7;Gdvf3Q&y&vE)n*g$DQ(V^1!WOO1Y%;`4onS}63b9@i(cL8 z^&~ILv%~0Aq{!5j+@^)ok}CIZsW97k`R1`J*8%j~^*&(L4GZ|4?Nr}+JgR@< zs~aEQBt6UB>G58B<$CGMf20a0EKyY{VemO{ojd!gfY+zYPo0%T-;HAJw{B~?7JaZr-X)wk6lduAoG>ftJ( zPp`7)t+?>ubkM_R=Gsh>zK8Fg*{Bn?x={D)%}m`KD<6*lja%!~LL=+GeMnnAN7Y|R z>%^(JQ#XzVZxeeK=JEci>f9%VYt8SvJzpU;v8Jl}-@`?k9gfNlXATyhSf*cgt-E)V zRA-W8DGS%7B|XP-&dEi5oqTzpZvT}DEPsynZuNZ~XQVa%Kf{D6A^-L~QC<1h^~Bv^ zuTQc^r9G-1gl(CtG(D5=!-2BqOVc}L|F$n*{P>!+_iD>K(}J~*`_8zsD1yCBYO&yLr^XO?a=3O?C&WwOMj z&Cx#}%(rR$~Eu zLe6&I4mz`0&F*ZObTCi%m1j}%6vn)69@FKi9M>f;cpV9GePWbx>Gt7;m77)XUT)n# zMe6q9QJ2QE^jut;@HV-u0Wi3SP&= z?%eg{ii!er!O4l{9vz?d%yikr_U2RgA;ou6Wsh<E(IqFrH!Qnn>y@RmbfTTb zn^s?&ZlqHf6U!L>&NGvV_p`_D3AZlHlzAty>dl=@<|$uUu1)(?7&bAs@V2LkS>Toe zpXj{ef3G&&teKYO@r`HAmDL~fcgA-wJDsc6`%2?K!#?gm%I}pEXV2=pcfL2m_3Y`j zXC)Uj+%2+S5m)7Q*Z1YC)jO-g4s!0=v$sQf_56ZdrEk-=zny6@PezyjXq}V$&8ziA zj~u$b%S$ZHp55KX`gX!=n>Sg1zUn?bIAOl28ZXB=ajO?wdwSNS%zDiKXTHhCJ%37! zjtXu~nRM;Ghsuw6nfrI1O5T_`WvkwyZD-Yw&D_l%dHBH<_sCjjv1?!FKTN%~c7e^@ z%fIS-t0rHXlO6oa>Bz+|+k<|EH)mUg3e0ZQzGCgLr>E=f5$BtwXX06+Rr}nx26gRI z{*=8r%5m1tqGy5EwmEyeec+io&tc---NvySdzVbuY&Btri1fifY(_QL4@|SV+TVSN zF>CUfno7G{;aSh>-%L1lJ7wdQ$5GDirVwAX!p-}%d?^IwOa`go1=c+{5F zw@=((yF~vLcTLpRqhIzER!UFW@ol61%Jqr{v8U^gZ3*%>ZQ)K$t+t$%Cv{;umxkWf z8k1E#^;6oeJo@oh zYFhS2o=FUqlec_I%@mNz_#FMmxx(oAi^I&;%5{$0djIMEmHam&n&VrL!!qe9p(dR_ zY`1pJ+4w#`S7pkXFzts+V@}0Bxp6Tn@sWXV=B$3L13xBqx}MFu+2#L^|FTj~##U_s z%hER$zX}b0HXZ5-*}xtsA@45{DpB#N++p&z%l{eJGUd5X-{16M`}g))V6Zj+L@h8SZ4=E9JOkZ{^Nc#T)V6HYU=VrDfjC)Uio@{SeLok;gwow zYG{y0aaL|6Tc4iwCCTd2*1V)Vxm&HR zYutW3{TW%ic2B_U+uhmq`FTqkmWaA0`rS3HRNk>W?d%#!LG@0*>?yl{-Z5(0_}Zs6 zV~)s?!jlimo+KAuT&jPPdBzKEkE2W$pR{g<#CzPj(pPxSbE;9c=d~+GwbZRQoMmU* z<6>tdb2(gBJznxp(Z|29>+`A}KTdlh-v3BR{NMEUMVG8QCMH*O%*r@))TG=zX71^j zvoE`Km2XY|#O0eGZqwos=QibL)Z_x?*O~U2`f0X7CqGU7>@Y!cv->0Gv@L8?12axH z?hD}UYq)H+V4|nte}+zvgo)noqmO!>j(PshsoC@+<5f?w)7~EiWm9Hwa`A-i;QjVh z_V~B|49C7t%{@_aZqKEg@ykv8l?DIm_jjB;8Gq=!Ot_JNRG_$QX3q8PO>#?)X+M@_ zRgJys$QWXueS76KNt4W{44=$%ROhNxiQQ^T-dXkP=7i?RV6RnK?ri(6++4_>th>Qc zZ)^UiZCkeS7wTR<>h{XWTFj$z+Sy$^7q4|^#>=?-OP&l`z$S9o@HzMC*y`2$AJ3kd zIp>qHc%GBz{EO2r-M{y{;-{qIrY6=2Ja=QPKgrx_&-eTI@74`t@v{;qjbtyJSNGXu zdg=h9;H_73E?!Ud4xcWySuOX3eR7iUmRF3*rxuxd3WoN2U2fRAq&GI@O3HzhGh5An zys^1?YyEdt_gBJ&8+|oHTP>Hp+05}YP+nKSBs_|9(koW&DS^`@)|G{A+5VrQ{ zl#R_(<2R=4D3lf4ptEb0;fltqGq*8E-E{S~)3Up^?2y*X=Q%AaJr60IJ;w3a=0>#D z@1MH;J56G@KI5oXv0U40BD>)BsYQ0j3qQqAJEqTEao#xlSL-~R{|qu8mV8{}EmR%4 zySlJrQK@y^nrKLxl8}<>YnDRl#7bk5|_uHU;n4*)JCNkotH1I4NFgEZn~$rLPxn* zZ?fP~$y;dxM-z@k?E6wY?St;4n@bz#MHgO~oRjtLso9RH^J2`NZs1N}ySn7&sfDib z2QLUtRyI4fXOefV+RdiLPp=>6C_ct{JoWkPz9}Jzt3E|cI{irENYm7V%s~bW)~lz# zS>lkPv@*%-*CGS?AGbKdo&}32U)padkd!w)QtvWk`wh{?3)O$#|7k zf$o0>nOxnclYS{rFYWc<(EoFDrBB|PUm9yenxE}vnaZuPP`5%Sexq&RpXqMXyLLQX z`tZlqM{6#~_&6@ATJ`VY!gW%Cy0hGG7qK6=E4XdUqj2?B-NMQ`*SI)IhL+UC7?BXI z?1LI^7f-A@7LanQ+c;?Xk)-X6j7ulZoH5aRlC;H_hv(%Bd5q5FKGv+vNL!u3yDGkS zty0}oj@YlWeNU|aVk6PUSrhbZg4EX#7x~ADVRH^VT2pa8VDHHWpJtT8wDFMs;5a(da53hufjJ@MAv50-srzIWp5e}=g;`YS(9D-+e6 z+Iv{XF;;0MXKLWA$)a;LBO~^_UiWwEM=$-|rCAbh&dw^Is%`R{ncH)*-qtJHm*d3J zy4J})7WDYEu!rH}(@2|ROD=Y2Rk$)~IX(;*-B=L2`TE2aQBN1Wd}81AxqGYk)JL|D zZ<+4h^q$9c&83g&U$)B~ReZAJW$NsEx3|oW+0yOzOJ~wVfyqoxqUrN>g>zMU-q~?U zo19!-*5$^!)Y0**aZlv_?9*x)QoO?9v(8OvDbv5_dYWO;Uh_xZM|1P0SLh~2JpOxT zPukKjr7$PLN;?s_^ z{z4~IrhmETt9oVY#Z1*b2j`W)DSn>nAfuVHJ7Bg~#J#YRC{O5gJC)~r&M zyRw@+CvJ9gKi1?G@!795q0V!4$hy_O*MkMR6D96B{OzA~L^eEi-GN6BC%beS z)bsfApP~Epnb&fYT}7NkKKqzvU+}#dBjV~dp`zn$)Hc0(>x^S+9Lr=~Gn_vMe*3up zsO*{PVsdk$95>qc7qBj=%s8&hoVqo(@H$W1y=>_d_YEJP>3nE&F;t}Pw&&ETUlVQ| zJCM76mWrzJw@u4Ka~E~-NK8GNx|&_3O^D&3qHmp{oIvJ@dnwnR2F^Ox2ODL`GP#=L&*W2Qy2G!hE$}eNSEL8 zh}-L#QM=h^qt9a_vy%bBK|BpR7RyN~PM*Ma?%?dT)y$kltdnGKY^%TI_NI#KVyMU^ zE$-C!6Pu0)zV-iSW4KOn|C4p$84L4vSLiG4TpM$-KzdS|O=m89_LGwe_Ah#_Ui!1v zr{ip_$;70+?s{|5KMHnzdH?d zYtFJJ<1Mq5nI{P7mS1T%x%}F7HxIK%%)==UbYA=ZOkGvkA$CtIQf!*h%MV#URy;aq zslB*kt=H^~b&69vm1cHbH}HQIp;y)Bly_=jXkqZWLt>u_F8*LuEnOcN=PD~b+p2PH zZ`rc4zU@t$bK`Ga+qUD{rCn<^S2zFoxG~)=C#2v}&y<1_FP3op5jbj_DD5iRvg>@Y zcvR${Gu^AS(`L+h`*2@gfyUdmSvzJYn;yNg?vxT&e3a7~83u!>wz%X4Qj!{fw3%&x zWV8Qgm^5+M)%32a@3za>XK$S$^=x{aqi9*;vxi#uSx(iQ|FmKT=aL&om3rD-x+m@V zzP&znPkk`ghWt10R9~&IGr3uIj=|~uI{)8>llH8antrWcxp4b+_f2b-9zDD^ojG@w z0k6SN&+RFvR|MWv-MeDrwp~0|dqsWSnr7|`K5>z|ekzm4<#mg%Oux!4vvsHa3ZG{d zZ#Qagw+aZ@s&?e_#QIY4BWt8*h8pZ-Wpg>!7?FvT}HOdriMP!&&{)&08YVcg=j!R(3PWRcXT(b&5$~(xNLx=jy&~-IJm;eK*tQO{RN#<}H7$;=bdD)j89tn{sYc zw<|}^KkZd~G)m%Cq>PL5Ve5d71~H#S`_v1WB92r&NjbD5<^ZtP zl|S^P1^?>n7WY{u2Yf0M;JWzJ&&b-H(wL{0FsDrF%~5d?U*X6# zf8zw+TunE3y)SDxOfgtNN@nt>TK2!O1Nb9!3joC@f`HJDP zb$JDCSDxKkB(Xbl2~Xdp=;C&>-$LhZt$I60bL~bSPn(W+HczizuaW(I|H#5=JLUAm z;-{3nJGV>FXWf*z?Q2(?&R-lHzWmwEK<1G3tKIgN78bs{XPdmN%`<~h)N9kpxN8np zdfIcoyxB9QT(0-2u2yMA>SKxWSRW4Qn6tTDw_R=prl>CD;!l>i>?Lvd$qeEXJhz?DlViy<1*?jL`m*vr!`@A^*WI&Gii`|GrXAH^i*|O(L+Cmnvm^E zYR}g--@dx#k<^C%`|Dq32A|mWxjW*8Yx4HZTX!zZ`?h@Yc8-&O*?Oz$^RMYKOvuaA zySh(c*+#cAbDk`VQt!^2niV_MGu|xdh%27xko?v7nfCAB3s3$^yFaD3{>Q7s2EW|< znr2`AQ?>N{!nNtFk}rEQaTMtpyK`LqI$sOB_BH}|OBeU7SM@9&AlgL{YvH6Xx^uRlkUz9NYLABEgV}lZuP(V=J+V%w_O?Rw%~{PpuP^wz zi%;*3w3N0_wv9a9ZMkE+$GuB0Ii93%t6t~3K55IYY3J6xoAvfz_g_BE0Aq#;cdR8+ zAO94c#HaE7lI*fJ|F$=0S28|1@g%Z0;)d!bPyJ)oVG}3WZ7eNZ;Bs$qbJTwZ#WKP0 zx@Yn;gT!{~g-NSC4*sh3)K)XSroDAv9>j_U^Z)wCdS=Zl33Ai&lOv>lJacwo{MpJ-Kvx)_;b>ey)sS`yML0{k*=6|9Fbb+9O4tr6RQnZ+(7- zszw)yncT=&)EO~3>Fct@uj~?+&A%SlZL|J!nu*lZ)|7xpDN%p5e9opdO7~2wRNYeW zXG;55iIbD3Wm;!tw{G3OU0q1ed57rjDY}>TuGE=)Ds7_tTD|md9}ah_?3nKHAXd34 z_PB28b#_K^-(^?TXYKhrJw58#kNc(KkyRa8;(opNt-g_cS*YgeouY7o&UXrZ z64Q&W)XWr$R89TFmwh6CFN2|U=p8qYTSDuCgX8PhWjYG(VqLd6KI`|jEtRv|>h%77 zdiUYe_QKP@<{tacu+qO|(>b}%9XsCbc@?|v`MtOozg2e}nQ*$(t+=qgOD*=1bWrN- zNfS(_HGkW@_spc6JdZ9#!#z7UOGUr^GRtiJg}h2~7jjeBKeBy)Pkx}b!ooNJ42TxvXPd2NaRo##16#9Mx@ z-&*^xWB1k>Y+7_DPJh@>p~9L?5Trj?)M8Ev81@ zV&}K3R+H&zD=hDN7b*5ASZAeZmhFy1PT{=rhpf{i??^rE_LS$(i!1%De@9{6hHSr0 zA3Nphj3f_!Sub;zpEWh#iDBzC%?061=M4Q*Iakj!Qd?>9VT*1vUsH>>*36r}Pjo`J zryDtU+)iEd$MEqxTj$){$Nw5S^+wkSnOEyxpTv|w|q2n4b$DSwe+;xfvsXmOo z`q$T`E&IDI=+o6B>5TsbS7@v4j!~GZmt^4o_4kE%MNcKR0yj+ulZR6tzA_MgeX{Um zEw|UUPurI(?aPa9+4)#ybIr$$W1{bL87)>P&(u%5o7kK_g)wY$rn+X~o(RZu7_rHC*b49AD>M_yO z#TG`=ld`_~_TONZo_C4)&%rZ!9E?jAKCSg-n;st>dS=>#F21!Gq;>=xA^P`ROznGznuT?;33T$M<31nG_CjZo11T< zzoj_k>u%6YKWy9^dB|1pO|?vE(D4l~&X&A#Y0P?7dSrX|mgz~Y=R4IGU8%eDL*l2a z$P&+Eca3g;oF2}z$3)9@O~AaIDwarLjJ zuq8XDJ?_7;!TAFNqx_*e!dC?jaPDc`mAi4;_9?BA8{&#DpSe?V($(2i< zTnT@*Xz5eV#Z~8n{LcFPbAP%w-`_w~U7hL5oLLulr|sS~eVuf8a_+kpzavV!nd25Y zzkA!}(ypesu~brfv#)%p{G_*!DqJqyIgtB&#fh_LUYqP(cGMx6ogv6J)mO~4_IyO) z#ZUis?0zDdT9G|jdR>{BkDgNels%DbSB{B(RqXnA%fQ?Hcgl)zYm>9e#tlieITv@! z$yn|$n^wrH@v)1k@mIRY=LC}-b`LIl>sotddBnba!+mk{Jf)!8B~O!PadV%09r85y za5mSKoyu1{7`Nwhd|8#WG_}gk@jru@M(rHS^+5-(Ryc^%gk@))Wr$jIJ~nN0#L)=n z8L?GamO(F7`j^F-CGRaf?y)p*gN4O%->K6#KC@~$s(DuHneP5=!Cl)YN+ZT-c?(Ao;fN@wFOf^E-aqUReA}(9)1;m)&0Nf2!QJ3ktYW7e_32RP#n2Ph zZRUdC539)LF&q%Jk?lGWuzJ^pozo`$a$SFA@xofhMOuk2anSDO%c)fhHF56jOi%w4?GsB3_v+@`Ia{SK_`=3G2{Ntqcn*aWU|Cs#le#@2r z3}5~4S>^Bl&oJSS{iP83XWRd1J^uXoKZ9_%>Aw{LzijKD#h(bN_y21Cl-1MopZ5D5 z3xDW8sOQdKT$dkseMP--{JYnGCS3f(e&MhE|04`qf((pIEbI)-49tv-pfeB|7#Rea zm<5Db6ch~%jU0p>1C)#dS)CHWi=~(u8SNQQX&GBpIdYZ2% z{|rUC6Myo%-?5ziN&djupZZVJTwea(q#C<2_}PrbKb98t2q*kIpSqNTYh%P(jVb@i z{aO_-1s%>dnEY=|y7HN#6VnSzGkioBN;qwGzg_sfmBr!EsgNc$pz*x zQ@7aN(bq~S<@*4<&kBPj!bJEq*ukCZE7liK$nPmVUmo zPU~s;zVH+a$J*7g#ya8tfp_IJYp2*Kl=`kMw6#5aon4D>1#j?Ht|Rr4e`iz%{aWrm z>-@jXzZJb-%}_p@USikwN7FWtb0S|us`bJzPJMx|x%@*a1H;mT`e#crw3RrCn7BNZ zJ1HCZ)OD3ePe#98j?4LJ#^Mhj?z-@zRq3JY`B~QPA*JVREAmz>J|v=Lcl<0z;s)D_ zxE0gfTfb~|^?g%z>;_N&!$gZf#bcg#&(C?oA13IsZ;I)Wa=VYO4k;g!QHa~o_dKV1 zen#4%qApQw;lHz!m8Id6(^l{?;>vGC7-2ALll_OATTa7DZO?G}4`-g^_4tuvlD z<4PUFhs58PWM_^I zfj3hUa?4}+RRr#Y7&IQ0Oj5XbS#7b}ii;lCSidb+(I}N#7Hl=8^5#y7`3CM5x=*IF zE>>}Rut;p$;!mPECR+c9pqXIZe*S?7kHv_#&DPcu!q`sW+0_~_lb*=V-@ ze+EaR)Wmq1_(z*mbG-Q%EN*$!>U&9fgYn^sQ&&H*_tNk&NzrioV>OlI#x{|IRyBR= z!?h=N`n@Y-E1dWuZBmcR#i>gtm{?z0Sg}Im@NH*oQP>sBi%UvhY< z+upqHeMa9=CkzZYHg=f6T`ddS`3HQ&1>uFOIo8^%E!m z(=$6^7RS_+7ZzkC{aaDS8Y$u#KJ}C6r>UPsKh1Jl#3d@=Jj<6)!|dsYrYy79%N>@7 z>o^qjyB3e7~kj)A~ zw^rF5T1FzpyiFUW145qvKf<6d$iT$N#LCRf3OaTLe5eW|6SJUzkbkwQczat6BHvop`AcXSX%Y|MK>W2kY1u{ZP!vDHV8iRBn}RNY%!FUFJs9 z9_3Fv91&i*%4pq%CinM`Zg@Lew}-wscA|9Ie}?qc_AjMA$8QXuUFRD5pTTeLy-79w zGkaD#1yu{peR;I*I@iHh+otI9y!#i{v87|K`eyklKi-~B)Q!EHw?$)OwXFPRIr9&4 z+O3~-&8!c7T*j+XVt1tC{ygoN(@Q_9#J6^HXTP^ttTX*ZSN-M%-^8UaCu}wdwY_(SH=phc)De#wCv7%O^-89r5G)`6QG6Gre7#2SZTZX!7H_wR|}0+oOgmo9j1`$sm`_mfMI%>E|1Ws3Vumu9|~yLrhk(D#1QmW7&CJztCKwySIJo?z|2 z_2a9nu{t{KW_NGSI8(Li+od+$Z1yg3@$zro59L+kPc&_B-eP^ZUT$r8SmcZ+i>lWC zke;m>yzPyXjCcOReJXl(uiw~&PgXTA(s*<4_K&v4{p9p7o$jO!6*s0$?SB4F>r2F+?%K}flglF9Q|qS-$(x?HP>acDZNB!=>B;N8 z)4WeUSn=LhF;96@<#Zu=<+)Q&-%Xfle>ySwA;;uP)AU)-Ud#8K{OPph!k4$dxA>jj za$ovMrfH77>xC^pE^S$;m$&?O%6|s4&{+W+xw5>=w1WO}>3W@c^E>p%PoHJMN>Kqn zrrQVpFxtN3)a)g?EAR9NTWBlWr5A6h{?8zHV_%70)%|Ae-#v5cZY9k+J+;T}T|byI=OP=(pdwelOKr zWnFsqLAOQAZl`*6E#7%?cX+?_(|Idv&b`?8lRtN^`CFk+D(9wWZ4~cQKj{_T@m(iX zM>|n}=H0!|g8xW*dB)7zEa><*qy5p2`Kl_9rMceZ9sRJeTB!VI&U?9+GN&sh^p&Ui zY3U~$dj9oT{zJdl&o9n(+4rA&U)CO)vv#BF-)Pa4r@BY;Z+f57_?_MR@p5zf{9kt8 z_HA@Meb6;^`a-|-kNl_K zk8aZV`N@9S!thGY8{PY!JMQR0~^`bTN zzU;fmyCkH1qQ*J<2_0|B=Kna|=k_PRH9MYrkNzgrnK$|7EZi+?v-(x4$8p_Bf;XSm z&AXF(|FN#O^TEu0``+w3C~+?=)qnX*t#|8UCwwYPuhQ?_7k*SmV(Z4Ns^5!#^F$kM zzBAQ7u;P%Bwe()|wGZwaKXPsVxV!5&&)=!jn=SrDqSnh@HsS zby549t)^zJcZt0DG;i6h^@+P5vL`JqW&X4MkEr*t$FH7O3%*+aq&Md1`vYHf@|!xR zO3VMz`?y=AdtKE0ZmYek_Hvzg>;Lykski8ZwLGVu1$wLS``f zXhsxW%neVPvHYk$d)(T{7w&mecg=X6%^}{IF;!{lMhT5PKdw5jf`E8V-cPoj9-%QF zHm_csIOFC}=Vg6y3n$;3=%lsuO4qcOwQT7*FKb_HvNPQy^2V=n zXa1QF+h(2?IjSvK9wYm-_S5-GN>`E}%zNW1e@?|-bnOSF!xxL5o}T`r=yTVhDWCT7 zecSg)Io%`F=-7$LMfaRs)xRqBeR+KTq4-sua4oq`!=D$6zH9n_IX&IhrD~$_k*|Vx zSN=NxQrRtw&(i*+2Jf7W$} z#bydst%-K+mh|T2OiVhep1X5i_jEJaj~O2{4SfY4B*}Fe#fa%dY)m@ZvL#k&?!4D+ zQ7K=4bxVs18E<;-t^L_3hEq&;(Kq$$7nVPB|82EQ`@n5_0*^utfcr`eQDm(~A78hxP5b4m-D=+AC@` zFYrRi{>Q%m86zB`r~Q5HBotgf+LpJNmdF5 zxVR`L?NIF&KfLs)P1yebM;M$17#NwESeRMaSXmeuI9VAO7#WxZnH7Z$9RmfF5?O?e z3L6y+oPs7ER5ngpxKX62>0&UesETv)q(u)um^c(Se+0Ki7#Y~?nKn-4V)JNiiM^#) zy=cR>V*+;+PS0{S>adj7;ZZ%5_M+bJ!SQn|{4(Y!^{4%3n0o6ctEt@cW9cgI-tO6H zy873y$E-F-o;|s^Y{kjeO|zOZHa!b%T^Q$GKXtlx$b1KJ^NU3{W&Jsr&&IpfeB<)y zys|EOs@_IF^%*%EtZpm5VNp=FR#>+{??YdPpCs>&NU!I#|jME+KHLOj#+6{iwX zu0-Gb-E?_nq0{>O6{mV~KbV}ou2lHLDdS_Q?_%%IaZ1Mn4wq}cja1-{}PoI8Gn4I9y5BZx?GiUVeg9t@~)n(JNiRg z8@BMS5z~8jf2D(c$GV*U%+(1sLi<;)Qd|5-d6CMzQ1&S$5py42rc$n9DusZpf}*4+B-%Ca0dV4J@9kvc_o5x&>+tYZiwp3i&g>Q;rin zWKkz8F7H~A@M_uGq?!qTY~t@M?8&Za=euO>UC$%uEU;;6$al5LGm>8Hyq0lh-RI4Y ziI#mPe&>BGQomMqr7mA|n%`BM<8J`vsH^o{T=o9k zidF@C!G9`}Ut1C${kzAI)g!&g?ChyyRV%|bl@!ZfY{*|3^pQn_wOD@9=4F99<1{0- zxOzAqDY$(%ZF_vX&w?x)1I2rmSH)Gu`c@sXJ;~ys%_{aV=Tt4b(1o{7%iRU*7$v&i zOt~FUmoV+r;R#H_SvkQ4yI(EYm+TVbGF>}+QS}Ll*pfG@H_9~E*Up^v-ednE!FA70 zZ*i-f^ZL|J>GdHO1vdX@xGC1NFI8CkbV!|8iq+!onh7}^QtH;0Cp5~MRZ2J>?hih= zAVMeZ==JHF>jdpC>z2pg4HKPZzx0QUMfkFeT@#m;UKJ|hmK9IRFz8fcxUz`xkKpzr zyUq3dW*4l?aDJpQ;pE&YjV(E|X16^w>`mEeIHPjWUy*rUzGoI3`xGdh)h75vaC(Wa zy3xLX;6<;6r1t$!^Ve zBOmfzLGj!6sGpL(aIrX0#+x8mes z`CWSUyUv|T7TWdV>I3dWqK7_seGq&h{IgEgCin32twAg0l=I75r!e^NdvC3_{xC5=rTOK757Mi0Zd7k@c%oifto(pT)>AYE+w_@wgcm0o&$_~bE=Q8^Au(Kre&)$x9`Hxy>1h35u z%@x1hx-e%`q`QQ6>DAyHF~3hHpMLiFs@y8)TNiAFd0ZbXIBmYiTtV$(s!pi<Vxv%FJ> zPsV)Kn4J}{Wj#kiMD&?HZS#-;c} zSFVpRUbafwZ}G90H||`!tUNs>#aZo%jp#OZ$Kn|6N;u@J-8qhU)1G%RNfC=Wo68pFx-_?$hI)HU^j2R&QlMA-{UbE_(aZ$J_>K_KBI;~%}|7jxTR?Ogk08NX}0>Q$kQlP7J9 zo)XYIVcGMB&o$aRkDj0LYBgWyq=ME{f8z2r`nvU4cB@Y3o~`|4ZP~k}V$1pFeg3#x z`$To_-MIqGZdvShZsRz2|1JNSCEgEjEHs)~XZ+YOU)5jY(4&LOsW)%_TFUg$R=889 zcXTx_RxA?R16X<7eJ7O--#|5Fw$yisk;hY9bz0XSLT}#TsnAMSaeyhHJ3i+9!rBf>RY4smAqxegm*=>0j7YcW9@uZmU zFJV~q-avHKqt7*pHh1=$tY@4m5YqZ^!scI#(r3nroL^+6y()Cu_TAh&lASY69N($`L7 zDCnEDFw=5s$4bMF7yIH>ob#R-O26CC&3nZ|ReW0Oy~Oui2d7VZy0Rs!|Iu__u@^gL zJmg5!7JjQeS+(XuBXgK8C_1$Ja>x8o zJ~IcNrly?bt`lPxc|AX$uyC8xrKi=sp&IvZER$FL-Nb&iuH-+%49+?K8Tij?n-)0+ zsiu}L2+VgaES=P3VIwW!QoY^c+po90e_h4@Gh7o*Ud6a~v!K0k;D3g#mr}AK?tf{J zT{QW*Uck(Ias_&BFWT!A%Q~h#%Kf9Fci#6S(~O-FN-EF97}Shznk2^F*m-5)suq@C zEB;>8FK9iLv-|KFF=HKeRi0nVug)k7*ZQf=AG+(#iVv-u4sA?|h@AJD^P>i1&;}Oy zq$>x%#L2zM?_fEeG&{X3+)(48S**xvr+wLfwF_Q!Rla`r`{JWIky~dCK3!WFV$r^{ z_nDaE&FQAAH%(G8T=+y(BCn-e$6}*N%~{{PwF1JwU42?-Tc`uPGjbYxnttln9|#n9<`Zg=m(qR*mJ3idYLWS+B9OX-fGFmE)= ziM>C>Ee_n}5%FAUKkH2Ytc{1(N1Qv-u(Fu>wbrYnX*mlbRunJLy>>TbuIP>s!$o%Q zH}hS%^sVTImc+`l+&nBLKJTS}2s187-^4aKagqUhhImz4k^sx<#jT5~mOY%~xg{lK zrr(U|LbH8$nmC=eV=MOSp0qw-!L^6Hk);|}3K;#m)Hr`F;?#@TsdFNF^{+{7X#tWN zoz_zYr>$6_K9y-f8ck2B1pnKL%|N6JM7J5_(&AW7?eYR43 zfPrSN(YqzfBTNpNR`1@BHs?`debB@52#qj@#o8Qs=F2U1bB7rhFIh3i-&%QJ*H@0I z-~HN6be6Y;Yd`zsuv>Rx`9%hktFc8-cJ}-%$ovt^|1!*Iarx}8ruV0P-K`&T?_YegVCVBk zEA3PJR{Y6o7oL4RwS$|r&^BcE?2DllhJ6k`i)>E%CfitQsMcQgxhd_}dG4yK^}E1w z4e6EL%S-QyZJuT7GX0nKzgIW)qNjGPRQa>8X7z+5>vai?4|jD;u9({4u3`&WcydT`lKHvN+wXRMwdIFt>fr zwBS1X8EZnd8QwM>Ka*8+^6sL&M+NguJHICv#Wb#-di2QaMY%dHBByu+B=maA`O5z@ zaC6tKvM;%`D3^16`2`)b?9fdoP28`_UK5kC4LzsY`Ruqu+g#BztSziUQoC~cMDpiz zUaZL5qZL2x^wd@D-&)?K?Y&rI&((1A{^WPvcciMsPBHI2ENON&PT}>RPixs*lI2~~ zPK0N==`6T^wluJ`CGCCHqu-|N#xrC?A1+KbGhP2;hIGP4hFD2u`(L3-Mh6~++x}D5 zFrBuw>B`*ej+<_m)?7S&vB>Jy%DU;+icc5m=B+rFD);eTquk34Rf`@^n!WPqi}h!o zs$EzVuDNZMpO?ddyQ+fgT~E)FIB&M%_?zAK-SU&Xt*ai3&amQ<#- zp1XvG<%i49_M7m3;{49{pTQ_}+R~ixXI|5q#NtB&y0vFM_#q%$UlI47!|~0DHTkC| z9I?6jv^;m$F?PeNLf1}DST68KJv#C$A z&~>f2_KXD=))y^TShv&EtvF8lT|lGmi}nNJu4y-m)7JWEZrbM<^ff~E)LZqC3)S2E zf1D5sNXR&3#65NKk5I<4`Nne=rY&>i`sT*@ImlDXcj`NlCU>VL$0sd$U%~%yRz$*< zcl+PnSRE=ZnbLEA(FDth`=S;Z`cFDyGUu9PUxwqpMyHvRiu`79zw19@uH~bDnzv^Cq*JfdU+r<3wDhQ%UDBLb z&vjM&5+Ax{SZc2u9rlUfRyW!ux#M%siLPkH4Am*y?HfyV*|`%l`{nm6p5t)J!hs5P^QbRotl+ z?vpkiT5PRzUHk2-;;p%VAHPac=oM}_swc5-_ATve`N_h!Dj#`#l^zgzd-HAgjN$wTIqZkB(htQUBYB78Mx&ZR;Qzr5pjue{$K zYIdnZ=H|li&0Dw5pX`@$Qgy!Y7tW@+Ir4_3*B^wMW?FrCcBrT9R+zy-ujS`N9b=Lf zz25rPweLT}(+iSs7Dn3!_qb0g$Y}htSS9HqW5}a_mpW5tORf8`lVjKJy-a4CCft)K z4xV{8Ww}U|!kuf`(-MnCPo!u!O6M)Tc68H5)o>1@h0J0>0f(FaoY5;QuXbMQsc-)z zcxU?A_IH7j`e#~FFTPrTrbRCxM&!^b5%K6n4Kg8;q3!Wynio_L+zQpwomD%lp)>ZV z*r)9dn-2In>20|3=E3H#i|=mUS@-4ChyM(rJ}FW8UtE%OR)4ZgzT=f~p+)+kbStlg z)pEl*hl2tNpG!I&Iq~$uN^^DBc8<=g0x_Hsg$iy_r;Hy4+U#b{nYv}uE;SZb?irew z7YXzkh#u5B+p4F)Ix}{GjxWox3Xk8*KDG0$J^EWS+j>(mgZrDc?N?=d_^iLzzgd3A zO@-yei*3qye~+MaK1<;Ck-<<8!8*DluBG`Ia|@L#>K z&O2*PTI;lPw+3&zCK2Vc;Y-N!8Evn+i+uC4=O22_5qVQm)!Q+9i)wQ9nO-Kn2C2Y9 zs!1mlHU<7!-5_ERX~LGVq~paBM%gfjO3ipc+<-Qx1?cMUiu zq^YUDX!UA2ImaiXME`W--?hJ2P4Jx)$j&FcOXh5x=8N^Er*4ExgfzvzYJC_#Q!c`% z?)cqHs|uZqrgs1PwtMa0)!aoKZLiiDiY|7tJkPc6-NBW9ZxsVo?=eMqx~#szvyhp2 z(d08>PkAMly>M+}V0y|w!RES#O5Rh+sgby%d$PDC=}Xpcp#`-}JK{vY1&jaE z$car~lwG~(?HU=oE`vwg{PJ%~8>rHwD8ZOsJH1P!X^-ZeOQE-)tglz)vXE31+ND{<@>g72 zpJRIAhF#D0Ps-|0@pIfUt(oub0TIIoyPr;d%uuO+cK#>kH>>*ZN_&R4CK$YH?#qZx z=Ta7$baU$Zt66in_k{IVI^MT8^i6a5&%h-;!C|*<(3h zd?21b>5!eYs8Cn;q&7jpMb?Tf2ZNq_Zw*`|w&}yEOCdbLYbQ>f)ppYH_|Hg>NXIZ| zm6$kp*PY?wH-on*KeoS-ux{3hOeEw-tS7;&weU z)=q`Zxec20o_S1P;{P1j^^ z++NTRrjn;$nE^*H-7pRB) zD3UuC_oz)~!xpvq4jX4rsd~2DwrRQ?^XzZ#bCzE&eOmwH-o`(Mx>|g$ab8wabb9*l z3O8R_k@;EG(_)(7ywivEEKfas`r;}V1J?_OUn^bipG@VR6}H}Y+M0!d6FJX`E2xJ& zo4a1#X;Z<`>`U^gX$|Ximn7LA%KK5)QW|r8s$j2+0{0a+FOGe$)WS~hT=FB~{Him$ zV%~@La32b9S<}DyCflX9MKdCz=e;^*Tr^$NjO)){rmID}UY=WH8Ixioa%{3*>Qw7j zOP=mBoHVuU!Q<|A$v)k!uMAy~}_N8sFr^gA+ zzuQ^#`dv52r%3+g3}+oR-_NWQ*ck@MHgG{MXxzw zu{KwDwsCd#hA%2GHS|3&`Mc}d)#le`$~*0JuuF|GJ)C2-vgkhp^ACp^woH1Z{~5g6 z7XDe;X)B^6EG$-k^(7n)d*7elZGWJO|J@}eghpM#1&hjgA7N}nX(Q8W4Uj2H7;TYay5cPrPGFZKHM z<+rw}gM&av$4!?-3R-?jDq0B>RU)+4xF6oZv0Z**U|Y@9zeheS`Pta@@=abiW6a%C zzHJ4Yp8eKw73(%H?S1h;u92Iqcj|(l>Sk+od@Y;$cs6HcXE4Bl_6_`xi_0>rOa$_7L|}i^+Uk6aU(9$|lQPv2B5EBn|^dDULG zH6)c-fjf2}=UNtLb zhMR}69*uFyS#y4+!^75xQ+YS|T0D8gHGMj>Qo_yH&Chm5NMCVqm~3-6C@gMix}FuQ zo`##3STMK5d4=x2RGaOoNnx&WT@%j8S|pm>i$2nbCa9rirTCR9Jp)3=pq+FBrBn zAYkv6n(UeEro|2sl0~msn z^!HESe)Dj#ny6ONnamx&k_K8^@2-3rbEIA7)YI78#aC;uapfKlSoe9$mH8J$x^i86 z4tZR4u56lC7A{bywJk7m%FAm%SG3xGP3C&|)r@7uzp34#?7JFo8-zc&x;*y2p7*Zx zu2=3~QF@RQmi4hkIrjO<%7PubK`ART+(oZge9GuQDz&`R=W(LOC&qtX>!+=?uM>;Z z6tKA>)%+)5#pfSNFLpmaJJR>AnxYzSfaCr83(hHqFeZdpDoKjPKqimi(%AIoIElY{E z@GABo$rW3-#q89}IW*nomqw=HmGxp`E7Y8{xTktA`z<;7sn*7WHv4sIudXzyT;Ed3 zS}w3zPg~P3yG_m7CGx}UK2gp2od<($kN0bEeR<_nkpFJh@rHW~i=1cGiK^~M_Ajsu z_Q-JPe${E{!@OzjEtz!JfIqq$VgorBJIuQF!-+xOCEKD-`>X4sQ$=ZeLtM|lnPcka zdv_MU(y5|{Ip4$gWX#Q0@R*))B)e?dqx?gMC#lV@p0!JC`6bm&;$8Evx>x$vf7SWI z^>^il^|zUxzdihF>E8|3e-8DX53oLI{-0r%-V?4`|H_hAIxFw8ZA(*`I@f%{Bf}jJ zk3YR?eMtGs{9UU!4(nQ(XjV_z^66{9wG~&Bq+ZNl?s|`3*uIY;t!yHarkZd=#%s0SNnClSBECd;!8~`*gfTtLiVb;(*$SS;OTr(P@6D$@OXrF+MdtAE`yr-zo!)=@g3E$X-1Pe>;* zdW-d|#lNQC_woLGU;fUz@A995Qd$`Eh%yzIhcJAbg(wzw7+3Q z-?WJJ7iEQC*_#@2i7;zeTWkLa;q~g=wlul_(9-G52hWtPymGd~+0|I%hK?cgs@)q! z#ae|{_pLhc_}U>OAKvn^JM42zggQ)RgI7;~mMG_WSWf@be+I`?ZiAi=7SUX1|_$2dh#aTk%R;kSs-%~NGbKcwedMYxHlg_C*J8+qrGfeyLJ2}QJpvjem$L2wwE2`m(~UM&rvph!rlL2?gocHSxO=59uFeL zLM7KpxGuYQhg)j?p);Zn?fnzFOdW-Dua^d`FH!h0tJSRRn@rM&8;mls3-&I)6u9Q` zY2OXZzSGlJyj2V{Ik5&#YaSM#>v?)nmbyg zUN)`>oS^RVYIbb0U1#(14F%R5uQr67tq=6Oa`#bd3eTZw8_&ry^*w$3hf8ACv!AV} zF3rhe5?Fh0hx;LmbnegWSEFKV=7dJh7YsWq6UN^9H_=O=x%H5qoOt{#M%!EFQ?$2; zrWS0DGwte6&a^jvB@j~YeaBv>D0s%H-kd4fp`}K=yH?1~w(l}>{<72Za=QAJ*@>14 zZ`@5@t(zCH_~G4PQ@+U@Y;z91JLvLanX&V#k~^owxE2=Z&b=bAz<$z<{Xw(0Z=S># z@XNQ_uhsv{S~>5@n=Z>g+9adUP;+(0jZblGt4*|7rB+L5&tdQV9IB9(>L=DZM}OCg zh3-5F6}8K+*f}!3iLFbJ%Q)(Gwcy;R4SRcw%M_*Nw#|;Ke^h=`?(@c3j@v#=G5D5n zp|t3agQ3iac`U+@N;JSaP~X&!*Oz1+n&T zW}RraxtnBnr`lz4>HLkGmi_q{nJz2xuIcEaLmfUZXI1k)wVV0Ff77XW-MfeG81D}) z*u(wdq47yLUu>@436O;XlKPkg8?d^48Dv zd9nV*ET$HR3|?NxwPxCK3QUK)U(7l)OaI_;1)cV-HtKyDcU@lX`H{A6{lO_;XU2x5 zo{JQfnk)J#EWl~TNwXDV72gcyx$}DcJFmx_{p!$uyKIq`tM43f4fchB3cSTqf2hcUTVB;~mri*V-1);%W5??f+c(w+Sw_bjmuej5gOSk&tmH!NVGmZqVzWLkojY>|!ycOnKZLXy~H|UcJ zyL+_gll&C3m+w}qw7*&$BDFjq)cxh68;TnP8dRBARTk&4b(jn8%3IgkP%;0I=(U>S z$lvA)8t>T`J!L)BIXn5JkW5s07GFX2T&anw!3j%#rM}-$5z*Zsy*lLRlln``^V=gG zWkvYcbDUnq#}=S{)^e7>e4jt+t=IKiIArqk%;i=;v`ZAf`c}t&X`5&4_0)Oieg4c- ze$`OBQF@L?*vXxx+C0CO^{T~)SLHJK|B7Aqq;p=%`&DP{p9Pc#8Z-nS3M{Z%S$a&w z>}G;m)San&&oj>$#(RqF=f8*zRMyrMO-_6nz;h*QDUbO#L&mfIeWyRlavibE zeY2bY$O3koo(2PfdTnL5b#KodI$pCPBs-z!vh11UgnqP2VC3vEH^Myy}^!{BDc>MZ^ zLjShl2@h-+&3t-bL0383&*e%hKgd1)e}q9pfRTZTiHV7km4OL#sx@fgpP-_lV_;%o zqrk+48xJa6eE8v`!GGv+*7l0V>`M+TE}DOZODgf;mWAw*ryeK07BxC}b-kP-*D}Vg zz+*cUTAMDbOnlhD;`L3nw=1>FnQ6NII?vc0TQUtUTsyYsz*({VzqF#a%N(D&QX=rp z>AB~vOBoE3G#**=9c$KJ@$G7fTpGvnCvHnFhaEP2_=u_XOR2tU@`@={H+VJ|CpPam zxZsPpEco%hOuThEc_O1Fq*P^MONe;caa309q|IwnOAhY)Mxyx zX?MED`(bfM_4PZ!OTA9n3!Dttck#5u6pkyFLhBYVAHU@Ks$Nz7fe3FWANxHHt^7^G zt^d@DmLABAXefx-rZ4@=XH&%aBP)6Qgb(cg&ao$V&C2ICGyk}5@^JmL z*dTfFiVbhh*f704zA|A|_==U={}m;lTrJ3UD>S~KuEG3iL+dL(<#&P-F(uCwk3ZB5 z(LZM4P-L{kr1+-3ltki8-cbG&7Dcxus{KwtZf`6m`{ zOL~*=s;)ANb(NINso81CORPm#?+Z|@J|%YP*A-jQb;i}}vNWIGYsr1y>*U0*Vi1}q zruHNG#E$CI9foW3a+>CzUi{W@wWaOZ`F`nJo@v(|H;X@~#m^eQbK|2I z`s~}nCUoz3xmzb!`T3OPg_r-W3yA7^(Pg)&&tB+kd`_Lx_b`c@I~}aC zn0CG3N@At5PnsdylzApnEp63(i*-Y_zkF5;ytBjeA=?6ro9Dt=Sz3QImmJMl*Y~vP zfvM=p`CH6i+$!)&d30#AF>m0Vqn+~|68E*|emrRW?97T2>lr#;hCDnXnXYwerDJpE zU01HnE(r(b7BQR(I(?`@@m}P``vI%M^L(x_c3t?)Y?ALPa7y2M%1!wWhxsqMW-~n# zjD9!_cJbQBJDY5eM(g&~c5Zujbb}PX z^NVPu)4wD#1!5Ur1zZfWIX11Dd(Zi{6BAaj*Q9>VVa`tVaBj^D-RJaGFo8Etveo8c zR8O-5kDt-Cuw#kuPi<1xo#QUFyLro$mI8%s7d3xQ<8N}lqTTE{u}$zwfzUmne~No^JZIbbo{F*`$-6rEe1onW9sbTz0>Ex1ujy@24WynqPLEPG@I` zu=4PH43d!9D7EyrThmrOb)lu!^MAScYaA{%W)WDueWzp5v3Js1Ss|NDe(_EGC9cP_ zv*^9a28oY4-Tqx)gboHo{pc`$n5xXV?NflC?z`yvl~D^ath!CNKA+)alJwwRbLbT{ z?mg%C6!|ZlQN*CGvMTmxkA&2^2dZ56Bv$p#&hMPAzIGww@%67xM{V8CBIdoOJoXIp zp?%Mv^thS4W)I%3Sk=+XTh%_9ahIh5qlt_|ZrGQo&O*M}N=v7F@s5+>b*Wiww^Cal z)GmFzDCF~lGiM#wIP`>QOnVo++#r98dsFhsSMgU5YNi^!*l{g%>B=IW1&s?B|1lP% z{$dCH!B9I3~XKl!s|h`JnoR-PH35w==ad0ICAo?~*&9=Y8& zo?kJO$a&bWncQjkF#5^PQqxs^2Y;G#T)opMwtZ#5k%Og+L#^efEQ#VuThuYv0uQ_6u>(#@yqvyVL&0+2j z2MTMPUu20bvttTcAzOcz@2{r!29=GE5(-lk*Cj+v$eVoT!QV&9`<}U;3ZCi2<9$#j z=;`TS`mYOuCclkYsh2Zf*?djSv5(4pCw`dbghn0r zwmoYPbnM;wq^|xj*Y6J-uVzo&|4f2u`oZHzxK-BD1|JUuBoG1zOr z(Sf=b=g%zBp7ZwgX@kn5>FaAhf18IluPohdB;%s9-u3CMGsf!1qO;z+tjvzln-S?QV5x9k(`;Fv zTGWc7GXQ@EM^Ja_D08F+Yg>ajo0`bRj=O_yC2bW4@7TxRzalfo+}#4LCOWzR2L znsPn$>34%oH72qZ3Duwag8!@8Ld2Gp*|z(RyB`oYTmbK!v}M3|7<(-M8maq<`j`Yf(4&Sx5T=pJMX{a^3J_I;A^Q+#NDcW9TO%s%#|ozu_KIEg2jZ_ z=TL*-n#DWsOjDd%acz;|mRoyI{gRh*Ty#I&C4qDI^mP|vd^o=zYTT*Re&@bmh_2GB zkG=|(T{{~p;~#PV;&i+#o8NZ+R?@%3WNneXwv~-*qaO?G(3rw#T@VW z&VtO1XLj|>J;-w4ZuTdqvd3!Sm%gx{TDtV%QL&g?U!K3?>-+BhDn{-L~F6dd8|Z-1xvJ`G3!e)R>2WKz3doSTshm*gU89c2Oyhbc9`^>rtWBh|l9Vde7m=^PF4$D$b1`W^is_ z5^g#n#vj`MOrE{Un*K=7Bj8E>&JL!Bhjowq@yht&(cph-#KQI4?DJ!AL+ez!wtHBgV8#nrq)%lJU^hiRwv ztesxHd7hD?Q1*;bVs378)2-87oGTsfasQb%$~{^%7u>)7~Z8$H@o$zU@xt5o!l)Q1yrG>ip=D*Y39_VE}Z%^uq8y7be&M9S{yC&)~ zznQo9s$heJSMyocXm_P1mbsbk7us0Rpk*Fm)U#rmnTFEZq;043*w4?rtN-GN-aKV} z5q6z(cWkQD8%t83UkO-uo^2V&)tKtEHCY$3XE)m#Z`7z>lFPhDy7@AnWkdIAR;>r^ zvh1CuOZ8WsI2m2^U~a;p&1QiIYYrL8|4CX<7459yF194)j_O5w52h#Pv4^>17hU@; ztj5N3|5K{QE8Ug^w|NTdn9{{KwGT|c*l)1!{G>p&OA>LGiY4cGRN1dBb@^rZQ2JKP zCRO9*?N+mXPBh=M_0FO6%etQ#!j!HbP<`!D@?v$v&xRfGMyG0pJF{-J@-DStlUZ+U z^r3mmvm(KJj2!XpJ;%5Fj#=GREt`+2}$o_ER%wu%B@%TfE3* zSLp4Xlb#uMy%SmVdd_Z}ullMTIa0R_3dEiMeGH3wwyL%xVp`eu=PYYu7yR0DCur&P zu!kr4baqYI!;TVbkqF_Ntom_=Y?YNsx!bChpYQ7XQjyx- zYWn!a{uPG54DY;(RbX2?_tS<7URxE1(_%jrx;h*ei}`5pYN~j@XEW!krm206Jj&M& zrE!VvKIdp1^1*Dysq%IA9?Bf7SeaShBDm0Ob?TmvMC^S^5F*JQ(_fge|@6M5x48rrC-4#8&vsI7bG*2#5scX1!bmd&vqfbsZ z2^whso^9`NIeLxHH9f5#d#V~Iy({29vWfAH>x;dAAC!M@xnQd$exhJmU?BUBpC2DK zT3Z-ziYv5mwwQ56k!@r9E$-Z2$LV_f7YpmQ8fUWnXSgKKFg-I}?4t8;g;|$QUj5AD z|KzMZ@0P56MZ0&1)b%8)ichHgD!_Qgu`YXN61c7->}@u4<988j z^A}!b(Ps)KuKLP*w@%Kw^J-6|Y@oNS+q{0uXwQYFi#J~5o~A8#U7*ZK>$Kr3?gNIm zSyp{MdL%JKc!Ky9J?R4_8}=@}v+I-m9mzS~BAb5AR{Eee{48;_!rgEUA-T9A5N8GpAkCis`9;g@^2!z z4OZ+@6b#&$uwv`%KWYn&-WtdJeKzCB!Rx{XQI}`5mq=K*X;j9gK8?9~BysVpN1|PA zx~Y{Bo*OK778z!xhI(z@w@Aisp;gq{jk6{1zMb;<)`O-m$XaA&6;!R*S>>`Y?U|_H zGi|@y{~4J7L|AmKdY`ucTk2XPuH5*UM|p3aw7(VAlCx*RL}A{_71n>|DRiaoToaSJ zz%olwcE>AG>F~Jx87s}Fu5kU3`%LfY_D&~_V-M#G-u2mLaoULE?y|0F{L*fb=dJJf z2$h6AW@mVAJx$4QR`)M|8E-MZ>(&RJu^DbJ*y;8Dhhk*n*{0kDVT$d?x;9KWudyNj zjIr85Q;Bndx7pJTe_pkx@+|V`D-;D>c4mP%G|SGsl8^>I*oO=yDXxw zEYe=|l%aTdyS%&O zeVsSse};{P&$T<#gPT5U`*V+!P?U;pY1Q@nWaefZJzb^h~k44#j+JeK~JALpXS;YI_wK&VYj`^#ugN;#xyi&dXqhQrV zxuPHIch0%~pP^1E_|TaI>)+E7))(h>@9+xv;V8maIZZIv*X?}qtUiYLif8=JfBcso ze{pD4@zx(fcEM}6I-Oa1z5JcVw&}I&WRE7Sz0^1}c2Pom)7yuly37(247EE$xc0TI zE79gy+kEQdqcoq;oX>JAqWL^>54s0!pK|LX*X-;|-iKPErFAt|W(DoJl~nj)z86Qv z?O6dT2d1X1NXSyic9e>J-)x14O z3~*aFbCOxOPikJCn8Cbc*K5*g+p9uyZ2x*!{%1IK!@YyAP4mv34H0Wsg;WO$9{pN) zX4Rn&Kc~Is-pl{H@A+i^O^QC(cibtw^iI}s{j7$}qg#%wQjGWA%o%X^=mYsF30G!3 z`)=lN)}d{IZcL5^cZ7~!t;=EmY|j}A$6n0-xVU6P0H4sbxf7pH-WmGj`4!RaM~a16 zlc&v4HF-LfbAI8Gw?{IVEW?%=PX5^)RiLNL=pic@cV~q=*9x;MZ@O*2K3%cXeSw`! z{LHF^(4)UvTN}@X!?HNl&ER4EV9rxV1Z06YmK}(ZtcHKGfadzaszH^UX z`=~eNowxrhKWWZ}u3OgL+r@Qa-1evBUA%bZfdSWwGH$2UPHG(y=BxUy`tD72wGyb# z+H@m!A?KV@{@u-hOY5KGLZ^1{*R3FA{YS3&D&wc!#p-}sc?^e|>9B0B~ocBJ| zWZBI%Kj)Cqgn0i`R;G0vM*?4K#W=Ige;jJmE^n}*=&?Xw1$Eu?)GT!eLnr*-Gu6o~gL$H*uMN7l?;v(His~>8s zY}xpbGmBenigUwS<&D{I z84OfdUZ06?*uIG)i2c2ti@i~cP>1}c{TnwwYkM!?ZlNP@H1FjBakiTVTYqc~$hf!b z%K7!Jy{C3+hKhGOJl?%S-y)B7#cPXaX|pSm$|l@A6?3k~{+ng{e+I7O7w<0Ix?)az zp;amSj5v>%9>c@MTcVn}=sr?sb2CmDW znb)$bJ#2Z-rc%-_^kUr|=Q!_T^N`(zD-Lkm9#PQ``kml+^9BD~ru{BzUqt78N|O!P z%#wC+&Gz<3EQgBhCoMBP@nC0gudPImvSc%F zJrAt2xD+iHnR{cYVNhvhe*t6OrF%&Vz7DMcymMl-W*xi6=+4=8MQ7VNMz>%6GaYVQ zi(J$^6+C%nE?=Lr(t3{rT%V>kSTFw;WByhr(C3MmhMlKh^?@0AH@X5#&n2iH5?7hF zE`njEocl=z!2>bL2Cq)k9eKX<)W52Z6}6i+CVgc{uyENM^Grrc_f<@#i1)HxyJuuP z7hrm8BAm+3mbiHG{15hLl`?qW9-T3*F>G4L)7j@RQFzIr7gSDRG!R? z;VjS4e8(!t68mn!OzosxS+iZWZkOGhZmcx^=(vYBbwz_}w{~aUwWkxm>iM;nKNHm2 z!{NoV?qYI`?@X;* z%CB~Z{~<%y`6K(n@}|0Uhu2K{`I~cTMP%oO@WL}D$_u=wTk-1)?k?Oc`FvLRmH!M6 zHub)H82|msrc{Odvb+uRw`};$B9yoxsIjkmmeivI-fjFVJt_|En6i3RvhL}st^n@N zMeOjMa47h|+3R(W8n>=~Bw?}4 zL$sl^fXlveM&?Cr&9&wRUZLlO-mWQKl%Dy{=U&yM8(L>Yo(1U|q{({iamm#@w@-1k zQ*_q8$e+_RE@&+M&#-UloJ(r1Q6H`dK;uN6!I_pV*i8djIXxPBi7AV>Qv+Y*1y$}Sn-v`EIRkl3%%{X zk6bH%7GZY7PO+nhf$v%_<77d%-macS>)bxb&vfX%JpBqg7YAFyV*%0p)6L>44;`5*N$*&tr5`!CsJ>Vvq++@Fhu zwz&sXUF1HZ`R(Xttu%fQ@5s521q6gc8e(&IRw_=q^+fT@`hQ~U)&wl)+2-chEIH58 z1M(^T3DfGu@q&M8lS`h^N_Xz7qdhprFv{ zSKrU+k#URDb!1z9B=2_=+9dLy;Y{KJf(jQbzZv0Y^rsBX3{&gT-8S{(yrMb>e?X5O`C<>b&h9CsNiO8Et{%*ko}iSgyY?r`9~RlH(Z`% z{w(BtrH1JD(-Km<8XPW`1|7QdylU3H+Ji}%@1i{poMFDE7W6pmsd2yO>p%H_Ht!bs zDK5{iKkaGlww=>gtS(=ge^2Od!;ynaEVqTT$VbdB_%`cj@8rE^QDO%&F7xE)#wBz_ zA6uHBE!eVK@Y3U4u77ru9dcAQaY-6a&F!rV7D(K>*Zp?sx3tB!39~lcxXVzNAeQ<_ z*Y(L(p?5Y;4tIPWtypQf^S;Ry$BhMRHyl`+c*|gG^uaUfDSI!@%>B=>BsA;O{Ud5q zzul|5bM8OGnd?91>|_ks8~fO`A$D$9+|sWfr_A5g@i?ySk<+8w!ICpy8$NS(3Qj-p zEW5dA*RD5(OiQ%cIS#tMG74JW*`d2?-*bhn8~!sq_-mjN!27G$WqI?0{|q}6BTve` zN#8l+p}c_YgM5LbItETNWRs1qik_Xi<9Ya+Iqpl(+27fs-jLcOWYcEeYkB5YcJf7; zY23Tc1m@VjV^cm6d*F*<=TWm6%oBxLu9Us3J;x7g>nV327gr|XoGiH(lV zf9`)+_Q=NPs+UINj-qKBI1|cxIclC+Fnob{TI8iq}opu;5I(H2+HP zHM)#XOjNsiX9z@S{cxUgRgZO6)(@qW1Dg7UN{bgv$!6JIyKnFLjO6m=<-vCCX^TP< z^B7M}p0P%+T;H>NxuKXpYmAZAw?)tPpB6H``fM{ZYmLP8r3H^Rc&2^k(@mb^5_IbnTMc=eudjHl>-rlIVt+}&g)9`d7$X z_$qhn`OXQ_a}WFaeO%djY=6%gAu;J1Ly2`_3jf?M#5QcYen9fyGnVkbG0XZS-u_(i zK%DngOyo+%B*N8os$u-4cr~3{@{;#uG#HMW2&2#pwI?8zFNdx0oyXpFW3g<26 zzG=Diz|-{smMhPG=AQXmdGWDhPdRle&i>x?&U?Zu>$fqhTM}wHr|YHL$qRe2yT6k7 z>T)1x+m(!G+arD-JS}%}3g>qhrt9k-@qTYyG0Umnc!ge?A}}6hDE=VR@wi0!6v?l-C>?bQQ)K0(;U`IekADb-%)=?^-lZ#WtIoZoImm& zOTB%ZDWSkwcUsQ+D_KJKO^@(gsLgG3zIk^l0L@jJ8Qzl;9dXOh_D3R&G_92LLII_>&-*H6{!oupp5 zW{-22&!pYCJYlzX&FrkSb+u~|oVuw0=ivj1za6dDt_ldut4nSAexg+igL!DjJm zN^Z<9pO1TMY!WYV4&l?j$@phN`cIuzX_f7aohh4B80(F`-{Oo-{LipN=}4ik*xyBG zbXQAGj8mQR?DM&We#{G-p8c?x63{B4Exzq^Zu9#Kk7w8}KJxK%T~dtQr|o~AYF+XE zTl}9vNd4c6&Q1Fd?>IX<$dS`nk>w$HttP8)Vu4=gWu3+P{ zpqJ@7^{du8n}y%LePzYfT?IZ9M4sks;7{ik`c=#zZN1O%J&&rFXLS+>$3+W~8+kd} zdsi`hdgd^5`H{@$#|;m-&fe)kwwSFHzJm)}B@^qnnye?Yte4%?z&v9eB zW_Bo$aZk^doam|TIXgQ`@}H!7{p6aKsrJf#=k(b+?9;c!nw?QTbYFTVW4c7g6U|fU zGN*i{M83EwO}|s6^!&j2U9H{axBjg(>lTX%)SUFdVY%k?T7~xx#UB~h?RwnEs&y~< zFz1J-EYg3@It5*h7iWz8*mGsYc_w?;Y!|NPg9@J+z0akFJbqE#Uf(;>%DU!U=mDo4 z8?!RG{{)=P3O_E88d*1Kch2?eofQn()~){;oI7kLI2$&LpA_j{^SgcG%@W7<&Fp{I z9C*ii$>8ShbBSe7OHPOKPk+m_(LZJX%W3h!dv0ek>dnvbR7;2xzZo!Ndr7_8%d_^I zoWgA$F=?h(T26h)V5;`<%neq{EG~Wp7VlQywdMMa%89`bMAKN0l&E?&zl87KJQW+unf@Hx^)c%JWI6@2d5u{>5) z>~^cnktGxSHBT0us8}c1YxLBLA?bwK0*hufb8ej@>E4GTSW9PImR)`GuY<^vTWtRs z1m9MQP59jUSDgEJS@|E4Z9&1jLo#`h$5X~hi2)AN+f7;acK9cWwO9umCCJoAz2 zgNghRd5O)Qg~1z~IBTXn3)`kVr{jb0O;OJ4*9?muajUOTj$^1%OK51{vHST_W3wmI zDR@4gj^opOcK>SXtqgr^d z=!xi{ro{VE$X7Kl@x6+ob zz^2aul@&9m9L;{Pqw7}G@u@nzj%)S34a46ZWsKfkaLRAn;f`9*3G0PI`{us!Qqyi# zy>lr0i_FHxez(+bCmG*GKjtc#U!8DY=)v<{d%U|oS1M|R)(WlbdiyT^PJhcOhN6b1 zXS@OoMH~;7ea>30p2Xy`qBMBN=`K$8&<{@9kykD@wwG`3ImFYyWpC__#qX51ilv<} z{IYSr*4fV%bu$y#rmc)z;Cxg{cljJ|iS>L=BHd-d+*fyZX*$*${*ixwZO!WS#ydVZ ze^HH{y#K}_fm>(YP2?V1X?M%p zx9kx)vtWy1^VINj-kW9rGd%EVVEU=d%u~N~=Be;`63p!#X?tgSrSAITt=QGtum3Ib zQioi!M+L_d;nPvgNpJlYACL`Zi%jB}!pHf-tX7MA>KAVw-Lm}$g~h)8XGrzBa6#tO zG}S9>4(|_q#kX2x)6w5`iPlW>KWplQ?Q64QNZj!zI7L7(%-!`-!9o4yS6F`Y&Fr`C zv2K_;k>B#_@ioimv(>da{9^nPTiU9>+j;Sd80Kq7lXa|2+qV@=xKeb7>34tDZLgb| z$3HbLDm(p3VyDN8$-W!QZd{GL8sH^rofN`--{9qe&EhHi2b@C+nI*)wTJK9N>08|4 zVSS~P+xkG1y=HNo-AB0(`T|{B4(s?>%j+pmIc&e;25{-U;4w!X8Xr}IC9>4NfmYkXZQl((uM37xxk=aj`wPg9TD)|{Gc zDKGR;V8g>_Cq6A)Z~n(+$D&V$aWdD;t_NOj&R6l=cGGd|qNS2&uJJm*;45dE@O%dE zlxv1xzOp{ha#Cyk&}L=m{K=5gSIFu!v-*h-K1=J*2;Z7llNx-$LRgpcRm9PQdCFS%Hb3Hcd`>KJgKg^S z&ypHam8WOuEAsUBD5q*Z`Oh$ejrSJAzvHrb5)#!-k1Zd6naR6+#gDazGn^OQef8tW z`emZ37EAO)&t9uql@|K0+4ysTP;-f|#-9z^0T25P;#nNJb2_F8$fs<#KD~ayb(84R z$v+yqvl5<*^WA=9`nT`XrJLb4iDx#SS@59iNKjt8P`7Gr#M2!@Ec#j3A|~{$((Pb8 z9>8{Q`<2aKvwwDaJm%;s*!K5eOlpYaVT*QcgH589MpKGrM?Yx&eAoRb!#mX%yH`z9 zZMv0o;q+;SHM(D|BQIY$ZMN{CtalxgETc<-j`U0W5}VWZ(>HfSOq-@O`=}UK{$Zi1 z;!AZiZ%;Nl75VIuwBKaW)_Y+l;xhMz(|8|*o16Yw*uOx{>DUG#t)?}9F77PiDLP)K z5cZ=x|Fl+NS_NNYV_==%;)d29qo;+Jvbd!lm>Op(*D3V|v#*-!&fZxyo$Jv%X~#7? zWBUyhzpjwmJLAG*qp9qRKmBL8Blt7MyoxEW$Ch46s<>p^ z)k9(B*U$JVto>=+uEZZ$(y;XK0*(_m%wzk0PJL>{vMH4*@35KC@i6YNLp5+|Sgk!;>O5norZ?+7g$&f4Ol%i(OZ3%4v-SB7VvupDiQi6^XE) zP1!E^Y{sS5oWOlgTlYD3{^*;*wS&`@wLwqeW~-mzyCV!uEr!BnOS@;>nsmNH)zyx3 zu8Rm?;&Hh*=eN~!Hk7@17stG5&w=AxWfzB6u4(aVW9#`j3g2C0S<2 z*iQKwJ(38i)nZk6WHL7|{6g2&`-00(C2pNK{fp#-L(QHAzqN{eoyr^D$aDu+#~JZ& zVw~;B@Z(uxOxfO@(|=~&FPacqWRalSP%f~+%E?Z^Wd+aEGh$n$;tf|mUsE?6BH8116K7+4m*{t5&_XZvPk%uim z?SF8D&8RW^qtVsLKKtHYduQ%)Z=KZ3f-_~}dWz|$+zAiU)Z1n}pP3?%@Jsu!cCbj~ z-xD7hkJ+hzTJiNpjeFzYMMrbj$c8OS%vkYvda!0w^qoX@hoZ0A`))2e-f`5hH26w+ zSCR9thJD7fhCfm>;k(@$nsxEa#|3weZ0vnydc$nZ7q1`h3piuUIa6vBwp=Pa zX7zLCXL)-=(*>1R&iI9I?rh01+sx$iQ09oJnc@!KWW#M2cze!gFKfT`*zA5ugdN8V zrCU>%?cvDcUMbmskaJ^|Y9H4t16RkY!)KUod^%mbbkP&>Cew9RcQTGn7c7u!GTZ-_ zUpMt&mUXM(%B<+}XA3#~7bb;#+xJ4Yw?zIb~4qRD(>&24>WIM+P_7u z_~hdERyGpn&+IJBo%A5s@1(Dy%~Qvz3)@z#&0D3!u|pz+H}Z_;i(=8#rhDpqyo+xe zi|DRB_$uzz!lnyK#!)i+o^~7%o%1ZH+p#$#C1Aq)J5N=l=d7q%=r-vYyWlTouLm8^ z`j(d$Oq(XKd{#qX!<9oDs^_W2I&Moc`OLzw|9!_%hwW1zY<%|l+cd3}y=Sb{%FT8@ zdaxz&m_~}sm+=Q;L=-2FLCD^%=WtfPYNBZIKpyItw3h@+J-3*_622|!j9Hw* z?DUtsxl&xYTEbh86zl(VFlNt96sel=k)!-b2KSCDiyL|!Ob-N{%82Znu;8$pRQYFF zY1Ky}hIT?rd7ixaCGSwHyMKbnp<9;Cmx3NdKJ$$8XPenP;hXdJS!%m~Coxz}QQ8~F zKRY#%ZMyEOpFgIE$Sl41Z0onyTD|$-^%tsy{+Oa@d5URC@4`@)4Hb9J%6O|Um|5p8 zHE+S`m6gwd&R`Id!JXj@CJu&OQq~GG@IFKXXYn)6z~k*x{M} zRD(##^Jiuq*!1*|*`0^3Yx0!OU-EUIab5LR%IdQrE_$n7IRa{6MF7dV%Fx2K~;~?if8=JJo1kP8&^7P ztbE9^e?x5CO)t#{1>cQ%d!HV$O_zDJrRH7Sn^RV=xTmxE7xi9aOD|=9 zYxrar|DW%;mRltnry0J|-DaL{$g6vO?xB;@^`3I%U7y0cf#vdI?d8T1hqcoFH3mk0 z))%wsHale?|K8}--a~g{J2$D>iCK3p@z^~7jLy4=y~dWAs~ZcV1Hyi;t~>m1!TN7U ze{(F0d-$dy*FIw>tIuIc&>jg@st1b^jb57;dQj}q%N}zR-3OCytoq#$ zsK?R2f03yUx7`eKxf#y0R?}0nc z<~{!&P%(8W`$x&p&B{s_O1H2G^KBNnu5s+V;0=cdmuDZ@v>`Flx|{8eRp*?gkF1%T z+s<~1x2{v&f5x}`p{C4~!zX!8C3Y*_Fta&Uu-raBf%+U<)an0b7zv- zrVc&!4x>wAUIkjA3yvJwnL8oU_zs8H>3vz@Gg#zir)nuo(Bw1R7P3ylnfuU|{%SMU zpo-RV=^0)7UD&fqwI41vuX>Q&(7)o^yPI<*8eYHE3QkR9i^?`;bmH|lnL2ZUzK`6L z>N}j=FKwnCG<+pcr7XSh{K|<=kIb*E2wAjLc-pkn9US~Q=lYMVd3o$+Mth_8yaYoL zt=Eeli>P&oY~;DKRp`~Kn6Mwy0-kaQxpr*vt&`rC9;h2`adSeh#qBkxQeqv7gM$k; z+%~W{qWD^}Hv3=7 z6-eJ3_TyuB`{H~jy{U*ERa@f6)&-ERz7TFj0MQuCL6Zc&A{=d!luFRWk zSlJf5tmyKZ&b7<0*Z$qJ)NuRhrdf(IN9WmlSsqAO?zpF7+V#8=sr%2(Ow>-Y{f#UA zen(PY@pw%rXOj)OJx4uH zvQ4s<592w=D8LwSLu{qOvPG;PO&6)$o)LaB;8U(lhf0&<>>K*IuHx@QS_1lZPxW5R z=MkiJ?WT?x|5b)=>g_t^Lb2Lqe` zmm%NQ*QXZ zSMy4ir#`Y16XmqDbK-Ut3UFz2SZ(3K{O)6gtlI)*kKBytzbiZ)g*fC7?FpQ~eKT=y zV%3cu*8DQo&32zSIGBn)u3A;h%z9Vjg6en8St;{=OV!s4aWG7t_uGDM@Z)FUH}75E zC1!PTHTQpp;saN_4_5DqjP<&jm-BJSx4Zjsv{FE`8#X7s!OuM!vFXq&-4eiT{6I_aXRtHx#^1Yof{i?xrktTVs z8j&zHFW09=6{!z{1uY!T-_mU2dm@x{ETG#U`g&S~sL@RGQbi>CNs( z8m~M(Z|Hth+5TY41J8X7N@6FX^nT7uWlfDX{T0-r!|x;5>Jxb}rRc+lr*@@Rs+Uia z-(bVj7SMh$JmJjr8?!f7^c|^x${@|rm)>>rvg7HKQyaw`L{?cc%(=Cnd7t0+YqF)m z3wPe1bt2wAeRkBJiz@$*FvtrsFf&3C_=YnE21Y>v1w}(ggFxt=W}urO1xlih)Vude z+|skjEZCou)w;_k#kRh!@Uy~R#fO~TwNgTli;_;M_P!O5?Y$FFTUP#(=RX67Y-Q)t z7rWnhy|7#tsK5N@p;wx0fjp54Es7m=y^}hf3Q`0)oU+sm?F2mhj=rqrozH$xae_y_ zK-ECg#h@g~HikrBj zgpR1FIB{xT|oyd&=>HiX2Y%Z7T6Ed(tF679=_Ab42#c_$8;vS*Cx*@Pq$X z(O**gIAfEhXBKvNWXnJF7cmvgYJYR!6~~8)t?3cp?p91VWnML5;vE|y8~0DrENndy zCzfh@1#bFeSjS?zMQ{I#$(?fr^bb9f=DK;sqT#ED-#>oetIxgi;QNavTGOXI*tjwINM-lN zCjzH$+~JdL?WujRY5JsRk3*(-IJ^8R|B`fiy2Pe=uaDSie8>rWH$QgM_K+9Vskd*w zRM=S&G~Ih0_wsJ(y538BA}#zls^8ghOJAEf!R1PlwTj)5%$LQqwmbKaCj|{axaM`%gVmRc~FIzsR;@`L!yYou1Rh%suBD3CwnD zy;!(d(Bk8d3e8T@=?R0Q0t_ez{c)PuOvRdyQsLgsc_;GsOWW-y z*-iTwA35QZdhJuUnDPAs-&buu7%)BmtiGQ>l4dD?%hkj08L!{$I5IVP?S<>kNAIiI z#;8Bo&E8eUbyz&0e{ohw#jE4TKJ9t)?@+eeTSv>D*p6AJ?7rnZEI%jvRBGiD^<>=w zrRs>&(}f<|3wd}dw%)j=^xB_MZcN|s1YOuXb8Uy%vUM<2BB6YxvYe;9MgO5rZY zhA4ICrsin&{)E|j7eDN}EqtOPCXS=(?+xFj$0rLMt14gd;^JMl=Mi%y-E;%)-L07E z`Y!N8O+u5;92P; z`%uZ@$KPbjACk@O?H+$cg#tkMd8T2@xJc#ie0K*P$_JP~a%J0D(XKgci9dZVqZr0&7V zfSWG%9JK>#Ye-9hKXyUK4nGb#n!#ZQ!Ep+Nh3({ zx}36A+!5=3k-tlR!5^!rup1XH3*O^i$y=yz5mVNFzv77P;$y8Vr~Fb~Q`Or0sczSt zn^hY>E~@3;-mPeudVS@g(jMmr*EYJYaMjbSkT~JT@Az0K>)3_8Wo6-irIi@l~ztI=^)9PWuWi&K6{{7ru$tbARxJ3akQib9+D zgcgC1ORVf#PL*HtZLwN;lb?G&i?F845j_q!lh}#oP9{fk=b2?4S;_o2*?aQ7N!@EJ zO;b4MXLx?8X6vv?Z@4P)L)ZO7;s>X4@#TpNI)64QDm^Xb7(nt4cixV zBq_412nwjUFOjg37W!!|5;~#v8Qa@K@-9ca*h`;m?KGSB#IAA6Rl7U0?ycL;6~2&R z*O8+e4c{g4I4%;F(Y&&Jp_1es;q7dSWe?^*NDna*R^;?|`ozh9Hbu>8{>3+XR!vC) z=WbS&&8ajK$O>F7Yj;#mj{CBcyNjM}%(AG59KJcre#?q#Za(;B<5TC#${@}%hnBVu zT_5px%Jl-5q-I8!lUhX}LniuTd`X5|T zw6Lvx!y~Bo>)r$VBbs?z=EeAHoL@TA;P}KY~^_gS$3zoPtV!)z(yeEy#&mG0#H9 zqCjL$!&~tQWecEYdjsQogYNUWdyf zN99w2hI{LNR2}7#bvv`n@vo3ZvfIL^3ymDp+uvDz$i5vVCANv9lBF@;{nm^B3@%2_ zJ%vdxc1%upJ0xfLDxR$)?f7~wL#x8&+@%&rS6YZWr5>xWTYPw-_R7tBDe6f*uPyf+@?F(b5?e6v;7`{VgWmaGGN9#|D@yDiV!@I%n(^s$d~@-^AHr=6Bt zy78MO_uYGUW?$JB-)+Z!X1C+C(|QZHrCHoez2Cn_FZ$y->6}f`lCRjli(e@#w=p{B z*{!;LWnu30D<29s+Q_hdu#MLF$8N2=?M?Bf+aK<1)_-;F?n9%SmwQ?#U!Qm^Qr5r5 zxSJ?-In`2cX#im3lH{p$8LYTy{urT)@}XryK~ZYyMyQyk}~(^E4Rmd-+LyVld}`w z!@6g(j*Oj;G>5*bKGSVu1N{nag^jG!Vxub`=RW88S6LWHy)9c+Pm7uAma(AD*=Nfx-OK(+{`L zx$!4*vYDe^^oD|Cc87BotDl^5zvAw(C%byzyqz9svi$Xf5AHhme%P`6k?%SBJ2vnl z->09aZTM4d{`xrGnLc6WwEI`KNN+mr!FP6gwCcZgMW=Nh<~}UgyU9-faM`EZTP6s- zpLqJm_Q{``Yj$ydpR>K;p7f3DMyG90rd-bFD&KZv!_yy|s(z$SD*F6zv)K6qH{V_O z7QJxu%IilW)!EBZcHD0iwmryJkUHdqb_5%$koesadR8=tH zdfug%e{UbFF>lM4KiPcYmb{CPw@%VdyBg=5W8CV~4p!?pX4}`=6(F#$N3XgX2n_De|W;nz)gM`^Rn{`Gv3uk3mrH(>DtGmx8G~a z9keaj;ABzVBv$lO*1%rLWA{G!>Hir5+}~`usQhMn&7XT`=h(dQOqcu z)SaZi%cr!-vHN5gkDb}kna7@dJ0uW!%(1-ugSGS>Gsk^V0uSfb-l&cLR>$+lrqlQ* zL!M(s^Bcvxr#G))?DPIPKl0O=9sV_YScLVNlzW;i?(MvBsBF*1ue(2_uUmIF{N3@X zKY1Vjv@YAXf?4kL9n*VaE(dI;AITA)d%B^?Qh9pAz8{rGSsU6P8J~E&@pX|3|Ivp( zZ0aTRww<$S4NDIbuVX&F+gA2;eCL%)o#{yen485s zK34D9R9W#aQug$ojh%FQ?K^&X+!D~;S~ZYvu;km=f(N`ftf{Q+XtC^cJ5Ef`>%`qI~{0U zpL}=8F(=t+9(SiF{F$@o?X<|l?>}u+Hr&fna_h)X&ewD1u(=0)oOM{?N%O<`VkTDg z(sY@)qNu)nK~z3^6-Jrdvr`E zp0PK)UYR!knfvy#bGOx7``uLV6Hi}! zbJdb*ue6}_;_q^W`(+;fOXzzmb)I#u`#x?Zi!%B7&6U!XmEW6NCVO+8p0{6Msr^?z zw*9kT>%TbtFZox$#ku09lz##JDc1Mu9`UUY7A&ogN#VQOQ`4Qg{plXNNR9mEKmIcm z1XyofyX$4lh z_USmwG{;>B4VWc!_S*mbZYVi_-nNUT_dgrUA3S*a9wJssHDsgTJ6b$MJAWwe7F^N$&N}|1<2Kz3Bbl^G`QO-T!Rp{wU|c!%ZL0_dkB0AFuoP z9q%5Wf)6zj-=BVEyZJ%xWkUVESjq4I8O+H z%W-~o)lJ6_K1@1ok;`o$d;XoPn?a4i_1*GY+VzAgERv^R6RQie$-P}J&#(91S~#Eg zwf>d+g~o3dsio=dxNUZ3MxW&NHG&hr{d;%AaMR)alk4B60e z51;fsJGQ_0@m@OrNb-iK6R#gpbD!WO{N(5yqn5(A)Aulcmf02+bbQadE6Z!^j0|KH z-`y+Ez1w(yhrP|V!yArCEAtum%-sFB;@i85{W5B|)A-AuIGK6&NlxC;$GNFG;m5XV z^S}3RsDJ#|Gp_&sul^;8HxAfY3cb6dx`$ui`eZs=g`M2Z^I`rIjo*l0=W(eK=VQ)4 z&it#bK6TxpgPcFVY+m<9&LH*IlOI)kBGsaMx81gR&b!C<{N@j@{;m7>Zih@+M3bkY z!t{?UF2(cvSmc?K{+1Zj{a}%Q|JNnHzBBvg&rRVs1#P4AIX7KbO*>Fta!l;-HqT1q z)1}iD9veKEXWkOc`t87_*eCLAMgBPjpM1)HEx-Kxan&FFP~%rs@{^lamOq>n`_5YP zQ<(TWp0^$0yX&e|CLb%xxvqYu{kHCdveVx873zMRKjS=M+Ua{PpK2byis{aM^6pc_ z%YSR;zkj&9(Sm=|X`QFCv)w+}-ZtlG_vl*Y6Mm^;?!)=*GhVlUJh6@Wo%_|>nYZmH zd1T&a-Vvd_d6T`0^`Xf7?AE-SdH=20^}gao^`wj&3AYa)yM5!+E2)`=wNamSTIVk} zdi5}zoj=Ar#=PUD-M#NJx$}$JcCx3PK5_l_qWBg4VYg4nc|VFOIcEF$>7F{Z2rt~bVA)hT^|2~W)dHg&bOa5vg4fgoORxf&F{XQP+!C+q4d{6 z^tt5mFyT9v%*Hp$EN)laOfO#PaGJGh*1D;G@69=XW%KIQbthld^-pu(`;T#x^zv!9 zk5?|ft;qPMeRb7l<=x4>dziT%gnwGk9<#!`O`c89Jnrhpp3hvn zzRdIYwEl~qZkpBpG{0G<`#k6HZpJ0*J8ci!>|1iOU+0H-@g5no@GF9E=D2f8DsUIg zjji3UUH2njs9tx*H}AKvZXeRmu-n<4y7)^yqx+L;6@v$*TRFC8F8V8QAuM3-PU(%- zO!s3Lr#Yq-9Q~>~$IeaY`orm8xhf7!eq(0CQ{ep4`qH12{uMb^yN%Uc{k6edG8ZC(XO9!b7n^|hnVoR z=9G8dOJY4!=iV){zTcSfoH=*f!IA}@^KNdf9Io4fVxgva^^)Z47ocbIItGjE-j zrINyabz!sAX+mt9C918S?SJ%IG*-&-qwq(??8kx!Kg#WsbJbmDY!UG&{4@XU)0Z8} zUM1dob4++g+vMX{s)Y}}sjTW-zV5xW>h@`CqdNkcd$--Raq=kNncAQ7eaWr^55L^1 z@F~$b{%}gsY_&+CoEe|C&wU=W?J)0T*3CCq&MCiEoLl%kr&`D-U3N#lu#HUWgo3QJ zNK;RR@;7a^latQQVZ5x&&i+CC$^B2ADP_f*Ps)9Nx_!6K?(KPR`VR$eFRWJmcso@n zo%L%z<9(I$Z50yVn;W2t5A5NL^{Po15*ougb_U1|HJu`F+>vw;>(jWVw#r@!uHwRC~86@7; zaou*CZ{_2P?#m?`rZ4iZOkKua;2wCN$9GTay9!g?8`~s)$mnh`i?mUZecNwm_i>J$ zi&3Nr&rjp$@=aflpM5;x)9)Xg-LLzL&DXKG6n~W~{(jn~_W1O5ock8lnLqvY{QnUK zHR$=POiYmeBJ%mGpyO9B3OxJ(yIY;nUO=+s`wk{8kqNP!QM>P$%zEi#@b$j$`fN@g zqi_EiT$UKDJXtm6WO3UA*P9$N$E_OO_ly1U&R^cRWJTZRF0nhJVog`I{!DunzDj{F zF7zUBI?#Zcqdlt<(mib4hBdmMrM}cCa))=G4 z#jB+z-IiWj^3RZe@vgk~M$-k{%-8z(9(GS=+BQ90M5p4^>yNA=qMDoBt79!b^+hnx z`&?q z#@4ne$)Na0o{-!<_MpXXMd1c#Vm;pUS8Q3HeZ<{$=JgeiO<(UY|Mci$)2`mdM+{f_ zPOF@{V5;+u*1&c3hI6j$+;TIeYU=Dg3DX2-oz&v;ULs~)&QjAe^$6b*W@Qc4+ecid z{PCW%DlSuY;jd{?o5K{pbAJ9YjcL;w&6HQp3uIZ(t~ita>mY;bp4xp$*N%#p9@(V9 zV6v&+zC+sWVnl#tQK8YoTR!2_Y=nJS%p%W7FfCp1ZAW{9?c8+!^@0=4*H-NanImtK z*!bDl<#%FFGkbt72Lr=8)C&^da~ zd(}17P8+FN`{NRy?peLYVrT5)S$Fp-ZtI+yQm`RGyzV1A$Axuz20R;%MdhCFIQ(aF zYfU*v=#Gr%Mw2*VXMR7;p5eCoN4wDNouOJ^PikId=&`u7Vd}!9`7?VO6Wr!Kt&!k) z@}#p*G%74lwah~FGLz_r8UYsGFLQlGx;O8h!t3n6qrED0X5m)rcf2v5D^;%u6bfHI zay0eAM^TSQKHZF*3E&eFJ7Nn`q#3BRd2&lmYrF=bxFsX ztgc6Vt1o(eX2TxgIUX`){zc99nGro zk@Kve)Hbtl^E20;?yyq7dNk;fMil!BHrB@WBafOt{js0Hd0^Yet==nL8&+O;vdqo= zOu_8lfaHH-<^lqIx@VmIecMl+I#~2nd&8^1iIbv>}3}HHR^5+q7o-;)**S-gb&J0^?Vt&M=H>Ex5Pl z3{SNCpWhwEheG`X_w;bi`7X^>d?$;)U4U_^Zp<~eXI>dhGb^-y=${d3NVR;IQYBEl zv`+PsFwgR!e^r_rZ-3Sh^E`Z|R8hJ3**ewrtQVH5usYPPa>zWg?}(yz(R26dKW259 z|6{Xo6j}YRk|}YTX7luE*N^WAk9OBftTq$e*AwNxxF{+p^#42HI=i1FH5UZ5&0@N~#s3CxW~U3k zN_E-zVYx?HI$>9-WNS8#+{kPe@(-EORR;(bORM=d%4X91bvc)vfzI zRg`gy(vQRwY-{=|qwX9$sMxeGa%bK@xdqMznQ2=KpC#*?#T?-4-l-T3q9}tyfHYhttMB-(A5tm={^0yVPS+~{0(vSJ3AeDHoR-K_%K~ld%^CWfW^WhpM}|y_)Z*{uv02Q?(|KD z13MNQ9C=vio5cE9F~>@=)b$zXsm*qZ*8H}oylp}c-LnsjJnnArWU;9AMBfEF_O6Sl zJF(+x*lnwWrh;chemAm8aja~76&M|KT;P~opr66faHeHzx2&!?xTkH0wSsHHs?)g} zA_Q-=_@|k2wQ-hwI=b-X)&*j+X@PG`H}HCWP*4nsIk_N^u`kx^la$lCIn^C+1gA~k zb7aQbj^GDrdQqLpi(a35$Plrqzw4S(L)<6kdcIZpZ)Fn?3B40`R6pI3cs$yZZ6>t{U{Sf#W?Z?*oJQ>}WNU7z1Nu%!H91^+YSx^C^b_L&};UJUhj&-jH}^YK3u zJ;hd&c`AL4-|K`eb2sztxx-$kHiyN?`e*HF;iXYKW4&EAa4UU(6(*l@Qf!MKk6Y)K zL@YvH+L9Caq9%QxD{&$4Md#R;Gi&k`iLF?(2vnH6B90_--I)Z*S#+jC<*Rf@izEtW6r(;tBE(B336;=e44aj*EzkIKDVXW z@e>Y-)C+nt#ixjiXZC;G zeQ`r^lib3fh#J|`KY5Gza{pF0*0T!8a2&b9r*n0Gv!ER7!dY)sgGH9NH}9B{&YQf6 zc|)gleZbS{*&>C3yEhy-=(}d8MpJ0seW62coQaS29QH~nd*hw0ciTNjwP!Ws754pt z_cnGX>tA~N#@6R<2In84Ho2HikEFgMD-siQw3(P^2gR7N^FNuM81f`>Hgm)~0?8;$|$59Rk11RG3_%U#jvQy$UO?wiabz;ter+1n?ItHdSloMbq^ z)AyKUuTX2(JK^qkWoIM4%rw?Hw_b_ohV%hF$pG%Dt9BeZDJ{^up+1E>UHsw>jYgrT+rE9}?{@Ua`LpTaCU58C+ZGfS z9a~Tt7kx)p`kaq)&qqB`(SUfXeThs$)3f*4I58D{ZO-v;-9G<$y>J7QD|a}Dso;Sf zkBq^-;Dt3Ike4xJYuG6A+@zc^`Ya(M#dp=*ZH7g#w_xmVWsno#Qk5nV=RtJcdikiG*jvJ+CQfyT%UdCI>352Wzx2vI#(`t zRdx6=y{YW9>wJKv?X@uqqs-vDo!uOc#;EJS!I3J9Q|lG>&{lmnP)ueJO1`X zZP^g`Pa%{m*7}<((<>kQ87F6EgipTrD5Yb?yq6CCf?3ncIe_2 z@$}&A3jvBJuO1P4y7SP%x?f$pDs}WNf9%lxD6x;fV2LfSGV`nGH?oUf=v5l$d|_)c zd!p=rkU_(IV#o0lo0sl0)i^62ox1souJghrWvQ=Znof3SmB{?y@xBm}mlZ7+k(wPi zTlA?(TKEmC^@Y}%P1{O;HHkI19GSJXi^b%|iO{;Gxy^I-^Jtspq{bJhF>LMolcauO z>9hl0LDSjKiOyKM_pNb}~IrEo^4;vS^@2xo}`bxv!_Sc*{DGMs%5_3CTkN#y0u-+@|Uj584fxYQr{K}QV zeEjy74U3w#urYjk#{QinNaN_b2Wi%;c0F~7Sm%{}@Xx6y{6W_H1$U^l2CVbViUpXApd#3V?kSDkOhi^bDO zpvZ0Qc_#L=6FRGt)lW{ot|j%8*NZ_YL7{cyqB|B@H+VNT{n5R9hSlKgBOT@bVr6&l zHEw+u|6MpKyxDiJpGPu#!E|SJ)dJ@XRrb925Ake4$BjM8rW+mEiu zBnUB13^-z*zBl)o>4R===Q&k&i+DSndLH_%sX6jEd0+1C7|G{CC(9ajvk$!QKcjGI zRSqA+a+akW`{u^6UkSPWdb?_k_s7{aq6Rgm*mtq)m%QSru*!-_vNb`*E|x9fG@pp? z&F~#tel~h-x~cQSt(AN6(Y%FDhC#d5DTXbUbN?{SbWz}z2Z=5W?QEZK{AUPcS;g*u zN?<|jZGA(bFHCRAsL3$BVaF04#*yIBu`~OR>hc;KVexxl5&6lwvyHpWpjk&Hw4yNWokg~DQ_#P< z3qkuHG&XJ2ofo<9v*^*z^1o*dgHqdsjebtyoFcoXENbnR$TF+a@9YfSDi+tIb$VLk zj2oYy(dIPK6Yt$15_LQ@?4=E(dq7XS(yI3|&KC|&ZIi#ub;#)0F7X*tTar8dc38JQ zPo>s2(WX>-8(Z#(^D&tkiUNOTe zMJKUqK4ID6>jhL#+a8}Dpph6;@U!D#P*34a&kU`FXP4{D=<)ttY%!5HEkMA+XQhwG z@}=us6rWle%6&}Ey|X6r!>hQ7FDw5uY!tOSd}rIi1$)y>kL=7S=X&+vGS}kIG64}= zuDWiGx8r+}#=PO^zQr2Mlg=#d&i!#NtvM_-+CVKZX!g4ICEmM|@2ap#H)&^O$eKlR z{gggkc5H?GOdl=Q>`J-Pk8%YDmD}^OrTbeJF>~*^vXCL*q1*czkvEuTUA!&Wcq>AV zug2?%qifis-)@g~C@{{k&iX9Pv0;ViLOzaf3%MtJGP@(-sdchvZEiGKxfop5WG*n(}0QQw;xOLi&7vfOiiEVQJ_)XC(r{?0Cz7lAgXLrfEt4j$^0 zT;n0t6tpb7kVE}xrR#K;P*-IGwxwl_q8a)=86FAPeat+${0$Nk{ctk_KUOMSt=le}BX0~sPVhl%K{X6$(r z!aApVXJXolrfcl{zK0XG9&_M&V*Q!__0?9bqJN5Azt&z|y>D8Lz+AD)#)c~C*(zTw zmERkyXSxe+JysC&BEC#&b`t(r4Mr;ho3jeTU_Afl1K zLpEJS>(AlcOWUVC_0n9Bm)OT^pzuksWJSon{|v{(nk=UD#cgDMvg@G5A&+lI4xDFO z`mUEt&%AzDgxP@;_C^yfd6~)XoE9`MRw3flHS1}`50!O? zvsM@zlw>AZ?hni^*u$^Jzr$_XY&%vT$L{dJpNfoazJFW)CA(e=cz;^2 zr`P;$lBn4KD(;Z0>BM8TryO?cnO-b3P7TYs%KrVMp!2Lb4CVhBCUCshxVGs~L_>hW zk696nr(R!KH?`cNa(QJRkH5^-xUE+l9tZ6Fc=fxictL@5*1f`_Z+n+jf8_Xeb(y^W z8W;9(o@@4jxtsZpS$uqy=gc+rg2i+reU`Ake+gcWr$l#$pUGJ$YW{AacA3QCyXYZsbPY#|v=9<*pF#V=siM)Vrx7IDLSJG)}ft*fl z*XRH7;dr<2L5&Zu6hramEo+@!I#)a?Xg{+t>RsK}lr8a+Tg=`!xG(fuXk4=HJJF&0~K|D?>TtKr2t2Ur{B&xE9y zesazdh@5EaI7MUH)jHLN-M$5P&K>xz?ocsJCo5vh1)b@}JJ|(Rtg2hxbTzPo^|Kg% z*UF}8O){(YoLRjgMY}?SbJEU2&aJESUc@$C?{yGRIy&9C=4zbM-nbRh-d{Q2wCO*? zfsSVJ&~2xSnRYr`G0OgDIAf%-i~H$C{)rw@d-`Ki8^ujSmQGt5{#D$ zc=O=Xw#hE5wk6%ZF3gvhsui#PT{rYfeYRzT*c;=+S8Bh7K1eQn#?%`7v#sPsWrAs$ z`IhqO-KzIHQgsVNCTOaze_wN;iDARhZ~^f`NqLUP!CdCtLXulACpxOE#D7J*sqgR`*?pX%{OlM;|cAd>r<2x>9p^M0O!t)27YZ zIWyS%XHMumQ0#KXLCxgUnw14PLR-9VxQRL@E>AgfV_VQ%uSaYL&s^O1*s1N0g9V$0 z)rt@6k9hVi(q&oPv9Whzmxj)L!)7=A!+)Jl2VC8mrBV6xXJewMa3$BYgLR3!;)OFF zFwK+n`xEPsz?ASVVw!NQuERCic^kDBI7OB!pOv4%_B~+x%QU{vOlyw4Fk6n!S{uIhkc?;pi)0fX!rQv*W*wWc&s5;5;+CzPM}lKcE8RVCx}5upNKpIw zBR&gwVwN{)b9paoeiW|3W7a=c;N8ZhyNv!EmooL#o#u7-kHgu;1&uG_9FK)Bb=f7x z(7^ld^X$%D?ds86v}%&#EI2~L*R0vSW0l}`4||rJNd=#Sy4pU}Ek3hY-zEC_)XOq$ z`lbe(ovv)yTiMJM8_ve}JWOfUjDuwn)?ay!WbgEpc2l~p5z?=bIp@xX*E3pn-51pO z;Ij0ubLH_nF3XDzX4@Mcu$sX9t!CBH2*buT(~e7V?{>b`7jJY?c}eMql}^qpZ6ld2 zR*GL07K&pLEqV5}u+`CN`K35d%cRf$84Nk~?m1m~c-pWj;9~A^78@a*hqG5`Ep^?( zCNJ3;cR?h!;&s7kkxODd*Uy}aa5yB(-uKKipYNXQ+wY88g{$q4#KbJO(z(HV;eFx$ zH=Fe~z0%prJpGc*t7H+0^zyjG1ykJY7WFI{XGXx`Rq%`fY{^zZGm%PTiENbsy^ zTr0Lu)ljnF#VfX?g)s*o#m-7t^DWVLUc#0-W~1c|F}mKDeofVztJx%xo10VdOmN#7 zG439z>6{B@oBKo*hHu{)G$nCyUt+Xb-TSbc&vK7mZNIH%()8MnTVZ_%1B1a1hr_9% zuKyW?=C9G+;Wj(Pz}Vo>_N0yGthZQK&e{6Fq{dl7VR2J(w(qJV41uBZ)=Ameo&BWj zQ+sNwNPCUJ)~rfg4q-?dNqFsciN1#UVyhHB-d^?%E zU$5%$_E%_Iyy?KU#C!TrdI|!xlUoa9oRU3QQ|F%X(DoNKDK~z$r9gCw^-M8=wohf% z(-tdDUFY=uU7qaIW!vX>rs~A~d?Ni^sw-E>FqV6L2iq;S>F1X2)ApJ6ctT!8u0zPS zjRG&lYwS`zp2kgMUAiGQ&9W>sY@h6gXm=`ds9`OtdO}gU+aj{6k&Z$3)xQz=dza{-c;T8h3nJK8b-DQVo^DN z{FXX)*WPtjJ~7qR_7$rVJJVmsZG2x=JX))IZX>g!xY{yKj-cC0)dp-I&wkZt;6A2Y z?jKupCXi!m`plH2X~Ai=M@6rE>C;{@^^aqI(Uuu}OSR7^imh>3&*rm#NB-)!(+n*m zrzYJzveBIR>eHlsk4>#ytS&L!S8@%%}!47&D#W3@7_v`_1SvA_Gcp})91v~e-$36CX0N!!eAF9 znlI6m7rjX7r$vj%!xg&jIonrgGEQ32czMsULweoa6~_Z^Ejb!>IrI6M6wgOK*V)Z= z+tzIsoL?|eYzO-q&e=!(#23w4-q{$XogNaMQOOft7qNu5aQ!642s1XRM-TrqtjY<~ zH|5Xuy}0!AkJe2ATN9*b|9B;Nxu7-Zh0kOjvojS{PtTuZG0l^I+WM<&mpnW7wMOkN zQcHVIH?86nezj5h!akP#R=9oP#Pm;7x4(*6`cX_v{rIcAM+>s%vqao*R;-L`@_gsBJn?=d?los(UBZ<$@lQ@4V`I@f zX2qy&m=m;$gCkMr&W0UP(rwKfGQ9(T>8-pLZ=ilNu~~j*>&nbI4|0}CcJsE{_}sJ$ zn&|#%PuydRpec)~VimFMD=vq4>^S8zc`K(@7JOM?c`{XIXGad#GO6iT z+GM0T1Xrg*|{b%V{7fZVs=@k+qDO4-1&kR%L*M8`I=RHw>w9MCDn03(>{&Y zMt=p)Y(DY3>3#T`xOkV~UW1_Kf@0&{8F7ndCv`5iS^D{zjn$^jj(^rLFa%H9y^c?D zySP{{L#fz}U-Xlu<=IP++xr|Jg7Ds}S(XX+dsgWnqq^hna+& z0;9?D{HT9v0*4j^MeUaFFk;H_-myX3_4_HMGaSxqg5E9o)?!;{cIS`&2e+uiduDtL zic*bBJ0YDP`NiM=4?}7e8r~-I;yzAk(rqriatNxJ?w`?YXtQ#^Kls zt7~6=dT(j2P@a4sM8P|{`SvUBSrcM@W!u@M&Al;;=~GOQL~8xMM5)$OaSLXzIHan6 zWMSL056ic4IPO^Lwnbukg2>kY3|Dwru5OjND0lTHulV|oms;=npIJ3EH`JU~_+!b< z!rjffeEOLU(ErD%z6W3qmBa_Ui$YxgD#=V#4Sl38`tOSChBeK!x2)29IEm~KG2Zs8&SADCHxBH%%U#MpH#BB_ndB6ynESiF7;-=5 zcsFIi^QcbClN>KDY_+fs;`s6?sw`LkfnepLS&C6b`;v4+`nHBXJKwp$agNyeouNPX zT`6EMS|Fxqa)Dzx!=?)@ie9TWM<(|!?L3*fCR(fEgJE;=YONW|=eou3P0tMt|L16D z*C=`=q>@wT?Fzy5Cg;C0<%S+y`>C9FA=`1o4<0LBKg9?zaPQtw`{}4!q8#%MkyBGw zu!}h`7N#6{ZG)*7jJ`?tMDi|vzymoTSRa3-;TmMON(w37UL{88J%?Y4y+ zpM2v*rwXd>J7A{kHPx{*cH_$9oD^3?(o8`sZ&BrEvKB>Kq=eEHIhVO+Uky)Rn z_O8`y{op-|;oh8Su?yu^m3D@^CO(MCQZ;4PRZCU4Bf{&HbgpFUcf&LH#N^Hg$Xr~o z-M>J7j%$HsU25vo&Wi4W{|w?mx7w0+PMq<4fvckI3YG)=+oeC2c8ER}=(1DQ@>y_M zOLEcuQoXaTFB+$6z0G}KZ}Pn3;t}5|5A3h(ydJSCB=uZflF&2mvi}TsPg%%By{_7( z)0p!@yUEODtItm1BLQZo%mi<4r3vOOt1R=2*(g5OpG<@ZZy|kZks+W)!oCCHRaRszr9=fb}b5@c0FqfE=b2BDsQ6<#N)z#K)Umc4&{^c+3J&prK6zN~+W(m|!t zzOOo5+<*Inj^BQEkm;M*hL_#5KgB7t?W~w#0u1wmttDdYs~~lziv;SWvyq`fyL>8KKk-5en9eCxunb6toq) za^(B;XPi%)b}MfCdnN5-tJ8mm^#L4jT_?wjK9gAeaJpCcwvIRXFLd+fcWmZRePH-; zMd%?#vq`<}(^t-sW?;XSsPV;0`+VHO9FKr%i49U87^=?ip1CQE!LVKC(4R+&Z;lqI z&E?s@s-Z`VUo7uwcVW4}#0tK|8#c!_bW3a37HS@uZtPxo>SXA?6^%}!0g7Eatfw^| zkW&l%TCnxpVpa{t(tirOUo4BXcxRw};9F&h*V=O-bwTTRGu%9VrB=Oeanw6_vAi&w zYxOJ9vkU>7jz-Q^)6+}z;Ru`$lunp=inG z-Hk__h1UNGOYg|z7u0VHbfd^fB3|OQLi*yTf?}!E=BFXX|Is???!*%TD~bde!H~KwQwB^^iYbO zv)-)6CFJaj7l$5iv{-ocsoMgN+fv~R8-)xO)G9`?dj!5JYN!#eS59l*RnfGwL7Rv1 ztk&kf6IZ256kERMyFWHI{ONlAnf30u=A6fjHcLMIEHt%i?v>Zy4P(8|6!JZIB&obf zb)(1zm;LO9r|$7^#!mR!%5Zc_{F;O7>iw8kSvTXM`CjS<5jF0jsg+@QrZx@ei+SBYz^eT7GNtWfmW-Ms42!`7o-+e2SzvrXT9FO}1cP5iH` zw`M`***~W~ELL;fVZXD4OKa7Zsb626t>^GFE}ma~k<*;TRV9XJ&8F`KdlF9ER9zFo zxV>G*b@M^-ua0y3rUoDVF=dCrr&_@a1#YkFJHxmcf4Y<_O$kr<_)1nU@ok{@E^X24 z25ZYyzX%G1C0@VV74}d>aB|n*jSTEt_-8!g5Sw_oqaZqI)>jSbq)07>BL*wB+ANgd zV`5w?(rxv}Yxg0;x@V7_XS`ah@@MGDb|fyEa+G~}{)#)BS6WAW zE)>*WXCQ4Gt+j#8HzD-6gOheo@%(2dM_zb+xE{s4Y&yJh^$a-|RAbB~q1dSJCKVV8l>7W?;waSsaDIafht>b=tuJ{O#(yNA=&sqY;%OBY!KWtsMV$tk#$=!lpsg)hB?%alYWv43? zAF<9@d$_;zkSw?8!9W(>12=nHTlDY#XE54#vpvr8h`we6!$xQ88#g6wTpPjz669pX zol{KTmb$#Z{I)Y-+pC?HXHRXux|U@PkCRT0(?2!M1vmD%vKNLX)E^1x5Gwx|=xQu- z=*yC*Cp&G9PFL#;POYQ%LEKrcg(t$s+XlYYmWDlGsQw*Ez@Gxx=mdi zUv%4N!(`rb+OPOqikE9~xyoJPncizs>!4P8;ah3k;(ekve%mE2v^^}NF4PBDa&6fC zt}cy_{JCA@G=SP=NmDA0i6 zajkRsa#4R}!H1st;l3B{MM!Q6iR_Cw^5*oS)e8R^f~L4^SZAs5>hz%&u1%Akl&Xm| zW+w)%77YD2F_4=p_jJtO4L12v^tvd1a<2s^R`K zwuT)IKWtF7F)b{%*z$Us=5M!IVR{xmo_l|{dNV3nEo5G9>ovV9`)p&rq0|fWo6BD9 zTl_?qTko}%ji8v%j!o-s*#|%M-V|>ysC=n^`Qnb(^F!_U7A&~fGfPVTib=z9 zccX=ewGP?d*_#`^W{>w0jW_!GaTJr9zm_EH~>Xw=DF1xBV z+m^EHS+^+@0v)2A~L23xgGh`!#rw}5fZ zx1FtqTybmv9Gb$@p!tqlc*@(KjRryQ9lv-taA<4~+L7(vcy4i&4&U>A4>P+I4L*v_ zn#srBAtWd2uriIQIlI=&$;`fKQrRW>|M<1b`QNiKH|OE`2MBbrOt;EqK{Zxm9|(ecf4b8<96FO zo*7dQrM*+CoUul917u{I3$8X4bjKI~$#1l`1|83ouR0NtSVMo_6lw^M$EKv#vhe`;lRuM^1i6LqUcw z-*sjN1*L0QU-<$=<~U!;F}{7EZ0`Xsz2+Csc(XYVY@a#9>Fi4Jd++3Drv)0GEtd&u zTrYk^$|I%mUBnBKdC@l>L$W&r-gZyTl&`_GZk=I=oal zq^Q>GPH}lui_yh9<|Os;BB>}<{wwqxGv4_Lf1|l z^IP1u{B`^X#YxjnTXfGo9@r~>#8}*5<*AFzlP$7L_Faowy4~FWRnqp#7wx(kje^Dd zZz$MFlvH>~-OAfv$iVaL>8gj*_N`bJH|Mk*yNi@dnfpg`Gj4_pv7d`3H#s(L*RP%x zQV@EZZRzI|W&MuXIx8>68n=dreSQ`v8#6KQA8SHuW`s~v?s@*grydH@`sxCwI=7Uj zUJg2c+&Rap`k#Vb<5#zz<%Vx|7`1#B;hnH;ON}cpi;_rX!~rw6Q%4T0$nTxFB3rZJ zquwGdrsgx+6QnjcMo3u*?`$*=*IL1;v;2#~*;PiDXZ40Co#Xm=T6*gH&r=QWFdW*s z@FQ>9v9;4HSl-x(Y}%taL$x|SkadUnBykU!KTbC;uzGG>w9jML>}P*>{%Yv#*fQg# z__KwK(VMQ-)C;@~a4xG}-B`F@b@S#K=~MEjsm&{HP_>*da@1ztQjUPT3O`ml2o@Or zp57s{Yu)a3&jtE;Clvn6_!?37Xi*UV!db5RjXl?A>=*tl|FP3StzElqL(vh2vmc_) zYEOE4bh--X`_yM4o&8FWqmL&c>&tG%oq8D?6)`vSwH8p#)x?7%= zGR4m>KeI&NLAUBxmv^$qr+=zzxR1N;>M;E}=f>|NoC{MA@ohTZRH4VeGkxDDuIh>@ zXShTc+)@41(dz1IKQ-9)O4MPIhVwJ`t3H?C*dwME8E*Ofj(@IE@mtM_4MP8vXa9Rq z;}n^DI>B6To8GQ{W*t0>gm{mZE4|%Uf5%}0Q(r3Mx1d64!(M|N#r!n~7fwtTW4rU~ z(W9XA-TaI87xoC|=o}6DHP;}z^p9i2Za(#A3#)CXJ$(0c+Omy?-;Ecsyp;7lw3s_R z(9|^Ug}&v~3tYowyv&%BJ5rg?&Q3-zWmn7kKS&9E(Z*O|l{rcTU1eeS#wEkFCac_m8{+o|;@1uA^S zZT5HbPZIWs4%?$}Ki?yXOjF8 zGv`~& zKd32&^k<1r+R7GCq-t?2_1USy6xA69MgH$}cKOUwW(w=OHJ!73>g-o(3(`)g-}OG@ z+p)Cx5wGKqX7T!mhmGbbP2_X3hncHNv3E$(reh2aVsV#d zKX*DCdF3GQ(*0+8#8kI=weG%_`c>!PX?JshC8-{#JJxb!$TC)^9*z`edG()RhKj?^ z9ktJNkLzyQE77;-VPyZ6rK=Ac-V^1zR=6VlHH+3SW6j=!)BUGeFfHi%&#+^rneKwN zi*w>;x3Xsh#H1eWsuf(}{J~$js0@0JAWi?v>K%j>pfN!Mqro|2&R zPS&|dMU?Z|W{I7Qg=PYCl`gG(JmZ9MnD*f-Dob->E}9BtcD`FY`9i_Fs&|UkPG_nc zq&MqC*Tw|q9EohY6ZM~gbz`&G(zBnrY_|!;=Kh`$?R|kGe3AAq4uhAqS1KArxD1Nn0{wt`s6%LmY$Vy^JNe0P0HNye#TnUbs^S4Oz%z<8HEW=6JY8#_48kuU;5<1 z;`1zKTN`wP%Rc{GaCD=ZaGQbmrrV!qlw@SCuUPR|WXET=%MKSSo?jL}QmD9G>WF3P zF~;gwjCx+jHl}q~N=%jA;b+m>uv3|RhaZQyX5%_9p)Ys+CV!RQe#Fz!g5^U<+NbVI zm!H{lUiI`OXksC9*Bbv9dA?)3xDqNX~?s9&kN+jN~Tna_D;W!HzG zuH$!h7KX%sI2HDv;m~FMBW%{;=^eddmSyu_afeo%einE0%%%v=y!X=tdbFLB?*}Wk zWX|FZ5Bj?6;bG(144;D@>}<-csQxO;RaY|KM6hE?F4s|0QB%&P+xbuaSaH_K@N9vd zTC+aau5}Vm78_iMOlXMsr=q~QX{KDlUhb#`{~1^+^sV21eU{+mBYf!YAE$6d&6{iKy6VLWcc_z4- zLAfSk@t&j2C32#-r>;Dmdw`ppTX;9C&5SAEzFpuiQxxLt*4HZk%(d>+^w{py+X6dp z6wkQ8_g?vJ8yD}A#kb8`8Ls|px!r6~ns4eq=S)IePezB~4uywZB@vcC(gYeBQ-2?k z&GvewFJSZQ>5ht>w1*BGcu@T#tP5oGF2i_?@N|{OZ_PYO(MA8Doj< zCm;OoJjPs}-@mdT+k5g`)+3TO!8@2g2}ZrPJ^C_FO=;f4Qqf*k$KWn5H48c8x;>|? z`Su6g=6Ms7`E0*nXN880^sJ(`Hm2}ry6<&Q&tr=adv_u0fyeK8Jsn05g0(rEu08Pz zVbGiEo3B$MGkuFKTmH_9q)eW;N{c=f>#RQ^{Ce&tyDna0%fD0N7xPZ;yVSSFuDBg- zr`X%QJ0|?ySo34nN{yvQ->L6O+t$(Gsmi%^*3`x8_nzaJZ~U`szQNQfm*t{7mOhG0 zJO4T1Q7oeyUv|pngMwQ!^RMKny)2Ocz|SuxWPR{K9S9 z1U$lL_0LdXX1-`(7I5IB`LE7Uv%qkfTVgkz9mM`crbS8nu3U5a*x}##i}X`7jQ>bZ zS*myJ@3dokrzm)JhxTk>+Inc(j;UEoyj{K=_Do@o?>Rbi1NSrD{S1u}&zFR)sB*h7 z;pDUknWE$RjonEHlO-RiU()2-Q2Uwbbg#hmp7|Xa%~P0~7HS^toha8*(-I;5Jowec ziBA^15kA1bP2u-J%XNX;pG6ye8^l>=h;DuHRd)k-*3vqwzTD<+VQ-Jt?4Hl^F{}YM zZylTVT5L2W;pmplt+Ssu9^sm`b*kZH+cmY{3rhCHkw(uPkZtUbydlM^)X{*9$+(ee%A>cF!L*jGeV^E4X*9y|a&t)jl>-z3+`>>ow??b!K788e;)5J6Z;~;SXz5HcVX;`+XCr~r#S@=?3?@J=&9@jBAVwE zOXnQ3Xt>_t-lJbJ^(Z=SuVO>*dp>A?@#<6Wd>7T&&3OkG8;5&J z$1eRDp|ow%gAe?jE<6cw-0Cfjk@e0&2bMH7yxYGmRzR%rIJ0hy6Swok%BF%Fev=AT zW;jfZV?DH@qN2Xw_pIK+6s85M`rb)twldD|XnAqz?;Xvy6Hl%m)N?x}E-Tb?FX-)| z#Z?@lr8x)u*M6+9>a6wc5wGl&4SmpjQ0#_kaQd{sjLWX=XXLlf^j=zeM1fhdZJyGC zZ{B;3|Kid*&|b7FU{RON(F94>-2V(mBu~34{a)BD$q{t>qL1TMA2TkSBd41$ynFpf zYn``uu<2v_$f-3U^Cw=oet&0jiiY3@r?nOdj+s*ze$h}>Fk1OZ<8e{1lT42PGt;^U zU#qqr(VjU&=k<&z^CtOe9T#@onr7p|b27B~N=b9b_R?p{Ed_gciZ<ay)Qb@34T6 z+Kcwnn^YCvNF-*gnkNxBH6~kEK`(Uggd3-Oe|s0Y&N*_=>D`(uzG~fOeKSk_Yd785 zvna$&a{ZaC2BSAccb28x4wL)4-BCD5wnj3vSyP79u6BcIYL3Ivc zxp7X-EcrVcUP50}*xfWP`V5wDu=L(+o zD9pWP&b3BBFMfvNk3ApOE#m%gd6A6!8L?+Y|CC~5+9$pW+smb3?pn@ry7|_3euiC} zXFXdO+|>|X+T#@5C$+Eqk%Y*J4M7?YayWh`2VPP>xjODqk+*NZOWKBz3+${%4EX|g z2-SMaYbQT!E{O3xxOA@Wy@WYVFYhm$!EV&N@CRq0$Er)GFZLE~yvyRjUGa=JGLBt7 z=tlzg`EKQr=f_u|hy zvgXkIpovK@oEZPyG1o6@mz=Wo>e(ARDvo{adL8jk zM0(Dbrz?(Wwk@?dV`eF!CER~x!G&kr>p$vTReNh7w>avEanJ{MH7UmE{egw|gXEvI zZ=Bu~!Six;ocqj3pYr;*f=hyyiYKhQ!(R!&V!r+S=Tt=@Lw--CH87i5<>Gl;#s^d@1O7N_oa{U@f`D|j2$+lK9R zm(fw$FA#HXrohYtuD28_l48%M2WrUlvM=N2owK64^H8{2)W6h<@DC>znslkHeWa5k zF!7l~{FfC0eQUPny?y^o_v56Ul_5qgrqS+hwVVEN9AWrW+23$z$NCjjM!E_;uGPZT z?4p87-&sY?AB0ZY%H>?GZNDPvfMLkfC0C3N9?;$3UNL>mr?v6|Yfs0D*0hQ$c$JbfPZo>=BaSUi4XV z4_o?fom_@I0ow&^2fy#A+FG#aPwA{~9U*~voO6nohFA22&SnZIb3Jl4(51z+K_sA8 za>Ew+h*z32aW#_5kK_kN$tz0RmR<4>I>2zOU!FxvQag6n-{U_Eqg`_yc_-UQR=ki8 zI&|0je9_$rS7-ca6x8Xko8#P+y7t@EUyXiza@w z)Ua(I|9WY;&(n(v3z=Fk5ZTdK$K9*U{-|K9yho^hYhCJ$U4Ok8u7`zesC79zXWF*= zSA`~spWUMHpJ8Q+lUizZMbgr+@H1-@ynZ@5XWYFWuBCfwbKbohv&`pQeNol2a_6!0 z&$Q)QpVhPkE?PP%H%U_aOWjij)(F;*-0~W~#6q`f9u4MdJ=J+ua>iow(Eki?nKWMZ z@$bwC&B#dIV3a&1&vU`r8L=0irJ60-6aUBM;>LFdflZz5hJE^J`E#=iX9(ADMaLXw zI(vG;t49qhvnKpnadR*4%;`tY?ul&p^Day?%kgHnslXF14!fnX*A+fI)0+^)r%|lC zdr7UvvzQ!~OAXm)M7B%rs0;nokZ?fb`&{{!1$UU4g9Tk4o-&YJ`&Cz)YoS2cs{3CV z^;PnZpHbjzoI8J;fx)WgzYBx{L$-EztnO!&y=3)F_U9386{c0ndh1<&xUK7Wv}9W2 zq4fp_Vp)2{UhXNC``GhB^x|LdfF18d(zMom<(=X@C0?LivfpctRY*y>*!tA(ne1hO z4<1%Yb#zqoE!xfLTb4JUf5r>NQllT@@Ay2VGxfDUb81^HzPY~WM)d;O`Hy517XS2H zyqtH!f^Ykjp1Sec6dc)@6d`(FE>Bc!mDDb-_#@o@d4FUr3x!shBpoZrGOc#oR_(N` z$Rnt$@-*|4457Wc%|}k$;L?+g(|?vxrh4*5#2?3N4-G39SOgRu$w<&W{_I}T(?xqM zwmxH*OL!msPMB*2Yx1Wip#@iG9}#|bP56;$kr>nZ&(rc8Zm#f_(YDkUpX}?Jv}0$e zN18zXvEQ@Lc8l--F5q)myCu{&Lf&liRHy6w$Lg1vu3@?plK;zK!tvX3j~1Pi*uL|p z+bR2y#EX*Cg!8j6X&P%J-+KCDis7aj@u}a%x|&p%-rQRJncL%_)M57%|J07Y-nrnS z>Jyev&jL^D1yn>o{%WWZv)$Q~VcpXSHHLhT7z0x$=&d}+XRT@w>3H?f>bCs?Kb>|J zGYcKNaE9mdj7Dqa80JsMjyOj1{OpK#zfiKiN%?|N!loM@K?mCINqF3zVkZx} zX4h~1d4~N--0bty4a_T7Cp9f!+SJk%^Pk~~@X?Z$CtDKIbPuGf3to(BXqM19J$uCu zbxU?WMa>B!9bc5&ck{i8x_oSb?)(YuD@+p-kM(Iiohs>~v)z7&ONr2P-^0$25|2KL zbDuu%?}7!oLUHvoW;uz8wSUxY%@JAp?QrV}?(iM{rt3GfxiPjIb)R-OF51^V{ke3j z;|Zm&bGKjUSGg9@zfQqx8AtwS_Sp*S;)Av@oLE}fw32CKX}NC5D#HhTJ44&8lMDl9 z>+aA{XI?yC=S%Z8rz^G=gj-1ymmM$fk;-id5=dbK<2x`?k z-x+lz?q~FmPB!ML$72371h_4G=d5=4h|jJEJkvwjT_p5=M+R=o+V{iy%ArP+*hd`A z3Ag7RTfiXtsH|RCjA6#w-=B`^O)R>xt}3!3RN?eOKPC0~FD2c&MDI_&Z7{oOadg}> z@3gSPk6%t>;B{#1-hao(KqKqgXWdwlZ{E9J=?gb(e&6&n!LZA!TFSFhXZ7O78nx7n zy+1W-U1F`Yrv6gcz{NAgeMy!1`lp{|S4@!<`g3sc!lsz_Ep^%^e)EhzGwuvqBfYNj znc&K{`!hrs)<04=dQr$W&+NleL$({`M}l4}s0FZHy(+PB#p+e%Ot(9wV(nDdA3E^x zSU}SX=JTsM&p3L!Ry9jHZFKys$#bYT{gHw4M)eiDRQUBKJ?c-nnP>S?z*ue8mMyOp zezqT7)#1&}`#cb}_CO}}D4voTUZyERRwTRWhsufbVLcaa}sOdjXtYCJ_bRFYFso%T%HiZ>LreE>e%GA4Q`IpE0`nSI_ za45>Vy?=IBbFkAcEitL>?H+QA#Y&~Z3lc;(^aOjSe64-{U0%&BJ$-k>B@JeK4+ACT z33DGFVe4O=5$YgtT`hR<&PE4Jt4k_9u4=Xf`)*zGmxBg2j}{QXAD zs)`OJy|sKk{WE{AuY7@cZIX1lfai{Njz{w^_00Sj^4a3Z_SGNd&tG-@82at6!|qqD zcV~QVnR$BZdW$aJwg(S(%_zH)b>X%K=aqzSi4&HFd9S;A#)^eCWMSnW7p?$Sk%~Xh zY&QI!@%zsoud^aLmfm&y4Z18DGNX>4VYtP%b>k%`nfbq_KV>>QW!dXx%j6XFIb$oP zaIHGax_1AHS<}z6{apV3k(TznfTZ(xoX@S7FsW00c-6JwIQMO)sf-~)i&~4M5`Hzs z**ZK8yY$$_GeSJ|*AxlGDTm_Dc`SXs;%TPSX8n%ZooVS0r8PurOs}k9?tNKT(HU{P z<8jfP(vTYCm_09h*RHaeZq%m{AsR0xy6TaheQK?b<5&Ij1=IPp>Vp=#0WF3}{T9c|WMZ^TBe9;`j#v!I90` z&v$m|tj@j3zH@!&Aui(ye18w;O_B{F?`{wCyT@(LlJ@EHgzV3vZX9({o8P~Rl#=gZWZSK! zd$U4l-z)i(feWt2huvYwFq)D3PWFp){=sJv3<-=e{04%N#ql$@7;QNv$WedHuw`T0 zqzRTk$dFbJTv$ z*)eC$idDhu7FliSY4x8O%=&R&qEENiTixnD@ubaPH6~m-%H_bGqOp2&$8?kQ9Z#N4 z`ObXw+ED#KOY4@J7@3@4{j})Heq-gr7%u%| z$_h)X!v8Z&|S#I%;S_z(Gh=+Z#>Dm{l}Rl zha&hLcSbC;co4JyiVGJvL&W8I21o0qV;d~vXB2w2E{wKy+_-GFa!K7{p99&`_I>kS zv|-1Z^wlk@Aps%D&t4gQnRw~d(#cJmB9>l>+3CJL=(Oug#rRND^P^5{l1{& z`1R8?g-YKgJ99)HoNqJlJdl4;C$p?$pTajgiQlg-w9YtpnE$ME>A8j7!gVvut}R-! z-qxo2?R3?*Q+_tEav$pWF3a)bT5`hfp6|CD4>~NB{8f9}w6W>)N73|^(Q-$erYy_d zm$rgUXU`GVO|B0=K-!~vblExOxXXPNy|H@kagnJJeyOQpS%wgxNdH3 z%X(}c7#>~s(B=Kq&Ci4vKfAKjuF9*sZ-Mtyqg_5)c8|iipS;4W%f>gAK7puU`eXas;?a%#jehc zp8cZp)^@H#7eD%N$Mz@eu5#SGl6O-`NqxY%1g^tw`rq{oWWGMIJ-oAnoy%zktAOXk zOO{L57jQNHIr3SQxlQoM`nk@Af3_$87MWMP|IO@HhbjSqR@RDc*N}yGFSrt9ADk_E^Uq7kcxfgbS#Y6K0j8o?aG%_D;7r3+U;Z*5)w!3B|_3JF)pBOpa zCHkz99+c=F*;Q zzKA#B#_ubp5+W*^N0zV&REb`{qjPD>4wL^3LHnXFPubL=GxzwjvfF=L_@*qld|F^$ z|3rh|{cFT#`pK`H^x)CL-tf~JjA_m1vNHHKZ+HLvRrhGlv@pf@%dW&<32KZ{+0ZWG z<-R#+4#U%}FP|}OkbN>+`J!E3{4|y6bytHP-`O@rc4;K5k)3Cr1;3tXPP=Gu?2&KR zcjq2()6i@2XY-6*-zGG@U@6C%r)Q64aQQy_d^JS$Y*Ac;Ynw@6y3_WcubnQBUgkez z%I3_9&S4U2jN##7SQZx@-JJ4_aaQ8*{@AwJjXnF4zcYS5{#NE;mQO^0eJH!KS0A^g z-7DD}6+#SGKAYVLapSnT!g)&afi;^W=f9_0%k zHD@jp-x%22^>m`gO0S@NjzhM=SzFnYOxfIzFv?^-2@gES!F}Y8aOc#g{VP&}<{GYl zsx$FGu{-;fWrD@2!LJhDWodj^u2S7pSN8tlj6-s{%)b(Pv`ahGJ3ekc`D40hHb29u z2(Ej%MQ3do=1o^$%za?WpS{!Di(|Juy_fOuN%z*{)8|k7YA7LPSUY!P(kGqd`!m<3 zZ_&H2I`a|JfoBVzoJ>AlxWU8VW?W)KZk6o0Wc!5-b%}+orMryu&s>^Cz#>Pi3QzWN&i4%Jlu6YH3O4JY}}biOk+d4z_SH zd~)tsaQRVShu?!Ak@0L6$ypkz4dH#yG=i#o*Rk)oddvKo;3Lr=Q?{G(7yMve^7gyb zWu}e$TmPKx{Peg&_`61Qj@p+8e@;J2<3BPXMWko%`vs?7UyQgqaak^d*q!@4dIh`J zh`jmL&nvm$KSPI0XyC)|W^)~_)Ec(A_H`7Tb@?#2?7B{^tMit+>jtU&!oKtFyKT_?Y_dlCjpG8JI@p>rRdr{waokwvDX^~g4>k;N%@@H(aMOr(PQu~eWyyp>{aqyMa zN{=$#j<>y*#f7|^TrRw`dR}wf{(HxVg19`>!1#?-tnR*NR#&Wfq&@S((apc6G?>Pv zO7v)LVaosfO4Cx6wKa6#XX8yOQmdPPPx&sJ&im9rHR{|$(@h__#pE7a@w*qZBwe!k zF0tOKU7*WfTsUQ3(pupi#vxX!s$DM=_G>gP-hOA1n`E9Wzu|jTb{FLpt2t&^w0@R< zxNQsXRMuT5#lE)tFkDSYsJz19n#k}@en(oronzg@sjs){>bxx0TyXjbup{lS9$8IRxTI&F9@6T;hWliiqwQCo21vuYwt1Jp(PL*TWuj9@-LC`BX zt!rm{>t$D#tu6Z8JbMpCXgOTSXMbdK>hY~>f~#b@BBUDws=WC)-B%QE722^R?y^(( zk_#GdOV|Hy_#m|L)<>ZQ{lVhll6!M!?f+fkxEfyIDK0E!NVPawQ9p`1t*8V$Y&FGxkd(7+W3^}d)0owx3 z8MH1HU47+H$A*hS3-hKmUF-3>9j%x5TOs5eJR2fuodJGEJ0VfV6T?K8#O z_!$#(BXyszNa|Sn-FSatLZkQrgU=H@wz4oCcHPC`V(b;bxGKEbREJe|Zs_%o+D6uQUv&@#C!Op8`oU-?}gWr0ylq3 z4PmfQUCNojbK7D45x1Qjs|5v?ni;gt*v1+zQR(%MFEOCDqcujM)W`qWckQLj3j`0I z-nBE};Az=TKF=7gDObvqZ1UZj16^1B>J7W+78fLZVjZLIrVH!l9B^Op;l6V3sWdjn zl}8&juZMM5y!)3}by9k#+Z>;z`>(86Eb-)6==3XF!uo}_&YpKH!CSJ1e`h0iepFX* znf_O4hNzXZXK$3gJhN-bM~%i`n=}$_Ha%IfCE=^Et3`2|=Jr>bz3b0xImEkI^w#gy z(=z9m>Mc0+=6Q0>hM)r>?3H}|YaQ-wIw}{n_A#T#F5?|vPuPZJeGObI6?fk*;bV{T zIR(b1rL&b*JwC(4yX4aLXEI-2tg<;>z_fMl0lr0NRx?}4`s=C1h&oN&^SnSQLLi-2 z^T*5?5gQKevs>)-?wj_nmV~>Jt2%_*X4M>Ekv!VeS-Mte>&_<=UQX4KIrGBSZ6fod zAclF*eI>sd9TDr1zq95_WrJ|hk{iv9QmPww`f*qBJ!QS}+$ZMjVS}ek{}}{c>^vkG zcKGs+HlCZY)yuTJ(-xQK~|JPNnRn=y-4%?U>IxXWWaJT9B^h$mc)6$}uOOhA+u})tZfA&Jo!#Ca4NsdlVPi zuY2n1FYm_AGltKE+9qD!nWd8E^!K<Hz{96)$+Oifr0$;f zU-@Jv^GB8y9kca+Ob_I(h|vm+KDgyD$A%A^gQjj?Ro(Q$jP)qX&a;Iw?#Z_$CA^M$ z1&1l?#s9c7`;Y%2{~xjEf7bY4`FsBS{9X0uU)33ZIsaqN`Nx0GANaM?;V_QEZWB#Q2 z{%7(#f7)O9&(M9-^!LB?hx1qd-u(IV5BvNd_LJv#&fhWr%Wt*wXZ}w9a{i*d@b6i2 Q{~31fe3$+CpZ))v082ZmwEzGB literal 0 HcmV?d00001 From 2662be91af0a7949b4cd524beb2565924b091943 Mon Sep 17 00:00:00 2001 From: Natalia Sayang <48160791+nataliasayang@users.noreply.github.com> Date: Thu, 21 Mar 2024 21:59:12 -0400 Subject: [PATCH 364/795] Add photos to measurements-issues FAQ entry --- .../org/docs/about/faq/measurements-issues/en.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/markdown/org/docs/about/faq/measurements-issues/en.md b/markdown/org/docs/about/faq/measurements-issues/en.md index b3a2edb9efd..a97ea64a284 100644 --- a/markdown/org/docs/about/faq/measurements-issues/en.md +++ b/markdown/org/docs/about/faq/measurements-issues/en.md @@ -22,6 +22,8 @@ There are a few measurements we've noticed tend to cause problems. The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). +![Waist to armpit](waisttoarmpit.jpg) + #### High point shoulder (HPS) [HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. @@ -30,12 +32,20 @@ Here are two approaches. One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. +![High point shoulder with dowel](hps2.jpg) + Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. +![High point shoulder with riibbon](hps.jpg) + #### High bust [High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + #### Shoulder slope Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). @@ -52,4 +62,4 @@ Seat is across the fullest part of your butt. Some other sources call this the " Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. -Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) \ No newline at end of file +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From bc21b2552793f38ef8fb3f466e94d7d235affe98 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 17:24:48 +0100 Subject: [PATCH 365/795] New translations en.yaml (French) skip-build --- sites/shared/components/account/fr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/fr.yaml b/sites/shared/components/account/fr.yaml index 97902c0df80..4421c5f5d7e 100644 --- a/sites/shared/components/account/fr.yaml +++ b/sites/shared/components/account/fr.yaml @@ -250,6 +250,7 @@ andMore: et plus unitsMustSave: "Remarque : tu dois enregistrer après avoir modifié les unités pour que le changement prenne effet sur cette page." makePublic: Rendre public makePrivate: Rendre privé +pattern: Patron patternNew: Génère un nouveau modèle patternNewInfo: Choisis un modèle, ajoute ton jeu de mesures, et nous générerons pour toi un patron de couture sur mesure. designNew: Créer un nouveau dessin From f9c6620b910f5ce3d08d629d80a073dee4794bd4 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Fri, 22 Mar 2024 16:33:30 +0000 Subject: [PATCH 366/795] Fix #6389 --- designs/lumira/src/leg.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designs/lumira/src/leg.mjs b/designs/lumira/src/leg.mjs index 1e9080eb4d7..dcb0444b696 100644 --- a/designs/lumira/src/leg.mjs +++ b/designs/lumira/src/leg.mjs @@ -63,13 +63,14 @@ export const leg = { at: points.scalebox, }) - snippets.circle4 = new Snippet('notch', points.backHips) snippets.circle6 = new Snippet('notch', points.frontGusset) + snippets.circle7 = new Snippet('notch', points.backGusset) if (backGusset) { snippets.circle1 = new Snippet('notch', paths.backCircle.shiftFractionAlong(0.25)) snippets.circle2 = new Snippet('notch', paths.backCircle.shiftFractionAlong(0.5)) snippets.circle3 = new Snippet('notch', paths.backCircle.shiftFractionAlong(0.75)) + snippets.circle4 = new Snippet('notch', points.backHips) snippets.circle5 = new Snippet('notch', points.backCircleGusset) const backCircle = paths.backCircle.edge('right') macro('hd', { From 8efcde1c788247abf0a6906efe9c55e3b7cee00e Mon Sep 17 00:00:00 2001 From: woutervdub Date: Fri, 22 Mar 2024 16:36:10 +0000 Subject: [PATCH 367/795] Fix #6387 --- designs/lumina/src/shape.mjs | 2 +- designs/lumira/src/shape.mjs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/designs/lumina/src/shape.mjs b/designs/lumina/src/shape.mjs index 86fad5391f3..4d9e2b4ee65 100644 --- a/designs/lumina/src/shape.mjs +++ b/designs/lumina/src/shape.mjs @@ -640,6 +640,6 @@ export const shape = { }, }) - return part //.hide() + return part.hide() }, } diff --git a/designs/lumira/src/shape.mjs b/designs/lumira/src/shape.mjs index 1693277241b..a83754c19fb 100644 --- a/designs/lumira/src/shape.mjs +++ b/designs/lumira/src/shape.mjs @@ -514,6 +514,6 @@ export const shape = { store.set('waistLengthFront', points.frontWaistband.dist(points.centerWaistband)) store.set('waistLengthBack', store.get('waistLength') - store.get('waistLengthFront')) - return part + return part.hide() }, } From 208753850d83c446da0441ab61465ccef5c00c73 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 17:45:46 +0100 Subject: [PATCH 368/795] New translations en.yaml (Spanish) skip-build --- sites/shared/components/account/es.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/es.yaml b/sites/shared/components/account/es.yaml index 16e8048ac78..ceaa799b514 100644 --- a/sites/shared/components/account/es.yaml +++ b/sites/shared/components/account/es.yaml @@ -250,6 +250,7 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private +pattern: Patrón patternNew: Generar un nuevo patrón patternNewInfo: Elige un diseño, añade tu juego de medidas y generaremos un patrón de costura a medida para ti. designNew: Crear un nuevo diseño From b5a529a0c7ed823aaa0171763579e87c6f63bd60 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 18:06:06 +0100 Subject: [PATCH 369/795] New translations en.yaml (German) skip-build --- sites/shared/components/account/de.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/de.yaml b/sites/shared/components/account/de.yaml index e1b2c702704..11c2795871d 100644 --- a/sites/shared/components/account/de.yaml +++ b/sites/shared/components/account/de.yaml @@ -250,6 +250,7 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private +pattern: Schnittmuster patternNew: Ein neues Muster generieren patternNewInfo: Wähle ein Design, füge deine Maße hinzu und wir erstellen ein maßgeschneidertes Nähmuster für dich. designNew: Ein neues Design erstellen From ce57674dac5e18a2341d4c8d8d81e60f9d5972d4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 18:26:53 +0100 Subject: [PATCH 370/795] New translations en.yaml (Dutch) skip-build --- sites/shared/components/account/nl.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/nl.yaml b/sites/shared/components/account/nl.yaml index a4e61e52e90..a075db49fa2 100644 --- a/sites/shared/components/account/nl.yaml +++ b/sites/shared/components/account/nl.yaml @@ -250,6 +250,7 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private +pattern: Patroon patternNew: Een nieuw patroon genereren patternNewInfo: Kies een ontwerp, voeg je maatset toe en wij maken een naaipatroon op maat voor je. designNew: Een nieuw ontwerp creëren From 9f81e78d671de29dbecdc12c0c2c9904f2bc5042 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 18:47:23 +0100 Subject: [PATCH 371/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/components/account/uk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/uk.yaml b/sites/shared/components/account/uk.yaml index ba12849400f..2480d922113 100644 --- a/sites/shared/components/account/uk.yaml +++ b/sites/shared/components/account/uk.yaml @@ -250,6 +250,7 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private +pattern: Викрійка patternNew: Створіть новий шаблон patternNewInfo: Виберіть дизайн, додайте свої мірки, і ми створимо для вас індивідуальну викрійку. designNew: Створіть новий дизайн From fd6bc86430d19128fa781edeb835daf8efae0367 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 22 Mar 2024 19:04:58 +0100 Subject: [PATCH 372/795] Update source file en.yaml skip-build --- sites/shared/components/account/en.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index b6e0cb5d7e8..d8e7aeecc54 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -270,6 +270,7 @@ unitsMustSave: "Note: You must save after changing Units to have the change take makePublic: Make public makePrivate: Make private +pattern: Pattern patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From 2372eb600239a32abae5f04e7e69e62eb690850b Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Thu, 21 Mar 2024 20:08:00 +0100 Subject: [PATCH 373/795] fix(huey): Add missing i18n strings, hide unused parts, add a note about needed zipper length --- designs/huey/i18n/en.json | 10 ++++++++-- designs/huey/src/cuff.mjs | 2 +- designs/huey/src/front.mjs | 13 +++++++++++++ designs/huey/src/waistband.mjs | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/designs/huey/i18n/en.json b/designs/huey/i18n/en.json index f5be6539b8c..c046799adda 100644 --- a/designs/huey/i18n/en.json +++ b/designs/huey/i18n/en.json @@ -16,7 +16,13 @@ "cutCuff.t": "The cuff is not shown", "cutCuff.d": "The **Cuff** (7) is a rectangular piece of ribbing fabric {{{ w }}} wide and {{{ l }}} long.", "cutWaistband.t": "The waistband is not shown", - "cutWaistband.d": "The **Waistband** (6) is a rectangular piece of ribbing fabric {{{ w }}} wide and {{{ l }}} long." + "cutWaistband.d": "The **Waistband** (6) is a rectangular piece of ribbing fabric {{{ w }}} wide and {{{ l }}} long.", + "zipperLength.t": "The zipper length is {{ length }}", + "zipperLength.d": "You need a zipper with a length of {{ length }}.", + "ribbingNo.t": "No ribbing", + "ribbingNo.d": "Do not include ribbing", + "ribbingYes.t": "Include ribbing", + "ribbingYes.d": "Include ribbing on sleeve and waistband" }, "o": { "pocket": { @@ -60,7 +66,7 @@ "d": "Use this to adapt the pattern to how stretchy the ribbing that you are using is." }, "hipsEase": { - "t": "Hops ease", + "t": "Hips ease", "d": "Controls the amount of ease at the hips" }, "pocketWidth": { diff --git a/designs/huey/src/cuff.mjs b/designs/huey/src/cuff.mjs index f1430d225ba..3897ab6d075 100644 --- a/designs/huey/src/cuff.mjs +++ b/designs/huey/src/cuff.mjs @@ -1,7 +1,7 @@ import { draftRibbing } from './shared.mjs' function draftHueyCuff({ points, measurements, options, macro, store, part }) { - if (!options.ribbing) return part + if (!options.ribbing) return part.hide() draftRibbing(part, measurements.wrist * (1 + options.cuffEase) * (1 - options.ribbingStretch)) diff --git a/designs/huey/src/front.mjs b/designs/huey/src/front.mjs index fc2dd31b267..db6084420a0 100644 --- a/designs/huey/src/front.mjs +++ b/designs/huey/src/front.mjs @@ -13,6 +13,7 @@ function draftHueyFront({ complete, sa, options, + units, measurements, part, }) { @@ -92,6 +93,18 @@ function draftHueyFront({ /* * Annotations */ + let zipperLength = store.get('frontNeckSeamLength') + points.cfNeck.dist(points.cfHem) + if (options.ribbing) { + zipperLength += store.get('ribbingHeight') + } + + store.flag.note({ + msg: 'huey:zipperLength', + replace: { + length: units(zipperLength), + }, + }) + // Cutlist store.cutlist.setCut({ cut: 2, from: 'fabric' }) diff --git a/designs/huey/src/waistband.mjs b/designs/huey/src/waistband.mjs index bd6d3fc1b77..7d60d57d09f 100644 --- a/designs/huey/src/waistband.mjs +++ b/designs/huey/src/waistband.mjs @@ -1,7 +1,7 @@ import { draftRibbing } from './shared.mjs' function draftHueyWaistband({ points, measurements, options, macro, store, part }) { - if (!options.ribbing) return part + if (!options.ribbing) return part.hide() draftRibbing(part, measurements.hips * (1 + options.hipsEase) * (1 - options.ribbingStretch)) From 3712b702367b9b92be7cb8a5c95a546df652d846 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 10:20:23 +0100 Subject: [PATCH 374/795] fix(huey): Zipper length calculation, clarify it is a maximum This stems from the excellent work by @HaasJona in #6421 in which they requested to double-check the zipper length calculation. Which I didn't get around to doing in the code review, but was able to now. Turns out there was a slight issue with it, so this resolves it. I've also updated the wording to clarify that what we are calculating as the __maximum__ zipper lenght. Since zippers typically come is standard lengths, it's typically not possible to find the exact length you need, so it's IMHO important to make it clear to the user they should always purchase a zipper that is as close as possible, yet shorter than the calculated maximum length. --- config/changelog.yaml | 2 ++ designs/huey/i18n/en.json | 4 ++-- designs/huey/src/front.mjs | 14 ++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index 6b3ba6e122e..951b81b51ff 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -22,6 +22,8 @@ Unreleased: Fixed: huey: - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes #6238 + - Adding missing translation for rubbing optino + - Hiden unused ribbing parts when ribbing option is disabled hugo: - Add missing dimension id attributes uma: diff --git a/designs/huey/i18n/en.json b/designs/huey/i18n/en.json index c046799adda..546a862b6e8 100644 --- a/designs/huey/i18n/en.json +++ b/designs/huey/i18n/en.json @@ -17,8 +17,8 @@ "cutCuff.d": "The **Cuff** (7) is a rectangular piece of ribbing fabric {{{ w }}} wide and {{{ l }}} long.", "cutWaistband.t": "The waistband is not shown", "cutWaistband.d": "The **Waistband** (6) is a rectangular piece of ribbing fabric {{{ w }}} wide and {{{ l }}} long.", - "zipperLength.t": "The zipper length is {{ length }}", - "zipperLength.d": "You need a zipper with a length of {{ length }}.", + "zipperLength.t": "The maximum zipper length is {{ length }}", + "zipperLength.d": "You need a zipper with a maximum length of {{ length }}. A slightly shorter zipper will work too.", "ribbingNo.t": "No ribbing", "ribbingNo.d": "Do not include ribbing", "ribbingYes.t": "Include ribbing", diff --git a/designs/huey/src/front.mjs b/designs/huey/src/front.mjs index db6084420a0..f9ac229b574 100644 --- a/designs/huey/src/front.mjs +++ b/designs/huey/src/front.mjs @@ -93,15 +93,17 @@ function draftHueyFront({ /* * Annotations */ - let zipperLength = store.get('frontNeckSeamLength') + points.cfNeck.dist(points.cfHem) - if (options.ribbing) { - zipperLength += store.get('ribbingHeight') - } - store.flag.note({ msg: 'huey:zipperLength', replace: { - length: units(zipperLength), + /* + * Zipper length is the hood part, plus center front + ribbing (if there is any) + */ + length: units( + measurements.head * options.hoodClosure + + points.cfNeck.dist(points.cfHem) + + (options.ribbing ? store.get('ribbingHeight') : 0) + ), }, }) From d865441f90d09773d327fa76becad41fb1b894fb Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 10:25:22 +0100 Subject: [PATCH 375/795] chore: Typos in changelog --- config/changelog.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index 951b81b51ff..7a5253bfd9e 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -22,8 +22,8 @@ Unreleased: Fixed: huey: - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes #6238 - - Adding missing translation for rubbing optino - - Hiden unused ribbing parts when ribbing option is disabled + - Adding missing translation for rubbing option + - Hide unused ribbing parts when ribbing option is disabled hugo: - Add missing dimension id attributes uma: From 02786f230a3b76802edb1e57d83764d6af515e4b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 10:47:29 +0100 Subject: [PATCH 376/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/skully/instructions/de.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/skully/instructions/de.md b/markdown/org/docs/designs/skully/instructions/de.md index 8603d5015b0..cdbfdced3d4 100644 --- a/markdown/org/docs/designs/skully/instructions/de.md +++ b/markdown/org/docs/designs/skully/instructions/de.md @@ -89,12 +89,12 @@ Turn it right sides out. ## Schritt 5: Haare -Now is the time to add hair to Skully. Achte beim Einsetzen der Stickwatte darauf, dass du auf der Innenseite Knoten anbringst, sonst kannst du Skully später ganz leicht die Haare ausreißen. +Jetzt ist es an der Zeit, dem Skully Haare hinzuzufügen. Achte beim Einsetzen der Stickwatte darauf, dass du auf der Innenseite Knoten anbringst, sonst kannst du Skully später ganz leicht die Haare ausreißen. ## Schritt 6: Füllung - Fill the plush toy with stuffing through the opening you left, making sure to fill all the parts well. Die Bereiche an der Vorderseite sind am schwersten zu erreichen. -- _Slipstitch_ or _whipstitch_ the opening closed. +- _Slipsticth_ oder _whipstitch_ die Öffnung geschlossen. ## Schritt 7: Tweaks From 4612ad4d4a8ab2d133a6ae20fe0e9fe39255c246 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:30 +0100 Subject: [PATCH 377/795] New translations en.md (French) skip-build --- .../docs/about/faq/measurements-issues/fr.md | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/fr.md diff --git a/markdown/org/docs/about/faq/measurements-issues/fr.md b/markdown/org/docs/about/faq/measurements-issues/fr.md new file mode 100644 index 00000000000..3afdf04ab7e --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/fr.md @@ -0,0 +1,65 @@ +--- +title: J'ai des difficultés avec les mesures. Que faut-il pour que je vérifie? +--- + +Chacune de nos [mesures] (https\://freesewing.org/docs/measurements) est documentée par une description et deux visuels. S'y référer résout la plupart des problèmes. + +Nous travaillons sur une fonctionnalité d'assurance qualité qui détecte les problèmes éventuels et les porte à l'attention de l'utilisateur d'une manière qui _a du sens_. + +En attendant, voici quelques endroits pour commencer à chercher si tu as des problèmes avec tes mesures. + +### Remarques générales + +Les problèmes de pantalon sont presque toujours causés par les mesures verticales qui déterminent l'espace dont nous disposons pour construire le haut du pantalon. Par exemple, la longueur de la taille a la cuisse _doit_ être supérieure à celle de la taille à l'assise, sinon il y a un espace négatif pour construire le pantalon. + +La mesure de la taille est un plan de référence vertical important. L'endroit où tu le prends n'a pas beaucoup d'importance, tant que toutes les mesures verticales sont cohérentes (de la taille au siège, de la taille aux hanches, des HPS à la taille, de la taille au sol, ...) avec ce plan horizontal. + +### Probèmes de mesures + +Nous avons remarqué que certaines mesures ont tendance à poser des problèmes. + +#### De la taille à l'aisselle + +La mesure [de la taille à l'aisselle] (https\://freesewing.org/docs/measurements/waisttoarmpit) est une mesure verticale droite, et non curviligne (qui suit la courbe du corps). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +![Waist to armpit](waisttoarmpit.jpg) + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +![High point shoulder with dowel](hps2.jpg) + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +![High point shoulder with riibbon](hps.jpg) + +#### Tour de buste supérieur + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + +#### Pente d'épaule + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From 263a45fe4c70a41fec789e45dba5b33db4c7d322 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:31 +0100 Subject: [PATCH 378/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/seam-allowance/fr.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 markdown/org/docs/about/faq/seam-allowance/fr.md diff --git a/markdown/org/docs/about/faq/seam-allowance/fr.md b/markdown/org/docs/about/faq/seam-allowance/fr.md new file mode 100644 index 00000000000..3388d6aa0fb --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/fr.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) From fe0a2c83d415a160a2ead3a03507029616ffded8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:32 +0100 Subject: [PATCH 379/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/standard-measurements/fr.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 markdown/org/docs/about/faq/standard-measurements/fr.md diff --git a/markdown/org/docs/about/faq/standard-measurements/fr.md b/markdown/org/docs/about/faq/standard-measurements/fr.md new file mode 100644 index 00000000000..91870c9a259 --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/fr.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). From 682c931019127a42d84a0d5caf302c739b514b14 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:36 +0100 Subject: [PATCH 380/795] New translations en.md (Spanish) skip-build --- .../docs/about/faq/measurements-issues/es.md | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/es.md diff --git a/markdown/org/docs/about/faq/measurements-issues/es.md b/markdown/org/docs/about/faq/measurements-issues/es.md new file mode 100644 index 00000000000..6dbaa2b41e9 --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/es.md @@ -0,0 +1,65 @@ +--- +title: I'm having trouble with measurements. What should I check? +--- + +Each of our [measurements](https://freesewing.org/docs/measurements) is documented with a description and two visuals. Referencing these resolves most issues. + +We are working on QA functionality that detects possible issues and brings them to the user's attention in a way that _makes sense_. + +In the meantime, here are some places to start looking if you're having trouble with your measurements. + +### General notes + +Trouser problems are almost always caused by vertical measurements that determine the room we have to construct the pants top. For example, waist to upper leg _must_ be longer than waist to seat; otherwise there is negative room to construct the pants. + +The waist measurement is an important vertical plane of reference. It doesn't matter that much where you take it, as long as you consistently measure all vertical measurements (waist to seat, waist to hips, HPS to waist, waist to floor, ...) from that same horizontal plane. + +### Trouble measurements + +There are a few measurements we've noticed tend to cause problems. + +#### De la cintura a la axila + +The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +![Waist to armpit](waisttoarmpit.jpg) + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +![High point shoulder with dowel](hps2.jpg) + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +![High point shoulder with riibbon](hps.jpg) + +#### Contorno de alto pecho + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + +#### Inclinación de hombro + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From d4446262f32d38af040500fc98d60c1d6e9da245 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:37 +0100 Subject: [PATCH 381/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/about/faq/seam-allowance/es.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 markdown/org/docs/about/faq/seam-allowance/es.md diff --git a/markdown/org/docs/about/faq/seam-allowance/es.md b/markdown/org/docs/about/faq/seam-allowance/es.md new file mode 100644 index 00000000000..3388d6aa0fb --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/es.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) From 9af278c00887a8e14fe88ea1e534bcea6ea05e40 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:38 +0100 Subject: [PATCH 382/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/about/faq/standard-measurements/es.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 markdown/org/docs/about/faq/standard-measurements/es.md diff --git a/markdown/org/docs/about/faq/standard-measurements/es.md b/markdown/org/docs/about/faq/standard-measurements/es.md new file mode 100644 index 00000000000..91870c9a259 --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/es.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). From dff6e86fbcccafbdd6629c7a64e69987160975af Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:43 +0100 Subject: [PATCH 383/795] New translations en.md (German) skip-build --- .../docs/about/faq/measurements-issues/de.md | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/de.md diff --git a/markdown/org/docs/about/faq/measurements-issues/de.md b/markdown/org/docs/about/faq/measurements-issues/de.md new file mode 100644 index 00000000000..9f3a71cda53 --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/de.md @@ -0,0 +1,65 @@ +--- +title: I'm having trouble with measurements. What should I check? +--- + +Each of our [measurements](https://freesewing.org/docs/measurements) is documented with a description and two visuals. Referencing these resolves most issues. + +We are working on QA functionality that detects possible issues and brings them to the user's attention in a way that _makes sense_. + +In the meantime, here are some places to start looking if you're having trouble with your measurements. + +### General notes + +Trouser problems are almost always caused by vertical measurements that determine the room we have to construct the pants top. For example, waist to upper leg _must_ be longer than waist to seat; otherwise there is negative room to construct the pants. + +The waist measurement is an important vertical plane of reference. It doesn't matter that much where you take it, as long as you consistently measure all vertical measurements (waist to seat, waist to hips, HPS to waist, waist to floor, ...) from that same horizontal plane. + +### Trouble measurements + +There are a few measurements we've noticed tend to cause problems. + +#### Taille bis Achselhöhle + +The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +![Waist to armpit](waisttoarmpit.jpg) + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +![High point shoulder with dowel](hps2.jpg) + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +![High point shoulder with riibbon](hps.jpg) + +#### Oberbrustweite + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + +#### Schulterneigung + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From 8b7f7935a62b1610e43e3ea29c7b2e976f02f8f8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:44 +0100 Subject: [PATCH 384/795] New translations en.md (German) skip-build --- markdown/org/docs/about/faq/seam-allowance/de.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 markdown/org/docs/about/faq/seam-allowance/de.md diff --git a/markdown/org/docs/about/faq/seam-allowance/de.md b/markdown/org/docs/about/faq/seam-allowance/de.md new file mode 100644 index 00000000000..3388d6aa0fb --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/de.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) From abdb879309381ca2c1867f76cab69e2f3ec024d5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:45 +0100 Subject: [PATCH 385/795] New translations en.md (German) skip-build --- markdown/org/docs/about/faq/standard-measurements/de.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 markdown/org/docs/about/faq/standard-measurements/de.md diff --git a/markdown/org/docs/about/faq/standard-measurements/de.md b/markdown/org/docs/about/faq/standard-measurements/de.md new file mode 100644 index 00000000000..91870c9a259 --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/de.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). From 308e994bbb2263b0df5758a071b887ab8fa9cd69 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:49 +0100 Subject: [PATCH 386/795] New translations en.md (Dutch) skip-build --- .../docs/about/faq/measurements-issues/nl.md | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/nl.md diff --git a/markdown/org/docs/about/faq/measurements-issues/nl.md b/markdown/org/docs/about/faq/measurements-issues/nl.md new file mode 100644 index 00000000000..fd3bb248c9a --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/nl.md @@ -0,0 +1,65 @@ +--- +title: I'm having trouble with measurements. What should I check? +--- + +Each of our [measurements](https://freesewing.org/docs/measurements) is documented with a description and two visuals. Referencing these resolves most issues. + +We are working on QA functionality that detects possible issues and brings them to the user's attention in a way that _makes sense_. + +In the meantime, here are some places to start looking if you're having trouble with your measurements. + +### General notes + +Trouser problems are almost always caused by vertical measurements that determine the room we have to construct the pants top. For example, waist to upper leg _must_ be longer than waist to seat; otherwise there is negative room to construct the pants. + +The waist measurement is an important vertical plane of reference. It doesn't matter that much where you take it, as long as you consistently measure all vertical measurements (waist to seat, waist to hips, HPS to waist, waist to floor, ...) from that same horizontal plane. + +### Trouble measurements + +There are a few measurements we've noticed tend to cause problems. + +#### Taille tot oksel + +The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +![Waist to armpit](waisttoarmpit.jpg) + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +![High point shoulder with dowel](hps2.jpg) + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +![High point shoulder with riibbon](hps.jpg) + +#### Hoge buste + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + +#### Schouderhelling + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From 2379f89dcf66a82476c05e0afc29ce873a864aa7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:50 +0100 Subject: [PATCH 387/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/faq/seam-allowance/nl.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 markdown/org/docs/about/faq/seam-allowance/nl.md diff --git a/markdown/org/docs/about/faq/seam-allowance/nl.md b/markdown/org/docs/about/faq/seam-allowance/nl.md new file mode 100644 index 00000000000..3388d6aa0fb --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/nl.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) From beaf7961d0028646758be75b64ea5a7222e2ca63 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:51 +0100 Subject: [PATCH 388/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/faq/standard-measurements/nl.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 markdown/org/docs/about/faq/standard-measurements/nl.md diff --git a/markdown/org/docs/about/faq/standard-measurements/nl.md b/markdown/org/docs/about/faq/standard-measurements/nl.md new file mode 100644 index 00000000000..91870c9a259 --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/nl.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). From 4780527f8b23059d02dd42960807aede7231f589 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:56 +0100 Subject: [PATCH 389/795] New translations en.md (Ukrainian) skip-build --- .../docs/about/faq/measurements-issues/uk.md | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 markdown/org/docs/about/faq/measurements-issues/uk.md diff --git a/markdown/org/docs/about/faq/measurements-issues/uk.md b/markdown/org/docs/about/faq/measurements-issues/uk.md new file mode 100644 index 00000000000..312b6df2d8a --- /dev/null +++ b/markdown/org/docs/about/faq/measurements-issues/uk.md @@ -0,0 +1,65 @@ +--- +title: I'm having trouble with measurements. What should I check? +--- + +Each of our [measurements](https://freesewing.org/docs/measurements) is documented with a description and two visuals. Referencing these resolves most issues. + +We are working on QA functionality that detects possible issues and brings them to the user's attention in a way that _makes sense_. + +In the meantime, here are some places to start looking if you're having trouble with your measurements. + +### General notes + +Trouser problems are almost always caused by vertical measurements that determine the room we have to construct the pants top. For example, waist to upper leg _must_ be longer than waist to seat; otherwise there is negative room to construct the pants. + +The waist measurement is an important vertical plane of reference. It doesn't matter that much where you take it, as long as you consistently measure all vertical measurements (waist to seat, waist to hips, HPS to waist, waist to floor, ...) from that same horizontal plane. + +### Trouble measurements + +There are a few measurements we've noticed tend to cause problems. + +#### Від талії до пахви + +The [waist to armpit](https://freesewing.org/docs/measurements/waisttoarmpit) is a straight vertical measure, not curvilinear (following the curve of the body). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). + +![Waist to armpit](waisttoarmpit.jpg) + +#### High point shoulder (HPS) + +[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. + +Here are two approaches. + +One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. + +![High point shoulder with dowel](hps2.jpg) + +Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. + +![High point shoulder with riibbon](hps.jpg) + +#### Обхват над грудьми + +[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. + +![High bust from the side](highbust.jpg) + +![High bust from the front](highbust2.jpg) + +#### Нахил плеча + +Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). + +#### Seat and hips + +Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. + +In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". + +Seat is across the fullest part of your butt. Some other sources call this the "hip". + +##### Waist + +Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. + +Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) From fc536fc1c31e157ee12043a8334bc7e9f79437af Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:57 +0100 Subject: [PATCH 390/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/about/faq/seam-allowance/uk.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 markdown/org/docs/about/faq/seam-allowance/uk.md diff --git a/markdown/org/docs/about/faq/seam-allowance/uk.md b/markdown/org/docs/about/faq/seam-allowance/uk.md new file mode 100644 index 00000000000..3388d6aa0fb --- /dev/null +++ b/markdown/org/docs/about/faq/seam-allowance/uk.md @@ -0,0 +1,7 @@ +--- +title: Why are seam allowances not included by default? +--- + +We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. + +We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) From 455f26f789bab35c348469004fb6c25f464ede46 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 11:30:58 +0100 Subject: [PATCH 391/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/about/faq/standard-measurements/uk.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 markdown/org/docs/about/faq/standard-measurements/uk.md diff --git a/markdown/org/docs/about/faq/standard-measurements/uk.md b/markdown/org/docs/about/faq/standard-measurements/uk.md new file mode 100644 index 00000000000..91870c9a259 --- /dev/null +++ b/markdown/org/docs/about/faq/standard-measurements/uk.md @@ -0,0 +1,9 @@ +--- +title: Where did the "standard" measurements go? +--- + +In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. + +We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). + +We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). From b2b2e0cf73b7b10e2b7c31c747e7bcde2a9ad1f0 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 11:36:28 +0100 Subject: [PATCH 392/795] chore: dependencies update --- CHANGELOG.md | 14 ++++++++++++++ README.md | 17 +++++++++-------- config/dependencies.yaml | 18 +++++++++--------- designs/aaron/README.md | 2 +- designs/albert/README.md | 2 +- designs/bee/README.md | 2 +- designs/bella/README.md | 2 +- designs/benjamin/README.md | 2 +- designs/bent/README.md | 2 +- designs/bob/README.md | 2 +- designs/breanna/README.md | 2 +- designs/brian/README.md | 2 +- designs/bruce/README.md | 2 +- designs/carlita/README.md | 2 +- designs/carlton/README.md | 2 +- designs/cathrin/README.md | 2 +- designs/charlie/README.md | 2 +- designs/cornelius/README.md | 2 +- designs/diana/README.md | 2 +- designs/examples/README.md | 2 +- designs/florence/README.md | 2 +- designs/florent/README.md | 2 +- designs/gozer/README.md | 2 +- designs/hi/README.md | 2 +- designs/holmes/README.md | 2 +- designs/hortensia/README.md | 2 +- designs/huey/README.md | 2 +- designs/hugo/README.md | 2 +- designs/jaeger/README.md | 2 +- designs/legend/README.md | 2 +- designs/lucy/README.md | 2 +- designs/lumina/README.md | 2 +- designs/lumira/README.md | 2 +- designs/lunetius/README.md | 2 +- designs/magde/README.md | 2 +- designs/naomiwu/README.md | 2 +- designs/noble/README.md | 2 +- designs/octoplushy/README.md | 2 +- designs/onyx/README.md | 2 +- designs/otis/README.md | 2 +- designs/paco/README.md | 2 +- designs/penelope/README.md | 2 +- designs/plugintest/README.md | 2 +- designs/rendertest/README.md | 2 +- designs/sandy/README.md | 2 +- designs/shelly/README.md | 2 +- designs/shin/README.md | 2 +- designs/simon/README.md | 2 +- designs/simone/README.md | 2 +- designs/skully/README.md | 2 +- designs/sven/README.md | 2 +- designs/tamiko/README.md | 2 +- designs/teagan/README.md | 2 +- designs/tiberius/README.md | 2 +- designs/titan/README.md | 2 +- designs/trayvon/README.md | 2 +- designs/tristan/README.md | 2 +- designs/uma/README.md | 2 +- designs/wahid/README.md | 2 +- designs/walburga/README.md | 2 +- designs/waralee/README.md | 2 +- designs/yuri/README.md | 2 +- packages/core/README.md | 2 +- packages/models/README.md | 2 +- packages/new-design/README.md | 2 +- packages/prettier-config/README.md | 2 +- packages/react-components/README.md | 2 +- packages/rehype-highlight-lines/README.md | 2 +- packages/rehype-jargon/README.md | 2 +- packages/snapseries/README.md | 2 +- plugins/core-plugins/README.md | 2 +- plugins/plugin-annotations/README.md | 2 +- plugins/plugin-bin-pack/README.md | 2 +- plugins/plugin-bust/README.md | 2 +- plugins/plugin-flip/README.md | 2 +- plugins/plugin-gore/README.md | 2 +- plugins/plugin-i18n/README.md | 2 +- plugins/plugin-measurements/README.md | 2 +- plugins/plugin-mirror/README.md | 2 +- plugins/plugin-ringsector/README.md | 2 +- plugins/plugin-round/README.md | 2 +- plugins/plugin-sprinkle/README.md | 2 +- plugins/plugin-svgattr/README.md | 2 +- plugins/plugin-theme/README.md | 2 +- plugins/plugin-timing/README.md | 2 +- plugins/plugin-versionfree-svg/README.md | 2 +- 86 files changed, 115 insertions(+), 100 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54c3d679af4..21684445364 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ - Always load plugin-bust due to its changes in how it handle conditionality. +### huey + +#### Fixed + + - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes + - Adding missing translation for rubbing option + - Hide unused ribbing parts when ribbing option is disabled + ### hugo #### Fixed @@ -39,6 +47,12 @@ - Fix back exposure when expand is off. Fixes +### wahid + +#### Changed + + - Add a warning when waist and hip reduction are both zero, so no back dart is required + ### plugin-bust #### Changed diff --git a/README.md b/README.md index dac07eac6a1..03c2bb9b506 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ All Contributors

Quentin FELIX
Quentin FELIX
💻 🎨 + Rachel Ostic
Rachel Ostic
📖 Rik Hekker
Rik Hekker
🐛 Sam Livingston-Gray
Sam Livingston-Gray
📖 Sanne
Sanne
💻 📖 Sara Latorre
Sara Latorre
🌍 SeaZeeZee
SeaZeeZee
📖 💻 - SimonbJohnson
SimonbJohnson
🐛 + SimonbJohnson
SimonbJohnson
🐛 SirCharlotte
SirCharlotte
🌍 Slylele
Slylele
📖 🌍 Soazillon
Soazillon
🌍 Soham Tembhurne
Soham Tembhurne
💻 SoneaTheBest
SoneaTheBest
🌍 Sophia
Sophia
💻 - Stefan Sydow
Stefan Sydow
🌍 📖 💻 + Stefan Sydow
Stefan Sydow
🌍 📖 💻 Stefano
Stefano
📖 Sushmita Biswas
Sushmita Biswas
💻 Tanay Toshniwal
Tanay Toshniwal
💻 Trent Trama
Trent Trama
💻 Tríona
Tríona
📖 Unmutual
Unmutual
📖 - Vili Sinervä
Vili Sinervä
💻 + Vili Sinervä
Vili Sinervä
💻 Vili Sinervä
Vili Sinervä
💻 Wouter van Wageningen
Wouter van Wageningen
💻 🎨 🔧 Yash Anil Ambekar
Yash Anil Ambekar
📖 amysews
amysews
📖 anna-puk
anna-puk
💻 beautifulsummermoon
beautifulsummermoon
🌍 - berce
berce
📖 + berce
berce
📖 biou
biou
💻 bobgeorgethe3rd
bobgeorgethe3rd
💻 📖 🎨 brmlyklr
brmlyklr
📖 chri5b
chri5b
💻 ⚠️ dingcycle
dingcycle
🌍 drowned-in-books
drowned-in-books
💬 - econo202
econo202
📖 + econo202
econo202
📖 ericamattos
ericamattos
🌍 evilrobotfromouterspace
evilrobotfromouterspace
🐛 fightingrabbit
fightingrabbit
💻 gaylyndie
gaylyndie
📖 grimlokason
grimlokason
💻 hellgy
hellgy
🎨 - jackseye
jackseye
📖 + jackseye
jackseye
📖 marckiesel
marckiesel
🌍 marpants
marpants
💻 mergerg
mergerg
📖 mesil
mesil
🐛 starfetch
starfetch
💻 📖 🌍 🎨 timorl
timorl
💻 - ttimearl
ttimearl
🖋 + ttimearl
ttimearl
🖋 tuesgloomsday
tuesgloomsday
📖 valadaptive
valadaptive
💻 viocky
viocky
🌍 diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 5e395b94bb5..d37f466095b 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -87,7 +87,7 @@ jaeger: '@freesewing/plugin-bust': *freesewing new-design: _: - 'axios': &axios '1.6.7' + 'axios': &axios '1.6.8' 'chalk': '5.3.0' 'execa': '8.0.1' 'mustache': &mustache '4.2.0' @@ -179,12 +179,12 @@ yuri: backend: _: - '@aws-sdk/client-sesv2': '3.533.0' + '@aws-sdk/client-sesv2': '3.535.0' '@prisma/client': &prisma '5.11.0' 'bcryptjs': '2.4.3' 'cors': '2.8.5' 'dotenv': '16.4.5' - 'express': '4.18.3' + 'express': '4.19.1' 'js-yaml': &jsyaml '4.1.0' 'lodash.get': *_get 'mustache': *mustache @@ -199,7 +199,7 @@ backend: dev: 'chai': *chai 'chai-http': '4.4.0' - 'esbuild': '0.20.1' + 'esbuild': '0.20.2' 'mocha': *mocha 'mocha-steps': '1.3.0' 'nodemon': '3.1.0' @@ -210,7 +210,7 @@ dev: '@mdx-js/mdx': &mdx '^3.0.0' '@mdx-js/react': *mdx '@mdx-js/runtime': &mdxRuntime '2.0.0-next.9' - '@next/bundle-analyzer': &next '14.1.3' + '@next/bundle-analyzer': &next '14.1.4' '@tailwindcss/typography': &tailwindTypography '0.5.10' 'algoliasearch': '4.22.1' 'daisyui': &daisyui '4.7.3' @@ -237,9 +237,9 @@ dev: 'remark-gfm': &remarkGfm '4.0.0' 'strip-markdown': &stripMarkdown 6.0.0 dev: &nextSiteDevDependencies - 'autoprefixer': &autoprefixer '10.4.18' + 'autoprefixer': &autoprefixer '10.4.19' 'js-yaml': &jsYaml '4.1.0' - 'postcss': &postcss '8.4.35' + 'postcss': &postcss '8.4.38' 'remark-extract-frontmatter': '3.2.0' 'remark-mdx-frontmatter': &mdxfrontmatter '4.0.0' 'tailwindcss': &tailwindcss '3.4.1' @@ -295,7 +295,7 @@ org: 'daisyui': *daisyui 'echarts': &echarts 5.5.0 'echarts-for-react': &echartsReact 3.0.2 - 'jotai': &jotai '2.7.0' + 'jotai': &jotai '2.7.1' 'jotai-location': &jotai-location '0.5.4' 'lodash.get': *_get 'lodash.orderby': *_orderby @@ -324,7 +324,7 @@ org: shared: _: - '@next/mdx': '14.1.3' + '@next/mdx': *next '@resvg/resvg-js': '2.6.0' '@tailwindcss/typography': *tailwindTypography 'Buffer': '0.0.0' diff --git a/designs/aaron/README.md b/designs/aaron/README.md index baaa600cb07..e61e8239fdd 100644 --- a/designs/aaron/README.md +++ b/designs/aaron/README.md @@ -21,7 +21,7 @@ All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

All Contributors

Date: Sat, 23 Mar 2024 11:39:27 +0100 Subject: [PATCH 393/795] fix(shared): Remove double entry in en.yaml --- sites/shared/components/account/en.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index 6079c8aa39d..0431cddead0 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -272,7 +272,6 @@ unitsMustSave: "Note: You must save after changing Units to have the change take makePublic: Make public makePrivate: Make private -pattern: Pattern patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From 0b25bd2a0fe9207d4a0345ac36bfd7380fff3b6f Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 11:52:46 +0100 Subject: [PATCH 394/795] chore(markdown): Fixes due to crowdin issues --- markdown/org/newsletter/2022q4/uk.md | 2 +- markdown/org/newsletter/2023q1/fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/newsletter/2022q4/uk.md b/markdown/org/newsletter/2022q4/uk.md index 722fc706e9f..8b0d70449ca 100644 --- a/markdown/org/newsletter/2022q4/uk.md +++ b/markdown/org/newsletter/2022q4/uk.md @@ -37,7 +37,7 @@ FreeSewing 2.22 вийшов наприкінці серпня, в ньому з ### Конфігурація на рівні частин, також відома як підтримка пакетів -На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів *, комір з набору комірів *, додати кишені з набору комірів *,* і так далі.

+На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів, комір з набору комірів, додати кишені з набору комірів, і так далі. Це одна з тих речей, яка має багато сенсу, але викликає питання: Як все це буде працювати під капотом? У версії 2 FreeSewing реалізація цих ідей була б нетривіальною, тому що, хоча ми підтримуємо розширення викрійок на інші дизайни, цей процес є надто громіздким для такого рівня спеціального поєднання різних дизайнів. diff --git a/markdown/org/newsletter/2023q1/fr.md b/markdown/org/newsletter/2023q1/fr.md index a66aaf2fc55..f5b6c68565c 100644 --- a/markdown/org/newsletter/2023q1/fr.md +++ b/markdown/org/newsletter/2023q1/fr.md @@ -69,7 +69,7 @@ Le chiffre d'affaires de FreeSewing au cours de l'année 2022 était de `9,325,5 Nous avons constaté un énorme afflux d'utilisateurs, de mécènes et de revenus en 2020 sans doute parce que [notre modèle de masque facial](https://freesewing.org/designs/florence/) a été follement populaire pendant la pénurie d'EPI cette année-là. Ce pic s'est atténué depuis, et a entraîné une tendance à la baisse des revenus d'une année sur l'autre. De plus, l'inflation et la crise du coût de la vie ont été particulièrement tangibles cette année, et j'ai reçu plus d'un message d'excuse de la part de mécènes qui voulaient continuer à nous soutenir mais qui se sont sentis obligés de nous supprimer de leur budget mensuel pour être sûrs de pouvoir subvenir à leurs besoins et/ou à ceux de leur famille. -Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10 000 `. Oui, j'aimerais bien arriver à 12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. +Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10 000 `. Oui, j'aimerais bien arriver à `12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. Je suis fière non seulement du travail que nous faisons, mais aussi parce que FreeSewing est une force pour le bien dans ce monde. En ajoutant les `9.325,54`de cette année, les contributions de FreeSewing à [Médecins sans frontières/Doctors Without Borders](https://www.msf.org/) s'élèvent à `38.814,94` euros ou environ 41,6k dollars américains. De l'argent qui aide les gens qui sont dans une situation pire que la nôtre. From 9ddcbf7e01ed1e944908d3eef2d9685623b9768a Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 11:52:58 +0100 Subject: [PATCH 395/795] fix(lab): Always prebuild empty jargon file Closes #6399 --- sites/lab/prebuild.mjs | 1 + sites/shared/prebuild/jargon.mjs | 15 +++++++++++++++ sites/shared/prebuild/runner.mjs | 2 ++ 3 files changed, 18 insertions(+) create mode 100644 sites/shared/prebuild/jargon.mjs diff --git a/sites/lab/prebuild.mjs b/sites/lab/prebuild.mjs index 5eabf325527..1ef8903c8ba 100644 --- a/sites/lab/prebuild.mjs +++ b/sites/lab/prebuild.mjs @@ -13,6 +13,7 @@ prebuildRunner({ // Always prebuild designs: true, i18n: true, + jargon: true, navigation: true, // Prebuild in production favicon: 'productionOnly', diff --git a/sites/shared/prebuild/jargon.mjs b/sites/shared/prebuild/jargon.mjs new file mode 100644 index 00000000000..7be969d3d91 --- /dev/null +++ b/sites/shared/prebuild/jargon.mjs @@ -0,0 +1,15 @@ +import fs from 'node:fs' +import path from 'node:path' + +/* + * Jaron is part of the 'docs' prebuild step + * But in the lab, there are no docs, so we build an empty jargon file + * because it is included in some components so it needs to be there. + */ +export const prebuildJargon = async (store) => { + fs.writeFileSync( + path.resolve('..', store.site, 'prebuild', `jargon.mjs`), + `export const site = "${store.site}" +export const jargon = { en: { } }` + ) +} diff --git a/sites/shared/prebuild/runner.mjs b/sites/shared/prebuild/runner.mjs index e18972a0e79..dbef77484aa 100644 --- a/sites/shared/prebuild/runner.mjs +++ b/sites/shared/prebuild/runner.mjs @@ -13,6 +13,7 @@ import { prebuildFavicon as favicon } from './favicon.mjs' import { prebuildCrowdin as crowdin } from './crowdin.mjs' import { prebuildOrg as orgPageTemplates } from './org.mjs' import { prebuildSearch as search } from './search.mjs' +import { prebuildJargon as jargon } from './jargon.mjs' //import { prebuildLab as lab} from './lab.mjs' import { prebuildOgImages as ogImages } from './og.mjs' @@ -32,6 +33,7 @@ const handlers = { favicon, patrons, docs, + jargon, posts, navigation, git, From c5569332de2d4c469a9155f769d6aef1d8a17869 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 11:53:31 +0100 Subject: [PATCH 396/795] chore(lab): Prebuild update --- sites/lab/pages/account/bookmark.mjs | 3 +- sites/lab/pages/account/import.mjs | 59 +++++++++++++ sites/lab/pages/account/pattern.mjs | 2 +- .../lab/pages/account/patterns/aaron/edit.mjs | 2 +- .../pages/account/patterns/albert/edit.mjs | 2 +- sites/lab/pages/account/patterns/bee/edit.mjs | 2 +- .../lab/pages/account/patterns/bella/edit.mjs | 2 +- .../pages/account/patterns/benjamin/edit.mjs | 2 +- .../lab/pages/account/patterns/bent/edit.mjs | 2 +- sites/lab/pages/account/patterns/bob/edit.mjs | 2 +- .../pages/account/patterns/breanna/edit.mjs | 2 +- .../lab/pages/account/patterns/brian/edit.mjs | 2 +- .../lab/pages/account/patterns/bruce/edit.mjs | 2 +- .../pages/account/patterns/carlita/edit.mjs | 2 +- .../pages/account/patterns/carlton/edit.mjs | 2 +- .../pages/account/patterns/cathrin/edit.mjs | 2 +- .../pages/account/patterns/charlie/edit.mjs | 2 +- .../pages/account/patterns/cornelius/edit.mjs | 2 +- .../lab/pages/account/patterns/diana/edit.mjs | 2 +- .../pages/account/patterns/florence/edit.mjs | 2 +- .../pages/account/patterns/florent/edit.mjs | 2 +- .../lab/pages/account/patterns/gozer/edit.mjs | 2 +- sites/lab/pages/account/patterns/hi/edit.mjs | 2 +- .../pages/account/patterns/holmes/edit.mjs | 2 +- .../pages/account/patterns/hortensia/edit.mjs | 2 +- .../lab/pages/account/patterns/huey/edit.mjs | 2 +- .../lab/pages/account/patterns/hugo/edit.mjs | 2 +- .../pages/account/patterns/jaeger/edit.mjs | 2 +- .../lab/pages/account/patterns/lucy/edit.mjs | 2 +- .../pages/account/patterns/lumina/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/lumira/edit.mjs | 86 +++++++++++++++++++ .../pages/account/patterns/lunetius/edit.mjs | 2 +- .../lab/pages/account/patterns/noble/edit.mjs | 2 +- .../account/patterns/octoplushy/edit.mjs | 2 +- .../lab/pages/account/patterns/onyx/edit.mjs | 2 +- .../lab/pages/account/patterns/otis/edit.mjs | 2 +- .../lab/pages/account/patterns/paco/edit.mjs | 2 +- .../pages/account/patterns/penelope/edit.mjs | 2 +- .../lab/pages/account/patterns/sandy/edit.mjs | 2 +- .../pages/account/patterns/shelly/edit.mjs | 2 +- .../lab/pages/account/patterns/shin/edit.mjs | 2 +- .../lab/pages/account/patterns/simon/edit.mjs | 2 +- .../pages/account/patterns/simone/edit.mjs | 2 +- .../pages/account/patterns/skully/edit.mjs | 2 +- .../lab/pages/account/patterns/sven/edit.mjs | 2 +- .../pages/account/patterns/tamiko/edit.mjs | 2 +- .../pages/account/patterns/teagan/edit.mjs | 2 +- .../pages/account/patterns/tiberius/edit.mjs | 2 +- .../lab/pages/account/patterns/titan/edit.mjs | 2 +- .../pages/account/patterns/trayvon/edit.mjs | 2 +- .../pages/account/patterns/tristan/edit.mjs | 86 +++++++++++++++++++ sites/lab/pages/account/patterns/uma/edit.mjs | 2 +- .../lab/pages/account/patterns/wahid/edit.mjs | 2 +- .../pages/account/patterns/walburga/edit.mjs | 2 +- .../pages/account/patterns/waralee/edit.mjs | 2 +- .../lab/pages/account/patterns/yuri/edit.mjs | 2 +- sites/lab/pages/account/set.mjs | 2 +- sites/lab/pages/new/lumira.mjs | 41 +++++++++ 58 files changed, 411 insertions(+), 54 deletions(-) create mode 100644 sites/lab/pages/account/import.mjs create mode 100644 sites/lab/pages/account/patterns/lumina/edit.mjs create mode 100644 sites/lab/pages/account/patterns/lumira/edit.mjs create mode 100644 sites/lab/pages/account/patterns/tristan/edit.mjs create mode 100644 sites/lab/pages/new/lumira.mjs diff --git a/sites/lab/pages/account/bookmark.mjs b/sites/lab/pages/account/bookmark.mjs index b00b99ad60f..13406a58df1 100644 --- a/sites/lab/pages/account/bookmark.mjs +++ b/sites/lab/pages/account/bookmark.mjs @@ -51,7 +51,6 @@ const BookmarkPage = ({ page }) => { else setLoadingStatus([false]) } const newId = getSearchParam('id') - console.log({ newId }) if (newId !== id) { setId(newId) getBookmark(newId) @@ -59,7 +58,7 @@ const BookmarkPage = ({ page }) => { }, [id, backend, setLoadingStatus]) return ( - + diff --git a/sites/lab/pages/account/import.mjs b/sites/lab/pages/account/import.mjs new file mode 100644 index 00000000000..50b3d1ce376 --- /dev/null +++ b/sites/lab/pages/account/import.mjs @@ -0,0 +1,59 @@ +// Dependencies +import dynamic from 'next/dynamic' +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { ns as setsNs } from 'shared/components/account/bookmarks.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(setsNs, authNs, pageNs) + +/* + * Some things should never generated as SSR + * So for these, we run a dynamic import and disable SSR rendering + */ +const DynamicAuthWrapper = dynamic( + () => import('shared/components/wrappers/auth/index.mjs').then((mod) => mod.AuthWrapper), + { ssr: false } +) + +const DynamicImporter = dynamic( + () => import('shared/components/account/import.mjs').then((mod) => mod.Importer), + { ssr: false } +) + +/* + * Each page MUST be wrapped in the PageWrapper component. + * You also MUST spread props.page into this wrapper component + * when path and locale come from static props (as here) + * or set them manually. + */ +const AccountImporterPage = ({ page }) => { + const { t } = useTranslation(ns) + + return ( + + + + + + ) +} + +export default AccountImporterPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'import'], + }, + }, + } +} diff --git a/sites/lab/pages/account/pattern.mjs b/sites/lab/pages/account/pattern.mjs index c226b8faa90..8049ef58733 100644 --- a/sites/lab/pages/account/pattern.mjs +++ b/sites/lab/pages/account/pattern.mjs @@ -43,7 +43,7 @@ const PatternPage = ({ page }) => { }, [id]) return ( - + diff --git a/sites/lab/pages/account/patterns/aaron/edit.mjs b/sites/lab/pages/account/patterns/aaron/edit.mjs index 30c99ff61e2..65ae7340ca8 100644 --- a/sites/lab/pages/account/patterns/aaron/edit.mjs +++ b/sites/lab/pages/account/patterns/aaron/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('aaron', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditAaronPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/albert/edit.mjs b/sites/lab/pages/account/patterns/albert/edit.mjs index b07d1f0a93d..174967625a4 100644 --- a/sites/lab/pages/account/patterns/albert/edit.mjs +++ b/sites/lab/pages/account/patterns/albert/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('albert', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditAlbertPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/bee/edit.mjs b/sites/lab/pages/account/patterns/bee/edit.mjs index 9faf9b440ee..059cb5ed2f8 100644 --- a/sites/lab/pages/account/patterns/bee/edit.mjs +++ b/sites/lab/pages/account/patterns/bee/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('bee', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBeePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/bella/edit.mjs b/sites/lab/pages/account/patterns/bella/edit.mjs index 2fcc75531d4..6ccde447b95 100644 --- a/sites/lab/pages/account/patterns/bella/edit.mjs +++ b/sites/lab/pages/account/patterns/bella/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('bella', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBellaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/benjamin/edit.mjs b/sites/lab/pages/account/patterns/benjamin/edit.mjs index 420786d1d36..b71c29222e0 100644 --- a/sites/lab/pages/account/patterns/benjamin/edit.mjs +++ b/sites/lab/pages/account/patterns/benjamin/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('benjamin', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBenjaminPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/bent/edit.mjs b/sites/lab/pages/account/patterns/bent/edit.mjs index 1bc30a8d9fa..db19b348558 100644 --- a/sites/lab/pages/account/patterns/bent/edit.mjs +++ b/sites/lab/pages/account/patterns/bent/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('bent', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBentPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/bob/edit.mjs b/sites/lab/pages/account/patterns/bob/edit.mjs index 481b4302e20..9fc65ef8a57 100644 --- a/sites/lab/pages/account/patterns/bob/edit.mjs +++ b/sites/lab/pages/account/patterns/bob/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('bob', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBobPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/breanna/edit.mjs b/sites/lab/pages/account/patterns/breanna/edit.mjs index 6a7a3f01b9d..157617f179b 100644 --- a/sites/lab/pages/account/patterns/breanna/edit.mjs +++ b/sites/lab/pages/account/patterns/breanna/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('breanna', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBreannaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/brian/edit.mjs b/sites/lab/pages/account/patterns/brian/edit.mjs index 8420ec69b26..e803d9f0551 100644 --- a/sites/lab/pages/account/patterns/brian/edit.mjs +++ b/sites/lab/pages/account/patterns/brian/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('brian', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBrianPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/bruce/edit.mjs b/sites/lab/pages/account/patterns/bruce/edit.mjs index c143392a913..7a924870804 100644 --- a/sites/lab/pages/account/patterns/bruce/edit.mjs +++ b/sites/lab/pages/account/patterns/bruce/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('bruce', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditBrucePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/carlita/edit.mjs b/sites/lab/pages/account/patterns/carlita/edit.mjs index a6e633b452b..3273f0e99f2 100644 --- a/sites/lab/pages/account/patterns/carlita/edit.mjs +++ b/sites/lab/pages/account/patterns/carlita/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('carlita', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditCarlitaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/carlton/edit.mjs b/sites/lab/pages/account/patterns/carlton/edit.mjs index add35130a52..276889ad410 100644 --- a/sites/lab/pages/account/patterns/carlton/edit.mjs +++ b/sites/lab/pages/account/patterns/carlton/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('carlton', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditCarltonPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/cathrin/edit.mjs b/sites/lab/pages/account/patterns/cathrin/edit.mjs index f9a58d1e5a6..2bcd3415484 100644 --- a/sites/lab/pages/account/patterns/cathrin/edit.mjs +++ b/sites/lab/pages/account/patterns/cathrin/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('cathrin', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditCathrinPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/charlie/edit.mjs b/sites/lab/pages/account/patterns/charlie/edit.mjs index 2de2bb49ae4..1bd290ddfc1 100644 --- a/sites/lab/pages/account/patterns/charlie/edit.mjs +++ b/sites/lab/pages/account/patterns/charlie/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('charlie', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditCharliePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/cornelius/edit.mjs b/sites/lab/pages/account/patterns/cornelius/edit.mjs index 66f17823da3..100fae8059e 100644 --- a/sites/lab/pages/account/patterns/cornelius/edit.mjs +++ b/sites/lab/pages/account/patterns/cornelius/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('cornelius', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditCorneliusPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/diana/edit.mjs b/sites/lab/pages/account/patterns/diana/edit.mjs index eeaad824d64..3968db22f1c 100644 --- a/sites/lab/pages/account/patterns/diana/edit.mjs +++ b/sites/lab/pages/account/patterns/diana/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('diana', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditDianaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/florence/edit.mjs b/sites/lab/pages/account/patterns/florence/edit.mjs index 8742d429aa9..17f6d39aed9 100644 --- a/sites/lab/pages/account/patterns/florence/edit.mjs +++ b/sites/lab/pages/account/patterns/florence/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('florence', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditFlorencePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/florent/edit.mjs b/sites/lab/pages/account/patterns/florent/edit.mjs index e5f64cb648b..4b99619931b 100644 --- a/sites/lab/pages/account/patterns/florent/edit.mjs +++ b/sites/lab/pages/account/patterns/florent/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('florent', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditFlorentPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/gozer/edit.mjs b/sites/lab/pages/account/patterns/gozer/edit.mjs index 05f11ed372e..78bff63c903 100644 --- a/sites/lab/pages/account/patterns/gozer/edit.mjs +++ b/sites/lab/pages/account/patterns/gozer/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('gozer', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditGozerPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/hi/edit.mjs b/sites/lab/pages/account/patterns/hi/edit.mjs index 40afcc25466..ac2c7a89106 100644 --- a/sites/lab/pages/account/patterns/hi/edit.mjs +++ b/sites/lab/pages/account/patterns/hi/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('hi', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditHiPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/holmes/edit.mjs b/sites/lab/pages/account/patterns/holmes/edit.mjs index 81ad550618c..f2c2cb47a58 100644 --- a/sites/lab/pages/account/patterns/holmes/edit.mjs +++ b/sites/lab/pages/account/patterns/holmes/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('holmes', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditHolmesPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/hortensia/edit.mjs b/sites/lab/pages/account/patterns/hortensia/edit.mjs index e827fafbd14..e3f8cf0f6e4 100644 --- a/sites/lab/pages/account/patterns/hortensia/edit.mjs +++ b/sites/lab/pages/account/patterns/hortensia/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('hortensia', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditHortensiaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/huey/edit.mjs b/sites/lab/pages/account/patterns/huey/edit.mjs index 348389fbd48..8bcc76f548d 100644 --- a/sites/lab/pages/account/patterns/huey/edit.mjs +++ b/sites/lab/pages/account/patterns/huey/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('huey', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditHueyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/hugo/edit.mjs b/sites/lab/pages/account/patterns/hugo/edit.mjs index eeb03de0f0f..3439dc28dd4 100644 --- a/sites/lab/pages/account/patterns/hugo/edit.mjs +++ b/sites/lab/pages/account/patterns/hugo/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('hugo', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditHugoPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/jaeger/edit.mjs b/sites/lab/pages/account/patterns/jaeger/edit.mjs index 712a9d1b03e..2c3e0425089 100644 --- a/sites/lab/pages/account/patterns/jaeger/edit.mjs +++ b/sites/lab/pages/account/patterns/jaeger/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('jaeger', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditJaegerPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/lucy/edit.mjs b/sites/lab/pages/account/patterns/lucy/edit.mjs index 2b08cfed7cc..f3ef8bb17fd 100644 --- a/sites/lab/pages/account/patterns/lucy/edit.mjs +++ b/sites/lab/pages/account/patterns/lucy/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('lucy', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditLucyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/lumina/edit.mjs b/sites/lab/pages/account/patterns/lumina/edit.mjs new file mode 100644 index 00000000000..e087e6703d5 --- /dev/null +++ b/sites/lab/pages/account/patterns/lumina/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Lumina } from 'designs/lumina/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('lumina', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditLuminaPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditLuminaPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'lumina'], + title: 'Lumina', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/lumira/edit.mjs b/sites/lab/pages/account/patterns/lumira/edit.mjs new file mode 100644 index 00000000000..718a1a0fc6b --- /dev/null +++ b/sites/lab/pages/account/patterns/lumira/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Lumira } from 'designs/lumira/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('lumira', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditLumiraPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditLumiraPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'lumira'], + title: 'Lumira', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/lunetius/edit.mjs b/sites/lab/pages/account/patterns/lunetius/edit.mjs index c7333c3cbaf..73b8a320b74 100644 --- a/sites/lab/pages/account/patterns/lunetius/edit.mjs +++ b/sites/lab/pages/account/patterns/lunetius/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('lunetius', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditLunetiusPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/noble/edit.mjs b/sites/lab/pages/account/patterns/noble/edit.mjs index fcfcbd297ce..403e4b2f249 100644 --- a/sites/lab/pages/account/patterns/noble/edit.mjs +++ b/sites/lab/pages/account/patterns/noble/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('noble', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditNoblePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/octoplushy/edit.mjs b/sites/lab/pages/account/patterns/octoplushy/edit.mjs index 1ea32daefc4..a1b3d0ffa7d 100644 --- a/sites/lab/pages/account/patterns/octoplushy/edit.mjs +++ b/sites/lab/pages/account/patterns/octoplushy/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('octoplushy', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditOctoplushyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/onyx/edit.mjs b/sites/lab/pages/account/patterns/onyx/edit.mjs index 8970399185d..b26ec8a2502 100644 --- a/sites/lab/pages/account/patterns/onyx/edit.mjs +++ b/sites/lab/pages/account/patterns/onyx/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('onyx', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditOnyxPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/otis/edit.mjs b/sites/lab/pages/account/patterns/otis/edit.mjs index 545b031db94..971fade99ec 100644 --- a/sites/lab/pages/account/patterns/otis/edit.mjs +++ b/sites/lab/pages/account/patterns/otis/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('otis', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditOtisPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/paco/edit.mjs b/sites/lab/pages/account/patterns/paco/edit.mjs index c578db7c780..5ae478f4f6f 100644 --- a/sites/lab/pages/account/patterns/paco/edit.mjs +++ b/sites/lab/pages/account/patterns/paco/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('paco', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditPacoPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/penelope/edit.mjs b/sites/lab/pages/account/patterns/penelope/edit.mjs index dad33b5a824..627ca6f3bd4 100644 --- a/sites/lab/pages/account/patterns/penelope/edit.mjs +++ b/sites/lab/pages/account/patterns/penelope/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('penelope', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditPenelopePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/sandy/edit.mjs b/sites/lab/pages/account/patterns/sandy/edit.mjs index fd292e75137..cfb7ef7d33c 100644 --- a/sites/lab/pages/account/patterns/sandy/edit.mjs +++ b/sites/lab/pages/account/patterns/sandy/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('sandy', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditSandyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/shelly/edit.mjs b/sites/lab/pages/account/patterns/shelly/edit.mjs index b813c832561..f7d06c1ee6b 100644 --- a/sites/lab/pages/account/patterns/shelly/edit.mjs +++ b/sites/lab/pages/account/patterns/shelly/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('shelly', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditShellyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/shin/edit.mjs b/sites/lab/pages/account/patterns/shin/edit.mjs index 0e36f5ac5a1..10fd581419f 100644 --- a/sites/lab/pages/account/patterns/shin/edit.mjs +++ b/sites/lab/pages/account/patterns/shin/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('shin', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditShinPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/simon/edit.mjs b/sites/lab/pages/account/patterns/simon/edit.mjs index 18a41d998ab..9ee7173aef8 100644 --- a/sites/lab/pages/account/patterns/simon/edit.mjs +++ b/sites/lab/pages/account/patterns/simon/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('simon', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditSimonPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/simone/edit.mjs b/sites/lab/pages/account/patterns/simone/edit.mjs index eae0dbc9972..ae536540eca 100644 --- a/sites/lab/pages/account/patterns/simone/edit.mjs +++ b/sites/lab/pages/account/patterns/simone/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('simone', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditSimonePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/skully/edit.mjs b/sites/lab/pages/account/patterns/skully/edit.mjs index 2a381922062..076b10ed867 100644 --- a/sites/lab/pages/account/patterns/skully/edit.mjs +++ b/sites/lab/pages/account/patterns/skully/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('skully', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditSkullyPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/sven/edit.mjs b/sites/lab/pages/account/patterns/sven/edit.mjs index f7870bba982..ffeb4372c33 100644 --- a/sites/lab/pages/account/patterns/sven/edit.mjs +++ b/sites/lab/pages/account/patterns/sven/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('sven', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditSvenPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/tamiko/edit.mjs b/sites/lab/pages/account/patterns/tamiko/edit.mjs index bfe982c695c..8d0b135c2b0 100644 --- a/sites/lab/pages/account/patterns/tamiko/edit.mjs +++ b/sites/lab/pages/account/patterns/tamiko/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('tamiko', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditTamikoPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/teagan/edit.mjs b/sites/lab/pages/account/patterns/teagan/edit.mjs index 167c856274e..e9c09bd9c4e 100644 --- a/sites/lab/pages/account/patterns/teagan/edit.mjs +++ b/sites/lab/pages/account/patterns/teagan/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('teagan', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditTeaganPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/tiberius/edit.mjs b/sites/lab/pages/account/patterns/tiberius/edit.mjs index 4639c311826..2f855615ad1 100644 --- a/sites/lab/pages/account/patterns/tiberius/edit.mjs +++ b/sites/lab/pages/account/patterns/tiberius/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('tiberius', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditTiberiusPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/titan/edit.mjs b/sites/lab/pages/account/patterns/titan/edit.mjs index 81d575eb5d6..56ea340df10 100644 --- a/sites/lab/pages/account/patterns/titan/edit.mjs +++ b/sites/lab/pages/account/patterns/titan/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('titan', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditTitanPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/trayvon/edit.mjs b/sites/lab/pages/account/patterns/trayvon/edit.mjs index bf1e368c0a5..1f5e3575c96 100644 --- a/sites/lab/pages/account/patterns/trayvon/edit.mjs +++ b/sites/lab/pages/account/patterns/trayvon/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('trayvon', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditTrayvonPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/tristan/edit.mjs b/sites/lab/pages/account/patterns/tristan/edit.mjs new file mode 100644 index 00000000000..a9566759f85 --- /dev/null +++ b/sites/lab/pages/account/patterns/tristan/edit.mjs @@ -0,0 +1,86 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Tristan } from 'designs/tristan/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useState, useEffect, useContext } from 'react' +import { useTranslation } from 'next-i18next' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Context +import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' +import { Loading } from 'shared/components/spinner.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('tristan', wbNs, pageNs) + +const EditDesignComponent = ({ id, design, Design, settings }) => ( + +) + +const EditTristanPage = ({ page }) => { + const { setLoadingStatus } = useContext(LoadingStatusContext) + const backend = useBackend() + const { t } = useTranslation(ns) + + const [pattern, setPattern] = useState(false) + + useEffect(() => { + const getPattern = async () => { + setLoadingStatus([true, t('backendLoadingStarted')]) + let result + try { + result = await backend.getPattern(id) + if (result.success) { + setPattern(result.data.pattern) + setLoadingStatus([true, 'backendLoadingCompleted', true, true]) + } else setLoadingStatus([true, 'backendError', true, false]) + } catch (err) { + console.log(err) + setLoadingStatus([true, 'backendError', true, false]) + } + } + const id = getSearchParam('id') + if (id) getPattern() + }, [backend, setLoadingStatus, t]) + + return ( + // prettier-ignore + + {pattern ? ( + + ) : ( +
+

{t('account:oneMomentPLease')}

+ +
+ )} + + ) +} + +export default EditTristanPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['account', 'patterns', 'tristan'], + title: 'Tristan', + }, + }, + } +} diff --git a/sites/lab/pages/account/patterns/uma/edit.mjs b/sites/lab/pages/account/patterns/uma/edit.mjs index af5ccad4938..e280f955323 100644 --- a/sites/lab/pages/account/patterns/uma/edit.mjs +++ b/sites/lab/pages/account/patterns/uma/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('uma', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditUmaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/wahid/edit.mjs b/sites/lab/pages/account/patterns/wahid/edit.mjs index 2e81d99a4f5..c3f7bf01805 100644 --- a/sites/lab/pages/account/patterns/wahid/edit.mjs +++ b/sites/lab/pages/account/patterns/wahid/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('wahid', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditWahidPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/walburga/edit.mjs b/sites/lab/pages/account/patterns/walburga/edit.mjs index 764ed8d9816..3db3cc3ee92 100644 --- a/sites/lab/pages/account/patterns/walburga/edit.mjs +++ b/sites/lab/pages/account/patterns/walburga/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('walburga', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditWalburgaPage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/waralee/edit.mjs b/sites/lab/pages/account/patterns/waralee/edit.mjs index 4ad4fbdd8af..290ffc41d73 100644 --- a/sites/lab/pages/account/patterns/waralee/edit.mjs +++ b/sites/lab/pages/account/patterns/waralee/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('waralee', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditWaraleePage = ({ page }) => { diff --git a/sites/lab/pages/account/patterns/yuri/edit.mjs b/sites/lab/pages/account/patterns/yuri/edit.mjs index 8ca1eef3922..1f5f055ca3b 100644 --- a/sites/lab/pages/account/patterns/yuri/edit.mjs +++ b/sites/lab/pages/account/patterns/yuri/edit.mjs @@ -21,7 +21,7 @@ import { Loading } from 'shared/components/spinner.mjs' const ns = nsMerge('yuri', wbNs, pageNs) const EditDesignComponent = ({ id, design, Design, settings }) => ( - + ) const EditYuriPage = ({ page }) => { diff --git a/sites/lab/pages/account/set.mjs b/sites/lab/pages/account/set.mjs index 7fbfcabde02..28d5148d76a 100644 --- a/sites/lab/pages/account/set.mjs +++ b/sites/lab/pages/account/set.mjs @@ -43,7 +43,7 @@ const SetPage = ({ page }) => { }, [id]) return ( - + diff --git a/sites/lab/pages/new/lumira.mjs b/sites/lab/pages/new/lumira.mjs new file mode 100644 index 00000000000..333cc7dcec4 --- /dev/null +++ b/sites/lab/pages/new/lumira.mjs @@ -0,0 +1,41 @@ +/* + * This page is auto-generated. Do not edit it by hand. + */ +import { Lumira } from 'designs/lumira/src/index.mjs' +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge } from 'shared/utils.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { Workbench, ns as wbNs } from 'shared/components/workbench/new.mjs' +import { WorkbenchLayout } from 'site/components/layouts/workbench.mjs' + +// Translation namespaces used on this page +const ns = nsMerge('lumira', wbNs, pageNs) + +const NewLumiraPage = ({ page, docs }) => ( + + + +) + +export default NewLumiraPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['new', 'lumira'], + title: 'Lumira', + }, + }, + } +} From e48ca5faf79742f7ddee977252cba3aff6ca11a9 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 11:55:04 +0100 Subject: [PATCH 397/795] fix: Typo in changelog --- config/changelog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/changelog.yaml b/config/changelog.yaml index 7a5253bfd9e..5b3a7efc9c5 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -22,7 +22,7 @@ Unreleased: Fixed: huey: - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes #6238 - - Adding missing translation for rubbing option + - Adding missing translation for ribbing option - Hide unused ribbing parts when ribbing option is disabled hugo: - Add missing dimension id attributes From 71b57adaf7ee34d672c9f795b795a14374001df2 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 12:03:10 +0100 Subject: [PATCH 398/795] chore(uma): Bump difficulty to 2 --- config/software/designs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/designs.json b/config/software/designs.json index 983a0f5e899..66cfa3d8fdc 100644 --- a/config/software/designs.json +++ b/config/software/designs.json @@ -897,7 +897,7 @@ "code": "Joost De Cock", "description": "A FreeSewing pattern for a basic, highly-customizable underwear pattern", "design": "Joost De Cock", - "difficulty": 1, + "difficulty": 2, "lab": true, "org": true, "tags": [ From 3c80481448d04b14090ab7c837ad228f8283b501 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Sat, 23 Mar 2024 12:11:33 +0100 Subject: [PATCH 399/795] fix(wahid): Fix images in sewing documentation --- markdown/org/docs/designs/wahid/instructions/en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/en.md b/markdown/org/docs/designs/wahid/instructions/en.md index 3cca9576f87..fbfe9446328 100644 --- a/markdown/org/docs/designs/wahid/instructions/en.md +++ b/markdown/org/docs/designs/wahid/instructions/en.md @@ -86,7 +86,7 @@ When you are done, press open this seam. #### Mark where your pocket needs to go -![Mark where your pocket needs to go](05a.png) +![Mark where your pocket needs to go](05b.png) Your front pattern piece has a helpline on it to show where the welt pocket should go. It's two half rectangles that got joined together when you closed the dart to form the shape of your welt pocket. @@ -117,7 +117,7 @@ Now sew along the helpline which marks the long edge of your pocket. #### Cut open the pocket -![Cut open the pocket](05c.png) +![Cut open the pocket](05e.png) Time to carefully cut open the pocket. Start in the middle of the pocket, and cut towards along the longest edges towards the side. @@ -127,7 +127,7 @@ At the edges of your pocket you need to stop cutting open the center and instead #### Press open the seam allowance -![Press open the seam allowance](05c.png) +![Press open the seam allowance](05f.png) Press open the seam allowance along the long edges of your pocket. From 144e57cc29c646f469c8bb32a7b49885d61068d1 Mon Sep 17 00:00:00 2001 From: matzie5 <56488326+matzie5@users.noreply.github.com> Date: Sat, 23 Mar 2024 12:41:38 +0100 Subject: [PATCH 400/795] Patch on the trace instructions - Pre-render function updated in accordance with plugin instruction - Anchor point definition added - Missing closing parenthesis added - Plugin bundle reference removed for easier code copy / paste --- markdown/dev/howtos/design/trace/en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/dev/howtos/design/trace/en.md b/markdown/dev/howtos/design/trace/en.md index 28c458057a9..31de654d309 100644 --- a/markdown/dev/howtos/design/trace/en.md +++ b/markdown/dev/howtos/design/trace/en.md @@ -79,7 +79,7 @@ const bgPlugin = { version: 1, hooks: { preRender: function (svg) { - if (svg.defs.indexOf(example) === -1) svg.defs += example + svg.defs.setIfUnset( 'background', background) }, }, } @@ -92,7 +92,6 @@ export const part = { name: 'example.part', draft: draftPart, plugins: [ - pluginBundle, // Here's our plugin to add the snippet bgPlugin, ] @@ -108,9 +107,10 @@ function draftPart ({ Point, points, Path, paths, part }) { snippets.background = new Snippet('bg', new Point(0,0)) // Snippets aren't taken into account for the bounding box + points.anchor = new Point(0,0) paths.diagonal = new Path() .move(points.anchor) - .line(new Point(2000,2000) + .line(new Point(2000,2000)) .setClass('hidden') // Develop your part here From 5bf788740418fa3431b7c891109311ad3c099be1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:41:44 +0100 Subject: [PATCH 401/795] Update source file en.md skip-build --- markdown/org/docs/about/site/bookmarks/type/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/en.md b/markdown/org/docs/about/site/bookmarks/type/en.md index 38a0eabfb8e..c08efa9d315 100644 --- a/markdown/org/docs/about/site/bookmarks/type/en.md +++ b/markdown/org/docs/about/site/bookmarks/type/en.md @@ -6,5 +6,5 @@ Every bookmark has a **type** attribute that is mandatory. When you manually create a bookmark, the type is always **custom** so you cannot choose it. -Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. +Other types include **pattern**, **docs**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From 9ae4b69b043e9f6e667ba2cb7feca3633edf6070 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:45:55 +0100 Subject: [PATCH 402/795] Update source file en.md skip-build --- markdown/org/docs/designs/wahid/instructions/en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/en.md b/markdown/org/docs/designs/wahid/instructions/en.md index fbfe9446328..3cca9576f87 100644 --- a/markdown/org/docs/designs/wahid/instructions/en.md +++ b/markdown/org/docs/designs/wahid/instructions/en.md @@ -86,7 +86,7 @@ When you are done, press open this seam. #### Mark where your pocket needs to go -![Mark where your pocket needs to go](05b.png) +![Mark where your pocket needs to go](05a.png) Your front pattern piece has a helpline on it to show where the welt pocket should go. It's two half rectangles that got joined together when you closed the dart to form the shape of your welt pocket. @@ -117,7 +117,7 @@ Now sew along the helpline which marks the long edge of your pocket. #### Cut open the pocket -![Cut open the pocket](05e.png) +![Cut open the pocket](05c.png) Time to carefully cut open the pocket. Start in the middle of the pocket, and cut towards along the longest edges towards the side. @@ -127,7 +127,7 @@ At the edges of your pocket you need to stop cutting open the center and instead #### Press open the seam allowance -![Press open the seam allowance](05f.png) +![Press open the seam allowance](05c.png) Press open the seam allowance along the long edges of your pocket. From 5470220aee85756dc75903a4f7e2a32b8f597977 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:12 +0100 Subject: [PATCH 403/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-cathrin-corset/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/en.md b/markdown/org/showcase/ramoth-cathrin-corset/en.md index 79495687079..0573a8262b0 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/en.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/en.md @@ -1,5 +1,5 @@ --- -author: 23386 +maker: "Ramoth" caption: "Ramoth Cathrin Corset ...with butterflies!" date: "2023-01-31" intro: "Here's a fantastic butterfly Cathrin corset made by Ramoth - their very first! They shared this about future alterations:" From f74f16ea7dc2779bd21b51e71c00398d08142d01 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:13 +0100 Subject: [PATCH 404/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md index 6796caf33d7..fa8bee14072 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md @@ -1,5 +1,5 @@ --- -author: 23386 +maker: "Ramoth" caption: "Ramoth's short-sleeve Simon with most of the shaping shifted to the back darts" date: "2021-09-30" intro: "Ramoth's short-sleeve Simon shirt" From 502f48af386e6880bf01516269fb7da552c43fb5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:13 +0100 Subject: [PATCH 405/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-simon-flannel/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/en.md b/markdown/org/showcase/ramoth-simon-flannel/en.md index 7af7ec0f032..568fb826e44 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/en.md +++ b/markdown/org/showcase/ramoth-simon-flannel/en.md @@ -1,5 +1,5 @@ --- -author: 23386 +maker: "Ramoth" caption: "Love the moths on this beautiful Simon flannel" date: "2023-02-03" intro: "Ramoth's Simon Flannel" From 2f87251558b140bd40909da790f26386ce66ef09 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:19 +0100 Subject: [PATCH 406/795] Update source file en.md skip-build --- markdown/org/showcase/simon-by-ramoth/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/en.md b/markdown/org/showcase/simon-by-ramoth/en.md index 2701c4546d6..d97aea69d2e 100644 --- a/markdown/org/showcase/simon-by-ramoth/en.md +++ b/markdown/org/showcase/simon-by-ramoth/en.md @@ -1,5 +1,5 @@ --- -author: 23386 +maker: "Ramoth" caption: "Ramoth's impressive first Simon" date: "2021-08-24" intro: "Ramoth made this fantastic first draft of the Simon shirt and generously shared some helpful fit notes. They said:" From ba0530bb3c9e32dddd15aad9b43edc09d19154dd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:34 +0100 Subject: [PATCH 407/795] Update source file en.yaml skip-build --- sites/shared/components/account/en.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index 0431cddead0..d8e7aeecc54 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -206,8 +206,6 @@ customBookmark: Custom Bookmarks yourBookmarks: Your bookmarks bookmarkThisThing: Bookmark this { thing } page: Page -doc: Documentation -pattern: Pattern # sets set: Measurements Set @@ -272,6 +270,7 @@ unitsMustSave: "Note: You must save after changing Units to have the change take makePublic: Make public makePrivate: Make private +pattern: Pattern patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From 51ba8f7046c883e288c33f52d4202e5695a94377 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 12:47:38 +0100 Subject: [PATCH 408/795] Update source file en.yaml skip-build --- sites/shared/components/workbench/views/logs/en.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/en.yaml b/sites/shared/components/workbench/views/logs/en.yaml index 2c69ef30437..bd679d458ed 100644 --- a/sites/shared/components/workbench/views/logs/en.yaml +++ b/sites/shared/components/workbench/views/logs/en.yaml @@ -1,6 +1,6 @@ logs: Logs error: Error messages -warn: Warning messages +warning: Warning messages info: Info messages debug: Debug messages seeLinkOrClick: See { link } or { click } From f1e407d7892f66f256828c9f9393774b03cc57d6 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 15:50:24 +0100 Subject: [PATCH 409/795] feat(org): Added admin subscribers page --- sites/org/pages/admin/index.mjs | 54 ++++++++---- sites/org/pages/admin/subscribers.mjs | 113 ++++++++++++++++++++++++++ sites/shared/hooks/use-backend.mjs | 8 ++ 3 files changed, 157 insertions(+), 18 deletions(-) create mode 100644 sites/org/pages/admin/subscribers.mjs diff --git a/sites/org/pages/admin/index.mjs b/sites/org/pages/admin/index.mjs index 3dfb673ad80..155950600df 100644 --- a/sites/org/pages/admin/index.mjs +++ b/sites/org/pages/admin/index.mjs @@ -16,6 +16,23 @@ import { SearchIcon } from 'shared/components/icons.mjs' // Translation namespaces used on this page const namespaces = nsMerge(pageNs, authNs) +const AdminMenu = () => ( + +) + const AdminPage = ({ page }) => { const { t } = useTranslation(namespaces) const backend = useBackend() @@ -39,25 +56,26 @@ const AdminPage = ({ page }) => { return ( -

- Other admin links: - -

-
Search users
-
- setQ(evt.target.value)} - className="input w-full input-bordered flex flex-row" - type="text" - placeholder="Username, ID, or E-mail address" - /> - +
+
+
Search users
+
+ setQ(evt.target.value)} + className="input w-full input-bordered flex flex-row" + type="text" + placeholder="Username, ID, or E-mail address" + /> + +
+ {loading ? : } +
+
- {loading ? : } ) diff --git a/sites/org/pages/admin/subscribers.mjs b/sites/org/pages/admin/subscribers.mjs new file mode 100644 index 00000000000..503e86d3231 --- /dev/null +++ b/sites/org/pages/admin/subscribers.mjs @@ -0,0 +1,113 @@ +// Dependencies +import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import { nsMerge, getSearchParam } from 'shared/utils.mjs' +// Hooks +import { useTranslation } from 'next-i18next' +import { useState, useEffect } from 'react' +import { useBackend } from 'shared/hooks/use-backend.mjs' +// Components +import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' +import { AuthWrapper, ns as authNs } from 'shared/components/wrappers/auth/index.mjs' +import { SearchIcon } from 'shared/components/icons.mjs' + +// Translation namespaces used on this page +const ns = nsMerge(pageNs, authNs) + +const SubscribersPage = ({ page }) => { + const { t } = useTranslation(ns) + const [subscribers, setSubscribers] = useState() + const [q, setQ] = useState() + const [hits, setHits] = useState([]) + const backend = useBackend() + + const loadSubscribers = async () => { + const result = await backend.adminLoadSubscribers() + if (result.success) setSubscribers(result.data.subscribers) + } + + const search = async () => { + if (!subscribers) await loadSubscribers() + const found = [] + for (const lang in subscribers) { + found.push( + ...subscribers[lang] + .filter((sub) => sub.email.toLowerCase().includes(q.toLowerCase())) + .map((sub) => ({ ...sub, lang })) + ) + } + setHits(found) + } + + const unsubscribe = async (ehash) => { + await backend.newsletterUnsubscribe(ehash) + await loadSubscribers() + await search() + } + + return ( + + + {subscribers ? ( + <> +
Search subscribers
+
+ setQ(evt.target.value)} + className="input w-full input-bordered flex flex-row" + type="text" + placeholder="Username, ID, or E-mail address" + /> + +
+ + + + + + + + + + {hits.map((hit, i) => ( + + + + + + ))} + +
EmailLanguageUnsubscribe
+ {hit.email} + {hit.lang.toUpperCase()} + +
+ + ) : ( + + )} + + + ) +} + +export default SubscribersPage + +export async function getStaticProps({ locale }) { + return { + props: { + ...(await serverSideTranslations(locale, ns)), + page: { + locale, + path: ['admin', 'subscribers'], + }, + }, + } +} diff --git a/sites/shared/hooks/use-backend.mjs b/sites/shared/hooks/use-backend.mjs index 3ebb7c32792..67572f8d85e 100644 --- a/sites/shared/hooks/use-backend.mjs +++ b/sites/shared/hooks/use-backend.mjs @@ -597,6 +597,14 @@ Backend.prototype.adminImpersonateUser = async function (id) { return responseHandler(await api.get(`/admin/impersonate/${id}/jwt`, this.auth)) } +/* + * Load newsletter subscribers (admin method) + */ +Backend.prototype.adminLoadSubscribers = async function () { + console.log(this.auth) + return responseHandler(await api.get(`/admin/subscribers/jwt`, this.auth)) +} + /* * Verify an admin account while impersonating another user */ From 4e3f224d793284d42c836c0817ea7a7d9d5e83bb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:20:29 +0100 Subject: [PATCH 410/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/instructions/fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/fr.md b/markdown/org/docs/designs/wahid/instructions/fr.md index 42bc2b7f9eb..7c19deefcdf 100644 --- a/markdown/org/docs/designs/wahid/instructions/fr.md +++ b/markdown/org/docs/designs/wahid/instructions/fr.md @@ -86,7 +86,7 @@ Lorsque vous avez terminé, repassez sur cette couture avec les marges ouvertes. #### Marquer l'emplacement de votre poche -![Marquer l'emplacement de votre poche](05a.png) +![Marquer l'emplacement de votre poche](05b.png) Votre pièce de patron avant possède une ligne d'aide pour montrer où doit être placée la poche passepoilée. Il s'agit de deux demi-rectangles réunis lors de la couture de la pince pour créer la forme de votre poche passepoilée. @@ -116,7 +116,7 @@ Cousez maintenant le long de la ligne d’aide qui marque le bord long de votre #### Couper et ouvrir la poche -![Couper et ouvrir la poche](05c.png) +![Couper et ouvrir la poche](05e.png) Il est temps de couper soigneusement la poche. Commencez au milieu de la poche et coupez le long des bords les plus longs vers le côté. @@ -126,7 +126,7 @@ Aux bords de votre poche, vous devez arrêter d'ouvrir le centre un peu avant et #### Repasser pour ouvrir la marge de couture -![Repasser pour ouvrir la marge de couture](05c.png) +![Repasser pour ouvrir la marge de couture](05f.png) Repassez pour ouvrir la marge de couture le long des bords longs de votre poche. From c0b9d761e266b0786053983efe09eb1db5d4f009 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:22:13 +0100 Subject: [PATCH 411/795] New translations en.md (French) skip-build --- markdown/org/newsletter/2023q1/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/newsletter/2023q1/fr.md b/markdown/org/newsletter/2023q1/fr.md index f5b6c68565c..a66aaf2fc55 100644 --- a/markdown/org/newsletter/2023q1/fr.md +++ b/markdown/org/newsletter/2023q1/fr.md @@ -69,7 +69,7 @@ Le chiffre d'affaires de FreeSewing au cours de l'année 2022 était de `9,325,5 Nous avons constaté un énorme afflux d'utilisateurs, de mécènes et de revenus en 2020 sans doute parce que [notre modèle de masque facial](https://freesewing.org/designs/florence/) a été follement populaire pendant la pénurie d'EPI cette année-là. Ce pic s'est atténué depuis, et a entraîné une tendance à la baisse des revenus d'une année sur l'autre. De plus, l'inflation et la crise du coût de la vie ont été particulièrement tangibles cette année, et j'ai reçu plus d'un message d'excuse de la part de mécènes qui voulaient continuer à nous soutenir mais qui se sont sentis obligés de nous supprimer de leur budget mensuel pour être sûrs de pouvoir subvenir à leurs besoins et/ou à ceux de leur famille. -Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10 000 `. Oui, j'aimerais bien arriver à `12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. +Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10 000 `. Oui, j'aimerais bien arriver à 12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. Je suis fière non seulement du travail que nous faisons, mais aussi parce que FreeSewing est une force pour le bien dans ce monde. En ajoutant les `9.325,54`de cette année, les contributions de FreeSewing à [Médecins sans frontières/Doctors Without Borders](https://www.msf.org/) s'élèvent à `38.814,94` euros ou environ 41,6k dollars américains. De l'argent qui aide les gens qui sont dans une situation pire que la nôtre. From e07e06ba0b0fe650abc811e3504e4e54b4ff88c5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:24:29 +0100 Subject: [PATCH 412/795] New translations en.md (French) skip-build --- markdown/org/showcase/ramoth-cathrin-corset/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/fr.md b/markdown/org/showcase/ramoth-cathrin-corset/fr.md index 52f8916b858..145c679e136 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/fr.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/fr.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Corset Ramoth Cathrin ...avec des papillons !" date: "2023-01-31" intro: "Voici un fantastique corset Cathrin en forme de papillon fabriqué par Ramoth - leur tout premier ! Ils ont partagé ceci à propos des futures modifications :" From 1e20742398127d6b45542e3727abd84ece35c0e9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:24:30 +0100 Subject: [PATCH 413/795] New translations en.md (French) skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/fr.md b/markdown/org/showcase/ramoth-short-sleeve-simon/fr.md index e175532fd06..661d3f79b7b 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/fr.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/fr.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Simon à manches courtes de Ramoth, dont la plupart des formes ont été déplacées vers les pinces du dos." date: "30-09-2021" intro: "La chemise Simon à manches courtes de Ramoth" From feb8293a7f828c3a3e74f2fa0d83e51e94de452b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:24:31 +0100 Subject: [PATCH 414/795] New translations en.md (French) skip-build --- markdown/org/showcase/ramoth-simon-flannel/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/fr.md b/markdown/org/showcase/ramoth-simon-flannel/fr.md index c4583f64fa8..0bfca7ce881 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/fr.md +++ b/markdown/org/showcase/ramoth-simon-flannel/fr.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "J'adore les papillons de nuit sur cette magnifique flanelle Simon." date: "2023-02-03" intro: "La flanelle Simon de Ramoth" From 1729068087883201264b5cb9eba7d55e8e5d07b3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:24:40 +0100 Subject: [PATCH 415/795] New translations en.md (French) skip-build --- markdown/org/showcase/simon-by-ramoth/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/fr.md b/markdown/org/showcase/simon-by-ramoth/fr.md index 1f2ac0ac7d7..69d565b5464 100644 --- a/markdown/org/showcase/simon-by-ramoth/fr.md +++ b/markdown/org/showcase/simon-by-ramoth/fr.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "L'impressionnant premier Simon de Ramoth" date: "2021-08-24" intro: "Ramoth a réalisé cette fantastique première ébauche de la chemise Simon et a généreusement partagé quelques notes utiles sur la coupe. Ils ont dit :" From 809e9d9174c6455f593d54ad853f4c2c084d1059 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:25:04 +0100 Subject: [PATCH 416/795] New translations en.yaml (French) skip-build --- sites/shared/components/account/fr.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/fr.yaml b/sites/shared/components/account/fr.yaml index 4421c5f5d7e..7d2fec1c170 100644 --- a/sites/shared/components/account/fr.yaml +++ b/sites/shared/components/account/fr.yaml @@ -188,6 +188,8 @@ customBookmark: Marques pages personnalisés yourBookmarks: Tes marques pages bookmarkThisThing: Ajoute un marque page à { thing } page: Page +doc: Documentation +pattern: Patron #sets set: Jeux de mesures name: Nom @@ -250,7 +252,6 @@ andMore: et plus unitsMustSave: "Remarque : tu dois enregistrer après avoir modifié les unités pour que le changement prenne effet sur cette page." makePublic: Rendre public makePrivate: Rendre privé -pattern: Patron patternNew: Génère un nouveau modèle patternNewInfo: Choisis un modèle, ajoute ton jeu de mesures, et nous générerons pour toi un patron de couture sur mesure. designNew: Créer un nouveau dessin From c8b4b109ffd031920989a00bc36377900fe9ca73 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:25:11 +0100 Subject: [PATCH 417/795] New translations en.yaml (French) skip-build --- sites/shared/components/workbench/views/logs/fr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/fr.yaml b/sites/shared/components/workbench/views/logs/fr.yaml index 800c8a422fa..4b526517719 100644 --- a/sites/shared/components/workbench/views/logs/fr.yaml +++ b/sites/shared/components/workbench/views/logs/fr.yaml @@ -1,6 +1,6 @@ logs: Journaux error: Messages d'erreur -warning: Messages d'avertissement +warn: Messages d'avertissement info: Messages d'information debug: Messages de débogage seeLinkOrClick: Voir { link } ou { click } From 2d239718b8c2b64b2bf1cf03cec93ed1c78985de Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:26:26 +0100 Subject: [PATCH 418/795] New translations en.md (French) skip-build --- markdown/org/docs/about/site/bookmarks/type/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/fr.md b/markdown/org/docs/about/site/bookmarks/type/fr.md index efd10c1c804..59fe9fdcddb 100644 --- a/markdown/org/docs/about/site/bookmarks/type/fr.md +++ b/markdown/org/docs/about/site/bookmarks/type/fr.md @@ -6,5 +6,5 @@ Chaque marque page possède un attribut **type** qui est obligatoire. Lorsque tu crées manuellement un marque page, le type est toujours **custom** et tu ne peux donc pas le choisir. -D'autres types incluent **patron**, **docs**, ou **set** qui seront automatiquement mis en place lorsque tu marqueras la page d'un patron, d'une page de documentation ou d'un jeu de mesures respectivement. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From 346f5c8ec1fd044576cd17e7809cd5e86378f669 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:39:28 +0100 Subject: [PATCH 419/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/designs/wahid/instructions/es.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/es.md b/markdown/org/docs/designs/wahid/instructions/es.md index 39f128f3c2c..bf886833cb7 100644 --- a/markdown/org/docs/designs/wahid/instructions/es.md +++ b/markdown/org/docs/designs/wahid/instructions/es.md @@ -86,7 +86,7 @@ Cuando haya terminado, presione Abrir esta costura. #### Marca a dónde tiene que ir tu bolsillo -![Marca a dónde tiene que ir tu bolsillo](05a.png) +![Marca a dónde tiene que ir tu bolsillo](05b.png) Su pieza de patrón frontal tiene una línea de ayuda en ella para mostrar a dónde debe ir el bolsillo de soldadura. Son dos mitad rectángulos que se unieron cuando cerraste el dardo para formar la forma de tu bolsillo de soldadura. @@ -116,7 +116,7 @@ Ahora coser a lo largo de la línea de ayuda que marca el largo borde de tu bols #### Cortar el bolsillo -![Cortar el bolsillo](05c.png) +![Cortar el bolsillo](05e.png) Es hora de cortar cuidadosamente el bolsillo. Empezar en el centro del bolsillo y cortar hacia los bordes más largos hacia el lado. @@ -126,7 +126,7 @@ En los bordes de su bolsillo usted necesita dejar de cortar el centro y en su lu #### Pulse abrir la costura -![Pulse abrir la costura](05c.png) +![Pulse abrir la costura](05f.png) Pulse abrir la costura a lo largo de los bordes largos de su bolsillo. From 0d2c624ce5658480ba28beec3e07d052541d1294 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:43:24 +0100 Subject: [PATCH 420/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/ramoth-cathrin-corset/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/es.md b/markdown/org/showcase/ramoth-cathrin-corset/es.md index b049640fd74..9e8bbb98b6e 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/es.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/es.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Corsé Ramoth Cathrin ...¡con mariposas!" date: "2023-01-31" intro: "Aquí tienes un fantástico corsé Cathrin mariposa fabricado por Ramoth, ¡el primero! Compartieron esto sobre futuras alteraciones:" From e20c10769726c07f1e4a009952cace5c5f535bed Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:43:25 +0100 Subject: [PATCH 421/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/es.md b/markdown/org/showcase/ramoth-short-sleeve-simon/es.md index 085c824dc81..3ef74f13b1f 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/es.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/es.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Simón de manga corta de Ramoth con la mayor parte de la forma desplazada a las pinzas de la espalda" date: "2021-09-30" intro: "Camiseta de manga corta Simon de Ramoth" From 2501c2bda262245ada2729bca0bfba724b4d5016 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:43:26 +0100 Subject: [PATCH 422/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/ramoth-simon-flannel/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/es.md b/markdown/org/showcase/ramoth-simon-flannel/es.md index 6b99d8b0e30..138034d5486 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/es.md +++ b/markdown/org/showcase/ramoth-simon-flannel/es.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Me encantan las polillas de esta preciosa franela Simon" date: "2023-02-03" intro: "Franela Simon de Ramoth" From 19a64b904f2a435f8181e5233be186609955b352 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:43:34 +0100 Subject: [PATCH 423/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/simon-by-ramoth/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/es.md b/markdown/org/showcase/simon-by-ramoth/es.md index 4d33abcf615..acfaa7b9c3a 100644 --- a/markdown/org/showcase/simon-by-ramoth/es.md +++ b/markdown/org/showcase/simon-by-ramoth/es.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "El impresionante primer Simon de Ramoth" date: "2021-08-24" intro: "Ramoth hizo este fantástico primer borrador de la camiseta Simon y compartió generosamente algunas notas útiles sobre el ajuste. Dijeron:" From d61c1f2563eb2006e9339699c164a9768bcc0198 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:43:58 +0100 Subject: [PATCH 424/795] New translations en.yaml (Spanish) skip-build --- sites/shared/components/account/es.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/es.yaml b/sites/shared/components/account/es.yaml index ceaa799b514..82404dd0870 100644 --- a/sites/shared/components/account/es.yaml +++ b/sites/shared/components/account/es.yaml @@ -188,6 +188,8 @@ customBookmark: Marcadores personalizados yourBookmarks: Tus favoritos bookmarkThisThing: Marca este { thing } page: Página +doc: Documentación +pattern: Patrón #sets set: Conjunto de medidas name: Nombre @@ -250,7 +252,6 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private -pattern: Patrón patternNew: Generar un nuevo patrón patternNewInfo: Elige un diseño, añade tu juego de medidas y generaremos un patrón de costura a medida para ti. designNew: Crear un nuevo diseño From bdffb14ed015b85e8daadc4c72937b341268a808 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:44:05 +0100 Subject: [PATCH 425/795] New translations en.yaml (Spanish) skip-build --- sites/shared/components/workbench/views/logs/es.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/es.yaml b/sites/shared/components/workbench/views/logs/es.yaml index 91d00e53f34..a0c8bc0db8d 100644 --- a/sites/shared/components/workbench/views/logs/es.yaml +++ b/sites/shared/components/workbench/views/logs/es.yaml @@ -1,6 +1,6 @@ logs: Registros error: Mensajes de error -warning: Mensajes de advertencia +warn: Mensajes de advertencia info: Mensajes informativos debug: Mensajes de depuración seeLinkOrClick: Ver { link } o { click } From 39488e2f71e066be1705081cea8c9e1d0f5ff3d4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:45:22 +0100 Subject: [PATCH 426/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/about/site/bookmarks/type/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/es.md b/markdown/org/docs/about/site/bookmarks/type/es.md index 49d9cc900d1..f61a8897d70 100644 --- a/markdown/org/docs/about/site/bookmarks/type/es.md +++ b/markdown/org/docs/about/site/bookmarks/type/es.md @@ -6,5 +6,5 @@ Cada marcador tiene un atributo **type** que es obligatorio. Cuando creas manualmente un marcador, el tipo siempre es **personalizado** , por lo que no puedes elegirlo. -Otros tipos son **patrón**, **docs**, o **conjunto** que se establecerán automáticamente cuando marques como favorito un patrón, una página de documentación o un conjunto de medidas respectivamente. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From 1ed5ce7e295e7180d0c169b056a55ac05384cede Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 16:58:25 +0100 Subject: [PATCH 427/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/wahid/instructions/de.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/de.md b/markdown/org/docs/designs/wahid/instructions/de.md index 055a1399698..08782e6784b 100644 --- a/markdown/org/docs/designs/wahid/instructions/de.md +++ b/markdown/org/docs/designs/wahid/instructions/de.md @@ -86,7 +86,7 @@ Wenn Sie fertig sind, drücken Sie diese Naht öffnen. #### Markieren, wohin deine Tasche gehen muss -![Markieren, wohin deine Tasche gehen muss](05a.png) +![Markieren, wohin deine Tasche gehen muss](05b.png) Ihr Frontmusterstück hat eine Helpline um zu zeigen, wohin die Welttasche gehen soll. Es sind zwei halbe Rechtecke, die zusammengeführt wurden, als du den Dart geschlossen hast, um die Form deiner Welttasche zu formen. @@ -116,7 +116,7 @@ Nähen Sie nun entlang der Helpline, die den langen Rand Ihrer Tasche markiert. #### Die Tasche öffnen -![Die Tasche öffnen](05c.png) +![Die Tasche öffnen](05e.png) Zeit, die Tasche sorgfältig zu öffnen. Beginnen Sie in der Mitte der Tasche und schneiden Sie entlang der längsten Kanten zur Seite. @@ -126,7 +126,7 @@ An den Kanten Ihrer Tasche müssen Sie aufhören, die Mitte zu öffnen und statt #### Öffne die Naht -![Öffne die Naht](05c.png) +![Öffne die Naht](05f.png) Drücken Sie die Naht entlang der langen Kanten der Tasche zu öffnen. From 1eaaf286dc54a3ca4564b5f36519c16f0641ad6f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:02:31 +0100 Subject: [PATCH 428/795] New translations en.md (German) skip-build --- markdown/org/showcase/ramoth-cathrin-corset/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/de.md b/markdown/org/showcase/ramoth-cathrin-corset/de.md index 379bb3fa0c9..18f884695b3 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/de.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/de.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth Cathrin Korsett ...mit Schmetterlingen!" date: "2023-01-31" intro: "Hier ist ein fantastisches Schmetterlings-Cathrin-Korsett von Ramoth - ihr allererstes! Sie teilten dies über zukünftige Änderungen mit:" From 8b7ce9dea147c2b7f0600e5580407e687d75c23e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:02:32 +0100 Subject: [PATCH 429/795] New translations en.md (German) skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/de.md b/markdown/org/showcase/ramoth-short-sleeve-simon/de.md index 92b69f72fb1..52b7e6bc302 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/de.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/de.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Der kurzärmelige Simon von Ramoth, bei dem der Großteil der Formgebung in die hinteren Abnäher verlagert wurde" date: "30.09.2021" intro: "Das kurzärmelige Simon-Shirt von Ramoth" From a28893c834271f65082a7e44f67ff55ad988b281 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:02:33 +0100 Subject: [PATCH 430/795] New translations en.md (German) skip-build --- markdown/org/showcase/ramoth-simon-flannel/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/de.md b/markdown/org/showcase/ramoth-simon-flannel/de.md index dd24b87cbb3..f7ab67b0763 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/de.md +++ b/markdown/org/showcase/ramoth-simon-flannel/de.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ich liebe die Motten auf diesem schönen Simon-Flanell" date: "2023-02-03" intro: "Ramoths Simon Flanell" From 9040646d5a57ec71fddaab84178733675072e754 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:02:41 +0100 Subject: [PATCH 431/795] New translations en.md (German) skip-build --- markdown/org/showcase/simon-by-ramoth/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/de.md b/markdown/org/showcase/simon-by-ramoth/de.md index b02aeb9bdd4..5a0e5b24336 100644 --- a/markdown/org/showcase/simon-by-ramoth/de.md +++ b/markdown/org/showcase/simon-by-ramoth/de.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoths beeindruckender erster Simon" date: "24.08.2021" intro: "Ramoth hat diesen fantastischen ersten Entwurf des Simon-Shirts gemacht und großzügig einige hilfreiche Passformhinweise geteilt. Sie sagten:" From d696e594bfc38c40aec8176acf4d0eca1d59b478 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:03:05 +0100 Subject: [PATCH 432/795] New translations en.yaml (German) skip-build --- sites/shared/components/account/de.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/de.yaml b/sites/shared/components/account/de.yaml index 11c2795871d..c47ce038aa5 100644 --- a/sites/shared/components/account/de.yaml +++ b/sites/shared/components/account/de.yaml @@ -188,6 +188,8 @@ customBookmark: Benutzerdefinierte Lesezeichen yourBookmarks: Deine Lesezeichen bookmarkThisThing: Setze ein Lesezeichen für diese Seite { thing } page: Seite +doc: Dokumentation +pattern: Schnittmuster #sets set: Maßnahmeset name: Name @@ -250,7 +252,6 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private -pattern: Schnittmuster patternNew: Ein neues Muster generieren patternNewInfo: Wähle ein Design, füge deine Maße hinzu und wir erstellen ein maßgeschneidertes Nähmuster für dich. designNew: Ein neues Design erstellen From 73dcb64d4b564b25c158d344c4b8f662583bb703 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:03:12 +0100 Subject: [PATCH 433/795] New translations en.yaml (German) skip-build --- sites/shared/components/workbench/views/logs/de.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/de.yaml b/sites/shared/components/workbench/views/logs/de.yaml index d8e79a85a90..267a4a2802b 100644 --- a/sites/shared/components/workbench/views/logs/de.yaml +++ b/sites/shared/components/workbench/views/logs/de.yaml @@ -1,6 +1,6 @@ logs: Logs error: Fehlermeldungen -warning: Warnmeldungen +warn: Warnmeldungen info: Info-Meldungen debug: Debug-Meldungen seeLinkOrClick: Siehe { link } oder { click } From d1f252335fec86574190ee81758ec22e58c2cd03 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:04:28 +0100 Subject: [PATCH 434/795] New translations en.md (German) skip-build --- markdown/org/docs/about/site/bookmarks/type/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/de.md b/markdown/org/docs/about/site/bookmarks/type/de.md index 9c21a579abb..0fe8f2c499d 100644 --- a/markdown/org/docs/about/site/bookmarks/type/de.md +++ b/markdown/org/docs/about/site/bookmarks/type/de.md @@ -6,5 +6,5 @@ Jedes Lesezeichen hat ein **type** Attribut, das obligatorisch ist. Wenn du ein Lesezeichen manuell erstellst, ist der Typ immer **benutzerdefiniert** und du kannst ihn nicht auswählen. -Andere Typen sind **pattern**, **docs**, oder **set** , die automatisch gesetzt werden, wenn du ein Lesezeichen für ein Muster, eine Dokumentationsseite oder ein Messset setzt. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From 81831f1dc4d920786d5a2e08e3b3b466299b6c23 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 17:05:30 +0100 Subject: [PATCH 435/795] chore(shared): Tweaks to navlinks and allow wide reading view Having build a documentation system at my job as well as the frontend for it, it was rather surprised that a surprisingly large proportion of my colleagues complained that the text was 'too narrow'. When reading documentation, the horizontal space is constrained to limit the amount of characters on a line. Long lines make for very hard to read text, because each time your eyes dart back from the end of the line to the beginning of the next line, it becomes harder to stay vertically anchored on the correct line. It's best practice to limit the line length like this, and so I've always been doing it. However, after someone at work asked, I added a toggle to allow the text to fill the available space. Much to my surprise, this was hailed like some sort of significant improvement. I still don't think it makes sense, but I've added a similar checkbox to the docs pages of both dev and org sites anyway. --- sites/dev/pages/[...slug].mjs | 64 +++++++++++-------- sites/org/components/layouts/docs.mjs | 14 +++- sites/org/pages/docs/[...slug].mjs | 30 +++++---- sites/shared/components/base-layout.mjs | 4 +- sites/shared/components/icons.mjs | 18 ++++++ sites/shared/components/mdx/read-more.mjs | 37 +++++++---- .../shared/components/navigation/sitenav.mjs | 16 +++-- sites/shared/components/wrappers/mdx.mjs | 5 +- sites/shared/styles/globals.css | 9 +-- 9 files changed, 133 insertions(+), 64 deletions(-) diff --git a/sites/dev/pages/[...slug].mjs b/sites/dev/pages/[...slug].mjs index 83b0a07de2e..f728c1f5e71 100644 --- a/sites/dev/pages/[...slug].mjs +++ b/sites/dev/pages/[...slug].mjs @@ -3,6 +3,8 @@ import { pages } from 'site/prebuild/docs.en.mjs' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' +// Hooks +import { useState } from 'react' // Components import { PageWrapper, ns } from 'shared/components/wrappers/page.mjs' //import { components } from 'shared/components/mdx/index.mjs' @@ -17,6 +19,7 @@ import { BaseLayoutProse, BaseLayoutRight, } from 'shared/components/base-layout.mjs' +import { NarrowIcon, WideIcon } from 'shared/components/icons.mjs' /* * This page is auto-generated by the prebuild script. @@ -24,33 +27,44 @@ import { * * See the page-templates folder for more info. */ -const DocsPage = ({ page, slug, frontmatter, mdx, mdxSlug }) => ( - - - - - - - -
- -

{frontmatter.title}

-
+const DocsPage = ({ page, slug, frontmatter, mdx, mdxSlug }) => { + const [wide, setWide] = useState(false) + + return ( + + + + + + + +
+
+
+ +
+ +
+

{frontmatter.title}

+
+ +
+
+ + + + + +
-
- - - - - -
- -
- - - -) + + + + ) +} export default DocsPage diff --git a/sites/org/components/layouts/docs.mjs b/sites/org/components/layouts/docs.mjs index ce2cc3bd97b..9eafb789b73 100644 --- a/sites/org/components/layouts/docs.mjs +++ b/sites/org/components/layouts/docs.mjs @@ -18,10 +18,11 @@ import { import { Toc } from 'shared/components/mdx/toc.mjs' import { MdxMetaData, ns as metaNs } from 'shared/components/mdx/meta.mjs' import { PrevNext } from 'shared/components/prev-next.mjs' +import { NarrowIcon, WideIcon } from 'shared/components/icons.mjs' export const ns = nsMerge(navNs, 'docs', metaNs) -export const DocsLayout = ({ children = [], frontmatter }) => { +export const DocsLayout = ({ children = [], frontmatter, wide, setWide }) => { const { slug, locale } = useContext(NavigationContext) return ( @@ -32,9 +33,16 @@ export const DocsLayout = ({ children = [], frontmatter }) => { - +
- +
+
+ +
+ +

{frontmatter.title}

diff --git a/sites/org/pages/docs/[...slug].mjs b/sites/org/pages/docs/[...slug].mjs index 589edf833de..1655d5e880d 100644 --- a/sites/org/pages/docs/[...slug].mjs +++ b/sites/org/pages/docs/[...slug].mjs @@ -2,6 +2,8 @@ import { nsMerge, localePath } from 'shared/utils.mjs' import { siteConfig } from 'site/site.config.mjs' // Used in static paths import { pages } from 'site/prebuild/docs.en.mjs' +// Hooks +import { useState } from 'react' // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' @@ -20,17 +22,23 @@ export const ns = nsMerge(pageNs, layoutNs, designNs, 'popout') * when path and locale come from static props (as here) * or set them manually. */ -const Page = ({ page, locale, frontmatter, mdx, mdxSlug }) => ( - } - > - - -) +const Page = ({ page, locale, frontmatter, mdx, mdxSlug }) => { + const [wide, setWide] = useState(false) + + return ( + ( + + )} + > + + + ) +} export default Page diff --git a/sites/shared/components/base-layout.mjs b/sites/shared/components/base-layout.mjs index cb3753105ee..2ea5fef7e35 100644 --- a/sites/shared/components/base-layout.mjs +++ b/sites/shared/components/base-layout.mjs @@ -26,8 +26,8 @@ export const BaseLayoutRight = ({ children = [] }) => ( /* * The main column for prose (text like docs and so on) */ -export const BaseLayoutProse = ({ children = [] }) => ( -
{children}
+export const BaseLayoutProse = ({ children = [], wide = false }) => ( +
{children}
) /* diff --git a/sites/shared/components/icons.mjs b/sites/shared/components/icons.mjs index d8156b602cc..a1069541af7 100644 --- a/sites/shared/components/icons.mjs +++ b/sites/shared/components/icons.mjs @@ -508,6 +508,15 @@ export const MsfIcon = (props) => ( ) +/* + * NarrowIcon - Looks like two arrow pointing inwards + */ +export const NarrowIcon = (props) => ( + + + +) + export const NewMsetIcon = (props) => ( @@ -820,6 +829,15 @@ export const WarningIcon = (props) => ( ) +/* + * WideIcon - Looks like two arrow pointing outwards + */ +export const WideIcon = (props) => ( + + + +) + export const WrenchIcon = (props) => ( diff --git a/sites/shared/components/mdx/read-more.mjs b/sites/shared/components/mdx/read-more.mjs index a838ae0f39b..37eae7d1ad5 100644 --- a/sites/shared/components/mdx/read-more.mjs +++ b/sites/shared/components/mdx/read-more.mjs @@ -20,10 +20,12 @@ export const getRoot = { }, } +const onActivePath = (slug, active) => (active ? active.slice(0, slug.length) === slug : false) + /* * This is a recursive function, so it needs to be lean */ -const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false }) => { +const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false, from = false }) => { const orderedTree = orderBy(tree, ['o', 't'], ['asc', 'asc']).filter( (item) => typeof item === 'object' ) @@ -44,20 +46,31 @@ const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false }) => * However, despite my best efforts, I can't seem to make it work. So this relies on a bit of CSS. * The 'summary-chevron' class is what does the trick. */ + const liClasses = + 'hover:bg-opacity-20 bg-secondary bg-opacity-0 block w-full p-0 break-all rounded' return ( -
  • +
  • {hasChildren ? ( -
    - - - {active === item.s ? {item.t} : item.t} +
    + + + {active === item.s ? {item.t} : item.t} + +
    + +
    ) : ( <> - - + {active === item.s ? {item.t} : item.t} @@ -75,6 +88,7 @@ export const ReadMore = ({ site = 'org', asMenu = false, depth = 99, + from = false, }) => { const { siteNav, slug } = useContext(NavigationContext) let active = false @@ -89,13 +103,14 @@ export const ReadMore = ({ if (root === true) root = '' if (asMenu && slug.split('/').length > 1) { - root = slug.split('/').slice(0, -1).join('/') + root = from ? from : slug.split('/').slice(0, -1).join('/') active = slug } - const tree = root === false ? getRoot[site](slug, siteNav) : getRoot[site](root, siteNav) + const tree = + root === false ? getRoot[site](from ? from : slug, siteNav) : getRoot[site](root, siteNav) if (!tree) return null - return + return } diff --git a/sites/shared/components/navigation/sitenav.mjs b/sites/shared/components/navigation/sitenav.mjs index ad421ae16f1..917e759644e 100644 --- a/sites/shared/components/navigation/sitenav.mjs +++ b/sites/shared/components/navigation/sitenav.mjs @@ -93,11 +93,17 @@ export const Breadcrumbs = ({ lead = false }) => { * A React component to render sidebar navigation based on the siteNav object and current slug * It just re-uses the ReadMore component as we provide to MDX content */ -export const NavLinks = () => ( -
    - -
    -) +export const NavLinks = () => { + const { slug } = useContext(NavigationContext) + const chunks = slug.split('/') + console.log(chunks[0]) + + return ( +
    + +
    + ) +} /* * A React component to render sidebar navigation for the main sections diff --git a/sites/shared/components/wrappers/mdx.mjs b/sites/shared/components/wrappers/mdx.mjs index addc534c713..6b5609f29c1 100644 --- a/sites/shared/components/wrappers/mdx.mjs +++ b/sites/shared/components/wrappers/mdx.mjs @@ -79,8 +79,11 @@ export const MdxWrapper = ({ site = 'org', async = false, slug = [], + wide = false, }) => ( -
    +
    {async ? ( ) : ( diff --git a/sites/shared/styles/globals.css b/sites/shared/styles/globals.css index de9991c7819..6d736bc118d 100644 --- a/sites/shared/styles/globals.css +++ b/sites/shared/styles/globals.css @@ -537,13 +537,10 @@ progress.progress-white::-moz-progress-bar { details { user-select: none; } -details > summary > svg.details-toggle { - transform: rotate(90deg); - opacity: 0.4; +details > summary > div > svg.details-toggle { } -details[open] > summary > svg.details-toggle { - transform: rotate(-90deg); - opacity: 0.8; +details[open] > summary > div > svg.details-toggle { + transform: rotate(90deg); } details[open] summary ~ * { animation: ease-opacity-t-b 0.5s ease; From 38d48690ad7410f3ab7f8659b3c5fc99f52dd56c Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 17:14:57 +0100 Subject: [PATCH 436/795] chore: Linter warnings --- sites/shared/components/mdx/read-more.mjs | 4 ++-- sites/shared/prebuild/sitenav-org.mjs | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sites/shared/components/mdx/read-more.mjs b/sites/shared/components/mdx/read-more.mjs index 37eae7d1ad5..9af3fc62ce4 100644 --- a/sites/shared/components/mdx/read-more.mjs +++ b/sites/shared/components/mdx/read-more.mjs @@ -2,7 +2,7 @@ import get from 'lodash.get' import Link from 'next/link' import { useContext } from 'react' import { NavigationContext } from 'shared/context/navigation-context.mjs' -import { BulletIcon, RightIcon } from 'shared/components/icons.mjs' +import { RightIcon } from 'shared/components/icons.mjs' import { pageHasChildren } from 'shared/utils.mjs' import orderBy from 'lodash.orderby' @@ -25,7 +25,7 @@ const onActivePath = (slug, active) => (active ? active.slice(0, slug.length) == /* * This is a recursive function, so it needs to be lean */ -const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false, from = false }) => { +const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false }) => { const orderedTree = orderBy(tree, ['o', 't'], ['asc', 'asc']).filter( (item) => typeof item === 'object' ) diff --git a/sites/shared/prebuild/sitenav-org.mjs b/sites/shared/prebuild/sitenav-org.mjs index 8d0fe7e0282..7d39eb29a2a 100644 --- a/sites/shared/prebuild/sitenav-org.mjs +++ b/sites/shared/prebuild/sitenav-org.mjs @@ -169,6 +169,7 @@ export const extendSiteNav = async (siteNav, lang) => { // Add curated measurements sets siteNav['curated-sets'] = { + _: 1, m: 1, s: 'curated-sets', t: t('sections:curatedSets'), @@ -226,6 +227,7 @@ export const extendSiteNav = async (siteNav, lang) => { // Add support siteNav.support = { + _: 1, m: 1, s: 'support', t: t('sections:support'), From 755a1b829f342cdf5904777f4e51a53cc4952a6e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:17:42 +0100 Subject: [PATCH 437/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/designs/wahid/instructions/nl.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/nl.md b/markdown/org/docs/designs/wahid/instructions/nl.md index def22d5d8f6..13f2aa053d9 100644 --- a/markdown/org/docs/designs/wahid/instructions/nl.md +++ b/markdown/org/docs/designs/wahid/instructions/nl.md @@ -86,7 +86,7 @@ Strijk deze naad open wanneer je klaar bent. #### Markeer waar je zak moet komen -![Markeer waar je zak moet komen](05a.png) +![Markeer waar je zak moet komen](05b.png) Je voorpand heeft een hulplijn om aan te geven waar de paspelzak moet komen. Het zijn twee halve rechthoeken die samenkwamen wanneer je de neep sloot, en samen de vorm van je paspelzak hebben. @@ -116,7 +116,7 @@ Stik nu langs de hulplijnen die de lange rand van je zakopening aangeeft. #### Knip de zak open -![Knip de zak open](05c.png) +![Knip de zak open](05e.png) Tijd om de zak voorzichtig open te knippen. Begin in het midden van de zakopening, en knip langs de lange randen naar de zijkant. @@ -126,7 +126,7 @@ Aan de zijranden van de zakopening moet je stoppen met in het midden te knippen #### Strijk de naadwaarde open -![Strijk de naadwaarde open](05c.png) +![Strijk de naadwaarde open](05f.png) Strijk de naadwaarde aan de lange kanten van je zakopening open. From dffb5a6517e80f6451bdb620711a67fe239d2bad Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:21:49 +0100 Subject: [PATCH 438/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/ramoth-cathrin-corset/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/nl.md b/markdown/org/showcase/ramoth-cathrin-corset/nl.md index 19e8f08dac6..acc5a0dfb30 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/nl.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/nl.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth Cathrin Corset ...met vlinders!" date: "2023-01-31" intro: "Hier is een fantastisch vlinderkorset van Cathrin gemaakt door Ramoth - hun allereerste! Dit deelden ze over toekomstige aanpassingen:" From a5eb428377cecf0d7e8940c93a4d18247a34ebb6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:21:50 +0100 Subject: [PATCH 439/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/nl.md b/markdown/org/showcase/ramoth-short-sleeve-simon/nl.md index d8d1fa04268..c82be2619ae 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/nl.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/nl.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoths Simon met korte mouwen, waarbij de meeste vorm is verplaatst naar de figuurnaden op de rug" date: "2021-09-30" intro: "Simon overhemd met korte mouwen van Ramoth" From 9f16d5cb15d6c1f3f713a4c164f10a19e788f36f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:21:50 +0100 Subject: [PATCH 440/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/ramoth-simon-flannel/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/nl.md b/markdown/org/showcase/ramoth-simon-flannel/nl.md index 264ebeb47e1..350376fc333 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/nl.md +++ b/markdown/org/showcase/ramoth-simon-flannel/nl.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Prachtige motten op deze mooie Simon flanel" date: "2023-02-03" intro: "Ramoth's Simon Flanel" From 31dd96f1faa926140c6ffda03d7b5c1b9e2687cd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:21:59 +0100 Subject: [PATCH 441/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/simon-by-ramoth/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/nl.md b/markdown/org/showcase/simon-by-ramoth/nl.md index 60419565587..91aa1fb7b1f 100644 --- a/markdown/org/showcase/simon-by-ramoth/nl.md +++ b/markdown/org/showcase/simon-by-ramoth/nl.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoths indrukwekkende eerste Simon" date: "2021-08-24" intro: "Ramoth maakte dit fantastische eerste ontwerp van het Simon shirt en deelde genereus een aantal nuttige opmerkingen over de pasvorm. Ze zeiden:" From 9172ad095be7d6b8be0cb47e7b94f90f6f03f84e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:22:24 +0100 Subject: [PATCH 442/795] New translations en.yaml (Dutch) skip-build --- sites/shared/components/account/nl.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/nl.yaml b/sites/shared/components/account/nl.yaml index a075db49fa2..195b134c102 100644 --- a/sites/shared/components/account/nl.yaml +++ b/sites/shared/components/account/nl.yaml @@ -188,6 +188,8 @@ customBookmark: Aangepaste bladwijzers yourBookmarks: Je bladwijzers bookmarkThisThing: Bookmark deze { thing } page: Pagina +doc: Documentatie +pattern: Patroon #sets set: Meetset name: Naam @@ -250,7 +252,6 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private -pattern: Patroon patternNew: Een nieuw patroon genereren patternNewInfo: Kies een ontwerp, voeg je maatset toe en wij maken een naaipatroon op maat voor je. designNew: Een nieuw ontwerp creëren From ea7b64716bdf2b0e62bef133a4439a5fb38fd00a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:22:30 +0100 Subject: [PATCH 443/795] New translations en.yaml (Dutch) skip-build --- sites/shared/components/workbench/views/logs/nl.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/nl.yaml b/sites/shared/components/workbench/views/logs/nl.yaml index dc7f64795f0..c3c20e2581f 100644 --- a/sites/shared/components/workbench/views/logs/nl.yaml +++ b/sites/shared/components/workbench/views/logs/nl.yaml @@ -1,6 +1,6 @@ logs: Logboeken error: Foutmeldingen -warning: Waarschuwingsberichten +warn: Waarschuwingsberichten info: Info berichten debug: Debugberichten seeLinkOrClick: Zie { link } of { click } From a77658c7830c1ce2298864436bb09426ca92d104 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:23:46 +0100 Subject: [PATCH 444/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/about/site/bookmarks/type/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/nl.md b/markdown/org/docs/about/site/bookmarks/type/nl.md index 704661c10d2..a46a0f2173e 100644 --- a/markdown/org/docs/about/site/bookmarks/type/nl.md +++ b/markdown/org/docs/about/site/bookmarks/type/nl.md @@ -6,5 +6,5 @@ Elke bladwijzer heeft een **type** attribuut dat verplicht is. Als je handmatig een bladwijzer maakt, is het type altijd **custom** zodat je het niet kunt kiezen. -Andere types zijn **patroon**, **docs**, of **set** die automatisch worden ingesteld wanneer je een bladwijzer maakt voor respectievelijk een patroon, documentatiepagina of meetset. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From e3d3456dabab32abf4a8b4a0fcc2b647cdbd73cc Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 23 Mar 2024 17:32:42 +0100 Subject: [PATCH 445/795] fix(shared): Remove debug statement --- sites/shared/components/navigation/sitenav.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/sites/shared/components/navigation/sitenav.mjs b/sites/shared/components/navigation/sitenav.mjs index 917e759644e..5e1bf95ce6e 100644 --- a/sites/shared/components/navigation/sitenav.mjs +++ b/sites/shared/components/navigation/sitenav.mjs @@ -96,7 +96,6 @@ export const Breadcrumbs = ({ lead = false }) => { export const NavLinks = () => { const { slug } = useContext(NavigationContext) const chunks = slug.split('/') - console.log(chunks[0]) return (
    From 41525b879292bfb3ba516800dabdea6b42b30880 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:37:11 +0100 Subject: [PATCH 446/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/wahid/instructions/uk.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/uk.md b/markdown/org/docs/designs/wahid/instructions/uk.md index bb6b54e0c26..8fe2326f2ad 100644 --- a/markdown/org/docs/designs/wahid/instructions/uk.md +++ b/markdown/org/docs/designs/wahid/instructions/uk.md @@ -86,7 +86,7 @@ title: "Жилет вахід: Інструкція з пошиття" #### Позначте, куди має йти ваша кишеня -![Позначте, куди має йти ваша кишеня](05a.png) +![Позначте, куди має йти ваша кишеня](05b.png) На передній частині викрійки є допоміжна лінія, яка показує, де повинна знаходитися кишеня з прорізним швом. Це два напівпрямокутники, які з'єдналися разом, коли ви закрили виточку, щоб сформувати форму кишені. @@ -116,7 +116,7 @@ title: "Жилет вахід: Інструкція з пошиття" #### Розріжте кишеню -![Розріжте кишеню](05c.png) +![Розріжте кишеню](05e.png) Час акуратно розрізати кишеню. Почніть з середини кишені і розріжте вздовж найдовших країв у бік. @@ -126,7 +126,7 @@ title: "Жилет вахід: Інструкція з пошиття" #### Розкрийте припуск на шов -![Розкрийте припуск на шов](05c.png) +![Розкрийте припуск на шов](05f.png) Розпрасуйте припуски на шви вздовж довгих країв кишені. From 892ae8f0c3707843d9645a9f28480e5397f6b7c9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:38:56 +0100 Subject: [PATCH 447/795] New translations en.md (Ukrainian) skip-build --- markdown/org/newsletter/2022q4/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/newsletter/2022q4/uk.md b/markdown/org/newsletter/2022q4/uk.md index 8b0d70449ca..722fc706e9f 100644 --- a/markdown/org/newsletter/2022q4/uk.md +++ b/markdown/org/newsletter/2022q4/uk.md @@ -37,7 +37,7 @@ FreeSewing 2.22 вийшов наприкінці серпня, в ньому з ### Конфігурація на рівні частин, також відома як підтримка пакетів -На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів, комір з набору комірів, додати кишені з набору комірів, і так далі. +На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів *, комір з набору комірів *, додати кишені з набору комірів *,* і так далі.

    Це одна з тих речей, яка має багато сенсу, але викликає питання: Як все це буде працювати під капотом? У версії 2 FreeSewing реалізація цих ідей була б нетривіальною, тому що, хоча ми підтримуємо розширення викрійок на інші дизайни, цей процес є надто громіздким для такого рівня спеціального поєднання різних дизайнів. From 475aea93e0c42f9c7830c72c1b89b70145af1455 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:14 +0100 Subject: [PATCH 448/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/ramoth-cathrin-corset/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/uk.md b/markdown/org/showcase/ramoth-cathrin-corset/uk.md index d4e709fd2eb..c94990b9ae2 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/uk.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/uk.md @@ -1,5 +1,5 @@ --- -maker: "Рамот" +author: 23386 caption: "Корсет Ramoth Cathrin ... з метеликами!" date: "2023-01-31" intro: "Ось фантастичний корсет-метелик Cathrin від Ramoth - їхній найперший! Вони розповіли про майбутні зміни:" From dda10ed32ab0f6ca883bd684360fd068c9ec1a6f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:15 +0100 Subject: [PATCH 449/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/uk.md b/markdown/org/showcase/ramoth-short-sleeve-simon/uk.md index 04385bddd9a..a9dd3783b48 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/uk.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/uk.md @@ -1,5 +1,5 @@ --- -maker: "Рамот" +author: 23386 caption: "Симон з коротким рукавом від Ramoth з більшою частиною форми, зміщеною на задні виточки" date: "2021-09-30" intro: "Сорочка Рамота з коротким рукавом Simon" From b87c52b0e88f9f381c1e58f7e57e640e77f48207 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:16 +0100 Subject: [PATCH 450/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/ramoth-simon-flannel/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/uk.md b/markdown/org/showcase/ramoth-simon-flannel/uk.md index 5df37442da3..eff36ee5892 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/uk.md +++ b/markdown/org/showcase/ramoth-simon-flannel/uk.md @@ -1,5 +1,5 @@ --- -maker: "Рамот" +author: 23386 caption: "Любіть метеликів на цій прекрасній фланелі Simon" date: "2023-02-03" intro: "Simon Flannel від Ramoth" From 448651565686ef736c0472b19bf724c8f4039244 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:25 +0100 Subject: [PATCH 451/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/simon-by-ramoth/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/uk.md b/markdown/org/showcase/simon-by-ramoth/uk.md index 499cc7c3c11..035f47a5fe6 100644 --- a/markdown/org/showcase/simon-by-ramoth/uk.md +++ b/markdown/org/showcase/simon-by-ramoth/uk.md @@ -1,5 +1,5 @@ --- -maker: "Рамот" +author: 23386 caption: "Вражаючий перший \"Саймон\" Рамота" date: "2021-08-24" intro: "Рамот створила цей фантастичний перший ескіз сорочки для Саймона і щедро поділилася корисними порадами щодо підгонки. Вони сказали:" From 6318b81b82c07efb723fd76bb73e88eb05648c7c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:49 +0100 Subject: [PATCH 452/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/components/account/uk.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/uk.yaml b/sites/shared/components/account/uk.yaml index 2480d922113..7c15ad8b8a1 100644 --- a/sites/shared/components/account/uk.yaml +++ b/sites/shared/components/account/uk.yaml @@ -188,6 +188,8 @@ customBookmark: Користувацькі закладки yourBookmarks: Ваші закладки bookmarkThisThing: Додайте це в закладки { thing } page: Сторінка +doc: Документація +pattern: Викрійка #sets set: Набір для вимірювань name: Назва @@ -250,7 +252,6 @@ andMore: and more unitsMustSave: "Note: You must save after changing Units to have the change take effect on this page." makePublic: Make public makePrivate: Make private -pattern: Викрійка patternNew: Створіть новий шаблон patternNewInfo: Виберіть дизайн, додайте свої мірки, і ми створимо для вас індивідуальну викрійку. designNew: Створіть новий дизайн From f29efb47ee7b9759d0a941cdd1610222fd4ad922 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:41:56 +0100 Subject: [PATCH 453/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/components/workbench/views/logs/uk.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/uk.yaml b/sites/shared/components/workbench/views/logs/uk.yaml index 3f0c9c9ddb6..b329a37224f 100644 --- a/sites/shared/components/workbench/views/logs/uk.yaml +++ b/sites/shared/components/workbench/views/logs/uk.yaml @@ -1,6 +1,6 @@ logs: Журнали error: Повідомлення про помилки -warning: Попереджувальні повідомлення +warn: Попереджувальні повідомлення info: Інформаційні повідомлення debug: Повідомлення про налагодження seeLinkOrClick: Дивіться { link } або { click } From 3d2ddfec8dbb3c7e9ab5c00e7f7f261909357bce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:43:14 +0100 Subject: [PATCH 454/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/about/site/bookmarks/type/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/uk.md b/markdown/org/docs/about/site/bookmarks/type/uk.md index 5e9fbf18c01..679250d9245 100644 --- a/markdown/org/docs/about/site/bookmarks/type/uk.md +++ b/markdown/org/docs/about/site/bookmarks/type/uk.md @@ -6,5 +6,5 @@ title: Тип Коли ви створюєте закладку вручну, тип завжди **користувацький** , тому ви не можете його вибрати. -Інші типи включають **деталі**, **документи**або **набір** , які будуть автоматично встановлені, коли ви зробите закладку на деталь, сторінку документації або набір вимірів відповідно. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From 6215d61be57348f57f3d530b190d4ba6e3279ed6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 17:49:38 +0100 Subject: [PATCH 455/795] New translations en.md (French) skip-build --- .../org/docs/about/faq/measurements-issues/fr.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/markdown/org/docs/about/faq/measurements-issues/fr.md b/markdown/org/docs/about/faq/measurements-issues/fr.md index 3afdf04ab7e..e9cc8e199ac 100644 --- a/markdown/org/docs/about/faq/measurements-issues/fr.md +++ b/markdown/org/docs/about/faq/measurements-issues/fr.md @@ -20,21 +20,21 @@ Nous avons remarqué que certaines mesures ont tendance à poser des problèmes. #### De la taille à l'aisselle -La mesure [de la taille à l'aisselle] (https\://freesewing.org/docs/measurements/waisttoarmpit) est une mesure verticale droite, et non curviligne (qui suit la courbe du corps). It should be at the bottom edge of your armpit, only as high as a shirt would be comfortable sitting (not digging in). +La mesure [de la taille à l'aisselle] (https\://freesewing.org/docs/measurements/waisttoarmpit) est une mesure verticale droite, et non curviligne (qui suit la courbe du corps). Il doit se situer au niveau du bord inférieur de ton aisselle, pas plus haut que le max qu'une chemise peux l'être (sans s'enfoncer). -![Waist to armpit](waisttoarmpit.jpg) +![De la taille à l'aisselle](waisttoarmpit.jpg) -#### High point shoulder (HPS) +#### Point Haut de l'Épaule (ou PHE) -[HPS](https://freesewing.org/docs/sewing/hps), which is used in several measurements, is one of the harder spots to get perfect. +[HPS](https://freesewing.org/docs/sewing/hps), qui est utilisé dans plusieurs mesures, est l'un des points les plus difficiles à perfectionner. -Here are two approaches. +Voici deux approches. -One way is to take a pencil, pen, or small dowel to find the point where your neck meets your shoulder, as well as the highest point as that's where the pencil or dowel will touch the shoulder. If you use that method, you ideally want the tool you're using to be parallel with the floor so you can find that high point. +Une façon de procéder consiste à prendre un crayon, un stylo ou une petite cheville pour trouver le point où ton cou rencontre ton épaule, ainsi que le point le plus élevé car c'est là que le crayon ou la cheville touchera l'épaule. Si tu utilises cette méthode, l'idéal est que l'outil que tu utilises soit parallèle au sol pour que tu puisses trouver ce point haut. -![High point shoulder with dowel](hps2.jpg) +[Épaulement en hauteur avec cheville](hps2.jpg) -Another way is with a ribbon. Take a longer ribbon and put it over your neck/shoulder like a cross body bag. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. +Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de ton cou/de tes épaules comme une sacoche. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. ![High point shoulder with riibbon](hps.jpg) From 321a3ec241aa343fa8267cfc95aa10c3b5d0618c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:07:32 +0100 Subject: [PATCH 456/795] Update source file en.md skip-build --- markdown/org/docs/about/site/bookmarks/type/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/en.md b/markdown/org/docs/about/site/bookmarks/type/en.md index c08efa9d315..38a0eabfb8e 100644 --- a/markdown/org/docs/about/site/bookmarks/type/en.md +++ b/markdown/org/docs/about/site/bookmarks/type/en.md @@ -6,5 +6,5 @@ Every bookmark has a **type** attribute that is mandatory. When you manually create a bookmark, the type is always **custom** so you cannot choose it. -Other types include **pattern**, **docs**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. +Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. From e4d31f27c4231396c1b3b7f6ffd494111f919f3d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:11:45 +0100 Subject: [PATCH 457/795] Update source file en.md skip-build --- markdown/org/docs/designs/wahid/instructions/en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/wahid/instructions/en.md b/markdown/org/docs/designs/wahid/instructions/en.md index 3cca9576f87..fbfe9446328 100644 --- a/markdown/org/docs/designs/wahid/instructions/en.md +++ b/markdown/org/docs/designs/wahid/instructions/en.md @@ -86,7 +86,7 @@ When you are done, press open this seam. #### Mark where your pocket needs to go -![Mark where your pocket needs to go](05a.png) +![Mark where your pocket needs to go](05b.png) Your front pattern piece has a helpline on it to show where the welt pocket should go. It's two half rectangles that got joined together when you closed the dart to form the shape of your welt pocket. @@ -117,7 +117,7 @@ Now sew along the helpline which marks the long edge of your pocket. #### Cut open the pocket -![Cut open the pocket](05c.png) +![Cut open the pocket](05e.png) Time to carefully cut open the pocket. Start in the middle of the pocket, and cut towards along the longest edges towards the side. @@ -127,7 +127,7 @@ At the edges of your pocket you need to stop cutting open the center and instead #### Press open the seam allowance -![Press open the seam allowance](05c.png) +![Press open the seam allowance](05f.png) Press open the seam allowance along the long edges of your pocket. From f9c00cc76fdd934a192812adfb26778c6ec2f996 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:01 +0100 Subject: [PATCH 458/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-cathrin-corset/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-cathrin-corset/en.md b/markdown/org/showcase/ramoth-cathrin-corset/en.md index 0573a8262b0..79495687079 100644 --- a/markdown/org/showcase/ramoth-cathrin-corset/en.md +++ b/markdown/org/showcase/ramoth-cathrin-corset/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth Cathrin Corset ...with butterflies!" date: "2023-01-31" intro: "Here's a fantastic butterfly Cathrin corset made by Ramoth - their very first! They shared this about future alterations:" From 3f3917d376d8435fd03f2afb53f85871dd8a24f5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:02 +0100 Subject: [PATCH 459/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-short-sleeve-simon/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md index fa8bee14072..6796caf33d7 100644 --- a/markdown/org/showcase/ramoth-short-sleeve-simon/en.md +++ b/markdown/org/showcase/ramoth-short-sleeve-simon/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth's short-sleeve Simon with most of the shaping shifted to the back darts" date: "2021-09-30" intro: "Ramoth's short-sleeve Simon shirt" From da9b0fd21529052dc60d368b8d135bd06fc52c23 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:02 +0100 Subject: [PATCH 460/795] Update source file en.md skip-build --- markdown/org/showcase/ramoth-simon-flannel/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/ramoth-simon-flannel/en.md b/markdown/org/showcase/ramoth-simon-flannel/en.md index 568fb826e44..7af7ec0f032 100644 --- a/markdown/org/showcase/ramoth-simon-flannel/en.md +++ b/markdown/org/showcase/ramoth-simon-flannel/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Love the moths on this beautiful Simon flannel" date: "2023-02-03" intro: "Ramoth's Simon Flannel" From 732fe8dddca9ecc5acfe3d67bbb7551d05392603 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:08 +0100 Subject: [PATCH 461/795] Update source file en.md skip-build --- markdown/org/showcase/simon-by-ramoth/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/simon-by-ramoth/en.md b/markdown/org/showcase/simon-by-ramoth/en.md index d97aea69d2e..2701c4546d6 100644 --- a/markdown/org/showcase/simon-by-ramoth/en.md +++ b/markdown/org/showcase/simon-by-ramoth/en.md @@ -1,5 +1,5 @@ --- -maker: "Ramoth" +author: 23386 caption: "Ramoth's impressive first Simon" date: "2021-08-24" intro: "Ramoth made this fantastic first draft of the Simon shirt and generously shared some helpful fit notes. They said:" From abbb3cbcd8980ef36eec56d23878eb01a5cf5b26 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:24 +0100 Subject: [PATCH 462/795] Update source file en.yaml skip-build --- sites/shared/components/account/en.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sites/shared/components/account/en.yaml b/sites/shared/components/account/en.yaml index d8e7aeecc54..0431cddead0 100644 --- a/sites/shared/components/account/en.yaml +++ b/sites/shared/components/account/en.yaml @@ -206,6 +206,8 @@ customBookmark: Custom Bookmarks yourBookmarks: Your bookmarks bookmarkThisThing: Bookmark this { thing } page: Page +doc: Documentation +pattern: Pattern # sets set: Measurements Set @@ -270,7 +272,6 @@ unitsMustSave: "Note: You must save after changing Units to have the change take makePublic: Make public makePrivate: Make private -pattern: Pattern patternNew: Generate a new pattern patternNewInfo: Pick a design, add your measurements set, and we'll generate a bespoke sewing pattern for you. From c863992eb42ad9574595f0670b629f9e312f7316 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:13:27 +0100 Subject: [PATCH 463/795] Update source file en.yaml skip-build --- sites/shared/components/workbench/views/logs/en.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/components/workbench/views/logs/en.yaml b/sites/shared/components/workbench/views/logs/en.yaml index bd679d458ed..2c69ef30437 100644 --- a/sites/shared/components/workbench/views/logs/en.yaml +++ b/sites/shared/components/workbench/views/logs/en.yaml @@ -1,6 +1,6 @@ logs: Logs error: Error messages -warning: Warning messages +warn: Warning messages info: Info messages debug: Debug messages seeLinkOrClick: See { link } or { click } From 6080d946b8c0564de488aeae882ee3e2e2aebc82 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:19:46 +0100 Subject: [PATCH 464/795] New translations en.md (French) skip-build --- .../docs/about/faq/measurements-issues/fr.md | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/markdown/org/docs/about/faq/measurements-issues/fr.md b/markdown/org/docs/about/faq/measurements-issues/fr.md index e9cc8e199ac..2c97b7bab67 100644 --- a/markdown/org/docs/about/faq/measurements-issues/fr.md +++ b/markdown/org/docs/about/faq/measurements-issues/fr.md @@ -1,12 +1,12 @@ --- -title: J'ai des difficultés avec les mesures. Que faut-il pour que je vérifie? +title: J'ai des difficultés avec les mesures. Que faut-il que je vérifie? --- Chacune de nos [mesures] (https\://freesewing.org/docs/measurements) est documentée par une description et deux visuels. S'y référer résout la plupart des problèmes. Nous travaillons sur une fonctionnalité d'assurance qualité qui détecte les problèmes éventuels et les porte à l'attention de l'utilisateur d'une manière qui _a du sens_. -En attendant, voici quelques endroits pour commencer à chercher si tu as des problèmes avec tes mesures. +En attendant, voici quelques endroits où commencer à chercher si tu as des problèmes avec tes mesures. ### Remarques générales @@ -34,32 +34,32 @@ Une façon de procéder consiste à prendre un crayon, un stylo ou une petite ch [Épaulement en hauteur avec cheville](hps2.jpg) -Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de ton cou/de tes épaules comme une sacoche. It helps to be able to feel where the neck ends and the shoulder begins with a small amount of pressure on the ribbon. You'll need to determine where the shoulder seam should sit, but the ribbon will tell you where the HPS should sit once you have the shoulder seam determined as it will be where the two lines cross. +Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de ton cou/de tes épaules comme une sacoche. Il est utile de pouvoir sentir où se termine le cou et où commence l'épaule en exerçant une petite pression sur le ruban. Tu devras déterminer l'emplacement de la couture de l'épaule, mais le ruban t'indiquera l'emplacement du HPS une fois que tu auras déterminé la couture de l'épaule, car ce sera l'endroit où les deux lignes se croisent. -![High point shoulder with riibbon](hps.jpg) +[Épaulement en hauteur avec ruban](hps2.jpg) #### Tour de buste supérieur -[High bust](https://freesewing.org/docs/measurements/highbust) is a horizontal measurement that does not need to be perfectly horizontal. It should go around your torso at the narrowest part of the upper chest, over the bust, under the arms, and across the back, but does not need to be parallel to the ground all the way around. +Le [buste haut] (https\://freesewing.org/docs/measurements/highbust) est une mesure horizontale qui n'a pas besoin d'être parfaitement horizontale. Elle doit faire le tour de ton torse au niveau de la partie la plus étroite du haut de la poitrine, passer sur le buste, sous les bras et dans le dos, mais il n'est pas nécessaire qu'elle soit parallèle au sol sur toute sa longueur. -![High bust from the side](highbust.jpg) +[Buste haut vu de côté](highbust.jpg) -![High bust from the front](highbust2.jpg) +[Buste haut de face](highbust2.jpg) #### Pente d'épaule -Many have had luck using an inclinometer app on a smartphone to measure [shoulder slope](https://freesewing.org/docs/measurements/shoulderslope). +Beaucoup ont eu de la chance en utilisant une application d'inclinomètre sur un smartphone pour mesurer [la pente des épaules] (https\://freesewing.org/docs/measurements/shoulderslope). -#### Seat and hips +#### Siège et hanches -Sometimes people have [seat](https://freesewing.org/docs/measurements/seat) and [hips](https://freesewing.org/docs/measurements/hips) reversed. +Parfois, les gens ont [siège](https://freesewing.org/docs/measurements/seat) et [hanches](https://freesewing.org/docs/measurements/hips) inversés. -In FreeSewing terms, hips is measured at the upper point of the hip bones. Some other sources call this the "high hip". +En termes de FreeSewing, les hanches sont mesurées au point supérieur des os de la hanche. D'autres sources appellent cela la "hanche haute". -Seat is across the fullest part of your butt. Some other sources call this the "hip". +L'assise se trouve sur la partie la plus large de tes fesses. D'autres sources appellent cela la "hanche". -##### Waist +##### Taille -Where you take the [waist](https://freesewing.org/docs/measurements/waist) measurements is not necessarily connected to where, for instance, a waistband is. +L'endroit où tu prends les mesures de la [taille] (https\://freesewing.org/docs/measurements/waist) n'est pas nécessairement lié à l'endroit où se trouve, par exemple, une ceinture. -Try bending sideways and noting the point where your body creases. (For bonus points, put your hand on your waist and sing "I'm a little teapot".) +Essaie de te pencher sur le côté et de noter l'endroit où ton corps se plisse. (Pour les points bonus, mets ta main sur ta taille et chante "Je suis une petite théière") From b7d6ca4cd8b7e744f38c84d18e6b98bbb8d6316e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:19:47 +0100 Subject: [PATCH 465/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/seam-allowance/fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/about/faq/seam-allowance/fr.md b/markdown/org/docs/about/faq/seam-allowance/fr.md index 3388d6aa0fb..dd41c4eaafc 100644 --- a/markdown/org/docs/about/faq/seam-allowance/fr.md +++ b/markdown/org/docs/about/faq/seam-allowance/fr.md @@ -1,7 +1,7 @@ --- -title: Why are seam allowances not included by default? +title: Pourquoi les marges de couture ne sont-elles pas incluses par défaut ? --- -We don't include seam allowance by default because it's computationally expensive to add seam allowance since there is no closed form integral solution for offsetting a cubic Bezier curve. +Nous n'incluons pas la marge de couture par défaut parce qu'il est coûteux de calculer la marge de couture étant donné qu'il n'y a pas de solution intégrale de forme fermée pour compenser une courbe de Bézier cubique. -We have a YouTube video with more information: [A look at the FreeSewing Timing Plugin](https://youtu.be/pn6w-O6nFbI) +Nous avons une vidéo YouTube qui contient plus d'informations : [Un regard sur le plugin FreeSewing Timing](https://youtu.be/pn6w-O6nFbI) From 89be7a1c93741abc5167837d81fc89b23fc17542 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 23 Mar 2024 18:19:48 +0100 Subject: [PATCH 466/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/standard-measurements/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/docs/about/faq/standard-measurements/fr.md b/markdown/org/docs/about/faq/standard-measurements/fr.md index 91870c9a259..2623776fb47 100644 --- a/markdown/org/docs/about/faq/standard-measurements/fr.md +++ b/markdown/org/docs/about/faq/standard-measurements/fr.md @@ -1,9 +1,9 @@ --- -title: Where did the "standard" measurements go? +title: Où sont passées les mesures "standard" ? --- -In past versions of FreeSewing, we published a sizing table so that users could try out the platform without entering their measurements. Because there are no real standards for sizes, ours were -- like all sizing charts -- made up. +Dans les versions antérieures de FreeSewing, nous avons publié un tableau des tailles pour que les utilisateurs puissent essayer la plateforme sans entrer leurs mesures. Comme il n'y a pas de normes réelles pour les tailles, les nôtres ont été - comme tous les tableaux de tailles - inventées. -We found that publishing these created unreasonable expectations. Users were disappointed when their patterns generated with "standard" sizes didn't fit as they expected. We removed the made up measurements in favor of [curated measurements sets](https://freesewing.org/curated-sets). +Nous avons constaté que leur publication créait des attentes déraisonnables. Les utilisateurs ont été déçus lorsque leurs patrons générés avec des tailles "standard" ne s'adaptaient pas comme ils l'espéraient. Nous avons supprimé les mesures inventées en faveur de [des mesures curatés] (https\://freesewing.org/curated-sets). -We also removed the ability to compare your measurements to "standard" ones to try to identify potential mismeasurements. In the future, we may implement different ways to check, but will only display these to users who are [comfortable with their measurement sets being compared](https://freesewing.org/account/compare). +Nous avons également supprimé la possibilité de comparer tes mesures à des mesures "standard" pour essayer d'identifier d'éventuelles erreurs de mesure. À l'avenir, nous pourrons mettre en place différentes méthodes de vérification, mais nous ne les afficherons qu'aux utilisateurs qui sont [à l'aise avec la comparaison de leurs ensembles de mesures] (https\://freesewing.org/account/compare). From f0cfc5d0f1ba304360ffcb15d758bf7315896794 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 24 Mar 2024 09:43:55 +0100 Subject: [PATCH 467/795] fix(org): Left-behind commit for wide docs content on index page --- sites/org/pages/docs/index.mjs | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/sites/org/pages/docs/index.mjs b/sites/org/pages/docs/index.mjs index a7a8af0a9e4..6f0cca2071b 100644 --- a/sites/org/pages/docs/index.mjs +++ b/sites/org/pages/docs/index.mjs @@ -2,6 +2,8 @@ import { serverSideTranslations } from 'next-i18next/serverSideTranslations' import { loadMdxAsStaticProps } from 'shared/mdx/load.mjs' import { nsMerge } from 'shared/utils.mjs' +// Hooks +import { useState } from 'react' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' import { MdxWrapper } from 'shared/components/wrappers/mdx.mjs' @@ -9,17 +11,23 @@ import { DocsLayout, ns as layoutNs } from 'site/components/layouts/docs.mjs' export const ns = nsMerge('docs', pageNs, layoutNs) -const DocsHomePage = ({ page, locale, frontmatter, mdx, mdxSlug }) => ( - } - > - - -) +const DocsHomePage = ({ page, locale, frontmatter, mdx, mdxSlug }) => { + const [wide, setWide] = useState(false) + + return ( + ( + + )} + > + + + ) +} export default DocsHomePage From e87de9d8d3dd93c2d15cbe7568f22b4c7973300b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:42:14 +0000 Subject: [PATCH 468/795] chore(deps): Bump daisyui from 4.7.3 to 4.8.0 Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.7.3 to 4.8.0. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.7.3...v4.8.0) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 06c5d74a6f6..90028dc7d93 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -35,7 +35,7 @@ "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", - "daisyui": "4.7.3", + "daisyui": "4.8.0", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index cce2c19d072..2fbd22b9fb5 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.8.0", "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index 9276ee11271..c0a64a417df 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,7 +37,7 @@ "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.7.3", + "daisyui": "4.8.0", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.7.1", diff --git a/sites/sde/package.json b/sites/sde/package.json index 93fa2362bb1..2f2d0137e30 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,7 +50,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.8.0", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..ba5808c68ac 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,7 +23,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.8.0", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..361ab13df26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4704,10 +4704,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.7.3.tgz#2d75b71d1c52f643914dea9b12930acc51ed9f49" - integrity sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g== +daisyui@4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.8.0.tgz#f49ed22d07fe67d92b3f9bd334f8cd4efd3ccb2d" + integrity sha512-SXy6MVzhqaa1vPZIdo5K/QAyRaQ4dbRHG+oXy7BFqJnZlwOB6bGkQRqqvClBUY2wCyiiyhk4gY5Ngi1m2JRIEA== dependencies: css-selector-tokenizer "^0.8" culori "^3" From 2cbe671a280cb785fa3d585b9371a88fdea77f70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:43:35 +0000 Subject: [PATCH 469/795] chore(deps): Bump pdfkit from 0.14.0 to 0.15.0 Bumps [pdfkit](https://github.com/foliojs/pdfkit) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/foliojs/pdfkit/releases) - [Changelog](https://github.com/foliojs/pdfkit/blob/master/CHANGELOG.md) - [Commits](https://github.com/foliojs/pdfkit/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: pdfkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index 93fa2362bb1..46ae3341533 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -65,7 +65,7 @@ "mustache": "4.2.0", "next": "14.1.4", "next-i18next": "15.2.0", - "pdfkit": "0.14.0", + "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..3c1ba3986f8 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -39,7 +39,7 @@ "mdast-util-toc": "7.0.0", "mermaid": "10.9.0", "ora": "8.0.1", - "pdfkit": "0.14.0", + "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..bfc3acb1835 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7962,6 +7962,11 @@ jotai@2.7.1: resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== +jpeg-exif@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/jpeg-exif/-/jpeg-exif-1.1.4.tgz#781a65b6cd74f62cb1c493511020f8d3577a1c2b" + integrity sha512-a+bKEcCjtuW5WTdgeXFzswSrdqi0jk4XlEtZlx5A94wCoBpFjfFTbo/Tra5SpNCl/YFZPvcV1dJc+TAYeg6ROQ== + js-base64@^2.1.9: version "2.6.4" resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz" @@ -11137,13 +11142,14 @@ pause@0.0.1: resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== -pdfkit@0.14.0: - version "0.14.0" - resolved "https://registry.npmjs.org/pdfkit/-/pdfkit-0.14.0.tgz" - integrity sha512-Hnor8/78jhHm6ONrxWhrqOwAVALlBnFyWOF8sstBZMiqHZgZ5A6RU+Q3yahhw82plxpT7LOfH3b3qcOX6rzMQg== +pdfkit@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.15.0.tgz#7152f1bfa500c37d25b5f8cd4850db09a8108941" + integrity sha512-Z0dx0sEPKLW2kbThS1SWZ0iSHlRPoFMpP+oSjNrtwRjsfGivwE+r6emyEFwQG/fx1Ri0AGUHmDcGOSMMlLLnSg== dependencies: crypto-js "^4.2.0" fontkit "^1.8.1" + jpeg-exif "^1.1.4" linebreak "^1.0.2" png-js "^1.0.0" From 03cd11cbc5a9ae35fd5e1d7d371b7dc3228d28b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 04:47:05 +0000 Subject: [PATCH 470/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.535.0 to 3.540.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.535.0 to 3.540.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.540.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 132 ++++++++++++++++++------------------- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index d5402230213..aed4dc8ba15 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.535.0", + "@aws-sdk/client-sesv2": "3.540.0", "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..fec14e702f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -197,23 +197,23 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.535.0.tgz#66ffd54ab4e612be84f4e63670304d2d83ca12a1" - integrity sha512-K0WZf/o4R+A20RFHJW+YyMg0cMK8GMHe2MHURpPvLJoq5JF0RpCdsMTgRiYIoAFCLoy8qFH9G0MebxR8JZvD+A== +"@aws-sdk/client-sesv2@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.540.0.tgz#eceae8ab2bbb0600ccef486fe31266863008f732" + integrity sha512-shnxtTz/ZIBtot6+V1robjwvhJVtARUnsxGAmRc8Wv7tN7git+P7G1zj28SAmuBBr04wJu0Z3uteMurGAeLAHA== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.540.0" "@aws-sdk/core" "3.535.0" - "@aws-sdk/credential-provider-node" "3.535.0" + "@aws-sdk/credential-provider-node" "3.540.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" @@ -243,22 +243,22 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz#64666c2f7bed8510938ba2b481429fea8f97473d" - integrity sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw== +"@aws-sdk/client-sso-oidc@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.540.0.tgz#e4c52889d33ca969add269011b790f2d634fb6d2" + integrity sha512-LZYK0lBRQK8D8M3Sqc96XiXkAV2v70zhTtF6weyzEpgwxZMfSuFJjs0jFyhaeZBZbZv7BBghIdhJ5TPavNxGMQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.540.0" "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" @@ -288,10 +288,10 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz#c405aaf880cb695aa2f5070a8827955274fc9df2" - integrity sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ== +"@aws-sdk/client-sso@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.540.0.tgz#732a7f325de3905a719c20ce05e555b445f82b4a" + integrity sha512-rrQZMuw4sxIo3eyAUUzPQRA336mPRnrAeSlSdVHBKZD8Fjvoy0lYry2vNhkPLpFZLso1J66KRyuIv4LzRR3v1Q== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" @@ -299,10 +299,10 @@ "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" @@ -332,10 +332,10 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz#0f518fe338c6b7a8b8a897e2ccee65d06dc0040f" - integrity sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw== +"@aws-sdk/client-sts@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.540.0.tgz#16ce14db1c5387be3ad9be6dd4f8ed33b63193c8" + integrity sha512-ITHUQxvpqfQX6obfpIi3KYGzZYfe/I5Ixjfxoi5lB7ISCtmxqObKB1fzD93wonkMJytJ7LUO8panZl/ojiJ1uw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" @@ -343,10 +343,10 @@ "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" @@ -414,16 +414,16 @@ "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz#b121b1aba2916e3f45745cd690b4082421a7c286" - integrity sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA== +"@aws-sdk/credential-provider-ini@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.540.0.tgz#8e17b23bf242152775db1473f7d2952beb6a5ef9" + integrity sha512-igN/RbsnulIBwqXbwsWmR3srqmtbPF1dm+JteGvUY31FW65fTVvWvSr945Y/cf1UbhPmIQXntlsqESqpkhTHwg== dependencies: - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.540.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.535.0" - "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.540.0" + "@aws-sdk/credential-provider-web-identity" "3.540.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -431,17 +431,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz#6739b4b52a9cce29dc8e70c9a7290b89cdc4b904" - integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== +"@aws-sdk/credential-provider-node@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.540.0.tgz#e6fd3404de68e7f9580f01aa542b16e9abc58e5c" + integrity sha512-HKQZJbLHlrHX9A0B1poiYNXIIQfy8whTjuosTCYKPDBhhUyVAQfxy/KG726j0v43IhaNPLgTGZCJve4hAsazSw== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-http" "3.535.0" - "@aws-sdk/credential-provider-ini" "3.535.0" + "@aws-sdk/credential-provider-ini" "3.540.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.535.0" - "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.540.0" + "@aws-sdk/credential-provider-web-identity" "3.540.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -460,25 +460,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz#dfc7c2f39f9ca965becd7e5b9414cd1bb2217490" - integrity sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg== +"@aws-sdk/credential-provider-sso@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.540.0.tgz#1fc5c53a0df8227249c73a3cb7660b1accb79186" + integrity sha512-tKkFqK227LF5ajc5EL6asXS32p3nkofpP8G7NRpU7zOEOQCg01KUc4JRX+ItI0T007CiN1J19yNoFqHLT/SqHg== dependencies: - "@aws-sdk/client-sso" "3.535.0" - "@aws-sdk/token-providers" "3.535.0" + "@aws-sdk/client-sso" "3.540.0" + "@aws-sdk/token-providers" "3.540.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz#f1d3a72ff958cbd7e052c5109755379745ac35e0" - integrity sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg== +"@aws-sdk/credential-provider-web-identity@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.540.0.tgz#775a2090e9f4f89efe2ebdf1e2c109a47561c0e9" + integrity sha512-OpDm9w3A168B44hSjpnvECP4rvnFzD86rN4VYdGADuCvEa5uEcdA/JuT5WclFPDqdWEmFBqS1pxBIJBf0g2Q9Q== dependencies: - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.540.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -513,13 +513,13 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz#2877ff5e42d943dd0c488e8b1ad82bd9da121227" - integrity sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog== +"@aws-sdk/middleware-user-agent@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" + integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== dependencies: "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" @@ -536,12 +536,12 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz#0d5aa221449d5b56730427b28d3319005c5700ed" - integrity sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg== +"@aws-sdk/token-providers@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.540.0.tgz#06fb874a62d3c496875768ac648bc6cca4c75a79" + integrity sha512-9BvtiVEZe5Ev88Wa4ZIUbtT6BVcPwhxmVInQ6c12MYNb0WNL54BN6wLy/eknAfF05gpX2/NDU2pUDOyMPdm/+g== dependencies: - "@aws-sdk/client-sso-oidc" "3.535.0" + "@aws-sdk/client-sso-oidc" "3.540.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" @@ -556,10 +556,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz#46f4b61b2661d6414ded8c98e4ad3c82a0bf597b" - integrity sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg== +"@aws-sdk/util-endpoints@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" + integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/types" "^2.12.0" From a9c2d0805c3cffe561852eff3077a8e1b3ce7d15 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 25 Mar 2024 13:11:56 +0100 Subject: [PATCH 471/795] Add missing i18n string. Fixes #6438 --- sites/shared/i18n/sections/en.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/en.yaml b/sites/shared/i18n/sections/en.yaml index 981b5b5aa6c..cf082c947b5 100644 --- a/sites/shared/i18n/sections/en.yaml +++ b/sites/shared/i18n/sections/en.yaml @@ -29,6 +29,7 @@ patterns: Your Patterns curate: Curate curateSets: Curate Sets curatedSets: Curated Measurements Sets +curated-setsAbout: Sets of measurements curated by FreeSewing that you can use to test our platform, or your designs code: Code patternsAbout: Lists the patterns that you have stored in your FreeSewing account setsAbout: Lists the measurements sets that you have stored in your FreeSewing account From 4e837e2361de926d18342dd94774e7dd8079488d Mon Sep 17 00:00:00 2001 From: Karl Nippoldt Date: Mon, 25 Mar 2024 11:00:43 -0700 Subject: [PATCH 472/795] Update front.mjs --- designs/simon/src/front.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designs/simon/src/front.mjs b/designs/simon/src/front.mjs index 61a48265570..180b1c854b5 100644 --- a/designs/simon/src/front.mjs +++ b/designs/simon/src/front.mjs @@ -141,7 +141,7 @@ function simonFront({ * Annotations */ // Cutlist - store.cutlist.setCut({ cut: 1, from: 'main fabric' }) + store.cutlist.setCut({ cut: 1, from: 'fabric' }) // Grainline const grainlineDistance = (points.hem.x - points.cfHem.x) * 0.2 From e4325ed93944c5c16108cc95cf24713a65a789a7 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:45:58 +0000 Subject: [PATCH 473/795] docs: update CONTRIBUTORS.md [skip ci] --- CONTRIBUTORS.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d4a465bbda1..8a4ed43f45b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -67,101 +67,102 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Kake
    Kake
    📖 Kapunahele Wong
    Kapunahele Wong
    📖 Karen
    Karen
    📖 📋 + Karl Nippoldt
    Karl Nippoldt
    📖 Katie McGinley
    Katie McGinley
    📖 Kieran Klaassen
    Kieran Klaassen
    💻 - Kittycatou
    Kittycatou
    🌍 + Kittycatou
    Kittycatou
    🌍 Kris
    Kris
    📖 Kristin Ruben
    Kristin Ruben
    💻 Lin
    Lin
    💻 Loudepeuter
    Loudepeuter
    🌍 Lucian
    Lucian
    📋 Luiz Saggioro
    Luiz Saggioro
    💻 - MA-TATAS
    MA-TATAS
    📖 + MA-TATAS
    MA-TATAS
    📖 Marcus
    Marcus
    🌍 Martin Tribo
    Martin Tribo
    📖 Nadege Michel
    Nadege Michel
    ⚠️ 📖 Natalia
    Natalia
    💻 🎨 📝 Nathan Yergler
    Nathan Yergler
    📖 Nick Dower
    Nick Dower
    📖 💻 🐛 - Nikhil Chelliah
    Nikhil Chelliah
    📖 + Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 Phillip Thelen
    Phillip Thelen
    💻 Pixieish
    Pixieish
    📖 - Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 + Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 Sanne
    Sanne
    💻 📖 Sara Latorre
    Sara Latorre
    🌍 - SeaZeeZee
    SeaZeeZee
    📖 💻 + SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 Soham Tembhurne
    Soham Tembhurne
    💻 SoneaTheBest
    SoneaTheBest
    🌍 - Sophia
    Sophia
    💻 + Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 Trent Trama
    Trent Trama
    💻 Tríona
    Tríona
    📖 - Unmutual
    Unmutual
    📖 + Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 amysews
    amysews
    📖 anna-puk
    anna-puk
    💻 - beautifulsummermoon
    beautifulsummermoon
    🌍 + beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 chri5b
    chri5b
    💻 ⚠️ dingcycle
    dingcycle
    🌍 - drowned-in-books
    drowned-in-books
    💬 + drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 gaylyndie
    gaylyndie
    📖 grimlokason
    grimlokason
    💻 - hellgy
    hellgy
    🎨 + hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 mesil
    mesil
    🐛 starfetch
    starfetch
    💻 📖 🌍 🎨 - timorl
    timorl
    💻 + timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 From 9dfc95153917c20603fdd434350d47ede263fec2 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 18:45:59 +0000 Subject: [PATCH 474/795] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index b675311ba4b..76d728dd686 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1167,6 +1167,15 @@ "contributions": [ "doc" ] + }, + { + "login": "karlnippoldt", + "name": "Karl Nippoldt", + "avatar_url": "https://avatars.githubusercontent.com/u/7821608?v=4", + "profile": "https://karlnippoldt.com", + "contributions": [ + "doc" + ] } ], "skipCi": true, From 5bb261c9466512eaabd8e22cd1e3fac2b0fa7b4e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 19:49:59 +0100 Subject: [PATCH 475/795] chore: Reconfigure after adding new contributor --- CHANGELOG.md | 2 +- README.md | 25 ++++++++++++----------- designs/aaron/README.md | 2 +- designs/albert/README.md | 2 +- designs/bee/README.md | 2 +- designs/bella/README.md | 2 +- designs/benjamin/README.md | 2 +- designs/bent/README.md | 2 +- designs/bob/README.md | 2 +- designs/breanna/README.md | 2 +- designs/brian/README.md | 2 +- designs/bruce/README.md | 2 +- designs/carlita/README.md | 2 +- designs/carlton/README.md | 2 +- designs/cathrin/README.md | 2 +- designs/charlie/README.md | 2 +- designs/cornelius/README.md | 2 +- designs/diana/README.md | 2 +- designs/examples/README.md | 2 +- designs/florence/README.md | 2 +- designs/florent/README.md | 2 +- designs/gozer/README.md | 2 +- designs/hi/README.md | 2 +- designs/holmes/README.md | 2 +- designs/hortensia/README.md | 2 +- designs/huey/README.md | 2 +- designs/hugo/README.md | 2 +- designs/jaeger/README.md | 2 +- designs/legend/README.md | 2 +- designs/lucy/README.md | 2 +- designs/lumina/README.md | 2 +- designs/lumira/README.md | 2 +- designs/lunetius/README.md | 2 +- designs/magde/README.md | 2 +- designs/naomiwu/README.md | 2 +- designs/noble/README.md | 2 +- designs/octoplushy/README.md | 2 +- designs/onyx/README.md | 2 +- designs/otis/README.md | 2 +- designs/paco/README.md | 2 +- designs/penelope/README.md | 2 +- designs/plugintest/README.md | 2 +- designs/rendertest/README.md | 2 +- designs/sandy/README.md | 2 +- designs/shelly/README.md | 2 +- designs/shin/README.md | 2 +- designs/simon/README.md | 2 +- designs/simone/README.md | 2 +- designs/skully/README.md | 2 +- designs/sven/README.md | 2 +- designs/tamiko/README.md | 2 +- designs/teagan/README.md | 2 +- designs/tiberius/README.md | 2 +- designs/titan/README.md | 2 +- designs/trayvon/README.md | 2 +- designs/tristan/README.md | 2 +- designs/uma/README.md | 2 +- designs/wahid/README.md | 2 +- designs/walburga/README.md | 2 +- designs/waralee/README.md | 2 +- designs/yuri/README.md | 2 +- packages/core/README.md | 2 +- packages/models/README.md | 2 +- packages/new-design/README.md | 2 +- packages/prettier-config/README.md | 2 +- packages/react-components/README.md | 2 +- packages/rehype-highlight-lines/README.md | 2 +- packages/rehype-jargon/README.md | 2 +- packages/snapseries/README.md | 2 +- plugins/core-plugins/README.md | 2 +- plugins/plugin-annotations/README.md | 2 +- plugins/plugin-bin-pack/README.md | 2 +- plugins/plugin-bust/README.md | 2 +- plugins/plugin-flip/README.md | 2 +- plugins/plugin-gore/README.md | 2 +- plugins/plugin-i18n/README.md | 2 +- plugins/plugin-measurements/README.md | 2 +- plugins/plugin-mirror/README.md | 2 +- plugins/plugin-ringsector/README.md | 2 +- plugins/plugin-round/README.md | 2 +- plugins/plugin-sprinkle/README.md | 2 +- plugins/plugin-svgattr/README.md | 2 +- plugins/plugin-theme/README.md | 2 +- plugins/plugin-timing/README.md | 2 +- plugins/plugin-versionfree-svg/README.md | 2 +- 85 files changed, 97 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21684445364..e11cb5c4fa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ #### Fixed - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes - - Adding missing translation for rubbing option + - Adding missing translation for ribbing option - Hide unused ribbing parts when ribbing option is disabled ### hugo diff --git a/README.md b/README.md index 03c2bb9b506..2b08d3b8086 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ All Contributors

    Kake
    Kake
    📖 Kapunahele Wong
    Kapunahele Wong
    📖 Karen
    Karen
    📖 📋 + Karl Nippoldt
    Karl Nippoldt
    📖 Katie McGinley
    Katie McGinley
    📖 Kieran Klaassen
    Kieran Klaassen
    💻 - Kittycatou
    Kittycatou
    🌍 + Kittycatou
    Kittycatou
    🌍 Kris
    Kris
    📖 Kristin Ruben
    Kristin Ruben
    💻 Lin
    Lin
    💻 Loudepeuter
    Loudepeuter
    🌍 Lucian
    Lucian
    📋 Luiz Saggioro
    Luiz Saggioro
    💻 - MA-TATAS
    MA-TATAS
    📖 + MA-TATAS
    MA-TATAS
    📖 Marcus
    Marcus
    🌍 Martin Tribo
    Martin Tribo
    📖 Nadege Michel
    Nadege Michel
    ⚠️ 📖 Natalia
    Natalia
    💻 🎨 📝 Nathan Yergler
    Nathan Yergler
    📖 Nick Dower
    Nick Dower
    📖 💻 🐛 - Nikhil Chelliah
    Nikhil Chelliah
    📖 + Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 Phillip Thelen
    Phillip Thelen
    💻 Pixieish
    Pixieish
    📖 - Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 + Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 Sanne
    Sanne
    💻 📖 Sara Latorre
    Sara Latorre
    🌍 - SeaZeeZee
    SeaZeeZee
    📖 💻 + SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 Soham Tembhurne
    Soham Tembhurne
    💻 SoneaTheBest
    SoneaTheBest
    🌍 - Sophia
    Sophia
    💻 + Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 Trent Trama
    Trent Trama
    💻 Tríona
    Tríona
    📖 - Unmutual
    Unmutual
    📖 + Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 amysews
    amysews
    📖 anna-puk
    anna-puk
    💻 - beautifulsummermoon
    beautifulsummermoon
    🌍 + beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 chri5b
    chri5b
    💻 ⚠️ dingcycle
    dingcycle
    🌍 - drowned-in-books
    drowned-in-books
    💬 + drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 gaylyndie
    gaylyndie
    📖 grimlokason
    grimlokason
    💻 - hellgy
    hellgy
    🎨 + hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 mesil
    mesil
    🐛 starfetch
    starfetch
    💻 📖 🌍 🎨 - timorl
    timorl
    💻 + timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 diff --git a/designs/aaron/README.md b/designs/aaron/README.md index e61e8239fdd..f4713859377 100644 --- a/designs/aaron/README.md +++ b/designs/aaron/README.md @@ -21,7 +21,7 @@ All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    Date: Mon, 25 Mar 2024 18:58:49 +0000 Subject: [PATCH 476/795] Fixes `albert`, #6434 --- designs/albert/src/strap.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designs/albert/src/strap.mjs b/designs/albert/src/strap.mjs index e5173fca9e0..0ebe12d1022 100644 --- a/designs/albert/src/strap.mjs +++ b/designs/albert/src/strap.mjs @@ -45,7 +45,7 @@ export const strap = { msg: `albert:cutStrap`, notes: [sa ? 'flag:saIncluded' : 'flag:saExcluded', 'flag:partHiddenByExpand'], replace: { - width: units(strapWidth + extraSa), + width: units(strapWidth * 2 + extraSa), length: units(strapLength + strapWidth * 2 + extraSa), }, suggest: { From fd3fb26ea013239bb08dfe0da3d1043160785860 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 20:37:06 +0100 Subject: [PATCH 477/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/simon/instructions/fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 158b77c993f..20eba312282 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -10,9 +10,9 @@ Kelly Hogaboom et Julian Collins ont fait une couture de Simone, et ils ont des toutes les étapes. Si vous cherchez à créer ce modèle, Kelly et Julian peuvent vous guider vers la fin. -Tu peux trouver tout le matériel sur le site de Kelly -: [#simonsayssew avec kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +You can find all the material's on Kelly's +site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Étape 1 : Thermocoller l'entoilage From 24417b2894d3e7145a9d8079e6f802b808d9933f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 20:45:34 +0100 Subject: [PATCH 478/795] New translations en.yaml (French) skip-build --- sites/shared/i18n/sections/fr.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/fr.yaml b/sites/shared/i18n/sections/fr.yaml index 54bebd15c54..5a6a8344cb6 100644 --- a/sites/shared/i18n/sections/fr.yaml +++ b/sites/shared/i18n/sections/fr.yaml @@ -29,6 +29,7 @@ patterns: Tes modèles curate: Curate curateSets: Curate Sets curatedSets: Ensembles de mesures sélectionnées +curated-setsAbout: Des ensembles de mesures curatées par FreeSewing que tu peux utiliser pour tester notre plateforme, ou tes créations code: Code patternsAbout: Liste les modèles que tu as enregistrés dans ton compte FreeSewing. setsAbout: Liste les jeux de mesures que tu as enregistrés dans ton compte FreeSewing. From a61a3c796ab6b4c42829ee20dabfc8f0846af59c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 20:57:54 +0100 Subject: [PATCH 479/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/designs/simon/instructions/es.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/es.md b/markdown/org/docs/designs/simon/instructions/es.md index af6b40e2302..2b913110261 100644 --- a/markdown/org/docs/designs/simon/instructions/es.md +++ b/markdown/org/docs/designs/simon/instructions/es.md @@ -10,9 +10,9 @@ Kelly Hogaboide y Julian Collins hicieron una costura Simon(e) , y tienen videos todos los pasos. Si estás buscando este patrón, Kelly y Julian pueden guiarte a empezar a terminar. -Puedes encontrar todo el material en el sitio -de Kelly: [#simonsayssew con Kelly Hogaboom y Julian Collins](https://kelly.Firstaboom.org/2020/07/simon-says-sew-with-kelly-Øaboom-and-ú-únian-collins/) - +You can find all the material's on Kelly's +site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Paso 1: Fusionar interfaz From c4de5116a4a2171850607416a1d6eac206db66b8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 21:06:27 +0100 Subject: [PATCH 480/795] New translations en.yaml (Spanish) skip-build --- sites/shared/i18n/sections/es.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/es.yaml b/sites/shared/i18n/sections/es.yaml index 7e12af3450a..799d58954f6 100644 --- a/sites/shared/i18n/sections/es.yaml +++ b/sites/shared/i18n/sections/es.yaml @@ -29,6 +29,7 @@ patterns: Tus patrones curate: Conserva curateSets: Conjuntos Curate curatedSets: Conjuntos de Medidas Curadas +curated-setsAbout: Conjuntos de medidas curadas por FreeSewing que puedes utilizar para probar nuestra plataforma, o tus diseños code: Código patternsAbout: Lista los patrones que tienes almacenados en tu cuenta de FreeSewing setsAbout: Lista los conjuntos de medidas que has almacenado en tu cuenta de FreeSewing From 22969a12377773e80063f72317db5ba9263017e5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 21:18:53 +0100 Subject: [PATCH 481/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/simon/instructions/de.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/de.md b/markdown/org/docs/designs/simon/instructions/de.md index d47e681a3db..0c7ffaa94ab 100644 --- a/markdown/org/docs/designs/simon/instructions/de.md +++ b/markdown/org/docs/designs/simon/instructions/de.md @@ -10,9 +10,9 @@ Kelly Hogaboom und Julian Collins haben eine Simon(e) mitnäht, und sie haben Vi alle Schritte. Wenn Sie dieses Muster herstellen wollen, können Kelly und Julian Ihnen den Weg zum Ende weisen. -Du findest das gesamte Material auf Kellys Website -: [#simonsayssew mit kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +You can find all the material's on Kelly's +site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Schritt 1: Sicherungsschnittstelle From c777b816047f8081c1b2c158c1a6c444ab431ce6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:26:15 +0000 Subject: [PATCH 482/795] chore(deps): Bump katex from 0.16.9 to 0.16.10 Bumps [katex](https://github.com/KaTeX/KaTeX) from 0.16.9 to 0.16.10. - [Release notes](https://github.com/KaTeX/KaTeX/releases) - [Changelog](https://github.com/KaTeX/KaTeX/blob/main/CHANGELOG.md) - [Commits](https://github.com/KaTeX/KaTeX/compare/v0.16.9...v0.16.10) --- updated-dependencies: - dependency-name: katex dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..9fcec1df9bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8149,9 +8149,9 @@ jws@^3.2.2: safe-buffer "^5.0.1" katex@^0.16.9: - version "0.16.9" - resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.9.tgz#bc62d8f7abfea6e181250f85a56e4ef292dcb1fa" - integrity sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ== + version "0.16.10" + resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185" + integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA== dependencies: commander "^8.3.0" From 8d0beb551565f95dd581579ce83c1381af8d4f6c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 21:27:24 +0100 Subject: [PATCH 483/795] New translations en.yaml (German) skip-build --- sites/shared/i18n/sections/de.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/de.yaml b/sites/shared/i18n/sections/de.yaml index 8cccab34cd0..b29039d6241 100644 --- a/sites/shared/i18n/sections/de.yaml +++ b/sites/shared/i18n/sections/de.yaml @@ -29,6 +29,7 @@ patterns: Deine Muster curate: Kuratieren curateSets: Sets kuratieren curatedSets: Kuratierte Maßnahmesets +curated-setsAbout: Von FreeSewing kuratierte Messreihen, die du nutzen kannst, um unsere Plattform oder deine Designs zu testen code: Code patternsAbout: Listet die Muster auf, die du in deinem FreeSewing-Konto gespeichert hast setsAbout: Listet die Messreihen auf, die du in deinem FreeSewing-Konto gespeichert hast From 28d80131a77f934974e202861e2fea44ff62f3af Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 21:39:43 +0100 Subject: [PATCH 484/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/designs/simon/instructions/nl.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/nl.md b/markdown/org/docs/designs/simon/instructions/nl.md index fff1da0ebef..8a82e9f0a42 100644 --- a/markdown/org/docs/designs/simon/instructions/nl.md +++ b/markdown/org/docs/designs/simon/instructions/nl.md @@ -10,9 +10,9 @@ Kelly Hogaboom en Julian Collins deden een Simon(e) naadong, en ze hebben video' alle stappen. Als je dit patroon wilt maken, kan Kelly en Julian je begeleiden om te beginnen. -Je kunt al het materiaal vinden op Kelly's +You can find all the material's on Kelly's site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Stap 1: Bevestig tussenvoering From e0e370217e5710fe2ce354ce42776a542e8e134e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 21:47:56 +0100 Subject: [PATCH 485/795] New translations en.yaml (Dutch) skip-build --- sites/shared/i18n/sections/nl.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/nl.yaml b/sites/shared/i18n/sections/nl.yaml index ebe57e44f08..6061fc3784d 100644 --- a/sites/shared/i18n/sections/nl.yaml +++ b/sites/shared/i18n/sections/nl.yaml @@ -29,6 +29,7 @@ patterns: Jouw patronen curate: samenstellen curateSets: Sets samenstellen curatedSets: Sets samengestelde metingen +curated-setsAbout: Maten sets samengesteld door FreeSewing die je kan gebruiken om ons platform of je ontwerpen te testen code: Code patternsAbout: Toont de patronen die je hebt opgeslagen in je FreeSewing account setsAbout: Toont de meetsets die je hebt opgeslagen in je FreeSewing account From 09032364b6d15c2501d3a9d1e0c2c9f022bf767d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 22:00:09 +0100 Subject: [PATCH 486/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/simon/instructions/uk.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/uk.md b/markdown/org/docs/designs/simon/instructions/uk.md index ab606660ae2..2c623f500e5 100644 --- a/markdown/org/docs/designs/simon/instructions/uk.md +++ b/markdown/org/docs/designs/simon/instructions/uk.md @@ -10,9 +10,9 @@ title: "Сорочка-символ: Інструкція з пошиття" усіма етапами. Якщо ви хочете зробити цей візерунок, Келлі та Джуліан допоможуть вам від початку до кінця. -Ви можете знайти всі матеріали на сайті Келлі -: [#simonsayssew with kelly hogaboom & julian collins] (https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +You can find all the material's on Kelly's +site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Крок 1: Взаємодія запобіжників From 66d1e00efd9bd2cb2b5237b31b41fa3d3422a2ce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 22:08:42 +0100 Subject: [PATCH 487/795] New translations en.yaml (Ukrainian) skip-build --- sites/shared/i18n/sections/uk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/uk.yaml b/sites/shared/i18n/sections/uk.yaml index fd91964ecb0..0d2b1fdb714 100644 --- a/sites/shared/i18n/sections/uk.yaml +++ b/sites/shared/i18n/sections/uk.yaml @@ -29,6 +29,7 @@ patterns: Ваші візерунки curate: Куратор curateSets: Кураторські набори curatedSets: Кураторські набори вимірювань +curated-setsAbout: Набори мірок, куратором яких є FreeSewing, які ви можете використовувати для тестування нашої платформи або ваших дизайнів code: Код patternsAbout: Перелік викрійок, збережених у вашому обліковому записі FreeSewing setsAbout: Перелік наборів мірок, збережених у вашому обліковому записі FreeSewing From 6bdf89dbaf5d398867518a1c7dce8b64836590ec Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 22:49:47 +0100 Subject: [PATCH 488/795] Update source file en.md skip-build --- markdown/org/docs/designs/simon/instructions/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index 06c8f6096ef..d9b263370b1 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -12,7 +12,7 @@ If you're looking to make this pattern, Kelly and Julian can guide you start to You can find all the material's on Kelly's site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) - +Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] ### Step 1: Fuse interfacing From 086cdbf7d2709917e96157638d942aa2f81768b7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 25 Mar 2024 22:52:53 +0100 Subject: [PATCH 489/795] Update source file en.yaml skip-build --- sites/shared/i18n/sections/en.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/sites/shared/i18n/sections/en.yaml b/sites/shared/i18n/sections/en.yaml index 981b5b5aa6c..cf082c947b5 100644 --- a/sites/shared/i18n/sections/en.yaml +++ b/sites/shared/i18n/sections/en.yaml @@ -29,6 +29,7 @@ patterns: Your Patterns curate: Curate curateSets: Curate Sets curatedSets: Curated Measurements Sets +curated-setsAbout: Sets of measurements curated by FreeSewing that you can use to test our platform, or your designs code: Code patternsAbout: Lists the patterns that you have stored in your FreeSewing account setsAbout: Lists the measurements sets that you have stored in your FreeSewing account From fafe9867fe7c1e33eaaeebd5a57b2333a069556d Mon Sep 17 00:00:00 2001 From: FreeSewing bot Date: Tue, 26 Mar 2024 03:20:20 +0100 Subject: [PATCH 490/795] feat: New showcase post my-fisrt-sewing-project by user-73391 --- markdown/org/showcase/my-fisrt-sewing-project/en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/en.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/en.md b/markdown/org/showcase/my-fisrt-sewing-project/en.md new file mode 100644 index 00000000000..a4d460dee2b --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/en.md @@ -0,0 +1,11 @@ +--- +title: "My fisrt sewing project!" +caption: "25/03/2024" +date: 20240325 +intro: "idk what to put here." +author: 73391 +designs: ["shelly"] +--- + +???? + From b42c95cf9512cd376049b9ab8565a61c7d95f979 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 04:22:41 +0000 Subject: [PATCH 491/795] chore(deps): Bump express from 4.19.1 to 4.19.2 Bumps [express](https://github.com/expressjs/express) from 4.19.1 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.1...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index d5402230213..31a2d359598 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -33,7 +33,7 @@ "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", - "express": "4.19.1", + "express": "4.19.2", "js-yaml": "4.1.0", "lodash.get": "4.4.2", "mustache": "4.2.0", diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..0b0207ca61e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5892,10 +5892,10 @@ exponential-backoff@^3.1.1: resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -express@4.19.1: - version "4.19.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.1.tgz#4700635795e911600a45596138cf5b0320e78256" - integrity sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w== +express@4.19.2: + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" From c10f2d925fe7290768129d1a96b0cf84558d27a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 04:23:12 +0000 Subject: [PATCH 492/795] chore(deps): Bump @resvg/resvg-js from 2.6.0 to 2.6.1 Bumps [@resvg/resvg-js](https://github.com/yisibl/resvg-js) from 2.6.0 to 2.6.1. - [Release notes](https://github.com/yisibl/resvg-js/releases) - [Changelog](https://github.com/yisibl/resvg-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/yisibl/resvg-js/compare/v2.6.0...v2.6.1) --- updated-dependencies: - dependency-name: "@resvg/resvg-js" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 128 +++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..d93c3b9805c 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -17,7 +17,7 @@ "peerDependencies": {}, "dependencies": { "@next/mdx": "14.1.4", - "@resvg/resvg-js": "2.6.0", + "@resvg/resvg-js": "2.6.1", "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 8b4b1d6f30b..3b823ac4379 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1942,83 +1942,83 @@ dependencies: "@prisma/debug" "5.11.0" -"@resvg/resvg-js-android-arm-eabi@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz#fed7723ed5c5f7490762e025ad704bcbceee37b7" - integrity sha512-lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA== +"@resvg/resvg-js-android-arm-eabi@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.1.tgz#4d6f17ab66658710165cd7f4e2171241f6f4595f" + integrity sha512-oXmXUUqTzinvXwkVBDdNKocAeF1zLGJYasTNRmoqF3gyOm04qRYT1On0m6oK2jbTiUAOUTqi0ZSizcecnwcSDA== -"@resvg/resvg-js-android-arm64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz#e0531a220ec8954e41039b2483cc3706d30d3635" - integrity sha512-N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ== +"@resvg/resvg-js-android-arm64@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.1.tgz#fe793dcb9b03af1260797c8153b7a9fad420077f" + integrity sha512-vcCZoBx8s/3/+t6nDd9fB/LL70I4B2YmgDT7uP6wyqVCUPniNeLR9VYIuvpMHw6oVyL5Mpt8F2YXV1zQE2X2hw== -"@resvg/resvg-js-darwin-arm64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz#38f609cd2bd71ce6a065df7a8b8144479b156969" - integrity sha512-MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew== +"@resvg/resvg-js-darwin-arm64@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.1.tgz#a96cc2e40da1a9922022d68a75e93233b58f09f9" + integrity sha512-uO0WvEQqQlAL8u7nI7k1yL5wSsZYU2YCSsN1hAhr1LjyvmWmyC09xUEdWPUVVT1nL2YK4Ueh0LR+pxOT3QlCng== -"@resvg/resvg-js-darwin-x64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz#5c3f69d0cd68980e7e5cfcabf0db90e85d289559" - integrity sha512-zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA== +"@resvg/resvg-js-darwin-x64@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.1.tgz#e90f1c999e8c10c4a9be205717484456687c560e" + integrity sha512-aW15HMQSk85GPHE4gsc56G0Fqi2IGVkDfPWEWHEyDBpCZ17RKweAwg5V3ioz9aGX1nmhjQa9tJ2xgVwX+sqIjw== -"@resvg/resvg-js-linux-arm-gnueabihf@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz#6bcae7d4101e7fea2be0db167eda832cab63e27f" - integrity sha512-sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A== +"@resvg/resvg-js-linux-arm-gnueabihf@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.1.tgz#f600fce988a6dfeb573d164f3991a5d190cb8e16" + integrity sha512-7vpBFzCMONnRzK0uCBT5h+Dmsa8dWsoLFqB6xgutNfKkldjuCOiLNe0tT7hneGF8tw5H+W6hX/VLx2ktDwsS4Q== -"@resvg/resvg-js-linux-arm64-gnu@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz#fb71ea6b9a4b30412fa096fdbf9e8427012b3a99" - integrity sha512-fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A== +"@resvg/resvg-js-linux-arm64-gnu@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.1.tgz#871b023e03d645ca95a077dcd5ee6909d11c6c3d" + integrity sha512-+Gi3OIOJFFiCdm72AsDa7KPnkogitLQ6yfF1O/J25adUrlWjvKAM9+8b5sTI9waeLERZHNJpIVESpdIxI2/5sQ== -"@resvg/resvg-js-linux-arm64-musl@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz#ec7e85b8b6eea23c0242faa1f1486241f253a190" - integrity sha512-ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg== +"@resvg/resvg-js-linux-arm64-musl@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.1.tgz#bc657676c3f0d602718f7df0e2a9825fefff714b" + integrity sha512-lnRGWG/LwpX6UsV1neHAavPnek3WlCnGMdBZ/7JbpamK5VmtDZmsV2esOFpME6pKnWL40UX4WjPsCBtKkhMUMA== -"@resvg/resvg-js-linux-x64-gnu@2.6.0": - version "2.6.0" - resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz" - integrity sha512-n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q== +"@resvg/resvg-js-linux-x64-gnu@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.1.tgz#79207115ae2edeaedc6906e0c78043866f345b7b" + integrity sha512-2S1N7fHl5480AUrUtxsfjFOh3t8NQ2qKavROZRDKWJqFXBrNOUsirDa33LtpFGDkFW18SjP/FCs1xfHLzzz43g== -"@resvg/resvg-js-linux-x64-musl@2.6.0": - version "2.6.0" - resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz" - integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw== +"@resvg/resvg-js-linux-x64-musl@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.1.tgz#dfed291a7530e4779d4f674395cf50ececdf8a72" + integrity sha512-G5GMmpvFiyclkp44eVPVWnN2lhLx9eMIcxGnBFWjnpI3TxrjBt7aVic2N8CsZ0vt2rrnJkQI0IKjUQQIi138Hw== -"@resvg/resvg-js-win32-arm64-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz#3af0d5f7bd9193ac6be8f226b539be6f7576302d" - integrity sha512-X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q== +"@resvg/resvg-js-win32-arm64-msvc@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.1.tgz#d0f5a5153cc7ca5c3b1fadfb60d53a1514d950b1" + integrity sha512-m9TBMrGs2tML0oz14D/x40tPedqCgNFy/DH7/z/bvnP9bH59fivaInmHTjd8oSFfGRZ/DasXMFcAL+LS1+hfSQ== -"@resvg/resvg-js-win32-ia32-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz#64af45bfee41cb2bea0b6dd0bdc94175183f2b56" - integrity sha512-L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg== +"@resvg/resvg-js-win32-ia32-msvc@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.1.tgz#65d5433c14915cb0934230b991e303f2f0dde6d8" + integrity sha512-Ma+MJXesViT0A7JqTobsB9DOCO0AkfmLxsgkvxq0IiWkpU9Z4Gp+RkDsFQbMhJwVXaz7b8L6y+EIvf95iCbJQw== -"@resvg/resvg-js-win32-x64-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz#08431a243c15f002d32e5e628857d19852323274" - integrity sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw== +"@resvg/resvg-js-win32-x64-msvc@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.1.tgz#8f6d7fba07c5f6a0f4eec8c3cc6680c61929a2ab" + integrity sha512-mWIlgEuFWBrlldCbhLPvG4tt0r0D1RZ8eR2+zxTtQ15d/lbVjwnGpw2l1noV3zhV5S6mAVzoZeQ1emoov63Y/A== -"@resvg/resvg-js@2.6.0": - version "2.6.0" - resolved "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.6.0.tgz" - integrity sha512-Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA== +"@resvg/resvg-js@2.6.1": + version "2.6.1" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.1.tgz#401535f60640d3e4e4e135023632e03aacb1c878" + integrity sha512-CVGUWPvgr3b96+PooncXCsvu93CMwfEoueqIxIJr9AuUA8OaIPcZjOgFhas62fcHRdWMmxQqF1Rp+89bQsj/RA== optionalDependencies: - "@resvg/resvg-js-android-arm-eabi" "2.6.0" - "@resvg/resvg-js-android-arm64" "2.6.0" - "@resvg/resvg-js-darwin-arm64" "2.6.0" - "@resvg/resvg-js-darwin-x64" "2.6.0" - "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.0" - "@resvg/resvg-js-linux-arm64-gnu" "2.6.0" - "@resvg/resvg-js-linux-arm64-musl" "2.6.0" - "@resvg/resvg-js-linux-x64-gnu" "2.6.0" - "@resvg/resvg-js-linux-x64-musl" "2.6.0" - "@resvg/resvg-js-win32-arm64-msvc" "2.6.0" - "@resvg/resvg-js-win32-ia32-msvc" "2.6.0" - "@resvg/resvg-js-win32-x64-msvc" "2.6.0" + "@resvg/resvg-js-android-arm-eabi" "2.6.1" + "@resvg/resvg-js-android-arm64" "2.6.1" + "@resvg/resvg-js-darwin-arm64" "2.6.1" + "@resvg/resvg-js-darwin-x64" "2.6.1" + "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.1" + "@resvg/resvg-js-linux-arm64-gnu" "2.6.1" + "@resvg/resvg-js-linux-arm64-musl" "2.6.1" + "@resvg/resvg-js-linux-x64-gnu" "2.6.1" + "@resvg/resvg-js-linux-x64-musl" "2.6.1" + "@resvg/resvg-js-win32-arm64-msvc" "2.6.1" + "@resvg/resvg-js-win32-ia32-msvc" "2.6.1" + "@resvg/resvg-js-win32-x64-msvc" "2.6.1" "@rushstack/eslint-patch@^1.3.3": version "1.7.2" From 1a932948cacbe649f8b96db2a15a0649dba38cb9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 11:17:26 +0100 Subject: [PATCH 493/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/simon/instructions/fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 20eba312282..08bb55bc517 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -10,9 +10,9 @@ Kelly Hogaboom et Julian Collins ont fait une couture de Simone, et ils ont des toutes les étapes. Si vous cherchez à créer ce modèle, Kelly et Julian peuvent vous guider vers la fin. -You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +Tu peux trouver tout le matériel sur le site de Kelly +: [#simonsayssew avec kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) +Note : en date du 19 mars 2024, ce lien semble être en panne car il redirige vers une autre page. Les vidéos sont toujours disponibles sur Vimeo. [[Partie 1 : Mesure et dessin](https://vimeo.com/438424557)/[2 : Découpe et marquage](https://vimeo.com/438424645)/[3 : Poignets, col, empiècements et pinces](https://vimeo.com/441665307)/[4 : Patte de devant et coutures d'épaules](https://vimeo.com/441667465)/[5 : Patte de manche et emmanchures](https://vimeo.com/441668326)/[6 : Coutures latérales, poignets et col](https://vimeo.com/441727449)/[7 : Ourlet, boutonnières et boutons](https://vimeo.com/441731576)] ### Étape 1 : Thermocoller l'entoilage From b711f26f1023a1202f84f46bbb4079e09281f127 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 11:17:31 +0100 Subject: [PATCH 494/795] New translations en.md (French) skip-build --- markdown/org/docs/about/site/bookmarks/type/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/bookmarks/type/fr.md b/markdown/org/docs/about/site/bookmarks/type/fr.md index 59fe9fdcddb..b1841593c51 100644 --- a/markdown/org/docs/about/site/bookmarks/type/fr.md +++ b/markdown/org/docs/about/site/bookmarks/type/fr.md @@ -6,5 +6,5 @@ Chaque marque page possède un attribut **type** qui est obligatoire. Lorsque tu crées manuellement un marque page, le type est toujours **custom** et tu ne peux donc pas le choisir. -Other types include **pattern**, **doc**, or **set** which will automatically be set when you bookmark a pattern, documentation page, or measurements set respectively. +D'autres types incluent **patron**, **doc**, ou **set** qui seront automatiquement mis en place lorsque tu marqueras la page d'un patron, d'une page de documentation ou d'un jeu de mesures respectivement. From 4a7609e50a3242d89abcb3316ab97328fd0e5a75 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 11:17:32 +0100 Subject: [PATCH 495/795] New translations en.md (French) skip-build --- .../docs/designs/shelly/instructions/fr.md | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/markdown/org/docs/designs/shelly/instructions/fr.md b/markdown/org/docs/designs/shelly/instructions/fr.md index bd401c899ff..da73c43fb35 100644 --- a/markdown/org/docs/designs/shelly/instructions/fr.md +++ b/markdown/org/docs/designs/shelly/instructions/fr.md @@ -28,24 +28,24 @@ Pour faire des t-shirts ou d'autres chemises avec du tissu extensible dans deux - Jusqu'à 80 % environ produiront un crop top. - 100 % descend au sommet de l'os de la hanche. - 120% produira un t-shirt typique. - - Avec 140 %, tu obtiendras une chemise un peu plus longue qui aura moins tendance sortir du pantalon ou à remonter. + - Avec 140 %, tu obtiendras une chemise un peu plus longue qui aura moins tendance à sortir du pantalon ou à remonter. - 200%+ peuvent être utilisés pour faire une simple robe t-shirt. Il est suggéré de régler les côtés droits sur faux, et d'ajuster la forme des côtés (dans les options avancées) pour les robes t-shirt. - En cas de doute, il est beaucoup plus facile de raccourcir une chemise ou une manche que de la rallonger. - - Détermine le type d'ajustement que tu souhaites et règle tes facilités en conséquence. Assure-toi d'avoir un tissu approprié. En cas de doute, il est plus sûr de rendre la chemise trop lâche que trop serrée. - - En général, lorsque tu travailles avec de l'élasthanne, tu veux que l'aisance soit négative à 0 %. Lorsque tu travailles avec un tissu de t-shirt ordinaire en coton/polyester, tu veux une aisance positive, à la fois parce que le tissu s'étire moins et parce que les styles typiques utilisant ce tissu sont plus lâches. + - Détermine le type d'ajustement que tu souhaites et règle l'aisance en conséquence. Assure-toi d'avoir un tissu approprié. En cas de doute, il est plus sûr de rendre la chemise trop lâche que trop serrée. + - En général, lorsque tu travailles avec de l'élasthanne, tu veux que l'aisance soit à 0 % ou négative. Lorsque tu travailles avec un tissu de t-shirt ordinaire en coton/polyester, tu veux une aisance positive, à la fois parce que le tissu s'étire moins et parce que les styles typiques utilisant ce tissu sont plus lâches. - Les chemises de compression sensorielle seront les plus serrées / auront le plus d'aisance négative. - Un tissu extensible dans les 4 sens est nécessaire. Le tissu de natation ou un autre tissu très extensible est fortement recommandé. - - Allègement de la poitrine : -30% à -20%. C'est la partie la plus importante à comprimer à des fins sensorielles, et c'est un endroit relativement sûr pour mettre de la tension. - - Facilité d'utilisation des manches : -20% à -10%. La compression peut être bénéfique, mais tu ne dois pas serrer au point de couper la circulation. - - Facilité au poignet : -15% à 0%. La plupart du temps, c'est la préférence. + - Aisance de la poitrine : -30% à -20%. C'est la partie la plus importante à comprimer à des fins sensorielles, et c'est un endroit relativement sûr pour mettre de la tension. + - Aisance des manches : -20% à -10%. La compression peut être bénéfique, mais tu ne dois pas serrer au point de couper la circulation. + - Aisance du poignet : -15% à 0%. La plupart du temps, c'est la préférence. - Aisance de l'encolure : 25 % à 100 % (25 % correspondra toujours à un tour de cou très serré qui nécessitera un peu d'étirement pour passer sur la tête, en raison de la façon dont le tour de cou est construit et parce que les trous de cou sont généralement un peu plus grands que le cou pour s'adapter à la tête. - Chemise athlétique - - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles facilités utiliser, merci de me le faire savoir. - - Il est recommandé d'utiliser un tissu très respirant avec un peu d'élasthanne/extensible. + - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles aisances utiliser, merci de me le faire savoir. + - Il est recommandé d'utiliser un tissu très respirant avec un peu d'élasthanne/elasticité. - Les aisances se situent entre celles d'un maillot de compression et d'un maillot de bain. @@ -58,13 +58,13 @@ Pour faire des t-shirts ou d'autres chemises avec du tissu extensible dans deux - T-shirt - - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles facilités utiliser, merci de me le faire savoir. - - Les assouplissements seront beaucoup plus importants (plus positifs) que pour les autres types de chemises. + - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles aisances utiliser, merci de me le faire savoir. + - Les aisances seront beaucoup plus importantes (plus positives) que pour les autres types de chemises. - Sweatshirt - - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles facilités utiliser, merci de me le faire savoir. + - L'auteur n'en a pas encore fait. Si quelqu'un sait quelles aisances utiliser, merci de me le faire savoir. - Les aisances seront similaires à celles d'un t-shirt, ou un peu plus grandes. @@ -78,11 +78,11 @@ Pour faire des t-shirts ou d'autres chemises avec du tissu extensible dans deux ### Étape 2 : Fixer le tour de cou - Avec _bons côtés ensemble_, plie la bande de cou en deux dans le sens de la longueur (pour qu'elle soit deux fois plus longue) et couds-la pour former une boucle. -- Avec _endroit contre endroit_, plie la bande de cou en deux dans le sens de la longueur (pour qu'elle soit deux fois plus large). -- Tourne la chemise _du bon côté_-out -- Marque les quarts de point sur ton tour de cou avec des épingles à bille, des pinces ou de la craie. +- _Envers contre envers_, plie la bande de cou en deux dans le sens de la longueur (pour qu'elle soit deux fois moins large). +- Tourne la chemise _du bon côté_ +- Marque des points aux quarts sur ton tour de cou avec des épingles à bille, des pinces ou de la craie. - Fais de même autour du trou du cou, en marquant le centre du devant, le centre du dos et les points médians de chaque manche. -- Avec _bons côtés ensemble_, aligne les bords non finis de la bande de cou avec le bord du trou du cou, et aligne les quarts de points de la bande de cou avec les quarts de points du trou du cou. Étire le tour de cou si nécessaire pour que tous les points s'alignent. Épingle ou clipse le tour de cou autour du trou de l'encolure. +- Avec _bons côtés ensemble_, aligne les bords non finis de la bande de cou avec le bord du trou du cou, et aligne les points de quarts de la bande de cou avec les points de quarts du trou du cou. Étire le tour de cou si nécessaire pour que tous les points s'alignent. Épingle ou clipse le tour de cou autour du trou de l'encolure. - Couds soigneusement autour du trou du cou, en veillant à coudre à travers les 3 couches. - Retourne le tour de cou. Il doit être bien à plat. @@ -90,9 +90,9 @@ Pour faire des t-shirts ou d'autres chemises avec du tissu extensible dans deux - Retourne la chemise à l'envers. - Avec _bons côtés ensemble_, place les pièces avant et arrière ensemble et épingle/clip leurs côtés ensemble. -- Avec _sur les bons côtés_, ferme la manche et épingle/clip le long de la couture de la manche. +- Avec _les bons côtés ensemble_, ferme la manche et épingle/clip le long de la couture de la manche. - Tu dois avoir préparé une couture unique, allant de l'extrémité de la manche à l'ourlet inférieur du corps. -- Couds-le. +- Couds-la. - Répète pour l'autre côté. ### Étape 4 : (Facultatif) Ourlet From dfcdbf62048e7f04113dcc1a52ead2bb08b9a494 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 11:17:33 +0100 Subject: [PATCH 496/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/measurements-issues/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/docs/about/faq/measurements-issues/fr.md b/markdown/org/docs/about/faq/measurements-issues/fr.md index 2c97b7bab67..f362edb09a7 100644 --- a/markdown/org/docs/about/faq/measurements-issues/fr.md +++ b/markdown/org/docs/about/faq/measurements-issues/fr.md @@ -26,17 +26,17 @@ La mesure [de la taille à l'aisselle] (https\://freesewing.org/docs/measurement #### Point Haut de l'Épaule (ou PHE) -[HPS](https://freesewing.org/docs/sewing/hps), qui est utilisé dans plusieurs mesures, est l'un des points les plus difficiles à perfectionner. +[PHE](https://freesewing.org/docs/sewing/hps), qui est utilisé dans plusieurs mesures, est l'un des points les plus difficiles à perfectionner. Voici deux approches. Une façon de procéder consiste à prendre un crayon, un stylo ou une petite cheville pour trouver le point où ton cou rencontre ton épaule, ainsi que le point le plus élevé car c'est là que le crayon ou la cheville touchera l'épaule. Si tu utilises cette méthode, l'idéal est que l'outil que tu utilises soit parallèle au sol pour que tu puisses trouver ce point haut. -[Épaulement en hauteur avec cheville](hps2.jpg) +[Point haut de l'épaule avec cheville](hps2.jpg) -Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de ton cou/de tes épaules comme une sacoche. Il est utile de pouvoir sentir où se termine le cou et où commence l'épaule en exerçant une petite pression sur le ruban. Tu devras déterminer l'emplacement de la couture de l'épaule, mais le ruban t'indiquera l'emplacement du HPS une fois que tu auras déterminé la couture de l'épaule, car ce sera l'endroit où les deux lignes se croisent. +Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de ton cou/de tes épaules comme une sacoche. Il est utile de pouvoir sentir où se termine le cou et où commence l'épaule en exerçant une petite pression sur le ruban. Tu devras déterminer l'emplacement de la couture de l'épaule, mais le ruban t'indiquera l'emplacement du PHE une fois que tu auras déterminé la couture de l'épaule, car ce sera l'endroit où les deux lignes se croisent. -[Épaulement en hauteur avec ruban](hps2.jpg) +[Point haut de l'épaule avec ruban](hps2.jpg) #### Tour de buste supérieur From dc3a05031b3dd18b55277f3fda97ced15fb0257e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 11:17:34 +0100 Subject: [PATCH 497/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/seam-allowance/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/faq/seam-allowance/fr.md b/markdown/org/docs/about/faq/seam-allowance/fr.md index dd41c4eaafc..7d00e9d2a30 100644 --- a/markdown/org/docs/about/faq/seam-allowance/fr.md +++ b/markdown/org/docs/about/faq/seam-allowance/fr.md @@ -2,6 +2,6 @@ title: Pourquoi les marges de couture ne sont-elles pas incluses par défaut ? --- -Nous n'incluons pas la marge de couture par défaut parce qu'il est coûteux de calculer la marge de couture étant donné qu'il n'y a pas de solution intégrale de forme fermée pour compenser une courbe de Bézier cubique. +Nous n'incluons pas la marge de couture par défaut parce qu'il est coûteux de calculer la marge de couture étant donné qu'il n'y a pas de solution intégrale explicite pour compenser une courbe de Bézier cubique. Nous avons une vidéo YouTube qui contient plus d'informations : [Un regard sur le plugin FreeSewing Timing](https://youtu.be/pn6w-O6nFbI) From e34d3869756bca67e3744caf6a697e44aa92fde0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:17 +0100 Subject: [PATCH 498/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/gozer/cutting/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/gozer/cutting/fr.md b/markdown/org/docs/designs/gozer/cutting/fr.md index 5cf39f448ae..4ab05e332d2 100644 --- a/markdown/org/docs/designs/gozer/cutting/fr.md +++ b/markdown/org/docs/designs/gozer/cutting/fr.md @@ -1,6 +1,6 @@ --- -title: "Gozer le fantôme : Instructions de découpage" +title: "Gozer le fantôme : Instructions de coupe" --- - **Couleur 1 ; traditionnellement blanc** - - Cut **1 Body (color 1)** + - Coupe **1 Corps** From 25d1de52baf09b12b277d90f55d6b4190bf7969e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:18 +0100 Subject: [PATCH 499/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/gozer/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/gozer/fr.md b/markdown/org/docs/designs/gozer/fr.md index 18bd55e2700..8ede6bdf990 100644 --- a/markdown/org/docs/designs/gozer/fr.md +++ b/markdown/org/docs/designs/gozer/fr.md @@ -2,9 +2,9 @@ title: Gozer le fantôme --- -Not quite sure what to say about this. It was three weeks or so before Halloween, and I was working on a different pattern. Then the thought of a traditional ghost costume popped into my head. +Je ne sais pas trop quoi dire à ce sujet. C'était environ trois semaines avant Halloween, et j'étais en train de travailler sur un autre modèle. Then the thought of a traditional ghost costume popped into my head. -So as a joke I made this, just so I could post it on the discord server. And then Joost asked where the pattern was. So I posted it. And he published it. +Alors pour plaisanter, j'ai fait ceci, juste pour pouvoir le poster sur le serveur discord. Puis Joost a demandé où se trouvait le patron. Je l'ai donc posté. Et il l'a publié. Wouter From aa2366997392baea9ff2d61784e205857f60c920 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:19 +0100 Subject: [PATCH 500/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/gozer/instructions/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/gozer/instructions/fr.md b/markdown/org/docs/designs/gozer/instructions/fr.md index a204c9fd246..0dcdbec0e41 100644 --- a/markdown/org/docs/designs/gozer/instructions/fr.md +++ b/markdown/org/docs/designs/gozer/instructions/fr.md @@ -8,7 +8,7 @@ title: "Gozer le fantôme : Instructions de couture" ## Étape 2 : Le corps -- Ourle le corps +- Fais un ourlet sur le corps ## Étape 3: Profitez-en! From 9ad874491b50ce69d3fb15e95535841eb29ff60e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:22 +0100 Subject: [PATCH 501/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/gozer/notes/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/gozer/notes/fr.md b/markdown/org/docs/designs/gozer/notes/fr.md index ec1b5caa91d..32072c27cbd 100644 --- a/markdown/org/docs/designs/gozer/notes/fr.md +++ b/markdown/org/docs/designs/gozer/notes/fr.md @@ -2,5 +2,5 @@ title: "Gozer le fantôme : Notes du concepteur" --- -The designer, nor FreeSewing, are liable for anything that follows the use of this pattern. You've been warned. +Ni la créatrice, ni FreeSewing, ne sont responsables de ce qui suit l'utilisation de ce modèle. Vous êtes prévenu. From 41cfbc31bb54f6d67cca95816d130fa5787e3921 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:41 +0100 Subject: [PATCH 502/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/needs/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/needs/fr.md b/markdown/org/docs/designs/shelly/needs/fr.md index ba0cb256246..08bb1167705 100644 --- a/markdown/org/docs/designs/shelly/needs/fr.md +++ b/markdown/org/docs/designs/shelly/needs/fr.md @@ -6,7 +6,7 @@ Pour fabriquer Shelly, tu auras besoin des éléments suivants : - Fourniture de base pour la couture - Entre 0,5 et 2 mètres d'un tissu approprié, selon la taille et le style ([voir les options de tissu](/docs/patterns/shelly/fabric)). - - Un rash guard à manches courtes pour enfants peut probablement être fabriqué avec 0,5 mètre de tissu restant. + - Un rash guard à manches courtes pour enfants peut probablement être fabriqué avec 0,5 mètre de chutes de tissus. - Un maillot de bain à manches longues ou un t-shirt plus ample pour un adulte de grande taille prendra plus près de 2 mètres. - Deux couleurs ou imprimés différents de tissu peuvent être utilisés (un pour les manches, un pour le corsage). - (Facultatif) Tissu côtelé pour le cou, si tu utilises un tissu moins extensible. From 900c44bbf96ab007fca24d4acfbc2a582a352654 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:43 +0100 Subject: [PATCH 503/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/bodylength/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/bodylength/fr.md b/markdown/org/docs/designs/shelly/options/bodylength/fr.md index 61a1c0163ed..494fa5fd94b 100644 --- a/markdown/org/docs/designs/shelly/options/bodylength/fr.md +++ b/markdown/org/docs/designs/shelly/options/bodylength/fr.md @@ -6,6 +6,6 @@ Contrôle la longueur de la chemise. - Jusqu'à 80 % environ produiront un crop top. - 100 % descend au sommet de l'os de la hanche. - 120% produira un t-shirt typique. - - Avec 140 %, tu obtiendras une chemise un peu plus longue qui aura moins tendance sortir du pantalon ou à remonter. + - Avec 140 %, tu obtiendras une chemise un peu plus longue qui aura moins tendance à sortir du pantalon ou à remonter. - 200%+ peuvent être utilisés pour faire une simple robe t-shirt. Il est suggéré de régler les côtés droits sur faux, et d'ajuster la forme des côtés (dans les options avancées) pour les robes t-shirt. From 3660e59160223c11ff046513f1baf72236e38521 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:45 +0100 Subject: [PATCH 504/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/fr.md b/markdown/org/docs/designs/shelly/options/fr.md index 72af877a25a..f13da58a672 100644 --- a/markdown/org/docs/designs/shelly/options/fr.md +++ b/markdown/org/docs/designs/shelly/options/fr.md @@ -1,5 +1,5 @@ --- -title: "Chemise Shelly Options de conception" +title: "Chemise Shelly : Options de conception" --- From bbf1b7252e6dbeb0db0c62295b1d789d2db4e6ea Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:48 +0100 Subject: [PATCH 505/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/neckbalance/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/neckbalance/fr.md b/markdown/org/docs/designs/shelly/options/neckbalance/fr.md index 9fa2e5d8d7b..85b83e43657 100644 --- a/markdown/org/docs/designs/shelly/options/neckbalance/fr.md +++ b/markdown/org/docs/designs/shelly/options/neckbalance/fr.md @@ -1,5 +1,5 @@ --- -title: "Position du manche" +title: "Position du cou" --- Contrôle l'endroit où le trou du cou est placé sur la chemise. Pour une valeur de 0 %, le centre du trou du cou se trouve exactement à l'endroit où les quatre coutures raglan se croiseraient, les parties avant et arrière étant identiques. Une valeur positive déplace le cou vers l'avant de la chemise. From c9a57a3ed4f0bb7668fe55abf19961855f746b5c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:52 +0100 Subject: [PATCH 506/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/sideshape/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/sideshape/fr.md b/markdown/org/docs/designs/shelly/options/sideshape/fr.md index 4a45a404f5a..b7855c339db 100644 --- a/markdown/org/docs/designs/shelly/options/sideshape/fr.md +++ b/markdown/org/docs/designs/shelly/options/sideshape/fr.md @@ -1,5 +1,5 @@ --- -title: "Forme latérale" +title: "Forme du côté" --- Contrôle la façon dont la couture latérale est incurvée. Le zéro crée une ligne droite de l'aisselle au côté des hanches. Les valeurs positives ajoutent de la matière et donnent à la couture latérale une forme arrondie/convexe, tandis que les valeurs négatives enlèvent de la matière et donnent à la couture latérale une forme de sablier/concave. Cette option n'aura aucun effet si l'option "côtés droits" est activée. From 37135f0ec44a095815208fe10e24ddfafcbfbe15 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:53 +0100 Subject: [PATCH 507/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/sleeveease/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/sleeveease/fr.md b/markdown/org/docs/designs/shelly/options/sleeveease/fr.md index 5fd5194a765..d9ef506a9d2 100644 --- a/markdown/org/docs/designs/shelly/options/sleeveease/fr.md +++ b/markdown/org/docs/designs/shelly/options/sleeveease/fr.md @@ -2,5 +2,5 @@ title: "Aisance des manches" --- -Affecte la largeur de la manche à l'emmanchure sur toutes les chemises. Pour les chemises dont la longueur est inférieure à 100 %, cette option affecte également la largeur de la manche à l'ourlet, les manches courtes étant plus affectées par cette option, et les manches longues étant plus affectées par l'option d'aisance du poignet. Dans la plupart des cas, cette valeur doit être plus grande que l'aisance de la poitrine, car les épaules et les bras sont plus petits et le même pourcentage d'aisance se traduira par une aisance absolue plus petite. Pour les vêtements de compression, les épaules ont également besoin de plus de mobilité que la poitrine, et les élastiques très négatifs doivent généralement être évités pour cette option. +Affecte la largeur de la manche à l'emmanchure sur toutes les chemises. Pour les chemises dont la longueur est inférieure à 100 %, cette option affecte également la largeur de la manche à l'ourlet, les manches courtes étant plus affectées par cette option, et les manches longues étant plus affectées par l'option d'aisance du poignet. Dans la plupart des cas, cette valeur doit être plus grande que l'aisance de la poitrine, car les épaules et les bras sont plus petits et le même pourcentage d'aisance se traduira par une aisance absolue plus petite. Pour les vêtements de compression, les épaules ont également besoin de plus de mobilité que la poitrine, et les aisances très négatives doivent généralement être évités pour cette option. From baf32cd0e7126cdf27a5d808e2dd7ee8be5f4df4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:55 +0100 Subject: [PATCH 508/795] New translations en.md (French) skip-build --- .../org/docs/designs/shelly/options/sleevelength/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/docs/designs/shelly/options/sleevelength/fr.md b/markdown/org/docs/designs/shelly/options/sleevelength/fr.md index d3e2eedc103..e93b1fed1c7 100644 --- a/markdown/org/docs/designs/shelly/options/sleevelength/fr.md +++ b/markdown/org/docs/designs/shelly/options/sleevelength/fr.md @@ -3,8 +3,8 @@ title: "Longueur des manches" --- Contrôle la longueur des manches de ta chemise. - - 15 à 30 % d'entre eux feront des manches courtes. - - 75 % d'entre eux feront des manches trois-quarts. - - 100 % feront des manches longues, s'arrêtant au poignet. - - 115% permettra de faire des manches couvrant les articulations, et est approprié si l'on utilise des trous pour les pouces. + - 15 à 30 % pour des manches courtes. + - 75 % pour des manches trois-quarts. + - 100 % pour des manches longues, s'arrêtant au poignet. + - 115% permettra de faire des manches couvrant les jointures, et est approprié si l'on utilise des trous pour les pouces. From 17edc82f3ae88b5e1c43f3729f7c8e501870af7d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:02:56 +0100 Subject: [PATCH 509/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/options/wristease/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/shelly/options/wristease/fr.md b/markdown/org/docs/designs/shelly/options/wristease/fr.md index 5ab13ad33ee..84c3df3ff7e 100644 --- a/markdown/org/docs/designs/shelly/options/wristease/fr.md +++ b/markdown/org/docs/designs/shelly/options/wristease/fr.md @@ -1,5 +1,5 @@ --- -title: "Facilité du poignet" +title: "Aisance du poignet" --- Affecte la largeur de l'extrémité de la manche sur certaines chemises. Il n'y a pas d'effet pour les manches se terminant au niveau du biceps ou au-dessus. Pour les manches plus longues, la mesure du poignet et cette option d'aisance du poignet ont un effet progressivement plus important, atteignant son plein effet pour les chemises à manches longues (longueur de manche de 100 % ou plus). From 081357354341eb56c93106a152d61b723e35af7a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:03:34 +0100 Subject: [PATCH 510/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/onyx/instructions/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/onyx/instructions/fr.md b/markdown/org/docs/designs/onyx/instructions/fr.md index 4f97954f383..1ea50b2c1d7 100644 --- a/markdown/org/docs/designs/onyx/instructions/fr.md +++ b/markdown/org/docs/designs/onyx/instructions/fr.md @@ -59,7 +59,7 @@ Décide de couper les pièces du devant et/ou du dos _sur le pli_: - Pour les combinaisons, coupe le dos _sur le pli_ si tu fais une combinaison avec fermeture à glissière sur le devant, ou le devant _sur le pli_ si tu fais une combinaison avec fermeture à glissière sur le dos (3 pièces au total). - Pour les pyjamas une pièce, les barboteuses et les combinaisons, coupe seulement le dos _sur le pli_ (3 pièces au total). -Détermine le type d'ajustement que tu souhaites et règle tes facilités en conséquence. Assure-toi d'avoir un tissu approprié. En cas de doute, il est plus sûr de rendre le vêtement trop lâche que trop serré. +Détermine le type d'ajustement que tu souhaites et règle l'aisance en conséquence. Assure-toi d'avoir un tissu approprié. En cas de doute, il est plus sûr de rendre le vêtement trop lâche que trop serré. - Pour les combinaisons et les justaucorps, tu veux une aisance négative. Cela permettra au tissu extensible/de natation de se former autour du corps de la personne qui le porte. - Pour les pyjamas d'une seule pièce, tu veux une aisance positive et adoucir la forme (c'est-à-dire ajouter de l'aisance aux endroits qui se découpent, comme la taille, pour donner à l'ensemble du vêtement une forme moins ajustée). - Les grenouillères et les bodys utilisent une aisance positive, la quantité et la répartition de l'aisance variant beaucoup en fonction de la forme prévue du vêtement. From 5bf115d5d318fbf8168c89303cc813ac903ec3e4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:03:43 +0100 Subject: [PATCH 511/795] New translations en.md (French) skip-build --- .../docs/designs/onyx/options/hoodfrontpiecesize/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/docs/designs/onyx/options/hoodfrontpiecesize/fr.md b/markdown/org/docs/designs/onyx/options/hoodfrontpiecesize/fr.md index b957fbb46a2..392d2a53ddf 100644 --- a/markdown/org/docs/designs/onyx/options/hoodfrontpiecesize/fr.md +++ b/markdown/org/docs/designs/onyx/options/hoodfrontpiecesize/fr.md @@ -3,8 +3,8 @@ title: "Longueur des manches" --- Contrôle la longueur des manches de ton vêtement. - - 15 à 30 % d'entre eux feront des manches courtes. - - 75 % d'entre eux feront des manches trois-quarts. - - 100 % feront des manches longues, s'arrêtant au poignet. - - 115% permettra de faire des manches couvrant les articulations, et est approprié si l'on utilise des trous pour les pouces. + - 15 à 30 % pour des manches courtes. + - 75 % pour des manches trois-quarts. + - 100 % pour des manches longues, s'arrêtant au poignet. + - 115% permettra de faire des manches couvrant les jointures, et est approprié si l'on utilise des trous pour les pouces. From acbd7356546ad485e79e62b7839801a626cad4ed Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:03:50 +0100 Subject: [PATCH 512/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/onyx/options/neckbalance/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/onyx/options/neckbalance/fr.md b/markdown/org/docs/designs/onyx/options/neckbalance/fr.md index 54364a4debb..99578e00a97 100644 --- a/markdown/org/docs/designs/onyx/options/neckbalance/fr.md +++ b/markdown/org/docs/designs/onyx/options/neckbalance/fr.md @@ -1,5 +1,5 @@ --- -title: "Position du manche" +title: "Position du cou" --- Contrôle l'endroit où le trou du cou est placé sur le vêtement. Pour une valeur de 0 %, le centre du trou du cou se trouve exactement à l'endroit où les quatre coutures raglan se croiseraient, les parties avant et arrière étant identiques et la manche étant symétrique. Une valeur positive déplace le cou vers l'avant du vêtement. From 48d4ca8ef0f467d3d13228cc6153c65635fcdb29 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:04:01 +0100 Subject: [PATCH 513/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/onyx/options/sleevelength/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/docs/designs/onyx/options/sleevelength/fr.md b/markdown/org/docs/designs/onyx/options/sleevelength/fr.md index b957fbb46a2..392d2a53ddf 100644 --- a/markdown/org/docs/designs/onyx/options/sleevelength/fr.md +++ b/markdown/org/docs/designs/onyx/options/sleevelength/fr.md @@ -3,8 +3,8 @@ title: "Longueur des manches" --- Contrôle la longueur des manches de ton vêtement. - - 15 à 30 % d'entre eux feront des manches courtes. - - 75 % d'entre eux feront des manches trois-quarts. - - 100 % feront des manches longues, s'arrêtant au poignet. - - 115% permettra de faire des manches couvrant les articulations, et est approprié si l'on utilise des trous pour les pouces. + - 15 à 30 % pour des manches courtes. + - 75 % pour des manches trois-quarts. + - 100 % pour des manches longues, s'arrêtant au poignet. + - 115% permettra de faire des manches couvrant les jointures, et est approprié si l'on utilise des trous pour les pouces. From 1145ad70f4bd7ace2964378972a53bfacf5a5255 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:04:04 +0100 Subject: [PATCH 514/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/onyx/options/wristease/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/onyx/options/wristease/fr.md b/markdown/org/docs/designs/onyx/options/wristease/fr.md index bdf338cbd5f..fee1b0688c4 100644 --- a/markdown/org/docs/designs/onyx/options/wristease/fr.md +++ b/markdown/org/docs/designs/onyx/options/wristease/fr.md @@ -1,5 +1,5 @@ --- -title: "Facilité du poignet" +title: "Aisance du poignet" --- Affecte la largeur de l'extrémité de la manche sur certains vêtements. Il n'y a pas d'effet pour les manches se terminant au niveau du biceps ou au-dessus. Il n'y a pas d'effet pour les manches se terminant au niveau du biceps ou au-dessus. From e37c1919fbf757578073f4c43368de2840f395fa Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 26 Mar 2024 14:04:12 +0100 Subject: [PATCH 515/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/shelly/notes/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/shelly/notes/fr.md b/markdown/org/docs/designs/shelly/notes/fr.md index 5a7d8cdce2b..4e006c47b01 100644 --- a/markdown/org/docs/designs/shelly/notes/fr.md +++ b/markdown/org/docs/designs/shelly/notes/fr.md @@ -2,11 +2,11 @@ title: "Maillot de bain Shelly : Notes du créateur" --- -Shelly est mon premier dessin. Elle est née du besoin de chemises pouvant se comprimer très fortement (pour des besoins sensoriels issus de l'autisme), et de l'absence de chemises prêtes à l'emploi adaptées. Les maillots de bain trop petits sont assez serrés, mais exposent le ventre et pincent au niveau des aisselles, j'ai donc entrepris de concevoir un maillot qui serait à la fois confortable et thérapeutique. +Shelly est mon premier design. Elle est née du besoin de chemises pouvant se comprimer très fortement (pour des besoins sensoriels issus de l'autisme), et de l'absence de chemises prêtes à l'emploi adaptées. Les maillots de bain trop petits sont assez serrés, mais exposent le ventre et pincent au niveau des aisselles, j'ai donc entrepris de concevoir un maillot qui serait à la fois confortable et thérapeutique. Les manches raglan sont utilisées pour apporter plus de souplesse et de mobilité au niveau de l'aisselle, et sont très importantes pour les vêtements très serrés. -Cela dit, Shelly est un modèle simple et polyvalent capable de fabriquer des hauts en tricot sur une large gamme d'eases, des chemises de compression serrées, aux tees raglan amples. Il s'agit d'un excellent premier projet de tricot, car il n'utilise que cinq pièces de tissu coupées à partir de quatre pièces de patron, et présente des coutures simples qui peuvent être entièrement réalisées à l'aide d'une surjeteuse. Elle est également assez tolérante aux petites erreurs de mesure/coupe/couture en raison de la nature élastique des tricots, en particulier du tissu de natation, et de l'absence de caractéristiques fines nécessitant une trop grande attention aux détails sur Shelly. +Cela dit, Shelly est un modèle simple et polyvalent capable de fabriquer des hauts en tricot sur une large gamme d'aisances, des chemises de compression serrées, aux tee-shirts raglan amples. Il s'agit d'un excellent premier projet de tricot, car il n'utilise que cinq pièces de tissu coupées à partir de quatre pièces de patron, et présente des coutures simples qui peuvent être entièrement réalisées à l'aide d'une surjeteuse. Elle est également assez tolérante aux petites erreurs de mesure/coupe/couture en raison de la nature élastique des tricots, en particulier du tissu de natation, et de l'absence de caractéristiques fines nécessitant une trop grande attention aux détails sur Shelly. Le nom est choisi parce que j'aime la plage et j'aime les coquillages. From 981d24b10287ce40d489d79245c387c82289f081 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:06:28 +0000 Subject: [PATCH 516/795] chore(deps): Bump swagger-ui-dist from 5.12.0 to 5.12.2 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.12.0 to 5.12.2. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.12.0...v5.12.2) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index bd975455b56..c9dbdfcdebf 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.12.0", + "swagger-ui-dist": "5.12.2", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 4b36f50f0a3..739a7af3374 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13188,10 +13188,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.12.0, swagger-ui-dist@>=5.0.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.0.tgz#cc983711d38963aad1de8693fb19f9d8f7a74f80" - integrity sha512-Rt1xUpbHulJVGbiQjq9yy9/r/0Pg6TmpcG+fXTaMePDc8z5WUw4LfaWts5qcNv/8ewPvBIbY7DKq7qReIKNCCQ== +swagger-ui-dist@5.12.2, swagger-ui-dist@>=5.0.0: + version "5.12.2" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.2.tgz#b04de905475ac0140d96177fe52c2c8f75ba0fbe" + integrity sha512-Fk8qZCBgZPkDli81pLrkSN15rs49xKnPkjhtKmUImmak4l2HdLiR/R7RgPkMGn1MuXvoIoLjIWgjE7NBgLWZHg== swagger-ui-express@5.0.0: version "5.0.0" From 9579a60509c8f1d36c1367e0242c5299334508b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:07:00 +0000 Subject: [PATCH 517/795] chore(deps): Bump use-local-storage-state from 19.1.0 to 19.2.0 Bumps [use-local-storage-state](https://github.com/astoilkov/use-local-storage-state) from 19.1.0 to 19.2.0. - [Release notes](https://github.com/astoilkov/use-local-storage-state/releases) - [Commits](https://github.com/astoilkov/use-local-storage-state/compare/v19.1.0...v19.2.0) --- updated-dependencies: - dependency-name: use-local-storage-state dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index c0a64a417df..2597c2a9f93 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -63,7 +63,7 @@ "remark-gfm": "4.0.0", "remark-mdx-frontmatter": "4.0.0", "strip-markdown": "6.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "yaml-loader": "0.8.1" }, "devDependencies": { diff --git a/sites/sde/package.json b/sites/sde/package.json index 7b040605ed7..a1f05fa4e14 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -84,7 +84,7 @@ "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.1", "tlds": "1.251.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": {}, diff --git a/sites/shared/package.json b/sites/shared/package.json index 854e65bfe73..1368e00d216 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -55,7 +55,7 @@ "tlds": "1.251.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 4b36f50f0a3..adfb453fe04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13979,10 +13979,10 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -use-local-storage-state@19.1.0: - version "19.1.0" - resolved "https://registry.npmjs.org/use-local-storage-state/-/use-local-storage-state-19.1.0.tgz" - integrity sha512-3Ea6uRtRaSwpZYD9maZPKoEEGRuHmVA7zGrV/Uh9s5NTj9K1x/MB4IOQoywjUesQyhXmJq6bqjC5cAqlsXoOTw== +use-local-storage-state@19.2.0: + version "19.2.0" + resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.2.0.tgz#eac2f18c8f4762931d3b6661097be0b2c00f65de" + integrity sha512-z5+n406vi3FzPJW6+lzuL/LJr4VLhXsUq1TWWeHQABL37bnJ159dSUmO7XuwqvACX93ZA9P2vkB8GMDgq1rr7A== use-sync-external-store@^1.0.0: version "1.2.0" From 633b87272a372ffe492f7b26ebc3b0276bcd3b90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:07:47 +0000 Subject: [PATCH 518/795] chore(deps-dev): Bump mocha from 10.3.0 to 10.4.0 Bumps [mocha](https://github.com/mochajs/mocha) from 10.3.0 to 10.4.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v10.3.0...v10.4.0) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- designs/aaron/package.json | 2 +- designs/albert/package.json | 2 +- designs/bee/package.json | 2 +- designs/bella/package.json | 2 +- designs/benjamin/package.json | 2 +- designs/bent/package.json | 2 +- designs/bob/package.json | 2 +- designs/breanna/package.json | 2 +- designs/brian/package.json | 2 +- designs/bruce/package.json | 2 +- designs/carlita/package.json | 2 +- designs/carlton/package.json | 2 +- designs/cathrin/package.json | 2 +- designs/charlie/package.json | 2 +- designs/cornelius/package.json | 2 +- designs/diana/package.json | 2 +- designs/examples/package.json | 2 +- designs/florence/package.json | 2 +- designs/florent/package.json | 2 +- designs/gozer/package.json | 2 +- designs/hi/package.json | 2 +- designs/holmes/package.json | 2 +- designs/hortensia/package.json | 2 +- designs/huey/package.json | 2 +- designs/hugo/package.json | 2 +- designs/jaeger/package.json | 2 +- designs/legend/package.json | 2 +- designs/lucy/package.json | 2 +- designs/lumina/package.json | 2 +- designs/lumira/package.json | 2 +- designs/lunetius/package.json | 2 +- designs/magde/package.json | 2 +- designs/naomiwu/package.json | 2 +- designs/noble/package.json | 2 +- designs/octoplushy/package.json | 2 +- designs/onyx/package.json | 2 +- designs/otis/package.json | 2 +- designs/paco/package.json | 2 +- designs/penelope/package.json | 2 +- designs/plugintest/package.json | 2 +- designs/rendertest/package.json | 2 +- designs/sandy/package.json | 2 +- designs/shelly/package.json | 2 +- designs/shin/package.json | 2 +- designs/simon/package.json | 2 +- designs/simone/package.json | 2 +- designs/skully/package.json | 2 +- designs/sven/package.json | 2 +- designs/tamiko/package.json | 2 +- designs/teagan/package.json | 2 +- designs/tiberius/package.json | 2 +- designs/titan/package.json | 2 +- designs/trayvon/package.json | 2 +- designs/tristan/package.json | 2 +- designs/uma/package.json | 2 +- designs/wahid/package.json | 2 +- designs/walburga/package.json | 2 +- designs/waralee/package.json | 2 +- designs/yuri/package.json | 2 +- packages/core/package.json | 2 +- plugins/core-plugins/package.json | 2 +- plugins/plugin-annotations/package.json | 2 +- plugins/plugin-bin-pack/package.json | 2 +- plugins/plugin-bust/package.json | 2 +- plugins/plugin-flip/package.json | 2 +- plugins/plugin-gore/package.json | 2 +- plugins/plugin-i18n/package.json | 2 +- plugins/plugin-measurements/package.json | 2 +- plugins/plugin-mirror/package.json | 2 +- plugins/plugin-ringsector/package.json | 2 +- plugins/plugin-round/package.json | 2 +- plugins/plugin-sprinkle/package.json | 2 +- plugins/plugin-svgattr/package.json | 2 +- plugins/plugin-theme/package.json | 2 +- plugins/plugin-timing/package.json | 2 +- plugins/plugin-versionfree-svg/package.json | 2 +- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 78 files changed, 81 insertions(+), 81 deletions(-) diff --git a/designs/aaron/package.json b/designs/aaron/package.json index ce49326fd04..ea3aaf7747d 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/albert/package.json b/designs/albert/package.json index 2da5d562161..76d7bf1ecad 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bee/package.json b/designs/bee/package.json index 526713a6274..679d1ef1970 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bella/package.json b/designs/bella/package.json index 13a232d076a..9c2e7949bac 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 306fcec95e6..34e8c8a00b4 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bent/package.json b/designs/bent/package.json index 7f65d2d1937..ab30a071207 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bob/package.json b/designs/bob/package.json index 690304808e0..386c486b04f 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 98433c12533..23703212f1d 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/brian/package.json b/designs/brian/package.json index f849821156b..1b8d3fef38d 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 0331cf23c1f..11c39cca02c 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlita/package.json b/designs/carlita/package.json index d6d57077e8b..cacda75c2f2 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlton/package.json b/designs/carlton/package.json index 993c41644db..527c7549a2d 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index dd7914bed64..b1b143c31f4 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/charlie/package.json b/designs/charlie/package.json index 18d70deb1f9..719da827cd5 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 6b25b344a0b..10cc99cdfe8 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/diana/package.json b/designs/diana/package.json index ca162a5e64a..712695b98a1 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/examples/package.json b/designs/examples/package.json index 62370fdfe04..4b9785928aa 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -49,7 +49,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florence/package.json b/designs/florence/package.json index 2be92777915..78c0d6f8a46 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florent/package.json b/designs/florent/package.json index 5517dc5daaf..ccc886313fb 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/gozer/package.json b/designs/gozer/package.json index 87a57c23f00..9f69b8e32fe 100644 --- a/designs/gozer/package.json +++ b/designs/gozer/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hi/package.json b/designs/hi/package.json index 9d69fb4066d..0f168e4475a 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/holmes/package.json b/designs/holmes/package.json index 8d117ccc321..4fd2f67ee9f 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -56,7 +56,7 @@ "@freesewing/plugin-gore": "3.2.0" }, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index 94509b15abb..6257ce5ecc6 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/huey/package.json b/designs/huey/package.json index 5625fd7e419..c3add0f8398 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 07352d582f2..ca8b3417488 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 8057ca5af1c..062664a8321 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/legend/package.json b/designs/legend/package.json index 393b84a3c33..c4c98decf3d 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lucy/package.json b/designs/lucy/package.json index fa1b7b9750c..1d88fed6ac4 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumina/package.json b/designs/lumina/package.json index 34aec3889be..d29100eba1e 100644 --- a/designs/lumina/package.json +++ b/designs/lumina/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumira/package.json b/designs/lumira/package.json index 1f785ea47b8..a8f347f9478 100644 --- a/designs/lumira/package.json +++ b/designs/lumira/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index d330055838a..33945b987ed 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/magde/package.json b/designs/magde/package.json index 05c56cdd495..85b88a524bc 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/naomiwu/package.json b/designs/naomiwu/package.json index f264bfcfbc6..7e94a19d612 100644 --- a/designs/naomiwu/package.json +++ b/designs/naomiwu/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/noble/package.json b/designs/noble/package.json index 386a9f1fc4e..a129e21771c 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index c0575885b02..c045f09f539 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/onyx/package.json b/designs/onyx/package.json index eb391f0487c..9cdf7db32a4 100644 --- a/designs/onyx/package.json +++ b/designs/onyx/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/otis/package.json b/designs/otis/package.json index d5bc84c0d50..6da21cc33f7 100644 --- a/designs/otis/package.json +++ b/designs/otis/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/paco/package.json b/designs/paco/package.json index 8d1e605df9f..91d4085935e 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/penelope/package.json b/designs/penelope/package.json index 53809315576..f7bb4c9d458 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 82cfdd51637..1c5802400b1 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index a20ffc0b6d6..d289bc33358 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sandy/package.json b/designs/sandy/package.json index c68744723f9..46629614acc 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shelly/package.json b/designs/shelly/package.json index ff36d0da81d..640316a9f39 100644 --- a/designs/shelly/package.json +++ b/designs/shelly/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shin/package.json b/designs/shin/package.json index b1cb670c6d1..b07a360390c 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simon/package.json b/designs/simon/package.json index 1c3dd85df64..13a8be358da 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simone/package.json b/designs/simone/package.json index a0e6f349f6f..cc6ab5ef1a9 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/skully/package.json b/designs/skully/package.json index 902e1c6c547..70b10a4c3fc 100644 --- a/designs/skully/package.json +++ b/designs/skully/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sven/package.json b/designs/sven/package.json index e190e0352ee..2d0457b03c6 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index f51300d340a..59db79d575b 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 8ddb9931348..85aec5e3f4c 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index 2856b97eb6b..d8baff4cca9 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/titan/package.json b/designs/titan/package.json index 1a580665506..fc9becb3e0d 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index 8802043a845..d1845b37b3c 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tristan/package.json b/designs/tristan/package.json index 75f650a70e1..6eefb36c598 100644 --- a/designs/tristan/package.json +++ b/designs/tristan/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/uma/package.json b/designs/uma/package.json index a604f506236..1b1b780c669 100644 --- a/designs/uma/package.json +++ b/designs/uma/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/wahid/package.json b/designs/wahid/package.json index 7bd43e2b1e9..556c25b8f2d 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/walburga/package.json b/designs/walburga/package.json index c9c5006449d..40e3691c03f 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/waralee/package.json b/designs/waralee/package.json index 338ea5cecd2..1b7be0b4cb1 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 21d8ff1e509..9b7aea2882d 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/packages/core/package.json b/packages/core/package.json index 3486b1ebea7..044df17a26f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,7 +64,7 @@ "devDependencies": { "eslint": "8.57.0", "nyc": "15.1.0", - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "sinon": "^17.0.1" }, diff --git a/plugins/core-plugins/package.json b/plugins/core-plugins/package.json index f8161bb41d8..55b6267fe70 100644 --- a/plugins/core-plugins/package.json +++ b/plugins/core-plugins/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/plugin-annotations": "3.2.0", "@freesewing/plugin-mirror": "3.2.0", diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index 080aeac1c48..9595a53eb92 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bin-pack/package.json b/plugins/plugin-bin-pack/package.json index de2420f1fa8..2bbb3177085 100644 --- a/plugins/plugin-bin-pack/package.json +++ b/plugins/plugin-bin-pack/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 78bbbf1bc64..2bf7619359f 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index c67d522a583..620410d3a05 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index 76b6b1cd68e..7109989548f 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index fa39fd98abb..0cd8688c19f 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 0f5550513ca..7922a7c75bd 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 733c2c5b3e4..f96155821fe 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-ringsector/package.json b/plugins/plugin-ringsector/package.json index 3b2f69a23c9..7a3674e6e81 100644 --- a/plugins/plugin-ringsector/package.json +++ b/plugins/plugin-ringsector/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index c5f81e78971..6d85f49d3fe 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index 72a16401155..75a5153fd03 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 5322bf25702..9d89a25858d 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index dc9e123f800..bb83f9c2ac9 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index cc7bdbb438b..d1841135c09 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index 73a4aa1a79a..9b11f459a4b 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/sites/backend/package.json b/sites/backend/package.json index bd975455b56..659d3516b43 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -50,7 +50,7 @@ "chai": "5.1.0", "chai-http": "4.4.0", "esbuild": "0.20.2", - "mocha": "10.3.0", + "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", "prisma": "5.11.0" diff --git a/yarn.lock b/yarn.lock index 4b36f50f0a3..f49d5654283 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10033,10 +10033,10 @@ mocha-steps@1.3.0: resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@10.3.0, mocha@^10.0.0: - version "10.3.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz" - integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== +mocha@10.4.0, mocha@^10.0.0: + version "10.4.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261" + integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== dependencies: ansi-colors "4.1.1" browser-stdout "1.3.1" From 625001031ae9a02212f6c9d170ef556e306db585 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 04:09:27 +0000 Subject: [PATCH 519/795] chore(deps): Bump @resvg/resvg-js from 2.6.1 to 2.6.2 Bumps [@resvg/resvg-js](https://github.com/yisibl/resvg-js) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/yisibl/resvg-js/releases) - [Changelog](https://github.com/yisibl/resvg-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/yisibl/resvg-js/compare/v2.6.1...v2.6.2) --- updated-dependencies: - dependency-name: "@resvg/resvg-js" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 128 +++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 854e65bfe73..17971fba235 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -17,7 +17,7 @@ "peerDependencies": {}, "dependencies": { "@next/mdx": "14.1.4", - "@resvg/resvg-js": "2.6.1", + "@resvg/resvg-js": "2.6.2", "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 4b36f50f0a3..d56bcd7939b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1942,83 +1942,83 @@ dependencies: "@prisma/debug" "5.11.0" -"@resvg/resvg-js-android-arm-eabi@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.1.tgz#4d6f17ab66658710165cd7f4e2171241f6f4595f" - integrity sha512-oXmXUUqTzinvXwkVBDdNKocAeF1zLGJYasTNRmoqF3gyOm04qRYT1On0m6oK2jbTiUAOUTqi0ZSizcecnwcSDA== +"@resvg/resvg-js-android-arm-eabi@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe" + integrity sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA== -"@resvg/resvg-js-android-arm64@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.1.tgz#fe793dcb9b03af1260797c8153b7a9fad420077f" - integrity sha512-vcCZoBx8s/3/+t6nDd9fB/LL70I4B2YmgDT7uP6wyqVCUPniNeLR9VYIuvpMHw6oVyL5Mpt8F2YXV1zQE2X2hw== +"@resvg/resvg-js-android-arm64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.2.tgz#b8cb564d7f6b3f37d9b43129f5dc5fe171e249e4" + integrity sha512-VcOKezEhm2VqzXpcIJoITuvUS/fcjIw5NA/w3tjzWyzmvoCdd+QXIqy3FBGulWdClvp4g+IfUemigrkLThSjAQ== -"@resvg/resvg-js-darwin-arm64@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.1.tgz#a96cc2e40da1a9922022d68a75e93233b58f09f9" - integrity sha512-uO0WvEQqQlAL8u7nI7k1yL5wSsZYU2YCSsN1hAhr1LjyvmWmyC09xUEdWPUVVT1nL2YK4Ueh0LR+pxOT3QlCng== +"@resvg/resvg-js-darwin-arm64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.2.tgz#49bd3faeda5c49f53302d970e6e79d006de18e7d" + integrity sha512-nmok2LnAd6nLUKI16aEB9ydMC6Lidiiq2m1nEBDR1LaaP7FGs4AJ90qDraxX+CWlVuRlvNjyYJTNv8qFjtL9+A== -"@resvg/resvg-js-darwin-x64@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.1.tgz#e90f1c999e8c10c4a9be205717484456687c560e" - integrity sha512-aW15HMQSk85GPHE4gsc56G0Fqi2IGVkDfPWEWHEyDBpCZ17RKweAwg5V3ioz9aGX1nmhjQa9tJ2xgVwX+sqIjw== +"@resvg/resvg-js-darwin-x64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.2.tgz#e1344173aa27bfb4d880ab576d1acf1c1648faca" + integrity sha512-GInyZLjgWDfsVT6+SHxQVRwNzV0AuA1uqGsOAW+0th56J7Nh6bHHKXHBWzUrihxMetcFDmQMAX1tZ1fZDYSRsw== -"@resvg/resvg-js-linux-arm-gnueabihf@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.1.tgz#f600fce988a6dfeb573d164f3991a5d190cb8e16" - integrity sha512-7vpBFzCMONnRzK0uCBT5h+Dmsa8dWsoLFqB6xgutNfKkldjuCOiLNe0tT7hneGF8tw5H+W6hX/VLx2ktDwsS4Q== +"@resvg/resvg-js-linux-arm-gnueabihf@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.2.tgz#34c445eba45efd68f6130b2ab426d76a7424253d" + integrity sha512-YIV3u/R9zJbpqTTNwTZM5/ocWetDKGsro0SWp70eGEM9eV2MerWyBRZnQIgzU3YBnSBQ1RcxRZvY/UxwESfZIw== -"@resvg/resvg-js-linux-arm64-gnu@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.1.tgz#871b023e03d645ca95a077dcd5ee6909d11c6c3d" - integrity sha512-+Gi3OIOJFFiCdm72AsDa7KPnkogitLQ6yfF1O/J25adUrlWjvKAM9+8b5sTI9waeLERZHNJpIVESpdIxI2/5sQ== +"@resvg/resvg-js-linux-arm64-gnu@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.2.tgz#30da47087dd8153182198b94fe9f8d994890dae5" + integrity sha512-zc2BlJSim7YR4FZDQ8OUoJg5holYzdiYMeobb9pJuGDidGL9KZUv7SbiD4E8oZogtYY42UZEap7dqkkYuA91pg== -"@resvg/resvg-js-linux-arm64-musl@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.1.tgz#bc657676c3f0d602718f7df0e2a9825fefff714b" - integrity sha512-lnRGWG/LwpX6UsV1neHAavPnek3WlCnGMdBZ/7JbpamK5VmtDZmsV2esOFpME6pKnWL40UX4WjPsCBtKkhMUMA== +"@resvg/resvg-js-linux-arm64-musl@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.2.tgz#5d75b8ff5c83103729c1ca3779987302753c50d4" + integrity sha512-3h3dLPWNgSsD4lQBJPb4f+kvdOSJHa5PjTYVsWHxLUzH4IFTJUAnmuWpw4KqyQ3NA5QCyhw4TWgxk3jRkQxEKg== -"@resvg/resvg-js-linux-x64-gnu@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.1.tgz#79207115ae2edeaedc6906e0c78043866f345b7b" - integrity sha512-2S1N7fHl5480AUrUtxsfjFOh3t8NQ2qKavROZRDKWJqFXBrNOUsirDa33LtpFGDkFW18SjP/FCs1xfHLzzz43g== +"@resvg/resvg-js-linux-x64-gnu@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.2.tgz#411abedfaee5edc57cbb7701736cecba522e26f3" + integrity sha512-IVUe+ckIerA7xMZ50duAZzwf1U7khQe2E0QpUxu5MBJNao5RqC0zwV/Zm965vw6D3gGFUl7j4m+oJjubBVoftw== -"@resvg/resvg-js-linux-x64-musl@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.1.tgz#dfed291a7530e4779d4f674395cf50ececdf8a72" - integrity sha512-G5GMmpvFiyclkp44eVPVWnN2lhLx9eMIcxGnBFWjnpI3TxrjBt7aVic2N8CsZ0vt2rrnJkQI0IKjUQQIi138Hw== +"@resvg/resvg-js-linux-x64-musl@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.2.tgz#fe4984038f0372f279e3ff570b72934dd7eb2a5c" + integrity sha512-UOf83vqTzoYQO9SZ0fPl2ZIFtNIz/Rr/y+7X8XRX1ZnBYsQ/tTb+cj9TE+KHOdmlTFBxhYzVkP2lRByCzqi4jQ== -"@resvg/resvg-js-win32-arm64-msvc@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.1.tgz#d0f5a5153cc7ca5c3b1fadfb60d53a1514d950b1" - integrity sha512-m9TBMrGs2tML0oz14D/x40tPedqCgNFy/DH7/z/bvnP9bH59fivaInmHTjd8oSFfGRZ/DasXMFcAL+LS1+hfSQ== +"@resvg/resvg-js-win32-arm64-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.2.tgz#d3a053cf7ff687087a2106330c0fdaae706254d1" + integrity sha512-7C/RSgCa+7vqZ7qAbItfiaAWhyRSoD4l4BQAbVDqRRsRgY+S+hgS3in0Rxr7IorKUpGE69X48q6/nOAuTJQxeQ== -"@resvg/resvg-js-win32-ia32-msvc@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.1.tgz#65d5433c14915cb0934230b991e303f2f0dde6d8" - integrity sha512-Ma+MJXesViT0A7JqTobsB9DOCO0AkfmLxsgkvxq0IiWkpU9Z4Gp+RkDsFQbMhJwVXaz7b8L6y+EIvf95iCbJQw== +"@resvg/resvg-js-win32-ia32-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.2.tgz#7cdda1ce29ef7209e28191d917fa5bef0624a4ad" + integrity sha512-har4aPAlvjnLcil40AC77YDIk6loMawuJwFINEM7n0pZviwMkMvjb2W5ZirsNOZY4aDbo5tLx0wNMREp5Brk+w== -"@resvg/resvg-js-win32-x64-msvc@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.1.tgz#8f6d7fba07c5f6a0f4eec8c3cc6680c61929a2ab" - integrity sha512-mWIlgEuFWBrlldCbhLPvG4tt0r0D1RZ8eR2+zxTtQ15d/lbVjwnGpw2l1noV3zhV5S6mAVzoZeQ1emoov63Y/A== +"@resvg/resvg-js-win32-x64-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.2.tgz#cb0ad04525d65f3def4c8d346157a57976d5b388" + integrity sha512-ZXtYhtUr5SSaBrUDq7DiyjOFJqBVL/dOBN7N/qmi/pO0IgiWW/f/ue3nbvu9joWE5aAKDoIzy/CxsY0suwGosQ== -"@resvg/resvg-js@2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.1.tgz#401535f60640d3e4e4e135023632e03aacb1c878" - integrity sha512-CVGUWPvgr3b96+PooncXCsvu93CMwfEoueqIxIJr9AuUA8OaIPcZjOgFhas62fcHRdWMmxQqF1Rp+89bQsj/RA== +"@resvg/resvg-js@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.2.tgz#3e92a907d88d879256c585347c5b21a7f3bb5b46" + integrity sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q== optionalDependencies: - "@resvg/resvg-js-android-arm-eabi" "2.6.1" - "@resvg/resvg-js-android-arm64" "2.6.1" - "@resvg/resvg-js-darwin-arm64" "2.6.1" - "@resvg/resvg-js-darwin-x64" "2.6.1" - "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.1" - "@resvg/resvg-js-linux-arm64-gnu" "2.6.1" - "@resvg/resvg-js-linux-arm64-musl" "2.6.1" - "@resvg/resvg-js-linux-x64-gnu" "2.6.1" - "@resvg/resvg-js-linux-x64-musl" "2.6.1" - "@resvg/resvg-js-win32-arm64-msvc" "2.6.1" - "@resvg/resvg-js-win32-ia32-msvc" "2.6.1" - "@resvg/resvg-js-win32-x64-msvc" "2.6.1" + "@resvg/resvg-js-android-arm-eabi" "2.6.2" + "@resvg/resvg-js-android-arm64" "2.6.2" + "@resvg/resvg-js-darwin-arm64" "2.6.2" + "@resvg/resvg-js-darwin-x64" "2.6.2" + "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.2" + "@resvg/resvg-js-linux-arm64-gnu" "2.6.2" + "@resvg/resvg-js-linux-arm64-musl" "2.6.2" + "@resvg/resvg-js-linux-x64-gnu" "2.6.2" + "@resvg/resvg-js-linux-x64-musl" "2.6.2" + "@resvg/resvg-js-win32-arm64-msvc" "2.6.2" + "@resvg/resvg-js-win32-ia32-msvc" "2.6.2" + "@resvg/resvg-js-win32-x64-msvc" "2.6.2" "@rushstack/eslint-patch@^1.3.3": version "1.7.2" From 4b48c2279d89d1745d0e6c981d97521fedada44c Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:29:32 +0000 Subject: [PATCH 520/795] docs: update CONTRIBUTORS.md [skip ci] --- CONTRIBUTORS.md | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8a4ed43f45b..030d1156b41 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -29,145 +29,148 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Cathy Zoller
    Cathy Zoller
    📖 Chantal Lapointe
    Chantal Lapointe
    🌍 + Corey
    Corey
    💬 Damien PIQUET
    Damien PIQUET
    💻 Darigov Research
    Darigov Research
    📖 🤔 David Clegg
    David Clegg
    🎨 💻 Elena FdR
    Elena FdR
    📖 📝 - Emmanuel Nyachoke
    Emmanuel Nyachoke
    💻 📖 + Emmanuel Nyachoke
    Emmanuel Nyachoke
    💻 📖 Enoch Riese
    Enoch Riese
    💻 EvEkSwed
    EvEkSwed
    🌍 Fantastik-Maman
    Fantastik-Maman
    🌍 Forrest O.
    Forrest O.
    📖 Frédéric
    Frédéric
    🌍 Glenn Matthews
    Glenn Matthews
    📖 - Greg Sadetsky
    Greg Sadetsky
    📖 + Greg Sadetsky
    Greg Sadetsky
    📖 Himanshu Singh
    Himanshu Singh
    📖 Igor Couto
    Igor Couto
    🐛 Ikko Ashimine
    Ikko Ashimine
    📖 Irapeke
    Irapeke
    🌍 Ivo Bek
    Ivo Bek
    📖 Jacek Sawoszczuk
    Jacek Sawoszczuk
    📖 - Jason Williams
    Jason Williams
    📖 + Jason Williams
    Jason Williams
    📖 Jeremy Jackson
    Jeremy Jackson
    💻 Jeroen Hoek
    Jeroen Hoek
    📖 Joe Schofield
    Joe Schofield
    📖 Joebidido
    Joebidido
    🌍 Jonathan Haas
    Jonathan Haas
    💻 Joost De Cock
    Joost De Cock
    🚧 - Josh Essman
    Josh Essman
    📖 + Josh Essman
    Josh Essman
    📖 Josh Munic
    Josh Munic
    🐛 Kake
    Kake
    📖 Kapunahele Wong
    Kapunahele Wong
    📖 Karen
    Karen
    📖 📋 Karl Nippoldt
    Karl Nippoldt
    📖 Katie McGinley
    Katie McGinley
    📖 - Kieran Klaassen
    Kieran Klaassen
    💻 + Kieran Klaassen
    Kieran Klaassen
    💻 Kittycatou
    Kittycatou
    🌍 Kris
    Kris
    📖 Kristin Ruben
    Kristin Ruben
    💻 Lin
    Lin
    💻 Loudepeuter
    Loudepeuter
    🌍 Lucian
    Lucian
    📋 - Luiz Saggioro
    Luiz Saggioro
    💻 + Luiz Saggioro
    Luiz Saggioro
    💻 MA-TATAS
    MA-TATAS
    📖 Marcus
    Marcus
    🌍 Martin Tribo
    Martin Tribo
    📖 Nadege Michel
    Nadege Michel
    ⚠️ 📖 Natalia
    Natalia
    💻 🎨 📝 Nathan Yergler
    Nathan Yergler
    📖 - Nick Dower
    Nick Dower
    📖 💻 🐛 + Nick Dower
    Nick Dower
    📖 💻 🐛 Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 Phillip Thelen
    Phillip Thelen
    💻 - Pixieish
    Pixieish
    📖 + Pixieish
    Pixieish
    📖 Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 Sanne
    Sanne
    💻 📖 - Sara Latorre
    Sara Latorre
    🌍 + Sara Latorre
    Sara Latorre
    🌍 SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 Soham Tembhurne
    Soham Tembhurne
    💻 - SoneaTheBest
    SoneaTheBest
    🌍 + SoneaTheBest
    SoneaTheBest
    🌍 Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 Trent Trama
    Trent Trama
    💻 - Tríona
    Tríona
    📖 + Tríona
    Tríona
    📖 Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 amysews
    amysews
    📖 - anna-puk
    anna-puk
    💻 + anna-puk
    anna-puk
    💻 beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 chri5b
    chri5b
    💻 ⚠️ - dingcycle
    dingcycle
    🌍 + dingcycle
    dingcycle
    🌍 drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 gaylyndie
    gaylyndie
    📖 - grimlokason
    grimlokason
    💻 + grimlokason
    grimlokason
    💻 hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 mesil
    mesil
    🐛 - starfetch
    starfetch
    💻 📖 🌍 🎨 + starfetch
    starfetch
    💻 📖 🌍 🎨 timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 viocky
    viocky
    🌍 woolishboy
    woolishboy
    💻 + + yc
    yc
    🌍 From 63482ac0dbdb5edf97ed70bab0f28500d1210261 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:29:33 +0000 Subject: [PATCH 521/795] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 76d728dd686..42adff166a6 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1176,6 +1176,15 @@ "contributions": [ "doc" ] + }, + { + "login": "RockerKitten", + "name": "Corey", + "avatar_url": "https://avatars.githubusercontent.com/u/84648053?v=4", + "profile": "https://github.com/RockerKitten", + "contributions": [ + "question" + ] } ], "skipCi": true, From 429a0b5936e9d1e4159e7ac5c490baec63c65487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:33:13 +0000 Subject: [PATCH 522/795] chore(deps): Bump @tailwindcss/typography from 0.5.10 to 0.5.11 Bumps [@tailwindcss/typography](https://github.com/tailwindlabs/tailwindcss-typography) from 0.5.10 to 0.5.11. - [Release notes](https://github.com/tailwindlabs/tailwindcss-typography/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.10...v0.5.11) --- updated-dependencies: - dependency-name: "@tailwindcss/typography" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 90028dc7d93..065bee67f12 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -33,7 +33,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.11", "algoliasearch": "4.22.1", "daisyui": "4.8.0", "lodash.get": "4.4.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index 2fbd22b9fb5..38927c24446 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -30,7 +30,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.11", "algoliasearch": "4.22.1", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index c0a64a417df..e239cf30728 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -34,7 +34,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.11", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.8.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 7b040605ed7..928dae90926 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -44,7 +44,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.11", "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", diff --git a/sites/shared/package.json b/sites/shared/package.json index 17971fba235..2e959f3a31a 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -18,7 +18,7 @@ "dependencies": { "@next/mdx": "14.1.4", "@resvg/resvg-js": "2.6.2", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.11", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/yarn.lock b/yarn.lock index d56bcd7939b..fc5f113618f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2545,10 +2545,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.10": - version "0.5.10" - resolved "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz" - integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== +"@tailwindcss/typography@0.5.11": + version "0.5.11" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.11.tgz#408ed44d6eec7703a8543a0e78f65b05619ca162" + integrity sha512-ahOULqBQGCdSqL3vMNjH1R5cU2gxTh059fJIKF2enHXE8c/s3yKGDSKZ1+4poCr7BZRREJS8n5cCFmwsW4Ok3A== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" From 4a4ec07fb2f35d85709d076f4cb61999f40bd4c1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:39:29 +0100 Subject: [PATCH 523/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/fabric/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/fabric/fr.md b/markdown/org/docs/designs/wahid/fabric/fr.md index 35063c237f7..6bbfce2ee00 100644 --- a/markdown/org/docs/designs/wahid/fabric/fr.md +++ b/markdown/org/docs/designs/wahid/fabric/fr.md @@ -2,7 +2,7 @@ title: "Gilet Wahid : Options de tissu" --- -Tous les tissus de costumes sont un très bon choix pour votre gilet. Toute boutique en tissu qui se respecte devrait avoir une catégorie avec du tissu pour costume. Vous pouvez simplement entrer, demander où vous pouvez trouver le tissu pour des costumes, et choisir quelque chose que vous aimez. +Tous les tissus de costumes sont un très bon choix pour votre gilet. Toute boutique de tissu qui se respecte devrait avoir une catégorie avec du tissu pour costume. Vous pouvez simplement entrer, demander où vous pouvez trouver le tissu pour des costumes, et choisir quelque chose que vous aimez. Ces tissus sont généralement en laine, mais vous pouvez aussi être un peu plus créatif et opter pour autre chose. From b79e3888d93c0994490f367ea548158a7d7696e3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:39:31 +0100 Subject: [PATCH 524/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/instructions/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/instructions/fr.md b/markdown/org/docs/designs/wahid/instructions/fr.md index 7c19deefcdf..c7fd906fe52 100644 --- a/markdown/org/docs/designs/wahid/instructions/fr.md +++ b/markdown/org/docs/designs/wahid/instructions/fr.md @@ -140,7 +140,7 @@ Retournez le parement de poche vers l'arrière et repassez. ![Repasser les triangles sur les côtés courts](05h.png) -Move your pocket facing out of the way to reveal those little triangles at the side of your pocket. +Déplacez votre parement de poche sur le côté pour révéler ces petits triangles sur le côté de votre poche. Repliez-les vers l'arrière en vous assurant de garder un rectangle parfait pour l'ouverture de poche, puis repassez-les. From a300ab6ea0b617598e30609b6f8b1906a04dc4df Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:39:46 +0100 Subject: [PATCH 525/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/options/weltheight/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/options/weltheight/fr.md b/markdown/org/docs/designs/wahid/options/weltheight/fr.md index 2c20e3a92f6..73a2e131146 100644 --- a/markdown/org/docs/designs/wahid/options/weltheight/fr.md +++ b/markdown/org/docs/designs/wahid/options/weltheight/fr.md @@ -2,7 +2,7 @@ title: "Hauteur du revers de poche" --- -Contrôle la hauteur des douilles de poche. +Contrôle la hauteur des passepoils de poche. From 0ebd635a5d04694b1b2831f1be0e2e5d3d6b7f76 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:45:38 +0100 Subject: [PATCH 526/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/notes/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/notes/fr.md b/markdown/org/docs/designs/wahid/notes/fr.md index c603f009100..6c831367f2e 100644 --- a/markdown/org/docs/designs/wahid/notes/fr.md +++ b/markdown/org/docs/designs/wahid/notes/fr.md @@ -2,7 +2,7 @@ title: "Gilet Wahid Notes du créateur" --- -J'aime les gilets. I think they are not only pretty to look at, they are also warm, cut down on the amount of shirt ironing you have to do, and have these cute little pockets you can put tiny things in. +J'aime les gilets. Je pense qu'elles ne sont pas seulement jolies à regarder, elles sont aussi chaudes, réduisent la quantité de repassage de chemise que tu dois faire, et ont ces petites poches mignonnes dans lesquelles tu peux mettre des choses minuscules. J'ai donc conçu Wahid pour pouvoir me fabriquer des gilets. From a85af73d08f35f135276177522e5455f7db484dc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:47:41 +0100 Subject: [PATCH 527/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/wahid/options/armholedepth/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/options/armholedepth/fr.md b/markdown/org/docs/designs/wahid/options/armholedepth/fr.md index 2d1e031d61e..3be31826815 100644 --- a/markdown/org/docs/designs/wahid/options/armholedepth/fr.md +++ b/markdown/org/docs/designs/wahid/options/armholedepth/fr.md @@ -4,5 +4,5 @@ title: "Profondeur d'emmanchure" Cette option contrôle la profondeur de l'emmanchure. -Cette option s'applique à la nouvelle façon v3 de calculer la profondeur de l'emmanchure. Si tu actives l'option [legacy armhole depth](/docs/designs/wahid/options/legacyarmholedepth) , cette option ne s'appliquera pas, mais c'est sa version legacy [armhole depth factor](/docs/designs/wahid/options/armholedepthfactor) qui s'appliquera. +Cette option s'applique à la nouvelle façon v3 de calculer la profondeur de l'emmanchure. Si tu actives l'option [profondeur d'emmanchure legacy](/docs/designs/wahid/options/legacyarmholedepth) , cette option ne s'appliquera pas, mais c'est sa version legacy [facteur de profondeur d'emmanchure](/docs/designs/wahid/options/armholedepthfactor) qui s'appliquera. From 3c4b9302c852019b6d764bea619a1bd321b2cf7f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 27 Mar 2024 18:47:42 +0100 Subject: [PATCH 528/795] New translations en.md (French) skip-build --- .../org/docs/designs/wahid/options/legacyarmholedepth/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/wahid/options/legacyarmholedepth/fr.md b/markdown/org/docs/designs/wahid/options/legacyarmholedepth/fr.md index 84cecd2bffc..63017bdf014 100644 --- a/markdown/org/docs/designs/wahid/options/legacyarmholedepth/fr.md +++ b/markdown/org/docs/designs/wahid/options/legacyarmholedepth/fr.md @@ -8,4 +8,4 @@ L'ancienne méthode (v2) utilisait la circonférence du biceps pour estimer la p La méthode v3 utilise plutôt la mesure de la taille à l'aisselle pour situer le bas de l'emmanchure. -Si tu actives cette option, le bloc Brian reviendra à la façon v2 de calculer la profondeur de l'emmanchure, et Wahid suivra. +Si tu actives cette option, le bloc Brian reviendra à la façon v2 pour calculer la profondeur de l'emmanchure, et Wahid suivra. From cc035e761c5b50b5e91a11f2498673c01b6c5588 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 04:59:40 +0000 Subject: [PATCH 529/795] chore(deps): Bump @tailwindcss/typography from 0.5.11 to 0.5.12 Bumps [@tailwindcss/typography](https://github.com/tailwindlabs/tailwindcss-typography) from 0.5.11 to 0.5.12. - [Release notes](https://github.com/tailwindlabs/tailwindcss-typography/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.11...v0.5.12) --- updated-dependencies: - dependency-name: "@tailwindcss/typography" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 065bee67f12..1d1a283ffd0 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -33,7 +33,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", - "@tailwindcss/typography": "0.5.11", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.22.1", "daisyui": "4.8.0", "lodash.get": "4.4.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index 38927c24446..29e248afcb9 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -30,7 +30,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@tailwindcss/typography": "0.5.11", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.22.1", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index 5dc3034d18d..e3cc3dcaf0a 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -34,7 +34,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.11", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.8.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 2515154635a..2ec161dfea0 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -44,7 +44,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.11", + "@tailwindcss/typography": "0.5.12", "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", diff --git a/sites/shared/package.json b/sites/shared/package.json index 81fd63fd19e..21ec651732e 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -18,7 +18,7 @@ "dependencies": { "@next/mdx": "14.1.4", "@resvg/resvg-js": "2.6.2", - "@tailwindcss/typography": "0.5.11", + "@tailwindcss/typography": "0.5.12", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/yarn.lock b/yarn.lock index e5ceb022b5a..456aeed630c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2545,10 +2545,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.11": - version "0.5.11" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.11.tgz#408ed44d6eec7703a8543a0e78f65b05619ca162" - integrity sha512-ahOULqBQGCdSqL3vMNjH1R5cU2gxTh059fJIKF2enHXE8c/s3yKGDSKZ1+4poCr7BZRREJS8n5cCFmwsW4Ok3A== +"@tailwindcss/typography@0.5.12": + version "0.5.12" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.12.tgz#c0532fd594427b7f4e8e38eff7bf272c63a1dca4" + integrity sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" From e2e8a75ca43b7c022eb87973d6d97c1845333955 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 05:00:42 +0000 Subject: [PATCH 530/795] chore(deps): Bump tailwindcss from 3.4.1 to 3.4.3 Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.4.1 to 3.4.3. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.3/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.1...v3.4.3) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 065bee67f12..e272975c25c 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -64,7 +64,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/lab/package.json b/sites/lab/package.json index 38927c24446..bf7271cc664 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -65,7 +65,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/org/package.json b/sites/org/package.json index 5dc3034d18d..cc8d3f4a01f 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -72,7 +72,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/sde/package.json b/sites/sde/package.json index 2515154635a..b4357129233 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -82,7 +82,7 @@ "remark-smartypants": "2.1.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "tlds": "1.251.0", "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" diff --git a/yarn.lock b/yarn.lock index e5ceb022b5a..2654d752290 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7947,7 +7947,7 @@ jest-get-type@^29.6.3: resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== -jiti@^1.19.1: +jiti@^1.19.1, jiti@^1.21.0: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -13207,10 +13207,10 @@ synckit@^0.6.0: dependencies: tslib "^2.3.1" -tailwindcss@3.4.1: - version "3.4.1" - resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz" - integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== +tailwindcss@3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" + integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" @@ -13220,7 +13220,7 @@ tailwindcss@3.4.1: fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.19.1" + jiti "^1.21.0" lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" From c2c3c024de5d0ebd686f04f20874a044678d0075 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 05:02:29 +0000 Subject: [PATCH 531/795] chore(deps): Bump swagger-ui-dist from 5.12.2 to 5.12.3 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.12.2 to 5.12.3. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.12.2...v5.12.3) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 4068dc097a3..0c2c5503da5 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.12.2", + "swagger-ui-dist": "5.12.3", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index e5ceb022b5a..f5f7931a631 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13188,10 +13188,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.12.2, swagger-ui-dist@>=5.0.0: - version "5.12.2" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.2.tgz#b04de905475ac0140d96177fe52c2c8f75ba0fbe" - integrity sha512-Fk8qZCBgZPkDli81pLrkSN15rs49xKnPkjhtKmUImmak4l2HdLiR/R7RgPkMGn1MuXvoIoLjIWgjE7NBgLWZHg== +swagger-ui-dist@5.12.3, swagger-ui-dist@>=5.0.0: + version "5.12.3" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.3.tgz#6a2bee23486ebf773a7e16e888477b0273861367" + integrity sha512-UAFxQSzxVkY/yfmipeMLj4LwH6I/ZGcfezwSquPm2U9CqOiHp8L6fD7TcyPDYfCZuHFaPw5y4io+fny37Ov9NQ== swagger-ui-express@5.0.0: version "5.0.0" From 886b5d816d3ac8433e2addbba06d0ff2b9027562 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 05:03:45 +0000 Subject: [PATCH 532/795] chore(deps): Bump html-react-parser from 5.1.9 to 5.1.10 Bumps [html-react-parser](https://github.com/remarkablemark/html-react-parser) from 5.1.9 to 5.1.10. - [Release notes](https://github.com/remarkablemark/html-react-parser/releases) - [Changelog](https://github.com/remarkablemark/html-react-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/remarkablemark/html-react-parser/compare/v5.1.9...v5.1.10) --- updated-dependencies: - dependency-name: html-react-parser dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index e5ceb022b5a..576ae7a53cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7018,14 +7018,14 @@ html-parse-stringify@^3.0.1: void-elements "3.1.0" html-react-parser@^5.0.7: - version "5.1.9" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.1.9.tgz#7a8eb3a0b243bddf68f1a77bba5e423933b64161" - integrity sha512-MP0MQDEGlzkJT0OwY//tKYrgIzBM1frYLxx9RF7ALdIjI+MCMumydcNovXDX4X/iDi1zfgaU28VxoNXZn7EPjQ== + version "5.1.10" + resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.1.10.tgz#e65bf68df9b505756680d2cae842f7add3da5305" + integrity sha512-gV22PvLij4wdEdtrZbGVC7Zy2OVWnQ0bYhX63S196ZRSx4+K0TuutCreHSXr+saUia8KeKB+2TYziVfijpH4Tw== dependencies: domhandler "5.0.3" html-dom-parser "5.0.8" react-property "2.0.2" - style-to-js "1.1.11" + style-to-js "1.1.12" html-to-text@^9.0.5: version "9.0.5" @@ -7298,6 +7298,11 @@ inline-style-parser@0.2.2: resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.2.tgz" integrity sha512-EcKzdTHVe8wFVOGEYXiW9WmJXPjqi1T+234YpJr98RiFYKHV3cdy1+3mkTE+KHTHxFFLH51SfaGOoUdW+v7ViQ== +inline-style-parser@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.3.tgz#e35c5fb45f3a83ed7849fe487336eb7efa25971c" + integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g== + inquirer@^7.3.3: version "7.3.3" resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz" @@ -13077,19 +13082,19 @@ stubs@^3.0.0: resolved "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz" integrity sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw== -style-to-js@1.1.11: - version "1.1.11" - resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.11.tgz#7ba66214cab556fdded4786e80de0baccfa0e942" - integrity sha512-yHpYzXzEkx7iDjGEmE8Eyl4K/hWIm36FXPdRsl2NHEpbigLeawLVsv6tcYp+2xNhfpCrut4w08dYqeCxWMdRxw== +style-to-js@1.1.12: + version "1.1.12" + resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.12.tgz#112dd054231e71643514013a4475d4649bb2b581" + integrity sha512-tv+/FkgNYHI2fvCoBMsqPHh5xovwiw+C3X0Gfnss/Syau0Nr3IqGOJ9XiOYXoPnToHVbllKFf5qCNFJGwFg5mg== dependencies: - style-to-object "1.0.5" + style-to-object "1.0.6" -style-to-object@1.0.5, style-to-object@^1.0.0: - version "1.0.5" - resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.5.tgz" - integrity sha512-rDRwHtoDD3UMMrmZ6BzOW0naTjMsVZLIjsGleSKS/0Oz+cgCfAPRspaqJuE8rDzpKha/nEvnM0IF4seEAZUTKQ== +style-to-object@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.6.tgz#0c28aed8be1813d166c60d962719b2907c26547b" + integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== dependencies: - inline-style-parser "0.2.2" + inline-style-parser "0.2.3" style-to-object@^0.3.0: version "0.3.0" @@ -13105,6 +13110,13 @@ style-to-object@^0.4.0: dependencies: inline-style-parser "0.1.1" +style-to-object@^1.0.0: + version "1.0.5" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.5.tgz" + integrity sha512-rDRwHtoDD3UMMrmZ6BzOW0naTjMsVZLIjsGleSKS/0Oz+cgCfAPRspaqJuE8rDzpKha/nEvnM0IF4seEAZUTKQ== + dependencies: + inline-style-parser "0.2.2" + styled-jsx@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz" From d988b46c0cf840b138a8641c6b3c757fd41e5835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 18:07:21 +0000 Subject: [PATCH 533/795] chore(deps): Bump algoliasearch from 4.22.1 to 4.23.2 Bumps [algoliasearch](https://github.com/algolia/algoliasearch-client-javascript) from 4.22.1 to 4.23.2. - [Release notes](https://github.com/algolia/algoliasearch-client-javascript/releases) - [Changelog](https://github.com/algolia/algoliasearch-client-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/algolia/algoliasearch-client-javascript/compare/4.22.1...4.23.2) --- updated-dependencies: - dependency-name: algoliasearch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- yarn.lock | 214 ++++++++++++++++++++++------------------- 4 files changed, 119 insertions(+), 101 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 61c828feaf0..a13d71128e2 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -34,7 +34,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.2", "daisyui": "4.8.0", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index 0313be01e02..6d718506d4c 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -31,7 +31,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.2", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index 5cb8e1b5588..0704c9bde4f 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -35,7 +35,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.2", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.8.0", "echarts": "5.5.0", diff --git a/yarn.lock b/yarn.lock index a1852897450..c1e0857dfea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,114 +7,131 @@ resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@algolia/cache-browser-local-storage@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz" - integrity sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g== +"@algolia/cache-browser-local-storage@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.2.tgz#060d15e89588fcac18e73643201fce0f4f7d5ca0" + integrity sha512-PvRQdCmtiU22dw9ZcTJkrVKgNBVAxKgD0/cfiqyxhA5+PHzA2WDt6jOmZ9QASkeM2BpyzClJb/Wr1yt2/t78Kw== dependencies: - "@algolia/cache-common" "4.22.1" + "@algolia/cache-common" "4.23.2" -"@algolia/cache-common@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz" - integrity sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA== +"@algolia/cache-common@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.2.tgz#c68706ce34b18377e56e71ac13cce2dd5662dcee" + integrity sha512-OUK/6mqr6CQWxzl/QY0/mwhlGvS6fMtvEPyn/7AHUx96NjqDA4X4+Ju7aXFQKh+m3jW9VPB0B9xvEQgyAnRPNw== -"@algolia/cache-in-memory@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz" - integrity sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw== +"@algolia/cache-in-memory@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.2.tgz#94cd828275d7a12186959bf1b95a13247e103b23" + integrity sha512-rfbi/SnhEa3MmlqQvgYz/9NNJ156NkU6xFxjbxBtLWnHbpj+qnlMoKd+amoiacHRITpajg6zYbLM9dnaD3Bczw== dependencies: - "@algolia/cache-common" "4.22.1" + "@algolia/cache-common" "4.23.2" -"@algolia/client-account@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz" - integrity sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw== +"@algolia/client-account@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.2.tgz#b53cb14e730fd8e0a0a227cf650b287b570a08bc" + integrity sha512-VbrOCLIN/5I7iIdskSoSw3uOUPF516k4SjDD4Qz3BFwa3of7D9A0lzBMAvQEJJEPHWdVraBJlGgdJq/ttmquJQ== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.2" + "@algolia/client-search" "4.23.2" + "@algolia/transporter" "4.23.2" -"@algolia/client-analytics@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz" - integrity sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg== +"@algolia/client-analytics@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.2.tgz#7fdcf1cb27f0ae93e5da6beb4e612fc06a880b0c" + integrity sha512-lLj7irsAztGhMoEx/SwKd1cwLY6Daf1Q5f2AOsZacpppSvuFvuBrmkzT7pap1OD/OePjLKxicJS8wNA0+zKtuw== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.2" + "@algolia/client-search" "4.23.2" + "@algolia/requester-common" "4.23.2" + "@algolia/transporter" "4.23.2" -"@algolia/client-common@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz" - integrity sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ== +"@algolia/client-common@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.2.tgz#e5f86fc2de707eb6bf9f1109b70187dae179c72c" + integrity sha512-Q2K1FRJBern8kIfZ0EqPvUr3V29ICxCm/q42zInV+VJRjldAD9oTsMGwqUQ26GFMdFYmqkEfCbY4VGAiQhh22g== dependencies: - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/requester-common" "4.23.2" + "@algolia/transporter" "4.23.2" -"@algolia/client-personalization@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz" - integrity sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ== +"@algolia/client-personalization@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.2.tgz#0472d9c207402eefcc9c98f7ffba5d26fe8e2fd0" + integrity sha512-vwPsgnCGhUcHhhQG5IM27z8q7dWrN9itjdvgA6uKf2e9r7vB+WXt4OocK0CeoYQt3OGEAExryzsB8DWqdMK5wg== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.2" + "@algolia/requester-common" "4.23.2" + "@algolia/transporter" "4.23.2" -"@algolia/client-search@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz" - integrity sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA== +"@algolia/client-search@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.2.tgz#9b2741f0a209596459f06a44583118207ea287f7" + integrity sha512-CxSB29OVGSE7l/iyoHvamMonzq7Ev8lnk/OkzleODZ1iBcCs3JC/XgTIKzN/4RSTrJ9QybsnlrN/bYCGufo7qw== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.2" + "@algolia/requester-common" "4.23.2" + "@algolia/transporter" "4.23.2" "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== -"@algolia/logger-common@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz" - integrity sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg== +"@algolia/logger-common@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.2.tgz#5441a828f0fad1ceaae3a27caec7b663d40dd27f" + integrity sha512-jGM49Q7626cXZ7qRAWXn0jDlzvoA1FvN4rKTi1g0hxKsTTSReyYk0i1ADWjChDPl3Q+nSDhJuosM2bBUAay7xw== -"@algolia/logger-console@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz" - integrity sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA== +"@algolia/logger-console@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.2.tgz#fda4252bb02df7c52a92c63f1e357bf7370cc8db" + integrity sha512-oo+lnxxEmlhTBTFZ3fGz1O8PJ+G+8FiAoMY2Qo3Q4w23xocQev6KqDTA1JQAGPDxAewNA2VBwWOsVXeXFjrI/Q== dependencies: - "@algolia/logger-common" "4.22.1" + "@algolia/logger-common" "4.23.2" -"@algolia/requester-browser-xhr@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz" - integrity sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw== +"@algolia/recommend@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.23.2.tgz#02bf57f836ced2c850633239d493a0414be76a7f" + integrity sha512-Q75CjnzRCDzgIlgWfPnkLtrfF4t82JCirhalXkSSwe/c1GH5pWh4xUyDOR3KTMo+YxxX3zTlrL/FjHmUJEWEcg== dependencies: - "@algolia/requester-common" "4.22.1" + "@algolia/cache-browser-local-storage" "4.23.2" + "@algolia/cache-common" "4.23.2" + "@algolia/cache-in-memory" "4.23.2" + "@algolia/client-common" "4.23.2" + "@algolia/client-search" "4.23.2" + "@algolia/logger-common" "4.23.2" + "@algolia/logger-console" "4.23.2" + "@algolia/requester-browser-xhr" "4.23.2" + "@algolia/requester-common" "4.23.2" + "@algolia/requester-node-http" "4.23.2" + "@algolia/transporter" "4.23.2" -"@algolia/requester-common@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz" - integrity sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg== - -"@algolia/requester-node-http@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz" - integrity sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA== +"@algolia/requester-browser-xhr@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.2.tgz#2d0a6b642e2a2bbfb2e2ff3d1e82158e3e143def" + integrity sha512-TO9wLlp8+rvW9LnIfyHsu8mNAMYrqNdQ0oLF6eTWFxXfxG3k8F/Bh7nFYGk2rFAYty4Fw4XUtrv/YjeNDtM5og== dependencies: - "@algolia/requester-common" "4.22.1" + "@algolia/requester-common" "4.23.2" -"@algolia/transporter@4.22.1": - version "4.22.1" - resolved "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz" - integrity sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ== +"@algolia/requester-common@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.2.tgz#9c2e5da4dc15e65f9b9bbe5bedb419cf23092ef1" + integrity sha512-3EfpBS0Hri0lGDB5H/BocLt7Vkop0bTTLVUBB844HH6tVycwShmsV6bDR7yXbQvFP1uNpgePRD3cdBCjeHmk6Q== + +"@algolia/requester-node-http@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.2.tgz#718ae71f58949eab3b5fcfc440be42af41bd640f" + integrity sha512-SVzgkZM/malo+2SB0NWDXpnT7nO5IZwuDTaaH6SjLeOHcya1o56LSWXk+3F3rNLz2GVH+I/rpYKiqmHhSOjerw== dependencies: - "@algolia/cache-common" "4.22.1" - "@algolia/logger-common" "4.22.1" - "@algolia/requester-common" "4.22.1" + "@algolia/requester-common" "4.23.2" + +"@algolia/transporter@4.23.2": + version "4.23.2" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.2.tgz#61e7b9288d4f561b2015ddde689ba31e08c21644" + integrity sha512-GY3aGKBy+8AK4vZh8sfkatDciDVKad5rTY2S10Aefyjh7e7UGBP4zigf42qVXwU8VOPwi7l/L7OACGMOFcjB0Q== + dependencies: + "@algolia/cache-common" "4.23.2" + "@algolia/logger-common" "4.23.2" + "@algolia/requester-common" "4.23.2" "@algolia/ui-components-highlight-vdom@^1.2.1": version "1.2.2" @@ -2986,25 +3003,26 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" -algoliasearch@4.22.1: - version "4.22.1" - resolved "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz" - integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== +algoliasearch@4.23.2: + version "4.23.2" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.2.tgz#3b7bc93d98f3965628c73a06cbf9203531324a9d" + integrity sha512-8aCl055IsokLuPU8BzLjwzXjb7ty9TPcUFFOk0pYOwsE5DMVhE3kwCMFtsCFKcnoPZK7oObm+H5mbnSO/9ioxQ== dependencies: - "@algolia/cache-browser-local-storage" "4.22.1" - "@algolia/cache-common" "4.22.1" - "@algolia/cache-in-memory" "4.22.1" - "@algolia/client-account" "4.22.1" - "@algolia/client-analytics" "4.22.1" - "@algolia/client-common" "4.22.1" - "@algolia/client-personalization" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/logger-common" "4.22.1" - "@algolia/logger-console" "4.22.1" - "@algolia/requester-browser-xhr" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/requester-node-http" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/cache-browser-local-storage" "4.23.2" + "@algolia/cache-common" "4.23.2" + "@algolia/cache-in-memory" "4.23.2" + "@algolia/client-account" "4.23.2" + "@algolia/client-analytics" "4.23.2" + "@algolia/client-common" "4.23.2" + "@algolia/client-personalization" "4.23.2" + "@algolia/client-search" "4.23.2" + "@algolia/logger-common" "4.23.2" + "@algolia/logger-console" "4.23.2" + "@algolia/recommend" "4.23.2" + "@algolia/requester-browser-xhr" "4.23.2" + "@algolia/requester-common" "4.23.2" + "@algolia/requester-node-http" "4.23.2" + "@algolia/transporter" "4.23.2" all-contributors-cli@^6.26.1: version "6.26.1" From be5b00ac7ae79431955626d0cd8e1e1b8dd168c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 04:23:20 +0000 Subject: [PATCH 534/795] chore(deps): Bump glob from 10.3.10 to 10.3.12 Bumps [glob](https://github.com/isaacs/node-glob) from 10.3.10 to 10.3.12. - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v10.3.10...v10.3.12) --- updated-dependencies: - dependency-name: glob dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/yarn.lock b/yarn.lock index a1852897450..cb8087bcbf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6476,7 +6476,7 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@10.3.10, glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: +glob@10.3.10: version "10.3.10" resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz" integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== @@ -6498,6 +6498,17 @@ glob@8.1.0, glob@^8.0.1: minimatch "^5.0.1" once "^1.3.0" +glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: + version "10.3.12" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.6" + minimatch "^9.0.1" + minipass "^7.0.4" + path-scurry "^1.10.2" + glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" @@ -7913,7 +7924,7 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" -jackspeak@^2.3.5: +jackspeak@^2.3.5, jackspeak@^2.3.6: version "2.3.6" resolved "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz" integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== @@ -8672,7 +8683,7 @@ lowlight@^3.0.0: devlop "^1.0.0" highlight.js "~11.9.0" -lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0": +lru-cache@^10.0.1, lru-cache@^10.2.0: version "10.2.0" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz" integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== @@ -10010,7 +10021,7 @@ minipass@^5.0.0: resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3: +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: version "7.0.4" resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== @@ -11107,12 +11118,12 @@ path-parse@^1.0.7: resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-scurry@^1.10.1, path-scurry@^1.6.1: - version "1.10.1" - resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz" - integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== +path-scurry@^1.10.1, path-scurry@^1.10.2, path-scurry@^1.6.1: + version "1.10.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== dependencies: - lru-cache "^9.1.1 || ^10.0.0" + lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-to-regexp@0.1.7: From 31599d5541ab70227a45d189e8d7646dcd877248 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 04:23:48 +0000 Subject: [PATCH 535/795] chore(deps): Bump tlds from 1.251.0 to 1.252.0 Bumps [tlds](https://github.com/stephenmathieson/node-tlds) from 1.251.0 to 1.252.0. - [Changelog](https://github.com/stephenmathieson/node-tlds/blob/master/CHANGELOG.md) - [Commits](https://github.com/stephenmathieson/node-tlds/compare/1.251.0...1.252.0) --- updated-dependencies: - dependency-name: tlds dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index c5a0d4b8340..9c805a545de 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -83,7 +83,7 @@ "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.3", - "tlds": "1.251.0", + "tlds": "1.252.0", "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, diff --git a/sites/shared/package.json b/sites/shared/package.json index 21ec651732e..c2c31720088 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -52,7 +52,7 @@ "remark-smartypants": "2.1.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tlds": "1.251.0", + "tlds": "1.252.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", "use-local-storage-state": "19.2.0", diff --git a/yarn.lock b/yarn.lock index a1852897450..0518d559d5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13371,10 +13371,10 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.3: resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -tlds@1.251.0: - version "1.251.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.251.0.tgz#d5a79fe0ddd564dadef7b3ce0b5f7f6e5acd2f99" - integrity sha512-yztVk5O1LGKCjPd+7soBQyiKvSBXI5qugc/X0C7pLa0rV5ufBS6xcyX0pdf4NznO8xcZ5fqX248q+jTHd4AQJA== +tlds@1.252.0: + version "1.252.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.252.0.tgz#71d9617f4ef4cc7347843bee72428e71b8b0f419" + integrity sha512-GA16+8HXvqtfEnw/DTcwB0UU354QE1n3+wh08oFjr6Znl7ZLAeUgYzCcK+/CCrOyE0vnHR8/pu3XXG3vDijXpQ== tmp@^0.0.33: version "0.0.33" From c63cb268d52f6dd053eca60a1d49ad35fef8475c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 04:24:51 +0000 Subject: [PATCH 536/795] chore(deps): Bump react-zoom-pan-pinch from 3.4.3 to 3.4.4 Bumps [react-zoom-pan-pinch](https://github.com/prc5/react-zoom-pan-pinch) from 3.4.3 to 3.4.4. - [Release notes](https://github.com/prc5/react-zoom-pan-pinch/releases) - [Changelog](https://github.com/BetterTyped/react-zoom-pan-pinch/blob/master/CHANGELOG.md) - [Commits](https://github.com/prc5/react-zoom-pan-pinch/compare/v3.4.3...v3.4.4) --- updated-dependencies: - dependency-name: react-zoom-pan-pinch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index c5a0d4b8340..300b2d71fc5 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -75,7 +75,7 @@ "react-dropzone": "14.2.3", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.3", + "react-zoom-pan-pinch": "3.4.4", "remark-gfm": "4.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", diff --git a/sites/shared/package.json b/sites/shared/package.json index 21ec651732e..ecd3b0157dc 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -44,7 +44,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.3", + "react-zoom-pan-pinch": "3.4.4", "rehype-autolink-headings": "7.1.0", "rehype-highlight": "7.0.0", "remark-frontmatter": "5.0.0", diff --git a/yarn.lock b/yarn.lock index a1852897450..78d57bd9f6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11728,10 +11728,10 @@ react-timeago@7.2.0: resolved "https://registry.npmjs.org/react-timeago/-/react-timeago-7.2.0.tgz" integrity sha512-2KsBEEs+qRhKx/kekUVNSTIpop3Jwd7SRBm0R4Eiq3mPeswRGSsftY9FpKsE/lXLdURyQFiHeHFrIUxLYskG5g== -react-zoom-pan-pinch@3.4.3: - version "3.4.3" - resolved "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.3.tgz" - integrity sha512-x5MFlfAx2D6NTpZu8OISqc2nYn4p+YEaM1p21w7S/VE1wbVzK8vRzTo9Bj1ydufa649MuP7JBRM3vvj1RftFZw== +react-zoom-pan-pinch@3.4.4: + version "3.4.4" + resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.4.tgz#5450b027dbf9f161773cde71b061423ff1109328" + integrity sha512-lGTu7D9lQpYEQ6sH+NSlLA7gicgKRW8j+D/4HO1AbSV2POvKRFzdWQ8eI0r3xmOsl4dYQcY+teV6MhULeg1xBw== react@18.2.0, react@^18.2.0: version "18.2.0" From 0bcac4c7095312af32d1d0716b7055a22e8bb35e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 16:40:58 +0000 Subject: [PATCH 537/795] chore(deps): Bump daisyui from 4.8.0 to 4.9.0 Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.8.0 to 4.9.0. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.8.0...v4.9.0) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index a13d71128e2..62e1a7c44bd 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -35,7 +35,7 @@ "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.2", - "daisyui": "4.8.0", + "daisyui": "4.9.0", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index 6d718506d4c..b952d2970b5 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.8.0", + "daisyui": "4.9.0", "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index 0704c9bde4f..fa239b578dc 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,7 +37,7 @@ "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.2", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.8.0", + "daisyui": "4.9.0", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.7.1", diff --git a/sites/sde/package.json b/sites/sde/package.json index fc176a74145..c3fcc119ed4 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,7 +50,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.8.0", + "daisyui": "4.9.0", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", diff --git a/sites/shared/package.json b/sites/shared/package.json index c5ccd15a6f7..60e7e34a3c9 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,7 +23,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.8.0", + "daisyui": "4.9.0", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 732e4cbe576..a2d90dd6b2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4722,10 +4722,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.8.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.8.0.tgz#f49ed22d07fe67d92b3f9bd334f8cd4efd3ccb2d" - integrity sha512-SXy6MVzhqaa1vPZIdo5K/QAyRaQ4dbRHG+oXy7BFqJnZlwOB6bGkQRqqvClBUY2wCyiiyhk4gY5Ngi1m2JRIEA== +daisyui@4.9.0: + version "4.9.0" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.9.0.tgz#c99b0d7146567a73735c56da9895a789da9c73aa" + integrity sha512-9JsDx4E+30kPxThE+6yEwQokqg1957uwTx/skP2RE98fG6Ten6U+S9YXeQg1a3CI958aF5aOb0oEA+KZFfrZUA== dependencies: css-selector-tokenizer "^0.8" culori "^3" From e6e709e9c881202bd908858d8916d6435c5789b4 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Sat, 30 Mar 2024 17:20:56 +0000 Subject: [PATCH 538/795] Implements #6457 --- designs/noble/i18n/de.json | 4 ++ designs/noble/i18n/en.json | 4 ++ designs/noble/i18n/es.json | 4 ++ designs/noble/i18n/fr.json | 4 ++ designs/noble/i18n/nl.json | 4 ++ designs/noble/i18n/uk.json | 4 ++ designs/noble/src/frontoutside.mjs | 9 ---- designs/noble/src/frontpoints.mjs | 81 +++++++++++++++++++++++----- designs/noble/src/options.mjs | 9 ++++ designs/tristan/i18n/de.json | 4 ++ designs/tristan/i18n/en.json | 4 ++ designs/tristan/i18n/es.json | 4 ++ designs/tristan/i18n/fr.json | 4 ++ designs/tristan/i18n/nl.json | 4 ++ designs/tristan/i18n/uk.json | 4 ++ designs/tristan/src/frontoutside.mjs | 10 ---- 16 files changed, 126 insertions(+), 31 deletions(-) diff --git a/designs/noble/i18n/de.json b/designs/noble/i18n/de.json index e09ebab2a2f..cfbdd5ff192 100644 --- a/designs/noble/i18n/de.json +++ b/designs/noble/i18n/de.json @@ -35,6 +35,10 @@ "t": "Länge des Taillenabnähers", "d": "Steuert die Länge des Taillenabnähers" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Position der Schulterabnäher", "d": "Steuert die Position der Schulternaht" diff --git a/designs/noble/i18n/en.json b/designs/noble/i18n/en.json index 1226ebf3dcd..429f8a64688 100644 --- a/designs/noble/i18n/en.json +++ b/designs/noble/i18n/en.json @@ -49,6 +49,10 @@ "t": "Waist dart length", "d": "Controls the length of the waist dart" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/noble/i18n/es.json b/designs/noble/i18n/es.json index 3684ac72e67..1a3fa571bda 100644 --- a/designs/noble/i18n/es.json +++ b/designs/noble/i18n/es.json @@ -35,6 +35,10 @@ "t": "Longitud del dart de Waist", "d": "Controla la longitud del dardo de la cintura" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/noble/i18n/fr.json b/designs/noble/i18n/fr.json index a657797a87f..b8787ae4791 100644 --- a/designs/noble/i18n/fr.json +++ b/designs/noble/i18n/fr.json @@ -35,6 +35,10 @@ "t": "Longueur de la pince de taille", "d": "Contrôle la longueur de la pince de taille" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Position de la pince d'épaule", "d": "Contrôle la position de la pince d'épaule" diff --git a/designs/noble/i18n/nl.json b/designs/noble/i18n/nl.json index 866ec5d93e8..6d79beaa917 100644 --- a/designs/noble/i18n/nl.json +++ b/designs/noble/i18n/nl.json @@ -35,6 +35,10 @@ "t": "Lengte neep taille", "d": "Bepaalt de lengte van de neep van de taille" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/noble/i18n/uk.json b/designs/noble/i18n/uk.json index 2b144342ae7..0dbed3b6ab6 100644 --- a/designs/noble/i18n/uk.json +++ b/designs/noble/i18n/uk.json @@ -35,6 +35,10 @@ "t": "Waist dart length", "d": "Controls the length of the waist dart" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/noble/src/frontoutside.mjs b/designs/noble/src/frontoutside.mjs index be39115b46d..118bc4b3b25 100644 --- a/designs/noble/src/frontoutside.mjs +++ b/designs/noble/src/frontoutside.mjs @@ -17,15 +17,6 @@ export const frontOutside = { macro('rmcutonfold') if (options.dartPosition == 'shoulder') { - paths.princessSeam = new Path() - .move(points.shoulderDartOutside) - .curve( - points.shoulderDartTipCpDownOutside, - points.waistUpDartRightCpUp, - points.waistUpDartRight - ) - .curve(points.waistUpDartRightCpDown, points.waistCpUp, points.waistDartRight) - .hide() paths.armhole = new Path() .move(points.armhole) .curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch) diff --git a/designs/noble/src/frontpoints.mjs b/designs/noble/src/frontpoints.mjs index 5d02fdf988a..4d3b74a9d52 100644 --- a/designs/noble/src/frontpoints.mjs +++ b/designs/noble/src/frontpoints.mjs @@ -2,7 +2,66 @@ import { frontSideDart as bellaFront } from '@freesewing/bella' import { cbqc, hidePresets } from '@freesewing/core' import * as options from './options.mjs' -const createRightDartPoints = (points, Path, diff, utils) => { +const createTopRightDartPoints = (points, Path, paths, options) => { + const topPath = new Path() + .move(points.waistUpDartRight) + .curve( + points.waistUpDartRightCpUp, + points.shoulderDartTipCpDownOutside, + points.shoulderDartOutside + ) + + const split1 = topPath.shiftFractionAlong(0.15 + options.shoulderDartCurvature * -1) + const split2 = topPath.shiftFractionAlong(0.5 + options.shoulderDartCurvature * -1) + const split3 = topPath.shiftFractionAlong(0.9 + options.shoulderDartCurvature * -0.5) + + const splitPath1 = topPath.split(split1) + const splitPath2 = splitPath1[1].split(split2) + const splitPath3 = splitPath2[1].split(split3) + + const splittedPath1 = splitPath1[0].clone() + const splittedPath2 = splitPath2[0].clone() + const splittedPath3 = splitPath3[0].clone() + const splittedPath4 = splitPath3[1].clone() + + points.shoulderDartPart1from = splittedPath1.ops[0].to.copy() + points.shoulderDartPart1cp1 = splittedPath1.ops[1].cp1.copy() + points.shoulderDartPart1cp2 = splittedPath1.ops[1].cp2.copy() + points.shoulderDartPart1to = splittedPath1.ops[1].to.copy() + points.shoulderDartPart2from = splittedPath2.ops[0].to.copy() + points.shoulderDartPart2cp1 = splittedPath2.ops[1].cp1.copy() + points.shoulderDartPart2cp2 = splittedPath2.ops[1].cp2.copy() + points.shoulderDartPart2to = splittedPath2.ops[1].to.copy() + points.shoulderDartPart3from = splittedPath3.ops[0].to.copy() + points.shoulderDartPart3cp1 = splittedPath3.ops[1].cp1.copy() + points.shoulderDartPart3cp2 = splittedPath3.ops[1].cp2.copy() + points.shoulderDartPart3to = splittedPath3.ops[1].to.copy() + points.shoulderDartPart4from = splittedPath4.ops[0].to.copy() + points.shoulderDartPart4cp1 = splittedPath4.ops[1].cp1.copy() + points.shoulderDartPart4cp2 = splittedPath4.ops[1].cp2.copy() + points.shoulderDartPart4to = splittedPath4.ops[1].to.copy() + + const sp2cp2a = points.shoulderDartPart2to.angle(points.shoulderDartPart2cp2) + const sp2cp2d = points.shoulderDartPart2to.dist(points.shoulderDartPart2cp2) + const sp3cp1a = points.shoulderDartPart3from.angle(points.shoulderDartPart3cp1) + const sp3cp1d = points.shoulderDartPart3from.dist(points.shoulderDartPart3cp1) + points.shoulderDartPart2to = points.shoulderDartPart2to.rotate( + options.shoulderDartCurvature * 100, + points.shoulderDartPart2from + ) + points.shoulderDartPart3from = points.shoulderDartPart2to.copy() + points.shoulderDartPart2cp2 = points.shoulderDartPart2to.shift(sp2cp2a, sp2cp2d) + points.shoulderDartPart3cp1 = points.shoulderDartPart3from.shift(sp3cp1a, sp3cp1d) + + return new Path() + .move(points.shoulderDartPart1from) + .curve(points.shoulderDartPart1cp1, points.shoulderDartPart1cp2, points.shoulderDartPart1to) + .curve(points.shoulderDartPart2cp1, points.shoulderDartPart2cp2, points.shoulderDartPart2to) + .curve(points.shoulderDartPart3cp1, points.shoulderDartPart3cp2, points.shoulderDartPart3to) + .curve(points.shoulderDartPart4cp1, points.shoulderDartPart4cp2, points.shoulderDartPart4to) +} + +const createRightDartPoints = (points, Path, paths, diff, utils, options) => { const radius = points.waistDartRight.dist(points.sideHemInitial) points.waistDartRight = points.waistDartRight.rotate( @@ -33,15 +92,13 @@ const createRightDartPoints = (points, Path, diff, utils) => { -0.5 * cbqc * points.armholeDartInside.dist(points.armholeDartTip) ) - return new Path() + paths.princessSeam = new Path() .move(points.waistDartRight) .curve(points.waistCpUp, points.waistUpDartRightCpDown, points.waistUpDartRight) - .curve( - points.waistUpDartRightCpUp, - points.shoulderDartTipCpDownOutside, - points.shoulderDartOutside - ) - .length() + .join(createTopRightDartPoints(points, Path, paths, options)) + .reverse() + .hide() + return paths.princessSeam.length() } const createArmholeDartPoints = (points, paths, Path, direction) => { @@ -121,7 +178,7 @@ export const frontPoints = { points.bust, options.upperDartLength ) - + points.bust points.armholeCircleInsideCp1 = points.armholeDartInside.shift( armholeDartAngle, cbqc * points.armholeDartInside.dist(points.armholeDartTip) @@ -290,15 +347,15 @@ export const frontPoints = { -0.5 * cbqc * points.armholeDartOutside.dist(points.armholeDartTip) ) points.shoulderDartTipCpDownOutside = points.shoulderDartTipCpDownOutside - .rotate(-2.5, points.shoulderDartOutside) + .rotate(2.5, points.shoulderDartOutside) .shiftFractionTowards(points.shoulderDartOutside, 0.2) let iteration = 1 let diff = 0 - let rightDartLength = createRightDartPoints(points, Path, diff, utils) + let rightDartLength = createRightDartPoints(points, Path, paths, diff, utils, options) do { - rightDartLength = createRightDartPoints(points, Path, diff, utils) + rightDartLength = createRightDartPoints(points, Path, paths, diff, utils, options) diff = shoulderInsideSeam.length() - rightDartLength iteration++ diff --git a/designs/noble/src/options.mjs b/designs/noble/src/options.mjs index 012fea26ae8..55649ccf375 100644 --- a/designs/noble/src/options.mjs +++ b/designs/noble/src/options.mjs @@ -10,15 +10,24 @@ export const backHemSlope = { deg: 2.5, min: 0, max: 5, menu: 'advanced' } export const upperDartLength = { pct: 90, min: 80, max: 95, menu: 'darts' } export const dartPosition = { dflt: 'shoulder', list: ['shoulder', 'armhole'], menu: 'darts' } export const waistdartposition = { pct: 0, min: -100, max: 100, menu: 'darts' } +export const shoulderDartCurvature = { + pct: 0, + min: -5, + max: 2.5, + // eslint-disable-next-line no-unused-vars + menu: (settings, mergedOptions) => (mergedOptions.dartPosition === 'shoulder' ? 'darts' : false), +} export const shoulderDartPosition = { pct: 50, min: 10, max: 90, + // eslint-disable-next-line no-unused-vars menu: (settings, mergedOptions) => (mergedOptions.dartPosition === 'shoulder' ? 'darts' : false), } export const armholeDartPosition = { pct: 50, min: 10, max: 90, + // eslint-disable-next-line no-unused-vars menu: (settings, mergedOptions) => (mergedOptions.dartPosition === 'armhole' ? 'darts' : false), } diff --git a/designs/tristan/i18n/de.json b/designs/tristan/i18n/de.json index 079db5e0e0d..9951cd33621 100644 --- a/designs/tristan/i18n/de.json +++ b/designs/tristan/i18n/de.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/i18n/en.json b/designs/tristan/i18n/en.json index ce735e5452a..43dff7b824a 100644 --- a/designs/tristan/i18n/en.json +++ b/designs/tristan/i18n/en.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/i18n/es.json b/designs/tristan/i18n/es.json index 079db5e0e0d..9951cd33621 100644 --- a/designs/tristan/i18n/es.json +++ b/designs/tristan/i18n/es.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/i18n/fr.json b/designs/tristan/i18n/fr.json index 079db5e0e0d..9951cd33621 100644 --- a/designs/tristan/i18n/fr.json +++ b/designs/tristan/i18n/fr.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/i18n/nl.json b/designs/tristan/i18n/nl.json index 079db5e0e0d..9951cd33621 100644 --- a/designs/tristan/i18n/nl.json +++ b/designs/tristan/i18n/nl.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/i18n/uk.json b/designs/tristan/i18n/uk.json index 079db5e0e0d..9951cd33621 100644 --- a/designs/tristan/i18n/uk.json +++ b/designs/tristan/i18n/uk.json @@ -77,6 +77,10 @@ "t": "Roundness of the cut in the front", "d": "Controls how 'round' the cut in the front is, from V to round to square" }, + "shoulderDartCurvature": { + "t": "Shoulder dart curvature", + "d": "Controls the curvature of the upper part of the shoulder dart" + }, "shoulderDartPosition": { "t": "Shoulder dart position", "d": "Controls the position of the shoulder dart" diff --git a/designs/tristan/src/frontoutside.mjs b/designs/tristan/src/frontoutside.mjs index 9b66adc8fd1..2b2e02f1255 100644 --- a/designs/tristan/src/frontoutside.mjs +++ b/designs/tristan/src/frontoutside.mjs @@ -19,16 +19,6 @@ export const frontOutside = { .curve(points.armholeCutCp, points.strapOutsideCp, points.strapOutside) .hide() - paths.princessSeam = new Path() - .move(points.shoulderDartOutside) - .curve( - points.shoulderDartTipCpDownOutside, - points.waistUpDartRightCpUp, - points.waistUpDartRight - ) - .curve(points.waistUpDartRightCpDown, points.waistCpUp, points.waistDartRight) - .hide() - paths.armhole = new Path() .move(points.armhole) .curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch) From e41ded769284b2c5d3c30090b16afb633c108950 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 04:56:46 +0000 Subject: [PATCH 539/795] chore(deps): Bump swagger-ui-dist from 5.12.3 to 5.13.0 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.12.3 to 5.13.0. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.12.3...v5.13.0) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 0c2c5503da5..7c0ba46c6a0 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.12.3", + "swagger-ui-dist": "5.13.0", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a2d90dd6b2f..847292ed651 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13229,10 +13229,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.12.3, swagger-ui-dist@>=5.0.0: - version "5.12.3" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.3.tgz#6a2bee23486ebf773a7e16e888477b0273861367" - integrity sha512-UAFxQSzxVkY/yfmipeMLj4LwH6I/ZGcfezwSquPm2U9CqOiHp8L6fD7TcyPDYfCZuHFaPw5y4io+fny37Ov9NQ== +swagger-ui-dist@5.13.0, swagger-ui-dist@>=5.0.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.13.0.tgz#e7e5b77de906d2d774c320f5f9fcaa6801cd7b88" + integrity sha512-uaWhh6j18IIs5tOX0arvIBnVINAzpTXaQXkr7qAk8zoupegJVg0UU/5+S/FgsgVCnzVsJ9d7QLjIxkswEeTg0Q== swagger-ui-express@5.0.0: version "5.0.0" From 9615f23b7fa7adc26ba96474298db975a9a43445 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Apr 2024 04:58:14 +0000 Subject: [PATCH 540/795] chore(deps): Bump jotai from 2.7.1 to 2.7.2 Bumps [jotai](https://github.com/pmndrs/jotai) from 2.7.1 to 2.7.2. - [Release notes](https://github.com/pmndrs/jotai/releases) - [Commits](https://github.com/pmndrs/jotai/compare/v2.7.1...v2.7.2) --- updated-dependencies: - dependency-name: jotai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index fa239b578dc..51ecb53967b 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -40,7 +40,7 @@ "daisyui": "4.9.0", "echarts": "5.5.0", "echarts-for-react": "3.0.2", - "jotai": "2.7.1", + "jotai": "2.7.2", "jotai-location": "0.5.4", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index c3fcc119ed4..1a48e829b18 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -55,7 +55,7 @@ "echarts-for-react": "3.0.2", "file-saver": "2.0.5", "i18next": "23.10.1", - "jotai": "2.7.1", + "jotai": "2.7.2", "jotai-location": "0.5.4", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", diff --git a/sites/shared/package.json b/sites/shared/package.json index 60e7e34a3c9..43d81af9670 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -29,7 +29,7 @@ "front-matter": "4.0.2", "highlight.js": "11.9.0", "github-slugger": "2.0.0", - "jotai": "2.7.1", + "jotai": "2.7.2", "jotai-location": "0.5.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", diff --git a/yarn.lock b/yarn.lock index a2d90dd6b2f..9b878372f16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7991,10 +7991,10 @@ jotai-location@0.5.4: resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" - integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== +jotai@2.7.2: + version "2.7.2" + resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.2.tgz#bfc49d76a93831f8e6b21e46662c3de7f15ae3d9" + integrity sha512-6Ft5kpNu8p93Ssf1Faoza3hYQZRIYp7rioK8MwTTFnbQKwUyZElwquPwl1h6U0uo9hC0jr+ghO3gcSjc6P35/Q== jpeg-exif@^1.1.4: version "1.1.4" From c44dac26ec7e557bc9c1c5bd6f8df826e02505c3 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Mon, 1 Apr 2024 16:11:15 +0200 Subject: [PATCH 541/795] chore(markdown): 2024q2 newsletter draft --- markdown/org/newsletter/2024q2/en.md | 287 +++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 markdown/org/newsletter/2024q2/en.md diff --git a/markdown/org/newsletter/2024q2/en.md b/markdown/org/newsletter/2024q2/en.md new file mode 100644 index 00000000000..892a9933301 --- /dev/null +++ b/markdown/org/newsletter/2024q2/en.md @@ -0,0 +1,287 @@ +--- +date: "2024-04-01" +edition: "2024q2" +intro: "Welcome to the 2024 Spring edition of the FreeSewing newsletter." +title: "2024 Spring edition" +--- + +Welcome to the 2024 Spring edition of the FreeSewing newsletter. + +Here's what we've got for you today, no joke: + +- 👕 FreeSewing 3.2 brings Tristan, Lumina, Lumira, and more (3-minute read by joost) +- 📨 Email just got harder, again (1-minute read by joost) +- 🕸️ Building FreeSewing's web of trust in the wake of the XZ backdoor attempt (5-minute by joost) +- 🤔 How FreeSewing's challenges have shifted over time (2-minute read by joost) + + +Shall we get started? + +  + +  + +## 👕 FreeSewing 3.2 brings Tristan, Lumina, Lumira, and more + +We released FreeSewing v3.2 earlier during Q1 2024 and it includes 3 new +designs, as well as a range of bug fixes and improvements. + +Let's have a look at the highlights: + +### The Tristan Top + +First up, there is [the Tristan Top](https://freesewing.org/designs/tristan). Tristan is a top with princess seams and (optional) lacing at front or/and back. It’s origin story is the need for a costume for a Renaissance festival, so that is probably a good indicator of what to expect. + +Tristan was design by Natalia who also [wrote a blog post about the new Tristan design](https://freesewing.org/blog/our-newest-design-is-the-tristan-top), so that's a great place to get all the details about this new design. + +### The Lumina and Lumira Leggings + +I’ll give you a second to scan that title again, but yes there are two different leggings patterns with similar names: [the Lumira Leggings](https://freesewing.org/designs/lumira) and the [Lumina Leggings](https://freesewing.org/designs/lumina). + +Both were born out of Wouter’s desire for good cycling gear, and I suggest you check out the designer notes for both [Lumina](https://freesewing.org/designs/lumina#notes) and [Lumira](https://freesewing.org/designs/lumira#notes) to fully appreciate the difference between these designs, why they differ, and what would work best for you. + +### Bug fixes and improvements + +Regular readers of the newsletter will know that we continiously roll out +improvements on FreeSewing.org and that those are not tied to a new release, +but it's a good opportunity to list them so here are some highlights of the bug +fixes and improvements that went into the 3.2 release: + +- Sandy has [a new panels + option](https://freesewing.org/docs/designs/sandy/options/panels) that was + added by [Paula](https://github.com/freesewing/freesewing/pull/5861). You + could aways create your circle skirt out of a number of a similar patterns by + doing the match yourself, but now the pattern will take care of that for you. +- What started out as [a bug report for the biceps ease on + Jaeger](https://github.com/freesewing/freesewing/issues/5999) ended with a + change to the way the armscye is calculated on Brian, in particular the depth + of the armhole. Given that Brian is our most foundational block, this will + have ripple effects on many other designs, you can expect that out-of-the-box + the armscye will reach a bit lower. +- In [Carlton](https://freesewing.org/designs/carlton) — and thus in + [Carlita](https://freesewing.org/designs/carlita) — we have fixed and issue + where the seam allowance on the undercollar was incorrectly drawn. +- In [Charlie](https://freesewing.org/designs/charlie), the back pocket welt + (4) and front pocket facing (8) incorrectly indicated to cut 2 instead of 4 + in the cutlist. This too is resolved. +- In [Hugo](https://freesewing.org/designs/hugo), we fixed a bug that caused + the design to error when the complete setting was off, and we fixed an issue + where the front pocket opening would get increasingly narrow as the hip + circumference increased. +- We’ve added a new + [Path.combine()](https://freesewing.dev/reference/api/path/combine) method to + [our core API](https://freesewing.dev/reference/api). Its origins lie in a + discussion in [issue + #5976](https://github.com/freesewing/freesewing/issues/5976) which was + originally filed as a bug report about how Path.join() connects gaps in the + joined paths — caused by either `move` operations, or a difference between + the end and start point of joined paths — to be filled in with a line + segment. That behaviour is expected/intended, but we’ve added + `Path.combine()` to faciliate the other behavior: Combining different paths + into a single Path object without alterning any of its drawing operations. +- The [title macro](https://freesewing.dev/reference/macros/title) now can be + configured with a `notes` and `classes.notes` setting in its config, allowing + designers to add notes to (the title of) a pattern part. +- Our [i18n plugin](https://freesewing.dev/reference/plugins/i18n) now supports + now supports translation of nested arrays of strings, which gives designers + more flexibility to concatenate translated parts of strings. + +The [FreeSewing 3.2 announcement blog post](https://freesewing.org/blog/v3-2-0) has all the details. + + +  + +--- + +  + + +## 📨 Email just got harder, again + +If you are reading this in your inbox, and not an archived copy on +FreeSewing.org, then we were able to deliver this email to you, which is good +news. + +What you may not realize is that doing so is not exactly trivial, and hasn't +been for years. But recently, things have gotten even more complex. Gmail +(Google) and Yahoo for example have [implemented new restrictions in the first +quarter of +2024](https://www.xomedia.io/blog/a-deep-dive-into-email-deliverability/) which +requires additional work on our end to maximize the chances of this email +actually landing in your inbox. + +Furthermore, so-called _bulk email senders_ are subject to the most stringent +checks. If you send 5000 messages a day, you are considered a bulk sender and +will be subject to extra scrutiny. As this newsletter has about 14k +subscribers, we are being held to the highest possible standards. + +Obviously, nobody likes spam, and I am not advocating against these rules. +It's just that the amount of time and effort required to make something as +seeminly trivial as sending out an email work at scale is ever-increasing as +the internet trends towards a de-facto pay-to-play model. + +For now, I am still making those efforts, and hopefully they proved sufficient +to get this to your inbox. But it's something we may need to revisit at a later +time if it becomes an increasing strain on our limited time and resources. + + +  + +--- + +  + +## 🕸️ Building FreeSewing's web of trust in the wake of the XZ backdoor attempt (5-minute by joost) + +Depending on where you get your news from, you might have heard or read about +[the backdoor attempt of the xz compression +utility](https://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/). + +In a nutshell, a malicious actor attempted to introduce a backdoor in this +utility, which ultimately was an attempt to smuggle a gated RCE exploit into +SSHd. + +Or, in [ELI5](https://en.wiktionary.org/wiki/ELI5) terms: Somebody contributed +code to a small library that had nefarious intent. It was done in a sneaky way +and the ultimate target was not the library itself, but rather another software +project that uses this library: The Secure Shell Deamon. A _daemon_ is just a +cooler word for a _service_ on a computer, because why not make things cooler. +This particular daemon or service, the _secure shell_ daemon is responsible for +handling secure shell (SSH) connections. It's the gold standard for remote +management of Linux (and unix) systems. + +The code smuggled in a gated RCE backdoor. RCE stands for _remote code +execution_, meaning it allows you to _do stuff_ remotely without needing to +authenticate or anything. Or to put it differently, it allows one to control +a remote computer system they normally should not have access to. +The fact that it is _gated_ means that the author of +the malicious code took steps to ensure that only they could use the malicious +code. Like a backdoor with a key. + +It's hard to overstate the gravity of this attempt at backdooring essentially +every Linux system on the planet. It's not only the world's most widely used +operating system, its dominance of server operating systems is overwhelming. +Or as I often say: _Anything that matters runs on Linux_. + +This is an ongoing story and I for one am hoping it will be made into a Netflix +mini-series starring David Cross in the role of [Andres +Freund](https://github.com/anarazel), but I digress. This is the FreeSewing +newsletter, so I wanted to lift something out of this story that I think +is relevant to FreeSewing, or really to any open source project out there. + +### Maintainer burnout and the long con of gaining trust + +One of the fascinating elements of this story is _who_ contributed the changes, +and why they were accepted without sufficient scrutiny to reveal the malicious +intent of the contribution. + +Because the user who made them had been contributing for __years__ to the project +and in light of this work had risen in status to a level where there was a lot +of implicit trust based on their work, despite knowing next to nothing about +who or what goes behind username `JiaT75` (in this case). Such a _long con_ is +a significant investment of time and effort, so the currently held assumption +is that this was a nation-state actor (think NSA or some other country's +equivalent). It's also important to note that the xy maintainer was having a +hard time dealing with the long tail of responsibilities of maintaining +software and was actively looking for help to stave off burnout. It's a +scenario that is shockingly common across open source projects and creates a +situation where malicious actors can all too easily take advantage of exhausted +maintainers desperate to offload some of the work. + +### Establishing a web of trust + +This problem of *who can you trust* is of course not new. One way to counter it +is by establishing a _web of trust_. This is how things are done in larger +open source software projects involving many volunteers, such as [the Debian +project](https://www.debian.org/). + +In practical terms, such a web of trust is built upon relationships between +people who know and have verified each other's true identity. For example, +there's a number of people in the FreeSewing community that I have met in real +life. We've not merely met face to face, but have spent time together, we know +where we live, we know each other's partners or family, or have some other +tangible way that provides a high level of assurance that this person really is +who they claim to be. + +Those people, in turn, can have similar connections with others who they know, +have met, and trust to a level that goes well beyond the online world. This +creates a web of trust where you can trust your friends, and the friends of +your friends and so on. + +In light of current events, and in acknowledgment of the rapid accelaration of +what is possible with generatative artificial intelligence, FreeSewing will +henceforth restrict all write access or elevated privileges to community +members who are part of FreeSewing's web of trust. + +We will of course continue to accept -- or rather review -- contributions from +everyone. But permissions that unlock the potential to do harm will be +restricted to people for whom trust has been established AFK (away from +keyboard). + +In order to facilitate building such a web of trust, we will start documenting +these connections between people. This will allow people who are looking to +take on more responsibilities within FreeSewing to look at its web of trust and +see who lives close to them so they can hook in to our web of trust through +that person. + +I realize that FreeSewing is extremely unlikely to be the target of a backdoor +attempt by a nation state actor, but adopting best practices and being +transparent about how we do things is a good idea regardless. + +So, I will start building and documenting this web of trust over the next couple +of weeks, and review all access control and permissions to make sure we are +doing everything we can to prevent even the most dedicated actors from poisoning +the well. + +  + +--- + +  + +## 🤔 How FreeSewing's challenges have shifted over time + +Did you know that [FreeSewing v1 was released 7 years and 7 days +ago](https://freesewing.org/blog/announcing-freesewing)? Since that time we've +made many changes big and small, and our core library and plugin system have +matured into a reliable -- and certainly opinionated -- way to design parametric +sewing patterns. + +The challenges that are most interesting from a technical point of view have +been more or less solved. What's left is the user-facing side of things, or +the user experience (UX) as we like to call it. + +FreeSewing can do a lot, so how make all of that functionality available to the +users without overwhelming them? Is that even possible on mobile, which is the +dominant way in which people go online now. How do you create it an intuitive experience, +or guide someone who arrives on FreeSewing.org after a _free sewing patterns_ +Google search towards an understanding of what FreeSewing is and does in the handful of +seconds that people are likely to give it a chance before moving on to the next +link in their search results. + +To be clear: I do not know the answer to these questions. But it is +increasingly what we spend our time on. The percentage of people out there who +use our software directly is insignificant compared to the amount of people who +(only) consume our software through our website. For most visitors, FreeSewing +__is__ a website and if it is anything else, that is probably not clear to them, +or even relevant. + +Obviously there is room for improvement, but often there is no one obvious path +forward. Perhaps -- or should I say almost certainly -- this is an area where I +lack the talent or skill to come up with some sort of grand overarching +strategy. But I find myself second-guessing a lot of my own ideas or impulses +in this area. + +So, I was wondering if we could do a little experiment. An experiment where I +ask you -- my dear reader -- a simple question. Are you ready for it? Here +is the question: + + +> **What is FreeSewing?** + +I'd love to hear your answer. You can simply hit reply to let me know. + +_PS: I burried this question at the end because I feel if you read through all of +what came before, I probably want to hear your thoughts._ + + From 61f111fc8dbc250cf5a135e4642f855588dd1352 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Mon, 1 Apr 2024 16:57:35 +0200 Subject: [PATCH 542/795] feat(backend): Add one-click unsubscribe endpoints --- scripts/newsletter-lib.mjs | 18 ++++++-- sites/backend/src/controllers/subscribers.mjs | 17 +++++--- sites/backend/src/html/ocunsub-ko.mjs | 9 ++++ sites/backend/src/html/ocunsub-ok.mjs | 8 ++++ sites/backend/src/models/subscriber.mjs | 43 +++++++++++++++++-- sites/backend/src/routes/subscribers.mjs | 9 ++++ 6 files changed, 93 insertions(+), 11 deletions(-) create mode 100644 sites/backend/src/html/ocunsub-ko.mjs create mode 100644 sites/backend/src/html/ocunsub-ok.mjs diff --git a/scripts/newsletter-lib.mjs b/scripts/newsletter-lib.mjs index 4bcf0474382..083ca44c9b6 100644 --- a/scripts/newsletter-lib.mjs +++ b/scripts/newsletter-lib.mjs @@ -113,11 +113,13 @@ const send = async (test = true) => { for (let sub of subscribers[lang]) { if (l > 0) { + const unsubGet = `https://freesewing.org${ + lang === 'en' ? '/' : '/' + lang + '/' + }newsletter/unsubscribe?x=${sub.ehash}` + const unsubPost = `https://backend3.freesewing.org/ocunsub/${sub.ehash}` const body = mustache.render(template, { ...i18n[lang], - unsubscribe: `https://freesewing.org${ - lang === 'en' ? '/' : '/' + lang + '/' - }newsletter/unsubscribe?x=${sub.ehash}`, + unsubscribe: unsubGet, content, }) console.log(`[${lang}] ${l}/${subs} (${i}) Sending to ${sub.email}`) @@ -141,6 +143,16 @@ const send = async (test = true) => { Charset: 'utf-8', Data: i18n[lang].title, }, + Headers: [ + { + Name: 'List-Unsubscribe', + Value: unsubPost, + }, + { + Name: 'List-Unsubscribe-Post', + Value: 'List-Unsubscribe=One-Click', + }, + ], }, }, Destination: { diff --git a/sites/backend/src/controllers/subscribers.mjs b/sites/backend/src/controllers/subscribers.mjs index 827783180f1..88f2adf065b 100644 --- a/sites/backend/src/controllers/subscribers.mjs +++ b/sites/backend/src/controllers/subscribers.mjs @@ -1,4 +1,7 @@ import { SubscriberModel } from '../models/subscriber.mjs' +// Catch-all page +import { html as ocunsubOk } from '../html/ocunsub-ok.mjs' +import { html as ocunsubKo } from '../html/ocunsub-ko.mjs' export function SubscribersController() {} @@ -47,12 +50,16 @@ SubscribersController.prototype.confirm = async (req, res, tools) => { } /* - * Unsubscribe from the newsletter + * One-Click unsubscribe from the newsletter * See: https://freesewing.dev/reference/backend/api */ -SubscribersController.unsubscribe = async (req, res, tools) => { - const Subscriber = new SubscriberModel(tools) - await Subscriber.unsubscribe(req) +SubscribersController.prototype.ocunsub = async (req, res, tools) => { + if (!res.params?.ehash) return res.set('Content-Type', 'text/html').status(200).send(ocunsubKo) - return Subscriber.sendResponse(res) + const Subscriber = new SubscriberModel(tools) + const result = await Subscriber.ocunsub(req) + + if (result) return res.set('Content-Type', 'text/html').status(200).send(ocunsubOk) + + return res.set('Content-Type', 'text/html').status(200).send(okunsubKo) } diff --git a/sites/backend/src/html/ocunsub-ko.mjs b/sites/backend/src/html/ocunsub-ko.mjs new file mode 100644 index 00000000000..ac9b6932335 --- /dev/null +++ b/sites/backend/src/html/ocunsub-ko.mjs @@ -0,0 +1,9 @@ +import { wrapper } from './shared.mjs' + +export const html = wrapper({ + content: ` +

    🫤 FNpe

    +

    Whatever you intended to do, it did not work.

    +

    Contact support

    +`, +}) diff --git a/sites/backend/src/html/ocunsub-ok.mjs b/sites/backend/src/html/ocunsub-ok.mjs new file mode 100644 index 00000000000..160f0110fb7 --- /dev/null +++ b/sites/backend/src/html/ocunsub-ok.mjs @@ -0,0 +1,8 @@ +import { wrapper } from './shared.mjs' + +export const html = wrapper({ + content: ` +

    👋 Farewell

    +

    You have been unsubscribed.

    +`, +}) diff --git a/sites/backend/src/models/subscriber.mjs b/sites/backend/src/models/subscriber.mjs index 458335508d6..4be6968f0eb 100644 --- a/sites/backend/src/models/subscriber.mjs +++ b/sites/backend/src/models/subscriber.mjs @@ -156,9 +156,9 @@ SubscriberModel.prototype.unsubscribe = async function ({ params }) { return this.setResponse(204) } else { - /* - * If not, perhaps it's an account ehash rather than subscriber ehash - */ + /* + * If not, perhaps it's an account ehash rather than subscriber ehash + */ await this.User.read({ ehash }) if (this.User.record) { await this.User.update({ newsletter: false }) @@ -173,6 +173,43 @@ SubscriberModel.prototype.unsubscribe = async function ({ params }) { return this.setResponse(404) } +/* + * One-click unsubscribe a user + * This is an unauthenticated route (has to for newsletter subscribers might not be users) + * + * @param {body} object - The request body + * @returns {SubscriberModal} object - The SubscriberModel + */ +SubscriberModel.prototype.ocunsub = async function ({ params }) { + const { ehash } = params + + /* + * Find the subscription record + */ + await this.read({ ehash }) + + /* + * If found, remove the record + */ + if (this.record) { + await this.delete({ id: this.record.id }) + + return true + } else { + /* + * If not, perhaps it's an account ehash rather than subscriber ehash + */ + await this.User.read({ ehash }) + if (this.User.record) { + await this.User.update({ newsletter: false }) + + return true + } + } + + return false +} + /* * A helper method to validate input and load the subscription record * diff --git a/sites/backend/src/routes/subscribers.mjs b/sites/backend/src/routes/subscribers.mjs index 4381eb474f8..2950d36217b 100644 --- a/sites/backend/src/routes/subscribers.mjs +++ b/sites/backend/src/routes/subscribers.mjs @@ -17,4 +17,13 @@ export function subscribersRoutes(tools) { // Unsubscribe from newsletter app.delete('/subscriber/:ehash', (req, res) => Subscriber.unsubscribe(req, res, tools)) + + // One-Click unsubscribe (ocunsub) from newsletter needs to be a POST request. + // See https://datatracker.ietf.org/doc/html/rfc8058 + app.post('/ocunsub/:ehash', (req, res) => Subscriber.ocunsub(req, res, tools)) + + // Just in case somebody lands here with a GET request + app.get('/ocunsub/:ehash', (req, res) => + res.redirect(`https://freesewing.org/newsletter/unsubscribe?i=${req.params.ehash}`) + ) } From 15b44fceb92f3211dae4398a3e31349e23df4a21 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Mon, 1 Apr 2024 18:24:24 +0200 Subject: [PATCH 543/795] chore(markdown): Add newsletter translations Who has time to wait for Crowdin --- markdown/org/newsletter/2024q2/de.md | 280 +++++++++++++++++++++++++++ markdown/org/newsletter/2024q2/es.md | 280 +++++++++++++++++++++++++++ markdown/org/newsletter/2024q2/fr.md | 279 ++++++++++++++++++++++++++ markdown/org/newsletter/2024q2/nl.md | 280 +++++++++++++++++++++++++++ markdown/org/newsletter/2024q2/uk.md | 280 +++++++++++++++++++++++++++ 5 files changed, 1399 insertions(+) create mode 100644 markdown/org/newsletter/2024q2/de.md create mode 100644 markdown/org/newsletter/2024q2/es.md create mode 100644 markdown/org/newsletter/2024q2/fr.md create mode 100644 markdown/org/newsletter/2024q2/nl.md create mode 100644 markdown/org/newsletter/2024q2/uk.md diff --git a/markdown/org/newsletter/2024q2/de.md b/markdown/org/newsletter/2024q2/de.md new file mode 100644 index 00000000000..14cfc5ab2ef --- /dev/null +++ b/markdown/org/newsletter/2024q2/de.md @@ -0,0 +1,280 @@ +--- +date: 2024-04-01 +edition: 2024q2 +intro: Willkommen zur Frühlingsausgabe 2024 des FreeSewing-Newsletters. +title: 2024 Frühjahrsausgabe +--- + +Willkommen zur Frühlingsausgabe 2024 des FreeSewing-Newsletters. + +Hier ist das, was wir heute für dich haben, kein Scherz: + +- 👕 FreeSewing 3.2 bringt Tristan, Lumina, Lumira und mehr (3-Minuten-Lesung von joost) +- 📨 E-Mail ist wieder schwieriger geworden (1-minute read by joost) +- 🕸️ Aufbau des Vertrauensnetzes von FreeSewing nach dem XZ-Backdoor-Versuch (5-Minuten von joost) +- 🤔 Wie sich die Herausforderungen von FreeSewing im Laufe der Zeit verändert haben (2-Minuten-Lesung von joost) + +Sollen wir loslegen? + +  + +  + +## 👕 FreeSewing 3.2 bringt Tristan, Lumina, Lumira und mehr + +Wir haben FreeSewing v3.2 im ersten Quartal 2024 veröffentlicht und es enthält 3 neue +Designs sowie eine Reihe von Fehlerbehebungen und Verbesserungen. + +Werfen wir einen Blick auf die Highlights: + +### The Tristan Top + +Als erstes gibt es [das Tristan Top] (https\://freesewing.org/designs/tristan). Tristan ist ein Oberteil mit Prinzessnähten und (optionaler) Schnürung vorne oder/und hinten. Seine Entstehungsgeschichte ist die Notwendigkeit eines Kostüms für ein Renaissance-Festival, also ist das wahrscheinlich ein guter Indikator dafür, was dich erwartet. + +Tristan wurde von Natalia entworfen, die auch [einen Blogbeitrag über das neue Tristan-Design geschrieben hat] (https\://freesewing.org/blog/our-newest-design-is-the-tristan-top), also ist das ein guter Ort, um alle Details über dieses neue Design zu erfahren. + +### The Lumina and Lumira Leggings + +Ich gebe dir eine Sekunde, um den Titel noch einmal zu überfliegen, aber ja, es gibt zwei verschiedene Leggings-Muster mit ähnlichen Namen: [die Lumira Leggings] (https\://freesewing.org/designs/lumira) und die [Lumina Leggings] (https\://freesewing.org/designs/lumina). + +Beide wurden aus Wouters Wunsch nach guter Fahrradbekleidung geboren. Ich empfehle dir, die Designernotizen für [Lumina] (https\://freesewing.org/designs/lumina#notes) und [Lumira] (https\://freesewing.org/designs/lumira#notes) zu lesen, um den Unterschied zwischen diesen Designs zu verstehen, zu verstehen, warum sie sich unterscheiden und zu wissen, was für dich am besten geeignet ist. + +### Bug fixes and improvements + +Regelmäßige Leserinnen und Leser des Newsletters wissen, dass wir auf +laufend Verbesserungen vornehmen, die nicht an eine neue Version gebunden sind, +aber es ist eine gute Gelegenheit, sie aufzulisten. Hier sind also einige Highlights der Fehlerbehebungen +und Verbesserungen, die in die Version 3.2 eingeflossen sind: + +- Sandy hat eine neue Paneele + Option, die + von [Paula](https://github.com/freesewing/freesewing/pull/5861) hinzugefügt wurde. Du + könntest deinen kreisförmigen Rock auch aus mehreren ähnlichen Mustern zusammenstellen, indem du + selbst anpasst, aber das übernimmt jetzt das Muster für dich. +- Was als [Fehlerbericht für die Bizeps-Erleichterung auf + Jaeger] (https\://github.com/freesewing/freesewing/issues/5999) begann, endete mit einer + Änderung der Art und Weise, wie der Armumfang auf Brian berechnet wird, insbesondere die Tiefe + des Armlochs. Da Brian unser grundlegendster Block ist, wird dies + Auswirkungen auf viele andere Entwürfe haben. Du kannst davon ausgehen, dass + der Armcye ein wenig tiefer reichen wird. +- In [Carlton](https://freesewing.org/designs/carlton) - und damit auch in + [Carlita](https://freesewing.org/designs/carlita) - haben wir + korrigiert, wo die Nahtzugabe am Unterkragen falsch eingezeichnet war. +- In [Charlie](https://freesewing.org/designs/charlie) wurde bei der Gesäßtaschenleiste + (4) und der Vordertaschenleiste (8) fälschlicherweise angegeben, dass 2 statt 4 + in der Schnittliste geschnitten werden. This too is resolved. +- In [Hugo](https://freesewing.org/designs/hugo) haben wir einen Fehler behoben, der dazu führte, dass + das Design fehlerhaft war, wenn die vollständige Einstellung ausgeschaltet war, und wir haben ein Problem + behoben, bei dem die Öffnung der Vordertasche mit zunehmendem Hüftumfang + immer enger wurde. +- Wir haben eine neue + [Path.combine()](https://freesewing.dev/reference/api/path/combine) Methode zu + [unserer Kern-API](https://freesewing.dev/reference/api) hinzugefügt. Die Ursprünge liegen in einer + Diskussion in issue + \#5976, die + ursprünglich als Fehlerbericht eingereicht wurde. Dabei ging es darum, wie Path.join() Lücken in den + verbundenen Pfaden - die entweder durch "Verschiebe"-Operationen oder durch einen Unterschied zwischen + dem End- und dem Startpunkt der verbundenen Pfade verursacht werden - mit einem Liniensegment + ausgefüllt werden. Dieses Verhalten wird erwartet/beabsichtigt, aber wir haben + `Path.combine()` hinzugefügt, um das andere Verhalten zu erleichtern: Das Kombinieren verschiedener Pfade + zu einem einzigen Pfadobjekt, ohne dass sich die Zeichenoperationen ändern. +- Das [Titelmakro] (https\://freesewing.dev/reference/macros/title) kann jetzt + mit einer `Noten`- und `Klassen.Noten`-Einstellung in seiner Konfiguration konfiguriert werden, was es + Designern ermöglicht, Noten zu (dem Titel) eines Musterteils hinzuzufügen. +- Unser [i18n plugin](https://freesewing.dev/reference/plugins/i18n) unterstützt jetzt + die Übersetzung von verschachtelten Arrays von Strings, was Designern + mehr Flexibilität bei der Verkettung von übersetzten Teilen von Strings gibt. + +Im [FreeSewing 3.2 Ankündigungs-Blogpost] (https\://freesewing.org/blog/v3-2-0) findest du alle Details. + +  + +*** + +  + +## 📨 E-Mail ist gerade wieder schwieriger geworden + +Wenn du dies in deinem Posteingang liest und nicht in einer archivierten Kopie auf +FreeSewing.org, dann konnten wir dir diese E-Mail zustellen, was eine gute +Nachricht ist. + +Was du vielleicht nicht weißt, ist, dass dies nicht gerade trivial ist und schon seit Jahren nicht mehr +ist. Aber in letzter Zeit sind die Dinge noch komplexer geworden. Gmail +(Google) und Yahoo zum Beispiel haben im ersten +Quartal von +2024 neue Beschränkungen eingeführt, die +zusätzliche Arbeit auf unserer Seite erfordern, um die Chancen zu maximieren, dass diese E-Mail +tatsächlich in deinem Posteingang landet. + +Außerdem werden sogenannte _Massen-E-Mail-Versender_ den strengsten +Kontrollen unterzogen. Wenn du 5000 Nachrichten pro Tag versendest, giltst du als Massenversender und +wird besonders genau überprüft. Da dieser Newsletter rund 14.000 +Abonnenten hat, müssen wir uns an die höchstmöglichen Standards halten. + +Natürlich mag niemand Spam und ich spreche mich nicht gegen diese Regeln aus. +Es ist nur so, dass der Zeit- und Arbeitsaufwand, der erforderlich ist, um etwas so +scheinbar Triviales wie das Versenden einer E-Mail in großem Umfang zu realisieren, immer größer wird, da +das Internet sich zu einem de facto Pay-to-Play-Modell entwickelt. + +Im Moment bemühe ich mich noch darum, und ich hoffe, sie haben ausgereicht +, um dies in deinen Posteingang zu bekommen. Aber es ist etwas, das wir vielleicht zu einem späteren Zeitpunkt +wieder aufgreifen müssen, wenn es unsere begrenzte Zeit und unsere Ressourcen zunehmend belastet. + +  + +*** + +  + +## 🕸️ Aufbau des Vertrauensnetzes von FreeSewing nach dem XZ-Backdoor-Versuch (5-Minuten von joost) + +Je nachdem, woher du deine Nachrichten beziehst, hast du vielleicht schon von +[dem Backdoor-Versuch des Komprimierungsprogramms xz +] (https\://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/) gehört oder gelesen. + +Kurz gesagt, ein böswilliger Akteur versuchte, eine Hintertür in dieses +Dienstprogramm einzuschleusen, was letztendlich ein Versuch war, einen Gated RCE-Exploit in +SSHd zu schmuggeln. + +Oder, in [ELI5](https://en.wiktionary.org/wiki/ELI5) Worten: Jemand hat +Code zu einer kleinen Bibliothek beigetragen, die schändliche Absichten hatte. Dies geschah auf hinterhältige Art und Weise +und das eigentliche Ziel war nicht die Bibliothek selbst, sondern ein anderes Software +Projekt, das diese Bibliothek verwendet: Der Secure Shell Deamon. Ein _Daemon_ ist nur ein +cooleres Wort für einen _Dienst_ auf einem Computer, denn warum sollte man Dinge nicht cooler machen. +Dieser spezielle Daemon oder Dienst, der _secure shell_ Daemon, ist für die +Handhabung von Secure Shell (SSH) Verbindungen verantwortlich. Es ist der Goldstandard für die Fernverwaltung von Linux- (und Unix-) Systemen +. + +Der Code schmuggelte eine RCE-Backdoor mit Gates ein. RCE steht für _remote code +execution_, was bedeutet, dass du aus der Ferne _etwas_ tun kannst, ohne dich zu authentifizieren +oder so. Oder anders ausgedrückt: Er ermöglicht es, +ein entferntes Computersystem zu kontrollieren, auf das man normalerweise keinen Zugriff haben sollte. +Die Tatsache, dass er _gated_ ist, bedeutet, dass der Autor von +Maßnahmen ergriffen hat, um sicherzustellen, dass nur er den bösartigen +Code verwenden kann. Wie eine Hintertür mit einem Schlüssel. + +Es ist kaum zu überschätzen, wie schwerwiegend dieser Versuch ist, praktisch jedes Linux-System auf dem Planeten +zurückzudrängen. Es ist nicht nur das weltweit am weitesten verbreitete +Betriebssystem, auch bei den Server-Betriebssystemen ist seine Dominanz überwältigend. +Oder wie ich oft sage: _Alles, was wichtig ist, läuft auf Linux_. + +Dies ist eine fortlaufende Geschichte, und ich hoffe, dass daraus eine Netflix +Miniserie mit David Cross in der Rolle des [Andres +Freund] (https\://github.com/anarazel) wird, aber ich schweife ab. Dies ist der FreeSewing +Newsletter, also wollte ich etwas aus dieser Geschichte herausgreifen, von dem ich denke, dass +für FreeSewing, oder wirklich für jedes Open-Source-Projekt da draußen, relevant ist. + +### Maintainer Burnout und der lange Weg, Vertrauen zu gewinnen + +Eines der faszinierenden Elemente dieser Geschichte ist, _wer_ die Änderungen beigesteuert hat, +und warum sie akzeptiert wurden, ohne dass die böswilligen +Absichten des Beitrags aufgedeckt wurden. + +Weil der Benutzer, der sie gemacht hat, seit **years** zum Projekt +beigetragen hat und aufgrund dieser Arbeit einen Status erreicht hat, bei dem es eine Menge +implizites Vertrauen aufgrund seiner Arbeit gab, obwohl er so gut wie nichts über +weiß, wer oder was sich hinter dem Benutzernamen `JiaT75` (in diesem Fall) verbirgt. Solch ein _langer Betrug_ ist +eine erhebliche Investition von Zeit und Mühe, daher ist die derzeitige Annahme +, dass es sich um einen nationalstaatlichen Akteur handelte (man denke an die NSA oder das Äquivalent in einem anderen Land +). Es ist auch wichtig zu erwähnen, dass der xy-Maintainer +mit den vielen Aufgaben, die mit der Wartung der Software +verbunden sind, nicht zurechtkam und aktiv nach Hilfe suchte, um ein Burnout zu vermeiden. Dieses +Szenario ist bei Open-Source-Projekten erschreckend häufig anzutreffen und schafft eine +Situation, in der böswillige Akteure nur allzu leicht einen Vorteil aus erschöpften +Maintainern ziehen können, die verzweifelt versuchen, einen Teil der Arbeit loszuwerden. + +### Ein Netz des Vertrauens aufbauen + +Das Problem, wem man vertrauen kann, ist natürlich nicht neu. Eine Möglichkeit, dem entgegenzuwirken +, ist der Aufbau eines _Vertrauensnetzes_. So wird es in größeren +Open-Source-Softwareprojekten gemacht, an denen viele Freiwillige beteiligt sind, wie z.B. das Debian +Projekt. + +In der Praxis beruht ein solches Vertrauensnetz auf Beziehungen zwischen +Menschen, die die wahre Identität des anderen kennen und überprüft haben. Zum Beispiel +gibt es eine Reihe von Leuten in der FreeSewing-Community, die ich im echten +Leben getroffen habe. Wir sind uns nicht nur von Angesicht zu Angesicht begegnet, sondern haben Zeit miteinander verbracht, wir wissen +wo wir wohnen, wir kennen die Partner oder die Familie des anderen oder haben eine andere +greifbare Möglichkeit, die ein hohes Maß an Sicherheit bietet, dass diese Person wirklich +ist, wer sie zu sein behauptet. + +Diese Menschen wiederum können ähnliche Verbindungen zu anderen Menschen haben, die sie kennen, +kennengelernt haben und denen sie vertrauen, und zwar auf einer Ebene, die weit über die Online-Welt hinausgeht. Diese +schafft ein Netz des Vertrauens, in dem du deinen Freunden vertrauen kannst, und die Freunde von +deinen Freunden und so weiter. + +In Anbetracht der aktuellen Ereignisse und in Anerkennung der rasanten Beschleunigung von +was mit generativer künstlicher Intelligenz möglich ist, wird FreeSewing +von nun an alle Schreibzugriffe oder erhöhten Privilegien auf Mitglieder der Community +beschränken, die Teil des Vertrauensnetzes von FreeSewing sind. + +Natürlich werden wir auch weiterhin Beiträge von +annehmen - oder besser gesagt, überprüfen -. Aber Berechtigungen, die das Potenzial haben, Schaden anzurichten, werden auf +auf Personen beschränkt, zu denen Vertrauen aufgebaut wurde AFK (away from +keyboard). + +Um den Aufbau eines solchen Vertrauensnetzes zu erleichtern, werden wir damit beginnen, +diese Verbindungen zwischen Menschen zu dokumentieren. So können Menschen, die +mehr Verantwortung innerhalb von FreeSewing übernehmen möchten, das Vertrauensnetz einsehen und +sehen, wer in ihrer Nähe wohnt, damit sie sich über +in unser Vertrauensnetz einklinken können. + +Mir ist klar, dass es extrem unwahrscheinlich ist, dass FreeSewing das Ziel eines Hintertürchenversuchs +eines nationalen Akteurs sein wird, aber es ist trotzdem eine gute Idee, die besten Praktiken zu übernehmen und +transparent zu machen, wie wir vorgehen. + +Ich werde also in den nächsten Wochen damit beginnen, dieses Netz des Vertrauens aufzubauen und zu dokumentieren +und alle Zugriffskontrollen und Berechtigungen zu überprüfen, um sicherzustellen, dass wir +alles tun, was wir können, um zu verhindern, dass selbst die engagiertesten Akteure +den Brunnen vergiften. + +  + +*** + +  + +## 🤔 Wie sich die Herausforderungen von FreeSewing im Laufe der Zeit verändert haben + +Wusstest du, dass FreeSewing v1 vor 7 Jahren und 7 Tagen + veröffentlicht wurde? Seitdem haben wir +viele große und kleine Änderungen vorgenommen, und unsere Kernbibliothek und unser Plugin-System +sind zu einer zuverlässigen - und sicherlich meinungsstarken - Möglichkeit gereift, parametrische +Nähmuster zu entwerfen. + +Die Herausforderungen, die aus technischer Sicht am interessantesten sind, wurden +mehr oder weniger gelöst. Was übrig bleibt, ist die Benutzeroberfläche, oder +das Benutzererlebnis (UX), wie wir es gerne nennen. + +FreeSewing kann eine Menge, aber wie kann man all diese Funktionen für die Nutzer von +verfügbar machen, ohne sie zu überfordern? Ist das überhaupt auf dem Handy möglich, das heute die +dominierende Art ist, online zu gehen? Wie schaffst du es, dass es ein intuitives Erlebnis wird, +oder dass jemand, der nach einer Google-Suche nach _freien Nähmustern_ +auf FreeSewing.org landet, in den wenigen +Sekunden versteht, was FreeSewing ist und tut, bevor er zum nächsten +Link in seinen Suchergebnissen weitergeht? + +Um es klar zu sagen: Ich kenne die Antwort auf diese Fragen nicht. Aber es ist +zunehmend, womit wir unsere Zeit verbringen. Der Prozentsatz der Menschen da draußen, die unsere Software +direkt nutzen, ist unbedeutend im Vergleich zu der Anzahl der Menschen, die +(nur) über unsere Website konsumieren. Für die meisten Besucher ist FreeSewing +**is** eine Website und wenn es etwas anderes ist, ist das für sie wahrscheinlich nicht klar, +oder sogar relevant. + +Natürlich gibt es Raum für Verbesserungen, aber oft gibt es keinen eindeutigen Weg +nach vorne. Vielleicht - oder sollte ich sagen fast sicher - ist dies ein Bereich, in dem ich +nicht das Talent oder die Fähigkeit habe, eine große, übergreifende +Strategie zu entwickeln. Aber ich ertappe mich dabei, wie ich viele meiner eigenen Ideen oder Impulse +in diesem Bereich in Frage stelle. + +Deshalb habe ich mich gefragt, ob wir ein kleines Experiment machen können. Ein Experiment, bei dem ich +dir - meinem lieben Leser - eine einfache Frage stelle. Bist du bereit dafür? Hier +ist die Frage: + +> **Was ist FreeSewing?** + +Ich würde gerne deine Antwort hören. Du kannst einfach auf "Antworten" klicken, um mir Bescheid zu geben. + +_PS: Ich habe diese Frage am Ende vergraben, weil ich denke, dass ich deine Gedanken hören möchte, wenn du dir alles durchliest, was auf +steht. diff --git a/markdown/org/newsletter/2024q2/es.md b/markdown/org/newsletter/2024q2/es.md new file mode 100644 index 00000000000..74548af6c00 --- /dev/null +++ b/markdown/org/newsletter/2024q2/es.md @@ -0,0 +1,280 @@ +--- +date: 2024-04-01 +edition: 2024q2 +intro: Bienvenido a la edición de primavera 2024 del boletín FreeSewing. +title: 2024 Edición de primavera +--- + +Bienvenido a la edición de primavera 2024 del boletín FreeSewing. + +Esto es lo que tenemos hoy para ti, no es broma: + +- 👕 FreeSewing 3.2 trae Tristan, Lumina, Lumira y más (lectura de 3 minutos por joost) +- 📨 El correo electrónico se ha vuelto más difícil, otra vez (lectura de 1 minuto por joost) +- 🕸️ Construir la red de confianza de FreeSewing tras el intento de backdoor del XZ (5 minutos por joost) +- 🤔 Cómo han cambiado los retos de FreeSewing con el tiempo (lectura de 2 minutos por joost) + +¿Empezamos? + +  + +  + +## 👕 FreeSewing 3.2 trae Tristan, Lumina, Lumira y más + +Lanzamos FreeSewing v3.2 a principios del primer trimestre de 2024 e incluye 3 nuevos diseños de +, así como una serie de correcciones de errores y mejoras. + +Echemos un vistazo a lo más destacado: + +### The Tristan Top + +En primer lugar, está [el Tristan Top](https://freesewing.org/designs/tristan). Tristán es un top con costuras princesa y lazada (opcional) delante y/o detrás. Su historia de origen es la necesidad de un disfraz para una fiesta renacentista, así que probablemente sea un buen indicador de lo que cabe esperar. + +Tristán fue diseñado por Natalia, que también [escribió una entrada en su blog sobre el nuevo diseño de Tristán](https://freesewing.org/blog/our-newest-design-is-the-tristan-top), así que ese es un buen lugar para obtener todos los detalles sobre este nuevo diseño. + +### The Lumina and Lumira Leggings + +Te daré un segundo para que vuelvas a escanear ese título, pero sí, hay dos patrones de leggings diferentes con nombres similares: [los Leggings Lumira](https://freesewing.org/designs/lumira) y los [Leggings Lumina](https://freesewing.org/designs/lumina). + +Ambos nacieron del deseo de Wouter de tener una buena equipación ciclista, y te sugiero que consultes las notas del diseñador tanto de [Lumina](https://freesewing.org/designs/lumina#notes) como de [Lumira](https://freesewing.org/designs/lumira#notes) para apreciar plenamente la diferencia entre estos diseños, por qué difieren y qué te iría mejor a ti. + +### Bug fixes and improvements + +Los lectores habituales del boletín sabrán que en FreeSewing.org introducimos continuamente mejoras en +y que éstas no están vinculadas a una nueva versión, +pero es una buena oportunidad para enumerarlas, así que aquí tienes algunos puntos destacados de las correcciones de errores +y mejoras que se han incluido en la versión 3.2: + +- Sandy tiene una nueva opción de paneles + que fue + añadida por [Paula](https://github.com/freesewing/freesewing/pull/5861). + Tú + podrías crear tu falda circular a partir de una serie de patrones similares haciendo tú misma la combinación, pero ahora el patrón se encargará de ello por ti. +- Lo que empezó como un informe de error sobre la facilidad de los bíceps en + Jaeger acabó con un cambio en + sobre la forma de calcular el contorno de los brazos en Brian, en concreto sobre la profundidad + de la sisa. Dado que Brian es nuestro bloque más fundacional, esto + tendrá efectos dominó en muchos otros diseños, puedes esperar que, fuera de la caja + , el codo de los brazos llegue un poco más abajo. +- En [Carlton](https://freesewing.org/designs/carlton) - y, por tanto, en + [Carlita](https://freesewing.org/designs/carlita) - hemos arreglado y emitido + en el que el margen de costura del cuello interior estaba mal trazado. +- En [Charlie](https://freesewing.org/designs/charlie), el ribete del bolsillo trasero + (4) y el ribete del bolsillo delantero (8) indicaban incorrectamente cortar 2 en lugar de 4 + en la lista de cortes. This too is resolved. +- En [Hugo](https://freesewing.org/designs/hugo), hemos corregido un error que hacía que + el diseño diera error cuando el ajuste completo estaba desactivado, y hemos solucionado un problema + por el que la abertura del bolsillo delantero se hacía cada vez más estrecha a medida que aumentaba la circunferencia de la cadera + . +- Hemos añadido un nuevo método + [Path.combine()](https://freesewing.dev/reference/api/path/combine) a + [nuestra API central](https://freesewing.dev/reference/api). Sus orígenes se encuentran en un debate de + en issue + \#5976 que fue + archivado originalmente como un informe de error sobre cómo Path.join() conecta los huecos en las rutas unidas + -causados por operaciones de `movimiento`, o por una diferencia entre + el punto final y el punto inicial de las rutas unidas- para rellenarlos con un segmento de línea + . Ese comportamiento es el esperado/intencionado, pero hemos añadido + `Path.combine()` para facilitar el otro comportamiento: Combinar distintas rutas + en un único objeto Ruta sin alterar ninguna de sus operaciones de dibujo. +- La macro [title](https://freesewing.dev/reference/macros/title) ahora puede configurarse + con un ajuste `notes` y `classes.notes` en su configuración, lo que permite a los diseñadores + añadir notas a (el título de) una parte de patrón. +- Nuestro [plugin i18n](https://freesewing.dev/reference/plugins/i18n) ahora admite + ahora admite la traducción de matrices anidadas de cadenas, lo que da a los diseñadores + más flexibilidad para concatenar partes traducidas de cadenas. + +La [entrada del blog del anuncio de FreeSewing 3.2](https://freesewing.org/blog/v3-2-0) tiene todos los detalles. + +  + +*** + +  + +## 📨 El correo electrónico vuelve a ser más difícil + +Si estás leyendo esto en tu bandeja de entrada, y no una copia archivada en +FreeSewing.org, entonces hemos podido enviarte este correo electrónico, lo cual es una buena noticia +. + +Lo que quizá no sepas es que hacerlo no es precisamente trivial, y no lo ha sido +durante años. Pero recientemente, las cosas se han vuelto aún más complejas. Gmail +(Google) y Yahoo, por ejemplo, han implementado nuevas restricciones en el primer +trimestre de +2024 lo que +requiere un trabajo adicional por nuestra parte para maximizar las posibilidades de que este correo +llegue realmente a tu bandeja de entrada. + +Además, los denominados _remitentes de correo electrónico masivo_ están sujetos a los controles más estrictos de +. Si envías 5000 mensajes al día, se te considera un remitente masivo y +estará sujeto a un escrutinio adicional. Como este boletín tiene unos 14.000 suscriptores en +, se nos exige el máximo nivel de calidad. + +Obviamente, a nadie le gusta el spam, y no estoy abogando en contra de estas normas. +Lo que ocurre es que la cantidad de tiempo y esfuerzo necesarios para hacer que algo tan +aparentemente trivial como enviar un correo electrónico funcione a escala es cada vez mayor, ya que +internet tiende hacia un modelo de pago por jugar de facto. + +Por ahora, sigo haciendo esos esfuerzos, y espero que hayan sido suficientes +para que esto llegue a tu bandeja de entrada. Pero es algo que tal vez tengamos que volver a examinar más adelante +si se convierte en una carga cada vez mayor para nuestro tiempo y recursos limitados. + +  + +*** + +  + +## 🕸️ Construir la red de confianza de FreeSewing tras el intento de backdoor del XZ (5 minutos por joost) + +Dependiendo de dónde obtengas tus noticias, puede que hayas oído o leído sobre +el intento de backdoor de la utilidad de compresión xz +. + +En pocas palabras, un actor malicioso intentó introducir una puerta trasera en esta utilidad +, que en última instancia era un intento de introducir un exploit RCE en +SSHd. + +O, en términos de [ELI5](https://en.wiktionary.org/wiki/ELI5): Alguien aportó código +a una pequeña biblioteca que tenía intenciones nefastas. Se hizo de forma furtiva +y el objetivo final no era la propia biblioteca, sino otro proyecto de software +que utiliza esta biblioteca: El Deamon Secure Shell. Un _daemon_ no es más que una palabra más guay de +para designar un _servicio_ en un ordenador, porque ¿por qué no hacer las cosas más guays? +Este demonio o servicio concreto, el demonio _secure shell_, se encarga de +gestionar las conexiones secure shell (SSH). Es el estándar de oro para la gestión remota +de sistemas Linux (y unix). + +El código introdujo de contrabando una puerta trasera RCE cerrada. RCE significa _ejecución remota de código +_, lo que significa que te permite _hacer cosas_ remotamente sin necesidad de autenticarte en +ni nada. O dicho de otro modo, permite controlar +un sistema informático remoto al que normalmente no debería tener acceso. +El hecho de que esté _gated_ significa que el autor de +el código malicioso tomó medidas para asegurarse de que sólo él podía utilizar el código malicioso de +. Como una puerta trasera con llave. + +Es difícil exagerar la gravedad de este intento de backdooring esencialmente +todos los sistemas Linux del planeta. No sólo es el sistema operativo +más utilizado del mundo, sino que su dominio de los sistemas operativos de servidor es abrumador. +O como suelo decir: _Todo lo que importa funciona en Linux_. + +Se trata de una historia en curso y, por mi parte, espero que se convierta en una miniserie de Netflix +protagonizada por David Cross en el papel de Andres +Freund, pero estoy divagando. Este es el boletín de FreeSewing +, así que quería sacar algo de esta historia que creo que +es relevante para FreeSewing, o realmente para cualquier proyecto de código abierto que exista. + +### El agotamiento del mantenedor y la larga estafa de ganarse la confianza + +Uno de los elementos fascinantes de esta historia es _quién_ aportó los cambios, +y por qué se aceptaron sin un escrutinio suficiente para revelar la intención maliciosa +de la aportación. + +Porque el usuario que las hizo había estado contribuyendo durante **years** al proyecto +y a la luz de este trabajo había ascendido de estatus hasta un nivel en el que había mucha +confianza implícita basada en su trabajo, a pesar de no saber casi nada sobre +quién o qué hay detrás del nombre de usuario `JiaT75` (en este caso). Una estafa tan _larga_ es +una inversión significativa de tiempo y esfuerzo, por lo que la suposición que se mantiene actualmente +es que se trataba de un actor de un Estado-nación (piensa en la NSA o en el equivalente a +de algún otro país). También es importante señalar que el mantenedor de xy tenía +dificultades para hacer frente a la larga cola de responsabilidades que supone mantener el software +y buscaba activamente ayuda para evitar el agotamiento. Se trata de un escenario +que es sorprendentemente común en los proyectos de código abierto y crea una situación +en la que los actores maliciosos pueden aprovecharse con demasiada facilidad de los agotados mantenedores de +, desesperados por descargar parte del trabajo. + +### Establecer una red de confianza + +Este problema de _en quién puedes confiar_ no es, por supuesto, nuevo. Una forma de contrarrestarlo +es estableciendo una _red de confianza_. Así es como se hacen las cosas en los grandes proyectos de software de código abierto +en los que participan muchos voluntarios, como el proyecto Debian +. + +En términos prácticos, esa red de confianza se construye sobre relaciones entre +personas que conocen y han verificado la verdadera identidad de las demás. Por ejemplo, +hay varias personas en la comunidad FreeSewing que he conocido en la vida real +. No sólo nos hemos visto cara a cara, sino que hemos pasado tiempo juntos, sabemos +dónde vivimos, conocemos a la pareja o a la familia del otro, o tenemos algún otro +modo tangible que proporciona un alto nivel de seguridad de que esta persona es realmente +quien dice ser. + +Esas personas, a su vez, pueden tener conexiones similares con otras a las que conocen, +han conocido y en las que confían a un nivel que va mucho más allá del mundo online. Este +crea una red de confianza en la que puedes confiar en tus amigos, y los amigos de +en tus amigos, y así sucesivamente. + +A la luz de los acontecimientos actuales, y en reconocimiento de la rápida aceleración de +lo que es posible con la inteligencia artificial generativa, FreeSewing +restringirá a partir de ahora todo acceso de escritura o privilegios elevados a los miembros de la comunidad +que formen parte de la red de confianza de FreeSewing. + +Por supuesto, seguiremos aceptando -o mejor dicho, revisando- las contribuciones de +de todo el mundo. Pero los permisos que desbloquean la posibilidad de hacer daño estarán +restringidos a las personas para las que se haya establecido la confianza AFK (lejos del teclado +). + +Para facilitar la construcción de esa red de confianza, empezaremos a documentar +esas conexiones entre personas. Esto permitirá a las personas que deseen +asumir más responsabilidades dentro de FreeSewing mirar su red de confianza y +ver quién vive cerca de ellos para que puedan engancharse a nuestra red de confianza a través de +esa persona. + +Soy consciente de que es extremadamente improbable que FreeSewing sea el objetivo de un intento de +por la puerta trasera por parte de un actor de un estado nación, pero adoptar las mejores prácticas y ser +transparente sobre cómo hacemos las cosas es una buena idea a pesar de todo. + +Así pues, empezaré a construir y documentar esta red de confianza en las próximas dos +semanas, y revisaré todos los controles de acceso y permisos para asegurarme de que estamos +haciendo todo lo posible para evitar que incluso los actores más dedicados envenenen +el pozo. + +  + +*** + +  + +## 🤔 Cómo han cambiado los retos de FreeSewing con el tiempo + +¿Sabías que FreeSewing v1 se lanzó hace 7 años y 7 días +? Desde entonces hemos +hecho muchos cambios grandes y pequeños, y nuestra biblioteca central y el sistema de plugins han +madurado hasta convertirse en una forma fiable -y ciertamente opinable- de diseñar patrones de costura paramétricos +. + +Los retos más interesantes desde el punto de vista técnico se han resuelto más o menos en +. Lo que queda es la parte de cara al usuario, o +la experiencia del usuario (UX), como nos gusta llamarla. + +FreeSewing puede hacer muchas cosas, así que ¿cómo poner toda esa funcionalidad a disposición de los usuarios de +sin abrumarlos? ¿Es eso posible incluso en el móvil, que es la +forma dominante en que la gente se conecta ahora a Internet. ¿Cómo creas una experiencia intuitiva, +o guías a alguien que llega a FreeSewing.org después de una búsqueda en Google de _patrones de costura gratuitos_ +hacia la comprensión de lo que es y hace FreeSewing en el puñado de +segundos en que es probable que la gente le dé una oportunidad antes de pasar al siguiente enlace +de sus resultados de búsqueda? + +Para que quede claro: no conozco la respuesta a estas preguntas. Pero es +cada vez más a lo que dedicamos nuestro tiempo. El porcentaje de personas que +utilizan nuestro software directamente es insignificante comparado con la cantidad de personas que +(sólo) consumen nuestro software a través de nuestro sitio web. Para la mayoría de los visitantes, FreeSewing +**is** un sitio web y si es otra cosa, probablemente no les quede claro, +o ni siquiera sea relevante. + +Obviamente, hay margen de mejora, pero a menudo no hay un camino obvio +hacia adelante. Tal vez -o debería decir casi seguro- éste sea un ámbito en el que +carezca de talento o habilidad para idear algún tipo de gran estrategia global +. Pero me encuentro cuestionando muchas de mis propias ideas o impulsos +en este ámbito. + +Así que me preguntaba si podríamos hacer un pequeño experimento. Un experimento en el que +te plantea -a mi querido lector- una pregunta sencilla. ¿Estás preparado? Aquí +está la cuestión: + +> \*\*¿Qué es FreeSewing? + +Me encantaría escuchar tu respuesta. Puedes simplemente pulsar responder para hacérmelo saber. + +_PS: He enterrado esta pregunta al final porque creo que si has leído todo +lo que había antes, probablemente quiera oír lo que piensas. diff --git a/markdown/org/newsletter/2024q2/fr.md b/markdown/org/newsletter/2024q2/fr.md new file mode 100644 index 00000000000..03109527c38 --- /dev/null +++ b/markdown/org/newsletter/2024q2/fr.md @@ -0,0 +1,279 @@ +--- +date: 04-01-2024 +edition: 2024q2 +intro: Bienvenue dans l'édition du printemps 2024 de la newsletter de FreeSewing. +title: 2024 Édition de printemps +--- + +Bienvenue dans l'édition du printemps 2024 de la newsletter de FreeSewing. + +Voici ce que nous avons pour toi aujourd'hui, sans blague : + +- 👕 FreeSewing 3.2 apporte Tristan, Lumina, Lumira, et plus encore (lecture de 3 minutes par joost). +- 📨 Le courrier électronique vient de devenir plus difficile, encore une fois (lecture en 1 minute par joost). +- 🕸️ Construire le réseau de confiance de FreeSewing suite à la tentative de backdoor du XZ (5 minutes par joost). +- 🤔 Comment les défis de FreeSewing se sont déplacés au fil du temps (lecture de 2 minutes par joost). + +On peut commencer ? + +  + +  + +## 👕 FreeSewing 3.2 apporte Tristan, Lumina, Lumira, etc. + +Nous avons publié FreeSewing v3.2 plus tôt au cours du premier trimestre 2024 et il comprend 3 nouveaux modèles +, ainsi qu'une série de corrections de bugs et d'améliorations. + +Jetons un coup d'œil aux faits marquants : + +### The Tristan Top + +Tout d'abord, il y a [le haut Tristan] (https\://freesewing.org/designs/tristan). Tristan est un haut avec des coutures princesse et un laçage (facultatif) sur le devant ou/et dans le dos. L'histoire de son origine est la nécessité d'un costume pour un festival de la Renaissance, c'est donc probablement un bon indicateur de ce à quoi tu dois t'attendre. + +Tristan a été conçu par Natalia qui a également [écrit un article de blog sur le nouveau design de Tristan] (https\://freesewing.org/blog/our-newest-design-is-the-tristan-top), c'est donc un bon endroit pour obtenir tous les détails sur ce nouveau design. + +### The Lumina and Lumira Leggings + +Je te laisse une seconde pour scanner à nouveau ce titre, mais oui, il y a deux modèles de leggings différents avec des noms similaires : [le Lumira Leggings](https://freesewing.org/designs/lumira) et le [Lumina Leggings](https://freesewing.org/designs/lumina). + +Les deux sont nés du désir de Wouter d'avoir un bon équipement cycliste, et je te suggère de consulter les notes du concepteur pour [Lumina](https://freesewing.org/designs/lumina#notes) et [Lumira](https://freesewing.org/designs/lumira#notes) pour bien comprendre la différence entre ces designs, pourquoi ils diffèrent, et ce qui te conviendrait le mieux. + +### Bug fixes and improvements + +Les lecteurs réguliers de la newsletter savent que nous apportons continuellement des améliorations +sur FreeSewing.org et que celles-ci ne sont pas liées à une nouvelle version, +mais c'est une bonne occasion de les énumérer. Voici donc quelques points forts des corrections de bugs +et des améliorations qui ont été apportées à la version 3.2 : + +- Sandy a un nouveau panneau + option qui a été + ajouté par [Paula](https://github.com/freesewing/freesewing/pull/5861). Tu + pourrais toujours créer ta jupe circulaire à partir d'un certain nombre de motifs similaires en + faisant les correspondances toi-même, mais maintenant le motif s'en chargera pour toi. +- Ce qui a commencé comme un rapport de bogue pour l'aisance du biceps sur + Jaeger s'est terminé par un changement + de la façon dont l'encolure des bras est calculée sur Brian, en particulier la profondeur + de l'emmanchure. Étant donné que Brian est notre bloc le plus fondamental, cela aura + des effets d'entraînement sur de nombreuses autres conceptions, tu peux t'attendre à ce que, dès la sortie de la boîte + , l'armcye atteigne un niveau un peu plus bas. +- Dans [Carlton](https://freesewing.org/designs/carlton) - et donc dans + [Carlita](https://freesewing.org/designs/carlita) - nous avons corrigé le problème + où la marge de couture du sous-pull était mal dessinée. +- Dans [Charlie](https://freesewing.org/designs/charlie), le passepoil de la poche arrière + (4) et le parement de la poche avant (8) indiquaient à tort de couper 2 au lieu de 4 + dans la liste de coupe. This too is resolved. +- Dans [Hugo](https://freesewing.org/designs/hugo), nous avons corrigé un bug qui provoquait + une erreur de conception lorsque le réglage complet était désactivé, et nous avons corrigé un problème + où l'ouverture de la poche avant devenait de plus en plus étroite à mesure que la circonférence de la hanche + augmentait. +- Nous avons ajouté une nouvelle méthode + [Path.combine()](https://freesewing.dev/reference/api/path/combine) à + [notre API de base](https://freesewing.dev/reference/api). Ses origines se trouvent dans une discussion + dans issue + \#5976 qui a été + à l'origine déposée comme un rapport de bogue sur la façon dont Path.join() connecte les lacunes dans les + chemins joints - causées soit par les opérations `move`, soit par une différence entre + les points de fin et de début des chemins joints - pour être remplies avec un segment de ligne + . Ce comportement est attendu, mais nous avons ajouté + `Path.combine()` pour faciliter l'autre comportement : Combiner différents chemins + en un seul objet Path sans alterner les opérations de dessin. +- La [macro titre](https://freesewing.dev/reference/macros/title) peut maintenant être configurée avec un paramètre `notes` et `classes.notes` dans sa configuration, ce qui permet aux concepteurs de + d'ajouter des notes (au titre) d'une partie de modèle. +- Notre [plugin i18n](https://freesewing.dev/reference/plugins/i18n) prend désormais en charge + prend désormais en charge la traduction des tableaux imbriqués de chaînes de caractères, ce qui donne aux concepteurs + plus de flexibilité pour concaténer les parties traduites des chaînes de caractères. + +Le [billet de blog sur l'annonce de FreeSewing 3.2] (https\://freesewing.org/blog/v3-2-0) contient tous les détails. + +  + +*** + +  + +## 📨 Le courrier électronique vient de devenir plus difficile, encore une fois. + +Si tu lis ceci dans ta boîte de réception, et non une copie archivée sur +FreeSewing.org, c'est que nous avons pu t'envoyer cet e-mail, ce qui est une bonne nouvelle +. + +Ce dont tu ne te rends peut-être pas compte, c'est qu'il n'est pas vraiment anodin de le faire, et ce depuis des années ( +). Mais récemment, les choses sont devenues encore plus complexes. Gmail +(Google) et Yahoo par exemple ont mis en place de nouvelles restrictions au premier +trimestre de +2024 ce qui +nécessite un travail supplémentaire de notre part pour maximiser les chances que cet email +atterrisse effectivement dans ta boîte de réception. + +De plus, les expéditeurs d'e-mails dits "volumineux" sont soumis aux contrôles les plus stricts sur +. Si tu envoies 5000 messages par jour, tu es considéré comme un expéditeur en masse et +fera l'objet d'un examen plus approfondi. Comme cette lettre d'information compte environ 14 000 abonnés ( +), nous sommes tenus de respecter les normes les plus strictes possibles. + +Évidemment, personne n'aime le spam, et je ne plaide pas contre ces règles. +C'est juste que le temps et les efforts nécessaires pour faire fonctionner à grande échelle quelque chose d'aussi +apparemment trivial que l'envoi d'un e-mail ne cessent d'augmenter à mesure que +l'Internet tend vers un modèle de facto de paiement à l'acte. + +Pour l'instant, je continue à faire ces efforts, et j'espère qu'ils se sont avérés suffisants +pour que ceci arrive dans ta boîte de réception. Mais c'est quelque chose que nous devrons peut-être réexaminer plus tard +si cela devient une contrainte de plus en plus forte sur notre temps et nos ressources limités. + +  + +*** + +  + +## 🕸️ Construire le réseau de confiance de FreeSewing suite à la tentative de backdoor du XZ (5 minutes par joost). + +Selon l'endroit où tu reçois tes nouvelles, tu as peut-être entendu ou lu quelque chose sur +[la tentative de porte dérobée de l'utilitaire de compression xz +] (https\://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/). + +En bref, un acteur malveillant a tenté d'introduire une porte dérobée dans cet utilitaire +, ce qui, en fin de compte, était une tentative d'introduire clandestinement un exploit RCE dans +SSHd. + +Ou, en termes [ELI5](https://en.wiktionary.org/wiki/ELI5) : Quelqu'un a contribué au code +d'une petite bibliothèque qui avait des intentions néfastes. Cela a été fait de manière sournoise +et la cible finale n'était pas la bibliothèque elle-même, mais plutôt un autre projet logiciel +qui utilise cette bibliothèque : Le Secure Shell Deamon. Un _daemon_ est juste un mot +plus cool pour désigner un _service_ sur un ordinateur, parce que pourquoi ne pas rendre les choses plus cool. +Ce démon ou service particulier, le démon _secure shell_, est responsable de +la gestion des connexions Secure Shell (SSH). C'est la référence en matière de gestion à distance +des systèmes Linux (et unix). + +Le code introduit clandestinement une porte dérobée RCE. RCE signifie _remote code +execution_, c'est-à-dire qu'il te permet de _faire des choses_ à distance sans avoir besoin de +s'authentifier ou quoi que ce soit d'autre. Ou, pour le dire autrement, il permet de contrôler +un système informatique distant auquel on ne devrait normalement pas avoir accès. +Le fait qu'il soit _gated_ signifie que l'auteur de +le code malveillant a pris des mesures pour s'assurer qu'il était le seul à pouvoir utiliser le code malveillant +. Comme une porte dérobée avec une clé. + +Il est difficile d'exagérer la gravité de cette tentative de backdooring, essentiellement +tous les systèmes Linux de la planète. Ce n'est pas seulement le système d'exploitation +le plus utilisé au monde, sa domination sur les systèmes d'exploitation des serveurs est écrasante. +Ou comme je le dis souvent : _Tout ce qui compte fonctionne sous Linux_. + +Cette histoire est en cours et j'espère pour ma part qu'elle fera l'objet d'une mini-série sur Netflix +avec David Cross dans le rôle de [Andres +Freund] (https\://github.com/anarazel), mais je m'écarte du sujet. C'est la lettre d'information de FreeSewing +, alors j'ai voulu extraire de cette histoire quelque chose que je pense +être pertinent pour FreeSewing, ou vraiment pour n'importe quel projet open source. + +### L'épuisement du mainteneur et le long con de gagner la confiance + +L'un des éléments fascinants de cette histoire est de savoir _qui a apporté les modifications, +et pourquoi elles ont été acceptées sans un examen suffisant pour révéler l'intention malveillante +de la contribution. + +Parce que l'utilisateur qui les a créés a contribué pendant **years** au projet +et qu'à la lumière de ce travail, son statut s'est élevé à un niveau où il y avait beaucoup +de confiance implicite basée sur son travail, malgré le fait qu'il ne sait pratiquement rien de +qui ou ce qui se cache derrière le nom d'utilisateur `JiaT75` (dans ce cas). Une telle _long con_ est +un investissement important en temps et en efforts, donc l'hypothèse actuellement retenue +est qu'il s'agit d'un acteur national (pense à la NSA ou à l'équivalent +d'un autre pays). Il est également important de noter que le responsable de xy avait +du mal à faire face à la longue série de responsabilités liées à la maintenance du logiciel +et qu'il cherchait activement de l'aide pour éviter l'épuisement. C'est un scénario +qui est scandaleusement courant dans les projets open source et qui crée une situation +où les acteurs malveillants peuvent trop facilement profiter des mainteneurs épuisés de +qui cherchent désespérément à se décharger d'une partie du travail. + +### Établir un réseau de confiance + +Ce problème de _qui peux-tu croire_ n'est bien sûr pas nouveau. Une façon de la contrer +est d'établir un _web de confiance_. C'est ainsi que les choses se passent dans les grands projets +de logiciels libres impliquant de nombreux bénévoles, tels que [le projet Debian +] (https\://www\.debian.org/). + +Concrètement, un tel réseau de confiance repose sur des relations entre +personnes qui connaissent et ont vérifié la véritable identité de chacune d'entre elles. Par exemple, +, il y a un certain nombre de personnes dans la communauté FreeSewing que j'ai rencontrées dans la vraie vie +. Nous ne nous sommes pas simplement rencontrés face à face, mais nous avons passé du temps ensemble, nous savons +où nous vivons, nous connaissons le partenaire ou la famille de l'autre, ou nous avons d'autres +moyens tangibles qui fournissent un niveau élevé d'assurance que cette personne est vraiment +ce qu'elle prétend être. + +Ces personnes, à leur tour, peuvent avoir des liens similaires avec d'autres personnes qu'elles connaissent, +qu'elles ont rencontrées, et en qui elles ont confiance à un niveau qui va bien au-delà du monde en ligne. Ce site +crée un réseau de confiance où tu peux faire confiance à tes amis, et les amis de +à tes amis et ainsi de suite. + +À la lumière des événements actuels, et en reconnaissance de l'accélération rapide de +ce qui est possible avec l'intelligence artificielle générative, FreeSewing +limitera dorénavant tout accès en écriture ou privilèges élevés aux membres de la communauté +qui font partie du réseau de confiance de FreeSewing. + +Nous continuerons bien sûr à accepter - ou plutôt à examiner - les contributions de +. Mais les autorisations qui permettent de faire du mal seront +limitées aux personnes pour lesquelles la confiance a été établie AFK (away from +keyboard). + +Afin de faciliter la construction d'un tel réseau de confiance, nous allons commencer à documenter +ces liens entre les personnes. Cela permettra aux personnes qui souhaitent +prendre plus de responsabilités au sein de FreeSewing de consulter son réseau de confiance et +de voir qui vit près d'eux afin qu'ils puissent se connecter à notre réseau de confiance par l'intermédiaire de +cette personne. + +Je sais qu'il est très peu probable que FreeSewing soit la cible d'une tentative de +par un acteur national, mais adopter les meilleures pratiques et être +transparent sur la façon dont nous faisons les choses est une bonne idée. + +Je vais donc commencer à construire et à documenter ce réseau de confiance au cours des deux +prochaines semaines, et passer en revue tous les contrôles d'accès et toutes les autorisations pour m'assurer que nous +faisons tout ce que nous pouvons pour empêcher même les acteurs les plus dévoués d'empoisonner +le puits. + +  + +*** + +  + +## 🤔 Comment les défis de FreeSewing se sont déplacés au fil du temps. + +Sais-tu que [FreeSewing v1 a été publié il y a 7 ans et 7 jours +] (https\://freesewing.org/blog/announcing-freesewing) ? Depuis, nous avons +apporté de nombreux changements, petits et grands, et notre bibliothèque de base et notre système de plugins ont +mûri pour devenir un moyen fiable - et certainement influencé - de concevoir des patrons de couture paramétriques +. + +Les défis les plus intéressants d'un point de vue technique ont +été plus ou moins résolus. Ce qui reste, c'est le côté face à l'utilisateur, ou +l'expérience utilisateur (UX) comme nous aimons l'appeler. + +FreeSewing peut faire beaucoup de choses, alors comment mettre toutes ces fonctionnalités à la disposition des utilisateurs de +sans les submerger ? Est-ce que c'est même possible sur le mobile, qui est le moyen dominant +par lequel les gens vont en ligne maintenant. Comment créer une expérience intuitive, +ou guider quelqu'un qui arrive sur FreeSewing.org après une recherche _free sewing patterns_ +Google vers une compréhension de ce qu'est et fait FreeSewing dans les quelques +secondes où les gens sont susceptibles de lui donner une chance avant de passer au lien +suivant dans leurs résultats de recherche. + +Pour être clair : je ne connais pas la réponse à ces questions. Mais c'est +de plus en plus ce à quoi nous consacrons notre temps. Le pourcentage de personnes qui +utilisent directement notre logiciel est insignifiant par rapport au nombre de personnes qui +consomment (uniquement) notre logiciel par l'intermédiaire de notre site Web. Pour la plupart des visiteurs, FreeSewing +**is** est un site Web et s'il s'agit d'autre chose, ce n'est probablement pas clair pour eux, +ou même pertinent. + +Il est évident qu'il y a matière à amélioration, mais souvent il n'y a pas de chemin évident +. Peut-être -- ou devrais-je dire presque certainement -- c'est un domaine dans lequel +n'a pas le talent ou les compétences nécessaires pour élaborer une sorte de grande stratégie globale pour +. Mais je me retrouve à remettre en question beaucoup de mes propres idées ou impulsions +dans ce domaine. + +Alors, je me demandais si nous pouvions faire une petite expérience. Une expérience au cours de laquelle je +te pose - mon cher lecteur - une question simple. Es-tu prêt pour cela ? C'est ici +que se pose la question : + +> \*\*Qu'est-ce que FreeSewing ? + +J'aimerais entendre ta réponse. Tu peux simplement cliquer sur répondre pour me le faire savoir. + +_PS : J'ai enterré cette question à la fin parce que j'ai l'impression que si tu as lu tout +ce qui précède, j'ai probablement envie d'entendre tes pensées. diff --git a/markdown/org/newsletter/2024q2/nl.md b/markdown/org/newsletter/2024q2/nl.md new file mode 100644 index 00000000000..017add48574 --- /dev/null +++ b/markdown/org/newsletter/2024q2/nl.md @@ -0,0 +1,280 @@ +--- +date: 2024-04-01 +edition: 2024q2 +intro: Welkom bij de 2024 lente editie van de FreeSewing nieuwsbrief. +title: 2024 Voorjaarseditie +--- + +Welkom bij de 2024 lente editie van de FreeSewing nieuwsbrief. + +Dit is wat we vandaag voor je hebben, geen grapje: + +- FreeSewing 3.2 brengt Tristan, Lumina, Lumira en meer (3 minuten lezen door joost) +- 📨 E-mail is weer moeilijker geworden (1 minuut gelezen door joost) +- 🕸️ Bouwen aan het web van vertrouwen van FreeSewing in de nasleep van de XZ achterdeurpoging (5 minuten door joost) +- 🤔 Hoe de uitdagingen van FreeSewing in de loop der tijd zijn veranderd (2 minuten lezen door joost) + +Zullen we beginnen? + +  + +  + +## FreeSewing 3.2 brengt Tristan, Lumina, Lumira en meer + +We hebben FreeSewing v3.2 eerder uitgebracht in Q1 2024 en het bevat 3 nieuwe +ontwerpen, evenals een reeks bugfixes en verbeteringen. + +Laten we eens kijken naar de hoogtepunten: + +### The Tristan Top + +Als eerste is er [de Tristan Top](https://freesewing.org/designs/tristan). Tristan is een top met prinsessennaden en (optioneel) een vetersluiting voor en/of achter. Het verhaal over de oorsprong is de behoefte aan een kostuum voor een Renaissance festival, dus dat is waarschijnlijk een goede indicatie van wat je kunt verwachten. + +Tristan is ontworpen door Natalia die ook [een blogpost schreef over het nieuwe Tristan ontwerp](https://freesewing.org/blog/our-newest-design-is-the-tristan-top), dus dat is een geweldige plek om alle details over dit nieuwe ontwerp te krijgen. + +### The Lumina and Lumira Leggings + +Ik geef je even de tijd om die titel nog een keer te scannen, maar ja, er zijn twee verschillende leggingspatronen met vergelijkbare namen: [de Lumira Leggings](https://freesewing.org/designs/lumira) en de [Lumina Leggings](https://freesewing.org/designs/lumina). + +Beide zijn voortgekomen uit Wouter's verlangen naar goede fietskleding, en ik raad je aan om de ontwerpnotities voor zowel [Lumina](https://freesewing.org/designs/lumina#notes) als [Lumira](https://freesewing.org/designs/lumira#notes) te bekijken om het verschil tussen deze ontwerpen te begrijpen, waarom ze verschillen en wat het beste voor jou zou werken. + +### Bug fixes and improvements + +Regelmatige lezers van de nieuwsbrief zullen weten dat we voortdurend +verbeteringen uitrollen op FreeSewing.org en dat die niet gebonden zijn aan een nieuwe release, +maar het is een goede gelegenheid om ze op te sommen, dus hier zijn enkele hoogtepunten van de bug +fixes en verbeteringen die in de 3.2 release zijn opgenomen: + +- Sandy heeft een nieuwe panelen + optie die + is toegevoegd door [Paula](https://github.com/freesewing/freesewing/pull/5861). Je zou + altijd je cirkelrok kunnen maken van een aantal vergelijkbare patronen door + zelf te matchen, maar nu zorgt het patroon daarvoor. +- Wat begon als een bugrapport voor het bicepsgemak op + Jaeger eindigde met een + wijziging in de manier waarop de armscye wordt berekend op Brian, in het bijzonder de diepte + van het armsgat. Aangezien Brian ons meest fundamentele blok is, zal dit + gevolgen hebben voor veel andere ontwerpen. Je kunt verwachten dat out-of-the-box + de armscye iets lager zal reiken. +- In [Carlton](https://freesewing.org/designs/carlton) - en dus ook in + [Carlita](https://freesewing.org/designs/carlita) - hebben we + hersteld en uitgegeven waar de naadtoeslag op de onderkraag verkeerd was getekend. +- In [Charlie](https://freesewing.org/designs/charlie) is voor de achterzak welt + (4) en voorzak facing (8) ten onrechte aangegeven dat er 2 in plaats van 4 + in de kniplijst moeten worden geknipt. This too is resolved. +- In [Hugo](https://freesewing.org/designs/hugo) hebben we een bug verholpen die ervoor zorgde dat + het ontwerp een foutmelding gaf als de volledige instelling uit stond, en we hebben een probleem verholpen + waarbij de opening van de voorzak steeds smaller werd naarmate de heup + groter werd. +- We hebben een nieuwe methode + [Path.combine()](https://freesewing.dev/reference/api/path/combine) toegevoegd aan + [onze kern-API](https://freesewing.dev/reference/api). De oorsprong ligt in een + discussie in issue + \#5976 die + oorspronkelijk was ingediend als een bugrapport over hoe Path.join() gaten in de + samengevoegde paden verbindt - veroorzaakt door `verplaats` operaties, of een verschil tussen + het eind- en beginpunt van samengevoegde paden - om op te vullen met een lijn + segment. Dat gedrag wordt verwacht/bedoeld, maar we hebben + `Path.combine()` toegevoegd om het andere gedrag te vergemakkelijken: Het combineren van verschillende paden + in een enkel Path object zonder de tekenbewerkingen af te wisselen. +- De [title macro](https://freesewing.dev/reference/macros/title) kan nu + geconfigureerd worden met een `notes` en `classes.notes` instelling in de configuratie, zodat + ontwerpers noten kunnen toevoegen aan (de titel van) een patroondeel. +- Onze [i18n plugin](https://freesewing.dev/reference/plugins/i18n) ondersteunt nu + ondersteunt nu vertaling van geneste matrices van strings, wat ontwerpers + meer flexibiliteit geeft om vertaalde delen van strings aan elkaar te rijgen. + +De [FreeSewing 3.2 aankondiging blog post](https://freesewing.org/blog/v3-2-0) heeft alle details. + +  + +*** + +  + +## E-mail is weer moeilijker geworden + +Als je dit in je inbox leest en niet in een gearchiveerde kopie op +FreeSewing.org, dan hebben we deze e-mail bij je kunnen afleveren en dat is goed +nieuws. + +Wat je je misschien niet realiseert is dat dit niet bepaald triviaal is, en dat is +al jaren niet meer. Maar onlangs zijn de dingen nog ingewikkelder geworden. Gmail +(Google) en Yahoo bijvoorbeeld hebben nieuwe beperkingen geïmplementeerd in het eerste +kwartaal van +2024 waardoor +extra werk van onze kant vereist is om de kans te maximaliseren dat deze e-mail +daadwerkelijk in je inbox terechtkomt. + +Bovendien worden zogenaamde _bulk e-mail afzenders_ onderworpen aan de strengste +controles. Als je 5000 berichten per dag verstuurt, word je beschouwd als een bulkverzender en wordt +extra kritisch bekeken. Aangezien deze nieuwsbrief ongeveer 14k +abonnees heeft, worden we aan de hoogst mogelijke normen gehouden. + +Uiteraard houdt niemand van spam en ik pleit niet tegen deze regels. +Het is gewoon zo dat de hoeveelheid tijd en moeite die nodig is om iets dat +zo triviaal lijkt als het versturen van een e-mail op schaal te laten werken, steeds groter wordt naarmate +het internet evolueert naar een de-facto pay-to-play model. + +Voorlopig doe ik die inspanningen nog steeds, en hopelijk zijn ze voldoende gebleken +om dit in jullie inbox te krijgen. Maar het is iets dat we op een later tijdstip +misschien opnieuw moeten bekijken als het een steeds groter beslag legt op onze beperkte tijd en middelen. + +  + +*** + +  + +## 🕸️ Bouwen aan het web van vertrouwen van FreeSewing in de nasleep van de XZ achterdeurpoging (5 minuten door joost) + +Afhankelijk van waar je je nieuws vandaan haalt, heb je misschien gehoord of gelezen over +de backdoor poging van het xz compressie +hulpprogramma. + +In een notendop probeerde een kwaadwillende actor een backdoor te introduceren in dit +hulpprogramma, wat uiteindelijk een poging was om een gated RCE-exploit binnen te smokkelen in +SSHd. + +Of, in [ELI5](https://en.wiktionary.org/wiki/ELI5) termen: Iemand heeft +code bijgedragen aan een kleine bibliotheek die snode bedoelingen had. Het werd op een geniepige manier gedaan +en het uiteindelijke doelwit was niet de bibliotheek zelf, maar een ander software +project dat deze bibliotheek gebruikt: De Secure Shell Deamon. Een _daemon_ is gewoon een +cooler woord voor een _service_ op een computer, want waarom dingen niet cooler maken. +Deze specifieke daemon of dienst, de _secure shell_ daemon is verantwoordelijk voor +het afhandelen van beveiligde shell (SSH) verbindingen. Het is de gouden standaard voor extern +beheer van Linux (en unix) systemen. + +De code smokkelde een gesloten RCE backdoor binnen. RCE staat voor _remote code +execution_, wat betekent dat je _dingen_ op afstand kunt doen zonder +authenticatie of iets dergelijks. Of anders gezegd, het stelt iemand in staat om +te bedienen van een computersysteem op afstand waar hij normaal gesproken geen toegang toe zou mogen hebben. +Het feit dat het _gated_ is betekent dat de auteur van +de kwaadaardige code stappen heeft genomen om ervoor te zorgen dat alleen zij de kwaadaardige +code konden gebruiken. Als een achterdeur met een sleutel. + +Het is moeilijk om de ernst te overschatten van deze poging tot backdooring van in wezen +elk Linux systeem op de planeet. Het is niet alleen 's werelds meest gebruikte besturingssysteem +, de dominantie van server besturingssystemen is overweldigend. +Of zoals ik vaak zeg: Alles wat er toe doet draait op Linux_. + +Dit is een doorlopend verhaal en ik hoop dat er een Netflix +miniserie van wordt gemaakt met David Cross in de rol van Andres +Freund, maar ik dwaal af. Dit is de FreeSewing +nieuwsbrief, dus ik wilde iets uit dit verhaal halen waarvan ik denk dat +relevant is voor FreeSewing, of eigenlijk voor elk open source project dat er is. + +### Burn-out bij de beheerder en de lange weg om vertrouwen te winnen + +Een van de fascinerende elementen van dit verhaal is _wie_ de wijzigingen heeft bijgedragen, +en waarom ze werden geaccepteerd zonder voldoende nauwkeurig onderzoek om de kwaadaardige +bedoeling van de bijdrage te onthullen. + +Omdat de gebruiker die ze maakte al **years** had bijgedragen aan het project +en door dit werk in status was gestegen tot een niveau waarop er veel +impliciet vertrouwen was gebaseerd op hun werk, ondanks dat ze vrijwel niets wisten over +wie of wat er achter gebruikersnaam `JiaT75` (in dit geval) schuilgaat. Zo'n _lange oplichting_ is +een aanzienlijke investering in tijd en moeite, dus de huidige aanname +is dat dit een actor uit een natiestaat was (denk aan NSA of het +equivalent van een ander land). Het is ook belangrijk om op te merken dat de xy-beheerder het +erg moeilijk had met de lange staart van verantwoordelijkheden van het onderhouden van +software en actief op zoek was naar hulp om een burnout te voorkomen. Het is een +scenario dat schokkend vaak voorkomt bij open source projecten en een +situatie creëert waarin kwaadwillende actoren maar al te gemakkelijk misbruik kunnen maken van uitgeputte +beheerders die wanhopig zijn om wat van het werk over te nemen. + +### Een web van vertrouwen creëren + +Dit probleem van _wie kun je vertrouwen_ is natuurlijk niet nieuw. Een manier om het tegen te gaan +is door een _web van vertrouwen_ te creëren. Dit is hoe dingen worden gedaan in grotere +open source software projecten waarbij veel vrijwilligers betrokken zijn, zoals het Debian +project. + +Praktisch gezien is zo'n web van vertrouwen gebouwd op relaties tussen +mensen die elkaars ware identiteit kennen en hebben geverifieerd. Bijvoorbeeld, +er zijn een aantal mensen in de FreeSewing gemeenschap die ik in het echte +leven heb ontmoet. We hebben elkaar niet alleen persoonlijk ontmoet, maar ook tijd met elkaar doorgebracht, we kennen +waar we wonen, we kennen elkaars partners of familie, of hebben een andere +tastbare manier die een hoge mate van zekerheid geeft dat deze persoon echt +is wie hij beweert te zijn. + +Die mensen kunnen op hun beurt soortgelijke connecties hebben met anderen die ze kennen, +hebben ontmoet en vertrouwen op een niveau dat veel verder gaat dan de online wereld. Dit +creëert een web van vertrouwen waarin je je vrienden kunt vertrouwen, en de vrienden van +je vrienden enzovoort. + +In het licht van de huidige gebeurtenissen en als erkenning van de snelle versnelling van +wat er mogelijk is met generatieve kunstmatige intelligentie, zal FreeSewing +voortaan alle schrijftoegang of verhoogde privileges beperken tot leden van de gemeenschap +die deel uitmaken van FreeSewing's web van vertrouwen. + +We blijven natuurlijk bijdragen accepteren - of liever gezegd beoordelen - van +iedereen. Maar rechten die het potentieel ontsluiten om kwaad te doen, worden +beperkt tot mensen voor wie vertrouwen is opgebouwd AFK (weg van +toetsenbord). + +Om het bouwen van zo'n web van vertrouwen te vergemakkelijken, beginnen we met het documenteren van +deze verbindingen tussen mensen. Hierdoor kunnen mensen die +meer verantwoordelijkheden binnen FreeSewing op zich willen nemen, het vertrouwensweb bekijken en +zien wie er bij hen in de buurt woont, zodat ze zich kunnen aansluiten bij ons vertrouwensweb via +die persoon. + +Ik realiseer me dat het zeer onwaarschijnlijk is dat FreeSewing het doelwit wordt van een achterdeur +poging door een nationale actor, maar het is hoe dan ook een goed idee om best practices toe te passen en +transparant te zijn over hoe we dingen doen. + +Ik zal dus in de komende paar weken beginnen met het bouwen en documenteren van dit web van vertrouwen, +, en alle toegangscontroles en toestemmingen herzien om er zeker van te zijn dat we +alles doen wat we kunnen om te voorkomen dat zelfs de meest toegewijde actoren +de bron vergiftigen. + +  + +*** + +  + +## 🤔 Hoe de uitdagingen van FreeSewing in de loop der tijd zijn veranderd + +Wist je dat FreeSewing v1 7 jaar en 7 dagen +geleden is uitgebracht? Sinds die tijd hebben we +veel grote en kleine veranderingen doorgevoerd, en onze kernbibliotheek en plugin-systeem zijn +uitgegroeid tot een betrouwbare -- en zeker eigenwijze -- manier om parametrische +naaipatronen te ontwerpen. + +De uitdagingen die vanuit technisch oogpunt het meest interessant zijn, zijn +min of meer opgelost. Wat overblijft is de gebruikerskant, of +de gebruikerservaring (UX) zoals wij het graag noemen. + +FreeSewing kan veel, dus hoe maak je al die functionaliteit beschikbaar voor de +gebruikers zonder ze te overweldigen? Is dat zelfs mogelijk op mobiel, wat nu de +dominante manier is waarop mensen online gaan. Hoe maak je er een intuïtieve ervaring van, +of hoe begeleid je iemand die op FreeSewing.org terechtkomt na een Google-zoekopdracht naar _gratis naaipatronen_ +naar een begrip van wat FreeSewing is en doet in de handvol +seconden dat mensen het waarschijnlijk een kans geven voordat ze verder gaan naar de volgende +link in hun zoekresultaten. + +Voor de duidelijkheid: ik weet het antwoord op deze vragen niet. Maar het is +steeds meer waar we onze tijd aan besteden. Het percentage mensen dat +onze software rechtstreeks gebruikt, is verwaarloosbaar vergeleken met het aantal mensen dat +(alleen) onze software gebruikt via onze website. Voor de meeste bezoekers is FreeSewing +**is** een website en als het iets anders is, is dat waarschijnlijk niet duidelijk voor hen, +of zelfs maar relevant. + +Er is duidelijk ruimte voor verbetering, maar vaak is er niet één duidelijk pad +voorwaarts. Misschien -- of moet ik zeggen bijna zeker -- is dit een gebied waar ik +het talent of de vaardigheid mis om een soort grote overkoepelende +strategie te bedenken. Maar ik betrap mezelf erop dat ik veel van mijn eigen ideeën of impulsen +op dit gebied in twijfel trek. + +Dus ik vroeg me af of we een klein experiment konden doen. Een experiment waarbij ik +aan jou -- mijn beste lezer -- een eenvoudige vraag stel. Ben je er klaar voor? Hier +is de vraag: + +> **Wat is FreeSewing?** + +Ik hoor graag je antwoord. Je kunt gewoon op reply drukken om het me te laten weten. + +_PS: Ik heb deze vraag aan het eind begraven, omdat ik het gevoel heb dat als je door alles van +hebt gelezen wat ervoor kwam, ik waarschijnlijk je gedachten wil horen._ diff --git a/markdown/org/newsletter/2024q2/uk.md b/markdown/org/newsletter/2024q2/uk.md new file mode 100644 index 00000000000..c84af490f90 --- /dev/null +++ b/markdown/org/newsletter/2024q2/uk.md @@ -0,0 +1,280 @@ +--- +date: 2024-04-01 +edition: 2024q2 +intro: Ласкаво просимо до весняного випуску 2024 року інформаційного бюлетеня FreeSewing. +title: 2024 Весняний випуск +--- + +Ласкаво просимо до весняного випуску 2024 року інформаційного бюлетеня FreeSewing. + +Ось що ми маємо для вас сьогодні, і це не жарт: + +- FreeSewing 3.2 приносить Tristan, Lumina, Lumira та багато іншого (3-хвилинне читання від joost) +- Електронна пошта знову стала складнішою (1 хвилина читання від joost) +- 🕸️ Побудова мережі довіри до FreeSewing після спроби бекдору XZ (5 хвилин на joost) +- Як змінилися виклики FreeSewing з плином часу (2-хвилинне читання від joost) + +Почнемо? + +  + +  + +## FreeSewing 3.2 приносить Tristan, Lumina, Lumira та багато іншого + +Ми випустили FreeSewing v3.2 раніше в першому кварталі 2024 року, і він включає в себе 3 нових дизайни +, а також ряд виправлень і поліпшень. + +Давайте подивимося на основні моменти: + +### The Tristan Top + +По-перше, це [Tristan Top] (https\://freesewing.org/designs/tristan). Трістан - топ зі швами "принцеса" та (за бажанням) шнурівкою спереду та/або ззаду. Історія його виникнення - це потреба в костюмі для фестивалю Ренесансу, тож це, мабуть, хороший показник того, чого очікувати. + +Трістан був розроблений Наталією, яка також [написала пост про новий дизайн Трістана] (https\://freesewing.org/blog/our-newest-design-is-the-tristan-top), тож це чудове місце, де можна дізнатися всі подробиці про цей новий дизайн. + +### The Lumina and Lumira Leggings + +Я дам вам секунду, щоб відсканувати цю назву ще раз, але так, є дві різні моделі легінсів зі схожими назвами: [the Lumira Leggings] (https\://freesewing.org/designs/lumira) та [Lumina Leggings] (https\://freesewing.org/designs/lumina). + +Обидві моделі народилися з бажання Воутера створити хороше велосипедне спорядження, і я пропоную вам ознайомитися з дизайнерськими нотатками для [Lumina] (https\://freesewing.org/designs/lumina#notes) та [Lumira] (https\://freesewing.org/designs/lumira#notes), щоб повністю оцінити різницю між цими моделями, чому вони відрізняються, і яка з них підійде вам найкраще. + +### Bug fixes and improvements + +Постійні читачі бюлетеня знають, що ми постійно впроваджуємо +покращення на FreeSewing.org, і що вони не пов'язані з новим випуском, +але це гарна можливість перерахувати їх, тому ось деякі основні моменти виправлення помилок +і покращень, які увійшли до випуску 3.2: + +- Сенді має нові панелі + опції, які були + додані [Паулою](https://github.com/freesewing/freesewing/pull/5861). Ви завжди + можете створити свою спідницю-коло з кількох схожих викрійок, + виконавши підбір самостійно, але тепер викрійка подбає про це за вас. +- Те, що почалося як [звіт про баг для біцепса на + Jaeger] (https\://github.com/freesewing/freesewing/issues/5999), закінчилося + зміною способу розрахунку обхвату плеча на Брайані, зокрема глибини + пройми. Враховуючи, що Брайан є нашим найбільш фундаментальним блоком, це матиме + вплив на багато інших конструкцій, ви можете очікувати, що поза коробкою + обхвату буде трохи нижчим. +- В [Carlton](https://freesewing.org/designs/carlton) - і, відповідно, в + [Carlita](https://freesewing.org/designs/carlita) - ми виправили і випустили + , де припуск на шов на комірі був неправильно накреслений. +- У моделі [Charlie](https://freesewing.org/designs/charlie) для шва задньої кишені + (4) і лицьової частини передньої кишені (8) у списку розкрою помилково вказано 2 замість 4 + . This too is resolved. +- У [Hugo](https://freesewing.org/designs/hugo) ми виправили баг, який призводив до + помилок у дизайні при вимкненому повному налаштуванні, а також вирішили проблему + , коли отвір передньої кишені ставав дедалі вужчим зі збільшенням обхвату стегон + . +- Ми додали новий метод + [Path.combine()](https://freesewing.dev/reference/api/path/combine) до + [нашого основного API](https://freesewing.dev/reference/api). Вона виникла з + обговорення у випуску + \#5976, яке було + спочатку подано як звіт про ваду про те, як Path.join() з'єднує пропуски у + об'єднаних шляхах - спричинені або операціями `move`, або різницею між + кінцевою та початковою точками об'єднаних шляхів - і заповнює їх відрізком лінії + . Така поведінка є очікуваною/передбачуваною, але ми додали + `Path.combine()`, щоб полегшити іншу поведінку: Об'єднання різних контурів + в один об'єкт Path без зміни операцій малювання. +- Макрос [title макрос](https://freesewing.dev/reference/macros/title) тепер можна + налаштувати за допомогою параметрів `notes` та `classes.notes` у його конфігурації, що дозволить дизайнерам + додавати примітки до частини шаблону (заголовка). +- Наш [плагін i18n](https://freesewing.dev/reference/plugins/i18n) тепер підтримує + тепер підтримує переклад вкладених масивів рядків, що надає дизайнерам + більше гнучкості для конкатенації перекладених частин рядків. + +Всі деталі можна знайти у блозі [Анонс FreeSewing 3.2] (https\://freesewing.org/blog/v3-2-0). + +  + +*** + +  + +## Електронна пошта знову стала складнішою + +Якщо ви читаєте цей лист у своїй поштовій скриньці, а не архівну копію на +FreeSewing.org, значить ми змогли доставити його вам, що є гарною +новиною. + +Можливо, ви не усвідомлюєте, що це не зовсім тривіально, і не було +роками. Але останнім часом все стало ще складніше. Gmail +(Google) та Yahoo, наприклад, [запровадили нові обмеження в першому +кварталі +2024 року] (https\://www\.xomedia.io/blog/a-deep-dive-into-email-deliverability/), що +вимагає додаткової роботи з нашого боку, щоб максимізувати шанси на те, що цей лист +дійсно потрапить до вашої поштової скриньки. + +Крім того, так звані _масові відправники_ підлягають найсуворішим перевіркам +. Якщо ви надсилаєте 5000 повідомлень на день, ви вважаєтесь масовим відправником, і +підлягає додатковій перевірці. Оскільки цей бюлетень має близько 14 тис. підписників +, ми дотримуємося найвищих стандартів. + +Очевидно, що ніхто не любить спам, і я не виступаю проти цих правил. +Просто кількість часу та зусиль, необхідних для того, щоб зробити щось +, здавалося б, тривіальне, як розсилка електронних листів, працює в масштабах, постійно зростає, оскільки +Інтернет має тенденцію до де-факто моделі "плати за послугу" (pay-to-play). + +Наразі я все ще докладаю цих зусиль, і сподіваюся, що вони виявилися достатніми +, щоб отримати цей лист до вашої поштової скриньки. Але, можливо, нам доведеться повернутися до цього питання пізніше +, якщо це стане все більшим навантаженням на наш обмежений час і ресурси. + +  + +*** + +  + +## 🕸️ Побудова мережі довіри до FreeSewing після спроби бекдору XZ (5 хвилин на joost) + +Залежно від того, звідки ви отримуєте новини, ви могли чути або читати про +спроба бекдору в утиліті для стиснення xz +. + +У двох словах, зловмисник намагався впровадити бекдор в утиліту +, що в кінцевому підсумку було спробою контрабанди закритого RCE-експлоіта в +SSHd. + +Або, кажучи мовою [ELI5](https://en.wiktionary.org/wiki/ELI5): Хтось додав код +до невеликої бібліотеки з недобрими намірами. Це було зроблено підступно +і кінцевою метою була не сама бібліотека, а інший програмний +проект, який використовує цю бібліотеку: Secure Shell Deamon. Демон - це просто +крутіше слово для позначення _сервісу_ на комп'ютері, бо чому б не зробити речі крутішими. +Цей конкретний демон або служба, демон _secure shell_, відповідає за обробку +з'єднань по захищеній оболонці (SSH). Це золотий стандарт для віддаленого +керування системами Linux (і Unix). + +Код проникає через закритий бекдор RCE. RCE розшифровується як _віддалене +виконання коду_, що означає, що він дозволяє вам _робити щось_ віддалено без необхідності +автентифікації або чогось подібного. Або, інакше кажучи, він дозволяє контролювати +віддалену комп'ютерну систему, до якої зазвичай не мають доступу. +Той факт, що він _закритий_, означає, що автор +шкідливого коду вжив заходів для того, щоб тільки він міг використовувати шкідливий +код. Як чорний хід з ключем. + +Важко переоцінити серйозність цієї спроби бекдору фактично +кожну систему Linux на планеті. Це не лише найпоширеніша у світі операційна система +, але й переважна більшість серверних операційних систем. +Або, як я часто кажу: Все, що має значення, працює на Linux. + +Ця історія триває, і я, зі свого боку, сподіваюся, що з неї зроблять міні-серіал на Netflix +з Девідом Кроссом у ролі [Андреса +Фройнда] (https\://github.com/anarazel), але я відволікаюся. Це інформаційний бюлетень FreeSewing +, тому я хотів би витягнути з цієї історії дещо, що, на мою думку, +має відношення до FreeSewing, або взагалі до будь-якого проекту з відкритим вихідним кодом. + +### Вигоряння мапінтейнера та довгий шлях до довіри + +Одним із цікавих елементів цієї історії є те, хто вніс зміни, +і чому вони були прийняті без достатньої перевірки, щоб виявити зловмисні +наміри цього внеску. + +Тому що користувач, який їх створив, робив внесок для **years** проекту +і в світлі цієї роботи піднявся в статусі до рівня, коли було багато +неявної довіри, заснованої на його роботі, незважаючи на те, що він майже нічого не знав про +, хто або що ховається за ім'ям користувача `JiaT75` (в даному випадку). Така _довга афера_ вимагає +значних витрат часу та зусиль, тому наразі припущення +, що це був актор національної держави (згадайте АНБ або еквівалент +іншої країни). Важливо також зазначити, що супровідник xy мав +труднощі з довгим хвостом обов'язків з підтримки програмного забезпечення +і активно шукав допомоги, щоб запобігти вигоранню. Це +сценарій, який шокуюче поширений у проектах з відкритим вихідним кодом і створює +ситуацію, коли зловмисники можуть дуже легко скористатися виснаженими +супровідниками, які відчайдушно намагаються розвантажити частину роботи. + +### Створення мережі довіри + +Проблема "кому можна довіряти", звичайно, не нова. Одним із способів протистояти цьому +є створення "павутини довіри". Саме так це робиться у великих +проектах програмного забезпечення з відкритим кодом, до яких залучено багато волонтерів, таких як проект Debian +. + +На практиці така мережа довіри будується на відносинах між +людьми, які знають і перевірили справжню особистість один одного. Наприклад, +у спільноті FreeSewing є багато людей, з якими я зустрічалася в реальному +житті. Ми не просто зустрічалися віч-на-віч, а проводили час разом, ми знаємо +, де живемо, ми знаємо партнерів або сім'ю один одного, або маємо інший +відчутний спосіб, який забезпечує високий рівень впевненості в тому, що ця людина дійсно є +, за кого вона себе видає. + +Ці люди, в свою чергу, можуть мати подібні зв'язки з іншими людьми, яких вони знають, +зустрічали, і довіряти їм на рівні, що виходить далеко за межі онлайн-світу. Цей +створює мережу довіри, де ви можете довіряти своїм друзям, а друзі +своїм друзям і так далі. + +У світлі поточних подій та на знак визнання швидкого прискорення +того, що можливо за допомогою генеративного штучного інтелекту, FreeSewing +відтепер обмежуватиме всі права на запис або підвищені привілеї для членів спільноти +, які є частиною мережі довіри FreeSewing. + +Звичайно, ми продовжимо приймати - чи радше переглядати - внески від +від усіх охочих. Але дозволи, які відкривають потенціал заподіяння шкоди, будуть +обмежені людьми, яким встановлено довіру AFK (подалі від +клавіатури). + +Щоб полегшити побудову такої павутини довіри, ми почнемо документувати +ці зв'язки між людьми. Це дозволить людям, які хочуть +взяти на себе більше відповідальності у Вільному Шитті, подивитися на мережу довіри і +побачити, хто живе поруч з ними, щоб вони могли приєднатися до нашої мережі довіри через +цієї людини. + +Я розумію, що FreeSewing вкрай малоймовірно, що FreeSewing стане мішенню для спроби чорного ходу +з боку національної держави, але переймати найкращі практики та бути +прозорими щодо того, як ми працюємо, - це хороша ідея, незважаючи ні на що. + +Отже, я почну будувати і документувати цю павутину довіри протягом наступних кількох +тижнів, а також перегляну весь контроль доступу і дозволи, щоб переконатися, що ми +робимо все можливе, щоб навіть найвідданіші актори не змогли отруїти +колодязь. + +  + +*** + +  + +## 🤔 Як змінилися виклики FreeSewing з плином часу + +Чи знали ви, що [FreeSewing v1 було випущено 7 років і 7 днів +тому] (https\://freesewing.org/blog/announcing-freesewing)? З того часу ми +багато великих і малих змін, а наша основна бібліотека і система плагінів +перетворилися на надійний - і, безумовно, самодостатній - спосіб проектування параметричних +викрійок одягу. + +Найцікавіші з технічної точки зору виклики були +більш-менш вирішені. Залишається тільки сторона, звернена до користувача, або +користувацький досвід (UX), як ми любимо його називати. + +FreeSewing може багато чого, тож як зробити всю цю функціональність доступною для користувачів +, не перевантажуючи їх? Чи можливо це взагалі на мобільному телефоні, який є +домінуючим способом, за допомогою якого люди зараз виходять в Інтернет. Як зробити його інтуїтивно зрозумілим, +або направити того, хто потрапляє на FreeSewing.org після +пошуку в Google до розуміння того, що таке FreeSewing і чим він займається, за кілька +секунд, які люди, швидше за все, дадуть йому шанс, перш ніж перейти до наступного +посилання в результатах пошуку. + +Скажу відверто: я не знаю відповіді на ці питання. Але це +все частіше те, на що ми витрачаємо свій час. Відсоток людей, які +використовують наше програмне забезпечення безпосередньо, є незначним порівняно з кількістю людей, які +(лише) споживають наше програмне забезпечення через наш веб-сайт. Для більшості відвідувачів FreeSewing +**is** - це веб-сайт, а якщо це щось інше, то, ймовірно, незрозуміле для них, +або навіть неактуальне. + +Очевидно, що є місце для вдосконалення, але часто не існує єдиного очевидного шляху +вперед. Можливо - або я б сказав майже напевно - це та сфера, де мені +бракує таланту або навичок, щоб розробити якусь грандіозну всеохоплюючу +стратегію. Але я переосмислюю багато своїх власних ідей чи імпульсів +у цій сфері. + +Тож я подумав, що ми могли б провести невеличкий експеримент. Експеримент, в якому я +задам тобі, мій дорогий читачу, просте запитання. Чи готові ви до цього? Ось тут +є питання: + +> **Що таке FreeSewing?** + +Я хотів би почути вашу відповідь. Ви можете просто натиснути кнопку "Відповісти", щоб повідомити мені про це. + +_PS: Я поховав це питання в кінці, тому що відчуваю, що якщо ви прочитаєте все +, що було до цього, я, мабуть, захочу почути ваші думки._. From 20d4dfabf45883b0ab22d9f1dbda5ed02ac70d66 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 1 Apr 2024 20:58:23 +0200 Subject: [PATCH 544/795] New translations en.md (Spanish) skip-build --- markdown/org/newsletter/2024q2/es.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/newsletter/2024q2/es.md b/markdown/org/newsletter/2024q2/es.md index 74548af6c00..e4a611c1f4f 100644 --- a/markdown/org/newsletter/2024q2/es.md +++ b/markdown/org/newsletter/2024q2/es.md @@ -48,8 +48,7 @@ y mejoras que se han incluido en la versión 3.2: - Sandy tiene una nueva opción de paneles que fue - añadida por [Paula](https://github.com/freesewing/freesewing/pull/5861). - Tú + añadida por [Paula](https://github.com/freesewing/freesewing/pull/5861). Tú podrías crear tu falda circular a partir de una serie de patrones similares haciendo tú misma la combinación, pero ahora el patrón se encargará de ello por ti. - Lo que empezó como un informe de error sobre la facilidad de los bíceps en Jaeger acabó con un cambio en From 5a054bc57cdf7a9dba8df4bc55a764722bd01c6e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 1 Apr 2024 20:58:27 +0200 Subject: [PATCH 545/795] New translations en.md (German) skip-build --- markdown/org/newsletter/2024q2/de.md | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/markdown/org/newsletter/2024q2/de.md b/markdown/org/newsletter/2024q2/de.md index 14cfc5ab2ef..992dc987fb6 100644 --- a/markdown/org/newsletter/2024q2/de.md +++ b/markdown/org/newsletter/2024q2/de.md @@ -37,14 +37,13 @@ Tristan wurde von Natalia entworfen, die auch [einen Blogbeitrag über das neue Ich gebe dir eine Sekunde, um den Titel noch einmal zu überfliegen, aber ja, es gibt zwei verschiedene Leggings-Muster mit ähnlichen Namen: [die Lumira Leggings] (https\://freesewing.org/designs/lumira) und die [Lumina Leggings] (https\://freesewing.org/designs/lumina). -Beide wurden aus Wouters Wunsch nach guter Fahrradbekleidung geboren. Ich empfehle dir, die Designernotizen für [Lumina] (https\://freesewing.org/designs/lumina#notes) und [Lumira] (https\://freesewing.org/designs/lumira#notes) zu lesen, um den Unterschied zwischen diesen Designs zu verstehen, zu verstehen, warum sie sich unterscheiden und zu wissen, was für dich am besten geeignet ist. +Ich empfehle dir, die Designernotizen für [Lumina] (https\://freesewing.org/designs/lumina#notes) und [Lumira] (https\://freesewing.org/designs/lumira#notes) zu lesen, um den Unterschied zwischen diesen Designs zu verstehen, zu verstehen, warum sie sich unterscheiden und zu wissen, was für dich am besten geeignet ist. ### Bug fixes and improvements Regelmäßige Leserinnen und Leser des Newsletters wissen, dass wir auf laufend Verbesserungen vornehmen, die nicht an eine neue Version gebunden sind, -aber es ist eine gute Gelegenheit, sie aufzulisten. Hier sind also einige Highlights der Fehlerbehebungen -und Verbesserungen, die in die Version 3.2 eingeflossen sind: +aber es ist eine gute Gelegenheit, sie aufzulisten. - Sandy hat eine neue Paneele Option, die @@ -55,8 +54,7 @@ und Verbesserungen, die in die Version 3.2 eingeflossen sind: Jaeger] (https\://github.com/freesewing/freesewing/issues/5999) begann, endete mit einer Änderung der Art und Weise, wie der Armumfang auf Brian berechnet wird, insbesondere die Tiefe des Armlochs. Da Brian unser grundlegendster Block ist, wird dies - Auswirkungen auf viele andere Entwürfe haben. Du kannst davon ausgehen, dass - der Armcye ein wenig tiefer reichen wird. + Auswirkungen auf viele andere Entwürfe haben. - In [Carlton](https://freesewing.org/designs/carlton) - und damit auch in [Carlita](https://freesewing.org/designs/carlita) - haben wir korrigiert, wo die Nahtzugabe am Unterkragen falsch eingezeichnet war. @@ -69,10 +67,7 @@ und Verbesserungen, die in die Version 3.2 eingeflossen sind: immer enger wurde. - Wir haben eine neue [Path.combine()](https://freesewing.dev/reference/api/path/combine) Methode zu - [unserer Kern-API](https://freesewing.dev/reference/api) hinzugefügt. Die Ursprünge liegen in einer - Diskussion in issue - \#5976, die - ursprünglich als Fehlerbericht eingereicht wurde. Dabei ging es darum, wie Path.join() Lücken in den + [unserer Kern-API](https://freesewing.dev/reference/api) hinzugefügt. Dabei ging es darum, wie Path.join() Lücken in den verbundenen Pfaden - die entweder durch "Verschiebe"-Operationen oder durch einen Unterschied zwischen dem End- und dem Startpunkt der verbundenen Pfade verursacht werden - mit einem Liniensegment ausgefüllt werden. Dieses Verhalten wird erwartet/beabsichtigt, aber wir haben @@ -188,8 +183,7 @@ Maintainern ziehen können, die verzweifelt versuchen, einen Teil der Arbeit los Das Problem, wem man vertrauen kann, ist natürlich nicht neu. Eine Möglichkeit, dem entgegenzuwirken , ist der Aufbau eines _Vertrauensnetzes_. So wird es in größeren -Open-Source-Softwareprojekten gemacht, an denen viele Freiwillige beteiligt sind, wie z.B. das Debian -Projekt. +Open-Source-Softwareprojekten gemacht, an denen viele Freiwillige beteiligt sind, wie z.B. In der Praxis beruht ein solches Vertrauensnetz auf Beziehungen zwischen Menschen, die die wahre Identität des anderen kennen und überprüft haben. Zum Beispiel From cef59794e5b486e8b2ec39e79f137f6abfc5251f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 1 Apr 2024 20:58:30 +0200 Subject: [PATCH 546/795] New translations en.md (Dutch) skip-build --- markdown/org/newsletter/2024q2/nl.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/newsletter/2024q2/nl.md b/markdown/org/newsletter/2024q2/nl.md index 017add48574..15a70d65e4d 100644 --- a/markdown/org/newsletter/2024q2/nl.md +++ b/markdown/org/newsletter/2024q2/nl.md @@ -55,8 +55,7 @@ fixes en verbeteringen die in de 3.2 release zijn opgenomen: Jaeger eindigde met een wijziging in de manier waarop de armscye wordt berekend op Brian, in het bijzonder de diepte van het armsgat. Aangezien Brian ons meest fundamentele blok is, zal dit - gevolgen hebben voor veel andere ontwerpen. Je kunt verwachten dat out-of-the-box - de armscye iets lager zal reiken. + gevolgen hebben voor veel andere ontwerpen. - In [Carlton](https://freesewing.org/designs/carlton) - en dus ook in [Carlita](https://freesewing.org/designs/carlita) - hebben we hersteld en uitgegeven waar de naadtoeslag op de onderkraag verkeerd was getekend. From 3ead5fcc3207e0d29f98edbc12706b46afbf2ec2 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Mon, 1 Apr 2024 14:13:56 -0700 Subject: [PATCH 547/795] Small wording that was unclear. --- markdown/org/docs/designs/cornelius/instructions/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/en.md b/markdown/org/docs/designs/cornelius/instructions/en.md index c9c3daf9040..4ed08688a0d 100644 --- a/markdown/org/docs/designs/cornelius/instructions/en.md +++ b/markdown/org/docs/designs/cornelius/instructions/en.md @@ -7,7 +7,7 @@ title: "Cornelius cycling breeches: Sewing Instructions" - Press under the seam allowances of the non-notched edges of the pocket facings. - Matching notches, pin the wrong sides of pocket facings to right side of pocket bags, _Edgestitch_ the folded edges to the pocket bags. - _Baste_ the seam allowances of the notched edges of the pocket facings to the pocket bags. -- With right sides together matching double notches sew the pocket bags to the front and then press to the wrong side. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Fold the pockets in half along the fold line, right sides together. Stitch the bottom of the pocket bag together. - Alternatively you can _French Seam_ the bottom seams of the pocket bags together if you prefer. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 6f16a0111bfa5e0548def2e041b5f79c24e71480 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Mon, 1 Apr 2024 21:23:14 +0000 Subject: [PATCH 548/795] Fix issue @HaasJona found --- designs/noble/src/frontpoints.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/designs/noble/src/frontpoints.mjs b/designs/noble/src/frontpoints.mjs index 4d3b74a9d52..e8c51ced70f 100644 --- a/designs/noble/src/frontpoints.mjs +++ b/designs/noble/src/frontpoints.mjs @@ -178,7 +178,6 @@ export const frontPoints = { points.bust, options.upperDartLength ) - points.bust points.armholeCircleInsideCp1 = points.armholeDartInside.shift( armholeDartAngle, cbqc * points.armholeDartInside.dist(points.armholeDartTip) From 9eee8e30a25ed3575d052446e0aed3efbf07f52f Mon Sep 17 00:00:00 2001 From: woutervdub Date: Mon, 1 Apr 2024 22:12:56 +0000 Subject: [PATCH 549/795] Fixes hem bug #6478 --- designs/teagan/src/front.mjs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/designs/teagan/src/front.mjs b/designs/teagan/src/front.mjs index de2731820fb..f2f61a48c89 100644 --- a/designs/teagan/src/front.mjs +++ b/designs/teagan/src/front.mjs @@ -94,8 +94,26 @@ function teaganFront({ ) // Draw seamline - paths.hemBase = new Path().move(points.cfHem).line(points.hem).hide() if (options.fitWaist) { + // Fix problem when length bonus becomes too small and the hem is above the hips + if (points.hem.y < points.hipsCp2.y) { + const tempSeam = new Path() + .move(new Point(points.hem.x, points.hipsCp2.y)) + .curve(points.hipsCp2, points.waistCp1, points.waist) + .curve_(points.waistCp2, points.armhole) + points.hem = tempSeam.intersectsY(points.hem.y)[0] + const splitSeam = tempSeam.split(points.hem) + if (splitSeam[1].ops.length < 3) { + points.hipsCp2 = points.hem.copy() + points.waistCp1 = points.hem.copy() + points.waist = points.hem.copy() + } else { + points.hipsCp2 = splitSeam[1].ops[1].cp1.copy() + points.waistCp1 = splitSeam[1].ops[1].cp2.copy() + points.waist = splitSeam[1].ops[1].to.copy() + points.waistCp2 = splitSeam[1].ops[2].cp1.copy() + } + } paths.sideSeam = new Path() .move(points.hem) .curve(points.hipsCp2, points.waistCp1, points.waist) @@ -104,6 +122,8 @@ function teaganFront({ } else { paths.sideSeam = new Path().move(points.hem).curve_(points.waistCp2, points.armhole).hide() } + paths.hemBase = new Path().move(points.cfHem).line(points.hem).hide() + paths.saBase = new Path() .move(points.armhole) .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow) From 43b1cd4d41077991d18ec38f11c6aad058ad54d4 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Tue, 2 Apr 2024 00:19:56 +0000 Subject: [PATCH 550/795] Fix #6447 --- designs/noble/src/backinside.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designs/noble/src/backinside.mjs b/designs/noble/src/backinside.mjs index 70bf3f19d6a..e3e3136da48 100644 --- a/designs/noble/src/backinside.mjs +++ b/designs/noble/src/backinside.mjs @@ -3,7 +3,7 @@ import { backPoints } from './backpoints.mjs' export const backInside = { name: 'noble.backInside', from: backPoints, - draft: ({ sa, Point, points, Path, paths, Snippet, snippets, options, macro, part }) => { + draft: ({ sa, Point, points, Path, paths, Snippet, snippets, options, macro, store, part }) => { if (options.dartPosition != 'shoulder') { paths.insideSeam = paths.seam.clone().unhide() } else { @@ -32,6 +32,8 @@ export const backInside = { snippets.dartTip = new Snippet('notch', points.dartTip) + store.cutlist.removeCut() + store.cutlist.addCut({ onFold: false }) macro('title', { at: points.titleAnchor, nr: 3, From 6f45fbbae0c169ff49ea5382d596d0ffa77b1e4f Mon Sep 17 00:00:00 2001 From: woutervdub Date: Tue, 2 Apr 2024 00:27:37 +0000 Subject: [PATCH 551/795] Another one for #6447 --- designs/noble/src/backoutside.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/designs/noble/src/backoutside.mjs b/designs/noble/src/backoutside.mjs index e581a9070cb..e10db7a7757 100644 --- a/designs/noble/src/backoutside.mjs +++ b/designs/noble/src/backoutside.mjs @@ -3,7 +3,7 @@ import { backPoints } from './backpoints.mjs' export const backOutside = { name: 'noble.backOutside', from: backPoints, - draft: ({ sa, Point, points, Path, paths, Snippet, snippets, options, macro, part }) => { + draft: ({ sa, Point, points, Path, paths, Snippet, snippets, options, macro, store, part }) => { if (options.dartPosition != 'shoulder') { return part } @@ -41,6 +41,8 @@ export const backOutside = { snippets.dartTip = new Snippet('notch', points.dartTip) + store.cutlist.removeCut() + store.cutlist.addCut({ onFold: false }) points.titleAnchor = points.dartBottomRight .shiftFractionTowards(points.waistSide, 0.1) .shiftFractionTowards(points.shoulder, 0.3) From 0fc8f63a2132d9e8ca6bf6cbb0a7c43876943500 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 04:28:24 +0000 Subject: [PATCH 552/795] chore(deps-dev): Bump eslint-plugin-jsonc from 2.14.1 to 2.15.0 Bumps [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) from 2.14.1 to 2.15.0. - [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases) - [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md) - [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.14.1...v2.15.0) --- updated-dependencies: - dependency-name: eslint-plugin-jsonc dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index a2d90dd6b2f..bc6f26c6af3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5527,9 +5527,9 @@ eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: tsconfig-paths "^3.15.0" eslint-plugin-jsonc@^2.4.0: - version "2.14.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.14.1.tgz#1ad123c9b28e91b76b5b5fefaa71c46bd6a1d981" - integrity sha512-Tei6G4N7pZulP5MHi0EIdtseiCqUPkDMd0O8Zrw4muMIlsjJ5/B9X+U3Pfo6B7l0mTL9LN9FwuWT70dRJ6z7tg== + version "2.15.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.0.tgz#3d6e329ae37a4240e2647c0e71f77ec6725a6897" + integrity sha512-wAphMVgTQPAKAYV8d/QEkEYDg8uer9nMQ85N17IUiJcAWLxJs83/Exe59dEH9yKUpvpLf46H+wR7/U7lZ3/NpQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" eslint-compat-utils "^0.5.0" From 0996f909450ebe3c961f80ab1d31f63a26c68bea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 04:24:37 +0000 Subject: [PATCH 553/795] chore(deps-dev): Bump prisma from 5.11.0 to 5.12.0 Bumps [prisma](https://github.com/prisma/prisma/tree/HEAD/packages/cli) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.0/packages/cli) --- updated-dependencies: - dependency-name: prisma dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 66 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 0c2c5503da5..0700d814c86 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -53,7 +53,7 @@ "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.11.0" + "prisma": "5.12.0" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/yarn.lock b/yarn.lock index a2d90dd6b2f..be5e2663992 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1923,41 +1923,41 @@ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d" integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== -"@prisma/debug@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.11.0.tgz#80e3f9d5a8f678c67a8783f7fcdda3cbbb8dd091" - integrity sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A== +"@prisma/debug@5.12.0": + version "5.12.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.0.tgz#0d5d94f095ae2d7e59ce89d32ad7bc4112b155b0" + integrity sha512-wK3fQLxPLMqf5riT5ZIhl8NffPSzFUwtzFX5CH7z/oI9Swmo9UhQlUgZABIVgdXSJ5OAlmRcDZtDKaMApIl8sg== -"@prisma/engines-version@5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102": - version "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz#a7aa218b1ebf1077798c931632461aae8ce6a8f7" - integrity sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA== +"@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab": + version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32" + integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g== -"@prisma/engines@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.11.0.tgz#96e941c5c81ce68f3a8b4c481007d397564c5d4b" - integrity sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw== +"@prisma/engines@5.12.0": + version "5.12.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.0.tgz#81a060d6eaf3da65c29bc7d81cd74fae72f13675" + integrity sha512-rFNRul9JGu0d3tf8etBgmDQ4NVoDwgGrRguvQOc8i+c6g7xPjRuu4aKzMMvHWUuccvRx5+fs1KMBxQ0x2THt+Q== dependencies: - "@prisma/debug" "5.11.0" - "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - "@prisma/fetch-engine" "5.11.0" - "@prisma/get-platform" "5.11.0" + "@prisma/debug" "5.12.0" + "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + "@prisma/fetch-engine" "5.12.0" + "@prisma/get-platform" "5.12.0" -"@prisma/fetch-engine@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz#cd7a2fa5b5d89f1da0689e329c56fa69223fba7d" - integrity sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w== +"@prisma/fetch-engine@5.12.0": + version "5.12.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.0.tgz#0418b29a0b473bb633871b43e3eb45c57a9157e5" + integrity sha512-qkHQbZ1hspvOwcImvqY4yj7+FUlw0+uP+6tu3g24V4ULHOXLLkvr5ZZc6vy26OF0hkbD3kcDJCeutFis3poKgg== dependencies: - "@prisma/debug" "5.11.0" - "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - "@prisma/get-platform" "5.11.0" + "@prisma/debug" "5.12.0" + "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + "@prisma/get-platform" "5.12.0" -"@prisma/get-platform@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.11.0.tgz#19a768127b1712c27f5dec8a0a79a4c9675829eb" - integrity sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw== +"@prisma/get-platform@5.12.0": + version "5.12.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.0.tgz#72b3ca03181d6bb20596b40ed581d5e0b06512ec" + integrity sha512-81Ptv9YJnwTArEBPQ2Lvu58sZPxy4OixKxVVgysFan6A3bFP7q8gIg15WTjsRuH4WXh6B667EM9sqoMTNu0fLQ== dependencies: - "@prisma/debug" "5.11.0" + "@prisma/debug" "5.12.0" "@resvg/resvg-js-android-arm-eabi@2.6.2": version "2.6.2" @@ -11458,12 +11458,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.11.0.tgz#ef3891f79921a2deec6f540eba13a3cc8525f6d2" - integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== +prisma@5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.0.tgz#b4194a549f5e0365233fb14f3fadef3bed057b5e" + integrity sha512-zxw4WSIvpsyNbpv8r7Fxgm7nwTFVmD6wbN6VuH13lClOceSANDOMl4jO3oxE6VzhjxmnEJqOGZjON2T2UpmLag== dependencies: - "@prisma/engines" "5.11.0" + "@prisma/engines" "5.12.0" proc-log@^3.0.0: version "3.0.0" From 9a1024d3d4042c381502f3d0ae9d1f7f3478b42e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 04:25:30 +0000 Subject: [PATCH 554/795] chore(deps): Bump @prisma/client from 5.11.0 to 5.12.0 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.0/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 0c2c5503da5..0d3319b0e1f 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.540.0", - "@prisma/client": "5.11.0", + "@prisma/client": "5.12.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index a2d90dd6b2f..64370881bf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1918,10 +1918,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d" - integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== +"@prisma/client@5.12.0": + version "5.12.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.0.tgz#4d1fb68074307bf9445d06ad387139301aa4bcc4" + integrity sha512-bk/+KPpRm0+IzqFCtAxrj+/TNiHzulspnO+OkysaYY/atc/eX0Gx8V3tTLxbHKVX0LKD4Hi8KKCcSbU1U72n7Q== "@prisma/debug@5.11.0": version "5.11.0" From 3a218ef3866d6dd7e5ab5e401a92b4aa43ef988a Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Wed, 3 Apr 2024 12:16:07 +0200 Subject: [PATCH 555/795] fix(markdown): Flip images from Simon documentation. Fixes #6472 --- .../docs/designs/simon/instructions/9b.png | Bin 17248 -> 21132 bytes .../docs/designs/simon/instructions/9c.png | Bin 20364 -> 24310 bytes .../docs/designs/simon/instructions/9e.png | Bin 29253 -> 34167 bytes .../org/docs/designs/simon/instructions/en.md | 2 ++ 4 files changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/9b.png b/markdown/org/docs/designs/simon/instructions/9b.png index ecbfd0fa9aed00d4fff99a8a144f94face9b5a76..70819750f5e5ef173acc77c61da6fe9fd2bb2ee3 100644 GIT binary patch literal 21132 zcmeAS@N?(olHy`uVBq!ia0y~yVEn?s!0?NMje&t7eDzj81_p*>RUr{2L5bxG1x5L3 znK`KnC6xuK3aJ&DX$%Y%w{im&693f+G#dpGM}7t#bL#^G{XYHe$Nkz|Np&Ysb%=^GD_6`1CuNR17l03 zvvYu_vop*`3=9=>YA4!y9Cna78h_a56K%}J$STcb@OTkj=Ba5YYWX?9-aTaxpb3kE#4j9UEROCydgl}_$=2E z2H)*xLzMK=Hmy$jAj12e+jq~kGVFPAeV?6ay5RwJq2n_W zZyk|7Vmy1>!OHm-XSz0d)%e*YUSjQ(-?^^h&#|2kHXSfNoMvU}FQX>Lox5g>q4q4P zk0ymKS4&Qb8_BJnv)v;5saE#A$@>kaTn?YM)2~>BQzwa2$VFqtq86hZm&~i48z(IK zTfzRnRaq_d)%K-O<|irY}`nA30p_eq7VTcrbQBVDX&y$;UJ2 zF#Jn@;FbSVyENh3K**8;k0bRkCPL8Z%+MV(pn=|VZS*46qECI zhxfCtM;FU4=XaR3%j+Hkd;5Wk#!c6)_w3%icYFPLli$A?Wx0x4zFrf##K6E?kr@(E z65;D(m7Jfemza{Dl&V*eTfhJUHue<-iOJciB??KY>6v-9O7C~?S5nAKu~iB;^)>J< za8Aw0^r$LI4X*MFNv_IHwoFm7x8t&@u&T%{$W1LtRH(?!$t$+1uvG$^Yn4}Q1rpX* zQUEI{$+lIB@C{IK&M!(;Fwry7GthOd$SgBbvg1;)DN0GR3UYCS8c~#zW~-D@Qc_^0 zuU}qXu2*iXmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC;&Vunjvh zzmDRN%7Rq=pw#00(xT*4*Rs^S5@lo~Qj+2N3rdS}z}`to)=$kz%}vcKDb_dCGeoh{ z-P1P!t^*VV>6y6&U|kit1t=;@GSd)&h2k5K4A?u!4ynj3fSZe=8s>MfVsIE)x#TC8 zf}H2+VygtQ-zp_PIWxry%rr4FHZd_sHPkgWwlL5&F-lI-wMb1))=f6DFiA>FN=>v# zGDkAXGq1QLF)uk4WK>0NfnH{2ij{$Rs%1)wnTc+aL2`<&iJ5_cZjzCyv93vyg^{U6 zQldqQsR5D^{zaMTnR$sh$gTnzm6DlaWoT+-oMLKZplf0XA}o@UbS(|cEp$^;42?{Z zOj9h4lFh(Ir6gOqKEjtgC#%#Zsi!@X{%(U2eB0_5|EQvl9peT zYpdjwnO9nYP#Th%n;Kk_2ntO@b3-FTV^d3GOLGe&V`R!keP-Cdd3hZ zfTG39zbG>`uOtzaPHmM8!8$5(3#^=rQWHz^i$e1Ab8MAB4p1=CGlVz?B<-78l9-ZM zlIW6Hl4`4DWME`sWnf}uU>ss-Xk}<&WooHyU}R;0q&`0-Gp&-4YCBNouz^ImM`m$J zeo-Y@2$G|MQwt$H2sbAaq*_5i0h}qU5|bfbC{8R(O#yoYE|r{-n3tZKVygsAt}rc` zSdv0onu)oANlKEgp=C;vu8DzBnyy8vv4O5xa%y5~im8dQQ4+*gaMO$P(@M${i&7oa zQ}aq}mE1FP3&3HepaG63O;op(XQYB+!NABw*T6& zA!Em-01*pvakJyH(Fd1wpi&QFAgI)#C5FZYEv-;c7`23?@Er}V(cmH}1V~amnz}}V zi=+@BN%3gvqFQiqA-Yqkc`3F^21szhGhJ6tWh-F+-ApL4m>3#WAGf*4w+~6(OOA*glk3 zRVmue3<-K+`sKpXP7z0e7@dwTy+!NR?cP=Qde!Q8x2`v>%gxmYTEe9jYQ-tQq@t*} zl+ zo)RS`rKAPIf`Wp~b2~aZBwip1mbOj$WAvi5DvU+&Yei5PakhpiHEC0v#P2~(vxFofEKrY$l6ujK^ z*3Ob8bG^;;g}aY_;Qi!S5R!bsT|-brlH+=u-Wmgt+i!ABKH1W=#z`ba^wE!e^|QBQ zZDRyP5-a2GnV*nOGCV#>NRWB%iL{WZ;g4%7h0e|QFv_2-ox;JxpJAace^KB|<3q0- zmKqU>E=L^HH;G!Um3!$K>EVCMC||hKI$ zrSSKov$yBQ$m;iR%D2&fFaL_YvnBQ$*d$5Q(5)U;Gn95Z6%dPAO z4&H1Og@i%k1<46>XLY~164U*5UY(p+@XID;=7%qzALLR7g{7{hwvKybqNSg_k3oKM z!6x(atLCM*wGaPMoccN28x)GO1H*&+rx<5?SWZs6r#7+Uq5P|K!&7z|PA60IIy)Nu zQoMWIgp2f_Dt`~M>x}_Wx(D*Rs*|d&EKNqv5 zOH=b)lLY@X)##i%&F;>2=xX!nJ3@vRI`b3{s%#Kiw|O7ermlbqp)JC@*GD|tHof~O z!=48ksx{3uJI?3|GS7YSY{lx8$*LtytGcr0^!pzBc_Zbs*-j_6)b|YCt%XfWObO2u zj&ms|Ef6kUH)~Z?n3MR$%&#Xr&N;aiO{<*kq0+Sd((A6zpS)OHSq>d;KYd5&ZkCdx zz>RcIv+T+UFbTs8 zoonXK(k;naviAC;OFwyHtmY@)QxocbApIiu-Ku=9YIFZ^h$_$0)>%^>)(ZJBac%An zoDth2T)wxl8f<*PfJ-%ww z9dF*g|7cH5z>-O)?+7u^eUYYdB56VJ^9!%PoY*s=_YC*VXSqrfIpP@Si9LVXtTg4r zhqp($lvf{_`sjpO<|~tmic6E%aO`?HCq_nEFHE>}r>VTasnonq-4dm3=T0uW5^`PX zXNlG%|K)N26sLMVlz&uR$q@J0vdUer*qf(BiOuRJU-P|&Ia_R=EP2Xk-9LMK^^b46 zUhSz-*z;%S8C}B*of0onf=_j81;m9k{&1c?edpHlEzS=@pFf?t_pjpQ(-DcFXj?v^ z(a&tvzOd$Q&glh)4<}X5j<~boOm0ETC7Y>w7D1fp<>_G(Tcz2LPW1it`ceIcseX6o z&0e0pxwWu{8EnhS*#=U+5r+Q?C3xM!*uGj6Sz9(8ni{Utx7a1&J%h#@(KU1A`eNUu z6n7PSOFX-h{L;iK#_P<1r7ova^J=Hud$#V^f@9fdcUSM+cu3-f%e8LpBZ84aK1^Lj zU4c`Adv5HVK7D6tS^2)C#5u?Geka6xsKh***65eQ%4NhI$?5WTLD7a@Hy$0=Jh!>uNhPdi)PFV zI<8mEW(6we+BljTChZBD@?`3xC;uuwm!+4dx0v*8;_uA*u|0kQzx&N-&AuY_*`H55 zQ4fq?o#-lXm#N6w@|o^_+2ZNvlTsrj`+5{+FVb3@GDG;TlT~lu^V^ayT+H>5*L+2V}-|>_zl1{iF zJz?UUqg@KST5sGv=b*kTF;dg=Lgv>s97=3fh8IpwTN+om(^F}eX_HdLzd4P5CCz&C zKz{w?kj_1~(XT|A#W7)l@ZBUoy}l103e#N;E_7P0GuX{x8oG52htjrlosE9mdY+%} z%-frA&OUvC@ZA;NJS9rn93|T>fZQ$h!lvG@4}df0iD%I-xWGoqE?Ie5;knZKM!zEt>TFgw zw`}<=X)x1g4TsWdj*_yS#uqxRIzFH8T+{5K(iEbX3Ua8#3zuy^#|+XJ2$xQA%s;Sn ziBA~IMA3wDYv#Et4(lC>Z}D54>?#oH%srR+k;DrZS<(6zI@*mVqM}}u3lFI=v_J@c@54U1AXcS#<=!P|n{(oqhl)@b6Z6~^e@#lI zROWl7x(Y-}ItoN^@{}z4=4~;Hqxs%}E`?3o9Lx?lSd_GnoR%=Y(0Oa^ zszp-I{Z%$9bx6E8;-DT~_GkNK1F4^j9aH8up3^I5vkJ79y;(YEs>2a6a8y5CDz0E{ zI$hK;Whskt^a~zP@z9yGzg2HTE6CB;_*+l5B=0}AQK@6i&+1cRR?Kr>L`{06=MWlo zvP)spC+7U51;Sfjp71+otG=l$CZes;?~0o5T(;$WY8#X~Za9HrWz*vQN1T>lggZ%< zgQ+fdd%vh-3ithRa4bblF8E^8Rn!$J=#sM#6plC7+ixiKOEGRdmpW7Og^TV<&(qGI zR*HnNOzeH|73A%;Th4voBm}cy)u$|(`?Zrq9aFp;&lSJmDOt4o?ac}Xw!Mv_jw#L- zr{*^Lr8us?oc#ZpGbn*x042~jC)NoEgkRgB)RCii;igmi0^!)gmh%S-T()^8aL;Y5 zGnTO`;h10dD|7ez_?VcU@VH9WsZ;kHy6&4h_q|PH(;B5P7QyHjS6G*r|KP*GVDn_Bnjr236bsoY`fVs5Vc{r>iL{{KIY+Z&{vk?@&q)?0nh zH{pWhhM%8h!A@Gao8{N9udf$ge{ERt;ei=*tlH#{mtVSl%lRey)KwIw#EOAO+KlJ- zx5As}=PlY7*8Dd9ZIY|N&7uXxiIS_2I~HDfT2}X6I%`!{q@c?-nHMp?rZ)Q7Mu)nZ z>QD5#!pi|l!7I~m|9a||@fws>qw^OQ2h6!TIqGxw<*cn8y}hnUNlHviOa@h7GJgE{ z5fd&cDk^GG^+kh=o7*t)5X+aBmzO)Qe|)4<*u%@KDQM-97Z(>leET-HaQ=-O5iRZQ zhYufKeAGxtNN7Qb*29-CGdKRdv$MFPzrS69L&7X4qPv-O@}x-*o;_=8XkZ8l4NZK1 zZ|{zhmqOEYBAXsONLc;%kJqQu1qr7U>rQvtI;k$ku4kNf#=*yjCvW##Gn-#878^+QGBB8% zZ!hz|x?8mF*LyPwUbni_9XFho&weniWT&{8*rV6$_nZA+8@-*+YVNt3>byKXHUD`% zU0qx`cXkLKJ$kgGxA*9d!p9%Z7@vPIxBTADXT>tsWjx(tx=oum8*j_G*)(aAkc@qu z%+{@2EB^g_e*3G{=1rRnDnF%!goh_zUgoQzr+4h*diyme2N3x$|W8 zwd(5X#ap&qNt)f<%sgrGxAVDXWoebYzjyc9A*15w z=Z?;^t)4JpLc@v`8lTG+U+nn!__(s2ot&km<%e(Ij$K+r$y}7-eKX{qX#vSj!->>gaJv}Y)@2{`V=Cv%d`u(7pAEaXS z{gpgb%>VLlu0C;I=ZSgGirEu9RDb-saeNKOwhOwxGYlBDrk?r}9u$;RsQ2T-LgyKV z$!)GPm>VK=jv1e~VV>*PzGKIZu+!JGwt9GY9EdHyn=1Is!Fl`NO{u5X{gh&LJn-;v zd*Sc5+oM}789Y>kZ2o?^d?9PAMd>RMhJkRiS1ZgLD7?5^u8GDQtRe?yY$E$;!%VAl18eT4Cvl?Ji4$7H-F#=GwaJM$ zH>Fm5zgs?W+O)Qg4i1I`=J#uu86x)8?EJa$=FOW0rKPT6VPTt#jE#&EjAjM|Cs(>| z`uF#@v(C1Eo}51=S#Ny&y8cg^V5#vQIjiUw*Y{sGna7xsdm;Mrw{7P{wruY?S0~GF z_d|i%T@zd||8G+_6iMuPAlFcZt8hzaKv_QTgND^81bgETGt|tgL*tV1JN{OUu#B_GSB5 zt7VmSoi1t>RXN<>l?0H-9eO-}m(NbY*RA?sh)eL!f|gcR!wX`NuU{8ym}GdYSGxV~?()S;mMl4XU2&p^ zLDCV9?zi64^;-AtwYB^8LOJK=CRR`xFnRLiqqU0`FAj{1>||!=E150(vVQ&gr(Ff$ zit_Fy>HIy6y>87vKR;Ktww7jCaQ*ei`v2eSBev(s{`+-(zmkT=inB&>)o)Ej#Ke;B z?Wxqz&|tV=@F4H$si_{mzPZ<5SG-=kJs>z3Y=XJDxWnN&AD+*v=94zhJ97WuH**#i zmI#|;SFehKa`rOc*#Y6<*OSVBC->X7ZP;L-6T3^~_V)bkJ9O>rC>m2G<9&(-1_FtRi66dvIkM2X{mkmEv9C*cBn%i{ zUt8;6`$sHiAtXmA*(pF476WAf~~`ihE-FJHcl*in$U`L^GD zyWZT}+ZHZZz%W_e|Ja+Gn-wRY1T_gBG_uQOTz~Pgsfp?HYYtA%gJ)(M8>XF^5%yl6 zgDI}&qpQy>6VBk}ez{-k)FyM@-kyK_<>loQXU^>G=-}v)u@o{iG%P49GrOOEyifMS z=g-b1C0jz@+F14S>94O~w#=;jqbB&3A^-0e{~v5so0TM9T)DfZ@?r6u8^v9sj#r%j zRR8tn;P{&C8lmYIy_oOj&%60N#f#+HK>dMNY3Js99QtJ%9Uo~;f0mbnkTi7 z&Jy4Ez-R(Eoz2aey3DWp`@FvrTVGj)u?aHIm3WcT&Ej|dRXzc01|ie>7Ve(q)}Dzg3j~PXB@f z2h5`X>gk=cEn<)Se$fBM)-v<`nl3F@|3`IB3~t}3bi?Vr)cl%nmj8bL6o2-A`}Xa} zW6RGSpZodQp~d0)7S`6zN)r{V)!Ehkk3YWh^0GzMAB$D1uNp}3+}KsizU}`W;nVMT zi`U2ea-R%5?Pe(Xyvz|x%e#iFb+he;r?+y-z1cQQGQqeDB zpZu1;{`hS9J=O~w?)`K=Eq_3MnqK4V)!DQASFc`u{MgyqAK!krU$AD)nLT^+=WFcw zcS@Usn>RCKZr+WK`u$(c7!q8*6x4h?dE7Q>xd02}{e54Rzvca!dtX4wsQQUKf5M+P zhHE(3s-EB4SSS2{cD>p-Y7Wdp(2!c{FyID&SR@LcU8~)|NblL&%U=D`(<5H5|46!Pr9^6 zBCKWVrjwc3oX^iaJR1J5b6N7l=kxx4E^W7DIPtVdCw32qbX`REL1uO)hAmOL|Gqwp zj@X&C)$+{jro7kRWbay^@ny36|9m@7u~L>`cvtd*@?HGbYnUdVWMQaCx+=dh$oDe*ed4M;F~k8s%(N z%dJYSWK9?-Xcb5vXV zo=adJ=YC$7BM#dW%}jIOp1St4;oo0Dnk=*n3UG?=n_YWR+4~Pq7?2p@< z^Q(D%*vgMDz2hI=`KVII-LWEe#~1DB7iJf&{-6G=AHma<{gvZt#*uIH%Wr*Yud_3g ztl#}yw9Qg*W9vDG{XZw^#TaZq_xt`}=Ei#GQSwZfwfkeYQ@r{?7;X zJztNouh3fm?4G~N_3KXQ3!+VDzbq;*ENhFFL=KA z39JZ7I{ZC5(MVEIRPv_kdBy3cFIwyH>^*#F*4<@6E6*stfAglsIq}}5D7)OX@0Eo* zZ~ghdO-07G|LpvC4ryLy-^-MCZ4|S5zR>uBwYN*f`{-|X-o1NQP+orgf?{+2iaE<3 zh_M{}b3JT2KyJK<{3yVxcqX# z)vSdVGZtLTSaAJyqJe~t)8A7D(@&;MIQ?|P=FQD>=gNw3u@+tWRPfKm=$x#-lUq{Q z_Si|&z`fF{*`UF(wL!`nPMn<~MZr#YGfbS;Uthd$pIp{fsjRJ1rlzJV)~|2(TW-Al z%50`s9WiIM$&L#H9MmQ*)Y!}td2;8DDHAxit`bWMbiTfuL+RZ~mm?183(7Ccp3iVf zjT8-0)e4!iA|P;0)2b~(s;sFeJWe^ec5)^DZJsziuH(bMg&(*-y6WebfB97CuAguI zg$-*R~Ic?#&(qTsE5U@j$5~)GG3WpcwK5B(aWn_ z;@A+j*m>_Rxmi}SudYg63B7t)Gln~MCC?%$_7f^b97=*NO&n*6m68@rzRF(Z7$$ga z-|mHXzpoFzzG%@Bp{Y+p1$=VjU)3IXVRypgl-sA5Au99zazEPjo#QL`Ue>(2J$twK zypP-;8$+}l-z{b05MWrS_~fgb?G`KEtk>Crv9Y|hnbo^a9t}9a$W_g5(eiZh8b9vj ztujIzS(F@kI#>)YcD_h^u*H<^7w^i|D-Zt^-k#TaDXLU9>uTubj@Q3Nu{bu|%V9T|L@IG6P; zDNOc`Z&xrt>^U0S0B^+K6}M~0SG_VqX^~#`LgNdPFRs{3mOSoq#9{flD~osEF&5hWj4NeoYN&v>)&B_3 zxoYj(g1A|~M=R}O-SI`6`EC`n?aJ3ovWw2mcUz`C{Xl?zQ`289mm^|Uu}j_E59gNq zznE0y{EJ1gCLv?_^w);Feu_7g< zY>pDY9jOb11t-2`2j@7DqNo=&KVNu#rD<%?y14b`@i(>vpI$3;cm=Djrg8c*+1UKH){z_MiZwZ*&d96v94SM@1d+i&G1 z`3cLXzZMNd%YkB^4JzX$+&xw(> z+8?u2&PctiT=3%BoQ0pwI~wy^fAw~}nN(z3TYWJ4<<*x@t=e8FmOq@{*^ws;9#Bg&*$>mD}$e2Sg~cp<2r9}qwDXcH&gEDX>Q-OM@pddpI6~7El!`Pz;GQWcTnw9 zXuIq5-)+0qOFVZf);0;)8Ems%}wKIKzK_ zU8Rg*^I@HB{qqcE{Qo~UwAf{_VN!?gmv=vIpU_gse*WT7!$spZ<*H8t6~C$-67}6v zBSpK4ye7_%>rl3z?@&3hOZ4gq{TtGa5C3s=@i^SN$@BT!21Z4Wm(m>N`Q}%`u5Vn_ z(Fhtdth{3r`*HdAutRrm^M*J`V&1`j>pwAyt|io#j={WYsficfCjhc{@^-3iODhj%7kVVWfO&GKhk#pl^xM;z3*U5GA!uv|GdD6cF_&PZsp z)!sXwEUK@FexK8?W4$%;;rxY<*`3t(Z%p>TSgP|y`PG9(4%e&Zte7k&E!4TIEOp^J zz57w~ey6<=zH4;BQln3|B-^C$Uxdt^sx_BS^LFtxxM(@1sh5jZ`>$xWyT~%-YtQ-R zCi`V9#Xk#*NH*+WQz?^u|6a?RD|^c9?F^I{jNi@ddElY?X71a-8IdiQ_s>6iaP9Hg zyo-tpwjF=-d%2=U5a)gY`Ha_FPMp^{G*MQ);9W$~=1uAM?Rods-1%^KwzOf@uL7RA z76N3NMh52NUyg3*Y`&21BJ%3BiAV4LmbdZ$ZoONXoU~Em z@-!cpCl~H%y4vArgll+$@ecyHeZ0QY^tPG1Z-Puk5_wM48t9#e6Gg)L&TdOmRpwZ;b z8y~;6)i|e_`EjRe5a%+To`VgBwGX9V@V4%iSvARPj%AJ9{+jLlRdWwM`uA_)z8O1n zxSAF-J$&-2}K+BFD^VLw(IMpJzp+)>qma(UZWBC@WHmlu|eM+6#ku1 zrMCC->92ern(p}ZZEE^-OqYp;!+=vw!iVieuayLgY{`vRu(bfpRhAVo_xtlQRI|Kz z9M;OF2uUtU(mbMM=%OU(a<|0x#*rH$Jd*Ydag6gMjE$xCvbP*qV7$O&zf9B0uL`sG zB*;wLzd_`iUztabucKR%na!U&hE;ARzj*o`{=9##bLi1WbGbtY3~K|IuXB!avU-(m z`r@uVi*mj+*Tjev!}-z-&+Ln=5B*|yRuM`*n7lbKezj|19;Z#sos0P{Ds%46nIJN| z$@28_nHgSHi9*zP!v0irPOtN*+suTKKt+&X7DDI4Qhs(Q2o= z=NucC|NpG9XgN<~jG}X0nxfa|(+^%fY^qaU^g#Sk^N;4|XTHmuSF6bVJ8opL+e%SW zPjvdZ)I(=ai!M%gS^R&6okj5n8J;TVexBYJo`(e_6;cXx?k>4}-1^MoFGrIM^Y*_t^NF|O^qx1T-}L<7 z_p?er{JyrhUko>BbAR)*hPh@$bfmi*qkze-(S$JI_$& z+&e!Bn|1PhIooUm-rE|m?A>#>pyBbXgPs`so-$(E0-}85S9UuQn z{xj#|jr)gIZnU1}e|(;N{qc4A-)BbmI47|s+>94{IB&VQ(rYI@t<$T{e4oEHM~msu zAA#-PdCY2d@LKhr`}2?e_?LEX{q)bZ&5Nf*Y{}BQGE~Pe%IB!?j-lIhv%kl z-uPst^~bB(uWvZ1uRav`F6C>9lkMWG&p64ly4~VQ zof66Ey%`_3=Kjr@Zh3~$A$a-G^8CDpsLsqoSglDdSz`VM>;5oxr z9E%Tj6uVFU@NjedgTMCmeXqDo*?QhJr`GQ~{pfh~&D;E}Gmi$W&Wh4e*EADl5V&yr z{jBpdi?nzd9tdCg^hNa zU!&}NRso5N7fPkJFMldlcV}J&M^nQDji*m@tEJyrKialX?E70`Sk32(YrsyRhqjf)bU0EgdWV!gE!`Js7-TGU&e|yaOjl2Dw1z1>GV*lmX z{<)(#*}L#%jN9hVPjorEI6(0lvNUw<8+%O#hSdE3^CVx$h#YrNf93P?xiPqsTISdN zLeu$y@C()ji3PKL6r24PH+SzY-fYjmKkfs6Cdb8ZF;A98Ep1caDEMBK`;lSs*5)yq(e(!8AzjLe! z6}>9Z=~D2uB(rSxsx6z29?y8SWySi72hM)}^!(|&r`JBrn6xU}Zh4GibMt1~Enjbm zeV-p^_wED#=iD3hPi#N;s7AlI*8Tj#$u!XvF~yHZSY7-jn@%Y14V)95H7`!YPD5n< zzaKTL`$MOO%!U+g z95noESl|=S;>L2|;7K{YbKfR-=&$#_qoNvz7jI+nz_U4EEYq(fzkdag0@`bmhd9$s|oHx3B+m2lS zd5^`h;iyF5=lbpSW)1;MHl6*uJZfp4S-_^{8QBI}pw_L<+Z;AfX}`KXRa@_QlHIo2 zf8L+vl{qeCe?4(t!>B)~?B&y*(EoJ;bqDP{Ear4D+sihtS|U`nm$51Ez~lUNJ5t~K zD@}dy@A>;<6J{`;*fXK|#@*$CbE3KShVd^x*wR|Rhxy;aedd2lkILJ$v-aO>6bx>E zbYa`$4ha!9cJ=Bxwv#v(JpA+f$IfJhX&nzAr1aNaoOoi_glxkN0V+Zd->E-OezQjK zgunigm47)kPU$uJEpEP;aA-~Sa;2Jp7rHCIA9|CN^DD!>d;80hDv=a1Q)z)4!7oay z{(UgGu=YH>a#arzcep1KX+xYxy`+M7uOxV z?W!dB=8dSv?p5CV_PI5GK0etn=aE8%wyj}CjQy4C83h|Z{`qlJ*>lFe5~D-xZHLTn zNGEkl6jtj*KUb_}HY~fwF~@pV%m2N*)>Gc&9mcRN^G}r0tgx%lfyj$0p{A-()#9GhG zRqtIbm-5=1McI0NI`u&OQSwFAyJ?cOOo|*#=Va{ezcJ&FFE8Hyd#%8w<%tHjW;#Eg z-MZ65rD^&8KDXqs@UgMJr`{G z#+&u=+lGG!C9JbquB?(uS^i|!_W8DxSX%eWaEG1C`&cNn^2nm@xaAieRfH647NmY( z7ov9b(sHpom#i{ot(P^lSaUPCSZ>a}Hz9|=di8m`mbOY=p6-()wt%aeRm|Q{zDeQ1 zkNoAcY|Wm2Q4I-SVfgY~VZqlD!}9I3?b{chl&HLIz~ZVku|jF-O%a2&%f5a$OHJ%K z>hV>2;mXTO&y(bo*jg2fJU+kQ6QR>~UG)C-&F+&FCVFkixO!(=y~)u>V(hQJ&TzQC zxixQX1>f8?*FZJ+UH@~(gWs=p`SbqygknSfr$?t26qY+h{7>MSZzG{Jk>j=fowSWw zH`m{P?|$V%LC<_^DaOQo7F!;(bQOCkhMy3SkZjQ8PEIi5ta#eEosmIY_|iplE1_b! zIgHin)lXv1H0N*Ne^-$p^(x!+Y}1Q0FYDQijsgZ{*Em8}XH5{Q=hVydo3SgyhUw6s z3G)LhoDYVF2lto0&poER{!Y7n{SK~ba~Y?+C_9_l>cmrvK7RP}y4ChI|F();rpYH; zf`1DeJYDzkLgv>U1y*lYIrtxX!unVz>T|f4|Cy$f8HYZ2HV4d!?&4mqcj(?pIpJr0 zZu1ibPxzg5ElAe>=l1u@$MY4h_D-#Mvz5Kz$@7RM^UpUei{rkppnv3!q13y$brpFR zS6|5fdSmxPfnPlR2Ufg1{6P9iYjbq}LXGVrLMvGsAO4%M$AFE?+VWrB`ThAXU(SdY zdtuWK>M6$^ue0p@q$CRJ`8=G=p8Vs;3tkKgX`?!ahe{?Ztmf4IA1%KU1%>ZRM5EJ^p#V9jEW! zZ>z%QA4|G8Yjvo|>IIiy1O$iP&RQ+FCWzI?Z2BS*p_d*kF8v1 zKHq!?{qC!u^rq+T{IY6U7`LOqf}L5O*Ou%ESyTD0KH}S(*cqE^em#}XTPr7hJ?Hqt zx9U-~wHtRoHmpqKne;elcInYHwba?mzp9#_+r2-i(2uk3*OPQmyZB6fh1fHD8*YXP z^W!?Uhpj(&BT`vFWNFK`xa)8BZVmlDE2{VBo}E9p#+*2)u3yuu>VNL|k)O$ih5sVD z<0ibn|MTRZU#yM?me>Dh+kV$pF!;Sx|L=Lbci(ip@LYfG+lh(yw!}{;72*ur7ar$z z=D=zGeHT?z&&L`v-`@Xc?d8+G5+ZCXW3u9GTm*a!xYQ(isxo-KuDE*5A^FOJ?e0%X zr)tYj@BPEV8}Np$dM2|-5UWa3=JvSLdpoyZ628Ycui$HmV{WLd*Qe6~bE0qM+`PWp za+k#c^Apl>|KtP|7A#tkxGT!LKe+9;vcehht)ZnSJWiQyKXcb6R{GhT@VI%!?;hmv z?{v!BxaY;yIWe-)yd@JoSl&D6PkAzJo3=#N&mGE3{1sf11dW6?pXr`=!&2kHlUEsW z*?U*!%y-Zii4Wc8qu4xqIk(s6)6q42Go9E{XUNwy?_H?1(#0=oU*(0E=tJzSO7DXl zyA@aSd~Z(>nlL}`#;eD%wlM;?^f`=n@<^V%sgYl!U)0Kz7q?DK`SDR9!#zwk(R&%V z8Fp0dI*?+rb%$Gnk6vs32L3%$=LvMWoY)<5Va>dCPadT3-%rS|V6AXq5!CY1o>*u1 zde-mQaS z@99S?s&9LX#rC+k$S!?sS+e?Q@r%1xHh4B~c+p?{;KmM<^vkpEy11AhI#3B3Xq+N7 z|DNj8Y2vFDCYIDaZ?_8N>-FN^ZT9Z*vzJ{*{m&e32&~oFR$j6;Uultc;S_7;yINaK z1D?BG3Ax4)yJ6e5INi3DQ{PYWP&u^Yrm|uAQJ))@Ch>x&?>QdaJGVpP1<#jvnWth6 zV~sTQEVM2p1;nJk6kY3B+r$tNCnbH)OaIR2<*YC6p2~`MIQ-N;-QIv#sY5}iJHcpH zKyWDc)>Uk;yi8YVX9WgFHt(ACOU_z$`C^f8Tp6#o-u-8}wlPAf%|+|sm6g#_FWwZT zF9^OaGet+He<%OB9nY3J#M;IfB)@!;JuTg2R>1Og&bgtwS*uGrTG_pmARuqpSrDfd(f^ROxVurc$n3HyKqgth?#_Ae=9*>pMfn>wBGGntZ$3P}yK2{gyQf7X#f#Q{GA<}8ZShdq zv_r3Ay8ZI#!^Kv+EJ|(`TkN(zc=|rGr031pZ!-TD?$bD>*?98Czt`E;yQ~hKJUcPI z4m8ktZ?6QeTg~6~r4bv7%xr3^w^qjI?&XuW`)$d>A>hNL62u9z{mCv87_ipra^ z_0=tQSsXlhmCG3b3cqCtO?nh$nC51ZcE?yUZ{9lH zd;ZHNC@p8cyO~#eqUC{$M+N)z`X*?mOz=25!An)ZTV=v2l?fjD|2)6E z?0#-??5-Wx<>@|6pF^kTi*_HKpqX;rc7{jr^44X3-J6_5wP#uRCgpI=i~pjfeTc2l zVbRw|UWIo%9Mg{+TzmY(rP}S7y7EH0zf1_8BMMaN2J7>eQ`u zHy>`blJH%2PCs0=(Xsk1zwdhEg#XJ9TkJ9xoBXW*@RZ$2Qqi}i-hFf_arRl(rn!Eu zX~8s!7jqvS@OR&}h$I!6ojnIsBpBH#(O+K_>e~f#d9v`TZZ921v@A}-mlVxj~ z_bd#%x?qpT)pgT)55@7#cgXipNtz-Wx~1akhHSg_i{~CSeYF0`i&q@-OVz!&PpyyK zHhH!3msxFkVT&(z+oY^f;SwEFe$EIz+)ANanw)VWIt z>u~?A&-3jv|K&Rhe0c9}?~oXFcu#(3NK@qLWl5Ks3MXi%^zK!ulDSnTv%hBh_SnQb zr*HGt|9>U<=0}$KC80}&-zR?-ln`W?=)to1U`O!p^N*JMmu;z(eW(3ZUb5A-|GcZd ze0lfz#P9w4li&Yp)@7@9m?1yS#!~)ZEtBrO>{Bnje>{t~-&Q^4|J(0(+a$mH9IK!A zPh{pv%V%#BnVky0zpDJe{n0RA`<&*%Hva9(Z)4oLQ*A&0OBVb8|J>yH3f4=%YPRs5 z`xf!zhD^^4t0Q~PW*8_bYf9hWzn4?A_qEWE_Fs?m~J~#dkQ*P|x#!kQG=JCqWN>d+nZkKn&*S{-D;rdVIyXF7X&o3D)oR=>6gVN0r93~pXQp7U<>}>z@7@-b zw!4w`amEHl#fnE~+ZBYmClpu+R`xF5->k%JP~a1YNr`GA!k)RdceVw*Vex?u z7bTr2Q+B0|9P{`6&;>Q#wnnH<+SdQ%Nm-H2k3&IUq$OL8+s{4TZEikm_vXD*=S6JE z())CY`{VrO_NMZ8mdxAPvSV-hhd1r3H)LFmNl{5#yk)_iMR$VP&n?=sVNqkDGJ61XuX8bP9iQ0U4kL}MVt}6394o-e=)5QL78%w_JzGu6{HZC-adLhbF zl6@rbUCL$`CBdY360NH~W#vR|zWeC-trVk&%lqryA`@AU-LqSC_w&lr+}a!d*6)uj z>6GSmTk}6bd)2AchFQl7I&Kv{oI7pT&(~MJ-q`(7;7F1oTkq@qd+$UaG&UI6&#|9& zN9PRV0+sb^&Zef$y*uZ_k!b#f_fKg2+4odqU)^8#?&8a!(fOToWvuu8*&6BZI(L`c z?R|eli>xi#`d(H$&v(E4$nB(hu=ST82Ray7T7D}2eB#<|z~1mHiuc;y-8+vS@7e871 z310g3{C{5B_bX`xb^ulel%yEotb*<)nGzz`K1u_9AodHsz0ytSYq-2|hV28s71 zJ|8lo9et-hJtML)g6DrgyvXw@TXyi9?AhODmH*z(;VtJEt*|E1 zr0Lc-*DO2eZ+dmDzkLo@!?(Wa8QCJ`mp@zVvSNB`Bd_{X6#uic z$oA8+?}5>^wU;%T7f;#oetq}Z>|NDAc5Sb)uU5BaIM5JSo3JBm%gzWLw}{7|_Lx_F z-8O4g)RA|6$7jsESW)>lzVONO2o;$;3Fix-aVXxe0aw30fBEidmFr(Gh2Rqk+b1XA zSmJp0o&IER!=zUi+P*J;*zw(uy9B)NpsMSH;$FkTe-d9L#TX+WpZI;w?DxOS6~WgZ zH`~|u-TdxzhYHD^56E`6DH1ReZ^(^#fmw`X3od+@8`ds@?29t=;37XeNLWnlGpa_T{=;&!Ok%U| zo;|$u>hB#@CMD-rdEG8Q=dY8ww{G^l<*U}b-E{1{B=bg>p6~O2@)TA-3Ji;2oEygP zD4>v+=rDJe6E8zSS^2(o-}e`uE&KdsZ&#A&wwhhsdhgCf?5UcUn!V~{R;J!N^KwOj zt*hAf*X@_j|M$_ELya*x&29VLSJ^dl*Uej7KQC$H)8~sXzX}WwuD^Ug+CMxvlvz2Q z$Kb+R&jY-COj*8{RXwfu-r2VAT9-18Z+ESSP_1?sJElYNY zwD9wo>i@YsX_;d+^YJg)g=&sZCfw8I^El(L@1h@H-tAhmBAZiC59aP=Ap8!`Iu z<@<{-MY2=aPRy+iTkt&HglC16$+r4#`%nApw#)ae>-%xoxID6@)khIjgSE_Fu3h&t zFMs#+#?pdq#~)q&tmBrc{YG@h_nWQ-1>26_<7HnT=@wdPDibRsV0xwKKi50qj-&nO zvkgCN3NE^spCYnoIZtNU?)nw_Z9VcA)?MHKZtvL@t5*Jnva(WS8e%uk0|NeVgvOuRx#J@wA#HK5M{qj21(076r`}xJu z^7EY4SC^Hf%cz}`ZuTtiJKCYyJaOKP)=!VT-uy}9FOib%d(-3kWWzlPA!CN~^}kdm z`7JYBBVumEC0Dn1LWL45yP16M_s^>HJRA$A2%WG0CNe20SV5@Upr9mvNA+&Szcp#Q z{VvbBHNW9N2ZK&^S>R!f_iK_^+%*k9ZCeOxhMcJ^XiLp@7uZmEw#??|H)T+9BUpS~ zR5q|kW4I)292gkW z8GHX-ZfS1?zkIn)U6Ndp-ZMqhe?q6aLOyVRbG)+QUO`#;A^rPrcRzc5e@mKm({ByK z&-}rl8G1dnC5KO56>L8C)j2Uukf(~-=5JM`&9grrQ{LRJkO&sDJvUvhc9efOg| zLLN(kSloUjf7tO)*s%7biq8ydHim$;LCL4ncYpZ(Z1MH4%ImaN9$D63 z{$O2bu|d_b0*yDKE7o64xPR>MkDssao{jp|dQ){p*vi1THJdUFtt_k)P92i)nPJZ6 z)-1R)ll8|N`TLI!tu*PGWp^hjGK}HG&Kdpn_P-e4MVX2}WOhFDdPexv(8qs1a^LuI z@#)o*DB|iXM%Vol1I6w>?Nkr?aO?2@gL_1cL9?4|y>HX^>3$Dl+*Y^i zbkbCdz2_Rr|9^=;6J^F4=zREMdWA|4n{wZqo@~<#{cn0&L-dY5VSQ|nds5}|w^^&A za(+J&?`~EMEmXa-YF65Er;w$g6^}3SgQgWPnp-hBPGk&NomKGf25Zi*3hQUKCaaHr z{j$CGBe&k4mQ~se3{29VE{-8{c6C^uUY>kqOX36%>9A|YQazw%p8UPrXAIt_T%EHk zt<iehDg^WLZYR)h5yjdK6=D;`o`qy8Il-XJxwWiM!KOw*(+|$I#wpdQe**0sd z=>-YX7jFeCW1pTno~mr`$Skt^VB9l?))2&zN2&>V2f(b4lx}C7YZRLDLcM-m;ap?mD~fSz5f;M2@_9dIm3g1H!MB z?9e-sRJeM%)SSC>65gkEZ#;qxZb>JF~N1O}k0AWYM}pWyT8A$rnrRCKi2te0w+Fuc<7K8Q)j@F`K`? zw~+bOsabw&SFgSra@8#Q>f0(w-eY`M_bYIif7u!M`-9A`uMcH3l$3VmO-+sYH?`5v z#l>vB#_}0c6H=>6rdNMDxh|4x)0!1bNrlhnUtYIQp?#SXxAnX2E+yTf&qSOBTFU&h zRkmH&9dcPKdhS}k*!EegcKPXFkI--Hd|bV&W#h+1sxg1NR@9bA$sX4-xUly466@n- zo;w`{y*_VQeC~;z4>Nnd-`_`<$}0c> literal 17248 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 diff --git a/markdown/org/docs/designs/simon/instructions/9c.png b/markdown/org/docs/designs/simon/instructions/9c.png index 15c8c5770b5eb9a3d65220aa6e13b4d640c11b57..9702443b9239859447eb58248d05c29721587846 100644 GIT binary patch literal 24310 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 b^dI{<(TV+qAt_ry$BBEo`njxgN@xNATzW!g literal 20364 zcmeAS@N?(olHy`uVBq!ia0y~yVEn?s!0?NMje&t7eDzj81_lO}VkgfK4h{~E8jh3> z1_lPs0*}aI1_q^BAk4V$?r$vy1_sFz*NBqf{Irtt#G+J&^73-M%)IR4<_ zS|7LmQD`B*h`JI}laA{Y#p?cT4vl=fzUNI&dp_sByy8N|%-K$vRkPmz{<`Xb=cgyL z8-6~Kd~V5eyikTiu|?oeHdDE{1BYVEglP9hKMuu~EzBY>S_GUttQ~N3i0Y?-tt zsC>Gk$L5YZu?&hWJ0|bi#<%n3&lA39o&BQZiY|Q$oDtj7v7=zm&Uf+e^!f#+2QCnH zvSB)2sG+^aA+JiV=<=uat>toBUD|hJr4)6WnC1#xdN+ed?Mb?rlDaPc&g)focfPE= zaP8%tSSiKrysTD=E!RV?W_f2Ue;&{M-bN%<{BTYhNbA}zrnv%#xMfZ+T(aPd*sW>z z%I#L2S_P8HWn#5bTyoa%1<#4o8XH>5cBSsK)?ds}wf5fKrGl5zKn}XIYS*4)Vz+i) zXWFB&okhl5yh&w=rN#wL#kEbTks?p0+-N(s*7^C?P_6RmZXUZqL6TW$)yuc@C2QH| zyFbIZ6HO#QHoX;NwNiXCEo4f_&8FK{C2?T^e0_@*i=Co`S*;Y0sHRPpWQ}ya{(N_^ zF5|j&Ym3V>TLc0Y2s_PL5uBN`du62fD$x|tgDECEcbhnQFl$`k{Ft!qZNO{Z>6gn^ zw0r=WA$KUlK*@gdhPd;yw>hgWv0dn(zC<=CbY;%(>Ca=hKRlAT#W!`rw;ras0&kaP1~8z>n@e8*xv27w6L7B#e|#H zN-;MeG}5#vH=KVn&s_26Q!kaRSnCn$y!^3X-9iWTBfV$R#Ex1XEt|dR$&#neuD2KN zn(LU}a514JLaD4=vt>sM)7%MRi`HINTz_w6;?B&UC(bW<8*tmG)K~UT^WQtMY>Ijd z9n_zgtq8LbBzm}J6Y8hpWG&!mA7|ZxvcJrEb%L* zS>@9mI!6>Z{lLL$^-*GL=&IM% zGvc{FESe*n}c#2Tn|Ea}VBKIR>WF?XWT3{VzeXjt?niL2xgx5$enSEq=F#_a#{eCyA5n+_F~Pj~fL%(c1u zLbgXaC`V4#xZv4sEa|IpLdPj@*V9vp*BF++_7=9&Iky|`+GjM~mdAa3r`J5eEpS0K$F$VIIni0xre~~5;+&(Sg)S{wl*3hW>097}?ao%c za+Q)lzpj%j%e4;Kd-3j4!9(7xky{M^sBlRP`Ufib= zjb1fA9zYgh*I^C207=glavBrf;g=OATc6%!vdHi(Q)7`sS zK>j<&{BUEUfM>>vet~i?>-i7g32|hKuv+nRv@*FIb>Fd@$H^utONrGg^R~u?N~K-i zOF;S;KTQ{NSbS~QZXPEom&S9#CjEXL)rC6kUp|N5jb&5hUF7hb^VLG(M|GJeP2Tw3 z(&H+b*YQqQMqJ`g=^zE z<%=LQqa}IWQsPgR!UVS%^a*_TUYb~b$t`ffXAV{?#dq%9k3FJ68V<@f-HByVl+)L> zWR`KCuCA8L&uZ20u_OtU`;G@+zjE>GMbFtTjpvk;xJsOEvCMK;&lO~~>JL~Te97#> z&lgK{7dbo^>aolD8J+FZO`KxQ%IU`iqznr(1nb7K>Evw+dp z%$n3X>lDb@HZmY#9Z(6&d%V!1TH)l~Q~`eX#&gCx-m@bFE{VzBEj@Hs6)N=B%hhA{ zlxa1hOMj-m(`&9U;3}E7(6Yqo);i@Y-s*WSFyC7J`px<4lJ6amZ!`GjPT013%L18~ zCqc>RV*n`ZKt8+O_s8$>yCb%sfUbJcvL#pj`@F`B2_@x{N06RZ_;?@helzk4^!qehswY(u z?W2Ln3!B45SDe*b_`l^?F>F5h=ABUo`$C83lGCbQw0v+1jWqRpWBC{+ILleR#r|K! z{_7x5J2jp&-m;NL@z2CsRq=44%OLXvK<>9Kar%*Z-M{)yEYnA@K%*bWeib>pen_Lk zhJn@U{DleDihmAml=*k($MoH&734rMvZCFO;HSZZ^v$)OXonIKYnq7wPMYd>c{a0l0NVBnztmwtX;Wj3s<$dd_lP+LxXcW-^0`T z`%8ZQQ&m;1`1|#GU~Fuy^lGK;UQgaJd3+AwpDXb1*2lkkJu?l3iu7lm?vLD-Bk4Ea z?(U1)B|)0k)-F&UZS_&h{^G8(=%3{M+MiFSOW0HxY}&jz|JBDY z`VHU&`sds6Uwda*lwC$k&eXwO>WMy1NZ)etei+Wy5N99_**z*{2n!h)&zRo9EIo1D@sw z4<5{}14(WGMf3MFYQ|>u8xP-2olw^H>_TPRVmT|tw}(F3`zPL7hT{ z5>_P|PEJm5-W7j(;#uK>g?py zbT~OUDCoiS=j|OG99OPfNw~kS*2CZb_@2to0>Z+V6YhqFhI)8;9a`!=T|h{vsilRb z(@B}-IvVs;2Rgc{Y;Y@0QO$T{_3QoR3>v@5s~B({qoDaIuE1iD*=x zUn9hG_&|zL;+q>AXPD(mndRPka=|S$R1}o1+U4sc=GXnwWLU6f4Nt$_FO6+^ce$1Z zaZWzTGS{ztrg8eCZvA~5em^p*{FKroV<{x8=5yfEQtw2w*^CTzb#=V+R&7r{&ZiTx zfuXdtRG`zvV5U!k1e?F@SCM;lzjHf|Cf%;J>^t18zpvx_{d##tMMVx?-lI#sr(akb zZQgM-=|qZ=PITJO>a!HWUS>`)CASkG5vbulL zkq*I%Z#UCF-m89Z`cvk3pX}i|mcONX#Koz zZ*Jb$S*(6;u64VdZPkr;$2aL5>yc~@Uhb!8Z7u!q;X{UopP!#6zrMEi!po9vzxkw0 zI99G)>EY++785h)?T)b3uKVl$PM9^T>+bGy^IaRy^hg?SsQ#X(qN=(u`}(?VkJC0w zE_UlZw6pm6gxRyZCrl8?xxJ0|`<-I`u(eUGOTDMx+G5t zTU16^e-ua6L;}}OV*&&pJ*TN57!10L!Zfq`88pTg;{ z@;V}Pj!n@F4v32CTC_-sVcK^sZEbFd)ePHKcHZ4R`<~5_`5_W6t5`3ck3=FH9=J1pAg7d}4bxG>;Be*N#+cRyeKf9Y}8ty@uhzFv!#u&c3P zVrEtp>wftBdHQSCXzO6ER;G&=FaCJD{l3ht4RX6bo@p@6zLxOo%S#S^{&p9o#_ik9 z+4$vhuID97RsWZ4+X!*vG6(e~v05i|j;z1`|KU5MsL=ECYz-?uB>egDxc`9#-|ug4 zo$KoM#lF9@DtNhH*=4?K^JmSH3JD8K`tstUd8~VEtn9IV`Tp(qsBHUf z`wve|)z;9~c1}uq89G`?;Hse|LAOVV^Gl`0-@|n)-oVw!#J z!0FScADZl3u|gweXAx^%U7hc>LSsHTn-1gja|wTceVt*RKkshtxwg0WE1%2e+}$NQ zSL7({VuDdq{I-hPh(BgR<3Sw{bSeT>vONWWoBk}@8^59 z@H0oNrQ+M!Co>LR&tH>!%~V>V?cj-t${Wky$BBrGTi@AN_BM)xh3U4ydgG#|mhn?Io_+Smhr|4{*ElN(Bpm4wys@`>`{fN$yUTQ2oD|u3rBcdk?(M0ZaQf+w zFPHs6HO%dm#b0@4ECjAzy?SGRef{LpJ3UvfgfMKdR+rh3!}0m!ae3=I|Lgz%mS44c z^~Zm|-z!^KNU*Z9&af<23knK)v#%#5E$vW>k>wWdhw(ZE0CCma;cD1eGRo*#G?^ z9HMpln>+&4G={#|1=1TYvnh zU}0l>bYY?Mk2jmoGnnkPSQoxNE@FS3?YfwqO*3Xl965gc@b&BB`TPHxfr`XEzh15O zlTYXU=r`9Y@yd!ozU{w%{7AUHE%(KRh0JMZW;9NiAiyJMBLQl*8YD2Bn`fK7{neeD zud~lg(F`^ydg8GrdOP33g$pID%XAhkUK|(|)pd1s`0ZO;W?7f(eS3Ged!B9eqfYgC z2ae0v_t^jYaX2x>X<@*FrPJe_!otLwnwkvK&PW_Ndi3Gl^7}^*HnYp#+WPO`vE<&h z*Vflt=jt3*UZo`}H~Y_=-KP~=wlr;6A@Jw<@25K|ek%32DZBMZTzrz;)z!73@UfeU zs;Z)ul~nLDpTa85b4!+}q@<)gxL5tYbjRB_H#gtdS8L71&7FIDbJx+NHIbXy`0aiy zxO{nQUPwel#%g6VGqK=hJ_k1>9+ui;f4uO=_x=BS4U>;09BSd@z1N=_`R2w(=JfOP zT*Jb|tjgc@I5x9^!s^4feRZ`zf`_d~+MMs_&!0Pro^o|{cN-=h;aC&5 z_g0>NL+tLd#OLSc8c6j@*jAam+x1%S$FE(zv_#3Qw5x&Jnui;`{B)R{|3Pw z_in3fzuw9%Zcy?fz~;w;=7^m|OW)opJ|ML3``vPR9=7J(SBp(APO$F3AY-LCPxa>w z*PLIAKE^)rc>U|;^7#p7vo|Ik<=Sn)-th15@5i91%*)f8G-*=QUNcap^-bmYXtTd= zKlk!)b4$x5pGYmf$gwxBKX|#H<=)!!^K2O|JV;Hnt zOH40@V`)%l>gj0@9~^8pn0+=OQmnJHv*PvI?Hdvgv)w7Z9^28?mG$+O#)Zljrnv&= zmt24K@!{wB&au(Y-v!ykIXN-?`}JD?$gyKdZ*FXy;I;I_$B&MnzGBi*E}iIYJksWQ zCEmGPH2U0)^iv;SWxo$<_X(K4G+kmn@BfRF(Ys!7WLi$0I`zbvGcK;KtV&8s7d9rl zw^x3><`TXC6UWyJoF8+<{o{_^`fm29@%i)JyQf44g@(3n?)0=MekT)j`I3U5_kxfr z$CpoA8yXmVX4-JZu8-y4qsz^~;o#uVu>16eg$~aJxk{W)-1B8;;M?*4XXV*jHb?LB zurZhY*(NM)mg`h??5f-Q-*0Eh8)QA<(24vb@ax;VyI!K7Nxr@w>{Bl=Ef&ef8X8qvBz)u;V(D8JE=`h zdb|Dpf&2IGzx$?qyzk-F>-QZhU0dJIa8NjKfbp+k#sLPNH}~cDR)1}Y&}s8q-n?ra z-*NvrN6hc9cMK~tV|ei6WN<~!P5X~m#pfSB-5UGKMpC!y@x)^G$sZ4Xp1*rHkCTVA zQPL{`n@_Kr^CC62Ki)p~$Mt%h-$(f0+?QW%|6jyup+MDMx%c&749#+GilT zczMFdW`2cbo!mz^=ydO`|J%xM_fMqNb(-y4c3zo=^LD=kE@j_dFXX-@WRiPEvZT|A z-oAHMouU7Kv85T`esz9t>hG_yZ_drJZl5Y&*P^|0<&5nw>UJCKuf8?+NA7F=ALsY~ zznU_Gd0O0`C7i+^&Q4z~ASJ}aU{U)_CobaOq{A0%cJ@`huqk?TJ~-m*`h3ucg zi*54rDvCK1saSX4ii* z<+{{u&+KA%yslTV>F@RX zE2h6=VYTX?(W6#A-GSpF?U*#9Z@Ty&@pS%eced{A?&>Ohbi{M|yWf}FdM%2-#dO<#zjJf5 zKt=BA&{s>XLBp+FB~Bj2E3;pJc=&nshG%oX8c6kQzjN=Jto4Ci6-6Nx6%pOZf%a?da)o$?@SyN=_D#7S8=y>%&u1TNAaY#Jc$X+}_^V^^SFpjcfn5o!eLTecO(; zz2}^tPdvMNTk`Mn{h)-*ao)A;O+%#jyJH77{*B?Y%??RPO@Dl&b8<&#my?f=iB(Ix z^_!sQYt9~UAJ$gg&+xeh@+e>~f zrCmqXxW7BpV93eaHqTVaqHpu>+Q0GnA@&|~|Nc96{N9Z|?TuF=bgw;M^*?z3x^G== zcPd-9*{HN^S+b|6rsm5b@s5{Lt&!gE-2PvzeVezvP382a2Nrxfr*GB0V*k@C(bnjo zu;Fjk-<=!ZO4q-#f8Lw-hv~wF$BZ{@mj`HUxtg?g?OsrzTjll&6j?u6^6X*rb36B# z?GiqF@^yaky=Tq0U#hEdHqH18q( z94YO0o1eJ%LUu;EO9@Z=!Gs3C<;`*H+vC=^U(6`sNX(wm?V{9iG|6LW(1{eI6DdX> zDnijKqMdJKnB4jsad_`S#UIk{oUiI7H{>l+7T{2r=%FzAA@#kt;#m^HLH5K_b+AbE9lV>tc2bE|SGq!LiWWSG4n&_Z6-Faom zq1(4_m&td!Ff}?b^gT{6ky>~)3xqCaEVvFDn3>b|tJk*pHAmykoNc`l8+5qa5*36x z7X)Z5_!4wz&0~SHFemn|Qe5 zB~!d4Q{sY7Of@?3BhKIJu~r<&x0M$_(Nw~2un<3JihVzK9vWz>hu3^ zFh5>Y_W9FW*|$&6DVN-mQe0AcQ{Rnw*8Sa2BgAx$M^$}ad&hd)xt->vebv>Djpvj> z!@^ta*4-1R`MhxhU-52bpSk%qm*WB#eD3Hh>r!snVzlmGeV&>~?%w3zu6b*lKXxc= z2j!tx3x%ETJX0&axNFBbTO0K=j8P)TwN2XnI10rlv#s!(=y2=M+iPJf5-yn5%`MZ< zXBD}}#lga}rPON0s?fEzvgf%$9e#)(jcu1u;A!@%sZy_ISuNkr>FU&Syv0dJ z>~^2#6s{lazZa_P=dtQt*Sh+lxl|FjsnN09qsFqO_wtsC-4o{?x|r*bzI^*#iDzL< zjSPu_iUJ&(hh8l%Z+4HEc5DWR;=F^WkDtz*5pBrR{NTfZur({*E_Qe>cJG9I1nXWpu>Y(YTohLTQWNBqbZw&gr*x@N0}*H znuiuSAAInOHLQh+v4*)uVXAlFl;AhVUfq)8Dw((7XR%X>$$=%bhyZA6oD| zbrt1}|nl#aFs@Ua8>J+pS_pKeD)kvZZuq ztwqbdi=UQvx|VUdZ)cnvy(iWmJoWwL-j-)EQ5S_-%Q=pGo^RI|=e+Bt?0fTF=JS3( zG5o>$bJt2Er@TG~4Tppk_DYWq3tm>`dT6-t!?)mFyLGlN^mmw-aCVEvJGUZzNjCpC z{f>`+E2E@YcHGa(Dbc# zZ9FHuMdRGPN&j`6JW>See%G0Q%eBh+-W#VOwCMZ?IgVEX9*KS&=M54bJbunQ(W7Hh z&GFN#n5Ny^8KaoJMK<4FH7j)0?ZBkjAcL+r?>~3jzjMdCi#rPb7?rKJe^9XdW{TUR zh1_f7B@~w&)tJJiF{LQuN+0*fBbSz~-=sFti{bpK;wX{h;vz4uA1&!-VMvKTS6Zyv zGU2x8H3$7WQ!UFTbAQhS)l5xdM`Mp0Ol#Fk^jo*khhwL$g>b?Ok!=;b-S%=;&Hem( z4foM=^Utp^Ka`Vav!S$fSM<7Gu(qlf*Hhz9GBbRUyeAvUF-%t9JKMMUbsN{KKI||3ohu)7m%Z#*!$!^*mOHe2*px3#-n`-O z>(~`*OL8CeCrb3pwH2~uD|2+IkvI}$*tN-fLXno}ZgZK8iLFzZ7BUDw>vNm`(Ds6& z9?#XMTTkqn(L2}vjce%3ul#2&yb#c-s^i;Mw^KM=Kg~MdTOs4a{lfo-wFYI^IBNcV zD!;Hw*LL;9%WVt3e~{~VA;GrOsqN97pe1T)3DM#--`Jckp`oJsVMxXGPpxNw5zk`?P#9R0ai^Ty6J z{x4C#12{W*4$bXWQ`lB5Qp2<-a7u6&_i??%_vhPheQkACsgtp~6Uct};k4ZC&M^{7 z)@2Tnb**;`r=?2YbzHYDtT|{MPh%pZ0N48OPfDX?PjP7>=K7s6RzO6qVTrQ1Vd6Up zotk%X9#4aw#Ot=iXu3b&_ff)VqrKi-zvf-L)}8#GaOuy+8UH?{7%;I#PA?9e6Wq1o zM!*-zd(5#yR*$~yQz`iB_nWhi?xMxk=Q3K}t8$J{ z-4|E!>8`4T$v*i5k=JxORFq1jFGwC<&gbNrC+YP`XY~Z;rrN^ie}xwWoGN&?;BnKD zbG45@zB&H?z|!E%fa@0fwy{sU-_BQ@tON4B^bs1|8zCog}-Np8Oy9F-gm#B`>?S5UZ}8HBB7ygZ<1loCx0RwcDGNPD@BhCUn4JC=zATXn z5?+7kwtuJMWHyDw6n_=jeK!);PwKbmYn^F)IK`}K>MOw;QyVpn7ewZUWNRyma3~6T zDGGHdh;S$-NZfwmmaxN~=`d43bm8CbHCx%&T{hWweD}o!m)xmbQd`+(S;?+CwJI=r z<)&IT50RuVQa5?+?Cd6-ek#y?RDi2hfaBKl2PR)HR5n$;_-3M|d$011aL)`giO26` zTl@AVUECP1v&`N`^0%4nv5WWp53Vr3WvjNTnB|$Bq3q4@PanS4*KPUz%|7i}!I^)@ zV`uz7qf_(wm(}f$xvT5j{T6S(U7)IPguj39R*B>^zQZqTJ5PA)7p%zt_2^{8-&g!Q zDh_RG>~_&Qwr6>I;)5IeE@Xd|Fsft#7t=Ww9DR=u81NiBFWLK&-~U)sdfMZ^_3N09 zo9@ed^kd!S9VJ#**FD#q*!A(j>CYFlJ)Ke@{C4d{cV5@~UE%f4`n`l+}E0 zUwiz1Z9=-ujv6~LJA3y3(Z39}yjM+_9@w#Hj?fpGOJ`r6dZH-&+xg||*1F`X#V^=@ zzm9M}(!SU^MnX?!f6i}fPn!}(*2tqLcAD*Fituxf`EW*uN9sO5D2VRY-*_GH`HJh~ z!i?XAIlr@}=Wbbge1Tp?!cUtsl}T1c`cH4KV200^W~rZwu_7mFHDz6 zJ1uU`t>^3KJo;yO`a*-%6086JWe&NTbvyU)GM*!UmZv8^{9OFusP=vHpXKgvB)_;x z^tu@&EV%qKFgT98`QBE2H<{y+&mP>qD86#`RlEJmwm8e^b`>X>%qU2BZMbLKi`bf< z>rHpmsLAeYw41TDL~7c1!CTF8)n|K<~eDdh#X4Pz|oIBVU%xOk*Y zcw14JxAO42%&AMS-uQS{K0$&_c{y)c)b01#-)|j~*-(?Pw*J3(h)8(ijVq2GmX)l# zughiX@{`}WtU$m>KFTYd9y74tbw6!?4W%eHK91(5~U zFT7)Tu;Hx^1JA4r=f72G=gvK+cZTuwsb{|P-!*LWYY!~vFO4d{wlpT^XVUV!S57Xy zocZJF=Xk|wU4{?$8J2yQH%^v#mGx>v-qW<*2JAYE9e$g|%E!;!R3LLiNbuU)J2~Rd z7z+OM8(Vx17uv=Drsss8?3`uG()%=)S$He(za2jdrI)i zh_9c@E8d?x9~c?b3Mx`AXmh`LCw^Cz>8b0~vcspoE}i4U%HUF#^NacCr<)}OGVK>u zBrM+^Z&7#i;f#w3PE|!}3=bY{eO{FDeM>5bz0R%5-Ro9pu6Io=<7~2GaZ=c`^Z(Jc z@fv<_ZJ&Snw)yw@!z;{{wna~Qd*fxTXF{Y{^D)&Mcee+>x6s(5ds%qmT&n~2KYq>o z$kfQdeEeIh+tRJK`?e`s^~&9xUi|Rs;)dz#ryqW+slMLgt?Yc;0y(wCoPr-8ZcDyb z=T-5uO7V43++^q73<7smg|<%B5_vw&YOn3nDPQmV@3?%MbLU-+3zbbwcTFu<{`~Rg z|Gw5;%lP)Tl{lZ-dO)zNCE!<;w4LK+LdSuc_n zDR%YgRt}#1cJrg6S00+WS+e7`Wb*-o`r9Avl&c)pn?88%U*7Q8;>()r-tTYiSFT~& zQ~1qcllOBmW{0y|cV25qIR1Ubs>bhkbBq=*+jH&R>6ZIj?_ZCQ=Rv zH92S}%U`$eZtoLq1;k{TT7%ejZoji_#j|6g7s7n~CTuw%qkY)mh3OXSUp(&{Z{$s! zP<{I0)3pr&CACNOm3JHsemg7j`AXa87m@?Sd1R(H*w^3UXLw<}hh1;3pQ~%2>ZbKi z7JlFG&f?Q;PlgRTJDUF%><<0jIQL?Dh5wQ7J&n`*nTnR)sgpW-Q|MXRmF((Hy?5Ww z8t^zNHB0^dzBn*bR?KVCG*zMQ1hbi$bDM-kUf3k&9AAF;4&Te?#)etH0)DXlx*@B7 zQv2|E`TX)<63quY7OhE=Sf{%zxZ?E38(l{`-U&5!tFL?TU|aGEos~@o6IjxpZFpke zo%j27Mu&sKfu{7d#1BXQo$%H_u(H-u@N)N@KbU#tnWN3JzthwX$!OjV%R2g&<<0pl;&AC#uyDZJFNd4GZxz0y- zg63Ek$hF>7HF&{eAbnQCK3$}W=iRMW>v(yw;d!rgc+TWwk?tmIme+4gyH;c+cwF&s%`)%Y zo;}$bi*~ytyq<2ovHtW$w)ux;t-f^~ebD)LV#N!leeoL)F5Ld;&6N$$Rs=_i@t&H> z8_(eUOtm#Eb^olp83u|UFI4jEFE&`T+Xd8LFp%`!_VekJ#hNpArfBW@`krTH3{$7i zqYKvj-Fydk+*F=8twMBl+|PT78g&mUep~*UojTV%Kco7hbmo;P1E$8)|Lbl^JDWBi zy1)0q{V!&(&IZkh>=ByyxqAb{w22cxya@0}y>31+>41aU^o7nj7F|W&3$B~(WjiE% zLB`5of>-24*t#_;eJ`_azQ4Pxq4TkYNQ$Vkh0%$pcb~4|-gi#U;(fvF>FdK6CzkJy zyw0W~yYEHGi;e%h{?49Qz4o}wedB8{-zrXY{O~PUNnQ8;!)=py>oVGA)G+<(d(o(! zZk!{(L)3LDXo36sg?9}zoa_r^+Asf}^hPef_WtDlWfpV8`8zrGyu2P7Um2)+M$K61 z(V>`K_5ZFa{b2un=(hh&rSs>_og~@cuhX^vwctb80rdqBx618nv@1)DlRs?0@$Q1r zf4N)CTqW}|&RYkVUjK45_`{Rk-WQg}yD#7FUcz%+cC(vP^m1pny|Pax^)GQy5J-5p zNzzYVU4Y|3c)sDRuUBU3)jodvUR@;N;N|Z-N^kpT=g!Sv!ONg_ZujDYSHG|G@;~R| z8mM~gj7;8kBbf~`FSGsye`jFmdu#Rf!;LkkcWP*_IB?-4v!Il0)04&GZ}aTyzf8*g zJp0O#)qKlYquK-J?%kFc%)T)B{f_9W+^{t>U4Q-5aVg<(pD$=Do45Vk%-gT_ndKUM zKPl<=|D9yp#^{pk_c&4;%8yTbAMu0rx5=;fp$l_rc1LcE;OXQJkN?bK^5mSbiGRu6 zdGq;`E`BclaOA(7+og%!C-zP0?s}x9@pq5FWnHf3Z`Sik87qq71{WaQ$u^rfvLtX11e4%KAZRO#T9G5otZy7 z-U(G+ek=XO?az)P<7s<;m)rb(81&|Dg@EPC$`AbC4$r7=Q?^kPaW9*9WNGj@|NYiG zpUb?fDo~0reqF#7|LLNLPppYt!{?&~k<*J4uSj34jwtt;Q_ddb7uOh~c5s6=yJBLB zeoEXKx0>}gX4mC@&HY=X9`~n4Qf$AG{PD86ZdE~QCR(~qi<=DpoO9&p<~-CuUE)i2fth<}m2D6C)ekL6pwW!IuNLIyogLyjAM=V`CsAV2MV<>9BIzn5etd0tM` zoz(HtSV-i>p2ElXuFiXNr}6U&z4b@ub{|ttOwm{Ad6QaRotkO7t$yq2hqGSD9Dlev z{Cd)#ITt1D%T3l06@B8-sw$dv1OBl#s(21`D@&z5P=5cB{6FY3b4xht?$JMDOLkEI+TO zT5hLs#gQT#^R*1x^MCLpzmsfSaZa%8_JpYCJzGn^eZFVad+y!Nwd>-}9CJUv=Gb5T zb4TZX_un9EKKl%)y;U}Q-JKU-_PN}t{9my|HJa(uv0JCPv>!ZPf8^(4O}_rMT5FFT z>))PuPT08MyYplaW{40o+4uc?=nLaD){m->-a0!w>i+s;=hXLq{L1JMSjK5r`7rxT zeU+G-pLEm2%j@!wC7aCH@bU56vaj{upH+c6)svsyZEQV%H~aduxYftY^Vcmm$WL@@ z-gr>)`>*ec42Lh?s*n5e^04oXuah5#O`oS{V8f6Yc<=-7r`E8wu9=ROUBzCr{{&3c zPUYz5+?umbDIp*^o zV&_?}`1Nk$Yg^sg7p&>DeYy5eQ;pztWhteN0y8x&S7>a@nWa3@^MUx2e& z>f5iCzqJMLE3*Z)irk!Docpy?Rf(mI^+xW8Lk2ufi<<%`gI4c|x68yAYY@x;WEeG|}iu5H9Epir+5#(6t(XnciRLtH9SM&B&6hAmn zD05~FC);MmsAe{|^-@Rtg&cMt{}~eQyh+PQL9FYc>c=)8o#qIQ#tDKAi8{vnHr`$Q z;PLz3&&TyFYxm?Y&}V9z`~Eva#5q6B6D4&IWm6|Gecx-qJaOVg4i1h6r-d8dKEEdy zxZv}VS>@M~-#=pp&)4yJq)c+tSGqinX>MY}h8YGY=6tyn+2>s7SJ-?#`1=-z<*tP` zj?P{!6Q&uYB-O9E^G{0d-}Uf!yNdKR2tT(Ce`u4g*H~wFraQ(c(;?Um57JQ+pS667QZVOOh z$xfSnN3&1R-~)eF#fp8li{wB9d2Q zgIjH7W-Z>eMohJmH(#e%IedHV*N@+~-DbNf3>qwbE8@;vfT4`>W6Qin=YM~wqx|tsNJg|!g+9`j7335R>E}GjUhcV`|ouAEB|uT|NZ}_ zKhj}+-Fq!tdM-KbUY?rW_d?=bN#Gn8tu`06#+zpjEx3C4&Y88-^1mH&sc~yOCv5WM z-Ay-N`L1gD-O}=QpH(;MJ>7Pym{00He|OxBX8-sZ8w{G9#+BReHZkGqG=jR=exBuH3fBnxzruCaDU6KTw4lygP-+tWgc;O1I^?BFQ z{HBHeiOaitapTs&1)o`XcixY?SLemz&ZhV|Y1?k^La&$EKNEs}ZM(NBW$Ah*h6hg< z@5nv>@abZQiX082bLpnF&u5Fs33pv;`jnRYW6_t*ENX`hw!bx+8!X;;d`j!%TPY7X zT9|zP-mZ9avxI>y^mVLlpP&IpH(z5!&VFl|!v-82+s=I4E%j0{{OHe-+OjGH87tYnGqs&meSJRg^qd&G9qYonL4E3lvd0szNFO|CE8VecQ}gTq5A}4@7N)uCUv6ES zeO#$!i@#Fmg}jGz!qy)Br|S-C;hJ5XZTg~jf`@AF{pAzqKD3c#wc?-Qn|5WV#Ss?{ zMczbT8BotF_(Va%?Z7`u}aSg}Pzdqu&^``s>DZW$p4M}iEsx>o1C`t`0zKeGAr z4z7I5LyMeavTnbtO^>{?v%u8+fYEa)89|o5#{qMKUzL1((ffY;=Ia7dvOR~^OiKIu zkICuJ1L+sdi{?yn)4zRd+6JBO>+&(23q5YUnZ>)6$BX~8;FUw_QCH&cFSz_7FgA{P zze0R_fcZ=x4ed10&e!wpuJ~E?@atCn2kYbe9-R4?qEk^NmbA;&NkO0?HBv?1 z^WgdUIpx1x56wJR``GaP{O<}YoEzRAKE1&F(Sd1;f7HH>TR#0iPcPT8J@w~YYSu^W z=HJuvIr2x|(W(_vJHmeV9y=@7De1lJQFr*Y2cKq|-2S-YoZyV_S8U6qXM~7^CS6Xq zE_hioYxA-XH=?`W{`>RO`~JgIH@~pWk6tz*>Di=}5@w|n-kNSm6SG|TGvfQbwA)L= zn4SK9T%SMx;5zyLhu(et{q`0I$JgUc%hMMYJK0Da+hm}tt0`>1?#`7LujNea7>%d- zY^`N{Xu~rWqRr7fG#6Jh*xD#c~(_ zCF<#q{%rIP2*0klELx6zZ`==!^7a>Hhs&cN}aD|87@i?si_HZMFF3jel3$FIX3-ysg>_TGU3b-gW;VaZg~|onf}Xw;vN^W1`T5*$o7B$k zXTJNZ-09Im?jH}|&d)vk2Gn~m*PqwJS?vD!-tpzhZ>{Zjf3cbS`^e)P@0Wl0tZsc^ z)0(wwtL67gE5Da&iu8V8v~unC{~tRK7kqjc@Bd)scX`ME*1tfRL&044e%bB4{r7n% zMzomzzumF<_vE*7;u6pJcLv>i@wxMel1^13A1ErlmtX$yR@(k%+sePqwTAy^Mr!D< zIZ}=!!PP<^&$N3R7M~1BnRC9#qF3kV3D+m7B33r@jStE)O*Ggft~YN_ z)7Ag~4wn77bMW(xUr*1e$)7ji0ZmI7wTkSo`>p;h$0lQU?)P7RBR2=V$*cr^zUUrpg*B9<$OFXhg@qqt z4Egfx+aB;WcD$6T3@#NcTCH)Rvfri@|Ag+tHEAjCr{`4u6>R*q=D78dyMJCYHJq6uBk|R(XIHg`%BExf zg+<4H{rUR*@9Wii>m4ftmmdDO;+$+iWX#nEAs%^Ijj_L%d_5sz)Z)gbyegPQ>5;X9 zhR%V&4+ zgBP;!G_TN`Ht+S?d1WaVBnzHwpDbZrtr8diU8(PH9am?&o|66I3rny5<;p+(`@)U; z%Xcl~J1EQaR(|=E!zm^U|I60OywexzzEI!ubVuX2o{Z3ajdmaSzio~d)t}h0@WaQZ zUFSA0)7HFD*}yc{L}i`3$+2^Co$r`;-3Yt4ealJiV@~U@CSN^$Kl#g-L=TCp+|0+n z9hFo+{EY!T{?NZ!r+d;Kqd!}JUYqWjAN$u@Z@%yGC#=ba@9qW8Fev9)bvk>)$HloG zJ5MgG2>-$Q^U=YlpXc05Gn!TKG=^Gt#hf5*mi%%&#o z@4~KE*XF*SbM0L1yJlM zO+mv&j%k8%QGZ3=)h1b8I-hR&chk>Pd$tEem;SDH3qQB)@u{076+f#IUo80ta+}=W z_sl2pfAz5MY)jdQw3yHw@3Rop%zr<`zLqi_EuP@rnQW5Znm=Lb+Et&9-Ig-U1+^;dqW|gk zy|wDS^ruLogsnh^z45?D=W|tcJGa+A4!^bQ;-Q`1D+TY*-ptH472W#bTlU@S z*QUK#Eg|yf*)Nj`tGU*RDViEG^Bg{4e}jLbtg^suRjG?}l?Cr8Zn*gO?o#uOZHsId zJLEs+sZyTXf0JuXqPUdkn}XS4Yn>w8~QT@c4pt31@Xa#oDm%ygniC z1NWy=3%#k{7xvbt&*)JTd2Ui?d9mY1fdsGG^5r*=e(x!?2%8hmcEHHzzKpqEowrR1 z<8!__?%x|@4U%pp-2V7y^|TA`XI;4XbX(~4s!!+ceSa1dx)L<#xyZ`hL~75^m(!;H z+1pmu?(pD;pu}BOrog$f;^xoNMGl>IZ|wN-A$r}^eitsjeYVkcwGGqz#X+5OF=4L# z4)_1(zt2maz3Uu9-~Zb6_l2y>gyuZhW4dwfgai&1mVjfY)m~(5&C_kfck_R89b*C2GNB)7*rdAR@DBJYcvo?bn>ILhW!*39R1o94Z#;Wqu<=eMh5 zb=dl+yKkHIM18;Z!ldT?a%sb8pDTag-e^%xWzYL{A>*n})I*uCpJQfEeV>2dlHFj&8FE#8a{ika#E>NLSR|-v0O>|CRa@A=khk2hY!!KDnqS(5>v(iDNrbR9+v* zsQ&W&_2tbzBGaBNzJ5G^uGVRzX>%+K?RT37{=N|zW>j6KYjDOP$@$LX!d=@sO{K#F z|AvTmhgoFimpy#>wWy+8_uxT+UiWi>+m^JvTE6+jb!cXwo+F_r)KQ9kGY-~O9_E^XF{-`>*4J=dkJ{iNn5 zqxwwF+C2XBzB#iCwpUz`f7HC4@57_l(Kk2M3h%Fen#;z{^yb#ie)0OfQ*-zK6cqQX zZ(IFU%dx&=Cu?NLnmCWFD6Ux9yj}11oHf5{{`twWt08q;=WJRfbSpZhqH0ggrsaJ5 z&FeUCm2`LN+TT8N%Xjt88wH)x*MHB5p5U6<+H84^=U?%IA1(aO?Eh;d+;{ex-jDRm zT-toic=`qDFH`DM?dIKMw9+f-JDKw5eU5c|+0{>H<<~vlS{}FXV}|ivJ@XYIPsE=G zZOmfaS7$$8&ffm%uYa5Gy2xG&3i|4?$wV#s$@gD|vwFY#?&bfrylheOvdQIdZfs26 zrLK4<-u<)G6WTk3Xwn z>J4)~drw*BUaa-2#*~-0xXxYM-lG*LEhqJ?#8hA7q#?v>5on5+SRSWBBZ_U+O2cu^AMi;Zc-}CR^lGh*3vvdh5 zuX5>hY46NzKT)uvBj((kOA_}2>^G?_o?5yh)pV1J^2!k9$O&I`j9-cw@7wp$JgAM$ zxiI*RV?9T&U$5KmN<}r-zz=u67>URwJv?RPqb97WshMFSl@d9x#4KZ3pys09aHrMQ z0q1w;znS?iljFO=4Bi!2KTR>#m^Q~Jt~%eEw>16c-)CAwx<|*G=gaTOtM06BYFeb>k}P=WqQSy~35kapzAaaAGM#*1 zneoEK>uqk=5-u!Tc>Tr26HzHsTf9oGSBRa}SGYgXJA8KaokFYI>w0JZ49LFn;!9N0 zMhWNbhmI^VytIkO=KrgzPoF-WICDnD)U;G(g}U;@BL9L#Z?cnSWfe~QcqGa2*PVIC z>-H|v;JH)tLv`*)BjLuz1Il~DlaGC8mH*XiAy)h0_w$!u?XHw_Z+BID@lTA8-+xDs zpk!aqZMAYUk8^vRg+BTflz0lTBrfA-%@gcA!hej5%Y66pYwWe#gcxlP?zFC6R?XF< zz!9(I8o1+KkuXn7z>k`n$~Gd)es@*-Y?fEF13Bq#xQl~0OX4qACM}!v(iid{cg(xT z$h1%4qQ{hZtM__LYH?exXe1-JoOPK8%NG_gt~)}S-&Kms_f{HNKVns!sA1T_B3Bz^ zZXzLdwar|tyVLv=yGqbI&NaVJ{n%~SI&=B{>!;)EwzePMoxQwTtI0rhmPzZHso(W) zd|puWHq1-xw*1c>4CSwxk7|od={X`@#U%Xl+Y^;tg`7A{DK#RBg&U^yl7H5lP9%SD*ND_K;Eb=R=RAH8PD^s*XaMt zn#60{*g0jl0>|dLs>g-4-=5WV`)ydM=EvE)&bTQpP}fjh_TZh&{@P^<98N};Uv7PI lob!fONMW?p`LO@&h5VB=rhKU3W?*1o@O1TaS?83{1OQ9=q^FGnu+oDk$98+~5+(;4@}JuwTX zbx*Wkyx}hQ(L?w5_dHU{)feip?eUUW*~8TC*gO5%qt{=#Z%=&pVdIL4Z_gxN`?xvY zaBuBFTdg9EY^K%E3f*oSUE)fdd$HY_XYE|y=i!DE>WgPB;D2u$#r3>9-~C)#=(c91z5f7vTkYf+g%;fa8`Zx$)_ZRK)ZA&}J?ChMd3w@HoH zv#WdYgQ$WJ$s1oic(i79^J)c-x&{kt3(Z{~o&UYLbdzi?-W}gv-M_oMAwb{wEY}eR z-|c5Zl=RXztxozN%J}1AGb7KbGe*x;G&}nqzm~Jxch9vl?0Ip0pPgyC;Q@7_<1-R( z9g#j_JbT;0%J~*&x;A;$_}L_0V(paQxvt{Rv7HY#9WXweW@YLxqbA0kyJm}__AIH7 zCWS6nOHPR!$*rEV-6H#`R`$Kg`wgaC4xhHuuULdrCy7(YMPtRH7NZ=O%&VRoCoK9~ z!T!JF_4E@thXB;8^zeLH&o_(c1Q=FI8I~Ib834T+_pNFm^#;@tpU`$1~?J z{7Zk}mH$(_G~wIiFHzpzGK_z3A2?d-9sI4~v~0qUlM{SzPW@xjS|e9szc~LClk;|m z_p`1?7t1f_cbK)y>mCDp`+*z`$FP84^(v z;p=0SoS&ls47YguJQ{>uF6ifOi{A8m(KO)W`OsL0L9E4HezRRWu9l~-&964qBz z04piUwpEJo4N!2-FG^J~(KFFA&~>fIEHhHF<5I9GN=dT{a&dziQIwKqtCUevQedU8 zUtV6WS8lAAUzDzIXlZGwZ(yWvWTab^lBQc+nOBlnp_^B%3^D>@hD&O3a#3bMNoIbY z0?5q7r2NtnTO}nf1qB7D;T5?BzP@nd^NOLNker{ZUy)d#Z>VRWpPQ?XtfRQZwX6ic zj^dEYf>iyW)Z+ZoqU2Q9vedj1Wn?2#lHvLbN{e#9-bqQ;Pt8fqP0cGQ);H8MM6uG{ z(>DOF0~7@5nYjgET@|?nC@M=b(-47$;v0|**gMD$smLvWn~S0v=6A4Sa2Q#+#;+%@y0xRFtlEjq6 zl0=upl2ltIBLgE7D+3cN1LF`wLn~uLD-%;~10yQ~B=z|znQ4`TRNH|vhYcjkJu-_+ z@{20LLXaF4oLUIsLAW`YAk_*A3gAp(m6#0iLUCeQY6{qUaH-^s#Ju#>6k8=|a)oKh z#F7*eO^qxJ6I0A|O^poGbWMzn(sV72Ktx(Du_^dVlf(Fc_oFdy6KV}uDr0a77j z$E5%f3vzL@~4`Lvw)S)GY#sw{{P*51Pgrx8t4X)APA}It&QaqZvMuUr_ z5FknMXzHR`aB(5JQ>l3=wo2tn_I9kT=2{F43~Wi>?k)`fL2$v|<&zm07&r?&B8wRq zlxBf2TEI;+$ zp2|;_=Pl1${y*HBDAA7fU;KaB zcyInrg?2vymW|#P)0&SZa`zrqd)4lHg$r^D0#o2otg zY1*Wr5PmA@|3^8Nz=qdV8Z%G z*e8E3`8o5kU2R1m0&e||46?+e@)-Zt-o z-rr~emJGS=36fLt)WI`>T=TF+}XEon#-<0Sd?`_U6{zWH<4 z$bRK&YN)Z4u9RixyULy_vv>2J_B+M4Jk`nz-0w?*0-(eC+y?8a&?VnK?b%&-!$m^J z?!>jpQbw&jDv>PbKYy^1?@L`A{9e~~`#CY=Gor5+X*h+YT1<0}7XoSKc+{i75n!J& zZ~3Y7LC+Wev$*y;R-A4&sXW3pdwfmPbWt$->(*^>x1~gOkY`7m2nP+uJi_OfOnw zEGoR=@_0jQU3$ag^yS)?AFg{Y6V`YqdZ2K<)@jSW=0ztou6B7mos=Q7ZN{a~HuCvJ zGZoI3-#WY4?3-NJw6NXmjt$QOv!9+{t8O~wTla&V;os++O&4fW)akzT0~}h{4iwwS z?6+{;e$V~$(--HDB?@n=+*y%xL2}*OGpVjl8^a=AS%mt!KCP4NJ)HLB_0Dzdu8He| z;#EE*%{KG9XY2aa@#&??st$q67e(e)Ux?7Tnf8gdLbZ;-ck={Q-?<(R(Xn{CLu@EKM6Ok-Q;T}tffU3xt-xclb9c8)~f zvqxt$A3uE2T75!_VAnDS0hSxnn2#4-yA(fNlyl~xPn+wKlO{9@fl_nD;X+o$s1`KvOP`NiFPjXt~;}>&< zL*7kS)V{=e{9UD7)!BbrtiV2axHw#(ZujooL6Sg6$5+g&vM_7->Bci zZs{g?!p*E^mKS;&o=A`YtoR89y{d8saE?Z_c+1WPMV$tOpGtThY@*G~9)mJRTuDi17am5T_W=EH$+j4LD zoO}D{ro_j&cedGo*7`9|ex*zLy9>vb~^XP>ymfA_|yg}>f1 z2HjL)QM9VPoBehBCrcGqr>}KCCr$oTE5CL!-x}4v9rxvw;=ANRv!cza&i-5bmz--e zBsQu~+c@ErTHuOj&)se|DI~miWNp4D@b_B6!DVS2x(oHDMwQBnubq6(uXeeNz3{$? zBAn|UAI(aYE@|^vChXn)N9J_v`=1+M^KgLd%;`9p(RFzFaf_;=p1SmgxXu07GT9r; z3pbYEJsUc~dRzBl_2Vn<=sRDX%6-n1gQ-M%@7j!&+>16`n7Q9iZGM}fQG&iltvTQ9 zfKt|UL=64lmw`FZIF8~(_t53Bzj+ST~F zVS~Scj-RQF9iroz0#MOc(F==#iI6NM3#JSGn-`z*k+;gUoTkY&Hr91zpuFG zeBGb7OVbZO7yMn&b+Vx9>G$31RJ6G_ow4IcohKagBTp< zYP#;?%}4C~;!Qqmz5ng_OLmV5&gvbZGx~T;&Y7Hv@7i4Q>aO>#TTKV<|4cu6OWdwH zj>*L{qT1-@R^7Hq9VL24OLDa)A6a4Emb^YZw*J>5M|%&Dt6T)x6s6qPetz{SZ*%|0 zgr<`ThrWET^4kA7D{i0s-MZ3$djyp}Y@ht^`Xs3k-^MkkIQ}qfdwM`ZTKa5|#;P-S z;@BCw)=h8*)uTt2Z9F@(=*H{kcirF5iFx6FuR5Y})ygyLHCKO{TfeUFse{iZUEy_) z*P32P$-AP@r4jb|!envPl*unyijMMBt-Yz1D}3bdK2g_0yKGsP>%aQ)SoOq0;qvKq z)eVQIPd*?(KhG_CNk(&&CSFpWyDQgHqO4uI_I-@z>5wVYwVx;Wo!z>8=}p6{&vH)R z>!>Y}ioH|4+ReVANye(sdIOL2*~eE9$IZcC zteH*tqF2b97{1_XP~~%+blv=_0ZWv6Zpi!aMejdu5uSNyKKt=PjjLT3uQxhBjjL4F zD%$vd;`5~1Z3p--SiN-cm-JX-a-xf;?{Pvj-q*Hp5f2l10S8?AdS*<&n3uBJE?!Fhhb64%W z+AXhTqjWfmUL1L6AnAKv_WR9x|M)B7eVa^toJ`R z_(=c##?ZLGYU#FV0m-rTqI=)%4Ei>yXQf7`fGVh=wcqx}j#YPe9Vwl$X136^?{>8p z8|GbFm|>Jsx$J3PwAnJ{Ywx2;>l^t9qYK0_gK4D?R$Q>G}c3CcF^41 zThiM%Pd!mnbua}GSn4Rynt@whZk?YGu ziABNh?{=h{z3UHL@#Lnt*|kR}g2Gf(E^(e%#S{17VFX{!;WW8JN*zp}QqAUmNZQ)) z_@(EQn$N43Tz|8;X#JTjmUlw*e{CzweIE3*?!kGp={j4*L0y}UBQs{`&;2IIx6kVL z`;(u4xdq?-EVFCgrG*;Z+_RioGOq95$m;D9>7uk$`2(}h@ncb$Uo0XFm5vHLJoI|= zQJzgl&$RNitU+h3LFzcQ+S4JtZ(tr+iNk2zh=wp zkK9)(8rv70;%E}+dm1xS??6e;xwm2&^UF?x6Zh8*zS8!enCrRUUVg24#{|MZ5yHO~||4oUOfcUXS0d+W;(6Un2mjy7!< zP(0Hq`Fm?v(Tl~JdxFFsNv|xoat9TP*^4tyP4#&jwJT%$uNT{YUl5Y|vV`sYXG2-v zWbW1}-@Cc1m$EuKybTn+>z4oe<;}d!?5>li&--t+tvPPB{dLat?wKdPPf!v3S@iCb z#&zz3?T6iZH#Q#L$mlt7!3v`q`-a?G8#n8{jN$s}_3qNKiOlS_E0h20vYuW1?b!Lp z_m|XNIkI8A+W+=pTB)j6C>q-?+3J{-A4&$}Q;eA`x=O(983PFD7{FYzc4-;xvA)@#5s z(`~^oM~2%y&o2buRQdGu4y(GH(vgys1-IYCM&4!O{^`~C($Zs6i;vyj(%&C!<<;NM zJ7?ysDchEKXin6|+j5*uN+pk&_@BAF_- z{@(5qznZz<1fN^)_xfFsE8cug;Ot?sd3*ly>AJC4mL%Qf_5KX5?S5<6=Pnd}V8QqOel@@U{trA=LEWNn z-#Oj7`@N=O9{a?=|JLVb`1Czi&=yJwZF~QFgKzq3?teS%9kpgBNl8n&zdSc5%3%5C zX(kVsUU{o^qDyA=2j7cRrj~wuKdaW}_b2X(b=!^IMOiFM9<_b?@b~-2FWl!BsBW!b z+oIfkzQQ0ec&>BD$qBl9ZPvfwX6RYjnYWnx{M|jt^L;0*E|_A?$WZa&lg!=HN4z^bRzKLL z+jduR^1a_X?9+t&BSXHhGE_Mo{`WX)P1hF-i)qc1pO^ZmA6vRP|NQ3*HhF7pe^-Ca zFrPR1Q`wV>$E)5h{+7}I^Tn&ueO{TM_VmV14q1j}iz{9Rp59RY=-*+147u%zK0U1y zuP?B6SugsQWAaOvl#Al$KWn@bO%jbh+Pf(Fc&?0{rPJRHjn6!}-Ou|Kd^yM2bMh;1 z;6~l_#Kyae&Yq0j+V7+)zxp@Rf;d55s@!y0tr{jz7bwVs>wQ03T-hK-Aq1yu!;cuZ|v zgJ;NE9WM?Dk!;d9v~kXjnjnju&H2TZSDd~& zwu-4X$yjZ)S{fy&e*SfVEGS`~`n_~#dW)iy58LEct4Ha5-eICGjtsYp9^B%KV2{#V z)w9?AYO6GtZ+KvJ$lX&WJ90&8Kic%ysFr({p8sC^C93wB(wf+=ORw2|MY3COvh47V zY-PBcmjCeiF7I!O9v9EWPhkmpAFimn7U56l+ZnjO=37}(DAQJ=8>nc|*}f(5eTZ>!9UKCm7y)VRhq@g}3AK){M;7p?O0 zzepZAYvB^Qt9w$%-u9_G-6fh77HkP`nRa1a?ybA4cJy`s>Smktl10R~agEo9nEy4m z?kKreU4NteVVZdFs$EU5noqT!FaGg_M;J%c>es;$R&g#$HJ+nI+o_Iy7wOY=5K2bMinoHluw#hoPE%#~t{noHD zVeRcV`o24lOMX)Pa472hd{Nt#XMZiXtb6!9c#YTs)h)gI-p6k3PraV`>rr~mmnn-t zovn>wE&FagI$jvFCTU@6;N;}vtN-*_pJ_4WS}kuT{!Qn1Bd7~H`QfKm-+r)`-InD# z^jU`Ms?FuCNB91)y^v?{9*C zW7+C91c?7X8eH@ORN%|DuUjX!@b|iQ0maXY_O9{BG;=wU;`Oty>hX=qTONJ-6)<_n zjcKwgHNNfod~@5Xs5_riBBz=^x^U7?>_+=rojI)+Y;q26oHJMMtM?nZDMjitlol_Y z=q7MX%0+PLiL03<%Hm1K%hvgxpELF4iH7qlO7nYq*S>yqeCDKWr@p4hf0QU`>wbQP zU6Jqp!eVfMt#XcEtdV_1+R%Mbpy-}?uOC0TdwJ)kg^Er*)yi}BWhn3*o?AC>-}A-C z4IW+jUR#p1g?(LD?y<=ewwli{RQNq(^UDo$mTEPZ^!XiW4SILP^0i26FT3yyP1!0J zt&$6pMoXvF+B>{n!W$^GFvCd2vnknnbLHiI^~v*IM&|#_2{``r@8;B-FXog9{`k14 z*mIgdTjCnI?9*FjRN}E)P)xORT*+U`>Uax--4G~BDrQ~Pjv?V+?{LD z*Sy4If+%OB{bj-ZUB5rs$~zz1^4aFglD43=6`H5SSr}jDa8)@uf8HT_^P1_KK84jr zlf0KL^>v%P_1)Ar%68kHF0gc8_N{pTU$cGx?SIBa&EY6|;bNmwYOEx)?(Lziu?zM` z&)1*nxhUXdY*E*@edbV#Fls!~atR=K0dfxuXu^O@yLSIKE5cCCr#R=ei)@%kKRtC-iU;r&5I+;Kylpyc__4DB~e8B^px|6F|D zt}!(tKvJ~@G`42geL;NALhh!9Q-6h0T^m+aJ{oVFOn$~}J zeoEc8NGWpKH94Q6X$NoI=!+Io{P5=2({NoErPW5?GwL${5)~ zMFy8Z@ujItJWfpC6cFd9H#=27&GuN~>TUN`dS7U>8>mPY@G$kZE*|WI5I3oMt?8d2|(@gcFwroCn#;;Dz zv(s8ZH7+s1YWksni)~+c{;k1C zN9yDN6V#vpP_1vt!x;=Jb-9zhs!=$Ni zk`Jmy2?W#zbk?l3U$DjcAj8r-oyBqMi=I{HJv{Sf=fpmprpG(C2JN#suN;0(>1$h7 zScgFKIf29PG|C(&CGX}qBw+J+XW1O4jhEsYHJc}%TV^2X7akTTy`}xa~dKkux*^}L_W_kY>ceQ5uG$nCW;s6TOAX5s#_V>^Qs-%B0e z-lUQ6|D)Wco2RvsWYR*fTy38^Rcy=0hPP*oIhdar=LZTU^KQNLhfy; z`n_i&&n25@=%&a^Z|QeA60+}GCcFRrI=5~SN4~iUJs18yXcFdh`lh6Iz3h6{bIq{N z-0q(97OvvjwDd>%#=qYf*1dL%zb<7kKm7RGJ7L$>*pjYEAeZB<5#r zXl&!WD>K)feR6rCtIKp_e#KYpz7msvK0oa!u;B6wH@}}%##w!@8O#r^uy^~sqjzz+ zU%{U@B5yCBn>ugy`d@P=*RHAm`~Ls2^aoaY97%#DZGLBZFEB1By>qDf``vz@WUF&N zMkS$-T#RMX{=P4iZF&DQLvH&*)sPjtxFV+t{;X|oowdyTUCR5&aPzZjJYKz z>=qg6_oRQ`|66;$QoEl{OVGO`tn7CAjn*|)EX7$$984|x+OwM!8ZyuP%e`xoaA%?T zyzSCfpWaqYKN-lod+`a)40F-z9|P(yI;^*CNR8rXVsMl=V3hmCnt9H?j0v?a2{Xlb zjwMgluX}YmdS;7zK#SiUt9Ch^jyujKeNhYzkqge{hMc#`v#JWebba01MWwggHb(7G zkSa3#B(;8O-aV7_w`ol(hc?dX<+;guSm5wGfy3|0?4IXt<3C<_u0Gml;(qxDllOni z{PWxXgJaYNP)4h1uPgk>cI}n@tY%Bohr9G9znYO5;q$yVyw%XGFzMPv-IN8dxKv!L zX6BU|yz4igwC`?*@^i~4-a8}tzh@s;pZ9$6^;hwc|E+Ew*Zw_&N8RAq$9}fD@8Ncy ze4tq&7mL>ld$xUlJEttY_K0_jMU%pgM{(K5R-F8NG56a!V~N>v$BurKVR4MGoF(SM zSk13pEW1d9OXGT%g!+}aHQQ3;r(0GOwSZF3|GmGrWC)5cFfLIFYuTr(bJ^|jhOHaq zZ*0q%BWF@p$M;)pZl%@yWB;N}ZEF74-l;!tC%5mv-Ky`WH+CNZH9lXMP4!fo>G|$W zvFh&%Wv}J)N}7~Pl2$r@Uti9*BQ?UJGR|FTsq;k#kFf`xZk(JuWxKu z9GDYT@q2RoA@ln0<`)iua_TnWh3c2AxTgMDx+?Dc=L;*#*RSz-vxh@x`ks<^R+9b~ zv%fs}z1w_#wD$@Rw-;5+#*9-R#WAYCpQl&;V&n1VQ_-a_QsiGx)Le32wV?iec>R1C ztHQ#~KK%_ATZ>h{RJ+i`tzZH#W!tEnt`uXi-3$5;7ri-X3v&sc@NTeVCf z*u!1_)l(Uj%H5p{V=TojvqA(|M80!bf0sSdyJB%l;Nx#8`Px?Mzi;qdl4j1Tdw>0( ztZodb#kyIrYTK05S%1$I%NVtuxn|d_!Re8DbJf$TphO@VKGI()@dMQ4agt zs`BiMmN$<-dy{N4Bj#1Zk3Z`BTHgQXzF+;Y29${cTJ~MK|8riy0?&csobGMUe?`BR z?6c-jdH0~-Rb+Lg%4TuxWvZS|MpGMdZ)V7B)$3gzE3&Y^DmmrT>GQLj4dPsE<$MzS zbXANwHD)mdik!QBPwnvAZ}TSC=A5%rJFIzW=ap8?ym^lwUf%!HvgZ8!zj{$e-dRj3 zQjfFjG`&?K(_Oo;$6DKpZ(HTpW*e>VULL8z+>5hZLkr%omHPbp>uu(q_U_}EzxMTC z^JHHqygvR`u`Q34vq^sxC{HcFceKJ_r;wuLrv9@x-5+l#%}oCEd;iCoYf~dQie4Py zRpD{gn6>GWq}pqb;{u9q(K7#ESn2T`yZLzA+XF_|URPh6EcGR&WR|^wzQP}^QpbxZfSZk z``gTOA5Yqu<;ypp`*0}Z-u&Mmi4VHSaNnq7|#F7ukJ zxurA)NSs^LcCvs=cj3NEugqj;w3RMRubKCHVd0IIX#opYY_`0z?(w0GGBbj+lb;`x z5r1FhIyLc)!W8dtk4D!0o;hIoG4So{0O)A|3xf6TN0{@$^B zp#^BRFHiAc(>7B+8LjW9EGpyD<8+QUpY*FyE6&OdmABz>DzN#zDp&Gb@5c5VP3FL! zI3<@rmvvJTUzMx>zOk;hhh4bl&GUbz|Ng}P+Pr1KT}O?letX0mb^E-Q@P2!IPwmkb zN7lrGwZ_jMFM9bVaNa44MN{7-|Ni!Iz1=72Gp-$=ak^`6FS^Ai&#w4aEm|UF+mhgY zo^Q8#`oyOee3K6C>ztfoIIV)`=J9WD4x8ovssH~a{Kdn`&g$<*f%^n^4DD&y5Oi=!bRHn^xFY-3`zs%V6>2>(K zsd^{U<0|qCPCU8%pptK{TmQ?i$C^2pB{NqAHBY;6fZJxx%2GX^V&R#6ylL%rl9DO% z)@kzd|6HGctp0~{y%hhw@_sS%q8CT*7QZ-n=>Pv!m&>pIe(LS4ac;4?qr=WHm+%KO zFU`!Kq`5>~@7nswrgWn{ zC#AK{y%k~8Qu9Oa_P$Y05}fX$V$8W>7Z+c{*P!|LOJn~0>Hn)#_hkMb)2KTq77Ca5 z73?$4m)W|`WbUk!%fS|DrziTHxgqGMH92LU*-X#8t!p*AT%z0;PTGHkTaJaXYVE&k zxA)&t&zJ<6)C&G(7p6k6jvU*pSk7Do1f-d_%&FddM-v5VF z>W&lN+#T6F`l{n5zOH6Gv$9e*eg90SS-M3}E0z>{eu-lKmNET#vS+f^tFLDdpA$1W zF?AESz5B+f1{Lq<(D2VO@?Q_D1>IEHvZU;vP0r~?OT+a`=g)cbICPp*^aZ^Wjm}z= zTh@5|IMHt3mH*@1dgpC37P|JySQUm#d_7+Aaq8jhz3h%6)3heA_ha6E+Da8KlS?3uV?WG~U1C;f&r>e`o%G{QoHb|G)pc z#CAsWZCxw)e2v!LlZ7%Vp>5Lw4sySqIYp#+(sYqxf!5bMHr{$Kb9?8s_e#+o#+G7y zch0%TrO3}#mrs7-y=}_D^t#W*KhEUW^@&+_UEnNw!QJC76u3%s;fhbKWiq$RF64d* zo0a|6;v-wq8Y73pX1U8=u+0#ai1lwdCl{%;YSTR>h0YJQ^^Z%1_8d@-Kc_g;Z$fR3 zV(`H~wtGbW{CrveLGVv!{$HsVnzAgeFOKM{`+b}+?@GaYThkS@idJq93ru-qyGCKM z|M7k82lyWx+tD97$7#K3LeTq9Ht(aZ+_mUy);Joy;qkIMQD4Wej;#Fm>*c@S-`wB+ zet-Y1#acoy&+2@eq?Gvoqg>ETm7B+xy={J;B+FeeBh{nruAtqghy9nF-1+7%;P|`f zu;yFw>3Ui+7Eew^YDE26w6JdW+K!Xo|4zL%N#?fW`m6D~GT0p({PuPq*k4t;$ACv! z{r29<^@W?XcLs@7^J`xy`D#=3*n+QX)q)u9g?r+6J!yHI>(Ov2uJC1o_@;i-H_99{ zpQbdK9M!cE0RQ7R{?Na6F6FPT$RD*s+ zJ^!>ar)%Y}*>93dlXz<@7ppy(|L^X6>+%mr-Zq`P&{=Hb*1qo8g-z2!C2h_hzt)&P zzbs+4S<%xsOV2hZTfexnd&BjZDLI#qo!q@#z=g3(OPRyTV%z3P!UC#-tyyxb*3G$} zFTi4;#E&Yl<5jJW3Re){EgMe^9w{b^{>6{zWko^ z+r+77r`-}aeH48>x8})V`J?sU7RoPi?U%7CysrGkBG-BIXY0(R+g1hE_nge&a-Dj9 z>#p3>joH>WQvObR|In-af&pEpz_U~lWy4v;N zN5%6?&F2K(R;A~Ck!oSwbylv*w=7W7av4Y0o<$j64}Pb}hbPF-tr9jD3$KA;I zY1gx{v97wIF1z97jR;Q`jdwFYtxCTz`QntFT(jRK*ZwY$72g{s|FxOzmA=%At-sE= z=KuZ1Aph@z|J@s%4WL%=S&mwxIR>0rJJxl_?XJ(BKV2fcEo9>QuXVAvTVHQ-J?v<4 z`BOaW?UEV4HlMUBJ8U=b>fWFs0^8H0&EZ0 z*2X!WnNm`5wtY8vmfy(r{NHN|Vfue&^H@3a>~h}JFP$X6|L6I7_W$4J|25NXGOrc( z>~FA8KF1`-rud4TH-l3&%4zmic}^Rd(~YSS+wG=u?FrINzAC=Ge8KnYMmZ&~Y(=y_ zpD%N6ktlQ5=G?UB<(yw{8GAN1x>z}WD`bB2IKBRhc)@$y-xdGO_q2;SgB;p*;k?1} zYg^AX_c0$Y7H}1u_d0KlP?gm@rP=Aii8K3p=2q}ce#kN{Q8D_ALtv`MCYJM`6J~D~ zQ?G9R^<>-AH%Hvs-Za1c{=eVuOYjf*|LgZRzWQsV+wtT==k8}0)~76dy5Snr>{DtJ z&n<-vY#tKmOI>_jYR%g{Y;P66Ea8isHZ3mQ$JeKA^4!X0^IpfEUQ@lP|L(T_#Qc{1 zpQqP}*ngT_&%4z0hBQtdlpVX=OX}SRLN_E_BlQW#`VW4>D6@v-+y{C;P(ReQPJw=1ljo z>y`g`a(~y~?O7=~pd~ja>i;*_bAuK}{jSa66g|3E=?JUv5w*pdyL$DSI+|8FskWEs z?b^Ss@=laD=bN4qJyzX?PGPAni5$0!5_)`n+=GquHuX!V%dd>#vj5copX=TJ?{bo| zmL-pteO$Qz$NmRjTpvfhcbww##{OQn$YTlqV=qjqxc|q7rCyN>oq5dX*S`M6<$ezK zt#{ksJkIi5Cj8@q{~uACU&;I@e&jJ++2%HmTSYUZ-lXN(uKIyNlvF#msC=fiWs2U3^)7tf!r;ozM$A*J)pV>ZQ;N=B_bLN8f9 zSKK+7(e?kY{(p;me-Ddqak$sQt8dHn=xSa}`@iFIF%d7ES~mDf_bz_>ou}A_-E^T* z{Ctm0ZuZGX=5AiQ;#04z=E_%GTvPwBCQee|F_iVYkj@z!}oum`XA^2TP%O9+Wv!>?i5gN zZgjCK)XaK#!0~E`O~w7cThlGv^=5UQkuhaF-QLb(XfAIa`amW4#DZT7iab+$o?9&0 zr1{4FUbD*j|9eHhb7{Pvu4hr4U}mTjekSRCpy-|hlWX5Bs1;fDbEn`=9q%3g@6~4T z%vLGRdiehTcKKt^?LWFkX`EarY~Gk^T{`b^KyARycf3c=23VI(j5C*J_r1MyqBFkLYo2COXlUxw_r0JMLpgm`GwUor zcE5S-c9Z@5XN{20XV(AD-v1&0!~TEb_55F()pTcp7Gm{YSbRR}>lC@yrmTSt^R7%d zxqP9zDaWD>CC-V_Z=B>#i@dVAo-E}mspK--F~RksND5cxlq}aLr!7@3aV~qbX6@es zR=aBk{h{iWCs)b5EU;>F{I&PL zU5dQ0F`B2ZWXG;~ zR+tpw)2*TZK_ldo$1;8QlD@}_g5MjxY~Q`DS%K%Eu~^s5XIZYXg+X^x8w z(U(4Zp<{K!|KIh$CI6g!|6Ab`O(*HNhPmwT zIwB%q7*n zw)OAj^-5X^R&x}l`Wn{ePZoXZYJ0pnH7dY#>dCf6mrke1?@pIzP^!P)y@7|@QJ~>@ zB}-k${r_LjKj5!>{rShW_rKL@zR&;Zr((<*6|-JIt4ldf@7TqQhgaCQW$WKRxnAjp zU}gTi`lp*_8*equTRdMmzN^p2vH-NQ|MSK7ce8nC+-hf=`!H&e#@ow!O$N8@cAbrT za%{qz|9<^nV*js+_ixPHc<{-EPV469RUCqP zJs*x8=Bzqf_r+;>&hm~|t0pFOy>RJ#_raz=MDOIEdz~dEDZ(s_QtrMH+?O6HI(@Nj z-nzWCa$WneMDBI3_4f4pEk3=aU~=u7d9^y1_oVk;vhIDi^y}ebn?Lu~|Fiycc>h1) zAL9SdA2)c{@0cU*wNscOEj`2Czd!JXwnJblM^l3W#{;XpH9Id9vZ|MbE>Oxlzgc+V z&Iwn~uACG5=bp`#c#{dI&Q%>qU+hwAF|GOJi5oLwR_5NasEnJxw||vGm`cSu_S;1U zl72JyyKm~hohkqLAj`2EGxpcX@O=34HvPwR`_HR?JgEP3_s2H=I_`VFg!>PClmU$$ ziG8q@-zUG|tJ^P~Z-?r=MRv&CwzZc|*=6^r_{h}w-s-;<1_vt)ZoV?+Z2s`n^23Zb z&2Jumk`mfjcVk&^|KC6BA1B-Yf9>%!=*O@3KcZ?Lm)FVKeUOdscJZm@Zj!MQe0afJ z^kn2R-l>j;XSU_sShjWZ`6c(|76f#LT_~CpIc1kg(5A(UT*{O0)W<1=H>tnUP=8kzk+CjVYxx8lKV`yXdl*se?bzgFv;Tv++GX`pp1 zlPlgmllgUXXY9tX7Nh6wFK+PN`kMDz_1z!l9KGoG zc}1&_VsDIL^~zN@O>|0L#V#wpXTV|jrf-67iiDEY_fy)-UYGwi)UMJ>c5>R zzevaFa_Eg^!n^Alrmmk@^@I5hXob%D`Y(?)u6AvgxQ`bl_?*$sG!7~io%;J}YheGX zl`Cx5JbH5X*QK)6iRCRH6PO|=Dy|l)(QimTDu2W91VN-`cs!Y>kVR zp|D5gTCUrlZFqJo_iT%p>hrCz_^q-FM{>@**9A36ob%wrOTkS?c|v?$ zkH0)noZeO0e6FGL&)W}uOW&VdD9o^7>IxkmXNhFxZEv2cJ@^s1KQDyqvrqT#(o2z5 zu@Bfc@Ms5JP<~Z;gBjx4RX=kszBBzT@%7l|6Co2HRBtw0w0g}8 zzvn^4;;*k?ED_xqB(^uKKK<>qH;;e4aeh!4@_u^ZuSFXtem~O}bH)6R7PvI+LI;G5KZNs(7QM_Z(0TKetKu z%}=Ix;&m6@$SUl%+`I)6&-_YUiCjAyvG%^Owo z&&f{x?tNjh)w@|Gyp|7r9WX=mkr|-AOmD1am&y*k2XIt{-Fe*y6F1bBlJr_})&I z=oy86-yFYf)LVQ$)$Ehi%$i^4);%t1^UKk3dTx=oOmeMufQaP2_w%!Bk6-Kw3+qrg z`|{|kq~feYCOR2BFCRIkcPK>U2MW0)mfe?OKVGzLo8u)Rtw}SVWV0Cax!8$1} zBKh?CS+fNV6@M%IjyN{|UzYU#-Tx)J%q}RNR?g2>#(!2?6}s;ImE9|BS2+oY&7U5%tTnOxYi7zMrG;C< z8y3Z_Syn15KG#ir+D6Oth!s!t&TbDg6$qdUc>zFheHlp=M8hR79(fnNgm z#>eeoD0nbIJ8h!wrlnVs{5NfSHov`UUHjv5e?!^$dw1ve_T|W!g-;W|8Z7lq{%vg3 zn#M@$(65fHFKe=t@B6QtvUf{F{EeC2N~eCSE_<}r;D}F{=tcQG!SC124N?V#%&wck zDk9meH6OFZmY)jERbx8R^!na8OAe8R!f*I$d*xFX&We|MI%lG8T0&3ni6)iX8yaP9 zSO4C(KO{r>1M?O?D}f{byw~Ol_SpujM635|bue{ZJ#DFgnT){1VcNTKgZav!l-13EI@5?AY86m+WQ3lXJXy%^0$-ZBXe6NuZ7GC^M zVp`(bTD4iaDKqAX953_{z3HvIcgZoEEzXxipH10fX;}E_4`_Dc*p-&&l?J@r&F=)% z&-*K@w@j>^P@8ke?%cUO`=8x?as9MGPE6HWyFUrrxhyrE)bm_g^i~^vPAV$1<(^w5 zUd^xN9o(|`pv2{iU!vwsUv$!NU9A6FtvtaQYfhXITGA+QFh6!O$iT~XL2f0o{qQYo zD*`}M5_0+NXY-#{o&Q?!>5s_cgFk{4d!AQj%-wP^_shDsl}9C?Ykc?YIbVYVGg$zq5ECaa&aP@Ue^5>e;fXpegEv_I*)L{ogPxmAKCC*x|RhJ#RC= z=ft#Ji)ovMl`Qr>H`YI-cxdV6T}tz3K6SWy|pVgP?n&o|u7c4gcHRk8;dH!o-UCL^o#h?W`PY=wQVZAs*JUy@^SNx$= zEK6F?HMQ%7+yC{bxXxPYWx0tTJk9iR=lKtjx&k5#g?aAOzqfPwxXAMdXnHFBrPJ-q zlEA(3iN6f}+>foT2z&gnB{HtaX2zPYamQ{n7#c26|9Zk>{pA;VPe0G=6}&p>*3NU~ z5^WoJxaX$v&wC7tpEarSPxaY;bnU2_d?ovvV?c|a%Y+jzrqB6#lfU%6W9rKN9g z?@Q{ujRs}Os`BM_#>a~TOj%dv2(4Oo%<8?Vy4tbBFIsOH>Gb@1-GAnlN!143>X%7( zvw6+bLOxloT9)vCt*uH>C%3b;MPKu@3mg7d@c$Be?)uH~+rcFH%jK{m&KhCKEJMCY(|^e?Gn0pe6a%i*3I) zJ_(*#{>P?2Xzh+ItliHmrhMbFFwCvszO*w%K1Dw8+sBtR;_G5>R{mCK_q$Wkey-8^ zXB?;d`#CzDW;t{0);B+|Jh6)Beze}J!r1Pw_YS|h6DH3mb7`l^m6o<&-EJvQ>m}M= zZ2dK(Z`p-OQd6csZ`=0tz?>-Ux$OG&_H(?Kd}88v6xjB!#<p(%dU$|; zT?$v!oX8hziZ_Cazh@tH~}clUZJU9vQL`zAz9 za`p5d+mu$nnY^0Cu|b0qxWBM!|y_TNzF)6yC1w)bBBsEfKVNdGY(1+Nt7t z*TmO>HmUjUI9K)Z>W)^=)4!@B7wx?im-xa!HH+!Z$o^VFx`v0D3hv%dgCz(JiRhey56((L%&=&u_QvERJ z&EvXFk9S7g`ZRkJ|2t{l2i`gFSE_!EVC?~Q4P76wzu3<9Vmn*-r@AJI^Iu#Fjo${W zd%W=9qRyb)I;%USFQ{)pZny8{l;+k-nZxjUbWxe-;tQ@{n{DSOR#g=?^ScY{q?R1D%<96 z+xw8~w*il#tnc)&d+RQ}Q$1=UKK;qtKP9M9qUr z*1UB&IxSOqqL)GJYpZut^Izocs(r)s`UN+`X1V_>nobyZU1jQ9t{xq$-nTky&1?3# zimor8T#W*{w%#Pu`j>aE&yaXwQnm5QOA%kUja3^L zXu5C|CmHPxyHmE_eDz`3(+5*bT#aO9W&7DDul0O+PHUs}ihKI{w*K-Z?FP$V>tC8( zU=W@tzy0XU^{e#@(q0z^m{hLj`&-M-W+(eO-*5i)iTcl<^{x0?E5G)#nPo|n(iiRC zE63URjvmLd5hVTH~riBVwudDZEqi&ZFtxA zxmW&}U!lo~HDAj2hROdelaF$0o_FOzrQNc{nlZ-@H-EpY-0nBQ+5Z38Vwo*VxO}fa zu+m$WoSZE*l{QS%5_@>UX^#}ORDYu7wTQsetLtybe ziND_-cwIWO@A=}=J8b8R*DpPEw>Oo|>{WtUg8Xd1-|wYnUlH%P9lJ5hybZK|T5{j> zgB$O(W}jVt=#`Y@%A0~`)y!5rxzH(n-sa`?M{y4?F$Jx7@^F`&RQuVrOS{8C712ot zFVOz3UdQx(JWrS1+S{byvizd+e%m>&uQ#zApO?8a-aSQ<xDw(Z^FVd$0HYX7~Gd4_vPQ)*$xS zRN-ZKQeI2lf7{<4sgsJuvpt0h-`j4TJCprvq0AMD;#<>WrT71@{P}g?`}1A9tCVL1 ze?Fw7rY%&oR7dOk=^ND{t_x?STUGCW$(I&=&L;ef-kq2^OaEH_d-eHDlZJzTrbp`J z&4O#QU-Ylv^f0F7dDV;UH(Qoe^~SA9-WjyEBWY{F$`^gi?I~7`e~(vBU()~oiFmt$ zhLgJ4!wd1nCP()=Ejeew&bRchlHWbsz2B;*r)XYN+POyJ#j0C-^Sn)Vaxg$&0;~MC)GR)!c zgQ;IOst5R6y1qE#rd-nZc*2yPc5mUZ;Tdg+c{U%gOST+jF5m#!~+r(0&6|9r0fl*>k) zTQ|yfUti}odG#i4CbQcY*2c5oz&c$#vNTx0PWI>!!5MyRdvA)E576$mYg~@ z$~`_|uHLjAd*7~KFJJ%4xE9nzmhQO_s~-2{(c6v{$2VBF%)2tp&+7A@n<{IK<#kUA zrIcRtOO8I*8n!KWYjv*CED=?~qkEZ5V(0EId^x8qG5Yq^jQv@Rvv*2w(0zGLe{=te z6_YC&#aKHgNt|A{&MQ7)>)D3wpMEL+D)+h8D`T}Wx7|)w^2GETi`kCf>Rl+8$YIid z8@%U!`uVT5_m98qwrWyvFq-VJZ_e%q4NfgHc$U8~{Vl$#(){kbtt*v`97O`ELt=ka zZPH18A1L}&oHuRxxx$7eCpLTK%xh1+>C^XSm+YBkm;V*MQPz5u(wp@-Ph|UA{S8{% zMDsIFy?%Xs`8TdJha*9QheqxHiY9)J>HleC#nHTWUj5w8TN~> zy#8l}(p6sV(*n+Ky`y{i&pT84aX9Nf9GFSD!=*nTS4}!!Y-}F z5!w#Z^p~&jJ?xb389m+5EaA+}3>9O}Wo5G-#WD6Ces<1n@*)+bi7Bu3CZtM61;twZ zGMebOAVmAj-+ip}+*gLRtU2Wqv~{(GM4-^blgkxWbE!nOysju%6S!hAtf+6M8N-Ju>QhzTg$trJp82H&s$X-R4N?y3SqN{oJxR z!Ay14w-sEDJ=6D{3%}7PWD?uDZ)w>cUy+HLQD+uPdB5Uf33S*vtN+fPrJpr3I7=U& zSDxw%I)LfYPLmMdga7Z}D?ffb@P4L!aM`x+S|=xQ>q!_Kljx~!aGukk$g;zM&#CC7 zx3~SLWifgupX!}_zV`{obgz5f%5xnQT9}=T6QY`un++41Gxa8=dfxth?%bJaGk4mD zMP+ZzO)FPDT`{lz!0MZG=gz!eH~;>2+xV_U2?nnci=zxTEb-siezn`_Sln8Ev(s8) zi6@s8=`L13?({lIS>M(~s!>5?mKFcT0GXU+X0L=#aN2H^7uzj)&+hyj(Y7qPU2T6hB#n;iZJ?%uhrp!N4wQe?=K=J#rE?w|e|sMqP?67=EQ&f9JY zw{neAJi}s5%;f{LrU_Vyv>i=rySIWp`NF~&q1Bf;q+P%9@y$x;G}$iS>9Hv{@o7l^ z|Bqa~7fgMm_*N?ZT=BBG?B|>fyQR*ryJl$hMfZ!cn2*AJCHd?v60@qF87FR=AtG(P z)o5$h?ffeXZYvpmP0~B7%#^jKHZ5q|mbU?ttSNqzSZr$bT%VV+#|X4FPY?;4SuXVL z{nuX!#yTmHZPpKRb_C9l`nxK{!GCASyH)0Ul#?!8+^{<*f#=K?6A#9jDSlU1!-~!ERfu#ZW+HfaD4%!){ukSyf{#n2xansyMjIO~N9IhfinqGZa;uN%C)TH^k~Z@shN!3ipy?YHk8G7gw7 z9xhd<=eO;$hO48-nTxgSD<;SEg}?dPv8W@*X!(l>yYt&s_)YIkfBy9ss|^}A{_PW3 zvEqX%v#b1lyH##4q*fidq{-0~kh&mR^7$gK_x_nbA}6UFwJZ#rG~v9Qtfkk|??$5D z+Oxih@vGkwnEdHO?aGLES#z&c1-;^WbLB*5*{+3i_t}-O-3^SC&vMDE@?%qBEO&^M zI&%3r)6KGnxN{OXEbN-}oV|K69|-}>_V z?6qGnqMsbEzx&-ZXV;@Si#L7y;?{i1#3SEKKKR??14^lLRo80$e_s40S#QD93#L9* z@pFZDMQE))^>Q26=dd=H4_!`GH&fOvUG{ZSu-L;ttM4^VJ{J?GJ4KO$X_AJroL9p0 zYtuKrf7cWPHMJ?hi#FXf~(#mQ{y>tB`;Z_-|T5j}aa ztTlF%jXyv z-MsGl`pOql&rG{w1$L>N)DWHeJnVLB<>QAgw;u{0b=sJE`uwF}@yD0VW80@@Pfz^5 zxw`QF+WrUp_kYXh?ELGw=jWxm3idlY9=!S-@PIpEbEV2+%{d!ihSa=~{(oc3uV0(` z<689pzcJqN>t)KezrCT(JTR#A{ zRLQ4FFlrjdw7Bi zr~RKl=MA^jFS_Ub^;Y8d8v-)C*Z1&e%oF11YdQE-%Xrahdxcp{jsm)$tBf5lihK#4 z`nFZbt98<%Z%gAE&OQ<3SDn~(ZBmNf*{0;m89K+juG)GoI3Rwoxan01&)Ey1`a7Q< z>(g&IyJ^FXS>4As?6fiJ{I;;pZGCfnGd9Zx&eAz%884r8S!%D$pUJ*yj{3UHlC08uB9^@^_2Fq3koc6@ zvhLvzXMGp#qD(Qh)tt-B7Je$RS*+o&*Cn(_*zkgtRFyLGT)+0Dg&j=sIWPALvotmy zWt7lmv-xX(TWZqJDS;X35@|`#uT9@j{Mvi&{~IMChq)3xCr#*Bav<$SWc{_DI_>{= ze5>w#|1-t)Ta1#JPs8bt1r={Dyew64aBy?wGnGBBF-z1zfMw6$dDEmhih>T6)mYpJ z{5ShN_m5{^@6W$l?Fibv({wi%x{EcM@{#iuCj9RzpF(n z*PPN2RB1f;lv^vsaN-Q}?-BV40urChd4eaYaOThdJ>$(nRZXD@yR)m$JhymKEaNeW z;p~e5y=ft#mv6^}xgIi5@jUdlT**pse);#n{DfJjruxOpe+>9+>U&uvrcS&k&AD`L z=c109K4-02dB1y(Z0ZQHS(|YyNo(4>%ESaE;id^Crd#D-x`@qe+2y+B~t*5560 zZ+!DVhD;38JA5d^$RU4?kF_?JYk`iv`qamhG!(5R7sc*-#*$P0Oo1E>c+oKirfM@dp_xr2AUi903 zH*0&tdGl`pnX;{oNB@>)_bk%5Arm&^jGN1`#ksegj5~ECn3=u18J%*bxh`{;<-fe~ z-%^oxwx_;1E0^%*GdsP{eV>+T^uGPd#hvpuGAlA1IQcs4fc*>C6rE+S{-*6-X|>dI zlFEml%BRZCE=kLj4K=>mdH(a&-bq&zSN44~iQp;tDKo)^b7h1S>$+(N(zY=PvNZlv zW&B_%cQRv_`uFxlnjVWnrca++mwWcyYV%hQr9WKRYHrxW*W=AT`D%!+gK;G9)oP{F zMWTF`8|=*3QpC7W2LpT9Zb zf^M1jXtrm#A+So8)j4pMI5=32n_TJG88F#3 z;d5n#i{8}3#r=CbzRte>D88;pS#D>p_Pp8$mPfDuocX>+gvHTE%7dx=Zjrp(eHrKf zj~MKJw4VO>I{zQz?)i74KhG1su6Nk{{V%Vt_m%Tyj`7?5-mJx`XO+qEeqWKYjNI=n z8BHD6%l5S%e_zG+>B$!BqNwV-ORwi2`*k+`K+^gO@6H0Q@_!HF-rTO;u=@As_1o*j zPG)e~|NFFl_4>WL25H1M~6A8Wsd|Mz#E!`I(u-dw%r z@zYhJ*{#W*#|J~6(_wuWI%(m1pgx~w|T_WZhf0Kg3G}oN_pP1hLKRRvM z$_2dQb347)?Ojk6?=k7ni`mIHejQJr(78Qdc8=1P&3YEH_4S8cuf9HWWOK!@d$|@j zmax9{w%;izbNcZ#{X1N%4>PSk%+!6CscX?kefxhrDUoeD;bva<_kL8j*pt6!SLDt| zliweGDIFfltb~_(ZT(c==WtjhQ8%HzBpe&(67nRAY#K7`PF7~T4H7${nj48;^V3N-#>nTFy*WE z$3MyXN`jsX>kApubE10v>wjDQd3U@1i1+zDmp=a8xN}YETKnL~f%ZRIwKrt_^|IOj zRrQFo=NH{Ck9&Mqe_T0x-BITKRU(Ji%jNBVx!7ZZO6PvN9n1%tr~XzrX%u(!qubfS z##XzUSN7|jGfbM=>$i*c%sZI*d|p$req{f`r`#W!&;MO>?nC{D&*2GwpKZPI{gb23 z_aEIS(k<8g+dX;XL)+H{XT#SWlfA!p`KzC1PCG-|G`e=YY3u&5uHHhNbzeied<9=; zfzaP><{e+!xL=!PUw$um_QD7LU#pJJ4|e>N%WuoyD5{lP*U8hQJoUBNEZ!fV{PSDx z<{myF-M+E@yJLZ++&@M6YdJBk{xz?q{=B)Lx7xBl|3LTE=X07~M97@C`(Y!|%%^=# z=jg4^VTbKs9PQutgL{hi&si@Tf_OQ)@2<&uFzJ>_$KBNR+dka=@U{NPyY%mm=FPX^ zn6)f%i^Rg&J{PBSKlNJu)a3WXZ7)rd*9h)vTgSQA^~BvIV{@5wF9DV}deUdigck{a zv<&)floYF%(DQvK1K?(>IkzK?9bd;Z zPwu9zwbtAAH2B{wkzKdvqmj%F<4YU<_A782RI&BMnOiEZUXgWpYth@Hn&Zs*^<`r-GrTK=X3()w?XueOfMuR7CZ>b>!6fBiw{{gr#9 zj@A7+x4iId`1)g->2o`{?F!`N_C8+u>SOwzV$*B+aor%}cGrJ-{_1u6ci)7P`xbUT zcAoxt@3sDc-23~agLZy2-MrIAY`x5(W#8vF``C0x|ND7uR{Gw@7h``cpS?c+;nP=A zWkq{7zFwPE;?Ty^wJbnyYT?E9`@Fkvx2gaCq9ga?>SEJ}zwG}PakEYPvQR_B(f{`u zSMBx(@UqlayJc?Y zOwGlhEcm2U`{S9~+Z)P{PrRsY<;K3-J3QH5EN`mdr89-$7g|zHOhl(H)Y$Ykr)bu) zhrt0KO1BvNx@J-L_5ZsA*X>G-xBdC&`Js|A+icyT-upi@?w0KEvU0pxx@C5$ZR^w3 z{tXA$9ACHm`<0273@vU-376gX=vEs2`uHG!`?b)Q@^`8^`tScV@exxFn_pZc+h}D| zrW0e=@voJ!f+_C{?@z-mHH>!{r$2iB`NaGAD-??vBx;L!qVwvxs+#w$jX1L<|H`(% znr0IZ9NvF7%DL#M6K8qNcR7w2Mrl2(&Ch-m>qYW!)OmD%|Bax}Rd%zFAKcr%;d%c0 zgTe)e%^&3LI(K;^&$YSrRvb+S_S)C)$a`E?@LuuH(|>P$%{8YmHA*qLl-91X{4Vn3 zl8)TJyVrKzv7Y{TWBvJpx$H9hsvBxgb8nrUx3EWdyKQIC%AV5qc6;@jma%PKxhT!R zuv9vw*|VS9{)=8r<>RFrs&jnby2m?R=-KG@LTcBy3$x!`tL3iga;n_Y7dGXv^{f+1 zBSGDRn#YI#w?5q4{@`Wt!{Gmwxx6ngXsMaLl$g7y>&pQrc@@uNM+zcBx1>DzdaUx! z_40k8U*9Yj_DxtQ@8|#bh&2;S4xcug*mq5(#bwXGYTP-IP?UU$tNor#wuJ48bjzN7 zrfkcv^F2-pwQ>}Yh`7{#B4W+Lx_X-_2VTrhp8Ebq{C`<)C&r5(HButo{y$d8jAIA8a%F( zjqG>UW-ELfzW&%P-{n^g&QJN*}biv zZ)s4ePWtA|xHnH;Ul#o$6KBnn%VLrt%j;k zb=CC=Q~t4sVUm(|)mJvQ<@3w4n3ENhl0uhd=rDEG&6r_b-5nmzr|zxbS$cIk_cc1&d5D|yoEwZ@D!Y6ewoYTbgz zg-x8U2jp&FsT#WIrO%UNa-6(PD!Y{8CaFC9Vwq4Hk!9m6X>{o$k5Olizly=nJq>%$ z@9pfJo_pZJrbexWtN&)0-dCM}R$0>X@Y7iQ>%aT9#0*d0Egr(kHg_ z`ihJlHDaldCR-fP7__lxFg+Tl2^$VYgr3CMswn%gBHFv$EhhA;C zwq@TgxkeaNM~A&_*N%Io)$Vsugt>V#69a?D zAJ82EOwRvi{eJMps=&rkxrCS3_DkQJjd$+$Z>&#TkSH;mfpPh9#>GcFK4dIWPci&+ zOT#Q~+rnF$SVC@{xU%4Y_=0f3qcbjfn@9Uzkd~Yv(z+<1_%N7>-T z>SxE_%0>I1*rSwkSb6?g<@paM_&%NBz4^q_8>jv+FM1HksGueHQ*!pT2Xm*-zx&M2 ztKx6#--^`V*{18)%cNagxxr}h^@a6?^H<$(a(f}wr|dLc@#Lf={k^vth2}M^&h@*M zaN+R7t;$!K8>g-eh)IfC7`1XqT2hST#G=r$O-ePZ82oj*r+&!qcQKygG4Gs7&0U8F zEF#=Tmp#`N>Ds)=Q-7N4hM6`we%{yTPwh*8Aphl1jqeTHnj(BjqYv5Mv7Hq#SbKH4w7S&dqIXk{!NTS(|6tq(rvWU%36@!pigUHJ1e9 z=3Z>S%e_TfHL|>BCn?CeCe&e4)*qX?$;PZBp)@dP=nGaaLw_Uwb-KO~N#>rg;diy_n z+@7VQEanw5FbXC4BxxhZ6^1M6Xo;juUc=&I_%XW&yn<`SJ_GPpmU`_bqPw;)dYW9MljXgJ9nC>x}{}N|^)pvLMZ-pXFvG+UPyx)-VG~w?3>FX^Sz5QeF zeB2vseQ1-ovVQ8$pvwYMyvbkI8uq-C2DMmy7CoBCrmh;|Z<*b?=+v*awoVmC0hitx z7vtaE=ZlIv7z}`=+Xj|BRXNz3(5pU%zX;nt1T0`1;k+i|;y3 zO5uoMjOm+S?0WpADX4q!V72m&zt-iC|3z;%QT?p>``{ES@5>VXn-7_vb-sQ<=q#JA z$E2PU6(ajs_pMUNyxYGqz@pEy8cm%K1@7J0D!+T)E#5}$2lwXN_w?7i^s0Hs zJ|EOvJbc7Mq9?AsRhw;N##4ndyN^Ye!!%Vdip~=jaSifXD)hs~{`Kq3iua0p{vEQL zQ}V3nPR;x427A5>OqwV%Z^!TTYnA00&X^g;*s1H78GCG66tKel#YFGT6}8vxa`wK~ z2aO$m_ia|EC;P4r$sH-4=fEnMv;V;mZ-53q{ZEtB{>Gzl`bITRRT3$?fF_VtM`d@B6HK zb#cve?MV|uN|k?qct7vJk4DZ4_B|KOJumufmw!F~Y~q&Y;#U&BiGIo@yzVyV#3oPv zv8Uni@8b{TKRD%IX;$bw^`JFKGNZMJ3&=i9e;ehJC__?mn|Eqm&NAA>tdb?g*2=V~cvZYvx7@%` zh-vNegK3{iADfrw-|qhZ@6-B%gY4&=6Hc@no6TjDU3_@m@-k+IxSA^dNfSlZ{dl4p zQTQup&XzpZlt@rGf(9Mz|NdxvmG0ZqVz^<+`b@zPyJ*Q)Njcj|S{>~|5)pT!~ncjGSaxXb@rkLe)a(*rdtgX1USA7L1(%LJu!?EK2{f`u`5*+3PIWLG9y5lf{y5 zzEZ8oeIDJ>KFLFU(}`t8rH2D-YV#u0OCKaJR1sV9`9TCDi{pW3TMlIyCY*lj|LE-W zZ{TEnrhIPL+T9aeIP>?`Fx3AzxYzgk<14==s7l_JtCQ>W;Clc6i)zH?!cf&s213VT zx8LcvJ^$|L%JlgmT7?J7ZUE?KU_&o&)QF$~Gl=UAW-VmAHqTlV@B90sq>Yff{0Q6e>! zkwNi%Sbb+(GTZ$>H_AU=%S#Ow)atXkczK)34zi5ktK*ATR04piig%-;de;;_N*z*2u@L#*>=WlK)H8yy1c=^7{=4T7DE$S|; z`oHzu<;mLr;`9$bubkqg`l95mbGnUs$jLj;wj6p|e2pVQK;eLa)s9-f8Ef5KjwN?R zt?etF!ll~ccGw`&_k#2nQQhxBlC1k0YWiN!G&r9#vE%mpkZnJWr4u(vh>9j=y>>oo ztiZWr&$%wPBU^rl>UDd#1@pRZ`}W6r#*)6b)6b?}U3JIQ={keS`Gx02Q&tM`@#*B; zty1z7S|lvG)Oc?o|MdGeKUFkeWY~VcHNv2-C;IkE>8o{{r=BnJJ^ZX|k1=zwrq!H~ zNNp}w*JR_}y?QGqhF+chC6{yW_1Dc8Ungvvc~C-Pf=K700GCGXhPlj(7MGfQVPms$ z0}Vqr1%%x7yT&EryD)#@{)cU|mTCU@WqV>KZ%4b(=Bl~rdnX@%MTg8Iw;y==>BN@I+pk&NHZ#t%E1x@WuSS=L%Ou%+p(zfz`g`LJe%u=) z&(|-@*T47KXC5}&2OAE(+Mpojb;c`W)*_D`OnMP%Cw85hFwuLX$FU&W&OH^s?&K~` z4%^Mj6h1?=w=wHW>-!qt=a+Oinlg5GUgn5BeEYVw|C#wViw_gPL_A~k>GmVA|5lJqiiXI$V?r}*8Et9RPT$XU;s_w3U`w#kf*iuP)5 zO}4(-0Vbi6D=shCKg(gM$Attlg%XV`p)5yJ49#TNZ*%1B7yg-3cP*v%`<+Lx{kt#Un$j46_=3p*ACgrsn!c(Tnt>CeZU z`Do$FDf+q3FUsojui5#qdj%Zwd0ekzAf&buq@KY#by2(H5~9=!Rqr%LqJKb6RtOYNeqetPa+ zm;GC@>(QF!pead%dd|Jae->{(%d-7`XnN17r$&z!y7)WY&$4X^J1(!wzechrjakR6 z`1WHCfe&AH8XC&Hc~w)keecR+2hM!9+{4$x?_O1RHYt*2`g76Bu1PA5*~0(cU;VY= z#@VjJ+r@V8OmE3EcqLkWHmsd>rpvNqR)@V=FB8(Pan%0wkh>}NONdYU zH_NzcbIn*}i%AE!k$SoqCB+d81AlfF?$sm9_`iPKCK&yIHCuC7g0TkWpA zYX0u!KPPZy&9Rb=7lURe&(nQ>C*jKDf-=|JkI#e|_h^~zm0Fm6!R8C!gAZ0B6O}y$ zHtc>IJ6~VU%VE;(>XMr&dG{(4=1z*!?^|EH-fF6y=d`N0So_I3P3?y|+J#S~-Z*t& zx=nwGO>gH!fuhVZzw7O{J}%Gd&u82E@Uz=xA<4abe(Rb4Im-VMV|~E4Luy&k4xQx{ zS9GU8Pk;N-(JNPJEB!gFL(M^k`{-eEJ|rGDR6T;VCpc-koG!&dS8_3s_2kzrSpj%}`) zYnbO};dJ?IQ;^YFwao^%eY(yqSDR%lZ^gbVR(_`l_v*u|G+5?!Y|-n;-eGrV>eoO| zRhddXCiMjY8d_fa3v|LCFDwswaxyJKz{S;R>&5pwA~cl5yw1!jw@bC3Cikq+;owIW z#|8zCj8#uT>nxPNyjyP5nJPF*r%`3f#HyVti^BK222NQeJnzb)aJd;r^YXM(f+m`l zI_9T{oc*B3;hHje=dxQ@f+swACO28iD74DXY&QG!U^PAC`Bv<^BH_K!Y{|2p>PEV| z&2O#c&!5lkwt3+$J5WPL!u|iEebZW77HKHit=+V5w%P8OT}tbcH_l#Y{>st+TY>lw zrW-zWVJC}E)fKR%esgYHGqF-Q!}81HxfjwaVy8}6@N2@3Sp_+XVpTJ(9rcbbiU|3( zcXnmMmcAzS3vpA=ByB#B5_+v`O4rhf*@1slyOb6Q7f$JVx-8|^o8LYYH67)CRvXQ7 zQks-A!+UC~dJO6QAK_LSH(pNJ3BE{TXu57^RrV{$5kX4 zx7TlJy8WJM`s{!&dmk-i`DDo#wtMNSs!$yf#Sg40k7l+l{FZ041ynZoHD63=xL4tF zdhU7dRZfrHSC?0Z?ftW<<3&YI(1#SQ*1({W_+63mN1c{>T*xqMn0cj0-&afBEUJI5 zNaZxHrR(1FyG|_lIoDuT@74PgHM$;rwwW|>$|9*rK1SWGT#HRNFO66sxT`H$YGuSS zqlv2;{~0neSA#PgcJ9_2mQamG6DQBCOqKnHJydc;T|@pRIf_HO3CA2lBjcz9J_>vDMdIbHjy zf&7Ut852&`9E(}kA179+waaW$%l7-1Kg|plVa?yqE_`_5wzq{fHa#Imcdyi?Op09c zSTf@RN363lzwNxhCl>`39>jyD30FKV+{ClwvE+uCHKslsk#3FpP0w2@=l_0nggLnT zrp~jO{3%w~mwYO7Hh;bNdT!a<2On;UZk=$^gm?M%K9|{#jCU=FW>)FEW7b0HK6PGOrQTi0obTX;sU{1rm z0}j))7E4)93!ih`$My1t8)tHRr}9V|PW@iJuR3F`$I{#Pa&v1-+VZ+>uG*wWP7@9P z;G8$#Z$m+pN33!Q@7&7b7{-|{VH*$4R`D!0vMW)OU=9xaX=E_LC3Dl%u5i`mw>U(6 z56TuCv~f2PgOyHcYxSati}T;5nQf|X-2U>0ClhGi$79lpz(-l7`N!IuKYXix#S^3d{J?p0 zBimU^7Omx1o&Dja?x!=)EsnOFOS`?A=h$4I^ZTS-137qpKKORN{-Y9TI??~dVnG-6 zB#9`q8`r$2t8iZI{4u9)|A7VkY>OAZ?7w>byz&XgxP&sxt-Z7(zNbd8puyS_gzF^jKZ z;n}@HElo;>D^-(aoc7*$BY2=m_*dxJ=@&R+4{!8+(SB$`s)CJ}Yr=)=B_F*fwS0&u z@!LB2tzL9+vaPJ&d}f)`tJSnt-(B=0qWkWmQ`JJJll*NHAT1|xr|Bx3Co@*1ntq7c z@=%sH z1_lPs0*}aI1_q^BAk4V$?r$vy1_sFz*NBqf{Irtt#G+J&^73-M%)IR4hd&)R0+-+r%d|G@;dZKZ-rPKZ7NPI6pnVEq!zgI^$v^rxWhj`-D6+x)Z~eYWw@>T^*(CzD>wB%qYTYONMFJactgN2b z-o5$RrEE^73FnqCJYJ&F#dH2^!c4P!|KGL$_!z&xeyg5TzmL+7nOpu|4Chl=o$`sr z(Z(;MT=`u~Vm-_C(m*S%bGfn7{X8*q;&k@5$z2V!(u(~x>Rcrq} zsd8qX|K~|@&8Nxd)30?|R4guf`eJ$JZx^e53*S#t;CS>;AVbb-qi5Z>bM8O3*8hq2 zzV4D_wdkXUiffbUHUp`ihgR<{tq%-gZI556)BAyOLFq-u{df6G&(C!FwdupV(@c9V z1vb9!Xi(rt3SYo6cSmv0M9$=twqLV8c^Y1r$?ULg#<3OVP0uUuTz_Y>>xId#A1}-8 zcU1ZIXIWHz{t(4@?_)Us%Jg{(9dlb{tTujLv5PD6nQTHGebh3Zq3Jo#x)-gZq{F~%e7+8ly!4Y+gJXUSQ%5aH-CZx zM-uY{XZ5mq5hu2p=x(y;>QhbD2r0UL>E$F9$1aZx{aq6L$5+fZdse6WS@K-`m4bhZ z+TQ^ z|M%&5`1<3MH+r(vtM(PQG%pvOv{RKsN#x0e&fY_RJjIuYT@>(jIZ)H~@j^rHE$#Tr zr8W}D!h(GzTc20IFst4k$6w92zQyPB@yUiN#hw~nJdOenD&=$zyKTPJ@?QTvkL)-1 zA3yo+51y~DaDMi!_tev!e+2LSSU>;KkG0P0<}*49{08O3#WR+*E|0g~8CEjw5Vew$SywE`D!6p9(yp~~R=s&YUK_QA&!4Xpe^O~$&s{6-@>ub$;a^*yKR%+b{F$B}Pa>fvoN@6PYtAQqOg_WXZ1B z#pN5WAAI|ole^tf8Oel%7}vtdUk^Tie$i!$Hmjb4!^<5l*W>3D)qYdjbyhCL)y<~# zZ{sneoIQWOn8wxo;<}s0e>aVPlFFh#OKM8h>Q#$pd#)+vXK{R^2a3uhp6S+3j7(hY zm2+&@ulpmp@BLw!*~Q)W#STgsyx^Jmq#$G7`^B{vIb)`u`ef}MIZffDkj?b?gL!gi zv$&hz3ET`~>ssX?!un$#|Lvj+Yqma!v%66-uYYs;bBpS-zW0A`?hcQiueqe~(>K9+ zb#GbzU)A5=ddgGsW)fSIhh}wC#fu5f>Sm`hHrP0^7v!&e5Vn`sb*f;etJu24ghuD2 zWg2sg?=3$f6!^uuIUwGc|MZ4{+Q8_S*~^W#>)X|}&aZv1%+Rn%TSHbf&`xtvQK?xx z&)>g-EQR|)rgjNVC}LN8{_?x)+pnxiof?~#o-wtIWMjKs6i{D#P}a3w*X8z7vn@9} z?ik9>sVi)|tbcA_i~`fopl_=_tSbp|c)6pa#IBUT+*^Q!9~4qXd>%WQg`Zc>?_o>s zVN3Sd#1b0*aHpKiX~!D}o7X*dy85Gi>zb&C`+1K!GtaE4`p6`o5q3Kx?DmfjzvT~a z%b8=lUTLCdO{LoZZ-(>sl(w9@Yy^sVJ_o+JH#FGVFGqcssSK`Icf53ex4|*B?at{5 z8+fz}=4xWWjc3~YBF%HBEoE%Und1!XCdSninHnRmo?&vfm7 zr6Kn$f91`c>$-2f=C;V*vPXAO?M26RQ+Q*ZSKhl6=6t;D!=J~~EB<{v4Jk|%%1t*s zJG=iYo8LXFMJG#GHoCHGTPx6T!`kNh;s5`>|G#<3wD0YMFE=f}o4N+JtXdrqBH8!! zz@|6arn_Pt!k!#pGD^-_^ljC?4}X0OdrQhb-ZWu$UVZJ}spf!}D>j6v-%qz&rJt4k z^@4xpr*DRfI$xwdjQzN&d|%HY$GqjQxH%pzbP}}MXt-;woy_spMQ6;lPj3mRJ{s<* z$HBDesEN?bBU|TXv$e&o?$6u2eQQaHM9lG{H$Q6`wVDXM{Bbq%)0PwKV)GBn==*KW z-qjUSR(VCs!C~E;qZJuBe|9XYyX9ab>AY^v-ZH*(2NL>puf)gaym?;pZBN%HPtIp2 z_K2PB-qi8PQSN3C+sqoNaP=CnIm*D z<;$s!*4vsL%R3VL{r`oCxQ5J|wotFLO82tc*VJ6~IlpweRyj;ky|Ik<{&(i<)BCzR z^fDLEK57!4AO6@;faQguY~RxZPeV>cv&Q{CF?I9xb5H&6Svfs4@Hg7dvXPFVOu`+hzOWc<{$M!@ln@Rx9hoSx6T zF8!;PDNXDuUhA7C^kO@Ebg$a>&NUtj-F5|~aCuDXc=cIo)%pEfOdUlgtbel3rBF*< zb&9`Nhw5S98_FH+e3m6i$vKA>W?y{J^-+_FC1cmFz;-=tqeYz>Cb6v=of~|mmnG(^ z7Jao9^NPRsxoq*>_jaAl5S?%k{gYDR>wKYqDT3iFr|BD_R+-4pWl8g=t*0<_u?WGa7ACPRXca) zr+!w`BZ5aaSi5Y#wP#uC`d3QJ6#{B!Sy8VLEAO1-!8&`vhjV8-&3SEyAM{SSeAU&d=bdI zN$GH@ZA3En-L!Ju-ydYeIRd>4F5Bf?KBjM1(-&X!Y?> zcM{mmWLc7=Y?7_JWRs_gF{jBY-=1HqE#*)1gaz;3SNC^CXkcne*UST@t5zuldldU7 zJzjeKm7-KXo7nN*_T+bZjlb2T`WF<;*uU(i{%NC<*y!7KJsWqH>^Qgft4+`mJLk8d zvRlJT_xxTfAGdd&$MM1<&92Yi^!Ik2^5p#4EOYXXkTobcl}*mgW>A|L`Efym)$Rio z0{`yZl!@M;JKHzz(B?}*~v~W4swAsaKUts$=iGsqi#v0ZA1>1gQ7&vXdcJD@d zp0Mqzg%u$Y5#k%x)qb&NUh+9}-TmqBe@pO&)pJOdwEuX)F26YT{e$Myn=3sh23YC% zv|XDsC7?3M<>d+%TbH-&jyc>#FOIln%-g>1Z}~%o{_y#8+x+~Ek6p0HfA}D?GBb4h z`5KeeXQ#gVs+M>z6;!%tN(cJQeq<$=wf=Ps8|eo$c|%Kf7;zWeQ;Qcz$_>jpo9d zAQ!dy$1cuhKM`K^y57RE1=PQTBE}wO-TFe;@i`DU#+&{ntCV3GxYYRix&9@ zH<}mM>9tRhoth$fqiNf(4dzESY~QtK^(sw|=fM}gyxh5!`}Bs3+20c+Z|kq!{skbcE2#I?oeA~ ze8|GxqVl&ydw$4@^m#X=QX-GI?T}o^?4Yu2y^cY$q}aK6;ey_73tvi!gtp~cZ{U%B ze6V71Yv#76EmF-{(YwQQ=bciUsJUdlrA6d4MfDUHVZkp^f0r_cnKi1kT1Uqnw`04j z=+&M#b5l$6@~PVF z_J7q+-VvG&3Lvw6&(GV2PrKIRB9Scd%`IA=Z8J}IwR5RVdit^bew}JcC-gL52`ebf z^*&g7XRY6^*}lG?H>|7uF|Yrc>=m(yWk=s$P?!4GE&s#j`r+65ejk5z2S4!NU;njg z-IRkTqbI-mmFX>e@{UlVV!PiO-_`fp-rw!(m?PVh^4#zR-$ak&I~RS4ojgm_mGP(1 z{m9&HGdN8jsLtzg?9K`(72Wszuvu=;uf?rjnYT&4lSsNC*%DPBZ?Zbq<#C|i^IN%k z@{@OWgzaq(+uJ<<&)L$Mw{MpGy}W+zgAdwMHmQp_Pjg)3o9wqsmcdOs#BhC=0!Kip z=pu~+M!7%YJ|s-h>@hT1r8~vHYr>JE&tLBKlYeY|!HU0mRrZ}v8y9IP30*aOqkq2Q zL|2cKD*IoztF_EwiG98`zb>Eu_|o5gf0gefRhfN(GcA6tkL`NAr?w|!&i<+W z6?-N)t6xjI_jBj#9TKb-eZC4Og+4viQTljd>)C7Da!j&y-z6E`-ctB&O;?R&b++A( z=am`PZfS?k&X?9bRR4`XChUv;&%GRr8a{buKIDjDWHOrWWMMw{y2;Y{KI%;GlW)l1 z?ff)%)oKlS@%6S}Qn)35Wa`H!wX zU;g9V{5{2As~#%!umAt7R^c@e+)$3o^)~^%07+|G$rgv4Suj^A! z$+uPPwdby^dtS9-zL|oT(v}W3Pocz_W^;5yw%nIyJXpMKM&ye#>7LJnCHQ-z{dU$~ zY?Qk=O)lP|uQ{ytcl!O#5}BPvWqBdGTufY3Wfm36il^7S?cbL9`0DfJ0U?qbQ+PJ% zB-)rH^z`&@Ili{}^^PZJIE!8!`E?~OF6Qs3@p&3mNHC!(M*uWMoL~D+Wd<&{8s&Ao|ll+DUsA!s1X@^yv%%7RD6qycZcetfDqPWHyR90 z#LLQUDt}kJ{_gz7?#YGDtp;vt^Xh*IUAu88!(iX$46~`ePJvCPds!VFwoP$-d-aj^a?*Gk`d7f2#+_`m;=Jh90%@Hc$rzMFRr;~_eiPT zkKxIMPSc-n{^|$RmkRDFIQ&BKQg@Y0vjT_o+t_%~$ccfKK}|aM|6LY#75w>WiA1i} zQt6iWzca4i(vW$=e7#KS?$X0Kht8xuk9=Qk*K<)twf1_;M*cvNvSW5%RhlOW{yKh6Z1wvV87szyWjq4eA8-DSzjOL|+r(^9mc(_B?$icYoH$$hZ1a)H zhANi|-(~atRxXLQH8@l5!Nc?SokGA7)inv{^tj&maHh)Nkp2B&;<>4!Kc}sEGkJUe zw#w)u%#AWu8^z}T{Zc1Wb;J1AZm+L;%F{ZW`p?K8D4Lw=Wcc}o$*vXq)*P0Q{P5TF z^t|`K4UVb3TCcx@C8Fkhd-7-bnRileM@Gmks!i#Z%zJsKLaXemxV>zLv%r)h^{`{5 zF@GK{7T2!dtKxk@NlV4EDfiX}-FEA@nKNsIZ!#Pxy*oFcoIAMHMv`f9TUV3rVW+oW zpZsv1v~=pe=V5z$KNV^g%+0lyDA~5$iv7*}+LoC&)Epd4vOAFANmb7td7RoSeWVpVJ3ZkPD@pv{+g_w1Q!;?w*VcmI0HdPjQx`2z-0 zeTCol>@p3M@C`5gaqM8+t>a%-v`l|__zUOU`NGo!TKv}d+-R~06q%r%%6y*l@kxoE zg@PJ^xAwg_^j$J&=aV}gIW{tjBeU=CesNsn_Ljz@jqgn*B-U651VtaI$Vm8eR5Hc2 zZIyO-)VtenVOzSFNb2`JoZP$cnuO#L9 zk1hQ2VtecB9p2G*%{*;HAKQJe>-lyu_uGzs&Y1E~)q<{q?)h?gPwP6`*)2O}aiNO0MMYGcM%SWMT3Y_6SL|C+n18E@ zL1Pw|Z@6NIQqJY57bli&zAG+kJ7Zbvv&wAsMV~hu2{r^ZjO}l)+!eX|9;c0R+|rB> z8*jR=zShQ|Ft6`?@0Hs7$B#xbpL@E+VqO(fQoTaE-ZXQys%6uYa(#Ye`UGe7ut!hRmtX%E-O%tT@Z+q-`#Uou zI*PYFGdO0pj$2>bD9PMyv7S?CsLLa(W8P`Ij!)XyYP?A`(B+{5e`xsgzN=qi^aFP4 zazsv?cuH--D^PPOdG`ii>AhwD&z;-b=$T@7e&%_l)00iU8Tr=U-XiGz;cuPX?%IfD zy}vS*KiHMIKJ2@}yCS!j!*{>2!}CSeuS-2eCTcDduZ!J&^KstUm*s5I`gUB_)-jjG z=fCuOzJXoTKy@>xOOoOtKR=d%;{EhkW zt`9!xvt8qgp3OhEbcfbAR*n-QV)jqgIH`y^)_ERp(D3=Sb@9ie`@4M?W}LbtxXnD$ z%;adP&8Ged8X*GiXB_zEa-2QwFTVV$XlbQa?G5QikM?k$pC9jFF4q@W8+zX>JK)Dd zX z==^-;Ik~Uy2FKMFedI8SZB_A}d`;%347jmuZ^^%%MN|CzL$5-8#Tb&encepis~Y;DGx%=277 z>&4dJ2|M<7_OT_;v9;zGIr*}jt$2UkyIZEWFQ;*?4oJIu@XV*QwP#KJ_r&JEKQiM| zs*TC-1&b__#JqM2FZ@x`S7*(9c!Rae>&6pPjgDQ|_hP~ISI*rl0!&5w9v?8udG{~( z_Lhse-zJ>YUmqaX-_zUodtSccJj+3C`*}GOt?yc(Xj-p+94SXr)o(=~+23-z_C`LT%2^ z_7Rm{S9a`9?zaa!ys!xq83#S-o%dd}5myd0*zxDG(jU4|$ShyWL>%Z^s zzrAh`C+Rp|Ru7u7?dgGybJqIqdz5-XHp#|Bpx1rDt5+$rrY9bjm@OS{H2YHa_l2*x z9-Tb;$nfw%j=f<8TH#kkru219$k+JMxu_#TsmsI1{qdfYZ?Cldy}0+}^>>SF16usf zIPuMW@a*{gy8m%@;bAIIPFuPpU2hFiTX~1CZSUEoTf!5gCe}_jITtO#&$HySrp7EL zMkWchq7`@3_?7#dOdSOREKb}ndbYV^y3o?)=g*a!ow}F)I{*~*jWSjTTP@8#e(bm3 z{rUXW649rVFWt$?4HOAn@nnI!smbcotNY4%1BDpb@>X81gp3h(EMkZZeQ?WfMb^s{ zvxA}!I~R4tXf}6mes=2nE?v3RwI{lGjzv6hp5hhy?g-D53!Hj&-_E(0TYX@j;WFW8 zb4|kQP$kiJLnFgmA3akSX(-M0SCr~^*cWo8I7j^01&8G~pU#u66TY9WT`GQN_V>LU zwcJ%-UVpmr#(9$Jl)kP2)2FLmOf+P>y(zH%?u^@>4xl`6Wt&@ppxIr$4yO#kDYHQh zDvp-r9&hX}DoOF}4|3F+-Ll9p=m`_cid9V^W}S!4`L6w|Y*jt;+;h>x+HoE_6m}IH@yztd)OX|J`}r)}LN{ z8&gCU8B~USvEiSVxbW_aHa(_G(|A7Z=+yC^AgZ~+{)e4_tKiY*KS3wMTqg$FoO%4F zvh=BktI)8gDc`WR{##cuC=JBPqGS8;3dh46ML0XylUe6w*(4E4Y16ur8 zKHc=+&#@+ES_&sF`q%D1uv1QV^IL#JKF6)4VJ@JWvB?WDtMWsPOoftqUY_-O zn|mmj(>~QA;{6}X;4=!lo>VLUe(-o%+3(uzPX%|gF1^#a)Zo~M#s5EDUYcET-iVb$ zBc#Zpw(Q*3o7*z=OPMzR=+Tu;-}zx43**Wdp_etUqE1b2OuQhwsQ6;+YN1$x)&mna zZT8__^e$uzP^1Y?V1Ex1s7?=lp5z`xiNgS zSimti;?(o^|CxF}KYi=9(ekKOcR)z%?j2bdWDlj+%znB+x=wGp0*8jZrs8D(`&Ro! z6clFqJ^0Xjsw(sB)Ni+U-(E8N>a|NAca3yo=ESY}+91dosObOg;73*C_`}yKW+=$X zKe^Dk^v~J(b@m0mH#Ym++p_BQju$a3-pN*dn^3ErEI zn0}XHSoBfj%L=yQJ-420`gq|%o_bK76vlw)#Es((|~ zO^LpPT$+09JI{YB{Na}RFe2vvrI{-43qve|9PR`^SUd?H@&1 z%k?Bm9h@kT%+o7-@k-g_r;=JjhkP^ z9^EFh?#$tRw~wzrAAeY4c6jJ#o;O83YYi*&{kAo(x&zMR&pw@-zrWmfqE^SP*W5BT zy3V1`-Oc7bUl^I4o4X_<;?TML`$zVaACuU1R&LkXtI-FVCWuO|T6d^8=7zO_U5VHB zo6Q=X+_$fvuv0s?^V=#uhUpWnxYyW6EKlvLsF~ob{_K-^{U^T_U(cjlREN2m2s+w` zwl7;fA%(N==>eJO7u%|=P3tail#xiDobAy0*uuc=d+?fL-a3-b+h#P{Ty{EoV@dd~ zyD#p{obyIWB01ygEeZZ(9w|a8@{AwsIwm@UBjL`Yuj1(yKX1OCy06T}z(CH&%-oS9 z{$b5@lhwL1`vN0Z{W^N!f=&M2-Oe#?`zARniSGZpOM$~9O{n8YX-NFF@Uj`3ln#I1 z)BA^~=i>C%tQ7gzn@^W{-m!ghp)>l!mwBHzoStoJ@G{x1KGJ!i(M9q7osTUt!fqQl zhsEAk{TNcS&Un6SpvV(#%PaBmI{yRdx z>q2MbiG{+~KgjUw+tqPKPJCbU?`Q3U2)`yLqX4kwwe~;DRCQtCrCw^RWJtlSJSaw%D+SO*me0V|ecGrZ7Gx};&%e^Cxf4153 z>h09I4E%}JOHKQ}{`Bfw9d9$QC-H{#I-NV4e7~Kv1LdZLb|sIx;%k1$h%b+Ki@hlD zDz3a$#oOY~se^0JO6`!DG12qEgG|;%C)R)3s&&$b>FMK3F;i_kCk5DOC{m~S9;fY*p7#bfq~A^DGwzmo(Ea26tlG`}zwHjImvI-pU}0ELc<;z_``<@v z?;i{L(s9i8ztzM(=df!M*^&-g)0=iUEGrgcWV#gHb;@KN?{T!?u#nHWHt}`;s-u$>=V6s}bLS}Z=>U)jS z0Rn05Is0$5Slv>)>Hb@x-S5n%YRk|^=Op=$f!0jy`TA>tHBaf>45g+BBR1dggEefI zHyFI&b6(yiF8HiQoFOFk?kSG|#~DjPDg|8yC+Xz6a-J==y%KjdaK)2nVkdv@>;LA; zemL&K`%9nIZhfj!`H?fH@gRrgtEq32?OxwtUwQ|eTr1wMuVeatEJ5J(7K1mvJNCs* zahcNJy|Fd60so^5 zTum}|ab5qKAUXMdqJ(W@+Sb-)b1i|^rzdyURUeRDIJs6QUH10^4p77V*SyC&wknE?b}zhVS|8YLxYPIqvx~$``k69>ld=8N!<44jBY!+H}UqfZ~c19 zcD+s9tYu!9BQBoqD>6-FI&YP8iB#;n>`7q5Z?G52H_2N$-!HEFGW>;QTl6x4|k8@j=t`T2|c%7vd+3HR_-Ws)7@b8jdrn%3tYF%)%H<& zC*F18yTtXfkJkG?{?1rC@m-I4{`cQ{O2KCeJp1*U4BMVn3bXrbUr+JOHMet@2+r)?`r#P$Tu_vc2h<)E8mA+eV-t)z=@7L7I zZt6dKvwe}4hOD@P_NS>o_|KbIfO`M?j@P{A|93j-T+F1UOQoOtnh6%(ng*&YMEIVG zH%cZK2mP#NUuImlfrLn zekE`%JYi>+EWb%f_saEj{v%=?yBlSG&HJ=`|L6JF^%ihR>*j4b+Gg1H@j`^Q>uyb( z>xVbkAKGyKx@f^(^~L1{WKh6&iW` zFSq{w;eY?nwOiLe*2>p)Wcu$`3)!swV$Q3y1Bb1QRe#^$IW_5Dl~$K>nqvFD_CLSt zf2wbATGgc6R4ygWe7j2VlCz7*(Euftu4OG&)A!|{u)C(bg74u%nf(Ig%uDZl@9EyG z_U~2yzReq7m(I35B6RUU;Jm-*6s9Q65W5KK9KF^(q8)n7{Ybf4}`d@v-Q>^z*Avgco%zPujk^K+<{jy=Qjo#aS3< zI!T?(d30;*myW&=wa$wLJz;D2e*3QAsid@#BLp!o>(e$x95kEu?3(C)?uoN}oxg3g zI+OmP_J7#aKUaVAzj)Yp!|ut2?;W7g{<;7E+zVTGcg?nSiwtd-9sXV;vDh;(NWye= zjApZo)y5BhBW$>SdK~)Mee2YBDeq$wv{ToGPhGB-dEc?T4SB6o4(DYfu2o7ERAvKIuL zbdC==n%C!Rvg+*G`|e7z?%QVUd}?EJ-g))CV;Tv|ewp12|DDjY@Y^q@r;i`yF85=! zGGq?j`JVA^8vp%2$K)S8$dv31smb$S&A_kVJxyrA z=rlzbRq0Qhp~BApafXsZgNpZu+<#LRpQ`lZ^^v);Ep3K=vas;wFvtEZkF@5?H(xq& zJ)T(j{AeP>O?HEot}~Y2m%Q`xx$tgY*BAYB|4wK{pUL^yCzf37 zcZx|Zy*+X9WP`u=7H z9nkWx15}xX@Bih?z%jLsN0>8L=<1)>Cu9rT#ixk7pIn92# zH?1e}hWx_Xi#LDpWIN7qS^QeW^i$YP=7&l*eLvlJd)O$~lN6qih#htw^xfY z{hZgIwpR24^%a&dI|r*OQ~x9A0Egs#4&=CgEtL-*xlTd(ixz2|hWXST`ehwUlg39sf1 zo2se%zRu(?&RH0m-R{M^tFQakYAYAdmQ^bS^tbLZ-&onp&bCTF>qL0b_Af_kpDixF z7`w74Lgc8nqL|#44z@KPEW1_}Z1;J3I&zPkRLsSa?Kj)&7O`8&u(iG8YSK-SfB43^ z|HDuX6H%Gp_d3{(nv|*$CNL=1-|EjF{ z$A5m-;%cuvBD^vBy`jOE+ss?^4{09dT-0#LvF;_CN|zGXRGD)=)#+Uo60>D|b5_m2 zReU)2i{10cx4wt$I6hdFFl1b}F31(1ne=Pgfv)$zGp^p2_;zUNtdn+XEnE5TNwGru z8TLX|Ywh-Z)ZWi~J#L?(*|}LSUQW(R)Lq4x6Li=51z)(8wg2;=fGH0?2Ly^t)J-cW zyv7mpTc9u}{bk6S*=yct91>gH8gu_WkAYOrLU)rDf~86F%XqVM3dMWQI(;)#TvPkO z?gnJ2?yukjD?N}+XJad~XPe!U?y~u!QSVQ~v!!DDF2ygIs#z{dFlO9d{d6-H~Vf|7`w$IlKQi_1`_+oG-?w z>pV&2#CMgbV(~4~vKD>?(-vQUb=WAZdV!G}Tg|cQ`$}cfmH)nb?eOiR>Yi_jQethk zc0c2xfl%=86aW6+{l6B!zjOO}`&;*K?-$npT$foTkEate;3z)N)(N!{~CV2`5XV>{-4kHcVDmG z;8XqjRTMwx^}@i~$oXex_xqLXsy*MHdkeJmbLoNnOYeCUP6~mh%1*uXWQ=BiR-9fG@BeiB`@a^uSN%K9-&{=CTKu?@ zgGoV~E9UxM@zC80ZF>V>bbT-=k&5kUXPY#WWlINFla%ObJyg|O3d$wFp}Dlc^fpg^flzOi0&fAXdmaR zrX5WNGdXiDUzD?D_sWX4d|-X@y*D)?V~s(}6FtS>H$ZDlBTp=}H#j$M?&H`0ADEXN zn(3c8&wS$gCj!0ar%P@1;qLwX?AG(0FKb?1o8iyM6yoc;Z;rEx;L)Rz&DKiYYDykU z9$iqnHMOF{a@&R6uX44ozJtt_1BL2|h4u<@^@UyQ{~x}8B!Tti$=pYkcCVK69+_n5 zA}p9O{qtP)=S|PNf@Yd`9#cN?WIDf0=P{)dVwWX==PWT%Q(f(i(j`s-eLnB>u-fxvM+X=5{XXsF|5R2j$RD0KZ{j_)|mZ}~;`+4B2;8U8<-|L1;;@KPm1*`<#k-PxDoC@?`gUC~RZ zYVB9;&iAu6NH5!;Qaj_J8WT&#EUx12sZSQEEUF2bWzFh8Emee{TjEPwMp$%qZQr6( z8uHT>w736%66)*vb4iQeV)t(wlfNly8}aQgDtOD7^X+r8cOP5F-)5O#e2=X3>fZnV z(Y6Ou8LtIxAA{ALA|M#lJT7{eS!Ze{fzpUxH9= zu}`6pf1cL~NgY)#vAb?u1@Yl6rK~;`*%|L*aWjVkPUvb~}^!Jbc|NOQ8>AZMb*Z80(#loS% zie8WQ=CXj656$1A=eddH_N*`8*lN%BW^uFopZ4A?aKObeH}dI5L!*gLG^&`?{$4y? z=Lecm3DsCtwDgjgS`wFWtdGdifX!#a|H^FYzq_$NBdPBGKb^$qYlQoyi(Xhaq~7?! z|Ns5`M|c0fZ`aPfk*FS$xvNUwcFV*HmY+ppn{2YnCL15Pn9vfoc5}hAZMnBH=9o@g zoub&eeSbW7acy10gL4%I$1*J3avD#Zy!utbdGoD#zvpRmotSD|y!f?aen;6}=KK8j zG7kGFF{|z09{R@lX~((zI=-97^=`O-kog&!c15^fyy(UEGcWbeef<6Z`hNHA7h`|g z^cae1$-Zvw*vI17Aa`|v>lV)=DYrK8SeL9aoYk?YBqHKRosMAhs+AViaj`2T%%pk} zrNn}Es%+_C3k`i>rI&NsZNKpYInP_GwkgVXUQqsQEN%Ds;;OCB>-s0DJbKW3ig)>E z)y@!^s*uA!yQ31ONSkr-eXid9&r+@-;rWJB&nMKzq(A;9xWUT>!|F1+uo zOK*7p=Xm*td-4A`_L<*Y5SHs-l*2BSF7nKnt-W~jRVArUQ}1jw+o5^*AII9N*{3x< zh2qbzTcmYD6RrX{K)5j2*Rm&V27|wrA=+oUIExY5} zpDj7tN{pN4e6H2t+H}+>A+_qp=cv;$Ya`AYy=gu7QY}S(cdEQiq|E)Vikki9eKrUA zEx%Z&-H?8G`~S!49}naIJ-HP*@BQzXx0#<`Z2hevr_-00Ci%53##!ylioQ=L|Cm`Y zbf_m^P?|0n>~K3kNA$7SKaVt_7bd&PjgIfWFSp>noPz*M$0Ugvih-r2E1PcUbcV?6 z4U_MCs}qyV!&@=$_}9&byu}NJIg@V4E6(&~nWxX3BER|0_S!GEYL5hOJaB*Z^U5a| zI2l5o)}{CSO8#@xe1B{F|M-8b`~E+Fe^=|w%K2v3c70nQy{7%GmEJA!y9Y`aSxmgd zbIU`-)p6Sd&OLDw5BVJhoW3&UGaZw-UU*!M)u-X4+nrVC?c3)bO}CSJzWV#Z+tZap zn-zY~IA447c!^hxz-qap0{#457q*{SV0<9{-^KC||E%Q?ZOwC!;Ne*tRsHlujo0RD zZLh1gFZ1;^^yNPLSuNbqPe+nFXZp-ZCyrdqESVlx9{K;XjfiX9${*RcTXd6VuZh>Y zZvCqNqDb@!G2`NBe%a%WkN0fdmiFVy!pXHc{kb>Xci(H&=;Br`Wh;AM_36kv2fkWv zgZU3{o{xXPUjI?~&r$h0>1m0vXEVb>SQlv=`fL-itT$}y){W|K@;0}Byx?FX*}7`A zz|zc#K^B3NHe^MvTBld5uu-@DH&6Mdy6U}qUkj8yeiCc{f-kYh=SZ+«NiHXsC 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 diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index 06c8f6096ef..a2caf9ef1d0 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -256,6 +256,8 @@ From the good side of your shirt, sew down the folded placket by stitching in th To do so, sew exactly on top of your earlier seam. Since you folded the fabric of your placket a bit past this seam, it will get caught at the back, fixing your folded placket in place, and locking the seam allowance inside. +![Stitch in the ditch](9e.png) + ### Step 10: Prepare the buttonhole placket > If you have chosen a grown-on placket, you can skip the first two sub-steps and skip ahead to Understanding a classic buttonhole placket. From 26971c9f98cb1fc6c7c45eb1f6da9d2af80e5436 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Wed, 3 Apr 2024 14:41:55 +0200 Subject: [PATCH 556/795] fix(huey): multiply the ribbing width in the flag message by 2. Fixes #6492 --- designs/huey/src/shared.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designs/huey/src/shared.mjs b/designs/huey/src/shared.mjs index 299826ee8cf..43cbba05e5a 100644 --- a/designs/huey/src/shared.mjs +++ b/designs/huey/src/shared.mjs @@ -117,7 +117,7 @@ export function draftRibbing(part, length) { msg: `huey:cut${capitalize(part.name.split('.')[1])}`, notes: [sa ? 'flag:saIncluded' : 'flag:saExcluded', 'flag:partHiddenByExpand'], replace: { - w: units(height + extraSa), + w: units(2 * height + extraSa), l: units(length + extraSa), }, suggest: { From 51a93cafaf682227398586eb0cad4d05882a0fda Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:28:36 +0100 Subject: [PATCH 557/795] Add Bruce Author --- markdown/org/showcase/bruces-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/en.md b/markdown/org/showcase/bruces-by-paul/en.md index aaf1c2e490a..4665fa9c178 100644 --- a/markdown/org/showcase/bruces-by-paul/en.md +++ b/markdown/org/showcase/bruces-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-12-19" intro: "Bruces by Paul" title: "Bruces by Paul" designs: ["bruce"] +author: 433 --- ![View of the back](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "View of the back") From 2e108815ae238871ce20f699a162e5c980b795b1 Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:29:52 +0100 Subject: [PATCH 558/795] Add Aaron & Bruce Author --- markdown/org/showcase/yoga-set-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/en.md b/markdown/org/showcase/yoga-set-by-paul/en.md index 328ec37fe05..8ade6afb7b1 100644 --- a/markdown/org/showcase/yoga-set-by-paul/en.md +++ b/markdown/org/showcase/yoga-set-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Yoga Outfit by Paul" designs: ["aaron","bruce"] +author: 433 --- From e574ae139d39623f47276cb17afaecc37b58631d Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:30:35 +0100 Subject: [PATCH 559/795] Add Jaeger Author --- markdown/org/showcase/linnen-jaeger-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/en.md b/markdown/org/showcase/linnen-jaeger-by-paul/en.md index aa424c56370..01a23f91956 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/en.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Jaeger by Paul" designs: ["jaeger"] +author: 433 --- From 5c0f11d1eb9c4724d01b04b4aef41db29fff71f8 Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:31:27 +0100 Subject: [PATCH 560/795] Add Huey Author --- markdown/org/showcase/huey-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/en.md b/markdown/org/showcase/huey-by-paul/en.md index cac26d43018..0e3862cdca3 100644 --- a/markdown/org/showcase/huey-by-paul/en.md +++ b/markdown/org/showcase/huey-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Huey by Paul" designs: ["huey"] +author: 433 --- From 6c698516ff08320c6af3fc1aae9ec41bba3ee2f0 Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:32:43 +0100 Subject: [PATCH 561/795] Add Florent, Theo & Wahid Author --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md index ba8fad9f2ef..47d0a50726d 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-01-02" intro: "Outfit - Florent, Theodore & Wahid by Paul" title: "Outfit - Florent, Theodore & Wahid by Paul" designs: ["florent","theo","wahid"] +author: 433 --- ![Outfit by Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Outfit by Paul") From b564c7f0e23532f13d4b1e50060a1eb1e6f56529 Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Wed, 3 Apr 2024 14:33:28 +0100 Subject: [PATCH 562/795] Add Wahid, Theo & Simon Author --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md index 5153ec7f54a..3a5151b3e7c 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-01-02" intro: "Outfit - Simon, Theo & Wahid by Paul" title: "Outfit - Simon, Theo & Wahid by Paul" designs: ["simon","wahid","theo"] +author: 433 --- ![Outfit by Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Outfit by Paul") From bb9b78dda2db3a53b533147fbc03f153db72d896 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Thu, 4 Apr 2024 16:50:57 +0200 Subject: [PATCH 563/795] fix(teagan): Hide sleevecap path from brian --- designs/teagan/src/sleeve.mjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/designs/teagan/src/sleeve.mjs b/designs/teagan/src/sleeve.mjs index 5b8c8bd013d..0d1384c7c47 100644 --- a/designs/teagan/src/sleeve.mjs +++ b/designs/teagan/src/sleeve.mjs @@ -13,6 +13,9 @@ function teaganSleeve({ store, part, }) { + // Hide sleevecap from brian + paths.sleevecap.hide() + const height = points.bicepsRight.x * options.sleeveLength let width = measurements.biceps * (1 + options.bicepsEase) * (1 + options.sleeveEase) if (width > points.bicepsRight.x * 2) width = points.bicepsRight.x * 2 From 27a57cdcf942adb2c5b0e96a2a43e67a11568ad8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:25:04 +0200 Subject: [PATCH 564/795] Update source file en.md skip-build --- markdown/org/docs/designs/cornelius/instructions/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/en.md b/markdown/org/docs/designs/cornelius/instructions/en.md index 4ed08688a0d..c9c3daf9040 100644 --- a/markdown/org/docs/designs/cornelius/instructions/en.md +++ b/markdown/org/docs/designs/cornelius/instructions/en.md @@ -7,7 +7,7 @@ title: "Cornelius cycling breeches: Sewing Instructions" - Press under the seam allowances of the non-notched edges of the pocket facings. - Matching notches, pin the wrong sides of pocket facings to right side of pocket bags, _Edgestitch_ the folded edges to the pocket bags. - _Baste_ the seam allowances of the notched edges of the pocket facings to the pocket bags. -- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. +- With right sides together matching double notches sew the pocket bags to the front and then press to the wrong side. - Fold the pockets in half along the fold line, right sides together. Stitch the bottom of the pocket bag together. - Alternatively you can _French Seam_ the bottom seams of the pocket bags together if you prefer. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 9cda3c0947678cc404bed55071feb8213194f1e4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:26:59 +0200 Subject: [PATCH 565/795] Update source file en.md skip-build --- markdown/org/docs/designs/simon/instructions/en.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index df5dd1dd689..d9b263370b1 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -256,8 +256,6 @@ From the good side of your shirt, sew down the folded placket by stitching in th To do so, sew exactly on top of your earlier seam. Since you folded the fabric of your placket a bit past this seam, it will get caught at the back, fixing your folded placket in place, and locking the seam allowance inside. -![Stitch in the ditch](9e.png) - ### Step 10: Prepare the buttonhole placket > If you have chosen a grown-on placket, you can skip the first two sub-steps and skip ahead to Understanding a classic buttonhole placket. From 9fe36c6a60d6f75061edb70ab77888e205550757 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:29:20 +0200 Subject: [PATCH 566/795] Update source file en.md skip-build --- markdown/org/showcase/bruces-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/bruces-by-paul/en.md b/markdown/org/showcase/bruces-by-paul/en.md index 4665fa9c178..aaf1c2e490a 100644 --- a/markdown/org/showcase/bruces-by-paul/en.md +++ b/markdown/org/showcase/bruces-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-12-19" intro: "Bruces by Paul" title: "Bruces by Paul" designs: ["bruce"] -author: 433 --- ![View of the back](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "View of the back") From 6e430003dfae921df810934acc030a3d05503bdb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:29:37 +0200 Subject: [PATCH 567/795] Update source file en.md skip-build --- markdown/org/showcase/huey-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/huey-by-paul/en.md b/markdown/org/showcase/huey-by-paul/en.md index 0e3862cdca3..cac26d43018 100644 --- a/markdown/org/showcase/huey-by-paul/en.md +++ b/markdown/org/showcase/huey-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Huey by Paul" designs: ["huey"] -author: 433 --- From 9c234491e28eb8cc758a3d384fcc915c290b094d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:29:41 +0200 Subject: [PATCH 568/795] Update source file en.md skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/en.md b/markdown/org/showcase/linnen-jaeger-by-paul/en.md index 01a23f91956..aa424c56370 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/en.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Jaeger by Paul" designs: ["jaeger"] -author: 433 --- From 425859f2a92b90283760490a2a98621a9e5ccdbe Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:29:46 +0200 Subject: [PATCH 569/795] Update source file en.md skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md index 47d0a50726d..ba8fad9f2ef 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-01-02" intro: "Outfit - Florent, Theodore & Wahid by Paul" title: "Outfit - Florent, Theodore & Wahid by Paul" designs: ["florent","theo","wahid"] -author: 433 --- ![Outfit by Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Outfit by Paul") From 5d54a4b46c622b50d2c5e3a1b1d7b77ac6241ae6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:29:47 +0200 Subject: [PATCH 570/795] Update source file en.md skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md index 3a5151b3e7c..5153ec7f54a 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-01-02" intro: "Outfit - Simon, Theo & Wahid by Paul" title: "Outfit - Simon, Theo & Wahid by Paul" designs: ["simon","wahid","theo"] -author: 433 --- ![Outfit by Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Outfit by Paul") From bc51c268b3726b36c5c64cb44be7dc2af660b140 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:30:09 +0200 Subject: [PATCH 571/795] Update source file en.md skip-build --- markdown/org/showcase/yoga-set-by-paul/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/yoga-set-by-paul/en.md b/markdown/org/showcase/yoga-set-by-paul/en.md index 8ade6afb7b1..328ec37fe05 100644 --- a/markdown/org/showcase/yoga-set-by-paul/en.md +++ b/markdown/org/showcase/yoga-set-by-paul/en.md @@ -5,7 +5,6 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Yoga Outfit by Paul" designs: ["aaron","bruce"] -author: 433 --- From 75debfd19fe31380a1024e7711c3a4cd6787ca7e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 18:56:37 +0200 Subject: [PATCH 572/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/cornelius/instructions/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/fr.md b/markdown/org/docs/designs/cornelius/instructions/fr.md index cce5e1d0291..eafa75bad7b 100644 --- a/markdown/org/docs/designs/cornelius/instructions/fr.md +++ b/markdown/org/docs/designs/cornelius/instructions/fr.md @@ -7,7 +7,7 @@ title: "Culotte de cycliste Cornélius : Instructions de couture" - Pliez et repassez les marges de coutures des bords non crantés des parements de poche. - En faisant correspondre les encoches, épinglez l'envers des parements de poche sur l'endroit des sacs de poche, _surpiquez_ les bords pliés sur les sacs de poche. - _Bâtir_ les marges de couture des bords crantés des parements de poche sur les sacs de poche. -- Endroit contre endroit, en faisant correspondre les doubles encoches, coudre les poches sur le devant, puis repasser sur l'envers. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Pliez les poches en deux le long de la ligne de pliage, endroit contre endroit. Coudre le fond du sac de poche ensemble. - Si vous préférez, vous pouvez également faire une _couture anglaise_ pour coudre ensemble le bas des sacs de poches. - _Bâtir_ le haut et le côté du sac de poche aux marges de couture de l'avant en faisant coïncider les crans. From bcd4732837b0e5a8235aa8ab0b7a4c23a512d7d2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:00:34 +0200 Subject: [PATCH 573/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/simon/instructions/fr.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 08bb55bc517..37a8f684746 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -252,6 +252,8 @@ Retourner la pièce sur l'endroit, et fixer la patte repliée en piquant dans la Pour cela, coudre exactement sur votre couture précédente. Comme tu as plié le tissu de ta patte de boutonnage un peu au-delà de cette couture, il sera pris à l'arrière, fixant ta patte de boutonnage pliée en place, et bloquant le surplus de couture à l'intérieur. +![Stitch in the ditch](9e.png) + ### Etape 10: Préparer la patte de boutonnage (côté boutonnières) > Si vous avez choisi une patte intégrée, vous pouvez passer les deux premières sous-étapes et passer à "Replier la patte de boutonnage". From 88cecf43bdf38a31937111bb91d4540380e0968c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:06:08 +0200 Subject: [PATCH 574/795] New translations en.md (French) skip-build --- markdown/org/showcase/bruces-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/fr.md b/markdown/org/showcase/bruces-by-paul/fr.md index f9b21ae9707..18bb6699bf0 100644 --- a/markdown/org/showcase/bruces-by-paul/fr.md +++ b/markdown/org/showcase/bruces-by-paul/fr.md @@ -6,6 +6,7 @@ intro: "Des Bruces faits par Paul" title: "Des Bruces faits par Paul" designs: - "bruce" +author: 433 --- ![Vue du dos](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "Vue du dos") From 54f021603490ad98a53ed69ce0e1d70d81a0728a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:06:23 +0200 Subject: [PATCH 575/795] New translations en.md (French) skip-build --- markdown/org/showcase/huey-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/fr.md b/markdown/org/showcase/huey-by-paul/fr.md index c0983545a58..753b08a89b4 100644 --- a/markdown/org/showcase/huey-by-paul/fr.md +++ b/markdown/org/showcase/huey-by-paul/fr.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Huey par Paul" designs: - "huey" +author: 433 --- From fc3aca8149d963c27c4cac2df92e2e755e8336bc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:06:27 +0200 Subject: [PATCH 576/795] New translations en.md (French) skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/fr.md b/markdown/org/showcase/linnen-jaeger-by-paul/fr.md index 2a95a6e916e..1d9dcd26882 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/fr.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/fr.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Jaeger par Paul" designs: - "jaeger" +author: 433 --- From 183134e0d0b5f3dac8285d5b6bb3a7f6c59d9a60 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:06:32 +0200 Subject: [PATCH 577/795] New translations en.md (French) skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/fr.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/fr.md index 571c1a309b3..65cdee702e1 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/fr.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/fr.md @@ -8,6 +8,7 @@ designs: - "florent" - "theo" - "wahid" +author: 433 --- ![Tenue par Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Tenue par Paul") From dd940574469d081d3bf0ba321f45a942c4977c1c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:06:33 +0200 Subject: [PATCH 578/795] New translations en.md (French) skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/fr.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/fr.md index 6b4c4511a95..13817337bf2 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/fr.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/fr.md @@ -8,6 +8,7 @@ designs: - "simon" - "wahid" - "theo" +author: 433 --- ![Tenue par Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Tenue par Paul") From a7dd8d3f54c02d2f96028bf0dcbe3ddb1476da6c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:07:00 +0200 Subject: [PATCH 579/795] New translations en.md (French) skip-build --- markdown/org/showcase/yoga-set-by-paul/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/fr.md b/markdown/org/showcase/yoga-set-by-paul/fr.md index 67734e67951..227237d8057 100644 --- a/markdown/org/showcase/yoga-set-by-paul/fr.md +++ b/markdown/org/showcase/yoga-set-by-paul/fr.md @@ -7,5 +7,6 @@ title: "Tenue de yoga par Paul" designs: - "aaron" - "bruce" +author: 433 --- From 380e82e2a12843265f0b8e1fd80b7d4e49117b3b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:17:40 +0200 Subject: [PATCH 580/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/designs/cornelius/instructions/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/es.md b/markdown/org/docs/designs/cornelius/instructions/es.md index 14936f1d551..3d23f381585 100644 --- a/markdown/org/docs/designs/cornelius/instructions/es.md +++ b/markdown/org/docs/designs/cornelius/instructions/es.md @@ -7,7 +7,7 @@ title: "Pantalones de ciclista Cornelius: Instrucciones de costura" - Press under the seam allowances of the non-notched edges of the pocket facings. - Haciendo coincidir las muescas, sujeta con alfileres los lados equivocados de los revestimientos de los bolsillos al lado derecho de las bolsas de bolsillo, _Edgestitch_ los bordes doblados a las bolsas de bolsillo. - _Hilvana_ los márgenes de costura de los bordes dentados de las carátulas de los bolsillos a las bolsas de los bolsillos. -- Con los lados derechos juntos haciendo coincidir las muescas dobles, cose las bolsas de bolsillo a la parte delantera y luego presiona hacia el lado equivocado. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Dobla los bolsillos por la mitad siguiendo la línea de pliegue, con los lados derechos juntos. Cose el fondo de la bolsa de bolsillo. - Si lo prefieres, puedes unir las costuras inferiores de las bolsas con la _costura francesa_. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 08f8c48e6bab2e22c0e465a0c4b9f588492c6206 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:21:39 +0200 Subject: [PATCH 581/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/designs/simon/instructions/es.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/es.md b/markdown/org/docs/designs/simon/instructions/es.md index 2b913110261..3752ca72634 100644 --- a/markdown/org/docs/designs/simon/instructions/es.md +++ b/markdown/org/docs/designs/simon/instructions/es.md @@ -252,6 +252,8 @@ Desde el lado bueno de la camiseta, coser la placa plegada cruzando la zanja. Para ello, coser exactamente encima de su costura anterior. Como has doblado la tela de la tapeta un poco más allá de esta costura, se enganchará en la parte posterior, fijando tu tapeta doblada en su sitio y bloqueando el margen de costura en el interior. +![Stitch in the ditch](9e.png) + ### Paso 10: Prepara el conjunto de posición del botón > Si ha elegido un placket, puede omitir los dos primeros subpasos y saltar a Enderstanding un clásico placket. From 0fd4ff4ca549334b5b3ad308fd2d133e093b4ed5 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Thu, 4 Apr 2024 10:23:14 -0700 Subject: [PATCH 582/795] Update frontpoints.mjs Removed superfluous parameter found by @HaasJona --- designs/noble/src/frontpoints.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designs/noble/src/frontpoints.mjs b/designs/noble/src/frontpoints.mjs index e8c51ced70f..369b2d819f5 100644 --- a/designs/noble/src/frontpoints.mjs +++ b/designs/noble/src/frontpoints.mjs @@ -2,7 +2,7 @@ import { frontSideDart as bellaFront } from '@freesewing/bella' import { cbqc, hidePresets } from '@freesewing/core' import * as options from './options.mjs' -const createTopRightDartPoints = (points, Path, paths, options) => { +const createTopRightDartPoints = (points, Path, options) => { const topPath = new Path() .move(points.waistUpDartRight) .curve( From d61532eef5eaf6c7086ba010dba584c1e5865151 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:04 +0200 Subject: [PATCH 583/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/bruces-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/es.md b/markdown/org/showcase/bruces-by-paul/es.md index 9da46f8502f..4122697e1eb 100644 --- a/markdown/org/showcase/bruces-by-paul/es.md +++ b/markdown/org/showcase/bruces-by-paul/es.md @@ -6,6 +6,7 @@ intro: "Bruces por Paul" title: "Bruces por Paul" designs: - "bruce" +author: 433 --- ![Vista de la parte trasera](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "Vista de la parte trasera") From 0200f57e8d27f628910abee4a5ede706c688a289 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:20 +0200 Subject: [PATCH 584/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/huey-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/es.md b/markdown/org/showcase/huey-by-paul/es.md index abae5b4ee6b..18ff4fae63d 100644 --- a/markdown/org/showcase/huey-by-paul/es.md +++ b/markdown/org/showcase/huey-by-paul/es.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Huey por Paul" designs: - "huey" +author: 433 --- From 5ef2a89a3b5134222ea763e9772f41dab9931562 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:24 +0200 Subject: [PATCH 585/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/es.md b/markdown/org/showcase/linnen-jaeger-by-paul/es.md index ce13f1a0c6d..67172174f0f 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/es.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/es.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Jaeger de Paul" designs: - "jaeger" +author: 433 --- From 1c0d8247d04e538df20b6fc24f1fb9c86867a393 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:29 +0200 Subject: [PATCH 586/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/es.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/es.md index ad99ec268ba..fff9376b837 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/es.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/es.md @@ -8,6 +8,7 @@ designs: - "florent" - "theo" - "wahid" +author: 433 --- ![Traje de Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Traje de Paul") From 3e7f61547c128aedd8f6c4c29db032e366deaff9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:30 +0200 Subject: [PATCH 587/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/es.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/es.md index abf18c13c44..f18c9c8de46 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/es.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/es.md @@ -8,6 +8,7 @@ designs: - "simon" - "wahid" - "theo" +author: 433 --- ![Traje de Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Traje de Paul") From f3cc84d73d8db5cbee9fd248d9d202e1efbc6ddd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:27:57 +0200 Subject: [PATCH 588/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/yoga-set-by-paul/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/es.md b/markdown/org/showcase/yoga-set-by-paul/es.md index 0ec9315ae41..b1f6693439a 100644 --- a/markdown/org/showcase/yoga-set-by-paul/es.md +++ b/markdown/org/showcase/yoga-set-by-paul/es.md @@ -7,5 +7,6 @@ title: "Conjunto de yoga de Paul" designs: - "aaron" - "bruce" +author: 433 --- From f81332ee577dc08e01cc244a01666fab096e846b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:38:30 +0200 Subject: [PATCH 589/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/cornelius/instructions/de.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/de.md b/markdown/org/docs/designs/cornelius/instructions/de.md index 7160c2eff26..5ab65df07d8 100644 --- a/markdown/org/docs/designs/cornelius/instructions/de.md +++ b/markdown/org/docs/designs/cornelius/instructions/de.md @@ -7,7 +7,7 @@ title: "Cornelius Radlerhosen: Anleitung zum Nähen" - Press under the seam allowances of the non-notched edges of the pocket facings. - Stecke die linke Seite der Taschenbespannung an die rechte Seite der Taschenbeutel, _Kantenstich_ die gefalteten Kanten an die Taschenbeutel. - _Hefte_ die Nahtzugaben der eingekerbten Kanten der Taschenbesetzungen an die Taschenbeutel. -- Nähe die Taschenbeutel rechts auf rechts an die Vorderseite und bügle sie dann auf die linke Seite. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Falte die Taschen entlang der Falzlinie in der Mitte und lege sie rechtsherum zusammen. Nähen Sie den Boden des Taschenbeutels zusammen. - Alternativ kannst du _French Seam_ die Bodennähte der Taschenbeutel zusammennähen, wenn du das möchtest. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From e51ccc9e2e3cd1a27aacae82db4bbd29890ecc7a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:42:23 +0200 Subject: [PATCH 590/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/simon/instructions/de.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/de.md b/markdown/org/docs/designs/simon/instructions/de.md index 0c7ffaa94ab..14831be8b41 100644 --- a/markdown/org/docs/designs/simon/instructions/de.md +++ b/markdown/org/docs/designs/simon/instructions/de.md @@ -252,6 +252,8 @@ Von der guten Seite Ihres Hemdes nähen Sie das gefaltete Plakat durch Nähen im Um dies zu tun, nähen Sie genau auf Ihrer früheren Naht. Da du den Stoff deiner Leiste ein wenig über diese Naht hinaus gefaltet hast, wird sie hinten eingeklemmt, wodurch deine gefaltete Leiste fixiert und die Nahtzugabe innen festgehalten wird. +![Stitch in the ditch](9e.png) + ### Schritt 10: Bereiten Sie das Buttonhole Placket vor > Wenn Sie einen ausgewachsenen Platz gewählt haben, können Sie die ersten beiden Unterschritte überspringen und einen klassischen Knopflochplatz verstehen. From 99d3c9f6cc382ea0a78573a9dad6ef536eb8be11 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:47:35 +0200 Subject: [PATCH 591/795] New translations en.md (German) skip-build --- markdown/org/showcase/bruces-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/de.md b/markdown/org/showcase/bruces-by-paul/de.md index 1d6919bcae9..9643c1d8505 100644 --- a/markdown/org/showcase/bruces-by-paul/de.md +++ b/markdown/org/showcase/bruces-by-paul/de.md @@ -6,6 +6,7 @@ intro: "Bruces von Paul" title: "Bruces von Paul" designs: - "bruce" +author: 433 --- ![Blick auf die Rückseite](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "Blick auf die Rückseite") From 31d101c5ba44665cd30cd90e310a9fcc641f64ca Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:47:51 +0200 Subject: [PATCH 592/795] New translations en.md (German) skip-build --- markdown/org/showcase/huey-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/de.md b/markdown/org/showcase/huey-by-paul/de.md index adb109dd7d4..be8cf256ac2 100644 --- a/markdown/org/showcase/huey-by-paul/de.md +++ b/markdown/org/showcase/huey-by-paul/de.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Huey von Paul" designs: - "huey" +author: 433 --- From 0d13ce99e55f82483f001abcc793d37aee4c6e01 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:47:55 +0200 Subject: [PATCH 593/795] New translations en.md (German) skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/de.md b/markdown/org/showcase/linnen-jaeger-by-paul/de.md index efc62990318..861dfee9352 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/de.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/de.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Jaeger by Paul" designs: - "jaeger" +author: 433 --- From ef1626c1ce137c95efc20fd9055ec171df616d20 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:48:00 +0200 Subject: [PATCH 594/795] New translations en.md (German) skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/de.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/de.md index 01dd599f1d9..281703c54b8 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/de.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/de.md @@ -8,6 +8,7 @@ designs: - "florent" - "theo" - "wahid" +author: 433 --- ![Outfit von Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Outfit von Paul") From e164542f9a1ab55e36f046e4b4d6ff00d530cf70 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:48:01 +0200 Subject: [PATCH 595/795] New translations en.md (German) skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/de.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/de.md index 422868efbc2..ca364871080 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/de.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/de.md @@ -8,6 +8,7 @@ designs: - "simon" - "wahid" - "theo" +author: 433 --- ![Outfit von Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Outfit von Paul") From 438e24fbef4ea4a0d65724ce2d2dec60e75278ff Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:48:27 +0200 Subject: [PATCH 596/795] New translations en.md (German) skip-build --- markdown/org/showcase/yoga-set-by-paul/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/de.md b/markdown/org/showcase/yoga-set-by-paul/de.md index d30fbe018d1..b930dfe8fb0 100644 --- a/markdown/org/showcase/yoga-set-by-paul/de.md +++ b/markdown/org/showcase/yoga-set-by-paul/de.md @@ -7,5 +7,6 @@ title: "Yoga Outfit von Paul" designs: - "aaron" - "bruce" +author: 433 --- From a441064702d54e2e8c544b4695be2591656907f7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 19:58:57 +0200 Subject: [PATCH 597/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/designs/cornelius/instructions/nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/nl.md b/markdown/org/docs/designs/cornelius/instructions/nl.md index 28ce7e05ddf..3a8ccee2bab 100644 --- a/markdown/org/docs/designs/cornelius/instructions/nl.md +++ b/markdown/org/docs/designs/cornelius/instructions/nl.md @@ -7,7 +7,7 @@ title: "Cornelius fietsbroek: Naai-instructies" - Press under the seam allowances of the non-notched edges of the pocket facings. - Speld de verkeerde kanten van de zakvullingen op de goede kant van de zakvullingen met dezelfde inkepingen, _Edgestitch_ de gevouwen randen op de zakvullingen. - _Rijg_ de naadtoeslagen van de gekerfde randen van de zakvullingen aan de zakzakken. -- Met de goede kanten op elkaar en de dubbele inkepingen naai je de zakjes aan de voorkant en pers je ze naar de verkeerde kant. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Vouw de zakken dubbel langs de vouwlijn, goede kanten op elkaar. Naai de onderkant van de zak aan elkaar. - Je kunt ook _Franse naad_ de onderste naden van de zakjes aan elkaar naaien als je dat liever doet. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 8b649fbd8de4f8a72a8086337497df9ac84796bf Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:02:58 +0200 Subject: [PATCH 598/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/designs/simon/instructions/nl.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/nl.md b/markdown/org/docs/designs/simon/instructions/nl.md index 8a82e9f0a42..905a1ef019e 100644 --- a/markdown/org/docs/designs/simon/instructions/nl.md +++ b/markdown/org/docs/designs/simon/instructions/nl.md @@ -252,6 +252,8 @@ Stik het geplooide knopenpat vast door langs de goede kant van je hemd in de naa Om dit te doen stik je exact bovenop je eerdere naad. Omdat je de stof van je placket iets voorbij deze naad hebt gevouwen, zal hij aan de achterkant vast komen te zitten, waardoor je gevouwen placket op zijn plaats wordt gefixeerd en de naadtoeslag binnenin wordt opgesloten. +![Stitch in the ditch](9e.png) + ### Stap 10: Bereid het knoopsgatenpat voor > Als je een aangeknipt knoopsgatenpat gekozen heb kan je de eerste twee substapjes overslaan en verdergaan met Hoe werkt een klassiek knopenpat. From c83ccaef3271901bcebe3c8ec8d13617370a7eee Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:08:25 +0200 Subject: [PATCH 599/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/bruces-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/nl.md b/markdown/org/showcase/bruces-by-paul/nl.md index 3c7dcb36605..66a501f8eab 100644 --- a/markdown/org/showcase/bruces-by-paul/nl.md +++ b/markdown/org/showcase/bruces-by-paul/nl.md @@ -6,6 +6,7 @@ intro: "Bruce door Paul" title: "Bruce door Paul" designs: - "bruce" +author: 433 --- ![Zicht op de achterkant](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "Zicht op de achterkant") From b6d71f6df8b43bc47d25210773fe40ea70b2b6ea Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:08:41 +0200 Subject: [PATCH 600/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/huey-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/nl.md b/markdown/org/showcase/huey-by-paul/nl.md index dce6ff9c4d9..5589f6b49e1 100644 --- a/markdown/org/showcase/huey-by-paul/nl.md +++ b/markdown/org/showcase/huey-by-paul/nl.md @@ -6,5 +6,6 @@ intro: "FIXME_geen_intro" title: "Huey door Paul" designs: - "huey" +author: 433 --- From b82df09e8eea12acf38146b26d13aa34ffa08fc8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:08:45 +0200 Subject: [PATCH 601/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/nl.md b/markdown/org/showcase/linnen-jaeger-by-paul/nl.md index 296422606c6..1d8d7c0daf9 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/nl.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/nl.md @@ -6,5 +6,6 @@ intro: "FIXME_geen_intro" title: "Jaeger door Paul" designs: - "jaeger" +author: 433 --- From 5948ad908bbbbbf6411373510c82d7dc255ae14b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:08:50 +0200 Subject: [PATCH 602/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/nl.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/nl.md index 3678130adf3..da1791ccab5 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/nl.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/nl.md @@ -8,6 +8,7 @@ designs: - "florent" - "theo" - "wahid" +author: 433 --- ![Outfit door Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Outfit door Paul") From eabda7630aaeffb7632c56e5e7a6e3785141986c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:08:51 +0200 Subject: [PATCH 603/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/nl.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/nl.md index 918aeb4c396..928a09191a5 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/nl.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/nl.md @@ -8,6 +8,7 @@ designs: - "simon" - "wahid" - "theo" +author: 433 --- ![Outfit door Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Outfit door Paul") From 3f8414d76557ba420cabcf8c4678f93138074b21 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:09:19 +0200 Subject: [PATCH 604/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/yoga-set-by-paul/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/nl.md b/markdown/org/showcase/yoga-set-by-paul/nl.md index 647b78bc031..36ed073a346 100644 --- a/markdown/org/showcase/yoga-set-by-paul/nl.md +++ b/markdown/org/showcase/yoga-set-by-paul/nl.md @@ -7,5 +7,6 @@ title: "Yoga Outfit door Paul" designs: - "aaron" - "bruce" +author: 433 --- From 7938cdb492e88b69ba8c9ce09d98ad1c35c0469e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:20:10 +0200 Subject: [PATCH 605/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/cornelius/instructions/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/uk.md b/markdown/org/docs/designs/cornelius/instructions/uk.md index b6cbdd3d73d..c6fd937ef4c 100644 --- a/markdown/org/docs/designs/cornelius/instructions/uk.md +++ b/markdown/org/docs/designs/cornelius/instructions/uk.md @@ -7,7 +7,7 @@ title: "Велосипедні бриджі Cornelius: Інструкція з - Press under the seam allowances of the non-notched edges of the pocket facings. - Сумістивши надсічки, приколіть виворітні сторони обшивок кишень до правого боку кишенькових мішків, _приметайте_ підігнуті краї до кишенькових мішків. - _Приметайте_ припуски на шви надсічених країв обшивок кишень до мішковин кишень. -- Лицьовими боками до лицьових боків, сумістивши подвійні надсічки, пришийте кишеньки до лицьового боку, а потім припрасуйте на виворітний бік. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Складіть кишені навпіл по лінії згину лицьовими боками разом. Зшийте дно кишенькової сумки. - Також ви можете _французький шов_ нижні шви кишенькових сумок разом, якщо бажаєте. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 1c41aa56c367cf0e570cfd70776ab68d496930bc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:24:09 +0200 Subject: [PATCH 606/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/simon/instructions/uk.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/uk.md b/markdown/org/docs/designs/simon/instructions/uk.md index 2c623f500e5..e93726b994f 100644 --- a/markdown/org/docs/designs/simon/instructions/uk.md +++ b/markdown/org/docs/designs/simon/instructions/uk.md @@ -252,6 +252,8 @@ Note: as of March 19, 2024, this link appears to be down as it's redirecting to Для цього прошийте точно поверх попереднього шва. Оскільки ви склали тканину планки трохи за цим швом, вона зачепиться ззаду, фіксуючи складену планку на місці і закриваючи припуски шва всередині. +![Stitch in the ditch](9e.png) + ### Крок 10: Підготуйте планку для петель > Якщо ви вибрали петлю для дорослих, ви можете пропустити перші два підкроки і перейти до розділу "Розуміння класичної петлі для ґудзиків". From 010fd70a8b8db745d51119620a32bf88f3ecf013 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:29:30 +0200 Subject: [PATCH 607/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/bruces-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/uk.md b/markdown/org/showcase/bruces-by-paul/uk.md index 957892c381c..5938aafff2e 100644 --- a/markdown/org/showcase/bruces-by-paul/uk.md +++ b/markdown/org/showcase/bruces-by-paul/uk.md @@ -6,6 +6,7 @@ intro: "Брюки від Paul" title: "Брюки від Paul" designs: - "Брюс." +author: 433 --- ![Вид ззаду](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "Вид ззаду") From c01d051227b0c5dcbc2301a4a2240be5908a11a4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:29:45 +0200 Subject: [PATCH 608/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/huey-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/uk.md b/markdown/org/showcase/huey-by-paul/uk.md index 9f150b768b1..4566a04b56c 100644 --- a/markdown/org/showcase/huey-by-paul/uk.md +++ b/markdown/org/showcase/huey-by-paul/uk.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Huey by Paul" designs: - "Х'юї." +author: 433 --- From b34ceb45c379eb4af52ef87033e369c7d8d925d2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:29:50 +0200 Subject: [PATCH 609/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/uk.md b/markdown/org/showcase/linnen-jaeger-by-paul/uk.md index cc3945afb16..52f83045287 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/uk.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/uk.md @@ -6,5 +6,6 @@ intro: "FIXME_no_intro" title: "Jaeger by Paul" designs: - "Єгер." +author: 433 --- From 91edab7252c19740cf80d4cf2f0b131db5b536d1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:29:55 +0200 Subject: [PATCH 610/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/uk.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/uk.md index 6f335cc6399..bd72a4d451d 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/uk.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/uk.md @@ -8,6 +8,7 @@ designs: - "флорентійський" - "Тео." - "вахід" +author: 433 --- ![Вбрання від Павла](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Вбрання від Павла") From 76a7c90dc825a95d32fb8cc3b255acf72edd8604 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:29:56 +0200 Subject: [PATCH 611/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/uk.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/uk.md index 78854daba98..08f5e4bfb27 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/uk.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/uk.md @@ -8,6 +8,7 @@ designs: - "Саймон" - "вахід" - "Тео." +author: 433 --- ![Вбрання від Павла](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Вбрання від Павла") From 79466e4fa9b5543ecf0da1bfb32260b1c38c0a17 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:30:24 +0200 Subject: [PATCH 612/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/yoga-set-by-paul/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/uk.md b/markdown/org/showcase/yoga-set-by-paul/uk.md index 47c86e3632e..c19c6df037a 100644 --- a/markdown/org/showcase/yoga-set-by-paul/uk.md +++ b/markdown/org/showcase/yoga-set-by-paul/uk.md @@ -7,5 +7,6 @@ title: "Екіпірування для йоги від Павла" designs: - "Аароне." - "Брюс." +author: 433 --- From a2a5e03c04278e06790d39664a7bd00fa0184c80 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:47:55 +0200 Subject: [PATCH 613/795] Update source file en.md skip-build --- markdown/org/docs/designs/cornelius/instructions/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/en.md b/markdown/org/docs/designs/cornelius/instructions/en.md index c9c3daf9040..4ed08688a0d 100644 --- a/markdown/org/docs/designs/cornelius/instructions/en.md +++ b/markdown/org/docs/designs/cornelius/instructions/en.md @@ -7,7 +7,7 @@ title: "Cornelius cycling breeches: Sewing Instructions" - Press under the seam allowances of the non-notched edges of the pocket facings. - Matching notches, pin the wrong sides of pocket facings to right side of pocket bags, _Edgestitch_ the folded edges to the pocket bags. - _Baste_ the seam allowances of the notched edges of the pocket facings to the pocket bags. -- With right sides together matching double notches sew the pocket bags to the front and then press to the wrong side. +- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. - Fold the pockets in half along the fold line, right sides together. Stitch the bottom of the pocket bag together. - Alternatively you can _French Seam_ the bottom seams of the pocket bags together if you prefer. - _Baste_ the top and side of the pocket bags to the front seam allowances matching notches. From 546f594181443cdda9a2e626e8392a64baec871f Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:49:46 +0200 Subject: [PATCH 614/795] Update source file en.md skip-build --- markdown/org/docs/designs/simon/instructions/en.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index d9b263370b1..df5dd1dd689 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -256,6 +256,8 @@ From the good side of your shirt, sew down the folded placket by stitching in th To do so, sew exactly on top of your earlier seam. Since you folded the fabric of your placket a bit past this seam, it will get caught at the back, fixing your folded placket in place, and locking the seam allowance inside. +![Stitch in the ditch](9e.png) + ### Step 10: Prepare the buttonhole placket > If you have chosen a grown-on placket, you can skip the first two sub-steps and skip ahead to Understanding a classic buttonhole placket. From eeec591e52ff29644bcaf35a6d6de6ffaa8f8e8e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:02 +0200 Subject: [PATCH 615/795] Update source file en.md skip-build --- markdown/org/showcase/bruces-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/bruces-by-paul/en.md b/markdown/org/showcase/bruces-by-paul/en.md index aaf1c2e490a..4665fa9c178 100644 --- a/markdown/org/showcase/bruces-by-paul/en.md +++ b/markdown/org/showcase/bruces-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-12-19" intro: "Bruces by Paul" title: "Bruces by Paul" designs: ["bruce"] +author: 433 --- ![View of the back](https://posts.freesewing.org/uploads/bruces_by_paul_back_19f9daa0e8.jpg "View of the back") From f30506e64b559f74eb7631b6f83a161b8b037ef3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:19 +0200 Subject: [PATCH 616/795] Update source file en.md skip-build --- markdown/org/showcase/huey-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/huey-by-paul/en.md b/markdown/org/showcase/huey-by-paul/en.md index cac26d43018..0e3862cdca3 100644 --- a/markdown/org/showcase/huey-by-paul/en.md +++ b/markdown/org/showcase/huey-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Huey by Paul" designs: ["huey"] +author: 433 --- From 41af393948509eee16eb354e840b0662b851dea4 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:23 +0200 Subject: [PATCH 617/795] Update source file en.md skip-build --- markdown/org/showcase/linnen-jaeger-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/linnen-jaeger-by-paul/en.md b/markdown/org/showcase/linnen-jaeger-by-paul/en.md index aa424c56370..01a23f91956 100644 --- a/markdown/org/showcase/linnen-jaeger-by-paul/en.md +++ b/markdown/org/showcase/linnen-jaeger-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Jaeger by Paul" designs: ["jaeger"] +author: 433 --- From f118b849d4e170641184e7cb7dbf897dfe2831a5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:29 +0200 Subject: [PATCH 618/795] Update source file en.md skip-build --- markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md index ba8fad9f2ef..47d0a50726d 100644 --- a/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-florent-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-01-02" intro: "Outfit - Florent, Theodore & Wahid by Paul" title: "Outfit - Florent, Theodore & Wahid by Paul" designs: ["florent","theo","wahid"] +author: 433 --- ![Outfit by Paul](/img/showcase/outfit-wahid-theodore-florent-by-paul/high_back.jpg "Outfit by Paul") From 572cf8071d11517a29caccb637d014210b7f507d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:29 +0200 Subject: [PATCH 619/795] Update source file en.md skip-build --- markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md index 5153ec7f54a..3a5151b3e7c 100644 --- a/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md +++ b/markdown/org/showcase/outfit-wahid-theo-simon-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-01-02" intro: "Outfit - Simon, Theo & Wahid by Paul" title: "Outfit - Simon, Theo & Wahid by Paul" designs: ["simon","wahid","theo"] +author: 433 --- ![Outfit by Paul](https://posts.freesewing.org/uploads/outfit_wahid_theo_simon_by_paul_high_back_808c2ace5b.jpg "Outfit by Paul") From 2d6b0a0d0f106f331ee88976036aa5523acc7fec Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Thu, 4 Apr 2024 20:52:50 +0200 Subject: [PATCH 620/795] Update source file en.md skip-build --- markdown/org/showcase/yoga-set-by-paul/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/yoga-set-by-paul/en.md b/markdown/org/showcase/yoga-set-by-paul/en.md index 328ec37fe05..8ade6afb7b1 100644 --- a/markdown/org/showcase/yoga-set-by-paul/en.md +++ b/markdown/org/showcase/yoga-set-by-paul/en.md @@ -5,6 +5,7 @@ date: "2018-09-29" intro: "FIXME_no_intro" title: "Yoga Outfit by Paul" designs: ["aaron","bruce"] +author: 433 --- From 5a9ed9483bac1bd17a12c0a431fb7e66f7339d71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 04:48:32 +0000 Subject: [PATCH 621/795] chore(deps): Bump daisyui from 4.9.0 to 4.10.1 Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.9.0 to 4.10.1. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.9.0...v4.10.1) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 62e1a7c44bd..4e46e0c5845 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -35,7 +35,7 @@ "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.2", - "daisyui": "4.9.0", + "daisyui": "4.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index b952d2970b5..c39fcef64bf 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.9.0", + "daisyui": "4.10.1", "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index 51ecb53967b..fb8a55b9b44 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,7 +37,7 @@ "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.2", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.9.0", + "daisyui": "4.10.1", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.7.2", diff --git a/sites/sde/package.json b/sites/sde/package.json index 1a48e829b18..13d7880a73c 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,7 +50,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.9.0", + "daisyui": "4.10.1", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", diff --git a/sites/shared/package.json b/sites/shared/package.json index 43d81af9670..0c8ce80b9ff 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,7 +23,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.9.0", + "daisyui": "4.10.1", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 9e7e83b10f2..b19d9113c49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4722,10 +4722,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.9.0.tgz#c99b0d7146567a73735c56da9895a789da9c73aa" - integrity sha512-9JsDx4E+30kPxThE+6yEwQokqg1957uwTx/skP2RE98fG6Ten6U+S9YXeQg1a3CI958aF5aOb0oEA+KZFfrZUA== +daisyui@4.10.1: + version "4.10.1" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.10.1.tgz#6e601470f498fee9756afebfa9a921e24a37d9e4" + integrity sha512-Ds0Z0Fv+Xf6ZEqV4Q5JIOeKfg83xxnww0Lzid0V94vPtlQ0yYmucEa33zSctsX2VEgBALtmk5zVEqd59pnUbuQ== dependencies: css-selector-tokenizer "^0.8" culori "^3" From f8ffa9e6ba6ea3447418e401e5ad5abef9c5a6b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 04:52:32 +0000 Subject: [PATCH 622/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.540.0 to 3.549.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.540.0 to 3.549.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.549.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 178 ++++++++++++++++++------------------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index ca4772ce88c..18704e2ad78 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.540.0", + "@aws-sdk/client-sesv2": "3.549.0", "@prisma/client": "5.12.0", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index 9e7e83b10f2..d6b8686cfeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -214,16 +214,16 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.540.0.tgz#eceae8ab2bbb0600ccef486fe31266863008f732" - integrity sha512-shnxtTz/ZIBtot6+V1robjwvhJVtARUnsxGAmRc8Wv7tN7git+P7G1zj28SAmuBBr04wJu0Z3uteMurGAeLAHA== +"@aws-sdk/client-sesv2@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.549.0.tgz#9de924b6974768765ef2f6a171bd86a56b61a692" + integrity sha512-o+78gx6E4aKB9dqbUfpCo7SP24zQn8BKmh17hWOXB6ryDqZUHeaoeJh0gtcrE6EXEsEtqGlXIIaTu9kYdYDepA== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/credential-provider-node" "3.540.0" + "@aws-sdk/client-sts" "3.549.0" + "@aws-sdk/core" "3.549.0" + "@aws-sdk/credential-provider-node" "3.549.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -234,13 +234,13 @@ "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.1" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-retry" "^2.3.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -260,15 +260,15 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.540.0.tgz#e4c52889d33ca969add269011b790f2d634fb6d2" - integrity sha512-LZYK0lBRQK8D8M3Sqc96XiXkAV2v70zhTtF6weyzEpgwxZMfSuFJjs0jFyhaeZBZbZv7BBghIdhJ5TPavNxGMQ== +"@aws-sdk/client-sso-oidc@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.549.0.tgz#1a0f4ea4d5d34d2bccea5f0f4db27231f9c299a7" + integrity sha512-FbB4A78ILAb8sM4TfBd+3CrQcfZIhe0gtVZNbaxpq5cJZh1K7oZ8vPfKw4do9JWkDUXPLsD9Bwz12f8/JpAb6Q== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.540.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/client-sts" "3.549.0" + "@aws-sdk/core" "3.549.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -279,13 +279,13 @@ "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.1" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-retry" "^2.3.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -305,14 +305,14 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.540.0.tgz#732a7f325de3905a719c20ce05e555b445f82b4a" - integrity sha512-rrQZMuw4sxIo3eyAUUzPQRA336mPRnrAeSlSdVHBKZD8Fjvoy0lYry2vNhkPLpFZLso1J66KRyuIv4LzRR3v1Q== +"@aws-sdk/client-sso@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.549.0.tgz#fa493de7366946971dc82bd07c181f23d4cb6be9" + integrity sha512-lz+yflOAj5Q263FlCsKpNqttaCb2NPh8jC76gVCqCt7TPxRDBYVaqg0OZYluDaETIDNJi4DwN2Azcck7ilwuPw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/core" "3.549.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -323,13 +323,13 @@ "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.1" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-retry" "^2.3.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -349,14 +349,14 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.540.0.tgz#16ce14db1c5387be3ad9be6dd4f8ed33b63193c8" - integrity sha512-ITHUQxvpqfQX6obfpIi3KYGzZYfe/I5Ixjfxoi5lB7ISCtmxqObKB1fzD93wonkMJytJ7LUO8panZl/ojiJ1uw== +"@aws-sdk/client-sts@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.549.0.tgz#d8b6034c80f190dded7add83e99d2da209b61699" + integrity sha512-63IreJ598Dzvpb+6sy81KfIX5iQxnrWSEtlyeCdC2GO6gmSQVwJzc9kr5pAC83lHmlZcm/Q3KZr3XBhRQqP0og== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/core" "3.549.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -367,13 +367,13 @@ "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.1" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-retry" "^2.3.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -393,12 +393,12 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/core@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.535.0.tgz#f3a726c297cea9634d19a1db4e958c918c506c8b" - integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== +"@aws-sdk/core@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.549.0.tgz#1c40b7abbea37479db5e5ac39957f26f0a7e2119" + integrity sha512-jC61OxJn72r/BbuDRCcluiw05Xw9eVLG0CwxQpF3RocxfxyZqlrGYaGecZ8Wy+7g/3sqGRC/Ar5eUhU1YcLx7w== dependencies: - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.1" "@smithy/protocol-http" "^3.3.0" "@smithy/signature-v4" "^2.2.0" "@smithy/smithy-client" "^2.5.0" @@ -431,16 +431,16 @@ "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.540.0.tgz#8e17b23bf242152775db1473f7d2952beb6a5ef9" - integrity sha512-igN/RbsnulIBwqXbwsWmR3srqmtbPF1dm+JteGvUY31FW65fTVvWvSr945Y/cf1UbhPmIQXntlsqESqpkhTHwg== +"@aws-sdk/credential-provider-ini@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.549.0.tgz#261654741e1c75f2adf888e06a443aa60ec32bad" + integrity sha512-k6IIrluZjQpzui5Din8fW3bFFhHaJ64XrsfYx0Ks1mb7xan84dJxmYP3tdDDmLzUeJv5h95ag88taHfjY9rakA== dependencies: - "@aws-sdk/client-sts" "3.540.0" + "@aws-sdk/client-sts" "3.549.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.540.0" - "@aws-sdk/credential-provider-web-identity" "3.540.0" + "@aws-sdk/credential-provider-sso" "3.549.0" + "@aws-sdk/credential-provider-web-identity" "3.549.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -448,17 +448,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.540.0.tgz#e6fd3404de68e7f9580f01aa542b16e9abc58e5c" - integrity sha512-HKQZJbLHlrHX9A0B1poiYNXIIQfy8whTjuosTCYKPDBhhUyVAQfxy/KG726j0v43IhaNPLgTGZCJve4hAsazSw== +"@aws-sdk/credential-provider-node@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.549.0.tgz#765b3d00b3771ff35f0aa333c3c3891eff22afb6" + integrity sha512-f3YgalsMuywEAVX4AUm9tojqrBdfpAac0+D320ePzas0Ntbp7ItYu9ceKIhgfzXO3No7P3QK0rCrOxL+ABTn8Q== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-http" "3.535.0" - "@aws-sdk/credential-provider-ini" "3.540.0" + "@aws-sdk/credential-provider-ini" "3.549.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.540.0" - "@aws-sdk/credential-provider-web-identity" "3.540.0" + "@aws-sdk/credential-provider-sso" "3.549.0" + "@aws-sdk/credential-provider-web-identity" "3.549.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -477,25 +477,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.540.0.tgz#1fc5c53a0df8227249c73a3cb7660b1accb79186" - integrity sha512-tKkFqK227LF5ajc5EL6asXS32p3nkofpP8G7NRpU7zOEOQCg01KUc4JRX+ItI0T007CiN1J19yNoFqHLT/SqHg== +"@aws-sdk/credential-provider-sso@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.549.0.tgz#1aa9f148715230233cb130afd8af3fea0b8947c7" + integrity sha512-BGopRKHs7W8zkoH8qmSHrjudj263kXbhVkAUPxVUz0I28+CZNBgJC/RfVCbOpzmysIQEpwSqvOv1y0k+DQzIJQ== dependencies: - "@aws-sdk/client-sso" "3.540.0" - "@aws-sdk/token-providers" "3.540.0" + "@aws-sdk/client-sso" "3.549.0" + "@aws-sdk/token-providers" "3.549.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.540.0.tgz#775a2090e9f4f89efe2ebdf1e2c109a47561c0e9" - integrity sha512-OpDm9w3A168B44hSjpnvECP4rvnFzD86rN4VYdGADuCvEa5uEcdA/JuT5WclFPDqdWEmFBqS1pxBIJBf0g2Q9Q== +"@aws-sdk/credential-provider-web-identity@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.549.0.tgz#5c11204dd00a3d0dfbeb0392a22e429251685826" + integrity sha512-QzclVXPxuwSI7515l34sdvliVq5leroO8P7RQFKRgfyQKO45o1psghierwG3PgV6jlMiv78FIAGJBr/n4qZ7YA== dependencies: - "@aws-sdk/client-sts" "3.540.0" + "@aws-sdk/client-sts" "3.549.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -553,12 +553,12 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.540.0.tgz#06fb874a62d3c496875768ac648bc6cca4c75a79" - integrity sha512-9BvtiVEZe5Ev88Wa4ZIUbtT6BVcPwhxmVInQ6c12MYNb0WNL54BN6wLy/eknAfF05gpX2/NDU2pUDOyMPdm/+g== +"@aws-sdk/token-providers@3.549.0": + version "3.549.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.549.0.tgz#0e4aa04d6d50d633c34c78bbed62e3924bc10103" + integrity sha512-rJyeXkXknLukRFGuMQOgKnPBa+kLODJtOqEBf929SpQ96f1I6ytdndmWbB5B/OQN5Fu5DOOQUQqJypDQVl5ibQ== dependencies: - "@aws-sdk/client-sso-oidc" "3.540.0" + "@aws-sdk/client-sso-oidc" "3.549.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" @@ -2182,16 +2182,16 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/core@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.0.tgz#5f9f86b681b9cbf23904041dad6f0531efe8375e" - integrity sha512-uu9ZDI95Uij4qk+L6kyFjdk11zqBkcJ3Lv0sc6jZrqHvLyr0+oeekD3CnqMafBn/5PRI6uv6ulW3kNLRBUHeVw== +"@smithy/core@^1.4.1": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" + integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== dependencies: - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" @@ -2262,10 +2262,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.0.tgz#9f1459e9b4cbf00fadfd99e98f88d4b1a2aeb987" - integrity sha512-OBhI9ZEAG8Xen0xsFJwwNOt44WE2CWkfYIxTognC8x42Lfsdf0VN/wCMqpdkySMDio/vts10BiovAxQp0T0faA== +"@smithy/middleware-endpoint@^2.5.0", "@smithy/middleware-endpoint@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad" + integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ== dependencies: "@smithy/middleware-serde" "^2.3.0" "@smithy/node-config-provider" "^2.3.0" @@ -2275,20 +2275,20 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/middleware-retry@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.2.0.tgz#ff48ac01ad57394eeea15a0146a86079cf6364b7" - integrity sha512-PsjDOLpbevgn37yJbawmfVoanru40qVA8UEf2+YA1lvOefmhuhL6ZbKtGsLAWDRnE1OlAmedsbA/htH6iSZjNA== +"@smithy/middleware-retry@^2.3.0", "@smithy/middleware-retry@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" + integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== dependencies: "@smithy/node-config-provider" "^2.3.0" "@smithy/protocol-http" "^3.3.0" "@smithy/service-error-classification" "^2.1.5" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" tslib "^2.6.2" - uuid "^8.3.2" + uuid "^9.0.1" "@smithy/middleware-serde@^2.3.0": version "2.3.0" @@ -2389,12 +2389,12 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@smithy/smithy-client@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.0.tgz#8de4fff221d232dda34a8e706d6a4f2911dffe2e" - integrity sha512-DDXWHWdimtS3y/Kw1Jo46KQ0ZYsDKcldFynQERUGBPDpkW1lXOTHy491ALHjwfiBQvzsVKVxl5+ocXNIgJuX4g== +"@smithy/smithy-client@^2.5.0", "@smithy/smithy-client@^2.5.1": + version "2.5.1" + resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3" + integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ== dependencies: - "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-endpoint" "^2.5.1" "@smithy/middleware-stack" "^2.2.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" @@ -14045,7 +14045,7 @@ uuid@^8.0.0, uuid@^8.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^9.0.0: +uuid@^9.0.0, uuid@^9.0.1: version "9.0.1" resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz" integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== From 849563d1ece811f63f427c03a01c9ed49c0857c0 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Fri, 5 Apr 2024 14:13:22 +0200 Subject: [PATCH 623/795] add(core): Add Path.rotate(...) function analogue to Point.rotate(...) --- markdown/dev/reference/api/path/rotate/en.md | 53 ++++++++++++++++++++ packages/core/src/path.mjs | 36 +++++++++++++ packages/core/src/utils.mjs | 2 +- packages/core/tests/path.test.mjs | 29 +++++++++++ 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 markdown/dev/reference/api/path/rotate/en.md diff --git a/markdown/dev/reference/api/path/rotate/en.md b/markdown/dev/reference/api/path/rotate/en.md new file mode 100644 index 00000000000..ef89eaf18bf --- /dev/null +++ b/markdown/dev/reference/api/path/rotate/en.md @@ -0,0 +1,53 @@ +--- +title: Path.rotate() +--- + +The `Path.rotate()` returns a path that is a rotated copy of this path. +This method behaves like calling [Point.rotate](/reference/api/point/rotate) on all nodes of this path. + +## Signature + +```js +Path path.rotate(number deg, Point rotationOrigin, cloneAttributes = false) +``` + +If you pass a truthy value to the cloneAttributes parameter, it will return a deep clone of the +path, including its attributes. By default, it will return a shallow +copy, without the attributes. + +## Example + + + +```js +({ Point, points, Path, Snippet, paths, snippets, part }) => { + + points.B = new Point(10, 30) + points.BCp2 = new Point(40, 20) + points.C = new Point(90, 30) + points.CCp1 = new Point(50, -30) + points.origin = new Point(6, 34) + snippets.origin = new Snippet('notch', points.origin) + + paths.example = new Path() + .move(points.B) + .curve(points.BCp2, points.CCp1, points.C) + .setText("FreeSewing rocks", "text-xs fill-note center") + + paths.rotated = paths.example + .rotate(180, points.origin, true) + .attr("class", "dotted") + + return part +} +``` + + +## Notes + +The rotated path is a shallow copy. +It will in other words not inherit the attributes of the original path. + +If you want a deep copy, including the attributes, set the third parameter to true: + +`Path.rotate(deg, origin, true)` diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index b25c27c8c63..4b606b4189e 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -678,6 +678,42 @@ Path.prototype.reverse = function (cloneAttributes = false) { return rev } +/** + * Returns a rotated version of this Path + * @param {number} deg Angle to rotate, see {@link Point#rotate} + * @param {Point} rotationOrigin point to use as rotation origin, see {@link Point#rotate} + * @param {boolean} cloneAttributes If the rotated path should receive a copy of the path attributes + * + * @return {Path} A Path instance that is a rotated copy of this Path + */ +Path.prototype.rotate = function (deg, rotationOrigin, cloneAttributes = false) { + deg = __asNumber(deg, 'deg', 'Path.rotate', this.log) + if (!(rotationOrigin instanceof Point)) + this.log.warn('Called `Path.rotate(deg,that)` but `rotationOrigin` is not a `Point` object') + + const rotatedPath = new Path().__withLog(this.log) + + for (const op of this.ops) { + if (op.type === 'move') { + const to = op.to.rotate(deg, rotationOrigin) + rotatedPath.move(to) + } else if (op.type === 'line') { + const to = op.to.rotate(deg, rotationOrigin) + rotatedPath.line(to) + } else if (op.type === 'curve') { + const cp1 = op.cp1.rotate(deg, rotationOrigin) + const cp2 = op.cp2.rotate(deg, rotationOrigin) + const to = op.to.rotate(deg, rotationOrigin) + rotatedPath.curve(cp1, cp2, to) + } else if (op.type === 'close') { + rotatedPath.close() + } + } + if (cloneAttributes) rotatedPath.attributes = this.attributes.clone() + + return rotatedPath +} + /** * Returns a rough estimate of the length of this path * diff --git a/packages/core/src/utils.mjs b/packages/core/src/utils.mjs index 77eee695f43..22bc34fb6d5 100644 --- a/packages/core/src/utils.mjs +++ b/packages/core/src/utils.mjs @@ -701,7 +701,7 @@ export function __addNonEnumProp(obj, name, value) { * @param {string} param - The name of the parameter to use in the logs * @param {string} method - The name of the method to use in the logs * @param {object} log - A logging object - * @return {bool} result - True if it is a valid coordinate, false when not + * @return {number} the given value parameter, converted to a number if possible */ export function __asNumber(value, param, method, log) { if (typeof value === 'number') return value diff --git a/packages/core/tests/path.test.mjs b/packages/core/tests/path.test.mjs index 1cbf31f2065..ae3eda60f7f 100644 --- a/packages/core/tests/path.test.mjs +++ b/packages/core/tests/path.test.mjs @@ -371,6 +371,20 @@ describe('Path', () => { expect(rev.ops[2].type).to.equal('line') }) + it('Should rotate a path', () => { + const test = new Path() + .move(new Point(123, 456)) + .line(new Point(12, 23)) + .curve(new Point(0, 40), new Point(123, 34), new Point(230, 4)) + .close() + let deg = 60 + let rotationOrigin = new Point(42, 100) + let rotated = test.rotate(deg, rotationOrigin, true) + expect(test.length()).to.equal(rotated.length()) + expect(test.ops[0].to.rotate(deg, rotationOrigin).x).to.equal(rotated.ops[0].to.x) + expect(test.ops[0].to.rotate(deg, rotationOrigin).y).to.equal(rotated.ops[0].to.y) + }) + it('Should find the edges of a path', () => { const test = new Path() .move(new Point(45, 60)) @@ -916,6 +930,21 @@ describe('Path', () => { expect(invalid).to.equal(true) }) + it('Should log a warning when calling rotate with an origin that is not a point', () => { + let invalid = false + const log = { warn: () => (invalid = true) } + const test = new Path().__withLog(log).move(new Point(123, 456)).line(new Point(12, 23)) + + expect(invalid).to.equal(false) + let deg = 60 + try { + test.rotate(deg, 'someOrigin') + } catch (err) { + expect('' + err).to.contain('Cannot read properties of') + } + expect(invalid).to.equal(true) + }) + it('Should add a noop operation', () => { const p1 = new Path().noop() expect(p1.ops.length).to.equal(1) From a728ab6ac985b400119635cd076536f57325b677 Mon Sep 17 00:00:00 2001 From: woutervdub Date: Fri, 5 Apr 2024 15:53:59 +0000 Subject: [PATCH 624/795] Another oops fixed. --- designs/noble/src/frontpoints.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designs/noble/src/frontpoints.mjs b/designs/noble/src/frontpoints.mjs index e8c51ced70f..d8d36c927e4 100644 --- a/designs/noble/src/frontpoints.mjs +++ b/designs/noble/src/frontpoints.mjs @@ -2,7 +2,7 @@ import { frontSideDart as bellaFront } from '@freesewing/bella' import { cbqc, hidePresets } from '@freesewing/core' import * as options from './options.mjs' -const createTopRightDartPoints = (points, Path, paths, options) => { +const createTopRightDartPoints = (points, Path, options) => { const topPath = new Path() .move(points.waistUpDartRight) .curve( @@ -95,7 +95,7 @@ const createRightDartPoints = (points, Path, paths, diff, utils, options) => { paths.princessSeam = new Path() .move(points.waistDartRight) .curve(points.waistCpUp, points.waistUpDartRightCpDown, points.waistUpDartRight) - .join(createTopRightDartPoints(points, Path, paths, options)) + .join(createTopRightDartPoints(points, Path, options)) .reverse() .hide() return paths.princessSeam.length() From c4402aa0ed2595446c871fc71f81e3b14f61e2f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 17:40:06 +0000 Subject: [PATCH 625/795] chore(deps): Bump @prisma/client from 5.12.0 to 5.12.1 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.12.0 to 5.12.1. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.1/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 18704e2ad78..a432f5323ee 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.549.0", - "@prisma/client": "5.12.0", + "@prisma/client": "5.12.1", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index d6b8686cfeb..204d1f604ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1918,10 +1918,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.0.tgz#4d1fb68074307bf9445d06ad387139301aa4bcc4" - integrity sha512-bk/+KPpRm0+IzqFCtAxrj+/TNiHzulspnO+OkysaYY/atc/eX0Gx8V3tTLxbHKVX0LKD4Hi8KKCcSbU1U72n7Q== +"@prisma/client@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" + integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== "@prisma/debug@5.12.0": version "5.12.0" From c784f68f8b6fdc199573ee989a996e01c3d61b41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:12:51 +0000 Subject: [PATCH 626/795] chore(deps-dev): Bump prisma from 5.12.0 to 5.12.1 Bumps [prisma](https://github.com/prisma/prisma/tree/HEAD/packages/cli) from 5.12.0 to 5.12.1. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.1/packages/cli) --- updated-dependencies: - dependency-name: prisma dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 54 +++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index a432f5323ee..344e61c88a2 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -53,7 +53,7 @@ "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.12.0" + "prisma": "5.12.1" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/yarn.lock b/yarn.lock index 204d1f604ec..9eece120c80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1923,41 +1923,41 @@ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== -"@prisma/debug@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.0.tgz#0d5d94f095ae2d7e59ce89d32ad7bc4112b155b0" - integrity sha512-wK3fQLxPLMqf5riT5ZIhl8NffPSzFUwtzFX5CH7z/oI9Swmo9UhQlUgZABIVgdXSJ5OAlmRcDZtDKaMApIl8sg== +"@prisma/debug@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.1.tgz#007c8ad2e466d565bcd0671b8846c27f8700c722" + integrity sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A== "@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab": version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32" integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g== -"@prisma/engines@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.0.tgz#81a060d6eaf3da65c29bc7d81cd74fae72f13675" - integrity sha512-rFNRul9JGu0d3tf8etBgmDQ4NVoDwgGrRguvQOc8i+c6g7xPjRuu4aKzMMvHWUuccvRx5+fs1KMBxQ0x2THt+Q== +"@prisma/engines@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.1.tgz#a50649427d627a9af962a188a84c65d61c6e2b3f" + integrity sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA== dependencies: - "@prisma/debug" "5.12.0" + "@prisma/debug" "5.12.1" "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/fetch-engine" "5.12.0" - "@prisma/get-platform" "5.12.0" + "@prisma/fetch-engine" "5.12.1" + "@prisma/get-platform" "5.12.1" -"@prisma/fetch-engine@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.0.tgz#0418b29a0b473bb633871b43e3eb45c57a9157e5" - integrity sha512-qkHQbZ1hspvOwcImvqY4yj7+FUlw0+uP+6tu3g24V4ULHOXLLkvr5ZZc6vy26OF0hkbD3kcDJCeutFis3poKgg== +"@prisma/fetch-engine@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.1.tgz#c38e9fa17fdc535b4c83cbb7645569ad0a511fa9" + integrity sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA== dependencies: - "@prisma/debug" "5.12.0" + "@prisma/debug" "5.12.1" "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/get-platform" "5.12.0" + "@prisma/get-platform" "5.12.1" -"@prisma/get-platform@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.0.tgz#72b3ca03181d6bb20596b40ed581d5e0b06512ec" - integrity sha512-81Ptv9YJnwTArEBPQ2Lvu58sZPxy4OixKxVVgysFan6A3bFP7q8gIg15WTjsRuH4WXh6B667EM9sqoMTNu0fLQ== +"@prisma/get-platform@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.1.tgz#33f427f6d744dee62a9e06858889691d78b50804" + integrity sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ== dependencies: - "@prisma/debug" "5.12.0" + "@prisma/debug" "5.12.1" "@resvg/resvg-js-android-arm-eabi@2.6.2": version "2.6.2" @@ -11458,12 +11458,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.0.tgz#b4194a549f5e0365233fb14f3fadef3bed057b5e" - integrity sha512-zxw4WSIvpsyNbpv8r7Fxgm7nwTFVmD6wbN6VuH13lClOceSANDOMl4jO3oxE6VzhjxmnEJqOGZjON2T2UpmLag== +prisma@5.12.1: + version "5.12.1" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.1.tgz#db4596253bb066afc9f08744642f200a398d8d51" + integrity sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q== dependencies: - "@prisma/engines" "5.12.0" + "@prisma/engines" "5.12.1" proc-log@^3.0.0: version "3.0.0" From f1bec11ae78990386b18513cd9f4d973d47fee65 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 6 Apr 2024 13:21:04 +0200 Subject: [PATCH 627/795] chore: Added web-of-trust --- config/trustees.mjs | 35 + markdown/dev/reference/trust/en.md | 62 + sites/dev/components/web-of-trust.mjs | 9512 +++++++++++++++++++++++++ sites/shared/components/icons.mjs | 7 + sites/shared/components/mdx/index.mjs | 4 + sites/shared/styles/globals.css | 15 + 6 files changed, 9635 insertions(+) create mode 100644 config/trustees.mjs create mode 100644 markdown/dev/reference/trust/en.md create mode 100644 sites/dev/components/web-of-trust.mjs diff --git a/config/trustees.mjs b/config/trustees.mjs new file mode 100644 index 00000000000..652f6bdf21e --- /dev/null +++ b/config/trustees.mjs @@ -0,0 +1,35 @@ +/* + * This defines the FreeSewing web of trust + * See: https://FreeSewing.dev/reference/trust + */ +export const trustees = { + 1: { + x: 1306, + y: 319, + title: 'joost', + in: 'Antwerp', + }, + 132: { + x: 457, + y: 345, + title: 'woutervdub', + in: 'Seattle', + }, + 13050: { + x: 668, + y: 399, + title: 'karen', + in: 'Chicago', + }, +} + +/* + * These are the connections between the trustees + * See: https://FreeSewing.dev/reference/trust + */ +export const connections = [ + [1, 132], + [1, 13050], +] + +export const lastUpdate = '20240402' diff --git a/markdown/dev/reference/trust/en.md b/markdown/dev/reference/trust/en.md new file mode 100644 index 00000000000..a7315972fc5 --- /dev/null +++ b/markdown/dev/reference/trust/en.md @@ -0,0 +1,62 @@ +--- +title: Web of Trust +--- + +In the wake of [the March 2024 supply-chain attack on XZ +Utils](https://www.wired.com/story/xz-backdoor-everything-you-need-to-know/) -- +which attempted to smuggle a backdoor into Linux distributions -- FreeSewing has +taken steps to guard against the attack vector where a contributor gains trust +over a long period of time, with the end goal to smuggle malicious code into the project. + +__Elevated permissions or access will only be granted to people who are in FreeSewing's web of trust__. + +We have established an initial web of trust (more on this below) and have +revoked elevated permissions from all other contributors. + + + +##### Paranoia much? + +We appreciate that -- given to the nature of software FreeSewing provides -- the chances of a supply chain attack by an adversary willing to invest months or even years to gain our trust are vanishingly small. + +Still, we are a small part of the larger open source ecosystem, and we cannot foresee the ways in which others may end up using our software. +In addition, we want to help normalize this approach, and help raise awareness of the risks involved in trusting pseudo-anonymous contributions. + + + +## Defining trust + +To understand what we mean by a _web of trust_, we need to keep in mind what we want to guard against. +In other words, the web of trust should prevent: + +**Someone attempting to gain our trust -- possibly over a prolonged period of time -- to achieve a malicious goal.** + +Right from the start, you can see that this is impossible. There is no real way to know people's true intentions, so we cannot guard against that. +However, if we assume people try to pull this off without giving up their real identity, we can instead just focus on identity instead. + +The FreeSewing community exists almost exclusively online. +In contrast, **FreeSewing's web of trust is made up of people who know and have verified each others _real_ identities**. + +In other words, to gain elevated permissions or access in FreeSewing, we need to know who you are and where you live. + +## Joining the web of trust + +To join FreeSewing's web of trust, you should: + +- Be a contributor +- Reach out to one of the current trustees +- Meet up with them -- physically, in the real world -- and verify each other's identities. +- Once the current trustee vouches for your identity, you can be added to the web of trust + + +Being a trustee is a requirement to be granted elevated privileges. It ddoes not automatically grant them. + + +## FreeSewing's web of trust + + + +## Trustees + + + diff --git a/sites/dev/components/web-of-trust.mjs b/sites/dev/components/web-of-trust.mjs new file mode 100644 index 00000000000..cb4eb190860 --- /dev/null +++ b/sites/dev/components/web-of-trust.mjs @@ -0,0 +1,9512 @@ +// Dependencies +import { trustees, connections, lastUpdate } from 'config/trustees.mjs' +import { shortDate } from 'shared/utils.mjs' +// Hooks +import { useState, useContext } from 'react' +// Context +import { ModalContext } from 'shared/context/modal-context.mjs' +import { PanZoomContext } from 'shared/components/workbench/pattern/pan-zoom-context.mjs' +// Components +import { Point } from '@freesewing/core' +import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' +import { WebLink, linkClasses } from 'shared/components/link.mjs' +import { TransformWrapper, TransformComponent } from 'react-zoom-pan-pinch' +import { UserIcon, MapMarkerIcon, FingerprintIcon, LinkIcon } from 'shared/components/icons.mjs' + +/** + * This displays the trustees as a table + */ +export const WebOfTrustTable = () => { + const { setModal } = useContext(ModalContext) + + return ( + + + + + + + + + {Object.keys(trustees).map((id) => ( + + + + + ))} + +
    UserLocation
    + + {trustees[id].in}
    + ) +} + +/** + * Helper method to draw a connection between two trustees on the map + * + * @param {object} from - An objectt with x and y coordinates + * @param {object} to - An objectt with x and y coordinates + * @return {string} pathString - The path string to draw the path + */ +const fromToPath = (from, to) => { + const p = {} + const angle = 35 + const shift = 0.5 + p.from = new Point(from.x, from.y) + p.to = new Point(to.x, to.y) + p.fromCp = p.from.shiftFractionTowards(p.to, shift).rotate(-1 * angle, p.from) + p.toCp = p.to.shiftFractionTowards(p.from, shift).rotate(angle, p.to) + + return `M ${p.from.x},${p.from.y} C ${p.fromCp.x}, ${p.fromCp.y} ${p.toCp.x}, ${p.toCp.y} ${p.to.x}, ${p.to.y}` +} + +/** + * This component shows the trustee details, typically loaded in a modal window + * + * @param {number} props.id - The id (FreeSewing user id) of the trustee + */ +const Details = ({ id }) => ( + <> +

    Trustee Details

    +
      +
    • + {trustees[id].title} +
      • +
    • + {trustees[id].in} +
      • +
    • + + + {`FreeSewing.org/users/user?id=${id}`} + +
      • +
    + +) + +/** + * This displays the trustees as a map + */ +export const WebOfTrustMap = () => { + const [fullMap, setFullMap] = useState(false) + const { setModal } = useContext(ModalContext) + + const { onTransformed, setZoomFunctions } = useContext(PanZoomContext) + + return ( + <> +
    + + + + {world} + {connections.map(([from, to], i) => ( + + ))} + {Object.keys(trustees).map((id) => ( + + setModal( + +
    +     + ) + } + > + +     + ))} +     +     +     +
    +
    + + Last update:{' '} + + {shortDate( + 'en', + new Date( + new Date( + lastUpdate.substr(0, 4), + lastUpdate.substr(4, 2) - 1, + lastUpdate.substr(6, 2) + ) + ), + false + )} + + + +
    + + ) +} + +/* + * React version of https://upload.wikimedia.org/wikipedia/commons/b/bc/BlankMap-World-Compact.svg + */ +const world = ( + <> + + + + + + + + Sudan + + + South Sudan + + + Georgia + + + Abkhazia + + + + South Ossetia + + + + + Peru + + + Burkina Faso + + + France + + + + + + + + + + Guadeloupe + + + + + + + + Martinique + + + + Reunion + + + + Mayotte + + + + French Guiana + + + + Libya + + + Belarus + + + Pakistan + + + Azad Kashmir + + + + Indonesia + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Yemen + + + + + + + Madagascar + + + + + + Bolivia, Plurinational State of + + + + + Serbia + + + Kosovo + + + + + Cote d'Ivoire + + + Algeria + + + Switzerland + + + Cameroon + + + North Macedonia + + + Botswana + + + Kenya + + + Jordan + + + Mexico + + + + + + + + + + + + + + + + + + United Arab Emirates + + + + + Belize + + + + + Brazil + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Sierra Leone + + + + + Mali + + + Congo, Democratic Republic of the + + + Italy + + + + + + + + Somalia + + + Somaliland + + + + Afghanistan + + + Bangladesh + + + + + + + + + + + + + + Dominican Republic + + + + + Guinea-Bissau + + + + + + + + + + + Ghana + + + Austria + + + Sweden + + + + + + + + + + + + + + + Turkey + + + + + + Uganda + + + Mozambique + + + + + + + Japan + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + New Zealand + + + + + + + + + + + + Cuba + + + + + + + + + + + Venezuela, Bolivarian Republic of + + + + + + + + + + + + + + + + Portugal + + + + + + + + + + + Colombia + + + Mauritania + + + + + Angola + + + + + Germany + + + + + + + + Thailand + + + + + + + + + + + + Australia + + + + + + + + + + + + + + + + + + + + + + + Papua New Guinea + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Iraq + + + Croatia + + + + + + + + + + + + + + + + + + + + + Greenland + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Niger + + + Denmark + + + + + + + + + + + + + + + + + + Latvia + + + Romania + + + Zambia + + + Myanmar + + + + + + + + + + + + + + + + + + + + + + + Ethiopia + + + Guatemala + + + Suriname + + + Czech Republic + + + Chad + + + Albania + + + Finland + + + + + + + + + + + + + + + + + + + + + + Syrian Arab Republic + + + Kyrgyzstan + + + Solomon Islands + + + + + + + + + + + + + + + + + + + + + + + + + + + Oman + + + + + + Panama + + + + + + + + Argentina + + + + + + + + United Kingdom of Great Britain and Northern Ireland + + + + + + + + + + + + + + + + + + + + + + + + + + + + Costa Rica + + + Paraguay + + + Guinea + + + + + Ireland + + + + + + Nigeria + + + + + + Tunisia + + + + + Poland + + + Namibia + + + South Africa + + + Egypt + + + Tanzania, United Republic of + + + + + + + Saudi Arabia + + + + + + + + Viet Nam + + + + + + + + + + + + + Russian Federation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Crimea + + + + Haiti + + + + + + + Bosnia and Herzegovina + + + India + + + + + + + + + + + + + + + China + + + + + + + + + + + + + + + + + + + + + + + + Hong Kong + + + + + + + + Macao + + + + Taiwan + + + + + + Canada + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + El Salvador + + + Guyana + + + Belgium + + + Equatorial Guinea + + + + + Lesotho + + + Bulgaria + + + Burundi + + + Djibouti + + + Azerbaijan + + + + + + Nagorno-Karabakh + + + + + Iran, Islamic Republic of + + + + + + + Malaysia + + + + + + + + + + + + + + + + + + Philippines + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Uruguay + + + Congo + + + Montenegro + + + + Estonia + + + + + + + + Rwanda + + + Armenia + + + Senegal + + + Togo + + + Spain + + + + + + + + + + + + + + + Gabon + + + + + Hungary + + + Malawi + + + Tajikistan + + + Cambodia + + + + + + + Korea, Republic of + + + + + + + + + + + + Honduras + + + + + Iceland + + + Nicaragua + + + Chile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Morocco + + + + Western Sahara + + + Sahrawi Arab Democratic Republic (Free Zone) + + + + + Liberia + + + Netherlands + + + + + + + + + + + + Bonaire, Sint Eustatius and Saba + + + + + Central African Republic + + + Slovakia + + + Lithuania + + + Zimbabwe + + + Sri Lanka + + + + + + Israel + + + + + Gaza Strip (State of Palestine) + + + West Bank (State of Palestine) + + + + + + + Lao People's Democratic Republic + + + Korea, Democratic People's Republic of + + + Greece + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Turkmenistan + + + Ecuador + + + + + + + + + + + + + Benin + + + Slovenia + + + Norway + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Moldova, Republic of + + + Transnistria + + + + + Ukraine + + + Donetsk People's Republic + + + + Luhansk People's Republic + + + + + Lebanon + + + + Nepal + + + Eritrea + + + + + United States of America + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Kazakhstan + + + + + French Southern Territories + + + + Eswatini + + + + Uzbekistan + + + Mongolia + + + Bhutan + + + New Caledonia + + + + + + + + + + + Fiji + + + + + + + + + + + + + Kuwait + + + + + + + Timor-Leste + + + + + + + Bahamas + + + + + + + + + + + + + + + + + + + + + + + Vanuatu + + + + + + + + + + + + + + + + + + + Falkland Islands (Malvinas) + + + + + + + + + + + + + South Georgia and the South Sandwich Islands + + + + + + Gambia, Republic of The + + + + Qatar + + + + Jamaica + + + + Cyprus + + + + + Northern Cyprus + + + + + Puerto Rico + + + + Brunei Darussalam + + + + + + + Trinidad and Tobago + + + + + + + Cabo Verde + + + + + + + + + + + + + French Polynesia + + + + + + + + + + + + + Samoa + + + + + + + Luxembourg + + + + Comoros + + + + + + + + Mauritius + + + + Faroe Islands + + + + + + + + + + + Sao Tome and Principe + + + + + + + Virgin Islands, U.S. + + + + + + + Curacao + + + + Sint Maarten (Dutch Part) + + + + Dominica + + + + Tonga + + + + + + + Kiribati + + + + + + + Micronesia, Federated States of + + + + Bahrain + + + + + Northern Mariana Islands + + + + Palau + + + + Seychelles + + + + Antigua and Barbuda + + + + + + + Barbados + + + + Turks and Caicos Islands + + + + + + + + Saint Vincent and the Grenadines + + + + Saint Lucia + + + + Grenada + + + + Malta + + + + Maldives + + + + Cayman Islands + + + + Saint Kitts and Nevis + + + + + + + Montserrat + + + + Saint Barthelemy + + + + Niue + + + + Saint Pierre and Miquelon + + + + Cook Islands + + + + + + + Wallis and Futuna + + + + American Samoa + + + + Marshall Islands + + + + Aruba + + + + Liechtenstein + + + + Virgin Islands, British + + + + + + + Saint Helena, Ascension and Tristan Da Cunha + + + + Jersey + + + + Anguilla + + + + Saint Martin (French Part) + + + + Guernsey + + + + San Marino + + + + Bermuda + + + + Tuvalu + + + + Nauru + + + + Gibraltar + + + + Pitcairn + + + + Monaco + + + + Holy See (Vatican City State) + + + + Isle of Man + + + + Guam + + + + Singapore + + + + Norfolk Island + + + + Tokelau + + + +) diff --git a/sites/shared/components/icons.mjs b/sites/shared/components/icons.mjs index a1069541af7..bbff1da1995 100644 --- a/sites/shared/components/icons.mjs +++ b/sites/shared/components/icons.mjs @@ -455,6 +455,13 @@ export const LockIcon = (props) => ( ) +export const MapMarkerIcon = (props) => ( + + + + +) + export const MastodonIcon = (props) => ( diff --git a/sites/shared/components/mdx/index.mjs b/sites/shared/components/mdx/index.mjs index 70aa30baacf..f9ba3f7206b 100644 --- a/sites/shared/components/mdx/index.mjs +++ b/sites/shared/components/mdx/index.mjs @@ -19,6 +19,8 @@ import { MeasieImage } from 'shared/components/measurements/image.mjs' // Dev/Org jargon import { Term as SharedTerm, termList } from 'shared/components/jargon.mjs' import { jargon, site } from 'site/prebuild/jargon.mjs' +// Dev web of trust +import { WebOfTrustMap, WebOfTrustTable } from '../../../dev/components/web-of-trust.mjs' export const Term = ({ children }) => export const TermList = termList(jargon, site) @@ -69,6 +71,8 @@ export const components = (site = 'org', slug = []) => { ...extra, Method: HttpMethod, StatusCode: HttpStatusCode, + WebOfTrustTable, + WebOfTrustMap, } const specific = {} diff --git a/sites/shared/styles/globals.css b/sites/shared/styles/globals.css index 6d736bc118d..498005da0ac 100644 --- a/sites/shared/styles/globals.css +++ b/sites/shared/styles/globals.css @@ -663,3 +663,18 @@ details[open] > summary > svg.summary-chevron { details > summary:hover > svg.summary-chevron { stroke-width: 5; } + +svg.svg-world path { + fill: currentColor; + fill: theme('colors.primary'); + fill-opacity: 0.2; + stroke: theme('colors.primary'); + stroke-opacity: 0.666; +} + +svg.svg-world circle.user, +svg.svg-world path.connection { + fill: none; + stroke: theme('colors.accent'); + stroke-opacity: 0.666; +} From daa0c8167e4828096845f657553446ca1b71fb48 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 6 Apr 2024 13:24:34 +0200 Subject: [PATCH 628/795] chore: Linter warning --- sites/dev/components/web-of-trust.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/dev/components/web-of-trust.mjs b/sites/dev/components/web-of-trust.mjs index cb4eb190860..e01b29bb4bf 100644 --- a/sites/dev/components/web-of-trust.mjs +++ b/sites/dev/components/web-of-trust.mjs @@ -11,7 +11,7 @@ import { Point } from '@freesewing/core' import { ModalWrapper } from 'shared/components/wrappers/modal.mjs' import { WebLink, linkClasses } from 'shared/components/link.mjs' import { TransformWrapper, TransformComponent } from 'react-zoom-pan-pinch' -import { UserIcon, MapMarkerIcon, FingerprintIcon, LinkIcon } from 'shared/components/icons.mjs' +import { UserIcon, MapMarkerIcon, LinkIcon } from 'shared/components/icons.mjs' /** * This displays the trustees as a table From b220e3c58d1657102271eecf6fc5d61b8bc920db Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Thu, 4 Apr 2024 13:52:18 +0200 Subject: [PATCH 629/795] Fix eslint complaints --- sites/org/pages/admin/subscribers.mjs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sites/org/pages/admin/subscribers.mjs b/sites/org/pages/admin/subscribers.mjs index 503e86d3231..53fbcdbf14e 100644 --- a/sites/org/pages/admin/subscribers.mjs +++ b/sites/org/pages/admin/subscribers.mjs @@ -1,9 +1,8 @@ // Dependencies import { serverSideTranslations } from 'next-i18next/serverSideTranslations' -import { nsMerge, getSearchParam } from 'shared/utils.mjs' +import { nsMerge } from 'shared/utils.mjs' // Hooks -import { useTranslation } from 'next-i18next' -import { useState, useEffect } from 'react' +import { useState } from 'react' import { useBackend } from 'shared/hooks/use-backend.mjs' // Components import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs' @@ -14,7 +13,6 @@ import { SearchIcon } from 'shared/components/icons.mjs' const ns = nsMerge(pageNs, authNs) const SubscribersPage = ({ page }) => { - const { t } = useTranslation(ns) const [subscribers, setSubscribers] = useState() const [q, setQ] = useState() const [hits, setHits] = useState([]) From f8d9aeb035025a8550c3b30ac323ddfbafcae469 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 6 Apr 2024 18:00:10 +0200 Subject: [PATCH 630/795] chore: Changelog/all-contributors update Updated the changelog after recent features/fixes by @haasjona and @woutervdub Re-ran reconfigure to update README's with the updated contributor list. --- CHANGELOG.md | 19 +++++++++++ README.md | 35 +++++++++++---------- config/changelog.yaml | 9 ++++++ designs/aaron/README.md | 2 +- designs/aaron/package.json | 2 +- designs/albert/README.md | 2 +- designs/albert/package.json | 2 +- designs/bee/README.md | 2 +- designs/bee/package.json | 2 +- designs/bella/README.md | 2 +- designs/bella/package.json | 2 +- designs/benjamin/README.md | 2 +- designs/benjamin/package.json | 2 +- designs/bent/README.md | 2 +- designs/bent/package.json | 2 +- designs/bob/README.md | 2 +- designs/bob/package.json | 2 +- designs/breanna/README.md | 2 +- designs/breanna/package.json | 2 +- designs/brian/README.md | 2 +- designs/brian/package.json | 2 +- designs/bruce/README.md | 2 +- designs/bruce/package.json | 2 +- designs/carlita/README.md | 2 +- designs/carlita/package.json | 2 +- designs/carlton/README.md | 2 +- designs/carlton/package.json | 2 +- designs/cathrin/README.md | 2 +- designs/cathrin/package.json | 2 +- designs/charlie/README.md | 2 +- designs/charlie/package.json | 2 +- designs/cornelius/README.md | 2 +- designs/cornelius/package.json | 2 +- designs/diana/README.md | 2 +- designs/diana/package.json | 2 +- designs/examples/README.md | 2 +- designs/examples/package.json | 2 +- designs/florence/README.md | 2 +- designs/florence/package.json | 2 +- designs/florent/README.md | 2 +- designs/florent/package.json | 2 +- designs/gozer/README.md | 2 +- designs/gozer/package.json | 2 +- designs/hi/README.md | 2 +- designs/hi/package.json | 2 +- designs/holmes/README.md | 2 +- designs/holmes/package.json | 2 +- designs/hortensia/README.md | 2 +- designs/hortensia/package.json | 2 +- designs/huey/README.md | 2 +- designs/huey/package.json | 2 +- designs/hugo/README.md | 2 +- designs/hugo/package.json | 2 +- designs/jaeger/README.md | 2 +- designs/jaeger/package.json | 2 +- designs/legend/README.md | 2 +- designs/legend/package.json | 2 +- designs/lucy/README.md | 2 +- designs/lucy/package.json | 2 +- designs/lumina/README.md | 2 +- designs/lumina/package.json | 2 +- designs/lumira/README.md | 2 +- designs/lumira/package.json | 2 +- designs/lunetius/README.md | 2 +- designs/lunetius/package.json | 2 +- designs/magde/README.md | 2 +- designs/magde/package.json | 2 +- designs/naomiwu/README.md | 2 +- designs/naomiwu/package.json | 2 +- designs/noble/README.md | 2 +- designs/noble/package.json | 2 +- designs/octoplushy/README.md | 2 +- designs/octoplushy/package.json | 2 +- designs/onyx/README.md | 2 +- designs/onyx/package.json | 2 +- designs/otis/README.md | 2 +- designs/otis/package.json | 2 +- designs/paco/README.md | 2 +- designs/paco/package.json | 2 +- designs/penelope/README.md | 2 +- designs/penelope/package.json | 2 +- designs/plugintest/README.md | 2 +- designs/plugintest/package.json | 2 +- designs/rendertest/README.md | 2 +- designs/rendertest/package.json | 2 +- designs/sandy/README.md | 2 +- designs/sandy/package.json | 2 +- designs/shelly/README.md | 2 +- designs/shelly/package.json | 2 +- designs/shin/README.md | 2 +- designs/shin/package.json | 2 +- designs/simon/README.md | 2 +- designs/simon/package.json | 2 +- designs/simone/README.md | 2 +- designs/simone/package.json | 2 +- designs/skully/README.md | 2 +- designs/skully/package.json | 2 +- designs/sven/README.md | 2 +- designs/sven/package.json | 2 +- designs/tamiko/README.md | 2 +- designs/tamiko/package.json | 2 +- designs/teagan/README.md | 2 +- designs/teagan/package.json | 2 +- designs/tiberius/README.md | 2 +- designs/tiberius/package.json | 2 +- designs/titan/README.md | 2 +- designs/titan/package.json | 2 +- designs/trayvon/README.md | 2 +- designs/trayvon/package.json | 2 +- designs/tristan/README.md | 2 +- designs/tristan/package.json | 2 +- designs/uma/README.md | 2 +- designs/uma/package.json | 2 +- designs/wahid/README.md | 2 +- designs/wahid/package.json | 2 +- designs/walburga/README.md | 2 +- designs/walburga/package.json | 2 +- designs/waralee/README.md | 2 +- designs/waralee/package.json | 2 +- designs/yuri/README.md | 2 +- designs/yuri/package.json | 2 +- packages/core/README.md | 2 +- packages/core/package.json | 2 +- packages/models/README.md | 2 +- packages/new-design/README.md | 2 +- packages/prettier-config/README.md | 2 +- packages/react-components/README.md | 2 +- packages/rehype-highlight-lines/README.md | 2 +- packages/rehype-jargon/README.md | 2 +- packages/snapseries/README.md | 2 +- plugins/core-plugins/README.md | 2 +- plugins/core-plugins/package.json | 2 +- plugins/plugin-annotations/README.md | 2 +- plugins/plugin-annotations/package.json | 2 +- plugins/plugin-bin-pack/README.md | 2 +- plugins/plugin-bin-pack/package.json | 2 +- plugins/plugin-bust/README.md | 2 +- plugins/plugin-bust/package.json | 2 +- plugins/plugin-flip/README.md | 2 +- plugins/plugin-flip/package.json | 2 +- plugins/plugin-gore/README.md | 2 +- plugins/plugin-gore/package.json | 2 +- plugins/plugin-i18n/README.md | 2 +- plugins/plugin-i18n/package.json | 2 +- plugins/plugin-measurements/README.md | 2 +- plugins/plugin-measurements/package.json | 2 +- plugins/plugin-mirror/README.md | 2 +- plugins/plugin-mirror/package.json | 2 +- plugins/plugin-ringsector/README.md | 2 +- plugins/plugin-ringsector/package.json | 2 +- plugins/plugin-round/README.md | 2 +- plugins/plugin-round/package.json | 2 +- plugins/plugin-sprinkle/README.md | 2 +- plugins/plugin-sprinkle/package.json | 2 +- plugins/plugin-svgattr/README.md | 2 +- plugins/plugin-svgattr/package.json | 2 +- plugins/plugin-theme/README.md | 2 +- plugins/plugin-theme/package.json | 2 +- plugins/plugin-timing/README.md | 2 +- plugins/plugin-timing/package.json | 2 +- plugins/plugin-versionfree-svg/README.md | 2 +- plugins/plugin-versionfree-svg/package.json | 2 +- sites/backend/package.json | 8 ++--- sites/dev/package.json | 8 ++--- sites/lab/package.json | 8 ++--- sites/org/package.json | 10 +++--- sites/sde/package.json | 14 ++++----- sites/shared/package.json | 14 ++++----- 168 files changed, 237 insertions(+), 206 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e11cb5c4fa0..c25df94ecc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,13 @@ - Add missing dimension id attributes +### noble + +#### Fixed + + - Fix 'cutonfold' text for Noble's back part. Fixes + - Improve dart shaping. Fixes + ### onyx #### Changed @@ -41,6 +48,12 @@ - Always load plugin-bust due to its changes in how it handle conditionality. +### teagan + +#### Fixed + + - Fix side seam when length is cropped. Fixes + ### uma #### Fixed @@ -65,6 +78,12 @@ - The `withCondition` named export is deprecated and will always return true. +### core + +#### Added + + - The `Path.rotate()` method was added to the core API. + ## 3.2.0 (2024-02-11) diff --git a/README.md b/README.md index 2b08d3b8086..6a2068d2958 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@     All Contributors

    Cathy Zoller
    Cathy Zoller
    📖 Chantal Lapointe
    Chantal Lapointe
    🌍 + Corey
    Corey
    💬 Damien PIQUET
    Damien PIQUET
    💻 Darigov Research
    Darigov Research
    📖 🤔 David Clegg
    David Clegg
    🎨 💻 Elena FdR
    Elena FdR
    📖 📝 - Emmanuel Nyachoke
    Emmanuel Nyachoke
    💻 📖 + Emmanuel Nyachoke
    Emmanuel Nyachoke
    💻 📖 Enoch Riese
    Enoch Riese
    💻 EvEkSwed
    EvEkSwed
    🌍 Fantastik-Maman
    Fantastik-Maman
    🌍 Forrest O.
    Forrest O.
    📖 Frédéric
    Frédéric
    🌍 Glenn Matthews
    Glenn Matthews
    📖 - Greg Sadetsky
    Greg Sadetsky
    📖 + Greg Sadetsky
    Greg Sadetsky
    📖 Himanshu Singh
    Himanshu Singh
    📖 Igor Couto
    Igor Couto
    🐛 Ikko Ashimine
    Ikko Ashimine
    📖 Irapeke
    Irapeke
    🌍 Ivo Bek
    Ivo Bek
    📖 Jacek Sawoszczuk
    Jacek Sawoszczuk
    📖 - Jason Williams
    Jason Williams
    📖 + Jason Williams
    Jason Williams
    📖 Jeremy Jackson
    Jeremy Jackson
    💻 Jeroen Hoek
    Jeroen Hoek
    📖 Joe Schofield
    Joe Schofield
    📖 Joebidido
    Joebidido
    🌍 Jonathan Haas
    Jonathan Haas
    💻 Joost De Cock
    Joost De Cock
    🚧 - Josh Essman
    Josh Essman
    📖 + Josh Essman
    Josh Essman
    📖 Josh Munic
    Josh Munic
    🐛 Kake
    Kake
    📖 Kapunahele Wong
    Kapunahele Wong
    📖 Karen
    Karen
    📖 📋 Karl Nippoldt
    Karl Nippoldt
    📖 Katie McGinley
    Katie McGinley
    📖 - Kieran Klaassen
    Kieran Klaassen
    💻 + Kieran Klaassen
    Kieran Klaassen
    💻 Kittycatou
    Kittycatou
    🌍 Kris
    Kris
    📖 Kristin Ruben
    Kristin Ruben
    💻 Lin
    Lin
    💻 Loudepeuter
    Loudepeuter
    🌍 Lucian
    Lucian
    📋 - Luiz Saggioro
    Luiz Saggioro
    💻 + Luiz Saggioro
    Luiz Saggioro
    💻 MA-TATAS
    MA-TATAS
    📖 Marcus
    Marcus
    🌍 Martin Tribo
    Martin Tribo
    📖 Nadege Michel
    Nadege Michel
    ⚠️ 📖 Natalia
    Natalia
    💻 🎨 📝 Nathan Yergler
    Nathan Yergler
    📖 - Nick Dower
    Nick Dower
    📖 💻 🐛 + Nick Dower
    Nick Dower
    📖 💻 🐛 Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 Phillip Thelen
    Phillip Thelen
    💻 - Pixieish
    Pixieish
    📖 + Pixieish
    Pixieish
    📖 Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 Sanne
    Sanne
    💻 📖 - Sara Latorre
    Sara Latorre
    🌍 + Sara Latorre
    Sara Latorre
    🌍 SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 Soham Tembhurne
    Soham Tembhurne
    💻 - SoneaTheBest
    SoneaTheBest
    🌍 + SoneaTheBest
    SoneaTheBest
    🌍 Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 Trent Trama
    Trent Trama
    💻 - Tríona
    Tríona
    📖 + Tríona
    Tríona
    📖 Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 amysews
    amysews
    📖 - anna-puk
    anna-puk
    💻 + anna-puk
    anna-puk
    💻 beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 chri5b
    chri5b
    💻 ⚠️ - dingcycle
    dingcycle
    🌍 + dingcycle
    dingcycle
    🌍 drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 gaylyndie
    gaylyndie
    📖 - grimlokason
    grimlokason
    💻 + grimlokason
    grimlokason
    💻 hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 mesil
    mesil
    🐛 - starfetch
    starfetch
    💻 📖 🌍 🎨 + starfetch
    starfetch
    💻 📖 🌍 🎨 timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 viocky
    viocky
    🌍 woolishboy
    woolishboy
    💻 + + yc
    yc
    🌍 diff --git a/config/changelog.yaml b/config/changelog.yaml index 5b3a7efc9c5..68b97e0d2e1 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -1,4 +1,8 @@ Unreleased: + Added: + core: + - The `Path.rotate()` method was added to the core API. + Changed: brian: - Always load plugin-bust due to its changes in how it handle conditionality. @@ -26,6 +30,11 @@ Unreleased: - Hide unused ribbing parts when ribbing option is disabled hugo: - Add missing dimension id attributes + noble: + - Fix 'cutonfold' text for Noble's back part. Fixes #6447 + - Improve dart shaping. Fixes #64547 + teagan: + - Fix side seam when length is cropped. Fixes #6480 uma: - Fix back exposure when expand is off. Fixes #6239 diff --git a/designs/aaron/README.md b/designs/aaron/README.md index f4713859377..47692bddbca 100644 --- a/designs/aaron/README.md +++ b/designs/aaron/README.md @@ -21,7 +21,7 @@ All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    Date: Sat, 6 Apr 2024 18:06:04 +0200 Subject: [PATCH 631/795] chore: Dependency updates --- sites/backend/package.json | 8 ++++---- sites/dev/package.json | 6 +++--- sites/lab/package.json | 2 +- sites/org/package.json | 4 ++-- sites/sde/package.json | 4 ++-- sites/shared/package.json | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 60e4f8b2fd0..d5402230213 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,8 +28,8 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.549.0", - "@prisma/client": "5.12.1", + "@aws-sdk/client-sesv2": "3.535.0", + "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.13.0", + "swagger-ui-dist": "5.12.0", "swagger-ui-express": "5.0.0" }, "devDependencies": { @@ -53,7 +53,7 @@ "mocha": "10.3.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.12.1" + "prisma": "5.11.0" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/sites/dev/package.json b/sites/dev/package.json index 78ce632f5d5..06c5d74a6f6 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -33,9 +33,9 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", - "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.23.2", - "daisyui": "4.10.1", + "@tailwindcss/typography": "0.5.10", + "algoliasearch": "4.22.1", + "daisyui": "4.7.3", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index b8e91c311b2..cce2c19d072 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.1", + "daisyui": "4.7.3", "i18next": "23.10.1", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index 52acf3d0ee8..9276ee11271 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,10 +37,10 @@ "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.10.1", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", - "jotai": "2.7.2", + "jotai": "2.7.1", "jotai-location": "0.5.4", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 338fd3adfa6..93fa2362bb1 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,12 +50,12 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.1", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", "i18next": "23.10.1", - "jotai": "2.7.2", + "jotai": "2.7.1", "jotai-location": "0.5.4", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", diff --git a/sites/shared/package.json b/sites/shared/package.json index bf8d901b4ae..3ea149a0c2d 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,13 +23,13 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.1", + "daisyui": "4.7.3", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", "highlight.js": "11.9.0", "github-slugger": "2.0.0", - "jotai": "2.7.2", + "jotai": "2.7.1", "jotai-location": "0.5.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", From bfae8c1f25bae8cf5db9a6e9f2470b963af9f6b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:07:17 +0000 Subject: [PATCH 632/795] chore(deps): Bump express from 4.19.1 to 4.19.2 in /sites/backend Bumps [express](https://github.com/expressjs/express) from 4.19.1 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.1...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index d5402230213..31a2d359598 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -33,7 +33,7 @@ "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", - "express": "4.19.1", + "express": "4.19.2", "js-yaml": "4.1.0", "lodash.get": "4.4.2", "mustache": "4.2.0", From aabfa0751750a7f185406d8bfae56e7c1a205aa3 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 20:04:05 +0200 Subject: [PATCH 633/795] New translations en.md (Spanish) skip-build --- markdown/org/blog/open-backend-api/es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/blog/open-backend-api/es.md b/markdown/org/blog/open-backend-api/es.md index 1396125ae02..3d73b00dddd 100644 --- a/markdown/org/blog/open-backend-api/es.md +++ b/markdown/org/blog/open-backend-api/es.md @@ -20,7 +20,7 @@ Supongo que, al menos al principio, será una función muy especializada. Sin em Por lo menos, sé que lo haré. -La [documentación de referencia de la API REST vive aquí](https://freesewing.dev/reference/backend), si buscas la Especificación OpenAPI, entonces ve a https\://backend3.freesewing.org/docs/ +La [documentación de referencia de la API REST vive aquí](https://freesewing.dev/reference/backend), si buscas la Especificación OpenAPI, entonces ve a https://backend3.freesewing.org/docs/ ## Usa, no abuses From 161360e6b29e9bf694e2a99ddd770ac17ccdcd64 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 20:49:16 +0200 Subject: [PATCH 634/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/simon/instructions/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/simon/instructions/uk.md b/markdown/org/docs/designs/simon/instructions/uk.md index e93726b994f..7f541238270 100644 --- a/markdown/org/docs/designs/simon/instructions/uk.md +++ b/markdown/org/docs/designs/simon/instructions/uk.md @@ -252,7 +252,7 @@ Note: as of March 19, 2024, this link appears to be down as it's redirecting to Для цього прошийте точно поверх попереднього шва. Оскільки ви склали тканину планки трохи за цим швом, вона зачепиться ззаду, фіксуючи складену планку на місці і закриваючи припуски шва всередині. -![Stitch in the ditch](9e.png) +![Пришийте кокетку з петлями для ґудзиків](9e.png) ### Крок 10: Підготуйте планку для петель From 5a8ce0885dd7b9da85ffdd59f16c304556d67317 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 20:59:38 +0200 Subject: [PATCH 635/795] New translations en.md (Ukrainian) skip-build --- markdown/org/blog/open-backend-api/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/blog/open-backend-api/uk.md b/markdown/org/blog/open-backend-api/uk.md index f9ef07d2a5a..f05637e1bc8 100644 --- a/markdown/org/blog/open-backend-api/uk.md +++ b/markdown/org/blog/open-backend-api/uk.md @@ -20,7 +20,7 @@ author: 1 Принаймні, я знаю, що так і буде. -Довідкова документація [REST API знаходиться тут] (https\://freesewing.dev/reference/backend), якщо ви шукаєте специфікацію OpenAPI, то перейдіть на https\://backend3.freesewing.org/docs/ +Довідкова документація [REST API знаходиться тут] (https://freesewing.dev/reference/backend), якщо ви шукаєте специфікацію OpenAPI, то перейдіть на https://backend3.freesewing.org/docs/ ## Використовуйте, але не зловживайте From a987447ae50e9a89943a9112b449bb957fcc858b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:27 +0200 Subject: [PATCH 636/795] New translations en.md (French) skip-build --- markdown/org/newsletter/2024q1/fr.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/markdown/org/newsletter/2024q1/fr.md b/markdown/org/newsletter/2024q1/fr.md index f26e5ce35a3..5f543848f4e 100644 --- a/markdown/org/newsletter/2024q1/fr.md +++ b/markdown/org/newsletter/2024q1/fr.md @@ -40,7 +40,7 @@ et continuez comme ça.   -*** +---   @@ -95,7 +95,7 @@ pour nous faire part de tes idées ! D'ici là, nous verrons ce que l'avenir nou   -*** +---   @@ -125,7 +125,7 @@ J'apprécie vraiment l'approche de Wouter, qui a ses propres besoins qui sont à   -*** +---   @@ -165,7 +165,7 @@ Je suppose que nous verrons comment ça se passe. You can find out for yourself,   -*** +---   @@ -179,7 +179,7 @@ Ok, alors voilà, j'espère que tout s'est bien passé à la fin. Mais pour rapp   -*** +---   @@ -188,7 +188,7 @@ Ok, alors voilà, j'espère que tout s'est bien passé à la fin. Mais pour rapp 2023 n'a pas été une année facile pour moi personnellement, ni pour FreeSewing d'ailleurs. The amount of time and effort that went into v3 is something that takes a lot out of you, and I am not ashamed to admit that more than any other year before I've struggled with feelings of _why am I even doing this_. Cependant, aujourd'hui, je me sens heureuse et fière parce que les recettes de FreeSewing pour 2023 ont atteint **10 222,07** (11 301 $). -Comme tu le sais peut-être ou non, [tous les revenus de FreeSewing sont reversés à Médecins sans frontières] (https\://freesewing.org/docs/about/pledge), ce qui signifie que 10 222,07 € ont été versés pour aider certaines des personnes les plus vulnérables de cette planète. +Comme tu le sais peut-être ou non, [tous les revenus de FreeSewing sont reversés à Médecins sans frontières] (https://freesewing.org/docs/about/pledge), ce qui signifie que 10 222,07 € ont été versés pour aider certaines des personnes les plus vulnérables de cette planète. Je suis particulièrement heureux que nous ayons repassé au-dessus de la barre des 10 000, après être descendus en dessous plusieurs années de suite. From 5fdf606e417fa88ec9da1aba81ad665bb393e6ce Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:34 +0200 Subject: [PATCH 637/795] New translations en.md (Spanish) skip-build --- markdown/org/newsletter/2024q1/es.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/markdown/org/newsletter/2024q1/es.md b/markdown/org/newsletter/2024q1/es.md index 0c9eac06153..df8465fcfcc 100644 --- a/markdown/org/newsletter/2024q1/es.md +++ b/markdown/org/newsletter/2024q1/es.md @@ -40,7 +40,7 @@ y sigue así.   -*** +---   @@ -95,7 +95,7 @@ para aportar ideas. Hasta entonces, veremos qué nos depara el futuro.   -*** +---   @@ -125,7 +125,7 @@ Realmente aprecio el enfoque de Wouter, que tiene sus propias necesidades como i   -*** +---   @@ -164,7 +164,7 @@ Supongo que ya veremos cómo va. Puedes averiguarlo por ti mismo, estamos [@free   -*** +---   @@ -178,7 +178,7 @@ Vale, espero que al final todo haya ido bien. Pero como recordatorio: Puedes rec   -*** +---   From 67c35fe4b5f8f2b7ef95ed1fec67bb0549c8997b Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:41 +0200 Subject: [PATCH 638/795] New translations en.md (German) skip-build --- markdown/org/newsletter/2024q1/de.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/markdown/org/newsletter/2024q1/de.md b/markdown/org/newsletter/2024q1/de.md index 7cb36f62a7e..45b06d8e8ee 100644 --- a/markdown/org/newsletter/2024q1/de.md +++ b/markdown/org/newsletter/2024q1/de.md @@ -40,7 +40,7 @@ und mach weiter so.   -*** +---   @@ -94,7 +94,7 @@ zu wenden! Bis dahin werden wir sehen, was die Zukunft bringt.   -*** +---   @@ -124,7 +124,7 @@ Ich schätze Wouters Ansatz sehr: Er hat seine eigenen Bedürfnisse, die ihn zu   -*** +---   @@ -164,7 +164,7 @@ Wir werden sehen, wie es läuft. You can find out for yourself, we're [@freesewi   -*** +---   @@ -178,7 +178,7 @@ Ok, dann hoffen wir mal, dass am Ende alles gut gegangen ist. Aber zur Erinnerun   -*** +---   @@ -187,7 +187,7 @@ Ok, dann hoffen wir mal, dass am Ende alles gut gegangen ist. Aber zur Erinnerun 2023 war kein einfaches Jahr für mich persönlich und auch nicht für FreeSewing. The amount of time and effort that went into v3 is something that takes a lot out of you, and I am not ashamed to admit that more than any other year before I've struggled with feelings of _why am I even doing this_. Aber heute bin ich glücklich und stolz, weil FreeSewing im Jahr 2023 einen Umsatz von **10.222,07€** ($11.301) erzielt hat. -Wie du vielleicht weißt, gehen [alle Einnahmen von FreeSewing an Ärzte ohne Grenzen] (https\://freesewing.org/docs/about/pledge). Das bedeutet, dass 10.222,07 € für einige der bedürftigsten Menschen auf diesem Planeten gespendet wurden. +Wie du vielleicht weißt, gehen [alle Einnahmen von FreeSewing an Ärzte ohne Grenzen] (https://freesewing.org/docs/about/pledge). Das bedeutet, dass 10.222,07 € für einige der bedürftigsten Menschen auf diesem Planeten gespendet wurden. Ich freue mich besonders, dass wir wieder über die 10-Kilometer-Marke geklettert sind, nachdem wir ein paar Jahre in Folge unter diese Marke gerutscht sind. From b923aac2a9d1df11ff01eef7365f57c7c3c5607e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:47 +0200 Subject: [PATCH 639/795] New translations en.md (Dutch) skip-build --- markdown/org/newsletter/2024q1/nl.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/markdown/org/newsletter/2024q1/nl.md b/markdown/org/newsletter/2024q1/nl.md index 9f08b603336..cdb3f727252 100644 --- a/markdown/org/newsletter/2024q1/nl.md +++ b/markdown/org/newsletter/2024q1/nl.md @@ -40,7 +40,7 @@ en ga zo door.   -*** +---   @@ -95,7 +95,7 @@ te bellen met ideeën! Tot die tijd zien we wel wat de toekomst brengt.   -*** +---   @@ -125,7 +125,7 @@ Ik waardeer Wouter's aanpak echt, waarbij hij zijn eigen behoeften heeft die de   -*** +---   @@ -165,7 +165,7 @@ Ik denk dat we wel zullen zien hoe het gaat. Je kunt het zelf ontdekken, we zijn   -*** +---   @@ -179,7 +179,7 @@ Ok, hopelijk is het uiteindelijk allemaal goed gegaan. Maar ter herinnering: Je   -*** +---   From 26951ab68b45dfc812c757f96421c7748ecc67f8 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:52 +0200 Subject: [PATCH 640/795] New translations en.md (Ukrainian) skip-build --- .../showcase/a-full-body-onyx-swimsuit-with-swim-skirt/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/a-full-body-onyx-swimsuit-with-swim-skirt/uk.md b/markdown/org/showcase/a-full-body-onyx-swimsuit-with-swim-skirt/uk.md index 1438d1218cb..15c20d76fda 100644 --- a/markdown/org/showcase/a-full-body-onyx-swimsuit-with-swim-skirt/uk.md +++ b/markdown/org/showcase/a-full-body-onyx-swimsuit-with-swim-skirt/uk.md @@ -15,6 +15,6 @@ Featuring a hood, thumb holes, and long sleeves and legs, it provides nearly ful The swim skirt provides additional modesty and adds some flair. -It is fully lined, including the hood and sleeves, with all but one of the seams hidden inside the lining, and very comfortable. Center seam and outseam ease are 0%, while most eases controlling tightness are set to \~-10%, though wrist is at +11% to give room for the hand, and leg hem is at +10% to help it get over the foot. The skirt length is 100% and width is 126% and is gathered and topstitched into place with no hems or folding. +It is fully lined, including the hood and sleeves, with all but one of the seams hidden inside the lining, and very comfortable. Center seam and outseam ease are 0%, while most eases controlling tightness are set to ~-10%, though wrist is at +11% to give room for the hand, and leg hem is at +10% to help it get over the foot. The skirt length is 100% and width is 126% and is gathered and topstitched into place with no hems or folding. Fabric used is 80% nylon/20% spandex mid-weight swim fabric for the fashion fabric, and 80% polyester/20% spandex heavyweight swim fabric for the lining. Construction is done using a serger/overlock machine for the seams, and a twin needle using a triple stretch stitch for the hems. From 2d2ab83663729632784f418d97071fe63191adad Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:53 +0200 Subject: [PATCH 641/795] New translations en.md (Ukrainian) skip-build --- .../org/showcase/short-sleeve-short-leg-onyx-swimsuit/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/short-sleeve-short-leg-onyx-swimsuit/uk.md b/markdown/org/showcase/short-sleeve-short-leg-onyx-swimsuit/uk.md index 0d586dd9247..139875885de 100644 --- a/markdown/org/showcase/short-sleeve-short-leg-onyx-swimsuit/uk.md +++ b/markdown/org/showcase/short-sleeve-short-leg-onyx-swimsuit/uk.md @@ -13,4 +13,4 @@ An Onyx one-piece swimsuit/unisuit made with short sleeves and short legs. It's It uses 80% nylon / 20% spandex mid-weight swim fabric for the fashion layer, and 80% polyester / 20% spandex heavyweight swim fabric for the lining layer. -Made with a front zipper, a neckband, \~30% leg and sleeve length, \~-20% ease for chest, waist, hips, upper legs, \~-10% sleeve ease, \~-10% center seam ease. The seams are made with a serger/overlocker. The hems are single-fold and made with a double-needle using a triple stretch stitch. The zipper is a 12" long, #5 gauge molded plastic zipper. +Made with a front zipper, a neckband, ~30% leg and sleeve length, ~-20% ease for chest, waist, hips, upper legs, ~-10% sleeve ease, ~-10% center seam ease. The seams are made with a serger/overlocker. The hems are single-fold and made with a double-needle using a triple stretch stitch. The zipper is a 12" long, #5 gauge molded plastic zipper. From edf474fcee3e5dc6b19335be6da2525b763599f1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:54 +0200 Subject: [PATCH 642/795] New translations en.md (Ukrainian) skip-build --- markdown/org/newsletter/2024q1/uk.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/markdown/org/newsletter/2024q1/uk.md b/markdown/org/newsletter/2024q1/uk.md index 5c96880f2d7..e5e1ef8f3be 100644 --- a/markdown/org/newsletter/2024q1/uk.md +++ b/markdown/org/newsletter/2024q1/uk.md @@ -40,7 +40,7 @@ title: 2024 Зимове видання   -*** +---   @@ -70,7 +70,7 @@ title: 2024 Зимове видання відбудуться 4 та 18 січня. Ви також можете знайти дати на вкладці "Події" на сервері FreeSewing Discord (знаходиться вгорі ліворуч). Ви можете написати мені на @lexander2002 на Discord або Діані (головному організатору) на -dianawildschut\@posteo.net, щоб повідомити нам, що ви прийдете :-) Ви можете знайти De War +dianawildschut@posteo.net, щоб повідомити нам, що ви прийдете :-) Ви можете знайти De War за адресою Heiligenbergerweg 34, 3816 AK, в Амерсфорті. Ми запрошуємо людей не тільки користуватися , але й зробити свій внесок у забезпечення життєдіяльності "Де Війни". Сайт працює на безоплатній основі, "ціноутворення на основі сприйнятої цінності". @@ -95,7 +95,7 @@ FreeSewing також буде частиною їхнього дводенно   -*** +---   @@ -103,7 +103,7 @@ FreeSewing також буде частиною їхнього дводенно На FreeSewing.org з'явилися два нових дизайни, про які ви, можливо, ще не знаєте. Звернімося до Воутера, який підписався за них обох, тож давайте послухаємо, що він скаже: -[Отіс] (https\://freesewing.org/designs/otis) - дитячий комбінезон: +[Отіс] (https://freesewing.org/designs/otis) - дитячий комбінезон: > _Коли у моєї племінниці народилася дитина, я знала, що робити: пошити їй одяг для малюка. І я ніколи не шила одягу для немовлят. What they should look like was easy. У мене були власні діти багато років тому, і суцільнолиті речі повинні бути простими у виготовленні_. > @@ -125,14 +125,14 @@ FreeSewing також буде частиною їхнього дводенно   -*** +---   ## Ми (ледве) вчимося. > _Щодо назви: Я думаю, що молодші за мене люди називають Instagram "грамом", тому я взяв це і зробив дієслово, бо що може бути кращим способом продемонструвати, що я не маю жодного уявлення про те, про що говорю._ -> _Це також заплутана відсилка до [допису в блозі 6 з половиною років тому] (https\://freesewing.org/blog/freesewing-goes-jamstack), тож якщо ви це зрозуміли, то вітаю, але я відволікаюся._ +> _Це також заплутана відсилка до [допису в блозі 6 з половиною років тому] (https://freesewing.org/blog/freesewing-goes-jamstack), тож якщо ви це зрозуміли, то вітаю, але я відволікаюся._ > > _Інстаграм. Я говорю про Instagram. Або в більш широкому сенсі - все те, що ми робимо (і не робимо), щоб "просувати" вільне шиття, підвищувати обізнаність і так далі. Назвемо його **marketing**._. @@ -161,11 +161,11 @@ FreeSewing також буде частиною їхнього дводенно Тож я трохи трепетно ставлюся до того, щоб знову долучитися до боротьби, але я також усвідомлюю той факт, що жодна робота не має значення, якщо люди принаймні не можуть якось про неї дізнатися. Тож я не впевнений, як мені це вдасться, і боюся, що тут немає великого висновку. Я просто хотів поділитися своїми думками з цього приводу. -Побачимо, як воно буде. Ви можете переконатися в цьому самі, ми [@freesewing_org] (https\://www\.instagram.com/freesewing_org/) на _грамах_. +Побачимо, як воно буде. Ви можете переконатися в цьому самі, ми [@freesewing_org] (https://www.instagram.com/freesewing_org/) на _грамах_.   -*** +---   @@ -179,7 +179,7 @@ FreeSewing також буде частиною їхнього дводенно   -*** +---   @@ -188,7 +188,7 @@ FreeSewing також буде частиною їхнього дводенно 2023 рік був непростим як для мене особисто, так і для FreeSewing. Кількість часу та зусиль, витрачених на створення v3, забирає багато сил, і мені не соромно зізнатися, що більше, ніж у будь-який інший рік до цього, я боровся з почуттям "навіщо я взагалі це роблю". Однак сьогодні я відчуваю себе щасливою і гордою, тому що дохід FreeSewing за 2023 рік склав **€10,222,07** ($11,301). -Як ви, можливо, знаєте, [весь дохід FreeSewing йде до організації "Лікарі без кордонів"] (https\://freesewing.org/docs/about/pledge), а це означає, що 10 222,07 євро пішли на допомогу найуразливішим людям на нашій планеті. +Як ви, можливо, знаєте, [весь дохід FreeSewing йде до організації "Лікарі без кордонів"] (https://freesewing.org/docs/about/pledge), а це означає, що 10 222,07 євро пішли на допомогу найуразливішим людям на нашій планеті. Я особливо радий, що ми знову піднялися вище позначки в 10 тисяч, після того, як кілька років поспіль опускалися нижче. From 1a9d717f2e70c157da5cbe3154979684c851a81e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:00:55 +0200 Subject: [PATCH 643/795] New translations en.md (Ukrainian) skip-build --- markdown/org/blog/email-breakdown-post-mortem/uk.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/blog/email-breakdown-post-mortem/uk.md b/markdown/org/blog/email-breakdown-post-mortem/uk.md index 67360308fc9..53a733c49cc 100644 --- a/markdown/org/blog/email-breakdown-post-mortem/uk.md +++ b/markdown/org/blog/email-breakdown-post-mortem/uk.md @@ -6,7 +6,7 @@ intro: From the end of 29 October 2023 until 2 January 2024, some emails sent to author: 1 --- -Between the 29th of October 2023 until the 2nd of January 2024, emails sent to joost\@joost.at (my personal email) or various @freesewing.org email addresses went unnoticed. Since noticing the issue today I have gone through the backlog and set aside any messages that I need to deal with. +Between the 29th of October 2023 until the 2nd of January 2024, emails sent to joost@joost.at (my personal email) or various @freesewing.org email addresses went unnoticed. Since noticing the issue today I have gone through the backlog and set aside any messages that I need to deal with. However, this is a manual and tedious process so it's possible that I'll miss a few. In addition, it's also very possible that emails sent to me 2 months ago required a speedier response. @@ -18,7 +18,7 @@ I'd like to apologize to all those who I should have been in touch with but didn To understand what happened, I should start by explaining my email setup. -I have historically used joost\@decock.org as my personal email. It's tied to Google in the way that is no longer possible today, using one of those grandfathered-in domain setups that they don't allow you to have any longer. +I have historically used joost@decock.org as my personal email. It's tied to Google in the way that is no longer possible today, using one of those grandfathered-in domain setups that they don't allow you to have any longer. I don't trust Google as far as I can throw them, but Gmail is the best mail client for my needs because I don't want to spend my time carefully organizing email, I just want to search and find what I'm looking for. Nothing comes close to Gmail when it comes to that. Furthermore, as an Android user, this primary not-really-gmail-but-still-a-bit Google account is also tied to my phone, and a host of other things that are important. In other words, I need to have _some_ Google account, so this is it. From 29e64f91c2f0a11217b5fd46e262bc3c2ceeac89 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:01 +0200 Subject: [PATCH 644/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/measurements-issues/fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/about/faq/measurements-issues/fr.md b/markdown/org/docs/about/faq/measurements-issues/fr.md index f362edb09a7..6ee3d81643f 100644 --- a/markdown/org/docs/about/faq/measurements-issues/fr.md +++ b/markdown/org/docs/about/faq/measurements-issues/fr.md @@ -40,7 +40,7 @@ Tu peux aussi utiliser un ruban. Prends un ruban plus long et mets-le autour de #### Tour de buste supérieur -Le [buste haut] (https\://freesewing.org/docs/measurements/highbust) est une mesure horizontale qui n'a pas besoin d'être parfaitement horizontale. Elle doit faire le tour de ton torse au niveau de la partie la plus étroite du haut de la poitrine, passer sur le buste, sous les bras et dans le dos, mais il n'est pas nécessaire qu'elle soit parallèle au sol sur toute sa longueur. +Le [buste haut] (https://freesewing.org/docs/measurements/highbust) est une mesure horizontale qui n'a pas besoin d'être parfaitement horizontale. Elle doit faire le tour de ton torse au niveau de la partie la plus étroite du haut de la poitrine, passer sur le buste, sous les bras et dans le dos, mais il n'est pas nécessaire qu'elle soit parallèle au sol sur toute sa longueur. [Buste haut vu de côté](highbust.jpg) @@ -48,7 +48,7 @@ Le [buste haut] (https\://freesewing.org/docs/measurements/highbust) est une mes #### Pente d'épaule -Beaucoup ont eu de la chance en utilisant une application d'inclinomètre sur un smartphone pour mesurer [la pente des épaules] (https\://freesewing.org/docs/measurements/shoulderslope). +Beaucoup ont eu de la chance en utilisant une application d'inclinomètre sur un smartphone pour mesurer [la pente des épaules] (https://freesewing.org/docs/measurements/shoulderslope). #### Siège et hanches @@ -60,6 +60,6 @@ L'assise se trouve sur la partie la plus large de tes fesses. D'autres sources a ##### Taille -L'endroit où tu prends les mesures de la [taille] (https\://freesewing.org/docs/measurements/waist) n'est pas nécessairement lié à l'endroit où se trouve, par exemple, une ceinture. +L'endroit où tu prends les mesures de la [taille] (https://freesewing.org/docs/measurements/waist) n'est pas nécessairement lié à l'endroit où se trouve, par exemple, une ceinture. Essaie de te pencher sur le côté et de noter l'endroit où ton corps se plisse. (Pour les points bonus, mets ta main sur ta taille et chante "Je suis une petite théière") From 931e0ef88a7353b4199edc088926588d839295d0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:02 +0200 Subject: [PATCH 645/795] New translations en.md (French) skip-build --- markdown/org/docs/about/faq/standard-measurements/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/about/faq/standard-measurements/fr.md b/markdown/org/docs/about/faq/standard-measurements/fr.md index 2623776fb47..e6108e515a3 100644 --- a/markdown/org/docs/about/faq/standard-measurements/fr.md +++ b/markdown/org/docs/about/faq/standard-measurements/fr.md @@ -4,6 +4,6 @@ title: Où sont passées les mesures "standard" ? Dans les versions antérieures de FreeSewing, nous avons publié un tableau des tailles pour que les utilisateurs puissent essayer la plateforme sans entrer leurs mesures. Comme il n'y a pas de normes réelles pour les tailles, les nôtres ont été - comme tous les tableaux de tailles - inventées. -Nous avons constaté que leur publication créait des attentes déraisonnables. Les utilisateurs ont été déçus lorsque leurs patrons générés avec des tailles "standard" ne s'adaptaient pas comme ils l'espéraient. Nous avons supprimé les mesures inventées en faveur de [des mesures curatés] (https\://freesewing.org/curated-sets). +Nous avons constaté que leur publication créait des attentes déraisonnables. Les utilisateurs ont été déçus lorsque leurs patrons générés avec des tailles "standard" ne s'adaptaient pas comme ils l'espéraient. Nous avons supprimé les mesures inventées en faveur de [des mesures curatés] (https://freesewing.org/curated-sets). -Nous avons également supprimé la possibilité de comparer tes mesures à des mesures "standard" pour essayer d'identifier d'éventuelles erreurs de mesure. À l'avenir, nous pourrons mettre en place différentes méthodes de vérification, mais nous ne les afficherons qu'aux utilisateurs qui sont [à l'aise avec la comparaison de leurs ensembles de mesures] (https\://freesewing.org/account/compare). +Nous avons également supprimé la possibilité de comparer tes mesures à des mesures "standard" pour essayer d'identifier d'éventuelles erreurs de mesure. À l'avenir, nous pourrons mettre en place différentes méthodes de vérification, mais nous ne les afficherons qu'aux utilisateurs qui sont [à l'aise avec la comparaison de leurs ensembles de mesures] (https://freesewing.org/account/compare). From de06a94fabcd54085d9457c5fe04491d51ea490e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:03 +0200 Subject: [PATCH 646/795] New translations en.md (French) skip-build --- markdown/org/newsletter/2024q2/fr.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/markdown/org/newsletter/2024q2/fr.md b/markdown/org/newsletter/2024q2/fr.md index 03109527c38..2838a6d5331 100644 --- a/markdown/org/newsletter/2024q2/fr.md +++ b/markdown/org/newsletter/2024q2/fr.md @@ -29,9 +29,9 @@ Jetons un coup d'œil aux faits marquants : ### The Tristan Top -Tout d'abord, il y a [le haut Tristan] (https\://freesewing.org/designs/tristan). Tristan est un haut avec des coutures princesse et un laçage (facultatif) sur le devant ou/et dans le dos. L'histoire de son origine est la nécessité d'un costume pour un festival de la Renaissance, c'est donc probablement un bon indicateur de ce à quoi tu dois t'attendre. +Tout d'abord, il y a [le haut Tristan] (https://freesewing.org/designs/tristan). Tristan est un haut avec des coutures princesse et un laçage (facultatif) sur le devant ou/et dans le dos. L'histoire de son origine est la nécessité d'un costume pour un festival de la Renaissance, c'est donc probablement un bon indicateur de ce à quoi tu dois t'attendre. -Tristan a été conçu par Natalia qui a également [écrit un article de blog sur le nouveau design de Tristan] (https\://freesewing.org/blog/our-newest-design-is-the-tristan-top), c'est donc un bon endroit pour obtenir tous les détails sur ce nouveau design. +Tristan a été conçu par Natalia qui a également [écrit un article de blog sur le nouveau design de Tristan] (https://freesewing.org/blog/our-newest-design-is-the-tristan-top), c'est donc un bon endroit pour obtenir tous les détails sur ce nouveau design. ### The Lumina and Lumira Leggings @@ -84,11 +84,11 @@ et des améliorations qui ont été apportées à la version 3.2 : prend désormais en charge la traduction des tableaux imbriqués de chaînes de caractères, ce qui donne aux concepteurs plus de flexibilité pour concaténer les parties traduites des chaînes de caractères. -Le [billet de blog sur l'annonce de FreeSewing 3.2] (https\://freesewing.org/blog/v3-2-0) contient tous les détails. +Le [billet de blog sur l'annonce de FreeSewing 3.2] (https://freesewing.org/blog/v3-2-0) contient tous les détails.   -*** +---   @@ -122,7 +122,7 @@ si cela devient une contrainte de plus en plus forte sur notre temps et nos ress   -*** +---   @@ -130,7 +130,7 @@ si cela devient une contrainte de plus en plus forte sur notre temps et nos ress Selon l'endroit où tu reçois tes nouvelles, tu as peut-être entendu ou lu quelque chose sur [la tentative de porte dérobée de l'utilitaire de compression xz -] (https\://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/). +] (https://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/). En bref, un acteur malveillant a tenté d'introduire une porte dérobée dans cet utilitaire , ce qui, en fin de compte, était une tentative d'introduire clandestinement un exploit RCE dans @@ -160,7 +160,7 @@ Ou comme je le dis souvent : _Tout ce qui compte fonctionne sous Linux_. Cette histoire est en cours et j'espère pour ma part qu'elle fera l'objet d'une mini-série sur Netflix avec David Cross dans le rôle de [Andres -Freund] (https\://github.com/anarazel), mais je m'écarte du sujet. C'est la lettre d'information de FreeSewing +Freund] (https://github.com/anarazel), mais je m'écarte du sujet. C'est la lettre d'information de FreeSewing , alors j'ai voulu extraire de cette histoire quelque chose que je pense être pertinent pour FreeSewing, ou vraiment pour n'importe quel projet open source. @@ -188,7 +188,7 @@ qui cherchent désespérément à se décharger d'une partie du travail. Ce problème de _qui peux-tu croire_ n'est bien sûr pas nouveau. Une façon de la contrer est d'établir un _web de confiance_. C'est ainsi que les choses se passent dans les grands projets de logiciels libres impliquant de nombreux bénévoles, tels que [le projet Debian -] (https\://www\.debian.org/). +] (https://www.debian.org/). Concrètement, un tel réseau de confiance repose sur des relations entre personnes qui connaissent et ont vérifié la véritable identité de chacune d'entre elles. Par exemple, @@ -230,14 +230,14 @@ le puits.   -*** +---   ## 🤔 Comment les défis de FreeSewing se sont déplacés au fil du temps. Sais-tu que [FreeSewing v1 a été publié il y a 7 ans et 7 jours -] (https\://freesewing.org/blog/announcing-freesewing) ? Depuis, nous avons +] (https://freesewing.org/blog/announcing-freesewing) ? Depuis, nous avons apporté de nombreux changements, petits et grands, et notre bibliothèque de base et notre système de plugins ont mûri pour devenir un moyen fiable - et certainement influencé - de concevoir des patrons de couture paramétriques . From 87889d1f5fac1a7afb81a1e42b49fd70ece2f63e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:11 +0200 Subject: [PATCH 647/795] New translations en.md (Spanish) skip-build --- markdown/org/newsletter/2024q2/es.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/newsletter/2024q2/es.md b/markdown/org/newsletter/2024q2/es.md index e4a611c1f4f..ab0f9539191 100644 --- a/markdown/org/newsletter/2024q2/es.md +++ b/markdown/org/newsletter/2024q2/es.md @@ -88,7 +88,7 @@ La [entrada del blog del anuncio de FreeSewing 3.2](https://freesewing.org/blog/   -*** +---   @@ -122,7 +122,7 @@ si se convierte en una carga cada vez mayor para nuestro tiempo y recursos limit   -*** +---   @@ -230,7 +230,7 @@ el pozo.   -*** +---   From e169f92a370375f6d20082953a48ac3aa724e470 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:18 +0200 Subject: [PATCH 648/795] New translations en.md (German) skip-build --- markdown/org/newsletter/2024q2/de.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/newsletter/2024q2/de.md b/markdown/org/newsletter/2024q2/de.md index 992dc987fb6..d35aee4843a 100644 --- a/markdown/org/newsletter/2024q2/de.md +++ b/markdown/org/newsletter/2024q2/de.md @@ -84,7 +84,7 @@ Im [FreeSewing 3.2 Ankündigungs-Blogpost] (https\://freesewing.org/blog/v3-2-0)   -*** +---   @@ -118,7 +118,7 @@ wieder aufgreifen müssen, wenn es unsere begrenzte Zeit und unsere Ressourcen z   -*** +---   @@ -225,7 +225,7 @@ den Brunnen vergiften.   -*** +---   From 83acbea33c53ffa21f1f1a4a357f3681280dabeb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:24 +0200 Subject: [PATCH 649/795] New translations en.md (Dutch) skip-build --- markdown/org/newsletter/2024q2/nl.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/org/newsletter/2024q2/nl.md b/markdown/org/newsletter/2024q2/nl.md index 15a70d65e4d..c2e0b9fdfcf 100644 --- a/markdown/org/newsletter/2024q2/nl.md +++ b/markdown/org/newsletter/2024q2/nl.md @@ -88,7 +88,7 @@ De [FreeSewing 3.2 aankondiging blog post](https://freesewing.org/blog/v3-2-0) h   -*** +---   @@ -122,7 +122,7 @@ misschien opnieuw moeten bekijken als het een steeds groter beslag legt op onze   -*** +---   @@ -230,7 +230,7 @@ de bron vergiftigen.   -*** +---   From 750a8b3e70c990854b962e01396ea05ac9cb121d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:25 +0200 Subject: [PATCH 650/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/carlton-coat/uk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/carlton-coat/uk.md b/markdown/org/showcase/carlton-coat/uk.md index 5baf930db5c..6663770398d 100644 --- a/markdown/org/showcase/carlton-coat/uk.md +++ b/markdown/org/showcase/carlton-coat/uk.md @@ -15,4 +15,4 @@ To specify it a little more - we simply made the sleeves more tight and also inc More images you can find on google disc: -https\://drive.google.com/drive/folders/1ERGkaSApfh9PgL4T4CBzmYI9Kd-Z0Pgf?usp=drive_link +https://drive.google.com/drive/folders/1ERGkaSApfh9PgL4T4CBzmYI9Kd-Z0Pgf?usp=drive_link From 88cab617fe79905c2194eb6d4cc3371b1724cf07 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sat, 6 Apr 2024 21:04:32 +0200 Subject: [PATCH 651/795] New translations en.md (Ukrainian) skip-build --- markdown/org/newsletter/2024q2/uk.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/markdown/org/newsletter/2024q2/uk.md b/markdown/org/newsletter/2024q2/uk.md index c84af490f90..2db3f48e9c1 100644 --- a/markdown/org/newsletter/2024q2/uk.md +++ b/markdown/org/newsletter/2024q2/uk.md @@ -29,15 +29,15 @@ title: 2024 Весняний випуск ### The Tristan Top -По-перше, це [Tristan Top] (https\://freesewing.org/designs/tristan). Трістан - топ зі швами "принцеса" та (за бажанням) шнурівкою спереду та/або ззаду. Історія його виникнення - це потреба в костюмі для фестивалю Ренесансу, тож це, мабуть, хороший показник того, чого очікувати. +По-перше, це [Tristan Top] (https://freesewing.org/designs/tristan). Трістан - топ зі швами "принцеса" та (за бажанням) шнурівкою спереду та/або ззаду. Історія його виникнення - це потреба в костюмі для фестивалю Ренесансу, тож це, мабуть, хороший показник того, чого очікувати. -Трістан був розроблений Наталією, яка також [написала пост про новий дизайн Трістана] (https\://freesewing.org/blog/our-newest-design-is-the-tristan-top), тож це чудове місце, де можна дізнатися всі подробиці про цей новий дизайн. +Трістан був розроблений Наталією, яка також [написала пост про новий дизайн Трістана] (https://freesewing.org/blog/our-newest-design-is-the-tristan-top), тож це чудове місце, де можна дізнатися всі подробиці про цей новий дизайн. ### The Lumina and Lumira Leggings -Я дам вам секунду, щоб відсканувати цю назву ще раз, але так, є дві різні моделі легінсів зі схожими назвами: [the Lumira Leggings] (https\://freesewing.org/designs/lumira) та [Lumina Leggings] (https\://freesewing.org/designs/lumina). +Я дам вам секунду, щоб відсканувати цю назву ще раз, але так, є дві різні моделі легінсів зі схожими назвами: [the Lumira Leggings] (https://freesewing.org/designs/lumira) та [Lumina Leggings] (https://freesewing.org/designs/lumina). -Обидві моделі народилися з бажання Воутера створити хороше велосипедне спорядження, і я пропоную вам ознайомитися з дизайнерськими нотатками для [Lumina] (https\://freesewing.org/designs/lumina#notes) та [Lumira] (https\://freesewing.org/designs/lumira#notes), щоб повністю оцінити різницю між цими моделями, чому вони відрізняються, і яка з них підійде вам найкраще. +Обидві моделі народилися з бажання Воутера створити хороше велосипедне спорядження, і я пропоную вам ознайомитися з дизайнерськими нотатками для [Lumina] (https://freesewing.org/designs/lumina#notes) та [Lumira] (https://freesewing.org/designs/lumira#notes), щоб повністю оцінити різницю між цими моделями, чому вони відрізняються, і яка з них підійде вам найкраще. ### Bug fixes and improvements @@ -52,7 +52,7 @@ title: 2024 Весняний випуск можете створити свою спідницю-коло з кількох схожих викрійок, виконавши підбір самостійно, але тепер викрійка подбає про це за вас. - Те, що почалося як [звіт про баг для біцепса на - Jaeger] (https\://github.com/freesewing/freesewing/issues/5999), закінчилося + Jaeger] (https://github.com/freesewing/freesewing/issues/5999), закінчилося зміною способу розрахунку обхвату плеча на Брайані, зокрема глибини пройми. Враховуючи, що Брайан є нашим найбільш фундаментальним блоком, це матиме вплив на багато інших конструкцій, ви можете очікувати, що поза коробкою @@ -85,11 +85,11 @@ title: 2024 Весняний випуск тепер підтримує переклад вкладених масивів рядків, що надає дизайнерам більше гнучкості для конкатенації перекладених частин рядків. -Всі деталі можна знайти у блозі [Анонс FreeSewing 3.2] (https\://freesewing.org/blog/v3-2-0). +Всі деталі можна знайти у блозі [Анонс FreeSewing 3.2] (https://freesewing.org/blog/v3-2-0).   -*** +---   @@ -103,7 +103,7 @@ FreeSewing.org, значить ми змогли доставити його в роками. Але останнім часом все стало ще складніше. Gmail (Google) та Yahoo, наприклад, [запровадили нові обмеження в першому кварталі -2024 року] (https\://www\.xomedia.io/blog/a-deep-dive-into-email-deliverability/), що +2024 року] (https://www.xomedia.io/blog/a-deep-dive-into-email-deliverability/), що вимагає додаткової роботи з нашого боку, щоб максимізувати шанси на те, що цей лист дійсно потрапить до вашої поштової скриньки. @@ -123,7 +123,7 @@ FreeSewing.org, значить ми змогли доставити його в   -*** +---   @@ -161,7 +161,7 @@ SSHd. Ця історія триває, і я, зі свого боку, сподіваюся, що з неї зроблять міні-серіал на Netflix з Девідом Кроссом у ролі [Андреса -Фройнда] (https\://github.com/anarazel), але я відволікаюся. Це інформаційний бюлетень FreeSewing +Фройнда] (https://github.com/anarazel), але я відволікаюся. Це інформаційний бюлетень FreeSewing , тому я хотів би витягнути з цієї історії дещо, що, на мою думку, має відношення до FreeSewing, або взагалі до будь-якого проекту з відкритим вихідним кодом. @@ -231,14 +231,14 @@ SSHd.   -*** +---   ## 🤔 Як змінилися виклики FreeSewing з плином часу Чи знали ви, що [FreeSewing v1 було випущено 7 років і 7 днів -тому] (https\://freesewing.org/blog/announcing-freesewing)? З того часу ми +тому] (https://freesewing.org/blog/announcing-freesewing)? З того часу ми багато великих і малих змін, а наша основна бібліотека і система плагінів перетворилися на надійний - і, безумовно, самодостатній - спосіб проектування параметричних викрійок одягу. From a43576654055010cf40643e3bea5b0e7abe96aa6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 7 Apr 2024 18:06:47 +0200 Subject: [PATCH 652/795] New translations en.md (French) skip-build --- markdown/org/newsletter/2024q2/fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/newsletter/2024q2/fr.md b/markdown/org/newsletter/2024q2/fr.md index 2838a6d5331..ba9217a1220 100644 --- a/markdown/org/newsletter/2024q2/fr.md +++ b/markdown/org/newsletter/2024q2/fr.md @@ -43,8 +43,7 @@ Les deux sont nés du désir de Wouter d'avoir un bon équipement cycliste, et j Les lecteurs réguliers de la newsletter savent que nous apportons continuellement des améliorations sur FreeSewing.org et que celles-ci ne sont pas liées à une nouvelle version, -mais c'est une bonne occasion de les énumérer. Voici donc quelques points forts des corrections de bugs -et des améliorations qui ont été apportées à la version 3.2 : +mais c'est une bonne occasion de les énumérer. - Sandy a un nouveau panneau option qui a été From 2d920fe336007dffa6f4ee96f1ca262e48ce47bd Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Sun, 7 Apr 2024 17:48:39 +0100 Subject: [PATCH 653/795] Add upcyclinguser Author --- .../org/showcase/a-lined-tristan-top-with-front-lacing/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md index 508815f88bf..376ef70cef9 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md @@ -5,6 +5,7 @@ date: 20240116 intro: "This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem." designs: ["tristan"] maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 080874dd88225318bffa8e38224f017b4e8486e9 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 8 Apr 2024 08:25:09 +0200 Subject: [PATCH 654/795] fix(core): Path.offset(...) no longer fails on very short curves or zero length paths. Fixes #6519 --- packages/core/src/path.mjs | 28 +++++++++++++++++++++++++--- packages/core/tests/path.test.mjs | 31 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index b25c27c8c63..a7a938d01d8 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -192,6 +192,11 @@ Path.prototype.bbox = function () { if (op.to) current = op.to } + if (bbs.length === 0 && current) { + // Degenerate case: Line is a point + bbs.push(__lineBoundingBox({ from: current, to: current })) + } + return __bbbbox(bbs) } @@ -646,7 +651,7 @@ Path.prototype.noop = function (id = false) { Path.prototype.offset = function (distance) { distance = __asNumber(distance, 'distance', 'Path.offset', this.log) - return __pathOffset(this, distance) + return __pathOffset(this, distance, this.log) } /** @@ -1355,7 +1360,7 @@ function __offsetLine(from, to, distance, log = false) { * @param {float} distance - The distance to offset by * @return {Path} offsetted - The offsetted Path instance */ -function __pathOffset(path, distance) { +function __pathOffset(path, distance, log) { let offset = [] let current let start = false @@ -1392,7 +1397,24 @@ function __pathOffset(path, distance) { if (!start) start = current } - return closed ? __joinPaths(offset).close() : __joinPaths(offset) + let result + + if (offset.length !== 0) { + result = __joinPaths(offset) + } else { + // degenerate case: Original path was likely short, so all the "if (segment)" checks returned false + // retry treating the path as a simple straight line from start to end + // note: do not call __joinPaths in this branch as this could result in "over-optimizing" this short path + let segment = __offsetLine(start, current, distance, path.log) + if (segment) { + result = segment + } else { + result = new Path().move(start).line(current) + log.warn(`Could not properly calculate offset path, the given path is likely too short.`) + } + } + + return closed ? result.close() : result } /** diff --git a/packages/core/tests/path.test.mjs b/packages/core/tests/path.test.mjs index 1cbf31f2065..4ab0b4ae820 100644 --- a/packages/core/tests/path.test.mjs +++ b/packages/core/tests/path.test.mjs @@ -118,6 +118,28 @@ describe('Path', () => { expect(round(bbox.bottomRight.x)).to.equal(119.86) expect(round(bbox.bottomRight.y)).to.equal(43.49) }) + + it('Should offset small curves', () => { + const curve = new Path() + .move(new Point(0, 0)) + .curve(new Point(0.1, 0.1), new Point(0.2, 0.2), new Point(0.1, 1.1)) + const offset = curve.offset(1) + const bbox = offset.bbox() + expect(round(bbox.bottomRight.x)).to.equal(-0.9) + expect(round(bbox.bottomRight.y)).to.equal(1.19) + }) + + it('Should offset zero length path', () => { + let logged = false + const log = { warn: () => (logged = true) } + const curve = new Path().__withLog(log).move(new Point(0, 0)).line(new Point(0, 0)).close() + expect(logged).to.equal(false) + const offset = curve.offset(1) + expect(logged).to.equal(true) + const bbox = offset.bbox() + expect(round(bbox.bottomRight.x)).to.equal(0) + expect(round(bbox.bottomRight.y)).to.equal(0) + }) }) describe('length', () => { @@ -354,6 +376,15 @@ describe('Path', () => { expect(box.bottomRight.y).to.equal(456) }) + it('Should find the bounding box of an empty path', () => { + const path = new Path().move(new Point(123, 456)).close() + const box = path.bbox() + expect(box.topLeft.x).to.equal(123) + expect(box.topLeft.y).to.equal(456) + expect(box.bottomRight.x).to.equal(123) + expect(box.bottomRight.y).to.equal(456) + }) + it('Should reverse a path', () => { const test = new Path() .move(new Point(123, 456)) From a3859812163fa2487bcdca5e5f15e942ad83c572 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 04:48:25 +0000 Subject: [PATCH 655/795] chore(deps): Bump i18next from 23.10.1 to 23.11.0 Bumps [i18next](https://github.com/i18next/i18next) from 23.10.1 to 23.11.0. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.10.1...v23.11.0) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/lab/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 703 +++++++++++++++++++++-------------------- 3 files changed, 357 insertions(+), 350 deletions(-) diff --git a/sites/lab/package.json b/sites/lab/package.json index cce2c19d072..2bc4345ee20 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -36,7 +36,7 @@ "d3-drag": "3.0.0", "d3-selection": "3.0.0", "daisyui": "4.7.3", - "i18next": "23.10.1", + "i18next": "23.11.0", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/sde/package.json b/sites/sde/package.json index 93fa2362bb1..71671c2a833 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -54,7 +54,7 @@ "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", - "i18next": "23.10.1", + "i18next": "23.11.0", "jotai": "2.7.1", "jotai-location": "0.5.4", "js-yaml": "4.1.0", diff --git a/yarn.lock b/yarn.lock index 4ea3a83af86..34f78ee90b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,131 +7,114 @@ resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@algolia/cache-browser-local-storage@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.2.tgz#060d15e89588fcac18e73643201fce0f4f7d5ca0" - integrity sha512-PvRQdCmtiU22dw9ZcTJkrVKgNBVAxKgD0/cfiqyxhA5+PHzA2WDt6jOmZ9QASkeM2BpyzClJb/Wr1yt2/t78Kw== +"@algolia/cache-browser-local-storage@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz#14b6dc9abc9e3a304a5fffb063d15f30af1032d1" + integrity sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g== dependencies: - "@algolia/cache-common" "4.23.2" + "@algolia/cache-common" "4.22.1" -"@algolia/cache-common@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.2.tgz#c68706ce34b18377e56e71ac13cce2dd5662dcee" - integrity sha512-OUK/6mqr6CQWxzl/QY0/mwhlGvS6fMtvEPyn/7AHUx96NjqDA4X4+Ju7aXFQKh+m3jW9VPB0B9xvEQgyAnRPNw== +"@algolia/cache-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.22.1.tgz#c625dff4bc2a74e79f9aed67b4e053b0ef1b3ec1" + integrity sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA== -"@algolia/cache-in-memory@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.2.tgz#94cd828275d7a12186959bf1b95a13247e103b23" - integrity sha512-rfbi/SnhEa3MmlqQvgYz/9NNJ156NkU6xFxjbxBtLWnHbpj+qnlMoKd+amoiacHRITpajg6zYbLM9dnaD3Bczw== +"@algolia/cache-in-memory@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz#858a3d887f521362e87d04f3943e2810226a0d71" + integrity sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw== dependencies: - "@algolia/cache-common" "4.23.2" + "@algolia/cache-common" "4.22.1" -"@algolia/client-account@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.2.tgz#b53cb14e730fd8e0a0a227cf650b287b570a08bc" - integrity sha512-VbrOCLIN/5I7iIdskSoSw3uOUPF516k4SjDD4Qz3BFwa3of7D9A0lzBMAvQEJJEPHWdVraBJlGgdJq/ttmquJQ== +"@algolia/client-account@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.22.1.tgz#a7fb8b66b9a4f0a428e1426b2561144267d76d43" + integrity sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw== dependencies: - "@algolia/client-common" "4.23.2" - "@algolia/client-search" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/client-common" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/transporter" "4.22.1" -"@algolia/client-analytics@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.2.tgz#7fdcf1cb27f0ae93e5da6beb4e612fc06a880b0c" - integrity sha512-lLj7irsAztGhMoEx/SwKd1cwLY6Daf1Q5f2AOsZacpppSvuFvuBrmkzT7pap1OD/OePjLKxicJS8wNA0+zKtuw== +"@algolia/client-analytics@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.22.1.tgz#506558740b4d49b1b1e3393861f729a8ce921851" + integrity sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg== dependencies: - "@algolia/client-common" "4.23.2" - "@algolia/client-search" "4.23.2" - "@algolia/requester-common" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/client-common" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" -"@algolia/client-common@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.2.tgz#e5f86fc2de707eb6bf9f1109b70187dae179c72c" - integrity sha512-Q2K1FRJBern8kIfZ0EqPvUr3V29ICxCm/q42zInV+VJRjldAD9oTsMGwqUQ26GFMdFYmqkEfCbY4VGAiQhh22g== +"@algolia/client-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.22.1.tgz#042b19c1b6157c485fa1b551349ab313944d2b05" + integrity sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ== dependencies: - "@algolia/requester-common" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" -"@algolia/client-personalization@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.2.tgz#0472d9c207402eefcc9c98f7ffba5d26fe8e2fd0" - integrity sha512-vwPsgnCGhUcHhhQG5IM27z8q7dWrN9itjdvgA6uKf2e9r7vB+WXt4OocK0CeoYQt3OGEAExryzsB8DWqdMK5wg== +"@algolia/client-personalization@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.22.1.tgz#ff088d797648224fb582e9fe5828f8087835fa3d" + integrity sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ== dependencies: - "@algolia/client-common" "4.23.2" - "@algolia/requester-common" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/client-common" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" -"@algolia/client-search@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.2.tgz#9b2741f0a209596459f06a44583118207ea287f7" - integrity sha512-CxSB29OVGSE7l/iyoHvamMonzq7Ev8lnk/OkzleODZ1iBcCs3JC/XgTIKzN/4RSTrJ9QybsnlrN/bYCGufo7qw== +"@algolia/client-search@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.22.1.tgz#508cc6ab3d1f4e9c02735a630d4dff6fbb8514a2" + integrity sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA== dependencies: - "@algolia/client-common" "4.23.2" - "@algolia/requester-common" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/client-common" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== -"@algolia/logger-common@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.2.tgz#5441a828f0fad1ceaae3a27caec7b663d40dd27f" - integrity sha512-jGM49Q7626cXZ7qRAWXn0jDlzvoA1FvN4rKTi1g0hxKsTTSReyYk0i1ADWjChDPl3Q+nSDhJuosM2bBUAay7xw== +"@algolia/logger-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.22.1.tgz#79cf4cd295de0377a94582c6aaac59b1ded731d9" + integrity sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg== -"@algolia/logger-console@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.2.tgz#fda4252bb02df7c52a92c63f1e357bf7370cc8db" - integrity sha512-oo+lnxxEmlhTBTFZ3fGz1O8PJ+G+8FiAoMY2Qo3Q4w23xocQev6KqDTA1JQAGPDxAewNA2VBwWOsVXeXFjrI/Q== +"@algolia/logger-console@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.22.1.tgz#0355345f6940f67aaa78ae9b81c06e44e49f2336" + integrity sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA== dependencies: - "@algolia/logger-common" "4.23.2" + "@algolia/logger-common" "4.22.1" -"@algolia/recommend@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.23.2.tgz#02bf57f836ced2c850633239d493a0414be76a7f" - integrity sha512-Q75CjnzRCDzgIlgWfPnkLtrfF4t82JCirhalXkSSwe/c1GH5pWh4xUyDOR3KTMo+YxxX3zTlrL/FjHmUJEWEcg== +"@algolia/requester-browser-xhr@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz#f04df6fe9690a071b267c77d26b83a3be9280361" + integrity sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw== dependencies: - "@algolia/cache-browser-local-storage" "4.23.2" - "@algolia/cache-common" "4.23.2" - "@algolia/cache-in-memory" "4.23.2" - "@algolia/client-common" "4.23.2" - "@algolia/client-search" "4.23.2" - "@algolia/logger-common" "4.23.2" - "@algolia/logger-console" "4.23.2" - "@algolia/requester-browser-xhr" "4.23.2" - "@algolia/requester-common" "4.23.2" - "@algolia/requester-node-http" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/requester-common" "4.22.1" -"@algolia/requester-browser-xhr@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.2.tgz#2d0a6b642e2a2bbfb2e2ff3d1e82158e3e143def" - integrity sha512-TO9wLlp8+rvW9LnIfyHsu8mNAMYrqNdQ0oLF6eTWFxXfxG3k8F/Bh7nFYGk2rFAYty4Fw4XUtrv/YjeNDtM5og== +"@algolia/requester-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.22.1.tgz#27be35f3718aafcb6b388ff9c3aa2defabd559ff" + integrity sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg== + +"@algolia/requester-node-http@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz#589a6fa828ad0f325e727a6fcaf4e1a2343cc62b" + integrity sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA== dependencies: - "@algolia/requester-common" "4.23.2" + "@algolia/requester-common" "4.22.1" -"@algolia/requester-common@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.2.tgz#9c2e5da4dc15e65f9b9bbe5bedb419cf23092ef1" - integrity sha512-3EfpBS0Hri0lGDB5H/BocLt7Vkop0bTTLVUBB844HH6tVycwShmsV6bDR7yXbQvFP1uNpgePRD3cdBCjeHmk6Q== - -"@algolia/requester-node-http@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.2.tgz#718ae71f58949eab3b5fcfc440be42af41bd640f" - integrity sha512-SVzgkZM/malo+2SB0NWDXpnT7nO5IZwuDTaaH6SjLeOHcya1o56LSWXk+3F3rNLz2GVH+I/rpYKiqmHhSOjerw== +"@algolia/transporter@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.22.1.tgz#8843841b857dc021668f31647aa557ff19cd9cb1" + integrity sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ== dependencies: - "@algolia/requester-common" "4.23.2" - -"@algolia/transporter@4.23.2": - version "4.23.2" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.2.tgz#61e7b9288d4f561b2015ddde689ba31e08c21644" - integrity sha512-GY3aGKBy+8AK4vZh8sfkatDciDVKad5rTY2S10Aefyjh7e7UGBP4zigf42qVXwU8VOPwi7l/L7OACGMOFcjB0Q== - dependencies: - "@algolia/cache-common" "4.23.2" - "@algolia/logger-common" "4.23.2" - "@algolia/requester-common" "4.23.2" + "@algolia/cache-common" "4.22.1" + "@algolia/logger-common" "4.22.1" + "@algolia/requester-common" "4.22.1" "@algolia/ui-components-highlight-vdom@^1.2.1": version "1.2.2" @@ -214,33 +197,33 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.549.0.tgz#9de924b6974768765ef2f6a171bd86a56b61a692" - integrity sha512-o+78gx6E4aKB9dqbUfpCo7SP24zQn8BKmh17hWOXB6ryDqZUHeaoeJh0gtcrE6EXEsEtqGlXIIaTu9kYdYDepA== +"@aws-sdk/client-sesv2@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.535.0.tgz#66ffd54ab4e612be84f4e63670304d2d83ca12a1" + integrity sha512-K0WZf/o4R+A20RFHJW+YyMg0cMK8GMHe2MHURpPvLJoq5JF0RpCdsMTgRiYIoAFCLoy8qFH9G0MebxR8JZvD+A== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.549.0" - "@aws-sdk/core" "3.549.0" - "@aws-sdk/credential-provider-node" "3.549.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/credential-provider-node" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.1" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.3.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -260,32 +243,32 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.549.0.tgz#1a0f4ea4d5d34d2bccea5f0f4db27231f9c299a7" - integrity sha512-FbB4A78ILAb8sM4TfBd+3CrQcfZIhe0gtVZNbaxpq5cJZh1K7oZ8vPfKw4do9JWkDUXPLsD9Bwz12f8/JpAb6Q== +"@aws-sdk/client-sso-oidc@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz#64666c2f7bed8510938ba2b481429fea8f97473d" + integrity sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.549.0" - "@aws-sdk/core" "3.549.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.1" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.3.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -305,31 +288,31 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.549.0.tgz#fa493de7366946971dc82bd07c181f23d4cb6be9" - integrity sha512-lz+yflOAj5Q263FlCsKpNqttaCb2NPh8jC76gVCqCt7TPxRDBYVaqg0OZYluDaETIDNJi4DwN2Azcck7ilwuPw== +"@aws-sdk/client-sso@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz#c405aaf880cb695aa2f5070a8827955274fc9df2" + integrity sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.549.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.1" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.3.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -349,31 +332,31 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.549.0.tgz#d8b6034c80f190dded7add83e99d2da209b61699" - integrity sha512-63IreJ598Dzvpb+6sy81KfIX5iQxnrWSEtlyeCdC2GO6gmSQVwJzc9kr5pAC83lHmlZcm/Q3KZr3XBhRQqP0og== +"@aws-sdk/client-sts@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz#0f518fe338c6b7a8b8a897e2ccee65d06dc0040f" + integrity sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.549.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.1" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.3.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" @@ -393,12 +376,12 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/core@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.549.0.tgz#1c40b7abbea37479db5e5ac39957f26f0a7e2119" - integrity sha512-jC61OxJn72r/BbuDRCcluiw05Xw9eVLG0CwxQpF3RocxfxyZqlrGYaGecZ8Wy+7g/3sqGRC/Ar5eUhU1YcLx7w== +"@aws-sdk/core@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.535.0.tgz#f3a726c297cea9634d19a1db4e958c918c506c8b" + integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== dependencies: - "@smithy/core" "^1.4.1" + "@smithy/core" "^1.4.0" "@smithy/protocol-http" "^3.3.0" "@smithy/signature-v4" "^2.2.0" "@smithy/smithy-client" "^2.5.0" @@ -431,16 +414,16 @@ "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.549.0.tgz#261654741e1c75f2adf888e06a443aa60ec32bad" - integrity sha512-k6IIrluZjQpzui5Din8fW3bFFhHaJ64XrsfYx0Ks1mb7xan84dJxmYP3tdDDmLzUeJv5h95ag88taHfjY9rakA== +"@aws-sdk/credential-provider-ini@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz#b121b1aba2916e3f45745cd690b4082421a7c286" + integrity sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA== dependencies: - "@aws-sdk/client-sts" "3.549.0" + "@aws-sdk/client-sts" "3.535.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.549.0" - "@aws-sdk/credential-provider-web-identity" "3.549.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -448,17 +431,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.549.0.tgz#765b3d00b3771ff35f0aa333c3c3891eff22afb6" - integrity sha512-f3YgalsMuywEAVX4AUm9tojqrBdfpAac0+D320ePzas0Ntbp7ItYu9ceKIhgfzXO3No7P3QK0rCrOxL+ABTn8Q== +"@aws-sdk/credential-provider-node@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz#6739b4b52a9cce29dc8e70c9a7290b89cdc4b904" + integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-http" "3.535.0" - "@aws-sdk/credential-provider-ini" "3.549.0" + "@aws-sdk/credential-provider-ini" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.549.0" - "@aws-sdk/credential-provider-web-identity" "3.549.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -477,25 +460,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.549.0.tgz#1aa9f148715230233cb130afd8af3fea0b8947c7" - integrity sha512-BGopRKHs7W8zkoH8qmSHrjudj263kXbhVkAUPxVUz0I28+CZNBgJC/RfVCbOpzmysIQEpwSqvOv1y0k+DQzIJQ== +"@aws-sdk/credential-provider-sso@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz#dfc7c2f39f9ca965becd7e5b9414cd1bb2217490" + integrity sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg== dependencies: - "@aws-sdk/client-sso" "3.549.0" - "@aws-sdk/token-providers" "3.549.0" + "@aws-sdk/client-sso" "3.535.0" + "@aws-sdk/token-providers" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.549.0.tgz#5c11204dd00a3d0dfbeb0392a22e429251685826" - integrity sha512-QzclVXPxuwSI7515l34sdvliVq5leroO8P7RQFKRgfyQKO45o1psghierwG3PgV6jlMiv78FIAGJBr/n4qZ7YA== +"@aws-sdk/credential-provider-web-identity@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz#f1d3a72ff958cbd7e052c5109755379745ac35e0" + integrity sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg== dependencies: - "@aws-sdk/client-sts" "3.549.0" + "@aws-sdk/client-sts" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -530,13 +513,13 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" - integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== +"@aws-sdk/middleware-user-agent@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz#2877ff5e42d943dd0c488e8b1ad82bd9da121227" + integrity sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog== dependencies: "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" @@ -553,12 +536,12 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.549.0": - version "3.549.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.549.0.tgz#0e4aa04d6d50d633c34c78bbed62e3924bc10103" - integrity sha512-rJyeXkXknLukRFGuMQOgKnPBa+kLODJtOqEBf929SpQ96f1I6ytdndmWbB5B/OQN5Fu5DOOQUQqJypDQVl5ibQ== +"@aws-sdk/token-providers@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz#0d5aa221449d5b56730427b28d3319005c5700ed" + integrity sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg== dependencies: - "@aws-sdk/client-sso-oidc" "3.549.0" + "@aws-sdk/client-sso-oidc" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" @@ -573,10 +556,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" - integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== +"@aws-sdk/util-endpoints@3.535.0": + version "3.535.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz#46f4b61b2661d6414ded8c98e4ad3c82a0bf597b" + integrity sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/types" "^2.12.0" @@ -1918,124 +1901,124 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" - integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== +"@prisma/client@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d" + integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== -"@prisma/debug@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.1.tgz#007c8ad2e466d565bcd0671b8846c27f8700c722" - integrity sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A== +"@prisma/debug@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.11.0.tgz#80e3f9d5a8f678c67a8783f7fcdda3cbbb8dd091" + integrity sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A== -"@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab": - version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32" - integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g== +"@prisma/engines-version@5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102": + version "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz#a7aa218b1ebf1077798c931632461aae8ce6a8f7" + integrity sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA== -"@prisma/engines@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.1.tgz#a50649427d627a9af962a188a84c65d61c6e2b3f" - integrity sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA== +"@prisma/engines@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.11.0.tgz#96e941c5c81ce68f3a8b4c481007d397564c5d4b" + integrity sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw== dependencies: - "@prisma/debug" "5.12.1" - "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/fetch-engine" "5.12.1" - "@prisma/get-platform" "5.12.1" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/fetch-engine" "5.11.0" + "@prisma/get-platform" "5.11.0" -"@prisma/fetch-engine@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.1.tgz#c38e9fa17fdc535b4c83cbb7645569ad0a511fa9" - integrity sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA== +"@prisma/fetch-engine@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz#cd7a2fa5b5d89f1da0689e329c56fa69223fba7d" + integrity sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w== dependencies: - "@prisma/debug" "5.12.1" - "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/get-platform" "5.12.1" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/get-platform" "5.11.0" -"@prisma/get-platform@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.1.tgz#33f427f6d744dee62a9e06858889691d78b50804" - integrity sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ== +"@prisma/get-platform@5.11.0": + version "5.11.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.11.0.tgz#19a768127b1712c27f5dec8a0a79a4c9675829eb" + integrity sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw== dependencies: - "@prisma/debug" "5.12.1" + "@prisma/debug" "5.11.0" -"@resvg/resvg-js-android-arm-eabi@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe" - integrity sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA== +"@resvg/resvg-js-android-arm-eabi@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz#fed7723ed5c5f7490762e025ad704bcbceee37b7" + integrity sha512-lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA== -"@resvg/resvg-js-android-arm64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.2.tgz#b8cb564d7f6b3f37d9b43129f5dc5fe171e249e4" - integrity sha512-VcOKezEhm2VqzXpcIJoITuvUS/fcjIw5NA/w3tjzWyzmvoCdd+QXIqy3FBGulWdClvp4g+IfUemigrkLThSjAQ== +"@resvg/resvg-js-android-arm64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz#e0531a220ec8954e41039b2483cc3706d30d3635" + integrity sha512-N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ== -"@resvg/resvg-js-darwin-arm64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.2.tgz#49bd3faeda5c49f53302d970e6e79d006de18e7d" - integrity sha512-nmok2LnAd6nLUKI16aEB9ydMC6Lidiiq2m1nEBDR1LaaP7FGs4AJ90qDraxX+CWlVuRlvNjyYJTNv8qFjtL9+A== +"@resvg/resvg-js-darwin-arm64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz#38f609cd2bd71ce6a065df7a8b8144479b156969" + integrity sha512-MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew== -"@resvg/resvg-js-darwin-x64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.2.tgz#e1344173aa27bfb4d880ab576d1acf1c1648faca" - integrity sha512-GInyZLjgWDfsVT6+SHxQVRwNzV0AuA1uqGsOAW+0th56J7Nh6bHHKXHBWzUrihxMetcFDmQMAX1tZ1fZDYSRsw== +"@resvg/resvg-js-darwin-x64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz#5c3f69d0cd68980e7e5cfcabf0db90e85d289559" + integrity sha512-zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA== -"@resvg/resvg-js-linux-arm-gnueabihf@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.2.tgz#34c445eba45efd68f6130b2ab426d76a7424253d" - integrity sha512-YIV3u/R9zJbpqTTNwTZM5/ocWetDKGsro0SWp70eGEM9eV2MerWyBRZnQIgzU3YBnSBQ1RcxRZvY/UxwESfZIw== +"@resvg/resvg-js-linux-arm-gnueabihf@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz#6bcae7d4101e7fea2be0db167eda832cab63e27f" + integrity sha512-sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A== -"@resvg/resvg-js-linux-arm64-gnu@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.2.tgz#30da47087dd8153182198b94fe9f8d994890dae5" - integrity sha512-zc2BlJSim7YR4FZDQ8OUoJg5holYzdiYMeobb9pJuGDidGL9KZUv7SbiD4E8oZogtYY42UZEap7dqkkYuA91pg== +"@resvg/resvg-js-linux-arm64-gnu@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz#fb71ea6b9a4b30412fa096fdbf9e8427012b3a99" + integrity sha512-fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A== -"@resvg/resvg-js-linux-arm64-musl@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.2.tgz#5d75b8ff5c83103729c1ca3779987302753c50d4" - integrity sha512-3h3dLPWNgSsD4lQBJPb4f+kvdOSJHa5PjTYVsWHxLUzH4IFTJUAnmuWpw4KqyQ3NA5QCyhw4TWgxk3jRkQxEKg== +"@resvg/resvg-js-linux-arm64-musl@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz#ec7e85b8b6eea23c0242faa1f1486241f253a190" + integrity sha512-ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg== -"@resvg/resvg-js-linux-x64-gnu@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.2.tgz#411abedfaee5edc57cbb7701736cecba522e26f3" - integrity sha512-IVUe+ckIerA7xMZ50duAZzwf1U7khQe2E0QpUxu5MBJNao5RqC0zwV/Zm965vw6D3gGFUl7j4m+oJjubBVoftw== +"@resvg/resvg-js-linux-x64-gnu@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz#2a9b2a14554b0b1825c2ebc52b5fc2d95a831a63" + integrity sha512-n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q== -"@resvg/resvg-js-linux-x64-musl@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.2.tgz#fe4984038f0372f279e3ff570b72934dd7eb2a5c" - integrity sha512-UOf83vqTzoYQO9SZ0fPl2ZIFtNIz/Rr/y+7X8XRX1ZnBYsQ/tTb+cj9TE+KHOdmlTFBxhYzVkP2lRByCzqi4jQ== +"@resvg/resvg-js-linux-x64-musl@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz#42081a8b06ccfa011aee9cc10b2f0fea3a4563ed" + integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw== -"@resvg/resvg-js-win32-arm64-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.2.tgz#d3a053cf7ff687087a2106330c0fdaae706254d1" - integrity sha512-7C/RSgCa+7vqZ7qAbItfiaAWhyRSoD4l4BQAbVDqRRsRgY+S+hgS3in0Rxr7IorKUpGE69X48q6/nOAuTJQxeQ== +"@resvg/resvg-js-win32-arm64-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz#3af0d5f7bd9193ac6be8f226b539be6f7576302d" + integrity sha512-X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q== -"@resvg/resvg-js-win32-ia32-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.2.tgz#7cdda1ce29ef7209e28191d917fa5bef0624a4ad" - integrity sha512-har4aPAlvjnLcil40AC77YDIk6loMawuJwFINEM7n0pZviwMkMvjb2W5ZirsNOZY4aDbo5tLx0wNMREp5Brk+w== +"@resvg/resvg-js-win32-ia32-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz#64af45bfee41cb2bea0b6dd0bdc94175183f2b56" + integrity sha512-L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg== -"@resvg/resvg-js-win32-x64-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.2.tgz#cb0ad04525d65f3def4c8d346157a57976d5b388" - integrity sha512-ZXtYhtUr5SSaBrUDq7DiyjOFJqBVL/dOBN7N/qmi/pO0IgiWW/f/ue3nbvu9joWE5aAKDoIzy/CxsY0suwGosQ== +"@resvg/resvg-js-win32-x64-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz#08431a243c15f002d32e5e628857d19852323274" + integrity sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw== -"@resvg/resvg-js@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.2.tgz#3e92a907d88d879256c585347c5b21a7f3bb5b46" - integrity sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q== +"@resvg/resvg-js@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.0.tgz#d811100796dda1f37a516c747dab3bbc9b24e5e4" + integrity sha512-Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA== optionalDependencies: - "@resvg/resvg-js-android-arm-eabi" "2.6.2" - "@resvg/resvg-js-android-arm64" "2.6.2" - "@resvg/resvg-js-darwin-arm64" "2.6.2" - "@resvg/resvg-js-darwin-x64" "2.6.2" - "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.2" - "@resvg/resvg-js-linux-arm64-gnu" "2.6.2" - "@resvg/resvg-js-linux-arm64-musl" "2.6.2" - "@resvg/resvg-js-linux-x64-gnu" "2.6.2" - "@resvg/resvg-js-linux-x64-musl" "2.6.2" - "@resvg/resvg-js-win32-arm64-msvc" "2.6.2" - "@resvg/resvg-js-win32-ia32-msvc" "2.6.2" - "@resvg/resvg-js-win32-x64-msvc" "2.6.2" + "@resvg/resvg-js-android-arm-eabi" "2.6.0" + "@resvg/resvg-js-android-arm64" "2.6.0" + "@resvg/resvg-js-darwin-arm64" "2.6.0" + "@resvg/resvg-js-darwin-x64" "2.6.0" + "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.0" + "@resvg/resvg-js-linux-arm64-gnu" "2.6.0" + "@resvg/resvg-js-linux-arm64-musl" "2.6.0" + "@resvg/resvg-js-linux-x64-gnu" "2.6.0" + "@resvg/resvg-js-linux-x64-musl" "2.6.0" + "@resvg/resvg-js-win32-arm64-msvc" "2.6.0" + "@resvg/resvg-js-win32-ia32-msvc" "2.6.0" + "@resvg/resvg-js-win32-x64-msvc" "2.6.0" "@rushstack/eslint-patch@^1.3.3": version "1.7.2" @@ -2182,7 +2165,7 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/core@^1.4.1": +"@smithy/core@^1.4.0": version "1.4.2" resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== @@ -2275,7 +2258,7 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/middleware-retry@^2.3.0", "@smithy/middleware-retry@^2.3.1": +"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== @@ -2562,10 +2545,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.12": - version "0.5.12" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.12.tgz#c0532fd594427b7f4e8e38eff7bf272c63a1dca4" - integrity sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg== +"@tailwindcss/typography@0.5.10": + version "0.5.10" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.10.tgz#2abde4c6d5c797ab49cf47610830a301de4c1e0a" + integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" @@ -3003,26 +2986,25 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" -algoliasearch@4.23.2: - version "4.23.2" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.2.tgz#3b7bc93d98f3965628c73a06cbf9203531324a9d" - integrity sha512-8aCl055IsokLuPU8BzLjwzXjb7ty9TPcUFFOk0pYOwsE5DMVhE3kwCMFtsCFKcnoPZK7oObm+H5mbnSO/9ioxQ== +algoliasearch@4.22.1: + version "4.22.1" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.22.1.tgz#f10fbecdc7654639ec20d62f109c1b3a46bc6afc" + integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== dependencies: - "@algolia/cache-browser-local-storage" "4.23.2" - "@algolia/cache-common" "4.23.2" - "@algolia/cache-in-memory" "4.23.2" - "@algolia/client-account" "4.23.2" - "@algolia/client-analytics" "4.23.2" - "@algolia/client-common" "4.23.2" - "@algolia/client-personalization" "4.23.2" - "@algolia/client-search" "4.23.2" - "@algolia/logger-common" "4.23.2" - "@algolia/logger-console" "4.23.2" - "@algolia/recommend" "4.23.2" - "@algolia/requester-browser-xhr" "4.23.2" - "@algolia/requester-common" "4.23.2" - "@algolia/requester-node-http" "4.23.2" - "@algolia/transporter" "4.23.2" + "@algolia/cache-browser-local-storage" "4.22.1" + "@algolia/cache-common" "4.22.1" + "@algolia/cache-in-memory" "4.22.1" + "@algolia/client-account" "4.22.1" + "@algolia/client-analytics" "4.22.1" + "@algolia/client-common" "4.22.1" + "@algolia/client-personalization" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/logger-common" "4.22.1" + "@algolia/logger-console" "4.22.1" + "@algolia/requester-browser-xhr" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/requester-node-http" "4.22.1" + "@algolia/transporter" "4.22.1" all-contributors-cli@^6.26.1: version "6.26.1" @@ -4722,10 +4704,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.10.1: - version "4.10.1" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.10.1.tgz#6e601470f498fee9756afebfa9a921e24a37d9e4" - integrity sha512-Ds0Z0Fv+Xf6ZEqV4Q5JIOeKfg83xxnww0Lzid0V94vPtlQ0yYmucEa33zSctsX2VEgBALtmk5zVEqd59pnUbuQ== +daisyui@4.7.3: + version "4.7.3" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.7.3.tgz#2d75b71d1c52f643914dea9b12930acc51ed9f49" + integrity sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g== dependencies: css-selector-tokenizer "^0.8" culori "^3" @@ -7193,10 +7175,10 @@ i18next-fs-backend@^2.3.1: resolved "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.1.tgz" integrity sha512-tvfXskmG/9o+TJ5Fxu54sSO5OkY6d+uMn+K6JiUGLJrwxAVfer+8V3nU8jq3ts9Pe5lXJv4b1N7foIjJ8Iy2Gg== -i18next@23.10.1: - version "23.10.1" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.10.1.tgz#217ce93b75edbe559ac42be00a20566b53937df6" - integrity sha512-NDiIzFbcs3O9PXpfhkjyf7WdqFn5Vq6mhzhtkXzj51aOcNuPNcTwuYNuXCpHsanZGHlHKL35G7huoFeVic1hng== +i18next@23.11.0: + version "23.11.0" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.0.tgz#3aaa38e887350db573af91eabddd71ab9fcd9ea8" + integrity sha512-VwFtlgy2LDbY0Qs6VfekIm6mv5/JmSJrtBf4aszl7Vby8+GcBlri0/7dkMZXmzTfiBMPUPBOmYCdQK7K4emkGQ== dependencies: "@babel/runtime" "^7.23.2" @@ -7981,7 +7963,7 @@ jest-get-type@^29.6.3: resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== -jiti@^1.19.1, jiti@^1.21.0: +jiti@^1.19.1: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -7991,15 +7973,10 @@ jotai-location@0.5.4: resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@2.7.2: - version "2.7.2" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.2.tgz#bfc49d76a93831f8e6b21e46662c3de7f15ae3d9" - integrity sha512-6Ft5kpNu8p93Ssf1Faoza3hYQZRIYp7rioK8MwTTFnbQKwUyZElwquPwl1h6U0uo9hC0jr+ghO3gcSjc6P35/Q== - -jpeg-exif@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/jpeg-exif/-/jpeg-exif-1.1.4.tgz#781a65b6cd74f62cb1c493511020f8d3577a1c2b" - integrity sha512-a+bKEcCjtuW5WTdgeXFzswSrdqi0jk4XlEtZlx5A94wCoBpFjfFTbo/Tra5SpNCl/YFZPvcV1dJc+TAYeg6ROQ== +jotai@2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" + integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== js-base64@^2.1.9: version "2.6.4" @@ -10067,7 +10044,33 @@ mocha-steps@1.3.0: resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@10.4.0, mocha@^10.0.0: +mocha@10.3.0: + version "10.3.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9" + integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "8.1.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +mocha@^10.0.0: version "10.4.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261" integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== @@ -11176,14 +11179,13 @@ pause@0.0.1: resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== -pdfkit@0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.15.0.tgz#7152f1bfa500c37d25b5f8cd4850db09a8108941" - integrity sha512-Z0dx0sEPKLW2kbThS1SWZ0iSHlRPoFMpP+oSjNrtwRjsfGivwE+r6emyEFwQG/fx1Ri0AGUHmDcGOSMMlLLnSg== +pdfkit@0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.14.0.tgz#1416633d48b1271b8059e7f0f7675635fd42a53e" + integrity sha512-Hnor8/78jhHm6ONrxWhrqOwAVALlBnFyWOF8sstBZMiqHZgZ5A6RU+Q3yahhw82plxpT7LOfH3b3qcOX6rzMQg== dependencies: crypto-js "^4.2.0" fontkit "^1.8.1" - jpeg-exif "^1.1.4" linebreak "^1.0.2" png-js "^1.0.0" @@ -11458,12 +11460,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.12.1: - version "5.12.1" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.1.tgz#db4596253bb066afc9f08744642f200a398d8d51" - integrity sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q== +prisma@5.11.0: + version "5.11.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.11.0.tgz#ef3891f79921a2deec6f540eba13a3cc8525f6d2" + integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== dependencies: - "@prisma/engines" "5.12.1" + "@prisma/engines" "5.11.0" proc-log@^3.0.0: version "3.0.0" @@ -11757,10 +11759,10 @@ react-timeago@7.2.0: resolved "https://registry.npmjs.org/react-timeago/-/react-timeago-7.2.0.tgz" integrity sha512-2KsBEEs+qRhKx/kekUVNSTIpop3Jwd7SRBm0R4Eiq3mPeswRGSsftY9FpKsE/lXLdURyQFiHeHFrIUxLYskG5g== -react-zoom-pan-pinch@3.4.4: - version "3.4.4" - resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.4.tgz#5450b027dbf9f161773cde71b061423ff1109328" - integrity sha512-lGTu7D9lQpYEQ6sH+NSlLA7gicgKRW8j+D/4HO1AbSV2POvKRFzdWQ8eI0r3xmOsl4dYQcY+teV6MhULeg1xBw== +react-zoom-pan-pinch@3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.3.tgz#10027dcf8ca997783414f43f84413fc00458d76b" + integrity sha512-x5MFlfAx2D6NTpZu8OISqc2nYn4p+YEaM1p21w7S/VE1wbVzK8vRzTo9Bj1ydufa649MuP7JBRM3vvj1RftFZw== react@18.2.0, react@^18.2.0: version "18.2.0" @@ -13229,7 +13231,12 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.13.0, swagger-ui-dist@>=5.0.0: +swagger-ui-dist@5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.0.tgz#cc983711d38963aad1de8693fb19f9d8f7a74f80" + integrity sha512-Rt1xUpbHulJVGbiQjq9yy9/r/0Pg6TmpcG+fXTaMePDc8z5WUw4LfaWts5qcNv/8ewPvBIbY7DKq7qReIKNCCQ== + +swagger-ui-dist@>=5.0.0: version "5.13.0" resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.13.0.tgz#e7e5b77de906d2d774c320f5f9fcaa6801cd7b88" integrity sha512-uaWhh6j18IIs5tOX0arvIBnVINAzpTXaQXkr7qAk8zoupegJVg0UU/5+S/FgsgVCnzVsJ9d7QLjIxkswEeTg0Q== @@ -13248,10 +13255,10 @@ synckit@^0.6.0: dependencies: tslib "^2.3.1" -tailwindcss@3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" - integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A== +tailwindcss@3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.1.tgz#f512ca5d1dd4c9503c7d3d28a968f1ad8f5c839d" + integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" @@ -13261,7 +13268,7 @@ tailwindcss@3.4.3: fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.21.0" + jiti "^1.19.1" lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" @@ -13400,10 +13407,10 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.3: resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -tlds@1.252.0: - version "1.252.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.252.0.tgz#71d9617f4ef4cc7347843bee72428e71b8b0f419" - integrity sha512-GA16+8HXvqtfEnw/DTcwB0UU354QE1n3+wh08oFjr6Znl7ZLAeUgYzCcK+/CCrOyE0vnHR8/pu3XXG3vDijXpQ== +tlds@1.251.0: + version "1.251.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.251.0.tgz#d5a79fe0ddd564dadef7b3ce0b5f7f6e5acd2f99" + integrity sha512-yztVk5O1LGKCjPd+7soBQyiKvSBXI5qugc/X0C7pLa0rV5ufBS6xcyX0pdf4NznO8xcZ5fqX248q+jTHd4AQJA== tmp@^0.0.33: version "0.0.33" @@ -14020,10 +14027,10 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -use-local-storage-state@19.2.0: - version "19.2.0" - resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.2.0.tgz#eac2f18c8f4762931d3b6661097be0b2c00f65de" - integrity sha512-z5+n406vi3FzPJW6+lzuL/LJr4VLhXsUq1TWWeHQABL37bnJ159dSUmO7XuwqvACX93ZA9P2vkB8GMDgq1rr7A== +use-local-storage-state@19.1.0: + version "19.1.0" + resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.1.0.tgz#9424981fd95dd37d253aad982f0a959ef5542fe2" + integrity sha512-3Ea6uRtRaSwpZYD9maZPKoEEGRuHmVA7zGrV/Uh9s5NTj9K1x/MB4IOQoywjUesQyhXmJq6bqjC5cAqlsXoOTw== use-sync-external-store@^1.0.0: version "1.2.0" From 0269f81eadf21ec5c6f5fb7b2ef98927ea088f4e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:56:32 +0000 Subject: [PATCH 656/795] chore(deps-dev): Bump mocha from 10.3.0 to 10.4.0 Bumps [mocha](https://github.com/mochajs/mocha) from 10.3.0 to 10.4.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v10.3.0...v10.4.0) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- designs/aaron/package.json | 2 +- designs/albert/package.json | 2 +- designs/bee/package.json | 2 +- designs/bella/package.json | 2 +- designs/benjamin/package.json | 2 +- designs/bent/package.json | 2 +- designs/bob/package.json | 2 +- designs/breanna/package.json | 2 +- designs/brian/package.json | 2 +- designs/bruce/package.json | 2 +- designs/carlita/package.json | 2 +- designs/carlton/package.json | 2 +- designs/cathrin/package.json | 2 +- designs/charlie/package.json | 2 +- designs/cornelius/package.json | 2 +- designs/diana/package.json | 2 +- designs/examples/package.json | 2 +- designs/florence/package.json | 2 +- designs/florent/package.json | 2 +- designs/gozer/package.json | 2 +- designs/hi/package.json | 2 +- designs/holmes/package.json | 2 +- designs/hortensia/package.json | 2 +- designs/huey/package.json | 2 +- designs/hugo/package.json | 2 +- designs/jaeger/package.json | 2 +- designs/legend/package.json | 2 +- designs/lucy/package.json | 2 +- designs/lumina/package.json | 2 +- designs/lumira/package.json | 2 +- designs/lunetius/package.json | 2 +- designs/magde/package.json | 2 +- designs/naomiwu/package.json | 2 +- designs/noble/package.json | 2 +- designs/octoplushy/package.json | 2 +- designs/onyx/package.json | 2 +- designs/otis/package.json | 2 +- designs/paco/package.json | 2 +- designs/penelope/package.json | 2 +- designs/plugintest/package.json | 2 +- designs/rendertest/package.json | 2 +- designs/sandy/package.json | 2 +- designs/shelly/package.json | 2 +- designs/shin/package.json | 2 +- designs/simon/package.json | 2 +- designs/simone/package.json | 2 +- designs/skully/package.json | 2 +- designs/sven/package.json | 2 +- designs/tamiko/package.json | 2 +- designs/teagan/package.json | 2 +- designs/tiberius/package.json | 2 +- designs/titan/package.json | 2 +- designs/trayvon/package.json | 2 +- designs/tristan/package.json | 2 +- designs/uma/package.json | 2 +- designs/wahid/package.json | 2 +- designs/walburga/package.json | 2 +- designs/waralee/package.json | 2 +- designs/yuri/package.json | 2 +- packages/core/package.json | 2 +- plugins/core-plugins/package.json | 2 +- plugins/plugin-annotations/package.json | 2 +- plugins/plugin-bin-pack/package.json | 2 +- plugins/plugin-bust/package.json | 2 +- plugins/plugin-flip/package.json | 2 +- plugins/plugin-gore/package.json | 2 +- plugins/plugin-i18n/package.json | 2 +- plugins/plugin-measurements/package.json | 2 +- plugins/plugin-mirror/package.json | 2 +- plugins/plugin-ringsector/package.json | 2 +- plugins/plugin-round/package.json | 2 +- plugins/plugin-sprinkle/package.json | 2 +- plugins/plugin-svgattr/package.json | 2 +- plugins/plugin-theme/package.json | 2 +- plugins/plugin-timing/package.json | 2 +- plugins/plugin-versionfree-svg/package.json | 2 +- sites/backend/package.json | 2 +- yarn.lock | 28 +-------------------- 78 files changed, 78 insertions(+), 104 deletions(-) diff --git a/designs/aaron/package.json b/designs/aaron/package.json index ce49326fd04..ea3aaf7747d 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/albert/package.json b/designs/albert/package.json index 2da5d562161..76d7bf1ecad 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bee/package.json b/designs/bee/package.json index 526713a6274..679d1ef1970 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bella/package.json b/designs/bella/package.json index 13a232d076a..9c2e7949bac 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 306fcec95e6..34e8c8a00b4 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bent/package.json b/designs/bent/package.json index 7f65d2d1937..ab30a071207 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bob/package.json b/designs/bob/package.json index 690304808e0..386c486b04f 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 98433c12533..23703212f1d 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/brian/package.json b/designs/brian/package.json index f849821156b..1b8d3fef38d 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 0331cf23c1f..11c39cca02c 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlita/package.json b/designs/carlita/package.json index d6d57077e8b..cacda75c2f2 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlton/package.json b/designs/carlton/package.json index 993c41644db..527c7549a2d 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index dd7914bed64..b1b143c31f4 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/charlie/package.json b/designs/charlie/package.json index 18d70deb1f9..719da827cd5 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 6b25b344a0b..10cc99cdfe8 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/diana/package.json b/designs/diana/package.json index ca162a5e64a..712695b98a1 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/examples/package.json b/designs/examples/package.json index 62370fdfe04..4b9785928aa 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -49,7 +49,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florence/package.json b/designs/florence/package.json index 2be92777915..78c0d6f8a46 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florent/package.json b/designs/florent/package.json index 5517dc5daaf..ccc886313fb 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/gozer/package.json b/designs/gozer/package.json index 87a57c23f00..9f69b8e32fe 100644 --- a/designs/gozer/package.json +++ b/designs/gozer/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hi/package.json b/designs/hi/package.json index 9d69fb4066d..0f168e4475a 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/holmes/package.json b/designs/holmes/package.json index 8d117ccc321..4fd2f67ee9f 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -56,7 +56,7 @@ "@freesewing/plugin-gore": "3.2.0" }, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index 94509b15abb..6257ce5ecc6 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/huey/package.json b/designs/huey/package.json index 5625fd7e419..c3add0f8398 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 07352d582f2..ca8b3417488 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 8057ca5af1c..062664a8321 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/legend/package.json b/designs/legend/package.json index 393b84a3c33..c4c98decf3d 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lucy/package.json b/designs/lucy/package.json index fa1b7b9750c..1d88fed6ac4 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumina/package.json b/designs/lumina/package.json index 34aec3889be..d29100eba1e 100644 --- a/designs/lumina/package.json +++ b/designs/lumina/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumira/package.json b/designs/lumira/package.json index 1f785ea47b8..a8f347f9478 100644 --- a/designs/lumira/package.json +++ b/designs/lumira/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index d330055838a..33945b987ed 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/magde/package.json b/designs/magde/package.json index 05c56cdd495..85b88a524bc 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/naomiwu/package.json b/designs/naomiwu/package.json index f264bfcfbc6..7e94a19d612 100644 --- a/designs/naomiwu/package.json +++ b/designs/naomiwu/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/noble/package.json b/designs/noble/package.json index 386a9f1fc4e..a129e21771c 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index c0575885b02..c045f09f539 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/onyx/package.json b/designs/onyx/package.json index eb391f0487c..9cdf7db32a4 100644 --- a/designs/onyx/package.json +++ b/designs/onyx/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/otis/package.json b/designs/otis/package.json index d5bc84c0d50..6da21cc33f7 100644 --- a/designs/otis/package.json +++ b/designs/otis/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/paco/package.json b/designs/paco/package.json index 8d1e605df9f..91d4085935e 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/penelope/package.json b/designs/penelope/package.json index 53809315576..f7bb4c9d458 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 82cfdd51637..1c5802400b1 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index a20ffc0b6d6..d289bc33358 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sandy/package.json b/designs/sandy/package.json index c68744723f9..46629614acc 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shelly/package.json b/designs/shelly/package.json index ff36d0da81d..640316a9f39 100644 --- a/designs/shelly/package.json +++ b/designs/shelly/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shin/package.json b/designs/shin/package.json index b1cb670c6d1..b07a360390c 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simon/package.json b/designs/simon/package.json index 1c3dd85df64..13a8be358da 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simone/package.json b/designs/simone/package.json index a0e6f349f6f..cc6ab5ef1a9 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/skully/package.json b/designs/skully/package.json index 902e1c6c547..70b10a4c3fc 100644 --- a/designs/skully/package.json +++ b/designs/skully/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sven/package.json b/designs/sven/package.json index e190e0352ee..2d0457b03c6 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index f51300d340a..59db79d575b 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 8ddb9931348..85aec5e3f4c 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index 2856b97eb6b..d8baff4cca9 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/titan/package.json b/designs/titan/package.json index 1a580665506..fc9becb3e0d 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index 8802043a845..d1845b37b3c 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tristan/package.json b/designs/tristan/package.json index 75f650a70e1..6eefb36c598 100644 --- a/designs/tristan/package.json +++ b/designs/tristan/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/uma/package.json b/designs/uma/package.json index a604f506236..1b1b780c669 100644 --- a/designs/uma/package.json +++ b/designs/uma/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/wahid/package.json b/designs/wahid/package.json index 7bd43e2b1e9..556c25b8f2d 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/walburga/package.json b/designs/walburga/package.json index c9c5006449d..40e3691c03f 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/waralee/package.json b/designs/waralee/package.json index 338ea5cecd2..1b7be0b4cb1 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 21d8ff1e509..9b7aea2882d 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/packages/core/package.json b/packages/core/package.json index 3486b1ebea7..044df17a26f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,7 +64,7 @@ "devDependencies": { "eslint": "8.57.0", "nyc": "15.1.0", - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "sinon": "^17.0.1" }, diff --git a/plugins/core-plugins/package.json b/plugins/core-plugins/package.json index f8161bb41d8..55b6267fe70 100644 --- a/plugins/core-plugins/package.json +++ b/plugins/core-plugins/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/plugin-annotations": "3.2.0", "@freesewing/plugin-mirror": "3.2.0", diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index 080aeac1c48..9595a53eb92 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bin-pack/package.json b/plugins/plugin-bin-pack/package.json index de2420f1fa8..2bbb3177085 100644 --- a/plugins/plugin-bin-pack/package.json +++ b/plugins/plugin-bin-pack/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 78bbbf1bc64..2bf7619359f 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index c67d522a583..620410d3a05 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index 76b6b1cd68e..7109989548f 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index fa39fd98abb..0cd8688c19f 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 0f5550513ca..7922a7c75bd 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 733c2c5b3e4..f96155821fe 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-ringsector/package.json b/plugins/plugin-ringsector/package.json index 3b2f69a23c9..7a3674e6e81 100644 --- a/plugins/plugin-ringsector/package.json +++ b/plugins/plugin-ringsector/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index c5f81e78971..6d85f49d3fe 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index 72a16401155..75a5153fd03 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 5322bf25702..9d89a25858d 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index dc9e123f800..bb83f9c2ac9 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index cc7bdbb438b..d1841135c09 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index 73a4aa1a79a..9b11f459a4b 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/sites/backend/package.json b/sites/backend/package.json index 31a2d359598..2372e5527c7 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -50,7 +50,7 @@ "chai": "5.1.0", "chai-http": "4.4.0", "esbuild": "0.20.2", - "mocha": "10.3.0", + "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", "prisma": "5.11.0" diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..392833eab4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10044,33 +10044,7 @@ mocha-steps@1.3.0: resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@10.3.0: - version "10.3.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.3.0.tgz#0e185c49e6dccf582035c05fa91084a4ff6e3fe9" - integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "8.1.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -mocha@^10.0.0: +mocha@10.4.0, mocha@^10.0.0: version "10.4.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261" integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== From 0662f68e1792b295e069017e711d12eaf53d1652 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 17:57:27 +0000 Subject: [PATCH 657/795] chore(deps): Bump jotai from 2.7.2 to 2.8.0 Bumps [jotai](https://github.com/pmndrs/jotai) from 2.7.2 to 2.8.0. - [Release notes](https://github.com/pmndrs/jotai/releases) - [Commits](https://github.com/pmndrs/jotai/compare/v2.7.2...v2.8.0) --- updated-dependencies: - dependency-name: jotai dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 9276ee11271..9b9f21d9291 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -40,7 +40,7 @@ "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", - "jotai": "2.7.1", + "jotai": "2.8.0", "jotai-location": "0.5.4", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 71671c2a833..721bc1fdfc4 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -55,7 +55,7 @@ "echarts-for-react": "3.0.2", "file-saver": "2.0.5", "i18next": "23.11.0", - "jotai": "2.7.1", + "jotai": "2.8.0", "jotai-location": "0.5.4", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..fec2503f44a 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -29,7 +29,7 @@ "front-matter": "4.0.2", "highlight.js": "11.9.0", "github-slugger": "2.0.0", - "jotai": "2.7.1", + "jotai": "2.8.0", "jotai-location": "0.5.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..330a4634be7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7973,10 +7973,10 @@ jotai-location@0.5.4: resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" - integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== +jotai@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.8.0.tgz#5a6585cd5576c400c2c5f8e157b83ad2ba70b2ab" + integrity sha512-yZNMC36FdLOksOr8qga0yLf14miCJlEThlp5DeFJNnqzm2+ZG7wLcJzoOyij5K6U6Xlc5ljQqPDlJRgqW0Y18g== js-base64@^2.1.9: version "2.6.4" From 55ea480452d6c036fc99c1e254a02cfde06c4da1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 04:47:59 +0000 Subject: [PATCH 658/795] chore(deps): Bump react-zoom-pan-pinch from 3.4.3 to 3.4.4 Bumps [react-zoom-pan-pinch](https://github.com/prc5/react-zoom-pan-pinch) from 3.4.3 to 3.4.4. - [Release notes](https://github.com/prc5/react-zoom-pan-pinch/releases) - [Changelog](https://github.com/BetterTyped/react-zoom-pan-pinch/blob/master/CHANGELOG.md) - [Commits](https://github.com/prc5/react-zoom-pan-pinch/compare/v3.4.3...v3.4.4) --- updated-dependencies: - dependency-name: react-zoom-pan-pinch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index 71671c2a833..134f6e53100 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -75,7 +75,7 @@ "react-dropzone": "14.2.3", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.3", + "react-zoom-pan-pinch": "3.4.4", "remark-gfm": "4.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..d80e5393a49 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -44,7 +44,7 @@ "react": "18.2.0", "react-dom": "18.2.0", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.3", + "react-zoom-pan-pinch": "3.4.4", "rehype-autolink-headings": "7.1.0", "rehype-highlight": "7.0.0", "remark-frontmatter": "5.0.0", diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..24d1d9cc79f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11759,10 +11759,10 @@ react-timeago@7.2.0: resolved "https://registry.npmjs.org/react-timeago/-/react-timeago-7.2.0.tgz" integrity sha512-2KsBEEs+qRhKx/kekUVNSTIpop3Jwd7SRBm0R4Eiq3mPeswRGSsftY9FpKsE/lXLdURyQFiHeHFrIUxLYskG5g== -react-zoom-pan-pinch@3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.3.tgz#10027dcf8ca997783414f43f84413fc00458d76b" - integrity sha512-x5MFlfAx2D6NTpZu8OISqc2nYn4p+YEaM1p21w7S/VE1wbVzK8vRzTo9Bj1ydufa649MuP7JBRM3vvj1RftFZw== +react-zoom-pan-pinch@3.4.4: + version "3.4.4" + resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.4.tgz#5450b027dbf9f161773cde71b061423ff1109328" + integrity sha512-lGTu7D9lQpYEQ6sH+NSlLA7gicgKRW8j+D/4HO1AbSV2POvKRFzdWQ8eI0r3xmOsl4dYQcY+teV6MhULeg1xBw== react@18.2.0, react@^18.2.0: version "18.2.0" From e3542031e1c68495e2919eede6f32d0d5f145408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 04:48:32 +0000 Subject: [PATCH 659/795] chore(deps): Bump @resvg/resvg-js from 2.6.0 to 2.6.2 Bumps [@resvg/resvg-js](https://github.com/yisibl/resvg-js) from 2.6.0 to 2.6.2. - [Release notes](https://github.com/yisibl/resvg-js/releases) - [Changelog](https://github.com/yisibl/resvg-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/yisibl/resvg-js/compare/v2.6.0...v2.6.2) --- updated-dependencies: - dependency-name: "@resvg/resvg-js" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 128 +++++++++++++++++++------------------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..f786720de30 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -17,7 +17,7 @@ "peerDependencies": {}, "dependencies": { "@next/mdx": "14.1.4", - "@resvg/resvg-js": "2.6.0", + "@resvg/resvg-js": "2.6.2", "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..7a4f82a2d09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1942,83 +1942,83 @@ dependencies: "@prisma/debug" "5.11.0" -"@resvg/resvg-js-android-arm-eabi@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz#fed7723ed5c5f7490762e025ad704bcbceee37b7" - integrity sha512-lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA== +"@resvg/resvg-js-android-arm-eabi@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe" + integrity sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA== -"@resvg/resvg-js-android-arm64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz#e0531a220ec8954e41039b2483cc3706d30d3635" - integrity sha512-N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ== +"@resvg/resvg-js-android-arm64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.2.tgz#b8cb564d7f6b3f37d9b43129f5dc5fe171e249e4" + integrity sha512-VcOKezEhm2VqzXpcIJoITuvUS/fcjIw5NA/w3tjzWyzmvoCdd+QXIqy3FBGulWdClvp4g+IfUemigrkLThSjAQ== -"@resvg/resvg-js-darwin-arm64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz#38f609cd2bd71ce6a065df7a8b8144479b156969" - integrity sha512-MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew== +"@resvg/resvg-js-darwin-arm64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.2.tgz#49bd3faeda5c49f53302d970e6e79d006de18e7d" + integrity sha512-nmok2LnAd6nLUKI16aEB9ydMC6Lidiiq2m1nEBDR1LaaP7FGs4AJ90qDraxX+CWlVuRlvNjyYJTNv8qFjtL9+A== -"@resvg/resvg-js-darwin-x64@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz#5c3f69d0cd68980e7e5cfcabf0db90e85d289559" - integrity sha512-zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA== +"@resvg/resvg-js-darwin-x64@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.2.tgz#e1344173aa27bfb4d880ab576d1acf1c1648faca" + integrity sha512-GInyZLjgWDfsVT6+SHxQVRwNzV0AuA1uqGsOAW+0th56J7Nh6bHHKXHBWzUrihxMetcFDmQMAX1tZ1fZDYSRsw== -"@resvg/resvg-js-linux-arm-gnueabihf@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz#6bcae7d4101e7fea2be0db167eda832cab63e27f" - integrity sha512-sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A== +"@resvg/resvg-js-linux-arm-gnueabihf@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.2.tgz#34c445eba45efd68f6130b2ab426d76a7424253d" + integrity sha512-YIV3u/R9zJbpqTTNwTZM5/ocWetDKGsro0SWp70eGEM9eV2MerWyBRZnQIgzU3YBnSBQ1RcxRZvY/UxwESfZIw== -"@resvg/resvg-js-linux-arm64-gnu@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz#fb71ea6b9a4b30412fa096fdbf9e8427012b3a99" - integrity sha512-fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A== +"@resvg/resvg-js-linux-arm64-gnu@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.2.tgz#30da47087dd8153182198b94fe9f8d994890dae5" + integrity sha512-zc2BlJSim7YR4FZDQ8OUoJg5holYzdiYMeobb9pJuGDidGL9KZUv7SbiD4E8oZogtYY42UZEap7dqkkYuA91pg== -"@resvg/resvg-js-linux-arm64-musl@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz#ec7e85b8b6eea23c0242faa1f1486241f253a190" - integrity sha512-ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg== +"@resvg/resvg-js-linux-arm64-musl@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.2.tgz#5d75b8ff5c83103729c1ca3779987302753c50d4" + integrity sha512-3h3dLPWNgSsD4lQBJPb4f+kvdOSJHa5PjTYVsWHxLUzH4IFTJUAnmuWpw4KqyQ3NA5QCyhw4TWgxk3jRkQxEKg== -"@resvg/resvg-js-linux-x64-gnu@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz#2a9b2a14554b0b1825c2ebc52b5fc2d95a831a63" - integrity sha512-n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q== +"@resvg/resvg-js-linux-x64-gnu@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.2.tgz#411abedfaee5edc57cbb7701736cecba522e26f3" + integrity sha512-IVUe+ckIerA7xMZ50duAZzwf1U7khQe2E0QpUxu5MBJNao5RqC0zwV/Zm965vw6D3gGFUl7j4m+oJjubBVoftw== -"@resvg/resvg-js-linux-x64-musl@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz#42081a8b06ccfa011aee9cc10b2f0fea3a4563ed" - integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw== +"@resvg/resvg-js-linux-x64-musl@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.2.tgz#fe4984038f0372f279e3ff570b72934dd7eb2a5c" + integrity sha512-UOf83vqTzoYQO9SZ0fPl2ZIFtNIz/Rr/y+7X8XRX1ZnBYsQ/tTb+cj9TE+KHOdmlTFBxhYzVkP2lRByCzqi4jQ== -"@resvg/resvg-js-win32-arm64-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz#3af0d5f7bd9193ac6be8f226b539be6f7576302d" - integrity sha512-X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q== +"@resvg/resvg-js-win32-arm64-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.2.tgz#d3a053cf7ff687087a2106330c0fdaae706254d1" + integrity sha512-7C/RSgCa+7vqZ7qAbItfiaAWhyRSoD4l4BQAbVDqRRsRgY+S+hgS3in0Rxr7IorKUpGE69X48q6/nOAuTJQxeQ== -"@resvg/resvg-js-win32-ia32-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz#64af45bfee41cb2bea0b6dd0bdc94175183f2b56" - integrity sha512-L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg== +"@resvg/resvg-js-win32-ia32-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.2.tgz#7cdda1ce29ef7209e28191d917fa5bef0624a4ad" + integrity sha512-har4aPAlvjnLcil40AC77YDIk6loMawuJwFINEM7n0pZviwMkMvjb2W5ZirsNOZY4aDbo5tLx0wNMREp5Brk+w== -"@resvg/resvg-js-win32-x64-msvc@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz#08431a243c15f002d32e5e628857d19852323274" - integrity sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw== +"@resvg/resvg-js-win32-x64-msvc@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.2.tgz#cb0ad04525d65f3def4c8d346157a57976d5b388" + integrity sha512-ZXtYhtUr5SSaBrUDq7DiyjOFJqBVL/dOBN7N/qmi/pO0IgiWW/f/ue3nbvu9joWE5aAKDoIzy/CxsY0suwGosQ== -"@resvg/resvg-js@2.6.0": - version "2.6.0" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.0.tgz#d811100796dda1f37a516c747dab3bbc9b24e5e4" - integrity sha512-Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA== +"@resvg/resvg-js@2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.2.tgz#3e92a907d88d879256c585347c5b21a7f3bb5b46" + integrity sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q== optionalDependencies: - "@resvg/resvg-js-android-arm-eabi" "2.6.0" - "@resvg/resvg-js-android-arm64" "2.6.0" - "@resvg/resvg-js-darwin-arm64" "2.6.0" - "@resvg/resvg-js-darwin-x64" "2.6.0" - "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.0" - "@resvg/resvg-js-linux-arm64-gnu" "2.6.0" - "@resvg/resvg-js-linux-arm64-musl" "2.6.0" - "@resvg/resvg-js-linux-x64-gnu" "2.6.0" - "@resvg/resvg-js-linux-x64-musl" "2.6.0" - "@resvg/resvg-js-win32-arm64-msvc" "2.6.0" - "@resvg/resvg-js-win32-ia32-msvc" "2.6.0" - "@resvg/resvg-js-win32-x64-msvc" "2.6.0" + "@resvg/resvg-js-android-arm-eabi" "2.6.2" + "@resvg/resvg-js-android-arm64" "2.6.2" + "@resvg/resvg-js-darwin-arm64" "2.6.2" + "@resvg/resvg-js-darwin-x64" "2.6.2" + "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.2" + "@resvg/resvg-js-linux-arm64-gnu" "2.6.2" + "@resvg/resvg-js-linux-arm64-musl" "2.6.2" + "@resvg/resvg-js-linux-x64-gnu" "2.6.2" + "@resvg/resvg-js-linux-x64-musl" "2.6.2" + "@resvg/resvg-js-win32-arm64-msvc" "2.6.2" + "@resvg/resvg-js-win32-ia32-msvc" "2.6.2" + "@resvg/resvg-js-win32-x64-msvc" "2.6.2" "@rushstack/eslint-patch@^1.3.3": version "1.7.2" From 9fe65760f064e13cb96ce216021b262d67323ca7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 04:49:02 +0000 Subject: [PATCH 660/795] chore(deps): Bump tlds from 1.251.0 to 1.252.0 Bumps [tlds](https://github.com/stephenmathieson/node-tlds) from 1.251.0 to 1.252.0. - [Changelog](https://github.com/stephenmathieson/node-tlds/blob/master/CHANGELOG.md) - [Commits](https://github.com/stephenmathieson/node-tlds/compare/1.251.0...1.252.0) --- updated-dependencies: - dependency-name: tlds dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index 71671c2a833..ece1fe1c77c 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -83,7 +83,7 @@ "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.1", - "tlds": "1.251.0", + "tlds": "1.252.0", "use-local-storage-state": "19.1.0", "web-worker": "1.3.0" }, diff --git a/sites/shared/package.json b/sites/shared/package.json index 3ea149a0c2d..dcb70fcc048 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -52,7 +52,7 @@ "remark-smartypants": "2.1.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tlds": "1.251.0", + "tlds": "1.252.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", "use-local-storage-state": "19.1.0", diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..d0893a2a31c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13407,10 +13407,10 @@ tiny-inflate@^1.0.0, tiny-inflate@^1.0.3: resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -tlds@1.251.0: - version "1.251.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.251.0.tgz#d5a79fe0ddd564dadef7b3ce0b5f7f6e5acd2f99" - integrity sha512-yztVk5O1LGKCjPd+7soBQyiKvSBXI5qugc/X0C7pLa0rV5ufBS6xcyX0pdf4NznO8xcZ5fqX248q+jTHd4AQJA== +tlds@1.252.0: + version "1.252.0" + resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.252.0.tgz#71d9617f4ef4cc7347843bee72428e71b8b0f419" + integrity sha512-GA16+8HXvqtfEnw/DTcwB0UU354QE1n3+wh08oFjr6Znl7ZLAeUgYzCcK+/CCrOyE0vnHR8/pu3XXG3vDijXpQ== tmp@^0.0.33: version "0.0.33" From 3b78abf42fedb0a08d13f8f3360de7df291eb06a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 10 Apr 2024 17:54:08 +0200 Subject: [PATCH 661/795] fix(backend): Check for public set. Fixes #6538 --- sites/backend/src/models/set.mjs | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sites/backend/src/models/set.mjs b/sites/backend/src/models/set.mjs index 4a75662ed2d..923f377493f 100644 --- a/sites/backend/src/models/set.mjs +++ b/sites/backend/src/models/set.mjs @@ -90,15 +90,25 @@ SetModel.prototype.guardedCreate = async function ({ body, user }) { */ SetModel.prototype.guardedRead = async function ({ params, user }) { /* - * Enforce RBAC - */ - if (!this.rbac.readSome(user)) return this.setResponse(403, 'insufficientAccessLevel') - - /* - * Attempt to read the record from the database + * If the set is public, we do not need to enforce RBAC + * So let's load it first */ await this.read({ id: parseInt(params.id) }) + /* + * If it's public, return early + */ + if (this.record?.public) + return this.setResponse(200, false, { + result: 'success', + set: this.asSet(), + }) + + /* + * If it's not public, enforce RBAC + */ + if (!this.rbac.readSome(user)) return this.setResponse(403, 'insufficientAccessLevel') + /* * If it does not exist, send a 404 */ From 92ef560c27a968bdb0f4f588f97b925f9d5926ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 04:10:36 +0000 Subject: [PATCH 662/795] chore(deps): Bump swagger-ui-dist from 5.12.0 to 5.15.0 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.12.0 to 5.15.0. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.12.0...v5.15.0) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 31a2d359598..af111e8a379 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.12.0", + "swagger-ui-dist": "5.15.0", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 34f78ee90b7..5597342b63e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13231,15 +13231,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.12.0.tgz#cc983711d38963aad1de8693fb19f9d8f7a74f80" - integrity sha512-Rt1xUpbHulJVGbiQjq9yy9/r/0Pg6TmpcG+fXTaMePDc8z5WUw4LfaWts5qcNv/8ewPvBIbY7DKq7qReIKNCCQ== - -swagger-ui-dist@>=5.0.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.13.0.tgz#e7e5b77de906d2d774c320f5f9fcaa6801cd7b88" - integrity sha512-uaWhh6j18IIs5tOX0arvIBnVINAzpTXaQXkr7qAk8zoupegJVg0UU/5+S/FgsgVCnzVsJ9d7QLjIxkswEeTg0Q== +swagger-ui-dist@5.15.0, swagger-ui-dist@>=5.0.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.15.0.tgz#b67856839d4cb8a31d7b0dc8792a9ee3d1123042" + integrity sha512-1zd4cNaUayXCWFSdBGNB+CYGISbe7M4FSgPqOjrgqKi1oEZfXzrOrjIHa0jHf5uSDN0X/mXmhFgKR9Jrr+fvqQ== swagger-ui-express@5.0.0: version "5.0.0" From 956ffba535e583919728704ae9363847bbcc99d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 17:07:48 +0000 Subject: [PATCH 663/795] chore(deps): Bump use-local-storage-state from 19.1.0 to 19.2.0 Bumps [use-local-storage-state](https://github.com/astoilkov/use-local-storage-state) from 19.1.0 to 19.2.0. - [Release notes](https://github.com/astoilkov/use-local-storage-state/releases) - [Commits](https://github.com/astoilkov/use-local-storage-state/compare/v19.1.0...v19.2.0) --- updated-dependencies: - dependency-name: use-local-storage-state dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 9276ee11271..bd02c928e42 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -63,7 +63,7 @@ "remark-gfm": "4.0.0", "remark-mdx-frontmatter": "4.0.0", "strip-markdown": "6.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "yaml-loader": "0.8.1" }, "devDependencies": { diff --git a/sites/sde/package.json b/sites/sde/package.json index ece1fe1c77c..e1f5ee2814a 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -84,7 +84,7 @@ "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.1", "tlds": "1.252.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": {}, diff --git a/sites/shared/package.json b/sites/shared/package.json index dcb70fcc048..6ea32abe9ad 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -55,7 +55,7 @@ "tlds": "1.252.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 83c19830706..8dea1c75e37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14022,10 +14022,10 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -use-local-storage-state@19.1.0: - version "19.1.0" - resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.1.0.tgz#9424981fd95dd37d253aad982f0a959ef5542fe2" - integrity sha512-3Ea6uRtRaSwpZYD9maZPKoEEGRuHmVA7zGrV/Uh9s5NTj9K1x/MB4IOQoywjUesQyhXmJq6bqjC5cAqlsXoOTw== +use-local-storage-state@19.2.0: + version "19.2.0" + resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.2.0.tgz#eac2f18c8f4762931d3b6661097be0b2c00f65de" + integrity sha512-z5+n406vi3FzPJW6+lzuL/LJr4VLhXsUq1TWWeHQABL37bnJ159dSUmO7XuwqvACX93ZA9P2vkB8GMDgq1rr7A== use-sync-external-store@^1.0.0: version "1.2.0" From 10f6b8cf26c5f3f946be2361e3e1dc97747042e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 04:13:05 +0000 Subject: [PATCH 664/795] chore(deps): Bump algoliasearch from 4.22.1 to 4.23.3 Bumps [algoliasearch](https://github.com/algolia/algoliasearch-client-javascript) from 4.22.1 to 4.23.3. - [Release notes](https://github.com/algolia/algoliasearch-client-javascript/releases) - [Changelog](https://github.com/algolia/algoliasearch-client-javascript/blob/master/CHANGELOG.md) - [Commits](https://github.com/algolia/algoliasearch-client-javascript/compare/4.22.1...4.23.3) --- updated-dependencies: - dependency-name: algoliasearch dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- yarn.lock | 214 ++++++++++++++++++++++------------------- 4 files changed, 119 insertions(+), 101 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 06c5d74a6f6..2862a16917b 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -34,7 +34,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", "@tailwindcss/typography": "0.5.10", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.3", "daisyui": "4.7.3", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index 2bc4345ee20..b1afcb00046 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -31,7 +31,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/typography": "0.5.10", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.3", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index 9276ee11271..6f75d870be8 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -35,7 +35,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "0.5.10", - "algoliasearch": "4.22.1", + "algoliasearch": "4.23.3", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.7.3", "echarts": "5.5.0", diff --git a/yarn.lock b/yarn.lock index 83c19830706..bac0bce7155 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,114 +7,131 @@ resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@algolia/cache-browser-local-storage@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz#14b6dc9abc9e3a304a5fffb063d15f30af1032d1" - integrity sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g== +"@algolia/cache-browser-local-storage@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.3.tgz#0cc26b96085e1115dac5fcb9d826651ba57faabc" + integrity sha512-vRHXYCpPlTDE7i6UOy2xE03zHF2C8MEFjPN2v7fRbqVpcOvAUQK81x3Kc21xyb5aSIpYCjWCZbYZuz8Glyzyyg== dependencies: - "@algolia/cache-common" "4.22.1" + "@algolia/cache-common" "4.23.3" -"@algolia/cache-common@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.22.1.tgz#c625dff4bc2a74e79f9aed67b4e053b0ef1b3ec1" - integrity sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA== +"@algolia/cache-common@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.3.tgz#3bec79092d512a96c9bfbdeec7cff4ad36367166" + integrity sha512-h9XcNI6lxYStaw32pHpB1TMm0RuxphF+Ik4o7tcQiodEdpKK+wKufY6QXtba7t3k8eseirEMVB83uFFF3Nu54A== -"@algolia/cache-in-memory@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz#858a3d887f521362e87d04f3943e2810226a0d71" - integrity sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw== +"@algolia/cache-in-memory@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.3.tgz#3945f87cd21ffa2bec23890c85305b6b11192423" + integrity sha512-yvpbuUXg/+0rbcagxNT7un0eo3czx2Uf0y4eiR4z4SD7SiptwYTpbuS0IHxcLHG3lq22ukx1T6Kjtk/rT+mqNg== dependencies: - "@algolia/cache-common" "4.22.1" + "@algolia/cache-common" "4.23.3" -"@algolia/client-account@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.22.1.tgz#a7fb8b66b9a4f0a428e1426b2561144267d76d43" - integrity sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw== +"@algolia/client-account@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.3.tgz#8751bbf636e6741c95e7c778488dee3ee430ac6f" + integrity sha512-hpa6S5d7iQmretHHF40QGq6hz0anWEHGlULcTIT9tbUssWUriN9AUXIFQ8Ei4w9azD0hc1rUok9/DeQQobhQMA== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.3" + "@algolia/client-search" "4.23.3" + "@algolia/transporter" "4.23.3" -"@algolia/client-analytics@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.22.1.tgz#506558740b4d49b1b1e3393861f729a8ce921851" - integrity sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg== +"@algolia/client-analytics@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.3.tgz#f88710885278fe6fb6964384af59004a5a6f161d" + integrity sha512-LBsEARGS9cj8VkTAVEZphjxTjMVCci+zIIiRhpFun9jGDUlS1XmhCW7CTrnaWeIuCQS/2iPyRqSy1nXPjcBLRA== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.3" + "@algolia/client-search" "4.23.3" + "@algolia/requester-common" "4.23.3" + "@algolia/transporter" "4.23.3" -"@algolia/client-common@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.22.1.tgz#042b19c1b6157c485fa1b551349ab313944d2b05" - integrity sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ== +"@algolia/client-common@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.3.tgz#891116aa0db75055a7ecc107649f7f0965774704" + integrity sha512-l6EiPxdAlg8CYhroqS5ybfIczsGUIAC47slLPOMDeKSVXYG1n0qGiz4RjAHLw2aD0xzh2EXZ7aRguPfz7UKDKw== dependencies: - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/requester-common" "4.23.3" + "@algolia/transporter" "4.23.3" -"@algolia/client-personalization@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.22.1.tgz#ff088d797648224fb582e9fe5828f8087835fa3d" - integrity sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ== +"@algolia/client-personalization@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.3.tgz#35fa8e5699b0295fbc400a8eb211dc711e5909db" + integrity sha512-3E3yF3Ocr1tB/xOZiuC3doHQBQ2zu2MPTYZ0d4lpfWads2WTKG7ZzmGnsHmm63RflvDeLK/UVx7j2b3QuwKQ2g== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.3" + "@algolia/requester-common" "4.23.3" + "@algolia/transporter" "4.23.3" -"@algolia/client-search@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.22.1.tgz#508cc6ab3d1f4e9c02735a630d4dff6fbb8514a2" - integrity sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA== +"@algolia/client-search@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.3.tgz#a3486e6af13a231ec4ab43a915a1f318787b937f" + integrity sha512-P4VAKFHqU0wx9O+q29Q8YVuaowaZ5EM77rxfmGnkHUJggh28useXQdopokgwMeYw2XUht49WX5RcTQ40rZIabw== dependencies: - "@algolia/client-common" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/client-common" "4.23.3" + "@algolia/requester-common" "4.23.3" + "@algolia/transporter" "4.23.3" "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== -"@algolia/logger-common@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.22.1.tgz#79cf4cd295de0377a94582c6aaac59b1ded731d9" - integrity sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg== +"@algolia/logger-common@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.3.tgz#35c6d833cbf41e853a4f36ba37c6e5864920bfe9" + integrity sha512-y9kBtmJwiZ9ZZ+1Ek66P0M68mHQzKRxkW5kAAXYN/rdzgDN0d2COsViEFufxJ0pb45K4FRcfC7+33YB4BLrZ+g== -"@algolia/logger-console@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.22.1.tgz#0355345f6940f67aaa78ae9b81c06e44e49f2336" - integrity sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA== +"@algolia/logger-console@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.3.tgz#30f916781826c4db5f51fcd9a8a264a06e136985" + integrity sha512-8xoiseoWDKuCVnWP8jHthgaeobDLolh00KJAdMe9XPrWPuf1by732jSpgy2BlsLTaT9m32pHI8CRfrOqQzHv3A== dependencies: - "@algolia/logger-common" "4.22.1" + "@algolia/logger-common" "4.23.3" -"@algolia/requester-browser-xhr@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz#f04df6fe9690a071b267c77d26b83a3be9280361" - integrity sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw== +"@algolia/recommend@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.23.3.tgz#53d4f194d22d9c72dc05f3f7514c5878f87c5890" + integrity sha512-9fK4nXZF0bFkdcLBRDexsnGzVmu4TSYZqxdpgBW2tEyfuSSY54D4qSRkLmNkrrz4YFvdh2GM1gA8vSsnZPR73w== dependencies: - "@algolia/requester-common" "4.22.1" + "@algolia/cache-browser-local-storage" "4.23.3" + "@algolia/cache-common" "4.23.3" + "@algolia/cache-in-memory" "4.23.3" + "@algolia/client-common" "4.23.3" + "@algolia/client-search" "4.23.3" + "@algolia/logger-common" "4.23.3" + "@algolia/logger-console" "4.23.3" + "@algolia/requester-browser-xhr" "4.23.3" + "@algolia/requester-common" "4.23.3" + "@algolia/requester-node-http" "4.23.3" + "@algolia/transporter" "4.23.3" -"@algolia/requester-common@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.22.1.tgz#27be35f3718aafcb6b388ff9c3aa2defabd559ff" - integrity sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg== - -"@algolia/requester-node-http@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz#589a6fa828ad0f325e727a6fcaf4e1a2343cc62b" - integrity sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA== +"@algolia/requester-browser-xhr@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.3.tgz#9e47e76f60d540acc8b27b4ebc7a80d1b41938b9" + integrity sha512-jDWGIQ96BhXbmONAQsasIpTYWslyjkiGu0Quydjlowe+ciqySpiDUrJHERIRfELE5+wFc7hc1Q5hqjGoV7yghw== dependencies: - "@algolia/requester-common" "4.22.1" + "@algolia/requester-common" "4.23.3" -"@algolia/transporter@4.22.1": - version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.22.1.tgz#8843841b857dc021668f31647aa557ff19cd9cb1" - integrity sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ== +"@algolia/requester-common@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.3.tgz#7dbae896e41adfaaf1d1fa5f317f83a99afb04b3" + integrity sha512-xloIdr/bedtYEGcXCiF2muajyvRhwop4cMZo+K2qzNht0CMzlRkm8YsDdj5IaBhshqfgmBb3rTg4sL4/PpvLYw== + +"@algolia/requester-node-http@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.3.tgz#c9f94a5cb96a15f48cea338ab6ef16bbd0ff989f" + integrity sha512-zgu++8Uj03IWDEJM3fuNl34s746JnZOWn1Uz5taV1dFyJhVM/kTNw9Ik7YJWiUNHJQXcaD8IXD1eCb0nq/aByA== dependencies: - "@algolia/cache-common" "4.22.1" - "@algolia/logger-common" "4.22.1" - "@algolia/requester-common" "4.22.1" + "@algolia/requester-common" "4.23.3" + +"@algolia/transporter@4.23.3": + version "4.23.3" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.3.tgz#545b045b67db3850ddf0bbecbc6c84ff1f3398b7" + integrity sha512-Wjl5gttqnf/gQKJA+dafnD0Y6Yw97yvfY8R9h0dQltX1GXTgNs1zWgvtWW0tHl1EgMdhAyw189uWiZMnL3QebQ== + dependencies: + "@algolia/cache-common" "4.23.3" + "@algolia/logger-common" "4.23.3" + "@algolia/requester-common" "4.23.3" "@algolia/ui-components-highlight-vdom@^1.2.1": version "1.2.2" @@ -2986,25 +3003,26 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" -algoliasearch@4.22.1: - version "4.22.1" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.22.1.tgz#f10fbecdc7654639ec20d62f109c1b3a46bc6afc" - integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== +algoliasearch@4.23.3: + version "4.23.3" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.3.tgz#e09011d0a3b0651444916a3e6bbcba064ec44b60" + integrity sha512-Le/3YgNvjW9zxIQMRhUHuhiUjAlKY/zsdZpfq4dlLqg6mEm0nL6yk+7f2hDOtLpxsgE4jSzDmvHL7nXdBp5feg== dependencies: - "@algolia/cache-browser-local-storage" "4.22.1" - "@algolia/cache-common" "4.22.1" - "@algolia/cache-in-memory" "4.22.1" - "@algolia/client-account" "4.22.1" - "@algolia/client-analytics" "4.22.1" - "@algolia/client-common" "4.22.1" - "@algolia/client-personalization" "4.22.1" - "@algolia/client-search" "4.22.1" - "@algolia/logger-common" "4.22.1" - "@algolia/logger-console" "4.22.1" - "@algolia/requester-browser-xhr" "4.22.1" - "@algolia/requester-common" "4.22.1" - "@algolia/requester-node-http" "4.22.1" - "@algolia/transporter" "4.22.1" + "@algolia/cache-browser-local-storage" "4.23.3" + "@algolia/cache-common" "4.23.3" + "@algolia/cache-in-memory" "4.23.3" + "@algolia/client-account" "4.23.3" + "@algolia/client-analytics" "4.23.3" + "@algolia/client-common" "4.23.3" + "@algolia/client-personalization" "4.23.3" + "@algolia/client-search" "4.23.3" + "@algolia/logger-common" "4.23.3" + "@algolia/logger-console" "4.23.3" + "@algolia/recommend" "4.23.3" + "@algolia/requester-browser-xhr" "4.23.3" + "@algolia/requester-common" "4.23.3" + "@algolia/requester-node-http" "4.23.3" + "@algolia/transporter" "4.23.3" all-contributors-cli@^6.26.1: version "6.26.1" From e150db75bac40d2197c374540efdcf850b9adf3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 04:14:18 +0000 Subject: [PATCH 665/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.535.0 to 3.554.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.535.0 to 3.554.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.554.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 270 +++++++++++++++++-------------------- 2 files changed, 126 insertions(+), 146 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index af111e8a379..bf209f0e6cc 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.535.0", + "@aws-sdk/client-sesv2": "3.554.0", "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index 83c19830706..0a32fc42e9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -142,15 +142,6 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@aws-crypto/crc32@3.0.0": - version "3.0.0" - resolved "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz" - integrity sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA== - dependencies: - "@aws-crypto/util" "^3.0.0" - "@aws-sdk/types" "^3.222.0" - tslib "^1.11.1" - "@aws-crypto/ie11-detection@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz" @@ -197,194 +188,194 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.535.0.tgz#66ffd54ab4e612be84f4e63670304d2d83ca12a1" - integrity sha512-K0WZf/o4R+A20RFHJW+YyMg0cMK8GMHe2MHURpPvLJoq5JF0RpCdsMTgRiYIoAFCLoy8qFH9G0MebxR8JZvD+A== +"@aws-sdk/client-sesv2@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.554.0.tgz#f56a0cd0076796de46efa2dfe1de9f4da87b70fc" + integrity sha512-l5x92adRLKX/PgvdsA4f/rAXyhFKoODW2KkrHdH98H9gXvWU8Tx4GRwwFw34S7ZlO+yg2j4mQZWo+4lLoJXfjw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.535.0" - "@aws-sdk/core" "3.535.0" - "@aws-sdk/credential-provider-node" "3.535.0" + "@aws-sdk/client-sts" "3.554.0" + "@aws-sdk/core" "3.554.0" + "@aws-sdk/credential-provider-node" "3.554.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz#64666c2f7bed8510938ba2b481429fea8f97473d" - integrity sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw== +"@aws-sdk/client-sso-oidc@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.554.0.tgz#c4002879c89cf5e4a45f39c63b2963f8fab88385" + integrity sha512-M86rkiRqbZBF5VyfTQ/vttry9VSoQkZ1oCqYF+SAGlXmD0Of8587yRSj2M4rYe0Uj7nRQIfSnhDYp1UzsZeRfQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.535.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/client-sts" "3.554.0" + "@aws-sdk/core" "3.554.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz#c405aaf880cb695aa2f5070a8827955274fc9df2" - integrity sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ== +"@aws-sdk/client-sso@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.554.0.tgz#fef7b7ee47cad3987b50e9218ec1d11dcd42e32b" + integrity sha512-yj6CgIxCT3UwMumEO481KH4QvwArkAPzD7Xvwe1QKgJATc9bKNEo/FxV8LfnWIJ7nOtMDxbNxYLMXH/Fs1qGaQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/core" "3.554.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz#0f518fe338c6b7a8b8a897e2ccee65d06dc0040f" - integrity sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw== +"@aws-sdk/client-sts@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.554.0.tgz#511f1bafe628613f1824274f9c11a9df31ac0b09" + integrity sha512-EhaA6T0M0DNg5M8TCF1a7XJI5D/ZxAF3dgVIchyF98iNzjYgl/7U8K6hJay2A11aFvVu70g46xYMpz3Meky4wQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.535.0" + "@aws-sdk/core" "3.554.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.535.0" + "@aws-sdk/middleware-user-agent" "3.540.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.0" - "@smithy/middleware-retry" "^2.2.0" + "@smithy/middleware-endpoint" "^2.5.1" + "@smithy/middleware-retry" "^2.3.1" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.0" - "@smithy/util-defaults-mode-node" "^2.3.0" + "@smithy/util-defaults-mode-browser" "^2.2.1" + "@smithy/util-defaults-mode-node" "^2.3.1" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/core@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.535.0.tgz#f3a726c297cea9634d19a1db4e958c918c506c8b" - integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== +"@aws-sdk/core@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.554.0.tgz#84def70777ace823efb54451da403bfc125a8571" + integrity sha512-JrG7ToTLeNf+/S3IiCUPVw9jEDB0DXl5ho8n/HwOa946mv+QyCepCuV2U/8f/1KAX0mD8Ufm/E4/cbCbFHgbSg== dependencies: - "@smithy/core" "^1.4.0" + "@smithy/core" "^1.4.2" "@smithy/protocol-http" "^3.3.0" - "@smithy/signature-v4" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/signature-v4" "^2.2.1" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" tslib "^2.6.2" @@ -399,31 +390,31 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz#0a42f6b1a61d927bbce9f4afd25112f486bd05da" - integrity sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw== +"@aws-sdk/credential-provider-http@3.552.0": + version "3.552.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.552.0.tgz#ecc88d02cba95621887e6b85b2583e756ad29eb6" + integrity sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/property-provider" "^2.2.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz#b121b1aba2916e3f45745cd690b4082421a7c286" - integrity sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA== +"@aws-sdk/credential-provider-ini@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.554.0.tgz#09c6b8f38cdbca3b27f0d71c53465ca9c3f2a5cf" + integrity sha512-BQenhg43S6TMJHxrdjDVdVF+HH5tA1op9ZYLyJrvV5nn7CCO4kyAkkOuSAv1NkL+RZsIkW0/vHTXwQOQw3cUsg== dependencies: - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.554.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.535.0" - "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.554.0" + "@aws-sdk/credential-provider-web-identity" "3.554.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -431,17 +422,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz#6739b4b52a9cce29dc8e70c9a7290b89cdc4b904" - integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== +"@aws-sdk/credential-provider-node@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.554.0.tgz#74e8ae0b69cfba716e57881ace9d6466deedfb5e" + integrity sha512-poX/+2OE3oxqp4f5MiaJh251p8l+bzcFwgcDBwz0e2rcpvMSYl9jw4AvGnCiG2bmf9yhNJdftBiS1A+KjxV0qA== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" - "@aws-sdk/credential-provider-http" "3.535.0" - "@aws-sdk/credential-provider-ini" "3.535.0" + "@aws-sdk/credential-provider-http" "3.552.0" + "@aws-sdk/credential-provider-ini" "3.554.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.535.0" - "@aws-sdk/credential-provider-web-identity" "3.535.0" + "@aws-sdk/credential-provider-sso" "3.554.0" + "@aws-sdk/credential-provider-web-identity" "3.554.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -460,25 +451,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz#dfc7c2f39f9ca965becd7e5b9414cd1bb2217490" - integrity sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg== +"@aws-sdk/credential-provider-sso@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.554.0.tgz#83e950685aaadb18d48d51c39f6201d820a5de41" + integrity sha512-8QPpwBA31i/fZ7lDZJC4FA9EdxLg5SJ8sPB2qLSjp5UTGTYL2HRl0Eznkb7DXyp/wImsR/HFR1NxuFCCVotLCg== dependencies: - "@aws-sdk/client-sso" "3.535.0" - "@aws-sdk/token-providers" "3.535.0" + "@aws-sdk/client-sso" "3.554.0" + "@aws-sdk/token-providers" "3.554.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz#f1d3a72ff958cbd7e052c5109755379745ac35e0" - integrity sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg== +"@aws-sdk/credential-provider-web-identity@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.554.0.tgz#6076a32066b633a18fc90cae7ed0b874db78a556" + integrity sha512-HN54DzLjepw5ZWSF9ycGevhFTyg6pjLuLKy5Y8t/f1jFDComzYdGEDe0cdV9YO653W3+PQwZZGz09YVygGYBLg== dependencies: - "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/client-sts" "3.554.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -513,13 +504,13 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz#2877ff5e42d943dd0c488e8b1ad82bd9da121227" - integrity sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog== +"@aws-sdk/middleware-user-agent@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" + integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== dependencies: "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.535.0" + "@aws-sdk/util-endpoints" "3.540.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" @@ -536,12 +527,12 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz#0d5aa221449d5b56730427b28d3319005c5700ed" - integrity sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg== +"@aws-sdk/token-providers@3.554.0": + version "3.554.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.554.0.tgz#5a20ce273451654a1382f772ef119a9a156f537c" + integrity sha512-KMMQ5Cw0FUPL9H8g69Lp08xtzRo7r/MK+lBV6LznWBbCP/NwtZ8awVHaPy2P31z00cWtu9MYkUTviWPqJTaBvg== dependencies: - "@aws-sdk/client-sso-oidc" "3.535.0" + "@aws-sdk/client-sso-oidc" "3.554.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" @@ -556,10 +547,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.535.0": - version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz#46f4b61b2661d6414ded8c98e4ad3c82a0bf597b" - integrity sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg== +"@aws-sdk/util-endpoints@3.540.0": + version "3.540.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" + integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/types" "^2.12.0" @@ -2165,7 +2156,7 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/core@^1.4.0": +"@smithy/core@^1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== @@ -2190,16 +2181,6 @@ "@smithy/url-parser" "^2.2.0" tslib "^2.6.2" -"@smithy/eventstream-codec@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.2.0.tgz#63d74fa817188995eb55e792a38060b0ede98dc4" - integrity sha512-8janZoJw85nJmQZc4L8TuePp2pk1nxLgkxIR0TUjKJ5Dkj5oelB9WtiSSGXCQvNsJl0VSTvK/2ueMXxvpa9GVw== - dependencies: - "@aws-crypto/crc32" "3.0.0" - "@smithy/types" "^2.12.0" - "@smithy/util-hex-encoding" "^2.2.0" - tslib "^2.6.2" - "@smithy/fetch-http-handler@^2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac" @@ -2245,7 +2226,7 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^2.5.0", "@smithy/middleware-endpoint@^2.5.1": +"@smithy/middleware-endpoint@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad" integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ== @@ -2258,7 +2239,7 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.1": +"@smithy/middleware-retry@^2.3.1": version "2.3.1" resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== @@ -2358,12 +2339,11 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/signature-v4@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.2.0.tgz#8fe6a574188b71fba6056111b88d50c84babb060" - integrity sha512-+B5TNzj/fRZzVW3z8UUJOkNx15+4E0CLuvJmJUA1JUIZFp3rdJ/M2H5r2SqltaVPXL0oIxv/6YK92T9TsFGbFg== +"@smithy/signature-v4@^2.2.1": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd" + integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q== dependencies: - "@smithy/eventstream-codec" "^2.2.0" "@smithy/is-array-buffer" "^2.2.0" "@smithy/types" "^2.12.0" "@smithy/util-hex-encoding" "^2.2.0" @@ -2372,7 +2352,7 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@smithy/smithy-client@^2.5.0", "@smithy/smithy-client@^2.5.1": +"@smithy/smithy-client@^2.5.1": version "2.5.1" resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3" integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ== @@ -2438,27 +2418,27 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.0.tgz#963a9d3c3351272764dd1c5dc07c26f2c8abcb02" - integrity sha512-2okTdZaCBvOJszAPU/KSvlimMe35zLOKbQpHhamFJmR7t95HSe0K3C92jQPjKY3PmDBD+7iMkOnuW05F5OlF4g== +"@smithy/util-defaults-mode-browser@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e" + integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw== dependencies: "@smithy/property-provider" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^2.3.0": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.0.tgz#5005058ca0a299f0948b47c288f7c3d4f36cb26e" - integrity sha512-hfKXnNLmsW9cmLb/JXKIvtuO6Cf4SuqN5PN1C2Ru/TBIws+m1wSgb+A53vo0r66xzB6E82inKG2J7qtwdi+Kkw== +"@smithy/util-defaults-mode-node@^2.3.1": + version "2.3.1" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a" + integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA== dependencies: "@smithy/config-resolver" "^2.2.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/property-provider" "^2.2.0" - "@smithy/smithy-client" "^2.5.0" + "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" tslib "^2.6.2" From f289f8f3a21a08a2565a3879882d7d38e047e743 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 17:33:27 +0000 Subject: [PATCH 666/795] chore(deps): Bump @prisma/client from 5.11.0 to 5.12.1 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.11.0 to 5.12.1. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.1/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index bf209f0e6cc..68def28731a 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.554.0", - "@prisma/client": "5.11.0", + "@prisma/client": "5.12.1", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index 25df4c163ff..e1fff157ddd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1909,10 +1909,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.11.0.tgz#d8e55fab85163415b2245fb408b9106f83c8106d" - integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== +"@prisma/client@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" + integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== "@prisma/debug@5.11.0": version "5.11.0" From 78571d2c929650de8a7a94632112e39a315e97ac Mon Sep 17 00:00:00 2001 From: Genia Boeing Date: Fri, 12 Apr 2024 20:06:01 +0100 Subject: [PATCH 667/795] Replace .setRender() with .hide() --- markdown/dev/howtos/design/seam-allowance/en.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/markdown/dev/howtos/design/seam-allowance/en.md b/markdown/dev/howtos/design/seam-allowance/en.md index 00642a550cb..4670670b630 100644 --- a/markdown/dev/howtos/design/seam-allowance/en.md +++ b/markdown/dev/howtos/design/seam-allowance/en.md @@ -13,7 +13,7 @@ In the example below we have two such paths: - `paths.saBase` is the path that will require regular seam allowance - `paths.hemBase` is the path that will require more seam allowance, or hem allowance -When creating them, we disable rendering, effectively hiding them. +When creating them, we hide the new paths to avoid drawing the same path multiple times. Then we string together our real path and our seam allowance based on them: ```js @@ -22,11 +22,11 @@ Then we string together our real path and our seam allowance based on them: .line(points.tip) .curve(points.tipCpBottom, points.tipCpTop, points.topLeft) .line(points.bottomLeft) - .setRender(false) + .hide() paths.hemBase = new Path() .move(points.bottomLeft) .line(points.bottomRight) - .setRender(false) + .hide() paths.seam = paths.saBase.join(paths.hemBase) .close() From 00ef7a9ba0d82cee81d9f2bf9f0f52c3363e460d Mon Sep 17 00:00:00 2001 From: FreeSewing bot Date: Fri, 12 Apr 2024 21:59:19 +0200 Subject: [PATCH 668/795] feat: New showcase post trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns by user-65187 --- .../en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md diff --git a/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md b/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md new file mode 100644 index 00000000000..902d46dfb4b --- /dev/null +++ b/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md @@ -0,0 +1,11 @@ +--- +title: "Trampoline Punk: A Punk Suit Made from a Trampoline Using the Jaeger Jacket and Charlie Chinos Patterns" +caption: "Jaeger Jacket and Charlie Chinos from the back, with a skull applique on the jacket" +date: 20240412 +intro: "Trampoline Punk attempts to answer the question "Can you sew a formal suit from a trampoline?" The answer: sort of, but you have to be willing to bleed for it." +author: 65187 +designs: ["jaeger", "charlie"] +--- + +Trampoline Punk attempts to answer the question "Can you sew a formal suit from a trampoline?" The answer: sort of, but you have to be willing to bleed for it. The formal jacket and pants are sewn from the family's trampoline that was destroyed in a 2023 windstorm. The dress shirt and patchwork skull are sewn from the designer's 22-year-old wedding dress. The garment features punk detailing such as DIY patches, safety pin embellishments, and chains from the trampoline rigging. Don't try this at home unless you are willing to sacrifice several sewing machine needles, your favorite scissors, and most of the skin on your hands. + From 00e99e30fe3186b462b09cd07565c806be50194e Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:40:18 +0000 Subject: [PATCH 669/795] docs: update CONTRIBUTORS.md [skip ci] --- CONTRIBUTORS.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 030d1156b41..e4fa39027f7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -90,87 +90,88 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Nathan Yergler
    Nathan Yergler
    📖 + Niabon
    Niabon
    📖 Nick Dower
    Nick Dower
    📖 💻 🐛 Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 - Phillip Thelen
    Phillip Thelen
    💻 + Phillip Thelen
    Phillip Thelen
    💻 Pixieish
    Pixieish
    📖 Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 - Sanne
    Sanne
    💻 📖 + Sanne
    Sanne
    💻 📖 Sara Latorre
    Sara Latorre
    🌍 SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 - Soham Tembhurne
    Soham Tembhurne
    💻 + Soham Tembhurne
    Soham Tembhurne
    💻 SoneaTheBest
    SoneaTheBest
    🌍 Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 - Trent Trama
    Trent Trama
    💻 + Trent Trama
    Trent Trama
    💻 Tríona
    Tríona
    📖 Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 - amysews
    amysews
    📖 + amysews
    amysews
    📖 anna-puk
    anna-puk
    💻 beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 - chri5b
    chri5b
    💻 ⚠️ + chri5b
    chri5b
    💻 ⚠️ dingcycle
    dingcycle
    🌍 drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 - gaylyndie
    gaylyndie
    📖 + gaylyndie
    gaylyndie
    📖 grimlokason
    grimlokason
    💻 hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 - mesil
    mesil
    🐛 + mesil
    mesil
    🐛 starfetch
    starfetch
    💻 📖 🌍 🎨 timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 viocky
    viocky
    🌍 - woolishboy
    woolishboy
    💻 + woolishboy
    woolishboy
    💻 yc
    yc
    🌍 From e962f4a4185b27881c5b2bd7e1f2c8bd626f90ad Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:40:19 +0000 Subject: [PATCH 670/795] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 42adff166a6..7d90e5a423f 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1185,6 +1185,15 @@ "contributions": [ "question" ] + }, + { + "login": "GeniaHarrietBoeing", + "name": "Niabon", + "avatar_url": "https://avatars.githubusercontent.com/u/73827848?v=4", + "profile": "https://github.com/GeniaHarrietBoeing", + "contributions": [ + "doc" + ] } ], "skipCi": true, From 6ba15614e230eb697c800b9469f9c6902d2a5a3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 04:10:25 +0000 Subject: [PATCH 671/795] chore(deps): Bump next from 14.1.4 to 14.2.1 Bumps [next](https://github.com/vercel/next.js) from 14.1.4 to 14.2.1. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.1.4...v14.2.1) --- updated-dependencies: - dependency-name: next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 124 +++++++++++++++++++++-------------------- 5 files changed, 69 insertions(+), 63 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 2862a16917b..8797f68db3f 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -39,7 +39,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.1.4", + "next": "14.2.1", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-dom": "18.2.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index b1afcb00046..df533dcead1 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -40,7 +40,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.1.4", + "next": "14.2.1", "next-i18next": "15.2.0", "ora": "8.0.1", "react": "18.2.0", diff --git a/sites/org/package.json b/sites/org/package.json index 6f75d870be8..adf1ffe41f7 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -46,7 +46,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "luxon": "3.4.4", - "next": "14.1.4", + "next": "14.2.1", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index ece1fe1c77c..51c8fd91fb9 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -63,7 +63,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "mustache": "4.2.0", - "next": "14.1.4", + "next": "14.2.1", "next-i18next": "15.2.0", "pdfkit": "0.14.0", "postcss-for": "2.1.1", diff --git a/yarn.lock b/yarn.lock index 25df4c163ff..e4bf35ac8ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1487,10 +1487,10 @@ dependencies: webpack-bundle-analyzer "4.10.1" -"@next/env@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.4.tgz#432e80651733fbd67230bf262aee28be65252674" - integrity sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ== +"@next/env@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.1.tgz#18b4fb5fd76bdda65369ad4ea5f33199ae708d2f" + integrity sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA== "@next/eslint-plugin-next@14.1.4": version "14.1.4" @@ -1506,50 +1506,50 @@ dependencies: source-map "^0.7.0" -"@next/swc-darwin-arm64@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.4.tgz#a3bca0dc4393ac4cf3169bbf24df63441de66bb7" - integrity sha512-ubmUkbmW65nIAOmoxT1IROZdmmJMmdYvXIe8211send9ZYJu+SqxSnJM4TrPj9wmL6g9Atvj0S/2cFmMSS99jg== +"@next/swc-darwin-arm64@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.1.tgz#44ca580ccac1396fa45e2bcc6584238098491e71" + integrity sha512-kGjnjcIJehEcd3rT/3NAATJQndAEELk0J9GmGMXHSC75TMnvpOhONcjNHbjtcWE5HUQnIHy5JVkatrnYm1QhVw== -"@next/swc-darwin-x64@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.4.tgz#ba3683d4e2d30099f3f2864dd7349a4d9f440140" - integrity sha512-b0Xo1ELj3u7IkZWAKcJPJEhBop117U78l70nfoQGo4xUSvv0PJSTaV4U9xQBLvZlnjsYkc8RwQN1HoH/oQmLlQ== +"@next/swc-darwin-x64@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.1.tgz#1747091f40fd3b0d8e072ba62203ec998619525f" + integrity sha512-dAdWndgdQi7BK2WSXrx4lae7mYcOYjbHJUhvOUnJjMNYrmYhxbbvJ2xElZpxNxdfA6zkqagIB9He2tQk+l16ew== -"@next/swc-linux-arm64-gnu@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.4.tgz#3519969293f16379954b7e196deb0c1eecbb2f8b" - integrity sha512-457G0hcLrdYA/u1O2XkRMsDKId5VKe3uKPvrKVOyuARa6nXrdhJOOYU9hkKKyQTMru1B8qEP78IAhf/1XnVqKA== +"@next/swc-linux-arm64-gnu@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.1.tgz#ede705718c316e65e3dd9ab31962824b8befb0cb" + integrity sha512-2ZctfnyFOGvTkoD6L+DtQtO3BfFz4CapoHnyLTXkOxbZkVRgg3TQBUjTD/xKrO1QWeydeo8AWfZRg8539qNKrg== -"@next/swc-linux-arm64-musl@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.4.tgz#4bb3196bd402b3f84cf5373ff1021f547264d62f" - integrity sha512-l/kMG+z6MB+fKA9KdtyprkTQ1ihlJcBh66cf0HvqGP+rXBbOXX0dpJatjZbHeunvEHoBBS69GYQG5ry78JMy3g== +"@next/swc-linux-arm64-musl@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.1.tgz#ce50a5d94a7ba1f8e34a941f4ca076d8beebc79c" + integrity sha512-jazZXctiaanemy4r+TPIpFP36t1mMwWCKMsmrTRVChRqE6putyAxZA4PDujx0SnfvZHosjdkx9xIq9BzBB5tWg== -"@next/swc-linux-x64-gnu@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.4.tgz#1b3372c98c83dcdab946cdb4ee06e068b8139ba3" - integrity sha512-BapIFZ3ZRnvQ1uWbmqEGJuPT9cgLwvKtxhK/L2t4QYO7l+/DxXuIGjvp1x8rvfa/x1FFSsipERZK70pewbtJtw== +"@next/swc-linux-x64-gnu@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.1.tgz#ac3e8fa4d028fe7a9d9b7c33db3ab65679ae5fe2" + integrity sha512-VjCHWCjsAzQAAo8lkBOLEIkBZFdfW+Z18qcQ056kL4KpUYc8o59JhLDCBlhg+hINQRgzQ2UPGma2AURGOH0+Qg== -"@next/swc-linux-x64-musl@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.4.tgz#8459088bdc872648ff78f121db596f2533df5808" - integrity sha512-mqVxTwk4XuBl49qn2A5UmzFImoL1iLm0KQQwtdRJRKl21ylQwwGCxJtIYo2rbfkZHoSKlh/YgztY0qH3wG1xIg== +"@next/swc-linux-x64-musl@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.1.tgz#2beb7bee80dfb54a36d81392f21c599014018177" + integrity sha512-7HZKYKvAp4nAHiHIbY04finRqjeYvkITOGOurP1aLMexIFG/1+oCnqhGogBdc4lao/lkMW1c+AkwWSzSlLasqw== -"@next/swc-win32-arm64-msvc@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.4.tgz#84280a08c00cc3be24ddd3a12f4617b108e6dea6" - integrity sha512-xzxF4ErcumXjO2Pvg/wVGrtr9QQJLk3IyQX1ddAC/fi6/5jZCZ9xpuL9Tzc4KPWMFq8GGWFVDMshZOdHGdkvag== +"@next/swc-win32-arm64-msvc@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.1.tgz#b25df35a6ed99eb73bfed07822dd28a37aaab9f9" + integrity sha512-YGHklaJ/Cj/F0Xd8jxgj2p8po4JTCi6H7Z3Yics3xJhm9CPIqtl8erlpK1CLv+HInDqEWfXilqatF8YsLxxA2Q== -"@next/swc-win32-ia32-msvc@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.4.tgz#23ff7f4bd0a27177428669ef6fa5c3923c738031" - integrity sha512-WZiz8OdbkpRw6/IU/lredZWKKZopUMhcI2F+XiMAcPja0uZYdMTZQRoQ0WZcvinn9xZAidimE7tN9W5v9Yyfyw== +"@next/swc-win32-ia32-msvc@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.1.tgz#2cc67b93f0a71a8f3c1dd735676f4c9ddd4240ff" + integrity sha512-o+ISKOlvU/L43ZhtAAfCjwIfcwuZstiHVXq/BDsZwGqQE0h/81td95MPHliWCnFoikzWcYqh+hz54ZB2FIT8RA== -"@next/swc-win32-x64-msvc@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.4.tgz#bccf5beccfde66d6c66fa4e2509118c796385eda" - integrity sha512-4Rto21sPfw555sZ/XNLqfxDUNeLhNYGO2dlPqsnuCg8N8a2a9u1ltqBOPQ4vj1Gf7eJC0W2hHG2eYUHuiXgY2w== +"@next/swc-win32-x64-msvc@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.1.tgz#e5f4003930de4a150a8c2e7cf5c133cd99a686bd" + integrity sha512-GmRoTiLcvCLifujlisknv4zu9/C4i9r0ktsA8E51EMqJL4bD4CpO7lDYr7SrUxCR0tS4RVcrqKmCak24T0ohaw== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -2521,11 +2521,17 @@ "@smithy/util-buffer-from" "^2.2.0" tslib "^2.6.2" -"@swc/helpers@0.5.2": - version "0.5.2" - resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz" - integrity sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw== +"@swc/counter@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" + integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== + +"@swc/helpers@0.5.5": + version "0.5.5" + resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.5.tgz#12689df71bfc9b21c4f4ca00ae55f2f16c8b77c0" + integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A== dependencies: + "@swc/counter" "^0.1.3" tslib "^2.4.0" "@swc/helpers@^0.3.13": @@ -10195,28 +10201,28 @@ next-i18next@15.2.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -next@14.1.4: - version "14.1.4" - resolved "https://registry.yarnpkg.com/next/-/next-14.1.4.tgz#203310f7310578563fd5c961f0db4729ce7a502d" - integrity sha512-1WTaXeSrUwlz/XcnhGTY7+8eiaFvdet5z9u3V2jb+Ek1vFo0VhHKSAIJvDWfQpttWjnyw14kBeq28TPq7bTeEQ== +next@14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.1.tgz#081509478156407e4c181ad4791fea0a43c6347d" + integrity sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag== dependencies: - "@next/env" "14.1.4" - "@swc/helpers" "0.5.2" + "@next/env" "14.2.1" + "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" graceful-fs "^4.2.11" postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.1.4" - "@next/swc-darwin-x64" "14.1.4" - "@next/swc-linux-arm64-gnu" "14.1.4" - "@next/swc-linux-arm64-musl" "14.1.4" - "@next/swc-linux-x64-gnu" "14.1.4" - "@next/swc-linux-x64-musl" "14.1.4" - "@next/swc-win32-arm64-msvc" "14.1.4" - "@next/swc-win32-ia32-msvc" "14.1.4" - "@next/swc-win32-x64-msvc" "14.1.4" + "@next/swc-darwin-arm64" "14.2.1" + "@next/swc-darwin-x64" "14.2.1" + "@next/swc-linux-arm64-gnu" "14.2.1" + "@next/swc-linux-arm64-musl" "14.2.1" + "@next/swc-linux-x64-gnu" "14.2.1" + "@next/swc-linux-x64-musl" "14.2.1" + "@next/swc-win32-arm64-msvc" "14.2.1" + "@next/swc-win32-ia32-msvc" "14.2.1" + "@next/swc-win32-x64-msvc" "14.2.1" nise@^5.1.5: version "5.1.9" From e6018d149707f5f6a13b595558d69fd6d392eec3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 04:10:43 +0000 Subject: [PATCH 672/795] chore(deps): Bump swagger-ui-dist from 5.15.0 to 5.15.1 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.15.0 to 5.15.1. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.15.0...v5.15.1) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index bf209f0e6cc..2b8405cbeba 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.19.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.15.0", + "swagger-ui-dist": "5.15.1", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 25df4c163ff..4395a92af4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13229,10 +13229,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.15.0, swagger-ui-dist@>=5.0.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.15.0.tgz#b67856839d4cb8a31d7b0dc8792a9ee3d1123042" - integrity sha512-1zd4cNaUayXCWFSdBGNB+CYGISbe7M4FSgPqOjrgqKi1oEZfXzrOrjIHa0jHf5uSDN0X/mXmhFgKR9Jrr+fvqQ== +swagger-ui-dist@5.15.1, swagger-ui-dist@>=5.0.0: + version "5.15.1" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.15.1.tgz#99fbb54c01feb6635e218fa12061f0edae634a00" + integrity sha512-Et/WY0NFdKj8sUBOyEx5P3VybsvGl7bo/y9JvgQ22TkH1a/KscQ0ZiQST2YeJ3cwCrIjYTbHbt165fkku0y1Ig== swagger-ui-express@5.0.0: version "5.0.0" From 727414eb4494e975c4152d630ccce919a685f722 Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Mon, 15 Apr 2024 15:41:26 +0100 Subject: [PATCH 673/795] Add Galit Author --- markdown/org/showcase/shorts/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/shorts/en.md b/markdown/org/showcase/shorts/en.md index 10e107187bd..d05cd2cd0bd 100644 --- a/markdown/org/showcase/shorts/en.md +++ b/markdown/org/showcase/shorts/en.md @@ -5,6 +5,7 @@ date: 20231118 intro: "-" designs: ["titan"] maker: Galit +author: 49445 --- Shorts for my dauther From 1d46cd093d1a5c8002dface82744136bc086265d Mon Sep 17 00:00:00 2001 From: bobgeorgethe3rd Date: Mon, 15 Apr 2024 15:43:56 +0100 Subject: [PATCH 674/795] typo in body --- markdown/org/showcase/shorts/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/en.md b/markdown/org/showcase/shorts/en.md index d05cd2cd0bd..a63f861adef 100644 --- a/markdown/org/showcase/shorts/en.md +++ b/markdown/org/showcase/shorts/en.md @@ -8,5 +8,5 @@ maker: Galit author: 49445 --- -Shorts for my dauther +Shorts for my daughter From 4ce430f81254213c9235f3b771330cef43b59fa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:14:42 +0000 Subject: [PATCH 675/795] chore(deps): Bump pino from 8.19.0 to 8.20.0 Bumps [pino](https://github.com/pinojs/pino) from 8.19.0 to 8.20.0. - [Release notes](https://github.com/pinojs/pino/releases) - [Commits](https://github.com/pinojs/pino/compare/v8.19.0...v8.20.0) --- updated-dependencies: - dependency-name: pino dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 2b8405cbeba..ec499c51f68 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -41,7 +41,7 @@ "passport": "0.7.0", "passport-http": "0.3.0", "passport-jwt": "4.0.1", - "pino": "8.19.0", + "pino": "8.20.0", "qrcode": "1.5.3", "swagger-ui-dist": "5.15.1", "swagger-ui-express": "5.0.0" diff --git a/yarn.lock b/yarn.lock index d8ea06e8f5a..b496f5ed545 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11260,9 +11260,9 @@ pify@^4.0.1: resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pino-abstract-transport@v1.1.0: +pino-abstract-transport@^1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8" integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA== dependencies: readable-stream "^4.0.0" @@ -11273,15 +11273,15 @@ pino-std-serializers@^6.0.0: resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz" integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== -pino@8.19.0: - version "8.19.0" - resolved "https://registry.npmjs.org/pino/-/pino-8.19.0.tgz" - integrity sha512-oswmokxkav9bADfJ2ifrvfHUwad6MLp73Uat0IkQWY3iAw5xTRoznXbXksZs8oaOUMpmhVWD+PZogNzllWpJaA== +pino@8.20.0: + version "8.20.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.20.0.tgz#ccfc6fef37b165e006b923834131632a8c4f036b" + integrity sha512-uhIfMj5TVp+WynVASaVEJFTncTUe4dHBq6CWplu/vBgvGHhvBvQfxz+vcOrnnBQdORH3izaGEurLfNlq3YxdFQ== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" on-exit-leak-free "^2.1.0" - pino-abstract-transport v1.1.0 + pino-abstract-transport "^1.1.0" pino-std-serializers "^6.0.0" process-warning "^3.0.0" quick-format-unescaped "^4.0.3" From 5c17c4b31a78ffb2b19552f23460d671ba200111 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 16:16:19 +0000 Subject: [PATCH 676/795] chore(deps): Bump pdfkit from 0.14.0 to 0.15.0 Bumps [pdfkit](https://github.com/foliojs/pdfkit) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/foliojs/pdfkit/releases) - [Changelog](https://github.com/foliojs/pdfkit/blob/master/CHANGELOG.md) - [Commits](https://github.com/foliojs/pdfkit/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: pdfkit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index 51c8fd91fb9..1e4334f138a 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -65,7 +65,7 @@ "mustache": "4.2.0", "next": "14.2.1", "next-i18next": "15.2.0", - "pdfkit": "0.14.0", + "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/sites/shared/package.json b/sites/shared/package.json index dcb70fcc048..1fcd625ff8c 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -39,7 +39,7 @@ "mdast-util-toc": "7.0.0", "mermaid": "10.9.0", "ora": "8.0.1", - "pdfkit": "0.14.0", + "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index d8ea06e8f5a..b33a1a74f50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7982,6 +7982,11 @@ jotai@2.7.1: resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.7.1.tgz#5d0db56e75375d4f41a2e9f1a23750e9e5d8cb24" integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== +jpeg-exif@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/jpeg-exif/-/jpeg-exif-1.1.4.tgz#781a65b6cd74f62cb1c493511020f8d3577a1c2b" + integrity sha512-a+bKEcCjtuW5WTdgeXFzswSrdqi0jk4XlEtZlx5A94wCoBpFjfFTbo/Tra5SpNCl/YFZPvcV1dJc+TAYeg6ROQ== + js-base64@^2.1.9: version "2.6.4" resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz" @@ -11183,13 +11188,14 @@ pause@0.0.1: resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== -pdfkit@0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.14.0.tgz#1416633d48b1271b8059e7f0f7675635fd42a53e" - integrity sha512-Hnor8/78jhHm6ONrxWhrqOwAVALlBnFyWOF8sstBZMiqHZgZ5A6RU+Q3yahhw82plxpT7LOfH3b3qcOX6rzMQg== +pdfkit@0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.15.0.tgz#7152f1bfa500c37d25b5f8cd4850db09a8108941" + integrity sha512-Z0dx0sEPKLW2kbThS1SWZ0iSHlRPoFMpP+oSjNrtwRjsfGivwE+r6emyEFwQG/fx1Ri0AGUHmDcGOSMMlLLnSg== dependencies: crypto-js "^4.2.0" fontkit "^1.8.1" + jpeg-exif "^1.1.4" linebreak "^1.0.2" png-js "^1.0.0" From 1909955d735dfdf2d16e432b23a338236deb7d0c Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 15 Apr 2024 18:26:48 +0200 Subject: [PATCH 677/795] Make pointOnCurve behaviour match documentation --- packages/core/src/path.mjs | 9 ++++++++- packages/core/src/utils.mjs | 24 +++++++++++++++++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index 4b606b4189e..5388676eb78 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -7,6 +7,7 @@ import { curvesIntersect, pointOnLine, pointOnCurve, + relativeOffsetOnCurve, curveEdge, round, __addNonEnumProp, @@ -902,7 +903,13 @@ Path.prototype.split = function (point) { break } } else if (path.ops[1].type === 'curve') { - let t = pointOnCurve(path.ops[0].to, path.ops[1].cp1, path.ops[1].cp2, path.ops[1].to, point) + let t = relativeOffsetOnCurve( + path.ops[0].to, + path.ops[1].cp1, + path.ops[1].cp2, + path.ops[1].to, + point + ) if (t !== false) { let curve = new Bezier( { x: path.ops[0].to.x, y: path.ops[0].to.y }, diff --git a/packages/core/src/utils.mjs b/packages/core/src/utils.mjs index 22bc34fb6d5..9a5ecf17fd7 100644 --- a/packages/core/src/utils.mjs +++ b/packages/core/src/utils.mjs @@ -541,16 +541,30 @@ export function pointOnBeam(from, to, check, precision = 1e6) { /** * Finds out whether a Point lies on a (cubic) Bezier curve * - * @param {Point} from - Start of the curve + * @param {Point} start - Start of the curve * @param {Point} cp1 - Control point at the start of the curve - * @param {Point} cp1 - Control point at the end of the curve + * @param {Point} cp2 - Control point at the end of the curve * @param {Point} end - End of the curve * @param {Point} check - Point to check - * @return {bool} result - True of the Point is on the curve, false when not + * @return {boolean} result - True of the Point is on the curve, false when not */ export function pointOnCurve(start, cp1, cp2, end, check) { - if (start.sitsOn(check)) return true - if (end.sitsOn(check)) return true + return relativeOffsetOnCurve(start, cp1, cp2, end, check) !== false +} + +/** + * Finds where a Point lies on a (cubic) Bezier curve + * + * @param {Point} start - Start of the curve + * @param {Point} cp1 - Control point at the start of the curve + * @param {Point} cp2 - Control point at the end of the curve + * @param {Point} end - End of the curve + * @param {Point} check - Point to check + * @return {false|number} result - relative position on the curve (value between 0 and 1), false when not on curve + */ +export function relativeOffsetOnCurve(start, cp1, cp2, end, check) { + if (start.sitsOn(check)) return 0 + if (end.sitsOn(check)) return 1 let curve = new Bezier( { x: start.x, y: start.y }, { x: cp1.x, y: cp1.y }, From d2731a6d8862d8102c3a94b88284ac80af5aa99e Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 15 Apr 2024 16:57:49 +0200 Subject: [PATCH 678/795] add(core): Add Path.angleAt(point) method --- packages/core/src/path.mjs | 44 +++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index 5388676eb78..e7af605da57 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -871,7 +871,7 @@ Path.prototype.smurve_ = function (to) { } /** - * Splits path on point, and retuns both halves as Path instances + * Splits path on point, and returns both halves as Path instances * * @param {Point} point - The Point to split this Path on * @return {Array} halves - An array holding the two Path instances that make the split halves @@ -955,6 +955,48 @@ Path.prototype.split = function (point) { return [firstHalf, secondHalf] } +/** + * Determines the angle (tangent) of this path at the given point. If the given point is a sharp corner of this path, + * this method returns the angle directly before the point. + * + * @param {Point} point - The Point to determine the angle of relative to this Path + * @return {number|false} the angle of degrees at that point or false if the given Point doesn't lie on this Path + */ +Path.prototype.angleAt = function (point) { + if (!(point instanceof Point)) + this.log.error('Called `Path.angleAt(point)` but `point` is not a `Point` object') + let divided = this.divide() + for (let pi = 0; pi < divided.length; pi++) { + let path = divided[pi] + if (path.ops[1].type === 'line') { + if (pointOnLine(path.ops[0].to, path.ops[1].to, point)) { + return path.ops[0].to.angle(path.ops[1].to) + } + } else if (path.ops[1].type === 'curve') { + let t = relativeOffsetOnCurve( + path.ops[0].to, + path.ops[1].cp1, + path.ops[1].cp2, + path.ops[1].to, + point + ) + if (t !== false) { + const curve = new Bezier( + { x: path.ops[0].to.x, y: path.ops[0].to.y }, + { x: path.ops[1].cp1.x, y: path.ops[1].cp1.y }, + { x: path.ops[1].cp2.x, y: path.ops[1].cp2.y }, + { x: path.ops[1].to.x, y: path.ops[1].to.y } + ) + + let normal = curve.normal(t) + return (Math.atan2(normal.x, normal.y) / Math.PI) * 180 + } + } + } + + return false +} + /** * Returns the startpoint of this path * From 25059b818f2f45e73df36a3fbf7aae2b6f53961a Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 15 Apr 2024 18:27:18 +0200 Subject: [PATCH 679/795] Add test for path.angleAt --- packages/core/tests/path.test.mjs | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/packages/core/tests/path.test.mjs b/packages/core/tests/path.test.mjs index ae3eda60f7f..3719b339a5b 100644 --- a/packages/core/tests/path.test.mjs +++ b/packages/core/tests/path.test.mjs @@ -649,6 +649,33 @@ describe('Path', () => { expect(halves[1].ops[0].to.y).to.equal(30) }) + it('Should determine the angle on a path', () => { + const a = new Point(0, 0) + const b = new Point(0, 40) + const c = new Point(40, 40) + const d = new Point(100, 40) + const e = new Point(100, 0) + + const linePoint = new Point(80, 40) + const curvePoint = new Point(5, 35) + + const path = new Path().move(a).curve(b, b, c).line(d).line(e) + + let angleAtStart = path.angleAt(a) + let angleOnCurve = path.angleAt(curvePoint) + let angleOnJoint = path.angleAt(c) + let angleOnLine = path.angleAt(linePoint) + let angleOnCorner = path.angleAt(d) + let angleOnEnd = path.angleAt(e) + + expect(angleAtStart).to.equal(-90) + expect(angleOnCurve).to.equal(-45) + expect(angleOnJoint).to.equal(0) + expect(angleOnLine).to.equal(0) + expect(angleOnCorner).to.equal(0) + expect(angleOnEnd).to.equal(90) + }) + it('Should trim a path when lines overlap', () => { const A = new Point(0, 0) const B = new Point(100, 100) From 85946eb7167fb9b38b1d59a4f3c83b29a33dc3ee Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 15 Apr 2024 18:43:39 +0200 Subject: [PATCH 680/795] Add clarifying comment --- packages/core/src/path.mjs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index e7af605da57..46604834efc 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -989,6 +989,9 @@ Path.prototype.angleAt = function (point) { ) let normal = curve.normal(t) + + // atan2's first parameter is y, but we're swapping them because + // we're interested in the tangent angle, not normal return (Math.atan2(normal.x, normal.y) / Math.PI) * 180 } } From 789ff3f8caf946dac51f1842f4fed4eccc899d0f Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Mon, 15 Apr 2024 19:31:01 +0200 Subject: [PATCH 681/795] Fix test --- packages/core/src/path.mjs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index 46604834efc..1bb3b14da22 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -1065,7 +1065,13 @@ Path.prototype.trim = function () { { x: ops[1].cp2.x, y: ops[1].cp2.y }, { x: ops[1].to.x, y: ops[1].to.y } ) - let t = pointOnCurve(ops[0].to, ops[1].cp1, ops[1].cp2, ops[1].to, intersection) + let t = relativeOffsetOnCurve( + ops[0].to, + ops[1].cp1, + ops[1].cp2, + ops[1].to, + intersection + ) let split = curve.split(t) let side if (first) side = split.left From 75477929e425dbaac084665690b702bb20f52982 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 04:17:40 +0000 Subject: [PATCH 682/795] chore(deps): Bump remark-smartypants from 2.1.0 to 3.0.0 Bumps [remark-smartypants](https://github.com/silvenon/remark-smartypants) from 2.1.0 to 3.0.0. - [Release notes](https://github.com/silvenon/remark-smartypants/releases) - [Commits](https://github.com/silvenon/remark-smartypants/compare/v2.1.0...v3.0.0) --- updated-dependencies: - dependency-name: remark-smartypants dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 192 +++++++++++++------------------------- 3 files changed, 69 insertions(+), 127 deletions(-) diff --git a/sites/sde/package.json b/sites/sde/package.json index 51c8fd91fb9..3fdeb07cac0 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -79,7 +79,7 @@ "remark-gfm": "4.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "2.1.0", + "remark-smartypants": "3.0.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.1", diff --git a/sites/shared/package.json b/sites/shared/package.json index dcb70fcc048..fef9f07a974 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -49,7 +49,7 @@ "rehype-highlight": "7.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "2.1.0", + "remark-smartypants": "3.0.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tlds": "1.252.0", diff --git a/yarn.lock b/yarn.lock index d8ea06e8f5a..0aaea983465 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2728,12 +2728,12 @@ resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/nlcst@^1.0.0": - version "1.0.4" - resolved "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.4.tgz" - integrity sha512-ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg== +"@types/nlcst@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/nlcst/-/nlcst-2.0.3.tgz#31cad346eaab48a9a8a58465d3d05e2530dda762" + integrity sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA== dependencies: - "@types/unist" "^2" + "@types/unist" "*" "@types/node@*": version "20.11.16" @@ -10235,12 +10235,12 @@ nise@^5.1.5: just-extend "^6.2.0" path-to-regexp "^6.2.1" -nlcst-to-string@^3.0.0: - version "3.1.1" - resolved "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.1.tgz" - integrity sha512-63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw== +nlcst-to-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-4.0.0.tgz#05511e8461ebfb415952eb0b7e9a1a7d40471bd4" + integrity sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA== dependencies: - "@types/nlcst" "^1.0.0" + "@types/nlcst" "^2.0.0" node-fetch@2.6.7: version "2.6.7" @@ -11028,14 +11028,17 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-latin@^5.0.0: - version "5.0.1" - resolved "https://registry.npmjs.org/parse-latin/-/parse-latin-5.0.1.tgz" - integrity sha512-b/K8ExXaWC9t34kKeDV8kGXBkXZ1HCSAZRYE7HR14eA1GlXX5L8iWhs8USJNhQU9q5ci413jCKF0gOyovvyRBg== +parse-latin@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse-latin/-/parse-latin-7.0.0.tgz#8dfacac26fa603f76417f36233fc45602a323e1d" + integrity sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ== dependencies: - nlcst-to-string "^3.0.0" - unist-util-modify-children "^3.0.0" - unist-util-visit-children "^2.0.0" + "@types/nlcst" "^2.0.0" + "@types/unist" "^3.0.0" + nlcst-to-string "^4.0.0" + unist-util-modify-children "^4.0.0" + unist-util-visit-children "^3.0.0" + vfile "^6.0.0" parse-path@^7.0.0: version "7.0.0" @@ -12186,13 +12189,14 @@ remark-rehype@^11.0.0: unified "^11.0.0" vfile "^6.0.0" -remark-smartypants@2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.1.0.tgz" - integrity sha512-qoF6Vz3BjU2tP6OfZqHOvCU0ACmu/6jhGaINSQRI9mM7wCxNQTKB3JUAN4SVoN2ybElEDTxBIABRep7e569iJw== +remark-smartypants@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/remark-smartypants/-/remark-smartypants-3.0.0.tgz#5ada743b82360e35da449c11006eacd6b4c32997" + integrity sha512-6/xo47aZxWJd1L6VsDWX5EJRtRC2X0+vBRVh6MPD1doayFC6VRrxez6Z8GcEDqznvf9Ly+EtpasNYQptyhy8nQ== dependencies: - retext "^8.1.0" - retext-smartypants "^5.2.0" + retext "^9.0.0" + retext-smartypants "^6.0.0" + unified "^11.0.4" unist-util-visit "^5.0.0" remark-squeeze-paragraphs@^4.0.0: @@ -12307,44 +12311,42 @@ restructure@^2.0.1: resolved "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz" integrity sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg== -retext-latin@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/retext-latin/-/retext-latin-3.1.0.tgz" - integrity sha512-5MrD1tuebzO8ppsja5eEu+ZbBeUNCjoEarn70tkXOS7Bdsdf6tNahsv2bY0Z8VooFF6cw7/6S+d3yI/TMlMVVQ== +retext-latin@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/retext-latin/-/retext-latin-4.0.0.tgz#d02498aa1fd39f1bf00e2ff59b1384c05d0c7ce3" + integrity sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA== dependencies: - "@types/nlcst" "^1.0.0" - parse-latin "^5.0.0" - unherit "^3.0.0" - unified "^10.0.0" + "@types/nlcst" "^2.0.0" + parse-latin "^7.0.0" + unified "^11.0.0" -retext-smartypants@^5.2.0: - version "5.2.0" - resolved "https://registry.npmjs.org/retext-smartypants/-/retext-smartypants-5.2.0.tgz" - integrity sha512-Do8oM+SsjrbzT2UNIKgheP0hgUQTDDQYyZaIY3kfq0pdFzoPk+ZClYJ+OERNXveog4xf1pZL4PfRxNoVL7a/jw== +retext-smartypants@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/retext-smartypants/-/retext-smartypants-6.1.0.tgz#59a005113c3e63a0045ebc8b3edbb31d0a1d2a55" + integrity sha512-LDPXg95346bqFZnDMHo0S7Rq5p64+B+N8Vz733+wPMDtwb9rCOs9LIdIEhrUOU+TAywX9St+ocQWJt8wrzivcQ== dependencies: - "@types/nlcst" "^1.0.0" - nlcst-to-string "^3.0.0" - unified "^10.0.0" - unist-util-visit "^4.0.0" + "@types/nlcst" "^2.0.0" + nlcst-to-string "^4.0.0" + unist-util-visit "^5.0.0" -retext-stringify@^3.0.0: - version "3.1.0" - resolved "https://registry.npmjs.org/retext-stringify/-/retext-stringify-3.1.0.tgz" - integrity sha512-767TLOaoXFXyOnjx/EggXlb37ZD2u4P1n0GJqVdpipqACsQP+20W+BNpMYrlJkq7hxffnFk+jc6mAK9qrbuB8w== +retext-stringify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/retext-stringify/-/retext-stringify-4.0.0.tgz#501d5440bd4d121e351c7c509f8507de9611e159" + integrity sha512-rtfN/0o8kL1e+78+uxPTqu1Klt0yPzKuQ2BfWwwfgIUSayyzxpM1PJzkKt4V8803uB9qSy32MvI7Xep9khTpiA== dependencies: - "@types/nlcst" "^1.0.0" - nlcst-to-string "^3.0.0" - unified "^10.0.0" + "@types/nlcst" "^2.0.0" + nlcst-to-string "^4.0.0" + unified "^11.0.0" -retext@^8.1.0: - version "8.1.0" - resolved "https://registry.npmjs.org/retext/-/retext-8.1.0.tgz" - integrity sha512-N9/Kq7YTn6ZpzfiGW45WfEGJqFf1IM1q8OsRa1CGzIebCJBNCANDRmOrholiDRGKo/We7ofKR4SEvcGAWEMD3Q== +retext@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/retext/-/retext-9.0.0.tgz#ab5cd72836894167b0ca6ae70fdcfaa166267f7a" + integrity sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA== dependencies: - "@types/nlcst" "^1.0.0" - retext-latin "^3.0.0" - retext-stringify "^3.0.0" - unified "^10.0.0" + "@types/nlcst" "^2.0.0" + retext-latin "^4.0.0" + retext-stringify "^4.0.0" + unified "^11.0.0" retry@^0.12.0: version "0.12.0" @@ -13709,11 +13711,6 @@ undici-types@~5.26.4: resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== -unherit@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/unherit/-/unherit-3.0.1.tgz" - integrity sha512-akOOQ/Yln8a2sgcLj4U0Jmx0R5jpIg2IUyRrWOzmEbjBtGzBdHtSeFKgoEcoH4KYIG/Pb8GQ/BwtYm0GCq1Sqg== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz" @@ -13758,20 +13755,7 @@ unicorn-magic@^0.1.0: resolved "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz" integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ== -unified@^10.0.0: - version "10.1.2" - resolved "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz" - integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q== - dependencies: - "@types/unist" "^2.0.0" - bail "^2.0.0" - extend "^3.0.0" - is-buffer "^2.0.0" - is-plain-obj "^4.0.0" - trough "^2.0.0" - vfile "^5.0.0" - -unified@^11.0.0: +unified@^11.0.0, unified@^11.0.4: version "11.0.4" resolved "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz" integrity sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ== @@ -13833,13 +13817,6 @@ unist-util-is@^4.0.0: resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz" integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== -unist-util-is@^5.0.0: - version "5.2.1" - resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz" - integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz" @@ -13847,12 +13824,12 @@ unist-util-is@^6.0.0: dependencies: "@types/unist" "^3.0.0" -unist-util-modify-children@^3.0.0: - version "3.1.1" - resolved "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.1.tgz" - integrity sha512-yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA== +unist-util-modify-children@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-4.0.0.tgz#981d6308e887b005d1f491811d3cbcc254b315e9" + integrity sha512-+tdN5fGNddvsQdIzUF3Xx82CU9sMM+fA0dLgR9vOmT0oPT2jH+P1nd5lSqfCfXAw+93NhcXNY2qqvTUtE4cQkw== dependencies: - "@types/unist" "^2.0.0" + "@types/unist" "^3.0.0" array-iterate "^2.0.0" unist-util-position-from-estree@^2.0.0: @@ -13926,12 +13903,12 @@ unist-util-stringify-position@^4.0.0: dependencies: "@types/unist" "^3.0.0" -unist-util-visit-children@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.2.tgz" - integrity sha512-+LWpMFqyUwLGpsQxpumsQ9o9DG2VGLFrpz+rpVXYIEdPy57GSy5HioC0g3bg/8WP9oCLlapQtklOzQ8uLS496Q== +unist-util-visit-children@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-visit-children/-/unist-util-visit-children-3.0.0.tgz#4bced199b71d7f3c397543ea6cc39e7a7f37dc7e" + integrity sha512-RgmdTfSBOg04sdPcpTSD1jzoNBjt9a80/ZCzp5cI9n1qPzLZWF9YdvWGN2zmTumP1HWhXKdUWexjy/Wy/lJ7tA== dependencies: - "@types/unist" "^2.0.0" + "@types/unist" "^3.0.0" unist-util-visit-parents@^3.0.0: version "3.1.1" @@ -13941,14 +13918,6 @@ unist-util-visit-parents@^3.0.0: "@types/unist" "^2.0.0" unist-util-is "^4.0.0" -unist-util-visit-parents@^5.1.1: - version "5.1.3" - resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz" - integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz" @@ -13975,15 +13944,6 @@ unist-util-visit@^2.0.0: unist-util-is "^4.0.0" unist-util-visit-parents "^3.0.0" -unist-util-visit@^4.0.0: - version "4.1.2" - resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz" - integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents "^5.1.1" - universal-user-agent@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz" @@ -14123,14 +14083,6 @@ vfile-message@^2.0.0: "@types/unist" "^2.0.0" unist-util-stringify-position "^2.0.0" -vfile-message@^3.0.0: - version "3.1.4" - resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz" - integrity sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw== - dependencies: - "@types/unist" "^2.0.0" - unist-util-stringify-position "^3.0.0" - vfile-message@^4.0.0: version "4.0.2" resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz" @@ -14149,16 +14101,6 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" -vfile@^5.0.0: - version "5.3.7" - resolved "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz" - integrity sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g== - dependencies: - "@types/unist" "^2.0.0" - is-buffer "^2.0.0" - unist-util-stringify-position "^3.0.0" - vfile-message "^3.0.0" - vfile@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz" From 611df35f5bb6cb9c166423dabd4a1659614ff43c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 04:18:04 +0000 Subject: [PATCH 683/795] chore(deps): Bump eslint-config-next from 14.1.4 to 14.2.1 Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.1.4 to 14.2.1. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.1/packages/eslint-config-next) --- updated-dependencies: - dependency-name: eslint-config-next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/yarn.lock b/yarn.lock index d8ea06e8f5a..814139c61be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1492,10 +1492,10 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.1.tgz#18b4fb5fd76bdda65369ad4ea5f33199ae708d2f" integrity sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA== -"@next/eslint-plugin-next@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.1.4.tgz#d7372b5ffede0e466af8af2ff534386418827fc8" - integrity sha512-n4zYNLSyCo0Ln5b7qxqQeQ34OZKXwgbdcx6kmkQbywr+0k6M3Vinft0T72R6CDAcDrne2IAgSud4uWCzFgc5HA== +"@next/eslint-plugin-next@14.2.1": + version "14.2.1" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.1.tgz#909952d05dd22bb3f6db2a308ac148be2d05c775" + integrity sha512-Fp+mthEBjkn8r9qd6o4JgxKp0IDEzW0VYHD8ZC05xS5/lFNwHKuOdr2kVhWG7BQCO9L6eeepshM1Wbs2T+LgSg== dependencies: glob "10.3.10" @@ -2794,37 +2794,37 @@ resolved "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz" integrity sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA== -"@typescript-eslint/parser@^5.4.2 || ^6.0.0": - version "6.20.0" - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz" - integrity sha512-bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w== +"@typescript-eslint/parser@^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a" + integrity sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg== dependencies: - "@typescript-eslint/scope-manager" "6.20.0" - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/typescript-estree" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/scope-manager" "7.2.0" + "@typescript-eslint/types" "7.2.0" + "@typescript-eslint/typescript-estree" "7.2.0" + "@typescript-eslint/visitor-keys" "7.2.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@6.20.0": - version "6.20.0" - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz" - integrity sha512-p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA== +"@typescript-eslint/scope-manager@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da" + integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg== dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/types" "7.2.0" + "@typescript-eslint/visitor-keys" "7.2.0" -"@typescript-eslint/types@6.20.0": - version "6.20.0" - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz" - integrity sha512-MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ== +"@typescript-eslint/types@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f" + integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA== -"@typescript-eslint/typescript-estree@6.20.0": - version "6.20.0" - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz" - integrity sha512-RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g== +"@typescript-eslint/typescript-estree@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556" + integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA== dependencies: - "@typescript-eslint/types" "6.20.0" - "@typescript-eslint/visitor-keys" "6.20.0" + "@typescript-eslint/types" "7.2.0" + "@typescript-eslint/visitor-keys" "7.2.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -2832,12 +2832,12 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/visitor-keys@6.20.0": - version "6.20.0" - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz" - integrity sha512-E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw== +"@typescript-eslint/visitor-keys@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e" + integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A== dependencies: - "@typescript-eslint/types" "6.20.0" + "@typescript-eslint/types" "7.2.0" eslint-visitor-keys "^3.4.1" "@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0": @@ -5428,13 +5428,13 @@ eslint-compat-utils@^0.5.0: semver "^7.5.4" eslint-config-next@^14.0.1: - version "14.1.4" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.1.4.tgz#22f2ba4c0993e991249d863656a64c204bae542c" - integrity sha512-cihIahbhYAWwXJwZkAaRPpUi5t9aOi/HdfWXOjZeUOqNWXHD8X22kd1KG58Dc3MVaRx3HoR/oMGk2ltcrqDn8g== + version "14.2.1" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.1.tgz#b19b53ca3d10379a98bc9bf497dbea651dfcd070" + integrity sha512-BgD0kPCWMlqoItRf3xe9fG0MqwObKfVch+f2ccwDpZiCJA8ghkz2wrASH+bI6nLZzGcOJOpMm1v1Q1euhfpt4Q== dependencies: - "@next/eslint-plugin-next" "14.1.4" + "@next/eslint-plugin-next" "14.2.1" "@rushstack/eslint-patch" "^1.3.3" - "@typescript-eslint/parser" "^5.4.2 || ^6.0.0" + "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0" eslint-import-resolver-node "^0.3.6" eslint-import-resolver-typescript "^3.5.2" eslint-plugin-import "^2.28.1" From 4d12078b28b83663118963435a1184e8962c9a58 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 19:01:19 +0200 Subject: [PATCH 684/795] chore(dev): Disable eslint for world svg --- sites/dev/components/web-of-trust.mjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sites/dev/components/web-of-trust.mjs b/sites/dev/components/web-of-trust.mjs index e01b29bb4bf..4139e74fab3 100644 --- a/sites/dev/components/web-of-trust.mjs +++ b/sites/dev/components/web-of-trust.mjs @@ -195,6 +195,7 @@ export const WebOfTrustMap = () => { ) } +/* eslint-disable */ /* * React version of https://upload.wikimedia.org/wikipedia/commons/b/bc/BlankMap-World-Compact.svg */ @@ -9510,3 +9511,4 @@ const world = ( ) +/* eslint-enable */ From 45e1d02673d80997ce340ca0a7ff06dc296842c6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 19:37:09 +0200 Subject: [PATCH 685/795] Update source file en.md skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/en.md | 1 - 1 file changed, 1 deletion(-) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md index 376ef70cef9..508815f88bf 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md @@ -5,7 +5,6 @@ date: 20240116 intro: "This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem." designs: ["tristan"] maker: Natalia -author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 03537e001a069e73c38ab803d4577551ad2722ed Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 19:38:00 +0200 Subject: [PATCH 686/795] Update source file en.md skip-build --- markdown/org/showcase/shorts/en.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/showcase/shorts/en.md b/markdown/org/showcase/shorts/en.md index a63f861adef..10e107187bd 100644 --- a/markdown/org/showcase/shorts/en.md +++ b/markdown/org/showcase/shorts/en.md @@ -5,8 +5,7 @@ date: 20231118 intro: "-" designs: ["titan"] maker: Galit -author: 49445 --- -Shorts for my daughter +Shorts for my dauther From 96c97314efdcae571d737628f7562bd5c6c163e5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:47:00 +0200 Subject: [PATCH 687/795] New translations en.md (French) skip-build --- markdown/org/showcase/shorts/fr.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/fr.md b/markdown/org/showcase/shorts/fr.md index 222a3d9ecca..f0790343e47 100644 --- a/markdown/org/showcase/shorts/fr.md +++ b/markdown/org/showcase/shorts/fr.md @@ -6,6 +6,7 @@ intro: "-" designs: - titan maker: Galit +author: 49445 --- -Shorts for my dauther +Shorts for my daughter From 09fd5678d77c9341353dc5e36b11bf7f9f1cc2a1 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:47:08 +0200 Subject: [PATCH 688/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/shorts/es.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/es.md b/markdown/org/showcase/shorts/es.md index 8fe296c35a8..c3d454dc95f 100644 --- a/markdown/org/showcase/shorts/es.md +++ b/markdown/org/showcase/shorts/es.md @@ -6,6 +6,7 @@ intro: "-" designs: - titán maker: Galit +author: 49445 --- -Shorts for my dauther +Shorts for my daughter From 56fe32bd01becc9216b5c34e1d11b53b2cf86c76 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:47:16 +0200 Subject: [PATCH 689/795] New translations en.md (German) skip-build --- markdown/org/showcase/shorts/de.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/de.md b/markdown/org/showcase/shorts/de.md index 222a3d9ecca..f0790343e47 100644 --- a/markdown/org/showcase/shorts/de.md +++ b/markdown/org/showcase/shorts/de.md @@ -6,6 +6,7 @@ intro: "-" designs: - titan maker: Galit +author: 49445 --- -Shorts for my dauther +Shorts for my daughter From a41836ba1b9dbf7ef255ad5a8eb705fb6674a5b0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:47:23 +0200 Subject: [PATCH 690/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/shorts/nl.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/nl.md b/markdown/org/showcase/shorts/nl.md index 9e98b319c73..55eb66f130d 100644 --- a/markdown/org/showcase/shorts/nl.md +++ b/markdown/org/showcase/shorts/nl.md @@ -6,6 +6,7 @@ intro: "-" designs: - titan maker: Galit +author: 49445 --- -Korte broek voor mijn dochter +Shorts for my daughter From 0a946198072b9ab7fd813b3e288678318418ba48 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:47:31 +0200 Subject: [PATCH 691/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/shorts/uk.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/uk.md b/markdown/org/showcase/shorts/uk.md index 064087d3107..983092bc87f 100644 --- a/markdown/org/showcase/shorts/uk.md +++ b/markdown/org/showcase/shorts/uk.md @@ -6,6 +6,7 @@ intro: "-" designs: - титан maker: Galit +author: 49445 --- -Shorts for my dauther +Shorts for my daughter From 8c48ce5c3d18de05e812daf93b17cc1e282c6d7c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:50:26 +0200 Subject: [PATCH 692/795] New translations en.md (French) skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/fr.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/fr.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/fr.md index e989d5b4b96..c1888a9da56 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/fr.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/fr.md @@ -6,6 +6,7 @@ intro: This Tristan top is lined and had bias binding applied to the neck hole, designs: - tristan maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 6a33d4900f2378dd03c89e3c4b58634a2194bd4a Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:50:29 +0200 Subject: [PATCH 693/795] New translations en.md (Spanish) skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/es.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/es.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/es.md index e989d5b4b96..c1888a9da56 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/es.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/es.md @@ -6,6 +6,7 @@ intro: This Tristan top is lined and had bias binding applied to the neck hole, designs: - tristan maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 94f3d867de8d27a06cd50d18ece7053dac9ab2d9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:50:32 +0200 Subject: [PATCH 694/795] New translations en.md (German) skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/de.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/de.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/de.md index e989d5b4b96..c1888a9da56 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/de.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/de.md @@ -6,6 +6,7 @@ intro: This Tristan top is lined and had bias binding applied to the neck hole, designs: - tristan maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 90565dde088c78927cb942798e3621dc7296a861 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:50:35 +0200 Subject: [PATCH 695/795] New translations en.md (Dutch) skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/nl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/nl.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/nl.md index e989d5b4b96..c1888a9da56 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/nl.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/nl.md @@ -6,6 +6,7 @@ intro: This Tristan top is lined and had bias binding applied to the neck hole, designs: - tristan maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From df7a730e4d7e058d94d8fd87aab32ac6f65b5739 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:50:57 +0200 Subject: [PATCH 696/795] New translations en.md (Ukrainian) skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/uk.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/uk.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/uk.md index e289c399aaf..c9b78b51add 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/uk.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/uk.md @@ -6,6 +6,7 @@ intro: This Tristan top is lined and had bias binding applied to the neck hole, designs: - tristan maker: Наталя +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From b4b97ab5536ce257db59026e6a8b5002141a9ceb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:51:35 +0200 Subject: [PATCH 697/795] New translations en.md (French) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/fr.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/fr.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/fr.md b/markdown/org/showcase/my-fisrt-sewing-project/fr.md new file mode 100644 index 00000000000..556d7137f5d --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/fr.md @@ -0,0 +1,11 @@ +--- +title: My fisrt sewing project! +caption: 25/03/2024 +date: 20240325 +intro: idk what to put here. +author: 73391 +designs: + - shelly +--- + +???? From b9d9137c502a29deabd32ced593e7f8cbc49ad91 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:51:36 +0200 Subject: [PATCH 698/795] New translations en.md (Spanish) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/es.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/es.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/es.md b/markdown/org/showcase/my-fisrt-sewing-project/es.md new file mode 100644 index 00000000000..556d7137f5d --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/es.md @@ -0,0 +1,11 @@ +--- +title: My fisrt sewing project! +caption: 25/03/2024 +date: 20240325 +intro: idk what to put here. +author: 73391 +designs: + - shelly +--- + +???? From 59960fb08a4aeb5bfd99fd341347a5adedb3f35d Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:51:37 +0200 Subject: [PATCH 699/795] New translations en.md (German) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/de.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/de.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/de.md b/markdown/org/showcase/my-fisrt-sewing-project/de.md new file mode 100644 index 00000000000..556d7137f5d --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/de.md @@ -0,0 +1,11 @@ +--- +title: My fisrt sewing project! +caption: 25/03/2024 +date: 20240325 +intro: idk what to put here. +author: 73391 +designs: + - shelly +--- + +???? From 68a93d6ac6d4670fd9cf23ec80290c03f5e4bf16 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:51:37 +0200 Subject: [PATCH 700/795] New translations en.md (Dutch) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/nl.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/nl.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/nl.md b/markdown/org/showcase/my-fisrt-sewing-project/nl.md new file mode 100644 index 00000000000..556d7137f5d --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/nl.md @@ -0,0 +1,11 @@ +--- +title: My fisrt sewing project! +caption: 25/03/2024 +date: 20240325 +intro: idk what to put here. +author: 73391 +designs: + - shelly +--- + +???? From 8804ed84fbd5bc8e3e48c4bb60366928898e468c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 21:51:38 +0200 Subject: [PATCH 701/795] New translations en.md (Ukrainian) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/uk.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/my-fisrt-sewing-project/uk.md diff --git a/markdown/org/showcase/my-fisrt-sewing-project/uk.md b/markdown/org/showcase/my-fisrt-sewing-project/uk.md new file mode 100644 index 00000000000..1400ccc040b --- /dev/null +++ b/markdown/org/showcase/my-fisrt-sewing-project/uk.md @@ -0,0 +1,11 @@ +--- +title: My fisrt sewing project! +caption: 25/03/2024 +date: 20240325 +intro: idk what to put here. +author: 73391 +designs: + - шеллі +--- + +???? From b0ec6590f5f028a8f48e4706e2d2584f2e8aeb50 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 22:12:41 +0200 Subject: [PATCH 702/795] Update source file en.md skip-build --- .../org/showcase/a-lined-tristan-top-with-front-lacing/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md index 508815f88bf..376ef70cef9 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md @@ -5,6 +5,7 @@ date: 20240116 intro: "This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem." designs: ["tristan"] maker: Natalia +author: 60164 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. From 0b1460ece9e18c6229e5a192502b462b12935ec2 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 16 Apr 2024 22:13:31 +0200 Subject: [PATCH 703/795] Update source file en.md skip-build --- markdown/org/showcase/shorts/en.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/en.md b/markdown/org/showcase/shorts/en.md index 10e107187bd..a63f861adef 100644 --- a/markdown/org/showcase/shorts/en.md +++ b/markdown/org/showcase/shorts/en.md @@ -5,7 +5,8 @@ date: 20231118 intro: "-" designs: ["titan"] maker: Galit +author: 49445 --- -Shorts for my dauther +Shorts for my daughter From 951bde99a62e7fc4454449f2da17d49a21a30a89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:35:26 +0000 Subject: [PATCH 704/795] chore(deps-dev): Bump @commitlint/config-conventional Bumps [@commitlint/config-conventional](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/config-conventional) from 19.1.0 to 19.2.2. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/config-conventional/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.2.2/@commitlint/config-conventional) --- updated-dependencies: - dependency-name: "@commitlint/config-conventional" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..562d037d459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -951,9 +951,9 @@ yargs "^17.0.0" "@commitlint/config-conventional@^19.0.3": - version "19.1.0" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-19.1.0.tgz#6b4b7938aa3bc308214a683247520f602e55961e" - integrity sha512-KIKD2xrp6Uuk+dcZVj3++MlzIr/Su6zLE8crEDQCZNvWHNQSeeGbzOlNtsR32TUy6H3JbP7nWgduAHCaiGQ6EA== + version "19.2.2" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-19.2.2.tgz#1f4e6975d428985deacf2b3ff6547e02c9302054" + integrity sha512-mLXjsxUVLYEGgzbxbxicGPggDuyWNkf25Ht23owXIH+zV2pv1eJuzLK3t1gDY5Gp6pxdE60jZnWUY5cvgL3ufw== dependencies: "@commitlint/types" "^19.0.3" conventional-changelog-conventionalcommits "^7.0.2" From 490c0f30ffe38be8f93233b06665707962d967b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:37:03 +0000 Subject: [PATCH 705/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.554.0 to 3.556.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.554.0 to 3.556.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.556.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 118 ++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 5735affee8c..3b33d1f7f10 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.554.0", + "@aws-sdk/client-sesv2": "3.556.0", "@prisma/client": "5.12.1", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..c97f3c25b86 100644 --- a/yarn.lock +++ b/yarn.lock @@ -205,16 +205,16 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.554.0.tgz#f56a0cd0076796de46efa2dfe1de9f4da87b70fc" - integrity sha512-l5x92adRLKX/PgvdsA4f/rAXyhFKoODW2KkrHdH98H9gXvWU8Tx4GRwwFw34S7ZlO+yg2j4mQZWo+4lLoJXfjw== +"@aws-sdk/client-sesv2@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.556.0.tgz#0d871b98496f021c9e3744921a46260b92f79261" + integrity sha512-CYbCVlMlXJ72r+DrBRjgqw+Dm2yVUA9d1rxZWjfBhMulaypbV0EIZK2xLwgcQ5LvdfKdrrFEsFcViDA6q0w3Zg== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.554.0" - "@aws-sdk/core" "3.554.0" - "@aws-sdk/credential-provider-node" "3.554.0" + "@aws-sdk/client-sts" "3.556.0" + "@aws-sdk/core" "3.556.0" + "@aws-sdk/credential-provider-node" "3.556.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -251,15 +251,15 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.554.0.tgz#c4002879c89cf5e4a45f39c63b2963f8fab88385" - integrity sha512-M86rkiRqbZBF5VyfTQ/vttry9VSoQkZ1oCqYF+SAGlXmD0Of8587yRSj2M4rYe0Uj7nRQIfSnhDYp1UzsZeRfQ== +"@aws-sdk/client-sso-oidc@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.556.0.tgz#4c19fccc35361de046d2cd74a7a685d71aa5dd1e" + integrity sha512-AXKd2TB6nNrksu+OfmHl8uI07PdgzOo4o8AxoRO8SHlwoMAGvcT9optDGVSYoVfgOKTymCoE7h8/UoUfPc11wQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.554.0" - "@aws-sdk/core" "3.554.0" + "@aws-sdk/client-sts" "3.556.0" + "@aws-sdk/core" "3.556.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -296,14 +296,14 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.554.0.tgz#fef7b7ee47cad3987b50e9218ec1d11dcd42e32b" - integrity sha512-yj6CgIxCT3UwMumEO481KH4QvwArkAPzD7Xvwe1QKgJATc9bKNEo/FxV8LfnWIJ7nOtMDxbNxYLMXH/Fs1qGaQ== +"@aws-sdk/client-sso@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.556.0.tgz#7beeeebb6a437f09680edefc5c998822292a528a" + integrity sha512-unXdWS7uvHqCcOyC1de+Fr8m3F2vMg2m24GPea0bg7rVGTYmiyn9mhUX11VCt+ozydrw+F50FQwL6OqoqPocmw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.554.0" + "@aws-sdk/core" "3.556.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -340,14 +340,14 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.554.0.tgz#511f1bafe628613f1824274f9c11a9df31ac0b09" - integrity sha512-EhaA6T0M0DNg5M8TCF1a7XJI5D/ZxAF3dgVIchyF98iNzjYgl/7U8K6hJay2A11aFvVu70g46xYMpz3Meky4wQ== +"@aws-sdk/client-sts@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.556.0.tgz#3aa20cca462839f1451f11efada2be119dd36a6b" + integrity sha512-TsK3js7Suh9xEmC886aY+bv0KdLLYtzrcmVt6sJ/W6EnDXYQhBuKYFhp03NrN2+vSvMGpqJwR62DyfKe1G0QzQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.554.0" + "@aws-sdk/core" "3.556.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -384,14 +384,14 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/core@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.554.0.tgz#84def70777ace823efb54451da403bfc125a8571" - integrity sha512-JrG7ToTLeNf+/S3IiCUPVw9jEDB0DXl5ho8n/HwOa946mv+QyCepCuV2U/8f/1KAX0mD8Ufm/E4/cbCbFHgbSg== +"@aws-sdk/core@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.556.0.tgz#d0f4431a72282b71cfbcaedfb803f7f2807cf60b" + integrity sha512-vJaSaHw2kPQlo11j/Rzuz0gk1tEaKdz+2ser0f0qZ5vwFlANjt08m/frU17ctnVKC1s58bxpctO/1P894fHLrA== dependencies: "@smithy/core" "^1.4.2" "@smithy/protocol-http" "^3.3.0" - "@smithy/signature-v4" "^2.2.1" + "@smithy/signature-v4" "^2.3.0" "@smithy/smithy-client" "^2.5.1" "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" @@ -422,16 +422,16 @@ "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.554.0.tgz#09c6b8f38cdbca3b27f0d71c53465ca9c3f2a5cf" - integrity sha512-BQenhg43S6TMJHxrdjDVdVF+HH5tA1op9ZYLyJrvV5nn7CCO4kyAkkOuSAv1NkL+RZsIkW0/vHTXwQOQw3cUsg== +"@aws-sdk/credential-provider-ini@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.556.0.tgz#bf780feb92a7920cc525cd7cb7870ea61b84c125" + integrity sha512-0Nz4ErOlXhe3muxWYMbPwRMgfKmVbBp36BAE2uv/z5wTbfdBkcgUwaflEvlKCLUTdHzuZsQk+BFS/gVyaUeOuA== dependencies: - "@aws-sdk/client-sts" "3.554.0" + "@aws-sdk/client-sts" "3.556.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.554.0" - "@aws-sdk/credential-provider-web-identity" "3.554.0" + "@aws-sdk/credential-provider-sso" "3.556.0" + "@aws-sdk/credential-provider-web-identity" "3.556.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -439,17 +439,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.554.0.tgz#74e8ae0b69cfba716e57881ace9d6466deedfb5e" - integrity sha512-poX/+2OE3oxqp4f5MiaJh251p8l+bzcFwgcDBwz0e2rcpvMSYl9jw4AvGnCiG2bmf9yhNJdftBiS1A+KjxV0qA== +"@aws-sdk/credential-provider-node@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.556.0.tgz#51f3dc4506053249f8593765d1ab2cef53732fa3" + integrity sha512-s1xVtKjyGc60O8qcNIzS1X3H+pWEwEfZ7TgNznVDNyuXvLrlNWiAcigPWGl2aAkc8tGcsSG0Qpyw2KYC939LFg== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-http" "3.552.0" - "@aws-sdk/credential-provider-ini" "3.554.0" + "@aws-sdk/credential-provider-ini" "3.556.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.554.0" - "@aws-sdk/credential-provider-web-identity" "3.554.0" + "@aws-sdk/credential-provider-sso" "3.556.0" + "@aws-sdk/credential-provider-web-identity" "3.556.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -468,25 +468,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.554.0.tgz#83e950685aaadb18d48d51c39f6201d820a5de41" - integrity sha512-8QPpwBA31i/fZ7lDZJC4FA9EdxLg5SJ8sPB2qLSjp5UTGTYL2HRl0Eznkb7DXyp/wImsR/HFR1NxuFCCVotLCg== +"@aws-sdk/credential-provider-sso@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.556.0.tgz#26dfdd2c6e034f66e82985d65bd6aa3ae09d5e19" + integrity sha512-ETuBgcnpfxqadEAqhQFWpKoV1C/NAgvs5CbBc5EJbelJ8f4prTdErIHjrRtVT8c02MXj92QwczsiNYd5IoOqyw== dependencies: - "@aws-sdk/client-sso" "3.554.0" - "@aws-sdk/token-providers" "3.554.0" + "@aws-sdk/client-sso" "3.556.0" + "@aws-sdk/token-providers" "3.556.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.554.0.tgz#6076a32066b633a18fc90cae7ed0b874db78a556" - integrity sha512-HN54DzLjepw5ZWSF9ycGevhFTyg6pjLuLKy5Y8t/f1jFDComzYdGEDe0cdV9YO653W3+PQwZZGz09YVygGYBLg== +"@aws-sdk/credential-provider-web-identity@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.556.0.tgz#94cd55eaee6ca96354237569102dfaf6774544f4" + integrity sha512-R/YAL8Uh8i+dzVjzMnbcWLIGeeRi2mioHVGnVF+minmaIkCiQMZg2HPrdlKm49El+RljT28Nl5YHRuiqzEIwMA== dependencies: - "@aws-sdk/client-sts" "3.554.0" + "@aws-sdk/client-sts" "3.556.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -544,12 +544,12 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.554.0": - version "3.554.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.554.0.tgz#5a20ce273451654a1382f772ef119a9a156f537c" - integrity sha512-KMMQ5Cw0FUPL9H8g69Lp08xtzRo7r/MK+lBV6LznWBbCP/NwtZ8awVHaPy2P31z00cWtu9MYkUTviWPqJTaBvg== +"@aws-sdk/token-providers@3.556.0": + version "3.556.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.556.0.tgz#96b4dd4fec67ae62f8c98ae8c2f94e4ed050073a" + integrity sha512-tvIiugNF0/+2wfuImMrpKjXMx4nCnFWQjQvouObny+wrif/PGqqQYrybwxPJDvzbd965bu1I+QuSv85/ug7xsg== dependencies: - "@aws-sdk/client-sso-oidc" "3.554.0" + "@aws-sdk/client-sso-oidc" "3.556.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" @@ -2356,7 +2356,7 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/signature-v4@^2.2.1": +"@smithy/signature-v4@^2.3.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd" integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q== From 415fa2628a7cb86383a81dac68cef38f6b15f1cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:38:58 +0000 Subject: [PATCH 706/795] chore(deps-dev): Bump eslint-plugin-jsonc from 2.15.0 to 2.15.1 Bumps [eslint-plugin-jsonc](https://github.com/ota-meshi/eslint-plugin-jsonc) from 2.15.0 to 2.15.1. - [Release notes](https://github.com/ota-meshi/eslint-plugin-jsonc/releases) - [Changelog](https://github.com/ota-meshi/eslint-plugin-jsonc/blob/master/CHANGELOG.md) - [Commits](https://github.com/ota-meshi/eslint-plugin-jsonc/compare/v2.15.0...v2.15.1) --- updated-dependencies: - dependency-name: eslint-plugin-jsonc dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..6257faff8f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5513,9 +5513,9 @@ eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: tsconfig-paths "^3.15.0" eslint-plugin-jsonc@^2.4.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.0.tgz#3d6e329ae37a4240e2647c0e71f77ec6725a6897" - integrity sha512-wAphMVgTQPAKAYV8d/QEkEYDg8uer9nMQ85N17IUiJcAWLxJs83/Exe59dEH9yKUpvpLf46H+wR7/U7lZ3/NpQ== + version "2.15.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.1.tgz#97a5b24e9b14fe2163fd4988fa66d428785d7e7e" + integrity sha512-PVFrqIJa8BbM/e828RSn0SwB/Z5ye+2LDuy2XqG6AymNgPsfApRRcznsbxP7VrjdLEU4Nb+g9n/d6opyp0jp9A== dependencies: "@eslint-community/eslint-utils" "^4.2.0" eslint-compat-utils "^0.5.0" From 44eff6432938dc458bf03a7c88882b795eaf9389 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:39:25 +0000 Subject: [PATCH 707/795] chore(deps-dev): Bump prisma from 5.11.0 to 5.12.1 Bumps [prisma](https://github.com/prisma/prisma/tree/HEAD/packages/cli) from 5.11.0 to 5.12.1. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.12.1/packages/cli) --- updated-dependencies: - dependency-name: prisma dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 66 +++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 5735affee8c..d90b03defca 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -53,7 +53,7 @@ "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.11.0" + "prisma": "5.12.1" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..17516c5cc78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1914,41 +1914,41 @@ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== -"@prisma/debug@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.11.0.tgz#80e3f9d5a8f678c67a8783f7fcdda3cbbb8dd091" - integrity sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A== +"@prisma/debug@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.1.tgz#007c8ad2e466d565bcd0671b8846c27f8700c722" + integrity sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A== -"@prisma/engines-version@5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102": - version "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz#a7aa218b1ebf1077798c931632461aae8ce6a8f7" - integrity sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA== +"@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab": + version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32" + integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g== -"@prisma/engines@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.11.0.tgz#96e941c5c81ce68f3a8b4c481007d397564c5d4b" - integrity sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw== +"@prisma/engines@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.1.tgz#a50649427d627a9af962a188a84c65d61c6e2b3f" + integrity sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA== dependencies: - "@prisma/debug" "5.11.0" - "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - "@prisma/fetch-engine" "5.11.0" - "@prisma/get-platform" "5.11.0" + "@prisma/debug" "5.12.1" + "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + "@prisma/fetch-engine" "5.12.1" + "@prisma/get-platform" "5.12.1" -"@prisma/fetch-engine@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz#cd7a2fa5b5d89f1da0689e329c56fa69223fba7d" - integrity sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w== +"@prisma/fetch-engine@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.1.tgz#c38e9fa17fdc535b4c83cbb7645569ad0a511fa9" + integrity sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA== dependencies: - "@prisma/debug" "5.11.0" - "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" - "@prisma/get-platform" "5.11.0" + "@prisma/debug" "5.12.1" + "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" + "@prisma/get-platform" "5.12.1" -"@prisma/get-platform@5.11.0": - version "5.11.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.11.0.tgz#19a768127b1712c27f5dec8a0a79a4c9675829eb" - integrity sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw== +"@prisma/get-platform@5.12.1": + version "5.12.1" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.1.tgz#33f427f6d744dee62a9e06858889691d78b50804" + integrity sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ== dependencies: - "@prisma/debug" "5.11.0" + "@prisma/debug" "5.12.1" "@resvg/resvg-js-android-arm-eabi@2.6.2": version "2.6.2" @@ -11447,12 +11447,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.11.0.tgz#ef3891f79921a2deec6f540eba13a3cc8525f6d2" - integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== +prisma@5.12.1: + version "5.12.1" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.1.tgz#db4596253bb066afc9f08744642f200a398d8d51" + integrity sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q== dependencies: - "@prisma/engines" "5.11.0" + "@prisma/engines" "5.12.1" proc-log@^3.0.0: version "3.0.0" From c4e942bb02dccfccc52fd31104bb265b19f56ba2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 04:16:37 +0000 Subject: [PATCH 708/795] chore(deps): Bump @next/bundle-analyzer from 14.1.4 to 14.2.2 Bumps [@next/bundle-analyzer](https://github.com/vercel/next.js/tree/HEAD/packages/next-bundle-analyzer) from 14.1.4 to 14.2.2. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.2/packages/next-bundle-analyzer) --- updated-dependencies: - dependency-name: "@next/bundle-analyzer" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 8797f68db3f..076b15fd1a3 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@next/bundle-analyzer": "14.1.4", + "@next/bundle-analyzer": "14.2.2", "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.23.3", "daisyui": "4.7.3", diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..6be93aa19d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1480,10 +1480,10 @@ resolved "https://registry.npmjs.org/@mdx-js/util/-/util-2.0.0-next.1.tgz" integrity sha512-F36kWTFdFXrbNIsM77dhVwYZsZonUIKHkYyYgnuw1NWskBfEn1ET5B5Z5mm58ckKNf7SimchnxR9sKCCtH38WA== -"@next/bundle-analyzer@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.1.4.tgz#d10e4599f76ea8c00289341763d6208a729e80a3" - integrity sha512-IpF/18HcAOcfHRr24tqPOUpMmVKIqvkCxIubMeRYWCXs3jm7niPGrt8Mu74yMDzfGlUwgQA6Xd6BUc5+jQxcEg== +"@next/bundle-analyzer@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.2.2.tgz#8095665de2c18d06eb16b81729d660338da03adf" + integrity sha512-Zp2xG3VTPHUquOcBaRtrr0/n7mqnjKUmprGcJXPEKGgP5rAsLymIfWKm3jIVWIw5Eb4fNOfX4v+L+qiSvs+OJw== dependencies: webpack-bundle-analyzer "4.10.1" From 375c954c677050298594ddc0357b3b3abb961590 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 04:18:34 +0000 Subject: [PATCH 709/795] chore(deps): Bump @next/mdx from 14.1.4 to 14.2.2 Bumps [@next/mdx](https://github.com/vercel/next.js/tree/HEAD/packages/next-mdx) from 14.1.4 to 14.2.2. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.2/packages/next-mdx) --- updated-dependencies: - dependency-name: "@next/mdx" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 01444fd15d6..018a46d37bb 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -16,7 +16,7 @@ "scripts": {}, "peerDependencies": {}, "dependencies": { - "@next/mdx": "14.1.4", + "@next/mdx": "14.2.2", "@resvg/resvg-js": "2.6.2", "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", diff --git a/yarn.lock b/yarn.lock index 60f9d2e5b55..ded6ba6d12a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,10 +1499,10 @@ dependencies: glob "10.3.10" -"@next/mdx@14.1.4": - version "14.1.4" - resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.1.4.tgz#e0f0f776ca524904e8090262daf80aa1f1be388b" - integrity sha512-FyuDXPTEmuIqtj/AxaKLvwiEZb6hDviq6Ywn8ZlsZOlvYSWpcZGuQrYrDulrdIm/I48hHXANor7EiJzTbVig8Q== +"@next/mdx@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.2.2.tgz#2521b056270a97bc8cf0c59043418a5b18778880" + integrity sha512-Te60j1vMxbYWg2E1CiEuIjzWxjI8y6XKmLnhec0sYQupd7aTLm2bjFSLxei+kiQdWUYB87cmhazI9K2dbNB9wA== dependencies: source-map "^0.7.0" From ed608b52a0a824a281108a4265b9d55b6e8cb5cf Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Thu, 18 Apr 2024 10:52:52 +0200 Subject: [PATCH 710/795] Add documentation and rename method --- markdown/dev/reference/api/path/angleat/en.md | 54 +++++++++++++ .../api/utils/curveparameterfrompoint/en.md | 77 +++++++++++++++++++ packages/core/src/path.mjs | 9 +-- packages/core/src/utils.mjs | 12 ++- 4 files changed, 144 insertions(+), 8 deletions(-) create mode 100644 markdown/dev/reference/api/path/angleat/en.md create mode 100644 markdown/dev/reference/api/utils/curveparameterfrompoint/en.md diff --git a/markdown/dev/reference/api/path/angleat/en.md b/markdown/dev/reference/api/path/angleat/en.md new file mode 100644 index 00000000000..7068802c39c --- /dev/null +++ b/markdown/dev/reference/api/path/angleat/en.md @@ -0,0 +1,54 @@ +--- +title: Path.angleAt() +--- + +The `Path.angleAt()` method returns the (tangent) angle of a path at a specific point. + +If the given point is a sharp corner, this method prefers returning the angle directly before the corner. + +If the given point does not lie (approximately) on the path, this method returns `false`. + +## Signature + +```js +number|false path.angleAt(Point point) +``` + +## Example + + +```js +({ Point, points, Path, paths, snippets, Snippet, part }) => { + +points.A = new Point(45, 60) +points.B = new Point(10, 30) +points.BCp2 = new Point(40, 20) +points.C = new Point(90, 30) +points.CCp1 = new Point(50, -30) +points.D = new Point(50, 80) +points.DCp1 = new Point(70, 30) + +paths.demo = new Path() +.move(points.D) +.curve(points.DCp1, points.DCp1, points.C) +.curve(points.CCp1, points.BCp2, points.B) +.line(points.A) + +points.testPoint = paths.demo.shiftFractionAlong(0.55) +snippets.point = new Snippet("notch", points.testPoint) + +let angle = paths.demo.angleAt(points.testPoint) +//draw a tangent path +paths.tangent = new Path() + .move(points.testPoint.shift(angle, -30)) + .line(points.testPoint.shift(angle, 30)) + .attr("class", "lining dashed") + +return part +} +``` + + +## Notes + +Keep in mind that calculations with Bézier curves are often approximations. diff --git a/markdown/dev/reference/api/utils/curveparameterfrompoint/en.md b/markdown/dev/reference/api/utils/curveparameterfrompoint/en.md new file mode 100644 index 00000000000..b1346a3d342 --- /dev/null +++ b/markdown/dev/reference/api/utils/curveparameterfrompoint/en.md @@ -0,0 +1,77 @@ +--- +title: utils.curveParameterFromPoint() +--- + +The `utils.curveParameterFromPoint()` function calculates where the point `check` lies on a +curve described by points `start`, `cp1`, `cp2`, and `end`. + +For example a return value of 0 indicates that the given point is the start of the curve, a return value +of 1 indicated that the given point is identical to the end of the curve. + +A return value of 0.5 indicates that the start point and the first control point had the same influence +as the end point and the second control point, to create the checked point, but this doesn't necessarily mean +that the point lies exactly half-way on the curve. + +This method returns `false` if the point isn't (approximately) located on the curve. + +## Signature + +```js +number|false utils.curveParameterFromPoint( + Point start, + Point cp1, + Point cp2, + Point end, + Point check +) +``` + +## Example + + +```js +({ Point, points, Path, paths, Snippet, snippets, getId, utils, part }) => { + + points.start = new Point(10, 10) + points.cp1 = new Point(90, 30) + points.cp2 = new Point(10, 40) + points.end = new Point(90, 60) + + const scatter = [] + for (let i = 1; i < 19; i++) { + for (let j = 1; j < 14; j++) { + scatter.push(new Point(i * 10, j * 10)) + } + } + let snippet + for (let point of scatter) { + let t = utils.curveParameterFromPoint( + points.start, + points.cp1, + points.cp2, + points.end, + point + ) + if(t !== false) { + points[getId()] = point.addText(` ${Math.round(t * 100) / 100}`, 'text-sm') + snippets[getId()] = new Snippet('notch', point) + } + } + paths.curve = new Path() + .move(points.start) + .curve(points.cp1, points.cp2, points.end) + .addClass("fabric stroke-lg") + + return part +} +``` + + + +## Notes + +Keep in mind that calculations with Bézier curves are often approximations. + +This method is mostly used as internal building block for methods like +`utils.pointOnCurve()`, `Path.split()` or `Path.angleAt()` and probably is not very relevant +for direct usage from pattern code. diff --git a/packages/core/src/path.mjs b/packages/core/src/path.mjs index 1bb3b14da22..14bb85dd293 100644 --- a/packages/core/src/path.mjs +++ b/packages/core/src/path.mjs @@ -6,8 +6,7 @@ import { lineIntersectsCurve, curvesIntersect, pointOnLine, - pointOnCurve, - relativeOffsetOnCurve, + curveParameterFromPoint, curveEdge, round, __addNonEnumProp, @@ -903,7 +902,7 @@ Path.prototype.split = function (point) { break } } else if (path.ops[1].type === 'curve') { - let t = relativeOffsetOnCurve( + let t = curveParameterFromPoint( path.ops[0].to, path.ops[1].cp1, path.ops[1].cp2, @@ -973,7 +972,7 @@ Path.prototype.angleAt = function (point) { return path.ops[0].to.angle(path.ops[1].to) } } else if (path.ops[1].type === 'curve') { - let t = relativeOffsetOnCurve( + let t = curveParameterFromPoint( path.ops[0].to, path.ops[1].cp1, path.ops[1].cp2, @@ -1065,7 +1064,7 @@ Path.prototype.trim = function () { { x: ops[1].cp2.x, y: ops[1].cp2.y }, { x: ops[1].to.x, y: ops[1].to.y } ) - let t = relativeOffsetOnCurve( + let t = curveParameterFromPoint( ops[0].to, ops[1].cp1, ops[1].cp2, diff --git a/packages/core/src/utils.mjs b/packages/core/src/utils.mjs index 9a5ecf17fd7..6d8c8b559c6 100644 --- a/packages/core/src/utils.mjs +++ b/packages/core/src/utils.mjs @@ -549,11 +549,17 @@ export function pointOnBeam(from, to, check, precision = 1e6) { * @return {boolean} result - True of the Point is on the curve, false when not */ export function pointOnCurve(start, cp1, cp2, end, check) { - return relativeOffsetOnCurve(start, cp1, cp2, end, check) !== false + return curveParameterFromPoint(start, cp1, cp2, end, check) !== false } /** - * Finds where a Point lies on a (cubic) Bezier curve + * Finds where a Point lies on a (cubic) Bezier curve and returns the curve parameter t of this position. + * For example a return value of 0 indicates that the given point is the start of the curve, a return value + * of 1 indicated that the given point is identical to the end of the curve. + * + * A return value of 0.5 indicates that the start point and the first control point had the same influence + * as the end point and the second control point, to create the point, but this doesn't necessarily mean + * that the point lies exactly half-way on the curve. * * @param {Point} start - Start of the curve * @param {Point} cp1 - Control point at the start of the curve @@ -562,7 +568,7 @@ export function pointOnCurve(start, cp1, cp2, end, check) { * @param {Point} check - Point to check * @return {false|number} result - relative position on the curve (value between 0 and 1), false when not on curve */ -export function relativeOffsetOnCurve(start, cp1, cp2, end, check) { +export function curveParameterFromPoint(start, cp1, cp2, end, check) { if (start.sitsOn(check)) return 0 if (end.sitsOn(check)) return 1 let curve = new Bezier( From 9bbcf8bfd5d5abf9b35b15202a670b942d0f804e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:04:37 +0000 Subject: [PATCH 711/795] chore(deps): Bump tailwindcss from 3.4.1 to 3.4.3 Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 3.4.1 to 3.4.3. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.3/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.1...v3.4.3) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 076b15fd1a3..51483e6d0bb 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -64,7 +64,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/lab/package.json b/sites/lab/package.json index df533dcead1..15d8481db13 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -65,7 +65,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/org/package.json b/sites/org/package.json index 19c8d628816..cc352455eaa 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -72,7 +72,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/sde/package.json b/sites/sde/package.json index 9c720e28bd0..b82af9cb1ad 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -82,7 +82,7 @@ "remark-smartypants": "3.0.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.3", "tlds": "1.252.0", "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" diff --git a/yarn.lock b/yarn.lock index c9e2b7156eb..b2e4bb0944b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7967,7 +7967,7 @@ jest-get-type@^29.6.3: resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== -jiti@^1.19.1: +jiti@^1.19.1, jiti@^1.21.0: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -13236,10 +13236,10 @@ synckit@^0.6.0: dependencies: tslib "^2.3.1" -tailwindcss@3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.1.tgz#f512ca5d1dd4c9503c7d3d28a968f1ad8f5c839d" - integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== +tailwindcss@3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" + integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" @@ -13249,7 +13249,7 @@ tailwindcss@3.4.1: fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.19.1" + jiti "^1.21.0" lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" From a6f719ca65915326684d33747c0e04ce4672bfc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:05:22 +0000 Subject: [PATCH 712/795] chore(deps): Bump @tailwindcss/typography from 0.5.10 to 0.5.12 Bumps [@tailwindcss/typography](https://github.com/tailwindlabs/tailwindcss-typography) from 0.5.10 to 0.5.12. - [Release notes](https://github.com/tailwindlabs/tailwindcss-typography/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.10...v0.5.12) --- updated-dependencies: - dependency-name: "@tailwindcss/typography" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 076b15fd1a3..00b92d0e631 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -33,7 +33,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.2.2", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", "daisyui": "4.7.3", "lodash.get": "4.4.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index df533dcead1..af170c94c95 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -30,7 +30,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index 19c8d628816..51e8af8e08d 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -34,7 +34,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.7.3", diff --git a/sites/sde/package.json b/sites/sde/package.json index 9c720e28bd0..81aaa81fe29 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -44,7 +44,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.12", "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", diff --git a/sites/shared/package.json b/sites/shared/package.json index 018a46d37bb..9ee1ed750e8 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -18,7 +18,7 @@ "dependencies": { "@next/mdx": "14.2.2", "@resvg/resvg-js": "2.6.2", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.12", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/yarn.lock b/yarn.lock index c9e2b7156eb..f5f45cd428d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2548,10 +2548,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.10": - version "0.5.10" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.10.tgz#2abde4c6d5c797ab49cf47610830a301de4c1e0a" - integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== +"@tailwindcss/typography@0.5.12": + version "0.5.12" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.12.tgz#c0532fd594427b7f4e8e38eff7bf272c63a1dca4" + integrity sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" From 1b04052433ccb207721b0e11e46a1c293353c63a Mon Sep 17 00:00:00 2001 From: nataliasayang Date: Thu, 18 Apr 2024 22:35:30 +0200 Subject: [PATCH 713/795] feat: New showcase post a-sturdy-albert-apron-by-ojensen by n_sayang --- .../showcase/a-sturdy-albert-apron-by-ojensen/en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md new file mode 100644 index 00000000000..09cd9114146 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md @@ -0,0 +1,11 @@ +--- +title: "A sturdy Albert apron by ojensen" +caption: "It was made out of a fairly sturdy duck canvas." +date: 20240418 +intro: "This Albert apron was Oliver's very first sewing project!" +author: null +designs: ["albert"] +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! + From 7b4d227352e97e7898f48693500e3378401e3d2b Mon Sep 17 00:00:00 2001 From: nataliasayang Date: Thu, 18 Apr 2024 22:43:14 +0200 Subject: [PATCH 714/795] feat: New showcase post wonderful-waralees-by-tuesday by n_sayang --- .../org/showcase/wonderful-waralees-by-tuesday/en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/en.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md new file mode 100644 index 00000000000..edb75486812 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md @@ -0,0 +1,11 @@ +--- +title: "Wonderful Waralees by Tuesday" +caption: "What a great look!" +date: 20240418 +intro: "FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable." +author: 22693 +designs: ["waralee"] +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. + From 71d5ffc3b6f2651cc9081734e2e4a6d3da1eead4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:20:52 +0000 Subject: [PATCH 715/795] chore(deps): Bump @bugsnag/plugin-react from 7.19.0 to 7.22.7 Bumps [@bugsnag/plugin-react](https://github.com/bugsnag/bugsnag-js) from 7.19.0 to 7.22.7. - [Release notes](https://github.com/bugsnag/bugsnag-js/releases) - [Changelog](https://github.com/bugsnag/bugsnag-js/blob/next/CHANGELOG.md) - [Commits](https://github.com/bugsnag/bugsnag-js/compare/v7.19.0...v7.22.7) --- updated-dependencies: - dependency-name: "@bugsnag/plugin-react" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- yarn.lock | 39 ++++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 19c8d628816..716142be354 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@bugsnag/js": "7.22.4", - "@bugsnag/plugin-react": "7.19.0", + "@bugsnag/plugin-react": "7.22.7", "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", diff --git a/yarn.lock b/yarn.lock index c9e2b7156eb..1d6a049eed8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -927,10 +927,10 @@ pump "^3.0.0" stack-generator "^2.0.3" -"@bugsnag/plugin-react@7.19.0": - version "7.19.0" - resolved "https://registry.npmjs.org/@bugsnag/plugin-react/-/plugin-react-7.19.0.tgz" - integrity sha512-owC4QXYJWGllMoOPcH5P7sbDIDuFLMCbjGAU6FwH5mBMObSQo+1ViSKImlTJQUFXATM8ySISTBVt7w3C6FFHng== +"@bugsnag/plugin-react@7.22.7": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.22.7.tgz#9f308cc4c043ee765d77686fca4e4404dc1c88d0" + integrity sha512-CDyCHK5+KMkpf/2vmVC7xqqP4ys25Yuj9M8xVrmP7LC02nFUPt/UzEIt43MSO4Jfw254ZimbsQrhIweabQNyxQ== "@bugsnag/safe-json-stringify@^6.0.0": version "6.0.0" @@ -12910,7 +12910,16 @@ string-argv@0.3.2: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13015,7 +13024,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13029,6 +13038,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" @@ -14230,7 +14246,7 @@ workerpool@6.2.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -14248,6 +14264,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" From 30ebfba2bd7c6a5f32baf5001758bd01d8b8abcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:21:15 +0000 Subject: [PATCH 716/795] chore(deps): Bump swagger-ui-dist from 5.15.1 to 5.16.1 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.15.1 to 5.16.1. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.15.1...v5.16.1) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 39 +++++++++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 5735affee8c..5d74973a804 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.20.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.15.1", + "swagger-ui-dist": "5.16.1", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index c9e2b7156eb..d0f9e843262 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12910,7 +12910,16 @@ string-argv@0.3.2: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13015,7 +13024,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13029,6 +13038,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" @@ -13217,10 +13233,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.15.1, swagger-ui-dist@>=5.0.0: - version "5.15.1" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.15.1.tgz#99fbb54c01feb6635e218fa12061f0edae634a00" - integrity sha512-Et/WY0NFdKj8sUBOyEx5P3VybsvGl7bo/y9JvgQ22TkH1a/KscQ0ZiQST2YeJ3cwCrIjYTbHbt165fkku0y1Ig== +swagger-ui-dist@5.16.1, swagger-ui-dist@>=5.0.0: + version "5.16.1" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.16.1.tgz#caffa02908aa5f33e803c3802498f17486146faa" + integrity sha512-E1jEbJgi88mA520k9ofPecq2dPC5ozPpSExKA6H13BsyM6ajfy+8FuWb/AHfwBa/JYGPSZ4/cKomrA5LTvS/JA== swagger-ui-express@5.0.0: version "5.0.0" @@ -14230,7 +14246,7 @@ workerpool@6.2.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -14248,6 +14264,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" From 759cd3a1b5887121363fa29d3e2c7c80f96cd3bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 04:22:12 +0000 Subject: [PATCH 717/795] chore(deps): Bump next from 14.2.1 to 14.2.2 Bumps [next](https://github.com/vercel/next.js) from 14.2.1 to 14.2.2. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.2.1...v14.2.2) --- updated-dependencies: - dependency-name: next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 139 ++++++++++++++++++++++++----------------- 5 files changed, 86 insertions(+), 61 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 076b15fd1a3..cd9bf78088a 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -39,7 +39,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.1", + "next": "14.2.2", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-dom": "18.2.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index df533dcead1..2682fc78fa9 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -40,7 +40,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.1", + "next": "14.2.2", "next-i18next": "15.2.0", "ora": "8.0.1", "react": "18.2.0", diff --git a/sites/org/package.json b/sites/org/package.json index 19c8d628816..04a4db9902e 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -46,7 +46,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "luxon": "3.4.4", - "next": "14.2.1", + "next": "14.2.2", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 9c720e28bd0..1284defc7e4 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -63,7 +63,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "mustache": "4.2.0", - "next": "14.2.1", + "next": "14.2.2", "next-i18next": "15.2.0", "pdfkit": "0.15.0", "postcss-for": "2.1.1", diff --git a/yarn.lock b/yarn.lock index c9e2b7156eb..c20d17bdf42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1487,10 +1487,10 @@ dependencies: webpack-bundle-analyzer "4.10.1" -"@next/env@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.1.tgz#18b4fb5fd76bdda65369ad4ea5f33199ae708d2f" - integrity sha512-qsHJle3GU3CmVx7pUoXcghX4sRN+vINkbLdH611T8ZlsP//grzqVW87BSUgOZeSAD4q7ZdZicdwNe/20U2janA== +"@next/env@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.2.tgz#6c36fe0b04a22ea78bd60a645ae77d53cd16d3ca" + integrity sha512-sk72qRfM1Q90XZWYRoJKu/UWlTgihrASiYw/scb15u+tyzcze3bOuJ/UV6TBOQEeUaxOkRqGeuGUdiiuxc5oqw== "@next/eslint-plugin-next@14.2.1": version "14.2.1" @@ -1506,50 +1506,50 @@ dependencies: source-map "^0.7.0" -"@next/swc-darwin-arm64@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.1.tgz#44ca580ccac1396fa45e2bcc6584238098491e71" - integrity sha512-kGjnjcIJehEcd3rT/3NAATJQndAEELk0J9GmGMXHSC75TMnvpOhONcjNHbjtcWE5HUQnIHy5JVkatrnYm1QhVw== +"@next/swc-darwin-arm64@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.2.tgz#55e395b0db6dd5ea2dc92818260ff3a399f1a056" + integrity sha512-3iPgMhzbalizGwHNFUcGnDhFPSgVBHQ8aqSTAMxB5BvJG0oYrDf1WOJZlbXBgunOEj/8KMVbejEur/FpvFsgFQ== -"@next/swc-darwin-x64@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.1.tgz#1747091f40fd3b0d8e072ba62203ec998619525f" - integrity sha512-dAdWndgdQi7BK2WSXrx4lae7mYcOYjbHJUhvOUnJjMNYrmYhxbbvJ2xElZpxNxdfA6zkqagIB9He2tQk+l16ew== +"@next/swc-darwin-x64@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.2.tgz#f96fb65510be798c03b0432129792c6ac8885bc8" + integrity sha512-x7Afi/jt0ZBRUZHTi49yyej4o8znfIMHO4RvThuoc0P+uli8Jd99y5GKjxoYunPKsXL09xBXEM1+OQy2xEL0Ag== -"@next/swc-linux-arm64-gnu@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.1.tgz#ede705718c316e65e3dd9ab31962824b8befb0cb" - integrity sha512-2ZctfnyFOGvTkoD6L+DtQtO3BfFz4CapoHnyLTXkOxbZkVRgg3TQBUjTD/xKrO1QWeydeo8AWfZRg8539qNKrg== +"@next/swc-linux-arm64-gnu@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.2.tgz#443f0d4ab9d1aa4338e40f77ca4e182d60e88448" + integrity sha512-zbfPtkk7L41ODMJwSp5VbmPozPmMMQrzAc0HAUomVeVIIwlDGs/UCqLJvLNDt4jpWgc21SjjyIn762lNGrMaUA== -"@next/swc-linux-arm64-musl@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.1.tgz#ce50a5d94a7ba1f8e34a941f4ca076d8beebc79c" - integrity sha512-jazZXctiaanemy4r+TPIpFP36t1mMwWCKMsmrTRVChRqE6putyAxZA4PDujx0SnfvZHosjdkx9xIq9BzBB5tWg== +"@next/swc-linux-arm64-musl@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.2.tgz#182c00b3d2f3ed4eaacdd385d07b230252c64de9" + integrity sha512-wPbS3pI/JU16rm3XdLvvTmlsmm1nd+sBa2ohXgBZcShX4TgOjD4R+RqHKlI1cjo/jDZKXt6OxmcU0Iys0OC/yg== -"@next/swc-linux-x64-gnu@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.1.tgz#ac3e8fa4d028fe7a9d9b7c33db3ab65679ae5fe2" - integrity sha512-VjCHWCjsAzQAAo8lkBOLEIkBZFdfW+Z18qcQ056kL4KpUYc8o59JhLDCBlhg+hINQRgzQ2UPGma2AURGOH0+Qg== +"@next/swc-linux-x64-gnu@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.2.tgz#e826a08085dcc61685ff42884ad4032e71ac154f" + integrity sha512-NqWOHqqq8iC9tuHvZxjQ2tX+jWy2X9y8NX2mcB4sj2bIccuCxbIZrU/ThFPZZPauygajZuVQ6zediejQHwZHwQ== -"@next/swc-linux-x64-musl@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.1.tgz#2beb7bee80dfb54a36d81392f21c599014018177" - integrity sha512-7HZKYKvAp4nAHiHIbY04finRqjeYvkITOGOurP1aLMexIFG/1+oCnqhGogBdc4lao/lkMW1c+AkwWSzSlLasqw== +"@next/swc-linux-x64-musl@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.2.tgz#42f921ca6d93fdfb2b13de70cd8a44ba5526b318" + integrity sha512-lGepHhwb9sGhCcU7999+iK1ZZT+6rrIoVg40MP7DZski9GIZP80wORSbt5kJzh9v2x2ev2lxC6VgwMQT0PcgTA== -"@next/swc-win32-arm64-msvc@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.1.tgz#b25df35a6ed99eb73bfed07822dd28a37aaab9f9" - integrity sha512-YGHklaJ/Cj/F0Xd8jxgj2p8po4JTCi6H7Z3Yics3xJhm9CPIqtl8erlpK1CLv+HInDqEWfXilqatF8YsLxxA2Q== +"@next/swc-win32-arm64-msvc@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.2.tgz#9c8f60da8e3882c4c66f21747abf944a627d05ff" + integrity sha512-TZSh/48SfcLEQ4rD25VVn2kdIgUWmMflRX3OiyPwGNXn3NiyPqhqei/BaqCYXViIQ+6QsG9R0C8LftMqy8JPMA== -"@next/swc-win32-ia32-msvc@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.1.tgz#2cc67b93f0a71a8f3c1dd735676f4c9ddd4240ff" - integrity sha512-o+ISKOlvU/L43ZhtAAfCjwIfcwuZstiHVXq/BDsZwGqQE0h/81td95MPHliWCnFoikzWcYqh+hz54ZB2FIT8RA== +"@next/swc-win32-ia32-msvc@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.2.tgz#fdb0b5f74e6dc0dcb34b7f7d24775ad034d915e8" + integrity sha512-M0tBVNMEBJN2ZNQWlcekMn6pvLria7Sa2Fai5znm7CCJz4pP3lrvlSxhKdkCerk0D9E0bqx5yAo3o2Q7RrD4gA== -"@next/swc-win32-x64-msvc@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.1.tgz#e5f4003930de4a150a8c2e7cf5c133cd99a686bd" - integrity sha512-GmRoTiLcvCLifujlisknv4zu9/C4i9r0ktsA8E51EMqJL4bD4CpO7lDYr7SrUxCR0tS4RVcrqKmCak24T0ohaw== +"@next/swc-win32-x64-msvc@14.2.2": + version "14.2.2" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.2.tgz#95cc0dad2c7ac5177fa6eeab070dccfa30532353" + integrity sha512-a/20E/wtTJZ3Ykv3f/8F0l7TtgQa2LWHU2oNB9bsu0VjqGuGGHmm/q6waoUNQYTVPYrrlxxaHjJcDV6aiSTt/w== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -10180,12 +10180,12 @@ next-i18next@15.2.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -next@14.2.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.1.tgz#081509478156407e4c181ad4791fea0a43c6347d" - integrity sha512-SF3TJnKdH43PMkCcErLPv+x/DY1YCklslk3ZmwaVoyUfDgHKexuKlf9sEfBQ69w+ue8jQ3msLb+hSj1T19hGag== +next@14.2.2: + version "14.2.2" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.2.tgz#707311b5e4bf973ada2305233f322bdd0cd9d579" + integrity sha512-oGwUaa2bCs47FbuxWMpOoXtBMPYpvTPgdZr3UAo+pu7Ns00z9otmYpoeV1HEiYL06AlRQQIA/ypK526KjJfaxg== dependencies: - "@next/env" "14.2.1" + "@next/env" "14.2.2" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -10193,15 +10193,15 @@ next@14.2.1: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.1" - "@next/swc-darwin-x64" "14.2.1" - "@next/swc-linux-arm64-gnu" "14.2.1" - "@next/swc-linux-arm64-musl" "14.2.1" - "@next/swc-linux-x64-gnu" "14.2.1" - "@next/swc-linux-x64-musl" "14.2.1" - "@next/swc-win32-arm64-msvc" "14.2.1" - "@next/swc-win32-ia32-msvc" "14.2.1" - "@next/swc-win32-x64-msvc" "14.2.1" + "@next/swc-darwin-arm64" "14.2.2" + "@next/swc-darwin-x64" "14.2.2" + "@next/swc-linux-arm64-gnu" "14.2.2" + "@next/swc-linux-arm64-musl" "14.2.2" + "@next/swc-linux-x64-gnu" "14.2.2" + "@next/swc-linux-x64-musl" "14.2.2" + "@next/swc-win32-arm64-msvc" "14.2.2" + "@next/swc-win32-ia32-msvc" "14.2.2" + "@next/swc-win32-x64-msvc" "14.2.2" nise@^5.1.5: version "5.1.9" @@ -12910,7 +12910,16 @@ string-argv@0.3.2: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13015,7 +13024,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13029,6 +13038,13 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" @@ -14230,7 +14246,7 @@ workerpool@6.2.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -14248,6 +14264,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" From e08a4aa5006d8368e2582f1f565f2ea151869135 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:54:42 +0000 Subject: [PATCH 718/795] chore(deps): Bump next-i18next from 15.2.0 to 15.3.0 Bumps [next-i18next](https://github.com/i18next/next-i18next) from 15.2.0 to 15.3.0. - [Release notes](https://github.com/i18next/next-i18next/releases) - [Changelog](https://github.com/i18next/next-i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/next-i18next/compare/v15.2.0...v15.3.0) --- updated-dependencies: - dependency-name: next-i18next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/lab/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/lab/package.json b/sites/lab/package.json index 2682fc78fa9..517f2a2b612 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -41,7 +41,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "next": "14.2.2", - "next-i18next": "15.2.0", + "next-i18next": "15.3.0", "ora": "8.0.1", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 1284defc7e4..2be94b47633 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -64,7 +64,7 @@ "lodash.set": "4.3.2", "mustache": "4.2.0", "next": "14.2.2", - "next-i18next": "15.2.0", + "next-i18next": "15.3.0", "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", diff --git a/yarn.lock b/yarn.lock index eb5ce38b26d..3f6adde7553 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10169,10 +10169,10 @@ nested-error-stacks@^2.0.0: resolved "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz" integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== -next-i18next@15.2.0: - version "15.2.0" - resolved "https://registry.npmjs.org/next-i18next/-/next-i18next-15.2.0.tgz" - integrity sha512-Rl5yZ4oGffsB0AjRykZ5PzNQ2M6am54MaMayldGmH/UKZisrIxk2SKEPJvaHhKlWe1qgdNi2FkodwK8sEjfEmg== +next-i18next@15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-15.3.0.tgz#b4530c80573854d00f95229af405e1e5beedbf18" + integrity sha512-bq7Cc9XJFcmGOCLnyEtHaeJ3+JJNsI/8Pkj9BaHAnhm4sZ9vNNC4ZsaqYnlRZ7VH5ypSo73fEqLK935jLsmCvQ== dependencies: "@babel/runtime" "^7.23.2" "@types/hoist-non-react-statics" "^3.3.4" From aba4aace712a6408115d976b16bcf5df38b303a0 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:24:58 +0200 Subject: [PATCH 719/795] New translations en.md (French) skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/fr.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md new file mode 100644 index 00000000000..72bb542de01 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md @@ -0,0 +1,11 @@ +--- +title: Wonderful Waralees by Tuesday +caption: What a great look! +date: 20240418 +intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +author: 22693 +designs: + - waralee +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. From 814543923845422a2701657523481889f2e584ea Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:24:59 +0200 Subject: [PATCH 720/795] New translations en.md (French) skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/fr.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md new file mode 100644 index 00000000000..73d933bd291 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md @@ -0,0 +1,11 @@ +--- +title: A sturdy Albert apron by ojensen +caption: It was made out of a fairly sturdy duck canvas. +date: 20240418 +intro: This Albert apron was Oliver's very first sewing project! +author: null +designs: + - albert +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! From 32452bf07f8d98d6ab8595e108f447fb91dfbc63 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:01 +0200 Subject: [PATCH 721/795] New translations en.md (Spanish) skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/es.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/es.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/es.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/es.md new file mode 100644 index 00000000000..72bb542de01 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/es.md @@ -0,0 +1,11 @@ +--- +title: Wonderful Waralees by Tuesday +caption: What a great look! +date: 20240418 +intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +author: 22693 +designs: + - waralee +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. From 9600cf10ebff631bbbca0c8d2fd0c52c060fdddc Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:02 +0200 Subject: [PATCH 722/795] New translations en.md (Spanish) skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/es.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/es.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/es.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/es.md new file mode 100644 index 00000000000..73d933bd291 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/es.md @@ -0,0 +1,11 @@ +--- +title: A sturdy Albert apron by ojensen +caption: It was made out of a fairly sturdy duck canvas. +date: 20240418 +intro: This Albert apron was Oliver's very first sewing project! +author: null +designs: + - albert +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! From 293460dc8b3e55d119b996a0bc62d3de071b42db Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:03 +0200 Subject: [PATCH 723/795] New translations en.md (German) skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/de.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/de.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/de.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/de.md new file mode 100644 index 00000000000..72bb542de01 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/de.md @@ -0,0 +1,11 @@ +--- +title: Wonderful Waralees by Tuesday +caption: What a great look! +date: 20240418 +intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +author: 22693 +designs: + - waralee +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. From 6f5dc71d976cdb785500905e0a6c45011db6045c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:04 +0200 Subject: [PATCH 724/795] New translations en.md (German) skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/de.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/de.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/de.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/de.md new file mode 100644 index 00000000000..73d933bd291 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/de.md @@ -0,0 +1,11 @@ +--- +title: A sturdy Albert apron by ojensen +caption: It was made out of a fairly sturdy duck canvas. +date: 20240418 +intro: This Albert apron was Oliver's very first sewing project! +author: null +designs: + - albert +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! From 926e1f7fc2b507290eef98de4544b2fbef1c6d90 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:06 +0200 Subject: [PATCH 725/795] New translations en.md (Dutch) skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/nl.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/nl.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/nl.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/nl.md new file mode 100644 index 00000000000..72bb542de01 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/nl.md @@ -0,0 +1,11 @@ +--- +title: Wonderful Waralees by Tuesday +caption: What a great look! +date: 20240418 +intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +author: 22693 +designs: + - waralee +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. From c516f919e983201284f3301df6ca864ecd441857 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:07 +0200 Subject: [PATCH 726/795] New translations en.md (Dutch) skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/nl.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/nl.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/nl.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/nl.md new file mode 100644 index 00000000000..73d933bd291 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/nl.md @@ -0,0 +1,11 @@ +--- +title: A sturdy Albert apron by ojensen +caption: It was made out of a fairly sturdy duck canvas. +date: 20240418 +intro: This Albert apron was Oliver's very first sewing project! +author: null +designs: + - albert +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! From b7fb234b7a954c071541f196e63fda7646cf7389 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:08 +0200 Subject: [PATCH 727/795] New translations en.md (Ukrainian) skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/uk.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/uk.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/uk.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/uk.md new file mode 100644 index 00000000000..8df732115ad --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/uk.md @@ -0,0 +1,11 @@ +--- +title: Wonderful Waralees by Tuesday +caption: What a great look! +date: 20240418 +intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +author: 22693 +designs: + - Waralee +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. From fb362b04829eeb32207aa15a9e8a413b6d247a7c Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:25:09 +0200 Subject: [PATCH 728/795] New translations en.md (Ukrainian) skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/uk.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/uk.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/uk.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/uk.md new file mode 100644 index 00000000000..e06d187fc16 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/uk.md @@ -0,0 +1,11 @@ +--- +title: A sturdy Albert apron by ojensen +caption: It was made out of a fairly sturdy duck canvas. +date: 20240418 +intro: This Albert apron was Oliver's very first sewing project! +author: null +designs: + - альберт +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! From 80734ba1369492ea9107f6b3a9b401b30bbc9b19 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:44:43 +0200 Subject: [PATCH 729/795] Update source file en.md skip-build --- .../showcase/a-sturdy-albert-apron-by-ojensen/en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md new file mode 100644 index 00000000000..09cd9114146 --- /dev/null +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/en.md @@ -0,0 +1,11 @@ +--- +title: "A sturdy Albert apron by ojensen" +caption: "It was made out of a fairly sturdy duck canvas." +date: 20240418 +intro: "This Albert apron was Oliver's very first sewing project!" +author: null +designs: ["albert"] +--- + +This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! + From 3224c2f954d8655b97915cb9edbcbc371936f374 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 19 Apr 2024 21:45:42 +0200 Subject: [PATCH 730/795] Update source file en.md skip-build --- .../org/showcase/wonderful-waralees-by-tuesday/en.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 markdown/org/showcase/wonderful-waralees-by-tuesday/en.md diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md new file mode 100644 index 00000000000..edb75486812 --- /dev/null +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/en.md @@ -0,0 +1,11 @@ +--- +title: "Wonderful Waralees by Tuesday" +caption: "What a great look!" +date: 20240418 +intro: "FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable." +author: 22693 +designs: ["waralee"] +--- + +FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. + From 2a3c19ca676ed82544490e5a35ca6edd585ffc29 Mon Sep 17 00:00:00 2001 From: Jeroen Hoek Date: Sat, 20 Apr 2024 22:28:45 +0200 Subject: [PATCH 731/795] Link just changed sub-domain. --- markdown/org/docs/designs/simon/instructions/en.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index df5dd1dd689..df943067d46 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -11,8 +11,7 @@ all the steps. If you're looking to make this pattern, Kelly and Julian can guide you start to finish. You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +site: [#simonsayssew with kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Step 1: Fuse interfacing From ee7566154d02fb759ce77c0287064a1032a4ba00 Mon Sep 17 00:00:00 2001 From: Jonathan Haas Date: Sun, 21 Apr 2024 18:24:43 +0200 Subject: [PATCH 732/795] fix(wahid): The back part needs also two cuts from lining fabric --- designs/wahid/src/back.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/designs/wahid/src/back.mjs b/designs/wahid/src/back.mjs index bfce96b1bd9..105c5e7fa83 100644 --- a/designs/wahid/src/back.mjs +++ b/designs/wahid/src/back.mjs @@ -130,6 +130,7 @@ function wahidBack({ */ // Cutlist store.cutlist.setCut({ cut: 2, from: 'fabric' }) + store.cutlist.addCut({ cut: 2, from: 'lining' }) // Title macro('title', { From 3bd6b09740a4ddb5443a35c015666a0f77d20606 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 18:32:54 +0200 Subject: [PATCH 733/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/simon/instructions/fr.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 37a8f684746..435da706b00 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -11,8 +11,7 @@ toutes les étapes. Si vous cherchez à créer ce modèle, Kelly et Julian peuvent vous guider vers la fin. Tu peux trouver tout le matériel sur le site de Kelly -: [#simonsayssew avec kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note : en date du 19 mars 2024, ce lien semble être en panne car il redirige vers une autre page. Les vidéos sont toujours disponibles sur Vimeo. [[Partie 1 : Mesure et dessin](https://vimeo.com/438424557)/[2 : Découpe et marquage](https://vimeo.com/438424645)/[3 : Poignets, col, empiècements et pinces](https://vimeo.com/441665307)/[4 : Patte de devant et coutures d'épaules](https://vimeo.com/441667465)/[5 : Patte de manche et emmanchures](https://vimeo.com/441668326)/[6 : Coutures latérales, poignets et col](https://vimeo.com/441727449)/[7 : Ourlet, boutonnières et boutons](https://vimeo.com/441731576)] +: [#simonsayssew avec kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Étape 1 : Thermocoller l'entoilage From 0868f1721338845395626b53778d5da12c5188b9 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 18:52:19 +0200 Subject: [PATCH 734/795] New translations en.md (Spanish) skip-build --- markdown/org/docs/designs/simon/instructions/es.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/es.md b/markdown/org/docs/designs/simon/instructions/es.md index 3752ca72634..8730f77517b 100644 --- a/markdown/org/docs/designs/simon/instructions/es.md +++ b/markdown/org/docs/designs/simon/instructions/es.md @@ -11,8 +11,7 @@ todos los pasos. Si estás buscando este patrón, Kelly y Julian pueden guiarte a empezar a terminar. You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +site: [#simonsayssew with kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Paso 1: Fusionar interfaz From 08cf01d23e91f4e0ef692a7b5a4a82469839b4b6 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 19:11:43 +0200 Subject: [PATCH 735/795] New translations en.md (German) skip-build --- markdown/org/docs/designs/simon/instructions/de.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/de.md b/markdown/org/docs/designs/simon/instructions/de.md index 14831be8b41..2e2c9f5f63f 100644 --- a/markdown/org/docs/designs/simon/instructions/de.md +++ b/markdown/org/docs/designs/simon/instructions/de.md @@ -10,9 +10,8 @@ Kelly Hogaboom und Julian Collins haben eine Simon(e) mitnäht, und sie haben Vi alle Schritte. Wenn Sie dieses Muster herstellen wollen, können Kelly und Julian Ihnen den Weg zum Ende weisen. -You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +Du findest das gesamte Material auf Kellys Website +: [#simonsayssew mit kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Schritt 1: Sicherungsschnittstelle From 5a11548273ea597933bfbba89d0f3c3d2bf7a752 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 19:31:02 +0200 Subject: [PATCH 736/795] New translations en.md (Dutch) skip-build --- markdown/org/docs/designs/simon/instructions/nl.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/nl.md b/markdown/org/docs/designs/simon/instructions/nl.md index 905a1ef019e..bf2af9d39ff 100644 --- a/markdown/org/docs/designs/simon/instructions/nl.md +++ b/markdown/org/docs/designs/simon/instructions/nl.md @@ -10,9 +10,8 @@ Kelly Hogaboom en Julian Collins deden een Simon(e) naadong, en ze hebben video' alle stappen. Als je dit patroon wilt maken, kan Kelly en Julian je begeleiden om te beginnen. -You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +Je kunt al het materiaal vinden op Kelly's +site: [#simonsayssew with kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Stap 1: Bevestig tussenvoering From 43665b420290bc67960f1da98e32329d30dfb849 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 19:50:04 +0200 Subject: [PATCH 737/795] New translations en.md (Ukrainian) skip-build --- markdown/org/docs/designs/simon/instructions/uk.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/uk.md b/markdown/org/docs/designs/simon/instructions/uk.md index 7f541238270..eb4737b7edc 100644 --- a/markdown/org/docs/designs/simon/instructions/uk.md +++ b/markdown/org/docs/designs/simon/instructions/uk.md @@ -10,9 +10,8 @@ title: "Сорочка-символ: Інструкція з пошиття" усіма етапами. Якщо ви хочете зробити цей візерунок, Келлі та Джуліан допоможуть вам від початку до кінця. -You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +Ви можете знайти всі матеріали на сайті Келлі +: [#simonsayssew with kelly hogaboom & julian collins] (https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Крок 1: Взаємодія запобіжників @@ -112,9 +111,9 @@ Note: as of March 19, 2024, this link appears to be down as it's redirecting to ### Крок 4: З'єднайте нашийник і стійку нашийника -#### Помістіть нашийник між стійками для нашийників і закріпіть його на місці +#### Помістіть нашийник між стійками для нашийників і закріпіть на місці -![Помістіть нашийник між стійками для нашийників і закріпіть його на місці](4a.png) +![Помістіть нашийник між стійками для нашийників і закріпіть на місці](4a.png) Позначте шпилькою середню точку коміра і стійки коміра. Середня точка кожної стійки для коміра насправді трохи зміщена від центру, оскільки один кінець довший за інший. Замість цього знайдіть середню точку між двома надрізами. @@ -334,9 +333,9 @@ Note: as of March 19, 2024, this link appears to be down as it's redirecting to > > Якщо ви знайомі з методом буріто, то вже знаєте, що робити. Якщо ні, то читайте далі, як акуратно закрити плечові шви сорочки, при цьому приховавши всі незавершені краї від сторонніх очей. -#### Приколіть передню частину до зовнішньої кокетки +#### Приколіть передні частини до зовнішньої кокетки -![Приколіть передню частину до зовнішньої кокетки](11a.png) ![Приколіть передню частину до зовнішньої кокетки](11b.png) +![Приколіть передні частини до зовнішньої кокетки](11a.png) ![Приколіть передні частини до зовнішньої кокетки](11b.png) Покладіть спину на підлогу доброю стороною догори, але будьте обережні, щоб скласти внутрішнє ярмо донизу (як показано пунктиром). From 34e1c2e28c1b1c2090ab6e3725695f38ff066542 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 21 Apr 2024 20:14:03 +0200 Subject: [PATCH 738/795] Update source file en.md skip-build --- markdown/org/docs/designs/simon/instructions/en.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/en.md b/markdown/org/docs/designs/simon/instructions/en.md index df5dd1dd689..df943067d46 100644 --- a/markdown/org/docs/designs/simon/instructions/en.md +++ b/markdown/org/docs/designs/simon/instructions/en.md @@ -11,8 +11,7 @@ all the steps. If you're looking to make this pattern, Kelly and Julian can guide you start to finish. You can find all the material's on Kelly's -site: [#simonsayssew with kelly hogaboom & julian collins](https://kelly.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) -Note: as of March 19, 2024, this link appears to be down as it's redirecting to a different page. The videos are still available on Vimeo. [[Part 1: Measuring & Drafting](https://vimeo.com/438424557)/[2: Cutting & Marking](https://vimeo.com/438424645)/[3: Cuffs, Collar, Yokes & Darts](https://vimeo.com/441665307)/[4: Front Placket & Shoulder Seams](https://vimeo.com/441667465)/[5: Sleeve Placket & Armscye](https://vimeo.com/441668326)/[6: Side Seams, Cuffs, & Collar](https://vimeo.com/441727449)/[7: Hem, Buttonholes, & Buttons](https://vimeo.com/441731576)] +site: [#simonsayssew with kelly hogaboom & julian collins](https://agni.hogaboom.org/2020/07/simon-says-sew-with-kelly-hogaboom-and-julian-collins/) ### Step 1: Fuse interfacing From 347f61b9537d3716a25bef45b900deda772f0063 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 04:40:02 +0000 Subject: [PATCH 739/795] chore(deps): Bump daisyui from 4.7.3 to 4.10.2 Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.7.3 to 4.10.2. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.7.3...v4.10.2) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 05c13a09a22..cf1fcd7741b 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -35,7 +35,7 @@ "@next/bundle-analyzer": "14.2.2", "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", - "daisyui": "4.7.3", + "daisyui": "4.10.2", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index f28fecbc837..4ecf784162d 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -35,7 +35,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.10.2", "i18next": "23.11.0", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", diff --git a/sites/org/package.json b/sites/org/package.json index 95b54034f02..d7299f21755 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -37,7 +37,7 @@ "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.7.3", + "daisyui": "4.10.2", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.8.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index 06e1ec7c8dd..f76e25a6311 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -50,7 +50,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.10.2", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", diff --git a/sites/shared/package.json b/sites/shared/package.json index 9ee1ed750e8..5e953f12b66 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -23,7 +23,7 @@ "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.7.3", + "daisyui": "4.10.2", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", diff --git a/yarn.lock b/yarn.lock index 983cb934b32..e50249cbcf1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4708,10 +4708,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.7.3: - version "4.7.3" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.7.3.tgz#2d75b71d1c52f643914dea9b12930acc51ed9f49" - integrity sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g== +daisyui@4.10.2: + version "4.10.2" + resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.10.2.tgz#c0e072b94ccaa0326d1fdec26e8dc163ac070561" + integrity sha512-eCWS1W/JPyxW9IvlgW5m0R6rp9ZhRsBTW37rvEUthckkjsV04u8XipV519OoccSA46ixhSJa3q7XLI1WUFtRCA== dependencies: css-selector-tokenizer "^0.8" culori "^3" From c1234b6f425f64458389886e25b3918d6005189b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 04:40:35 +0000 Subject: [PATCH 740/795] chore(deps): Bump @bugsnag/js from 7.22.4 to 7.22.7 Bumps [@bugsnag/js](https://github.com/bugsnag/bugsnag-js) from 7.22.4 to 7.22.7. - [Release notes](https://github.com/bugsnag/bugsnag-js/releases) - [Changelog](https://github.com/bugsnag/bugsnag-js/blob/next/CHANGELOG.md) - [Commits](https://github.com/bugsnag/bugsnag-js/compare/v7.22.4...v7.22.7) --- updated-dependencies: - dependency-name: "@bugsnag/js" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- yarn.lock | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 95b54034f02..e5959b6a39e 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@bugsnag/js": "7.22.4", + "@bugsnag/js": "7.22.7", "@bugsnag/plugin-react": "7.22.7", "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", diff --git a/yarn.lock b/yarn.lock index 983cb934b32..bc515dd9654 100644 --- a/yarn.lock +++ b/yarn.lock @@ -884,17 +884,17 @@ resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz" integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A== -"@bugsnag/browser@^7.22.4": - version "7.22.4" - resolved "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.22.4.tgz" - integrity sha512-h2o9RZhAEIgJAUsECd7a00IkLnvQvLT7dUyUYx/s8VLvcq89gKa8E59rlM7f15wtkJ5MPfozhErXDpsdOvF4Rg== +"@bugsnag/browser@^7.22.7": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.22.7.tgz#ba1f9f3596b9d3cf1b4db11250f8be2f178a78c1" + integrity sha512-70jFkWKscK2osm7bnFbPLevrzHClrygM3UcKetKs/l81Xuzlxnu1SS3onN5OUl9kd9RN4XMFr46Pv5jSqWqImQ== dependencies: - "@bugsnag/core" "^7.19.0" + "@bugsnag/core" "^7.22.7" -"@bugsnag/core@^7.19.0": - version "7.19.0" - resolved "https://registry.npmjs.org/@bugsnag/core/-/core-7.19.0.tgz" - integrity sha512-2KGwdaLD9PhR7Wk7xPi3jGuGsKTatc/28U4TOZIDU3CgC2QhGjubwiXSECel5gwxhZ3jACKcMKSV2ovHhv1NrA== +"@bugsnag/core@^7.22.7": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.22.7.tgz#ea5e0822b01913c88be4dbc67d388aff8d65f26a" + integrity sha512-9DPWBkkBjhFJc5dCFy/wVC3HE0Aw3ZiLJKjyAxgywSKbILgtpD+qT1Xe8sacWyxU92znamlZ8H8ziQOe7jhhbA== dependencies: "@bugsnag/cuid" "^3.0.0" "@bugsnag/safe-json-stringify" "^6.0.0" @@ -907,20 +907,20 @@ resolved "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.0.2.tgz" integrity sha512-cIwzC93r3PQ/INeuwtZwkZIG2K8WWN0rRLZQhu+mr48Ay+i6sEki4GYfTsflse7hZ1BeDWrNb/Q9vgY3B31xHQ== -"@bugsnag/js@7.22.4": - version "7.22.4" - resolved "https://registry.npmjs.org/@bugsnag/js/-/js-7.22.4.tgz" - integrity sha512-GjU3YmCNxVl1QZ64e8D4hKSfhHiymHu4hyYlyKxIdqmnhpHvoFnADcdAHEnWPG82O9j9w+JoDXvL460aiOEgHg== +"@bugsnag/js@7.22.7": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.22.7.tgz#d631584ae37803b275798544232cef4f7e5afbfc" + integrity sha512-Qq8l06rSDTZtxgNIDpTeXHrin9C30INNbPfnR2CNcEsCmfqyVQb4USPEuRb0xg5wiaLKU9r4IAatMqiCgdzG6A== dependencies: - "@bugsnag/browser" "^7.22.4" - "@bugsnag/node" "^7.22.3" + "@bugsnag/browser" "^7.22.7" + "@bugsnag/node" "^7.22.7" -"@bugsnag/node@^7.22.3": - version "7.22.3" - resolved "https://registry.npmjs.org/@bugsnag/node/-/node-7.22.3.tgz" - integrity sha512-vDXu0mrduonyCjUkTp+zKSh1WHAtA2VjB49xK5s1f/HnTASiJvzUOQBRXrkqaj37sndYHUSMxUCPvLawyc75nA== +"@bugsnag/node@^7.22.7": + version "7.22.7" + resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.22.7.tgz#85231637527eb0be9baeed4ed88ed226da7ca577" + integrity sha512-Ud8vpX9UkGxoWAk7OigyR7w1eycbsE5uv5KZx0aWiqDPXylvICd42V5ZiWstpkdm9IVFo9AQ4+gmerHPe4Lwrg== dependencies: - "@bugsnag/core" "^7.19.0" + "@bugsnag/core" "^7.22.7" byline "^5.0.0" error-stack-parser "^2.0.2" iserror "^0.0.2" From 31764433f38d4ca0b5c9a81c216b54738cbce572 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 22 Apr 2024 18:26:04 +0200 Subject: [PATCH 741/795] New translations en.md (French) skip-build --- .../org/docs/designs/simon/instructions/fr.md | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 435da706b00..77702d36e2a 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -239,9 +239,9 @@ Ensuite, pliez à nouveau la patte en veillant à ce que le tissu arrive juste a Quand vous êtes satisfait, repassez la patte pliée. -#### Fixer la patte de boutonnage +#### Coucher la marge de couture d'un côté au fer -![Fixer la patte de boutonnage](9c.png) +![Coucher la marge de couture d'un côté au fer](9c.png) > Ce qui suit est l'approche classique. Si vous avez choisi une patte de boutonnage intégrée (sans couture), passez cette étape. > @@ -257,9 +257,9 @@ Pour cela, coudre exactement sur votre couture précédente. Comme tu as plié l > Si vous avez choisi une patte intégrée, vous pouvez passer les deux premières sous-étapes et passer à "Replier la patte de boutonnage". -#### Fixer la patte de boutonnage (côté boutonnières) +#### Replier la patte de boutonnières -![Fixer la patte de boutonnage (côté boutonnières)](10a.png) +![Replier la patte de boutonnières](10a.png) Si vous avez choisi une patte séparée, cousez-la sur le devant gauche. @@ -568,9 +568,9 @@ Notez également que le bord de votre manche sera plus long que votre poignet (d > Prenez votre temps pour épingler tout ceci avec soin. Nous allons faire des points de bordure plus tard, il est donc important que l'avant et l'arrière de ta manchette soient bien alignés. -#### Piquer les poignets aux manches +#### Repassez la couture en couchant la marge de couture côté patte de boutonnage -![Piquer les poignets aux manches](18b.png) +![Repassez la couture en couchant la marge de couture côté patte de boutonnage](18b.png) Une fois que tout est épinglé, cousez le long du bord du poignet pour l'attacher à votre manche. @@ -580,9 +580,9 @@ Il est important d'attraper à la fois la couche extérieure et la couche intér Quand vous avez terminé, donnez un bon coup de fer à vos poignets. -#### Surpiquez les poignets +#### Coudre la sous-patte de poignet -![Surpiquez les poignets](18c.png) +![Coudre la sous-patte de poignet](18c.png) > Assurez-vous que vos poignets ont été repassés au préalable. @@ -604,9 +604,9 @@ Veillez à respecter la marge de couture standard et - important - évitez les p > > C'est un peu délicat, donc faites très attention aux parties les plus courbées : là où le dos rejoint les devants. -#### Piquer le col en place +#### Coucher la marge de couture d'un côté au fer -![Piquer le col en place](19b.png) ![Piquer le col en place](19c.png) +![Coucher la marge de couture d'un côté au fer](19b.png) ![Coucher la marge de couture d'un côté au fer](19c.png) Quand vous serez satisfait de la façon dont vous avez bâti votre col en place, il est temps de piquer cette chose. @@ -622,9 +622,9 @@ Piquez à environ la moitié de la marge de couture de votre couture précédent > Vous devez arrêter quelques cm avant la fin du col (note: fin du col, et non fin du pied de col) de façon à ce que cette couture soit entièrement recouverte lorsque le col est plié. -#### Repasser le col +#### Surpiquer le col -![Repasser le col](19e.png) +![Surpiquer le col](19e.png) Maintenant que votre col est attaché, donnez-lui un bon coup de fer. From ff4e2217f88e40829d740071210d1f697a6f67da Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 22 Apr 2024 18:47:31 +0200 Subject: [PATCH 742/795] New translations en.md (Dutch) skip-build --- .../org/docs/designs/simon/instructions/nl.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/nl.md b/markdown/org/docs/designs/simon/instructions/nl.md index bf2af9d39ff..92a00ed9ce9 100644 --- a/markdown/org/docs/designs/simon/instructions/nl.md +++ b/markdown/org/docs/designs/simon/instructions/nl.md @@ -239,9 +239,9 @@ Plooi het knopenpat opnieuw om, en let op dat de stof tot net voorbij de aanzetn Als je daarmee blij bent, strijk dan het geplooide knopenpat. -#### Stik het geplooide knopenpat +#### Kleef de tussenvoering op de manchet -![Stik het geplooide knopenpat](9c.png) +![Kleef de tussenvoering op de manchet](9c.png) > Dit is de klassieke aanpak. Als je voor het naadloze knopenpat gekozen heb moet je dit niet doen. > @@ -379,9 +379,9 @@ Aangezien je deze schoudernaden gestreken hebt zou alles mooi plat moeten liggen ### Stap 13: Maak het mouwsplit -#### Stik de mouwsplitreep +#### Sierstiksel op de manchetten -![Stik de mouwsplitreep](13a.png) ![Strijk de mouwsplitreep](13b.png) ![Stik de mouwsplitreep door](13c.png) +![Sierstiksel op de manchetten](13a.png) ![Strijk de mouwsplitreep](13b.png) ![Stik de mouwsplitreep door](13c.png) - Leg je mouw met de goede kant naar beneden, en de mouwsplitreep bovenop, ook met de goede kant naar beneden. - Leg de rand van de mouwsplitreep (de onderlap van het mouwsplit) gelijk met de knip in de mouw, aan de kant het dichtst bij de zijnaad. @@ -580,9 +580,9 @@ Het is belangrijk om zowel de buitenste als de binnenste laag van je manchet aan Strijk alles nog eens grondig als je dit gedaan hebt. -#### Sierstiksel op de manchetten +#### Strijk de schouderpas -![Sierstiksel op de manchetten](18c.png) +![Strijk de schouderpas](18c.png) > Let op dat je je manchetten strijkt voor je dit doet. @@ -604,9 +604,9 @@ Zorg dat je de standaard naadwaarde in het oog houdt en - belangrijk - plooien v > > Dat is een beetje lastig, dus wees extra nauwkeurig aan de delen die het meest gebogen zijn: aan de schoudernaden. -#### Stik de kraag smal door +#### Stik de mouwsplitreep door -![Stik de kraag smal door](19b.png) ![Stik de kraag smal door](19c.png) +![Stik de mouwsplitreep door](19b.png) ![Stik de mouwsplitreep door](19c.png) Als je blij bent met hoe je kraag gedriegd is, wordt het tijd om het ding definitief vast te stikken. From 124c4fb2436b1ad37db4351cfc4359952aacd181 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 04:30:07 +0000 Subject: [PATCH 743/795] chore(deps): Bump swagger-ui-dist from 5.16.1 to 5.17.0 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.16.1 to 5.17.0. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.16.1...v5.17.0) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index ea5aba11b08..f5c8cd005d4 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.20.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.16.1", + "swagger-ui-dist": "5.17.0", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 983cb934b32..131f27f13cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13233,10 +13233,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.16.1, swagger-ui-dist@>=5.0.0: - version "5.16.1" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.16.1.tgz#caffa02908aa5f33e803c3802498f17486146faa" - integrity sha512-E1jEbJgi88mA520k9ofPecq2dPC5ozPpSExKA6H13BsyM6ajfy+8FuWb/AHfwBa/JYGPSZ4/cKomrA5LTvS/JA== +swagger-ui-dist@5.17.0, swagger-ui-dist@>=5.0.0: + version "5.17.0" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.17.0.tgz#a781618e4410551480fa95fcee9d1266b46ed311" + integrity sha512-PtEozc87rN6i6rqLYNVTK+1ZAYmCMy6poU6I2MOJXD19BVv6D7U9zwS8geRbtfamCM5yUwWkSNQKWGK58vculg== swagger-ui-express@5.0.0: version "5.0.0" From 05b18ee01561f9958fc24b858c1707a3796a22d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 04:31:05 +0000 Subject: [PATCH 744/795] chore(deps-dev): Bump @commitlint/cli from 19.2.1 to 19.3.0 Bumps [@commitlint/cli](https://github.com/conventional-changelog/commitlint/tree/HEAD/@commitlint/cli) from 19.2.1 to 19.3.0. - [Release notes](https://github.com/conventional-changelog/commitlint/releases) - [Changelog](https://github.com/conventional-changelog/commitlint/blob/master/@commitlint/cli/CHANGELOG.md) - [Commits](https://github.com/conventional-changelog/commitlint/commits/v19.3.0/@commitlint/cli) --- updated-dependencies: - dependency-name: "@commitlint/cli" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index 983cb934b32..1b1cb866d44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -938,12 +938,12 @@ integrity sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA== "@commitlint/cli@^19.0.3": - version "19.2.1" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.2.1.tgz#8f00d27a8b7c7780e75b06fd4658fdc1e9209f1b" - integrity sha512-cbkYUJsLqRomccNxvoJTyv5yn0bSy05BBizVyIcLACkRbVUqYorC351Diw/XFSWC/GtpwiwT2eOvQgFZa374bg== + version "19.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.3.0.tgz#44e6da9823a01f0cdcc43054bbefdd2c6c5ddf39" + integrity sha512-LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g== dependencies: - "@commitlint/format" "^19.0.3" - "@commitlint/lint" "^19.1.0" + "@commitlint/format" "^19.3.0" + "@commitlint/lint" "^19.2.2" "@commitlint/load" "^19.2.0" "@commitlint/read" "^19.2.1" "@commitlint/types" "^19.0.3" @@ -983,28 +983,28 @@ resolved "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-19.0.0.tgz" integrity sha512-mtsdpY1qyWgAO/iOK0L6gSGeR7GFcdW7tIjcNFxcWkfLDF5qVbPHKuGATFqRMsxcO8OUKNj0+3WOHB7EHm4Jdw== -"@commitlint/format@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/format/-/format-19.0.3.tgz" - integrity sha512-QjjyGyoiVWzx1f5xOteKHNLFyhyweVifMgopozSgx1fGNrGV8+wp7k6n1t6StHdJ6maQJ+UUtO2TcEiBFRyR6Q== +"@commitlint/format@^19.3.0": + version "19.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-19.3.0.tgz#48dd9e6930d41eb0ca19f36159ee940c5b25d857" + integrity sha512-luguk5/aF68HiF4H23ACAfk8qS8AHxl4LLN5oxPc24H+2+JRPsNr1OS3Gaea0CrH7PKhArBMKBz5RX9sA5NtTg== dependencies: "@commitlint/types" "^19.0.3" chalk "^5.3.0" -"@commitlint/is-ignored@^19.0.3": - version "19.0.3" - resolved "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.0.3.tgz" - integrity sha512-MqDrxJaRSVSzCbPsV6iOKG/Lt52Y+PVwFVexqImmYYFhe51iVJjK2hRhOG2jUAGiUHk4jpdFr0cZPzcBkSzXDQ== +"@commitlint/is-ignored@^19.2.2": + version "19.2.2" + resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-19.2.2.tgz#503ddcf908ac6b2bc4586a49cb53893a1856f5b2" + integrity sha512-eNX54oXMVxncORywF4ZPFtJoBm3Tvp111tg1xf4zWXGfhBPKpfKG6R+G3G4v5CPlRROXpAOpQ3HMhA9n1Tck1g== dependencies: "@commitlint/types" "^19.0.3" semver "^7.6.0" -"@commitlint/lint@^19.1.0": - version "19.1.0" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-19.1.0.tgz#0f4b26b1452d59a92a28b5fa6de9bdbee18399a1" - integrity sha512-ESjaBmL/9cxm+eePyEr6SFlBUIYlYpI80n+Ltm7IA3MAcrmiP05UMhJdAD66sO8jvo8O4xdGn/1Mt2G5VzfZKw== +"@commitlint/lint@^19.2.2": + version "19.2.2" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-19.2.2.tgz#57f69e24bd832a7dcce8ebf82d11e3bf03ccc2a9" + integrity sha512-xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA== dependencies: - "@commitlint/is-ignored" "^19.0.3" + "@commitlint/is-ignored" "^19.2.2" "@commitlint/parse" "^19.0.3" "@commitlint/rules" "^19.0.3" "@commitlint/types" "^19.0.3" From 8972a33fdc27a05b19131b80ea360c283842f1b7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 23 Apr 2024 19:57:56 +0200 Subject: [PATCH 745/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/simon/instructions/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index 77702d36e2a..f142e0ade5f 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -239,9 +239,9 @@ Ensuite, pliez à nouveau la patte en veillant à ce que le tissu arrive juste a Quand vous êtes satisfait, repassez la patte pliée. -#### Coucher la marge de couture d'un côté au fer +#### Coudre la sous-patte de poignet -![Coucher la marge de couture d'un côté au fer](9c.png) +![Coudre la sous-patte de poignet](9c.png) > Ce qui suit est l'approche classique. Si vous avez choisi une patte de boutonnage intégrée (sans couture), passez cette étape. > From e7b3b9276ca37d0fe4119987f001dfeaf465ced1 Mon Sep 17 00:00:00 2001 From: nataliasayang Date: Wed, 24 Apr 2024 03:32:59 +0200 Subject: [PATCH 746/795] feat: New showcase post waralees-by-moderndragon-featuring-a-fancy-seam-finish by natalia --- .../en.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 markdown/org/showcase/waralees-by-moderndragon-featuring-a-fancy-seam-finish/en.md diff --git a/markdown/org/showcase/waralees-by-moderndragon-featuring-a-fancy-seam-finish/en.md b/markdown/org/showcase/waralees-by-moderndragon-featuring-a-fancy-seam-finish/en.md new file mode 100644 index 00000000000..01949e70c15 --- /dev/null +++ b/markdown/org/showcase/waralees-by-moderndragon-featuring-a-fancy-seam-finish/en.md @@ -0,0 +1,19 @@ +--- +title: "Waralees by moderndragon, featuring a fancy seam finish" +caption: "These Waralees were made of a old duvet cover that they dyed." +date: 20240423 +intro: "This was moderndragon's very first Waralee wrap pants!" +author: 22007 +designs: ["waralee"] +--- + +This was moderndragon's very first Waralee wrap pants! + +They also tried their hand at a fancy seam finish for the crotch seam. Which was a bit of a challenge, given that it's a really curved seam. But they think it was worth it. + +Can you believe they created this vibrant fabric by dyeing an old duvet cover? + +Lovely work! + +![Fancy seam finish](https://imagedelivery.net/ouSuR9yY1bHt-fuAokSA5Q/showcase-waralees-by-moderndragon-featuring-a-fancy-seam-finish-1/public "Fancy seam finish") + From 688986b8c93bc27d5fcccb7831581017f9983e3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 04:16:43 +0000 Subject: [PATCH 747/795] chore(deps): Bump @prisma/client from 5.12.1 to 5.13.0 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.12.1 to 5.13.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.13.0/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index f5c8cd005d4..51db4ba317f 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.556.0", - "@prisma/client": "5.12.1", + "@prisma/client": "5.13.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index 22130330199..b4555c024cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1909,10 +1909,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.12.1.tgz#c26a674fea76754b3a9e8b90a11e617f90212f76" - integrity sha512-6/JnizEdlSBxDIdiLbrBdMW5NqDxOmhXAJaNXiPpgzAPr/nLZResT6MMpbOHLo5yAbQ1Vv5UU8PTPRzb0WIxdA== +"@prisma/client@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a" + integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg== "@prisma/debug@5.12.1": version "5.12.1" From c78e2a2c32ff83e49934dcce0e7f58b28951b6a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 04:17:14 +0000 Subject: [PATCH 748/795] chore(deps): Bump react-i18next from 14.1.0 to 14.1.1 Bumps [react-i18next](https://github.com/i18next/react-i18next) from 14.1.0 to 14.1.1. - [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/react-i18next/compare/v14.1.0...v14.1.1) --- updated-dependencies: - dependency-name: react-i18next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/lab/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sites/lab/package.json b/sites/lab/package.json index 4ecf784162d..cee2af91ded 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -46,7 +46,7 @@ "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-hotkeys-hook": "4.5.0", - "react-i18next": "14.1.0", + "react-i18next": "14.1.1", "react-instantsearch-dom": "6.40.4", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index f76e25a6311..237cde1c91e 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -71,7 +71,7 @@ "react-dom": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-hotkeys-hook": "4.5.0", - "react-i18next": "14.1.0", + "react-i18next": "14.1.1", "react-dropzone": "14.2.3", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", diff --git a/yarn.lock b/yarn.lock index 22130330199..529b3a2c247 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11672,10 +11672,10 @@ react-hotkeys-hook@4.5.0: resolved "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.0.tgz" integrity sha512-Samb85GSgAWFQNvVt3PS90LPPGSf9mkH/r4au81ZP1yOIFayLC3QAvqTgGtJ8YEDMXtPmaVBs6NgipHO6h4Mug== -react-i18next@14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.0.tgz#44da74fbffd416f5d0c5307ef31735cf10cc91d9" - integrity sha512-3KwX6LHpbvGQ+sBEntjV4sYW3Zovjjl3fpoHbUwSgFHf0uRBcbeCBLR5al6ikncI5+W0EFb71QXZmfop+J6NrQ== +react-i18next@14.1.1: + version "14.1.1" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.1.tgz#3d942a99866555ae3552c40f9fddfa061e29d7f3" + integrity sha512-QSiKw+ihzJ/CIeIYWrarCmXJUySHDwQr5y8uaNIkbxoGRm/5DukkxZs+RPla79IKyyDPzC/DRlgQCABHtrQuQQ== dependencies: "@babel/runtime" "^7.23.9" html-parse-stringify "^3.0.1" From 8e397a4f333a5bcb77673566aa9394c040003dd5 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:28 +0200 Subject: [PATCH 749/795] New translations en.md (French) skip-build --- markdown/org/docs/designs/cornelius/instructions/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/designs/cornelius/instructions/fr.md b/markdown/org/docs/designs/cornelius/instructions/fr.md index eafa75bad7b..c956836a7e6 100644 --- a/markdown/org/docs/designs/cornelius/instructions/fr.md +++ b/markdown/org/docs/designs/cornelius/instructions/fr.md @@ -7,7 +7,7 @@ title: "Culotte de cycliste Cornélius : Instructions de couture" - Pliez et repassez les marges de coutures des bords non crantés des parements de poche. - En faisant correspondre les encoches, épinglez l'envers des parements de poche sur l'endroit des sacs de poche, _surpiquez_ les bords pliés sur les sacs de poche. - _Bâtir_ les marges de couture des bords crantés des parements de poche sur les sacs de poche. -- With right sides together, matching both notches, sew the pocket bags to the front and then press to the wrong side. +- Endroit contre endroit, en faisant correspondre les deux encoches, coudre les poches sur le devant, puis repasser sur l'envers. - Pliez les poches en deux le long de la ligne de pliage, endroit contre endroit. Coudre le fond du sac de poche ensemble. - Si vous préférez, vous pouvez également faire une _couture anglaise_ pour coudre ensemble le bas des sacs de poches. - _Bâtir_ le haut et le côté du sac de poche aux marges de couture de l'avant en faisant coïncider les crans. From 6f55bcf132181315059ae79f70537c01e5584d99 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:30 +0200 Subject: [PATCH 750/795] New translations en.md (French) skip-build --- .../org/docs/designs/simon/instructions/fr.md | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/markdown/org/docs/designs/simon/instructions/fr.md b/markdown/org/docs/designs/simon/instructions/fr.md index f142e0ade5f..6c8d5a2528e 100644 --- a/markdown/org/docs/designs/simon/instructions/fr.md +++ b/markdown/org/docs/designs/simon/instructions/fr.md @@ -59,9 +59,9 @@ Placez les 2 pièces de vos poignets (l'une entoilée, l'autre non) endroit cont Avant de retourner ta manchette, nous devons découper la marge de couture pour la rendre moins volumineuse. -#### Repasser la marge de couture +#### Repasser la marge de couture arrière -![Repasser la marge de couture](2c.png) +![Repasser la marge de couture arrière](2c.png) Replie les surplus de couture de chaque côté de la manchette, là où la manchette s'attache à la manche, et repasse-les. @@ -239,9 +239,9 @@ Ensuite, pliez à nouveau la patte en veillant à ce que le tissu arrive juste a Quand vous êtes satisfait, repassez la patte pliée. -#### Coudre la sous-patte de poignet +#### Fixer la patte de boutonnage -![Coudre la sous-patte de poignet](9c.png) +![Fixer la patte de boutonnage](9c.png) > Ce qui suit est l'approche classique. Si vous avez choisi une patte de boutonnage intégrée (sans couture), passez cette étape. > @@ -251,15 +251,15 @@ Retourner la pièce sur l'endroit, et fixer la patte repliée en piquant dans la Pour cela, coudre exactement sur votre couture précédente. Comme tu as plié le tissu de ta patte de boutonnage un peu au-delà de cette couture, il sera pris à l'arrière, fixant ta patte de boutonnage pliée en place, et bloquant le surplus de couture à l'intérieur. -![Stitch in the ditch](9e.png) +![Coudre dans la pliure](9e.png) ### Etape 10: Préparer la patte de boutonnage (côté boutonnières) > Si vous avez choisi une patte intégrée, vous pouvez passer les deux premières sous-étapes et passer à "Replier la patte de boutonnage". -#### Replier la patte de boutonnières +#### Fixer la patte de boutonnage (côté boutonnières) -![Replier la patte de boutonnières](10a.png) +![Fixer la patte de boutonnage (côté boutonnières)](10a.png) Si vous avez choisi une patte séparée, cousez-la sur le devant gauche. @@ -442,9 +442,9 @@ Ensuite, couds horizontalement l'autre côté de la patte de boutonnage pour ter > > Par conséquent, ce sont les coutures et non les bords qui doivent être alignés, donc il faut positionner la manche de façon à ce qu'elle dépasse du bord de 1 cm. -#### Manchon à goupille en place +#### Épingler la manche en place -![Manchon à goupille en place](14a.png) +![Épingler la manche en place](14a.png) Étalez votre chemise sur l'envers, en mettant les deux devants et le dos bien à plat. @@ -568,9 +568,9 @@ Notez également que le bord de votre manche sera plus long que votre poignet (d > Prenez votre temps pour épingler tout ceci avec soin. Nous allons faire des points de bordure plus tard, il est donc important que l'avant et l'arrière de ta manchette soient bien alignés. -#### Repassez la couture en couchant la marge de couture côté patte de boutonnage +#### Piquer les poignets aux manches -![Repassez la couture en couchant la marge de couture côté patte de boutonnage](18b.png) +![Piquer les poignets aux manches](18b.png) Une fois que tout est épinglé, cousez le long du bord du poignet pour l'attacher à votre manche. @@ -580,9 +580,9 @@ Il est important d'attraper à la fois la couche extérieure et la couche intér Quand vous avez terminé, donnez un bon coup de fer à vos poignets. -#### Coudre la sous-patte de poignet +#### Surpiquez les poignets -![Coudre la sous-patte de poignet](18c.png) +![Surpiquez les poignets](18c.png) > Assurez-vous que vos poignets ont été repassés au préalable. @@ -604,9 +604,9 @@ Veillez à respecter la marge de couture standard et - important - évitez les p > > C'est un peu délicat, donc faites très attention aux parties les plus courbées : là où le dos rejoint les devants. -#### Coucher la marge de couture d'un côté au fer +#### Piquer le col en place -![Coucher la marge de couture d'un côté au fer](19b.png) ![Coucher la marge de couture d'un côté au fer](19c.png) +![Piquer le col en place](19b.png) ![Piquer le col en place](19c.png) Quand vous serez satisfait de la façon dont vous avez bâti votre col en place, il est temps de piquer cette chose. @@ -622,9 +622,9 @@ Piquez à environ la moitié de la marge de couture de votre couture précédent > Vous devez arrêter quelques cm avant la fin du col (note: fin du col, et non fin du pied de col) de façon à ce que cette couture soit entièrement recouverte lorsque le col est plié. -#### Surpiquer le col +#### Repasser le col -![Surpiquer le col](19e.png) +![Repasser le col](19e.png) Maintenant que votre col est attaché, donnez-lui un bon coup de fer. From 12518a48879ca77843161a9c0f4f321853c19edf Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:34 +0200 Subject: [PATCH 751/795] New translations en.md (French) skip-build --- markdown/org/showcase/shorts/fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/showcase/shorts/fr.md b/markdown/org/showcase/shorts/fr.md index f0790343e47..ed5e7928b0e 100644 --- a/markdown/org/showcase/shorts/fr.md +++ b/markdown/org/showcase/shorts/fr.md @@ -9,4 +9,4 @@ maker: Galit author: 49445 --- -Shorts for my daughter +Short pour ma fille From 997f52712aa99ab660f596df8b407546b90f14bb Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:37 +0200 Subject: [PATCH 752/795] New translations en.md (French) skip-build --- markdown/org/newsletter/2024q2/fr.md | 86 ++++++++++++---------------- 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/markdown/org/newsletter/2024q2/fr.md b/markdown/org/newsletter/2024q2/fr.md index ba9217a1220..b16fbb0eca2 100644 --- a/markdown/org/newsletter/2024q2/fr.md +++ b/markdown/org/newsletter/2024q2/fr.md @@ -7,10 +7,10 @@ title: 2024 Édition de printemps Bienvenue dans l'édition du printemps 2024 de la newsletter de FreeSewing. -Voici ce que nous avons pour toi aujourd'hui, sans blague : +Sans blague, voici ce que nous te proposons pour aujourd'hui : - 👕 FreeSewing 3.2 apporte Tristan, Lumina, Lumira, et plus encore (lecture de 3 minutes par joost). -- 📨 Le courrier électronique vient de devenir plus difficile, encore une fois (lecture en 1 minute par joost). +- 📨 Le courrier électronique gagne en difficultés, encore une fois (lecture en 1 minute par joost) - 🕸️ Construire le réseau de confiance de FreeSewing suite à la tentative de backdoor du XZ (5 minutes par joost). - 🤔 Comment les défis de FreeSewing se sont déplacés au fil du temps (lecture de 2 minutes par joost). @@ -29,13 +29,13 @@ Jetons un coup d'œil aux faits marquants : ### The Tristan Top -Tout d'abord, il y a [le haut Tristan] (https://freesewing.org/designs/tristan). Tristan est un haut avec des coutures princesse et un laçage (facultatif) sur le devant ou/et dans le dos. L'histoire de son origine est la nécessité d'un costume pour un festival de la Renaissance, c'est donc probablement un bon indicateur de ce à quoi tu dois t'attendre. +Tout d'abord, il y a [le haut Tristan] (https://freesewing.org/designs/tristan). Tristan est un haut avec des coutures princesse et un laçage (facultatif) sur le devant et/ou dans le dos. Originalement il remplit de besoin pour un costume pour un festival de la Renaissance, c'est probablement un bon indicateur de ce que tu vas trouver. -Tristan a été conçu par Natalia qui a également [écrit un article de blog sur le nouveau design de Tristan] (https://freesewing.org/blog/our-newest-design-is-the-tristan-top), c'est donc un bon endroit pour obtenir tous les détails sur ce nouveau design. +Tristan a été conçu par Natalia qui a également [écrit un article de blog sur le nouveau design de Tristan] (https://freesewing.org/blog/our-newest-design-is-the-tristan-top), c'est un bon endroit pour obtenir tous les détails sur ce nouveau design. ### The Lumina and Lumira Leggings -Je te laisse une seconde pour scanner à nouveau ce titre, mais oui, il y a deux modèles de leggings différents avec des noms similaires : [le Lumira Leggings](https://freesewing.org/designs/lumira) et le [Lumina Leggings](https://freesewing.org/designs/lumina). +Je te laisse une seconde pour lire à nouveau ce titre, mais oui, il y a deux modèles de leggings différents avec des noms similaires : [le Lumira Leggings](https://freesewing.org/designs/lumira) et le [Lumina Leggings](https://freesewing.org/designs/lumina). Les deux sont nés du désir de Wouter d'avoir un bon équipement cycliste, et je te suggère de consulter les notes du concepteur pour [Lumina](https://freesewing.org/designs/lumina#notes) et [Lumira](https://freesewing.org/designs/lumira#notes) pour bien comprendre la différence entre ces designs, pourquoi ils diffèrent, et ce qui te conviendrait le mieux. @@ -45,20 +45,15 @@ Les lecteurs réguliers de la newsletter savent que nous apportons continuelleme sur FreeSewing.org et que celles-ci ne sont pas liées à une nouvelle version, mais c'est une bonne occasion de les énumérer. -- Sandy a un nouveau panneau - option qui a été - ajouté par [Paula](https://github.com/freesewing/freesewing/pull/5861). Tu - pourrais toujours créer ta jupe circulaire à partir d'un certain nombre de motifs similaires en - faisant les correspondances toi-même, mais maintenant le motif s'en chargera pour toi. +- Sandy a un [nouveau panneau d'option](https://freesewing.org/docs/designs/sandy/options/panels) qui a été ajouté par [Paula](https://github.com/freesewing/freesewing/pull/5861). Tu pourrais toujours créer ta jupe circulaire à partir d'un certain nombre de motifs similaires en faisant les correspondances toi-même, mais maintenant le patron s'en chargera pour toi. - Ce qui a commencé comme un rapport de bogue pour l'aisance du biceps sur Jaeger s'est terminé par un changement de la façon dont l'encolure des bras est calculée sur Brian, en particulier la profondeur de l'emmanchure. Étant donné que Brian est notre bloc le plus fondamental, cela aura - des effets d'entraînement sur de nombreuses autres conceptions, tu peux t'attendre à ce que, dès la sortie de la boîte - , l'armcye atteigne un niveau un peu plus bas. + des effets conjugués sur de nombreuses autres design, tu peux t'attendre à ce que l'emmanchure soit un peu plus basse dans les versions de base des designs. - Dans [Carlton](https://freesewing.org/designs/carlton) - et donc dans [Carlita](https://freesewing.org/designs/carlita) - nous avons corrigé le problème - où la marge de couture du sous-pull était mal dessinée. + où la marge de couture du sous col était mal dessinée. - Dans [Charlie](https://freesewing.org/designs/charlie), le passepoil de la poche arrière (4) et le parement de la poche avant (8) indiquaient à tort de couper 2 au lieu de 4 dans la liste de coupe. This too is resolved. @@ -70,16 +65,16 @@ mais c'est une bonne occasion de les énumérer. [Path.combine()](https://freesewing.dev/reference/api/path/combine) à [notre API de base](https://freesewing.dev/reference/api). Ses origines se trouvent dans une discussion dans issue - \#5976 qui a été - à l'origine déposée comme un rapport de bogue sur la façon dont Path.join() connecte les lacunes dans les + \#5976 qui a été + à l'origine déposée comme un rapport de bogue sur la façon dont Path.join() connecte les trous dans les chemins joints - causées soit par les opérations `move`, soit par une différence entre les points de fin et de début des chemins joints - pour être remplies avec un segment de ligne . Ce comportement est attendu, mais nous avons ajouté `Path.combine()` pour faciliter l'autre comportement : Combiner différents chemins - en un seul objet Path sans alterner les opérations de dessin. + en un seul objet Path sans altérer les opérations de dessin. - La [macro titre](https://freesewing.dev/reference/macros/title) peut maintenant être configurée avec un paramètre `notes` et `classes.notes` dans sa configuration, ce qui permet aux concepteurs de - d'ajouter des notes (au titre) d'une partie de modèle. -- Notre [plugin i18n](https://freesewing.dev/reference/plugins/i18n) prend désormais en charge + d'ajouter des notes (au titre) d'une partie de patron. +- Notre [plugin i18n](https://freesewing.dev/reference/plugins/i18n) prend désormais en charge la traduction des tableaux imbriqués de chaînes de caractères, ce qui donne aux concepteurs plus de flexibilité pour concaténer les parties traduites des chaînes de caractères. @@ -91,24 +86,22 @@ Le [billet de blog sur l'annonce de FreeSewing 3.2] (https://freesewing.org/blog   -## 📨 Le courrier électronique vient de devenir plus difficile, encore une fois. +## 📨 Le courrier électronique gagne en difficultés, encore une fois Si tu lis ceci dans ta boîte de réception, et non une copie archivée sur FreeSewing.org, c'est que nous avons pu t'envoyer cet e-mail, ce qui est une bonne nouvelle . -Ce dont tu ne te rends peut-être pas compte, c'est qu'il n'est pas vraiment anodin de le faire, et ce depuis des années ( -). Mais récemment, les choses sont devenues encore plus complexes. Gmail +Ce dont tu ne te rends peut-être pas compte, c'est que le faire n'est pas vraiment anodin, et ce, depuis des années. Mais récemment, les choses sont devenues encore plus complexes. Gmail (Google) et Yahoo par exemple ont mis en place de nouvelles restrictions au premier trimestre de 2024 ce qui nécessite un travail supplémentaire de notre part pour maximiser les chances que cet email atterrisse effectivement dans ta boîte de réception. -De plus, les expéditeurs d'e-mails dits "volumineux" sont soumis aux contrôles les plus stricts sur +De plus, les expéditeurs d'e-mails dits "volumineux" sont soumis aux contrôles les plus stricts. . Si tu envoies 5000 messages par jour, tu es considéré comme un expéditeur en masse et -fera l'objet d'un examen plus approfondi. Comme cette lettre d'information compte environ 14 000 abonnés ( -), nous sommes tenus de respecter les normes les plus strictes possibles. +fera l'objet d'un examen plus approfondi. Comme cette lettre d'information compte environ 14 000 abonnés, nous sommes tenus de respecter les normes les plus strictes possibles. Évidemment, personne n'aime le spam, et je ne plaide pas contre ces règles. C'est juste que le temps et les efforts nécessaires pour faire fonctionner à grande échelle quelque chose d'aussi @@ -127,16 +120,14 @@ si cela devient une contrainte de plus en plus forte sur notre temps et nos ress ## 🕸️ Construire le réseau de confiance de FreeSewing suite à la tentative de backdoor du XZ (5 minutes par joost). -Selon l'endroit où tu reçois tes nouvelles, tu as peut-être entendu ou lu quelque chose sur +Selon l'endroit où tu lis les infos, tu as peut-être entendu ou lu quelque chose sur [la tentative de porte dérobée de l'utilitaire de compression xz ] (https://arstechnica.com/security/2024/03/backdoor-found-in-widely-used-linux-utility-breaks-encrypted-ssh-connections/). -En bref, un acteur malveillant a tenté d'introduire une porte dérobée dans cet utilitaire -, ce qui, en fin de compte, était une tentative d'introduire clandestinement un exploit RCE dans -SSHd. +En bref, un acteur malveillant a tenté d'introduire une porte dérobée dans cet utilitaire, ce qui, en fin de compte, était une tentative d'introduire clandestinement un exploit RCE dans SSHd. Ou, en termes [ELI5](https://en.wiktionary.org/wiki/ELI5) : Quelqu'un a contribué au code -d'une petite bibliothèque qui avait des intentions néfastes. Cela a été fait de manière sournoise +d'une petite bibliothèque avec des intentions néfastes. Cela a été fait de manière sournoise et la cible finale n'était pas la bibliothèque elle-même, mais plutôt un autre projet logiciel qui utilise cette bibliothèque : Le Secure Shell Deamon. Un _daemon_ est juste un mot plus cool pour désigner un _service_ sur un ordinateur, parce que pourquoi ne pas rendre les choses plus cool. @@ -165,27 +156,27 @@ Freund] (https://github.com/anarazel), mais je m'écarte du sujet. C'est la lett ### L'épuisement du mainteneur et le long con de gagner la confiance -L'un des éléments fascinants de cette histoire est de savoir _qui a apporté les modifications, +L'un des éléments fascinants de cette histoire est de savoir _qui_ a apporté les modifications, et pourquoi elles ont été acceptées sans un examen suffisant pour révéler l'intention malveillante de la contribution. -Parce que l'utilisateur qui les a créés a contribué pendant **years** au projet +Parce que l'utilisateur qui les a créés a contribué pendant **des années** au projet et qu'à la lumière de ce travail, son statut s'est élevé à un niveau où il y avait beaucoup -de confiance implicite basée sur son travail, malgré le fait qu'il ne sait pratiquement rien de +de confiance implicite basée sur son travail, malgré le fait qu'on ne sait pratiquement rien de qui ou ce qui se cache derrière le nom d'utilisateur `JiaT75` (dans ce cas). Une telle _long con_ est un investissement important en temps et en efforts, donc l'hypothèse actuellement retenue est qu'il s'agit d'un acteur national (pense à la NSA ou à l'équivalent d'un autre pays). Il est également important de noter que le responsable de xy avait du mal à faire face à la longue série de responsabilités liées à la maintenance du logiciel -et qu'il cherchait activement de l'aide pour éviter l'épuisement. C'est un scénario +et qu'il cherchait activement de l'aide pour éviter le burnout. C'est un scénario qui est scandaleusement courant dans les projets open source et qui crée une situation -où les acteurs malveillants peuvent trop facilement profiter des mainteneurs épuisés de +où les acteurs malveillants peuvent trop facilement profiter des mainteneurs épuisés qui cherchent désespérément à se décharger d'une partie du travail. ### Établir un réseau de confiance Ce problème de _qui peux-tu croire_ n'est bien sûr pas nouveau. Une façon de la contrer -est d'établir un _web de confiance_. C'est ainsi que les choses se passent dans les grands projets +est d'établir un _réseau de confiance_. C'est ainsi que les choses se passent dans les grands projets de logiciels libres impliquant de nombreux bénévoles, tels que [le projet Debian ] (https://www.debian.org/). @@ -198,27 +189,25 @@ moyens tangibles qui fournissent un niveau élevé d'assurance que cette personn ce qu'elle prétend être. Ces personnes, à leur tour, peuvent avoir des liens similaires avec d'autres personnes qu'elles connaissent, -qu'elles ont rencontrées, et en qui elles ont confiance à un niveau qui va bien au-delà du monde en ligne. Ce site -crée un réseau de confiance où tu peux faire confiance à tes amis, et les amis de -à tes amis et ainsi de suite. +qu'elles ont rencontrées, et en qui elles ont confiance à un niveau qui va bien au-delà du monde en ligne. Cela +crée un réseau de confiance où tu peux faire confiance à tes amis, et les amis de tes amis et ainsi de suite. À la lumière des événements actuels, et en reconnaissance de l'accélération rapide de ce qui est possible avec l'intelligence artificielle générative, FreeSewing limitera dorénavant tout accès en écriture ou privilèges élevés aux membres de la communauté qui font partie du réseau de confiance de FreeSewing. -Nous continuerons bien sûr à accepter - ou plutôt à examiner - les contributions de -. Mais les autorisations qui permettent de faire du mal seront +Nous continuerons bien sûr à accepter - ou plutôt à examiner - les contributions de tout le monde. Mais les autorisations qui permettent de faire du mal seront limitées aux personnes pour lesquelles la confiance a été établie AFK (away from keyboard). Afin de faciliter la construction d'un tel réseau de confiance, nous allons commencer à documenter ces liens entre les personnes. Cela permettra aux personnes qui souhaitent -prendre plus de responsabilités au sein de FreeSewing de consulter son réseau de confiance et +prendre plus de responsabilités au sein de FreeSewing de consulter le réseau de confiance et de voir qui vit près d'eux afin qu'ils puissent se connecter à notre réseau de confiance par l'intermédiaire de cette personne. -Je sais qu'il est très peu probable que FreeSewing soit la cible d'une tentative de +Je sais qu'il est très peu probable que FreeSewing soit la cible d'une tentative de porte dérobée par un acteur national, mais adopter les meilleures pratiques et être transparent sur la façon dont nous faisons les choses est une bonne idée. @@ -241,12 +230,11 @@ apporté de nombreux changements, petits et grands, et notre bibliothèque de ba mûri pour devenir un moyen fiable - et certainement influencé - de concevoir des patrons de couture paramétriques . -Les défis les plus intéressants d'un point de vue technique ont -été plus ou moins résolus. Ce qui reste, c'est le côté face à l'utilisateur, ou +Les défis les plus intéressants d'un point de vue technique ont plus ou moins été résolus. Ce qui reste, c'est le côté face à l'utilisateur, ou l'expérience utilisateur (UX) comme nous aimons l'appeler. FreeSewing peut faire beaucoup de choses, alors comment mettre toutes ces fonctionnalités à la disposition des utilisateurs de -sans les submerger ? Est-ce que c'est même possible sur le mobile, qui est le moyen dominant +sans les submerger ? Est-ce que c'est même possible sur téléphone qui est le moyen principal par lequel les gens vont en ligne maintenant. Comment créer une expérience intuitive, ou guider quelqu'un qui arrive sur FreeSewing.org après une recherche _free sewing patterns_ Google vers une compréhension de ce qu'est et fait FreeSewing dans les quelques @@ -262,15 +250,13 @@ ou même pertinent. Il est évident qu'il y a matière à amélioration, mais souvent il n'y a pas de chemin évident . Peut-être -- ou devrais-je dire presque certainement -- c'est un domaine dans lequel -n'a pas le talent ou les compétences nécessaires pour élaborer une sorte de grande stratégie globale pour -. Mais je me retrouve à remettre en question beaucoup de mes propres idées ou impulsions +je n'ai pas le talent ou les compétences nécessaires pour élaborer une sorte de grande stratégie globale. Mais je me retrouve à remettre en question beaucoup de mes propres idées ou impulsions dans ce domaine. Alors, je me demandais si nous pouvions faire une petite expérience. Une expérience au cours de laquelle je -te pose - mon cher lecteur - une question simple. Es-tu prêt pour cela ? C'est ici -que se pose la question : +te pose - mon cher lecteur - une question simple. Es-tu prêt pour cela ? Voici la question : -> \*\*Qu'est-ce que FreeSewing ? +> **Qu'est-ce que FreeSewing ?** J'aimerais entendre ta réponse. Tu peux simplement cliquer sur répondre pour me le faire savoir. From a970e95e7224a66502cb63baf212e4503265cbab Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:38 +0200 Subject: [PATCH 753/795] New translations en.md (French) skip-build --- markdown/org/showcase/my-fisrt-sewing-project/fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/markdown/org/showcase/my-fisrt-sewing-project/fr.md b/markdown/org/showcase/my-fisrt-sewing-project/fr.md index 556d7137f5d..474addc1c95 100644 --- a/markdown/org/showcase/my-fisrt-sewing-project/fr.md +++ b/markdown/org/showcase/my-fisrt-sewing-project/fr.md @@ -1,8 +1,8 @@ --- -title: My fisrt sewing project! +title: Mon premier projet de couture ! caption: 25/03/2024 date: 20240325 -intro: idk what to put here. +intro: je ne sais pas quoi mettre ici. author: 73391 designs: - shelly From b475dded27f9205dbafb27788a11a27cd9ea16ea Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:39 +0200 Subject: [PATCH 754/795] New translations en.md (French) skip-build --- markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md b/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md index 72bb542de01..53a52c71756 100644 --- a/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md +++ b/markdown/org/showcase/wonderful-waralees-by-tuesday/fr.md @@ -1,11 +1,11 @@ --- -title: Wonderful Waralees by Tuesday -caption: What a great look! +title: Merveilleux Waralees par Tuesday +caption: Quel beau look ! date: 20240418 -intro: FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. +intro: Le fabricant de FreeSewins Tuesday a déclaré que ce pantalon enveloppant Waralee est extrêmement confortable. author: 22693 designs: - waralee --- -FreeSewing maker Tuesday said these Waralee wrap pants are extremely comfortable. We enjoyed following along with the adventure of creating them! Turned out just fab. +Le fabricant de FreeSewins Tuesday a déclaré que ce pantalon enveloppant Waralee est extrêmement confortable. Nous avons aimé suivre l'aventure de leur création ! Le résultat est tout simplement fabuleux. From 6a1f4f4413fcc21891238441566575214a11b716 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 24 Apr 2024 18:12:40 +0200 Subject: [PATCH 755/795] New translations en.md (French) skip-build --- .../org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md index 73d933bd291..c1e328ac63c 100644 --- a/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md +++ b/markdown/org/showcase/a-sturdy-albert-apron-by-ojensen/fr.md @@ -1,11 +1,11 @@ --- -title: A sturdy Albert apron by ojensen -caption: It was made out of a fairly sturdy duck canvas. +title: Un tablier Albert robuste par ojensen +caption: Il était fait d'une toile canard assez solide. date: 20240418 -intro: This Albert apron was Oliver's very first sewing project! +intro: Ce tablier Albert a été le tout premier projet de couture d'Oliver ! author: null designs: - albert --- -This Albert apron was Oliver's very first sewing project! They made it out of a fairly sturdy duck canvas. We think this is a great intro to sewing and excellent work! +Ce tablier Albert a été le tout premier projet de couture d'Oliver ! Iel l'a fait d'une toile canard assez solide. Nous pensons que c'est une excellente introduction à la couture et un excellent travail ! From cad36d0897f76620c05d2f4b4740908de24b0679 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:00:00 +0000 Subject: [PATCH 756/795] chore(deps): Bump swagger-ui-dist from 5.17.0 to 5.17.1 Bumps [swagger-ui-dist](https://github.com/swagger-api/swagger-ui) from 5.17.0 to 5.17.1. - [Release notes](https://github.com/swagger-api/swagger-ui/releases) - [Changelog](https://github.com/swagger-api/swagger-ui/blob/master/.releaserc) - [Commits](https://github.com/swagger-api/swagger-ui/compare/v5.17.0...v5.17.1) --- updated-dependencies: - dependency-name: swagger-ui-dist dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index f5c8cd005d4..f9b65a6cfa5 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -43,7 +43,7 @@ "passport-jwt": "4.0.1", "pino": "8.20.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.17.0", + "swagger-ui-dist": "5.17.1", "swagger-ui-express": "5.0.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 22130330199..1a23f7b727c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13233,10 +13233,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.17.0, swagger-ui-dist@>=5.0.0: - version "5.17.0" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.17.0.tgz#a781618e4410551480fa95fcee9d1266b46ed311" - integrity sha512-PtEozc87rN6i6rqLYNVTK+1ZAYmCMy6poU6I2MOJXD19BVv6D7U9zwS8geRbtfamCM5yUwWkSNQKWGK58vculg== +swagger-ui-dist@5.17.1, swagger-ui-dist@>=5.0.0: + version "5.17.1" + resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.17.1.tgz#7422a29a7b58222c0f757b1f6abde0dac8b11aa7" + integrity sha512-6MNu1MYNALLFvcPpo2MJVJFIxz2rFkH+XoX+J72LBLdj4JLjVaP4lHmNHtJ/tXZUXHdsb2Iw9JhPlqspjkomQg== swagger-ui-express@5.0.0: version "5.0.0" From b411df7c49c479f0127a37bb857f4902d631bdee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:00:28 +0000 Subject: [PATCH 757/795] chore(deps): Bump @next/mdx from 14.2.2 to 14.2.3 Bumps [@next/mdx](https://github.com/vercel/next.js/tree/HEAD/packages/next-mdx) from 14.2.2 to 14.2.3. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.3/packages/next-mdx) --- updated-dependencies: - dependency-name: "@next/mdx" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 5e953f12b66..dd45a54afc7 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -16,7 +16,7 @@ "scripts": {}, "peerDependencies": {}, "dependencies": { - "@next/mdx": "14.2.2", + "@next/mdx": "14.2.3", "@resvg/resvg-js": "2.6.2", "@tailwindcss/typography": "0.5.12", "Buffer": "0.0.0", diff --git a/yarn.lock b/yarn.lock index 22130330199..0c5d75c36ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1499,10 +1499,10 @@ dependencies: glob "10.3.10" -"@next/mdx@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.2.2.tgz#2521b056270a97bc8cf0c59043418a5b18778880" - integrity sha512-Te60j1vMxbYWg2E1CiEuIjzWxjI8y6XKmLnhec0sYQupd7aTLm2bjFSLxei+kiQdWUYB87cmhazI9K2dbNB9wA== +"@next/mdx@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.2.3.tgz#f914cc8c2caf05cbf2ed10eff3a79977faa3eced" + integrity sha512-oVz7BWpoLQ9dKvCKxPIX9X6BILPTrpTJnYDn2lAsZvK7J9Ela6xNm57vNwgZ8q7xw1THSDdSlbPNgIalM7U/+A== dependencies: source-map "^0.7.0" From 805f5c511b5988487ba1d47e596f2d0fff3c79a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:01:20 +0000 Subject: [PATCH 758/795] chore(deps): Bump next from 14.2.2 to 14.2.3 Bumps [next](https://github.com/vercel/next.js) from 14.2.2 to 14.2.3. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/compare/v14.2.2...v14.2.3) --- updated-dependencies: - dependency-name: next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 108 ++++++++++++++++++++--------------------- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index cf1fcd7741b..6c0cb4d48fe 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -39,7 +39,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.2", + "next": "14.2.3", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", "react-dom": "18.2.0", diff --git a/sites/lab/package.json b/sites/lab/package.json index 4ecf784162d..bcb491f8cf9 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -40,7 +40,7 @@ "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.2", + "next": "14.2.3", "next-i18next": "15.3.0", "ora": "8.0.1", "react": "18.2.0", diff --git a/sites/org/package.json b/sites/org/package.json index a2548fce506..8c4608b05a4 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -46,7 +46,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "luxon": "3.4.4", - "next": "14.2.2", + "next": "14.2.3", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index f76e25a6311..5ab637ee5dc 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -63,7 +63,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "mustache": "4.2.0", - "next": "14.2.2", + "next": "14.2.3", "next-i18next": "15.3.0", "pdfkit": "0.15.0", "postcss-for": "2.1.1", diff --git a/yarn.lock b/yarn.lock index 22130330199..707daf91ccd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1487,10 +1487,10 @@ dependencies: webpack-bundle-analyzer "4.10.1" -"@next/env@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.2.tgz#6c36fe0b04a22ea78bd60a645ae77d53cd16d3ca" - integrity sha512-sk72qRfM1Q90XZWYRoJKu/UWlTgihrASiYw/scb15u+tyzcze3bOuJ/UV6TBOQEeUaxOkRqGeuGUdiiuxc5oqw== +"@next/env@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.3.tgz#d6def29d1c763c0afb397343a15a82e7d92353a0" + integrity sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA== "@next/eslint-plugin-next@14.2.1": version "14.2.1" @@ -1506,50 +1506,50 @@ dependencies: source-map "^0.7.0" -"@next/swc-darwin-arm64@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.2.tgz#55e395b0db6dd5ea2dc92818260ff3a399f1a056" - integrity sha512-3iPgMhzbalizGwHNFUcGnDhFPSgVBHQ8aqSTAMxB5BvJG0oYrDf1WOJZlbXBgunOEj/8KMVbejEur/FpvFsgFQ== +"@next/swc-darwin-arm64@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz#db1a05eb88c0224089b815ad10ac128ec79c2cdb" + integrity sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A== -"@next/swc-darwin-x64@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.2.tgz#f96fb65510be798c03b0432129792c6ac8885bc8" - integrity sha512-x7Afi/jt0ZBRUZHTi49yyej4o8znfIMHO4RvThuoc0P+uli8Jd99y5GKjxoYunPKsXL09xBXEM1+OQy2xEL0Ag== +"@next/swc-darwin-x64@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz#a3f8af05b5f9a52ac3082e66ac29e125ab1d7b9c" + integrity sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA== -"@next/swc-linux-arm64-gnu@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.2.tgz#443f0d4ab9d1aa4338e40f77ca4e182d60e88448" - integrity sha512-zbfPtkk7L41ODMJwSp5VbmPozPmMMQrzAc0HAUomVeVIIwlDGs/UCqLJvLNDt4jpWgc21SjjyIn762lNGrMaUA== +"@next/swc-linux-arm64-gnu@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz#4e63f43879285b52554bfd39e6e0cc78a9b27bbf" + integrity sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA== -"@next/swc-linux-arm64-musl@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.2.tgz#182c00b3d2f3ed4eaacdd385d07b230252c64de9" - integrity sha512-wPbS3pI/JU16rm3XdLvvTmlsmm1nd+sBa2ohXgBZcShX4TgOjD4R+RqHKlI1cjo/jDZKXt6OxmcU0Iys0OC/yg== +"@next/swc-linux-arm64-musl@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz#ebdaed26214448b1e6f2c3e8b3cd29bfba387990" + integrity sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw== -"@next/swc-linux-x64-gnu@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.2.tgz#e826a08085dcc61685ff42884ad4032e71ac154f" - integrity sha512-NqWOHqqq8iC9tuHvZxjQ2tX+jWy2X9y8NX2mcB4sj2bIccuCxbIZrU/ThFPZZPauygajZuVQ6zediejQHwZHwQ== +"@next/swc-linux-x64-gnu@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz#19e3bcc137c3b582a1ab867106817e5c90a20593" + integrity sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w== -"@next/swc-linux-x64-musl@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.2.tgz#42f921ca6d93fdfb2b13de70cd8a44ba5526b318" - integrity sha512-lGepHhwb9sGhCcU7999+iK1ZZT+6rrIoVg40MP7DZski9GIZP80wORSbt5kJzh9v2x2ev2lxC6VgwMQT0PcgTA== +"@next/swc-linux-x64-musl@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz#794a539b98e064169cf0ff7741b2a4fb16adec7d" + integrity sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ== -"@next/swc-win32-arm64-msvc@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.2.tgz#9c8f60da8e3882c4c66f21747abf944a627d05ff" - integrity sha512-TZSh/48SfcLEQ4rD25VVn2kdIgUWmMflRX3OiyPwGNXn3NiyPqhqei/BaqCYXViIQ+6QsG9R0C8LftMqy8JPMA== +"@next/swc-win32-arm64-msvc@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz#eda9fa0fbf1ff9113e87ac2668ee67ce9e5add5a" + integrity sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A== -"@next/swc-win32-ia32-msvc@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.2.tgz#fdb0b5f74e6dc0dcb34b7f7d24775ad034d915e8" - integrity sha512-M0tBVNMEBJN2ZNQWlcekMn6pvLria7Sa2Fai5znm7CCJz4pP3lrvlSxhKdkCerk0D9E0bqx5yAo3o2Q7RrD4gA== +"@next/swc-win32-ia32-msvc@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz#7c1190e3f640ab16580c6bdbd7d0e766b9920457" + integrity sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw== -"@next/swc-win32-x64-msvc@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.2.tgz#95cc0dad2c7ac5177fa6eeab070dccfa30532353" - integrity sha512-a/20E/wtTJZ3Ykv3f/8F0l7TtgQa2LWHU2oNB9bsu0VjqGuGGHmm/q6waoUNQYTVPYrrlxxaHjJcDV6aiSTt/w== +"@next/swc-win32-x64-msvc@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz#2be4e39ee25bfbd85be78eea17c0e7751dc4323c" + integrity sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -10180,12 +10180,12 @@ next-i18next@15.3.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -next@14.2.2: - version "14.2.2" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.2.tgz#707311b5e4bf973ada2305233f322bdd0cd9d579" - integrity sha512-oGwUaa2bCs47FbuxWMpOoXtBMPYpvTPgdZr3UAo+pu7Ns00z9otmYpoeV1HEiYL06AlRQQIA/ypK526KjJfaxg== +next@14.2.3: + version "14.2.3" + resolved "https://registry.yarnpkg.com/next/-/next-14.2.3.tgz#f117dd5d5f20c307e7b8e4f9c1c97d961008925d" + integrity sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A== dependencies: - "@next/env" "14.2.2" + "@next/env" "14.2.3" "@swc/helpers" "0.5.5" busboy "1.6.0" caniuse-lite "^1.0.30001579" @@ -10193,15 +10193,15 @@ next@14.2.2: postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.2" - "@next/swc-darwin-x64" "14.2.2" - "@next/swc-linux-arm64-gnu" "14.2.2" - "@next/swc-linux-arm64-musl" "14.2.2" - "@next/swc-linux-x64-gnu" "14.2.2" - "@next/swc-linux-x64-musl" "14.2.2" - "@next/swc-win32-arm64-msvc" "14.2.2" - "@next/swc-win32-ia32-msvc" "14.2.2" - "@next/swc-win32-x64-msvc" "14.2.2" + "@next/swc-darwin-arm64" "14.2.3" + "@next/swc-darwin-x64" "14.2.3" + "@next/swc-linux-arm64-gnu" "14.2.3" + "@next/swc-linux-arm64-musl" "14.2.3" + "@next/swc-linux-x64-gnu" "14.2.3" + "@next/swc-linux-x64-musl" "14.2.3" + "@next/swc-win32-arm64-msvc" "14.2.3" + "@next/swc-win32-ia32-msvc" "14.2.3" + "@next/swc-win32-x64-msvc" "14.2.3" nise@^5.1.5: version "5.1.9" From 44225929ced18cb964e1e4e403b9ecfa1540a0a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:01:56 +0000 Subject: [PATCH 759/795] chore(deps): Bump eslint-config-next from 14.2.1 to 14.2.3 Bumps [eslint-config-next](https://github.com/vercel/next.js/tree/HEAD/packages/eslint-config-next) from 14.2.1 to 14.2.3. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.3/packages/eslint-config-next) --- updated-dependencies: - dependency-name: eslint-config-next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 22130330199..03b73ff375d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1492,10 +1492,10 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.2.tgz#6c36fe0b04a22ea78bd60a645ae77d53cd16d3ca" integrity sha512-sk72qRfM1Q90XZWYRoJKu/UWlTgihrASiYw/scb15u+tyzcze3bOuJ/UV6TBOQEeUaxOkRqGeuGUdiiuxc5oqw== -"@next/eslint-plugin-next@14.2.1": - version "14.2.1" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.1.tgz#909952d05dd22bb3f6db2a308ac148be2d05c775" - integrity sha512-Fp+mthEBjkn8r9qd6o4JgxKp0IDEzW0VYHD8ZC05xS5/lFNwHKuOdr2kVhWG7BQCO9L6eeepshM1Wbs2T+LgSg== +"@next/eslint-plugin-next@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.3.tgz#287ad8620e7061ba01e8d3313d464db6d217b6df" + integrity sha512-L3oDricIIjgj1AVnRdRor21gI7mShlSwU/1ZGHmqM3LzHhXXhdkrfeNY5zif25Bi5Dd7fiJHsbhoZCHfXYvlAw== dependencies: glob "10.3.10" @@ -5428,11 +5428,11 @@ eslint-compat-utils@^0.5.0: semver "^7.5.4" eslint-config-next@^14.0.1: - version "14.2.1" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.1.tgz#b19b53ca3d10379a98bc9bf497dbea651dfcd070" - integrity sha512-BgD0kPCWMlqoItRf3xe9fG0MqwObKfVch+f2ccwDpZiCJA8ghkz2wrASH+bI6nLZzGcOJOpMm1v1Q1euhfpt4Q== + version "14.2.3" + resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.3.tgz#2fb0f7c4eccda530a4b5054438162b2303786d4f" + integrity sha512-ZkNztm3Q7hjqvB1rRlOX8P9E/cXRL9ajRcs8jufEtwMfTVYRqnmtnaSu57QqHyBlovMuiB8LEzfLBkh5RYV6Fg== dependencies: - "@next/eslint-plugin-next" "14.2.1" + "@next/eslint-plugin-next" "14.2.3" "@rushstack/eslint-patch" "^1.3.3" "@typescript-eslint/parser" "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0" eslint-import-resolver-node "^0.3.6" From 33755d5cf49441c47c33be8b0bbf5bd457cb2aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:02:44 +0000 Subject: [PATCH 760/795] chore(deps): Bump @next/bundle-analyzer from 14.2.2 to 14.2.3 Bumps [@next/bundle-analyzer](https://github.com/vercel/next.js/tree/HEAD/packages/next-bundle-analyzer) from 14.2.2 to 14.2.3. - [Release notes](https://github.com/vercel/next.js/releases) - [Changelog](https://github.com/vercel/next.js/blob/canary/release.js) - [Commits](https://github.com/vercel/next.js/commits/v14.2.3/packages/next-bundle-analyzer) --- updated-dependencies: - dependency-name: "@next/bundle-analyzer" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index cf1fcd7741b..d2af4e2d595 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -32,7 +32,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@next/bundle-analyzer": "14.2.2", + "@next/bundle-analyzer": "14.2.3", "@tailwindcss/typography": "0.5.12", "algoliasearch": "4.23.3", "daisyui": "4.10.2", diff --git a/yarn.lock b/yarn.lock index 22130330199..f7988d53f9d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1480,10 +1480,10 @@ resolved "https://registry.npmjs.org/@mdx-js/util/-/util-2.0.0-next.1.tgz" integrity sha512-F36kWTFdFXrbNIsM77dhVwYZsZonUIKHkYyYgnuw1NWskBfEn1ET5B5Z5mm58ckKNf7SimchnxR9sKCCtH38WA== -"@next/bundle-analyzer@14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.2.2.tgz#8095665de2c18d06eb16b81729d660338da03adf" - integrity sha512-Zp2xG3VTPHUquOcBaRtrr0/n7mqnjKUmprGcJXPEKGgP5rAsLymIfWKm3jIVWIw5Eb4fNOfX4v+L+qiSvs+OJw== +"@next/bundle-analyzer@14.2.3": + version "14.2.3" + resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.2.3.tgz#dfa43586983d3fffdeb5f3c50f2c65ab1c51f184" + integrity sha512-Z88hbbngMs7njZKI8kTJIlpdLKYfMSLwnsqYe54AP4aLmgL70/Ynx/J201DQ+q2Lr6FxFw1uCeLGImDrHOl2ZA== dependencies: webpack-bundle-analyzer "4.10.1" From 7ddd38e2e049b0f074ad836b6e37413e1b42725b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 04:33:22 +0000 Subject: [PATCH 761/795] chore(deps): Bump jotai-location from 0.5.4 to 0.5.5 Bumps [jotai-location](https://github.com/jotaijs/jotai-location) from 0.5.4 to 0.5.5. - [Changelog](https://github.com/jotaijs/jotai-location/blob/main/CHANGELOG.md) - [Commits](https://github.com/jotaijs/jotai-location/compare/v0.5.4...v0.5.5) --- updated-dependencies: - dependency-name: jotai-location dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 8c4608b05a4..5e9c10abb81 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -41,7 +41,7 @@ "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.8.0", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/sde/package.json b/sites/sde/package.json index 971643820c1..c4ab3d9293d 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -56,7 +56,7 @@ "file-saver": "2.0.5", "i18next": "23.11.0", "jotai": "2.8.0", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", "lodash.get": "4.4.2", diff --git a/sites/shared/package.json b/sites/shared/package.json index dd45a54afc7..989af643bf6 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -30,7 +30,7 @@ "highlight.js": "11.9.0", "github-slugger": "2.0.0", "jotai": "2.8.0", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", "lodash.orderby": "4.6.0", diff --git a/yarn.lock b/yarn.lock index dd14d721c00..10189858fed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7972,10 +7972,10 @@ jiti@^1.19.1, jiti@^1.21.0: resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== -jotai-location@0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" - integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== +jotai-location@0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/jotai-location/-/jotai-location-0.5.5.tgz#2b2622da6ee49493bc4d69e5610e2e5d382894ed" + integrity sha512-6QW/7W9IJHjhbn7gRgAw4sC30k0/G6JiC4uPlKi8ZPZGYk7R7r9PyMD2eVhL4XSxxag89JxS1iSyr6BIXsB4Sw== jotai@2.8.0: version "2.8.0" From 3e67c789b69aba2397804e2dccbad3ad45bba1ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 04:34:23 +0000 Subject: [PATCH 762/795] chore(deps): Bump @aws-sdk/client-sesv2 from 3.556.0 to 3.563.0 Bumps [@aws-sdk/client-sesv2](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-sesv2) from 3.556.0 to 3.563.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-sesv2/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.563.0/clients/client-sesv2) --- updated-dependencies: - dependency-name: "@aws-sdk/client-sesv2" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 4d483651094..cffad96b6e1 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.556.0", + "@aws-sdk/client-sesv2": "3.563.0", "@prisma/client": "5.13.0", "bcryptjs": "2.4.3", "cors": "2.8.5", diff --git a/yarn.lock b/yarn.lock index dd14d721c00..8c0fe5f37dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -205,16 +205,16 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.556.0.tgz#0d871b98496f021c9e3744921a46260b92f79261" - integrity sha512-CYbCVlMlXJ72r+DrBRjgqw+Dm2yVUA9d1rxZWjfBhMulaypbV0EIZK2xLwgcQ5LvdfKdrrFEsFcViDA6q0w3Zg== +"@aws-sdk/client-sesv2@3.563.0": + version "3.563.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.563.0.tgz#4705a790fd8060cd24ecc2bbe8ec87f403a1de18" + integrity sha512-JiZ5RZrKT1wd8494/8pYTDmaYkARoo6XH3jgiR/Jd1FfqW7nzNhALWh0F9ch1XcsC/yVWLJwiRDk6a2NwWxSkg== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" "@aws-sdk/client-sts" "3.556.0" "@aws-sdk/core" "3.556.0" - "@aws-sdk/credential-provider-node" "3.556.0" + "@aws-sdk/credential-provider-node" "3.563.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" @@ -439,10 +439,10 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.556.0.tgz#51f3dc4506053249f8593765d1ab2cef53732fa3" - integrity sha512-s1xVtKjyGc60O8qcNIzS1X3H+pWEwEfZ7TgNznVDNyuXvLrlNWiAcigPWGl2aAkc8tGcsSG0Qpyw2KYC939LFg== +"@aws-sdk/credential-provider-node@3.563.0": + version "3.563.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.563.0.tgz#d549552e32aecc05a194914f6b959799b71ec4be" + integrity sha512-cNGT93uuAzM2ZnWT0rHbT/bjnVRCIQDTi8ylnvNpsOj+zFCn2q2eQAh6fgACPjKhCA7Szc38AX0hH2PDXH6+yg== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-http" "3.552.0" From 6ca891ae6fb919ca3994a33052aa7eb4c75b4793 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 15:29:01 +0200 Subject: [PATCH 763/795] chore: Update dependencies and contributors --- README.md | 21 +- config/dependencies.yaml | 46 ++-- designs/aaron/README.md | 2 +- designs/albert/README.md | 2 +- designs/bee/README.md | 2 +- designs/bella/README.md | 2 +- designs/benjamin/README.md | 2 +- designs/bent/README.md | 2 +- designs/bob/README.md | 2 +- designs/breanna/README.md | 2 +- designs/brian/README.md | 2 +- designs/bruce/README.md | 2 +- designs/carlita/README.md | 2 +- designs/carlton/README.md | 2 +- designs/cathrin/README.md | 2 +- designs/charlie/README.md | 2 +- designs/cornelius/README.md | 2 +- designs/diana/README.md | 2 +- designs/examples/README.md | 2 +- designs/florence/README.md | 2 +- designs/florent/README.md | 2 +- designs/gozer/README.md | 2 +- designs/hi/README.md | 2 +- designs/holmes/README.md | 2 +- designs/hortensia/README.md | 2 +- designs/huey/README.md | 2 +- designs/hugo/README.md | 2 +- designs/jaeger/README.md | 2 +- designs/legend/README.md | 2 +- designs/lucy/README.md | 2 +- designs/lumina/README.md | 2 +- designs/lumira/README.md | 2 +- designs/lunetius/README.md | 2 +- designs/magde/README.md | 2 +- designs/naomiwu/README.md | 2 +- designs/noble/README.md | 2 +- designs/octoplushy/README.md | 2 +- designs/onyx/README.md | 2 +- designs/otis/README.md | 2 +- designs/paco/README.md | 2 +- designs/penelope/README.md | 2 +- designs/plugintest/README.md | 2 +- designs/rendertest/README.md | 2 +- designs/sandy/README.md | 2 +- designs/shelly/README.md | 2 +- designs/shin/README.md | 2 +- designs/simon/README.md | 2 +- designs/simone/README.md | 2 +- designs/skully/README.md | 2 +- designs/sven/README.md | 2 +- designs/tamiko/README.md | 2 +- designs/teagan/README.md | 2 +- designs/tiberius/README.md | 2 +- designs/titan/README.md | 2 +- designs/trayvon/README.md | 2 +- designs/tristan/README.md | 2 +- designs/uma/README.md | 2 +- designs/wahid/README.md | 2 +- designs/walburga/README.md | 2 +- designs/waralee/README.md | 2 +- designs/yuri/README.md | 2 +- packages/core/README.md | 2 +- packages/models/README.md | 2 +- packages/new-design/README.md | 2 +- packages/new-design/lib/download-list.mjs | 256 +++++++++++----------- packages/prettier-config/README.md | 2 +- packages/react-components/README.md | 2 +- packages/rehype-highlight-lines/README.md | 2 +- packages/rehype-jargon/README.md | 2 +- packages/snapseries/README.md | 2 +- plugins/core-plugins/README.md | 2 +- plugins/plugin-annotations/README.md | 2 +- plugins/plugin-bin-pack/README.md | 2 +- plugins/plugin-bust/README.md | 2 +- plugins/plugin-flip/README.md | 2 +- plugins/plugin-gore/README.md | 2 +- plugins/plugin-i18n/README.md | 2 +- plugins/plugin-measurements/README.md | 2 +- plugins/plugin-mirror/README.md | 2 +- plugins/plugin-ringsector/README.md | 2 +- plugins/plugin-round/README.md | 2 +- plugins/plugin-sprinkle/README.md | 2 +- plugins/plugin-svgattr/README.md | 2 +- plugins/plugin-theme/README.md | 2 +- plugins/plugin-timing/README.md | 2 +- plugins/plugin-versionfree-svg/README.md | 2 +- sites/backend/package.json | 2 +- sites/lab/package.json | 4 +- sites/org/package.json | 2 +- sites/sde/package.json | 4 +- sites/shared/package.json | 2 +- yarn.lock | 237 ++++++++++++++------ 92 files changed, 420 insertions(+), 320 deletions(-) diff --git a/README.md b/README.md index 6a2068d2958..12346947168 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ All Contributors

    Nathan Yergler
    Nathan Yergler
    📖 + Niabon
    Niabon
    📖 Nick Dower
    Nick Dower
    📖 💻 🐛 Nikhil Chelliah
    Nikhil Chelliah
    📖 OysteinHoiby
    OysteinHoiby
    💻 Patrick Forringer
    Patrick Forringer
    🔌 Paul
    Paul
    📖 📝 🌍 Paula Vidas
    Paula Vidas
    💻 - Phillip Thelen
    Phillip Thelen
    💻 + Phillip Thelen
    Phillip Thelen
    💻 Pixieish
    Pixieish
    📖 Prof. dr. Sorcha Ní Dhubhghaill
    Prof. dr. Sorcha Ní Dhubhghaill
    📖 Quentin FELIX
    Quentin FELIX
    💻 🎨 Rachel Ostic
    Rachel Ostic
    📖 Rik Hekker
    Rik Hekker
    🐛 Sam Livingston-Gray
    Sam Livingston-Gray
    📖 - Sanne
    Sanne
    💻 📖 + Sanne
    Sanne
    💻 📖 Sara Latorre
    Sara Latorre
    🌍 SeaZeeZee
    SeaZeeZee
    📖 💻 SimonbJohnson
    SimonbJohnson
    🐛 SirCharlotte
    SirCharlotte
    🌍 Slylele
    Slylele
    📖 🌍 Soazillon
    Soazillon
    🌍 - Soham Tembhurne
    Soham Tembhurne
    💻 + Soham Tembhurne
    Soham Tembhurne
    💻 SoneaTheBest
    SoneaTheBest
    🌍 Sophia
    Sophia
    💻 Stefan Sydow
    Stefan Sydow
    🌍 📖 💻 Stefano
    Stefano
    📖 Sushmita Biswas
    Sushmita Biswas
    💻 Tanay Toshniwal
    Tanay Toshniwal
    💻 - Trent Trama
    Trent Trama
    💻 + Trent Trama
    Trent Trama
    💻 Tríona
    Tríona
    📖 Unmutual
    Unmutual
    📖 Vili Sinervä
    Vili Sinervä
    💻 Vili Sinervä
    Vili Sinervä
    💻 Wouter van Wageningen
    Wouter van Wageningen
    💻 🎨 🔧 Yash Anil Ambekar
    Yash Anil Ambekar
    📖 - amysews
    amysews
    📖 + amysews
    amysews
    📖 anna-puk
    anna-puk
    💻 beautifulsummermoon
    beautifulsummermoon
    🌍 berce
    berce
    📖 biou
    biou
    💻 bobgeorgethe3rd
    bobgeorgethe3rd
    💻 📖 🎨 brmlyklr
    brmlyklr
    📖 - chri5b
    chri5b
    💻 ⚠️ + chri5b
    chri5b
    💻 ⚠️ dingcycle
    dingcycle
    🌍 drowned-in-books
    drowned-in-books
    💬 econo202
    econo202
    📖 ericamattos
    ericamattos
    🌍 evilrobotfromouterspace
    evilrobotfromouterspace
    🐛 fightingrabbit
    fightingrabbit
    💻 - gaylyndie
    gaylyndie
    📖 + gaylyndie
    gaylyndie
    📖 grimlokason
    grimlokason
    💻 hellgy
    hellgy
    🎨 jackseye
    jackseye
    📖 marckiesel
    marckiesel
    🌍 marpants
    marpants
    💻 mergerg
    mergerg
    📖 - mesil
    mesil
    🐛 + mesil
    mesil
    🐛 starfetch
    starfetch
    💻 📖 🌍 🎨 timorl
    timorl
    💻 ttimearl
    ttimearl
    🖋 tuesgloomsday
    tuesgloomsday
    📖 valadaptive
    valadaptive
    💻 viocky
    viocky
    🌍 - woolishboy
    woolishboy
    💻 + woolishboy
    woolishboy
    💻 yc
    yc
    🌍 diff --git a/config/dependencies.yaml b/config/dependencies.yaml index d37f466095b..383623ed7f9 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -3,7 +3,7 @@ _types: peer: '@freesewing/core': &freesewing '{{version}}' dev: - 'mocha': &mocha '10.3.0' + 'mocha': &mocha '10.4.0' 'chai': &chai '5.1.0' '@freesewing/models': *freesewing '@freesewing/plugin-timing': *freesewing @@ -179,12 +179,12 @@ yuri: backend: _: - '@aws-sdk/client-sesv2': '3.535.0' - '@prisma/client': &prisma '5.11.0' + '@aws-sdk/client-sesv2': '3.563.0' + '@prisma/client': &prisma '5.13.0' 'bcryptjs': '2.4.3' 'cors': '2.8.5' 'dotenv': '16.4.5' - 'express': '4.19.1' + 'express': '4.19.2' 'js-yaml': &jsyaml '4.1.0' 'lodash.get': *_get 'mustache': *mustache @@ -192,9 +192,9 @@ backend: 'passport': '0.7.0' 'passport-http': '0.3.0' 'passport-jwt': '4.0.1' - 'pino': '8.19.0' + 'pino': '8.20.0' 'qrcode': '1.5.3' - 'swagger-ui-dist': '5.12.0' + 'swagger-ui-dist': '5.17.1' 'swagger-ui-express': '5.0.0' dev: 'chai': *chai @@ -210,10 +210,10 @@ dev: '@mdx-js/mdx': &mdx '^3.0.0' '@mdx-js/react': *mdx '@mdx-js/runtime': &mdxRuntime '2.0.0-next.9' - '@next/bundle-analyzer': &next '14.1.4' - '@tailwindcss/typography': &tailwindTypography '0.5.10' - 'algoliasearch': '4.22.1' - 'daisyui': &daisyui '4.7.3' + '@next/bundle-analyzer': &next '14.2.3' + '@tailwindcss/typography': &tailwindTypography '0.5.12' + 'algoliasearch': '4.23.3' + 'daisyui': &daisyui '4.10.2' 'lodash.get': *_get 'lodash.orderby': &_orderby '4.6.0' 'lodash.set': *_set @@ -242,7 +242,7 @@ dev: 'postcss': &postcss '8.4.38' 'remark-extract-frontmatter': '3.2.0' 'remark-mdx-frontmatter': &mdxfrontmatter '4.0.0' - 'tailwindcss': &tailwindcss '3.4.1' + 'tailwindcss': &tailwindcss '3.4.3' 'yaml-loader': '0.8.1' lab: @@ -256,7 +256,7 @@ lab: 'd3-drag': &d3drag '3.0.0' 'd3-selection': &d3selection '3.0.0' 'daisyui': *daisyui - 'i18next': &i18next '23.10.1' + 'i18next': &i18next '23.11.0' 'lodash.get': *_get 'lodash.orderby': *_orderby 'lodash.set': *_set @@ -266,7 +266,7 @@ lab: 'react': *react 'react-copy-to-clipboard': *reactCopyToClipboard 'react-hotkeys-hook': *reactHotkeysHook - 'react-i18next': &reactI18next '14.1.0' + 'react-i18next': &reactI18next '14.1.1' 'react-instantsearch-dom': *reactInstantsearchDom 'react-swipeable': *reactSwipeable 'react-timeago': *reactTimeago @@ -283,8 +283,8 @@ lab: org: _: - '@bugsnag/js': &bugsnag 7.22.4 - '@bugsnag/plugin-react': 7.19.0 + '@bugsnag/js': &bugsnag 7.22.7 + '@bugsnag/plugin-react': 7.22.7 '@mdx-js/mdx': *mdx '@mdx-js/react': *mdx '@mdx-js/runtime': *mdxRuntime @@ -295,8 +295,8 @@ org: 'daisyui': *daisyui 'echarts': &echarts 5.5.0 'echarts-for-react': &echartsReact 3.0.2 - 'jotai': &jotai '2.7.1' - 'jotai-location': &jotai-location '0.5.4' + 'jotai': &jotai '2.8.0' + 'jotai-location': &jotai-location '0.5.5' 'lodash.get': *_get 'lodash.orderby': *_orderby 'lodash.set': *_set @@ -318,14 +318,14 @@ org: 'remark-gfm': *remarkGfm 'remark-mdx-frontmatter': *mdxfrontmatter 'strip-markdown': *stripMarkdown - 'use-local-storage-state': &use-local-storage-state 19.1.0 + 'use-local-storage-state': &use-local-storage-state 19.2.0 'yaml-loader': 0.8.1 dev: *nextSiteDevDependencies shared: _: '@next/mdx': *next - '@resvg/resvg-js': '2.6.0' + '@resvg/resvg-js': '2.6.2' '@tailwindcss/typography': *tailwindTypography 'Buffer': '0.0.0' 'd3-dispatch': '3.0.1' @@ -347,21 +347,21 @@ shared: 'mdast-util-toc': '7.0.0' 'mermaid': '10.9.0' 'ora': *ora - 'pdfkit': &pdfkit '0.14.0' + 'pdfkit': &pdfkit '0.15.0' 'postcss-for': &postcssfor '2.1.1' 'react': *react 'react-dom': *react 'react-timeago': *reactTimeago - 'react-zoom-pan-pinch': &zoompanpinch '3.4.3' + 'react-zoom-pan-pinch': &zoompanpinch '3.4.4' 'rehype-autolink-headings': *rehypeAutolinkHeadings 'rehype-highlight': *rehypeHighlight 'remark-frontmatter': &remarkfrontmatter '5.0.0' 'remark-mdx-frontmatter': *mdxfrontmatter - "remark-smartypants": &smartypants "2.1.0" + "remark-smartypants": &smartypants "3.0.1" "slugify": &slugify "^1.6.6" # see: https://github.com/npm/cli/issues/2610#issuecomment-1295371753 'svg-to-pdfkit': &svgtopdfkit 'https://git@github.com/eriese/SVG-to-PDFKit' - 'tlds': &rlds '1.251.0' + 'tlds': &rlds '1.252.0' 'to-vfile': '8.0.0' 'unist-util-visit': *unist-util-visit 'use-local-storage-state': *use-local-storage-state diff --git a/designs/aaron/README.md b/designs/aaron/README.md index 47692bddbca..7bbc33fa334 100644 --- a/designs/aaron/README.md +++ b/designs/aaron/README.md @@ -21,7 +21,7 @@ All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    All Contributors

    = 18.17.0 <22" diff --git a/sites/lab/package.json b/sites/lab/package.json index 98c8500396e..f384d8684fc 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -31,7 +31,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.23.3", + "algoliasearch": "4.22.1", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", @@ -41,7 +41,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "next": "14.2.3", - "next-i18next": "15.3.0", + "next-i18next": "15.2.0", "ora": "8.0.1", "react": "18.2.0", "react-copy-to-clipboard": "5.1.0", diff --git a/sites/org/package.json b/sites/org/package.json index 5e9c10abb81..862a30e2cf7 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -35,7 +35,7 @@ "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.23.3", + "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.10.2", "echarts": "5.5.0", diff --git a/sites/sde/package.json b/sites/sde/package.json index c4ab3d9293d..1dd7a0d3e59 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -64,7 +64,7 @@ "lodash.set": "4.3.2", "mustache": "4.2.0", "next": "14.2.3", - "next-i18next": "15.3.0", + "next-i18next": "15.2.0", "pdfkit": "0.15.0", "postcss-for": "2.1.1", "react": "18.2.0", @@ -79,7 +79,7 @@ "remark-gfm": "4.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "3.0.0", + "remark-smartypants": "3.0.1", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.3", diff --git a/sites/shared/package.json b/sites/shared/package.json index 989af643bf6..bb27b485a13 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -49,7 +49,7 @@ "rehype-highlight": "7.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "3.0.0", + "remark-smartypants": "3.0.1", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tlds": "1.252.0", diff --git a/yarn.lock b/yarn.lock index 1e029c8d487..6da2714a66a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,13 @@ resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== +"@algolia/cache-browser-local-storage@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz#14b6dc9abc9e3a304a5fffb063d15f30af1032d1" + integrity sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g== + dependencies: + "@algolia/cache-common" "4.22.1" + "@algolia/cache-browser-local-storage@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.3.tgz#0cc26b96085e1115dac5fcb9d826651ba57faabc" @@ -14,11 +21,23 @@ dependencies: "@algolia/cache-common" "4.23.3" +"@algolia/cache-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.22.1.tgz#c625dff4bc2a74e79f9aed67b4e053b0ef1b3ec1" + integrity sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA== + "@algolia/cache-common@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.3.tgz#3bec79092d512a96c9bfbdeec7cff4ad36367166" integrity sha512-h9XcNI6lxYStaw32pHpB1TMm0RuxphF+Ik4o7tcQiodEdpKK+wKufY6QXtba7t3k8eseirEMVB83uFFF3Nu54A== +"@algolia/cache-in-memory@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz#858a3d887f521362e87d04f3943e2810226a0d71" + integrity sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw== + dependencies: + "@algolia/cache-common" "4.22.1" + "@algolia/cache-in-memory@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.3.tgz#3945f87cd21ffa2bec23890c85305b6b11192423" @@ -26,6 +45,15 @@ dependencies: "@algolia/cache-common" "4.23.3" +"@algolia/client-account@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.22.1.tgz#a7fb8b66b9a4f0a428e1426b2561144267d76d43" + integrity sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw== + dependencies: + "@algolia/client-common" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/transporter" "4.22.1" + "@algolia/client-account@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.3.tgz#8751bbf636e6741c95e7c778488dee3ee430ac6f" @@ -35,6 +63,16 @@ "@algolia/client-search" "4.23.3" "@algolia/transporter" "4.23.3" +"@algolia/client-analytics@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.22.1.tgz#506558740b4d49b1b1e3393861f729a8ce921851" + integrity sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg== + dependencies: + "@algolia/client-common" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" + "@algolia/client-analytics@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.3.tgz#f88710885278fe6fb6964384af59004a5a6f161d" @@ -45,6 +83,14 @@ "@algolia/requester-common" "4.23.3" "@algolia/transporter" "4.23.3" +"@algolia/client-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.22.1.tgz#042b19c1b6157c485fa1b551349ab313944d2b05" + integrity sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ== + dependencies: + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" + "@algolia/client-common@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.3.tgz#891116aa0db75055a7ecc107649f7f0965774704" @@ -53,6 +99,15 @@ "@algolia/requester-common" "4.23.3" "@algolia/transporter" "4.23.3" +"@algolia/client-personalization@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.22.1.tgz#ff088d797648224fb582e9fe5828f8087835fa3d" + integrity sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ== + dependencies: + "@algolia/client-common" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" + "@algolia/client-personalization@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.3.tgz#35fa8e5699b0295fbc400a8eb211dc711e5909db" @@ -62,6 +117,15 @@ "@algolia/requester-common" "4.23.3" "@algolia/transporter" "4.23.3" +"@algolia/client-search@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.22.1.tgz#508cc6ab3d1f4e9c02735a630d4dff6fbb8514a2" + integrity sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA== + dependencies: + "@algolia/client-common" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter" "4.22.1" + "@algolia/client-search@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.3.tgz#a3486e6af13a231ec4ab43a915a1f318787b937f" @@ -76,11 +140,23 @@ resolved "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ== +"@algolia/logger-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.22.1.tgz#79cf4cd295de0377a94582c6aaac59b1ded731d9" + integrity sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg== + "@algolia/logger-common@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.3.tgz#35c6d833cbf41e853a4f36ba37c6e5864920bfe9" integrity sha512-y9kBtmJwiZ9ZZ+1Ek66P0M68mHQzKRxkW5kAAXYN/rdzgDN0d2COsViEFufxJ0pb45K4FRcfC7+33YB4BLrZ+g== +"@algolia/logger-console@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.22.1.tgz#0355345f6940f67aaa78ae9b81c06e44e49f2336" + integrity sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA== + dependencies: + "@algolia/logger-common" "4.22.1" + "@algolia/logger-console@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.3.tgz#30f916781826c4db5f51fcd9a8a264a06e136985" @@ -105,6 +181,13 @@ "@algolia/requester-node-http" "4.23.3" "@algolia/transporter" "4.23.3" +"@algolia/requester-browser-xhr@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz#f04df6fe9690a071b267c77d26b83a3be9280361" + integrity sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw== + dependencies: + "@algolia/requester-common" "4.22.1" + "@algolia/requester-browser-xhr@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.3.tgz#9e47e76f60d540acc8b27b4ebc7a80d1b41938b9" @@ -112,11 +195,23 @@ dependencies: "@algolia/requester-common" "4.23.3" +"@algolia/requester-common@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.22.1.tgz#27be35f3718aafcb6b388ff9c3aa2defabd559ff" + integrity sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg== + "@algolia/requester-common@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.3.tgz#7dbae896e41adfaaf1d1fa5f317f83a99afb04b3" integrity sha512-xloIdr/bedtYEGcXCiF2muajyvRhwop4cMZo+K2qzNht0CMzlRkm8YsDdj5IaBhshqfgmBb3rTg4sL4/PpvLYw== +"@algolia/requester-node-http@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz#589a6fa828ad0f325e727a6fcaf4e1a2343cc62b" + integrity sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA== + dependencies: + "@algolia/requester-common" "4.22.1" + "@algolia/requester-node-http@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.3.tgz#c9f94a5cb96a15f48cea338ab6ef16bbd0ff989f" @@ -124,6 +219,15 @@ dependencies: "@algolia/requester-common" "4.23.3" +"@algolia/transporter@4.22.1": + version "4.22.1" + resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.22.1.tgz#8843841b857dc021668f31647aa557ff19cd9cb1" + integrity sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ== + dependencies: + "@algolia/cache-common" "4.22.1" + "@algolia/logger-common" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/transporter@4.23.3": version "4.23.3" resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.3.tgz#545b045b67db3850ddf0bbecbc6c84ff1f3398b7" @@ -1914,41 +2018,41 @@ resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a" integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg== -"@prisma/debug@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.12.1.tgz#007c8ad2e466d565bcd0671b8846c27f8700c722" - integrity sha512-kd/wNsR0klrv79o1ITsbWxYyh4QWuBidvxsXSParPsYSu0ircUmNk3q4ojsgNc3/81b0ozg76iastOG43tbf8A== +"@prisma/debug@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.13.0.tgz#d88b0f6fafa0c216e20e284ed9fc30f1cbe45786" + integrity sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ== -"@prisma/engines-version@5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab": - version "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab.tgz#c78d099a3fe86d446db7442e64e56987e39e7f32" - integrity sha512-6yvO8s80Tym61aB4QNtYZfWVmE3pwqe807jEtzm8C5VDe7nw8O1FGX3TXUaXmWV0fQTIAfRbeL2Gwrndabp/0g== +"@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b": + version "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b.tgz#a72a4fb83ba1fd01ad45f795aa55168f60d34723" + integrity sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A== -"@prisma/engines@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.12.1.tgz#a50649427d627a9af962a188a84c65d61c6e2b3f" - integrity sha512-HQDdglLw2bZR/TXD2Y+YfDMvi5Q8H+acbswqOsWyq9pPjBLYJ6gzM+ptlTU/AV6tl0XSZLU1/7F4qaWa8bqpJA== +"@prisma/engines@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.13.0.tgz#8994ebf7b4e35aee7746a8465ec22738379bcab6" + integrity sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw== dependencies: - "@prisma/debug" "5.12.1" - "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/fetch-engine" "5.12.1" - "@prisma/get-platform" "5.12.1" + "@prisma/debug" "5.13.0" + "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" + "@prisma/fetch-engine" "5.13.0" + "@prisma/get-platform" "5.13.0" -"@prisma/fetch-engine@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.12.1.tgz#c38e9fa17fdc535b4c83cbb7645569ad0a511fa9" - integrity sha512-qSs3KcX1HKcea1A+hlJVK/ljj0PNIUHDxAayGMvgJBqmaN32P9tCidlKz1EGv6WoRFICYnk3Dd/YFLBwnFIozA== +"@prisma/fetch-engine@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.13.0.tgz#9b6945c7b38bb59e840f8905b20ea7a3d059ca55" + integrity sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA== dependencies: - "@prisma/debug" "5.12.1" - "@prisma/engines-version" "5.12.0-21.473ed3124229e22d881cb7addf559799debae1ab" - "@prisma/get-platform" "5.12.1" + "@prisma/debug" "5.13.0" + "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" + "@prisma/get-platform" "5.13.0" -"@prisma/get-platform@5.12.1": - version "5.12.1" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.12.1.tgz#33f427f6d744dee62a9e06858889691d78b50804" - integrity sha512-pgIR+pSvhYHiUcqXVEZS31NrFOTENC9yFUdEAcx7cdQBoZPmHVjtjN4Ss6NzVDMYPrKJJ51U14EhEoeuBlMioQ== +"@prisma/get-platform@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.13.0.tgz#99ef909a52b9d79b64d72d2d3d8210c4892b6572" + integrity sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw== dependencies: - "@prisma/debug" "5.12.1" + "@prisma/debug" "5.13.0" "@resvg/resvg-js-android-arm-eabi@2.6.2": version "2.6.2" @@ -2989,6 +3093,26 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" +algoliasearch@4.22.1: + version "4.22.1" + resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.22.1.tgz#f10fbecdc7654639ec20d62f109c1b3a46bc6afc" + integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== + dependencies: + "@algolia/cache-browser-local-storage" "4.22.1" + "@algolia/cache-common" "4.22.1" + "@algolia/cache-in-memory" "4.22.1" + "@algolia/client-account" "4.22.1" + "@algolia/client-analytics" "4.22.1" + "@algolia/client-common" "4.22.1" + "@algolia/client-personalization" "4.22.1" + "@algolia/client-search" "4.22.1" + "@algolia/logger-common" "4.22.1" + "@algolia/logger-console" "4.22.1" + "@algolia/requester-browser-xhr" "4.22.1" + "@algolia/requester-common" "4.22.1" + "@algolia/requester-node-http" "4.22.1" + "@algolia/transporter" "4.22.1" + algoliasearch@4.23.3: version "4.23.3" resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.3.tgz#e09011d0a3b0651444916a3e6bbcba064ec44b60" @@ -10169,10 +10293,10 @@ nested-error-stacks@^2.0.0: resolved "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz" integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== -next-i18next@15.3.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-15.3.0.tgz#b4530c80573854d00f95229af405e1e5beedbf18" - integrity sha512-bq7Cc9XJFcmGOCLnyEtHaeJ3+JJNsI/8Pkj9BaHAnhm4sZ9vNNC4ZsaqYnlRZ7VH5ypSo73fEqLK935jLsmCvQ== +next-i18next@15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-15.2.0.tgz#96455f282b0dbd0319ce9647b3c319fb50258681" + integrity sha512-Rl5yZ4oGffsB0AjRykZ5PzNQ2M6am54MaMayldGmH/UKZisrIxk2SKEPJvaHhKlWe1qgdNi2FkodwK8sEjfEmg== dependencies: "@babel/runtime" "^7.23.2" "@types/hoist-non-react-statics" "^3.3.4" @@ -11447,12 +11571,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.12.1: - version "5.12.1" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.12.1.tgz#db4596253bb066afc9f08744642f200a398d8d51" - integrity sha512-SkMnb6wyIxTv9ACqiHBI2u9gD6y98qXRoCoLEnZsF6yee5Qg828G+ARrESN+lQHdw4maSZFFSBPPDpvSiVTo0Q== +prisma@5.13.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.13.0.tgz#1f06e20ccfb6038ad68869e6eacd3b346f9d0851" + integrity sha512-kGtcJaElNRAdAGsCNykFSZ7dBKpL14Cbs+VaQ8cECxQlRPDjBlMHNFYeYt0SKovAVy2Y65JXQwB3A5+zIQwnTg== dependencies: - "@prisma/engines" "5.12.1" + "@prisma/engines" "5.13.0" proc-log@^3.0.0: version "3.0.0" @@ -12169,10 +12293,10 @@ remark-rehype@^11.0.0: unified "^11.0.0" vfile "^6.0.0" -remark-smartypants@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-smartypants/-/remark-smartypants-3.0.0.tgz#5ada743b82360e35da449c11006eacd6b4c32997" - integrity sha512-6/xo47aZxWJd1L6VsDWX5EJRtRC2X0+vBRVh6MPD1doayFC6VRrxez6Z8GcEDqznvf9Ly+EtpasNYQptyhy8nQ== +remark-smartypants@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-smartypants/-/remark-smartypants-3.0.1.tgz#44171381842f0b7ecba296340925b588aa9991a3" + integrity sha512-qyshfCl2eLO0i0558e79ZJsfojC5wjnYLByjt0FmjJQN6aYwcRxpoj784LZJSoWCdnA2ubh5rLNGb8Uur/wDng== dependencies: retext "^9.0.0" retext-smartypants "^6.0.0" @@ -12910,16 +13034,7 @@ string-argv@0.3.2: resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13024,7 +13139,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13038,13 +13153,6 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" @@ -14246,7 +14354,7 @@ workerpool@6.2.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -14264,15 +14372,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" From aefa81028f84eb72abd997184ba445fcba33d436 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:11:53 +0200 Subject: [PATCH 764/795] chore(markdown): Fixes for crowdin issues --- markdown/org/newsletter/2022q4/uk.md | 2 +- markdown/org/newsletter/2023q1/fr.md | 2 +- .../en.md | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/markdown/org/newsletter/2022q4/uk.md b/markdown/org/newsletter/2022q4/uk.md index 722fc706e9f..ebef1781797 100644 --- a/markdown/org/newsletter/2022q4/uk.md +++ b/markdown/org/newsletter/2022q4/uk.md @@ -37,7 +37,7 @@ FreeSewing 2.22 вийшов наприкінці серпня, в ньому з ### Конфігурація на рівні частин, також відома як підтримка пакетів -На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів *, комір з набору комірів *, додати кишені з набору комірів *,* і так далі.

    +На [нашій дорожній карті](https://github.com/freesewing/freesewing/discussions/1278) - яка, якщо ви звернули увагу, містить все більше речей під заголовком *вже реалізованих* - у нас була так звана підтримка *пакетів*. Ідея полягала в тому, що ми хотіли б дати можливість створювати дизайн, вільно комбінуючи різні компоненти. Наприклад, ви можете взяти рукава з набору рукавів *, комір з набору комірів *, додати кишені з набору комірів *,* і так далі. Це одна з тих речей, яка має багато сенсу, але викликає питання: Як все це буде працювати під капотом? У версії 2 FreeSewing реалізація цих ідей була б нетривіальною, тому що, хоча ми підтримуємо розширення викрійок на інші дизайни, цей процес є надто громіздким для такого рівня спеціального поєднання різних дизайнів. diff --git a/markdown/org/newsletter/2023q1/fr.md b/markdown/org/newsletter/2023q1/fr.md index a66aaf2fc55..e2fcd826ce0 100644 --- a/markdown/org/newsletter/2023q1/fr.md +++ b/markdown/org/newsletter/2023q1/fr.md @@ -69,7 +69,7 @@ Le chiffre d'affaires de FreeSewing au cours de l'année 2022 était de `9,325,5 Nous avons constaté un énorme afflux d'utilisateurs, de mécènes et de revenus en 2020 sans doute parce que [notre modèle de masque facial](https://freesewing.org/designs/florence/) a été follement populaire pendant la pénurie d'EPI cette année-là. Ce pic s'est atténué depuis, et a entraîné une tendance à la baisse des revenus d'une année sur l'autre. De plus, l'inflation et la crise du coût de la vie ont été particulièrement tangibles cette année, et j'ai reçu plus d'un message d'excuse de la part de mécènes qui voulaient continuer à nous soutenir mais qui se sont sentis obligés de nous supprimer de leur budget mensuel pour être sûrs de pouvoir subvenir à leurs besoins et/ou à ceux de leur famille. -Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10 000 `. Oui, j'aimerais bien arriver à 12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. +Je ne me sens donc pas mal à l'idée que les revenus soient moins élevés cette année. Je pense que l'année a été difficile pour beaucoup de gens, et nous avons toujours cherché à obtenir le soutien de ceux qui pouvaient l'épargner sans difficultés. Oui, c'est agréable de franchir la barrière des 10.000. Oui, j'aimerais bien arriver à `12.000` et atteindre `1.000` MRR (monthly recurring revenue) mais je ne vais pas laisser cela m'empêcher d'être fière du travail que nous faisons. Je suis fière non seulement du travail que nous faisons, mais aussi parce que FreeSewing est une force pour le bien dans ce monde. En ajoutant les `9.325,54`de cette année, les contributions de FreeSewing à [Médecins sans frontières/Doctors Without Borders](https://www.msf.org/) s'élèvent à `38.814,94` euros ou environ 41,6k dollars américains. De l'argent qui aide les gens qui sont dans une situation pire que la nôtre. diff --git a/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md b/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md index 902d46dfb4b..e7018a7037d 100644 --- a/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md +++ b/markdown/org/showcase/trampoline-punk-a-punk-suit-made-from-a-trampoline-using-the-jaeger-jacket-and-charlie-chinos-patterns/en.md @@ -2,7 +2,8 @@ title: "Trampoline Punk: A Punk Suit Made from a Trampoline Using the Jaeger Jacket and Charlie Chinos Patterns" caption: "Jaeger Jacket and Charlie Chinos from the back, with a skull applique on the jacket" date: 20240412 -intro: "Trampoline Punk attempts to answer the question "Can you sew a formal suit from a trampoline?" The answer: sort of, but you have to be willing to bleed for it." +intro: | + Trampoline Punk attempts to answer the question "Can you sew a formal suit from a trampoline?" The answer: sort of, but you have to be willing to bleed for it. author: 65187 designs: ["jaeger", "charlie"] --- From aaf4e04fd16afeb04c15edf0b265a9eb1dc34670 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:12:28 +0200 Subject: [PATCH 765/795] chore: Dependency updates --- config/dependencies.yaml | 48 ++++++++++----------- designs/aaron/package.json | 2 +- designs/albert/package.json | 2 +- designs/bee/package.json | 2 +- designs/bella/package.json | 2 +- designs/benjamin/package.json | 2 +- designs/bent/package.json | 2 +- designs/bob/package.json | 2 +- designs/breanna/package.json | 2 +- designs/brian/package.json | 2 +- designs/bruce/package.json | 2 +- designs/carlita/package.json | 2 +- designs/carlton/package.json | 2 +- designs/cathrin/package.json | 2 +- designs/charlie/package.json | 2 +- designs/cornelius/package.json | 2 +- designs/diana/package.json | 2 +- designs/examples/package.json | 2 +- designs/florence/package.json | 2 +- designs/florent/package.json | 2 +- designs/gozer/package.json | 2 +- designs/hi/package.json | 2 +- designs/holmes/package.json | 2 +- designs/hortensia/package.json | 2 +- designs/huey/package.json | 2 +- designs/hugo/package.json | 2 +- designs/jaeger/package.json | 2 +- designs/legend/package.json | 2 +- designs/lucy/package.json | 2 +- designs/lumina/package.json | 2 +- designs/lumira/package.json | 2 +- designs/lunetius/package.json | 2 +- designs/magde/package.json | 2 +- designs/naomiwu/package.json | 2 +- designs/noble/package.json | 2 +- designs/octoplushy/package.json | 2 +- designs/onyx/package.json | 2 +- designs/otis/package.json | 2 +- designs/paco/package.json | 2 +- designs/penelope/package.json | 2 +- designs/plugintest/package.json | 2 +- designs/rendertest/package.json | 2 +- designs/sandy/package.json | 2 +- designs/shelly/package.json | 2 +- designs/shin/package.json | 2 +- designs/simon/package.json | 2 +- designs/simone/package.json | 2 +- designs/skully/package.json | 2 +- designs/sven/package.json | 2 +- designs/tamiko/package.json | 2 +- designs/teagan/package.json | 2 +- designs/tiberius/package.json | 2 +- designs/titan/package.json | 2 +- designs/trayvon/package.json | 2 +- designs/tristan/package.json | 2 +- designs/uma/package.json | 2 +- designs/wahid/package.json | 2 +- designs/walburga/package.json | 2 +- designs/waralee/package.json | 2 +- designs/yuri/package.json | 2 +- packages/core/package.json | 2 +- plugins/core-plugins/package.json | 2 +- plugins/plugin-annotations/package.json | 2 +- plugins/plugin-bin-pack/package.json | 2 +- plugins/plugin-bust/package.json | 2 +- plugins/plugin-flip/package.json | 2 +- plugins/plugin-gore/package.json | 2 +- plugins/plugin-i18n/package.json | 2 +- plugins/plugin-measurements/package.json | 2 +- plugins/plugin-mirror/package.json | 2 +- plugins/plugin-ringsector/package.json | 2 +- plugins/plugin-round/package.json | 2 +- plugins/plugin-sprinkle/package.json | 2 +- plugins/plugin-svgattr/package.json | 2 +- plugins/plugin-theme/package.json | 2 +- plugins/plugin-timing/package.json | 2 +- plugins/plugin-versionfree-svg/package.json | 2 +- sites/backend/package.json | 14 +++--- sites/dev/package.json | 16 +++---- sites/lab/package.json | 14 +++--- sites/org/package.json | 18 ++++---- sites/sde/package.json | 30 ++++++------- sites/shared/package.json | 26 +++++------ 83 files changed, 159 insertions(+), 159 deletions(-) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 383623ed7f9..599a1bf4ce9 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -3,7 +3,7 @@ _types: peer: '@freesewing/core': &freesewing '{{version}}' dev: - 'mocha': &mocha '10.4.0' + 'mocha': &mocha '10.3.0' 'chai': &chai '5.1.0' '@freesewing/models': *freesewing '@freesewing/plugin-timing': *freesewing @@ -179,12 +179,12 @@ yuri: backend: _: - '@aws-sdk/client-sesv2': '3.563.0' - '@prisma/client': &prisma '5.13.0' + '@aws-sdk/client-sesv2': '3.535.0' + '@prisma/client': &prisma '5.11.0' 'bcryptjs': '2.4.3' 'cors': '2.8.5' 'dotenv': '16.4.5' - 'express': '4.19.2' + 'express': '4.19.1' 'js-yaml': &jsyaml '4.1.0' 'lodash.get': *_get 'mustache': *mustache @@ -192,9 +192,9 @@ backend: 'passport': '0.7.0' 'passport-http': '0.3.0' 'passport-jwt': '4.0.1' - 'pino': '8.20.0' + 'pino': '9.0.0' 'qrcode': '1.5.3' - 'swagger-ui-dist': '5.17.1' + 'swagger-ui-dist': '5.17.2' 'swagger-ui-express': '5.0.0' dev: 'chai': *chai @@ -210,15 +210,15 @@ dev: '@mdx-js/mdx': &mdx '^3.0.0' '@mdx-js/react': *mdx '@mdx-js/runtime': &mdxRuntime '2.0.0-next.9' - '@next/bundle-analyzer': &next '14.2.3' - '@tailwindcss/typography': &tailwindTypography '0.5.12' - 'algoliasearch': '4.23.3' - 'daisyui': &daisyui '4.10.2' + '@next/bundle-analyzer': &next '14.1.4' + '@tailwindcss/typography': &tailwindTypography '0.5.10' + 'algoliasearch': '4.22.1' + 'daisyui': &daisyui '4.7.3' 'lodash.get': *_get 'lodash.orderby': &_orderby '4.6.0' 'lodash.set': *_set 'next': *next - 'react': &react '18.2.0' + 'react': &react '18.3.1' 'react-copy-to-clipboard': &reactCopyToClipboard '5.1.0' 'react-dom': *react 'react-hotkeys-hook': &reactHotkeysHook '4.5.0' @@ -242,7 +242,7 @@ dev: 'postcss': &postcss '8.4.38' 'remark-extract-frontmatter': '3.2.0' 'remark-mdx-frontmatter': &mdxfrontmatter '4.0.0' - 'tailwindcss': &tailwindcss '3.4.3' + 'tailwindcss': &tailwindcss '3.4.1' 'yaml-loader': '0.8.1' lab: @@ -256,7 +256,7 @@ lab: 'd3-drag': &d3drag '3.0.0' 'd3-selection': &d3selection '3.0.0' 'daisyui': *daisyui - 'i18next': &i18next '23.11.0' + 'i18next': &i18next '23.11.2' 'lodash.get': *_get 'lodash.orderby': *_orderby 'lodash.set': *_set @@ -266,7 +266,7 @@ lab: 'react': *react 'react-copy-to-clipboard': *reactCopyToClipboard 'react-hotkeys-hook': *reactHotkeysHook - 'react-i18next': &reactI18next '14.1.1' + 'react-i18next': &reactI18next '14.1.0' 'react-instantsearch-dom': *reactInstantsearchDom 'react-swipeable': *reactSwipeable 'react-timeago': *reactTimeago @@ -283,8 +283,8 @@ lab: org: _: - '@bugsnag/js': &bugsnag 7.22.7 - '@bugsnag/plugin-react': 7.22.7 + '@bugsnag/js': &bugsnag 7.22.4 + '@bugsnag/plugin-react': 7.19.0 '@mdx-js/mdx': *mdx '@mdx-js/react': *mdx '@mdx-js/runtime': *mdxRuntime @@ -295,8 +295,8 @@ org: 'daisyui': *daisyui 'echarts': &echarts 5.5.0 'echarts-for-react': &echartsReact 3.0.2 - 'jotai': &jotai '2.8.0' - 'jotai-location': &jotai-location '0.5.5' + 'jotai': &jotai '2.7.1' + 'jotai-location': &jotai-location '0.5.4' 'lodash.get': *_get 'lodash.orderby': *_orderby 'lodash.set': *_set @@ -318,14 +318,14 @@ org: 'remark-gfm': *remarkGfm 'remark-mdx-frontmatter': *mdxfrontmatter 'strip-markdown': *stripMarkdown - 'use-local-storage-state': &use-local-storage-state 19.2.0 + 'use-local-storage-state': &use-local-storage-state 19.1.0 'yaml-loader': 0.8.1 dev: *nextSiteDevDependencies shared: _: '@next/mdx': *next - '@resvg/resvg-js': '2.6.2' + '@resvg/resvg-js': '2.6.0' '@tailwindcss/typography': *tailwindTypography 'Buffer': '0.0.0' 'd3-dispatch': '3.0.1' @@ -347,21 +347,21 @@ shared: 'mdast-util-toc': '7.0.0' 'mermaid': '10.9.0' 'ora': *ora - 'pdfkit': &pdfkit '0.15.0' + 'pdfkit': &pdfkit '0.14.0' 'postcss-for': &postcssfor '2.1.1' 'react': *react 'react-dom': *react 'react-timeago': *reactTimeago - 'react-zoom-pan-pinch': &zoompanpinch '3.4.4' + 'react-zoom-pan-pinch': &zoompanpinch '3.4.3' 'rehype-autolink-headings': *rehypeAutolinkHeadings 'rehype-highlight': *rehypeHighlight 'remark-frontmatter': &remarkfrontmatter '5.0.0' 'remark-mdx-frontmatter': *mdxfrontmatter - "remark-smartypants": &smartypants "3.0.1" + "remark-smartypants": &smartypants "2.1.0" "slugify": &slugify "^1.6.6" # see: https://github.com/npm/cli/issues/2610#issuecomment-1295371753 'svg-to-pdfkit': &svgtopdfkit 'https://git@github.com/eriese/SVG-to-PDFKit' - 'tlds': &rlds '1.252.0' + 'tlds': &rlds '1.251.0' 'to-vfile': '8.0.0' 'unist-util-visit': *unist-util-visit 'use-local-storage-state': *use-local-storage-state diff --git a/designs/aaron/package.json b/designs/aaron/package.json index ea3aaf7747d..ce49326fd04 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/albert/package.json b/designs/albert/package.json index 76d7bf1ecad..2da5d562161 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bee/package.json b/designs/bee/package.json index 679d1ef1970..526713a6274 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bella/package.json b/designs/bella/package.json index 9c2e7949bac..13a232d076a 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 34e8c8a00b4..306fcec95e6 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bent/package.json b/designs/bent/package.json index ab30a071207..7f65d2d1937 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bob/package.json b/designs/bob/package.json index 386c486b04f..690304808e0 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 23703212f1d..98433c12533 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/brian/package.json b/designs/brian/package.json index 1b8d3fef38d..f849821156b 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 11c39cca02c..0331cf23c1f 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlita/package.json b/designs/carlita/package.json index cacda75c2f2..d6d57077e8b 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlton/package.json b/designs/carlton/package.json index 527c7549a2d..993c41644db 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index b1b143c31f4..dd7914bed64 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/charlie/package.json b/designs/charlie/package.json index 719da827cd5..18d70deb1f9 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 10cc99cdfe8..6b25b344a0b 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/diana/package.json b/designs/diana/package.json index 712695b98a1..ca162a5e64a 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/examples/package.json b/designs/examples/package.json index 4b9785928aa..62370fdfe04 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -49,7 +49,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florence/package.json b/designs/florence/package.json index 78c0d6f8a46..2be92777915 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florent/package.json b/designs/florent/package.json index ccc886313fb..5517dc5daaf 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/gozer/package.json b/designs/gozer/package.json index 9f69b8e32fe..87a57c23f00 100644 --- a/designs/gozer/package.json +++ b/designs/gozer/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hi/package.json b/designs/hi/package.json index 0f168e4475a..9d69fb4066d 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/holmes/package.json b/designs/holmes/package.json index 4fd2f67ee9f..8d117ccc321 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -56,7 +56,7 @@ "@freesewing/plugin-gore": "3.2.0" }, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index 6257ce5ecc6..94509b15abb 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/huey/package.json b/designs/huey/package.json index c3add0f8398..5625fd7e419 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hugo/package.json b/designs/hugo/package.json index ca8b3417488..07352d582f2 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 062664a8321..8057ca5af1c 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/legend/package.json b/designs/legend/package.json index c4c98decf3d..393b84a3c33 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lucy/package.json b/designs/lucy/package.json index 1d88fed6ac4..fa1b7b9750c 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumina/package.json b/designs/lumina/package.json index d29100eba1e..34aec3889be 100644 --- a/designs/lumina/package.json +++ b/designs/lumina/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumira/package.json b/designs/lumira/package.json index a8f347f9478..1f785ea47b8 100644 --- a/designs/lumira/package.json +++ b/designs/lumira/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index 33945b987ed..d330055838a 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/magde/package.json b/designs/magde/package.json index 85b88a524bc..05c56cdd495 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/naomiwu/package.json b/designs/naomiwu/package.json index 7e94a19d612..f264bfcfbc6 100644 --- a/designs/naomiwu/package.json +++ b/designs/naomiwu/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/noble/package.json b/designs/noble/package.json index a129e21771c..386a9f1fc4e 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index c045f09f539..c0575885b02 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/onyx/package.json b/designs/onyx/package.json index 9cdf7db32a4..eb391f0487c 100644 --- a/designs/onyx/package.json +++ b/designs/onyx/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/otis/package.json b/designs/otis/package.json index 6da21cc33f7..d5bc84c0d50 100644 --- a/designs/otis/package.json +++ b/designs/otis/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/paco/package.json b/designs/paco/package.json index 91d4085935e..8d1e605df9f 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/penelope/package.json b/designs/penelope/package.json index f7bb4c9d458..53809315576 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 1c5802400b1..82cfdd51637 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index d289bc33358..a20ffc0b6d6 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sandy/package.json b/designs/sandy/package.json index 46629614acc..c68744723f9 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shelly/package.json b/designs/shelly/package.json index 640316a9f39..ff36d0da81d 100644 --- a/designs/shelly/package.json +++ b/designs/shelly/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shin/package.json b/designs/shin/package.json index b07a360390c..b1cb670c6d1 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simon/package.json b/designs/simon/package.json index 13a8be358da..1c3dd85df64 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simone/package.json b/designs/simone/package.json index cc6ab5ef1a9..a0e6f349f6f 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/skully/package.json b/designs/skully/package.json index 70b10a4c3fc..902e1c6c547 100644 --- a/designs/skully/package.json +++ b/designs/skully/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sven/package.json b/designs/sven/package.json index 2d0457b03c6..e190e0352ee 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index 59db79d575b..f51300d340a 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 85aec5e3f4c..8ddb9931348 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index d8baff4cca9..2856b97eb6b 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/titan/package.json b/designs/titan/package.json index fc9becb3e0d..1a580665506 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index d1845b37b3c..8802043a845 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tristan/package.json b/designs/tristan/package.json index 6eefb36c598..75f650a70e1 100644 --- a/designs/tristan/package.json +++ b/designs/tristan/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/uma/package.json b/designs/uma/package.json index 1b1b780c669..a604f506236 100644 --- a/designs/uma/package.json +++ b/designs/uma/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/wahid/package.json b/designs/wahid/package.json index 556c25b8f2d..7bd43e2b1e9 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/walburga/package.json b/designs/walburga/package.json index 40e3691c03f..c9c5006449d 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/waralee/package.json b/designs/waralee/package.json index 1b7be0b4cb1..338ea5cecd2 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 9b7aea2882d..21d8ff1e509 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/packages/core/package.json b/packages/core/package.json index 044df17a26f..3486b1ebea7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,7 +64,7 @@ "devDependencies": { "eslint": "8.57.0", "nyc": "15.1.0", - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "sinon": "^17.0.1" }, diff --git a/plugins/core-plugins/package.json b/plugins/core-plugins/package.json index 55b6267fe70..f8161bb41d8 100644 --- a/plugins/core-plugins/package.json +++ b/plugins/core-plugins/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0", "@freesewing/plugin-annotations": "3.2.0", "@freesewing/plugin-mirror": "3.2.0", diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index 9595a53eb92..080aeac1c48 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bin-pack/package.json b/plugins/plugin-bin-pack/package.json index 2bbb3177085..de2420f1fa8 100644 --- a/plugins/plugin-bin-pack/package.json +++ b/plugins/plugin-bin-pack/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 2bf7619359f..78bbbf1bc64 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index 620410d3a05..c67d522a583 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index 7109989548f..76b6b1cd68e 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index 0cd8688c19f..fa39fd98abb 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 7922a7c75bd..0f5550513ca 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index f96155821fe..733c2c5b3e4 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-ringsector/package.json b/plugins/plugin-ringsector/package.json index 7a3674e6e81..3b2f69a23c9 100644 --- a/plugins/plugin-ringsector/package.json +++ b/plugins/plugin-ringsector/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index 6d85f49d3fe..c5f81e78971 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index 75a5153fd03..72a16401155 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 9d89a25858d..5322bf25702 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index bb83f9c2ac9..dc9e123f800 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index d1841135c09..cc7bdbb438b 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index 9b11f459a4b..73a4aa1a79a 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.4.0", + "mocha": "10.3.0", "chai": "5.1.0" }, "files": [ diff --git a/sites/backend/package.json b/sites/backend/package.json index ce05f7c2d6f..a38cf20704d 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -28,12 +28,12 @@ }, "peerDependencies": {}, "dependencies": { - "@aws-sdk/client-sesv2": "3.563.0", - "@prisma/client": "5.13.0", + "@aws-sdk/client-sesv2": "3.535.0", + "@prisma/client": "5.11.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", - "express": "4.19.2", + "express": "4.19.1", "js-yaml": "4.1.0", "lodash.get": "4.4.2", "mustache": "4.2.0", @@ -41,19 +41,19 @@ "passport": "0.7.0", "passport-http": "0.3.0", "passport-jwt": "4.0.1", - "pino": "8.20.0", + "pino": "9.0.0", "qrcode": "1.5.3", - "swagger-ui-dist": "5.17.1", + "swagger-ui-dist": "5.17.2", "swagger-ui-express": "5.0.0" }, "devDependencies": { "chai": "5.1.0", "chai-http": "4.4.0", "esbuild": "0.20.2", - "mocha": "10.4.0", + "mocha": "10.3.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", - "prisma": "5.13.0" + "prisma": "5.11.0" }, "engines": { "node": ">= 18.17.0 <22" diff --git a/sites/dev/package.json b/sites/dev/package.json index fa9a47b3789..51ee9abddec 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -32,17 +32,17 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@next/bundle-analyzer": "14.2.3", - "@tailwindcss/typography": "0.5.12", - "algoliasearch": "4.23.3", - "daisyui": "4.10.2", + "@next/bundle-analyzer": "14.1.4", + "@tailwindcss/typography": "0.5.10", + "algoliasearch": "4.22.1", + "daisyui": "4.7.3", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.3", - "react": "18.2.0", + "next": "14.1.4", + "react": "18.3.1", "react-copy-to-clipboard": "5.1.0", - "react-dom": "18.2.0", + "react-dom": "18.3.1", "react-hotkeys-hook": "4.5.0", "react-instantsearch-dom": "6.40.4", "react-instantsearch-hooks-web": "6.47.3", @@ -64,7 +64,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.3", + "tailwindcss": "3.4.1", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/lab/package.json b/sites/lab/package.json index f384d8684fc..6e2d3ea8b57 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -30,23 +30,23 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@tailwindcss/typography": "0.5.12", + "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.2", - "i18next": "23.11.0", + "daisyui": "4.7.3", + "i18next": "23.11.2", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", - "next": "14.2.3", + "next": "14.1.4", "next-i18next": "15.2.0", "ora": "8.0.1", - "react": "18.2.0", + "react": "18.3.1", "react-copy-to-clipboard": "5.1.0", "react-hotkeys-hook": "4.5.0", - "react-i18next": "14.1.1", + "react-i18next": "14.1.0", "react-instantsearch-dom": "6.40.4", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", @@ -65,7 +65,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.3", + "tailwindcss": "3.4.1", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/org/package.json b/sites/org/package.json index 862a30e2cf7..9276ee11271 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -28,25 +28,25 @@ }, "peerDependencies": {}, "dependencies": { - "@bugsnag/js": "7.22.7", - "@bugsnag/plugin-react": "7.22.7", + "@bugsnag/js": "7.22.4", + "@bugsnag/plugin-react": "7.19.0", "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.12", + "@tailwindcss/typography": "0.5.10", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", - "daisyui": "4.10.2", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", - "jotai": "2.8.0", - "jotai-location": "0.5.5", + "jotai": "2.7.1", + "jotai-location": "0.5.4", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "luxon": "3.4.4", - "next": "14.2.3", + "next": "14.1.4", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", @@ -63,7 +63,7 @@ "remark-gfm": "4.0.0", "remark-mdx-frontmatter": "4.0.0", "strip-markdown": "6.0.0", - "use-local-storage-state": "19.2.0", + "use-local-storage-state": "19.1.0", "yaml-loader": "0.8.1" }, "devDependencies": { @@ -72,7 +72,7 @@ "postcss": "8.4.38", "remark-extract-frontmatter": "3.2.0", "remark-mdx-frontmatter": "4.0.0", - "tailwindcss": "3.4.3", + "tailwindcss": "3.4.1", "yaml-loader": "0.8.1" }, "engines": { diff --git a/sites/sde/package.json b/sites/sde/package.json index 1dd7a0d3e59..d0aec045d94 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -44,47 +44,47 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.12", + "@tailwindcss/typography": "0.5.10", "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.2", + "daisyui": "4.7.3", "echarts": "5.5.0", "echarts-for-react": "3.0.2", "file-saver": "2.0.5", - "i18next": "23.11.0", - "jotai": "2.8.0", - "jotai-location": "0.5.5", + "i18next": "23.11.2", + "jotai": "2.7.1", + "jotai-location": "0.5.4", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "mustache": "4.2.0", - "next": "14.2.3", + "next": "14.1.4", "next-i18next": "15.2.0", - "pdfkit": "0.15.0", + "pdfkit": "0.14.0", "postcss-for": "2.1.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "18.3.1", + "react-dom": "18.3.1", "react-copy-to-clipboard": "5.1.0", "react-hotkeys-hook": "4.5.0", - "react-i18next": "14.1.1", + "react-i18next": "14.1.0", "react-dropzone": "14.2.3", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.4", + "react-zoom-pan-pinch": "3.4.3", "remark-gfm": "4.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "3.0.1", + "remark-smartypants": "2.1.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tailwindcss": "3.4.3", - "tlds": "1.252.0", - "use-local-storage-state": "19.2.0", + "tailwindcss": "3.4.1", + "tlds": "1.251.0", + "use-local-storage-state": "19.1.0", "web-worker": "1.3.0" }, "devDependencies": {}, diff --git a/sites/shared/package.json b/sites/shared/package.json index bb27b485a13..7ccd89a2b8a 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -16,21 +16,21 @@ "scripts": {}, "peerDependencies": {}, "dependencies": { - "@next/mdx": "14.2.3", - "@resvg/resvg-js": "2.6.2", - "@tailwindcss/typography": "0.5.12", + "@next/mdx": "14.1.4", + "@resvg/resvg-js": "2.6.0", + "@tailwindcss/typography": "0.5.10", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", "d3-selection": "3.0.0", - "daisyui": "4.10.2", + "daisyui": "4.7.3", "feed": "4.2.2", "file-saver": "2.0.5", "front-matter": "4.0.2", "highlight.js": "11.9.0", "github-slugger": "2.0.0", - "jotai": "2.8.0", - "jotai-location": "0.5.5", + "jotai": "2.7.1", + "jotai-location": "0.5.4", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", "lodash.orderby": "4.6.0", @@ -39,23 +39,23 @@ "mdast-util-toc": "7.0.0", "mermaid": "10.9.0", "ora": "8.0.1", - "pdfkit": "0.15.0", + "pdfkit": "0.14.0", "postcss-for": "2.1.1", - "react": "18.2.0", - "react-dom": "18.2.0", + "react": "18.3.1", + "react-dom": "18.3.1", "react-timeago": "7.2.0", - "react-zoom-pan-pinch": "3.4.4", + "react-zoom-pan-pinch": "3.4.3", "rehype-autolink-headings": "7.1.0", "rehype-highlight": "7.0.0", "remark-frontmatter": "5.0.0", "remark-mdx-frontmatter": "4.0.0", - "remark-smartypants": "3.0.1", + "remark-smartypants": "2.1.0", "slugify": "^1.6.6", "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", - "tlds": "1.252.0", + "tlds": "1.251.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", - "use-local-storage-state": "19.2.0", + "use-local-storage-state": "19.1.0", "web-worker": "1.3.0" }, "devDependencies": { From 15a74de0c9dba5cbc8b9ab869715011a92385535 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:15:04 +0200 Subject: [PATCH 766/795] chore: Add Guin as author. Closes #6616 --- markdown/org/showcase/guin-gingham-simon/en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/markdown/org/showcase/guin-gingham-simon/en.md b/markdown/org/showcase/guin-gingham-simon/en.md index 9e6013b7eb5..98100355258 100644 --- a/markdown/org/showcase/guin-gingham-simon/en.md +++ b/markdown/org/showcase/guin-gingham-simon/en.md @@ -5,6 +5,7 @@ date: "2023-01-27" intro: "Guin made this great modified Simon by giving it fun lantern sleeves in a contrasting color that definitely has nothing to do with running out of navy gingham. All's well that ends well, though - his shirt turned out awesome. Also loving the way the stripe matching turned out across the front." title: "Guin's Gingham Lantern Simon" designs: ["simon"] +author: 27042 --- Guin made this great modified Simon by giving it fun lantern sleeves in a contrasting color that definitely has nothing to do with running out of navy gingham. All's well that ends well, though - his shirt turned out awesome. Also loving the way the stripe matching turned out across the front. From 06a31c7d5a7622bc4a26f4e55f81a467ea19515b Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:23:58 +0200 Subject: [PATCH 767/795] fix(huey): Increase lengtBonus default. Fixes #6596 --- CHANGELOG.md | 4 ++++ config/changelog.yaml | 2 ++ designs/huey/src/back.mjs | 2 ++ 3 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c25df94ecc2..caada1b9923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ ### huey +#### Changed + + - The lengthBonus option default was changed from 0% to 15%. Fixes + #### Fixed - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes diff --git a/config/changelog.yaml b/config/changelog.yaml index 68b97e0d2e1..ea16c38b722 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -6,6 +6,8 @@ Unreleased: Changed: brian: - Always load plugin-bust due to its changes in how it handle conditionality. + huey: + - The lengthBonus option default was changed from 0% to 15%. Fixes #6596 onyx: - Always load plugin-bust due to its changes in how it handle conditionality. plugin-bust: diff --git a/designs/huey/src/back.mjs b/designs/huey/src/back.mjs index f66548c08b8..999ce0287e7 100644 --- a/designs/huey/src/back.mjs +++ b/designs/huey/src/back.mjs @@ -101,6 +101,8 @@ export const back = { ribbing: { bool: true, menu: 'style' }, ribbingHeight: { pct: 10, min: 5, max: 15, menu: 'style' }, hipsEase: { pct: 8, min: 4, max: 12, menu: 'fit' }, + // Override Brian's lengthbonus. See #6596 + lengthBonus: { pct: 15, min: -4, max: 60, menu: 'style' }, }, draft: draftHueyBack, } From 248a52d360eda5dcb3afa6e57289335ad5325772 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:38:57 +0200 Subject: [PATCH 768/795] fix(shared): Do not count _ key as page child --- sites/shared/utils.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sites/shared/utils.mjs b/sites/shared/utils.mjs index 84e8ce1ff14..8dff35b9390 100644 --- a/sites/shared/utils.mjs +++ b/sites/shared/utils.mjs @@ -339,7 +339,7 @@ export const hasRequiredMeasurements = (Design, measies = {}, DesignIsMeasuremen * and then check if there are any left. If there are, those are child-pages. */ export const pageHasChildren = (page) => - Object.keys(page).filter((key) => !['t', 's', 'o', 'b', 'h'].includes(key)).length > 0 + Object.keys(page).filter((key) => !['t', 's', 'o', 'b', 'h', '_'].includes(key)).length > 0 /* * Returns the slug of the page above this one From 5ce91673b7b5101defe2dffb7d305168589fe09d Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 16:43:59 +0200 Subject: [PATCH 769/795] fix(shared): Apply sitenav filters to ReadMore MDX component A while ago, I rewrote the sitenav component to *just* use the ReadMore MDX component to generate the navigation tree. However, sitenav have certain keys that you can set to control the visibility of hte item to the user, and those filters were not added to the ReadMore component, thus showing navigation items that should have been hidden. --- sites/shared/components/mdx/read-more.mjs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sites/shared/components/mdx/read-more.mjs b/sites/shared/components/mdx/read-more.mjs index 9af3fc62ce4..e96798ee086 100644 --- a/sites/shared/components/mdx/read-more.mjs +++ b/sites/shared/components/mdx/read-more.mjs @@ -26,9 +26,10 @@ const onActivePath = (slug, active) => (active ? active.slice(0, slug.length) == * This is a recursive function, so it needs to be lean */ const RenderTree = ({ tree, recurse, depth = 1, level = 0, active = false }) => { - const orderedTree = orderBy(tree, ['o', 't'], ['asc', 'asc']).filter( - (item) => typeof item === 'object' - ) + const orderedTree = orderBy(tree, ['o', 't'], ['asc', 'asc']) + .filter((item) => typeof item === 'object') + .filter((item) => !item.h) + .filter((item) => !item._) return (
    ) From 222fe2d83642dbed8afc7bc1da8c5622e6f7340b Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 17:39:17 +0200 Subject: [PATCH 772/795] chore(markdown): Claim showcase posts of Natalia Closes #6587 Closes #6586 Closes #6585 Closes #6584 Closes #6583 Closes #6582 Closes #6581 Closes #6580 --- .../org/showcase/a-lined-tristan-top-with-front-lacing/en.md | 3 +-- .../showcase/a-noble-top-for-the-renaissance-festival/en.md | 2 +- markdown/org/showcase/bella-block/en.md | 1 + markdown/org/showcase/green-cathrin/en.md | 1 + markdown/org/showcase/lower-rise-ursula/en.md | 1 + markdown/org/showcase/mini-shin-swim-trunks/en.md | 1 + markdown/org/showcase/modified-tamiko-nursing-cover/en.md | 1 + markdown/org/showcase/ursula-test-pairs/en.md | 1 + 8 files changed, 8 insertions(+), 3 deletions(-) diff --git a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md index 376ef70cef9..18aa79dc5b8 100644 --- a/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md +++ b/markdown/org/showcase/a-lined-tristan-top-with-front-lacing/en.md @@ -4,8 +4,7 @@ caption: "A top made out of fabric scraps. The main fabric was likely upholstery date: 20240116 intro: "This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem." designs: ["tristan"] -maker: Natalia -author: 60164 +author: 19867 --- This Tristan top is lined and had bias binding applied to the neck hole, armholes, and hem. It laces in the front to make it easier to wear. This top is technically reversible, although the eyelets are a bit rough on the back side. The boning used is lightweight plastic boning. It gives a nice amount of structure, and support for the lacing. diff --git a/markdown/org/showcase/a-noble-top-for-the-renaissance-festival/en.md b/markdown/org/showcase/a-noble-top-for-the-renaissance-festival/en.md index 3c86206f75f..401f00d6676 100644 --- a/markdown/org/showcase/a-noble-top-for-the-renaissance-festival/en.md +++ b/markdown/org/showcase/a-noble-top-for-the-renaissance-festival/en.md @@ -4,7 +4,7 @@ caption: "This top is made from scrap cotton fabrics" date: 20231016 intro: "This top is based on the Noble block." designs: ["tristan"] -maker: Natalia +author: 19867 --- This top was made based on the Noble block, and later spun off into its own design, Tristan. The wearer reports that their body is asymmetric, which you can see in the back view. They were very happy with this simple variation of Noble. diff --git a/markdown/org/showcase/bella-block/en.md b/markdown/org/showcase/bella-block/en.md index 9cd14743e0f..920e4bd8ca9 100644 --- a/markdown/org/showcase/bella-block/en.md +++ b/markdown/org/showcase/bella-block/en.md @@ -5,6 +5,7 @@ date: "2021-01-21" intro: "Bella bodice block" title: "Bella bodice block" designs: ["bella"] +author: 19867 --- diff --git a/markdown/org/showcase/green-cathrin/en.md b/markdown/org/showcase/green-cathrin/en.md index 2406501d3b4..78ec216767e 100644 --- a/markdown/org/showcase/green-cathrin/en.md +++ b/markdown/org/showcase/green-cathrin/en.md @@ -5,6 +5,7 @@ date: "2021-10-19" intro: "A green 11-panel Cathrin corset" title: "A green 11-panel Cathrin corset" designs: ["cathrin"] +author: 19867 --- ![cathrin1.jpg](https://posts.freesewing.org/uploads/cathrin1_4e664dbf4c.jpg) diff --git a/markdown/org/showcase/lower-rise-ursula/en.md b/markdown/org/showcase/lower-rise-ursula/en.md index 68c9b6c3530..7b9ad3d4c74 100644 --- a/markdown/org/showcase/lower-rise-ursula/en.md +++ b/markdown/org/showcase/lower-rise-ursula/en.md @@ -5,6 +5,7 @@ date: "2021-09-16" intro: "This Ursula was made made in a cotton spandex knit (94% Cotton, 6% Spandex) with burgundy picot elastic." title: "Lower rise Ursula" designs: ["ursula"] +author: 19867 --- This Ursula was made made in a cotton spandex knit (94% Cotton, 6% Spandex) with burgundy picot elastic. diff --git a/markdown/org/showcase/mini-shin-swim-trunks/en.md b/markdown/org/showcase/mini-shin-swim-trunks/en.md index d4b2990124d..4deeb1d6a46 100644 --- a/markdown/org/showcase/mini-shin-swim-trunks/en.md +++ b/markdown/org/showcase/mini-shin-swim-trunks/en.md @@ -5,6 +5,7 @@ date: "2022-06-27" intro: "The making of these mini Shins was photographed to help draw illustrations for the instructions. While those are under construction -- or if you prefer photographs to drawings -- the entire series of photos can be viewed on Discord ." title: "Mini Shin swim trunks" designs: ["shin"] +author: 19867 --- The making of these mini Shins was photographed to help draw illustrations for the instructions. While those are under construction -- or if you prefer photographs to drawings -- the entire series of photos can be [viewed on Discord](https://discord.com/channels/698854858052075530/787402509543145532/973065355763253289). diff --git a/markdown/org/showcase/modified-tamiko-nursing-cover/en.md b/markdown/org/showcase/modified-tamiko-nursing-cover/en.md index 591b465a381..254852231e3 100644 --- a/markdown/org/showcase/modified-tamiko-nursing-cover/en.md +++ b/markdown/org/showcase/modified-tamiko-nursing-cover/en.md @@ -5,6 +5,7 @@ date: "2022-06-12" intro: "The maker shared:" title: "Modified Tamiko as a nursing cover" designs: ["tamiko"] +author: 19867 --- The maker shared: diff --git a/markdown/org/showcase/ursula-test-pairs/en.md b/markdown/org/showcase/ursula-test-pairs/en.md index bb5a3fb9349..358d5204626 100644 --- a/markdown/org/showcase/ursula-test-pairs/en.md +++ b/markdown/org/showcase/ursula-test-pairs/en.md @@ -5,6 +5,7 @@ date: "2021-06-26" intro: "Ursula is a basic, highly-customizable undies pattern. Here are some of the early versions testing different combinations of options, which may be useful to you as you design your own pairs." title: "Early tests of Ursula" designs: ["ursula"] +author: 19867 --- From 4261e9f1b24ca2aaac6a6aff8f5fc6dba5542188 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 17:48:30 +0200 Subject: [PATCH 773/795] fix(simone): Add translation for missing options Fixes #6577 --- CHANGELOG.md | 6 ++++++ config/changelog.yaml | 2 ++ designs/simone/i18n/en.json | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index caada1b9923..bbc972f20a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,12 @@ - Always load plugin-bust due to its changes in how it handle conditionality. +### simone + +#### Fixed + + - Added missing translation for various options + ### tamiko #### Changed diff --git a/config/changelog.yaml b/config/changelog.yaml index ea16c38b722..6823de4e8d1 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -35,6 +35,8 @@ Unreleased: noble: - Fix 'cutonfold' text for Noble's back part. Fixes #6447 - Improve dart shaping. Fixes #64547 + simone: + - Added missing translation for various options teagan: - Fix side seam when length is cropped. Fixes #6480 uma: diff --git a/designs/simone/i18n/en.json b/designs/simone/i18n/en.json index 3ce043f279b..d7f7ef8c1d6 100644 --- a/designs/simone/i18n/en.json +++ b/designs/simone/i18n/en.json @@ -23,6 +23,18 @@ "t": "Bust-aligned buttons", "d": "Optional button spacing strategies to ensure a button at the bustline" }, + "bustAlignedButtons.even": { + "t": "Even spacing", + "d": "Button spacing is calculated for buttons above the bustline, and this spacing is used for all buttons." + }, + "bustAlignedButtons.split": { + "t": "Split spacing", + "d": "Different button spacings are calculated and used for buttons above and below the bustline." + }, + "bustAlignedButtons.disabled": { + "t": "Disabled", + "d": "Different button spacings are calculated and used for buttons above and below the bustline." + }, "bustDartAngle": { "t": "Bust dart angle", "d": "Controls the angle by which the (side) bust dart slopes downward" @@ -39,6 +51,14 @@ "t": "Front darts", "d": "Whether to include front darts or not" }, + "frontDarts.no": { + "t": "No front darts", + "d": "Do not include front darts" + }, + "frontDarts.yes": { + "t": "With front darts", + "d": "Do include front darts" + }, "frontDartLength": { "t": "Front dart length", "d": "Controls how close the front dart approaches the bust point" From 964eff784880688ad5339a358c696e06b8bfd53e Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 27 Apr 2024 19:06:16 +0200 Subject: [PATCH 774/795] fix(simone): Incorrect translation structure --- designs/simone/i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/designs/simone/i18n/en.json b/designs/simone/i18n/en.json index d7f7ef8c1d6..f9c139d88ac 100644 --- a/designs/simone/i18n/en.json +++ b/designs/simone/i18n/en.json @@ -51,11 +51,11 @@ "t": "Front darts", "d": "Whether to include front darts or not" }, - "frontDarts.no": { + "frontDartsNo": { "t": "No front darts", "d": "Do not include front darts" }, - "frontDarts.yes": { + "frontDartsYes": { "t": "With front darts", "d": "Do include front darts" }, From 079a739c1a7ae925d220e609dab05be7ecad4379 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 15:44:56 +0200 Subject: [PATCH 775/795] chore(org): Wrap scan for jargon in try ... catch Vercel is unhappy because the scan for jargon pages errors, but I honestly don't know why because the command runs just fine locally. So I've wrapped this in a try ... catch block, but we'll have to await the Vercel build to check whether that resolves the matter. --- sites/shared/prebuild/markdown.mjs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/sites/shared/prebuild/markdown.mjs b/sites/shared/prebuild/markdown.mjs index 6f5c3bb048b..4729f123035 100644 --- a/sites/shared/prebuild/markdown.mjs +++ b/sites/shared/prebuild/markdown.mjs @@ -40,14 +40,16 @@ const loadFolderFrontmatter = async (key, site, folder, transform = false, lang * it's much faster to first run find to limit the number of files to open */ const cmd = `find . -type f -name "${lang ? lang : '*'}.md" -exec grep "^${key}:" -ism 1 {} +` - const grep = exec(cmd, { cwd, maxBuffer: 2048 * 1024 }, (error, stdout, stderr) => { - if (error) { - console.error(`exec error: ${error} - ${stderr}`) - return - } + let grep + try { + grep = exec(cmd, { cwd, maxBuffer: 2048 * 1024 }, (error, stdout, stderr) => { + if (error) console.error('Exec error:', { cwd, cmd, error, stderr }) - return stdout - }) + return stdout + }) + } catch (err) { + console.log('caught', err) + } /* * Stdout is buffered, so we need to gather all of it From 21ee1c4a36c7204eb2869ac0924af6d86039bf3f Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 15:51:19 +0200 Subject: [PATCH 776/795] fix(org): Switch to direct grep rather than find When we don't care about the language, use grep directly rather than find first in prebuild script. This is to sidestep an issue where the vercel build fails because the find+grep combo fails (even though it does find the results). --- sites/shared/prebuild/markdown.mjs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/sites/shared/prebuild/markdown.mjs b/sites/shared/prebuild/markdown.mjs index 4729f123035..b315cb7e15d 100644 --- a/sites/shared/prebuild/markdown.mjs +++ b/sites/shared/prebuild/markdown.mjs @@ -39,17 +39,15 @@ const loadFolderFrontmatter = async (key, site, folder, transform = false, lang * But the biggest task is combing through all the org documentation and for this * it's much faster to first run find to limit the number of files to open */ - const cmd = `find . -type f -name "${lang ? lang : '*'}.md" -exec grep "^${key}:" -ism 1 {} +` - let grep - try { - grep = exec(cmd, { cwd, maxBuffer: 2048 * 1024 }, (error, stdout, stderr) => { - if (error) console.error('Exec error:', { cwd, cmd, error, stderr }) + //const cmd = `find . -type f -name "${lang ? lang : '*'}.md" -exec grep "^${key}:" -ism 1 {} +` + const cmd = lang + ? `find . -type f -name "${lang ? lang : '*'}.md" -exec grep "^${key}:" -ism 1 {} +` + : `grep -R "^${key}:" -ism 1 .` + const grep = exec(cmd, { cwd, maxBuffer: 2048 * 1024 }, (error, stdout, stderr) => { + if (error) console.error('Exec error:', { cwd, cmd, error, stderr }) - return stdout - }) - } catch (err) { - console.log('caught', err) - } + return stdout + }) /* * Stdout is buffered, so we need to gather all of it From 10c61372242347444445c0ed6029902f7ec2d388 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 15:58:09 +0200 Subject: [PATCH 777/795] fix(org): Add next-i18next as dependency --- config/dependencies.yaml | 1 + sites/org/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 599a1bf4ce9..9eec638667e 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -302,6 +302,7 @@ org: 'lodash.set': *_set 'luxon': '3.4.4' 'next': *next + 'next-i18next': *nextI18next 'ora': *ora 'react-dropzone': &dropzone '14.2.3' 'react-hotkeys-hook': *reactHotkeysHook diff --git a/sites/org/package.json b/sites/org/package.json index 9276ee11271..404bb4692f9 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -47,6 +47,7 @@ "lodash.set": "4.3.2", "luxon": "3.4.4", "next": "14.1.4", + "next-i18next": "15.2.0", "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", From 4e89ab323e7a3dee566a946984570a2d0582e32f Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:05:36 +0200 Subject: [PATCH 778/795] fix(cathrin): Allow negative values for backDrop and frontRise options Fixes #6563 --- CHANGELOG.md | 7 +++++++ config/changelog.yaml | 3 +++ designs/cathrin/src/base.mjs | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbc972f20a6..37bb1558ee7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,13 @@ - Always load plugin-bust due to its changes in how it handle conditionality. +### cathrin + +#### Changed + + - Allow negative values in backDrop option + - Allow negative values for the frontRise options + ### huey #### Changed diff --git a/config/changelog.yaml b/config/changelog.yaml index 6823de4e8d1..54267158ec7 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -6,6 +6,9 @@ Unreleased: Changed: brian: - Always load plugin-bust due to its changes in how it handle conditionality. + cathrin: + - Allow negative values in backDrop option + - Allow negative values for the frontRise options huey: - The lengthBonus option default was changed from 0% to 15%. Fixes #6596 onyx: diff --git a/designs/cathrin/src/base.mjs b/designs/cathrin/src/base.mjs index 2d28510d504..883b823659b 100644 --- a/designs/cathrin/src/base.mjs +++ b/designs/cathrin/src/base.mjs @@ -98,8 +98,8 @@ export const base = { panels: { list: ['11', '13'], dflt: '13', menu: 'fit' }, backOpening: { pct: 4, min: 3, max: 10, menu: 'style' }, backRise: { pct: 15, min: 1, max: 25, menu: 'style' }, - backDrop: { pct: 2, min: 0, max: 5, menu: 'style' }, - frontRise: { pct: 4, min: 0.1, max: 8, menu: 'style' }, + backDrop: { pct: 2, min: -10, max: 5, menu: 'style' }, + frontRise: { pct: 4, min: -10, max: 8, menu: 'style' }, frontDrop: { pct: 5, min: 0, max: 10, menu: 'style' }, hipRise: { pct: 5, min: 0, max: 15, menu: 'style' }, }, From 1ef19839af9cbbdbc26d948dfb633bd2d3943767 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:08:07 +0200 Subject: [PATCH 779/795] fix(org): Missing dependencies for org site --- config/dependencies.yaml | 4 +++- sites/org/package.json | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 9eec638667e..6cd078df11d 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -306,9 +306,11 @@ org: 'ora': *ora 'react-dropzone': &dropzone '14.2.3' 'react-hotkeys-hook': *reactHotkeysHook + "react-i18next": *reactI18next 'react-instantsearch-dom': *reactInstantsearchDom 'react-swipeable': *reactSwipeable 'react-timeago': *reactTimeago + 'react-zoom-pan-pinch': &zoompanpinch '3.4.3' 'rehype-autolink-headings': *rehypeAutolinkHeadings 'rehype-highlight': *rehypeHighlight 'rehype-sanitize': *rehypeSanitize @@ -353,7 +355,7 @@ shared: 'react': *react 'react-dom': *react 'react-timeago': *reactTimeago - 'react-zoom-pan-pinch': &zoompanpinch '3.4.3' + 'react-zoom-pan-pinch': *zoompanpinch 'rehype-autolink-headings': *rehypeAutolinkHeadings 'rehype-highlight': *rehypeHighlight 'remark-frontmatter': &remarkfrontmatter '5.0.0' diff --git a/sites/org/package.json b/sites/org/package.json index 404bb4692f9..0bea7591098 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -51,9 +51,11 @@ "ora": "8.0.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", + "react-i18next": "14.1.0", "react-instantsearch-dom": "6.40.4", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", + "react-zoom-pan-pinch": "3.4.3", "rehype-autolink-headings": "7.1.0", "rehype-highlight": "7.0.0", "rehype-sanitize": "6.0.0", From f4f8349e59280226370f3473815df3bfd855535e Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:08:07 +0200 Subject: [PATCH 780/795] fix(org): Missing dependencies for org site --- config/dependencies.yaml | 3 ++- sites/org/package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 6cd078df11d..7664a5a1fc0 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -223,7 +223,7 @@ dev: 'react-dom': *react 'react-hotkeys-hook': &reactHotkeysHook '4.5.0' 'react-instantsearch-dom': &reactInstantsearchDom '6.40.4' - 'react-instantsearch-hooks-web': '6.47.3' + 'react-instantsearch-hooks-web': &reactInstantsearchHooksWeb '6.47.3' 'react-swipeable': &reactSwipeable '7.0.1' 'react-timeago': &reactTimeago '7.2.0' 'rehype-autolink-headings': &rehypeAutolinkHeadings '7.1.0' @@ -308,6 +308,7 @@ org: 'react-hotkeys-hook': *reactHotkeysHook "react-i18next": *reactI18next 'react-instantsearch-dom': *reactInstantsearchDom + 'react-instantsearch-hooks-web': *reactInstantsearchHooksWeb 'react-swipeable': *reactSwipeable 'react-timeago': *reactTimeago 'react-zoom-pan-pinch': &zoompanpinch '3.4.3' diff --git a/sites/org/package.json b/sites/org/package.json index 0bea7591098..1b70cc982f6 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -53,6 +53,7 @@ "react-hotkeys-hook": "4.5.0", "react-i18next": "14.1.0", "react-instantsearch-dom": "6.40.4", + "react-instantsearch-hooks-web": "6.47.3", "react-swipeable": "7.0.1", "react-timeago": "7.2.0", "react-zoom-pan-pinch": "3.4.3", From 5339020a232b121ffa264dbf2fe82a48060a0c6f Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:21:06 +0200 Subject: [PATCH 781/795] feat(simon): Allow negative values for buttonFreeLength option Fixes #6508 Shout-out to @karlnippoldt for reporting this. --- CHANGELOG.md | 10 ++++++++-- config/changelog.yaml | 6 ++++-- designs/simon/src/options.mjs | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37bb1558ee7..592bb59cca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,8 +13,8 @@ #### Changed - - Allow negative values in backDrop option - - Allow negative values for the frontRise options + - Allow negative values in backDrop option. Fixes + - Allow negative values for the frontRise options. Fixes ### huey @@ -53,6 +53,12 @@ - Always load plugin-bust due to its changes in how it handle conditionality. +### simon + +#### Changed + + - Allow negative values for the buttonFreeLength option. Fixes + ### simone #### Fixed diff --git a/config/changelog.yaml b/config/changelog.yaml index 54267158ec7..4a3c89c98dc 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -7,8 +7,8 @@ Unreleased: brian: - Always load plugin-bust due to its changes in how it handle conditionality. cathrin: - - Allow negative values in backDrop option - - Allow negative values for the frontRise options + - Allow negative values in backDrop option. Fixes #6563 + - Allow negative values for the frontRise options. Fixes #6563 huey: - The lengthBonus option default was changed from 0% to 15%. Fixes #6596 onyx: @@ -19,6 +19,8 @@ Unreleased: - The plugin will now always be loaded, but will check for each drafted set whether it should make any changes. shelly: - Always load plugin-bust due to its changes in how it handle conditionality. + simon: + - Allow negative values for the buttonFreeLength option. Fixes #6508 tamiko: - Always load plugin-bust due to its changes in how it handle conditionality. wahid: diff --git a/designs/simon/src/options.mjs b/designs/simon/src/options.mjs index 6c96b607e7f..65276e3b2e7 100644 --- a/designs/simon/src/options.mjs +++ b/designs/simon/src/options.mjs @@ -9,7 +9,7 @@ export const boxPleatFold = { pct: 15, min: 10, max: 20, menu: 'advanced' } export const boxPleatWidth = { pct: 7, min: 4, max: 10, menu: 'advanced' } export const roundBack = { pct: 0, min: 0, max: 10, menu: 'fit' } // Front -export const buttonFreeLength = { pct: 2, min: 0, max: 15, menu: 'style.closure' } +export const buttonFreeLength = { pct: 2, min: -10, max: 15, menu: 'style.closure' } export const buttonholePlacketStyle = { list: ['classic', 'seamless'], dflt: 'seamless', From 8388c1f81e11e9cbd04a4ac0d6277c933567e509 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:25:30 +0200 Subject: [PATCH 782/795] wip: dependencies for freesewing.org --- config/dependencies.yaml | 1 + sites/org/package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 7664a5a1fc0..c9a287eeb2c 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -304,6 +304,7 @@ org: 'next': *next 'next-i18next': *nextI18next 'ora': *ora + 'react-dom': *react 'react-dropzone': &dropzone '14.2.3' 'react-hotkeys-hook': *reactHotkeysHook "react-i18next": *reactI18next diff --git a/sites/org/package.json b/sites/org/package.json index 1b70cc982f6..ed83ea97bdc 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -49,6 +49,7 @@ "next": "14.1.4", "next-i18next": "15.2.0", "ora": "8.0.1", + "react-dom": "18.3.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", "react-i18next": "14.1.0", From 9b182bc0568d03939e7565b186c90b6501190f58 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:58:06 +0200 Subject: [PATCH 783/795] fix(org): React dependency issue --- config/dependencies.yaml | 1 + packages/new-design/lib/download-list.mjs | 262 +- sites/org/package.json | 1 + sites/shared/prebuild/data/design-options.mjs | 2 +- yarn.lock | 3752 ++++++++++------- 5 files changed, 2321 insertions(+), 1697 deletions(-) diff --git a/config/dependencies.yaml b/config/dependencies.yaml index c9a287eeb2c..c58e514fca0 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -304,6 +304,7 @@ org: 'next': *next 'next-i18next': *nextI18next 'ora': *ora + 'react': *react 'react-dom': *react 'react-dropzone': &dropzone '14.2.3' 'react-hotkeys-hook': *reactHotkeysHook diff --git a/packages/new-design/lib/download-list.mjs b/packages/new-design/lib/download-list.mjs index 9e1ae9e4e8a..e5c0c5778af 100644 --- a/packages/new-design/lib/download-list.mjs +++ b/packages/new-design/lib/download-list.mjs @@ -10,6 +10,7 @@ export const downloads = { 'sde/site.config.mjs', 'sde/tailwind.config.mjs', 'sde/hooks/use-design.mjs', + 'sde/pkgs/.gitkeep', 'sde/mock/designs.mjs', 'sde/mock/docs-helpers.mjs', 'sde/mock/highlight.mjs', @@ -20,7 +21,6 @@ export const downloads = { 'sde/mock/read-more.mjs', 'sde/mock/tabbed-example.mjs', 'sde/mock/youtube.mjs', - 'sde/pkgs/.gitkeep', 'sde/prebuild/.gitkeep', 'sde/prebuild/sitenav.de.mjs', 'sde/prebuild/sitenav.en.mjs', @@ -36,11 +36,23 @@ export const downloads = { 'sde/components/search.mjs', 'sde/components/header/design-picker.mjs', 'sde/components/header/index.mjs', + 'sde/components/navigation/modal-menu.mjs', 'sde/components/layouts/bare.mjs', 'sde/components/layouts/default.mjs', 'sde/components/layouts/workbench.mjs', - 'sde/components/navigation/modal-menu.mjs', 'sde/components/wrappers/page.mjs', + 'sde/design/from-bent/src/back.mjs', + 'sde/design/from-bent/src/front.mjs', + 'sde/design/from-bent/src/index.mjs', + 'sde/design/from-bent/src/top-sleeve.mjs', + 'sde/design/from-bent/src/under-sleeve.mjs', + 'sde/design/from-bent/i18n/de.json', + 'sde/design/from-bent/i18n/en.json', + 'sde/design/from-bent/i18n/es.json', + 'sde/design/from-bent/i18n/fr.json', + 'sde/design/from-bent/i18n/index.mjs', + 'sde/design/from-bent/i18n/nl.json', + 'sde/design/from-bent/i18n/uk.json', 'sde/design/from-bella/en.json', 'sde/design/from-bella/i18n/de.json', 'sde/design/from-bella/i18n/en.json', @@ -63,27 +75,6 @@ export const downloads = { 'sde/design/from-breanna/src/front.mjs', 'sde/design/from-breanna/src/index.mjs', 'sde/design/from-breanna/src/sleeve.mjs', - 'sde/design/from-bent/i18n/de.json', - 'sde/design/from-bent/i18n/en.json', - 'sde/design/from-bent/i18n/es.json', - 'sde/design/from-bent/i18n/fr.json', - 'sde/design/from-bent/i18n/index.mjs', - 'sde/design/from-bent/i18n/nl.json', - 'sde/design/from-bent/i18n/uk.json', - 'sde/design/from-bent/src/back.mjs', - 'sde/design/from-bent/src/front.mjs', - 'sde/design/from-bent/src/index.mjs', - 'sde/design/from-bent/src/top-sleeve.mjs', - 'sde/design/from-bent/src/under-sleeve.mjs', - 'sde/design/from-scratch/i18n/de.json', - 'sde/design/from-scratch/i18n/en.json', - 'sde/design/from-scratch/i18n/es.json', - 'sde/design/from-scratch/i18n/fr.json', - 'sde/design/from-scratch/i18n/index.mjs', - 'sde/design/from-scratch/i18n/nl.json', - 'sde/design/from-scratch/i18n/uk.json', - 'sde/design/from-scratch/src/bib.mjs', - 'sde/design/from-scratch/src/index.mjs', 'sde/design/from-brian/i18n/de.json', 'sde/design/from-brian/i18n/en.json', 'sde/design/from-brian/i18n/es.json', @@ -95,6 +86,15 @@ export const downloads = { 'sde/design/from-brian/src/front.mjs', 'sde/design/from-brian/src/index.mjs', 'sde/design/from-brian/src/sleeve.mjs', + 'sde/design/from-scratch/i18n/de.json', + 'sde/design/from-scratch/i18n/en.json', + 'sde/design/from-scratch/i18n/es.json', + 'sde/design/from-scratch/i18n/fr.json', + 'sde/design/from-scratch/i18n/index.mjs', + 'sde/design/from-scratch/i18n/nl.json', + 'sde/design/from-scratch/i18n/uk.json', + 'sde/design/from-scratch/src/bib.mjs', + 'sde/design/from-scratch/src/index.mjs', 'sde/design/from-titan/i18n/de.json', 'sde/design/from-titan/i18n/en.json', 'sde/design/from-titan/i18n/es.json', @@ -189,60 +189,6 @@ export const downloads = { 'sde/public/locales/de/tutorial.json', 'sde/public/locales/de/ui-settings.json', 'sde/public/locales/de/workbench.json', - 'sde/public/locales/es/account.json', - 'sde/public/locales/es/auth.json', - 'sde/public/locales/es/bella.json', - 'sde/public/locales/es/bent.json', - 'sde/public/locales/es/breanna.json', - 'sde/public/locales/es/brian.json', - 'sde/public/locales/es/common.json', - 'sde/public/locales/es/core-settings.json', - 'sde/public/locales/es/curate.json', - 'sde/public/locales/es/cut.json', - 'sde/public/locales/es/design-options.json', - 'sde/public/locales/es/designs.json', - 'sde/public/locales/es/docs.json', - 'sde/public/locales/es/errors.json', - 'sde/public/locales/es/flag.json', - 'sde/public/locales/es/footer.json', - 'sde/public/locales/es/frombella.json', - 'sde/public/locales/es/frombent.json', - 'sde/public/locales/es/frombreanna.json', - 'sde/public/locales/es/frombrian.json', - 'sde/public/locales/es/fromscratch.json', - 'sde/public/locales/es/fromtitan.json', - 'sde/public/locales/es/gdpr.json', - 'sde/public/locales/es/header.json', - 'sde/public/locales/es/hodl.json', - 'sde/public/locales/es/homepage.json', - 'sde/public/locales/es/lab.json', - 'sde/public/locales/es/locales.json', - 'sde/public/locales/es/logs.json', - 'sde/public/locales/es/measurements.json', - 'sde/public/locales/es/modal.json', - 'sde/public/locales/es/newsletter.json', - 'sde/public/locales/es/patrons.json', - 'sde/public/locales/es/plugin-annotations.json', - 'sde/public/locales/es/plugins.json', - 'sde/public/locales/es/popout.json', - 'sde/public/locales/es/print.json', - 'sde/public/locales/es/roles.json', - 'sde/public/locales/es/sde.json', - 'sde/public/locales/es/sections.json', - 'sde/public/locales/es/sets.json', - 'sde/public/locales/es/sponsors.json', - 'sde/public/locales/es/status.json', - 'sde/public/locales/es/submissions.json', - 'sde/public/locales/es/support.json', - 'sde/public/locales/es/susi.json', - 'sde/public/locales/es/tags.json', - 'sde/public/locales/es/techniques.json', - 'sde/public/locales/es/themes.json', - 'sde/public/locales/es/timeago.json', - 'sde/public/locales/es/titan.json', - 'sde/public/locales/es/tutorial.json', - 'sde/public/locales/es/ui-settings.json', - 'sde/public/locales/es/workbench.json', 'sde/public/locales/en/account.json', 'sde/public/locales/en/auth.json', 'sde/public/locales/en/bella.json', @@ -297,60 +243,6 @@ export const downloads = { 'sde/public/locales/en/tutorial.json', 'sde/public/locales/en/ui-settings.json', 'sde/public/locales/en/workbench.json', - 'sde/public/locales/nl/account.json', - 'sde/public/locales/nl/auth.json', - 'sde/public/locales/nl/bella.json', - 'sde/public/locales/nl/bent.json', - 'sde/public/locales/nl/breanna.json', - 'sde/public/locales/nl/brian.json', - 'sde/public/locales/nl/common.json', - 'sde/public/locales/nl/core-settings.json', - 'sde/public/locales/nl/curate.json', - 'sde/public/locales/nl/cut.json', - 'sde/public/locales/nl/design-options.json', - 'sde/public/locales/nl/designs.json', - 'sde/public/locales/nl/docs.json', - 'sde/public/locales/nl/errors.json', - 'sde/public/locales/nl/flag.json', - 'sde/public/locales/nl/footer.json', - 'sde/public/locales/nl/frombella.json', - 'sde/public/locales/nl/frombent.json', - 'sde/public/locales/nl/frombreanna.json', - 'sde/public/locales/nl/frombrian.json', - 'sde/public/locales/nl/fromscratch.json', - 'sde/public/locales/nl/fromtitan.json', - 'sde/public/locales/nl/gdpr.json', - 'sde/public/locales/nl/header.json', - 'sde/public/locales/nl/hodl.json', - 'sde/public/locales/nl/homepage.json', - 'sde/public/locales/nl/lab.json', - 'sde/public/locales/nl/locales.json', - 'sde/public/locales/nl/logs.json', - 'sde/public/locales/nl/measurements.json', - 'sde/public/locales/nl/modal.json', - 'sde/public/locales/nl/newsletter.json', - 'sde/public/locales/nl/patrons.json', - 'sde/public/locales/nl/plugin-annotations.json', - 'sde/public/locales/nl/plugins.json', - 'sde/public/locales/nl/popout.json', - 'sde/public/locales/nl/print.json', - 'sde/public/locales/nl/roles.json', - 'sde/public/locales/nl/sde.json', - 'sde/public/locales/nl/sections.json', - 'sde/public/locales/nl/sets.json', - 'sde/public/locales/nl/sponsors.json', - 'sde/public/locales/nl/status.json', - 'sde/public/locales/nl/submissions.json', - 'sde/public/locales/nl/support.json', - 'sde/public/locales/nl/susi.json', - 'sde/public/locales/nl/tags.json', - 'sde/public/locales/nl/techniques.json', - 'sde/public/locales/nl/themes.json', - 'sde/public/locales/nl/timeago.json', - 'sde/public/locales/nl/titan.json', - 'sde/public/locales/nl/tutorial.json', - 'sde/public/locales/nl/ui-settings.json', - 'sde/public/locales/nl/workbench.json', 'sde/public/locales/fr/account.json', 'sde/public/locales/fr/auth.json', 'sde/public/locales/fr/bella.json', @@ -405,6 +297,114 @@ export const downloads = { 'sde/public/locales/fr/tutorial.json', 'sde/public/locales/fr/ui-settings.json', 'sde/public/locales/fr/workbench.json', + 'sde/public/locales/nl/account.json', + 'sde/public/locales/nl/auth.json', + 'sde/public/locales/nl/bella.json', + 'sde/public/locales/nl/bent.json', + 'sde/public/locales/nl/breanna.json', + 'sde/public/locales/nl/brian.json', + 'sde/public/locales/nl/common.json', + 'sde/public/locales/nl/core-settings.json', + 'sde/public/locales/nl/curate.json', + 'sde/public/locales/nl/cut.json', + 'sde/public/locales/nl/design-options.json', + 'sde/public/locales/nl/designs.json', + 'sde/public/locales/nl/docs.json', + 'sde/public/locales/nl/errors.json', + 'sde/public/locales/nl/flag.json', + 'sde/public/locales/nl/footer.json', + 'sde/public/locales/nl/frombella.json', + 'sde/public/locales/nl/frombent.json', + 'sde/public/locales/nl/frombreanna.json', + 'sde/public/locales/nl/frombrian.json', + 'sde/public/locales/nl/fromscratch.json', + 'sde/public/locales/nl/fromtitan.json', + 'sde/public/locales/nl/gdpr.json', + 'sde/public/locales/nl/header.json', + 'sde/public/locales/nl/hodl.json', + 'sde/public/locales/nl/homepage.json', + 'sde/public/locales/nl/lab.json', + 'sde/public/locales/nl/locales.json', + 'sde/public/locales/nl/logs.json', + 'sde/public/locales/nl/measurements.json', + 'sde/public/locales/nl/modal.json', + 'sde/public/locales/nl/newsletter.json', + 'sde/public/locales/nl/patrons.json', + 'sde/public/locales/nl/plugin-annotations.json', + 'sde/public/locales/nl/plugins.json', + 'sde/public/locales/nl/popout.json', + 'sde/public/locales/nl/print.json', + 'sde/public/locales/nl/roles.json', + 'sde/public/locales/nl/sde.json', + 'sde/public/locales/nl/sections.json', + 'sde/public/locales/nl/sets.json', + 'sde/public/locales/nl/sponsors.json', + 'sde/public/locales/nl/status.json', + 'sde/public/locales/nl/submissions.json', + 'sde/public/locales/nl/support.json', + 'sde/public/locales/nl/susi.json', + 'sde/public/locales/nl/tags.json', + 'sde/public/locales/nl/techniques.json', + 'sde/public/locales/nl/themes.json', + 'sde/public/locales/nl/timeago.json', + 'sde/public/locales/nl/titan.json', + 'sde/public/locales/nl/tutorial.json', + 'sde/public/locales/nl/ui-settings.json', + 'sde/public/locales/nl/workbench.json', + 'sde/public/locales/es/account.json', + 'sde/public/locales/es/auth.json', + 'sde/public/locales/es/bella.json', + 'sde/public/locales/es/bent.json', + 'sde/public/locales/es/breanna.json', + 'sde/public/locales/es/brian.json', + 'sde/public/locales/es/common.json', + 'sde/public/locales/es/core-settings.json', + 'sde/public/locales/es/curate.json', + 'sde/public/locales/es/cut.json', + 'sde/public/locales/es/design-options.json', + 'sde/public/locales/es/designs.json', + 'sde/public/locales/es/docs.json', + 'sde/public/locales/es/errors.json', + 'sde/public/locales/es/flag.json', + 'sde/public/locales/es/footer.json', + 'sde/public/locales/es/frombella.json', + 'sde/public/locales/es/frombent.json', + 'sde/public/locales/es/frombreanna.json', + 'sde/public/locales/es/frombrian.json', + 'sde/public/locales/es/fromscratch.json', + 'sde/public/locales/es/fromtitan.json', + 'sde/public/locales/es/gdpr.json', + 'sde/public/locales/es/header.json', + 'sde/public/locales/es/hodl.json', + 'sde/public/locales/es/homepage.json', + 'sde/public/locales/es/lab.json', + 'sde/public/locales/es/locales.json', + 'sde/public/locales/es/logs.json', + 'sde/public/locales/es/measurements.json', + 'sde/public/locales/es/modal.json', + 'sde/public/locales/es/newsletter.json', + 'sde/public/locales/es/patrons.json', + 'sde/public/locales/es/plugin-annotations.json', + 'sde/public/locales/es/plugins.json', + 'sde/public/locales/es/popout.json', + 'sde/public/locales/es/print.json', + 'sde/public/locales/es/roles.json', + 'sde/public/locales/es/sde.json', + 'sde/public/locales/es/sections.json', + 'sde/public/locales/es/sets.json', + 'sde/public/locales/es/sponsors.json', + 'sde/public/locales/es/status.json', + 'sde/public/locales/es/submissions.json', + 'sde/public/locales/es/support.json', + 'sde/public/locales/es/susi.json', + 'sde/public/locales/es/tags.json', + 'sde/public/locales/es/techniques.json', + 'sde/public/locales/es/themes.json', + 'sde/public/locales/es/timeago.json', + 'sde/public/locales/es/titan.json', + 'sde/public/locales/es/tutorial.json', + 'sde/public/locales/es/ui-settings.json', + 'sde/public/locales/es/workbench.json', 'sde/public/locales/uk/account.json', 'sde/public/locales/uk/auth.json', 'sde/public/locales/uk/bella.json', diff --git a/sites/org/package.json b/sites/org/package.json index ed83ea97bdc..0a5f4e5d335 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -49,6 +49,7 @@ "next": "14.1.4", "next-i18next": "15.2.0", "ora": "8.0.1", + "react": "18.3.1", "react-dom": "18.3.1", "react-dropzone": "14.2.3", "react-hotkeys-hook": "4.5.0", diff --git a/sites/shared/prebuild/data/design-options.mjs b/sites/shared/prebuild/data/design-options.mjs index 7e75e64ef56..38eedb053d2 100644 --- a/sites/shared/prebuild/data/design-options.mjs +++ b/sites/shared/prebuild/data/design-options.mjs @@ -1,3 +1,3 @@ // __SDEFILE__ - This file is a dependency for the stand-alone environment // This file is auto-generated by the prebuild script | Any changes will be overwritten -export const options = {"aaron":{"brianFitSleeve":false,"brianFitCollar":false,"collarFactor":4.8,"bicepsEase":0.05,"chestEase":{"pct":8,"min":0,"max":20,"menu":"style"},"collarEase":0,"cuffEase":0,"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":10,"min":-20,"max":60,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":0.97,"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":0.6,"backNeckCutout":0.05,"frontArmholeDeeper":0,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"hipsEase":{"pct":8,"min":0,"max":20,"menu":"fit"},"stretchFactor":{"pct":5,"min":0,"max":15,"menu":"fit"},"armholeDrop":{"pct":10,"min":0,"max":75,"menu":"style"},"necklineBend":{"pct":100,"min":40,"max":100,"menu":"style"},"necklineDrop":{"pct":20,"min":10,"max":35,"menu":"style"},"shoulderStrapWidth":{"pct":15,"min":10,"max":40,"menu":"style"},"shoulderStrapPlacement":{"pct":40,"min":20,"max":80,"menu":"style"},"backlineBend":{"pct":50,"min":25,"max":100,"menu":"style"},"knitBindingWidth":{"pct":600,"min":300,"max":800,"menu":"style"}},"albert":{"backOpening":{"pct":10,"min":0,"max":25,"menu":"fit"},"bibWidth":{"pct":100,"min":50,"max":125,"menu":"style"},"bibLength":{"pct":75,"min":0,"max":90,"menu":"style"},"lengthBonus":{"pct":0,"min":-20,"max":25,"menu":"style"},"chestDepth":{"pct":22,"min":15,"max":90,"menu":"fit"},"strapWidth":{"pct":60,"min":20,"max":100,"menu":"style"}},"bee":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":10,"min":0,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"advanced"},"bustDartCurve":1,"bustDartLength":1,"waistDartLength":1,"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"advanced"},"backArmholeCurvature":0.63,"backArmholePitchDepth":0.35,"backArmholeSlant":5,"frontArmholeCurvature":0.63,"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"advanced"},"backHemSlope":2.5,"backNeckCutout":0.06,"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"ties":{"bool":true,"menu":"style"},"crossBackTies":{"bool":false,"menu":"style"},"bandLength":{"pct":85,"min":75,"max":90,"menu":"style"},"neckTieLength":{"pct":80,"min":70,"max":100,"menu":"style"},"neckTieWidth":{"pct":6,"min":2,"max":18,"snap":{"metric":[6,13,19,25,32,38],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1]},"menu":"style"},"reversible":{"bool":false,"menu":"style"},"topDepth":{"pct":54,"min":50,"max":80,"menu":"fit"},"bottomCupDepth":{"pct":8,"min":0,"max":20,"menu":"fit"},"sideDepth":{"pct":20.6,"min":0,"max":30,"menu":"fit"},"sideCurve":{"pct":0,"min":-50,"max":50,"menu":"fit"},"frontCurve":{"pct":0,"min":-50,"max":50,"menu":"fit"},"bellaGuide":{"bool":false,"menu":"fit"},"pointedTieEnds":{"bool":false,"menu":"style"},"duoColorTies":{"bool":false,"menu":"style"},"bandTieWidth":{"pct":3,"min":1,"max":9,"snap":{"metric":[6,13,19,25,32,38],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1]},"menu":"style"},"bandTieLength":{"pct":35,"min":30,"max":50,"menu":"style"}},"bella":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":10,"min":0,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"darts"},"bustDartCurve":{"pct":100,"min":0,"max":100,"menu":"darts"},"bustDartLength":{"pct":90,"min":75,"max":100,"menu":"darts"},"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"darts"},"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"armhole"},"backArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"backArmholePitchDepth":{"pct":35,"max":40,"min":30,"menu":"armhole"},"backArmholeSlant":{"deg":5,"min":1,"max":9,"menu":"armhole"},"frontArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"armhole"},"backHemSlope":{"deg":2.5,"min":0,"max":5,"menu":"advanced"},"backNeckCutout":{"pct":6,"min":3,"max":9,"menu":"advanced"},"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"}},"benjamin":{"transitionLength":2,"bandLength":0.17,"adjustmentRibbonWidth":20,"collarEase":{"pct":3,"min":0,"max":6,"menu":"fit"},"adjustmentRibbon":{"bool":false,"menu":"fit"},"tipWidth":{"pct":15,"min":0,"max":20,"menu":"style"},"knotWidth":{"pct":7,"min":5,"max":10,"menu":"style"},"bowLength":{"pct":28,"min":23,"max":33,"menu":"style"},"bowStyle":{"dflt":"butterfly","list":["diamond","butterfly","square","widesquare"],"menu":"style"},"endStyle":{"dflt":"straight","list":["straight","pointed","rounded"],"menu":"style"},"collarBandHeight":{"pct":6,"min":5,"max":8,"menu":"style"}},"bent":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"chestEase":{"pct":8,"min":-4,"max":20,"menu":"fit"},"collarEase":{"pct":3.5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":40,"min":2,"max":100,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":60,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-20,"max":15,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"}},"bob":{"neckRatio":{"pct":80,"min":70,"max":90,"menu":"fit"},"widthRatio":{"pct":45,"min":35,"max":55,"menu":"fit"},"lengthRatio":{"pct":75,"min":55,"max":85,"menu":"fit"},"headSize":{"pct":100,"min":10,"max":200,"snap":5,"menu":"size"}},"breanna":{"collarFactor":4.8,"armholeDepthBase":0.6,"shoulderSeamLength":0.95,"sleeveWidthGuarantee":0.9,"breannaFitSleeve":true,"breannaFitCollar":true,"shoulderDart":{"bool":false,"menu":"fit"},"waistDart":{"bool":true,"menu":"fit"},"primaryBustDart":{"list":["06:00","07:00","08:00","09:00","10:00","11:00","11:30","12:00","12:30","13:00","13:30","14:00","15:00","16:00","17:00"],"dflt":"06:00","doNotTranslate":true,"menu":"style"},"secondaryBustDart":{"list":["none","06:00","07:00","08:00","09:00","10:00","11:00","11:30","12:00","12:30","13:00","13:30","14:00","15:00","16:00","17:00"],"dflt":"13:30","doNotTranslate":true,"menu":"style"},"acrossBackFactor":{"pct":96,"min":93,"max":100,"menu":"advanced"},"armholeDepthFactor":{"pct":100,"min":80,"max":120,"menu":"advanced"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"shoulderDartSize":{"pct":7,"min":4,"max":10},"shoulderDartLength":{"pct":85,"min":60,"max":100},"waistDartSize":{"pct":10,"min":4,"max":15},"waistDartLength":{"pct":85,"min":60,"max":100},"verticalEase":{"pct":2,"min":0,"max":8,"menu":"fit"},"frontArmholeDeeper":{"pct":1,"min":0,"max":5,"menu":"advanced"},"shoulderEase":{"pct":0,"min":0,"max":4,"menu":"fit"},"collarEase":{"pct":3.5,"min":0,"max":10,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"waistEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"primaryBustDartShaping":{"pct":50,"min":25,"max":75,"menu":"style"},"primaryBustDartLength":{"pct":85,"min":65,"max":95,"menu":"style"},"secondaryBustDartLength":{"pct":85,"min":65,"max":95,"menu":"style"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":100,"menu":"advanced"},"frontScyeDart":{"pct":25,"min":0,"max":45,"menu":"fit"},"sleevecapEase":{"pct":0.5,"min":0,"max":2.5,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":110,"min":35,"max":165,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":45,"min":35,"max":55,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":3,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":5.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":4.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"cuffEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"}},"brian":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":-4,"max":60,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"}},"bruce":{"hipRatioFront":0.245,"hipRatioBack":0.315,"legRatioInset":0.3,"legRatioBack":0.32,"gussetRatio":0.0666,"gussetInsetRatio":0.6,"heightRatioInset":0.65,"bulge":{"deg":20,"min":0,"max":40,"menu":"fit"},"legBonus":{"pct":0,"min":-10,"max":20,"menu":"style"},"rise":{"pct":10,"min":0,"max":25,"menu":"style"},"stretch":{"pct":15,"min":5,"max":25,"menu":"fit"},"legStretch":{"pct":40,"min":25,"max":45,"menu":"fit"},"backRise":{"pct":5,"min":0,"max":10,"menu":"fit"}},"carlita":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"collarEase":0.145,"cuffEase":{"pct":60,"min":30,"max":100,"menu":"fit"},"draftForHighBust":true,"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":0,"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"fit"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":65,"min":50,"max":70,"menu":"fit"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":12,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"buttonSpacingHorizontal":{"pct":43.5,"min":15,"max":60,"menu":"style"},"length":{"pct":69,"min":35,"max":100,"menu":"style"},"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"pocketPlacementHorizontal":{"pct":11,"min":5,"max":20,"menu":"pockets"},"pocketPlacementVertical":{"pct":6,"min":5,"max":60,"menu":"pockets"},"pocketWidth":{"pct":95,"min":70,"max":120,"menu":"pockets"},"pocketHeight":{"pct":15,"min":0,"max":40,"menu":"pockets"},"pocketRadius":{"pct":20,"min":0,"max":50,"menu":"pockets"},"pocketFlapRadius":{"pct":15,"min":0,"max":50,"menu":"pockets"},"chestPocketPlacement":{"pct":55,"min":30,"max":65,"menu":"pockets"},"chestPocketAngle":0,"chestPocketHeight":{"pct":60,"min":40,"max":80,"menu":"pockets"},"chestPocketWidth":{"pct":25,"min":15,"max":50,"menu":"pockets"},"innerPocketPlacement":{"pct":53,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"seatEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"contour":{"pct":50,"min":25,"max":75,"menu":"advanced"},"backPleat":0.048,"beltWidth":{"pct":15,"min":10,"max":20,"menu":"style"},"sleeveLengthBonus":{"pct":7,"min":0,"max":20,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"cuffLength":{"pct":15,"min":10,"max":20,"menu":"style"},"chestShapingMax":5,"collarHeight":{"pct":9.6,"min":8,"max":11,"menu":"collar"},"collarFlare":{"pct":20,"min":0,"max":40,"menu":"collar"},"collarSpread":{"deg":4,"min":2,"max":6,"menu":"collar"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"}},"carlton":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"collarEase":0.145,"cuffEase":{"pct":60,"min":30,"max":100,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":0,"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"fit"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":65,"min":50,"max":70,"menu":"fit"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":12,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"buttonSpacingHorizontal":{"pct":43.5,"min":15,"max":60,"menu":"style"},"length":{"pct":69,"min":35,"max":100,"menu":"style"},"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"pocketPlacementHorizontal":{"pct":11,"min":5,"max":20,"menu":"pockets"},"pocketPlacementVertical":{"pct":6,"min":5,"max":60,"menu":"pockets"},"pocketWidth":{"pct":95,"min":70,"max":120,"menu":"pockets"},"pocketHeight":{"pct":15,"min":0,"max":40,"menu":"pockets"},"pocketRadius":{"pct":20,"min":0,"max":50,"menu":"pockets"},"pocketFlapRadius":{"pct":15,"min":0,"max":50,"menu":"pockets"},"chestPocketPlacement":{"pct":55,"min":30,"max":65,"menu":"pockets"},"chestPocketAngle":{"deg":4,"min":0,"max":6,"menu":"pockets"},"chestPocketHeight":{"pct":60,"min":40,"max":80,"menu":"pockets"},"chestPocketWidth":{"pct":25,"min":15,"max":50,"menu":"pockets"},"innerPocketPlacement":{"pct":53,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"seatEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"backPleat":0.048,"beltWidth":{"pct":15,"min":10,"max":20,"menu":"style"},"sleeveLengthBonus":{"pct":7,"min":0,"max":20,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"cuffLength":{"pct":15,"min":10,"max":20,"menu":"style"},"chestShapingMax":5,"collarHeight":{"pct":9.6,"min":8,"max":11,"menu":"collar"},"collarFlare":{"pct":20,"min":0,"max":40,"menu":"collar"},"collarSpread":{"deg":4,"min":2,"max":6,"menu":"collar"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"}},"cathrin":{"waistReduction":{"pct":10,"min":2,"max":20,"menu":"fit"},"panels":{"list":["11","13"],"dflt":"13","menu":"fit"},"backOpening":{"pct":4,"min":3,"max":10,"menu":"style"},"backRise":{"pct":15,"min":1,"max":25,"menu":"style"},"backDrop":{"pct":2,"min":0,"max":5,"menu":"style"},"frontRise":{"pct":4,"min":0.1,"max":8,"menu":"style"},"frontDrop":{"pct":5,"min":0,"max":10,"menu":"style"},"hipRise":{"pct":5,"min":0,"max":15,"menu":"style"}},"charlie":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":false,"waistEase":{"pct":1,"min":0,"max":5,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"kneeEase":{"pct":15,"min":10,"max":30,"menu":"fit"},"waistHeight":{"pct":-4,"min":-15,"max":40,"menu":"style"},"lengthBonus":{"pct":2,"min":-20,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":15,"menu":"style"},"fitKnee":true,"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":55,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":50,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"waistbandReduction":0.25,"waistbandFactor":0.1,"frontPocketSlantDepth":{"pct":85,"min":70,"max":100,"menu":"pockets.frontpockets"},"frontPocketSlantWidth":{"pct":25,"min":15,"max":35,"menu":"pockets.frontpockets"},"frontPocketSlantRound":{"pct":30,"min":5,"max":50,"menu":"pockets.frontpockets"},"frontPocketSlantBend":{"pct":25,"min":5,"max":50,"menu":"pockets.frontpockets"},"frontPocketWidth":{"pct":55,"min":45,"max":65,"menu":"pockets.frontpockets"},"frontPocketDepth":{"pct":100,"min":85,"max":110,"menu":"pockets.frontpockets"},"frontPocketFacing":{"pct":45,"min":25,"max":65,"menu":"pockets.frontpockets"},"flyCurve":{"pct":72,"min":50,"max":100,"menu":"advanced.fly"},"flyLength":{"pct":45,"min":30,"max":60,"menu":"advanced.fly"},"flyWidth":{"pct":15,"min":10,"max":20,"menu":"advanced.fly"},"backPocketVerticalPlacement":{"pct":24,"min":18,"max":30,"menu":"pockets.backpockets"},"backPocketHorizontalPlacement":{"pct":55,"min":48,"max":62,"menu":"pockets.backpockets"},"backPocketWidth":{"pct":55,"min":50,"max":60,"menu":"pockets.backpockets"},"backPocketDepth":{"pct":60,"min":40,"max":80,"menu":"pockets.backpockets"},"backPocketFacing":{"bool":true,"menu":"pockets.backpockets"},"waistbandCurve":{"pct":0,"min":0,"max":35,"menu":"fit"},"beltLoops":{"count":8,"min":6,"max":12,"menu":"advanced"}},"cornelius":{"pctAtoO":0.5,"pctAtoC":0.25,"pctUtoA":0.25,"pctJtoA":0.25,"pctSeatAdjustment":0.5,"ventLength":{"pct":70,"min":25,"max":110,"menu":"style"},"fullness":{"pct":0,"min":0,"max":55,"menu":"fit"},"waistbandBelowWaist":{"pct":5,"min":0,"max":15,"menu":"style"},"waistReduction":{"pct":1,"min":-2,"max":10,"menu":"fit"},"bandBelowKnee":{"pct":25,"min":15,"max":50,"menu":"advanced"},"pctZtoR":0.35,"pctRtoZin":0.75,"pctRtoZup":0.25,"pctRtoKin":0.75,"pctRtoKdown":0.25,"pctKtoRout":0.15,"pctKtoRup":0.25,"pctKtoH":0.7,"flyWidth":{"pct":0.38,"min":0.2,"max":0.6,"menu":"style"},"kneeToBelow":{"pct":94,"min":85,"max":110,"menu":"advanced"},"cuffWidth":{"pct":0,"min":-50,"max":150,"menu":"style"},"cuffStyle":{"dflt":"elegant","list":["traditional","elegant","keystone"],"menu":"style"}},"diana":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":0,"min":-5,"max":50,"menu":"fit"},"chestEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"collarEase":0,"cuffEase":{"pct":20,"min":0,"max":30,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":0,"max":50,"menu":"fit"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":0,"min":0,"max":20,"menu":"advanced"},"armholeDepthFactor":{"pct":55,"min":50,"max":70,"menu":"advanced"},"backNeckCutout":0.05,"frontArmholeDeeper":{"pct":0,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"drapeAngle":{"deg":20,"min":10,"max":30,"menu":"style"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"fit"},"shoulderSeamLength":{"pct":35,"min":0.1,"max":60,"menu":"style"},"waistEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"hipsEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":100,"min":35,"max":165,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":3,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":5.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":4.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":6,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"}},"examples":{"size":{"pct":50,"min":5,"max":100,"menu":"stack"},"x":{"pct":0,"min":-100,"max":100,"menu":"stack"},"y":{"pct":0,"min":-100,"max":100,"menu":"stack"},"stackIt":{"dflt":"Do stack","list":["Do stack","Do not stack"],"menu":"stack"}},"florence":{"length":{"pct":40,"min":35,"max":45,"menu":"fit"},"height":{"pct":26,"min":23,"max":29,"menu":"fit"},"curve":{"pct":12.5,"min":10,"max":15,"menu":"fit"}},"florent":{"topSide":0.8,"brim":0,"headEase":{"pct":2,"min":0,"max":5,"menu":"fit"}},"gozer":{},"hi":{"length":1000,"size":{"pct":100,"min":5,"max":500,"menu":"style"},"nosePointiness":{"pct":0,"min":-5,"max":10,"menu":"style"},"aggressive":{"bool":false,"menu":"style"},"hungry":{"pct":50,"min":0,"max":100,"menu":"style"}},"holmes":{"headEase":{"pct":3,"min":0,"max":9,"snap":{"metric":[6,13,19,25,32,38,44,50],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1,44.45,50.8]},"menu":"fit"},"lengthRatio":{"pct":55,"min":40,"max":60,"menu":"style"},"gores":{"count":6,"min":4,"max":20,"menu":"style"},"visorAngle":{"deg":45,"min":10,"max":90,"menu":"style"},"visorWidth":{"pct":5,"min":1,"max":17,"snap":5,"menu":"style"},"visorLength":{"pct":100,"min":80,"max":150,"menu":"advanced"},"earLength":{"pct":100,"min":80,"max":150,"menu":"style"},"earWidth":{"pct":100,"min":80,"max":150,"menu":"style"},"buttonhole":{"bool":false,"menu":"style"}},"hortensia":{"width":230,"height":330,"size":{"pct":50,"min":20,"max":200,"menu":"style"},"zipperSize":{"dflt":"#5","list":["#3","#4","#4.5","#5","#6","#8","#10","invisible"],"menu":"style"},"minHandleSpaceWidth":80,"maxHandleSpaceWidth":250,"pctHandleSpace":50,"pctHandleVert":42,"handleWidth":{"pct":8.6,"min":4,"max":25,"menu":"style"},"strapLength":{"pct":160,"min":75,"max":250,"menu":"style"}},"huey":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":-4,"max":60,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"ribbing":{"bool":true,"menu":"style"},"ribbingHeight":{"pct":10,"min":5,"max":15,"menu":"style"},"hipsEase":{"pct":8,"min":4,"max":12,"menu":"fit"},"pocket":{"bool":true,"menu":"style"},"pocketHeight":{"pct":30,"min":25,"max":35,"menu":"style"},"pocketWidth":{"pct":60,"min":50,"max":70,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"},"hoodHeight":{"pct":59,"min":55,"max":65,"menu":"style"},"hoodCutback":{"pct":10,"min":5,"max":15,"menu":"style"},"hoodClosure":{"pct":13.5,"min":10,"max":15,"menu":"style"},"hoodDepth":{"pct":8.5,"min":5,"max":12,"menu":"style"},"hoodAngle":{"deg":5,"min":2,"max":8,"menu":"style"},"ribbingStretch":{"pct":15,"min":0,"max":30,"menu":"fit"}},"hugo":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":8,"min":4,"max":20,"menu":"fit"},"collarEase":0.05,"cuffEase":{"pct":20,"min":10,"max":50,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":10,"min":0,"max":20,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":0.5,"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":0,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"hipsEase":{"pct":12,"min":4,"max":20,"menu":"fit"},"ribbingHeight":{"pct":10,"min":4,"max":20,"menu":"style"},"pocketWidth":{"pct":50,"min":35,"max":65,"menu":"style"},"sleevecapEase":0,"sleevecapTopFactorX":0.5,"sleevecapTopFactorY":0.45,"sleevecapBackFactorX":0.6,"sleevecapBackFactorY":0.33,"sleevecapFrontFactorX":0.55,"sleevecapFrontFactorY":0.33,"sleevecapQ1Offset":0.017,"sleevecapQ2Offset":0.035,"sleevecapQ3Offset":0.025,"sleevecapQ4Offset":0.01,"sleevecapQ1Spread1":0.1,"sleevecapQ1Spread2":0.15,"sleevecapQ2Spread1":0.15,"sleevecapQ2Spread2":0.1,"sleevecapQ3Spread1":0.1,"sleevecapQ3Spread2":0.08,"sleevecapQ4Spread1":0.07,"sleevecapQ4Spread2":0.063,"sleeveWidthGuarantee":0.9,"sleeveLengthBonus":{"pct":2,"min":0,"max":10,"menu":"style"},"ribbingStretch":{"pct":5,"min":0,"max":10,"menu":"fit"}},"jaeger":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":19,"min":10,"max":25,"menu":"fit"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"centerBackDart":{"pct":0.5,"min":0,"max":1.5,"menu":"fit"},"hipsEase":{"pct":12,"min":8,"max":20,"menu":"fit"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"rollLineCollarHeight":{"pct":6,"min":5,"max":9,"menu":"collar"},"reduceWaistStandardFraction":0.08,"reduceWaistDartFraction":0.05,"reduceHipsStandardFraction":0.1,"centerFrontHemDrop":{"pct":2,"min":0,"max":4,"menu":"style"},"frontPocketPlacement":{"pct":75,"min":65,"max":85,"menu":"pockets"},"frontPocketWidth":{"pct":68,"min":55,"max":75,"menu":"pockets"},"frontPocketDepth":{"pct":110,"min":80,"max":130,"menu":"pockets"},"frontPocketRadius":{"pct":10,"min":0,"max":50,"menu":"pockets"},"frontDartPlacement":{"pct":55,"min":45,"max":60,"menu":"advanced"},"sideFrontPlacement":{"pct":85,"min":80,"max":90,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"innerPocketPlacement":{"pct":52,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"frontCutawayAngle":{"deg":2.5,"min":1,"max":4,"menu":"style"},"frontCutawayStart":{"pct":30,"min":10,"max":70,"menu":"style"},"frontCutawayEnd":{"pct":40,"min":10,"max":40,"menu":"style"},"hemRadius":{"pct":100,"min":35,"max":100,"menu":"style"},"chestPocketDepth":{"pct":110,"min":70,"max":150,"menu":"pockets"},"chestPocketWidth":{"pct":37,"min":30,"max":45,"menu":"pockets"},"chestPocketPlacement":{"pct":52,"min":40,"max":60,"menu":"pockets"},"chestPocketAngle":{"deg":2.5,"min":0,"max":7,"menu":"pockets"},"chestPocketWeltSize":{"pct":17.5,"min":10,"max":25,"menu":"pockets"},"lapelStart":{"pct":10,"min":0,"max":35,"menu":"style"},"collarHeight":{"pct":9,"min":7,"max":10,"menu":"collar"},"collarNotchDepth":{"pct":15,"min":15,"max":50,"menu":"collar"},"collarNotchAngle":{"deg":45,"min":30,"max":60,"menu":"collar"},"collarNotchReturn":{"pct":100,"min":50,"max":100,"menu":"collar"},"chestShaping":{"pct":30,"min":0,"max":100,"menu":"advanced"},"buttons":{"list":["1","2","3"],"dflt":"2","menu":"style"},"buttonLength":{"pct":30,"min":30,"max":60,"menu":"style"},"chestShapingMax":5,"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"style"},"backVent":{"count":1,"min":0,"max":2,"menu":"style"},"backVentLength":{"pct":35,"min":15,"max":100,"menu":"style"},"collarSpread":{"deg":13,"min":5,"max":35,"menu":"collar"},"collarRoll":{"pct":5,"min":0,"max":10,"menu":"collar"},"pocketFoldover":{"pct":25,"min":15,"max":35,"menu":"pockets"},"sleeveLengthBonus":{"pct":0,"min":-20,"max":15,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"sleeveVentLength":{"pct":35,"min":25,"max":55,"menu":"sleeves"},"sleeveVentWidth":{"pct":18,"min":10,"max":26,"menu":"sleeves"}},"legend":{},"lucy":{"width":{"pct":50,"min":30,"max":100,"menu":"style"},"length":{"pct":50,"min":30,"max":100,"menu":"style"},"edge":{"pct":25,"min":20,"max":50,"menu":"style"}},"lumina":{"waistband":{"bool":true,"menu":"style"},"lowerwaistbandback":{"bool":true},"ease":{"pct":-8,"min":-25,"max":10,"menu":"fit"},"length":{"pct":35,"min":10,"max":100,"menu":"style"},"waistbandsize":{"pct":50,"min":0,"max":150},"waistlowering":{"pct":35,"min":-10,"max":60,"menu":"style"},"waistreduction":{"pct":4,"min":0,"max":10},"sidepanel":{"pct":25,"min":10,"max":40,"menu":"style"},"smoothing":{"pct":85,"min":50,"max":100,"menu":"advanced"},"fixedsidepanel":{"bool":false,"menu":"style"},"crossSeamAngle":35,"crotchToKnee":0.4,"waistToKneeCP":0.4,"kneeToWaistLength":400,"crotchPointsCP":2,"pocket":{"bool":true,"menu":"style"},"pocketdepth":{"pct":90,"min":20,"max":120}},"lumira":{"gussetcompensation":1.03,"waistband":{"bool":true,"menu":"style"},"backgusset":{"bool":false,"menu":"style"},"cyclingchamois":{"bool":false,"menu":"style"},"frontbulge":{"bool":false},"ease":{"pct":-8,"min":-30,"max":0,"menu":"fit"},"leglength":{"pct":100,"min":10,"max":100,"menu":"style"},"waistlowering":{"pct":35,"min":-10,"max":60,"menu":"style"},"gussetwidth":{"pct":16,"min":5,"max":30},"backgussetwidth":{"pct":50,"min":20,"max":75},"frontgussetlength":{"pct":12.5,"min":0,"max":30},"waistbandsize":{"pct":90,"min":0,"max":150},"waistreduction":{"pct":4,"min":0,"max":10},"backinserttopcp":0.3,"backinserttopcpangle":0,"backinsertgussetcp":0.2,"frontbulgelift":1.75,"frontbulgeforwardpercentage":0.125,"frontbulgemiddleshift":0.65,"buttlift":{"pct":30,"min":0,"max":60},"frontbulgesize":{"pct":2.5,"min":0,"max":10}},"lunetius":{"lengthRatio":{"pct":105,"min":60,"max":130,"menu":"style"},"widthRatio":{"pct":100,"min":50,"max":130,"menu":"style"},"length":{"list":["toKnee","toBelowKnee","toHips","toUpperLeg","toFloor"],"dflt":"toBelowKnee","menu":"style"}},"magde":{"size":{"pct":100,"min":15,"max":200,"menu":"style"},"taperRatio":{"pct":60,"min":50,"max":100,"menu":"style"},"flapHeightRatio":{"pct":83,"min":60,"max":100,"menu":"style"},"openingRatio":{"pct":66,"min":30,"max":90,"menu":"style"},"onePieceLid":{"bool":false,"menu":"style"},"useCommonWebbingSizes":{"bool":true,"menu":"style"}},"naomiwu":{"hipsEase":{"pct":0,"min":-5,"max":5,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":15,"menu":"fit"},"waistSlant":{"pct":0,"min":0,"max":2,"menu":"fit"},"invertFly":{"bool":false,"menu":"style"},"length":{"pct":40,"min":0,"max":80,"menu":"style"},"waistbandWidth":{"pct":4.4,"min":2,"max":10,"menu":"style"},"beltLoopWidth":{"pct":40,"min":20,"max":60,"menu":"style"},"frontPocketOpeningBend":{"pct":80,"min":0,"max":100,"menu":"pockets"},"frontPocketOpeningDepth":{"pct":33,"min":25,"max":45,"menu":"pockets"},"backPocketDepth":{"pct":70,"min":60,"max":85,"menu":"pockets"},"backPocketChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"frontPocketOpeningWidth":{"pct":33,"min":25,"max":45,"menu":"pockets"},"backAttachmentWidth":{"pct":40,"min":25,"max":55,"menu":"pockets"},"backAttachmentDepth":{"pct":190,"min":100,"max":220,"menu":"pockets"},"frontAttachmentWidth":{"pct":95,"min":80,"max":110,"menu":"pockets"},"frontAttachmentChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"backAttachmentFlapChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"dartLength":{"pct":90,"min":50,"max":100,"menu":"advanced"},"dartWidth":{"pct":5,"min":4,"max":8,"menu":"advanced"},"flyLength":{"pct":75,"min":50,"max":85,"menu":"advanced"},"flyWidth":{"pct":16,"min":10,"max":22,"menu":"advanced"},"frontHalf":{"pct":55,"min":50,"max":60,"menu":"advanced"},"jseamBend":{"pct":65,"min":50,"max":100,"menu":"advanced"},"minDartWidth":{"pct":2,"min":0.5,"max":4,"menu":"advanced"}},"noble":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":0,"min":-5,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"darts"},"bustDartCurve":1,"bustDartLength":0.9,"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"darts"},"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"armhole"},"backArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"backArmholePitchDepth":{"pct":35,"max":40,"min":30,"menu":"armhole"},"backArmholeSlant":{"deg":5,"min":1,"max":9,"menu":"armhole"},"frontArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"armhole"},"backHemSlope":{"deg":2.5,"min":0,"max":5,"menu":"advanced"},"backNeckCutout":{"pct":6,"min":3,"max":9,"menu":"advanced"},"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"armholeDartPosition":{"pct":50,"min":10,"max":90},"dartPosition":{"dflt":"shoulder","list":["shoulder","armhole"],"menu":"darts"},"shoulderDartPosition":{"pct":50,"min":10,"max":90},"shoulderToShoulderCorrection":0.995,"upperDartLength":{"pct":90,"min":80,"max":95,"menu":"darts"},"waistdartposition":{"pct":0,"min":-100,"max":100,"menu":"darts"}},"octoplushy":{"sizeConstant":200,"size":{"pct":100,"min":5,"max":500,"menu":"style"},"type":{"dflt":"octoplushy","list":["octoplushy","octopus","squid"],"menu":"style"},"armWidth":{"pct":15,"min":10,"max":30,"menu":"style"},"armLength":{"pct":200,"min":100,"max":500,"menu":"style"},"neckWidth":{"pct":25,"min":25,"max":45,"menu":"style"},"armTaper":{"pct":25,"min":0,"max":50,"menu":"style"},"bottomTopArmRatio":{"pct":57,"min":25,"max":75,"menu":"style"},"bottomArmReduction":{"pct":90,"min":75,"max":125},"bottomArmReductionPlushy":{"pct":80,"min":75,"max":125}},"onyx":{"neckStyle":{"dflt":"neckband","list":["neckband","hood"],"menu":"style"},"skirt":{"bool":false,"menu":"style"},"sleeveRibbing":{"bool":false,"menu":"construction"},"legRibbing":{"bool":false,"menu":"construction"},"zipperPosition":{"dflt":"front","list":["front","back","none"],"menu":"construction"},"neckEase":{"pct":50,"min":-30,"max":150,"menu":"fit"},"chestEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"waistEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"hipsEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"seatEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"upperLegEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"legHemEase":{"pct":0,"min":-40,"max":100,"menu":"fit"},"centerSeamEase":{"pct":0,"min":-20,"max":50,"menu":"fit"},"outseamEase":{"pct":0,"min":-20,"max":5,"menu":"fit"},"armpitEase":{"pct":15,"min":-20,"max":50,"menu":"fit"},"legLength":{"pct":20,"min":0,"max":120,"menu":"style"},"neckBalance":{"pct":40,"min":0,"max":80,"menu":"fit"},"raglanScoopLength":{"pct":20,"min":0,"max":50,"menu":"advanced"},"raglanScoopMagnitude":{"pct":6,"min":0,"max":20,"menu":"advanced"},"legHem":{"pct":200,"min":0,"max":800},"crotchGussetWidth":{"pct":100,"min":75,"max":133,"menu":"fit"},"legTaperPosition":{"pct":50,"min":0,"max":100,"menu":"advanced"},"frontOnFold":{"bool":false,"menu":"construction"},"backOnFold":{"bool":true,"menu":"construction"},"zipperLength":{"pct":20,"min":0,"max":50,"menu":"construction"},"sleeveEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"armholeTweakFactor":1.1,"skirtWidth":{"pct":160,"min":100,"max":250},"skirtLength":{"pct":100,"min":20,"max":500},"skirtWaistband":{"pct":200,"min":0,"max":800},"skirtHem":{"pct":200,"min":0,"max":800},"sleeveRibbingWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"sleeveRibbingLength":{"pct":75,"min":50,"max":100},"legRibbingWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"legRibbingLength":{"pct":75,"min":50,"max":100},"neckbandLength":{"pct":80,"min":50,"max":100},"neckbandWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"zipperGuardWidth":{"pct":50,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35},"menu":"construction"},"neckGuardLength":{"pct":2,"min":0,"max":5},"zipperGuardTapeCoverMaterial":0.75,"bicepsPosition":0.2,"wristEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"sleeveLength":{"pct":20,"min":0,"max":125,"menu":"style"},"sleeveHem":{"pct":200,"min":0,"max":800},"hoodDepth":{"pct":100,"min":70,"max":180},"hoodHeight":{"pct":100,"min":70,"max":140},"hoodFrontDip":{"pct":8,"min":0,"max":20},"hoodHem":{"pct":200,"min":0,"max":800},"hoodFrontBonus":{"pct":0,"min":-8,"max":10},"hoodFrontPieceSize":{"pct":50,"min":0,"max":50}},"otis":{"ease":{"pct":14,"min":0,"max":30,"menu":"fit"},"snapPlacket":{"pct":5,"min":0,"max":30,"menu":"advanced"},"sleeveType":{"dflt":"short","list":["short","long"],"menu":"style"},"hem":{"pct":10,"min":0,"max":30,"menu":"advanced"},"binding":{"pct":11,"min":2,"max":30,"menu":"advanced"}},"paco":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":false,"waistEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":15,"menu":"fit"},"kneeEase":0.06,"waistHeight":{"pct":5,"min":0,"max":100,"menu":"style"},"lengthBonus":{"pct":0,"min":-15,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":10,"menu":"style"},"fitKnee":false,"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":60,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":45,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"elastic"},"titanPaperless":false,"frontPocketHeelRatio":0.4,"backPocketWaistRatio":0.4,"backPocketHeightRatio":0.4,"backPocketWidthRatio":0.37,"waistbandHeight":0,"elasticatedCuff":{"bool":true,"menu":"style"},"ankleElastic":{"pct":5,"min":1,"max":13,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"elastic"},"heelEase":{"pct":5,"min":0,"max":50,"menu":"elastic"},"frontPockets":{"bool":true,"menu":"pockets"},"backPockets":{"bool":false,"menu":"pockets"},"frontPocketFlapSize":{"pct":3,"min":3,"max":3,"snap":{"metric":1,"imperial":0.79375},"menu":false},"weltFactor":0.15},"penelope":{"dartMaximumDifference":0.344,"dartMinimumDifference":0.2,"dartMinimumWidth":0.006888,"dartSideMinimum":10,"dartBackControl1":0.114,"dartBackControl2":5,"dartBackControl3":4,"curvePlacement":2.4,"dart2offset":32,"dart2factor":0.8,"hipCurveDividerDown":40,"hipCurveDividerUp":3,"sideSeamShiftPercentage":0.006,"backVentWidth":0.1,"paperlessOffset":15,"curvedDartControlAngle":2,"curvedDartTopControlOffset":0.2,"curvedDartBottomControlOffset":0.4,"curvedDarts":{"bool":true,"menu":"style"},"lengthBonus":{"pct":0,"min":-50,"max":50,"menu":"style"},"hemBonus":{"pct":0,"min":-35,"max":0,"menu":"style"},"hem":{"pct":2,"min":0,"max":5,"menu":"style"},"backVent":{"bool":true,"menu":"style"},"backVentLength":{"pct":40,"min":5,"max":70},"zipperLocation":{"dflt":"backSeam","list":["backSeam","sideSeam"],"menu":"style"},"nrOfDarts":{"count":2,"min":1,"max":2,"menu":"style"},"seatEase":{"pct":1,"min":0,"max":8,"menu":"fit"},"waistEase":{"pct":1,"min":0,"max":8,"menu":"fit"},"backDartDepthFactor":{"pct":50,"min":35,"max":70,"menu":"advanced"},"frontDartDepthFactor":{"pct":45,"min":30,"max":65,"menu":"advanced"},"dartToSideSeamFactor":{"pct":50,"min":30,"max":70,"menu":"advanced"},"waistband":{"bool":true,"menu":"style"},"waistbandWidth":{"pct":10,"min":5,"max":20},"waistbandOverlap":{"pct":3.5,"min":0,"max":10}},"plugintest":{"plugin":{"dflt":"all","list":["all","annotations","flip","gore","i18n","measurements","mirror","round","sprinkle","title","versionfreeSvg"],"menu":"tests"},"bannerDy":{"count":-1,"min":-15,"max":15,"menu":"annotations.banner"},"bannerSpaces":{"count":10,"min":0,"max":20,"menu":"annotations.banner"},"bannerRepeat":{"count":10,"min":1,"max":20,"menu":"annotations.banner"},"bartackLength":{"count":15,"min":2,"max":100,"menu":"annotations.bartack"},"bartackAngle":{"count":0,"min":-360,"max":360,"menu":"annotations.bartack"},"bartackDensity":{"count":3,"min":1,"max":5,"menu":"annotations.bartack"},"bartackWidth":{"count":3,"min":1,"max":5,"menu":"annotations.bartack"},"bartackStart":{"pct":25,"min":0,"max":100,"menu":"annotations.bartack"},"bartackEnd":{"pct":75,"min":0,"max":100,"menu":"annotations.bartack"},"crossboxText":{"bool":true,"menu":"annotations.crossboxText"},"cutonfoldMargin":{"pct":5,"min":0,"max":25,"menu":"annotations.cutonfold"},"cutonfoldOffset":{"count":15,"min":0,"max":100,"menu":"annotations.cutonfold"},"cutonfoldGrainline":{"bool":false,"menu":"annotations.cutonfold"},"dimensionsCustomText":{"bool":false,"menu":"annotations.dimensions"},"dimensionsEndMarker":{"bool":true,"menu":"annotations.dimensions"},"dimensionsStartMarker":{"bool":true,"menu":"annotations.dimensions"},"logoScale":{"pct":100,"min":10,"max":200,"menu":"annotations.logo"},"logoRotate":{"deg":0,"min":-360,"max":360,"menu":"annotations.logo"},"pleatMargin":{"count":35,"min":0,"max":50,"menu":"annotations.pleat"},"pleatReverse":{"bool":false,"menu":"annotations.pleat"},"scaleboxRotation":{"deg":0,"min":0,"max":360,"menu":"annotations.scalebox"},"scaleboxText":{"dflt":"default","list":["default","custom","suppress"],"menu":"annotations.scalebox"},"sewtogetherHinge":{"bool":true,"menu":"annotations.sewtogether"},"sewtogetherMiddle":{"bool":false,"menu":"annotations.sewtogether"},"titleNr":{"count":1,"min":0,"max":100,"menu":"annotations.title"},"titleTitle":{"bool":true,"menu":"annotations.title"},"titleMeta":{"bool":true,"menu":"annotations.title"},"titleScale":{"pct":100,"min":10,"max":200,"menu":"annotations.title"},"titleRotate":{"deg":0,"min":-360,"max":360,"menu":"annotations.title"},"snippetScale":{"pct":100,"min":10,"max":200,"menu":"annotations.snippets"},"snippetRotation":{"deg":0,"min":-360,"max":360,"menu":"annotations.snippets"},"flipAxis":{"dflt":"x","list":["x","y"],"menu":"flip"},"goreRadius":{"count":20,"min":10,"max":30,"menu":"gore"},"goreGoreNumber":{"count":6,"min":4,"max":8,"menu":"gore"},"goreExtraLength":{"count":10,"min":0,"max":20,"menu":"gore"},"mirrorLine":{"dflt":"a","list":["a","b","none"],"menu":"mirror"},"mirrorClone":{"bool":true,"menu":"mirror"},"roundRadius":{"count":10,"min":0,"max":50,"menu":"round"},"roundHide":{"bool":false,"menu":"round"},"sprinkleScale":{"pct":100,"min":10,"max":200,"menu":"sprinkle"},"sprinkleRotate":{"deg":0,"min":-360,"max":360,"menu":"sprinkle"},"sprinkleSnippet":{"dflt":"bnotch","list":["notch","bnotch","button","buttonhole","buttonhole-start","buttonhole-end","snap-stud","snap-socket","logo"],"menu":"sprinkle"},"ringsectorInsideRadius":{"count":30,"min":10,"max":50,"menu":"ringsector"},"ringsectorOutsideRadius":{"count":60,"min":60,"max":120,"menu":"ringsector"},"ringsectorAngle":{"deg":75,"min":30,"max":120,"menu":"ringsector"}},"rendertest":{"width":{"mm":200,"min":50,"max":500,"testIgnore":false},"only":{"menu":"show","dflt":"false","list":["false","circles","colors","widths","styles","combos","text","snippets","macros"]}},"sandy":{"minimumOverlap":15,"seamlessFullCircle":{"bool":false,"menu":"construction"},"waistbandWidth":{"pct":4,"min":1,"max":8,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"waistbandPosition":{"pct":50,"min":0,"max":100,"menu":"fit"},"lengthBonus":{"pct":50,"min":10,"max":100,"menu":"style"},"circleRatio":{"pct":50,"min":20,"max":100,"menu":"style"},"waistbandOverlap":{"pct":3,"min":0,"max":15,"menu":"style"},"gathering":{"pct":0,"min":0,"max":200,"menu":"style"},"hemWidth":{"pct":2,"min":1,"max":10,"menu":"construction"},"waistbandShape":{"list":["straight","curved"],"dflt":"straight","menu":"fit"},"panels":{"count":1,"min":1,"max":8,"menu":"construction"}},"shelly":{"neckEase":{"pct":50,"min":-30,"max":150,"menu":"fit"},"chestEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"straightSides":{"bool":true,"menu":"advanced"},"hipsEase":{"pct":0,"min":-30,"max":75,"menu":"advanced"},"armpitEase":{"pct":15,"min":-20,"max":50,"menu":"fit"},"bodyLength":{"pct":120,"min":20,"max":300,"menu":"style"},"neckBalance":{"pct":40,"min":0,"max":80,"menu":"fit"},"raglanScoopLength":{"pct":20,"min":0,"max":50,"menu":"advanced"},"raglanScoopMagnitude":{"pct":6,"min":0,"max":20,"menu":"advanced"},"hemWidth":{"pct":200,"min":0,"max":800,"menu":"construction"},"sideShape":{"pct":0,"min":-20,"max":20,"menu":"advanced"},"armholeTweakFactor":1.1,"sleeveEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"bicepsPosition":0.2,"wristEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"sleeveLength":{"pct":20,"min":0,"max":125,"menu":"style"},"sleeveHem":{"pct":200,"min":0,"max":800,"menu":"construction"},"neckbandLength":{"pct":80,"min":50,"max":100,"menu":"fit"},"neckbandWidth":{"pct":7.5,"min":0,"max":50,"menu":"fit"}},"shin":{"frontFactor":0.58,"legFrontFactor":0.48,"gussetFactor":0.0714,"angle":10,"elasticWidth":{"pct":10,"min":4,"max":20,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"stretch":{"pct":20,"min":10,"max":30,"menu":"fit"},"bulge":{"pct":2.5,"min":0,"max":5,"menu":"fit"},"legReduction":{"pct":5,"min":0,"max":10,"menu":"fit"},"rise":{"pct":0,"min":0,"max":25,"menu":"style"},"backRise":{"pct":5,"min":0,"max":10,"menu":"fit"}},"simon":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":2,"min":0,"max":15,"menu":"fit"},"lengthBonus":{"pct":25,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"backDarts":{"list":["auto","never","always"],"dflt":"auto","menu":"style"},"backDartShaping":{"pct":25,"min":5,"max":75,"menu":"advanced"},"boxPleat":{"bool":false,"menu":"style"},"boxPleatFold":{"pct":15,"min":10,"max":20,"menu":"advanced"},"boxPleatWidth":{"pct":7,"min":4,"max":10,"menu":"advanced"},"roundBack":{"pct":0,"min":0,"max":10,"menu":"fit"},"buttonholePlacketWidth":{"pct":8,"min":4,"max":12,"menu":"style.closure"},"buttonholePlacketFoldWidth":{"pct":16,"min":8,"max":24,"menu":"style.closure"},"buttonPlacketWidth":{"pct":5,"min":2,"max":8,"menu":"style.closure"},"hemCurve":{"pct":50,"min":25,"max":100,"menu":"style"},"hemStyle":{"list":["straight","baseball","slashed"],"dflt":"straight","menu":"style"},"hipsEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"yokeHeight":{"pct":70,"min":40,"max":90,"menu":"style"},"sleevePlacketWidth":{"pct":13,"min":8,"max":18,"menu":"style.cuffs"},"waistEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"buttonFreeLength":{"pct":2,"min":0,"max":15,"menu":"style.closure"},"extraTopButton":{"bool":true,"menu":"style.closure"},"separateButtonPlacket":{"bool":false,"menu":"style.closure"},"separateButtonholePlacket":{"bool":false,"menu":"style.closure"},"buttons":{"count":7,"min":4,"max":12,"menu":"style.closure"},"ffsa":{"pct":150,"min":100,"max":200,"menu":"advanced"},"collarAngle":{"deg":85,"min":60,"max":130,"menu":"style.collar"},"collarBend":{"pct":3.5,"min":0,"max":10,"menu":"style.collar"},"collarFlare":{"deg":3.5,"min":0,"max":10,"menu":"style.collar"},"collarGap":{"pct":2.5,"min":0,"max":6,"menu":"style.collar"},"collarRoll":{"pct":3,"min":0,"max":6,"menu":"style.collar"},"collarStandBend":{"deg":3,"min":0,"max":5,"menu":"style.collar"},"collarStandCurve":{"deg":2,"min":0,"max":5,"menu":"style.collar"},"collarStandWidth":{"pct":8,"min":3,"max":13,"menu":"style.collar"},"cuffOverlap":0.15,"barrelCuffNarrowButton":{"bool":true,"menu":"style.cuffs"},"cuffButtonRows":{"count":1,"min":1,"max":2,"menu":"style.cuffs"},"cuffDrape":{"pct":5,"min":0,"max":10,"menu":"style.cuffs"},"cuffLength":{"pct":10,"min":3,"max":15,"menu":"style.cuffs"},"cuffStyle":{"list":["roundedBarrelCuff","angledBarrelCuff","straightBarrelCuff","roundedFrenchCuff","angledFrenchCuff","straightFrenchCuff"],"dflt":"angledBarrelCuff","menu":"style.cuffs"},"buttonPlacketStyle":{"list":["classic","seamless"],"dflt":"classic"},"buttonholePlacketStyle":{"list":["classic","seamless"],"dflt":"seamless"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":3.5,"min":-40,"max":10,"menu":"fit"},"sleevePlacketLength":{"pct":25,"min":15,"max":35,"menu":"style.cuffs"},"splitYoke":{"bool":false,"menu":"style"}},"simone":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"draftForHighBust":true,"shoulderEase":{"pct":2,"min":0,"max":15,"menu":"fit"},"lengthBonus":{"pct":25,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"backDarts":{"list":["auto","never","always"],"dflt":"auto","menu":"style"},"backDartShaping":{"pct":25,"min":5,"max":75,"menu":"advanced"},"boxPleat":{"bool":false,"menu":"style"},"boxPleatFold":{"pct":15,"min":10,"max":20,"menu":"advanced"},"boxPleatWidth":{"pct":7,"min":4,"max":10,"menu":"advanced"},"roundBack":{"pct":0,"min":0,"max":10,"menu":"fit"},"buttonholePlacketWidth":{"pct":8,"min":4,"max":12,"menu":"style.closure"},"buttonholePlacketFoldWidth":{"pct":16,"min":8,"max":24,"menu":"style.closure"},"buttonPlacketWidth":{"pct":5,"min":2,"max":8,"menu":"style.closure"},"hemCurve":{"pct":50,"min":25,"max":100,"menu":"style"},"hemStyle":{"list":["straight","baseball","slashed"],"dflt":"straight","menu":"style"},"hipsEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"yokeHeight":{"pct":70,"min":40,"max":90,"menu":"style"},"sleevePlacketWidth":{"pct":13,"min":8,"max":18,"menu":"style.cuffs"},"waistEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"buttonFreeLength":{"pct":2,"min":0,"max":15,"menu":"style.closure"},"extraTopButton":{"bool":true,"menu":"style.closure"},"separateButtonPlacket":{"bool":false,"menu":"style.closure"},"separateButtonholePlacket":{"bool":false,"menu":"style.closure"},"buttons":{"count":7,"min":4,"max":12,"menu":"style.closure"},"ffsa":{"pct":150,"min":100,"max":200,"menu":"advanced"},"minimalDartShaping":5,"bustDartAngle":{"deg":10,"min":0,"max":20,"menu":"advanced"},"bustDartLength":{"pct":80,"min":50,"max":90,"menu":"advanced"},"frontDarts":{"bool":false,"menu":"advanced"},"frontDartLength":{"pct":45,"min":30,"max":60,"menu":"advanced"},"contour":{"pct":50,"min":30,"max":75,"menu":"style"},"bustAlignedButtons":{"dflt":"disabled","list":["even","split","disabled"],"menu":"style.closure"},"collarAngle":{"deg":85,"min":60,"max":130,"menu":"style.collar"},"collarBend":{"pct":3.5,"min":0,"max":10,"menu":"style.collar"},"collarFlare":{"deg":3.5,"min":0,"max":10,"menu":"style.collar"},"collarGap":{"pct":2.5,"min":0,"max":6,"menu":"style.collar"},"collarRoll":{"pct":3,"min":0,"max":6,"menu":"style.collar"},"collarStandBend":{"deg":3,"min":0,"max":5,"menu":"style.collar"},"collarStandCurve":{"deg":2,"min":0,"max":5,"menu":"style.collar"},"collarStandWidth":{"pct":8,"min":3,"max":13,"menu":"style.collar"},"cuffOverlap":0.15,"barrelCuffNarrowButton":{"bool":true,"menu":"style.cuffs"},"cuffButtonRows":{"count":1,"min":1,"max":2,"menu":"style.cuffs"},"cuffDrape":{"pct":5,"min":0,"max":10,"menu":"style.cuffs"},"cuffLength":{"pct":10,"min":3,"max":15,"menu":"style.cuffs"},"cuffStyle":{"list":["roundedBarrelCuff","angledBarrelCuff","straightBarrelCuff","roundedFrenchCuff","angledFrenchCuff","straightFrenchCuff"],"dflt":"angledBarrelCuff","menu":"style.cuffs"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":3.5,"min":-40,"max":10,"menu":"fit"},"sleevePlacketLength":{"pct":25,"min":15,"max":35,"menu":"style.cuffs"},"splitYoke":{"bool":false,"menu":"style"},"buttonPlacketStyle":{"list":["classic","seamless"],"dflt":"classic"},"buttonholePlacketStyle":{"list":["classic","seamless"],"dflt":"seamless"}},"skully":{"size":{"pct":75,"min":10,"max":300,"menu":"fit"}},"sven":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":10,"min":5,"max":30,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":15,"min":0,"max":30,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"waistEase":0.08,"sleeveLengthBonus":{"pct":3,"min":0,"max":10,"menu":"style"},"ribbingHeight":{"pct":8,"min":3,"max":15,"menu":"style"},"hipsEase":{"pct":8,"min":-4,"max":20,"menu":"fit"},"ribbing":{"bool":true,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"ribbingStretch":{"pct":15,"min":0,"max":30,"menu":"fit"}},"tamiko":{"armholeDepthFactor":{"pct":50,"min":40,"max":60,"menu":"fit"},"chestEase":{"pct":2,"min":1,"max":20,"menu":"fit"},"flare":{"deg":15,"min":-10,"max":30,"menu":"style"},"lengthBonus":{"pct":13,"min":0,"max":60,"menu":"style"},"shoulderseamLength":{"pct":10,"min":5,"max":25,"menu":"style"},"draftForHighBust":{"bool":false,"menu":"fit"}},"teagan":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":0.05,"chestEase":{"pct":12,"min":5,"max":25,"menu":"fit"},"collarEase":0,"cuffEase":0,"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":5,"min":-20,"max":60,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":8,"min":4,"max":12,"menu":"fit"},"frontArmholeDeeper":0.005,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveWidthGuarantee":0.85,"sleeveLength":{"pct":30,"min":20,"max":100,"menu":"fit"},"fitWaist":{"bool":false,"menu":"fit"},"waistEase":{"pct":25,"min":8,"max":40},"hipsEase":{"pct":18,"min":8,"max":30,"menu":"fit"},"necklineDepth":{"pct":25,"min":20,"max":40,"menu":"style"},"necklineWidth":{"pct":30,"min":10,"max":50,"menu":"style"},"necklineBend":{"pct":30,"min":0,"max":70,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveEase":{"pct":15,"min":5,"max":35,"menu":"style"}},"tiberius":{"headRatio":{"pct":100,"min":80,"max":120,"menu":"fit"},"armholeDrop":{"pct":110,"min":100,"max":150,"menu":"fit"},"lengthBonus":{"pct":90,"min":60,"max":130,"menu":"style"},"widthBonus":{"pct":100,"min":50,"max":130,"menu":"style"},"clavi":{"bool":false,"menu":"style.clavi"},"clavusLocation":{"pct":65,"min":50,"max":80,"menu":"style.clavi"},"clavusWidth":{"pct":100,"min":50,"max":150,"menu":"style.clavi"},"length":{"list":["toKnee","toMidLeg","toFloor"],"dflt":"toKnee","menu":"style"},"width":{"list":["toElbow","toShoulder","toMidArm"],"dflt":"toMidArm","menu":"style"},"forceWidth":{"bool":false,"menu":"advanced"}},"titan":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":true,"waistEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"seatEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"kneeEase":{"pct":6,"min":1,"max":25,"menu":"fit"},"waistHeight":{"pct":100,"min":0,"max":100,"menu":"style"},"lengthBonus":{"pct":2,"min":-20,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":15,"menu":"style"},"fitKnee":{"bool":false,"menu":"style"},"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":60,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":45,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"advanced"}},"trayvon":{"tipWidth":{"pct":15,"min":5,"max":35,"snap":{"metric":1,"imperial":0.79375},"menu":"style"},"knotWidth":{"pct":8,"min":4,"max":12,"snap":{"metric":1,"imperial":0.79375},"menu":"style"},"lengthBonus":{"pct":0,"min":-50,"max":50,"menu":"style"}},"tristan":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":0,"min":-5,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":0.46,"bustDartCurve":1,"bustDartLength":0.9,"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"advanced"},"armholeDepth":{"pct":44,"min":38,"max":55,"menu":"style"},"backArmholeCurvature":0.63,"backArmholePitchDepth":0.035,"backArmholeSlant":5,"frontArmholeCurvature":0.63,"frontArmholePitchDepth":0.29,"backHemSlope":2.5,"backNeckCutout":0.06,"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"armholeDartPosition":0.5,"dartPosition":"shoulder","shoulderDartPosition":{"pct":50,"min":10,"max":90,"menu":"style"},"shoulderToShoulderCorrection":0.995,"upperDartLength":{"pct":90,"min":80,"max":95,"menu":"advanced"},"waistdartposition":{"pct":0,"min":-100,"max":100,"menu":"darts"},"armholeBackDepth":0.6,"armholeBackIn":0.6,"armholeFrontDepth":0.65,"armholeFrontIn":0.2,"cutDepthBack":{"pct":40,"min":5,"max":90,"menu":"style"},"cutDepthFront":{"pct":80,"min":0,"max":125,"menu":"style"},"cutRoundnessBack":{"pct":20,"min":0,"max":100,"menu":"style"},"cutRoundnessFront":{"pct":10,"min":0,"max":100,"menu":"style"},"strapWidth":{"pct":45,"min":5,"max":90,"menu":"style"},"hemSize":{"pct":5.62,"min":1,"max":25},"zipperLocation":{"dflt":"side","list":["front","side","back"],"menu":"options"},"hem":{"bool":false},"lacing":{"bool":true,"menu":"options"},"lacingLocation":{"dflt":"front","list":["front","back"]},"lacingWidth":{"pct":20,"min":0,"max":50},"peplum":{"bool":false,"menu":"options"},"peplumSize":{"pct":10,"min":5,"max":250},"peplumFullness":{"deg":180,"min":180,"max":360}},"uma":{"xStretch":{"pct":15,"min":0,"max":30,"menu":"fit"},"yStretch":{"pct":5,"min":0,"max":15,"menu":"fit"},"gussetWidth":{"pct":15,"min":5,"max":24,"menu":"fit"},"gussetLength":{"pct":12.7,"min":10,"max":16,"menu":"fit"},"gussetPosition":{"pct":70,"min":5,"max":95,"menu":"fit"},"bulge":{"deg":0,"min":0,"max":30,"menu":"fit"},"rise":{"pct":50,"min":30,"max":100,"menu":"style"},"legRise":{"pct":54,"min":5,"max":95,"menu":"style"},"frontDip":{"pct":10,"min":0,"max":25,"menu":"style"},"frontExposure":{"pct":70,"min":5,"max":100,"menu":"style"},"backDip":{"pct":-5,"min":-15,"max":10,"menu":"style"},"backExposure":{"pct":30,"min":0,"max":115,"menu":"style"}},"wahid":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":false},"chestEase":{"pct":2,"min":1,"max":10,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":false},"cuffEase":{"pct":20,"min":0,"max":200,"menu":false},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":false},"lengthBonus":{"pct":1,"min":0,"max":8,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":false},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":false},"acrossBackFactor":0.97,"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":70,"min":60,"max":80,"menu":"fit"},"backNeckCutout":{"pct":5,"min":-2,"max":8,"menu":false},"frontArmholeDeeper":0.005,"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":false},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"frontOverlap":0.01,"necklineDrop":{"pct":50,"min":35,"max":85,"menu":"style"},"frontStyle":{"dflt":"classic","list":["classic","rounded"],"menu":"style"},"frontInset":{"pct":15,"min":10,"max":20,"menu":"advanced"},"shoulderInset":{"pct":10,"min":0,"max":20,"menu":"advanced"},"neckInset":{"pct":5,"min":0,"max":10,"menu":"advanced"},"hemStyle":{"dflt":"classic","list":["classic","rounded","square"],"menu":"style"},"hemRadius":{"pct":6,"min":2,"max":12,"menu":"style"},"pocketWidth":{"pct":10,"max":15,"min":8,"menu":"style"},"pocketAngle":{"deg":5,"min":0,"max":5,"menu":"advanced"},"pocketLocation":{"pct":35,"min":25,"max":55,"menu":"style"},"frontScyeDart":{"deg":6,"min":0,"max":12,"menu":"fit"},"buttons":{"count":6,"min":4,"max":12,"menu":"style"},"waistEase":{"pct":8,"min":2,"max":15,"menu":"fit"},"hipsEase":{"pct":8,"min":2,"max":15,"menu":"fit"},"backInset":{"pct":15,"min":10,"max":20,"menu":"advanced"},"centerBackDart":{"pct":2,"min":0,"max":5,"menu":"fit"},"backScyeDart":{"deg":2,"min":0,"max":6,"menu":"fit"},"weltHeight":{"pct":12.5,"max":20,"min":10,"menu":"style"}},"walburga":{"headRatio":{"pct":100,"min":80,"max":120,"menu":"fit"},"lengthBonus":{"pct":85,"min":60,"max":130,"menu":"style"},"widthBonus":{"pct":95,"min":50,"max":130,"menu":"style"},"length":{"list":["toKnee","toMidLeg","toFloor"],"dflt":"toKnee","menu":"style"},"neckline":{"bool":true,"menu":"style"},"neckoRatio":{"pct":100,"min":10,"max":190,"menu":"style"}},"waralee":{"backRaise":{"pct":10,"min":0,"max":25,"menu":"fit"},"waistRaise":{"pct":0,"min":-20,"max":40,"menu":"fit"},"fitWaist":{"bool":true,"menu":"fit"},"hemWidth":{"pct":1.75,"min":1,"max":2.5,"menu":"style"},"legSize":{"pct":75,"max":90,"min":50,"menu":"style"},"waistOverlap":{"pct":50,"min":10,"max":100,"menu":"style"},"frontPocket":{"bool":true,"menu":"style"},"backPocket":{"bool":true,"menu":"style"},"waistbandWidth":{"pct":3.5,"min":2,"max":5,"menu":"style"},"frontPocketStyle":{"dflt":"welt","list":["welt","waistband"],"menu":"style"},"separateWaistband":{"bool":false,"menu":"style"},"knotInFront":{"bool":true,"menu":"style"},"crotchFront":{"pct":30,"min":10,"max":70,"menu":"advanced"},"crotchBack":{"pct":45,"min":10,"max":70,"menu":"advanced"},"crotchFactorFrontHor":{"pct":90,"min":10,"max":100,"menu":"advanced"},"crotchFactorFrontVer":{"pct":30,"min":10,"max":70,"menu":"advanced"},"crotchFactorBackHor":{"pct":90,"min":10,"max":100,"menu":"advanced"},"crotchFactorBackVer":{"pct":60,"min":20,"max":90,"menu":"advanced"},"backWaistAdjustment":0.3,"frontPocketVerticalOffset":0.07,"frontPocketHorizontalOffset":0.18,"frontPocketSize":0.45,"frontPocketWidthHeightRatio":0.076,"frontPocketDepthFactor":1.6,"frontWaistAdjustment":0.163,"backPocketDepth":0.5,"backPocketVerticalOffset":0.2,"backPocketHorizontalOffset":0.045,"backPocketSize":0.45,"crotchEase":1.08},"yuri":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":20,"min":10,"max":30,"menu":"fit"},"cuffEase":{"pct":30,"min":20,"max":60,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":10,"min":5,"max":15,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveLengthBonus":{"pct":1,"min":0,"max":10,"menu":"fit"},"hipsEase":{"pct":0,"min":0,"max":10,"menu":"fit"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"}}} +export const options = {"aaron":{"brianFitSleeve":false,"brianFitCollar":false,"collarFactor":4.8,"bicepsEase":0.05,"chestEase":{"pct":8,"min":0,"max":20,"menu":"style"},"collarEase":0,"cuffEase":0,"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":10,"min":-20,"max":60,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":0.97,"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":0.6,"backNeckCutout":0.05,"frontArmholeDeeper":0,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"hipsEase":{"pct":8,"min":0,"max":20,"menu":"fit"},"stretchFactor":{"pct":5,"min":0,"max":15,"menu":"fit"},"armholeDrop":{"pct":10,"min":0,"max":75,"menu":"style"},"necklineBend":{"pct":100,"min":40,"max":100,"menu":"style"},"necklineDrop":{"pct":20,"min":10,"max":35,"menu":"style"},"shoulderStrapWidth":{"pct":15,"min":10,"max":40,"menu":"style"},"shoulderStrapPlacement":{"pct":40,"min":20,"max":80,"menu":"style"},"backlineBend":{"pct":50,"min":25,"max":100,"menu":"style"},"knitBindingWidth":{"pct":600,"min":300,"max":800,"menu":"style"}},"albert":{"backOpening":{"pct":10,"min":0,"max":25,"menu":"fit"},"bibWidth":{"pct":100,"min":50,"max":125,"menu":"style"},"bibLength":{"pct":75,"min":0,"max":90,"menu":"style"},"lengthBonus":{"pct":0,"min":-20,"max":25,"menu":"style"},"chestDepth":{"pct":22,"min":15,"max":90,"menu":"fit"},"strapWidth":{"pct":60,"min":20,"max":100,"menu":"style"}},"bee":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":10,"min":0,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"advanced"},"bustDartCurve":1,"bustDartLength":1,"waistDartLength":1,"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"advanced"},"backArmholeCurvature":0.63,"backArmholePitchDepth":0.35,"backArmholeSlant":5,"frontArmholeCurvature":0.63,"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"advanced"},"backHemSlope":2.5,"backNeckCutout":0.06,"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"ties":{"bool":true,"menu":"style"},"crossBackTies":{"bool":false,"menu":"style"},"bandLength":{"pct":85,"min":75,"max":90,"menu":"style"},"neckTieLength":{"pct":80,"min":70,"max":100,"menu":"style"},"neckTieWidth":{"pct":6,"min":2,"max":18,"snap":{"metric":[6,13,19,25,32,38],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1]},"menu":"style"},"reversible":{"bool":false,"menu":"style"},"topDepth":{"pct":54,"min":50,"max":80,"menu":"fit"},"bottomCupDepth":{"pct":8,"min":0,"max":20,"menu":"fit"},"sideDepth":{"pct":20.6,"min":0,"max":30,"menu":"fit"},"sideCurve":{"pct":0,"min":-50,"max":50,"menu":"fit"},"frontCurve":{"pct":0,"min":-50,"max":50,"menu":"fit"},"bellaGuide":{"bool":false,"menu":"fit"},"pointedTieEnds":{"bool":false,"menu":"style"},"duoColorTies":{"bool":false,"menu":"style"},"bandTieWidth":{"pct":3,"min":1,"max":9,"snap":{"metric":[6,13,19,25,32,38],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1]},"menu":"style"},"bandTieLength":{"pct":35,"min":30,"max":50,"menu":"style"}},"bella":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":10,"min":0,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"darts"},"bustDartCurve":{"pct":100,"min":0,"max":100,"menu":"darts"},"bustDartLength":{"pct":90,"min":75,"max":100,"menu":"darts"},"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"darts"},"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"armhole"},"backArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"backArmholePitchDepth":{"pct":35,"max":40,"min":30,"menu":"armhole"},"backArmholeSlant":{"deg":5,"min":1,"max":9,"menu":"armhole"},"frontArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"armhole"},"backHemSlope":{"deg":2.5,"min":0,"max":5,"menu":"advanced"},"backNeckCutout":{"pct":6,"min":3,"max":9,"menu":"advanced"},"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"}},"benjamin":{"transitionLength":2,"bandLength":0.17,"adjustmentRibbonWidth":20,"collarEase":{"pct":3,"min":0,"max":6,"menu":"fit"},"adjustmentRibbon":{"bool":false,"menu":"fit"},"tipWidth":{"pct":15,"min":0,"max":20,"menu":"style"},"knotWidth":{"pct":7,"min":5,"max":10,"menu":"style"},"bowLength":{"pct":28,"min":23,"max":33,"menu":"style"},"bowStyle":{"dflt":"butterfly","list":["diamond","butterfly","square","widesquare"],"menu":"style"},"endStyle":{"dflt":"straight","list":["straight","pointed","rounded"],"menu":"style"},"collarBandHeight":{"pct":6,"min":5,"max":8,"menu":"style"}},"bent":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"chestEase":{"pct":8,"min":-4,"max":20,"menu":"fit"},"collarEase":{"pct":3.5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":40,"min":2,"max":100,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":60,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-20,"max":15,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"}},"bob":{"neckRatio":{"pct":80,"min":70,"max":90,"menu":"fit"},"widthRatio":{"pct":45,"min":35,"max":55,"menu":"fit"},"lengthRatio":{"pct":75,"min":55,"max":85,"menu":"fit"},"headSize":{"pct":100,"min":10,"max":200,"snap":5,"menu":"size"}},"breanna":{"collarFactor":4.8,"armholeDepthBase":0.6,"shoulderSeamLength":0.95,"sleeveWidthGuarantee":0.9,"breannaFitSleeve":true,"breannaFitCollar":true,"shoulderDart":{"bool":false,"menu":"fit"},"waistDart":{"bool":true,"menu":"fit"},"primaryBustDart":{"list":["06:00","07:00","08:00","09:00","10:00","11:00","11:30","12:00","12:30","13:00","13:30","14:00","15:00","16:00","17:00"],"dflt":"06:00","doNotTranslate":true,"menu":"style"},"secondaryBustDart":{"list":["none","06:00","07:00","08:00","09:00","10:00","11:00","11:30","12:00","12:30","13:00","13:30","14:00","15:00","16:00","17:00"],"dflt":"13:30","doNotTranslate":true,"menu":"style"},"acrossBackFactor":{"pct":96,"min":93,"max":100,"menu":"advanced"},"armholeDepthFactor":{"pct":100,"min":80,"max":120,"menu":"advanced"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"shoulderDartSize":{"pct":7,"min":4,"max":10},"shoulderDartLength":{"pct":85,"min":60,"max":100},"waistDartSize":{"pct":10,"min":4,"max":15},"waistDartLength":{"pct":85,"min":60,"max":100},"verticalEase":{"pct":2,"min":0,"max":8,"menu":"fit"},"frontArmholeDeeper":{"pct":1,"min":0,"max":5,"menu":"advanced"},"shoulderEase":{"pct":0,"min":0,"max":4,"menu":"fit"},"collarEase":{"pct":3.5,"min":0,"max":10,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"waistEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"primaryBustDartShaping":{"pct":50,"min":25,"max":75,"menu":"style"},"primaryBustDartLength":{"pct":85,"min":65,"max":95,"menu":"style"},"secondaryBustDartLength":{"pct":85,"min":65,"max":95,"menu":"style"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":100,"menu":"advanced"},"frontScyeDart":{"pct":25,"min":0,"max":45,"menu":"fit"},"sleevecapEase":{"pct":0.5,"min":0,"max":2.5,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":110,"min":35,"max":165,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":45,"min":35,"max":55,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":3,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":5.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":4.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":12.5,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"cuffEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"}},"brian":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":-4,"max":60,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"}},"bruce":{"hipRatioFront":0.245,"hipRatioBack":0.315,"legRatioInset":0.3,"legRatioBack":0.32,"gussetRatio":0.0666,"gussetInsetRatio":0.6,"heightRatioInset":0.65,"bulge":{"deg":20,"min":0,"max":40,"menu":"fit"},"legBonus":{"pct":0,"min":-10,"max":20,"menu":"style"},"rise":{"pct":10,"min":0,"max":25,"menu":"style"},"stretch":{"pct":15,"min":5,"max":25,"menu":"fit"},"legStretch":{"pct":40,"min":25,"max":45,"menu":"fit"},"backRise":{"pct":5,"min":0,"max":10,"menu":"fit"}},"carlita":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"collarEase":0.145,"cuffEase":{"pct":60,"min":30,"max":100,"menu":"fit"},"draftForHighBust":true,"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":0,"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"fit"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":65,"min":50,"max":70,"menu":"fit"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":12,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"buttonSpacingHorizontal":{"pct":43.5,"min":15,"max":60,"menu":"style"},"length":{"pct":69,"min":35,"max":100,"menu":"style"},"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"pocketPlacementHorizontal":{"pct":11,"min":5,"max":20,"menu":"pockets"},"pocketPlacementVertical":{"pct":6,"min":5,"max":60,"menu":"pockets"},"pocketWidth":{"pct":95,"min":70,"max":120,"menu":"pockets"},"pocketHeight":{"pct":15,"min":0,"max":40,"menu":"pockets"},"pocketRadius":{"pct":20,"min":0,"max":50,"menu":"pockets"},"pocketFlapRadius":{"pct":15,"min":0,"max":50,"menu":"pockets"},"chestPocketPlacement":{"pct":55,"min":30,"max":65,"menu":"pockets"},"chestPocketAngle":0,"chestPocketHeight":{"pct":60,"min":40,"max":80,"menu":"pockets"},"chestPocketWidth":{"pct":25,"min":15,"max":50,"menu":"pockets"},"innerPocketPlacement":{"pct":53,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"seatEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"contour":{"pct":50,"min":25,"max":75,"menu":"advanced"},"backPleat":0.048,"beltWidth":{"pct":15,"min":10,"max":20,"menu":"style"},"sleeveLengthBonus":{"pct":7,"min":0,"max":20,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"cuffLength":{"pct":15,"min":10,"max":20,"menu":"style"},"chestShapingMax":5,"collarHeight":{"pct":9.6,"min":8,"max":11,"menu":"collar"},"collarFlare":{"pct":20,"min":0,"max":40,"menu":"collar"},"collarSpread":{"deg":4,"min":2,"max":6,"menu":"collar"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"}},"carlton":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":20,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":10,"min":5,"max":20,"menu":"fit"},"collarEase":0.145,"cuffEase":{"pct":60,"min":30,"max":100,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":0,"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"fit"},"armholeDepth":{"pct":5,"min":-10,"max":50},"armholeDepthFactor":{"pct":65,"min":50,"max":70,"menu":"fit"},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.5,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":12,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"buttonSpacingHorizontal":{"pct":43.5,"min":15,"max":60,"menu":"style"},"length":{"pct":69,"min":35,"max":100,"menu":"style"},"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"pocketPlacementHorizontal":{"pct":11,"min":5,"max":20,"menu":"pockets"},"pocketPlacementVertical":{"pct":6,"min":5,"max":60,"menu":"pockets"},"pocketWidth":{"pct":95,"min":70,"max":120,"menu":"pockets"},"pocketHeight":{"pct":15,"min":0,"max":40,"menu":"pockets"},"pocketRadius":{"pct":20,"min":0,"max":50,"menu":"pockets"},"pocketFlapRadius":{"pct":15,"min":0,"max":50,"menu":"pockets"},"chestPocketPlacement":{"pct":55,"min":30,"max":65,"menu":"pockets"},"chestPocketAngle":{"deg":4,"min":0,"max":6,"menu":"pockets"},"chestPocketHeight":{"pct":60,"min":40,"max":80,"menu":"pockets"},"chestPocketWidth":{"pct":25,"min":15,"max":50,"menu":"pockets"},"innerPocketPlacement":{"pct":53,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"seatEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"backPleat":0.048,"beltWidth":{"pct":15,"min":10,"max":20,"menu":"style"},"sleeveLengthBonus":{"pct":7,"min":0,"max":20,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"cuffLength":{"pct":15,"min":10,"max":20,"menu":"style"},"chestShapingMax":5,"collarHeight":{"pct":9.6,"min":8,"max":11,"menu":"collar"},"collarFlare":{"pct":20,"min":0,"max":40,"menu":"collar"},"collarSpread":{"deg":4,"min":2,"max":6,"menu":"collar"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"}},"cathrin":{"waistReduction":{"pct":10,"min":2,"max":20,"menu":"fit"},"panels":{"list":["11","13"],"dflt":"13","menu":"fit"},"backOpening":{"pct":4,"min":3,"max":10,"menu":"style"},"backRise":{"pct":15,"min":1,"max":25,"menu":"style"},"backDrop":{"pct":2,"min":-10,"max":5,"menu":"style"},"frontRise":{"pct":4,"min":-10,"max":8,"menu":"style"},"frontDrop":{"pct":5,"min":0,"max":10,"menu":"style"},"hipRise":{"pct":5,"min":0,"max":15,"menu":"style"}},"charlie":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":false,"waistEase":{"pct":1,"min":0,"max":5,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"kneeEase":{"pct":15,"min":10,"max":30,"menu":"fit"},"waistHeight":{"pct":-4,"min":-15,"max":40,"menu":"style"},"lengthBonus":{"pct":2,"min":-20,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":15,"menu":"style"},"fitKnee":true,"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":55,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":50,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"waistbandReduction":0.25,"waistbandFactor":0.1,"frontPocketSlantDepth":{"pct":85,"min":70,"max":100,"menu":"pockets.frontpockets"},"frontPocketSlantWidth":{"pct":25,"min":15,"max":35,"menu":"pockets.frontpockets"},"frontPocketSlantRound":{"pct":30,"min":5,"max":50,"menu":"pockets.frontpockets"},"frontPocketSlantBend":{"pct":25,"min":5,"max":50,"menu":"pockets.frontpockets"},"frontPocketWidth":{"pct":55,"min":45,"max":65,"menu":"pockets.frontpockets"},"frontPocketDepth":{"pct":100,"min":85,"max":110,"menu":"pockets.frontpockets"},"frontPocketFacing":{"pct":45,"min":25,"max":65,"menu":"pockets.frontpockets"},"flyCurve":{"pct":72,"min":50,"max":100,"menu":"advanced.fly"},"flyLength":{"pct":45,"min":30,"max":60,"menu":"advanced.fly"},"flyWidth":{"pct":15,"min":10,"max":20,"menu":"advanced.fly"},"backPocketVerticalPlacement":{"pct":24,"min":18,"max":30,"menu":"pockets.backpockets"},"backPocketHorizontalPlacement":{"pct":55,"min":48,"max":62,"menu":"pockets.backpockets"},"backPocketWidth":{"pct":55,"min":50,"max":60,"menu":"pockets.backpockets"},"backPocketDepth":{"pct":60,"min":40,"max":80,"menu":"pockets.backpockets"},"backPocketFacing":{"bool":true,"menu":"pockets.backpockets"},"waistbandCurve":{"pct":0,"min":0,"max":35,"menu":"fit"},"beltLoops":{"count":8,"min":6,"max":12,"menu":"advanced"}},"cornelius":{"pctAtoO":0.5,"pctAtoC":0.25,"pctUtoA":0.25,"pctJtoA":0.25,"pctSeatAdjustment":0.5,"ventLength":{"pct":70,"min":25,"max":110,"menu":"style"},"fullness":{"pct":0,"min":0,"max":55,"menu":"fit"},"waistbandBelowWaist":{"pct":5,"min":0,"max":15,"menu":"style"},"waistReduction":{"pct":1,"min":-2,"max":10,"menu":"fit"},"bandBelowKnee":{"pct":25,"min":15,"max":50,"menu":"advanced"},"pctZtoR":0.35,"pctRtoZin":0.75,"pctRtoZup":0.25,"pctRtoKin":0.75,"pctRtoKdown":0.25,"pctKtoRout":0.15,"pctKtoRup":0.25,"pctKtoH":0.7,"flyWidth":{"pct":0.38,"min":0.2,"max":0.6,"menu":"style"},"kneeToBelow":{"pct":94,"min":85,"max":110,"menu":"advanced"},"cuffWidth":{"pct":0,"min":-50,"max":150,"menu":"style"},"cuffStyle":{"dflt":"elegant","list":["traditional","elegant","keystone"],"menu":"style"}},"diana":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":0,"min":-5,"max":50,"menu":"fit"},"chestEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"collarEase":0,"cuffEase":{"pct":20,"min":0,"max":30,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":0,"min":0,"max":50,"menu":"fit"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":97,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":0,"min":0,"max":20,"menu":"advanced"},"armholeDepthFactor":{"pct":55,"min":50,"max":70,"menu":"advanced"},"backNeckCutout":0.05,"frontArmholeDeeper":{"pct":0,"min":0,"max":1.5,"menu":"advanced"},"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"drapeAngle":{"deg":20,"min":10,"max":30,"menu":"style"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"fit"},"shoulderSeamLength":{"pct":35,"min":0.1,"max":60,"menu":"style"},"waistEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"hipsEase":{"pct":0,"min":-10,"max":20,"menu":"fit"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":100,"min":35,"max":165,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":3,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":5.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":4.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":6,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"}},"examples":{"size":{"pct":50,"min":5,"max":100,"menu":"stack"},"x":{"pct":0,"min":-100,"max":100,"menu":"stack"},"y":{"pct":0,"min":-100,"max":100,"menu":"stack"},"stackIt":{"dflt":"Do stack","list":["Do stack","Do not stack"],"menu":"stack"}},"florence":{"length":{"pct":40,"min":35,"max":45,"menu":"fit"},"height":{"pct":26,"min":23,"max":29,"menu":"fit"},"curve":{"pct":12.5,"min":10,"max":15,"menu":"fit"}},"florent":{"topSide":0.8,"brim":0,"headEase":{"pct":2,"min":0,"max":5,"menu":"fit"}},"gozer":{},"hi":{"length":1000,"size":{"pct":100,"min":5,"max":500,"menu":"style"},"nosePointiness":{"pct":0,"min":-5,"max":10,"menu":"style"},"aggressive":{"bool":false,"menu":"style"},"hungry":{"pct":50,"min":0,"max":100,"menu":"style"}},"holmes":{"headEase":{"pct":3,"min":0,"max":9,"snap":{"metric":[6,13,19,25,32,38,44,50],"imperial":[6.35,12.7,19.05,25.4,31.75,38.1,44.45,50.8]},"menu":"fit"},"lengthRatio":{"pct":55,"min":40,"max":60,"menu":"style"},"gores":{"count":6,"min":4,"max":20,"menu":"style"},"visorAngle":{"deg":45,"min":10,"max":90,"menu":"style"},"visorWidth":{"pct":5,"min":1,"max":17,"snap":5,"menu":"style"},"visorLength":{"pct":100,"min":80,"max":150,"menu":"advanced"},"earLength":{"pct":100,"min":80,"max":150,"menu":"style"},"earWidth":{"pct":100,"min":80,"max":150,"menu":"style"},"buttonhole":{"bool":false,"menu":"style"}},"hortensia":{"width":230,"height":330,"size":{"pct":50,"min":20,"max":200,"menu":"style"},"zipperSize":{"dflt":"#5","list":["#3","#4","#4.5","#5","#6","#8","#10","invisible"],"menu":"style"},"minHandleSpaceWidth":80,"maxHandleSpaceWidth":250,"pctHandleSpace":50,"pctHandleVert":42,"handleWidth":{"pct":8.6,"min":4,"max":25,"menu":"style"},"strapLength":{"pct":160,"min":75,"max":250,"menu":"style"}},"huey":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":15,"min":-4,"max":60,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"ribbing":{"bool":true,"menu":"style"},"ribbingHeight":{"pct":10,"min":5,"max":15,"menu":"style"},"hipsEase":{"pct":8,"min":4,"max":12,"menu":"fit"},"pocket":{"bool":true,"menu":"style"},"pocketHeight":{"pct":30,"min":25,"max":35,"menu":"style"},"pocketWidth":{"pct":60,"min":50,"max":70,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":0,"min":-40,"max":10,"menu":"style"},"hoodHeight":{"pct":59,"min":55,"max":65,"menu":"style"},"hoodCutback":{"pct":10,"min":5,"max":15,"menu":"style"},"hoodClosure":{"pct":13.5,"min":10,"max":15,"menu":"style"},"hoodDepth":{"pct":8.5,"min":5,"max":12,"menu":"style"},"hoodAngle":{"deg":5,"min":2,"max":8,"menu":"style"},"ribbingStretch":{"pct":15,"min":0,"max":30,"menu":"fit"}},"hugo":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":8,"min":4,"max":20,"menu":"fit"},"collarEase":0.05,"cuffEase":{"pct":20,"min":10,"max":50,"menu":"fit"},"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":10,"min":0,"max":20,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":0.5,"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":0,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"hipsEase":{"pct":12,"min":4,"max":20,"menu":"fit"},"ribbingHeight":{"pct":10,"min":4,"max":20,"menu":"style"},"pocketWidth":{"pct":50,"min":35,"max":65,"menu":"style"},"sleevecapEase":0,"sleevecapTopFactorX":0.5,"sleevecapTopFactorY":0.45,"sleevecapBackFactorX":0.6,"sleevecapBackFactorY":0.33,"sleevecapFrontFactorX":0.55,"sleevecapFrontFactorY":0.33,"sleevecapQ1Offset":0.017,"sleevecapQ2Offset":0.035,"sleevecapQ3Offset":0.025,"sleevecapQ4Offset":0.01,"sleevecapQ1Spread1":0.1,"sleevecapQ1Spread2":0.15,"sleevecapQ2Spread1":0.15,"sleevecapQ2Spread2":0.1,"sleevecapQ3Spread1":0.1,"sleevecapQ3Spread2":0.08,"sleevecapQ4Spread1":0.07,"sleevecapQ4Spread2":0.063,"sleeveWidthGuarantee":0.9,"sleeveLengthBonus":{"pct":2,"min":0,"max":10,"menu":"style"},"ribbingStretch":{"pct":5,"min":0,"max":10,"menu":"fit"}},"jaeger":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":19,"min":10,"max":25,"menu":"fit"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"centerBackDart":{"pct":0.5,"min":0,"max":1.5,"menu":"fit"},"hipsEase":{"pct":12,"min":8,"max":20,"menu":"fit"},"waistEase":{"pct":14,"min":8,"max":25,"menu":"fit"},"rollLineCollarHeight":{"pct":6,"min":5,"max":9,"menu":"collar"},"reduceWaistStandardFraction":0.08,"reduceWaistDartFraction":0.05,"reduceHipsStandardFraction":0.1,"centerFrontHemDrop":{"pct":2,"min":0,"max":4,"menu":"style"},"frontPocketPlacement":{"pct":75,"min":65,"max":85,"menu":"pockets"},"frontPocketWidth":{"pct":68,"min":55,"max":75,"menu":"pockets"},"frontPocketDepth":{"pct":110,"min":80,"max":130,"menu":"pockets"},"frontPocketRadius":{"pct":10,"min":0,"max":50,"menu":"pockets"},"frontDartPlacement":{"pct":55,"min":45,"max":60,"menu":"advanced"},"sideFrontPlacement":{"pct":85,"min":80,"max":90,"menu":"advanced"},"frontOverlap":{"pct":1.5,"min":1,"max":2,"menu":"advanced"},"innerPocketPlacement":{"pct":52,"min":42,"max":62,"menu":"pockets"},"innerPocketWidth":{"pct":50,"min":45,"max":65,"menu":"pockets"},"innerPocketDepth":{"pct":110,"min":75,"max":140,"menu":"pockets"},"innerPocketWeltHeight":{"pct":3.5,"min":2.5,"max":5,"menu":"pockets"},"frontCutawayAngle":{"deg":2.5,"min":1,"max":4,"menu":"style"},"frontCutawayStart":{"pct":30,"min":10,"max":70,"menu":"style"},"frontCutawayEnd":{"pct":40,"min":10,"max":40,"menu":"style"},"hemRadius":{"pct":100,"min":35,"max":100,"menu":"style"},"chestPocketDepth":{"pct":110,"min":70,"max":150,"menu":"pockets"},"chestPocketWidth":{"pct":37,"min":30,"max":45,"menu":"pockets"},"chestPocketPlacement":{"pct":52,"min":40,"max":60,"menu":"pockets"},"chestPocketAngle":{"deg":2.5,"min":0,"max":7,"menu":"pockets"},"chestPocketWeltSize":{"pct":17.5,"min":10,"max":25,"menu":"pockets"},"lapelStart":{"pct":10,"min":0,"max":35,"menu":"style"},"collarHeight":{"pct":9,"min":7,"max":10,"menu":"collar"},"collarNotchDepth":{"pct":15,"min":15,"max":50,"menu":"collar"},"collarNotchAngle":{"deg":45,"min":30,"max":60,"menu":"collar"},"collarNotchReturn":{"pct":100,"min":50,"max":100,"menu":"collar"},"chestShaping":{"pct":30,"min":0,"max":100,"menu":"advanced"},"buttons":{"list":["1","2","3"],"dflt":"2","menu":"style"},"buttonLength":{"pct":30,"min":30,"max":60,"menu":"style"},"chestShapingMax":5,"lapelReduction":{"pct":5,"min":0,"max":10,"menu":"style"},"backVent":{"count":1,"min":0,"max":2,"menu":"style"},"backVentLength":{"pct":35,"min":15,"max":100,"menu":"style"},"collarSpread":{"deg":13,"min":5,"max":35,"menu":"collar"},"collarRoll":{"pct":5,"min":0,"max":10,"menu":"collar"},"pocketFoldover":{"pct":25,"min":15,"max":35,"menu":"pockets"},"sleeveLengthBonus":{"pct":0,"min":-20,"max":15,"menu":"fit"},"sleeveBend":{"deg":10,"min":0,"max":20,"menu":"fit"},"sleevecapHeight":{"pct":45,"min":40,"max":60,"menu":"advanced"},"sleevecapEase":{"pct":1,"min":0,"max":10,"menu":"advanced"},"sleeveVentLength":{"pct":35,"min":25,"max":55,"menu":"sleeves"},"sleeveVentWidth":{"pct":18,"min":10,"max":26,"menu":"sleeves"}},"legend":{},"lucy":{"width":{"pct":50,"min":30,"max":100,"menu":"style"},"length":{"pct":50,"min":30,"max":100,"menu":"style"},"edge":{"pct":25,"min":20,"max":50,"menu":"style"}},"lumina":{"waistband":{"bool":true,"menu":"style"},"lowerwaistbandback":{"bool":true},"ease":{"pct":-8,"min":-25,"max":10,"menu":"fit"},"length":{"pct":35,"min":10,"max":100,"menu":"style"},"waistbandsize":{"pct":50,"min":0,"max":150},"waistlowering":{"pct":35,"min":-10,"max":60,"menu":"style"},"waistreduction":{"pct":4,"min":0,"max":10},"sidepanel":{"pct":25,"min":10,"max":40,"menu":"style"},"smoothing":{"pct":85,"min":50,"max":100,"menu":"advanced"},"fixedsidepanel":{"bool":false,"menu":"style"},"crossSeamAngle":35,"crotchToKnee":0.4,"waistToKneeCP":0.4,"kneeToWaistLength":400,"crotchPointsCP":2,"pocket":{"bool":true,"menu":"style"},"pocketdepth":{"pct":90,"min":20,"max":120}},"lumira":{"gussetcompensation":1.03,"waistband":{"bool":true,"menu":"style"},"backgusset":{"bool":false,"menu":"style"},"cyclingchamois":{"bool":false,"menu":"style"},"frontbulge":{"bool":false},"ease":{"pct":-8,"min":-30,"max":0,"menu":"fit"},"leglength":{"pct":100,"min":10,"max":100,"menu":"style"},"waistlowering":{"pct":35,"min":-10,"max":60,"menu":"style"},"gussetwidth":{"pct":16,"min":5,"max":30},"backgussetwidth":{"pct":50,"min":20,"max":75},"frontgussetlength":{"pct":12.5,"min":0,"max":30},"waistbandsize":{"pct":90,"min":0,"max":150},"waistreduction":{"pct":4,"min":0,"max":10},"backinserttopcp":0.3,"backinserttopcpangle":0,"backinsertgussetcp":0.2,"frontbulgelift":1.75,"frontbulgeforwardpercentage":0.125,"frontbulgemiddleshift":0.65,"buttlift":{"pct":30,"min":0,"max":60},"frontbulgesize":{"pct":2.5,"min":0,"max":10}},"lunetius":{"lengthRatio":{"pct":105,"min":60,"max":130,"menu":"style"},"widthRatio":{"pct":100,"min":50,"max":130,"menu":"style"},"length":{"list":["toKnee","toBelowKnee","toHips","toUpperLeg","toFloor"],"dflt":"toBelowKnee","menu":"style"}},"magde":{"size":{"pct":100,"min":15,"max":200,"menu":"style"},"taperRatio":{"pct":60,"min":50,"max":100,"menu":"style"},"flapHeightRatio":{"pct":83,"min":60,"max":100,"menu":"style"},"openingRatio":{"pct":66,"min":30,"max":90,"menu":"style"},"onePieceLid":{"bool":false,"menu":"style"},"useCommonWebbingSizes":{"bool":true,"menu":"style"}},"naomiwu":{"hipsEase":{"pct":0,"min":-5,"max":5,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":15,"menu":"fit"},"waistSlant":{"pct":0,"min":0,"max":2,"menu":"fit"},"invertFly":{"bool":false,"menu":"style"},"length":{"pct":40,"min":0,"max":80,"menu":"style"},"waistbandWidth":{"pct":4.4,"min":2,"max":10,"menu":"style"},"beltLoopWidth":{"pct":40,"min":20,"max":60,"menu":"style"},"frontPocketOpeningBend":{"pct":80,"min":0,"max":100,"menu":"pockets"},"frontPocketOpeningDepth":{"pct":33,"min":25,"max":45,"menu":"pockets"},"backPocketDepth":{"pct":70,"min":60,"max":85,"menu":"pockets"},"backPocketChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"frontPocketOpeningWidth":{"pct":33,"min":25,"max":45,"menu":"pockets"},"backAttachmentWidth":{"pct":40,"min":25,"max":55,"menu":"pockets"},"backAttachmentDepth":{"pct":190,"min":100,"max":220,"menu":"pockets"},"frontAttachmentWidth":{"pct":95,"min":80,"max":110,"menu":"pockets"},"frontAttachmentChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"backAttachmentFlapChamferSize":{"pct":15,"min":5,"max":25,"menu":"pockets"},"dartLength":{"pct":90,"min":50,"max":100,"menu":"advanced"},"dartWidth":{"pct":5,"min":4,"max":8,"menu":"advanced"},"flyLength":{"pct":75,"min":50,"max":85,"menu":"advanced"},"flyWidth":{"pct":16,"min":10,"max":22,"menu":"advanced"},"frontHalf":{"pct":55,"min":50,"max":60,"menu":"advanced"},"jseamBend":{"pct":65,"min":50,"max":100,"menu":"advanced"},"minDartWidth":{"pct":2,"min":0.5,"max":4,"menu":"advanced"}},"noble":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":0,"min":-5,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":{"pct":46,"min":38,"max":54,"menu":"darts"},"bustDartCurve":1,"bustDartLength":0.9,"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"darts"},"armholeDepth":{"pct":44,"min":38,"max":46,"menu":"armhole"},"backArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"backArmholePitchDepth":{"pct":35,"max":40,"min":30,"menu":"armhole"},"backArmholeSlant":{"deg":5,"min":1,"max":9,"menu":"armhole"},"frontArmholeCurvature":{"pct":63,"min":50,"max":85,"menu":"armhole"},"frontArmholePitchDepth":{"pct":29,"max":31,"min":27,"menu":"armhole"},"backHemSlope":{"deg":2.5,"min":0,"max":5,"menu":"advanced"},"backNeckCutout":{"pct":6,"min":3,"max":9,"menu":"advanced"},"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"armholeDartPosition":{"pct":50,"min":10,"max":90},"dartPosition":{"dflt":"shoulder","list":["shoulder","armhole"],"menu":"darts"},"shoulderDartCurvature":{"pct":0,"min":-5,"max":2.5},"shoulderDartPosition":{"pct":50,"min":10,"max":90},"shoulderToShoulderCorrection":0.995,"upperDartLength":{"pct":90,"min":80,"max":95,"menu":"darts"},"waistdartposition":{"pct":0,"min":-100,"max":100,"menu":"darts"}},"octoplushy":{"sizeConstant":200,"size":{"pct":100,"min":5,"max":500,"menu":"style"},"type":{"dflt":"octoplushy","list":["octoplushy","octopus","squid"],"menu":"style"},"armWidth":{"pct":15,"min":10,"max":30,"menu":"style"},"armLength":{"pct":200,"min":100,"max":500,"menu":"style"},"neckWidth":{"pct":25,"min":25,"max":45,"menu":"style"},"armTaper":{"pct":25,"min":0,"max":50,"menu":"style"},"bottomTopArmRatio":{"pct":57,"min":25,"max":75,"menu":"style"},"bottomArmReduction":{"pct":90,"min":75,"max":125},"bottomArmReductionPlushy":{"pct":80,"min":75,"max":125}},"onyx":{"neckStyle":{"dflt":"neckband","list":["neckband","hood"],"menu":"style"},"skirt":{"bool":false,"menu":"style"},"sleeveRibbing":{"bool":false,"menu":"construction"},"legRibbing":{"bool":false,"menu":"construction"},"zipperPosition":{"dflt":"front","list":["front","back","none"],"menu":"construction"},"neckEase":{"pct":50,"min":-30,"max":150,"menu":"fit"},"chestEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"waistEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"hipsEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"seatEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"upperLegEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"legHemEase":{"pct":0,"min":-40,"max":100,"menu":"fit"},"centerSeamEase":{"pct":0,"min":-20,"max":50,"menu":"fit"},"outseamEase":{"pct":0,"min":-20,"max":5,"menu":"fit"},"armpitEase":{"pct":15,"min":-20,"max":50,"menu":"fit"},"legLength":{"pct":20,"min":0,"max":120,"menu":"style"},"neckBalance":{"pct":40,"min":0,"max":80,"menu":"fit"},"raglanScoopLength":{"pct":20,"min":0,"max":50,"menu":"advanced"},"raglanScoopMagnitude":{"pct":6,"min":0,"max":20,"menu":"advanced"},"legHem":{"pct":200,"min":0,"max":800},"crotchGussetWidth":{"pct":100,"min":75,"max":133,"menu":"fit"},"legTaperPosition":{"pct":50,"min":0,"max":100,"menu":"advanced"},"frontOnFold":{"bool":false,"menu":"construction"},"backOnFold":{"bool":true,"menu":"construction"},"zipperLength":{"pct":20,"min":0,"max":50,"menu":"construction"},"sleeveEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"armholeTweakFactor":1.1,"skirtWidth":{"pct":160,"min":100,"max":250},"skirtLength":{"pct":100,"min":20,"max":500},"skirtWaistband":{"pct":200,"min":0,"max":800},"skirtHem":{"pct":200,"min":0,"max":800},"sleeveRibbingWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"sleeveRibbingLength":{"pct":75,"min":50,"max":100},"legRibbingWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"legRibbingLength":{"pct":75,"min":50,"max":100},"neckbandLength":{"pct":80,"min":50,"max":100},"neckbandWidth":{"pct":20,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35}},"zipperGuardWidth":{"pct":50,"min":0,"max":100,"snap":{"metric":5,"imperial":6.35},"menu":"construction"},"neckGuardLength":{"pct":2,"min":0,"max":5},"zipperGuardTapeCoverMaterial":0.75,"bicepsPosition":0.2,"wristEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"sleeveLength":{"pct":20,"min":0,"max":125,"menu":"style"},"sleeveHem":{"pct":200,"min":0,"max":800},"hoodDepth":{"pct":100,"min":70,"max":180},"hoodHeight":{"pct":100,"min":70,"max":140},"hoodFrontDip":{"pct":8,"min":0,"max":20},"hoodHem":{"pct":200,"min":0,"max":800},"hoodFrontBonus":{"pct":0,"min":-8,"max":10},"hoodFrontPieceSize":{"pct":50,"min":0,"max":50}},"otis":{"ease":{"pct":14,"min":0,"max":30,"menu":"fit"},"snapPlacket":{"pct":5,"min":0,"max":30,"menu":"advanced"},"sleeveType":{"dflt":"short","list":["short","long"],"menu":"style"},"hem":{"pct":10,"min":0,"max":30,"menu":"advanced"},"binding":{"pct":11,"min":2,"max":30,"menu":"advanced"}},"paco":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":false,"waistEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"seatEase":{"pct":5,"min":0,"max":15,"menu":"fit"},"kneeEase":0.06,"waistHeight":{"pct":5,"min":0,"max":100,"menu":"style"},"lengthBonus":{"pct":0,"min":-15,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":10,"menu":"style"},"fitKnee":false,"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":60,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":45,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"elastic"},"titanPaperless":false,"frontPocketHeelRatio":0.4,"backPocketWaistRatio":0.4,"backPocketHeightRatio":0.4,"backPocketWidthRatio":0.37,"waistbandHeight":0,"elasticatedCuff":{"bool":true,"menu":"style"},"ankleElastic":{"pct":5,"min":1,"max":13,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"elastic"},"heelEase":{"pct":5,"min":0,"max":50,"menu":"elastic"},"frontPockets":{"bool":true,"menu":"pockets"},"backPockets":{"bool":false,"menu":"pockets"},"frontPocketFlapSize":{"pct":3,"min":3,"max":3,"snap":{"metric":1,"imperial":0.79375},"menu":false},"weltFactor":0.15},"penelope":{"dartMaximumDifference":0.344,"dartMinimumDifference":0.2,"dartMinimumWidth":0.006888,"dartSideMinimum":10,"dartBackControl1":0.114,"dartBackControl2":5,"dartBackControl3":4,"curvePlacement":2.4,"dart2offset":32,"dart2factor":0.8,"hipCurveDividerDown":40,"hipCurveDividerUp":3,"sideSeamShiftPercentage":0.006,"backVentWidth":0.1,"paperlessOffset":15,"curvedDartControlAngle":2,"curvedDartTopControlOffset":0.2,"curvedDartBottomControlOffset":0.4,"curvedDarts":{"bool":true,"menu":"style"},"lengthBonus":{"pct":0,"min":-50,"max":50,"menu":"style"},"hemBonus":{"pct":0,"min":-35,"max":0,"menu":"style"},"hem":{"pct":2,"min":0,"max":5,"menu":"style"},"backVent":{"bool":true,"menu":"style"},"backVentLength":{"pct":40,"min":5,"max":70},"zipperLocation":{"dflt":"backSeam","list":["backSeam","sideSeam"],"menu":"style"},"nrOfDarts":{"count":2,"min":1,"max":2,"menu":"style"},"seatEase":{"pct":1,"min":0,"max":8,"menu":"fit"},"waistEase":{"pct":1,"min":0,"max":8,"menu":"fit"},"backDartDepthFactor":{"pct":50,"min":35,"max":70,"menu":"advanced"},"frontDartDepthFactor":{"pct":45,"min":30,"max":65,"menu":"advanced"},"dartToSideSeamFactor":{"pct":50,"min":30,"max":70,"menu":"advanced"},"waistband":{"bool":true,"menu":"style"},"waistbandWidth":{"pct":10,"min":5,"max":20},"waistbandOverlap":{"pct":3.5,"min":0,"max":10}},"plugintest":{"plugin":{"dflt":"all","list":["all","annotations","flip","gore","i18n","measurements","mirror","round","sprinkle","title","versionfreeSvg"],"menu":"tests"},"bannerDy":{"count":-1,"min":-15,"max":15,"menu":"annotations.banner"},"bannerSpaces":{"count":10,"min":0,"max":20,"menu":"annotations.banner"},"bannerRepeat":{"count":10,"min":1,"max":20,"menu":"annotations.banner"},"bartackLength":{"count":15,"min":2,"max":100,"menu":"annotations.bartack"},"bartackAngle":{"count":0,"min":-360,"max":360,"menu":"annotations.bartack"},"bartackDensity":{"count":3,"min":1,"max":5,"menu":"annotations.bartack"},"bartackWidth":{"count":3,"min":1,"max":5,"menu":"annotations.bartack"},"bartackStart":{"pct":25,"min":0,"max":100,"menu":"annotations.bartack"},"bartackEnd":{"pct":75,"min":0,"max":100,"menu":"annotations.bartack"},"crossboxText":{"bool":true,"menu":"annotations.crossboxText"},"cutonfoldMargin":{"pct":5,"min":0,"max":25,"menu":"annotations.cutonfold"},"cutonfoldOffset":{"count":15,"min":0,"max":100,"menu":"annotations.cutonfold"},"cutonfoldGrainline":{"bool":false,"menu":"annotations.cutonfold"},"dimensionsCustomText":{"bool":false,"menu":"annotations.dimensions"},"dimensionsEndMarker":{"bool":true,"menu":"annotations.dimensions"},"dimensionsStartMarker":{"bool":true,"menu":"annotations.dimensions"},"logoScale":{"pct":100,"min":10,"max":200,"menu":"annotations.logo"},"logoRotate":{"deg":0,"min":-360,"max":360,"menu":"annotations.logo"},"pleatMargin":{"count":35,"min":0,"max":50,"menu":"annotations.pleat"},"pleatReverse":{"bool":false,"menu":"annotations.pleat"},"scaleboxRotation":{"deg":0,"min":0,"max":360,"menu":"annotations.scalebox"},"scaleboxText":{"dflt":"default","list":["default","custom","suppress"],"menu":"annotations.scalebox"},"sewtogetherHinge":{"bool":true,"menu":"annotations.sewtogether"},"sewtogetherMiddle":{"bool":false,"menu":"annotations.sewtogether"},"titleNr":{"count":1,"min":0,"max":100,"menu":"annotations.title"},"titleTitle":{"bool":true,"menu":"annotations.title"},"titleMeta":{"bool":true,"menu":"annotations.title"},"titleScale":{"pct":100,"min":10,"max":200,"menu":"annotations.title"},"titleRotate":{"deg":0,"min":-360,"max":360,"menu":"annotations.title"},"snippetScale":{"pct":100,"min":10,"max":200,"menu":"annotations.snippets"},"snippetRotation":{"deg":0,"min":-360,"max":360,"menu":"annotations.snippets"},"flipAxis":{"dflt":"x","list":["x","y"],"menu":"flip"},"goreRadius":{"count":20,"min":10,"max":30,"menu":"gore"},"goreGoreNumber":{"count":6,"min":4,"max":8,"menu":"gore"},"goreExtraLength":{"count":10,"min":0,"max":20,"menu":"gore"},"mirrorLine":{"dflt":"a","list":["a","b","none"],"menu":"mirror"},"mirrorClone":{"bool":true,"menu":"mirror"},"roundRadius":{"count":10,"min":0,"max":50,"menu":"round"},"roundHide":{"bool":false,"menu":"round"},"sprinkleScale":{"pct":100,"min":10,"max":200,"menu":"sprinkle"},"sprinkleRotate":{"deg":0,"min":-360,"max":360,"menu":"sprinkle"},"sprinkleSnippet":{"dflt":"bnotch","list":["notch","bnotch","button","buttonhole","buttonhole-start","buttonhole-end","snap-stud","snap-socket","logo"],"menu":"sprinkle"},"ringsectorInsideRadius":{"count":30,"min":10,"max":50,"menu":"ringsector"},"ringsectorOutsideRadius":{"count":60,"min":60,"max":120,"menu":"ringsector"},"ringsectorAngle":{"deg":75,"min":30,"max":120,"menu":"ringsector"}},"rendertest":{"width":{"mm":200,"min":50,"max":500,"testIgnore":false},"only":{"menu":"show","dflt":"false","list":["false","circles","colors","widths","styles","combos","text","snippets","macros"]}},"sandy":{"minimumOverlap":15,"seamlessFullCircle":{"bool":false,"menu":"construction"},"waistbandWidth":{"pct":4,"min":1,"max":8,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"waistbandPosition":{"pct":50,"min":0,"max":100,"menu":"fit"},"lengthBonus":{"pct":50,"min":10,"max":100,"menu":"style"},"circleRatio":{"pct":50,"min":20,"max":100,"menu":"style"},"waistbandOverlap":{"pct":3,"min":0,"max":15,"menu":"style"},"gathering":{"pct":0,"min":0,"max":200,"menu":"style"},"hemWidth":{"pct":2,"min":1,"max":10,"menu":"construction"},"waistbandShape":{"list":["straight","curved"],"dflt":"straight","menu":"fit"},"panels":{"count":1,"min":1,"max":8,"menu":"construction"}},"shelly":{"neckEase":{"pct":50,"min":-30,"max":150,"menu":"fit"},"chestEase":{"pct":0,"min":-40,"max":50,"menu":"fit"},"straightSides":{"bool":true,"menu":"advanced"},"hipsEase":{"pct":0,"min":-30,"max":75,"menu":"advanced"},"armpitEase":{"pct":15,"min":-20,"max":50,"menu":"fit"},"bodyLength":{"pct":120,"min":20,"max":300,"menu":"style"},"neckBalance":{"pct":40,"min":0,"max":80,"menu":"fit"},"raglanScoopLength":{"pct":20,"min":0,"max":50,"menu":"advanced"},"raglanScoopMagnitude":{"pct":6,"min":0,"max":20,"menu":"advanced"},"hemWidth":{"pct":200,"min":0,"max":800,"menu":"construction"},"sideShape":{"pct":0,"min":-20,"max":20,"menu":"advanced"},"armholeTweakFactor":1.1,"sleeveEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"bicepsPosition":0.2,"wristEase":{"pct":0,"min":-30,"max":50,"menu":"fit"},"sleeveLength":{"pct":20,"min":0,"max":125,"menu":"style"},"sleeveHem":{"pct":200,"min":0,"max":800,"menu":"construction"},"neckbandLength":{"pct":80,"min":50,"max":100,"menu":"fit"},"neckbandWidth":{"pct":7.5,"min":0,"max":50,"menu":"fit"}},"shin":{"frontFactor":0.58,"legFrontFactor":0.48,"gussetFactor":0.0714,"angle":10,"elasticWidth":{"pct":10,"min":4,"max":20,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"style"},"stretch":{"pct":20,"min":10,"max":30,"menu":"fit"},"bulge":{"pct":2.5,"min":0,"max":5,"menu":"fit"},"legReduction":{"pct":5,"min":0,"max":10,"menu":"fit"},"rise":{"pct":0,"min":0,"max":25,"menu":"style"},"backRise":{"pct":5,"min":0,"max":10,"menu":"fit"}},"simon":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":2,"min":0,"max":15,"menu":"fit"},"lengthBonus":{"pct":25,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"backDarts":{"list":["auto","never","always"],"dflt":"auto","menu":"style"},"backDartShaping":{"pct":25,"min":5,"max":75,"menu":"advanced"},"boxPleat":{"bool":false,"menu":"style"},"boxPleatFold":{"pct":15,"min":10,"max":20,"menu":"advanced"},"boxPleatWidth":{"pct":7,"min":4,"max":10,"menu":"advanced"},"roundBack":{"pct":0,"min":0,"max":10,"menu":"fit"},"buttonholePlacketWidth":{"pct":8,"min":4,"max":12,"menu":"style.closure"},"buttonholePlacketFoldWidth":{"pct":16,"min":8,"max":24,"menu":"style.closure"},"buttonPlacketWidth":{"pct":5,"min":2,"max":8,"menu":"style.closure"},"hemCurve":{"pct":50,"min":25,"max":100,"menu":"style"},"hemStyle":{"list":["straight","baseball","slashed"],"dflt":"straight","menu":"style"},"hipsEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"yokeHeight":{"pct":70,"min":40,"max":90,"menu":"style"},"sleevePlacketWidth":{"pct":13,"min":8,"max":18,"menu":"style.cuffs"},"waistEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"buttonFreeLength":{"pct":2,"min":-10,"max":15,"menu":"style.closure"},"extraTopButton":{"bool":true,"menu":"style.closure"},"separateButtonPlacket":{"bool":false,"menu":"style.closure"},"separateButtonholePlacket":{"bool":false,"menu":"style.closure"},"buttons":{"count":7,"min":4,"max":12,"menu":"style.closure"},"ffsa":{"pct":150,"min":100,"max":200,"menu":"advanced"},"collarAngle":{"deg":85,"min":60,"max":130,"menu":"style.collar"},"collarBend":{"pct":3.5,"min":0,"max":10,"menu":"style.collar"},"collarFlare":{"deg":3.5,"min":0,"max":10,"menu":"style.collar"},"collarGap":{"pct":2.5,"min":0,"max":6,"menu":"style.collar"},"collarRoll":{"pct":3,"min":0,"max":6,"menu":"style.collar"},"collarStandBend":{"deg":3,"min":0,"max":5,"menu":"style.collar"},"collarStandCurve":{"deg":2,"min":0,"max":5,"menu":"style.collar"},"collarStandWidth":{"pct":8,"min":3,"max":13,"menu":"style.collar"},"cuffOverlap":0.15,"barrelCuffNarrowButton":{"bool":true,"menu":"style.cuffs"},"cuffButtonRows":{"count":1,"min":1,"max":2,"menu":"style.cuffs"},"cuffDrape":{"pct":5,"min":0,"max":10,"menu":"style.cuffs"},"cuffLength":{"pct":10,"min":3,"max":15,"menu":"style.cuffs"},"cuffStyle":{"list":["roundedBarrelCuff","angledBarrelCuff","straightBarrelCuff","roundedFrenchCuff","angledFrenchCuff","straightFrenchCuff"],"dflt":"angledBarrelCuff","menu":"style.cuffs"},"buttonPlacketStyle":{"list":["classic","seamless"],"dflt":"classic"},"buttonholePlacketStyle":{"list":["classic","seamless"],"dflt":"seamless"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":3.5,"min":-40,"max":10,"menu":"fit"},"sleevePlacketLength":{"pct":25,"min":15,"max":35,"menu":"style.cuffs"},"splitYoke":{"bool":false,"menu":"style"}},"simone":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":5,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"cuffEase":{"pct":20,"min":10,"max":40,"menu":"fit"},"draftForHighBust":true,"shoulderEase":{"pct":2,"min":0,"max":15,"menu":"fit"},"lengthBonus":{"pct":25,"min":-4,"max":60,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"backDarts":{"list":["auto","never","always"],"dflt":"auto","menu":"style"},"backDartShaping":{"pct":25,"min":5,"max":75,"menu":"advanced"},"boxPleat":{"bool":false,"menu":"style"},"boxPleatFold":{"pct":15,"min":10,"max":20,"menu":"advanced"},"boxPleatWidth":{"pct":7,"min":4,"max":10,"menu":"advanced"},"roundBack":{"pct":0,"min":0,"max":10,"menu":"fit"},"buttonholePlacketWidth":{"pct":8,"min":4,"max":12,"menu":"style.closure"},"buttonholePlacketFoldWidth":{"pct":16,"min":8,"max":24,"menu":"style.closure"},"buttonPlacketWidth":{"pct":5,"min":2,"max":8,"menu":"style.closure"},"hemCurve":{"pct":50,"min":25,"max":100,"menu":"style"},"hemStyle":{"list":["straight","baseball","slashed"],"dflt":"straight","menu":"style"},"hipsEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"yokeHeight":{"pct":70,"min":40,"max":90,"menu":"style"},"sleevePlacketWidth":{"pct":13,"min":8,"max":18,"menu":"style.cuffs"},"waistEase":{"pct":15,"min":10,"max":35,"menu":"fit"},"buttonFreeLength":{"pct":2,"min":-10,"max":15,"menu":"style.closure"},"extraTopButton":{"bool":true,"menu":"style.closure"},"separateButtonPlacket":{"bool":false,"menu":"style.closure"},"separateButtonholePlacket":{"bool":false,"menu":"style.closure"},"buttons":{"count":7,"min":4,"max":12,"menu":"style.closure"},"ffsa":{"pct":150,"min":100,"max":200,"menu":"advanced"},"minimalDartShaping":5,"bustDartAngle":{"deg":10,"min":0,"max":20,"menu":"advanced"},"bustDartLength":{"pct":80,"min":50,"max":90,"menu":"advanced"},"frontDarts":{"bool":false,"menu":"advanced"},"frontDartLength":{"pct":45,"min":30,"max":60,"menu":"advanced"},"contour":{"pct":50,"min":30,"max":75,"menu":"style"},"bustAlignedButtons":{"dflt":"disabled","list":["even","split","disabled"],"menu":"style.closure"},"collarAngle":{"deg":85,"min":60,"max":130,"menu":"style.collar"},"collarBend":{"pct":3.5,"min":0,"max":10,"menu":"style.collar"},"collarFlare":{"deg":3.5,"min":0,"max":10,"menu":"style.collar"},"collarGap":{"pct":2.5,"min":0,"max":6,"menu":"style.collar"},"collarRoll":{"pct":3,"min":0,"max":6,"menu":"style.collar"},"collarStandBend":{"deg":3,"min":0,"max":5,"menu":"style.collar"},"collarStandCurve":{"deg":2,"min":0,"max":5,"menu":"style.collar"},"collarStandWidth":{"pct":8,"min":3,"max":13,"menu":"style.collar"},"cuffOverlap":0.15,"barrelCuffNarrowButton":{"bool":true,"menu":"style.cuffs"},"cuffButtonRows":{"count":1,"min":1,"max":2,"menu":"style.cuffs"},"cuffDrape":{"pct":5,"min":0,"max":10,"menu":"style.cuffs"},"cuffLength":{"pct":10,"min":3,"max":15,"menu":"style.cuffs"},"cuffStyle":{"list":["roundedBarrelCuff","angledBarrelCuff","straightBarrelCuff","roundedFrenchCuff","angledFrenchCuff","straightFrenchCuff"],"dflt":"angledBarrelCuff","menu":"style.cuffs"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"sleeveLengthBonus":{"pct":3.5,"min":-40,"max":10,"menu":"fit"},"sleevePlacketLength":{"pct":25,"min":15,"max":35,"menu":"style.cuffs"},"splitYoke":{"bool":false,"menu":"style"},"buttonPlacketStyle":{"list":["classic","seamless"],"dflt":"classic"},"buttonholePlacketStyle":{"list":["classic","seamless"],"dflt":"seamless"}},"skully":{"size":{"pct":75,"min":10,"max":300,"menu":"fit"}},"sven":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":10,"min":5,"max":30,"menu":"fit"},"cuffEase":{"pct":20,"min":0,"max":200,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":15,"min":0,"max":30,"menu":"style"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"waistEase":0.08,"sleeveLengthBonus":{"pct":3,"min":0,"max":10,"menu":"style"},"ribbingHeight":{"pct":8,"min":3,"max":15,"menu":"style"},"hipsEase":{"pct":8,"min":-4,"max":20,"menu":"fit"},"ribbing":{"bool":true,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"},"ribbingStretch":{"pct":15,"min":0,"max":30,"menu":"fit"}},"tamiko":{"armholeDepthFactor":{"pct":50,"min":40,"max":60,"menu":"fit"},"chestEase":{"pct":2,"min":1,"max":20,"menu":"fit"},"flare":{"deg":15,"min":-10,"max":30,"menu":"style"},"lengthBonus":{"pct":13,"min":0,"max":60,"menu":"style"},"shoulderseamLength":{"pct":10,"min":5,"max":25,"menu":"style"},"draftForHighBust":{"bool":false,"menu":"fit"}},"teagan":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":0.05,"chestEase":{"pct":12,"min":5,"max":25,"menu":"fit"},"collarEase":0,"cuffEase":0,"draftForHighBust":{"bool":false,"menu":"fit"},"shoulderEase":0,"lengthBonus":{"pct":5,"min":-20,"max":60,"menu":"style"},"s3Collar":0,"s3Armhole":0,"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":8,"min":4,"max":12,"menu":"fit"},"frontArmholeDeeper":0.005,"shoulderSlopeReduction":0,"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveWidthGuarantee":0.85,"sleeveLength":{"pct":30,"min":20,"max":100,"menu":"fit"},"fitWaist":{"bool":false,"menu":"fit"},"waistEase":{"pct":25,"min":8,"max":40},"hipsEase":{"pct":18,"min":8,"max":30,"menu":"fit"},"necklineDepth":{"pct":25,"min":20,"max":40,"menu":"style"},"necklineWidth":{"pct":30,"min":10,"max":50,"menu":"style"},"necklineBend":{"pct":30,"min":0,"max":70,"menu":"style"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveEase":{"pct":15,"min":5,"max":35,"menu":"style"}},"tiberius":{"headRatio":{"pct":100,"min":80,"max":120,"menu":"fit"},"armholeDrop":{"pct":110,"min":100,"max":150,"menu":"fit"},"lengthBonus":{"pct":90,"min":60,"max":130,"menu":"style"},"widthBonus":{"pct":100,"min":50,"max":130,"menu":"style"},"clavi":{"bool":false,"menu":"style.clavi"},"clavusLocation":{"pct":65,"min":50,"max":80,"menu":"style.clavi"},"clavusWidth":{"pct":100,"min":50,"max":150,"menu":"style.clavi"},"length":{"list":["toKnee","toMidLeg","toFloor"],"dflt":"toKnee","menu":"style"},"width":{"list":["toElbow","toShoulder","toMidArm"],"dflt":"toMidArm","menu":"style"},"forceWidth":{"bool":false,"menu":"advanced"}},"titan":{"fitCrossSeam":true,"fitCrossSeamFront":true,"fitCrossSeamBack":true,"fitGuides":true,"waistEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"seatEase":{"pct":2,"min":0,"max":10,"menu":"fit"},"kneeEase":{"pct":6,"min":1,"max":25,"menu":"fit"},"waistHeight":{"pct":100,"min":0,"max":100,"menu":"style"},"lengthBonus":{"pct":2,"min":-20,"max":10,"menu":"style"},"crotchDrop":{"pct":2,"min":0,"max":15,"menu":"style"},"fitKnee":{"bool":false,"menu":"style"},"legBalance":{"pct":57.5,"min":52.5,"max":62.5,"menu":"advanced"},"crossSeamCurveStart":{"pct":85,"min":60,"max":100,"menu":"advanced"},"crossSeamCurveBend":{"pct":65,"min":45,"max":85,"menu":"advanced"},"crossSeamCurveAngle":{"deg":12,"min":0,"max":20,"menu":"advanced"},"crotchSeamCurveStart":{"pct":80,"min":60,"max":95,"menu":"advanced"},"crotchSeamCurveBend":{"pct":80,"min":45,"max":100,"menu":"advanced"},"crotchSeamCurveAngle":{"deg":25,"min":0,"max":35,"menu":"advanced"},"waistBalance":{"pct":60,"min":30,"max":90,"menu":"advanced"},"grainlinePosition":{"pct":45,"min":30,"max":60,"menu":"advanced"},"waistbandWidth":{"pct":3,"min":1,"max":6,"snap":{"metric":[3.5,5,10,12,20,25,30,40,50,60,80,100,120],"imperial":[3.175,6.35,9.524999999999999,12.7,15.875,19.049999999999997,25.4,31.75,38.099999999999994,44.449999999999996,50.8,76.19999999999999,101.6,127]},"menu":"advanced"}},"trayvon":{"tipWidth":{"pct":15,"min":5,"max":35,"snap":{"metric":1,"imperial":0.79375},"menu":"style"},"knotWidth":{"pct":8,"min":4,"max":12,"snap":{"metric":1,"imperial":0.79375},"menu":"style"},"lengthBonus":{"pct":0,"min":-50,"max":50,"menu":"style"}},"tristan":{"acrossBackFactor":0.925,"shoulderSlopeBack":1.23,"neckWidthBack":0.197,"neckWidthFront":0.17,"backDartLocation":0.145,"backCenterWaistReduction":0.35,"collarFactor":0.19,"bustSpanEase":{"pct":0,"min":-5,"max":20,"menu":"fit"},"chestEase":{"pct":11,"min":5,"max":20,"menu":"fit"},"fullChestEaseReduction":{"pct":4,"min":0,"max":8,"menu":"fit"},"shoulderToShoulderEase":{"pct":-0.5,"min":-1,"max":5,"menu":"fit"},"waistEase":{"pct":5,"min":1,"max":20,"menu":"fit"},"backDartHeight":0.46,"bustDartCurve":1,"bustDartLength":0.9,"waistDartLength":{"pct":90,"min":75,"max":95,"menu":"advanced"},"armholeDepth":{"pct":44,"min":38,"max":55,"menu":"style"},"backArmholeCurvature":0.63,"backArmholePitchDepth":0.035,"backArmholeSlant":5,"frontArmholeCurvature":0.63,"frontArmholePitchDepth":0.29,"backHemSlope":2.5,"backNeckCutout":0.06,"frontShoulderWidth":{"pct":95,"max":98,"min":92,"menu":"advanced"},"highBustWidth":{"pct":86,"max":92,"min":80,"menu":"advanced"},"armholeDartPosition":0.5,"dartPosition":"shoulder","shoulderDartCurvature":{"pct":0,"min":-5,"max":2.5},"shoulderDartPosition":{"pct":50,"min":10,"max":90,"menu":"style"},"shoulderToShoulderCorrection":0.995,"upperDartLength":{"pct":90,"min":80,"max":95,"menu":"advanced"},"waistdartposition":{"pct":0,"min":-100,"max":100,"menu":"darts"},"armholeBackDepth":0.6,"armholeBackIn":0.6,"armholeFrontDepth":0.65,"armholeFrontIn":0.2,"cutDepthBack":{"pct":40,"min":5,"max":90,"menu":"style"},"cutDepthFront":{"pct":80,"min":0,"max":125,"menu":"style"},"cutRoundnessBack":{"pct":20,"min":0,"max":100,"menu":"style"},"cutRoundnessFront":{"pct":10,"min":0,"max":100,"menu":"style"},"strapWidth":{"pct":45,"min":5,"max":90,"menu":"style"},"hemSize":{"pct":5.62,"min":1,"max":25},"zipperLocation":{"dflt":"side","list":["front","side","back"],"menu":"options"},"hem":{"bool":false},"lacing":{"bool":true,"menu":"options"},"lacingLocation":{"dflt":"front","list":["front","back"]},"lacingWidth":{"pct":20,"min":0,"max":50},"peplum":{"bool":false,"menu":"options"},"peplumSize":{"pct":10,"min":5,"max":250},"peplumFullness":{"deg":180,"min":180,"max":360}},"uma":{"xStretch":{"pct":15,"min":0,"max":30,"menu":"fit"},"yStretch":{"pct":5,"min":0,"max":15,"menu":"fit"},"gussetWidth":{"pct":15,"min":5,"max":24,"menu":"fit"},"gussetLength":{"pct":12.7,"min":10,"max":16,"menu":"fit"},"gussetPosition":{"pct":70,"min":5,"max":95,"menu":"fit"},"bulge":{"deg":0,"min":0,"max":30,"menu":"fit"},"rise":{"pct":50,"min":30,"max":100,"menu":"style"},"legRise":{"pct":54,"min":5,"max":95,"menu":"style"},"frontDip":{"pct":10,"min":0,"max":25,"menu":"style"},"frontExposure":{"pct":70,"min":5,"max":100,"menu":"style"},"backDip":{"pct":-5,"min":-15,"max":10,"menu":"style"},"backExposure":{"pct":30,"min":0,"max":115,"menu":"style"}},"wahid":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":false},"chestEase":{"pct":2,"min":1,"max":10,"menu":"fit"},"collarEase":{"pct":5,"min":0,"max":10,"menu":false},"cuffEase":{"pct":20,"min":0,"max":200,"menu":false},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":false},"lengthBonus":{"pct":1,"min":0,"max":8,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":false},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":false},"acrossBackFactor":0.97,"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":70,"min":60,"max":80,"menu":"fit"},"backNeckCutout":{"pct":5,"min":-2,"max":8,"menu":false},"frontArmholeDeeper":0.005,"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":false},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"frontOverlap":0.01,"necklineDrop":{"pct":50,"min":35,"max":85,"menu":"style"},"frontStyle":{"dflt":"classic","list":["classic","rounded"],"menu":"style"},"frontInset":{"pct":15,"min":10,"max":20,"menu":"advanced"},"shoulderInset":{"pct":10,"min":0,"max":20,"menu":"advanced"},"neckInset":{"pct":5,"min":0,"max":10,"menu":"advanced"},"hemStyle":{"dflt":"classic","list":["classic","rounded","square"],"menu":"style"},"hemRadius":{"pct":6,"min":2,"max":12,"menu":"style"},"pocketWidth":{"pct":10,"max":15,"min":8,"menu":"style"},"pocketAngle":{"deg":5,"min":0,"max":5,"menu":"advanced"},"pocketLocation":{"pct":35,"min":25,"max":55,"menu":"style"},"frontScyeDart":{"deg":6,"min":0,"max":12,"menu":"fit"},"buttons":{"count":6,"min":4,"max":12,"menu":"style"},"waistEase":{"pct":8,"min":2,"max":15,"menu":"fit"},"hipsEase":{"pct":8,"min":2,"max":15,"menu":"fit"},"backInset":{"pct":15,"min":10,"max":20,"menu":"advanced"},"centerBackDart":{"pct":2,"min":0,"max":5,"menu":"fit"},"backScyeDart":{"deg":2,"min":0,"max":6,"menu":"fit"},"weltHeight":{"pct":12.5,"max":20,"min":10,"menu":"style"}},"walburga":{"headRatio":{"pct":100,"min":80,"max":120,"menu":"fit"},"lengthBonus":{"pct":85,"min":60,"max":130,"menu":"style"},"widthBonus":{"pct":95,"min":50,"max":130,"menu":"style"},"length":{"list":["toKnee","toMidLeg","toFloor"],"dflt":"toKnee","menu":"style"},"neckline":{"bool":true,"menu":"style"},"neckoRatio":{"pct":100,"min":10,"max":190,"menu":"style"}},"waralee":{"backRaise":{"pct":10,"min":0,"max":25,"menu":"fit"},"waistRaise":{"pct":0,"min":-20,"max":40,"menu":"fit"},"fitWaist":{"bool":true,"menu":"fit"},"hemWidth":{"pct":1.75,"min":1,"max":2.5,"menu":"style"},"legSize":{"pct":75,"max":90,"min":50,"menu":"style"},"waistOverlap":{"pct":50,"min":10,"max":100,"menu":"style"},"frontPocket":{"bool":true,"menu":"style"},"backPocket":{"bool":true,"menu":"style"},"waistbandWidth":{"pct":3.5,"min":2,"max":5,"menu":"style"},"frontPocketStyle":{"dflt":"welt","list":["welt","waistband"],"menu":"style"},"separateWaistband":{"bool":false,"menu":"style"},"knotInFront":{"bool":true,"menu":"style"},"crotchFront":{"pct":30,"min":10,"max":70,"menu":"advanced"},"crotchBack":{"pct":45,"min":10,"max":70,"menu":"advanced"},"crotchFactorFrontHor":{"pct":90,"min":10,"max":100,"menu":"advanced"},"crotchFactorFrontVer":{"pct":30,"min":10,"max":70,"menu":"advanced"},"crotchFactorBackHor":{"pct":90,"min":10,"max":100,"menu":"advanced"},"crotchFactorBackVer":{"pct":60,"min":20,"max":90,"menu":"advanced"},"backWaistAdjustment":0.3,"frontPocketVerticalOffset":0.07,"frontPocketHorizontalOffset":0.18,"frontPocketSize":0.45,"frontPocketWidthHeightRatio":0.076,"frontPocketDepthFactor":1.6,"frontWaistAdjustment":0.163,"backPocketDepth":0.5,"backPocketVerticalOffset":0.2,"backPocketHorizontalOffset":0.045,"backPocketSize":0.45,"crotchEase":1.08},"yuri":{"brianFitSleeve":true,"brianFitCollar":true,"collarFactor":4.8,"bicepsEase":{"pct":15,"min":0,"max":50,"menu":"fit"},"chestEase":{"pct":15,"min":-4,"max":35,"menu":"fit"},"collarEase":{"pct":20,"min":10,"max":30,"menu":"fit"},"cuffEase":{"pct":30,"min":20,"max":60,"menu":"fit"},"draftForHighBust":{"bool":false},"shoulderEase":{"pct":0,"min":-2,"max":6,"menu":"fit"},"lengthBonus":{"pct":10,"min":5,"max":15,"menu":"fit"},"s3Collar":{"pct":0,"min":-100,"max":100,"menu":"style"},"s3Armhole":{"pct":0,"min":-100,"max":100,"menu":"style"},"acrossBackFactor":{"pct":98,"min":93,"max":100,"menu":"advanced"},"armholeDepth":{"pct":2,"min":-10,"max":50},"armholeDepthFactor":{"pct":55,"min":50,"max":70},"backNeckCutout":{"pct":5,"min":2,"max":8,"menu":"advanced"},"frontArmholeDeeper":{"pct":0.2,"min":0,"max":0.5,"menu":"advanced"},"shoulderSlopeReduction":{"pct":0,"min":0,"max":80,"menu":"advanced"},"legacyArmholeDepth":{"bool":false,"menu":"advanced"},"sleeveLengthBonus":{"pct":1,"min":0,"max":10,"menu":"fit"},"hipsEase":{"pct":0,"min":0,"max":10,"menu":"fit"},"sleevecapEase":{"pct":0,"min":0,"max":10,"menu":"advanced.sleevecap"},"sleevecapTopFactorX":{"pct":50,"min":25,"max":75,"menu":"advanced.sleevecap"},"sleevecapTopFactorY":{"pct":45,"min":35,"max":125,"menu":"advanced.sleevecap"},"sleevecapBackFactorX":{"pct":60,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapBackFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorX":{"pct":55,"min":35,"max":65,"menu":"advanced.sleevecap"},"sleevecapFrontFactorY":{"pct":33,"min":30,"max":65,"menu":"advanced.sleevecap"},"sleevecapQ1Offset":{"pct":1.7,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ2Offset":{"pct":3.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ3Offset":{"pct":2.5,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ4Offset":{"pct":1,"min":0,"max":7,"menu":"advanced.sleevecap"},"sleevecapQ1Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ1Spread2":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread1":{"pct":15,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ2Spread2":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread1":{"pct":10,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ3Spread2":{"pct":8,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread1":{"pct":7,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleevecapQ4Spread2":{"pct":6.3,"min":4,"max":20,"menu":"advanced.sleevecap"},"sleeveWidthGuarantee":{"pct":90,"min":25,"max":100,"menu":"advanced"}}} diff --git a/yarn.lock b/yarn.lock index 6da2714a66a..f277511043f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,63 +9,35 @@ "@algolia/cache-browser-local-storage@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz#14b6dc9abc9e3a304a5fffb063d15f30af1032d1" + resolved "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.22.1.tgz" integrity sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g== dependencies: "@algolia/cache-common" "4.22.1" -"@algolia/cache-browser-local-storage@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.23.3.tgz#0cc26b96085e1115dac5fcb9d826651ba57faabc" - integrity sha512-vRHXYCpPlTDE7i6UOy2xE03zHF2C8MEFjPN2v7fRbqVpcOvAUQK81x3Kc21xyb5aSIpYCjWCZbYZuz8Glyzyyg== - dependencies: - "@algolia/cache-common" "4.23.3" - "@algolia/cache-common@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.22.1.tgz#c625dff4bc2a74e79f9aed67b4e053b0ef1b3ec1" + resolved "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.22.1.tgz" integrity sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA== -"@algolia/cache-common@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.23.3.tgz#3bec79092d512a96c9bfbdeec7cff4ad36367166" - integrity sha512-h9XcNI6lxYStaw32pHpB1TMm0RuxphF+Ik4o7tcQiodEdpKK+wKufY6QXtba7t3k8eseirEMVB83uFFF3Nu54A== - "@algolia/cache-in-memory@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz#858a3d887f521362e87d04f3943e2810226a0d71" + resolved "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.22.1.tgz" integrity sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw== dependencies: "@algolia/cache-common" "4.22.1" -"@algolia/cache-in-memory@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.23.3.tgz#3945f87cd21ffa2bec23890c85305b6b11192423" - integrity sha512-yvpbuUXg/+0rbcagxNT7un0eo3czx2Uf0y4eiR4z4SD7SiptwYTpbuS0IHxcLHG3lq22ukx1T6Kjtk/rT+mqNg== - dependencies: - "@algolia/cache-common" "4.23.3" - "@algolia/client-account@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.22.1.tgz#a7fb8b66b9a4f0a428e1426b2561144267d76d43" + resolved "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.22.1.tgz" integrity sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw== dependencies: "@algolia/client-common" "4.22.1" "@algolia/client-search" "4.22.1" "@algolia/transporter" "4.22.1" -"@algolia/client-account@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.23.3.tgz#8751bbf636e6741c95e7c778488dee3ee430ac6f" - integrity sha512-hpa6S5d7iQmretHHF40QGq6hz0anWEHGlULcTIT9tbUssWUriN9AUXIFQ8Ei4w9azD0hc1rUok9/DeQQobhQMA== - dependencies: - "@algolia/client-common" "4.23.3" - "@algolia/client-search" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/client-analytics@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.22.1.tgz#506558740b4d49b1b1e3393861f729a8ce921851" + resolved "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.22.1.tgz" integrity sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg== dependencies: "@algolia/client-common" "4.22.1" @@ -73,68 +45,32 @@ "@algolia/requester-common" "4.22.1" "@algolia/transporter" "4.22.1" -"@algolia/client-analytics@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.23.3.tgz#f88710885278fe6fb6964384af59004a5a6f161d" - integrity sha512-LBsEARGS9cj8VkTAVEZphjxTjMVCci+zIIiRhpFun9jGDUlS1XmhCW7CTrnaWeIuCQS/2iPyRqSy1nXPjcBLRA== - dependencies: - "@algolia/client-common" "4.23.3" - "@algolia/client-search" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/client-common@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.22.1.tgz#042b19c1b6157c485fa1b551349ab313944d2b05" + resolved "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.22.1.tgz" integrity sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ== dependencies: "@algolia/requester-common" "4.22.1" "@algolia/transporter" "4.22.1" -"@algolia/client-common@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.23.3.tgz#891116aa0db75055a7ecc107649f7f0965774704" - integrity sha512-l6EiPxdAlg8CYhroqS5ybfIczsGUIAC47slLPOMDeKSVXYG1n0qGiz4RjAHLw2aD0xzh2EXZ7aRguPfz7UKDKw== - dependencies: - "@algolia/requester-common" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/client-personalization@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.22.1.tgz#ff088d797648224fb582e9fe5828f8087835fa3d" + resolved "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-4.22.1.tgz" integrity sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ== dependencies: "@algolia/client-common" "4.22.1" "@algolia/requester-common" "4.22.1" "@algolia/transporter" "4.22.1" -"@algolia/client-personalization@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.23.3.tgz#35fa8e5699b0295fbc400a8eb211dc711e5909db" - integrity sha512-3E3yF3Ocr1tB/xOZiuC3doHQBQ2zu2MPTYZ0d4lpfWads2WTKG7ZzmGnsHmm63RflvDeLK/UVx7j2b3QuwKQ2g== - dependencies: - "@algolia/client-common" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/client-search@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.22.1.tgz#508cc6ab3d1f4e9c02735a630d4dff6fbb8514a2" + resolved "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.22.1.tgz" integrity sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA== dependencies: "@algolia/client-common" "4.22.1" "@algolia/requester-common" "4.22.1" "@algolia/transporter" "4.22.1" -"@algolia/client-search@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.23.3.tgz#a3486e6af13a231ec4ab43a915a1f318787b937f" - integrity sha512-P4VAKFHqU0wx9O+q29Q8YVuaowaZ5EM77rxfmGnkHUJggh28useXQdopokgwMeYw2XUht49WX5RcTQ40rZIabw== - dependencies: - "@algolia/client-common" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/events@^4.0.1": version "4.0.1" resolved "https://registry.npmjs.org/@algolia/events/-/events-4.0.1.tgz" @@ -142,101 +78,44 @@ "@algolia/logger-common@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.22.1.tgz#79cf4cd295de0377a94582c6aaac59b1ded731d9" + resolved "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.22.1.tgz" integrity sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg== -"@algolia/logger-common@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.23.3.tgz#35c6d833cbf41e853a4f36ba37c6e5864920bfe9" - integrity sha512-y9kBtmJwiZ9ZZ+1Ek66P0M68mHQzKRxkW5kAAXYN/rdzgDN0d2COsViEFufxJ0pb45K4FRcfC7+33YB4BLrZ+g== - "@algolia/logger-console@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.22.1.tgz#0355345f6940f67aaa78ae9b81c06e44e49f2336" + resolved "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.22.1.tgz" integrity sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA== dependencies: "@algolia/logger-common" "4.22.1" -"@algolia/logger-console@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.23.3.tgz#30f916781826c4db5f51fcd9a8a264a06e136985" - integrity sha512-8xoiseoWDKuCVnWP8jHthgaeobDLolh00KJAdMe9XPrWPuf1by732jSpgy2BlsLTaT9m32pHI8CRfrOqQzHv3A== - dependencies: - "@algolia/logger-common" "4.23.3" - -"@algolia/recommend@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.23.3.tgz#53d4f194d22d9c72dc05f3f7514c5878f87c5890" - integrity sha512-9fK4nXZF0bFkdcLBRDexsnGzVmu4TSYZqxdpgBW2tEyfuSSY54D4qSRkLmNkrrz4YFvdh2GM1gA8vSsnZPR73w== - dependencies: - "@algolia/cache-browser-local-storage" "4.23.3" - "@algolia/cache-common" "4.23.3" - "@algolia/cache-in-memory" "4.23.3" - "@algolia/client-common" "4.23.3" - "@algolia/client-search" "4.23.3" - "@algolia/logger-common" "4.23.3" - "@algolia/logger-console" "4.23.3" - "@algolia/requester-browser-xhr" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/requester-node-http" "4.23.3" - "@algolia/transporter" "4.23.3" - "@algolia/requester-browser-xhr@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz#f04df6fe9690a071b267c77d26b83a3be9280361" + resolved "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.22.1.tgz" integrity sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw== dependencies: "@algolia/requester-common" "4.22.1" -"@algolia/requester-browser-xhr@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.23.3.tgz#9e47e76f60d540acc8b27b4ebc7a80d1b41938b9" - integrity sha512-jDWGIQ96BhXbmONAQsasIpTYWslyjkiGu0Quydjlowe+ciqySpiDUrJHERIRfELE5+wFc7hc1Q5hqjGoV7yghw== - dependencies: - "@algolia/requester-common" "4.23.3" - "@algolia/requester-common@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.22.1.tgz#27be35f3718aafcb6b388ff9c3aa2defabd559ff" + resolved "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.22.1.tgz" integrity sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg== -"@algolia/requester-common@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.23.3.tgz#7dbae896e41adfaaf1d1fa5f317f83a99afb04b3" - integrity sha512-xloIdr/bedtYEGcXCiF2muajyvRhwop4cMZo+K2qzNht0CMzlRkm8YsDdj5IaBhshqfgmBb3rTg4sL4/PpvLYw== - "@algolia/requester-node-http@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz#589a6fa828ad0f325e727a6fcaf4e1a2343cc62b" + resolved "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.22.1.tgz" integrity sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA== dependencies: "@algolia/requester-common" "4.22.1" -"@algolia/requester-node-http@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.23.3.tgz#c9f94a5cb96a15f48cea338ab6ef16bbd0ff989f" - integrity sha512-zgu++8Uj03IWDEJM3fuNl34s746JnZOWn1Uz5taV1dFyJhVM/kTNw9Ik7YJWiUNHJQXcaD8IXD1eCb0nq/aByA== - dependencies: - "@algolia/requester-common" "4.23.3" - "@algolia/transporter@4.22.1": version "4.22.1" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.22.1.tgz#8843841b857dc021668f31647aa557ff19cd9cb1" + resolved "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.22.1.tgz" integrity sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ== dependencies: "@algolia/cache-common" "4.22.1" "@algolia/logger-common" "4.22.1" "@algolia/requester-common" "4.22.1" -"@algolia/transporter@4.23.3": - version "4.23.3" - resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.23.3.tgz#545b045b67db3850ddf0bbecbc6c84ff1f3398b7" - integrity sha512-Wjl5gttqnf/gQKJA+dafnD0Y6Yw97yvfY8R9h0dQltX1GXTgNs1zWgvtWW0tHl1EgMdhAyw189uWiZMnL3QebQ== - dependencies: - "@algolia/cache-common" "4.23.3" - "@algolia/logger-common" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/ui-components-highlight-vdom@^1.2.1": version "1.2.2" resolved "https://registry.npmjs.org/@algolia/ui-components-highlight-vdom/-/ui-components-highlight-vdom-1.2.2.tgz" @@ -245,7 +124,7 @@ "@algolia/ui-components-shared" "1.2.2" "@babel/runtime" "^7.0.0" -"@algolia/ui-components-shared@1.2.2", "@algolia/ui-components-shared@^1.2.1": +"@algolia/ui-components-shared@^1.2.1", "@algolia/ui-components-shared@1.2.2": version "1.2.2" resolved "https://registry.npmjs.org/@algolia/ui-components-shared/-/ui-components-shared-1.2.2.tgz" integrity sha512-FYwEG5sbr8p4V8mqP0iUaKgmWfcrMXRXwp7e6iBuB65P/7QyL8pT4I6/iGb85Q5mNH+UtYYSmLZhKjEblllKEQ== @@ -284,7 +163,7 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0": +"@aws-crypto/sha256-js@^3.0.0", "@aws-crypto/sha256-js@3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz" integrity sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ== @@ -309,201 +188,201 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-sesv2@3.563.0": - version "3.563.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sesv2/-/client-sesv2-3.563.0.tgz#4705a790fd8060cd24ecc2bbe8ec87f403a1de18" - integrity sha512-JiZ5RZrKT1wd8494/8pYTDmaYkARoo6XH3jgiR/Jd1FfqW7nzNhALWh0F9ch1XcsC/yVWLJwiRDk6a2NwWxSkg== +"@aws-sdk/client-sesv2@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.535.0.tgz" + integrity sha512-K0WZf/o4R+A20RFHJW+YyMg0cMK8GMHe2MHURpPvLJoq5JF0RpCdsMTgRiYIoAFCLoy8qFH9G0MebxR8JZvD+A== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.556.0" - "@aws-sdk/core" "3.556.0" - "@aws-sdk/credential-provider-node" "3.563.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" + "@aws-sdk/credential-provider-node" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.2" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.1" - "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.1" - "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso-oidc@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.556.0.tgz#4c19fccc35361de046d2cd74a7a685d71aa5dd1e" - integrity sha512-AXKd2TB6nNrksu+OfmHl8uI07PdgzOo4o8AxoRO8SHlwoMAGvcT9optDGVSYoVfgOKTymCoE7h8/UoUfPc11wQ== +"@aws-sdk/client-sso-oidc@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.535.0.tgz" + integrity sha512-M2cG4EQXDpAJQyq33ORIr6abmdX9p9zX0ssVy8XwFNB7lrgoIKxuVoGL+fX+XMgecl24x7ELz6b4QlILOevbCw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.556.0" - "@aws-sdk/core" "3.556.0" + "@aws-sdk/client-sts" "3.535.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.2" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.1" - "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.1" - "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sso@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.556.0.tgz#7beeeebb6a437f09680edefc5c998822292a528a" - integrity sha512-unXdWS7uvHqCcOyC1de+Fr8m3F2vMg2m24GPea0bg7rVGTYmiyn9mhUX11VCt+ozydrw+F50FQwL6OqoqPocmw== +"@aws-sdk/client-sso@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.535.0.tgz" + integrity sha512-h9eQRdFnjDRVBnPJIKXuX7D+isSAioIfZPC4PQwsL5BscTRlk4c90DX0R0uk64YUtp7LZu8TNtrosFZ/1HtTrQ== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.556.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.2" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.1" - "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.1" - "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/client-sts@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.556.0.tgz#3aa20cca462839f1451f11efada2be119dd36a6b" - integrity sha512-TsK3js7Suh9xEmC886aY+bv0KdLLYtzrcmVt6sJ/W6EnDXYQhBuKYFhp03NrN2+vSvMGpqJwR62DyfKe1G0QzQ== +"@aws-sdk/client-sts@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.535.0.tgz" + integrity sha512-ii9OOm3TJwP3JmO1IVJXKWIShVKPl0VtdlgROc/SkDglO/kuAw9eDdlROgc+qbFl+gm6bBTguOVTUXt3tS3flw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.556.0" + "@aws-sdk/core" "3.535.0" "@aws-sdk/middleware-host-header" "3.535.0" "@aws-sdk/middleware-logger" "3.535.0" "@aws-sdk/middleware-recursion-detection" "3.535.0" - "@aws-sdk/middleware-user-agent" "3.540.0" + "@aws-sdk/middleware-user-agent" "3.535.0" "@aws-sdk/region-config-resolver" "3.535.0" "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@aws-sdk/util-user-agent-browser" "3.535.0" "@aws-sdk/util-user-agent-node" "3.535.0" "@smithy/config-resolver" "^2.2.0" - "@smithy/core" "^1.4.2" + "@smithy/core" "^1.4.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/hash-node" "^2.2.0" "@smithy/invalid-dependency" "^2.2.0" "@smithy/middleware-content-length" "^2.2.0" - "@smithy/middleware-endpoint" "^2.5.1" - "@smithy/middleware-retry" "^2.3.1" + "@smithy/middleware-endpoint" "^2.5.0" + "@smithy/middleware-retry" "^2.2.0" "@smithy/middleware-serde" "^2.3.0" "@smithy/middleware-stack" "^2.2.0" "@smithy/node-config-provider" "^2.3.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" "@smithy/url-parser" "^2.2.0" "@smithy/util-base64" "^2.3.0" "@smithy/util-body-length-browser" "^2.2.0" "@smithy/util-body-length-node" "^2.3.0" - "@smithy/util-defaults-mode-browser" "^2.2.1" - "@smithy/util-defaults-mode-node" "^2.3.1" + "@smithy/util-defaults-mode-browser" "^2.2.0" + "@smithy/util-defaults-mode-node" "^2.3.0" "@smithy/util-endpoints" "^1.2.0" "@smithy/util-middleware" "^2.2.0" "@smithy/util-retry" "^2.2.0" "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@aws-sdk/core@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.556.0.tgz#d0f4431a72282b71cfbcaedfb803f7f2807cf60b" - integrity sha512-vJaSaHw2kPQlo11j/Rzuz0gk1tEaKdz+2ser0f0qZ5vwFlANjt08m/frU17ctnVKC1s58bxpctO/1P894fHLrA== +"@aws-sdk/core@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/core/-/core-3.535.0.tgz" + integrity sha512-+Yusa9HziuaEDta1UaLEtMAtmgvxdxhPn7jgfRY6PplqAqgsfa5FR83sxy5qr2q7xjQTwHtV4MjQVuOjG9JsLw== dependencies: - "@smithy/core" "^1.4.2" + "@smithy/core" "^1.4.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/signature-v4" "^2.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/signature-v4" "^2.2.0" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" fast-xml-parser "4.2.5" tslib "^2.6.2" "@aws-sdk/credential-provider-env@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz#26248e263a8107953d5496cb3760d4e7c877abcf" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.535.0.tgz" integrity sha512-XppwO8c0GCGSAvdzyJOhbtktSEaShg14VJKg8mpMa1XcgqzmcqqHQjtDWbx5rZheY1VdpXZhpEzJkB6LpQejpA== dependencies: "@aws-sdk/types" "3.535.0" @@ -511,31 +390,31 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-http@3.552.0": - version "3.552.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.552.0.tgz#ecc88d02cba95621887e6b85b2583e756ad29eb6" - integrity sha512-vsmu7Cz1i45pFEqzVb4JcFmAmVnWFNLsGheZc8SCptlqCO5voETrZZILHYIl4cjKkSDk3pblBOf0PhyjqWW6WQ== +"@aws-sdk/credential-provider-http@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.535.0.tgz" + integrity sha512-kdj1wCmOMZ29jSlUskRqN04S6fJ4dvt0Nq9Z32SA6wO7UG8ht6Ot9h/au/eTWJM3E1somZ7D771oK7dQt9b8yw== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/fetch-http-handler" "^2.5.0" "@smithy/node-http-handler" "^2.5.0" "@smithy/property-provider" "^2.2.0" "@smithy/protocol-http" "^3.3.0" - "@smithy/smithy-client" "^2.5.1" + "@smithy/smithy-client" "^2.5.0" "@smithy/types" "^2.12.0" "@smithy/util-stream" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-ini@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.556.0.tgz#bf780feb92a7920cc525cd7cb7870ea61b84c125" - integrity sha512-0Nz4ErOlXhe3muxWYMbPwRMgfKmVbBp36BAE2uv/z5wTbfdBkcgUwaflEvlKCLUTdHzuZsQk+BFS/gVyaUeOuA== +"@aws-sdk/credential-provider-ini@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.535.0.tgz" + integrity sha512-bm3XOYlyCjtAb8eeHXLrxqRxYVRw2Iqv9IufdJb4gM13TbNSYniUT1WKaHxGIZ5p+FuNlXVhvk1OpHFM13+gXA== dependencies: - "@aws-sdk/client-sts" "3.556.0" + "@aws-sdk/client-sts" "3.535.0" "@aws-sdk/credential-provider-env" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.556.0" - "@aws-sdk/credential-provider-web-identity" "3.556.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -543,17 +422,17 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@3.563.0": - version "3.563.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.563.0.tgz#d549552e32aecc05a194914f6b959799b71ec4be" - integrity sha512-cNGT93uuAzM2ZnWT0rHbT/bjnVRCIQDTi8ylnvNpsOj+zFCn2q2eQAh6fgACPjKhCA7Szc38AX0hH2PDXH6+yg== +"@aws-sdk/credential-provider-node@^3.535.0", "@aws-sdk/credential-provider-node@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz" + integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== dependencies: "@aws-sdk/credential-provider-env" "3.535.0" - "@aws-sdk/credential-provider-http" "3.552.0" - "@aws-sdk/credential-provider-ini" "3.556.0" + "@aws-sdk/credential-provider-http" "3.535.0" + "@aws-sdk/credential-provider-ini" "3.535.0" "@aws-sdk/credential-provider-process" "3.535.0" - "@aws-sdk/credential-provider-sso" "3.556.0" - "@aws-sdk/credential-provider-web-identity" "3.556.0" + "@aws-sdk/credential-provider-sso" "3.535.0" + "@aws-sdk/credential-provider-web-identity" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/credential-provider-imds" "^2.3.0" "@smithy/property-provider" "^2.2.0" @@ -563,7 +442,7 @@ "@aws-sdk/credential-provider-process@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz#ea1e8a38a32e36bbdc3f75eb03352e6eafa0c659" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.535.0.tgz" integrity sha512-9O1OaprGCnlb/kYl8RwmH7Mlg8JREZctB8r9sa1KhSsWFq/SWO0AuJTyowxD7zL5PkeS4eTvzFFHWCa3OO5epA== dependencies: "@aws-sdk/types" "3.535.0" @@ -572,25 +451,25 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-sso@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.556.0.tgz#26dfdd2c6e034f66e82985d65bd6aa3ae09d5e19" - integrity sha512-ETuBgcnpfxqadEAqhQFWpKoV1C/NAgvs5CbBc5EJbelJ8f4prTdErIHjrRtVT8c02MXj92QwczsiNYd5IoOqyw== +"@aws-sdk/credential-provider-sso@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.535.0.tgz" + integrity sha512-2Dw0YIr8ETdFpq65CC4zK8ZIEbX78rXoNRZXUGNQW3oSKfL0tj8O8ErY6kg1IdEnYbGnEQ35q6luZ5GGNKLgDg== dependencies: - "@aws-sdk/client-sso" "3.556.0" - "@aws-sdk/token-providers" "3.556.0" + "@aws-sdk/client-sso" "3.535.0" + "@aws-sdk/token-providers" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-web-identity@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.556.0.tgz#94cd55eaee6ca96354237569102dfaf6774544f4" - integrity sha512-R/YAL8Uh8i+dzVjzMnbcWLIGeeRi2mioHVGnVF+minmaIkCiQMZg2HPrdlKm49El+RljT28Nl5YHRuiqzEIwMA== +"@aws-sdk/credential-provider-web-identity@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.535.0.tgz" + integrity sha512-t2/JWrKY0H66A7JW7CqX06/DG2YkJddikt5ymdQvx/Q7dRMJ3d+o/vgjoKr7RvEx/pNruCeyM1599HCvwrVMrg== dependencies: - "@aws-sdk/client-sts" "3.556.0" + "@aws-sdk/client-sts" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/types" "^2.12.0" @@ -598,7 +477,7 @@ "@aws-sdk/middleware-host-header@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz#d5264f813592f5e77df25e5a14bbb0e6441812db" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.535.0.tgz" integrity sha512-0h6TWjBWtDaYwHMQJI9ulafeS4lLaw1vIxRjbpH0svFRt6Eve+Sy8NlVhECfTU2hNz/fLubvrUxsXoThaLBIew== dependencies: "@aws-sdk/types" "3.535.0" @@ -608,7 +487,7 @@ "@aws-sdk/middleware-logger@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz#1a8ffd6c368edd6cb32e1edf7b1dced95c1820ee" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.535.0.tgz" integrity sha512-huNHpONOrEDrdRTvSQr1cJiRMNf0S52NDXtaPzdxiubTkP+vni2MohmZANMOai/qT0olmEVX01LhZ0ZAOgmg6A== dependencies: "@aws-sdk/types" "3.535.0" @@ -617,7 +496,7 @@ "@aws-sdk/middleware-recursion-detection@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz#6aa1e1bd1e84730d58a73021b745e20d4341a92d" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.535.0.tgz" integrity sha512-am2qgGs+gwqmR4wHLWpzlZ8PWhm4ktj5bYSgDrsOfjhdBlWNxvPoID9/pDAz5RWL48+oH7I6SQzMqxXsFDikrw== dependencies: "@aws-sdk/types" "3.535.0" @@ -625,20 +504,20 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/middleware-user-agent@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.540.0.tgz#4981c64c1eeb6b5c453bce02d060b8c71d44994d" - integrity sha512-8Rd6wPeXDnOYzWj1XCmOKcx/Q87L0K1/EHqOBocGjLVbN3gmRxBvpmR1pRTjf7IsWfnnzN5btqtcAkfDPYQUMQ== +"@aws-sdk/middleware-user-agent@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.535.0.tgz" + integrity sha512-Uvb2WJ+zdHdCOtsWVPI/M0BcfNrjOYsicDZWtaljucRJKLclY5gNWwD+RwIC+8b5TvfnVOlH+N5jhvpi5Impog== dependencies: "@aws-sdk/types" "3.535.0" - "@aws-sdk/util-endpoints" "3.540.0" + "@aws-sdk/util-endpoints" "3.535.0" "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" "@aws-sdk/region-config-resolver@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz#20a30fb5fbbe27ab70f2ed16327bae7e367b5cec" + resolved "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.535.0.tgz" integrity sha512-IXOznDiaItBjsQy4Fil0kzX/J3HxIOknEphqHbOfUf+LpA5ugcsxuQQONrbEQusCBnfJyymrldBvBhFmtlU9Wg== dependencies: "@aws-sdk/types" "3.535.0" @@ -648,30 +527,30 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@aws-sdk/token-providers@3.556.0": - version "3.556.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.556.0.tgz#96b4dd4fec67ae62f8c98ae8c2f94e4ed050073a" - integrity sha512-tvIiugNF0/+2wfuImMrpKjXMx4nCnFWQjQvouObny+wrif/PGqqQYrybwxPJDvzbd965bu1I+QuSv85/ug7xsg== +"@aws-sdk/token-providers@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.535.0.tgz" + integrity sha512-4g+l/B9h1H/SiDtFRosW3pMwc+3PTXljZit+5NUBcET2XqcdUyHmgj3lBdu+CJ9CHdIMggRalYMAFXnRFe3Psg== dependencies: - "@aws-sdk/client-sso-oidc" "3.556.0" + "@aws-sdk/client-sso-oidc" "3.535.0" "@aws-sdk/types" "3.535.0" "@smithy/property-provider" "^2.2.0" "@smithy/shared-ini-file-loader" "^2.4.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/types@3.535.0", "@aws-sdk/types@^3.222.0": +"@aws-sdk/types@^3.222.0", "@aws-sdk/types@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.535.0.tgz#5e6479f31299dd9df170e63f4d10fe739008cf04" + resolved "https://registry.npmjs.org/@aws-sdk/types/-/types-3.535.0.tgz" integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg== dependencies: "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/util-endpoints@3.540.0": - version "3.540.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.540.0.tgz#a7fea1d2a5e64623353aaa6ee32dbb86ab9cd3f8" - integrity sha512-1kMyQFAWx6f8alaI6UT65/5YW/7pDWAKAdNwL6vuJLea03KrZRX3PMoONOSJpAS5m3Ot7HlWZvf3wZDNTLELZw== +"@aws-sdk/util-endpoints@3.535.0": + version "3.535.0" + resolved "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.535.0.tgz" + integrity sha512-c8TlaQsiPchOOmTTR6qvHCO2O7L7NJwlKWAoQJ2GqWDZuC5es/fyuF2rp1h+ZRrUVraUomS0YdGkAmaDC7hJQg== dependencies: "@aws-sdk/types" "3.535.0" "@smithy/types" "^2.12.0" @@ -687,7 +566,7 @@ "@aws-sdk/util-user-agent-browser@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz#d67d72e8b933051620f18ddb1c2be225f79f588f" + resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.535.0.tgz" integrity sha512-RWMcF/xV5n+nhaA/Ff5P3yNP3Kur/I+VNZngog4TEs92oB/nwOdAg/2JL8bVAhUbMrjTjpwm7PItziYFQoqyig== dependencies: "@aws-sdk/types" "3.535.0" @@ -697,7 +576,7 @@ "@aws-sdk/util-user-agent-node@3.535.0": version "3.535.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz#f5c26fb6f3f561d3cf35f96f303b1775afad0a5b" + resolved "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.535.0.tgz" integrity sha512-dRek0zUuIT25wOWJlsRm97nTkUlh1NDcLsQZIN2Y8KxhwoXXWtJs5vaDPT+qAg+OpcNj80i1zLR/CirqlFg/TQ== dependencies: "@aws-sdk/types" "3.535.0" @@ -725,7 +604,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.7.5": +"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.0", "@babel/core@^7.7.5": version "7.23.9" resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz" integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== @@ -748,7 +627,7 @@ "@babel/eslint-parser@^7.22.15": version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz#e27eee93ed1d271637165ef3a86e2b9332395c32" + resolved "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.24.1.tgz" integrity sha512-d5guuzMlPeDfZIbpQ8+g1NaCNuAGBBGNECh0HVqz1sjOeVLh2CEaifuOysCH18URW6R7pqXINvf5PaR/dC6jLQ== dependencies: "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" @@ -823,7 +702,7 @@ "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0": version "7.24.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz" integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w== "@babel/helper-simple-access@^7.22.5": @@ -880,7 +759,7 @@ "@babel/plugin-syntax-import-assertions@^7.22.5": version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz#db3aad724153a00eaac115a3fb898de544e34971" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz" integrity sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ== dependencies: "@babel/helper-plugin-utils" "^7.24.0" @@ -894,7 +773,7 @@ "@babel/plugin-transform-react-display-name@^7.24.1": version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz" integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw== dependencies: "@babel/helper-plugin-utils" "^7.24.0" @@ -919,7 +798,7 @@ "@babel/plugin-transform-react-pure-annotations@^7.24.1": version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz" integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA== dependencies: "@babel/helper-annotate-as-pure" "^7.22.5" @@ -927,7 +806,7 @@ "@babel/preset-react@^7.22.15": version "7.24.1" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95" + resolved "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.1.tgz" integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA== dependencies: "@babel/helper-plugin-utils" "^7.24.0" @@ -988,16 +867,16 @@ resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz" integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A== -"@bugsnag/browser@^7.22.7": +"@bugsnag/browser@^7.22.4": version "7.22.7" - resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.22.7.tgz#ba1f9f3596b9d3cf1b4db11250f8be2f178a78c1" + resolved "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.22.7.tgz" integrity sha512-70jFkWKscK2osm7bnFbPLevrzHClrygM3UcKetKs/l81Xuzlxnu1SS3onN5OUl9kd9RN4XMFr46Pv5jSqWqImQ== dependencies: "@bugsnag/core" "^7.22.7" -"@bugsnag/core@^7.22.7": +"@bugsnag/core@^7.0.0", "@bugsnag/core@^7.22.7": version "7.22.7" - resolved "https://registry.yarnpkg.com/@bugsnag/core/-/core-7.22.7.tgz#ea5e0822b01913c88be4dbc67d388aff8d65f26a" + resolved "https://registry.npmjs.org/@bugsnag/core/-/core-7.22.7.tgz" integrity sha512-9DPWBkkBjhFJc5dCFy/wVC3HE0Aw3ZiLJKjyAxgywSKbILgtpD+qT1Xe8sacWyxU92znamlZ8H8ziQOe7jhhbA== dependencies: "@bugsnag/cuid" "^3.0.0" @@ -1011,17 +890,17 @@ resolved "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.0.2.tgz" integrity sha512-cIwzC93r3PQ/INeuwtZwkZIG2K8WWN0rRLZQhu+mr48Ay+i6sEki4GYfTsflse7hZ1BeDWrNb/Q9vgY3B31xHQ== -"@bugsnag/js@7.22.7": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.22.7.tgz#d631584ae37803b275798544232cef4f7e5afbfc" - integrity sha512-Qq8l06rSDTZtxgNIDpTeXHrin9C30INNbPfnR2CNcEsCmfqyVQb4USPEuRb0xg5wiaLKU9r4IAatMqiCgdzG6A== +"@bugsnag/js@7.22.4": + version "7.22.4" + resolved "https://registry.npmjs.org/@bugsnag/js/-/js-7.22.4.tgz" + integrity sha512-GjU3YmCNxVl1QZ64e8D4hKSfhHiymHu4hyYlyKxIdqmnhpHvoFnADcdAHEnWPG82O9j9w+JoDXvL460aiOEgHg== dependencies: - "@bugsnag/browser" "^7.22.7" - "@bugsnag/node" "^7.22.7" + "@bugsnag/browser" "^7.22.4" + "@bugsnag/node" "^7.22.3" -"@bugsnag/node@^7.22.7": +"@bugsnag/node@^7.22.3": version "7.22.7" - resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.22.7.tgz#85231637527eb0be9baeed4ed88ed226da7ca577" + resolved "https://registry.npmjs.org/@bugsnag/node/-/node-7.22.7.tgz" integrity sha512-Ud8vpX9UkGxoWAk7OigyR7w1eycbsE5uv5KZx0aWiqDPXylvICd42V5ZiWstpkdm9IVFo9AQ4+gmerHPe4Lwrg== dependencies: "@bugsnag/core" "^7.22.7" @@ -1031,10 +910,10 @@ pump "^3.0.0" stack-generator "^2.0.3" -"@bugsnag/plugin-react@7.22.7": - version "7.22.7" - resolved "https://registry.yarnpkg.com/@bugsnag/plugin-react/-/plugin-react-7.22.7.tgz#9f308cc4c043ee765d77686fca4e4404dc1c88d0" - integrity sha512-CDyCHK5+KMkpf/2vmVC7xqqP4ys25Yuj9M8xVrmP7LC02nFUPt/UzEIt43MSO4Jfw254ZimbsQrhIweabQNyxQ== +"@bugsnag/plugin-react@7.19.0": + version "7.19.0" + resolved "https://registry.npmjs.org/@bugsnag/plugin-react/-/plugin-react-7.19.0.tgz" + integrity sha512-owC4QXYJWGllMoOPcH5P7sbDIDuFLMCbjGAU6FwH5mBMObSQo+1ViSKImlTJQUFXATM8ySISTBVt7w3C6FFHng== "@bugsnag/safe-json-stringify@^6.0.0": version "6.0.0" @@ -1043,7 +922,7 @@ "@commitlint/cli@^19.0.3": version "19.3.0" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-19.3.0.tgz#44e6da9823a01f0cdcc43054bbefdd2c6c5ddf39" + resolved "https://registry.npmjs.org/@commitlint/cli/-/cli-19.3.0.tgz" integrity sha512-LgYWOwuDR7BSTQ9OLZ12m7F/qhNY+NpAyPBgo4YNMkACE7lGuUnuQq1yi9hz1KA4+3VqpOYl8H1rY/LYK43v7g== dependencies: "@commitlint/format" "^19.3.0" @@ -1056,7 +935,7 @@ "@commitlint/config-conventional@^19.0.3": version "19.2.2" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-19.2.2.tgz#1f4e6975d428985deacf2b3ff6547e02c9302054" + resolved "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-19.2.2.tgz" integrity sha512-mLXjsxUVLYEGgzbxbxicGPggDuyWNkf25Ht23owXIH+zV2pv1eJuzLK3t1gDY5Gp6pxdE60jZnWUY5cvgL3ufw== dependencies: "@commitlint/types" "^19.0.3" @@ -1089,7 +968,7 @@ "@commitlint/format@^19.3.0": version "19.3.0" - resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-19.3.0.tgz#48dd9e6930d41eb0ca19f36159ee940c5b25d857" + resolved "https://registry.npmjs.org/@commitlint/format/-/format-19.3.0.tgz" integrity sha512-luguk5/aF68HiF4H23ACAfk8qS8AHxl4LLN5oxPc24H+2+JRPsNr1OS3Gaea0CrH7PKhArBMKBz5RX9sA5NtTg== dependencies: "@commitlint/types" "^19.0.3" @@ -1097,7 +976,7 @@ "@commitlint/is-ignored@^19.2.2": version "19.2.2" - resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-19.2.2.tgz#503ddcf908ac6b2bc4586a49cb53893a1856f5b2" + resolved "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-19.2.2.tgz" integrity sha512-eNX54oXMVxncORywF4ZPFtJoBm3Tvp111tg1xf4zWXGfhBPKpfKG6R+G3G4v5CPlRROXpAOpQ3HMhA9n1Tck1g== dependencies: "@commitlint/types" "^19.0.3" @@ -1105,7 +984,7 @@ "@commitlint/lint@^19.2.2": version "19.2.2" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-19.2.2.tgz#57f69e24bd832a7dcce8ebf82d11e3bf03ccc2a9" + resolved "https://registry.npmjs.org/@commitlint/lint/-/lint-19.2.2.tgz" integrity sha512-xrzMmz4JqwGyKQKTpFzlN0dx0TAiT7Ran1fqEBgEmEj+PU98crOFtysJgY+QdeSagx6EDRigQIXJVnfrI0ratA== dependencies: "@commitlint/is-ignored" "^19.2.2" @@ -1115,7 +994,7 @@ "@commitlint/load@^19.2.0": version "19.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-19.2.0.tgz#3ca51fdead4f1e1e09c9c7df343306412b1ef295" + resolved "https://registry.npmjs.org/@commitlint/load/-/load-19.2.0.tgz" integrity sha512-XvxxLJTKqZojCxaBQ7u92qQLFMMZc4+p9qrIq/9kJDy8DOrEa7P1yx7Tjdc2u2JxIalqT4KOGraVgCE7eCYJyQ== dependencies: "@commitlint/config-validator" "^19.0.3" @@ -1145,7 +1024,7 @@ "@commitlint/read@^19.2.1": version "19.2.1" - resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-19.2.1.tgz#7296b99c9a989e60e5927fff8388a1dd44299c2f" + resolved "https://registry.npmjs.org/@commitlint/read/-/read-19.2.1.tgz" integrity sha512-qETc4+PL0EUv7Q36lJbPG+NJiBOGg7SSC7B5BsPWOmei+Dyif80ErfWQ0qXoW9oCh7GTpTNRoaVhiI8RbhuaNw== dependencies: "@commitlint/top-level" "^19.0.0" @@ -1156,7 +1035,7 @@ "@commitlint/resolve-extends@^19.1.0": version "19.1.0" - resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-19.1.0.tgz#fa5b8f921e9c8d76f53624c35bf25b9676bd73fa" + resolved "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-19.1.0.tgz" integrity sha512-z2riI+8G3CET5CPgXJPlzftH+RiWYLMYv4C9tSLdLXdr6pBNimSKukYP9MS27ejmscqCTVA4almdLh0ODD2KYg== dependencies: "@commitlint/config-validator" "^19.0.3" @@ -1202,121 +1081,11 @@ resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@esbuild/aix-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537" - integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g== - -"@esbuild/android-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9" - integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg== - -"@esbuild/android-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995" - integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w== - -"@esbuild/android-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98" - integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg== - -"@esbuild/darwin-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb" - integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA== - -"@esbuild/darwin-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0" - integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA== - -"@esbuild/freebsd-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911" - integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw== - -"@esbuild/freebsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c" - integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw== - -"@esbuild/linux-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5" - integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A== - -"@esbuild/linux-arm@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c" - integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg== - -"@esbuild/linux-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa" - integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig== - -"@esbuild/linux-loong64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5" - integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ== - -"@esbuild/linux-mips64el@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa" - integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA== - -"@esbuild/linux-ppc64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20" - integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg== - -"@esbuild/linux-riscv64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300" - integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg== - -"@esbuild/linux-s390x@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685" - integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ== - "@esbuild/linux-x64@0.20.2": version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz#86eca35203afc0d9de0694c64ec0ab0a378f6fff" + resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz" integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw== -"@esbuild/netbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6" - integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ== - -"@esbuild/openbsd-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf" - integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ== - -"@esbuild/sunos-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f" - integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w== - -"@esbuild/win32-arm64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90" - integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ== - -"@esbuild/win32-ia32@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23" - integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ== - -"@esbuild/win32-x64@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc" - integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ== - "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -1349,6 +1118,577 @@ resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== +"@freesewing/aaron@file:/home/joost/git/freesewing/designs/aaron": + version "3.2.0" + resolved "file:designs/aaron" + +"@freesewing/albert@file:/home/joost/git/freesewing/designs/albert": + version "3.2.0" + resolved "file:designs/albert" + +"@freesewing/bee@file:/home/joost/git/freesewing/designs/bee": + version "3.2.0" + resolved "file:designs/bee" + +"@freesewing/bella@3.2.0", "@freesewing/bella@file:/home/joost/git/freesewing/designs/bella": + version "3.2.0" + resolved "file:designs/bella" + +"@freesewing/benjamin@file:/home/joost/git/freesewing/designs/benjamin": + version "3.2.0" + resolved "file:designs/benjamin" + +"@freesewing/bent@3.2.0", "@freesewing/bent@file:/home/joost/git/freesewing/designs/bent": + version "3.2.0" + resolved "file:designs/bent" + +"@freesewing/bob@file:/home/joost/git/freesewing/designs/bob": + version "3.2.0" + resolved "file:designs/bob" + +"@freesewing/breanna@3.2.0", "@freesewing/breanna@file:/home/joost/git/freesewing/designs/breanna": + version "3.2.0" + resolved "file:designs/breanna" + +"@freesewing/brian@3.2.0", "@freesewing/brian@file:/home/joost/git/freesewing/designs/brian": + version "3.2.0" + resolved "file:designs/brian" + +"@freesewing/bruce@file:/home/joost/git/freesewing/designs/bruce": + version "3.2.0" + resolved "file:designs/bruce" + +"@freesewing/carlita@file:/home/joost/git/freesewing/designs/carlita": + version "3.2.0" + resolved "file:designs/carlita" + +"@freesewing/carlton@3.2.0", "@freesewing/carlton@file:/home/joost/git/freesewing/designs/carlton": + version "3.2.0" + resolved "file:designs/carlton" + +"@freesewing/cathrin@file:/home/joost/git/freesewing/designs/cathrin": + version "3.2.0" + resolved "file:designs/cathrin" + +"@freesewing/charlie@file:/home/joost/git/freesewing/designs/charlie": + version "3.2.0" + resolved "file:designs/charlie" + +"@freesewing/core-plugins@3.2.0", "@freesewing/core-plugins@file:/home/joost/git/freesewing/plugins/core-plugins": + version "3.2.0" + resolved "file:plugins/core-plugins" + +"@freesewing/core@3.2.0", "@freesewing/core@file:/home/joost/git/freesewing/packages/core": + version "3.2.0" + resolved "file:packages/core" + dependencies: + "@freesewing/core-plugins" "3.2.0" + bezier-js "6.1.4" + hooks "0.3.2" + lodash.clonedeep "^4.5.0" + lodash.get "4.4.2" + lodash.set "4.3.2" + lodash.unset "4.5.2" + +"@freesewing/cornelius@file:/home/joost/git/freesewing/designs/cornelius": + version "3.2.0" + resolved "file:designs/cornelius" + +"@freesewing/dev@file:/home/joost/git/freesewing/sites/dev": + version "3.2.0" + resolved "file:sites/dev" + dependencies: + "@mdx-js/mdx" "^3.0.0" + "@mdx-js/react" "^3.0.0" + "@mdx-js/runtime" "2.0.0-next.9" + "@next/bundle-analyzer" "14.1.4" + "@tailwindcss/typography" "0.5.10" + algoliasearch "4.22.1" + daisyui "4.7.3" + lodash.get "4.4.2" + lodash.orderby "4.6.0" + lodash.set "4.3.2" + next "14.1.4" + react "18.3.1" + react-copy-to-clipboard "5.1.0" + react-dom "18.3.1" + react-hotkeys-hook "4.5.0" + react-instantsearch-dom "6.40.4" + react-instantsearch-hooks-web "6.47.3" + react-swipeable "7.0.1" + react-timeago "7.2.0" + rehype-autolink-headings "7.1.0" + rehype-highlight "7.0.0" + rehype-sanitize "6.0.0" + rehype-slug "6.0.0" + rehype-stringify "10.0.0" + remark "15.0.1" + remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" + remark-gfm "4.0.0" + strip-markdown "6.0.0" + +"@freesewing/diana@file:/home/joost/git/freesewing/designs/diana": + version "3.2.0" + resolved "file:designs/diana" + +"@freesewing/examples@file:/home/joost/git/freesewing/designs/examples": + version "3.2.0" + resolved "file:designs/examples" + +"@freesewing/florence@file:/home/joost/git/freesewing/designs/florence": + version "3.2.0" + resolved "file:designs/florence" + +"@freesewing/florent@file:/home/joost/git/freesewing/designs/florent": + version "3.2.0" + resolved "file:designs/florent" + +"@freesewing/gozer@file:/home/joost/git/freesewing/designs/gozer": + version "3.2.0" + resolved "file:designs/gozer" + +"@freesewing/hi@file:/home/joost/git/freesewing/designs/hi": + version "3.2.0" + resolved "file:designs/hi" + +"@freesewing/holmes@file:/home/joost/git/freesewing/designs/holmes": + version "3.2.0" + resolved "file:designs/holmes" + dependencies: + "@freesewing/plugin-gore" "3.2.0" + +"@freesewing/hortensia@file:/home/joost/git/freesewing/designs/hortensia": + version "3.2.0" + resolved "file:designs/hortensia" + +"@freesewing/huey@file:/home/joost/git/freesewing/designs/huey": + version "3.2.0" + resolved "file:designs/huey" + +"@freesewing/hugo@file:/home/joost/git/freesewing/designs/hugo": + version "3.2.0" + resolved "file:designs/hugo" + +"@freesewing/jaeger@file:/home/joost/git/freesewing/designs/jaeger": + version "3.2.0" + resolved "file:designs/jaeger" + +"@freesewing/lab@file:/home/joost/git/freesewing/sites/lab": + version "3.2.0" + resolved "file:sites/lab" + dependencies: + "@mdx-js/mdx" "^3.0.0" + "@mdx-js/react" "^3.0.0" + "@mdx-js/runtime" "2.0.0-next.9" + "@tailwindcss/typography" "0.5.10" + algoliasearch "4.22.1" + d3-dispatch "3.0.1" + d3-drag "3.0.0" + d3-selection "3.0.0" + daisyui "4.7.3" + i18next "23.11.2" + lodash.get "4.4.2" + lodash.orderby "4.6.0" + lodash.set "4.3.2" + next "14.1.4" + next-i18next "15.2.0" + ora "8.0.1" + react "18.3.1" + react-copy-to-clipboard "5.1.0" + react-hotkeys-hook "4.5.0" + react-i18next "14.1.0" + react-instantsearch-dom "6.40.4" + react-swipeable "7.0.1" + react-timeago "7.2.0" + rehype-autolink-headings "7.1.0" + rehype-highlight "7.0.0" + rehype-sanitize "6.0.0" + rehype-slug "6.0.0" + rehype-stringify "10.0.0" + remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" + remark-gfm "4.0.0" + remark-mdx-frontmatter "4.0.0" + +"@freesewing/legend@file:/home/joost/git/freesewing/designs/legend": + version "3.2.0" + resolved "file:designs/legend" + +"@freesewing/lucy@file:/home/joost/git/freesewing/designs/lucy": + version "3.2.0" + resolved "file:designs/lucy" + +"@freesewing/lumina@file:/home/joost/git/freesewing/designs/lumina": + version "3.2.0" + resolved "file:designs/lumina" + +"@freesewing/lumira@file:/home/joost/git/freesewing/designs/lumira": + version "3.2.0" + resolved "file:designs/lumira" + +"@freesewing/lunetius@file:/home/joost/git/freesewing/designs/lunetius": + version "3.2.0" + resolved "file:designs/lunetius" + +"@freesewing/magde@file:/home/joost/git/freesewing/designs/magde": + version "3.2.0" + resolved "file:designs/magde" + +"@freesewing/models@3.2.0", "@freesewing/models@file:/home/joost/git/freesewing/packages/models": + version "3.2.0" + resolved "file:packages/models" + +"@freesewing/naomiwu@file:/home/joost/git/freesewing/designs/naomiwu": + version "3.2.0" + resolved "file:designs/naomiwu" + +"@freesewing/new-design@file:/home/joost/git/freesewing/packages/new-design": + version "3.2.0" + resolved "file:packages/new-design" + dependencies: + axios "1.6.8" + chalk "5.3.0" + execa "8.0.1" + mustache "4.2.0" + ora "8.0.1" + prompts "2.4.2" + recursive-readdir "2.2.3" + +"@freesewing/noble@file:/home/joost/git/freesewing/designs/noble": + version "3.2.0" + resolved "file:designs/noble" + +"@freesewing/octoplushy@file:/home/joost/git/freesewing/designs/octoplushy": + version "3.2.0" + resolved "file:designs/octoplushy" + +"@freesewing/onyx@file:/home/joost/git/freesewing/designs/onyx": + version "3.2.0" + resolved "file:designs/onyx" + +"@freesewing/org@file:/home/joost/git/freesewing/sites/org": + version "3.2.0" + resolved "file:sites/org" + dependencies: + "@bugsnag/js" "7.22.4" + "@bugsnag/plugin-react" "7.19.0" + "@mdx-js/mdx" "^3.0.0" + "@mdx-js/react" "^3.0.0" + "@mdx-js/runtime" "2.0.0-next.9" + "@tailwindcss/nesting" "^0.0.0-insiders.565cd3e" + "@tailwindcss/typography" "0.5.10" + algoliasearch "4.22.1" + daisyui "4.7.3" + echarts "5.5.0" + echarts-for-react "3.0.2" + jotai "2.7.1" + jotai-location "0.5.4" + lodash.get "4.4.2" + lodash.orderby "4.6.0" + lodash.set "4.3.2" + luxon "3.4.4" + next "14.1.4" + next-i18next "15.2.0" + ora "8.0.1" + react "18.3.1" + react-copy-to-clipboard "5.1.0" + react-dom "18.3.1" + react-dropzone "14.2.3" + react-hotkeys-hook "4.5.0" + react-i18next "14.1.0" + react-instantsearch-dom "6.40.4" + react-instantsearch-hooks-web "6.47.3" + react-swipeable "7.0.1" + react-timeago "7.2.0" + react-zoom-pan-pinch "3.4.3" + rehype-autolink-headings "7.1.0" + rehype-highlight "7.0.0" + rehype-sanitize "6.0.0" + rehype-slug "6.0.0" + rehype-stringify "10.0.0" + remark "15.0.1" + remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" + remark-gfm "4.0.0" + remark-mdx-frontmatter "4.0.0" + strip-markdown "6.0.0" + use-local-storage-state "19.1.0" + yaml-loader "0.8.1" + +"@freesewing/otis@file:/home/joost/git/freesewing/designs/otis": + version "3.2.0" + resolved "file:designs/otis" + +"@freesewing/paco@file:/home/joost/git/freesewing/designs/paco": + version "3.2.0" + resolved "file:designs/paco" + +"@freesewing/penelope@file:/home/joost/git/freesewing/designs/penelope": + version "3.2.0" + resolved "file:designs/penelope" + +"@freesewing/plugin-annotations@3.2.0", "@freesewing/plugin-annotations@file:/home/joost/git/freesewing/plugins/plugin-annotations": + version "3.2.0" + resolved "file:plugins/plugin-annotations" + +"@freesewing/plugin-bin-pack@file:/home/joost/git/freesewing/plugins/plugin-bin-pack": + version "3.2.0" + resolved "file:plugins/plugin-bin-pack" + +"@freesewing/plugin-bust@3.2.0", "@freesewing/plugin-bust@file:/home/joost/git/freesewing/plugins/plugin-bust": + version "3.2.0" + resolved "file:plugins/plugin-bust" + +"@freesewing/plugin-flip@3.2.0", "@freesewing/plugin-flip@file:/home/joost/git/freesewing/plugins/plugin-flip": + version "3.2.0" + resolved "file:plugins/plugin-flip" + +"@freesewing/plugin-gore@3.2.0", "@freesewing/plugin-gore@file:/home/joost/git/freesewing/plugins/plugin-gore": + version "3.2.0" + resolved "file:plugins/plugin-gore" + +"@freesewing/plugin-i18n@3.2.0", "@freesewing/plugin-i18n@file:/home/joost/git/freesewing/plugins/plugin-i18n": + version "3.2.0" + resolved "file:plugins/plugin-i18n" + +"@freesewing/plugin-measurements@3.2.0", "@freesewing/plugin-measurements@file:/home/joost/git/freesewing/plugins/plugin-measurements": + version "3.2.0" + resolved "file:plugins/plugin-measurements" + +"@freesewing/plugin-mirror@3.2.0", "@freesewing/plugin-mirror@file:/home/joost/git/freesewing/plugins/plugin-mirror": + version "3.2.0" + resolved "file:plugins/plugin-mirror" + +"@freesewing/plugin-ringsector@file:/home/joost/git/freesewing/plugins/plugin-ringsector": + version "3.2.0" + resolved "file:plugins/plugin-ringsector" + +"@freesewing/plugin-round@3.2.0", "@freesewing/plugin-round@file:/home/joost/git/freesewing/plugins/plugin-round": + version "3.2.0" + resolved "file:plugins/plugin-round" + +"@freesewing/plugin-sprinkle@3.2.0", "@freesewing/plugin-sprinkle@file:/home/joost/git/freesewing/plugins/plugin-sprinkle": + version "3.2.0" + resolved "file:plugins/plugin-sprinkle" + +"@freesewing/plugin-svgattr@3.2.0", "@freesewing/plugin-svgattr@file:/home/joost/git/freesewing/plugins/plugin-svgattr": + version "3.2.0" + resolved "file:plugins/plugin-svgattr" + +"@freesewing/plugin-theme@3.2.0", "@freesewing/plugin-theme@file:/home/joost/git/freesewing/plugins/plugin-theme": + version "3.2.0" + resolved "file:plugins/plugin-theme" + +"@freesewing/plugin-timing@3.2.0", "@freesewing/plugin-timing@file:/home/joost/git/freesewing/plugins/plugin-timing": + version "3.2.0" + resolved "file:plugins/plugin-timing" + +"@freesewing/plugin-versionfree-svg@file:/home/joost/git/freesewing/plugins/plugin-versionfree-svg": + version "3.2.0" + resolved "file:plugins/plugin-versionfree-svg" + +"@freesewing/plugintest@file:/home/joost/git/freesewing/designs/plugintest": + version "3.2.0" + resolved "file:designs/plugintest" + +"@freesewing/prettier-config@file:/home/joost/git/freesewing/packages/prettier-config": + version "3.2.0" + resolved "file:packages/prettier-config" + +"@freesewing/react-components@3.2.0", "@freesewing/react-components@file:/home/joost/git/freesewing/packages/react-components": + version "3.2.0" + resolved "file:packages/react-components" + dependencies: + html-react-parser "^5.0.7" + +"@freesewing/rendertest@file:/home/joost/git/freesewing/designs/rendertest": + version "3.2.0" + resolved "file:designs/rendertest" + +"@freesewing/sandy@file:/home/joost/git/freesewing/designs/sandy": + version "3.2.0" + resolved "file:designs/sandy" + +"@freesewing/sde@file:/home/joost/git/freesewing/sites/sde": + version "3.2.0" + resolved "file:sites/sde" + dependencies: + "@freesewing/bella" "3.2.0" + "@freesewing/bent" "3.2.0" + "@freesewing/breanna" "3.2.0" + "@freesewing/brian" "3.2.0" + "@freesewing/core" "3.2.0" + "@freesewing/core-plugins" "3.2.0" + "@freesewing/plugin-bust" "3.2.0" + "@freesewing/plugin-i18n" "3.2.0" + "@freesewing/plugin-theme" "3.2.0" + "@freesewing/plugin-timing" "3.2.0" + "@freesewing/react-components" "3.2.0" + "@freesewing/snapseries" "3.2.0" + "@freesewing/titan" "3.2.0" + "@mdx-js/mdx" "^3.0.0" + "@mdx-js/react" "^3.0.0" + "@mdx-js/runtime" "2.0.0-next.9" + "@tailwindcss/nesting" "^0.0.0-insiders.565cd3e" + "@tailwindcss/typography" "0.5.10" + autoprefixer "10.4.19" + axios "1.6.8" + d3-dispatch "3.0.1" + d3-drag "3.0.0" + d3-selection "3.0.0" + daisyui "4.7.3" + echarts "5.5.0" + echarts-for-react "3.0.2" + file-saver "2.0.5" + i18next "23.11.2" + jotai "2.7.1" + jotai-location "0.5.4" + js-yaml "4.1.0" + lodash.debounce "^4.0.8" + lodash.get "4.4.2" + lodash.orderby "4.6.0" + lodash.set "4.3.2" + mustache "4.2.0" + next "14.1.4" + next-i18next "15.2.0" + pdfkit "0.14.0" + postcss-for "2.1.1" + react "18.3.1" + react-copy-to-clipboard "5.1.0" + react-dom "18.3.1" + react-dropzone "14.2.3" + react-hotkeys-hook "4.5.0" + react-i18next "14.1.0" + react-swipeable "7.0.1" + react-timeago "7.2.0" + react-zoom-pan-pinch "3.4.3" + remark-frontmatter "5.0.0" + remark-gfm "4.0.0" + remark-mdx-frontmatter "4.0.0" + remark-smartypants "2.1.0" + slugify "^1.6.6" + svg-to-pdfkit "https://git@github.com/eriese/SVG-to-PDFKit" + tailwindcss "3.4.1" + tlds "1.251.0" + use-local-storage-state "19.1.0" + web-worker "1.3.0" + +"@freesewing/shared@file:/home/joost/git/freesewing/sites/shared": + version "3.2.0" + resolved "file:sites/shared" + dependencies: + "@next/mdx" "14.1.4" + "@resvg/resvg-js" "2.6.0" + "@tailwindcss/typography" "0.5.10" + Buffer "0.0.0" + d3-dispatch "3.0.1" + d3-drag "3.0.0" + d3-selection "3.0.0" + daisyui "4.7.3" + feed "4.2.2" + file-saver "2.0.5" + front-matter "4.0.2" + github-slugger "2.0.0" + highlight.js "11.9.0" + jotai "2.7.1" + jotai-location "0.5.4" + lodash.clonedeep "4.5.0" + lodash.debounce "^4.0.8" + lodash.get "4.4.2" + lodash.orderby "4.6.0" + lodash.unset "4.5.2" + mdast-util-toc "7.0.0" + mermaid "10.9.0" + ora "8.0.1" + pdfkit "0.14.0" + postcss-for "2.1.1" + react "18.3.1" + react-dom "18.3.1" + react-timeago "7.2.0" + react-zoom-pan-pinch "3.4.3" + rehype-autolink-headings "7.1.0" + rehype-highlight "7.0.0" + remark-frontmatter "5.0.0" + remark-mdx-frontmatter "4.0.0" + remark-smartypants "2.1.0" + slugify "^1.6.6" + svg-to-pdfkit "https://git@github.com/eriese/SVG-to-PDFKit" + tlds "1.251.0" + to-vfile "8.0.0" + unist-util-visit "5.0.0" + use-local-storage-state "19.1.0" + web-worker "1.3.0" + +"@freesewing/shelly@file:/home/joost/git/freesewing/designs/shelly": + version "3.2.0" + resolved "file:designs/shelly" + +"@freesewing/shin@file:/home/joost/git/freesewing/designs/shin": + version "3.2.0" + resolved "file:designs/shin" + +"@freesewing/simon@3.2.0", "@freesewing/simon@file:/home/joost/git/freesewing/designs/simon": + version "3.2.0" + resolved "file:designs/simon" + +"@freesewing/simone@file:/home/joost/git/freesewing/designs/simone": + version "3.2.0" + resolved "file:designs/simone" + +"@freesewing/skully@file:/home/joost/git/freesewing/designs/skully": + version "3.2.0" + resolved "file:designs/skully" + +"@freesewing/snapseries@3.2.0", "@freesewing/snapseries@file:/home/joost/git/freesewing/packages/snapseries": + version "3.2.0" + resolved "file:packages/snapseries" + +"@freesewing/sven@file:/home/joost/git/freesewing/designs/sven": + version "3.2.0" + resolved "file:designs/sven" + +"@freesewing/tamiko@file:/home/joost/git/freesewing/designs/tamiko": + version "3.2.0" + resolved "file:designs/tamiko" + +"@freesewing/teagan@file:/home/joost/git/freesewing/designs/teagan": + version "3.2.0" + resolved "file:designs/teagan" + +"@freesewing/tiberius@file:/home/joost/git/freesewing/designs/tiberius": + version "3.2.0" + resolved "file:designs/tiberius" + +"@freesewing/titan@3.2.0", "@freesewing/titan@file:/home/joost/git/freesewing/designs/titan": + version "3.2.0" + resolved "file:designs/titan" + +"@freesewing/trayvon@file:/home/joost/git/freesewing/designs/trayvon": + version "3.2.0" + resolved "file:designs/trayvon" + +"@freesewing/tristan@file:/home/joost/git/freesewing/designs/tristan": + version "3.2.0" + resolved "file:designs/tristan" + +"@freesewing/uma@file:/home/joost/git/freesewing/designs/uma": + version "3.2.0" + resolved "file:designs/uma" + +"@freesewing/wahid@file:/home/joost/git/freesewing/designs/wahid": + version "3.2.0" + resolved "file:designs/wahid" + +"@freesewing/walburga@file:/home/joost/git/freesewing/designs/walburga": + version "3.2.0" + resolved "file:designs/walburga" + +"@freesewing/waralee@file:/home/joost/git/freesewing/designs/waralee": + version "3.2.0" + resolved "file:designs/waralee" + +"@freesewing/yuri@file:/home/joost/git/freesewing/designs/yuri": + version "3.2.0" + resolved "file:designs/yuri" + "@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz" @@ -1510,28 +1850,9 @@ yargs "17.7.2" yargs-parser "21.1.1" -"@mdx-js/mdx@2.0.0-next.9": - version "2.0.0-next.9" - resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.0.0-next.9.tgz" - integrity sha512-6i7iLIPApiCdvp4T6n3dI5IqDOvcNx4M3DUJ+AG6xj/NTssJcf5r3Gl4i3Q2tqJp0JAj6bWQ3IOLAefF18Y48g== - dependencies: - "@mdx-js/util" "2.0.0-next.1" - astring "^1.4.0" - detab "^2.0.0" - estree-walker "^2.0.0" - hast-util-to-estree "^1.1.0" - mdast-util-to-hast "^10.1.0" - periscopic "^2.0.0" - rehype-minify-whitespace "^4.0.0" - remark-mdx "2.0.0-next.9" - remark-parse "^9.0.0" - remark-squeeze-paragraphs "^4.0.0" - unified "^9.2.0" - unist-builder "^2.0.0" - "@mdx-js/mdx@^3.0.0": version "3.0.1" - resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-3.0.1.tgz#617bd2629ae561fdca1bb88e3badd947f5a82191" + resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.0.1.tgz" integrity sha512-eIQ4QTrOWyL3LWEe/bu6Taqzq2HQvHcyTMaOrI95P2/LmJE7AsfPfgJGuFLPVqBUE1BC1rik3VIhU+s9u72arA== dependencies: "@types/estree" "^1.0.0" @@ -1558,18 +1879,37 @@ unist-util-visit "^5.0.0" vfile "^6.0.0" +"@mdx-js/mdx@2.0.0-next.9": + version "2.0.0-next.9" + resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.0.0-next.9.tgz" + integrity sha512-6i7iLIPApiCdvp4T6n3dI5IqDOvcNx4M3DUJ+AG6xj/NTssJcf5r3Gl4i3Q2tqJp0JAj6bWQ3IOLAefF18Y48g== + dependencies: + "@mdx-js/util" "2.0.0-next.1" + astring "^1.4.0" + detab "^2.0.0" + estree-walker "^2.0.0" + hast-util-to-estree "^1.1.0" + mdast-util-to-hast "^10.1.0" + periscopic "^2.0.0" + rehype-minify-whitespace "^4.0.0" + remark-mdx "2.0.0-next.9" + remark-parse "^9.0.0" + remark-squeeze-paragraphs "^4.0.0" + unified "^9.2.0" + unist-builder "^2.0.0" + +"@mdx-js/react@^3.0.0", "@mdx-js/react@>=0.15.0": + version "3.0.1" + resolved "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz" + integrity sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A== + dependencies: + "@types/mdx" "^2.0.0" + "@mdx-js/react@2.0.0-next.9": version "2.0.0-next.9" resolved "https://registry.npmjs.org/@mdx-js/react/-/react-2.0.0-next.9.tgz" integrity sha512-ZHEwW79zXQrII6ZSaIDgxd80IDRB6Zg/2N1IivQ62j4qlAZd78rbbAc0BQKwADYpuFg96g0pFbuZ7/+vl1gR6A== -"@mdx-js/react@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-3.0.1.tgz#997a19b3a5b783d936c75ae7c47cfe62f967f746" - integrity sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A== - dependencies: - "@types/mdx" "^2.0.0" - "@mdx-js/runtime@2.0.0-next.9": version "2.0.0-next.9" resolved "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-2.0.0-next.9.tgz" @@ -1584,76 +1924,41 @@ resolved "https://registry.npmjs.org/@mdx-js/util/-/util-2.0.0-next.1.tgz" integrity sha512-F36kWTFdFXrbNIsM77dhVwYZsZonUIKHkYyYgnuw1NWskBfEn1ET5B5Z5mm58ckKNf7SimchnxR9sKCCtH38WA== -"@next/bundle-analyzer@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/bundle-analyzer/-/bundle-analyzer-14.2.3.tgz#dfa43586983d3fffdeb5f3c50f2c65ab1c51f184" - integrity sha512-Z88hbbngMs7njZKI8kTJIlpdLKYfMSLwnsqYe54AP4aLmgL70/Ynx/J201DQ+q2Lr6FxFw1uCeLGImDrHOl2ZA== +"@next/bundle-analyzer@14.1.4": + version "14.1.4" + resolved "https://registry.npmjs.org/@next/bundle-analyzer/-/bundle-analyzer-14.1.4.tgz" + integrity sha512-IpF/18HcAOcfHRr24tqPOUpMmVKIqvkCxIubMeRYWCXs3jm7niPGrt8Mu74yMDzfGlUwgQA6Xd6BUc5+jQxcEg== dependencies: webpack-bundle-analyzer "4.10.1" -"@next/env@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.3.tgz#d6def29d1c763c0afb397343a15a82e7d92353a0" - integrity sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA== +"@next/env@14.1.4": + version "14.1.4" + resolved "https://registry.npmjs.org/@next/env/-/env-14.1.4.tgz" + integrity sha512-e7X7bbn3Z6DWnDi75UWn+REgAbLEqxI8Tq2pkFOFAMpWAWApz/YCUhtWMWn410h8Q2fYiYL7Yg5OlxMOCfFjJQ== "@next/eslint-plugin-next@14.2.3": version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.3.tgz#287ad8620e7061ba01e8d3313d464db6d217b6df" + resolved "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-14.2.3.tgz" integrity sha512-L3oDricIIjgj1AVnRdRor21gI7mShlSwU/1ZGHmqM3LzHhXXhdkrfeNY5zif25Bi5Dd7fiJHsbhoZCHfXYvlAw== dependencies: glob "10.3.10" -"@next/mdx@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/mdx/-/mdx-14.2.3.tgz#f914cc8c2caf05cbf2ed10eff3a79977faa3eced" - integrity sha512-oVz7BWpoLQ9dKvCKxPIX9X6BILPTrpTJnYDn2lAsZvK7J9Ela6xNm57vNwgZ8q7xw1THSDdSlbPNgIalM7U/+A== +"@next/mdx@14.1.4": + version "14.1.4" + resolved "https://registry.npmjs.org/@next/mdx/-/mdx-14.1.4.tgz" + integrity sha512-FyuDXPTEmuIqtj/AxaKLvwiEZb6hDviq6Ywn8ZlsZOlvYSWpcZGuQrYrDulrdIm/I48hHXANor7EiJzTbVig8Q== dependencies: source-map "^0.7.0" -"@next/swc-darwin-arm64@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz#db1a05eb88c0224089b815ad10ac128ec79c2cdb" - integrity sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A== +"@next/swc-linux-x64-gnu@14.1.4": + version "14.1.4" + resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.4.tgz" + integrity sha512-BapIFZ3ZRnvQ1uWbmqEGJuPT9cgLwvKtxhK/L2t4QYO7l+/DxXuIGjvp1x8rvfa/x1FFSsipERZK70pewbtJtw== -"@next/swc-darwin-x64@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz#a3f8af05b5f9a52ac3082e66ac29e125ab1d7b9c" - integrity sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA== - -"@next/swc-linux-arm64-gnu@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz#4e63f43879285b52554bfd39e6e0cc78a9b27bbf" - integrity sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA== - -"@next/swc-linux-arm64-musl@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz#ebdaed26214448b1e6f2c3e8b3cd29bfba387990" - integrity sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw== - -"@next/swc-linux-x64-gnu@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz#19e3bcc137c3b582a1ab867106817e5c90a20593" - integrity sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w== - -"@next/swc-linux-x64-musl@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz#794a539b98e064169cf0ff7741b2a4fb16adec7d" - integrity sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ== - -"@next/swc-win32-arm64-msvc@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz#eda9fa0fbf1ff9113e87ac2668ee67ce9e5add5a" - integrity sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A== - -"@next/swc-win32-ia32-msvc@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz#7c1190e3f640ab16580c6bdbd7d0e766b9920457" - integrity sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw== - -"@next/swc-win32-x64-msvc@14.2.3": - version "14.2.3" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz#2be4e39ee25bfbd85be78eea17c0e7751dc4323c" - integrity sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA== +"@next/swc-linux-x64-musl@14.1.4": + version "14.1.4" + resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.4.tgz" + integrity sha512-mqVxTwk4XuBl49qn2A5UmzFImoL1iLm0KQQwtdRJRKl21ylQwwGCxJtIYo2rbfkZHoSKlh/YgztY0qH3wG1xIg== "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" @@ -1670,7 +1975,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": +"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -1748,17 +2053,6 @@ dependencies: which "^4.0.0" -"@npmcli/run-script@7.0.2": - version "7.0.2" - resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz" - integrity sha512-Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w== - dependencies: - "@npmcli/node-gyp" "^3.0.0" - "@npmcli/promise-spawn" "^7.0.0" - node-gyp "^10.0.0" - read-package-json-fast "^3.0.0" - which "^4.0.0" - "@npmcli/run-script@^7.0.0": version "7.0.4" resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz" @@ -1770,6 +2064,17 @@ node-gyp "^10.0.0" which "^4.0.0" +"@npmcli/run-script@7.0.2": + version "7.0.2" + resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz" + integrity sha512-Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w== + dependencies: + "@npmcli/node-gyp" "^3.0.0" + "@npmcli/promise-spawn" "^7.0.0" + node-gyp "^10.0.0" + read-package-json-fast "^3.0.0" + which "^4.0.0" + "@nrwl/devkit@18.0.2": version "18.0.2" resolved "https://registry.npmjs.org/@nrwl/devkit/-/devkit-18.0.2.tgz" @@ -1785,7 +2090,7 @@ nx "18.0.2" tslib "^2.3.0" -"@nx/devkit@18.0.2", "@nx/devkit@>=17.1.2 < 19": +"@nx/devkit@>=17.1.2 < 19", "@nx/devkit@18.0.2": version "18.0.2" resolved "https://registry.npmjs.org/@nx/devkit/-/devkit-18.0.2.tgz" integrity sha512-1LiAHWRYaQkSIUsNxynHM+k4luLDuErThXKsIdOyZr4Qkw0k7v/Aw7HMdx9Usgo+mC3wc+EF7SQUnWCnQ2KHww== @@ -1799,36 +2104,6 @@ tslib "^2.3.0" yargs-parser "21.1.1" -"@nx/nx-darwin-arm64@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-18.0.2.tgz#ef88f8b72a53dc2ee6ea5e64337a202543315ecc" - integrity sha512-zFW5GDrH3GRdm5FePCYuCAEWvJ/G7iiB3jgP0zvLTRe06BQ4Z3bKCQu1v0B/mA7kR+cCY0ZtgHE+9UhK+lWarw== - -"@nx/nx-darwin-x64@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-18.0.2.tgz#1baccf7e384409673a799ad37c7d62793102557f" - integrity sha512-Iihl8MK7NiDxn6pyhe/sctEv5J2MOK2bLJH3hBgJXbq8h278jAXqM5zLxVO49Kya65K7idAu1g5nvrRtafUIXg== - -"@nx/nx-freebsd-x64@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-18.0.2.tgz#fdd578968f01b2d4b246faaf19d28af4f1a40405" - integrity sha512-D6pFFLRZs5f99oF3nHWMHhEYBVDB7x0kaDuR+96FfQlZXPU2SSQ+fzV1TREeQPhfHf9owgcduiE4utrOgJBTOQ== - -"@nx/nx-linux-arm-gnueabihf@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-18.0.2.tgz#a201f1ce0a0927c415107733b6eaddf6a26a2255" - integrity sha512-TCEKHBByEqIjiMNGOWS3maPpqQq1syUKOfp4fLJyE9A+NEK0th/6s65RWtzQR/GBUsi5r5y5g/pt+XFup+DrMA== - -"@nx/nx-linux-arm64-gnu@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-18.0.2.tgz#4a8af9e17a985e2ca5096bf3d8270e875fb79243" - integrity sha512-oYWeWtLmtM2LmsTStc6P4xUSJvpZxHZCoHIAFw1Rw7LQRbTyky19XR87F2mbEJbhSPMymeeLDR6SN0JSplODLg== - -"@nx/nx-linux-arm64-musl@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-18.0.2.tgz#4a9dd570619a4abdbfcc13ef76b45f45a560241f" - integrity sha512-9I27P5IilvICsLJxmh79OG6Y21uFKaqDAKCDlc608cyAH48Rq9xVM24DEQD0cITbfOjMRBBO2rMl7XX3b81w9Q== - "@nx/nx-linux-x64-gnu@18.0.2": version "18.0.2" resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-18.0.2.tgz" @@ -1839,22 +2114,12 @@ resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-18.0.2.tgz" integrity sha512-zEaO53G3xOYEZ0loBdKCYcnXganzkbv8daWMxNCjBtstyTN3sfRH7KKM8Z6dp0xw4toxxuCC4OsYGmRKnps+Dg== -"@nx/nx-win32-arm64-msvc@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-18.0.2.tgz#a138940a29a6578b11508ff715c3042f374fc330" - integrity sha512-pLc0SC/bEh8TC5H//pD+vHYUNCdYLWsMB9xAdey6V2qmKPrrDuWTs69qh0zCW4S1Jm8C9XK1av5mWIp2Fj8KnA== - -"@nx/nx-win32-x64-msvc@18.0.2": - version "18.0.2" - resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-18.0.2.tgz#c058aa500c1284d4be4c281f7b96e675a8922ed0" - integrity sha512-alWijWoroV65IRLdAQhFpINS9SRYSncWVT7CYe1iWwjiT16Un2i4NDoselpADuAsYC+Rgd+4h5Y+XzwtsQ55gg== - "@octokit/auth-token@^3.0.0": version "3.0.4" resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz" integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== -"@octokit/core@^4.2.1": +"@octokit/core@^4.2.1", "@octokit/core@>=3", "@octokit/core@>=4": version "4.2.4" resolved "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz" integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ== @@ -2013,124 +2278,74 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.13.0": - version "5.13.0" - resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a" - integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg== +"@prisma/client@5.11.0": + version "5.11.0" + resolved "https://registry.npmjs.org/@prisma/client/-/client-5.11.0.tgz" + integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== -"@prisma/debug@5.13.0": - version "5.13.0" - resolved "https://registry.yarnpkg.com/@prisma/debug/-/debug-5.13.0.tgz#d88b0f6fafa0c216e20e284ed9fc30f1cbe45786" - integrity sha512-699iqlEvzyCj9ETrXhs8o8wQc/eVW+FigSsHpiskSFydhjVuwTJEfj/nIYqTaWFYuxiWQRfm3r01meuW97SZaQ== +"@prisma/debug@5.11.0": + version "5.11.0" + resolved "https://registry.npmjs.org/@prisma/debug/-/debug-5.11.0.tgz" + integrity sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A== -"@prisma/engines-version@5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b": - version "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" - resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b.tgz#a72a4fb83ba1fd01ad45f795aa55168f60d34723" - integrity sha512-AyUuhahTINGn8auyqYdmxsN+qn0mw3eg+uhkp8zwknXYIqoT3bChG4RqNY/nfDkPvzWAPBa9mrDyBeOnWSgO6A== +"@prisma/engines-version@5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102": + version "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + resolved "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz" + integrity sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA== -"@prisma/engines@5.13.0": - version "5.13.0" - resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-5.13.0.tgz#8994ebf7b4e35aee7746a8465ec22738379bcab6" - integrity sha512-hIFLm4H1boj6CBZx55P4xKby9jgDTeDG0Jj3iXtwaaHmlD5JmiDkZhh8+DYWkTGchu+rRF36AVROLnk0oaqhHw== +"@prisma/engines@5.11.0": + version "5.11.0" + resolved "https://registry.npmjs.org/@prisma/engines/-/engines-5.11.0.tgz" + integrity sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw== dependencies: - "@prisma/debug" "5.13.0" - "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" - "@prisma/fetch-engine" "5.13.0" - "@prisma/get-platform" "5.13.0" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/fetch-engine" "5.11.0" + "@prisma/get-platform" "5.11.0" -"@prisma/fetch-engine@5.13.0": - version "5.13.0" - resolved "https://registry.yarnpkg.com/@prisma/fetch-engine/-/fetch-engine-5.13.0.tgz#9b6945c7b38bb59e840f8905b20ea7a3d059ca55" - integrity sha512-Yh4W+t6YKyqgcSEB3odBXt7QyVSm0OQlBSldQF2SNXtmOgMX8D7PF/fvH6E6qBCpjB/yeJLy/FfwfFijoHI6sA== +"@prisma/fetch-engine@5.11.0": + version "5.11.0" + resolved "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz" + integrity sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w== dependencies: - "@prisma/debug" "5.13.0" - "@prisma/engines-version" "5.13.0-23.b9a39a7ee606c28e3455d0fd60e78c3ba82b1a2b" - "@prisma/get-platform" "5.13.0" + "@prisma/debug" "5.11.0" + "@prisma/engines-version" "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102" + "@prisma/get-platform" "5.11.0" -"@prisma/get-platform@5.13.0": - version "5.13.0" - resolved "https://registry.yarnpkg.com/@prisma/get-platform/-/get-platform-5.13.0.tgz#99ef909a52b9d79b64d72d2d3d8210c4892b6572" - integrity sha512-B/WrQwYTzwr7qCLifQzYOmQhZcFmIFhR81xC45gweInSUn2hTEbfKUPd2keAog+y5WI5xLAFNJ3wkXplvSVkSw== +"@prisma/get-platform@5.11.0": + version "5.11.0" + resolved "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.11.0.tgz" + integrity sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw== dependencies: - "@prisma/debug" "5.13.0" + "@prisma/debug" "5.11.0" -"@resvg/resvg-js-android-arm-eabi@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.2.tgz#e761e0b688127db64879f455178c92468a9aeabe" - integrity sha512-FrJibrAk6v29eabIPgcTUMPXiEz8ssrAk7TXxsiZzww9UTQ1Z5KAbFJs+Z0Ez+VZTYgnE5IQJqBcoSiMebtPHA== +"@resvg/resvg-js-linux-x64-gnu@2.6.0": + version "2.6.0" + resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz" + integrity sha512-n3zC8DWsvxC1AwxpKFclIPapDFibs5XdIRoV/mcIlxlh0vseW1F49b97F33BtJQRmlntsqqN6GMMqx8byB7B+Q== -"@resvg/resvg-js-android-arm64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.2.tgz#b8cb564d7f6b3f37d9b43129f5dc5fe171e249e4" - integrity sha512-VcOKezEhm2VqzXpcIJoITuvUS/fcjIw5NA/w3tjzWyzmvoCdd+QXIqy3FBGulWdClvp4g+IfUemigrkLThSjAQ== +"@resvg/resvg-js-linux-x64-musl@2.6.0": + version "2.6.0" + resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz" + integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw== -"@resvg/resvg-js-darwin-arm64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.2.tgz#49bd3faeda5c49f53302d970e6e79d006de18e7d" - integrity sha512-nmok2LnAd6nLUKI16aEB9ydMC6Lidiiq2m1nEBDR1LaaP7FGs4AJ90qDraxX+CWlVuRlvNjyYJTNv8qFjtL9+A== - -"@resvg/resvg-js-darwin-x64@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.2.tgz#e1344173aa27bfb4d880ab576d1acf1c1648faca" - integrity sha512-GInyZLjgWDfsVT6+SHxQVRwNzV0AuA1uqGsOAW+0th56J7Nh6bHHKXHBWzUrihxMetcFDmQMAX1tZ1fZDYSRsw== - -"@resvg/resvg-js-linux-arm-gnueabihf@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.2.tgz#34c445eba45efd68f6130b2ab426d76a7424253d" - integrity sha512-YIV3u/R9zJbpqTTNwTZM5/ocWetDKGsro0SWp70eGEM9eV2MerWyBRZnQIgzU3YBnSBQ1RcxRZvY/UxwESfZIw== - -"@resvg/resvg-js-linux-arm64-gnu@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.2.tgz#30da47087dd8153182198b94fe9f8d994890dae5" - integrity sha512-zc2BlJSim7YR4FZDQ8OUoJg5holYzdiYMeobb9pJuGDidGL9KZUv7SbiD4E8oZogtYY42UZEap7dqkkYuA91pg== - -"@resvg/resvg-js-linux-arm64-musl@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.2.tgz#5d75b8ff5c83103729c1ca3779987302753c50d4" - integrity sha512-3h3dLPWNgSsD4lQBJPb4f+kvdOSJHa5PjTYVsWHxLUzH4IFTJUAnmuWpw4KqyQ3NA5QCyhw4TWgxk3jRkQxEKg== - -"@resvg/resvg-js-linux-x64-gnu@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.2.tgz#411abedfaee5edc57cbb7701736cecba522e26f3" - integrity sha512-IVUe+ckIerA7xMZ50duAZzwf1U7khQe2E0QpUxu5MBJNao5RqC0zwV/Zm965vw6D3gGFUl7j4m+oJjubBVoftw== - -"@resvg/resvg-js-linux-x64-musl@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.2.tgz#fe4984038f0372f279e3ff570b72934dd7eb2a5c" - integrity sha512-UOf83vqTzoYQO9SZ0fPl2ZIFtNIz/Rr/y+7X8XRX1ZnBYsQ/tTb+cj9TE+KHOdmlTFBxhYzVkP2lRByCzqi4jQ== - -"@resvg/resvg-js-win32-arm64-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.2.tgz#d3a053cf7ff687087a2106330c0fdaae706254d1" - integrity sha512-7C/RSgCa+7vqZ7qAbItfiaAWhyRSoD4l4BQAbVDqRRsRgY+S+hgS3in0Rxr7IorKUpGE69X48q6/nOAuTJQxeQ== - -"@resvg/resvg-js-win32-ia32-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.2.tgz#7cdda1ce29ef7209e28191d917fa5bef0624a4ad" - integrity sha512-har4aPAlvjnLcil40AC77YDIk6loMawuJwFINEM7n0pZviwMkMvjb2W5ZirsNOZY4aDbo5tLx0wNMREp5Brk+w== - -"@resvg/resvg-js-win32-x64-msvc@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.2.tgz#cb0ad04525d65f3def4c8d346157a57976d5b388" - integrity sha512-ZXtYhtUr5SSaBrUDq7DiyjOFJqBVL/dOBN7N/qmi/pO0IgiWW/f/ue3nbvu9joWE5aAKDoIzy/CxsY0suwGosQ== - -"@resvg/resvg-js@2.6.2": - version "2.6.2" - resolved "https://registry.yarnpkg.com/@resvg/resvg-js/-/resvg-js-2.6.2.tgz#3e92a907d88d879256c585347c5b21a7f3bb5b46" - integrity sha512-xBaJish5OeGmniDj9cW5PRa/PtmuVU3ziqrbr5xJj901ZDN4TosrVaNZpEiLZAxdfnhAe7uQ7QFWfjPe9d9K2Q== +"@resvg/resvg-js@2.6.0": + version "2.6.0" + resolved "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.6.0.tgz" + integrity sha512-Tf3YpbBKcQn991KKcw/vg7vZf98v01seSv6CVxZBbRkL/xyjnoYB6KgrFL6zskT1A4dWC/vg77KyNOW+ePaNlA== optionalDependencies: - "@resvg/resvg-js-android-arm-eabi" "2.6.2" - "@resvg/resvg-js-android-arm64" "2.6.2" - "@resvg/resvg-js-darwin-arm64" "2.6.2" - "@resvg/resvg-js-darwin-x64" "2.6.2" - "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.2" - "@resvg/resvg-js-linux-arm64-gnu" "2.6.2" - "@resvg/resvg-js-linux-arm64-musl" "2.6.2" - "@resvg/resvg-js-linux-x64-gnu" "2.6.2" - "@resvg/resvg-js-linux-x64-musl" "2.6.2" - "@resvg/resvg-js-win32-arm64-msvc" "2.6.2" - "@resvg/resvg-js-win32-ia32-msvc" "2.6.2" - "@resvg/resvg-js-win32-x64-msvc" "2.6.2" + "@resvg/resvg-js-android-arm-eabi" "2.6.0" + "@resvg/resvg-js-android-arm64" "2.6.0" + "@resvg/resvg-js-darwin-arm64" "2.6.0" + "@resvg/resvg-js-darwin-x64" "2.6.0" + "@resvg/resvg-js-linux-arm-gnueabihf" "2.6.0" + "@resvg/resvg-js-linux-arm64-gnu" "2.6.0" + "@resvg/resvg-js-linux-arm64-musl" "2.6.0" + "@resvg/resvg-js-linux-x64-gnu" "2.6.0" + "@resvg/resvg-js-linux-x64-musl" "2.6.0" + "@resvg/resvg-js-win32-arm64-msvc" "2.6.0" + "@resvg/resvg-js-win32-ia32-msvc" "2.6.0" + "@resvg/resvg-js-win32-x64-msvc" "2.6.0" "@rushstack/eslint-patch@^1.3.3": version "1.7.2" @@ -2260,7 +2475,7 @@ "@smithy/abort-controller@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.2.0.tgz#18983401a5e2154b5c94057730024a7d14cbcd35" + resolved "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.2.0.tgz" integrity sha512-wRlta7GuLWpTqtFfGo+nZyOO1vEvewdNR1R4rTxpC8XU6vG/NDyrFBhwLZsqg1NUoR1noVaXJPC/7ZK47QCySw== dependencies: "@smithy/types" "^2.12.0" @@ -2268,7 +2483,7 @@ "@smithy/config-resolver@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.2.0.tgz#54f40478bb61709b396960a3535866dba5422757" + resolved "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.2.0.tgz" integrity sha512-fsiMgd8toyUba6n1WRmr+qACzXltpdDkPTAaDqc8QqPBUzO+/JKwL6bUBseHVi8tu9l+3JOK+tSf7cay+4B3LA== dependencies: "@smithy/node-config-provider" "^2.3.0" @@ -2277,9 +2492,9 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/core@^1.4.2": +"@smithy/core@^1.4.0": version "1.4.2" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.4.2.tgz#1c3ed886d403041ce5bd2d816448420c57baa19c" + resolved "https://registry.npmjs.org/@smithy/core/-/core-1.4.2.tgz" integrity sha512-2fek3I0KZHWJlRLvRTqxTEri+qV0GRHrJIoLFuBMZB4EMg4WgeBGfF0X6abnrNYpq55KJ6R4D6x4f0vLnhzinA== dependencies: "@smithy/middleware-endpoint" "^2.5.1" @@ -2293,7 +2508,7 @@ "@smithy/credential-provider-imds@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz#326ce401b82e53f3c7ee4862a066136959a06166" + resolved "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.3.0.tgz" integrity sha512-BWB9mIukO1wjEOo1Ojgl6LrG4avcaC7T/ZP6ptmAaW4xluhSIPZhY+/PI5YKzlk+jsm+4sQZB45Bt1OfMeQa3w== dependencies: "@smithy/node-config-provider" "^2.3.0" @@ -2304,7 +2519,7 @@ "@smithy/fetch-http-handler@^2.5.0": version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz#0b8e1562807fdf91fe7dd5cde620d7a03ddc10ac" + resolved "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.5.0.tgz" integrity sha512-BOWEBeppWhLn/no/JxUL/ghTfANTjT7kg3Ww2rPqTUY9R4yHPXxJ9JhMe3Z03LN3aPwiwlpDIUcVw1xDyHqEhw== dependencies: "@smithy/protocol-http" "^3.3.0" @@ -2315,7 +2530,7 @@ "@smithy/hash-node@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.2.0.tgz#df29e1e64811be905cb3577703b0e2d0b07fc5cc" + resolved "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.2.0.tgz" integrity sha512-zLWaC/5aWpMrHKpoDF6nqpNtBhlAYKF/7+9yMN7GpdR8CzohnWfGtMznPybnwSS8saaXBMxIGwJqR4HmRp6b3g== dependencies: "@smithy/types" "^2.12.0" @@ -2325,7 +2540,7 @@ "@smithy/invalid-dependency@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz#ee3d8980022cb5edb514ac187d159b3e773640f0" + resolved "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.2.0.tgz" integrity sha512-nEDASdbKFKPXN2O6lOlTgrEEOO9NHIeO+HVvZnkqc8h5U9g3BIhWsvzFo+UcUbliMHvKNPD/zVxDrkP1Sbgp8Q== dependencies: "@smithy/types" "^2.12.0" @@ -2333,23 +2548,23 @@ "@smithy/is-array-buffer@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111" + resolved "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz" integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA== dependencies: tslib "^2.6.2" "@smithy/middleware-content-length@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz#a82e97bd83d8deab69e07fea4512563bedb9461a" + resolved "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.2.0.tgz" integrity sha512-5bl2LG1Ah/7E5cMSC+q+h3IpVHMeOkG0yLRyQT1p2aMJkSrZG7RlXHPuAgb7EyaFeidKEnnd/fNaLLaKlHGzDQ== dependencies: "@smithy/protocol-http" "^3.3.0" "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/middleware-endpoint@^2.5.1": +"@smithy/middleware-endpoint@^2.5.0", "@smithy/middleware-endpoint@^2.5.1": version "2.5.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz#1333c58304aff4d843e8ef4b85c8cb88975dd5ad" + resolved "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.5.1.tgz" integrity sha512-1/8kFp6Fl4OsSIVTWHnNjLnTL8IqpIb/D3sTSczrKFnrE9VMNWxnrRKNvpUHOJ6zpGD5f62TPm7+17ilTJpiCQ== dependencies: "@smithy/middleware-serde" "^2.3.0" @@ -2360,9 +2575,9 @@ "@smithy/util-middleware" "^2.2.0" tslib "^2.6.2" -"@smithy/middleware-retry@^2.3.1": +"@smithy/middleware-retry@^2.2.0", "@smithy/middleware-retry@^2.3.1": version "2.3.1" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz#d6fdce94f2f826642c01b4448e97a509c4556ede" + resolved "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.3.1.tgz" integrity sha512-P2bGufFpFdYcWvqpyqqmalRtwFUNUA8vHjJR5iGqbfR6mp65qKOLcUd6lTr4S9Gn/enynSrSf3p3FVgVAf6bXA== dependencies: "@smithy/node-config-provider" "^2.3.0" @@ -2377,7 +2592,7 @@ "@smithy/middleware-serde@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz#a7615ba646a88b6f695f2d55de13d8158181dd13" + resolved "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.3.0.tgz" integrity sha512-sIADe7ojwqTyvEQBe1nc/GXB9wdHhi9UwyX0lTyttmUWDJLP655ZYE1WngnNyXREme8I27KCaUhyhZWRXL0q7Q== dependencies: "@smithy/types" "^2.12.0" @@ -2385,7 +2600,7 @@ "@smithy/middleware-stack@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz#3fb49eae6313f16f6f30fdaf28e11a7321f34d9f" + resolved "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.2.0.tgz" integrity sha512-Qntc3jrtwwrsAC+X8wms8zhrTr0sFXnyEGhZd9sLtsJ/6gGQKFzNB+wWbOcpJd7BR8ThNCoKt76BuQahfMvpeA== dependencies: "@smithy/types" "^2.12.0" @@ -2393,7 +2608,7 @@ "@smithy/node-config-provider@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz#9fac0c94a14c5b5b8b8fa37f20c310a844ab9922" + resolved "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.3.0.tgz" integrity sha512-0elK5/03a1JPWMDPaS726Iw6LpQg80gFut1tNpPfxFuChEEklo2yL823V94SpTZTxmKlXFtFgsP55uh3dErnIg== dependencies: "@smithy/property-provider" "^2.2.0" @@ -2403,7 +2618,7 @@ "@smithy/node-http-handler@^2.5.0": version "2.5.0" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz#7b5e0565dd23d340380489bd5fe4316d2bed32de" + resolved "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.5.0.tgz" integrity sha512-mVGyPBzkkGQsPoxQUbxlEfRjrj6FPyA3u3u2VXGr9hT8wilsoQdZdvKpMBFMB8Crfhv5dNkKHIW0Yyuc7eABqA== dependencies: "@smithy/abort-controller" "^2.2.0" @@ -2414,7 +2629,7 @@ "@smithy/property-provider@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.2.0.tgz#37e3525a3fa3e11749f86a4f89f0fd7765a6edb0" + resolved "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.2.0.tgz" integrity sha512-+xiil2lFhtTRzXkx8F053AV46QnIw6e7MV8od5Mi68E1ICOjCeCHw2XfLnDEUHnT9WGUIkwcqavXjfwuJbGlpg== dependencies: "@smithy/types" "^2.12.0" @@ -2422,7 +2637,7 @@ "@smithy/protocol-http@^3.3.0": version "3.3.0" - resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.3.0.tgz#a37df7b4bb4960cdda560ce49acfd64c455e4090" + resolved "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.3.0.tgz" integrity sha512-Xy5XK1AFWW2nlY/biWZXu6/krgbaf2dg0q492D8M5qthsnU2H+UgFeZLbM76FnH7s6RO/xhQRkj+T6KBO3JzgQ== dependencies: "@smithy/types" "^2.12.0" @@ -2430,7 +2645,7 @@ "@smithy/querystring-builder@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz#22937e19fcd0aaa1a3e614ef8cb6f8e86756a4ef" + resolved "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.2.0.tgz" integrity sha512-L1kSeviUWL+emq3CUVSgdogoM/D9QMFaqxL/dd0X7PCNWmPXqt+ExtrBjqT0V7HLN03Vs9SuiLrG3zy3JGnE5A== dependencies: "@smithy/types" "^2.12.0" @@ -2439,7 +2654,7 @@ "@smithy/querystring-parser@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz#24a5633f4b3806ff2888d4c2f4169e105fdffd79" + resolved "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.2.0.tgz" integrity sha512-BvHCDrKfbG5Yhbpj4vsbuPV2GgcpHiAkLeIlcA1LtfpMz3jrqizP1+OguSNSj1MwBHEiN+jwNisXLGdajGDQJA== dependencies: "@smithy/types" "^2.12.0" @@ -2447,22 +2662,22 @@ "@smithy/service-error-classification@^2.1.5": version "2.1.5" - resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz#0568a977cc0db36299d8703a5d8609c1f600c005" + resolved "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.1.5.tgz" integrity sha512-uBDTIBBEdAQryvHdc5W8sS5YX7RQzF683XrHePVdFmAgKiMofU15FLSM0/HU03hKTnazdNRFa0YHS7+ArwoUSQ== dependencies: "@smithy/types" "^2.12.0" "@smithy/shared-ini-file-loader@^2.4.0": version "2.4.0" - resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz#1636d6eb9bff41e36ac9c60364a37fd2ffcb9947" + resolved "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.4.0.tgz" integrity sha512-WyujUJL8e1B6Z4PBfAqC/aGY1+C7T0w20Gih3yrvJSk97gpiVfB+y7c46T4Nunk+ZngLq0rOIdeVeIklk0R3OA== dependencies: "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@smithy/signature-v4@^2.3.0": +"@smithy/signature-v4@^2.2.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.3.0.tgz#c30dd4028ae50c607db99459981cce8cdab7a3fd" + resolved "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.3.0.tgz" integrity sha512-ui/NlpILU+6HAQBfJX8BBsDXuKSNrjTSuOYArRblcrErwKFutjrCNb/OExfVRyj9+26F9J+ZmfWT+fKWuDrH3Q== dependencies: "@smithy/is-array-buffer" "^2.2.0" @@ -2473,9 +2688,9 @@ "@smithy/util-utf8" "^2.3.0" tslib "^2.6.2" -"@smithy/smithy-client@^2.5.1": +"@smithy/smithy-client@^2.5.0", "@smithy/smithy-client@^2.5.1": version "2.5.1" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.5.1.tgz#0fd2efff09dc65500d260e590f7541f8a387eae3" + resolved "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.5.1.tgz" integrity sha512-jrbSQrYCho0yDaaf92qWgd+7nAeap5LtHTI51KXqmpIFCceKU3K9+vIVTUH72bOJngBMqa4kyu1VJhRcSrk/CQ== dependencies: "@smithy/middleware-endpoint" "^2.5.1" @@ -2487,14 +2702,14 @@ "@smithy/types@^2.12.0": version "2.12.0" - resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.12.0.tgz#c44845f8ba07e5e8c88eda5aed7e6a0c462da041" + resolved "https://registry.npmjs.org/@smithy/types/-/types-2.12.0.tgz" integrity sha512-QwYgloJ0sVNBeBuBs65cIkTbfzV/Q6ZNPCJ99EICFEdJYG50nGIY/uYXp+TbsdJReIuPr0a0kXmCvren3MbRRw== dependencies: tslib "^2.6.2" "@smithy/url-parser@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.2.0.tgz#6fcda6116391a4f61fef5580eb540e128359b3c0" + resolved "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.2.0.tgz" integrity sha512-hoA4zm61q1mNTpksiSWp2nEl1dt3j726HdRhiNgVJQMj7mLp7dprtF57mOB6JvEk/x9d2bsuL5hlqZbBuHQylQ== dependencies: "@smithy/querystring-parser" "^2.2.0" @@ -2503,7 +2718,7 @@ "@smithy/util-base64@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.3.0.tgz#312dbb4d73fb94249c7261aee52de4195c2dd8e2" + resolved "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-2.3.0.tgz" integrity sha512-s3+eVwNeJuXUwuMbusncZNViuhv2LjVJ1nMwTqSA0XAC7gjKhqqxRdJPhR8+YrkoZ9IiIbFk/yK6ACe/xlF+hw== dependencies: "@smithy/util-buffer-from" "^2.2.0" @@ -2512,21 +2727,21 @@ "@smithy/util-body-length-browser@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz#25620645c6b62b42594ef4a93b66e6ab70e27d2c" + resolved "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-2.2.0.tgz" integrity sha512-dtpw9uQP7W+n3vOtx0CfBD5EWd7EPdIdsQnWTDoFf77e3VUf05uA7R7TGipIo8e4WL2kuPdnsr3hMQn9ziYj5w== dependencies: tslib "^2.6.2" "@smithy/util-body-length-node@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz#d065a9b5e305ff899536777bbfe075cdc980136f" + resolved "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.3.0.tgz" integrity sha512-ITWT1Wqjubf2CJthb0BuT9+bpzBfXeMokH/AAa5EJQgbv9aPMVfnM76iFIZVFf50hYXGbtiV71BHAthNWd6+dw== dependencies: tslib "^2.6.2" "@smithy/util-buffer-from@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b" + resolved "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz" integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA== dependencies: "@smithy/is-array-buffer" "^2.2.0" @@ -2534,14 +2749,14 @@ "@smithy/util-config-provider@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz#bc79f99562d12a1f8423100ca662a6fb07cde943" + resolved "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-2.3.0.tgz" integrity sha512-HZkzrRcuFN1k70RLqlNK4FnPXKOpkik1+4JaBoHNJn+RnJGYqaa3c5/+XtLOXhlKzlRgNvyaLieHTW2VwGN0VQ== dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^2.2.1": +"@smithy/util-defaults-mode-browser@^2.2.0": version "2.2.1" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz#9db31416daf575d2963c502e0528cfe8055f0c4e" + resolved "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.2.1.tgz" integrity sha512-RtKW+8j8skk17SYowucwRUjeh4mCtnm5odCL0Lm2NtHQBsYKrNW0od9Rhopu9wF1gHMfHeWF7i90NwBz/U22Kw== dependencies: "@smithy/property-provider" "^2.2.0" @@ -2550,9 +2765,9 @@ bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^2.3.1": +"@smithy/util-defaults-mode-node@^2.3.0": version "2.3.1" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz#4613210a3d107aadb3f85bd80cb71c796dd8bf0a" + resolved "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.3.1.tgz" integrity sha512-vkMXHQ0BcLFysBMWgSBLSk3+leMpFSyyFj8zQtv5ZyUBx8/owVh1/pPEkzmW/DR/Gy/5c8vjLDD9gZjXNKbrpA== dependencies: "@smithy/config-resolver" "^2.2.0" @@ -2565,7 +2780,7 @@ "@smithy/util-endpoints@^1.2.0": version "1.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz#b8b805f47e8044c158372f69b88337703117665d" + resolved "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-1.2.0.tgz" integrity sha512-BuDHv8zRjsE5zXd3PxFXFknzBG3owCpjq8G3FcsXW3CykYXuEqM3nTSsmLzw5q+T12ZYuDlVUZKBdpNbhVtlrQ== dependencies: "@smithy/node-config-provider" "^2.3.0" @@ -2574,14 +2789,14 @@ "@smithy/util-hex-encoding@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz#87edb7c88c2f422cfca4bb21f1394ae9602c5085" + resolved "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-2.2.0.tgz" integrity sha512-7iKXR+/4TpLK194pVjKiasIyqMtTYJsgKgM242Y9uzt5dhHnUDvMNb+3xIhRJ9QhvqGii/5cRUt4fJn3dtXNHQ== dependencies: tslib "^2.6.2" "@smithy/util-middleware@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.2.0.tgz#80cfad40f6cca9ffe42a5899b5cb6abd53a50006" + resolved "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.2.0.tgz" integrity sha512-L1qpleXf9QD6LwLCJ5jddGkgWyuSvWBkJwWAZ6kFkdifdso+sk3L3O1HdmPvCdnCK3IS4qWyPxev01QMnfHSBw== dependencies: "@smithy/types" "^2.12.0" @@ -2589,7 +2804,7 @@ "@smithy/util-retry@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.2.0.tgz#e8e019537ab47ba6b2e87e723ec51ee223422d85" + resolved "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.2.0.tgz" integrity sha512-q9+pAFPTfftHXRytmZ7GzLFFrEGavqapFc06XxzZFcSIGERXMerXxCitjOG1prVDR9QdjqotF40SWvbqcCpf8g== dependencies: "@smithy/service-error-classification" "^2.1.5" @@ -2598,7 +2813,7 @@ "@smithy/util-stream@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.2.0.tgz#b1279e417992a0f74afa78d7501658f174ed7370" + resolved "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.2.0.tgz" integrity sha512-17faEXbYWIRst1aU9SvPZyMdWmqIrduZjVOqCPMIsWFNxs5yQQgFrJL6b2SdiCzyW9mJoDjFtgi53xx7EH+BXA== dependencies: "@smithy/fetch-http-handler" "^2.5.0" @@ -2612,32 +2827,19 @@ "@smithy/util-uri-escape@^2.2.0": version "2.2.0" - resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz#56f5764051a33b67bc93fdd2a869f971b0635406" + resolved "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-2.2.0.tgz" integrity sha512-jtmJMyt1xMD/d8OtbVJ2gFZOSKc+ueYJZPW20ULW1GOp/q/YIM0wNh+u8ZFao9UaIGz4WoPW8hC64qlWLIfoDA== dependencies: tslib "^2.6.2" "@smithy/util-utf8@^2.3.0": version "2.3.0" - resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5" + resolved "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz" integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A== dependencies: "@smithy/util-buffer-from" "^2.2.0" tslib "^2.6.2" -"@swc/counter@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9" - integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ== - -"@swc/helpers@0.5.5": - version "0.5.5" - resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.5.tgz#12689df71bfc9b21c4f4ca00ae55f2f16c8b77c0" - integrity sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A== - dependencies: - "@swc/counter" "^0.1.3" - tslib "^2.4.0" - "@swc/helpers@^0.3.13": version "0.3.17" resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz" @@ -2645,6 +2847,13 @@ dependencies: tslib "^2.4.0" +"@swc/helpers@0.5.2": + version "0.5.2" + resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz" + integrity sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw== + dependencies: + tslib "^2.4.0" + "@tailwindcss/nesting@^0.0.0-insiders.565cd3e": version "0.0.0-insiders.565cd3e" resolved "https://registry.npmjs.org/@tailwindcss/nesting/-/nesting-0.0.0-insiders.565cd3e.tgz" @@ -2652,10 +2861,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.12": - version "0.5.12" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.12.tgz#c0532fd594427b7f4e8e38eff7bf272c63a1dca4" - integrity sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg== +"@tailwindcss/typography@0.5.10": + version "0.5.10" + resolved "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz" + integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" @@ -2832,12 +3041,12 @@ resolved "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz" integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== -"@types/nlcst@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/nlcst/-/nlcst-2.0.3.tgz#31cad346eaab48a9a8a58465d3d05e2530dda762" - integrity sha512-vSYNSDe6Ix3q+6Z7ri9lyWqgGhJTmzRjZRqyq15N0Z/1/UnVsno9G/N40NBijoYx2seFDIl0+B2mgAb9mezUCA== +"@types/nlcst@^1.0.0": + version "1.0.4" + resolved "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.4.tgz" + integrity sha512-ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg== dependencies: - "@types/unist" "*" + "@types/unist" "^2" "@types/node@*": version "20.11.16" @@ -2861,9 +3070,9 @@ resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz" integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== -"@types/react@*": +"@types/react@*", "@types/react@>=16", "@types/react@>=17.0.0", "@types/react@17 || 18": version "18.2.61" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.61.tgz#5607308495037436779939ec0348a5816c08799d" + resolved "https://registry.npmjs.org/@types/react/-/react-18.2.61.tgz" integrity sha512-NURTN0qNnJa7O/k4XUkEW2yfygA+NxS0V5h1+kp9jPwhzZy95q3ADoGMP0+JypMhrZBTTgjKAUlTctde1zzeQA== dependencies: "@types/prop-types" "*" @@ -2900,7 +3109,7 @@ "@typescript-eslint/parser@^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0": version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.2.0.tgz#44356312aea8852a3a82deebdacd52ba614ec07a" + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz" integrity sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg== dependencies: "@typescript-eslint/scope-manager" "7.2.0" @@ -2911,7 +3120,7 @@ "@typescript-eslint/scope-manager@7.2.0": version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz#cfb437b09a84f95a0930a76b066e89e35d94e3da" + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz" integrity sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg== dependencies: "@typescript-eslint/types" "7.2.0" @@ -2919,12 +3128,12 @@ "@typescript-eslint/types@7.2.0": version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.2.0.tgz#0feb685f16de320e8520f13cca30779c8b7c403f" + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz" integrity sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA== "@typescript-eslint/typescript-estree@7.2.0": version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz#5beda2876c4137f8440c5a84b4f0370828682556" + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz" integrity sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA== dependencies: "@typescript-eslint/types" "7.2.0" @@ -2938,7 +3147,7 @@ "@typescript-eslint/visitor-keys@7.2.0": version "7.2.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz#5035f177752538a5750cca1af6044b633610bf9e" + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz" integrity sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A== dependencies: "@typescript-eslint/types" "7.2.0" @@ -2969,29 +3178,16 @@ dependencies: argparse "^2.0.1" -Buffer@0.0.0: - version "0.0.0" - resolved "https://registry.npmjs.org/Buffer/-/Buffer-0.0.0.tgz" - integrity sha512-+zdncl8lI5TCkARStn9F1BwcuJYofYmD0oEHe5FNfCvGfeDJwf6+dSikCdQN6BMXXmHMhNNUagBN367WST1AIQ== - -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abbrev@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz" - integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== - abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" @@ -3022,22 +3218,22 @@ acorn-walk@^8.0.0: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz" integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== -acorn@^6.1.1: - version "6.4.2" - resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== - -acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.9.0: +"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.9.0: version "8.11.3" resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== +acorn@^6.0.0, acorn@^6.1.1: + version "6.4.2" + resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" + integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== + add-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz" integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ== -agent-base@6, agent-base@^6.0.2: +agent-base@^6.0.2, agent-base@6: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -3093,9 +3289,9 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" -algoliasearch@4.22.1: +"algoliasearch@>= 3.1 < 5", "algoliasearch@>= 3.1 < 6", algoliasearch@4.22.1: version "4.22.1" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.22.1.tgz#f10fbecdc7654639ec20d62f109c1b3a46bc6afc" + resolved "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz" integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== dependencies: "@algolia/cache-browser-local-storage" "4.22.1" @@ -3113,27 +3309,6 @@ algoliasearch@4.22.1: "@algolia/requester-node-http" "4.22.1" "@algolia/transporter" "4.22.1" -algoliasearch@4.23.3: - version "4.23.3" - resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.23.3.tgz#e09011d0a3b0651444916a3e6bbcba064ec44b60" - integrity sha512-Le/3YgNvjW9zxIQMRhUHuhiUjAlKY/zsdZpfq4dlLqg6mEm0nL6yk+7f2hDOtLpxsgE4jSzDmvHL7nXdBp5feg== - dependencies: - "@algolia/cache-browser-local-storage" "4.23.3" - "@algolia/cache-common" "4.23.3" - "@algolia/cache-in-memory" "4.23.3" - "@algolia/client-account" "4.23.3" - "@algolia/client-analytics" "4.23.3" - "@algolia/client-common" "4.23.3" - "@algolia/client-personalization" "4.23.3" - "@algolia/client-search" "4.23.3" - "@algolia/logger-common" "4.23.3" - "@algolia/logger-console" "4.23.3" - "@algolia/recommend" "4.23.3" - "@algolia/requester-browser-xhr" "4.23.3" - "@algolia/requester-common" "4.23.3" - "@algolia/requester-node-http" "4.23.3" - "@algolia/transporter" "4.23.3" - all-contributors-cli@^6.26.1: version "6.26.1" resolved "https://registry.npmjs.org/all-contributors-cli/-/all-contributors-cli-6.26.1.tgz" @@ -3152,16 +3327,16 @@ all-contributors-cli@^6.26.1: optionalDependencies: prettier "^2" -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - ansi-colors@^4.1.1: version "4.1.3" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz" integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz" @@ -3215,7 +3390,17 @@ ansi-styles@^5.0.0: resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1: +ansi-styles@^6.0.0: + version "6.2.1" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + +ansi-styles@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -3502,7 +3687,7 @@ attr-accept@^2.2.2: autoprefixer@10.4.19: version "10.4.19" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.19.tgz#ad25a856e82ee9d7898c59583c1afeb3fa65f89f" + resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz" integrity sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew== dependencies: browserslist "^4.23.0" @@ -3522,9 +3707,9 @@ axe-core@=4.7.0: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@1.6.8, axios@^1.5.1, axios@^1.6.0: +axios@^1.5.1, axios@^1.6.0, axios@1.6.8: version "1.6.8" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66" + resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz" integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== dependencies: follow-redirects "^1.15.6" @@ -3538,6 +3723,28 @@ axobject-query@^3.2.1: dependencies: dequal "^2.0.3" +"backend.freesewing.org@file:/home/joost/git/freesewing/sites/backend": + version "3.2.0" + resolved "file:sites/backend" + dependencies: + "@aws-sdk/client-sesv2" "3.535.0" + "@prisma/client" "5.11.0" + bcryptjs "2.4.3" + cors "2.8.5" + dotenv "16.4.5" + express "4.19.1" + js-yaml "4.1.0" + lodash.get "4.4.2" + mustache "4.2.0" + otplib "12.0.1" + passport "0.7.0" + passport-http "0.3.0" + passport-jwt "4.0.1" + pino "9.0.0" + qrcode "1.5.3" + swagger-ui-dist "5.17.2" + swagger-ui-express "5.0.0" + bail@^1.0.0: version "1.0.5" resolved "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz" @@ -3553,16 +3760,16 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@0.0.8: - version "0.0.8" - resolved "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" - integrity sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw== - base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1: version "1.5.1" resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== +base64-js@0.0.8: + version "0.0.8" + resolved "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" + integrity sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw== + bcryptjs@2.4.3: version "2.4.3" resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz" @@ -3659,9 +3866,9 @@ browser-stdout@1.3.1: resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.22.2, browserslist@^4.23.0: +browserslist@^4.22.2, browserslist@^4.23.0, "browserslist@>= 4.21.0": version "4.23.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: caniuse-lite "^1.0.30001587" @@ -3708,6 +3915,11 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" +Buffer@0.0.0: + version "0.0.0" + resolved "https://registry.npmjs.org/Buffer/-/Buffer-0.0.0.tgz" + integrity sha512-+zdncl8lI5TCkARStn9F1BwcuJYofYmD0oEHe5FNfCvGfeDJwf6+dSikCdQN6BMXXmHMhNNUagBN367WST1AIQ== + build-array@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/build-array/-/build-array-1.0.0.tgz" @@ -3852,7 +4064,7 @@ camelcase@^6.0.0: caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599: version "1.0.30001599" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz#571cf4f3f1506df9bf41fcbb6d10d5d017817bce" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001599.tgz" integrity sha512-LRAQHZ4yT1+f9LemSMeqdMpMxZcc4RMWdj4tiFe3G8tNkWK+E58g+/tzotb5cU6TbcVJLr4fySiAW7XmxQvZQA== ccount@^2.0.0: @@ -3885,19 +4097,6 @@ chai@5.1.0: loupe "^3.1.0" pathval "^2.0.0" -chalk@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@5.3.0, chalk@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" @@ -3926,6 +4125,24 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^5.3.0: + version "5.3.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + +chalk@4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@5.3.0: + version "5.3.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + character-entities-html4@^1.0.0: version "1.1.4" resolved "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz" @@ -4006,7 +4223,7 @@ cheerio@^1.0.0-rc.5: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3: +chokidar@^3.5.2, chokidar@^3.5.3, chokidar@3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -4041,7 +4258,7 @@ clean-stack@^2.0.0: resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-cursor@3.1.0, cli-cursor@^3.1.0: +cli-cursor@^3.1.0, cli-cursor@3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz" integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== @@ -4055,16 +4272,16 @@ cli-cursor@^4.0.0: dependencies: restore-cursor "^4.0.0" -cli-spinners@2.6.1: - version "2.6.1" - resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz" - integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== - cli-spinners@^2.5.0, cli-spinners@^2.9.2: version "2.9.2" resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz" integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== +cli-spinners@2.6.1: + version "2.6.1" + resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz" + integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== + cli-truncate@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz" @@ -4172,16 +4389,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + color-support@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz" @@ -4217,26 +4434,26 @@ comma-separated-tokens@^2.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz" integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg== -commander@11.1.0: - version "11.1.0" - resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" - integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== - -commander@7, commander@^7.2.0: - version "7.2.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - commander@^4.0.0: version "4.1.1" resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^7.2.0, commander@7: + version "7.2.0" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@^8.3.0: version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@11.1.0: + version "11.1.0" + resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" + integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" @@ -4294,7 +4511,7 @@ content-type@~1.0.4, content-type@~1.0.5: resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -conventional-changelog-angular@7.0.0, conventional-changelog-angular@^7.0.0: +conventional-changelog-angular@^7.0.0, conventional-changelog-angular@7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz" integrity sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ== @@ -4356,8 +4573,8 @@ conventional-commits-parser@^4.0.0: resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz" integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== dependencies: - JSONStream "^1.3.5" is-text-path "^1.0.1" + JSONStream "^1.3.5" meow "^8.1.2" split2 "^3.2.2" @@ -4366,8 +4583,8 @@ conventional-commits-parser@^5.0.0: resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz" integrity sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA== dependencies: - JSONStream "^1.3.5" is-text-path "^2.0.0" + JSONStream "^1.3.5" meow "^12.0.1" split2 "^4.0.0" @@ -4401,7 +4618,7 @@ cookie-signature@1.0.6: cookie@0.6.0: version "0.6.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.6.0.tgz#2798b04b071b0ecbff0dbb62a505a8efa4e19051" + resolved "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz" integrity sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw== cookiejar@^2.1.4: @@ -4460,7 +4677,7 @@ cosmiconfig@^8.2.0: cosmiconfig@^9.0.0: version "9.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-9.0.0.tgz#34c3fc58287b915f3ae905ab6dc3de258b55ad9d" + resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz" integrity sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg== dependencies: env-paths "^2.2.1" @@ -4468,6 +4685,14 @@ cosmiconfig@^9.0.0: js-yaml "^4.1.0" parse-json "^5.2.0" +cosmiconfig@>=8.2: + version "9.0.0" + dependencies: + env-paths "^2.2.1" + import-fresh "^3.3.0" + js-yaml "^4.1.0" + parse-json "^5.2.0" + cp-file@^9.0.0: version "9.1.0" resolved "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz" @@ -4545,7 +4770,7 @@ cytoscape-cose-bilkent@^4.1.0: dependencies: cose-base "^1.0.0" -cytoscape@^3.28.1: +cytoscape@^3.2.0, cytoscape@^3.28.1: version "3.28.1" resolved "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz" integrity sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg== @@ -4553,6 +4778,13 @@ cytoscape@^3.28.1: heap "^0.2.6" lodash "^4.17.21" +d3-array@^3.2.0, "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: + version "3.2.4" + resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" + integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== + dependencies: + internmap "1 - 2" + "d3-array@1 - 2": version "2.12.1" resolved "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz" @@ -4560,13 +4792,6 @@ cytoscape@^3.28.1: dependencies: internmap "^1.0.0" -"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0: - version "3.2.4" - resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" - integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== - dependencies: - internmap "1 - 2" - d3-axis@3: version "3.0.0" resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz" @@ -4676,16 +4901,16 @@ d3-hierarchy@3: dependencies: d3-color "1 - 3" +d3-path@^3.1.0, "d3-path@1 - 3", d3-path@3: + version "3.1.0" + resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz" + integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== + d3-path@1: version "1.0.9" resolved "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz" integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== -"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz" - integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== - d3-polygon@3: version "3.0.1" resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz" @@ -4733,13 +4958,6 @@ d3-scale@4: resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz" integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== -d3-shape@3: - version "3.2.0" - resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz" - integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA== - dependencies: - d3-path "^3.1.0" - d3-shape@^1.2.0: version "1.3.7" resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz" @@ -4747,6 +4965,13 @@ d3-shape@^1.2.0: dependencies: d3-path "1" +d3-shape@3: + version "3.2.0" + resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz" + integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA== + dependencies: + d3-path "^3.1.0" + "d3-time-format@2 - 4", d3-time-format@4: version "4.1.0" resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz" @@ -4832,10 +5057,10 @@ dagre-d3-es@7.0.10: d3 "^7.8.2" lodash-es "^4.17.21" -daisyui@4.10.2: - version "4.10.2" - resolved "https://registry.yarnpkg.com/daisyui/-/daisyui-4.10.2.tgz#c0e072b94ccaa0326d1fdec26e8dc163ac070561" - integrity sha512-eCWS1W/JPyxW9IvlgW5m0R6rp9ZhRsBTW37rvEUthckkjsV04u8XipV519OoccSA46ixhSJa3q7XLI1WUFtRCA== +daisyui@4.7.3: + version "4.7.3" + resolved "https://registry.npmjs.org/daisyui/-/daisyui-4.7.3.tgz" + integrity sha512-R8jUpBMAUm4rSyxzGa9QqFdJTkzREtb1QahXdDoOfElGiF4VbSuu5bfqQoOro1kkSagPy+aTKu5WtSSXmH3u3g== dependencies: css-selector-tokenizer "^0.8" culori "^3" @@ -4877,20 +5102,6 @@ debounce@^1.2.1: resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz" integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== -debug@2.6.9: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@4.3.4, debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debug@^3.2.7: version "3.2.7" resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" @@ -4898,6 +5109,20 @@ debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@4, debug@4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz" @@ -5083,16 +5308,21 @@ diff-sequences@^29.6.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== +diff@^5.0.0: + version "5.1.0" + resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" + integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== + +diff@^5.1.0: + version "5.1.0" + resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" + integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== + diff@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== -diff@^5.0.0, diff@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" - integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== - dijkstrajs@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz" @@ -5124,14 +5354,6 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz" @@ -5141,15 +5363,35 @@ dom-serializer@^2.0.0: domhandler "^5.0.2" entities "^4.2.0" +dom-serializer@0: + version "0.2.2" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + +domelementtype@^2.0.1: + version "2.3.0" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + domelementtype@1: version "1.3.1" resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1, domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== +domhandler@^5.0.2, domhandler@^5.0.3, domhandler@5.0.3: + version "5.0.3" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" domhandler@2.3: version "2.3.0" @@ -5158,26 +5400,11 @@ domhandler@2.3: dependencies: domelementtype "1" -domhandler@5.0.3, domhandler@^5.0.2, domhandler@^5.0.3: - version "5.0.3" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - dompurify@^3.0.5: version "3.0.8" resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.0.8.tgz" integrity sha512-b7uwreMYL2eZhrSCRC4ahLTeZcPZxSmYfmcQGXGkXiZSNW1X85v+SDM5KsWcpivIiUBH47Ji7NtyUdpLeF5JZQ== -domutils@1.5: - version "1.5.1" - resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" - integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw== - dependencies: - dom-serializer "0" - domelementtype "1" - domutils@^3.0.1, domutils@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz" @@ -5187,6 +5414,14 @@ domutils@^3.0.1, domutils@^3.1.0: domelementtype "^2.3.0" domhandler "^5.0.3" +domutils@1.5: + version "1.5.1" + resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" + integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw== + dependencies: + dom-serializer "0" + domelementtype "1" + dot-prop@^5.1.0: version "5.3.0" resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz" @@ -5199,16 +5434,16 @@ dotenv-expand@~10.0.0: resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz" integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== -dotenv@16.4.5: - version "16.4.5" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz" - integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== - dotenv@~16.3.1: version "16.3.2" resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz" integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ== +dotenv@16.4.5: + version "16.4.5" + resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz" + integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== + duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" @@ -5234,7 +5469,7 @@ echarts-for-react@3.0.2: fast-deep-equal "^3.1.3" size-sensor "^1.0.1" -echarts@5.5.0: +"echarts@^3.0.0 || ^4.0.0 || ^5.0.0", echarts@5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz" integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw== @@ -5256,7 +5491,7 @@ ejs@^3.1.7: electron-to-chromium@^1.4.668: version "1.4.690" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz#dd5145d45c49c08a9a6f7454127e660bdf9a3fa7" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.690.tgz" integrity sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA== elkjs@^0.9.0: @@ -5294,7 +5529,7 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding@^0.1.13: +encoding@^0.1.0, encoding@^0.1.13: version "0.1.13" resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5323,11 +5558,6 @@ enquirer@~2.3.6: dependencies: ansi-colors "^4.1.1" -entities@1.0: - version "1.0.0" - resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" - integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ== - entities@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" @@ -5338,6 +5568,11 @@ entities@^4.2.0, entities@^4.4.0, entities@^4.5.0: resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== +entities@1.0: + version "1.0.0" + resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" + integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ== + env-paths@^2.2.0, env-paths@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz" @@ -5490,9 +5725,9 @@ esbuild-plugin-yaml@^0.0.1: fs-extra "^9.1.0" js-yaml "^4.0.0" -esbuild@0.20.2, esbuild@^0.20.0: +esbuild@^0.20.0, esbuild@0.20.2: version "0.20.2" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.2.tgz#9d6b2386561766ee6b5a55196c6d766d28c87ea1" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz" integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g== optionalDependencies: "@esbuild/aix-ppc64" "0.20.2" @@ -5529,16 +5764,21 @@ escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + +escape-string-regexp@^4.0.0, escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escape-string-regexp@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz" @@ -5546,14 +5786,14 @@ escape-string-regexp@^5.0.0: eslint-compat-utils@^0.5.0: version "0.5.0" - resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz#f7b2eb2befec25a370fac76934d3f9189f312a65" + resolved "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.0.tgz" integrity sha512-dc6Y8tzEcSYZMHa+CMPLi/hyo1FzNeonbhJL7Ol0ccuKQkwopJcJBA9YL/xmMTLU1eKigXo9vj9nALElWYSowg== dependencies: semver "^7.5.4" eslint-config-next@^14.0.1: version "14.2.3" - resolved "https://registry.yarnpkg.com/eslint-config-next/-/eslint-config-next-14.2.3.tgz#2fb0f7c4eccda530a4b5054438162b2303786d4f" + resolved "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-14.2.3.tgz" integrity sha512-ZkNztm3Q7hjqvB1rRlOX8P9E/cXRL9ajRcs8jufEtwMfTVYRqnmtnaSu57QqHyBlovMuiB8LEzfLBkh5RYV6Fg== dependencies: "@next/eslint-plugin-next" "14.2.3" @@ -5613,7 +5853,7 @@ eslint-plugin-es@^4.1.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: +eslint-plugin-import@*, eslint-plugin-import@^2.25.2, eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: version "2.29.1" resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz" integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== @@ -5638,7 +5878,7 @@ eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: eslint-plugin-jsonc@^2.4.0: version "2.15.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.1.tgz#97a5b24e9b14fe2163fd4988fa66d428785d7e7e" + resolved "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.15.1.tgz" integrity sha512-PVFrqIJa8BbM/e828RSn0SwB/Z5ye+2LDuy2XqG6AymNgPsfApRRcznsbxP7VrjdLEU4Nb+g9n/d6opyp0jp9A== dependencies: "@eslint-community/eslint-utils" "^4.2.0" @@ -5673,7 +5913,7 @@ eslint-plugin-jsx-a11y@^6.7.1: eslint-plugin-markdown@^4.0.1: version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-markdown/-/eslint-plugin-markdown-4.0.1.tgz#f5a574498d378da54bf2aea940d41a74e1f2dcb4" + resolved "https://registry.npmjs.org/eslint-plugin-markdown/-/eslint-plugin-markdown-4.0.1.tgz" integrity sha512-5/MnGvYU0i8MbHH5cg8S+Vl3DL+bqRNYshk1xUO86DilNBaxtTkhH+5FD0/yO03AmlI6+lfNFdk2yOw72EPzpA== dependencies: mdast-util-from-markdown "^0.8.5" @@ -5685,7 +5925,7 @@ eslint-plugin-mongo@^1.0.5: dependencies: requireindex "~1.1.0" -eslint-plugin-n@^15.7.0: +"eslint-plugin-n@^15.0.0 || ^16.0.0 ", eslint-plugin-n@^15.7.0: version "15.7.0" resolved "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz" integrity sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q== @@ -5699,7 +5939,7 @@ eslint-plugin-n@^15.7.0: resolve "^1.22.1" semver "^7.3.8" -eslint-plugin-promise@^6.1.1: +eslint-plugin-promise@^6.0.0, eslint-plugin-promise@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz" integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== @@ -5709,7 +5949,7 @@ eslint-plugin-promise@^6.1.1: resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react@^7.32.2, eslint-plugin-react@^7.33.2: +eslint-plugin-react@^7.28.0, eslint-plugin-react@^7.32.2, eslint-plugin-react@^7.33.2: version "7.33.2" resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz" integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== @@ -5739,14 +5979,6 @@ eslint-plugin-yaml@^0.5.0: js-yaml "^4.1.0" jshint "^2.13.0" -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz" @@ -5755,6 +5987,14 @@ eslint-scope@^7.2.2: esrecurse "^4.3.0" estraverse "^5.2.0" +eslint-scope@5.1.1: + version "5.1.1" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + eslint-utils@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz" @@ -5774,7 +6014,12 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -5784,7 +6029,7 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4 resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@8.57.0, eslint@^8.23.1, eslint@^8.41.0: +eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.23.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.1, eslint@^8.23.1, eslint@^8.41.0, eslint@^8.56.0, eslint@^8.8.0, eslint@>=4.19.1, eslint@>=5, eslint@>=6.0.0, eslint@>=7.0.0, eslint@>=8, eslint@8.57.0: version "8.57.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz" integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== @@ -5888,7 +6133,12 @@ estree-util-build-jsx@^3.0.0: estree-util-is-identifier-name "^3.0.0" estree-walker "^3.0.0" -estree-util-is-identifier-name@^1.0.0, estree-util-is-identifier-name@^1.1.0: +estree-util-is-identifier-name@^1.0.0: + version "1.1.0" + resolved "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz" + integrity sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ== + +estree-util-is-identifier-name@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz" integrity sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ== @@ -5965,10 +6215,10 @@ events@^3.3.0: resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -execa@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== +execa@^5.1.1: + version "5.1.1" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -5980,7 +6230,7 @@ execa@5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -execa@8.0.1, execa@^8.0.1: +execa@^8.0.1, execa@8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz" integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== @@ -5995,10 +6245,10 @@ execa@8.0.1, execa@^8.0.1: signal-exit "^4.1.0" strip-final-newline "^3.0.0" -execa@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +execa@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -6020,10 +6270,10 @@ exponential-backoff@^3.1.1: resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -express@4.19.2: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== +"express@>=4.0.0 || >=5.0.0-beta", express@4.19.1: + version "4.19.1" + resolved "https://registry.npmjs.org/express/-/express-4.19.1.tgz" + integrity sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w== dependencies: accepts "~1.3.8" array-flatten "1.1.1" @@ -6147,7 +6397,7 @@ feed@4.2.2: dependencies: xml-js "^1.6.11" -figures@3.2.0, figures@^3.0.0: +figures@^3.0.0, figures@3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -6209,14 +6459,6 @@ find-cache-dir@^3.2.0: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-up@5.0.0, find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" @@ -6239,6 +6481,14 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz" @@ -6248,6 +6498,14 @@ find-up@^7.0.0: path-exists "^5.0.0" unicorn-magic "^0.1.0" +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat-cache@^3.0.4: version "3.2.0" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz" @@ -6269,7 +6527,7 @@ flatted@^3.2.9: follow-redirects@^1.15.6: version "1.15.6" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== fontkit@^1.8.1: @@ -6404,11 +6662,6 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -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.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" @@ -6499,11 +6752,6 @@ get-stdin@^8.0.0: resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== -get-stream@6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz" - integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== - get-stream@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" @@ -6514,6 +6762,11 @@ get-stream@^8.0.1: resolved "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz" integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== +get-stream@6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz" + integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" @@ -6585,12 +6838,12 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-slugger@2.0.0, github-slugger@^2.0.0: +github-slugger@^2.0.0, github-slugger@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz" integrity sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw== -glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@^5.1.2, glob-parent@~5.1.2, glob-parent@5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -6604,31 +6857,9 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@10.3.10: - version "10.3.10" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz" - integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.3.5" - minimatch "^9.0.1" - minipass "^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry "^1.10.1" - -glob@8.1.0, glob@^8.0.1: - version "8.1.0" - resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: version "10.3.12" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.12.tgz#3a65c363c2e9998d220338e88a5f6ac97302960b" + resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz" integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== dependencies: foreground-child "^3.1.0" @@ -6637,7 +6868,7 @@ glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: minipass "^7.0.4" path-scurry "^1.10.2" -glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.1: version "7.2.3" resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -6649,6 +6880,41 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^7.1.4: + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^8.0.1: + version "8.1.0" + resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + glob@^9.2.0: version "9.3.5" resolved "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz" @@ -6659,6 +6925,28 @@ glob@^9.2.0: minipass "^4.2.4" path-scurry "^1.6.1" +glob@10.3.10: + version "10.3.10" + resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@8.1.0: + version "8.1.0" + resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-directory@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz" @@ -6685,7 +6973,7 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globby@11.1.0, globby@^11.1.0: +globby@^11.1.0, globby@11.1.0: version "11.1.0" resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -6704,7 +6992,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@4.2.11: version "4.2.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -6789,7 +7077,7 @@ has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: dependencies: has-symbols "^1.0.3" -has-unicode@2.0.1, has-unicode@^2.0.1: +has-unicode@^2.0.1, has-unicode@2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== @@ -7073,7 +7361,7 @@ hexoid@^1.0.0: resolved "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== -highlight.js@11.9.0, highlight.js@~11.9.0: +highlight.js@~11.9.0, highlight.js@11.9.0: version "11.9.0" resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz" integrity sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw== @@ -7110,7 +7398,14 @@ hosted-git-info@^3.0.6: dependencies: lru-cache "^6.0.0" -hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: +hosted-git-info@^4.0.0: + version "4.1.0" + resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== + dependencies: + lru-cache "^6.0.0" + +hosted-git-info@^4.0.1: version "4.1.0" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== @@ -7138,7 +7433,7 @@ htm@^3.0.0: html-dom-parser@5.0.8: version "5.0.8" - resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-5.0.8.tgz#540057d8eb7ff28c9fd45fa9eead374c34dae20c" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-5.0.8.tgz" integrity sha512-vuWiX9EXgu8CJ5m9EP5c7bvBmNSuQVnrY8tl0z0ZX96Uth1IPlYH/8W8VZ/hBajFf18EN+j2pukbCNd01HEd1w== dependencies: domhandler "5.0.3" @@ -7158,7 +7453,7 @@ html-parse-stringify@^3.0.1: html-react-parser@^5.0.7: version "5.1.10" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-5.1.10.tgz#e65bf68df9b505756680d2cae842f7add3da5305" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-5.1.10.tgz" integrity sha512-gV22PvLij4wdEdtrZbGVC7Zy2OVWnQ0bYhX63S196ZRSx4+K0TuutCreHSXr+saUia8KeKB+2TYziVfijpH4Tw== dependencies: domhandler "5.0.3" @@ -7187,6 +7482,16 @@ html-whitespace-sensitive-tag-names@^3.0.0: resolved "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-3.0.0.tgz" integrity sha512-KlClZ3/Qy5UgvpvVvDomGhnQhNWH5INE8GwvSIQ9CWt1K0zbbXrl7eN5bWaafOZgtmO3jMPwUqmrmEwinhPq1w== +htmlparser2@^8.0.1, htmlparser2@^8.0.2: + version "8.0.2" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + htmlparser2@3.8.x: version "3.8.3" resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz" @@ -7208,16 +7513,6 @@ htmlparser2@9.1.0: domutils "^3.1.0" entities "^4.5.0" -htmlparser2@^8.0.1, htmlparser2@^8.0.2: - version "8.0.2" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" - http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz" @@ -7295,7 +7590,7 @@ humanize-ms@^1.2.1: husky@^9.0.10: version "9.0.11" - resolved "https://registry.yarnpkg.com/husky/-/husky-9.0.11.tgz#fc91df4c756050de41b3e478b2158b87c1e79af9" + resolved "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz" integrity sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw== i18next-fs-backend@^2.3.1: @@ -7303,21 +7598,28 @@ i18next-fs-backend@^2.3.1: resolved "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.1.tgz" integrity sha512-tvfXskmG/9o+TJ5Fxu54sSO5OkY6d+uMn+K6JiUGLJrwxAVfer+8V3nU8jq3ts9Pe5lXJv4b1N7foIjJ8Iy2Gg== -i18next@23.11.0: - version "23.11.0" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.0.tgz#3aaa38e887350db573af91eabddd71ab9fcd9ea8" - integrity sha512-VwFtlgy2LDbY0Qs6VfekIm6mv5/JmSJrtBf4aszl7Vby8+GcBlri0/7dkMZXmzTfiBMPUPBOmYCdQK7K4emkGQ== +"i18next@>= 23.2.3", "i18next@>= 23.7.13", i18next@23.11.2: + version "23.11.2" + resolved "https://registry.npmjs.org/i18next/-/i18next-23.11.2.tgz" + integrity sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA== dependencies: "@babel/runtime" "^7.23.2" -iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@^0.4.24, iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@0.6, iconv-lite@^0.6.2: +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +iconv-lite@0.6: version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -7334,13 +7636,6 @@ ignore-by-default@^1.0.1: resolved "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz" integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== -ignore-walk@3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz" - integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== - dependencies: - minimatch "^3.0.4" - ignore-walk@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz" @@ -7355,6 +7650,13 @@ ignore-walk@^6.0.4: dependencies: minimatch "^9.0.0" +ignore-walk@3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== + dependencies: + minimatch "^3.0.4" + ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.3.0: version "5.3.1" resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz" @@ -7399,21 +7701,21 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: +inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@4.1.1: - version "4.1.1" - resolved "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz" - integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g== - ini@^1.3.2, ini@^1.3.8: version "1.3.8" resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +ini@4.1.1: + version "4.1.1" + resolved "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz" + integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g== + init-package-json@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz" @@ -7439,7 +7741,7 @@ inline-style-parser@0.2.2: inline-style-parser@0.2.3: version "0.2.3" - resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.2.3.tgz#e35c5fb45f3a83ed7849fe487336eb7efa25971c" + resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.3.tgz" integrity sha512-qlD8YNDqyTKTyuITrDOffsl6Tdhv+UC4hcdAVuQsK4IMQ99nSgd1MIA/Q+jQYoh9r3hVUXhYh7urSRmXPkW04g== inquirer@^7.3.3: @@ -7510,16 +7812,16 @@ internal-slot@^1.0.4, internal-slot@^1.0.5: hasown "^2.0.0" side-channel "^1.0.4" -"internmap@1 - 2": - version "2.0.3" - resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz" - integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== - internmap@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz" integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== +"internmap@1 - 2": + version "2.0.3" + resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz" + integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== + ip-regex@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz" @@ -7527,7 +7829,7 @@ ip-regex@^2.0.0: ip@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.1.tgz#e8f3595d33a3ea66490204234b77636965307105" + resolved "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz" integrity sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ== ipaddr.js@1.9.1: @@ -7769,12 +8071,22 @@ is-path-inside@^3.0.3: resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: +is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: +is-plain-obj@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== + +is-plain-obj@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" + integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== + +is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== @@ -7844,11 +8156,6 @@ is-ssh@^1.4.0: dependencies: protocols "^2.0.1" -is-stream@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - is-stream@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" @@ -7859,6 +8166,11 @@ is-stream@^3.0.0: resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz" integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== +is-stream@2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" @@ -7946,11 +8258,6 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - isarray@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz" @@ -7961,7 +8268,12 @@ isarray@~1.0.0: resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -iserror@0.0.2, iserror@^0.0.2: +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + +iserror@^0.0.2, iserror@0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/iserror/-/iserror-0.0.2.tgz" integrity sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw== @@ -8076,7 +8388,7 @@ javascript-stringify@^2.0.1: resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz" integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== -"jest-diff@>=29.4.3 < 30", jest-diff@^29.4.1: +jest-diff@^29.4.1, "jest-diff@>=29.4.3 < 30": version "29.7.0" resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz" integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== @@ -8091,25 +8403,20 @@ jest-get-type@^29.6.3: resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== -jiti@^1.19.1, jiti@^1.21.0: +jiti@^1.19.1: version "1.21.0" resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== -jotai-location@0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/jotai-location/-/jotai-location-0.5.5.tgz#2b2622da6ee49493bc4d69e5610e2e5d382894ed" - integrity sha512-6QW/7W9IJHjhbn7gRgAw4sC30k0/G6JiC4uPlKi8ZPZGYk7R7r9PyMD2eVhL4XSxxag89JxS1iSyr6BIXsB4Sw== +jotai-location@0.5.4: + version "0.5.4" + resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" + integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/jotai/-/jotai-2.8.0.tgz#5a6585cd5576c400c2c5f8e157b83ad2ba70b2ab" - integrity sha512-yZNMC36FdLOksOr8qga0yLf14miCJlEThlp5DeFJNnqzm2+ZG7wLcJzoOyij5K6U6Xlc5ljQqPDlJRgqW0Y18g== - -jpeg-exif@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/jpeg-exif/-/jpeg-exif-1.1.4.tgz#781a65b6cd74f62cb1c493511020f8d3577a1c2b" - integrity sha512-a+bKEcCjtuW5WTdgeXFzswSrdqi0jk4XlEtZlx5A94wCoBpFjfFTbo/Tra5SpNCl/YFZPvcV1dJc+TAYeg6ROQ== +jotai@>=1.11.0, jotai@2.7.1: + version "2.7.1" + resolved "https://registry.npmjs.org/jotai/-/jotai-2.7.1.tgz" + integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== js-base64@^2.1.9: version "2.6.4" @@ -8121,7 +8428,7 @@ js-base64@^2.1.9: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@3.14.1, js-yaml@^3.10.0, js-yaml@^3.13.1: +js-yaml@^3.10.0: version "3.14.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -8129,13 +8436,29 @@ js-yaml@3.14.1, js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0: +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +js-yaml@^4.0.0, js-yaml@^4.1.0, js-yaml@4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" +js-yaml@3.14.1: + version "3.14.1" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" @@ -8249,6 +8572,14 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== +JSONStream@^1.3.5: + version "1.3.5" + resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" + jsonwebtoken@^9.0.0: version "9.0.2" resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz" @@ -8299,7 +8630,7 @@ jws@^3.2.2: katex@^0.16.9: version "0.16.10" - resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.10.tgz#6f81b71ac37ff4ec7556861160f53bc5f058b185" + resolved "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz" integrity sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA== dependencies: commander "^8.3.0" @@ -8463,16 +8794,16 @@ libnpmpublish@7.3.0: sigstore "^1.4.0" ssri "^10.0.1" -lilconfig@3.0.0, lilconfig@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz" - integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== - lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== +lilconfig@^3.0.0, lilconfig@3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz" + integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== + linebreak@^1.0.2: version "1.1.0" resolved "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz" @@ -8519,16 +8850,6 @@ listr2@8.0.1: rfdc "^1.3.0" wrap-ansi "^9.0.0" -load-json-file@6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz" - integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== - dependencies: - graceful-fs "^4.1.15" - parse-json "^5.0.0" - strip-bom "^4.0.0" - type-fest "^0.6.0" - load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" @@ -8550,6 +8871,16 @@ load-json-file@^5.2.0: strip-bom "^3.0.0" type-fest "^0.3.0" +load-json-file@6.2.0: + version "6.2.0" + resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz" + integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== + dependencies: + graceful-fs "^4.1.15" + parse-json "^5.0.0" + strip-bom "^4.0.0" + type-fest "^0.6.0" + loader-utils@^2.0.0: version "2.0.4" resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz" @@ -8611,7 +8942,7 @@ lodash.castarray@^4.4.0: resolved "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz" integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q== -lodash.clonedeep@4.5.0, lodash.clonedeep@^4.5.0: +lodash.clonedeep@^4.5.0, lodash.clonedeep@4.5.0: version "4.5.0" resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== @@ -8631,7 +8962,7 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz" integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== -lodash.get@4.4.2, lodash.get@^4.4.2: +lodash.get@^4.4.2, lodash.get@4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== @@ -8751,7 +9082,7 @@ lodash@^4.11.2, lodash@^4.17.19, lodash@^4.17.21, lodash@~4.17.21: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.1.0, log-symbols@^4.0.0, log-symbols@^4.1.0: +log-symbols@^4.0.0, log-symbols@^4.1.0, log-symbols@4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -8830,7 +9161,12 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.5.1, lru-cache@^7.7.1: +lru-cache@^7.5.1: + version "7.18.3" + resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== + +lru-cache@^7.7.1: version "7.18.3" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== @@ -8847,13 +9183,6 @@ magic-string@^0.25.3: dependencies: sourcemap-codec "^1.4.8" -make-dir@4.0.0, make-dir@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" - integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== - dependencies: - semver "^7.5.3" - make-dir@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz" @@ -8869,6 +9198,20 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" +make-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" + integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== + dependencies: + semver "^7.5.3" + +make-dir@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" + integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== + dependencies: + semver "^7.5.3" + make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1: version "11.1.1" resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz" @@ -8951,7 +9294,18 @@ mdast-util-find-and-replace@^3.0.0: unist-util-is "^6.0.0" unist-util-visit-parents "^6.0.0" -mdast-util-from-markdown@^0.8.0, mdast-util-from-markdown@^0.8.5: +mdast-util-from-markdown@^0.8.0: + version "0.8.5" + resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz" + integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== + dependencies: + "@types/mdast" "^3.0.0" + mdast-util-to-string "^2.0.0" + micromark "~2.11.0" + parse-entities "^2.0.0" + unist-util-stringify-position "^2.0.0" + +mdast-util-from-markdown@^0.8.5: version "0.8.5" resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz" integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== @@ -9307,7 +9661,7 @@ merge2@^1.3.0, merge2@^1.4.1: mermaid@10.9.0: version "10.9.0" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.9.0.tgz#4d1272fbe434bd8f3c2c150554dc8a23a9bf9361" + resolved "https://registry.npmjs.org/mermaid/-/mermaid-10.9.0.tgz" integrity sha512-swZju0hFox/B/qoLKK0rOxxgh8Cf7rJSfAUc1u8fezVihYMvrJAS45GzAxTVf4Q+xn9uMgitBcmWk7nWGXOs/g== dependencies: "@braintree/sanitize-url" "^6.0.1" @@ -9970,7 +10324,7 @@ micromark@~2.11.0: debug "^4.0.0" parse-entities "^2.0.0" -micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: +micromatch@^4.0.4, micromatch@^4.0.5, micromatch@4.0.5: version "4.0.5" resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -10015,27 +10369,6 @@ min-indent@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -minimatch@3.0.5: - version "3.0.5" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz" - integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" @@ -10057,6 +10390,20 @@ minimatch@^8.0.2: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.0, minimatch@^9.0.3: + version "9.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimatch@~3.0.2: version "3.0.8" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz" @@ -10064,6 +10411,27 @@ minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" +minimatch@3.0.5: + version "3.0.5" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@9.0.3: + version "9.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz" @@ -10144,16 +10512,16 @@ minipass@^4.2.4: resolved "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz" integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: version "7.0.4" resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz" @@ -10162,24 +10530,24 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mkdirp@0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" - integrity sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew== - mkdirp@^1.0.3: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== +mkdirp@0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" + integrity sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew== + mocha-steps@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@10.4.0, mocha@^10.0.0: +mocha@^10.0.0: version "10.4.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261" + resolved "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz" integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== dependencies: ansi-colors "4.1.1" @@ -10203,6 +10571,32 @@ mocha@10.4.0, mocha@^10.0.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" +mocha@10.3.0: + version "10.3.0" + resolved "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz" + integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "8.1.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + modify-values@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/modify-values/-/modify-values-1.0.1.tgz" @@ -10218,6 +10612,11 @@ mrmime@^2.0.0: resolved "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz" integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== +ms@^2.0.0, ms@^2.1.1, ms@2.1.3: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" @@ -10228,11 +10627,6 @@ ms@2.1.2: resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - multimatch@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz" @@ -10244,21 +10638,21 @@ multimatch@5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mustache@4.2.0, mustache@^4.0.1: +mustache@^4.0.1, mustache@4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz" integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - mute-stream@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz" integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== +mute-stream@0.0.8: + version "0.0.8" + resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" + integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== + mz@^2.7.0: version "2.7.0" resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz" @@ -10278,7 +10672,7 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -negotiator@0.6.3, negotiator@^0.6.3: +negotiator@^0.6.3, negotiator@0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -10295,7 +10689,7 @@ nested-error-stacks@^2.0.0: next-i18next@15.2.0: version "15.2.0" - resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-15.2.0.tgz#96455f282b0dbd0319ce9647b3c319fb50258681" + resolved "https://registry.npmjs.org/next-i18next/-/next-i18next-15.2.0.tgz" integrity sha512-Rl5yZ4oGffsB0AjRykZ5PzNQ2M6am54MaMayldGmH/UKZisrIxk2SKEPJvaHhKlWe1qgdNi2FkodwK8sEjfEmg== dependencies: "@babel/runtime" "^7.23.2" @@ -10304,28 +10698,28 @@ next-i18next@15.2.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -next@14.2.3: - version "14.2.3" - resolved "https://registry.yarnpkg.com/next/-/next-14.2.3.tgz#f117dd5d5f20c307e7b8e4f9c1c97d961008925d" - integrity sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A== +"next@>= 12.0.0", next@14.1.4: + version "14.1.4" + resolved "https://registry.npmjs.org/next/-/next-14.1.4.tgz" + integrity sha512-1WTaXeSrUwlz/XcnhGTY7+8eiaFvdet5z9u3V2jb+Ek1vFo0VhHKSAIJvDWfQpttWjnyw14kBeq28TPq7bTeEQ== dependencies: - "@next/env" "14.2.3" - "@swc/helpers" "0.5.5" + "@next/env" "14.1.4" + "@swc/helpers" "0.5.2" busboy "1.6.0" caniuse-lite "^1.0.30001579" graceful-fs "^4.2.11" postcss "8.4.31" styled-jsx "5.1.1" optionalDependencies: - "@next/swc-darwin-arm64" "14.2.3" - "@next/swc-darwin-x64" "14.2.3" - "@next/swc-linux-arm64-gnu" "14.2.3" - "@next/swc-linux-arm64-musl" "14.2.3" - "@next/swc-linux-x64-gnu" "14.2.3" - "@next/swc-linux-x64-musl" "14.2.3" - "@next/swc-win32-arm64-msvc" "14.2.3" - "@next/swc-win32-ia32-msvc" "14.2.3" - "@next/swc-win32-x64-msvc" "14.2.3" + "@next/swc-darwin-arm64" "14.1.4" + "@next/swc-darwin-x64" "14.1.4" + "@next/swc-linux-arm64-gnu" "14.1.4" + "@next/swc-linux-arm64-musl" "14.1.4" + "@next/swc-linux-x64-gnu" "14.1.4" + "@next/swc-linux-x64-musl" "14.1.4" + "@next/swc-win32-arm64-msvc" "14.1.4" + "@next/swc-win32-ia32-msvc" "14.1.4" + "@next/swc-win32-x64-msvc" "14.1.4" nise@^5.1.5: version "5.1.9" @@ -10338,19 +10732,12 @@ nise@^5.1.5: just-extend "^6.2.0" path-to-regexp "^6.2.1" -nlcst-to-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/nlcst-to-string/-/nlcst-to-string-4.0.0.tgz#05511e8461ebfb415952eb0b7e9a1a7d40471bd4" - integrity sha512-YKLBCcUYKAg0FNlOBT6aI91qFmSiFKiluk655WzPF+DDMA02qIyy8uiRqI8QXtcFpEvll12LpL5MXqEmAZ+dcA== +nlcst-to-string@^3.0.0: + version "3.1.1" + resolved "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.1.tgz" + integrity sha512-63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw== dependencies: - "@types/nlcst" "^2.0.0" - -node-fetch@2.6.7: - version "2.6.7" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" + "@types/nlcst" "^1.0.0" node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: version "2.7.0" @@ -10359,6 +10746,13 @@ node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" +node-fetch@2.6.7: + version "2.6.7" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" + node-gyp@^10.0.0: version "10.0.1" resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz" @@ -10413,13 +10807,6 @@ non-layered-tidy-tree-layout@^2.0.2: resolved "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz" integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw== -nopt@1.0.10, nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" - integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== - dependencies: - abbrev "1" - nopt@^7.0.0: version "7.2.0" resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz" @@ -10427,6 +10814,13 @@ nopt@^7.0.0: dependencies: abbrev "^2.0.0" +nopt@~1.0.10, nopt@1.0.10: + version "1.0.10" + resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" + integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== + dependencies: + abbrev "1" + normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" @@ -10437,7 +10831,17 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0, normalize-package-data@^3.0.3: +normalize-package-data@^3.0.0: + version "3.0.3" + resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz" + integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== + dependencies: + hosted-git-info "^4.0.1" + is-core-module "^2.5.0" + semver "^7.3.4" + validate-npm-package-license "^3.0.1" + +normalize-package-data@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -10508,15 +10912,6 @@ npm-normalize-package-bin@^3.0.0: resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz" integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ== -npm-package-arg@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz" - integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg== - dependencies: - hosted-git-info "^3.0.6" - semver "^7.0.0" - validate-npm-package-name "^3.0.0" - npm-package-arg@^10.0.0, npm-package-arg@^10.1.0: version "10.1.0" resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz" @@ -10537,6 +10932,22 @@ npm-package-arg@^11.0.0: semver "^7.3.5" validate-npm-package-name "^5.0.0" +npm-package-arg@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz" + integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg== + dependencies: + hosted-git-info "^3.0.6" + semver "^7.0.0" + validate-npm-package-name "^3.0.0" + +npm-packlist@^8.0.0: + version "8.0.2" + resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz" + integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA== + dependencies: + ignore-walk "^6.0.4" + npm-packlist@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz" @@ -10547,13 +10958,6 @@ npm-packlist@5.1.1: npm-bundled "^1.1.2" npm-normalize-package-bin "^1.0.1" -npm-packlist@^8.0.0: - version "8.0.2" - resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz" - integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA== - dependencies: - ignore-walk "^6.0.4" - npm-pick-manifest@^9.0.0: version "9.0.0" resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz" @@ -10621,7 +11025,7 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -nx@18.0.2, "nx@>=17.1.2 < 19": +"nx@>= 16 <= 18", "nx@>=17.1.2 < 19", nx@18.0.2: version "18.0.2" resolved "https://registry.npmjs.org/nx/-/nx-18.0.2.tgz" integrity sha512-Ibnz493HnANU15Bg/oVi/X0BO35KkU0zkOmWYeaJEhpFdGNOKzH5pdPYuTuToQiViCNpXLsPo4rPIv2pdMAclA== @@ -10672,7 +11076,7 @@ nx@18.0.2, "nx@>=17.1.2 < 19": "@nx/nx-win32-arm64-msvc" "18.0.2" "@nx/nx-win32-x64-msvc" "18.0.2" -nyc@15.1.0, nyc@^15.1.0: +nyc@^15.1.0, nyc@15.1.0: version "15.1.0" resolved "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz" integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A== @@ -10847,6 +11251,21 @@ optionator@^0.9.3: prelude-ls "^1.2.1" type-check "^0.4.0" +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + ora@5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz" @@ -10876,21 +11295,6 @@ ora@8.0.1: string-width "^7.0.0" strip-ansi "^7.1.0" -ora@^5.4.1: - version "5.4.1" - resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" @@ -10985,13 +11389,6 @@ p-map-series@2.1.0: resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz" integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q== -p-map@4.0.0, p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - p-map@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz" @@ -10999,6 +11396,13 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" +p-map@^4.0.0, p-map@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-pipe@3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz" @@ -11012,7 +11416,7 @@ p-queue@6.6.2: eventemitter3 "^4.0.4" p-timeout "^3.2.0" -p-reduce@2.1.0, p-reduce@^2.0.0, p-reduce@^2.1.0: +p-reduce@^2.0.0, p-reduce@^2.1.0, p-reduce@2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz" integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== @@ -11131,17 +11535,14 @@ parse-json@^5.0.0, parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-latin@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/parse-latin/-/parse-latin-7.0.0.tgz#8dfacac26fa603f76417f36233fc45602a323e1d" - integrity sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ== +parse-latin@^5.0.0: + version "5.0.1" + resolved "https://registry.npmjs.org/parse-latin/-/parse-latin-5.0.1.tgz" + integrity sha512-b/K8ExXaWC9t34kKeDV8kGXBkXZ1HCSAZRYE7HR14eA1GlXX5L8iWhs8USJNhQU9q5ci413jCKF0gOyovvyRBg== dependencies: - "@types/nlcst" "^2.0.0" - "@types/unist" "^3.0.0" - nlcst-to-string "^4.0.0" - unist-util-modify-children "^4.0.0" - unist-util-visit-children "^3.0.0" - vfile "^6.0.0" + nlcst-to-string "^3.0.0" + unist-util-modify-children "^3.0.0" + unist-util-visit-children "^2.0.0" parse-path@^7.0.0: version "7.0.0" @@ -11200,7 +11601,7 @@ passport-jwt@4.0.1: jsonwebtoken "^9.0.0" passport-strategy "^1.0.0" -passport-strategy@1.x.x, passport-strategy@^1.0.0: +passport-strategy@^1.0.0, passport-strategy@1.x.x: version "1.0.0" resolved "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== @@ -11251,22 +11652,22 @@ path-parse@^1.0.7: path-scurry@^1.10.1, path-scurry@^1.10.2, path-scurry@^1.6.1: version "1.10.2" - resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.2.tgz#8f6357eb1239d5fa1da8b9f70e9c080675458ba7" + resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz" integrity sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA== dependencies: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - path-to-regexp@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz" integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw== +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== + path-type@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz" @@ -11289,14 +11690,13 @@ pause@0.0.1: resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz" integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg== -pdfkit@0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/pdfkit/-/pdfkit-0.15.0.tgz#7152f1bfa500c37d25b5f8cd4850db09a8108941" - integrity sha512-Z0dx0sEPKLW2kbThS1SWZ0iSHlRPoFMpP+oSjNrtwRjsfGivwE+r6emyEFwQG/fx1Ri0AGUHmDcGOSMMlLLnSg== +pdfkit@0.14.0: + version "0.14.0" + resolved "https://registry.npmjs.org/pdfkit/-/pdfkit-0.14.0.tgz" + integrity sha512-Hnor8/78jhHm6ONrxWhrqOwAVALlBnFyWOF8sstBZMiqHZgZ5A6RU+Q3yahhw82plxpT7LOfH3b3qcOX6rzMQg== dependencies: crypto-js "^4.2.0" fontkit "^1.8.1" - jpeg-exif "^1.1.4" linebreak "^1.0.2" png-js "^1.0.0" @@ -11347,11 +11747,6 @@ pidtree@0.6.0: resolved "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== -pify@5.0.0, pify@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" - integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== - pify@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" @@ -11367,10 +11762,20 @@ pify@^4.0.1: resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pino-abstract-transport@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.1.0.tgz#083d98f966262164504afb989bccd05f665937a8" - integrity sha512-lsleG3/2a/JIWUtf9Q5gUNErBqwIu1tUKTT3dUzaf5DySw9ra1wcqKjJjLX1VTY64Wk1eEOYsVGSaGfCK85ekA== +pify@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" + integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== + +pify@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" + integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== + +pino-abstract-transport@^1.2.0: + version "1.2.0" + resolved "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz" + integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q== dependencies: readable-stream "^4.0.0" split2 "^4.0.0" @@ -11380,22 +11785,22 @@ pino-std-serializers@^6.0.0: resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz" integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== -pino@8.20.0: - version "8.20.0" - resolved "https://registry.yarnpkg.com/pino/-/pino-8.20.0.tgz#ccfc6fef37b165e006b923834131632a8c4f036b" - integrity sha512-uhIfMj5TVp+WynVASaVEJFTncTUe4dHBq6CWplu/vBgvGHhvBvQfxz+vcOrnnBQdORH3izaGEurLfNlq3YxdFQ== +pino@9.0.0: + version "9.0.0" + resolved "https://registry.npmjs.org/pino/-/pino-9.0.0.tgz" + integrity sha512-uI1ThkzTShNSwvsUM6b4ND8ANzWURk9zTELMztFkmnCQeR/4wkomJ+echHee5GMWGovoSfjwdeu80DsFIt7mbA== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" on-exit-leak-free "^2.1.0" - pino-abstract-transport "^1.1.0" + pino-abstract-transport "^1.2.0" pino-std-serializers "^6.0.0" process-warning "^3.0.0" quick-format-unescaped "^4.0.3" real-require "^0.2.0" safe-stable-stringify "^2.3.1" sonic-boom "^3.7.0" - thread-stream "^2.0.0" + thread-stream "^2.6.0" pirates@^4.0.1: version "4.0.6" @@ -11473,14 +11878,6 @@ postcss-nested@^6.0.1: dependencies: postcss-selector-parser "^6.0.11" -postcss-selector-parser@6.0.10: - version "6.0.10" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6: version "6.0.15" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz" @@ -11489,6 +11886,14 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@6.0.10: + version "6.0.10" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-simple-vars@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-2.0.0.tgz" @@ -11501,25 +11906,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@8.4.31: - version "8.4.31" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" - integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== - dependencies: - nanoid "^3.3.6" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -postcss@8.4.38, postcss@^8.4.23: - version "8.4.38" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e" - integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.2.0" - -postcss@^5.0.0, postcss@^5.0.21: +postcss@^5.0.0: version "5.2.18" resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== @@ -11529,6 +11916,34 @@ postcss@^5.0.0, postcss@^5.0.21: source-map "^0.5.6" supports-color "^3.2.3" +postcss@^5.0.21: + version "5.2.18" + resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" + integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + +postcss@^8.0.0, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.23, postcss@>=8.0.9, postcss@8.4.38: + version "8.4.38" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + +postcss@8.4.31: + version "8.4.31" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== + dependencies: + nanoid "^3.3.6" + picocolors "^1.0.0" + source-map-js "^1.0.2" + preact@^10.10.0: version "10.19.3" resolved "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz" @@ -11571,12 +11986,12 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@5.13.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/prisma/-/prisma-5.13.0.tgz#1f06e20ccfb6038ad68869e6eacd3b346f9d0851" - integrity sha512-kGtcJaElNRAdAGsCNykFSZ7dBKpL14Cbs+VaQ8cECxQlRPDjBlMHNFYeYt0SKovAVy2Y65JXQwB3A5+zIQwnTg== +prisma@*, prisma@5.11.0: + version "5.11.0" + resolved "https://registry.npmjs.org/prisma/-/prisma-5.11.0.tgz" + integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== dependencies: - "@prisma/engines" "5.13.0" + "@prisma/engines" "5.11.0" proc-log@^3.0.0: version "3.0.0" @@ -11705,13 +12120,6 @@ qrcode@1.5.3: pngjs "^5.0.0" yargs "^15.3.1" -qs@6.11.0: - version "6.11.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@^6.11.0, qs@^6.11.2: version "6.11.2" resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz" @@ -11724,6 +12132,13 @@ qs@^6.11.0, qs@^6.11.2: resolved "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz" integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -11769,13 +12184,13 @@ react-copy-to-clipboard@5.1.0: copy-to-clipboard "^3.3.1" prop-types "^15.8.1" -react-dom@18.2.0: - version "18.2.0" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" - integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== +react-dom@*, react-dom@^18.2.0, "react-dom@>= 16.3.0 < 19", "react-dom@>= 16.8.0 < 19", react-dom@>=16.8.1, react-dom@>=18, react-dom@18.3.1: + version "18.3.1" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== dependencies: loose-envify "^1.1.0" - scheduler "^0.23.0" + scheduler "^0.23.2" react-dropzone@14.2.3: version "14.2.3" @@ -11796,10 +12211,10 @@ react-hotkeys-hook@4.5.0: resolved "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.0.tgz" integrity sha512-Samb85GSgAWFQNvVt3PS90LPPGSf9mkH/r4au81ZP1yOIFayLC3QAvqTgGtJ8YEDMXtPmaVBs6NgipHO6h4Mug== -react-i18next@14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-14.1.1.tgz#3d942a99866555ae3552c40f9fddfa061e29d7f3" - integrity sha512-QSiKw+ihzJ/CIeIYWrarCmXJUySHDwQr5y8uaNIkbxoGRm/5DukkxZs+RPla79IKyyDPzC/DRlgQCABHtrQuQQ== +"react-i18next@>= 13.5.0", react-i18next@14.1.0: + version "14.1.0" + resolved "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz" + integrity sha512-3KwX6LHpbvGQ+sBEntjV4sYW3Zovjjl3fpoHbUwSgFHf0uRBcbeCBLR5al6ikncI5+W0EFb71QXZmfop+J6NrQ== dependencies: "@babel/runtime" "^7.23.9" html-parse-stringify "^3.0.1" @@ -11870,15 +12285,15 @@ react-timeago@7.2.0: resolved "https://registry.npmjs.org/react-timeago/-/react-timeago-7.2.0.tgz" integrity sha512-2KsBEEs+qRhKx/kekUVNSTIpop3Jwd7SRBm0R4Eiq3mPeswRGSsftY9FpKsE/lXLdURyQFiHeHFrIUxLYskG5g== -react-zoom-pan-pinch@3.4.4: - version "3.4.4" - resolved "https://registry.yarnpkg.com/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.4.tgz#5450b027dbf9f161773cde71b061423ff1109328" - integrity sha512-lGTu7D9lQpYEQ6sH+NSlLA7gicgKRW8j+D/4HO1AbSV2POvKRFzdWQ8eI0r3xmOsl4dYQcY+teV6MhULeg1xBw== +react-zoom-pan-pinch@3.4.3: + version "3.4.3" + resolved "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.3.tgz" + integrity sha512-x5MFlfAx2D6NTpZu8OISqc2nYn4p+YEaM1p21w7S/VE1wbVzK8vRzTo9Bj1ydufa649MuP7JBRM3vvj1RftFZw== -react@18.2.0, react@^18.2.0: - version "18.2.0" - resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" - integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== +react@*, "react@^15.0.0 || >=16.0.0", "react@^15.3.0 || 16 || 17 || 18", "react@^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^16.8.3 || ^17 || ^18", react@^18.2.0, react@^18.3.1, "react@>= 16.3.0 < 19", "react@>= 16.8 || 18.0.0", "react@>= 16.8.0", "react@>= 16.8.0 < 19", "react@>= 16.8.0 || 17.x.x || ^18.0.0-0", "react@>= 17.0.2", react@>=14, react@>=16, react@>=16.8.1, react@>=17.0.0, react@>=18, "react@0.14 || 15 || 16 || 17 || 18", react@18.3.1: + version "18.3.1" + resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== dependencies: loose-envify "^1.1.0" @@ -11902,7 +12317,7 @@ read-package-json-fast@^3.0.0: json-parse-even-better-errors "^3.0.0" npm-normalize-package-bin "^3.0.0" -read-package-json@6.0.4, read-package-json@^6.0.0: +read-package-json@^6.0.0, read-package-json@6.0.4: version "6.0.4" resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz" integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw== @@ -11965,16 +12380,6 @@ read@^2.0.0: dependencies: mute-stream "~1.0.0" -readable-stream@1.1: - version "1.1.13" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" - integrity sha512-E98tWzqShvKDGpR2MbjsDkDQWLW2TfWUC15H4tNQhIJ5Lsta84l8nUGL9/ybltGwe+wZzWPpc1Kmd2wQP4bdCA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" @@ -12008,6 +12413,16 @@ readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" +readable-stream@1.1: + version "1.1.13" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" + integrity sha512-E98tWzqShvKDGpR2MbjsDkDQWLW2TfWUC15H4tNQhIJ5Lsta84l8nUGL9/ybltGwe+wZzWPpc1Kmd2wQP4bdCA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readdirp@~3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" @@ -12020,7 +12435,7 @@ real-require@^0.2.0: resolved "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz" integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== -recursive-readdir@2.2.3, recursive-readdir@^2.2.3: +recursive-readdir@^2.2.3, recursive-readdir@2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz" integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA== @@ -12128,6 +12543,12 @@ rehype-format@^5.0.0: rehype-minify-whitespace "^6.0.0" unist-util-visit-parents "^6.0.0" +"rehype-highlight-lines@file:/home/joost/git/freesewing/packages/rehype-highlight-lines": + version "3.2.0" + resolved "file:packages/rehype-highlight-lines" + dependencies: + unist-util-remove "4.0.0" + rehype-highlight@7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/rehype-highlight/-/rehype-highlight-7.0.0.tgz" @@ -12139,6 +12560,13 @@ rehype-highlight@7.0.0: unist-util-visit "^5.0.0" vfile "^6.0.0" +"rehype-jargon@file:/home/joost/git/freesewing/packages/rehype-jargon": + version "3.2.0" + resolved "file:packages/rehype-jargon" + dependencies: + hast-util-from-html "2.0.1" + unist-util-visit "5.0.0" + rehype-minify-whitespace@^4.0.0: version "4.0.5" resolved "https://registry.npmjs.org/rehype-minify-whitespace/-/rehype-minify-whitespace-4.0.5.tgz" @@ -12248,6 +12676,14 @@ remark-mdx-frontmatter@4.0.0: unified "^11.0.0" yaml "^2.0.0" +remark-mdx@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.0.tgz" + integrity sha512-O7yfjuC6ra3NHPbRVxfflafAj3LTwx3b73aBvkEFU5z4PsD6FD4vrqJAkE5iNGLz71GdjXfgRqm3SQ0h0VuE7g== + dependencies: + mdast-util-mdx "^3.0.0" + micromark-extension-mdxjs "^3.0.0" + remark-mdx@2.0.0-next.9: version "2.0.0-next.9" resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.9.tgz" @@ -12257,14 +12693,6 @@ remark-mdx@2.0.0-next.9: micromark-extension-mdx "^0.2.0" micromark-extension-mdxjs "^0.3.0" -remark-mdx@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.0.tgz" - integrity sha512-O7yfjuC6ra3NHPbRVxfflafAj3LTwx3b73aBvkEFU5z4PsD6FD4vrqJAkE5iNGLz71GdjXfgRqm3SQ0h0VuE7g== - dependencies: - mdast-util-mdx "^3.0.0" - micromark-extension-mdxjs "^3.0.0" - remark-parse@^11.0.0: version "11.0.0" resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz" @@ -12293,14 +12721,13 @@ remark-rehype@^11.0.0: unified "^11.0.0" vfile "^6.0.0" -remark-smartypants@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-smartypants/-/remark-smartypants-3.0.1.tgz#44171381842f0b7ecba296340925b588aa9991a3" - integrity sha512-qyshfCl2eLO0i0558e79ZJsfojC5wjnYLByjt0FmjJQN6aYwcRxpoj784LZJSoWCdnA2ubh5rLNGb8Uur/wDng== +remark-smartypants@2.1.0: + version "2.1.0" + resolved "https://registry.npmjs.org/remark-smartypants/-/remark-smartypants-2.1.0.tgz" + integrity sha512-qoF6Vz3BjU2tP6OfZqHOvCU0ACmu/6jhGaINSQRI9mM7wCxNQTKB3JUAN4SVoN2ybElEDTxBIABRep7e569iJw== dependencies: - retext "^9.0.0" - retext-smartypants "^6.0.0" - unified "^11.0.4" + retext "^8.1.0" + retext-smartypants "^5.2.0" unist-util-visit "^5.0.0" remark-squeeze-paragraphs@^4.0.0: @@ -12361,16 +12788,16 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-from@5.0.0, resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== +resolve-from@^5.0.0, resolve-from@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-pkg-maps@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz" @@ -12415,42 +12842,44 @@ restructure@^2.0.1: resolved "https://registry.npmjs.org/restructure/-/restructure-2.0.1.tgz" integrity sha512-e0dOpjm5DseomnXx2M5lpdZ5zoHqF1+bqdMJUohoYVVQa7cBdnk7fdmeI6byNWP/kiME72EeTiSypTCVnpLiDg== -retext-latin@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/retext-latin/-/retext-latin-4.0.0.tgz#d02498aa1fd39f1bf00e2ff59b1384c05d0c7ce3" - integrity sha512-hv9woG7Fy0M9IlRQloq/N6atV82NxLGveq+3H2WOi79dtIYWN8OaxogDm77f8YnVXJL2VD3bbqowu5E3EMhBYA== +retext-latin@^3.0.0: + version "3.1.0" + resolved "https://registry.npmjs.org/retext-latin/-/retext-latin-3.1.0.tgz" + integrity sha512-5MrD1tuebzO8ppsja5eEu+ZbBeUNCjoEarn70tkXOS7Bdsdf6tNahsv2bY0Z8VooFF6cw7/6S+d3yI/TMlMVVQ== dependencies: - "@types/nlcst" "^2.0.0" - parse-latin "^7.0.0" - unified "^11.0.0" + "@types/nlcst" "^1.0.0" + parse-latin "^5.0.0" + unherit "^3.0.0" + unified "^10.0.0" -retext-smartypants@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/retext-smartypants/-/retext-smartypants-6.1.0.tgz#59a005113c3e63a0045ebc8b3edbb31d0a1d2a55" - integrity sha512-LDPXg95346bqFZnDMHo0S7Rq5p64+B+N8Vz733+wPMDtwb9rCOs9LIdIEhrUOU+TAywX9St+ocQWJt8wrzivcQ== +retext-smartypants@^5.2.0: + version "5.2.0" + resolved "https://registry.npmjs.org/retext-smartypants/-/retext-smartypants-5.2.0.tgz" + integrity sha512-Do8oM+SsjrbzT2UNIKgheP0hgUQTDDQYyZaIY3kfq0pdFzoPk+ZClYJ+OERNXveog4xf1pZL4PfRxNoVL7a/jw== dependencies: - "@types/nlcst" "^2.0.0" - nlcst-to-string "^4.0.0" - unist-util-visit "^5.0.0" + "@types/nlcst" "^1.0.0" + nlcst-to-string "^3.0.0" + unified "^10.0.0" + unist-util-visit "^4.0.0" -retext-stringify@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/retext-stringify/-/retext-stringify-4.0.0.tgz#501d5440bd4d121e351c7c509f8507de9611e159" - integrity sha512-rtfN/0o8kL1e+78+uxPTqu1Klt0yPzKuQ2BfWwwfgIUSayyzxpM1PJzkKt4V8803uB9qSy32MvI7Xep9khTpiA== +retext-stringify@^3.0.0: + version "3.1.0" + resolved "https://registry.npmjs.org/retext-stringify/-/retext-stringify-3.1.0.tgz" + integrity sha512-767TLOaoXFXyOnjx/EggXlb37ZD2u4P1n0GJqVdpipqACsQP+20W+BNpMYrlJkq7hxffnFk+jc6mAK9qrbuB8w== dependencies: - "@types/nlcst" "^2.0.0" - nlcst-to-string "^4.0.0" - unified "^11.0.0" + "@types/nlcst" "^1.0.0" + nlcst-to-string "^3.0.0" + unified "^10.0.0" -retext@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/retext/-/retext-9.0.0.tgz#ab5cd72836894167b0ca6ae70fdcfaa166267f7a" - integrity sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA== +retext@^8.1.0: + version "8.1.0" + resolved "https://registry.npmjs.org/retext/-/retext-8.1.0.tgz" + integrity sha512-N9/Kq7YTn6ZpzfiGW45WfEGJqFf1IM1q8OsRa1CGzIebCJBNCANDRmOrholiDRGKo/We7ofKR4SEvcGAWEMD3Q== dependencies: - "@types/nlcst" "^2.0.0" - retext-latin "^4.0.0" - retext-stringify "^4.0.0" - unified "^11.0.0" + "@types/nlcst" "^1.0.0" + retext-latin "^3.0.0" + retext-stringify "^3.0.0" + unified "^10.0.0" retry@^0.12.0: version "0.12.0" @@ -12472,7 +12901,14 @@ rfdc@^1.3.0: resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz" integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -12546,7 +12982,7 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0, safe-buffer@5.2.1: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -12580,10 +13016,10 @@ sax@^1.2.4: resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz" integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA== -scheduler@^0.23.0: - version "0.23.0" - resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz" - integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== dependencies: loose-envify "^1.1.0" @@ -12599,12 +13035,22 @@ selderee@^0.11.0: dependencies: parseley "^0.12.0" -"semver@2 || 3 || 4 || 5", semver@^5.6.0: +semver@^5.6.0: version "5.7.2" resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: +semver@^6.0.0: + version "6.3.1" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^6.3.0: + version "6.3.1" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== + +semver@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -12616,6 +13062,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve dependencies: lru-cache "^6.0.0" +"semver@2 || 3 || 4 || 5": + version "5.7.2" + resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + send@0.18.0: version "0.18.0" resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" @@ -12710,12 +13161,17 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@3.0.7, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7, signal-exit@3.0.7: version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -signal-exit@^4.0.1, signal-exit@^4.1.0: +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + +signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== @@ -12781,7 +13237,7 @@ size-sensor@^1.0.1: resolved "https://registry.npmjs.org/size-sensor/-/size-sensor-1.0.2.tgz" integrity sha512-2NCmWxY7A9pYKGXNBfteo4hy14gWu47rg5692peVMst6lQLPKrVjhY+UTEsPI5ceFRJSl3gVgMYaUi/hKuaiKw== -slash@3.0.0, slash@^3.0.0: +slash@^3.0.0, slash@3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== @@ -12854,7 +13310,7 @@ sort-keys@^2.0.0: source-map-js@^1.0.2, source-map-js@^1.2.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz" integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== source-map@^0.5.6: @@ -12925,6 +13381,13 @@ spdx-license-ids@^3.0.0: resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz" integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== +split@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + split2@^3.2.2: version "3.2.2" resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz" @@ -12937,13 +13400,6 @@ split2@^4.0.0: resolved "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz" integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== -split@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" @@ -13029,12 +13485,40 @@ streamsearch@^1.1.0: resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== +string_decoder@^1.1.1, string_decoder@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + string-argv@0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -13103,25 +13587,6 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -string_decoder@^1.1.1, string_decoder@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - stringify-entities@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz" @@ -13139,7 +13604,7 @@ stringify-entities@^4.0.0: character-entities-html4 "^2.0.0" character-entities-legacy "^3.0.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": version "6.0.1" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -13153,7 +13618,21 @@ strip-ansi@^3.0.0: dependencies: ansi-regex "^2.0.0" -strip-ansi@^7.0.1, strip-ansi@^7.1.0: +strip-ansi@^6.0.0, strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + +strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== @@ -13187,16 +13666,16 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" +strip-json-comments@^3.1.1, strip-json-comments@3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + strip-json-comments@1.0.x: version "1.0.4" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" integrity sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg== -strip-json-comments@3.1.1, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - strip-markdown@6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/strip-markdown/-/strip-markdown-6.0.0.tgz" @@ -13209,7 +13688,7 @@ strnum@^1.0.5: resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz" integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== -strong-log-transformer@2.1.0, strong-log-transformer@^2.1.0: +strong-log-transformer@^2.1.0, strong-log-transformer@2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz" integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA== @@ -13225,18 +13704,11 @@ stubs@^3.0.0: style-to-js@1.1.12: version "1.1.12" - resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.12.tgz#112dd054231e71643514013a4475d4649bb2b581" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.12.tgz" integrity sha512-tv+/FkgNYHI2fvCoBMsqPHh5xovwiw+C3X0Gfnss/Syau0Nr3IqGOJ9XiOYXoPnToHVbllKFf5qCNFJGwFg5mg== dependencies: style-to-object "1.0.6" -style-to-object@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-1.0.6.tgz#0c28aed8be1813d166c60d962719b2907c26547b" - integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== - dependencies: - inline-style-parser "0.2.3" - style-to-object@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz" @@ -13258,6 +13730,13 @@ style-to-object@^1.0.0: dependencies: inline-style-parser "0.2.2" +style-to-object@1.0.6: + version "1.0.6" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.6.tgz" + integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== + dependencies: + inline-style-parser "0.2.3" + styled-jsx@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz" @@ -13299,13 +13778,6 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" @@ -13318,7 +13790,14 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^5.3.0, supports-color@^5.5.0: +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13332,6 +13811,13 @@ supports-color@^7.1.0, supports-color@^7.2.0: dependencies: has-flag "^4.0.0" +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" @@ -13341,10 +13827,10 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@5.17.1, swagger-ui-dist@>=5.0.0: - version "5.17.1" - resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-5.17.1.tgz#7422a29a7b58222c0f757b1f6abde0dac8b11aa7" - integrity sha512-6MNu1MYNALLFvcPpo2MJVJFIxz2rFkH+XoX+J72LBLdj4JLjVaP4lHmNHtJ/tXZUXHdsb2Iw9JhPlqspjkomQg== +swagger-ui-dist@>=5.0.0, swagger-ui-dist@5.17.2: + version "5.17.2" + resolved "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.17.2.tgz" + integrity sha512-V/NqUw6QoTrjSpctp2oLQvxrl3vW29UsUtZyq7B1CF0v870KOFbYGDQw8rpKaKm0JxTwHpWnW1SN9YuKZdiCyw== swagger-ui-express@5.0.0: version "5.0.0" @@ -13360,10 +13846,10 @@ synckit@^0.6.0: dependencies: tslib "^2.3.1" -tailwindcss@3.4.3: - version "3.4.3" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" - integrity sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A== +"tailwindcss@>=3.0.0 || insiders", tailwindcss@3.4.1: + version "3.4.1" + resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz" + integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" @@ -13373,7 +13859,7 @@ tailwindcss@3.4.3: fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.21.0" + jiti "^1.19.1" lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" @@ -13404,18 +13890,6 @@ tar-stream@~2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@6.1.11: - version "6.1.11" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - tar@^6.1.11, tar@^6.1.2: version "6.2.0" resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz" @@ -13428,6 +13902,18 @@ tar@^6.1.11, tar@^6.1.2: mkdirp "^1.0.3" yallist "^4.0.0" +tar@6.1.11: + version "6.1.11" + resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + teeny-request@7.1.1: version "7.1.1" resolved "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz" @@ -13487,13 +13973,18 @@ thirty-two@^1.0.2: resolved "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz" integrity sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA== -thread-stream@^2.0.0: - version "2.4.1" - resolved "https://registry.npmjs.org/thread-stream/-/thread-stream-2.4.1.tgz" - integrity sha512-d/Ex2iWd1whipbT681JmTINKw0ZwOUBZm7+Gjs64DHuX34mmw8vJL2bFAaNacaW72zYiTJxSHi5abUuOi5nsfg== +thread-stream@^2.6.0: + version "2.7.0" + resolved "https://registry.npmjs.org/thread-stream/-/thread-stream-2.7.0.tgz" + integrity sha512-qQiRWsU/wvNolI6tbbCKd9iKaTnCXsTwVxhhKM6nctPdujTyztjlbUkUTUymidWcMnZ5pWR0ej4a0tjsW021vw== dependencies: real-require "^0.2.0" +through@^2.3.4, through@^2.3.6, "through@>=2.2.7 <3", through@2: + version "2.3.8" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + through2@^2.0.0: version "2.0.5" resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" @@ -13502,20 +13993,15 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - tiny-inflate@^1.0.0, tiny-inflate@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw== -tlds@1.252.0: - version "1.252.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.252.0.tgz#71d9617f4ef4cc7347843bee72428e71b8b0f419" - integrity sha512-GA16+8HXvqtfEnw/DTcwB0UU354QE1n3+wh08oFjr6Znl7ZLAeUgYzCcK+/CCrOyE0vnHR8/pu3XXG3vDijXpQ== +tlds@1.251.0: + version "1.251.0" + resolved "https://registry.npmjs.org/tlds/-/tlds-1.251.0.tgz" + integrity sha512-yztVk5O1LGKCjPd+7soBQyiKvSBXI5qugc/X0C7pLa0rV5ufBS6xcyX0pdf4NznO8xcZ5fqX248q+jTHd4AQJA== tmp@^0.0.33: version "0.0.33" @@ -13636,12 +14122,12 @@ tsconfig-paths@^4.1.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== +tslib@^1.11.1: + version "1.14.1" + resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^1.11.1, tslib@^1.9.0: +tslib@^1.9.0: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -13651,6 +14137,11 @@ tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6 resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tuf-js@^1.1.7: version "1.1.7" resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz" @@ -13681,7 +14172,7 @@ type-component@0.0.1: resolved "https://registry.npmjs.org/type-component/-/type-component-0.0.1.tgz" integrity sha512-mDZRBQS2yZkwRQKfjJvQ8UIYJeBNNWCq+HBNstl9N5s9jZ4dkVYXEGkVPsSCEh5Ld4JM1kmrZTzjnrqSAIQ7dw== -type-detect@4.0.8, type-detect@^4.0.8: +type-detect@^4.0.8, type-detect@4.0.8: version "4.0.8" resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== @@ -13716,7 +14207,12 @@ type-fest@^0.6.0: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-fest@^0.8.0, type-fest@^0.8.1: +type-fest@^0.8.0: + version "0.8.1" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +type-fest@^0.8.1: version "0.8.1" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== @@ -13785,7 +14281,7 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -"typescript@>=3 < 6": +"typescript@>=3 < 6", typescript@>=3.3.1, typescript@>=4, typescript@>=4.2.0, typescript@>=4.9.5: version "5.3.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== @@ -13815,6 +14311,11 @@ undici-types@~5.26.4: resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz" integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== +unherit@^3.0.0: + version "3.0.1" + resolved "https://registry.npmjs.org/unherit/-/unherit-3.0.1.tgz" + integrity sha512-akOOQ/Yln8a2sgcLj4U0Jmx0R5jpIg2IUyRrWOzmEbjBtGzBdHtSeFKgoEcoH4KYIG/Pb8GQ/BwtYm0GCq1Sqg== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz" @@ -13859,7 +14360,20 @@ unicorn-magic@^0.1.0: resolved "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz" integrity sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ== -unified@^11.0.0, unified@^11.0.4: +unified@^10.0.0: + version "10.1.2" + resolved "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz" + integrity sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q== + dependencies: + "@types/unist" "^2.0.0" + bail "^2.0.0" + extend "^3.0.0" + is-buffer "^2.0.0" + is-plain-obj "^4.0.0" + trough "^2.0.0" + vfile "^5.0.0" + +unified@^11.0.0: version "11.0.4" resolved "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz" integrity sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ== @@ -13921,6 +14435,13 @@ unist-util-is@^4.0.0: resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz" integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== +unist-util-is@^5.0.0: + version "5.2.1" + resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.1.tgz" + integrity sha512-u9njyyfEh43npf1M+yGKDGVPbY/JWEemg5nH05ncKPfi+kBbKBJoTdsogMu33uhytuLlv9y0O7GH7fEdwLdLQw== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is@^6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz" @@ -13928,12 +14449,12 @@ unist-util-is@^6.0.0: dependencies: "@types/unist" "^3.0.0" -unist-util-modify-children@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unist-util-modify-children/-/unist-util-modify-children-4.0.0.tgz#981d6308e887b005d1f491811d3cbcc254b315e9" - integrity sha512-+tdN5fGNddvsQdIzUF3Xx82CU9sMM+fA0dLgR9vOmT0oPT2jH+P1nd5lSqfCfXAw+93NhcXNY2qqvTUtE4cQkw== +unist-util-modify-children@^3.0.0: + version "3.1.1" + resolved "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.1.tgz" + integrity sha512-yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA== dependencies: - "@types/unist" "^3.0.0" + "@types/unist" "^2.0.0" array-iterate "^2.0.0" unist-util-position-from-estree@^2.0.0: @@ -13970,6 +14491,13 @@ unist-util-remove-position@^5.0.0: "@types/unist" "^3.0.0" unist-util-visit "^5.0.0" +unist-util-remove@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" + integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== + dependencies: + unist-util-is "^4.0.0" + unist-util-remove@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-4.0.0.tgz" @@ -13979,13 +14507,6 @@ unist-util-remove@4.0.0: unist-util-is "^6.0.0" unist-util-visit-parents "^6.0.0" -unist-util-remove@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" - integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== - dependencies: - unist-util-is "^4.0.0" - unist-util-stringify-position@^2.0.0: version "2.0.3" resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz" @@ -14007,12 +14528,12 @@ unist-util-stringify-position@^4.0.0: dependencies: "@types/unist" "^3.0.0" -unist-util-visit-children@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unist-util-visit-children/-/unist-util-visit-children-3.0.0.tgz#4bced199b71d7f3c397543ea6cc39e7a7f37dc7e" - integrity sha512-RgmdTfSBOg04sdPcpTSD1jzoNBjt9a80/ZCzp5cI9n1qPzLZWF9YdvWGN2zmTumP1HWhXKdUWexjy/Wy/lJ7tA== +unist-util-visit-children@^2.0.0: + version "2.0.2" + resolved "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.2.tgz" + integrity sha512-+LWpMFqyUwLGpsQxpumsQ9o9DG2VGLFrpz+rpVXYIEdPy57GSy5HioC0g3bg/8WP9oCLlapQtklOzQ8uLS496Q== dependencies: - "@types/unist" "^3.0.0" + "@types/unist" "^2.0.0" unist-util-visit-parents@^3.0.0: version "3.1.1" @@ -14022,6 +14543,14 @@ unist-util-visit-parents@^3.0.0: "@types/unist" "^2.0.0" unist-util-is "^4.0.0" +unist-util-visit-parents@^5.1.1: + version "5.1.3" + resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz" + integrity sha512-x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz" @@ -14030,15 +14559,6 @@ unist-util-visit-parents@^6.0.0: "@types/unist" "^3.0.0" unist-util-is "^6.0.0" -unist-util-visit@5.0.0, unist-util-visit@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz" - integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg== - dependencies: - "@types/unist" "^3.0.0" - unist-util-is "^6.0.0" - unist-util-visit-parents "^6.0.0" - unist-util-visit@^2.0.0: version "2.0.3" resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz" @@ -14048,6 +14568,24 @@ unist-util-visit@^2.0.0: unist-util-is "^4.0.0" unist-util-visit-parents "^3.0.0" +unist-util-visit@^4.0.0: + version "4.1.2" + resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz" + integrity sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^5.1.1" + +unist-util-visit@^5.0.0, unist-util-visit@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz" + integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg== + dependencies: + "@types/unist" "^3.0.0" + unist-util-is "^6.0.0" + unist-util-visit-parents "^6.0.0" + universal-user-agent@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz" @@ -14058,7 +14596,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz" integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0, unpipe@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -14090,10 +14628,10 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -use-local-storage-state@19.2.0: - version "19.2.0" - resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.2.0.tgz#eac2f18c8f4762931d3b6661097be0b2c00f65de" - integrity sha512-z5+n406vi3FzPJW6+lzuL/LJr4VLhXsUq1TWWeHQABL37bnJ159dSUmO7XuwqvACX93ZA9P2vkB8GMDgq1rr7A== +use-local-storage-state@19.1.0: + version "19.1.0" + resolved "https://registry.npmjs.org/use-local-storage-state/-/use-local-storage-state-19.1.0.tgz" + integrity sha512-3Ea6uRtRaSwpZYD9maZPKoEEGRuHmVA7zGrV/Uh9s5NTj9K1x/MB4IOQoywjUesQyhXmJq6bqjC5cAqlsXoOTw== use-sync-external-store@^1.0.0: version "1.2.0" @@ -14105,12 +14643,17 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -utils-merge@1.0.1, utils-merge@^1.0.1: +utils-merge@^1.0.1, utils-merge@1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -uuid@^8.0.0, uuid@^8.3.2: +uuid@^8.0.0: + version "8.3.2" + resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +uuid@^8.3.2: version "8.3.2" resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -14139,7 +14682,7 @@ v8-to-istanbul@^9.0.0: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^2.0.0" -validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4, validate-npm-package-license@3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -14147,13 +14690,6 @@ validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validat spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-name@5.0.0, validate-npm-package-name@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz" - integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== - dependencies: - builtins "^5.0.0" - validate-npm-package-name@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz" @@ -14161,6 +14697,13 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" +validate-npm-package-name@^5.0.0, validate-npm-package-name@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz" + integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== + dependencies: + builtins "^5.0.0" + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" @@ -14187,6 +14730,14 @@ vfile-message@^2.0.0: "@types/unist" "^2.0.0" unist-util-stringify-position "^2.0.0" +vfile-message@^3.0.0: + version "3.1.4" + resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-3.1.4.tgz" + integrity sha512-fa0Z6P8HUrQN4BZaX05SIVXic+7kE3b05PWAtPuYP9QLHsLKYR7/AlLW3NtOrpXRLeawpDLMsVkmk5DG0NXgWw== + dependencies: + "@types/unist" "^2.0.0" + unist-util-stringify-position "^3.0.0" + vfile-message@^4.0.0: version "4.0.2" resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.2.tgz" @@ -14205,6 +14756,16 @@ vfile@^4.0.0: unist-util-stringify-position "^2.0.0" vfile-message "^2.0.0" +vfile@^5.0.0: + version "5.3.7" + resolved "https://registry.npmjs.org/vfile/-/vfile-5.3.7.tgz" + integrity sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g== + dependencies: + "@types/unist" "^2.0.0" + is-buffer "^2.0.0" + unist-util-stringify-position "^3.0.0" + vfile-message "^3.0.0" + vfile@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz" @@ -14231,7 +14792,7 @@ web-namespaces@^2.0.0: resolved "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz" integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ== -web-worker@1.3.0, web-worker@^1.2.0: +web-worker@^1.2.0, web-worker@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz" integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA== @@ -14354,7 +14915,7 @@ workerpool@6.2.1: resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -14372,6 +14933,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz" @@ -14395,14 +14965,6 @@ wrappy@1: resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz" - integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^4.0.1" - write-file-atomic@^2.4.2: version "2.4.3" resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz" @@ -14422,6 +14984,14 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" +write-file-atomic@5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^4.0.1" + write-json-file@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz" @@ -14494,21 +15064,11 @@ yaml-loader@0.8.1: loader-utils "^2.0.0" yaml "^2.0.0" -yaml@2.3.4, yaml@^2.0.0, yaml@^2.3.4: +yaml@^2.0.0, yaml@^2.3.4, yaml@2.3.4: version "2.3.4" resolved "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz" integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@21.1.1, yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz" @@ -14517,11 +15077,26 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2, yargs-parser@^20.2.3: +yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@^20.2.3: + version "20.2.9" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== + +yargs-parser@^21.1.1, yargs-parser@21.1.1: + version "21.1.1" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz" @@ -14532,33 +15107,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.2.0: - version "16.2.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@17.7.2, yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2: - version "17.7.2" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz" - integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - -yargs@^15.0.1, yargs@^15.0.2, yargs@^15.3.1: +yargs@^15.0.1: version "15.4.1" resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== @@ -14575,9 +15124,82 @@ yargs@^15.0.1, yargs@^15.0.2, yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" +yargs@^15.0.2: + version "15.4.1" + resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^15.3.1: + version "15.4.1" + resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^16.2.0: + version "16.2.0" + resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2, yargs@17.7.2: + version "17.7.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + +yargs@16.2.0: + version "16.2.0" + resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + yarn@^1.22.19: version "1.22.22" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.22.tgz#ac34549e6aa8e7ead463a7407e1c7390f61a6610" + resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz" integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg== yocto-queue@^0.1.0: From 4a451b2ebce9e1c53d97a077955e6138ad277d38 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 16:58:27 +0200 Subject: [PATCH 784/795] chore: Remove debug output from shared designs tests --- tests/designs/config.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/designs/config.mjs b/tests/designs/config.mjs index 133c9ca34ec..76d9fd960eb 100644 --- a/tests/designs/config.mjs +++ b/tests/designs/config.mjs @@ -97,7 +97,6 @@ export const testPatternConfig = (Pattern) => { const draft = new Pattern({ measurements: requested, }).draft() - console.log(draft.setStores[0].logs) const missWarnings = draft.setStores[0].logs.warn.filter((w, i, a) => { return w.match(/tried to access `measurements/) && a.indexOf(w) === i }) From 05afe455b77d609f8edff7da869e8f8ce03dec43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 14:59:54 +0000 Subject: [PATCH 785/795] chore(deps): Bump express from 4.19.1 to 4.19.2 Bumps [express](https://github.com/expressjs/express) from 4.19.1 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.1...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 2543 +++++++++++++----------------------- 2 files changed, 939 insertions(+), 1606 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index a38cf20704d..9632132cef2 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -33,7 +33,7 @@ "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", - "express": "4.19.1", + "express": "4.19.2", "js-yaml": "4.1.0", "lodash.get": "4.4.2", "mustache": "4.2.0", diff --git a/yarn.lock b/yarn.lock index f277511043f..95dc35a1255 100644 --- a/yarn.lock +++ b/yarn.lock @@ -124,7 +124,7 @@ "@algolia/ui-components-shared" "1.2.2" "@babel/runtime" "^7.0.0" -"@algolia/ui-components-shared@^1.2.1", "@algolia/ui-components-shared@1.2.2": +"@algolia/ui-components-shared@1.2.2", "@algolia/ui-components-shared@^1.2.1": version "1.2.2" resolved "https://registry.npmjs.org/@algolia/ui-components-shared/-/ui-components-shared-1.2.2.tgz" integrity sha512-FYwEG5sbr8p4V8mqP0iUaKgmWfcrMXRXwp7e6iBuB65P/7QyL8pT4I6/iGb85Q5mNH+UtYYSmLZhKjEblllKEQ== @@ -163,7 +163,7 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-crypto/sha256-js@^3.0.0", "@aws-crypto/sha256-js@3.0.0": +"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz" integrity sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ== @@ -422,7 +422,7 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/credential-provider-node@^3.535.0", "@aws-sdk/credential-provider-node@3.535.0": +"@aws-sdk/credential-provider-node@3.535.0": version "3.535.0" resolved "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.535.0.tgz" integrity sha512-6JXp/EuL6euUkH5k4d+lQFF6gBwukrcCOWfNHCmq14mNJf/cqT3HAX1VMtWFRSK20am0IxfYQGccb0/nZykdKg== @@ -539,7 +539,7 @@ "@smithy/types" "^2.12.0" tslib "^2.6.2" -"@aws-sdk/types@^3.222.0", "@aws-sdk/types@3.535.0": +"@aws-sdk/types@3.535.0", "@aws-sdk/types@^3.222.0": version "3.535.0" resolved "https://registry.npmjs.org/@aws-sdk/types/-/types-3.535.0.tgz" integrity sha512-aY4MYfduNj+sRR37U7XxYR8wemfbKP6lx00ze2M2uubn7mZotuVrWYAafbMSXrdEMSToE5JDhr28vArSOoLcSg== @@ -604,7 +604,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.0", "@babel/core@^7.7.5": +"@babel/core@^7.7.5": version "7.23.9" resolved "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz" integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== @@ -874,7 +874,7 @@ dependencies: "@bugsnag/core" "^7.22.7" -"@bugsnag/core@^7.0.0", "@bugsnag/core@^7.22.7": +"@bugsnag/core@^7.22.7": version "7.22.7" resolved "https://registry.npmjs.org/@bugsnag/core/-/core-7.22.7.tgz" integrity sha512-9DPWBkkBjhFJc5dCFy/wVC3HE0Aw3ZiLJKjyAxgywSKbILgtpD+qT1Xe8sacWyxU92znamlZ8H8ziQOe7jhhbA== @@ -1081,11 +1081,121 @@ resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== +"@esbuild/aix-ppc64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz#a70f4ac11c6a1dfc18b8bbb13284155d933b9537" + integrity sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g== + +"@esbuild/android-arm64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz#db1c9202a5bc92ea04c7b6840f1bbe09ebf9e6b9" + integrity sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg== + +"@esbuild/android-arm@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.2.tgz#3b488c49aee9d491c2c8f98a909b785870d6e995" + integrity sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w== + +"@esbuild/android-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.2.tgz#3b1628029e5576249d2b2d766696e50768449f98" + integrity sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg== + +"@esbuild/darwin-arm64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz#6e8517a045ddd86ae30c6608c8475ebc0c4000bb" + integrity sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA== + +"@esbuild/darwin-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz#90ed098e1f9dd8a9381695b207e1cff45540a0d0" + integrity sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA== + +"@esbuild/freebsd-arm64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz#d71502d1ee89a1130327e890364666c760a2a911" + integrity sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw== + +"@esbuild/freebsd-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz#aa5ea58d9c1dd9af688b8b6f63ef0d3d60cea53c" + integrity sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw== + +"@esbuild/linux-arm64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz#055b63725df678379b0f6db9d0fa85463755b2e5" + integrity sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A== + +"@esbuild/linux-arm@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz#76b3b98cb1f87936fbc37f073efabad49dcd889c" + integrity sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg== + +"@esbuild/linux-ia32@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz#c0e5e787c285264e5dfc7a79f04b8b4eefdad7fa" + integrity sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig== + +"@esbuild/linux-loong64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz#a6184e62bd7cdc63e0c0448b83801001653219c5" + integrity sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ== + +"@esbuild/linux-mips64el@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz#d08e39ce86f45ef8fc88549d29c62b8acf5649aa" + integrity sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA== + +"@esbuild/linux-ppc64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz#8d252f0b7756ffd6d1cbde5ea67ff8fd20437f20" + integrity sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg== + +"@esbuild/linux-riscv64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz#19f6dcdb14409dae607f66ca1181dd4e9db81300" + integrity sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg== + +"@esbuild/linux-s390x@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz#3c830c90f1a5d7dd1473d5595ea4ebb920988685" + integrity sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ== + "@esbuild/linux-x64@0.20.2": version "0.20.2" resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz" integrity sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw== +"@esbuild/netbsd-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz#e771c8eb0e0f6e1877ffd4220036b98aed5915e6" + integrity sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ== + +"@esbuild/openbsd-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz#9a795ae4b4e37e674f0f4d716f3e226dd7c39baf" + integrity sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ== + +"@esbuild/sunos-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz#7df23b61a497b8ac189def6e25a95673caedb03f" + integrity sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w== + +"@esbuild/win32-arm64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz#f1ae5abf9ca052ae11c1bc806fb4c0f519bacf90" + integrity sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ== + +"@esbuild/win32-ia32@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz#241fe62c34d8e8461cd708277813e1d0ba55ce23" + integrity sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ== + +"@esbuild/win32-x64@0.20.2": + version "0.20.2" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz#9c907b21e30a52db959ba4f80bb01a0cc403d5cc" + integrity sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz" @@ -1118,577 +1228,6 @@ resolved "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@freesewing/aaron@file:/home/joost/git/freesewing/designs/aaron": - version "3.2.0" - resolved "file:designs/aaron" - -"@freesewing/albert@file:/home/joost/git/freesewing/designs/albert": - version "3.2.0" - resolved "file:designs/albert" - -"@freesewing/bee@file:/home/joost/git/freesewing/designs/bee": - version "3.2.0" - resolved "file:designs/bee" - -"@freesewing/bella@3.2.0", "@freesewing/bella@file:/home/joost/git/freesewing/designs/bella": - version "3.2.0" - resolved "file:designs/bella" - -"@freesewing/benjamin@file:/home/joost/git/freesewing/designs/benjamin": - version "3.2.0" - resolved "file:designs/benjamin" - -"@freesewing/bent@3.2.0", "@freesewing/bent@file:/home/joost/git/freesewing/designs/bent": - version "3.2.0" - resolved "file:designs/bent" - -"@freesewing/bob@file:/home/joost/git/freesewing/designs/bob": - version "3.2.0" - resolved "file:designs/bob" - -"@freesewing/breanna@3.2.0", "@freesewing/breanna@file:/home/joost/git/freesewing/designs/breanna": - version "3.2.0" - resolved "file:designs/breanna" - -"@freesewing/brian@3.2.0", "@freesewing/brian@file:/home/joost/git/freesewing/designs/brian": - version "3.2.0" - resolved "file:designs/brian" - -"@freesewing/bruce@file:/home/joost/git/freesewing/designs/bruce": - version "3.2.0" - resolved "file:designs/bruce" - -"@freesewing/carlita@file:/home/joost/git/freesewing/designs/carlita": - version "3.2.0" - resolved "file:designs/carlita" - -"@freesewing/carlton@3.2.0", "@freesewing/carlton@file:/home/joost/git/freesewing/designs/carlton": - version "3.2.0" - resolved "file:designs/carlton" - -"@freesewing/cathrin@file:/home/joost/git/freesewing/designs/cathrin": - version "3.2.0" - resolved "file:designs/cathrin" - -"@freesewing/charlie@file:/home/joost/git/freesewing/designs/charlie": - version "3.2.0" - resolved "file:designs/charlie" - -"@freesewing/core-plugins@3.2.0", "@freesewing/core-plugins@file:/home/joost/git/freesewing/plugins/core-plugins": - version "3.2.0" - resolved "file:plugins/core-plugins" - -"@freesewing/core@3.2.0", "@freesewing/core@file:/home/joost/git/freesewing/packages/core": - version "3.2.0" - resolved "file:packages/core" - dependencies: - "@freesewing/core-plugins" "3.2.0" - bezier-js "6.1.4" - hooks "0.3.2" - lodash.clonedeep "^4.5.0" - lodash.get "4.4.2" - lodash.set "4.3.2" - lodash.unset "4.5.2" - -"@freesewing/cornelius@file:/home/joost/git/freesewing/designs/cornelius": - version "3.2.0" - resolved "file:designs/cornelius" - -"@freesewing/dev@file:/home/joost/git/freesewing/sites/dev": - version "3.2.0" - resolved "file:sites/dev" - dependencies: - "@mdx-js/mdx" "^3.0.0" - "@mdx-js/react" "^3.0.0" - "@mdx-js/runtime" "2.0.0-next.9" - "@next/bundle-analyzer" "14.1.4" - "@tailwindcss/typography" "0.5.10" - algoliasearch "4.22.1" - daisyui "4.7.3" - lodash.get "4.4.2" - lodash.orderby "4.6.0" - lodash.set "4.3.2" - next "14.1.4" - react "18.3.1" - react-copy-to-clipboard "5.1.0" - react-dom "18.3.1" - react-hotkeys-hook "4.5.0" - react-instantsearch-dom "6.40.4" - react-instantsearch-hooks-web "6.47.3" - react-swipeable "7.0.1" - react-timeago "7.2.0" - rehype-autolink-headings "7.1.0" - rehype-highlight "7.0.0" - rehype-sanitize "6.0.0" - rehype-slug "6.0.0" - rehype-stringify "10.0.0" - remark "15.0.1" - remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" - remark-gfm "4.0.0" - strip-markdown "6.0.0" - -"@freesewing/diana@file:/home/joost/git/freesewing/designs/diana": - version "3.2.0" - resolved "file:designs/diana" - -"@freesewing/examples@file:/home/joost/git/freesewing/designs/examples": - version "3.2.0" - resolved "file:designs/examples" - -"@freesewing/florence@file:/home/joost/git/freesewing/designs/florence": - version "3.2.0" - resolved "file:designs/florence" - -"@freesewing/florent@file:/home/joost/git/freesewing/designs/florent": - version "3.2.0" - resolved "file:designs/florent" - -"@freesewing/gozer@file:/home/joost/git/freesewing/designs/gozer": - version "3.2.0" - resolved "file:designs/gozer" - -"@freesewing/hi@file:/home/joost/git/freesewing/designs/hi": - version "3.2.0" - resolved "file:designs/hi" - -"@freesewing/holmes@file:/home/joost/git/freesewing/designs/holmes": - version "3.2.0" - resolved "file:designs/holmes" - dependencies: - "@freesewing/plugin-gore" "3.2.0" - -"@freesewing/hortensia@file:/home/joost/git/freesewing/designs/hortensia": - version "3.2.0" - resolved "file:designs/hortensia" - -"@freesewing/huey@file:/home/joost/git/freesewing/designs/huey": - version "3.2.0" - resolved "file:designs/huey" - -"@freesewing/hugo@file:/home/joost/git/freesewing/designs/hugo": - version "3.2.0" - resolved "file:designs/hugo" - -"@freesewing/jaeger@file:/home/joost/git/freesewing/designs/jaeger": - version "3.2.0" - resolved "file:designs/jaeger" - -"@freesewing/lab@file:/home/joost/git/freesewing/sites/lab": - version "3.2.0" - resolved "file:sites/lab" - dependencies: - "@mdx-js/mdx" "^3.0.0" - "@mdx-js/react" "^3.0.0" - "@mdx-js/runtime" "2.0.0-next.9" - "@tailwindcss/typography" "0.5.10" - algoliasearch "4.22.1" - d3-dispatch "3.0.1" - d3-drag "3.0.0" - d3-selection "3.0.0" - daisyui "4.7.3" - i18next "23.11.2" - lodash.get "4.4.2" - lodash.orderby "4.6.0" - lodash.set "4.3.2" - next "14.1.4" - next-i18next "15.2.0" - ora "8.0.1" - react "18.3.1" - react-copy-to-clipboard "5.1.0" - react-hotkeys-hook "4.5.0" - react-i18next "14.1.0" - react-instantsearch-dom "6.40.4" - react-swipeable "7.0.1" - react-timeago "7.2.0" - rehype-autolink-headings "7.1.0" - rehype-highlight "7.0.0" - rehype-sanitize "6.0.0" - rehype-slug "6.0.0" - rehype-stringify "10.0.0" - remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" - remark-gfm "4.0.0" - remark-mdx-frontmatter "4.0.0" - -"@freesewing/legend@file:/home/joost/git/freesewing/designs/legend": - version "3.2.0" - resolved "file:designs/legend" - -"@freesewing/lucy@file:/home/joost/git/freesewing/designs/lucy": - version "3.2.0" - resolved "file:designs/lucy" - -"@freesewing/lumina@file:/home/joost/git/freesewing/designs/lumina": - version "3.2.0" - resolved "file:designs/lumina" - -"@freesewing/lumira@file:/home/joost/git/freesewing/designs/lumira": - version "3.2.0" - resolved "file:designs/lumira" - -"@freesewing/lunetius@file:/home/joost/git/freesewing/designs/lunetius": - version "3.2.0" - resolved "file:designs/lunetius" - -"@freesewing/magde@file:/home/joost/git/freesewing/designs/magde": - version "3.2.0" - resolved "file:designs/magde" - -"@freesewing/models@3.2.0", "@freesewing/models@file:/home/joost/git/freesewing/packages/models": - version "3.2.0" - resolved "file:packages/models" - -"@freesewing/naomiwu@file:/home/joost/git/freesewing/designs/naomiwu": - version "3.2.0" - resolved "file:designs/naomiwu" - -"@freesewing/new-design@file:/home/joost/git/freesewing/packages/new-design": - version "3.2.0" - resolved "file:packages/new-design" - dependencies: - axios "1.6.8" - chalk "5.3.0" - execa "8.0.1" - mustache "4.2.0" - ora "8.0.1" - prompts "2.4.2" - recursive-readdir "2.2.3" - -"@freesewing/noble@file:/home/joost/git/freesewing/designs/noble": - version "3.2.0" - resolved "file:designs/noble" - -"@freesewing/octoplushy@file:/home/joost/git/freesewing/designs/octoplushy": - version "3.2.0" - resolved "file:designs/octoplushy" - -"@freesewing/onyx@file:/home/joost/git/freesewing/designs/onyx": - version "3.2.0" - resolved "file:designs/onyx" - -"@freesewing/org@file:/home/joost/git/freesewing/sites/org": - version "3.2.0" - resolved "file:sites/org" - dependencies: - "@bugsnag/js" "7.22.4" - "@bugsnag/plugin-react" "7.19.0" - "@mdx-js/mdx" "^3.0.0" - "@mdx-js/react" "^3.0.0" - "@mdx-js/runtime" "2.0.0-next.9" - "@tailwindcss/nesting" "^0.0.0-insiders.565cd3e" - "@tailwindcss/typography" "0.5.10" - algoliasearch "4.22.1" - daisyui "4.7.3" - echarts "5.5.0" - echarts-for-react "3.0.2" - jotai "2.7.1" - jotai-location "0.5.4" - lodash.get "4.4.2" - lodash.orderby "4.6.0" - lodash.set "4.3.2" - luxon "3.4.4" - next "14.1.4" - next-i18next "15.2.0" - ora "8.0.1" - react "18.3.1" - react-copy-to-clipboard "5.1.0" - react-dom "18.3.1" - react-dropzone "14.2.3" - react-hotkeys-hook "4.5.0" - react-i18next "14.1.0" - react-instantsearch-dom "6.40.4" - react-instantsearch-hooks-web "6.47.3" - react-swipeable "7.0.1" - react-timeago "7.2.0" - react-zoom-pan-pinch "3.4.3" - rehype-autolink-headings "7.1.0" - rehype-highlight "7.0.0" - rehype-sanitize "6.0.0" - rehype-slug "6.0.0" - rehype-stringify "10.0.0" - remark "15.0.1" - remark-copy-linked-files "git+https://git@github.com/joostdecock/remark-copy-linked-files" - remark-gfm "4.0.0" - remark-mdx-frontmatter "4.0.0" - strip-markdown "6.0.0" - use-local-storage-state "19.1.0" - yaml-loader "0.8.1" - -"@freesewing/otis@file:/home/joost/git/freesewing/designs/otis": - version "3.2.0" - resolved "file:designs/otis" - -"@freesewing/paco@file:/home/joost/git/freesewing/designs/paco": - version "3.2.0" - resolved "file:designs/paco" - -"@freesewing/penelope@file:/home/joost/git/freesewing/designs/penelope": - version "3.2.0" - resolved "file:designs/penelope" - -"@freesewing/plugin-annotations@3.2.0", "@freesewing/plugin-annotations@file:/home/joost/git/freesewing/plugins/plugin-annotations": - version "3.2.0" - resolved "file:plugins/plugin-annotations" - -"@freesewing/plugin-bin-pack@file:/home/joost/git/freesewing/plugins/plugin-bin-pack": - version "3.2.0" - resolved "file:plugins/plugin-bin-pack" - -"@freesewing/plugin-bust@3.2.0", "@freesewing/plugin-bust@file:/home/joost/git/freesewing/plugins/plugin-bust": - version "3.2.0" - resolved "file:plugins/plugin-bust" - -"@freesewing/plugin-flip@3.2.0", "@freesewing/plugin-flip@file:/home/joost/git/freesewing/plugins/plugin-flip": - version "3.2.0" - resolved "file:plugins/plugin-flip" - -"@freesewing/plugin-gore@3.2.0", "@freesewing/plugin-gore@file:/home/joost/git/freesewing/plugins/plugin-gore": - version "3.2.0" - resolved "file:plugins/plugin-gore" - -"@freesewing/plugin-i18n@3.2.0", "@freesewing/plugin-i18n@file:/home/joost/git/freesewing/plugins/plugin-i18n": - version "3.2.0" - resolved "file:plugins/plugin-i18n" - -"@freesewing/plugin-measurements@3.2.0", "@freesewing/plugin-measurements@file:/home/joost/git/freesewing/plugins/plugin-measurements": - version "3.2.0" - resolved "file:plugins/plugin-measurements" - -"@freesewing/plugin-mirror@3.2.0", "@freesewing/plugin-mirror@file:/home/joost/git/freesewing/plugins/plugin-mirror": - version "3.2.0" - resolved "file:plugins/plugin-mirror" - -"@freesewing/plugin-ringsector@file:/home/joost/git/freesewing/plugins/plugin-ringsector": - version "3.2.0" - resolved "file:plugins/plugin-ringsector" - -"@freesewing/plugin-round@3.2.0", "@freesewing/plugin-round@file:/home/joost/git/freesewing/plugins/plugin-round": - version "3.2.0" - resolved "file:plugins/plugin-round" - -"@freesewing/plugin-sprinkle@3.2.0", "@freesewing/plugin-sprinkle@file:/home/joost/git/freesewing/plugins/plugin-sprinkle": - version "3.2.0" - resolved "file:plugins/plugin-sprinkle" - -"@freesewing/plugin-svgattr@3.2.0", "@freesewing/plugin-svgattr@file:/home/joost/git/freesewing/plugins/plugin-svgattr": - version "3.2.0" - resolved "file:plugins/plugin-svgattr" - -"@freesewing/plugin-theme@3.2.0", "@freesewing/plugin-theme@file:/home/joost/git/freesewing/plugins/plugin-theme": - version "3.2.0" - resolved "file:plugins/plugin-theme" - -"@freesewing/plugin-timing@3.2.0", "@freesewing/plugin-timing@file:/home/joost/git/freesewing/plugins/plugin-timing": - version "3.2.0" - resolved "file:plugins/plugin-timing" - -"@freesewing/plugin-versionfree-svg@file:/home/joost/git/freesewing/plugins/plugin-versionfree-svg": - version "3.2.0" - resolved "file:plugins/plugin-versionfree-svg" - -"@freesewing/plugintest@file:/home/joost/git/freesewing/designs/plugintest": - version "3.2.0" - resolved "file:designs/plugintest" - -"@freesewing/prettier-config@file:/home/joost/git/freesewing/packages/prettier-config": - version "3.2.0" - resolved "file:packages/prettier-config" - -"@freesewing/react-components@3.2.0", "@freesewing/react-components@file:/home/joost/git/freesewing/packages/react-components": - version "3.2.0" - resolved "file:packages/react-components" - dependencies: - html-react-parser "^5.0.7" - -"@freesewing/rendertest@file:/home/joost/git/freesewing/designs/rendertest": - version "3.2.0" - resolved "file:designs/rendertest" - -"@freesewing/sandy@file:/home/joost/git/freesewing/designs/sandy": - version "3.2.0" - resolved "file:designs/sandy" - -"@freesewing/sde@file:/home/joost/git/freesewing/sites/sde": - version "3.2.0" - resolved "file:sites/sde" - dependencies: - "@freesewing/bella" "3.2.0" - "@freesewing/bent" "3.2.0" - "@freesewing/breanna" "3.2.0" - "@freesewing/brian" "3.2.0" - "@freesewing/core" "3.2.0" - "@freesewing/core-plugins" "3.2.0" - "@freesewing/plugin-bust" "3.2.0" - "@freesewing/plugin-i18n" "3.2.0" - "@freesewing/plugin-theme" "3.2.0" - "@freesewing/plugin-timing" "3.2.0" - "@freesewing/react-components" "3.2.0" - "@freesewing/snapseries" "3.2.0" - "@freesewing/titan" "3.2.0" - "@mdx-js/mdx" "^3.0.0" - "@mdx-js/react" "^3.0.0" - "@mdx-js/runtime" "2.0.0-next.9" - "@tailwindcss/nesting" "^0.0.0-insiders.565cd3e" - "@tailwindcss/typography" "0.5.10" - autoprefixer "10.4.19" - axios "1.6.8" - d3-dispatch "3.0.1" - d3-drag "3.0.0" - d3-selection "3.0.0" - daisyui "4.7.3" - echarts "5.5.0" - echarts-for-react "3.0.2" - file-saver "2.0.5" - i18next "23.11.2" - jotai "2.7.1" - jotai-location "0.5.4" - js-yaml "4.1.0" - lodash.debounce "^4.0.8" - lodash.get "4.4.2" - lodash.orderby "4.6.0" - lodash.set "4.3.2" - mustache "4.2.0" - next "14.1.4" - next-i18next "15.2.0" - pdfkit "0.14.0" - postcss-for "2.1.1" - react "18.3.1" - react-copy-to-clipboard "5.1.0" - react-dom "18.3.1" - react-dropzone "14.2.3" - react-hotkeys-hook "4.5.0" - react-i18next "14.1.0" - react-swipeable "7.0.1" - react-timeago "7.2.0" - react-zoom-pan-pinch "3.4.3" - remark-frontmatter "5.0.0" - remark-gfm "4.0.0" - remark-mdx-frontmatter "4.0.0" - remark-smartypants "2.1.0" - slugify "^1.6.6" - svg-to-pdfkit "https://git@github.com/eriese/SVG-to-PDFKit" - tailwindcss "3.4.1" - tlds "1.251.0" - use-local-storage-state "19.1.0" - web-worker "1.3.0" - -"@freesewing/shared@file:/home/joost/git/freesewing/sites/shared": - version "3.2.0" - resolved "file:sites/shared" - dependencies: - "@next/mdx" "14.1.4" - "@resvg/resvg-js" "2.6.0" - "@tailwindcss/typography" "0.5.10" - Buffer "0.0.0" - d3-dispatch "3.0.1" - d3-drag "3.0.0" - d3-selection "3.0.0" - daisyui "4.7.3" - feed "4.2.2" - file-saver "2.0.5" - front-matter "4.0.2" - github-slugger "2.0.0" - highlight.js "11.9.0" - jotai "2.7.1" - jotai-location "0.5.4" - lodash.clonedeep "4.5.0" - lodash.debounce "^4.0.8" - lodash.get "4.4.2" - lodash.orderby "4.6.0" - lodash.unset "4.5.2" - mdast-util-toc "7.0.0" - mermaid "10.9.0" - ora "8.0.1" - pdfkit "0.14.0" - postcss-for "2.1.1" - react "18.3.1" - react-dom "18.3.1" - react-timeago "7.2.0" - react-zoom-pan-pinch "3.4.3" - rehype-autolink-headings "7.1.0" - rehype-highlight "7.0.0" - remark-frontmatter "5.0.0" - remark-mdx-frontmatter "4.0.0" - remark-smartypants "2.1.0" - slugify "^1.6.6" - svg-to-pdfkit "https://git@github.com/eriese/SVG-to-PDFKit" - tlds "1.251.0" - to-vfile "8.0.0" - unist-util-visit "5.0.0" - use-local-storage-state "19.1.0" - web-worker "1.3.0" - -"@freesewing/shelly@file:/home/joost/git/freesewing/designs/shelly": - version "3.2.0" - resolved "file:designs/shelly" - -"@freesewing/shin@file:/home/joost/git/freesewing/designs/shin": - version "3.2.0" - resolved "file:designs/shin" - -"@freesewing/simon@3.2.0", "@freesewing/simon@file:/home/joost/git/freesewing/designs/simon": - version "3.2.0" - resolved "file:designs/simon" - -"@freesewing/simone@file:/home/joost/git/freesewing/designs/simone": - version "3.2.0" - resolved "file:designs/simone" - -"@freesewing/skully@file:/home/joost/git/freesewing/designs/skully": - version "3.2.0" - resolved "file:designs/skully" - -"@freesewing/snapseries@3.2.0", "@freesewing/snapseries@file:/home/joost/git/freesewing/packages/snapseries": - version "3.2.0" - resolved "file:packages/snapseries" - -"@freesewing/sven@file:/home/joost/git/freesewing/designs/sven": - version "3.2.0" - resolved "file:designs/sven" - -"@freesewing/tamiko@file:/home/joost/git/freesewing/designs/tamiko": - version "3.2.0" - resolved "file:designs/tamiko" - -"@freesewing/teagan@file:/home/joost/git/freesewing/designs/teagan": - version "3.2.0" - resolved "file:designs/teagan" - -"@freesewing/tiberius@file:/home/joost/git/freesewing/designs/tiberius": - version "3.2.0" - resolved "file:designs/tiberius" - -"@freesewing/titan@3.2.0", "@freesewing/titan@file:/home/joost/git/freesewing/designs/titan": - version "3.2.0" - resolved "file:designs/titan" - -"@freesewing/trayvon@file:/home/joost/git/freesewing/designs/trayvon": - version "3.2.0" - resolved "file:designs/trayvon" - -"@freesewing/tristan@file:/home/joost/git/freesewing/designs/tristan": - version "3.2.0" - resolved "file:designs/tristan" - -"@freesewing/uma@file:/home/joost/git/freesewing/designs/uma": - version "3.2.0" - resolved "file:designs/uma" - -"@freesewing/wahid@file:/home/joost/git/freesewing/designs/wahid": - version "3.2.0" - resolved "file:designs/wahid" - -"@freesewing/walburga@file:/home/joost/git/freesewing/designs/walburga": - version "3.2.0" - resolved "file:designs/walburga" - -"@freesewing/waralee@file:/home/joost/git/freesewing/designs/waralee": - version "3.2.0" - resolved "file:designs/waralee" - -"@freesewing/yuri@file:/home/joost/git/freesewing/designs/yuri": - version "3.2.0" - resolved "file:designs/yuri" - "@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz" @@ -1850,6 +1389,25 @@ yargs "17.7.2" yargs-parser "21.1.1" +"@mdx-js/mdx@2.0.0-next.9": + version "2.0.0-next.9" + resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.0.0-next.9.tgz" + integrity sha512-6i7iLIPApiCdvp4T6n3dI5IqDOvcNx4M3DUJ+AG6xj/NTssJcf5r3Gl4i3Q2tqJp0JAj6bWQ3IOLAefF18Y48g== + dependencies: + "@mdx-js/util" "2.0.0-next.1" + astring "^1.4.0" + detab "^2.0.0" + estree-walker "^2.0.0" + hast-util-to-estree "^1.1.0" + mdast-util-to-hast "^10.1.0" + periscopic "^2.0.0" + rehype-minify-whitespace "^4.0.0" + remark-mdx "2.0.0-next.9" + remark-parse "^9.0.0" + remark-squeeze-paragraphs "^4.0.0" + unified "^9.2.0" + unist-builder "^2.0.0" + "@mdx-js/mdx@^3.0.0": version "3.0.1" resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-3.0.1.tgz" @@ -1879,37 +1437,18 @@ unist-util-visit "^5.0.0" vfile "^6.0.0" -"@mdx-js/mdx@2.0.0-next.9": +"@mdx-js/react@2.0.0-next.9": version "2.0.0-next.9" - resolved "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-2.0.0-next.9.tgz" - integrity sha512-6i7iLIPApiCdvp4T6n3dI5IqDOvcNx4M3DUJ+AG6xj/NTssJcf5r3Gl4i3Q2tqJp0JAj6bWQ3IOLAefF18Y48g== - dependencies: - "@mdx-js/util" "2.0.0-next.1" - astring "^1.4.0" - detab "^2.0.0" - estree-walker "^2.0.0" - hast-util-to-estree "^1.1.0" - mdast-util-to-hast "^10.1.0" - periscopic "^2.0.0" - rehype-minify-whitespace "^4.0.0" - remark-mdx "2.0.0-next.9" - remark-parse "^9.0.0" - remark-squeeze-paragraphs "^4.0.0" - unified "^9.2.0" - unist-builder "^2.0.0" + resolved "https://registry.npmjs.org/@mdx-js/react/-/react-2.0.0-next.9.tgz" + integrity sha512-ZHEwW79zXQrII6ZSaIDgxd80IDRB6Zg/2N1IivQ62j4qlAZd78rbbAc0BQKwADYpuFg96g0pFbuZ7/+vl1gR6A== -"@mdx-js/react@^3.0.0", "@mdx-js/react@>=0.15.0": +"@mdx-js/react@^3.0.0": version "3.0.1" resolved "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz" integrity sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A== dependencies: "@types/mdx" "^2.0.0" -"@mdx-js/react@2.0.0-next.9": - version "2.0.0-next.9" - resolved "https://registry.npmjs.org/@mdx-js/react/-/react-2.0.0-next.9.tgz" - integrity sha512-ZHEwW79zXQrII6ZSaIDgxd80IDRB6Zg/2N1IivQ62j4qlAZd78rbbAc0BQKwADYpuFg96g0pFbuZ7/+vl1gR6A== - "@mdx-js/runtime@2.0.0-next.9": version "2.0.0-next.9" resolved "https://registry.npmjs.org/@mdx-js/runtime/-/runtime-2.0.0-next.9.tgz" @@ -1950,6 +1489,26 @@ dependencies: source-map "^0.7.0" +"@next/swc-darwin-arm64@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.4.tgz#a3bca0dc4393ac4cf3169bbf24df63441de66bb7" + integrity sha512-ubmUkbmW65nIAOmoxT1IROZdmmJMmdYvXIe8211send9ZYJu+SqxSnJM4TrPj9wmL6g9Atvj0S/2cFmMSS99jg== + +"@next/swc-darwin-x64@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.4.tgz#ba3683d4e2d30099f3f2864dd7349a4d9f440140" + integrity sha512-b0Xo1ELj3u7IkZWAKcJPJEhBop117U78l70nfoQGo4xUSvv0PJSTaV4U9xQBLvZlnjsYkc8RwQN1HoH/oQmLlQ== + +"@next/swc-linux-arm64-gnu@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.4.tgz#3519969293f16379954b7e196deb0c1eecbb2f8b" + integrity sha512-457G0hcLrdYA/u1O2XkRMsDKId5VKe3uKPvrKVOyuARa6nXrdhJOOYU9hkKKyQTMru1B8qEP78IAhf/1XnVqKA== + +"@next/swc-linux-arm64-musl@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.4.tgz#4bb3196bd402b3f84cf5373ff1021f547264d62f" + integrity sha512-l/kMG+z6MB+fKA9KdtyprkTQ1ihlJcBh66cf0HvqGP+rXBbOXX0dpJatjZbHeunvEHoBBS69GYQG5ry78JMy3g== + "@next/swc-linux-x64-gnu@14.1.4": version "14.1.4" resolved "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.1.4.tgz" @@ -1960,6 +1519,21 @@ resolved "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.1.4.tgz" integrity sha512-mqVxTwk4XuBl49qn2A5UmzFImoL1iLm0KQQwtdRJRKl21ylQwwGCxJtIYo2rbfkZHoSKlh/YgztY0qH3wG1xIg== +"@next/swc-win32-arm64-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.4.tgz#84280a08c00cc3be24ddd3a12f4617b108e6dea6" + integrity sha512-xzxF4ErcumXjO2Pvg/wVGrtr9QQJLk3IyQX1ddAC/fi6/5jZCZ9xpuL9Tzc4KPWMFq8GGWFVDMshZOdHGdkvag== + +"@next/swc-win32-ia32-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.4.tgz#23ff7f4bd0a27177428669ef6fa5c3923c738031" + integrity sha512-WZiz8OdbkpRw6/IU/lredZWKKZopUMhcI2F+XiMAcPja0uZYdMTZQRoQ0WZcvinn9xZAidimE7tN9W5v9Yyfyw== + +"@next/swc-win32-x64-msvc@14.1.4": + version "14.1.4" + resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.4.tgz#bccf5beccfde66d6c66fa4e2509118c796385eda" + integrity sha512-4Rto21sPfw555sZ/XNLqfxDUNeLhNYGO2dlPqsnuCg8N8a2a9u1ltqBOPQ4vj1Gf7eJC0W2hHG2eYUHuiXgY2w== + "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": version "5.1.1-v1" resolved "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz" @@ -1975,7 +1549,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -2053,17 +1627,6 @@ dependencies: which "^4.0.0" -"@npmcli/run-script@^7.0.0": - version "7.0.4" - resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz" - integrity sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg== - dependencies: - "@npmcli/node-gyp" "^3.0.0" - "@npmcli/package-json" "^5.0.0" - "@npmcli/promise-spawn" "^7.0.0" - node-gyp "^10.0.0" - which "^4.0.0" - "@npmcli/run-script@7.0.2": version "7.0.2" resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz" @@ -2075,6 +1638,17 @@ read-package-json-fast "^3.0.0" which "^4.0.0" +"@npmcli/run-script@^7.0.0": + version "7.0.4" + resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz" + integrity sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg== + dependencies: + "@npmcli/node-gyp" "^3.0.0" + "@npmcli/package-json" "^5.0.0" + "@npmcli/promise-spawn" "^7.0.0" + node-gyp "^10.0.0" + which "^4.0.0" + "@nrwl/devkit@18.0.2": version "18.0.2" resolved "https://registry.npmjs.org/@nrwl/devkit/-/devkit-18.0.2.tgz" @@ -2090,7 +1664,7 @@ nx "18.0.2" tslib "^2.3.0" -"@nx/devkit@>=17.1.2 < 19", "@nx/devkit@18.0.2": +"@nx/devkit@18.0.2", "@nx/devkit@>=17.1.2 < 19": version "18.0.2" resolved "https://registry.npmjs.org/@nx/devkit/-/devkit-18.0.2.tgz" integrity sha512-1LiAHWRYaQkSIUsNxynHM+k4luLDuErThXKsIdOyZr4Qkw0k7v/Aw7HMdx9Usgo+mC3wc+EF7SQUnWCnQ2KHww== @@ -2104,6 +1678,36 @@ tslib "^2.3.0" yargs-parser "21.1.1" +"@nx/nx-darwin-arm64@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-18.0.2.tgz#ef88f8b72a53dc2ee6ea5e64337a202543315ecc" + integrity sha512-zFW5GDrH3GRdm5FePCYuCAEWvJ/G7iiB3jgP0zvLTRe06BQ4Z3bKCQu1v0B/mA7kR+cCY0ZtgHE+9UhK+lWarw== + +"@nx/nx-darwin-x64@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-18.0.2.tgz#1baccf7e384409673a799ad37c7d62793102557f" + integrity sha512-Iihl8MK7NiDxn6pyhe/sctEv5J2MOK2bLJH3hBgJXbq8h278jAXqM5zLxVO49Kya65K7idAu1g5nvrRtafUIXg== + +"@nx/nx-freebsd-x64@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-18.0.2.tgz#fdd578968f01b2d4b246faaf19d28af4f1a40405" + integrity sha512-D6pFFLRZs5f99oF3nHWMHhEYBVDB7x0kaDuR+96FfQlZXPU2SSQ+fzV1TREeQPhfHf9owgcduiE4utrOgJBTOQ== + +"@nx/nx-linux-arm-gnueabihf@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-18.0.2.tgz#a201f1ce0a0927c415107733b6eaddf6a26a2255" + integrity sha512-TCEKHBByEqIjiMNGOWS3maPpqQq1syUKOfp4fLJyE9A+NEK0th/6s65RWtzQR/GBUsi5r5y5g/pt+XFup+DrMA== + +"@nx/nx-linux-arm64-gnu@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-18.0.2.tgz#4a8af9e17a985e2ca5096bf3d8270e875fb79243" + integrity sha512-oYWeWtLmtM2LmsTStc6P4xUSJvpZxHZCoHIAFw1Rw7LQRbTyky19XR87F2mbEJbhSPMymeeLDR6SN0JSplODLg== + +"@nx/nx-linux-arm64-musl@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-18.0.2.tgz#4a9dd570619a4abdbfcc13ef76b45f45a560241f" + integrity sha512-9I27P5IilvICsLJxmh79OG6Y21uFKaqDAKCDlc608cyAH48Rq9xVM24DEQD0cITbfOjMRBBO2rMl7XX3b81w9Q== + "@nx/nx-linux-x64-gnu@18.0.2": version "18.0.2" resolved "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-18.0.2.tgz" @@ -2114,12 +1718,22 @@ resolved "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-18.0.2.tgz" integrity sha512-zEaO53G3xOYEZ0loBdKCYcnXganzkbv8daWMxNCjBtstyTN3sfRH7KKM8Z6dp0xw4toxxuCC4OsYGmRKnps+Dg== +"@nx/nx-win32-arm64-msvc@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-18.0.2.tgz#a138940a29a6578b11508ff715c3042f374fc330" + integrity sha512-pLc0SC/bEh8TC5H//pD+vHYUNCdYLWsMB9xAdey6V2qmKPrrDuWTs69qh0zCW4S1Jm8C9XK1av5mWIp2Fj8KnA== + +"@nx/nx-win32-x64-msvc@18.0.2": + version "18.0.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-18.0.2.tgz#c058aa500c1284d4be4c281f7b96e675a8922ed0" + integrity sha512-alWijWoroV65IRLdAQhFpINS9SRYSncWVT7CYe1iWwjiT16Un2i4NDoselpADuAsYC+Rgd+4h5Y+XzwtsQ55gg== + "@octokit/auth-token@^3.0.0": version "3.0.4" resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz" integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== -"@octokit/core@^4.2.1", "@octokit/core@>=3", "@octokit/core@>=4": +"@octokit/core@^4.2.1": version "4.2.4" resolved "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz" integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ== @@ -2319,6 +1933,41 @@ dependencies: "@prisma/debug" "5.11.0" +"@resvg/resvg-js-android-arm-eabi@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.6.0.tgz#fed7723ed5c5f7490762e025ad704bcbceee37b7" + integrity sha512-lJnZ/2P5aMocrFMW7HWhVne5gH82I8xH6zsfH75MYr4+/JOaVcGCTEQ06XFohGMdYRP3v05SSPLPvTM/RHjxfA== + +"@resvg/resvg-js-android-arm64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.6.0.tgz#e0531a220ec8954e41039b2483cc3706d30d3635" + integrity sha512-N527f529bjMwYWShZYfBD60dXA4Fux+D695QsHQ93BDYZSHUoOh1CUGUyICevnTxs7VgEl98XpArmUWBZQVMfQ== + +"@resvg/resvg-js-darwin-arm64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.6.0.tgz#38f609cd2bd71ce6a065df7a8b8144479b156969" + integrity sha512-MabUKLVayEwlPo0mIqAmMt+qESN8LltCvv5+GLgVga1avpUrkxj/fkU1TKm8kQegutUjbP/B0QuMuUr0uhF8ew== + +"@resvg/resvg-js-darwin-x64@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.6.0.tgz#5c3f69d0cd68980e7e5cfcabf0db90e85d289559" + integrity sha512-zrFetdnSw/suXjmyxSjfDV7i61hahv6DDG6kM7BYN2yJ3Es5+BZtqYZTcIWogPJedYKmzN1YTMWGd/3f0ubFiA== + +"@resvg/resvg-js-linux-arm-gnueabihf@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.6.0.tgz#6bcae7d4101e7fea2be0db167eda832cab63e27f" + integrity sha512-sH4gxXt7v7dGwjGyzLwn7SFGvwZG6DQqLaZ11MmzbCwd9Zosy1TnmrMJfn6TJ7RHezmQMgBPi18bl55FZ1AT4A== + +"@resvg/resvg-js-linux-arm64-gnu@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.6.0.tgz#fb71ea6b9a4b30412fa096fdbf9e8427012b3a99" + integrity sha512-fCyMncqCJtrlANADIduYF4IfnWQ295UKib7DAxFXQhBsM9PLDTpizr0qemZcCNadcwSVHnAIzL4tliZhCM8P6A== + +"@resvg/resvg-js-linux-arm64-musl@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.6.0.tgz#ec7e85b8b6eea23c0242faa1f1486241f253a190" + integrity sha512-ouLjTgBQHQyxLht4FdMPTvuY8xzJigM9EM2Tlu0llWkN1mKyTQrvYWi6TA6XnKdzDJHy7ZLpWpjZi7F5+Pg+Vg== + "@resvg/resvg-js-linux-x64-gnu@2.6.0": version "2.6.0" resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.6.0.tgz" @@ -2329,6 +1978,21 @@ resolved "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.6.0.tgz" integrity sha512-n4tasK1HOlAxdTEROgYA1aCfsEKk0UOFDNd/AQTTZlTmCbHKXPq+O8npaaKlwXquxlVK8vrkcWbksbiGqbCAcw== +"@resvg/resvg-js-win32-arm64-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.6.0.tgz#3af0d5f7bd9193ac6be8f226b539be6f7576302d" + integrity sha512-X2+EoBJFwDI5LDVb51Sk7ldnVLitMGr9WwU/i21i3fAeAXZb3hM16k67DeTy16OYkT2dk/RfU1tP1wG+rWbz2Q== + +"@resvg/resvg-js-win32-ia32-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.6.0.tgz#64af45bfee41cb2bea0b6dd0bdc94175183f2b56" + integrity sha512-L7oevWjQoUgK5W1fCKn0euSVemhDXVhrjtwqpc7MwBKKimYeiOshO1Li1pa8bBt5PESahenhWgdB6lav9O0fEg== + +"@resvg/resvg-js-win32-x64-msvc@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.6.0.tgz#08431a243c15f002d32e5e628857d19852323274" + integrity sha512-8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw== + "@resvg/resvg-js@2.6.0": version "2.6.0" resolved "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.6.0.tgz" @@ -2840,13 +2504,6 @@ "@smithy/util-buffer-from" "^2.2.0" tslib "^2.6.2" -"@swc/helpers@^0.3.13": - version "0.3.17" - resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz" - integrity sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q== - dependencies: - tslib "^2.4.0" - "@swc/helpers@0.5.2": version "0.5.2" resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz" @@ -2854,6 +2511,13 @@ dependencies: tslib "^2.4.0" +"@swc/helpers@^0.3.13": + version "0.3.17" + resolved "https://registry.npmjs.org/@swc/helpers/-/helpers-0.3.17.tgz" + integrity sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q== + dependencies: + tslib "^2.4.0" + "@tailwindcss/nesting@^0.0.0-insiders.565cd3e": version "0.0.0-insiders.565cd3e" resolved "https://registry.npmjs.org/@tailwindcss/nesting/-/nesting-0.0.0-insiders.565cd3e.tgz" @@ -3070,7 +2734,7 @@ resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz" integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ== -"@types/react@*", "@types/react@>=16", "@types/react@>=17.0.0", "@types/react@17 || 18": +"@types/react@*": version "18.2.61" resolved "https://registry.npmjs.org/@types/react/-/react-18.2.61.tgz" integrity sha512-NURTN0qNnJa7O/k4XUkEW2yfygA+NxS0V5h1+kp9jPwhzZy95q3ADoGMP0+JypMhrZBTTgjKAUlTctde1zzeQA== @@ -3178,16 +2842,29 @@ dependencies: argparse "^2.0.1" -abbrev@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz" - integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== +Buffer@0.0.0: + version "0.0.0" + resolved "https://registry.npmjs.org/Buffer/-/Buffer-0.0.0.tgz" + integrity sha512-+zdncl8lI5TCkARStn9F1BwcuJYofYmD0oEHe5FNfCvGfeDJwf6+dSikCdQN6BMXXmHMhNNUagBN367WST1AIQ== + +JSONStream@^1.3.5: + version "1.3.5" + resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" + integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== + dependencies: + jsonparse "^1.2.0" + through ">=2.2.7 <3" abbrev@1: version "1.1.1" resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abbrev@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz" + integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== + abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz" @@ -3218,22 +2895,22 @@ acorn-walk@^8.0.0: resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz" integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A== -"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.9.0: - version "8.11.3" - resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" - integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== - -acorn@^6.0.0, acorn@^6.1.1: +acorn@^6.1.1: version "6.4.2" resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^8.0.0, acorn@^8.0.4, acorn@^8.5.0, acorn@^8.9.0: + version "8.11.3" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz" + integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg== + add-stream@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz" integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ== -agent-base@^6.0.2, agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -3289,7 +2966,7 @@ algoliasearch-helper@3.14.0: dependencies: "@algolia/events" "^4.0.1" -"algoliasearch@>= 3.1 < 5", "algoliasearch@>= 3.1 < 6", algoliasearch@4.22.1: +algoliasearch@4.22.1: version "4.22.1" resolved "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.22.1.tgz" integrity sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg== @@ -3327,16 +3004,16 @@ all-contributors-cli@^6.26.1: optionalDependencies: prettier "^2" -ansi-colors@^4.1.1: - version "4.1.3" - resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz" - integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== - ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz" integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== +ansi-colors@^4.1.1: + version "4.1.3" + resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== + ansi-escapes@^4.2.1: version "4.3.2" resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz" @@ -3390,17 +3067,7 @@ ansi-styles@^5.0.0: resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-styles@^6.0.0: - version "6.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -ansi-styles@^6.1.0: - version "6.2.1" - resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -ansi-styles@^6.2.1: +ansi-styles@^6.0.0, ansi-styles@^6.1.0, ansi-styles@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -3707,7 +3374,7 @@ axe-core@=4.7.0: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@^1.5.1, axios@^1.6.0, axios@1.6.8: +axios@1.6.8, axios@^1.5.1, axios@^1.6.0: version "1.6.8" resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz" integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ== @@ -3723,28 +3390,6 @@ axobject-query@^3.2.1: dependencies: dequal "^2.0.3" -"backend.freesewing.org@file:/home/joost/git/freesewing/sites/backend": - version "3.2.0" - resolved "file:sites/backend" - dependencies: - "@aws-sdk/client-sesv2" "3.535.0" - "@prisma/client" "5.11.0" - bcryptjs "2.4.3" - cors "2.8.5" - dotenv "16.4.5" - express "4.19.1" - js-yaml "4.1.0" - lodash.get "4.4.2" - mustache "4.2.0" - otplib "12.0.1" - passport "0.7.0" - passport-http "0.3.0" - passport-jwt "4.0.1" - pino "9.0.0" - qrcode "1.5.3" - swagger-ui-dist "5.17.2" - swagger-ui-express "5.0.0" - bail@^1.0.0: version "1.0.5" resolved "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz" @@ -3760,16 +3405,16 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - base64-js@0.0.8: version "0.0.8" resolved "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz" integrity sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw== +base64-js@^1.1.2, base64-js@^1.3.0, base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + bcryptjs@2.4.3: version "2.4.3" resolved "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz" @@ -3866,7 +3511,7 @@ browser-stdout@1.3.1: resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.22.2, browserslist@^4.23.0, "browserslist@>= 4.21.0": +browserslist@^4.22.2, browserslist@^4.23.0: version "4.23.0" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz" integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== @@ -3915,11 +3560,6 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -Buffer@0.0.0: - version "0.0.0" - resolved "https://registry.npmjs.org/Buffer/-/Buffer-0.0.0.tgz" - integrity sha512-+zdncl8lI5TCkARStn9F1BwcuJYofYmD0oEHe5FNfCvGfeDJwf6+dSikCdQN6BMXXmHMhNNUagBN367WST1AIQ== - build-array@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/build-array/-/build-array-1.0.0.tgz" @@ -4097,6 +3737,19 @@ chai@5.1.0: loupe "^3.1.0" pathval "^2.0.0" +chalk@4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@5.3.0, chalk@^5.3.0: + version "5.3.0" + resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + chalk@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz" @@ -4125,24 +3778,6 @@ chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - -chalk@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== - character-entities-html4@^1.0.0: version "1.1.4" resolved "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz" @@ -4223,7 +3858,7 @@ cheerio@^1.0.0-rc.5: parse5 "^7.0.0" parse5-htmlparser2-tree-adapter "^7.0.0" -chokidar@^3.5.2, chokidar@^3.5.3, chokidar@3.5.3: +chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -4258,7 +3893,7 @@ clean-stack@^2.0.0: resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-cursor@^3.1.0, cli-cursor@3.1.0: +cli-cursor@3.1.0, cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz" integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== @@ -4272,16 +3907,16 @@ cli-cursor@^4.0.0: dependencies: restore-cursor "^4.0.0" -cli-spinners@^2.5.0, cli-spinners@^2.9.2: - version "2.9.2" - resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz" - integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== - cli-spinners@2.6.1: version "2.6.1" resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz" integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== +cli-spinners@^2.5.0, cli-spinners@^2.9.2: + version "2.9.2" + resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== + cli-truncate@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz" @@ -4389,16 +4024,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + color-support@^1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz" @@ -4434,26 +4069,26 @@ comma-separated-tokens@^2.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz" integrity sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg== +commander@11.1.0: + version "11.1.0" + resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" + integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== + +commander@7, commander@^7.2.0: + version "7.2.0" + resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@^4.0.0: version "4.1.1" resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^7.2.0, commander@7: - version "7.2.0" - resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - commander@^8.3.0: version "8.3.0" resolved "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== -commander@11.1.0: - version "11.1.0" - resolved "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz" - integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ== - commondir@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz" @@ -4511,7 +4146,7 @@ content-type@~1.0.4, content-type@~1.0.5: resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -conventional-changelog-angular@^7.0.0, conventional-changelog-angular@7.0.0: +conventional-changelog-angular@7.0.0, conventional-changelog-angular@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz" integrity sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ== @@ -4573,8 +4208,8 @@ conventional-commits-parser@^4.0.0: resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz" integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== dependencies: - is-text-path "^1.0.1" JSONStream "^1.3.5" + is-text-path "^1.0.1" meow "^8.1.2" split2 "^3.2.2" @@ -4583,8 +4218,8 @@ conventional-commits-parser@^5.0.0: resolved "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz" integrity sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA== dependencies: - is-text-path "^2.0.0" JSONStream "^1.3.5" + is-text-path "^2.0.0" meow "^12.0.1" split2 "^4.0.0" @@ -4685,14 +4320,6 @@ cosmiconfig@^9.0.0: js-yaml "^4.1.0" parse-json "^5.2.0" -cosmiconfig@>=8.2: - version "9.0.0" - dependencies: - env-paths "^2.2.1" - import-fresh "^3.3.0" - js-yaml "^4.1.0" - parse-json "^5.2.0" - cp-file@^9.0.0: version "9.1.0" resolved "https://registry.npmjs.org/cp-file/-/cp-file-9.1.0.tgz" @@ -4770,7 +4397,7 @@ cytoscape-cose-bilkent@^4.1.0: dependencies: cose-base "^1.0.0" -cytoscape@^3.2.0, cytoscape@^3.28.1: +cytoscape@^3.28.1: version "3.28.1" resolved "https://registry.npmjs.org/cytoscape/-/cytoscape-3.28.1.tgz" integrity sha512-xyItz4O/4zp9/239wCcH8ZcFuuZooEeF8KHRmzjDfGdXsj3OG9MFSMA0pJE0uX3uCN/ygof6hHf4L7lst+JaDg== @@ -4778,13 +4405,6 @@ cytoscape@^3.2.0, cytoscape@^3.28.1: heap "^0.2.6" lodash "^4.17.21" -d3-array@^3.2.0, "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3: - version "3.2.4" - resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" - integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== - dependencies: - internmap "1 - 2" - "d3-array@1 - 2": version "2.12.1" resolved "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz" @@ -4792,6 +4412,13 @@ d3-array@^3.2.0, "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", dependencies: internmap "^1.0.0" +"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0: + version "3.2.4" + resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz" + integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg== + dependencies: + internmap "1 - 2" + d3-axis@3: version "3.0.0" resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz" @@ -4901,16 +4528,16 @@ d3-hierarchy@3: dependencies: d3-color "1 - 3" -d3-path@^3.1.0, "d3-path@1 - 3", d3-path@3: - version "3.1.0" - resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz" - integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== - d3-path@1: version "1.0.9" resolved "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz" integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== +"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz" + integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ== + d3-polygon@3: version "3.0.1" resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz" @@ -4958,13 +4585,6 @@ d3-scale@4: resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz" integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ== -d3-shape@^1.2.0: - version "1.3.7" - resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz" - integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== - dependencies: - d3-path "1" - d3-shape@3: version "3.2.0" resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz" @@ -4972,6 +4592,13 @@ d3-shape@3: dependencies: d3-path "^3.1.0" +d3-shape@^1.2.0: + version "1.3.7" + resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz" + integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== + dependencies: + d3-path "1" + "d3-time-format@2 - 4", d3-time-format@4: version "4.1.0" resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz" @@ -5102,20 +4729,6 @@ debounce@^1.2.1: resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz" integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@4, debug@4.3.4: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debug@2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" @@ -5123,6 +4736,20 @@ debug@2.6.9: dependencies: ms "2.0.0" +debug@4, debug@4.3.4, debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== + dependencies: + ms "^2.1.1" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz" @@ -5308,21 +4935,16 @@ diff-sequences@^29.6.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz" integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q== -diff@^5.0.0: - version "5.1.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" - integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== - -diff@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" - integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== - diff@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== +diff@^5.0.0, diff@^5.1.0: + version "5.1.0" + resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz" + integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== + dijkstrajs@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz" @@ -5354,6 +4976,14 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@0: + version "0.2.2" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" + integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== + dependencies: + domelementtype "^2.0.1" + entities "^2.0.0" + dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz" @@ -5363,35 +4993,15 @@ dom-serializer@^2.0.0: domhandler "^5.0.2" entities "^4.2.0" -dom-serializer@0: - version "0.2.2" - resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -domelementtype@^2.0.1: - version "2.3.0" - resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domelementtype@1: version "1.3.1" resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domhandler@^5.0.2, domhandler@^5.0.3, domhandler@5.0.3: - version "5.0.3" - resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" +domelementtype@^2.0.1, domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domhandler@2.3: version "2.3.0" @@ -5400,11 +5010,26 @@ domhandler@2.3: dependencies: domelementtype "1" +domhandler@5.0.3, domhandler@^5.0.2, domhandler@^5.0.3: + version "5.0.3" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + dompurify@^3.0.5: version "3.0.8" resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.0.8.tgz" integrity sha512-b7uwreMYL2eZhrSCRC4ahLTeZcPZxSmYfmcQGXGkXiZSNW1X85v+SDM5KsWcpivIiUBH47Ji7NtyUdpLeF5JZQ== +domutils@1.5: + version "1.5.1" + resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" + integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw== + dependencies: + dom-serializer "0" + domelementtype "1" + domutils@^3.0.1, domutils@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz" @@ -5414,14 +5039,6 @@ domutils@^3.0.1, domutils@^3.1.0: domelementtype "^2.3.0" domhandler "^5.0.3" -domutils@1.5: - version "1.5.1" - resolved "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz" - integrity sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw== - dependencies: - dom-serializer "0" - domelementtype "1" - dot-prop@^5.1.0: version "5.3.0" resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz" @@ -5434,16 +5051,16 @@ dotenv-expand@~10.0.0: resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz" integrity sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A== -dotenv@~16.3.1: - version "16.3.2" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz" - integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ== - dotenv@16.4.5: version "16.4.5" resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz" integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg== +dotenv@~16.3.1: + version "16.3.2" + resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz" + integrity sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ== + duplexer@^0.1.1, duplexer@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz" @@ -5469,7 +5086,7 @@ echarts-for-react@3.0.2: fast-deep-equal "^3.1.3" size-sensor "^1.0.1" -"echarts@^3.0.0 || ^4.0.0 || ^5.0.0", echarts@5.5.0: +echarts@5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/echarts/-/echarts-5.5.0.tgz" integrity sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw== @@ -5529,7 +5146,7 @@ encodeurl@~1.0.2: resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding@^0.1.0, encoding@^0.1.13: +encoding@^0.1.13: version "0.1.13" resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -5558,6 +5175,11 @@ enquirer@~2.3.6: dependencies: ansi-colors "^4.1.1" +entities@1.0: + version "1.0.0" + resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" + integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ== + entities@^2.0.0: version "2.2.0" resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz" @@ -5568,11 +5190,6 @@ entities@^4.2.0, entities@^4.4.0, entities@^4.5.0: resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== -entities@1.0: - version "1.0.0" - resolved "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz" - integrity sha512-LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ== - env-paths@^2.2.0, env-paths@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz" @@ -5725,7 +5342,7 @@ esbuild-plugin-yaml@^0.0.1: fs-extra "^9.1.0" js-yaml "^4.0.0" -esbuild@^0.20.0, esbuild@0.20.2: +esbuild@0.20.2, esbuild@^0.20.0: version "0.20.2" resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz" integrity sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g== @@ -5764,21 +5381,16 @@ escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^4.0.0, escape-string-regexp@4.0.0: +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + escape-string-regexp@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz" @@ -5853,7 +5465,7 @@ eslint-plugin-es@^4.1.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@*, eslint-plugin-import@^2.25.2, eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: +eslint-plugin-import@^2.27.5, eslint-plugin-import@^2.28.1: version "2.29.1" resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz" integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw== @@ -5925,7 +5537,7 @@ eslint-plugin-mongo@^1.0.5: dependencies: requireindex "~1.1.0" -"eslint-plugin-n@^15.0.0 || ^16.0.0 ", eslint-plugin-n@^15.7.0: +eslint-plugin-n@^15.7.0: version "15.7.0" resolved "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.7.0.tgz" integrity sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q== @@ -5939,7 +5551,7 @@ eslint-plugin-mongo@^1.0.5: resolve "^1.22.1" semver "^7.3.8" -eslint-plugin-promise@^6.0.0, eslint-plugin-promise@^6.1.1: +eslint-plugin-promise@^6.1.1: version "6.1.1" resolved "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz" integrity sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig== @@ -5949,7 +5561,7 @@ eslint-plugin-promise@^6.0.0, eslint-plugin-promise@^6.1.1: resolved "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz" integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== -eslint-plugin-react@^7.28.0, eslint-plugin-react@^7.32.2, eslint-plugin-react@^7.33.2: +eslint-plugin-react@^7.32.2, eslint-plugin-react@^7.33.2: version "7.33.2" resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz" integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== @@ -5979,14 +5591,6 @@ eslint-plugin-yaml@^0.5.0: js-yaml "^4.1.0" jshint "^2.13.0" -eslint-scope@^7.2.2: - version "7.2.2" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz" - integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - eslint-scope@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz" @@ -5995,6 +5599,14 @@ eslint-scope@5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" +eslint-scope@^7.2.2: + version "7.2.2" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz" + integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-utils@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz" @@ -6014,12 +5626,7 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^2.1.0: +eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -6029,7 +5636,7 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4 resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.23.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.1, eslint@^8.23.1, eslint@^8.41.0, eslint@^8.56.0, eslint@^8.8.0, eslint@>=4.19.1, eslint@>=5, eslint@>=6.0.0, eslint@>=7.0.0, eslint@>=8, eslint@8.57.0: +eslint@8.57.0, eslint@^8.23.1, eslint@^8.41.0: version "8.57.0" resolved "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz" integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== @@ -6133,12 +5740,7 @@ estree-util-build-jsx@^3.0.0: estree-util-is-identifier-name "^3.0.0" estree-walker "^3.0.0" -estree-util-is-identifier-name@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz" - integrity sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ== - -estree-util-is-identifier-name@^1.1.0: +estree-util-is-identifier-name@^1.0.0, estree-util-is-identifier-name@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-1.1.0.tgz" integrity sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ== @@ -6215,10 +5817,10 @@ events@^3.3.0: resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz" integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== -execa@^5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== +execa@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz" + integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -6230,7 +5832,7 @@ execa@^5.1.1: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -execa@^8.0.1, execa@8.0.1: +execa@8.0.1, execa@^8.0.1: version "8.0.1" resolved "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz" integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== @@ -6245,10 +5847,10 @@ execa@^8.0.1, execa@8.0.1: signal-exit "^4.1.0" strip-final-newline "^3.0.0" -execa@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== +execa@^5.1.1: + version "5.1.1" + resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -6270,10 +5872,10 @@ exponential-backoff@^3.1.1: resolved "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -"express@>=4.0.0 || >=5.0.0-beta", express@4.19.1: - version "4.19.1" - resolved "https://registry.npmjs.org/express/-/express-4.19.1.tgz" - integrity sha512-K4w1/Bp7y8iSiVObmCrtq8Cs79XjJc/RU2YYkZQ7wpUu5ZyZ7MtPHkqoMz4pf+mgXfNvo2qft8D9OnrH2ABk9w== +express@4.19.2: + version "4.19.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" + integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== dependencies: accepts "~1.3.8" array-flatten "1.1.1" @@ -6397,7 +5999,7 @@ feed@4.2.2: dependencies: xml-js "^1.6.11" -figures@^3.0.0, figures@3.2.0: +figures@3.2.0, figures@^3.0.0: version "3.2.0" resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -6459,6 +6061,14 @@ find-cache-dir@^3.2.0: make-dir "^3.0.2" pkg-dir "^4.1.0" +find-up@5.0.0, find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" @@ -6481,14 +6091,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz" @@ -6498,14 +6100,6 @@ find-up@^7.0.0: path-exists "^5.0.0" unicorn-magic "^0.1.0" -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - flat-cache@^3.0.4: version "3.2.0" resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz" @@ -6662,6 +6256,11 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +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.npmjs.org/function-bind/-/function-bind-1.1.2.tgz" @@ -6752,6 +6351,11 @@ get-stdin@^8.0.0: resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz" integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== +get-stream@6.0.0: + version "6.0.0" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz" + integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== + get-stream@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" @@ -6762,11 +6366,6 @@ get-stream@^8.0.1: resolved "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz" integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA== -get-stream@6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz" - integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== - get-symbol-description@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" @@ -6838,12 +6437,12 @@ gitconfiglocal@^1.0.0: dependencies: ini "^1.3.2" -github-slugger@^2.0.0, github-slugger@2.0.0: +github-slugger@2.0.0, github-slugger@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz" integrity sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw== -glob-parent@^5.1.2, glob-parent@~5.1.2, glob-parent@5.1.2: +glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -6857,74 +6456,6 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: - version "10.3.12" - resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz" - integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== - dependencies: - foreground-child "^3.1.0" - jackspeak "^2.3.6" - minimatch "^9.0.1" - minipass "^7.0.4" - path-scurry "^1.10.2" - -glob@^7.1.1: - version "7.2.3" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.4: - version "7.2.3" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^8.0.1: - version "8.1.0" - resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -glob@^9.2.0: - version "9.3.5" - resolved "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz" - integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== - dependencies: - fs.realpath "^1.0.0" - minimatch "^8.0.2" - minipass "^4.2.4" - path-scurry "^1.6.1" - glob@10.3.10: version "10.3.10" resolved "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz" @@ -6936,7 +6467,7 @@ glob@10.3.10: minipass "^5.0.0 || ^6.0.2 || ^7.0.0" path-scurry "^1.10.1" -glob@8.1.0: +glob@8.1.0, glob@^8.0.1: version "8.1.0" resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -6947,6 +6478,39 @@ glob@8.1.0: minimatch "^5.0.1" once "^1.3.0" +glob@^10.2.2, glob@^10.3.10, glob@^10.3.7: + version "10.3.12" + resolved "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz" + integrity sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.6" + minimatch "^9.0.1" + minipass "^7.0.4" + path-scurry "^1.10.2" + +glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +glob@^9.2.0: + version "9.3.5" + resolved "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz" + integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q== + dependencies: + fs.realpath "^1.0.0" + minimatch "^8.0.2" + minipass "^4.2.4" + path-scurry "^1.6.1" + global-directory@^4.0.1: version "4.0.1" resolved "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz" @@ -6973,7 +6537,7 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" -globby@^11.1.0, globby@11.1.0: +globby@11.1.0, globby@^11.1.0: version "11.1.0" resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -6992,7 +6556,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@4.2.11: +graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -7077,7 +6641,7 @@ has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: dependencies: has-symbols "^1.0.3" -has-unicode@^2.0.1, has-unicode@2.0.1: +has-unicode@2.0.1, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== @@ -7361,7 +6925,7 @@ hexoid@^1.0.0: resolved "https://registry.npmjs.org/hexoid/-/hexoid-1.0.0.tgz" integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g== -highlight.js@~11.9.0, highlight.js@11.9.0: +highlight.js@11.9.0, highlight.js@~11.9.0: version "11.9.0" resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz" integrity sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw== @@ -7398,14 +6962,7 @@ hosted-git-info@^3.0.6: dependencies: lru-cache "^6.0.0" -hosted-git-info@^4.0.0: - version "4.1.0" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: version "4.1.0" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== @@ -7482,16 +7039,6 @@ html-whitespace-sensitive-tag-names@^3.0.0: resolved "https://registry.npmjs.org/html-whitespace-sensitive-tag-names/-/html-whitespace-sensitive-tag-names-3.0.0.tgz" integrity sha512-KlClZ3/Qy5UgvpvVvDomGhnQhNWH5INE8GwvSIQ9CWt1K0zbbXrl7eN5bWaafOZgtmO3jMPwUqmrmEwinhPq1w== -htmlparser2@^8.0.1, htmlparser2@^8.0.2: - version "8.0.2" - resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz" - integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.3" - domutils "^3.0.1" - entities "^4.4.0" - htmlparser2@3.8.x: version "3.8.3" resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz" @@ -7513,6 +7060,16 @@ htmlparser2@9.1.0: domutils "^3.1.0" entities "^4.5.0" +htmlparser2@^8.0.1, htmlparser2@^8.0.2: + version "8.0.2" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz" + integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.3" + domutils "^3.0.1" + entities "^4.4.0" + http-cache-semantics@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz" @@ -7598,28 +7155,21 @@ i18next-fs-backend@^2.3.1: resolved "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.1.tgz" integrity sha512-tvfXskmG/9o+TJ5Fxu54sSO5OkY6d+uMn+K6JiUGLJrwxAVfer+8V3nU8jq3ts9Pe5lXJv4b1N7foIjJ8Iy2Gg== -"i18next@>= 23.2.3", "i18next@>= 23.7.13", i18next@23.11.2: +i18next@23.11.2: version "23.11.2" resolved "https://registry.npmjs.org/i18next/-/i18next-23.11.2.tgz" integrity sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA== dependencies: "@babel/runtime" "^7.23.2" -iconv-lite@^0.4.24, iconv-lite@0.4.24: +iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -iconv-lite@0.6: +iconv-lite@0.6, iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -7636,6 +7186,13 @@ ignore-by-default@^1.0.1: resolved "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz" integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== +ignore-walk@3.0.4: + version "3.0.4" + resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz" + integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== + dependencies: + minimatch "^3.0.4" + ignore-walk@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz" @@ -7650,13 +7207,6 @@ ignore-walk@^6.0.4: dependencies: minimatch "^9.0.0" -ignore-walk@3.0.4: - version "3.0.4" - resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz" - integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== - dependencies: - minimatch "^3.0.4" - ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.3.0: version "5.3.1" resolved "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz" @@ -7701,21 +7251,21 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@2, inherits@2.0.4: +inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@^1.3.2, ini@^1.3.8: - version "1.3.8" - resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - ini@4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz" integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g== +ini@^1.3.2, ini@^1.3.8: + version "1.3.8" + resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + init-package-json@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz" @@ -7812,16 +7362,16 @@ internal-slot@^1.0.4, internal-slot@^1.0.5: hasown "^2.0.0" side-channel "^1.0.4" -internmap@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz" - integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== - "internmap@1 - 2": version "2.0.3" resolved "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz" integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== +internmap@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz" + integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== + ip-regex@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz" @@ -8071,22 +7621,12 @@ is-path-inside@^3.0.3: resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^1.0.0: +is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-plain-obj@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-plain-obj@^2.1.0: +is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== @@ -8156,6 +7696,11 @@ is-ssh@^1.4.0: dependencies: protocols "^2.0.1" +is-stream@2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + is-stream@^2.0.0: version "2.0.1" resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz" @@ -8166,11 +7711,6 @@ is-stream@^3.0.0: resolved "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz" integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== -is-stream@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== - is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" @@ -8258,6 +7798,11 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" +isarray@0.0.1: + version "0.0.1" + resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== + isarray@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz" @@ -8268,12 +7813,7 @@ isarray@~1.0.0: resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" - integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== - -iserror@^0.0.2, iserror@0.0.2: +iserror@0.0.2, iserror@^0.0.2: version "0.0.2" resolved "https://registry.npmjs.org/iserror/-/iserror-0.0.2.tgz" integrity sha512-oKGGrFVaWwETimP3SiWwjDeY27ovZoyZPHtxblC4hCq9fXxed/jasx+ATWFFjCVSRZng8VTMsN1nDnGo6zMBSw== @@ -8388,7 +7928,7 @@ javascript-stringify@^2.0.1: resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz" integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg== -jest-diff@^29.4.1, "jest-diff@>=29.4.3 < 30": +"jest-diff@>=29.4.3 < 30", jest-diff@^29.4.1: version "29.7.0" resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz" integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== @@ -8413,7 +7953,7 @@ jotai-location@0.5.4: resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== -jotai@>=1.11.0, jotai@2.7.1: +jotai@2.7.1: version "2.7.1" resolved "https://registry.npmjs.org/jotai/-/jotai-2.7.1.tgz" integrity sha512-bsaTPn02nFgWNP6cBtg/htZhCu4s0wxqoklRHePp6l/vlsypR9eLn7diRliwXYWMXDpPvW/LLA2afI8vwgFFaw== @@ -8428,7 +7968,7 @@ js-base64@^2.1.9: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0: +js-yaml@3.14.1, js-yaml@^3.10.0, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -8436,29 +7976,13 @@ js-yaml@^3.10.0: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^4.0.0, js-yaml@^4.1.0, js-yaml@4.1.0: +js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" -js-yaml@3.14.1: - version "3.14.1" - resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsesc@^2.5.1: version "2.5.2" resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz" @@ -8572,14 +8096,6 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -JSONStream@^1.3.5: - version "1.3.5" - resolved "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz" - integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== - dependencies: - jsonparse "^1.2.0" - through ">=2.2.7 <3" - jsonwebtoken@^9.0.0: version "9.0.2" resolved "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz" @@ -8794,16 +8310,16 @@ libnpmpublish@7.3.0: sigstore "^1.4.0" ssri "^10.0.1" +lilconfig@3.0.0, lilconfig@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz" + integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== + lilconfig@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz" integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ== -lilconfig@^3.0.0, lilconfig@3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz" - integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g== - linebreak@^1.0.2: version "1.1.0" resolved "https://registry.npmjs.org/linebreak/-/linebreak-1.1.0.tgz" @@ -8850,6 +8366,16 @@ listr2@8.0.1: rfdc "^1.3.0" wrap-ansi "^9.0.0" +load-json-file@6.2.0: + version "6.2.0" + resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz" + integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== + dependencies: + graceful-fs "^4.1.15" + parse-json "^5.0.0" + strip-bom "^4.0.0" + type-fest "^0.6.0" + load-json-file@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz" @@ -8871,16 +8397,6 @@ load-json-file@^5.2.0: strip-bom "^3.0.0" type-fest "^0.3.0" -load-json-file@6.2.0: - version "6.2.0" - resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-6.2.0.tgz" - integrity sha512-gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ== - dependencies: - graceful-fs "^4.1.15" - parse-json "^5.0.0" - strip-bom "^4.0.0" - type-fest "^0.6.0" - loader-utils@^2.0.0: version "2.0.4" resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz" @@ -8942,7 +8458,7 @@ lodash.castarray@^4.4.0: resolved "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz" integrity sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q== -lodash.clonedeep@^4.5.0, lodash.clonedeep@4.5.0: +lodash.clonedeep@4.5.0, lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz" integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== @@ -8962,7 +8478,7 @@ lodash.flattendeep@^4.4.0: resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz" integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== -lodash.get@^4.4.2, lodash.get@4.4.2: +lodash.get@4.4.2, lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== @@ -9082,7 +8598,7 @@ lodash@^4.11.2, lodash@^4.17.19, lodash@^4.17.21, lodash@~4.17.21: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@^4.0.0, log-symbols@^4.1.0, log-symbols@4.1.0: +log-symbols@4.1.0, log-symbols@^4.0.0, log-symbols@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -9161,12 +8677,7 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.5.1: - version "7.18.3" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" - integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== - -lru-cache@^7.7.1: +lru-cache@^7.5.1, lru-cache@^7.7.1: version "7.18.3" resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== @@ -9183,6 +8694,13 @@ magic-string@^0.25.3: dependencies: sourcemap-codec "^1.4.8" +make-dir@4.0.0, make-dir@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" + integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== + dependencies: + semver "^7.5.3" + make-dir@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz" @@ -9198,20 +8716,6 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-dir@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" - integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== - dependencies: - semver "^7.5.3" - -make-dir@4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz" - integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw== - dependencies: - semver "^7.5.3" - make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.1: version "11.1.1" resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz" @@ -9294,18 +8798,7 @@ mdast-util-find-and-replace@^3.0.0: unist-util-is "^6.0.0" unist-util-visit-parents "^6.0.0" -mdast-util-from-markdown@^0.8.0: - version "0.8.5" - resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz" - integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^2.0.0" - micromark "~2.11.0" - parse-entities "^2.0.0" - unist-util-stringify-position "^2.0.0" - -mdast-util-from-markdown@^0.8.5: +mdast-util-from-markdown@^0.8.0, mdast-util-from-markdown@^0.8.5: version "0.8.5" resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz" integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== @@ -10324,7 +9817,7 @@ micromark@~2.11.0: debug "^4.0.0" parse-entities "^2.0.0" -micromatch@^4.0.4, micromatch@^4.0.5, micromatch@4.0.5: +micromatch@4.0.5, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -10369,6 +9862,27 @@ min-indent@^1.0.0: resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== +minimatch@3.0.5: + version "3.0.5" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz" + integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== + dependencies: + brace-expansion "^1.1.7" + +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: + version "9.0.3" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" @@ -10390,20 +9904,6 @@ minimatch@^8.0.2: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.0, minimatch@^9.0.3: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^9.0.1: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minimatch@~3.0.2: version "3.0.8" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz" @@ -10411,27 +9911,6 @@ minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" -minimatch@3.0.5: - version "3.0.5" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz" - integrity sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@9.0.3: - version "9.0.3" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minimist-options@4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz" @@ -10512,16 +9991,16 @@ minipass@^4.2.4: resolved "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz" integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ== -"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: - version "7.0.4" - resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" - integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== - minipass@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4: + version "7.0.4" + resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz" @@ -10530,25 +10009,25 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - mkdirp@0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz" integrity sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew== +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + mocha-steps@1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@^10.0.0: - version "10.4.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz" - integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== +mocha@10.3.0: + version "10.3.0" + resolved "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz" + integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== dependencies: ansi-colors "4.1.1" browser-stdout "1.3.1" @@ -10571,10 +10050,10 @@ mocha@^10.0.0: yargs-parser "20.2.4" yargs-unparser "2.0.0" -mocha@10.3.0: - version "10.3.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz" - integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== +mocha@^10.0.0: + version "10.4.0" + resolved "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz" + integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== dependencies: ansi-colors "4.1.1" browser-stdout "1.3.1" @@ -10612,11 +10091,6 @@ mrmime@^2.0.0: resolved "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz" integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw== -ms@^2.0.0, ms@^2.1.1, ms@2.1.3: - version "2.1.3" - resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - ms@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" @@ -10627,6 +10101,11 @@ ms@2.1.2: resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@2.1.3, ms@^2.0.0, ms@^2.1.1: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multimatch@5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz" @@ -10638,21 +10117,21 @@ multimatch@5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -mustache@^4.0.1, mustache@4.2.0: +mustache@4.2.0, mustache@^4.0.1: version "4.2.0" resolved "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz" integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== -mute-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz" - integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== - mute-stream@0.0.8: version "0.0.8" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mute-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz" + integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== + mz@^2.7.0: version "2.7.0" resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz" @@ -10672,7 +10151,7 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -negotiator@^0.6.3, negotiator@0.6.3: +negotiator@0.6.3, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== @@ -10698,7 +10177,7 @@ next-i18next@15.2.0: hoist-non-react-statics "^3.3.2" i18next-fs-backend "^2.3.1" -"next@>= 12.0.0", next@14.1.4: +next@14.1.4: version "14.1.4" resolved "https://registry.npmjs.org/next/-/next-14.1.4.tgz" integrity sha512-1WTaXeSrUwlz/XcnhGTY7+8eiaFvdet5z9u3V2jb+Ek1vFo0VhHKSAIJvDWfQpttWjnyw14kBeq28TPq7bTeEQ== @@ -10739,13 +10218,6 @@ nlcst-to-string@^3.0.0: dependencies: "@types/nlcst" "^1.0.0" -node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - node-fetch@2.6.7: version "2.6.7" resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz" @@ -10753,6 +10225,13 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" +node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7: + version "2.7.0" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + node-gyp@^10.0.0: version "10.0.1" resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz" @@ -10807,6 +10286,13 @@ non-layered-tidy-tree-layout@^2.0.2: resolved "https://registry.npmjs.org/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz" integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw== +nopt@1.0.10, nopt@~1.0.10: + version "1.0.10" + resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" + integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== + dependencies: + abbrev "1" + nopt@^7.0.0: version "7.2.0" resolved "https://registry.npmjs.org/nopt/-/nopt-7.2.0.tgz" @@ -10814,13 +10300,6 @@ nopt@^7.0.0: dependencies: abbrev "^2.0.0" -nopt@~1.0.10, nopt@1.0.10: - version "1.0.10" - resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" - integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== - dependencies: - abbrev "1" - normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz" @@ -10831,17 +10310,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: - version "3.0.3" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^3.0.3: +normalize-package-data@^3.0.0, normalize-package-data@^3.0.3: version "3.0.3" resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -10912,6 +10381,15 @@ npm-normalize-package-bin@^3.0.0: resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz" integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ== +npm-package-arg@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz" + integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg== + dependencies: + hosted-git-info "^3.0.6" + semver "^7.0.0" + validate-npm-package-name "^3.0.0" + npm-package-arg@^10.0.0, npm-package-arg@^10.1.0: version "10.1.0" resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz" @@ -10932,22 +10410,6 @@ npm-package-arg@^11.0.0: semver "^7.3.5" validate-npm-package-name "^5.0.0" -npm-package-arg@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz" - integrity sha512-CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg== - dependencies: - hosted-git-info "^3.0.6" - semver "^7.0.0" - validate-npm-package-name "^3.0.0" - -npm-packlist@^8.0.0: - version "8.0.2" - resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz" - integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA== - dependencies: - ignore-walk "^6.0.4" - npm-packlist@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz" @@ -10958,6 +10420,13 @@ npm-packlist@5.1.1: npm-bundled "^1.1.2" npm-normalize-package-bin "^1.0.1" +npm-packlist@^8.0.0: + version "8.0.2" + resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz" + integrity sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA== + dependencies: + ignore-walk "^6.0.4" + npm-pick-manifest@^9.0.0: version "9.0.0" resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz" @@ -11025,7 +10494,7 @@ nth-check@^2.0.1: dependencies: boolbase "^1.0.0" -"nx@>= 16 <= 18", "nx@>=17.1.2 < 19", nx@18.0.2: +nx@18.0.2, "nx@>=17.1.2 < 19": version "18.0.2" resolved "https://registry.npmjs.org/nx/-/nx-18.0.2.tgz" integrity sha512-Ibnz493HnANU15Bg/oVi/X0BO35KkU0zkOmWYeaJEhpFdGNOKzH5pdPYuTuToQiViCNpXLsPo4rPIv2pdMAclA== @@ -11076,7 +10545,7 @@ nth-check@^2.0.1: "@nx/nx-win32-arm64-msvc" "18.0.2" "@nx/nx-win32-x64-msvc" "18.0.2" -nyc@^15.1.0, nyc@15.1.0: +nyc@15.1.0, nyc@^15.1.0: version "15.1.0" resolved "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz" integrity sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A== @@ -11251,21 +10720,6 @@ optionator@^0.9.3: prelude-ls "^1.2.1" type-check "^0.4.0" -ora@^5.4.1: - version "5.4.1" - resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - ora@5.3.0: version "5.3.0" resolved "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz" @@ -11295,6 +10749,21 @@ ora@8.0.1: string-width "^7.0.0" strip-ansi "^7.1.0" +ora@^5.4.1: + version "5.4.1" + resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz" + integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== + dependencies: + bl "^4.1.0" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-spinners "^2.5.0" + is-interactive "^1.0.0" + is-unicode-supported "^0.1.0" + log-symbols "^4.1.0" + strip-ansi "^6.0.0" + wcwidth "^1.0.1" + os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz" @@ -11389,6 +10858,13 @@ p-map-series@2.1.0: resolved "https://registry.npmjs.org/p-map-series/-/p-map-series-2.1.0.tgz" integrity sha512-RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q== +p-map@4.0.0, p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" + p-map@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz" @@ -11396,13 +10872,6 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^4.0.0, p-map@4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - p-pipe@3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/p-pipe/-/p-pipe-3.1.0.tgz" @@ -11416,7 +10885,7 @@ p-queue@6.6.2: eventemitter3 "^4.0.4" p-timeout "^3.2.0" -p-reduce@^2.0.0, p-reduce@^2.1.0, p-reduce@2.1.0: +p-reduce@2.1.0, p-reduce@^2.0.0, p-reduce@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz" integrity sha512-2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw== @@ -11601,7 +11070,7 @@ passport-jwt@4.0.1: jsonwebtoken "^9.0.0" passport-strategy "^1.0.0" -passport-strategy@^1.0.0, passport-strategy@1.x.x: +passport-strategy@1.x.x, passport-strategy@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== @@ -11658,16 +11127,16 @@ path-scurry@^1.10.1, path-scurry@^1.10.2, path-scurry@^1.6.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@^6.2.1: - version "6.2.1" - resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz" - integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw== - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz" integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@^6.2.1: + version "6.2.1" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz" + integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw== + path-type@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz" @@ -11747,6 +11216,11 @@ pidtree@0.6.0: resolved "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== +pify@5.0.0, pify@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" + integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== + pify@^2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz" @@ -11762,16 +11236,6 @@ pify@^4.0.1: resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz" integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== -pify@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" - integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== - -pify@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz" - integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== - pino-abstract-transport@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz" @@ -11878,14 +11342,6 @@ postcss-nested@^6.0.1: dependencies: postcss-selector-parser "^6.0.11" -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6: - version "6.0.15" - resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz" - integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - postcss-selector-parser@6.0.10: version "6.0.10" resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz" @@ -11894,6 +11350,14 @@ postcss-selector-parser@6.0.10: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.6: + version "6.0.15" + resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz" + integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw== + dependencies: + cssesc "^3.0.0" + util-deprecate "^1.0.2" + postcss-simple-vars@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-2.0.0.tgz" @@ -11906,35 +11370,6 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^5.0.0: - version "5.2.18" - resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^5.0.21: - version "5.2.18" - resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^8.0.0, postcss@^8.1.0, postcss@^8.2.14, postcss@^8.2.15, postcss@^8.4.21, postcss@^8.4.23, postcss@>=8.0.9, postcss@8.4.38: - version "8.4.38" - resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" - integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== - dependencies: - nanoid "^3.3.7" - picocolors "^1.0.0" - source-map-js "^1.2.0" - postcss@8.4.31: version "8.4.31" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz" @@ -11944,6 +11379,25 @@ postcss@8.4.31: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@8.4.38, postcss@^8.4.23: + version "8.4.38" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz" + integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.0" + source-map-js "^1.2.0" + +postcss@^5.0.0, postcss@^5.0.21: + version "5.2.18" + resolved "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz" + integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== + dependencies: + chalk "^1.1.3" + js-base64 "^2.1.9" + source-map "^0.5.6" + supports-color "^3.2.3" + preact@^10.10.0: version "10.19.3" resolved "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz" @@ -11986,7 +11440,7 @@ pretty-quick@^4.0.0: picomatch "^3.0.1" tslib "^2.6.2" -prisma@*, prisma@5.11.0: +prisma@5.11.0: version "5.11.0" resolved "https://registry.npmjs.org/prisma/-/prisma-5.11.0.tgz" integrity sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g== @@ -12120,6 +11574,13 @@ qrcode@1.5.3: pngjs "^5.0.0" yargs "^15.3.1" +qs@6.11.0: + version "6.11.0" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@^6.11.0, qs@^6.11.2: version "6.11.2" resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz" @@ -12132,13 +11593,6 @@ qs@^6.11.0, qs@^6.11.2: resolved "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz" integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -12184,7 +11638,7 @@ react-copy-to-clipboard@5.1.0: copy-to-clipboard "^3.3.1" prop-types "^15.8.1" -react-dom@*, react-dom@^18.2.0, "react-dom@>= 16.3.0 < 19", "react-dom@>= 16.8.0 < 19", react-dom@>=16.8.1, react-dom@>=18, react-dom@18.3.1: +react-dom@18.3.1: version "18.3.1" resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz" integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== @@ -12211,7 +11665,7 @@ react-hotkeys-hook@4.5.0: resolved "https://registry.npmjs.org/react-hotkeys-hook/-/react-hotkeys-hook-4.5.0.tgz" integrity sha512-Samb85GSgAWFQNvVt3PS90LPPGSf9mkH/r4au81ZP1yOIFayLC3QAvqTgGtJ8YEDMXtPmaVBs6NgipHO6h4Mug== -"react-i18next@>= 13.5.0", react-i18next@14.1.0: +react-i18next@14.1.0: version "14.1.0" resolved "https://registry.npmjs.org/react-i18next/-/react-i18next-14.1.0.tgz" integrity sha512-3KwX6LHpbvGQ+sBEntjV4sYW3Zovjjl3fpoHbUwSgFHf0uRBcbeCBLR5al6ikncI5+W0EFb71QXZmfop+J6NrQ== @@ -12290,7 +11744,7 @@ react-zoom-pan-pinch@3.4.3: resolved "https://registry.npmjs.org/react-zoom-pan-pinch/-/react-zoom-pan-pinch-3.4.3.tgz" integrity sha512-x5MFlfAx2D6NTpZu8OISqc2nYn4p+YEaM1p21w7S/VE1wbVzK8vRzTo9Bj1ydufa649MuP7JBRM3vvj1RftFZw== -react@*, "react@^15.0.0 || >=16.0.0", "react@^15.3.0 || 16 || 17 || 18", "react@^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.8.0 || ^17.0.0 || ^18.0.0", "react@^16.8.3 || ^17 || ^18", react@^18.2.0, react@^18.3.1, "react@>= 16.3.0 < 19", "react@>= 16.8 || 18.0.0", "react@>= 16.8.0", "react@>= 16.8.0 < 19", "react@>= 16.8.0 || 17.x.x || ^18.0.0-0", "react@>= 17.0.2", react@>=14, react@>=16, react@>=16.8.1, react@>=17.0.0, react@>=18, "react@0.14 || 15 || 16 || 17 || 18", react@18.3.1: +react@18.3.1, react@^18.2.0: version "18.3.1" resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz" integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== @@ -12317,7 +11771,7 @@ read-package-json-fast@^3.0.0: json-parse-even-better-errors "^3.0.0" npm-normalize-package-bin "^3.0.0" -read-package-json@^6.0.0, read-package-json@6.0.4: +read-package-json@6.0.4, read-package-json@^6.0.0: version "6.0.4" resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz" integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw== @@ -12380,6 +11834,16 @@ read@^2.0.0: dependencies: mute-stream "~1.0.0" +readable-stream@1.1: + version "1.1.13" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" + integrity sha512-E98tWzqShvKDGpR2MbjsDkDQWLW2TfWUC15H4tNQhIJ5Lsta84l8nUGL9/ybltGwe+wZzWPpc1Kmd2wQP4bdCA== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz" @@ -12413,16 +11877,6 @@ readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@1.1: - version "1.1.13" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz" - integrity sha512-E98tWzqShvKDGpR2MbjsDkDQWLW2TfWUC15H4tNQhIJ5Lsta84l8nUGL9/ybltGwe+wZzWPpc1Kmd2wQP4bdCA== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readdirp@~3.6.0: version "3.6.0" resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz" @@ -12435,7 +11889,7 @@ real-require@^0.2.0: resolved "https://registry.npmjs.org/real-require/-/real-require-0.2.0.tgz" integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== -recursive-readdir@^2.2.3, recursive-readdir@2.2.3: +recursive-readdir@2.2.3, recursive-readdir@^2.2.3: version "2.2.3" resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz" integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA== @@ -12543,12 +11997,6 @@ rehype-format@^5.0.0: rehype-minify-whitespace "^6.0.0" unist-util-visit-parents "^6.0.0" -"rehype-highlight-lines@file:/home/joost/git/freesewing/packages/rehype-highlight-lines": - version "3.2.0" - resolved "file:packages/rehype-highlight-lines" - dependencies: - unist-util-remove "4.0.0" - rehype-highlight@7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/rehype-highlight/-/rehype-highlight-7.0.0.tgz" @@ -12560,13 +12008,6 @@ rehype-highlight@7.0.0: unist-util-visit "^5.0.0" vfile "^6.0.0" -"rehype-jargon@file:/home/joost/git/freesewing/packages/rehype-jargon": - version "3.2.0" - resolved "file:packages/rehype-jargon" - dependencies: - hast-util-from-html "2.0.1" - unist-util-visit "5.0.0" - rehype-minify-whitespace@^4.0.0: version "4.0.5" resolved "https://registry.npmjs.org/rehype-minify-whitespace/-/rehype-minify-whitespace-4.0.5.tgz" @@ -12676,14 +12117,6 @@ remark-mdx-frontmatter@4.0.0: unified "^11.0.0" yaml "^2.0.0" -remark-mdx@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.0.tgz" - integrity sha512-O7yfjuC6ra3NHPbRVxfflafAj3LTwx3b73aBvkEFU5z4PsD6FD4vrqJAkE5iNGLz71GdjXfgRqm3SQ0h0VuE7g== - dependencies: - mdast-util-mdx "^3.0.0" - micromark-extension-mdxjs "^3.0.0" - remark-mdx@2.0.0-next.9: version "2.0.0-next.9" resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.9.tgz" @@ -12693,6 +12126,14 @@ remark-mdx@2.0.0-next.9: micromark-extension-mdx "^0.2.0" micromark-extension-mdxjs "^0.3.0" +remark-mdx@^3.0.0: + version "3.0.0" + resolved "https://registry.npmjs.org/remark-mdx/-/remark-mdx-3.0.0.tgz" + integrity sha512-O7yfjuC6ra3NHPbRVxfflafAj3LTwx3b73aBvkEFU5z4PsD6FD4vrqJAkE5iNGLz71GdjXfgRqm3SQ0h0VuE7g== + dependencies: + mdast-util-mdx "^3.0.0" + micromark-extension-mdxjs "^3.0.0" + remark-parse@^11.0.0: version "11.0.0" resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz" @@ -12788,16 +12229,16 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" +resolve-from@5.0.0, resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-from@^5.0.0, resolve-from@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - resolve-pkg-maps@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz" @@ -12901,14 +12342,7 @@ rfdc@^1.3.0: resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz" integrity sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg== -rimraf@^3.0.0: - version "3.0.2" - resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -12982,7 +12416,7 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0, safe-buffer@5.2.1: +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -13035,22 +12469,12 @@ selderee@^0.11.0: dependencies: parseley "^0.12.0" -semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.6.0: version "5.7.2" resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^6.0.0: - version "6.3.1" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^6.3.0: - version "6.3.1" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" - integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== - -semver@^6.3.1: +semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== @@ -13062,11 +12486,6 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve dependencies: lru-cache "^6.0.0" -"semver@2 || 3 || 4 || 5": - version "5.7.2" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== - send@0.18.0: version "0.18.0" resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz" @@ -13161,17 +12580,12 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7, signal-exit@3.0.7: +signal-exit@3.0.7, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -signal-exit@^4.0.1: - version "4.1.0" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" - integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== - -signal-exit@^4.1.0: +signal-exit@^4.0.1, signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== @@ -13237,7 +12651,7 @@ size-sensor@^1.0.1: resolved "https://registry.npmjs.org/size-sensor/-/size-sensor-1.0.2.tgz" integrity sha512-2NCmWxY7A9pYKGXNBfteo4hy14gWu47rg5692peVMst6lQLPKrVjhY+UTEsPI5ceFRJSl3gVgMYaUi/hKuaiKw== -slash@^3.0.0, slash@3.0.0: +slash@3.0.0, slash@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== @@ -13381,13 +12795,6 @@ spdx-license-ids@^3.0.0: resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz" integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== -split@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - split2@^3.2.2: version "3.2.2" resolved "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz" @@ -13400,6 +12807,13 @@ split2@^4.0.0: resolved "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz" integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== +split@^1.0.1: + version "1.0.1" + resolved "https://registry.npmjs.org/split/-/split-1.0.1.tgz" + integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== + dependencies: + through "2" + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz" @@ -13485,25 +12899,6 @@ streamsearch@^1.1.0: resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz" integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== -string_decoder@^1.1.1, string_decoder@^1.3.0: - version "1.3.0" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" - integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - string-argv@0.3.2: version "0.3.2" resolved "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz" @@ -13587,6 +12982,25 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string_decoder@^1.1.1, string_decoder@^1.3.0: + version "1.3.0" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz" + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + stringify-entities@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz" @@ -13625,14 +13039,7 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.0.1: - version "7.1.0" - resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" - integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== - dependencies: - ansi-regex "^6.0.1" - -strip-ansi@^7.1.0: +strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== @@ -13666,16 +13073,16 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -strip-json-comments@^3.1.1, strip-json-comments@3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - strip-json-comments@1.0.x: version "1.0.4" resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz" integrity sha512-AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg== +strip-json-comments@3.1.1, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + strip-markdown@6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/strip-markdown/-/strip-markdown-6.0.0.tgz" @@ -13688,7 +13095,7 @@ strnum@^1.0.5: resolved "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz" integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== -strong-log-transformer@^2.1.0, strong-log-transformer@2.1.0: +strong-log-transformer@2.1.0, strong-log-transformer@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz" integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA== @@ -13709,6 +13116,13 @@ style-to-js@1.1.12: dependencies: style-to-object "1.0.6" +style-to-object@1.0.6: + version "1.0.6" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.6.tgz" + integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== + dependencies: + inline-style-parser "0.2.3" + style-to-object@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz" @@ -13730,13 +13144,6 @@ style-to-object@^1.0.0: dependencies: inline-style-parser "0.2.2" -style-to-object@1.0.6: - version "1.0.6" - resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.6.tgz" - integrity sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA== - dependencies: - inline-style-parser "0.2.3" - styled-jsx@5.1.1: version "5.1.1" resolved "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.1.tgz" @@ -13778,6 +13185,13 @@ superagent@^8.0.9: qs "^6.11.0" semver "^7.3.8" +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" @@ -13790,14 +13204,7 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^5.5.0: +supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13811,13 +13218,6 @@ supports-color@^7.1.0, supports-color@^7.2.0: dependencies: has-flag "^4.0.0" -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" @@ -13827,7 +13227,7 @@ supports-preserve-symlinks-flag@^1.0.0: version "0.1.10" resolved "git+https://git@github.com/eriese/SVG-to-PDFKit.git#388d8c29a7b6b1353ea6b65f683ed939e4a7725f" -swagger-ui-dist@>=5.0.0, swagger-ui-dist@5.17.2: +swagger-ui-dist@5.17.2, swagger-ui-dist@>=5.0.0: version "5.17.2" resolved "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.17.2.tgz" integrity sha512-V/NqUw6QoTrjSpctp2oLQvxrl3vW29UsUtZyq7B1CF0v870KOFbYGDQw8rpKaKm0JxTwHpWnW1SN9YuKZdiCyw== @@ -13846,7 +13246,7 @@ synckit@^0.6.0: dependencies: tslib "^2.3.1" -"tailwindcss@>=3.0.0 || insiders", tailwindcss@3.4.1: +tailwindcss@3.4.1: version "3.4.1" resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz" integrity sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA== @@ -13890,18 +13290,6 @@ tar-stream@~2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.1.11, tar@^6.1.2: - version "6.2.0" - resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz" - integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - tar@6.1.11: version "6.1.11" resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz" @@ -13914,6 +13302,18 @@ tar@6.1.11: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11, tar@^6.1.2: + version "6.2.0" + resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + teeny-request@7.1.1: version "7.1.1" resolved "https://registry.npmjs.org/teeny-request/-/teeny-request-7.1.1.tgz" @@ -13980,11 +13380,6 @@ thread-stream@^2.6.0: dependencies: real-require "^0.2.0" -through@^2.3.4, through@^2.3.6, "through@>=2.2.7 <3", through@2: - version "2.3.8" - resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - through2@^2.0.0: version "2.0.5" resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" @@ -13993,6 +13388,11 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" +through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: + version "2.3.8" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== + tiny-inflate@^1.0.0, tiny-inflate@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz" @@ -14122,12 +13522,12 @@ tsconfig-paths@^4.1.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1.11.1: - version "1.14.1" - resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== -tslib@^1.9.0: +tslib@^1.11.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -14137,11 +13537,6 @@ tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6 resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tslib@2.3.0: - version "2.3.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" - integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== - tuf-js@^1.1.7: version "1.1.7" resolved "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz" @@ -14172,7 +13567,7 @@ type-component@0.0.1: resolved "https://registry.npmjs.org/type-component/-/type-component-0.0.1.tgz" integrity sha512-mDZRBQS2yZkwRQKfjJvQ8UIYJeBNNWCq+HBNstl9N5s9jZ4dkVYXEGkVPsSCEh5Ld4JM1kmrZTzjnrqSAIQ7dw== -type-detect@^4.0.8, type-detect@4.0.8: +type-detect@4.0.8, type-detect@^4.0.8: version "4.0.8" resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== @@ -14207,12 +13602,7 @@ type-fest@^0.6.0: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-fest@^0.8.0: - version "0.8.1" - resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-fest@^0.8.1: +type-fest@^0.8.0, type-fest@^0.8.1: version "0.8.1" resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== @@ -14281,7 +13671,7 @@ typedarray@^0.0.6: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -"typescript@>=3 < 6", typescript@>=3.3.1, typescript@>=4, typescript@>=4.2.0, typescript@>=4.9.5: +"typescript@>=3 < 6": version "5.3.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz" integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== @@ -14491,13 +13881,6 @@ unist-util-remove-position@^5.0.0: "@types/unist" "^3.0.0" unist-util-visit "^5.0.0" -unist-util-remove@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" - integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== - dependencies: - unist-util-is "^4.0.0" - unist-util-remove@4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-4.0.0.tgz" @@ -14507,6 +13890,13 @@ unist-util-remove@4.0.0: unist-util-is "^6.0.0" unist-util-visit-parents "^6.0.0" +unist-util-remove@^2.0.0: + version "2.1.0" + resolved "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz" + integrity sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q== + dependencies: + unist-util-is "^4.0.0" + unist-util-stringify-position@^2.0.0: version "2.0.3" resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz" @@ -14559,6 +13949,15 @@ unist-util-visit-parents@^6.0.0: "@types/unist" "^3.0.0" unist-util-is "^6.0.0" +unist-util-visit@5.0.0, unist-util-visit@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz" + integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg== + dependencies: + "@types/unist" "^3.0.0" + unist-util-is "^6.0.0" + unist-util-visit-parents "^6.0.0" + unist-util-visit@^2.0.0: version "2.0.3" resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz" @@ -14577,15 +13976,6 @@ unist-util-visit@^4.0.0: unist-util-is "^5.0.0" unist-util-visit-parents "^5.1.1" -unist-util-visit@^5.0.0, unist-util-visit@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz" - integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg== - dependencies: - "@types/unist" "^3.0.0" - unist-util-is "^6.0.0" - unist-util-visit-parents "^6.0.0" - universal-user-agent@^6.0.0: version "6.0.1" resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz" @@ -14596,7 +13986,7 @@ universalify@^2.0.0: resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz" integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== -unpipe@~1.0.0, unpipe@1.0.0: +unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== @@ -14643,17 +14033,12 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -utils-merge@^1.0.1, utils-merge@1.0.1: +utils-merge@1.0.1, utils-merge@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz" integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== -uuid@^8.0.0: - version "8.3.2" - resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -uuid@^8.3.2: +uuid@^8.0.0, uuid@^8.3.2: version "8.3.2" resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -14682,7 +14067,7 @@ v8-to-istanbul@^9.0.0: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^2.0.0" -validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4, validate-npm-package-license@3.0.4: +validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -14690,6 +14075,13 @@ validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4, valida spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +validate-npm-package-name@5.0.0, validate-npm-package-name@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz" + integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== + dependencies: + builtins "^5.0.0" + validate-npm-package-name@^3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz" @@ -14697,13 +14089,6 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validate-npm-package-name@^5.0.0, validate-npm-package-name@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz" - integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== - dependencies: - builtins "^5.0.0" - vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz" @@ -14792,7 +14177,7 @@ web-namespaces@^2.0.0: resolved "https://registry.npmjs.org/web-namespaces/-/web-namespaces-2.0.1.tgz" integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ== -web-worker@^1.2.0, web-worker@1.3.0: +web-worker@1.3.0, web-worker@^1.2.0: version "1.3.0" resolved "https://registry.npmjs.org/web-worker/-/web-worker-1.3.0.tgz" integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA== @@ -14965,6 +14350,14 @@ wrappy@1: resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== +write-file-atomic@5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== + dependencies: + imurmurhash "^0.1.4" + signal-exit "^4.0.1" + write-file-atomic@^2.4.2: version "2.4.3" resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz" @@ -14984,14 +14377,6 @@ write-file-atomic@^3.0.0: signal-exit "^3.0.2" typedarray-to-buffer "^3.1.5" -write-file-atomic@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz" - integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^4.0.1" - write-json-file@^3.2.0: version "3.2.0" resolved "https://registry.npmjs.org/write-json-file/-/write-json-file-3.2.0.tgz" @@ -15064,11 +14449,21 @@ yaml-loader@0.8.1: loader-utils "^2.0.0" yaml "^2.0.0" -yaml@^2.0.0, yaml@^2.3.4, yaml@2.3.4: +yaml@2.3.4, yaml@^2.0.0, yaml@^2.3.4: version "2.3.4" resolved "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz" integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA== +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs-parser@21.1.1, yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz" @@ -15077,26 +14472,11 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^20.2.2: +yargs-parser@^20.2.2, yargs-parser@^20.2.3: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.1.1, yargs-parser@21.1.1: - version "21.1.1" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz" @@ -15107,58 +14487,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@^15.0.1: - version "15.4.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.2" - -yargs@^15.0.2: - version "15.4.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.2" - -yargs@^15.3.1: - version "15.4.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.2" - -yargs@^16.2.0: +yargs@16.2.0, yargs@^16.2.0: version "16.2.0" resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -15171,7 +14500,7 @@ yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2, yargs@17.7.2: +yargs@17.7.2, yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2: version "17.7.2" resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz" integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== @@ -15184,18 +14513,22 @@ yargs@^17.0.0, yargs@^17.6.2, yargs@^17.7.2, yargs@17.7.2: y18n "^5.0.5" yargs-parser "^21.1.1" -yargs@16.2.0: - version "16.2.0" - resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== +yargs@^15.0.1, yargs@^15.0.2, yargs@^15.3.1: + version "15.4.1" + resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" yarn@^1.22.19: version "1.22.22" From b15c1fd24cd7d7493e74ad2b89591b69c0deceed Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 17:01:55 +0200 Subject: [PATCH 786/795] fix(charlie): Cutting instructions for the fly facing Fixes #6392 Shout-out to @jpmunic for reporting this. --- CHANGELOG.md | 6 ++++++ config/changelog.yaml | 2 ++ designs/charlie/src/fly-facing.mjs | 2 +- markdown/org/docs/designs/charlie/cutting/en.md | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 592bb59cca7..1f2d9c50f47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ - Allow negative values in backDrop option. Fixes - Allow negative values for the frontRise options. Fixes +### charlie + +#### Fixed + + - Fix cut instructions for fly facing, only 1 to be cut. Fixes + ### huey #### Changed diff --git a/config/changelog.yaml b/config/changelog.yaml index 4a3c89c98dc..811a68637f0 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -31,6 +31,8 @@ Unreleased: - The `withCondition` named export is deprecated and will always return true. Fixed: + charlie: + - Fix cut instructions for fly facing, only 1 to be cut. Fixes #6392 huey: - Fixed an issue where ribbing height would distort the pocket under certain conditions. Fixes #6238 - Adding missing translation for ribbing option diff --git a/designs/charlie/src/fly-facing.mjs b/designs/charlie/src/fly-facing.mjs index b591d232d50..98113a598f3 100644 --- a/designs/charlie/src/fly-facing.mjs +++ b/designs/charlie/src/fly-facing.mjs @@ -33,7 +33,7 @@ function draftCharlieFlyFacing({ points, Point, paths, Path, macro, snippets, st /* * Annotations */ - store.cutlist.setCut({ cut: 2, from: 'fabric' }) + store.cutlist.setCut({ cut: 1, from: 'fabric' }) // Grainline points.grainlineTop = points.flyTop.shiftFractionTowards(points.styleWaistIn, 0.5) diff --git a/markdown/org/docs/designs/charlie/cutting/en.md b/markdown/org/docs/designs/charlie/cutting/en.md index 4753fde2c14..45cfd813e4a 100644 --- a/markdown/org/docs/designs/charlie/cutting/en.md +++ b/markdown/org/docs/designs/charlie/cutting/en.md @@ -9,7 +9,7 @@ title: "Charlie chinos: Cutting Instructions" - Part **4**: **4 x** - Part **6**: **2 x** - Part **8**: **4 x** (2 pairs _with good sides together_) -- Part **9**: **2 x** _with good sides together_ +- Part **9**: **1 x** - Part **10**: **1 x** on the fold - Part **11**: **1 x** if making a straight waistband - Part **11**: **2 x** _with good sides together_ if making a curved waistband From 91bcd014c0763d4ca89cc0e05150b9e2eb48faa4 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 28 Apr 2024 17:26:55 +0200 Subject: [PATCH 787/795] feat(shared): Allow sorting of patterns by various fields. Fixes #6477 This was a feature request by FreeSewing user 23364 (Renee-mariposa) --- sites/shared/components/account/patterns.mjs | 63 ++++++++++++++++++-- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/sites/shared/components/account/patterns.mjs b/sites/shared/components/account/patterns.mjs index c5415d7bee1..d55b7cb0009 100644 --- a/sites/shared/components/account/patterns.mjs +++ b/sites/shared/components/account/patterns.mjs @@ -8,6 +8,7 @@ import { horFlexClasses, newPatternUrl, } from 'shared/utils.mjs' +import orderBy from 'lodash.orderby' import { freeSewingConfig as conf, controlLevels } from 'shared/config/freesewing.config.mjs' // Context import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' @@ -35,6 +36,7 @@ import { CameraIcon, EditIcon, ResetIcon, + RightIcon, UploadIcon, FreeSewingIcon, CloneIcon, @@ -540,6 +542,19 @@ export const PatternCard = ({ return
    {inner}
    } +// Component to show the sort header in the pattern table +const SortButton = ({ field, label, order, orderAsc, updateOrder }) => ( + +) + // Component for the account/patterns page export const Patterns = () => { const router = useRouter() @@ -554,6 +569,8 @@ export const Patterns = () => { const [patterns, setPatterns] = useState([]) const [selected, setSelected] = useState({}) const [refresh, setRefresh] = useState(0) + const [order, setOrder] = useState('id') + const [orderAsc, setOrderAsc] = useState(true) // Helper var to see how many are selected const selCount = Object.keys(selected).length @@ -601,6 +618,14 @@ export const Patterns = () => { setLoadingStatus([true, 'nailedIt', true, true]) } + // Helper method to update the order state + const updateOrder = (field) => { + if (order !== field) { + setOrder(field) + setOrderAsc(true) + } else setOrderAsc(!orderAsc) + } + return (

    @@ -624,16 +649,42 @@ export const Patterns = () => { checked={patterns.length === selCount} /> - # + + + {t('account:img')} - {t('account:name')} - {t('account:design')} - {t('account:createdAt')} - {t('account:public')} + + + + + + + + + + + + - {patterns.map((pattern, i) => ( + {orderBy(patterns, order, orderAsc ? 'asc' : 'desc').map((pattern, i) => ( Date: Mon, 29 Apr 2024 17:22:06 +0000 Subject: [PATCH 788/795] chore(deps): Bump @prisma/client from 5.11.0 to 5.13.0 Bumps [@prisma/client](https://github.com/prisma/prisma/tree/HEAD/packages/client) from 5.11.0 to 5.13.0. - [Release notes](https://github.com/prisma/prisma/releases) - [Commits](https://github.com/prisma/prisma/commits/5.13.0/packages/client) --- updated-dependencies: - dependency-name: "@prisma/client" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/backend/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sites/backend/package.json b/sites/backend/package.json index 9632132cef2..33555e45e9e 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -29,7 +29,7 @@ "peerDependencies": {}, "dependencies": { "@aws-sdk/client-sesv2": "3.535.0", - "@prisma/client": "5.11.0", + "@prisma/client": "5.13.0", "bcryptjs": "2.4.3", "cors": "2.8.5", "dotenv": "16.4.5", diff --git a/yarn.lock b/yarn.lock index 95dc35a1255..99a207d43c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1892,10 +1892,10 @@ resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz" integrity sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ== -"@prisma/client@5.11.0": - version "5.11.0" - resolved "https://registry.npmjs.org/@prisma/client/-/client-5.11.0.tgz" - integrity sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw== +"@prisma/client@5.13.0": + version "5.13.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-5.13.0.tgz#b9f1d0983d714e982675201d8222a9ecb4bdad4a" + integrity sha512-uYdfpPncbZ/syJyiYBwGZS8Gt1PTNoErNYMuqHDa2r30rNSFtgTA/LXsSk55R7pdRTMi5pHkeP9B14K6nHmwkg== "@prisma/debug@5.11.0": version "5.11.0" From eb96cc3c9080e4584132e0418f8bf276e1739660 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:23:25 +0000 Subject: [PATCH 789/795] chore(deps): Bump use-local-storage-state from 19.1.0 to 19.2.0 Bumps [use-local-storage-state](https://github.com/astoilkov/use-local-storage-state) from 19.1.0 to 19.2.0. - [Release notes](https://github.com/astoilkov/use-local-storage-state/releases) - [Commits](https://github.com/astoilkov/use-local-storage-state/compare/v19.1.0...v19.2.0) --- updated-dependencies: - dependency-name: use-local-storage-state dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 0a5f4e5d335..c950dfee2de 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -69,7 +69,7 @@ "remark-gfm": "4.0.0", "remark-mdx-frontmatter": "4.0.0", "strip-markdown": "6.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "yaml-loader": "0.8.1" }, "devDependencies": { diff --git a/sites/sde/package.json b/sites/sde/package.json index d0aec045d94..39450cfa698 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -84,7 +84,7 @@ "svg-to-pdfkit": "https://git@github.com/eriese/SVG-to-PDFKit", "tailwindcss": "3.4.1", "tlds": "1.251.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": {}, diff --git a/sites/shared/package.json b/sites/shared/package.json index 7ccd89a2b8a..3b3a097900a 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -55,7 +55,7 @@ "tlds": "1.251.0", "to-vfile": "8.0.0", "unist-util-visit": "5.0.0", - "use-local-storage-state": "19.1.0", + "use-local-storage-state": "19.2.0", "web-worker": "1.3.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 95dc35a1255..09bf92eeea2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14018,10 +14018,10 @@ urlgrey@1.0.0: dependencies: fast-url-parser "^1.1.3" -use-local-storage-state@19.1.0: - version "19.1.0" - resolved "https://registry.npmjs.org/use-local-storage-state/-/use-local-storage-state-19.1.0.tgz" - integrity sha512-3Ea6uRtRaSwpZYD9maZPKoEEGRuHmVA7zGrV/Uh9s5NTj9K1x/MB4IOQoywjUesQyhXmJq6bqjC5cAqlsXoOTw== +use-local-storage-state@19.2.0: + version "19.2.0" + resolved "https://registry.yarnpkg.com/use-local-storage-state/-/use-local-storage-state-19.2.0.tgz#eac2f18c8f4762931d3b6661097be0b2c00f65de" + integrity sha512-z5+n406vi3FzPJW6+lzuL/LJr4VLhXsUq1TWWeHQABL37bnJ159dSUmO7XuwqvACX93ZA9P2vkB8GMDgq1rr7A== use-sync-external-store@^1.0.0: version "1.2.0" From 73662ab39f279cc722cbe1974ede0ac32506c5d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:23:44 +0000 Subject: [PATCH 790/795] chore(deps-dev): Bump mocha from 10.3.0 to 10.4.0 Bumps [mocha](https://github.com/mochajs/mocha) from 10.3.0 to 10.4.0. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v10.3.0...v10.4.0) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- designs/aaron/package.json | 2 +- designs/albert/package.json | 2 +- designs/bee/package.json | 2 +- designs/bella/package.json | 2 +- designs/benjamin/package.json | 2 +- designs/bent/package.json | 2 +- designs/bob/package.json | 2 +- designs/breanna/package.json | 2 +- designs/brian/package.json | 2 +- designs/bruce/package.json | 2 +- designs/carlita/package.json | 2 +- designs/carlton/package.json | 2 +- designs/cathrin/package.json | 2 +- designs/charlie/package.json | 2 +- designs/cornelius/package.json | 2 +- designs/diana/package.json | 2 +- designs/examples/package.json | 2 +- designs/florence/package.json | 2 +- designs/florent/package.json | 2 +- designs/gozer/package.json | 2 +- designs/hi/package.json | 2 +- designs/holmes/package.json | 2 +- designs/hortensia/package.json | 2 +- designs/huey/package.json | 2 +- designs/hugo/package.json | 2 +- designs/jaeger/package.json | 2 +- designs/legend/package.json | 2 +- designs/lucy/package.json | 2 +- designs/lumina/package.json | 2 +- designs/lumira/package.json | 2 +- designs/lunetius/package.json | 2 +- designs/magde/package.json | 2 +- designs/naomiwu/package.json | 2 +- designs/noble/package.json | 2 +- designs/octoplushy/package.json | 2 +- designs/onyx/package.json | 2 +- designs/otis/package.json | 2 +- designs/paco/package.json | 2 +- designs/penelope/package.json | 2 +- designs/plugintest/package.json | 2 +- designs/rendertest/package.json | 2 +- designs/sandy/package.json | 2 +- designs/shelly/package.json | 2 +- designs/shin/package.json | 2 +- designs/simon/package.json | 2 +- designs/simone/package.json | 2 +- designs/skully/package.json | 2 +- designs/sven/package.json | 2 +- designs/tamiko/package.json | 2 +- designs/teagan/package.json | 2 +- designs/tiberius/package.json | 2 +- designs/titan/package.json | 2 +- designs/trayvon/package.json | 2 +- designs/tristan/package.json | 2 +- designs/uma/package.json | 2 +- designs/wahid/package.json | 2 +- designs/walburga/package.json | 2 +- designs/waralee/package.json | 2 +- designs/yuri/package.json | 2 +- packages/core/package.json | 2 +- plugins/core-plugins/package.json | 2 +- plugins/plugin-annotations/package.json | 2 +- plugins/plugin-bin-pack/package.json | 2 +- plugins/plugin-bust/package.json | 2 +- plugins/plugin-flip/package.json | 2 +- plugins/plugin-gore/package.json | 2 +- plugins/plugin-i18n/package.json | 2 +- plugins/plugin-measurements/package.json | 2 +- plugins/plugin-mirror/package.json | 2 +- plugins/plugin-ringsector/package.json | 2 +- plugins/plugin-round/package.json | 2 +- plugins/plugin-sprinkle/package.json | 2 +- plugins/plugin-svgattr/package.json | 2 +- plugins/plugin-theme/package.json | 2 +- plugins/plugin-timing/package.json | 2 +- plugins/plugin-versionfree-svg/package.json | 2 +- sites/backend/package.json | 2 +- yarn.lock | 30 ++------------------- 78 files changed, 79 insertions(+), 105 deletions(-) diff --git a/designs/aaron/package.json b/designs/aaron/package.json index ce49326fd04..ea3aaf7747d 100644 --- a/designs/aaron/package.json +++ b/designs/aaron/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/albert/package.json b/designs/albert/package.json index 2da5d562161..76d7bf1ecad 100644 --- a/designs/albert/package.json +++ b/designs/albert/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bee/package.json b/designs/bee/package.json index 526713a6274..679d1ef1970 100644 --- a/designs/bee/package.json +++ b/designs/bee/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bella/package.json b/designs/bella/package.json index 13a232d076a..9c2e7949bac 100644 --- a/designs/bella/package.json +++ b/designs/bella/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/benjamin/package.json b/designs/benjamin/package.json index 306fcec95e6..34e8c8a00b4 100644 --- a/designs/benjamin/package.json +++ b/designs/benjamin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bent/package.json b/designs/bent/package.json index 7f65d2d1937..ab30a071207 100644 --- a/designs/bent/package.json +++ b/designs/bent/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bob/package.json b/designs/bob/package.json index 690304808e0..386c486b04f 100644 --- a/designs/bob/package.json +++ b/designs/bob/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/breanna/package.json b/designs/breanna/package.json index 98433c12533..23703212f1d 100644 --- a/designs/breanna/package.json +++ b/designs/breanna/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/brian/package.json b/designs/brian/package.json index f849821156b..1b8d3fef38d 100644 --- a/designs/brian/package.json +++ b/designs/brian/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/bruce/package.json b/designs/bruce/package.json index 0331cf23c1f..11c39cca02c 100644 --- a/designs/bruce/package.json +++ b/designs/bruce/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlita/package.json b/designs/carlita/package.json index d6d57077e8b..cacda75c2f2 100644 --- a/designs/carlita/package.json +++ b/designs/carlita/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/carlton/package.json b/designs/carlton/package.json index 993c41644db..527c7549a2d 100644 --- a/designs/carlton/package.json +++ b/designs/carlton/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cathrin/package.json b/designs/cathrin/package.json index dd7914bed64..b1b143c31f4 100644 --- a/designs/cathrin/package.json +++ b/designs/cathrin/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/charlie/package.json b/designs/charlie/package.json index 18d70deb1f9..719da827cd5 100644 --- a/designs/charlie/package.json +++ b/designs/charlie/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/cornelius/package.json b/designs/cornelius/package.json index 6b25b344a0b..10cc99cdfe8 100644 --- a/designs/cornelius/package.json +++ b/designs/cornelius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/diana/package.json b/designs/diana/package.json index ca162a5e64a..712695b98a1 100644 --- a/designs/diana/package.json +++ b/designs/diana/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/examples/package.json b/designs/examples/package.json index 62370fdfe04..4b9785928aa 100644 --- a/designs/examples/package.json +++ b/designs/examples/package.json @@ -49,7 +49,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florence/package.json b/designs/florence/package.json index 2be92777915..78c0d6f8a46 100644 --- a/designs/florence/package.json +++ b/designs/florence/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/florent/package.json b/designs/florent/package.json index 5517dc5daaf..ccc886313fb 100644 --- a/designs/florent/package.json +++ b/designs/florent/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/gozer/package.json b/designs/gozer/package.json index 87a57c23f00..9f69b8e32fe 100644 --- a/designs/gozer/package.json +++ b/designs/gozer/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hi/package.json b/designs/hi/package.json index 9d69fb4066d..0f168e4475a 100644 --- a/designs/hi/package.json +++ b/designs/hi/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/holmes/package.json b/designs/holmes/package.json index 8d117ccc321..4fd2f67ee9f 100644 --- a/designs/holmes/package.json +++ b/designs/holmes/package.json @@ -56,7 +56,7 @@ "@freesewing/plugin-gore": "3.2.0" }, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hortensia/package.json b/designs/hortensia/package.json index 94509b15abb..6257ce5ecc6 100644 --- a/designs/hortensia/package.json +++ b/designs/hortensia/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/huey/package.json b/designs/huey/package.json index 5625fd7e419..c3add0f8398 100644 --- a/designs/huey/package.json +++ b/designs/huey/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/hugo/package.json b/designs/hugo/package.json index 07352d582f2..ca8b3417488 100644 --- a/designs/hugo/package.json +++ b/designs/hugo/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/jaeger/package.json b/designs/jaeger/package.json index 8057ca5af1c..062664a8321 100644 --- a/designs/jaeger/package.json +++ b/designs/jaeger/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/legend/package.json b/designs/legend/package.json index 393b84a3c33..c4c98decf3d 100644 --- a/designs/legend/package.json +++ b/designs/legend/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lucy/package.json b/designs/lucy/package.json index fa1b7b9750c..1d88fed6ac4 100644 --- a/designs/lucy/package.json +++ b/designs/lucy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumina/package.json b/designs/lumina/package.json index 34aec3889be..d29100eba1e 100644 --- a/designs/lumina/package.json +++ b/designs/lumina/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lumira/package.json b/designs/lumira/package.json index 1f785ea47b8..a8f347f9478 100644 --- a/designs/lumira/package.json +++ b/designs/lumira/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/lunetius/package.json b/designs/lunetius/package.json index d330055838a..33945b987ed 100644 --- a/designs/lunetius/package.json +++ b/designs/lunetius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/magde/package.json b/designs/magde/package.json index 05c56cdd495..85b88a524bc 100644 --- a/designs/magde/package.json +++ b/designs/magde/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/naomiwu/package.json b/designs/naomiwu/package.json index f264bfcfbc6..7e94a19d612 100644 --- a/designs/naomiwu/package.json +++ b/designs/naomiwu/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/noble/package.json b/designs/noble/package.json index 386a9f1fc4e..a129e21771c 100644 --- a/designs/noble/package.json +++ b/designs/noble/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/octoplushy/package.json b/designs/octoplushy/package.json index c0575885b02..c045f09f539 100644 --- a/designs/octoplushy/package.json +++ b/designs/octoplushy/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/onyx/package.json b/designs/onyx/package.json index eb391f0487c..9cdf7db32a4 100644 --- a/designs/onyx/package.json +++ b/designs/onyx/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/otis/package.json b/designs/otis/package.json index d5bc84c0d50..6da21cc33f7 100644 --- a/designs/otis/package.json +++ b/designs/otis/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/paco/package.json b/designs/paco/package.json index 8d1e605df9f..91d4085935e 100644 --- a/designs/paco/package.json +++ b/designs/paco/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/penelope/package.json b/designs/penelope/package.json index 53809315576..f7bb4c9d458 100644 --- a/designs/penelope/package.json +++ b/designs/penelope/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/plugintest/package.json b/designs/plugintest/package.json index 82cfdd51637..1c5802400b1 100644 --- a/designs/plugintest/package.json +++ b/designs/plugintest/package.json @@ -64,7 +64,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/rendertest/package.json b/designs/rendertest/package.json index a20ffc0b6d6..d289bc33358 100644 --- a/designs/rendertest/package.json +++ b/designs/rendertest/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sandy/package.json b/designs/sandy/package.json index c68744723f9..46629614acc 100644 --- a/designs/sandy/package.json +++ b/designs/sandy/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shelly/package.json b/designs/shelly/package.json index ff36d0da81d..640316a9f39 100644 --- a/designs/shelly/package.json +++ b/designs/shelly/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/shin/package.json b/designs/shin/package.json index b1cb670c6d1..b07a360390c 100644 --- a/designs/shin/package.json +++ b/designs/shin/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simon/package.json b/designs/simon/package.json index 1c3dd85df64..13a8be358da 100644 --- a/designs/simon/package.json +++ b/designs/simon/package.json @@ -56,7 +56,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/simone/package.json b/designs/simone/package.json index a0e6f349f6f..cc6ab5ef1a9 100644 --- a/designs/simone/package.json +++ b/designs/simone/package.json @@ -57,7 +57,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/skully/package.json b/designs/skully/package.json index 902e1c6c547..70b10a4c3fc 100644 --- a/designs/skully/package.json +++ b/designs/skully/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/sven/package.json b/designs/sven/package.json index e190e0352ee..2d0457b03c6 100644 --- a/designs/sven/package.json +++ b/designs/sven/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tamiko/package.json b/designs/tamiko/package.json index f51300d340a..59db79d575b 100644 --- a/designs/tamiko/package.json +++ b/designs/tamiko/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/teagan/package.json b/designs/teagan/package.json index 8ddb9931348..85aec5e3f4c 100644 --- a/designs/teagan/package.json +++ b/designs/teagan/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tiberius/package.json b/designs/tiberius/package.json index 2856b97eb6b..d8baff4cca9 100644 --- a/designs/tiberius/package.json +++ b/designs/tiberius/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/titan/package.json b/designs/titan/package.json index 1a580665506..fc9becb3e0d 100644 --- a/designs/titan/package.json +++ b/designs/titan/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/trayvon/package.json b/designs/trayvon/package.json index 8802043a845..d1845b37b3c 100644 --- a/designs/trayvon/package.json +++ b/designs/trayvon/package.json @@ -54,7 +54,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/tristan/package.json b/designs/tristan/package.json index 75f650a70e1..6eefb36c598 100644 --- a/designs/tristan/package.json +++ b/designs/tristan/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/uma/package.json b/designs/uma/package.json index a604f506236..1b1b780c669 100644 --- a/designs/uma/package.json +++ b/designs/uma/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/wahid/package.json b/designs/wahid/package.json index 7bd43e2b1e9..556c25b8f2d 100644 --- a/designs/wahid/package.json +++ b/designs/wahid/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/walburga/package.json b/designs/walburga/package.json index c9c5006449d..40e3691c03f 100644 --- a/designs/walburga/package.json +++ b/designs/walburga/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/waralee/package.json b/designs/waralee/package.json index 338ea5cecd2..1b7be0b4cb1 100644 --- a/designs/waralee/package.json +++ b/designs/waralee/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/designs/yuri/package.json b/designs/yuri/package.json index 21d8ff1e509..9b7aea2882d 100644 --- a/designs/yuri/package.json +++ b/designs/yuri/package.json @@ -55,7 +55,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/models": "3.2.0", "@freesewing/plugin-timing": "3.2.0" diff --git a/packages/core/package.json b/packages/core/package.json index 3486b1ebea7..044df17a26f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -64,7 +64,7 @@ "devDependencies": { "eslint": "8.57.0", "nyc": "15.1.0", - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "sinon": "^17.0.1" }, diff --git a/plugins/core-plugins/package.json b/plugins/core-plugins/package.json index f8161bb41d8..55b6267fe70 100644 --- a/plugins/core-plugins/package.json +++ b/plugins/core-plugins/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0", "@freesewing/plugin-annotations": "3.2.0", "@freesewing/plugin-mirror": "3.2.0", diff --git a/plugins/plugin-annotations/package.json b/plugins/plugin-annotations/package.json index 080aeac1c48..9595a53eb92 100644 --- a/plugins/plugin-annotations/package.json +++ b/plugins/plugin-annotations/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bin-pack/package.json b/plugins/plugin-bin-pack/package.json index de2420f1fa8..2bbb3177085 100644 --- a/plugins/plugin-bin-pack/package.json +++ b/plugins/plugin-bin-pack/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-bust/package.json b/plugins/plugin-bust/package.json index 78bbbf1bc64..2bf7619359f 100644 --- a/plugins/plugin-bust/package.json +++ b/plugins/plugin-bust/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-flip/package.json b/plugins/plugin-flip/package.json index c67d522a583..620410d3a05 100644 --- a/plugins/plugin-flip/package.json +++ b/plugins/plugin-flip/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-gore/package.json b/plugins/plugin-gore/package.json index 76b6b1cd68e..7109989548f 100644 --- a/plugins/plugin-gore/package.json +++ b/plugins/plugin-gore/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-i18n/package.json b/plugins/plugin-i18n/package.json index fa39fd98abb..0cd8688c19f 100644 --- a/plugins/plugin-i18n/package.json +++ b/plugins/plugin-i18n/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-measurements/package.json b/plugins/plugin-measurements/package.json index 0f5550513ca..7922a7c75bd 100644 --- a/plugins/plugin-measurements/package.json +++ b/plugins/plugin-measurements/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-mirror/package.json b/plugins/plugin-mirror/package.json index 733c2c5b3e4..f96155821fe 100644 --- a/plugins/plugin-mirror/package.json +++ b/plugins/plugin-mirror/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-ringsector/package.json b/plugins/plugin-ringsector/package.json index 3b2f69a23c9..7a3674e6e81 100644 --- a/plugins/plugin-ringsector/package.json +++ b/plugins/plugin-ringsector/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-round/package.json b/plugins/plugin-round/package.json index c5f81e78971..6d85f49d3fe 100644 --- a/plugins/plugin-round/package.json +++ b/plugins/plugin-round/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-sprinkle/package.json b/plugins/plugin-sprinkle/package.json index 72a16401155..75a5153fd03 100644 --- a/plugins/plugin-sprinkle/package.json +++ b/plugins/plugin-sprinkle/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-svgattr/package.json b/plugins/plugin-svgattr/package.json index 5322bf25702..9d89a25858d 100644 --- a/plugins/plugin-svgattr/package.json +++ b/plugins/plugin-svgattr/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-theme/package.json b/plugins/plugin-theme/package.json index dc9e123f800..bb83f9c2ac9 100644 --- a/plugins/plugin-theme/package.json +++ b/plugins/plugin-theme/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-timing/package.json b/plugins/plugin-timing/package.json index cc7bdbb438b..d1841135c09 100644 --- a/plugins/plugin-timing/package.json +++ b/plugins/plugin-timing/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/plugins/plugin-versionfree-svg/package.json b/plugins/plugin-versionfree-svg/package.json index 73a4aa1a79a..9b11f459a4b 100644 --- a/plugins/plugin-versionfree-svg/package.json +++ b/plugins/plugin-versionfree-svg/package.json @@ -53,7 +53,7 @@ }, "dependencies": {}, "devDependencies": { - "mocha": "10.3.0", + "mocha": "10.4.0", "chai": "5.1.0" }, "files": [ diff --git a/sites/backend/package.json b/sites/backend/package.json index 9632132cef2..312bed51d34 100644 --- a/sites/backend/package.json +++ b/sites/backend/package.json @@ -50,7 +50,7 @@ "chai": "5.1.0", "chai-http": "4.4.0", "esbuild": "0.20.2", - "mocha": "10.3.0", + "mocha": "10.4.0", "mocha-steps": "1.3.0", "nodemon": "3.1.0", "prisma": "5.11.0" diff --git a/yarn.lock b/yarn.lock index 95dc35a1255..b1e657a5e59 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10024,35 +10024,9 @@ mocha-steps@1.3.0: resolved "https://registry.npmjs.org/mocha-steps/-/mocha-steps-1.3.0.tgz" integrity sha512-KZvpMJTqzLZw3mOb+EEuYi4YZS41C9iTnb7skVFRxHjUd1OYbl64tCMSmpdIRM9LnwIrSOaRfPtNpF5msgv6Eg== -mocha@10.3.0: - version "10.3.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz" - integrity sha512-uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg== - dependencies: - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "8.1.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -mocha@^10.0.0: +mocha@10.4.0, mocha@^10.0.0: version "10.4.0" - resolved "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.4.0.tgz#ed03db96ee9cfc6d20c56f8e2af07b961dbae261" integrity sha512-eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA== dependencies: ansi-colors "4.1.1" From 461177d2959acd4e800310d22a67608d08ae3762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 17:26:15 +0000 Subject: [PATCH 791/795] chore(deps): Bump jotai-location from 0.5.4 to 0.5.5 Bumps [jotai-location](https://github.com/jotaijs/jotai-location) from 0.5.4 to 0.5.5. - [Changelog](https://github.com/jotaijs/jotai-location/blob/main/CHANGELOG.md) - [Commits](https://github.com/jotaijs/jotai-location/compare/v0.5.4...v0.5.5) --- updated-dependencies: - dependency-name: jotai-location dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/org/package.json b/sites/org/package.json index 0a5f4e5d335..87115815ef6 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -41,7 +41,7 @@ "echarts": "5.5.0", "echarts-for-react": "3.0.2", "jotai": "2.7.1", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "lodash.get": "4.4.2", "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", diff --git a/sites/sde/package.json b/sites/sde/package.json index d0aec045d94..ac2619cd932 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -56,7 +56,7 @@ "file-saver": "2.0.5", "i18next": "23.11.2", "jotai": "2.7.1", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "js-yaml": "4.1.0", "lodash.debounce": "^4.0.8", "lodash.get": "4.4.2", diff --git a/sites/shared/package.json b/sites/shared/package.json index 7ccd89a2b8a..8986de0b85e 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -30,7 +30,7 @@ "highlight.js": "11.9.0", "github-slugger": "2.0.0", "jotai": "2.7.1", - "jotai-location": "0.5.4", + "jotai-location": "0.5.5", "lodash.clonedeep": "4.5.0", "lodash.debounce": "^4.0.8", "lodash.orderby": "4.6.0", diff --git a/yarn.lock b/yarn.lock index 95dc35a1255..19f2348c041 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7948,10 +7948,10 @@ jiti@^1.19.1: resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== -jotai-location@0.5.4: - version "0.5.4" - resolved "https://registry.npmjs.org/jotai-location/-/jotai-location-0.5.4.tgz" - integrity sha512-IqpyYLAF6HgoDoJVlX66IGvgrugCA1LJybT01NqenpdwypPtUB6u0cnJZMbN6axU+Yl2FTI6l+4x9IWh4WGFRA== +jotai-location@0.5.5: + version "0.5.5" + resolved "https://registry.yarnpkg.com/jotai-location/-/jotai-location-0.5.5.tgz#2b2622da6ee49493bc4d69e5610e2e5d382894ed" + integrity sha512-6QW/7W9IJHjhbn7gRgAw4sC30k0/G6JiC4uPlKi8ZPZGYk7R7r9PyMD2eVhL4XSxxag89JxS1iSyr6BIXsB4Sw== jotai@2.7.1: version "2.7.1" From 31fc7030eadff3dcc08c2c1c5047ce74defd9ea7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Tue, 30 Apr 2024 09:25:21 +0200 Subject: [PATCH 792/795] fix(org): Broken link to docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Discord user FrostCow for reporting this 🙏 --- markdown/org/docs/about/site/en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/markdown/org/docs/about/site/en.md b/markdown/org/docs/about/site/en.md index 453f435004a..e21782be297 100644 --- a/markdown/org/docs/about/site/en.md +++ b/markdown/org/docs/about/site/en.md @@ -25,7 +25,7 @@ So I'm not going to do that. I'm going to assume you are reading with an open mi On every page of FreeSewing.org is the same header with links to the most important sections of the site: - [Designs](/designs/) shows our collection of parametric designs you can generate bespoke sewing patterns from -- [Documentation](/documentation/) holds all the documentation, for the website, for our designs, everything +- [Documentation](/docs/) holds all the documentation, for the website, for our designs, everything - [Blog](/blog/) holds blog posts with updates and news about FreeSewing - [Showcase](/showcase/) show examples from the FreeSewing community, things they have made with FreeSewing patterns - [Account](/account/) is where you can manage your FreeSewing account From 02308e98192dccf0f5a12df4624b9c9296706e0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 04:43:55 +0000 Subject: [PATCH 793/795] chore(deps): Bump @tailwindcss/typography from 0.5.10 to 0.5.13 Bumps [@tailwindcss/typography](https://github.com/tailwindlabs/tailwindcss-typography) from 0.5.10 to 0.5.13. - [Release notes](https://github.com/tailwindlabs/tailwindcss-typography/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss-typography/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss-typography/compare/v0.5.10...v0.5.13) --- updated-dependencies: - dependency-name: "@tailwindcss/typography" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/dev/package.json | 2 +- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- sites/shared/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sites/dev/package.json b/sites/dev/package.json index 51ee9abddec..8b858ef60bf 100644 --- a/sites/dev/package.json +++ b/sites/dev/package.json @@ -33,7 +33,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@next/bundle-analyzer": "14.1.4", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.13", "algoliasearch": "4.22.1", "daisyui": "4.7.3", "lodash.get": "4.4.2", diff --git a/sites/lab/package.json b/sites/lab/package.json index 6e2d3ea8b57..13842e2cf13 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -30,7 +30,7 @@ "@mdx-js/mdx": "^3.0.0", "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.13", "algoliasearch": "4.22.1", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/sites/org/package.json b/sites/org/package.json index 627c3fd08c1..84948e49a01 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -34,7 +34,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.13", "algoliasearch": "4.22.1", "react-copy-to-clipboard": "5.1.0", "daisyui": "4.7.3", diff --git a/sites/sde/package.json b/sites/sde/package.json index 3fa928f503c..43f833a48ac 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -44,7 +44,7 @@ "@mdx-js/react": "^3.0.0", "@mdx-js/runtime": "2.0.0-next.9", "@tailwindcss/nesting": "^0.0.0-insiders.565cd3e", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.13", "autoprefixer": "10.4.19", "axios": "1.6.8", "d3-dispatch": "3.0.1", diff --git a/sites/shared/package.json b/sites/shared/package.json index 366148935f1..a8a2bac4128 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -18,7 +18,7 @@ "dependencies": { "@next/mdx": "14.1.4", "@resvg/resvg-js": "2.6.0", - "@tailwindcss/typography": "0.5.10", + "@tailwindcss/typography": "0.5.13", "Buffer": "0.0.0", "d3-dispatch": "3.0.1", "d3-drag": "3.0.0", diff --git a/yarn.lock b/yarn.lock index eb22c0b4b12..d69e425f251 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2525,10 +2525,10 @@ dependencies: postcss-nested "^5.0.5" -"@tailwindcss/typography@0.5.10": - version "0.5.10" - resolved "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz" - integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== +"@tailwindcss/typography@0.5.13": + version "0.5.13" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.13.tgz#cd788a4fa4d0ca2506e242d512f377b22c1f7932" + integrity sha512-ADGcJ8dX21dVVHIwTRgzrcunY6YY9uSlAHHGVKvkA+vLc5qLwEszvKts40lx7z0qc4clpjclwLeK5rVCV2P/uw== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" From ab89cf786a8f2f0916b6e99f811316500f31b25f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 04:44:16 +0000 Subject: [PATCH 794/795] chore(deps): Bump mdast-util-toc from 7.0.0 to 7.0.1 Bumps [mdast-util-toc](https://github.com/syntax-tree/mdast-util-toc) from 7.0.0 to 7.0.1. - [Release notes](https://github.com/syntax-tree/mdast-util-toc/releases) - [Commits](https://github.com/syntax-tree/mdast-util-toc/compare/7.0.0...7.0.1) --- updated-dependencies: - dependency-name: mdast-util-toc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sites/shared/package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/shared/package.json b/sites/shared/package.json index 366148935f1..5fdc902b099 100644 --- a/sites/shared/package.json +++ b/sites/shared/package.json @@ -36,7 +36,7 @@ "lodash.orderby": "4.6.0", "lodash.unset": "4.5.2", "lodash.get": "4.4.2", - "mdast-util-toc": "7.0.0", + "mdast-util-toc": "7.0.1", "mermaid": "10.9.0", "ora": "8.0.1", "pdfkit": "0.14.0", diff --git a/yarn.lock b/yarn.lock index eb22c0b4b12..c8bb06b6d66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2756,10 +2756,10 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/ungap__structured-clone@^0.3.0": - version "0.3.3" - resolved "https://registry.npmjs.org/@types/ungap__structured-clone/-/ungap__structured-clone-0.3.3.tgz" - integrity sha512-RNmhIPwoip6K/zZOv3ypksTAqaqLEXvlNSXKyrC93xMSOAHZCR7PifW6xKZCwkbbnbM9dwB9X56PPoNTlNwEqw== +"@types/ungap__structured-clone@^1.0.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@types/ungap__structured-clone/-/ungap__structured-clone-1.2.0.tgz#12b9fd4ab3e6a82292d60048492b05eb75b4a48f" + integrity sha512-ZoaihZNLeZSxESbk9PUAPZOlSpcKx81I1+4emtULDVmBLkYutTcMlCj2K9VNlf9EWODxdO6gkAqEaLorXwZQVA== "@types/unist@*", "@types/unist@^3.0.0": version "3.0.2" @@ -9092,13 +9092,13 @@ mdast-util-to-string@^4.0.0: dependencies: "@types/mdast" "^4.0.0" -mdast-util-toc@7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/mdast-util-toc/-/mdast-util-toc-7.0.0.tgz" - integrity sha512-C28UcSqjmnWuvgT8d97qpaItHKvySqVPAECUzqQ51xuMyNFFJwcFoKW77KoMjtXrclTidLQFDzLUmTmrshRweA== +mdast-util-toc@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-7.0.1.tgz#e886e45cd462060fab10a63f160fd2dbe2daf8d8" + integrity sha512-mBuhuKtP8F/5vVLNJKeC1fs1W5w2sZqB1uUvKwQK9qftSiBILVkQjKQ8aLVrhIEFPGwbMKCVCB3WAAW+BoVPxg== dependencies: "@types/mdast" "^4.0.0" - "@types/ungap__structured-clone" "^0.3.0" + "@types/ungap__structured-clone" "^1.0.0" "@ungap/structured-clone" "^1.0.0" github-slugger "^2.0.0" mdast-util-to-string "^4.0.0" From 09adc0f218db53b01a49f01a00eb685503385091 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 04:44:37 +0000 Subject: [PATCH 795/795] chore(deps): Bump next-i18next from 15.2.0 to 15.3.0 Bumps [next-i18next](https://github.com/i18next/next-i18next) from 15.2.0 to 15.3.0. - [Release notes](https://github.com/i18next/next-i18next/releases) - [Changelog](https://github.com/i18next/next-i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/next-i18next/compare/v15.2.0...v15.3.0) --- updated-dependencies: - dependency-name: next-i18next dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sites/lab/package.json | 2 +- sites/org/package.json | 2 +- sites/sde/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sites/lab/package.json b/sites/lab/package.json index 6e2d3ea8b57..12407fa2762 100644 --- a/sites/lab/package.json +++ b/sites/lab/package.json @@ -41,7 +41,7 @@ "lodash.orderby": "4.6.0", "lodash.set": "4.3.2", "next": "14.1.4", - "next-i18next": "15.2.0", + "next-i18next": "15.3.0", "ora": "8.0.1", "react": "18.3.1", "react-copy-to-clipboard": "5.1.0", diff --git a/sites/org/package.json b/sites/org/package.json index 627c3fd08c1..2c47c93311e 100644 --- a/sites/org/package.json +++ b/sites/org/package.json @@ -47,7 +47,7 @@ "lodash.set": "4.3.2", "luxon": "3.4.4", "next": "14.1.4", - "next-i18next": "15.2.0", + "next-i18next": "15.3.0", "ora": "8.0.1", "react": "18.3.1", "react-dom": "18.3.1", diff --git a/sites/sde/package.json b/sites/sde/package.json index 3fa928f503c..246bb70ffb0 100644 --- a/sites/sde/package.json +++ b/sites/sde/package.json @@ -64,7 +64,7 @@ "lodash.set": "4.3.2", "mustache": "4.2.0", "next": "14.1.4", - "next-i18next": "15.2.0", + "next-i18next": "15.3.0", "pdfkit": "0.14.0", "postcss-for": "2.1.1", "react": "18.3.1", diff --git a/yarn.lock b/yarn.lock index eb22c0b4b12..11965071ca1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10140,10 +10140,10 @@ nested-error-stacks@^2.0.0: resolved "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz" integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== -next-i18next@15.2.0: - version "15.2.0" - resolved "https://registry.npmjs.org/next-i18next/-/next-i18next-15.2.0.tgz" - integrity sha512-Rl5yZ4oGffsB0AjRykZ5PzNQ2M6am54MaMayldGmH/UKZisrIxk2SKEPJvaHhKlWe1qgdNi2FkodwK8sEjfEmg== +next-i18next@15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-15.3.0.tgz#b4530c80573854d00f95229af405e1e5beedbf18" + integrity sha512-bq7Cc9XJFcmGOCLnyEtHaeJ3+JJNsI/8Pkj9BaHAnhm4sZ9vNNC4ZsaqYnlRZ7VH5ypSo73fEqLK935jLsmCvQ== dependencies: "@babel/runtime" "^7.23.2" "@types/hoist-non-react-statics" "^3.3.4"