From bb6bae13f226a1d3e0b95aef88cce8ca19db5f70 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 24 Jan 2022 10:09:26 +0100 Subject: [PATCH 01/83] fix(fs.dev): Load script the NextJS way --- packages/freesewing.dev/pages/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/freesewing.dev/pages/index.js b/packages/freesewing.dev/pages/index.js index 3b3a02686ff..b3fa85bd76d 100644 --- a/packages/freesewing.dev/pages/index.js +++ b/packages/freesewing.dev/pages/index.js @@ -3,6 +3,7 @@ import useApp from 'site/hooks/useApp.js' import Head from 'next/head' import HelpUs from 'site/components/help-us.js' import Link from 'next/link' +import Script from 'next/script' const HomePage = (props) => { const app = useApp() @@ -20,7 +21,7 @@ const HomePage = (props) => { -

From fc118a2418c9482b58a36fe7707d97541fa7cfbd Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 24 Jan 2022 10:16:22 +0100 Subject: [PATCH 02/83] fix(markdown): Build-breaking issue in DE markdown --- markdown/org/docs/various/notation/buttons/de.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/markdown/org/docs/various/notation/buttons/de.md b/markdown/org/docs/various/notation/buttons/de.md index 9afe43e2828..9bef35e3de7 100644 --- a/markdown/org/docs/various/notation/buttons/de.md +++ b/markdown/org/docs/various/notation/buttons/de.md @@ -4,8 +4,12 @@ title: Knöpfe, Knopflöcher und Druckknöpfe Buttons and buttonholes may come in different sizes, but always have the same shape that represents how they look in real life: - + +A button is shown on the left, and a buttonhole on the right + -Snaps haben einen *-Stud* und *Sockel* Teil und sehen auch wie das echte aus: +Snaps haben einen -Stud und Sockel Teil und sehen auch wie das echte aus: - + +A snap stud is shown on the left, and a snap socket on the right + From bebb206e5e7105ddc8b442af28d417e82b1bc21e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 24 Jan 2022 11:25:14 +0100 Subject: [PATCH 03/83] fix(fs.dev): Move script out of head --- packages/freesewing.dev/pages/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/freesewing.dev/pages/index.js b/packages/freesewing.dev/pages/index.js index b3fa85bd76d..84006665715 100644 --- a/packages/freesewing.dev/pages/index.js +++ b/packages/freesewing.dev/pages/index.js @@ -21,8 +21,8 @@ const HomePage = (props) => { - +

FreeSewing.dev hosts documentation for contributors and developers alike. From 2169994f0ac65c51c7d631c154805862e63df132 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 24 Jan 2022 11:44:46 +0100 Subject: [PATCH 04/83] fix(i18n): Type in scale description --- packages/i18n/src/locales/en/settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/i18n/src/locales/en/settings.yml b/packages/i18n/src/locales/en/settings.yml index 613ac9aee8c..8bd3ad111c2 100644 --- a/packages/i18n/src/locales/en/settings.yml +++ b/packages/i18n/src/locales/en/settings.yml @@ -40,4 +40,4 @@ debug: scale: title: Scale - description: Controls the overal line width, font size, and other elements that do not scale with the pattern's measurements + description: Controls the overall line width, font size, and other elements that do not scale with the pattern's measurements From 2ea353a4753ef82d6c85f991b368f04ea153c4e7 Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 24 Jan 2022 12:34:29 +0100 Subject: [PATCH 05/83] chore(fs.dev): Webpack aliases to load local code from source These changes force webpack to load the local pacakges (like patterns and so on) from source, rather than from a compiled bundle. This means that the lab site will reload whenever one makes changes to pattern code. --- .../freesewing.lab/components/pattern-picker.js | 7 +++---- packages/freesewing.lab/hooks/useApp.js | 1 + packages/freesewing.lab/next.config.mjs | 10 +++++++++- .../page-templates/pattern-list.js | 6 +++--- packages/freesewing.lab/pages/blocks/brian.js | 4 ++++ .../components/wrappers/workbench.js | 1 - packages/freesewing.shared/config/next.mjs | 16 +++++++++++++++- 7 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 packages/freesewing.lab/pages/blocks/brian.js diff --git a/packages/freesewing.lab/components/pattern-picker.js b/packages/freesewing.lab/components/pattern-picker.js index 7d5a85ee970..dca79364251 100644 --- a/packages/freesewing.lab/components/pattern-picker.js +++ b/packages/freesewing.lab/components/pattern-picker.js @@ -1,5 +1,4 @@ import React from 'react' -import config from 'site/freesewing.config.js' import DesignIcon from 'shared/components/icons/design.js' import Link from 'next/link' @@ -16,15 +15,15 @@ const PatternPicker = ({ app }) => { Patterns