diff --git a/config/badges.yaml b/config/badges.yaml index e8fc489be5b..3bc899d22bb 100644 --- a/config/badges.yaml +++ b/config/badges.yaml @@ -36,4 +36,3 @@ _social: link: 'https://instagram.com/freesewing_org' img: 'https://img.shields.io/badge/%F3%A0%80%A0-Follow%20us-E4405F.svg?logo=instagram&logoColor=white&logoWidth=15' alt: 'Follow @freesewing_org on Twitter' - diff --git a/config/build-order.mjs b/config/build-order.mjs index bdc2785a1c2..1732c8c8ebb 100644 --- a/config/build-order.mjs +++ b/config/build-order.mjs @@ -1,4 +1,4 @@ -import { designs, plugins, packages } from './software/index.mjs' +import { designs, plugins, packages } from './software/index.mjs' /* * As this monorepo has interlocking dependencies @@ -6,21 +6,20 @@ import { designs, plugins, packages } from './software/index.mjs' * order. This file takes care of that */ -const first = [ 'core', 'config-helpers', 'remark-jargon', 'snapseries' ] -const blocks = [ 'brian', 'titan', 'bella', 'breanna' ] -const extended = [ 'bent', 'simon', 'carlton', 'ursula' ] +const first = ['core', 'config-helpers', 'remark-jargon', 'snapseries'] +const blocks = ['brian', 'titan', 'bella', 'breanna'] +const extended = ['bent', 'simon', 'carlton', 'ursula'] const last = ['i18n'] export const buildOrder = [ - // First build FreeSewing core library and config-helpers first, // Then build all FreeSewing plugins, but not the bundle - Object.keys(plugins).filter(id => id !== 'plugin-bundle'), + Object.keys(plugins).filter((id) => id !== 'plugin-bundle'), // Then build the plugin bundle - [ 'plugin-bundle' ], + ['plugin-bundle'], // Then build all FreeSewing designs that are blocks blocks, @@ -29,11 +28,10 @@ export const buildOrder = [ extended, // Then build all remaining designs - Object.keys(designs).filter(id => [...blocks, ...extended].indexOf(id) === -1), + Object.keys(designs).filter((id) => [...blocks, ...extended].indexOf(id) === -1), // Finally build the rest of the packages - Object.keys(packages).filter(id => first.indexOf(id) === -1 && last.indexOf(id) === -1), + Object.keys(packages).filter((id) => first.indexOf(id) === -1 && last.indexOf(id) === -1), - last + last, ] - diff --git a/config/changelog.yaml b/config/changelog.yaml index 51cac302947..2299299bd38 100644 --- a/config/changelog.yaml +++ b/config/changelog.yaml @@ -1,5 +1,4 @@ Unreleased: - Breaking: all: - This package is now ESM only. @@ -84,7 +83,6 @@ Unreleased: plugin-versionfree-svg: - This plugin no longer sets its version as an SVG attribute when rendering patterns - Fixed: albert: - Workaround for not finding a suitable legband radius @@ -104,7 +102,6 @@ Unreleased: - Added seperate waistband options - Added bow tie placement option - 2.22.0: date: 2022-08-23 @@ -643,7 +640,6 @@ Unreleased: plugin-title: - Removed rendering of config.cut as it's not used - 2.19.9: date: 2022-01-09 @@ -799,7 +795,6 @@ Unreleased: - Fixed a regression that caused the `waistHeight` option to be ignored. Closes [#1467](https://github.com/freesewing/freesewing/issues/1467) - 2.19.3: date: 2021-11-05 @@ -811,7 +806,6 @@ Unreleased: charlie: - Converted the `waistbandWidth` options to snapped pct (was normal pct) - 2.19.2: date: 2021-11-02 @@ -1221,7 +1215,6 @@ Unreleased: create-freesewing-pattern: - Don't list pattern as dependency in the example package.json - 2.16.0: date: 2021-05-24 diff --git a/config/defaults.yaml b/config/defaults.yaml index 9168681d965..d4fb088acac 100644 --- a/config/defaults.yaml +++ b/config/defaults.yaml @@ -1,4 +1,4 @@ -author: "Joost De Cock (https://github.com/joostdecock)" -homepage: "https://freesewing.org/" -repository: "github:freesewing/freesewing" -bugsUrl: "https://github.com/freesewing/freesewing/issues" +author: 'Joost De Cock (https://github.com/joostdecock)' +homepage: 'https://freesewing.org/' +repository: 'github:freesewing/freesewing' +bugsUrl: 'https://github.com/freesewing/freesewing/issues' diff --git a/config/keywords.yaml b/config/keywords.yaml index f6b93f28536..b0b5ec7e0af 100644 --- a/config/keywords.yaml +++ b/config/keywords.yaml @@ -81,5 +81,3 @@ plugin-bundle: - made to measure - diy - fashion - - diff --git a/config/measurements.mjs b/config/measurements.mjs index 0a74ae626e7..64e318f81f8 100644 --- a/config/measurements.mjs +++ b/config/measurements.mjs @@ -45,5 +45,3 @@ export const degreeMeasurements = ['shoulderSlope'] /* Helper method to determine whether a measurement uses degrees */ export const isDegreeMeasurement = (measie) => degreeMeasurements.indexOf(measie) !== -1 - - diff --git a/config/pattern-options.js b/config/pattern-options.js index b824fa3d40e..b91e171be89 100644 --- a/config/pattern-options.js +++ b/config/pattern-options.js @@ -1,6 +1,4 @@ module.exports = { - models: { - }, - only: { - } + models: {}, + only: {}, } diff --git a/config/software/designs.json b/config/software/designs.json index 03ad76be50b..e4b026851b0 100644 --- a/config/software/designs.json +++ b/config/software/designs.json @@ -1,351 +1,351 @@ { "accessories": { "albert": { - "description": "A FreeSewing pattern for an apron", + "description": "A FreeSewing pattern for an apron", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 2, - "tags": [ "accessories" ] + "tags": ["accessories"] }, "benjamin": { "description": "A FreeSewing pattern for a bow tie", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 3, - "tags": [ "accessories" ] + "tags": ["accessories"] }, "bob": { "description": "A FreeSewing pattern for a bib", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "accessories", "infants" ] + "tags": ["accessories", "infants"] }, "florence": { "description": "A FreeSewing pattern for a face mask", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 1, - "tags": [ "accessories" ] + "tags": ["accessories"] }, "florent": { - "description": "A FreeSewing pattern for a flat cap", - "code": [ "Quentin Felix", "Joost De Cock" ], + "description": "A FreeSewing pattern for a flat cap", + "code": ["Quentin Felix", "Joost De Cock"], "design": "Quentin Felix", "difficulty": 3, - "tags": [ "accessories", "hats" ] + "tags": ["accessories", "hats"] }, "hi": { - "description": "A FreeSewing pattern for a shark plush toy", + "description": "A FreeSewing pattern for a shark plush toy", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 4, - "tags": [ "accessories", "toys" ] + "tags": ["accessories", "toys"] }, "holmes": { - "description": "A FreeSewing pattern for a Sherlock Holmes hat", - "code": [ "Erica Alcusa Sáez", "bobgeorgethe3rd" ], + "description": "A FreeSewing pattern for a Sherlock Holmes hat", + "code": ["Erica Alcusa Sáez", "bobgeorgethe3rd"], "design": "Erica Alcusa Sáez", "difficulty": 3, - "tags": [ "accessories", "hats" ] + "tags": ["accessories", "hats"] }, "hortensia": { - "description": "A FreeSewing pattern for a handbag", + "description": "A FreeSewing pattern for a handbag", "code": "Wouter Van Wageningen", - "design": [ "Stoffsuchti", "Wouter Van Wageningen" ], + "design": ["Stoffsuchti", "Wouter Van Wageningen"], "difficulty": 3, - "tags": [ "accessories", "bags" ] + "tags": ["accessories", "bags"] }, "lucy": { - "description": "A FreeSewing pattern for a historical tie-on pocket", + "description": "A FreeSewing pattern for a historical tie-on pocket", "code": "SeaZeeZee", "design": "SeaZeeZee", "difficulty": 2, - "tags": [ "accessories", "historical", "bags" ] + "tags": ["accessories", "historical", "bags"] }, "octoplushy": { - "description": "A FreeSewing pattern for an octopus plushy toy", + "description": "A FreeSewing pattern for an octopus plushy toy", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 4, - "tags": [ "accessories", "toys" ] + "tags": ["accessories", "toys"] }, "trayvon": { - "description": "A FreeSewing pattern for a tie", + "description": "A FreeSewing pattern for a tie", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 2, - "tags": [ "accessories" ] + "tags": ["accessories"] } }, "blocks": { "bella": { - "description": "A FreeSewing pattern for a womenswear bodice block", + "description": "A FreeSewing pattern for a womenswear bodice block", "code": "Joost De Cock", - "design": [ "Bella Incognito", "Joost De Cock" ], + "design": ["Bella Incognito", "Joost De Cock"], "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "bent": { - "description": "A FreeSewing pattern for a menswear body block with a two-part sleeve", + "description": "A FreeSewing pattern for a menswear body block with a two-part sleeve", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "breanna": { - "description": "A FreeSewing pattern for a basic body block for womenswear", + "description": "A FreeSewing pattern for a basic body block for womenswear", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "brian": { "description": "A FreeSewing pattern for a basic body block for menswear", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "noble": { - "description": "A FreeSewing pattern for a princess seam bodice block", + "description": "A FreeSewing pattern for a princess seam bodice block", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "titan": { - "description": "A FreeSewing pattern for a unisex trouser block", + "description": "A FreeSewing pattern for a unisex trouser block", "code": "Joost De Cock", - "design": [ "Debra Bean", "Joost De Cock" ], + "design": ["Debra Bean", "Joost De Cock"], "difficulty": 3, - "tags": [ "bottoms" ] + "tags": ["bottoms"] } }, "garments": { "aaron": { - "description": "A FreeSewing pattern for a A-shirt or tank top", + "description": "A FreeSewing pattern for a A-shirt or tank top", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 2, - "tags": [ "tops", "underwear" ] + "tags": ["tops", "underwear"] }, "bee": { - "description": "A FreeSewing pattern for a bikini top", + "description": "A FreeSewing pattern for a bikini top", "code": "bobgeorgethe3rd", "design": "PrudenceRabbit", "difficulty": 3, - "tags": [ "tops", "swimwear" ] + "tags": ["tops", "swimwear"] }, "bruce": { - "description": "A FreeSewing pattern for boxer briefs", + "description": "A FreeSewing pattern for boxer briefs", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops", "underwear" ] + "tags": ["tops", "underwear"] }, "carlita": { - "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", + "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", "code": "Joost De Cock", - "design": [ "Anneke Caramin", "Joost De Cock" ], + "design": ["Anneke Caramin", "Joost De Cock"], "difficulty": 5, - "tags": [ "tops", "coats" ] + "tags": ["tops", "coats"] }, "carlton": { - "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", + "description": "A FreeSewing pattern for Sherlock Holmes cosplay; Or just a nice long coat", "code": "Joost De Cock", - "design": [ "Anneke Caramin", "Joost De Cock" ], + "design": ["Anneke Caramin", "Joost De Cock"], "difficulty": 5, - "tags": [ "tops", "coats" ] + "tags": ["tops", "coats"] }, "cathrin": { - "description": "A FreeSewing pattern for a underbust corset / waist trainer", + "description": "A FreeSewing pattern for a underbust corset / waist trainer", "code": "Joost De Cock", - "design": [ "Cathrin Åhlén", "Joost De Cock" ], + "design": ["Cathrin Åhlén", "Joost De Cock"], "difficulty": 4, - "tags": [ "tops", "underwear" ] + "tags": ["tops", "underwear"] }, "charlie": { - "description": "A FreeSewing pattern for chino trousers", + "description": "A FreeSewing pattern for chino trousers", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "bottoms", "trousers" ] + "tags": ["bottoms", "trousers"] }, "cornelius": { - "description": "A FreeSewing pattern for cycling breeches, based on the Keystone drafting system", + "description": "A FreeSewing pattern for cycling breeches, based on the Keystone drafting system", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 3, - "tags": [ "bottoms", "trousers" ] + "tags": ["bottoms", "trousers"] }, "diana": { - "description": "A FreeSewing pattern for a top with a draped neck", + "description": "A FreeSewing pattern for a top with a draped neck", "code": "Erica Alcusa Sáez", "design": "Erica Alcusa Sáez", "difficulty": 2, - "tags": [ "tops" ] + "tags": ["tops"] }, "huey": { - "description": "A FreeSewing pattern for a zip-up hoodie", + "description": "A FreeSewing pattern for a zip-up hoodie", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "hugo": { - "description": "A FreeSewing pattern for a hooded jumper with raglan sleeves", + "description": "A FreeSewing pattern for a hooded jumper with raglan sleeves", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "jaeger": { - "description": "A FreeSewing pattern for a sport coat style jacket", + "description": "A FreeSewing pattern for a sport coat style jacket", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 5, - "tags": [ "tops", "coats" ] + "tags": ["tops", "coats"] }, "lunetius": { - "description": "A FreeSewing pattern for a lacerna, a historical Roman cloak", + "description": "A FreeSewing pattern for a lacerna, a historical Roman cloak", "code": "Rika Tamaike", "design": "Rika Tamaike", "difficulty": 1, - "tags": [ "tops", "coats", "historical" ] + "tags": ["tops", "coats", "historical"] }, "paco": { - "description": "A FreeSewing pattern for summer pants", + "description": "A FreeSewing pattern for summer pants", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "bottoms", "trousers" ] + "tags": ["bottoms", "trousers"] }, "penelope": { - "description": "A FreeSewing pattern for a pencil skirt", + "description": "A FreeSewing pattern for a pencil skirt", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 3, - "tags": [ "bottoms", "skirts" ] + "tags": ["bottoms", "skirts"] }, "sandy": { - "description": "A FreeSewing pattern for a circle skirt", - "code": [ "Erica Alcusa Sáez", "Joost De Cock" ], + "description": "A FreeSewing pattern for a circle skirt", + "code": ["Erica Alcusa Sáez", "Joost De Cock"], "design": "Erica Alcusa Sáez", "difficulty": 3, - "tags": [ "bottoms", "skirts" ] + "tags": ["bottoms", "skirts"] }, "shin": { - "description": "A FreeSewing pattern for swim trunks", + "description": "A FreeSewing pattern for swim trunks", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 2, - "tags": [ "bottoms", "swimwear" ] + "tags": ["bottoms", "swimwear"] }, "simon": { - "description": "A FreeSewing pattern for a button down shirt", + "description": "A FreeSewing pattern for a button down shirt", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 4, - "tags": [ "tops" ] + "tags": ["tops"] }, "simone": { - "description": "A FreeSewing pattern for a button down shirt (Simone = Simon for people with breasts)", + "description": "A FreeSewing pattern for a button down shirt (Simone = Simon for people with breasts)", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 4, - "tags": [ "tops" ] + "tags": ["tops"] }, "sven": { - "description": "A FreeSewing pattern for a straightforward sweater", + "description": "A FreeSewing pattern for a straightforward sweater", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] }, "tamiko": { - "description": "A FreeSewing pattern for a zero-waste top", + "description": "A FreeSewing pattern for a zero-waste top", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 1, - "tags": [ "tops" ] + "tags": ["tops"] }, "teagan": { - "description": "A FreeSewing pattern for a T-shirt", + "description": "A FreeSewing pattern for a T-shirt", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 2, - "tags": [ "tops" ] + "tags": ["tops"] }, "tiberius": { - "description": "A FreeSewing pattern for a tunica, a historical Roman tunic", + "description": "A FreeSewing pattern for a tunica, a historical Roman tunic", "code": "Rika Tamaike", "design": "Rika Tamaike", "difficulty": 1, - "tags": [ "tops", "historic" ] + "tags": ["tops", "historic"] }, "unice": { - "description": "A FreeSewing pattern for a basic, highly-customizable underwear pattern", - "code": [ "Anna Puk", "Natalia Sayang" ], - "design": [ "Anna Puk", "Natalia Sayang" ], + "description": "A FreeSewing pattern for a basic, highly-customizable underwear pattern", + "code": ["Anna Puk", "Natalia Sayang"], + "design": ["Anna Puk", "Natalia Sayang"], "difficulty": 1, - "tags": [ "bottoms", "underwear" ] + "tags": ["bottoms", "underwear"] }, "ursula": { - "description": "A FreeSewing pattern for a basic, highly-customizable underwear pattern", + "description": "A FreeSewing pattern for a basic, highly-customizable underwear pattern", "code": "Natalia Sayang", "design": "Natalia Sayang", "difficulty": 1, - "tags": [ "bottoms", "underwear" ] + "tags": ["bottoms", "underwear"] }, "wahid": { - "description": "A FreeSewing pattern for a classic fitted waistcoat", + "description": "A FreeSewing pattern for a classic fitted waistcoat", "code": "Joost De Cock", "design": "Joost De Cock", "difficulty": 4, - "tags": [ "tops" ] + "tags": ["tops"] }, "walburga": { - "description": "A FreeSewing pattern for a wappenrock (tabard/surcoat), a historical European/medieval (ish) garment", + "description": "A FreeSewing pattern for a wappenrock (tabard/surcoat), a historical European/medieval (ish) garment", "code": "Rika Tamaike", "design": "Rika Tamaike", "difficulty": 1, - "tags": [ "bottoms", "historic" ] + "tags": ["bottoms", "historic"] }, "waralee": { - "description": "A FreeSewing pattern for wrap pants", + "description": "A FreeSewing pattern for wrap pants", "code": "Wouter Van Wageningen", "design": "Wouter Van Wageningen", "difficulty": 2, - "tags": [ "bottoms", "trousers" ] + "tags": ["bottoms", "trousers"] }, "yuri": { - "description": "A FreeSewing pattern for a fancy zipless sweater based on the Huey hoodie", + "description": "A FreeSewing pattern for a fancy zipless sweater based on the Huey hoodie", "code": "Hellgy", "design": "Biou", "difficulty": 3, - "tags": [ "tops" ] + "tags": ["tops"] } }, "utilities": { "examples": { - "description": "A FreeSewing pattern holding examples for our documentation", + "description": "A FreeSewing pattern holding examples for our documentation", "code": "Joost De Cock" }, "legend": { - "description": "A FreeSewing pattern to document pattern notation", + "description": "A FreeSewing pattern to document pattern notation", "code": "Joost De Cock" }, "plugintest": { - "description": "A FreeSewing pattern to test (y)our plugins", + "description": "A FreeSewing pattern to test (y)our plugins", "code": "Joost De Cock" }, "rendertest": { - "description": "A FreeSewing pattern to test (y)our render engine our CSS", + "description": "A FreeSewing pattern to test (y)our render engine our CSS", "code": "Joost De Cock" }, "tutorial": { - "description": "A FreeSewing pattern for a baby bib that's used in our tutorial", + "description": "A FreeSewing pattern for a baby bib that's used in our tutorial", "code": "Joost De Cock" } } diff --git a/config/software/index.mjs b/config/software/index.mjs index 13836e94179..23447c3f06a 100644 --- a/config/software/index.mjs +++ b/config/software/index.mjs @@ -4,14 +4,22 @@ import plugins from './plugins.json' assert { type: 'json' } import sites from './sites.json' assert { type: 'json' } // Helper method to construct summary objects -const unpack = (obj, folder) => Object.fromEntries( - Object.keys(obj).map(name => [name, { name, folder, type: folder.slice(0, -1), description: obj[name] } ]) -) +const unpack = (obj, folder) => + Object.fromEntries( + Object.keys(obj).map((name) => [ + name, + { name, folder, type: folder.slice(0, -1), description: obj[name] }, + ]) + ) // Helper method to construct summary objects for designs -const unpackDesigns = (obj, folder) => Object.fromEntries( - Object.keys(obj).map(name => [name, { name, folder, type: folder.slice(0, -1), ...obj[name] } ]) -) +const unpackDesigns = (obj, folder) => + Object.fromEntries( + Object.keys(obj).map((name) => [ + name, + { name, folder, type: folder.slice(0, -1), ...obj[name] }, + ]) + ) const designs = { ...designsByType.accessories, @@ -38,6 +46,5 @@ export const publishedSoftware = { ...unpack(packages, 'packages'), } -export const publishedTypes = [ 'designs', 'packages', 'plugins' ] -export const types = [ ...publishedTypes, 'sites' ] - +export const publishedTypes = ['designs', 'packages', 'plugins'] +export const types = [...publishedTypes, 'sites'] diff --git a/config/software/plugins.json b/config/software/plugins.json index 64c8fe1afd7..af0f9ce27b1 100644 --- a/config/software/plugins.json +++ b/config/software/plugins.json @@ -24,4 +24,3 @@ "plugin-title": "A FreeSewing plugin to add a title to your pattern parts", "plugin-versionfree-svg": "A FreeSewing plugin to keep version info out of your SVG to allow easy diffs across versions" } - diff --git a/config/templates/build.dflt.mjs b/config/templates/build.dflt.mjs index aa4dfabb290..2f76b066047 100644 --- a/config/templates/build.dflt.mjs +++ b/config/templates/build.dflt.mjs @@ -17,7 +17,7 @@ const options = { entryPoints: ['src/index.mjs'], format: 'esm', outfile: 'dist/index.mjs', - external: ["@freesewing"], + external: ['@freesewing'], metafile: process.env.VERBOSE ? true : false, minify: process.env.NO_MINIFY ? false : true, sourcemap: true, @@ -25,12 +25,11 @@ const options = { // Let esbuild generate the build let result -(async () => { +;(async () => { result = await esbuild.build(options).catch(() => process.exit(1)) if (process.env.VERBOSE) { const info = await esbuild.analyzeMetafile(result.metafile) console.log(info) } - })() diff --git a/config/templates/design/package.json b/config/templates/design/package.json.mustache similarity index 100% rename from config/templates/design/package.json rename to config/templates/design/package.json.mustache diff --git a/config/templates/design/src/index.mjs b/config/templates/design/src/index.mjs.mustache similarity index 100% rename from config/templates/design/src/index.mjs rename to config/templates/design/src/index.mjs.mustache diff --git a/config/templates/newsletter.html b/config/templates/newsletter.html index 611b60f17de..7de792f5083 100644 --- a/config/templates/newsletter.html +++ b/config/templates/newsletter.html @@ -1,24 +1,35 @@ - - + + - - - - - - - - FreeSewing Newsletter + + + + + + + + + + + + + FreeSewing Newsletter + @@ -26,11 +37,11 @@ @@ -42,255 +53,329 @@ - - - - -
- - - - + + + - - -
- ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  -
- + + +
+ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  +
+ - - + -
- + - diff --git a/config/templates/package.dflt.json b/config/templates/package.dflt.json index 31f94c6dd6b..2a93133c018 100644 --- a/config/templates/package.dflt.json +++ b/config/templates/package.dflt.json @@ -7,8 +7,8 @@ "url": "https://github.com/freesewing/freesewing/issues" }, "funding": { - "type" : "individual", - "url" : "https://freesewing.org/patrons/join" + "type": "individual", + "url": "https://freesewing.org/patrons/join" }, "keywords": ["freesewing"], "type": "module", diff --git a/config/templates/plugin.test.mjs b/config/templates/plugin.test.mjs index 216a74b956b..7bf4f668398 100644 --- a/config/templates/plugin.test.mjs +++ b/config/templates/plugin.test.mjs @@ -4,4 +4,3 @@ import { sharedPluginTests } from '../../../tests/plugins/shared.mjs' // Run shared tests sharedPluginTests(plugin) - diff --git a/package.json b/package.json index 03e2cbf4092..abef4401528 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "kickstart:windows": "npx lerna bootstrap && yarn wbuildall && yarn prepare && yarn tips", "cleanall": "lerna run clean", "test": "lerna run test", - "prettier": "npx prettier --write 'packages/**/src/*.mjs' 'packages/**/src/*.js' 'packages/i18n/src/locales/**/*.*' 'packages/**/tests/*.mjs'", + "prettier": "npx prettier --write 'config/*' 'config/**/*' 'packages/**/src/*.mjs' 'packages/i18n/src/locales/**/*.*' 'packages/**/tests/*.mjs'", "reconfigure": "all-contributors generate && node --experimental-json-modules --no-warnings scripts/reconfigure.mjs", "prerelease": "lerna version --no-git-tag-version --no-push && yarn reconfigure && yarn buildall", "buildall": "lerna run cibuild_step0 && lerna run cibuild_step1 && lerna run cibuild_step2 && lerna run cibuild_step3 && lerna run cibuild_step4 && lerna run cibuild_step5 && lerna run cibuild_step6 && lerna run cibuild_step7", diff --git a/packages/core/src/config.mjs b/packages/core/src/config.mjs index e33ec7ebca1..ffa929dff9c 100644 --- a/packages/core/src/config.mjs +++ b/packages/core/src/config.mjs @@ -29,5 +29,5 @@ export const __loadPatternDefaults = () => ({ debug: false, options: {}, absoluteOptions: {}, - measurements: {} + measurements: {}, }) diff --git a/packages/core/tests/pattern-draft.test.mjs b/packages/core/tests/pattern-draft.test.mjs index 0b549d032ac..a5b80a394f9 100644 --- a/packages/core/tests/pattern-draft.test.mjs +++ b/packages/core/tests/pattern-draft.test.mjs @@ -48,7 +48,7 @@ describe('Pattern', () => { name: 'test.partB', measurements: ['head', 'knee'], optionalMeasurements: ['knee'], - after: [ partA ], + after: [partA], plugins: [ { name: 'testPlugin', diff --git a/packages/core/tests/snap.test.mjs b/packages/core/tests/snap.test.mjs index c7c92b9ce0f..fa64a1f9f6b 100644 --- a/packages/core/tests/snap.test.mjs +++ b/packages/core/tests/snap.test.mjs @@ -18,9 +18,9 @@ describe('Snapped options', () => { draft: ({ part, absoluteOptions }) => { abs = absoluteOptions return part - } + }, } - const design = new Design({ parts: [ part] }) + const design = new Design({ parts: [part] }) new design({ options: { test: 0.13 }, measurements, idPrefix: 'A' }).draft() expect(abs.test).to.equal(60) new design({ options: { test: 0.27 }, measurements, idPrefix: 'B' }).draft() diff --git a/packages/core/tests/snippet.test.mjs b/packages/core/tests/snippet.test.mjs index d6de391b53c..9500ad0dc8c 100644 --- a/packages/core/tests/snippet.test.mjs +++ b/packages/core/tests/snippet.test.mjs @@ -43,5 +43,4 @@ describe('Snippet', () => { pattern.draft() expect(result).to.equal(':)') }) - }) diff --git a/packages/core/tests/store.test.mjs b/packages/core/tests/store.test.mjs index 80d56a73c8d..9bbb9db3286 100644 --- a/packages/core/tests/store.test.mjs +++ b/packages/core/tests/store.test.mjs @@ -59,7 +59,7 @@ describe('Store', () => { } const part = { name: 'example.part', - plugins: [ plugin ], + plugins: [plugin], draft: ({ store, part }) => { store.test.example.warning('hello warning') store.test.example.info('hello info') @@ -95,7 +95,7 @@ describe('Store', () => { } const part = { name: 'example_part', - plugins: [ plugin ], + plugins: [plugin], draft: ({ methodA, methodB, part }) => { methodA('hello A') methodB('hello B') @@ -129,9 +129,11 @@ describe('Store', () => { it('Should log a warning when pushing to a non-array key', () => { const store = new Store() - store.push('test',1) + store.push('test', 1) expect(store.logs.warning.length).to.equal(1) - expect(store.logs.warning[0]).to.equal('Store.push(value) on key `test`, but key does not hold an array') + expect(store.logs.warning[0]).to.equal( + 'Store.push(value) on key `test`, but key does not hold an array' + ) }) it('Should log a warning when setting an undefined value with set()', () => { @@ -145,7 +147,9 @@ describe('Store', () => { const store = new Store() store.setIfUnset('test') expect(store.logs.warning.length).to.equal(1) - expect(store.logs.warning[0]).to.equal('Store.setIfUnset(value) on key `test`, but value is undefined') + expect(store.logs.warning[0]).to.equal( + 'Store.setIfUnset(value) on key `test`, but value is undefined' + ) }) it('Should unset a value', () => { diff --git a/packages/core/tests/utils.test.mjs b/packages/core/tests/utils.test.mjs index e1a4a3c4828..8bd1a0dd53f 100644 --- a/packages/core/tests/utils.test.mjs +++ b/packages/core/tests/utils.test.mjs @@ -484,9 +484,9 @@ describe('Utils', () => { points.to = new Point(19, 76) paths.test = new Path().move(points.from).line(points.to) return part - } + }, } - const design = new Design({ parts: [ test ]}) + const design = new Design({ parts: [test] }) const pattern = new design() const props = pattern.draft().getRenderProps() const transform = generateStackTransform(30, 60, 90, true, true, props.stacks.test) diff --git a/packages/i18n/src/locales/de/docs.yaml b/packages/i18n/src/locales/de/docs.yaml index a5f11b2d7b4..865c6ca0477 100644 --- a/packages/i18n/src/locales/de/docs.yaml +++ b/packages/i18n/src/locales/de/docs.yaml @@ -1,3 +1,3 @@ --- -thingIsDeprecated: "{thing} ist veraltet" -weRecommendThingInstead: "Wir empfehlen stattdessen {thing}" +thingIsDeprecated: '{thing} ist veraltet' +weRecommendThingInstead: 'Wir empfehlen stattdessen {thing}' diff --git a/packages/i18n/src/locales/uk/gdpr.yaml b/packages/i18n/src/locales/uk/gdpr.yaml index c0bb57200b6..297d1ebff62 100644 --- a/packages/i18n/src/locales/uk/gdpr.yaml +++ b/packages/i18n/src/locales/uk/gdpr.yaml @@ -26,7 +26,7 @@ profileWarning: Відкликання згоди видалить усі Ваш profileWhatAnswerOptional: 'За наявності: зображення облікового запису, біоі соціальні мережі' profileWhatAnswer: "Ваша електронна адреса, ім'я користувачаі пароль." profileWhatQuestion: Що таке дані облікового запису? -profileWhyAnswer: 'Щоб автентифікувати Вас, зв''язатися з Вами коли це потрібно та задля покращення нашої спільноти.' +profileWhyAnswer: "Щоб автентифікувати Вас, зв'язатися з Вами коли це потрібно та задля покращення нашої спільноти." readMore: Для отримання додаткової інформації, будь ласка, прочитайте наші умови конфіденційності. readRights: Для отримання додаткової інформації, будь ласка, прочитайте про Ваші права. revokeConsent: Відкликати згоду diff --git a/packages/i18n/src/locales/uk/intro.yaml b/packages/i18n/src/locales/uk/intro.yaml index a592fc7f140..56fc2f74e20 100644 --- a/packages/i18n/src/locales/uk/intro.yaml +++ b/packages/i18n/src/locales/uk/intro.yaml @@ -6,7 +6,7 @@ txt-draft: 'Оберіть одну з викрійок, модель та на txt-how: Як це працює txt-join: Приєднайтеся до тисяч інших користувачів та створіть безкоштовний акаунт на freesewing.org. txt-model: Всі наші викрійки адаптуються під задані виміри. Тому перше, що варто зробити – піти взяти сантиметрову стрічку. -txt-newHere: "Якщо ви тут вперше – найкраще місце для початку є наше демо:" +txt-newHere: 'Якщо ви тут вперше – найкраще місце для початку є наше демо:' txt-opensource: 'Наша платформа, наші викрійки та навіть наш вебсайт. Весь наш код доступний на GitHub. Pull requests вітаються!' txt-patrons: FreeSewing існує завдяки фінансовій підтримці наших Патронів. Прокрутіть вниз, щоб дізнатися про нашу модель підписки. txt-showcase: Завершені проекти від спільноти FreeSewing diff --git a/scripts/add-software.mjs b/scripts/add-software.mjs index 07f4730784c..8e226909ad2 100644 --- a/scripts/add-software.mjs +++ b/scripts/add-software.mjs @@ -188,10 +188,13 @@ function createDesign(name, type) { mkdir([...design, 'tests']) // Create package.json - templateOut([...template, 'package.json'], [...design, 'package.json'], { name, description }) + templateOut([...template, 'package.json.mustache'], [...design, 'package.json'], { + name, + description, + }) // Create index.mjs - templateOut([...template, 'src', 'index.mjs'], [...design, 'src', 'index.mjs'], { + templateOut([...template, 'src', 'index.mjs.mustache'], [...design, 'src', 'index.mjs'], { capitalized_name, })