diff --git a/packages/simon/index.html b/packages/simon/index.html index 5a8ec88cee4..a5d908a5f17 100644 --- a/packages/simon/index.html +++ b/packages/simon/index.html @@ -110,7 +110,7 @@ let settings1 = { ...settings }; pattern1.settings.options.yokeDart = 0; pattern1.settings.options.lengthBonus = 0.2; pattern1.settings.options.hipsEase = 0.1; - pattern1.settings.options.hemStyle = "slashed"; + pattern1.settings.options.hemStyle = "baseball"; pattern1.settings.options.buttonPlacketType = "cut-on"; pattern1.settings.options.buttonPlacketStyle = "classic"; pattern1.settings.options.buttonholePlacketType = "cut-on"; diff --git a/packages/simon/package.json b/packages/simon/package.json index e0195b16e53..13d5b9ae98c 100644 --- a/packages/simon/package.json +++ b/packages/simon/package.json @@ -33,6 +33,7 @@ "browserbuild": "rollup -c rollup.js -o dist/browser.js -f iife -m true -n freesewing_patterns_simon --footer 'freesewing.patterns.simon = freesewing_patterns_simon;'", "nodebuild": "rollup -c rollup.js -o dist/index.js -f cjs -m true", "modulebuild": "rollup -c rollup.js -o dist/index.mjs -f es -m true", + "rebuild": "npm run nodebuild && npm run modulebuild", "build": "npm run clean && npm run browserbuild && npm run nodebuild && npm run modulebuild" }, "husky": { diff --git a/packages/simon/rollup.js b/packages/simon/rollup.js index 29af7a8a414..528d1c60d28 100644 --- a/packages/simon/rollup.js +++ b/packages/simon/rollup.js @@ -14,14 +14,14 @@ export default { json(), babel({ exclude: "node_modules/**" - }), - terser({ - output: { - preamble: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` - } }) + //terser({ + // output: { + // preamble: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` + // } + //}) ], - external: ["freesewing", "@freesewing/plugin-bundle"], + external: ["freesewing", "@freesewing/plugin-bundle", "@freesewing/brian"], output: { globals: { freesewing: "freesewing", diff --git a/packages/simon/src/front.js b/packages/simon/src/front.js index 888ec30d00c..6a2c4a819b5 100644 --- a/packages/simon/src/front.js +++ b/packages/simon/src/front.js @@ -76,7 +76,6 @@ export default part => { .move(points.bballEnd) .line(points.hips) .join(paths.saBaseFromHips); - paths.hemBase = new Path() .move(points.cfHem) .line(points.bballStart) @@ -108,7 +107,7 @@ export default part => { paths.saBase.render = false; paths.saBaseFromHips.render = false; paths.saBaseFromArmhole.render = false; - paths.hemBase.render = false; + aths.hemBase.render = false; paths.seam = paths.hemBase .join(paths.saBase) .join(paths.saBaseFromArmhole) diff --git a/packages/simon/src/frontleft-seamless.js b/packages/simon/src/frontleft-seamless.js index aa50641f872..32f64afaa45 100644 --- a/packages/simon/src/frontleft-seamless.js +++ b/packages/simon/src/frontleft-seamless.js @@ -17,7 +17,6 @@ export default part => { macro, options } = part.shorthand(); - let fold = options.buttonholePlacketFoldWidth; let width = options.buttonholePlacketWidth; points.placketCfNeck = points.cfNeck; diff --git a/packages/simon/src/frontleft.js b/packages/simon/src/frontleft.js index b903f289244..f1857d42ed5 100644 --- a/packages/simon/src/frontleft.js +++ b/packages/simon/src/frontleft.js @@ -17,7 +17,7 @@ export default part => { return options.buttonholePlacketStyle === "seamless" ? frontLeftSeamless(part) - : seperateButtonholePlacket + : options.seperateButtonholePlacket ? frontLeftClassicSeperate(part) : frontLeftClassicCuton(part); }; diff --git a/packages/simon/src/sleeve.js b/packages/simon/src/sleeve.js index 842633f8b3c..08e8110633f 100644 --- a/packages/simon/src/sleeve.js +++ b/packages/simon/src/sleeve.js @@ -2,6 +2,15 @@ import { calculateReduction } from "./shared"; export default part => { part.paths = {}; // This removed paperless dimensions from brian block + for (let pid of [ + "__scaleboxLead", + "__scaleboxMetric", + "__scaleboxImperial", + "__scaleboxText", + "__scaleboxTitle", + "__scaleboxLink" + ]) + delete part.points[pid]; let { store, measurements,