From 23a1c8263ecb10687d83e2933626228cbb91d97e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Wed, 25 Sep 2019 18:04:39 +0200 Subject: [PATCH] :wrench: Reconfigure packages --- CHANGELOG.md | 6 ++++ config/descriptions.yaml | 1 + packages/aaron/package.json | 4 +-- packages/benjamin/package.json | 4 +-- packages/bent/package.json | 4 +-- packages/brian/package.json | 4 +-- packages/bruce/package.json | 4 +-- packages/carlita/package.json | 4 +-- packages/carlton/package.json | 4 +-- packages/cathrin/package.json | 4 +-- .../create-freesewing-pattern/package.json | 6 ++-- packages/examples/package.json | 4 +-- packages/florent/package.json | 4 +-- packages/huey/package.json | 4 +-- packages/hugo/package.json | 4 +-- packages/i18n/src/shared-options.yml | 36 +++++++++++++++++++ packages/jaeger/package.json | 4 +-- packages/penelope/package.json | 4 +-- packages/rendertest/package.json | 4 +-- packages/sandy/package.json | 4 +-- packages/shin/package.json | 4 +-- packages/sven/package.json | 4 +-- packages/tamiko/package.json | 4 +-- packages/theo/package.json | 4 +-- packages/trayvon/package.json | 4 +-- packages/tutorial/package.json | 4 +-- .../utils/src/neckstimate/with-breasts.js | 4 +-- packages/wahid/package.json | 4 +-- packages/waralee/package.json | 4 +-- 29 files changed, 96 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f68fb66d89b..00fc2ee550a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +### components + +#### Changed + + - Added Penelope and Waralee linedrawings + ### core #### Changed diff --git a/config/descriptions.yaml b/config/descriptions.yaml index a0f81007824..6826753a3ad 100644 --- a/config/descriptions.yaml +++ b/config/descriptions.yaml @@ -44,6 +44,7 @@ rendertest: "A FreeSewing pattern to test (y)our render engine our CSS" sandy: "A FreeSewing pattern for a circle skirt" shin: "A FreeSewing pattern for swim trunks" simon: "A FreeSewing pattern for a button down shirt" +simone: "A FreeSewing pattern for a button down shirt (Simone = Simon for people with breasts)" sven: "A FreeSewing pattern for a straightforward sweater" tamiko: "A FreeSewing pattern for a zero-waste top" theo: "A FreeSewing pattern for classic trousers" diff --git a/packages/aaron/package.json b/packages/aaron/package.json index 1f8092c8a20..5f34b57aa1a 100644 --- a/packages/aaron/package.json +++ b/packages/aaron/package.json @@ -55,10 +55,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/benjamin/package.json b/packages/benjamin/package.json index 2a530bca496..bc36b5b8daf 100644 --- a/packages/benjamin/package.json +++ b/packages/benjamin/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/bent/package.json b/packages/bent/package.json index badf96702e3..57309e18f6f 100644 --- a/packages/bent/package.json +++ b/packages/bent/package.json @@ -55,10 +55,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/brian/package.json b/packages/brian/package.json index 8fb30a1ee0f..fe4ae8d9464 100644 --- a/packages/brian/package.json +++ b/packages/brian/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/bruce/package.json b/packages/bruce/package.json index 7aa59bfa820..ea166c8c68c 100644 --- a/packages/bruce/package.json +++ b/packages/bruce/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/carlita/package.json b/packages/carlita/package.json index e35f3e0b480..9ccf7cf8e1b 100644 --- a/packages/carlita/package.json +++ b/packages/carlita/package.json @@ -58,10 +58,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/carlton/package.json b/packages/carlton/package.json index ac6653a4f83..6969e3d8aee 100644 --- a/packages/carlton/package.json +++ b/packages/carlton/package.json @@ -56,10 +56,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/cathrin/package.json b/packages/cathrin/package.json index 34b0b121045..96c76e236cb 100644 --- a/packages/cathrin/package.json +++ b/packages/cathrin/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/create-freesewing-pattern/package.json b/packages/create-freesewing-pattern/package.json index 6a4418a0bee..90a68243edb 100644 --- a/packages/create-freesewing-pattern/package.json +++ b/packages/create-freesewing-pattern/package.json @@ -26,13 +26,13 @@ "peerDependencies": {}, "dependencies": { "chalk": "^2.4.2", - "commander": "^3.0.1", + "commander": "^2.19.0", "conf": "^2.2.0", - "cp-file": "^7.0.0", + "cp-file": "^6.0.0", "execa": "^1.0.0", "git-config-path": "^2.0.0", "github-username": "^4.1.0", - "globby": "^10.0.1", + "globby": "^9.0.0", "handlebars": "^4.1.0", "inquirer": "^6.2.2", "make-dir": "^2.0.0", diff --git a/packages/examples/package.json b/packages/examples/package.json index 43c6bfe1af0..b5355418683 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -49,10 +49,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/florent/package.json b/packages/florent/package.json index 05eaea71285..c404c1ab519 100644 --- a/packages/florent/package.json +++ b/packages/florent/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/huey/package.json b/packages/huey/package.json index 2cb1ef89681..180bc18edae 100644 --- a/packages/huey/package.json +++ b/packages/huey/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/hugo/package.json b/packages/hugo/package.json index abdf2c92436..e4bcb0a32e1 100644 --- a/packages/hugo/package.json +++ b/packages/hugo/package.json @@ -55,10 +55,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/i18n/src/shared-options.yml b/packages/i18n/src/shared-options.yml index 54aeb924284..fd3c1070fc2 100644 --- a/packages/i18n/src/shared-options.yml +++ b/packages/i18n/src/shared-options.yml @@ -88,6 +88,42 @@ simon: dflt: brian other: hipsEase: aaron +simone: + dflt: simon + other: + acrossBackFactor: brian + armholeDepthFactor: brian + backNeckCutout: brian + bicepsEase: brian + chestEase: brian + collarEase: brian + cuffEase: brian + frontArmholeDeeper: brian + hipsEase: aaron + lengthBonus: brian + shoulderEase: brian + shoulderSlopeReduction: brian + sleevecapEase: brian + sleevecapTopFactorX: brian + sleevecapTopFactorY: brian + sleevecapBackFactorX: brian + sleevecapBackFactorY: brian + sleevecapFrontFactorX: brian + sleevecapFrontFactorY: brian + sleevecapQ1Offset: brian + sleevecapQ2Offset: brian + sleevecapQ3Offset: brian + sleevecapQ4Offset: brian + sleeveLengthBonus: brian + sleevecapQ1Spread1: brian + sleevecapQ1Spread2: brian + sleevecapQ2Spread1: brian + sleevecapQ2Spread2: brian + sleevecapQ3Spread1: brian + sleevecapQ3Spread2: brian + sleevecapQ4Spread1: brian + sleevecapQ4Spread2: brian + sleeveWidthGuarantee: brian sven: dflt: brian tamiko: diff --git a/packages/jaeger/package.json b/packages/jaeger/package.json index 6c45827d4b3..8d774bf4df5 100644 --- a/packages/jaeger/package.json +++ b/packages/jaeger/package.json @@ -56,10 +56,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/penelope/package.json b/packages/penelope/package.json index c0d3fd7c367..d0a2a3a4c2d 100644 --- a/packages/penelope/package.json +++ b/packages/penelope/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/rendertest/package.json b/packages/rendertest/package.json index 52c0e287611..1532dce70b7 100644 --- a/packages/rendertest/package.json +++ b/packages/rendertest/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/sandy/package.json b/packages/sandy/package.json index 9a9d3af7ec3..5065135624a 100644 --- a/packages/sandy/package.json +++ b/packages/sandy/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/shin/package.json b/packages/shin/package.json index c02a396b19e..c6ea0e40248 100644 --- a/packages/shin/package.json +++ b/packages/shin/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/sven/package.json b/packages/sven/package.json index 4201b12298c..47349241a08 100644 --- a/packages/sven/package.json +++ b/packages/sven/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/tamiko/package.json b/packages/tamiko/package.json index dd879fa5ac0..ba3429fbc33 100644 --- a/packages/tamiko/package.json +++ b/packages/tamiko/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/theo/package.json b/packages/theo/package.json index fcdaef51657..f0a24006a5a 100644 --- a/packages/theo/package.json +++ b/packages/theo/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/trayvon/package.json b/packages/trayvon/package.json index a3202c1d291..b1805403101 100644 --- a/packages/trayvon/package.json +++ b/packages/trayvon/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/tutorial/package.json b/packages/tutorial/package.json index 9d3dcb80125..4cb123912fa 100644 --- a/packages/tutorial/package.json +++ b/packages/tutorial/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/utils/src/neckstimate/with-breasts.js b/packages/utils/src/neckstimate/with-breasts.js index 33c6ab88b18..dcb74fd75e3 100644 --- a/packages/utils/src/neckstimate/with-breasts.js +++ b/packages/utils/src/neckstimate/with-breasts.js @@ -92,7 +92,7 @@ export default { base: 158 }, bustSpan: { - slope: 0.1, + slope: 0.6, base: 160 }, highBust: { @@ -100,7 +100,7 @@ export default { base: 820 }, highPointShoulderToBust: { - slope: 0.1, + slope: 0.3, base: 285 }, naturalWaistToUnderbust: { diff --git a/packages/wahid/package.json b/packages/wahid/package.json index 13d0f0d61ed..76a3ee39776 100644 --- a/packages/wahid/package.json +++ b/packages/wahid/package.json @@ -57,10 +57,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0", diff --git a/packages/waralee/package.json b/packages/waralee/package.json index c3f32c86326..3a66cd15354 100644 --- a/packages/waralee/package.json +++ b/packages/waralee/package.json @@ -54,10 +54,10 @@ "@freesewing/plugin-flip": "^2.0.3", "@freesewing/utils": "^2.0.3", "@svgr/rollup": "^2.4.1", - "cross-env": "^6.0.0", + "cross-env": "^5.1.4", "gh-pages": "^1.2.0", "react-scripts": "^3.0.0", - "webpack": "4.40.2", + "webpack": "4.29.6", "rollup": "^0.64.1", "rollup-plugin-babel": "^4.0.1", "rollup-plugin-babel-minify": "^7.0.0",