diff --git a/packages/aaron/package.json b/packages/aaron/package.json index 33be79bcd1f..454604976b0 100644 --- a/packages/aaron/package.json +++ b/packages/aaron/package.json @@ -33,9 +33,9 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/brian": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/brian": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/aaron/src/index.js b/packages/aaron/src/index.js index fca99bdca28..9d385931bc7 100644 --- a/packages/aaron/src/index.js +++ b/packages/aaron/src/index.js @@ -1,21 +1,20 @@ import freesewing from "@freesewing/core"; import Brian from "@freesewing/brian"; import plugins from "@freesewing/plugin-bundle"; -import config from "./config"; +import config from "../config"; // Parts import draftBack from "./back"; import draftFront from "./front"; // Create design -const Aaron = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Aaron.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { // Getting the base part from Brian return new Brian(this.settings).draftBase(part); }; -Aaron.prototype.draftFront = part => draftFront(part); -Aaron.prototype.draftBack = part => draftBack(part); +Pattern.prototype.draftFront = part => draftFront(part); +Pattern.prototype.draftBack = part => draftBack(part); -export default Aaron; -export { config }; +export default Pattern; diff --git a/packages/bent/package.json b/packages/bent/package.json index 34a86c362da..58321686f84 100644 --- a/packages/bent/package.json +++ b/packages/bent/package.json @@ -33,9 +33,9 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/brian": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/brian": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/bent/src/index.js b/packages/bent/src/index.js index 626516d23f2..ec481ef0091 100644 --- a/packages/bent/src/index.js +++ b/packages/bent/src/index.js @@ -8,23 +8,22 @@ import draftTopSleeve from "./topsleeve"; import draftUnderSleeve from "./undersleeve"; // Create new design -const Bent = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods from Brian to prototype -Bent.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Bent.prototype.draftFront = function(part) { +Pattern.prototype.draftFront = function(part) { return new Brian(this.settings).draftFront(part); }; -Bent.prototype.draftBack = function(part) { +Pattern.prototype.draftBack = function(part) { return new Brian(this.settings).draftBack(part); }; // Attach own draft methods to prototype -Bent.prototype.draftSleeve = draftSleeve; -Bent.prototype.draftTopSleeve = draftTopSleeve; -Bent.prototype.draftUnderSleeve = draftUnderSleeve; +Pattern.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftTopSleeve = draftTopSleeve; +Pattern.prototype.draftUnderSleeve = draftUnderSleeve; -export default Bent; -export { config }; +export default Pattern; diff --git a/packages/brian/package.json b/packages/brian/package.json index 20453ce6e4f..b51db8ce463 100644 --- a/packages/brian/package.json +++ b/packages/brian/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/brian/src/index.js b/packages/brian/src/index.js index 08b16041976..ff508cc1d90 100644 --- a/packages/brian/src/index.js +++ b/packages/brian/src/index.js @@ -9,14 +9,13 @@ import draftSleevecap from "./sleevecap"; import draftSleeve from "./sleeve"; // Create design -const Brian = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Brian.prototype.draftBase = draftBase; -Brian.prototype.draftBack = draftBack; -Brian.prototype.draftFront = draftFront; -Brian.prototype.draftSleevecap = draftSleevecap; -Brian.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftBase = draftBase; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftSleevecap = draftSleevecap; +Pattern.prototype.draftSleeve = draftSleeve; -export default Brian; -export { config }; +export default Pattern; diff --git a/packages/bruce/package.json b/packages/bruce/package.json index 9927d35ce40..d9da8562277 100644 --- a/packages/bruce/package.json +++ b/packages/bruce/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/bruce/src/index.js b/packages/bruce/src/index.js index 3f9dee683d7..ec775ecfe1d 100644 --- a/packages/bruce/src/index.js +++ b/packages/bruce/src/index.js @@ -8,13 +8,12 @@ import draftFront from "./front"; import draftInset from "./inset"; // Create design -const Bruce = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Bruce.prototype.draftBack = part => draftBack(part); -Bruce.prototype.draftSide = part => draftSide(part); -Bruce.prototype.draftInset = part => draftInset(part); -Bruce.prototype.draftFront = part => draftFront(part); +Pattern.prototype.draftBack = part => draftBack(part); +Pattern.prototype.draftSide = part => draftSide(part); +Pattern.prototype.draftInset = part => draftInset(part); +Pattern.prototype.draftFront = part => draftFront(part); -export default Bruce; -export { config }; +export default Pattern; diff --git a/packages/carlita/package.json b/packages/carlita/package.json index 4cd26e8672b..dc7b517408c 100644 --- a/packages/carlita/package.json +++ b/packages/carlita/package.json @@ -33,12 +33,12 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/bent": "^2.0.0-alpha.3", - "@freesewing/carlton": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3", - "@freesewing/plugin-bust": "^2.0.0-alpha.3", - "@freesewing/plugin-buttons": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/bent": "^2.0.0-alpha.4", + "@freesewing/carlton": "^2.0.0-alpha.4", + "@freesewing/plugin-bust": "^2.0.0-alpha.4", + "@freesewing/plugin-buttons": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/carlita/src/index.js b/packages/carlita/src/index.js index 04d78eb81b3..5284b6e24da 100644 --- a/packages/carlita/src/index.js +++ b/packages/carlita/src/index.js @@ -1,4 +1,4 @@ -import freesewing from "freesewing"; +import freesewing from "@freesewing/core"; import plugins from "@freesewing/plugin-bundle"; import buttons from "@freesewing/plugin-buttons"; import bust from "@freesewing/plugin-bust"; @@ -10,13 +10,13 @@ import draftFront from "./front"; import draftSide from "./side"; // Create new design -const Carlita = new freesewing.Design(config, [plugins, buttons, bust]); +const Pattern = new freesewing.Design(config, [plugins, buttons, bust]); let fromBent = ["Base", "Front", "Back", "Sleeve", "TopSleeve", "UnderSleeve"]; // Attach draft methods from Bent to prototype for (let m of fromBent) { - Carlita.prototype["draftBent" + m] = function(part) { + Pattern.prototype["draftBent" + m] = function(part) { return new Bent(this.settings)["draft" + m](part); }; } @@ -40,17 +40,17 @@ for (let m of [ "draftInnerPocketBag", "draftInnerPocketTab" ]) { - Carlita.prototype[m] = function(part) { + Pattern.prototype[m] = function(part) { return new Carlton(this.settings)[m](part); }; } -Carlita.prototype.draftCarltonFront = function(part) { +Pattern.prototype.draftCarltonFront = function(part) { return new Carlton(this.settings).draftFront(part); }; // Attach own draft methods to prototype -Carlita.prototype.draftFront = draftFront; -Carlita.prototype.draftSide = draftSide; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftSide = draftSide; -export default Carlita; +export default Pattern; diff --git a/packages/carlton/package.json b/packages/carlton/package.json index 582a5857495..8274c8e84fc 100644 --- a/packages/carlton/package.json +++ b/packages/carlton/package.json @@ -33,10 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/bent": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3", - "@freesewing/plugin-buttons": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/bent": "^2.0.0-alpha.4", + "@freesewing/plugin-buttons": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/carlton/src/index.js b/packages/carlton/src/index.js index 09d9f031488..74d897d74a2 100644 --- a/packages/carlton/src/index.js +++ b/packages/carlton/src/index.js @@ -23,46 +23,45 @@ import draftInnerPocketBag from "./innerpocketbag"; import draftInnerPocketTab from "./innerpockettab"; // Create new design -const Carlton = new freesewing.Design(config, [plugins, buttons]); +const Pattern = new freesewing.Design(config, [plugins, buttons]); // Attach draft methods from Bent to prototype -Carlton.prototype.draftBentBase = function(part) { +Pattern.prototype.draftBentBase = function(part) { return new Bent(this.settings).draftBase(part); }; -Carlton.prototype.draftBentFront = function(part) { +Pattern.prototype.draftBentFront = function(part) { return new Bent(this.settings).draftFront(part); }; -Carlton.prototype.draftBentBack = function(part) { +Pattern.prototype.draftBentBack = function(part) { return new Bent(this.settings).draftBack(part); }; -Carlton.prototype.draftBentSleeve = function(part) { +Pattern.prototype.draftBentSleeve = function(part) { return new Bent(this.settings).draftSleeve(part); }; -Carlton.prototype.draftBentTopSleeve = function(part) { +Pattern.prototype.draftBentTopSleeve = function(part) { return new Bent(this.settings).draftTopSleeve(part); }; -Carlton.prototype.draftBentUnderSleeve = function(part) { +Pattern.prototype.draftBentUnderSleeve = function(part) { return new Bent(this.settings).draftUnderSleeve(part); }; // Attach own draft methods to prototype -Carlton.prototype.draftFront = draftFront; -Carlton.prototype.draftBack = draftBack; -Carlton.prototype.draftTail = draftTail; -Carlton.prototype.draftTopSleeve = draftTopSleeve; -Carlton.prototype.draftUnderSleeve = draftUnderSleeve; -Carlton.prototype.draftBelt = draftBelt; -Carlton.prototype.draftCollarStand = draftCollarStand; -Carlton.prototype.draftCollar = draftCollar; -Carlton.prototype.draftCuffFacing = draftCuffFacing; -Carlton.prototype.draftPocket = draftPocket; -Carlton.prototype.draftPocketFlap = draftPocketFlap; -Carlton.prototype.draftPocketLining = draftPocketLining; -Carlton.prototype.draftChestPocketWelt = draftChestPocketWelt; -Carlton.prototype.draftChestPocketBag = draftChestPocketBag; -Carlton.prototype.draftInnerPocketWelt = draftInnerPocketWelt; -Carlton.prototype.draftInnerPocketBag = draftInnerPocketBag; -Carlton.prototype.draftInnerPocketTab = draftInnerPocketTab; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftTail = draftTail; +Pattern.prototype.draftTopSleeve = draftTopSleeve; +Pattern.prototype.draftUnderSleeve = draftUnderSleeve; +Pattern.prototype.draftBelt = draftBelt; +Pattern.prototype.draftCollarStand = draftCollarStand; +Pattern.prototype.draftCollar = draftCollar; +Pattern.prototype.draftCuffFacing = draftCuffFacing; +Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftPocketFlap = draftPocketFlap; +Pattern.prototype.draftPocketLining = draftPocketLining; +Pattern.prototype.draftChestPocketWelt = draftChestPocketWelt; +Pattern.prototype.draftChestPocketBag = draftChestPocketBag; +Pattern.prototype.draftInnerPocketWelt = draftInnerPocketWelt; +Pattern.prototype.draftInnerPocketBag = draftInnerPocketBag; +Pattern.prototype.draftInnerPocketTab = draftInnerPocketTab; -export default Carlton; -export { config }; +export default Pattern; diff --git a/packages/cathrin/package.json b/packages/cathrin/package.json index 670ef466ebb..41c1c9800f2 100644 --- a/packages/cathrin/package.json +++ b/packages/cathrin/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/cathrin/src/index.js b/packages/cathrin/src/index.js index 699f980019b..72f7a88004a 100644 --- a/packages/cathrin/src/index.js +++ b/packages/cathrin/src/index.js @@ -12,17 +12,16 @@ import draftPanel5 from "./panel5"; import draftPanel6 from "./panel6"; // Create design -const Cathrin = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Cathrin.prototype.draftBase = draftBase; -Cathrin.prototype.draftPanels = draftPanels; -Cathrin.prototype.draftPanel1 = draftPanel1; -Cathrin.prototype.draftPanel2 = draftPanel2; -Cathrin.prototype.draftPanel3 = draftPanel3; -Cathrin.prototype.draftPanel4 = draftPanel4; -Cathrin.prototype.draftPanel5 = draftPanel5; -Cathrin.prototype.draftPanel6 = draftPanel6; +Pattern.prototype.draftBase = draftBase; +Pattern.prototype.draftPanels = draftPanels; +Pattern.prototype.draftPanel1 = draftPanel1; +Pattern.prototype.draftPanel2 = draftPanel2; +Pattern.prototype.draftPanel3 = draftPanel3; +Pattern.prototype.draftPanel4 = draftPanel4; +Pattern.prototype.draftPanel5 = draftPanel5; +Pattern.prototype.draftPanel6 = draftPanel6; -export default Cathrin; -export { config }; +export default Pattern; diff --git a/packages/components/.storybook/config.js b/packages/components/.storybook/config.js index 2927b4a48c7..045a4b3321a 100644 --- a/packages/components/.storybook/config.js +++ b/packages/components/.storybook/config.js @@ -1,7 +1,7 @@ import React from "react"; -import { configure } from "@storybook/react"; import "../../css-theme/dist/theme.css"; -import { addParameters, addDecorator } from "@storybook/react"; +import { configure } from "@storybook/react"; +import { addDecorator } from "@storybook/react"; import { IntlProvider } from "react-intl"; import { strings } from "@freesewing/i18n"; @@ -17,11 +17,4 @@ addDecorator(story => ( )); -//addParameters({ -// backgrounds: [ -// { name: 'Light', value: '#f8f9fa', default: true }, -// { name: 'Dark', value: '#212529' }, -// ], -//}); - configure(loadStories, module); diff --git a/packages/components/package.json b/packages/components/package.json index a5f7fa18dd6..d8d4a581e44 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -27,12 +27,15 @@ "storybook": "start-storybook -p 6663" }, "peerDependencies": { - "@freesewing/i18n": "^2.0.0-alpha.3", - "@freesewing/patterns": "^2.0.0-alpha.3", - "@freesewing/utils": "^2.0.0-alpha.3", - "prop-types": "15.7.2", "react": "^16.4.1", - "react-intl": "^2.8.0" + "prop-types": "15.7.2", + "@freesewing/patterns": "^2.0.0-alpha.4", + "@freesewing/i18n": "^2.0.0-alpha.4", + "@freesewing/utils": "^2.0.0-alpha.4", + "react-intl": "^2.8.0", + "@material-ui/core": "^3.9.3", + "@material-ui/icons": "^3.0.2", + "@material-ui/lab": "^3.0.0-alpha.30" }, "files": [ "dist/*", diff --git a/packages/components/src/.form/FormFieldSlider/index.js b/packages/components/src/.form/FormFieldSlider/index.js index af11e423aa5..f3c5ccbbf7e 100644 --- a/packages/components/src/.form/FormFieldSlider/index.js +++ b/packages/components/src/.form/FormFieldSlider/index.js @@ -1,7 +1,7 @@ import React, { useState } from "react"; import PropTypes from "prop-types"; import Slider from "@material-ui/lab/Slider"; -import { withStyles } from "@material-ui/styles"; +import { withStyles } from "@material-ui/core/styles"; const PaddedSlider = withStyles({ container: { diff --git a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js index 812a496628c..1e331fe696e 100644 --- a/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js +++ b/packages/components/src/DraftConfigurator/DraftSettingLanguage/index.js @@ -3,7 +3,7 @@ import PropTypes from "prop-types"; import FormFieldList from "../../.form/FormFieldList"; import OptionPreamble from "../OptionPreamble"; import { injectIntl } from "react-intl"; -import { i18n as languages } from "@freesewing/i18n"; +import { languages } from "@freesewing/i18n"; const DraftSettingLanguage = props => { const [value, setValue] = useState(props.intl.locale); diff --git a/packages/components/src/Workbench/LanguageChooser/index.js b/packages/components/src/Workbench/LanguageChooser/index.js index 0c2285b4e68..1e8b0f6a86f 100644 --- a/packages/components/src/Workbench/LanguageChooser/index.js +++ b/packages/components/src/Workbench/LanguageChooser/index.js @@ -1,6 +1,6 @@ import React from "react"; import Button from "@material-ui/core/Button"; -import { i18n } from "@freesewing/i18n"; +import { languages } from "@freesewing/i18n"; const LanguageChooser = props => { const styles = { @@ -27,7 +27,7 @@ const LanguageChooser = props => { return (
- {Object.keys(i18n).map(lang => { + {Object.keys(languages).map(lang => { return ( ); })} diff --git a/packages/examples/package.json b/packages/examples/package.json index 12982af8583..8950be8823f 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -28,9 +28,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/examples/src/index.js b/packages/examples/src/index.js index 3848d3e8fa3..eff73041685 100644 --- a/packages/examples/src/index.js +++ b/packages/examples/src/index.js @@ -1,9 +1,8 @@ -import freesewing from "freesewing"; +import freesewing from "@freesewing/core"; import plugins from "@freesewing/plugin-bundle"; - import config from "../config/"; import { version } from "../package.json"; - +// Path API import draftPath_ops from "./path_ops"; import draftPath_attr from "./path_attr"; import draftPath_clone from "./path_clone"; @@ -23,14 +22,14 @@ import draftPath_split from "./path_split"; import draftPath_start from "./path_start"; import draftPath_translate from "./path_translate"; import draftPath_trim from "./path_trim"; - +// Plugins import draftPlugin_cutonfold from "./plugin_cutonfold"; import draftPlugin_dimension from "./plugin_dimension"; import draftPlugin_grainline from "./plugin_grainline"; import draftPlugin_logo from "./plugin_logo"; import draftPlugin_scalebox from "./plugin_scalebox"; import draftPlugin_title from "./plugin_title"; - +// Point API import draftPoint_angle from "./point_angle"; import draftPoint_attr from "./point_attr"; import draftPoint_clone from "./point_clone"; @@ -47,7 +46,7 @@ import draftPoint_shiftoutwards from "./point_shiftoutwards"; import draftPoint_sitson from "./point_sitson"; import draftPoint_rotate from "./point_rotate"; import draftPoint_translate from "./point_translate"; - +// Utils API import draftUtils_linesintersect from "./utils_linesintersect"; import draftUtils_beamsintersect from "./utils_beamsintersect"; import draftUtils_beamintersectsx from "./utils_beamintersectsx"; @@ -63,87 +62,84 @@ import draftUtils_lineintersectscircle from "./utils_lineintersectscircle"; import draftUtils_curveintersectsx from "./utils_curveintersectsx"; import draftUtils_curveintersectsy from "./utils_curveintersectsy"; import draftUtils_splitcurve from "./utils_splitcurve"; - +// Various import draftSettings_sa from "./settings_sa"; - import draftSnippet_attr from "./snippet_attr"; import draftSnippet_clone from "./snippet_clone"; // Create design -const Examples = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Examples.prototype.draftPath_move = draftPath_ops; -Examples.prototype.draftPath_line = draftPath_ops; -Examples.prototype.draftPath_curve = draftPath_ops; -Examples.prototype.draftPath__curve = draftPath_ops; -Examples.prototype.draftPath_curve_ = draftPath_ops; -Examples.prototype.draftPath_close = draftPath_ops; +let methods = { + draftPath_move: draftPath_ops, + draftPath_line: draftPath_ops, + draftPath_curve: draftPath_ops, + draftPath__curve: draftPath_ops, + draftPath_curve_: draftPath_ops, + draftPath_close: draftPath_ops, + draftPath_attr, + draftPath_clone, + draftPath_divide, + draftPath_edge, + draftPath_end, + draftPath_intersects, + draftPath_intersectsx, + draftPath_intersectsy, + draftPath_join, + draftPath_length, + draftPath_offset, + draftPath_ops, + draftPath_reverse, + draftPath_shiftalong, + draftPath_shiftfractionalong, + draftPath_split, + draftPath_start, + draftPath_translate, + draftPath_trim, + draftPlugin_cutonfold, + draftPlugin_dimension, + draftPlugin_grainline, + draftPlugin_logo, + draftPlugin_scalebox, + draftPlugin_title, + draftPoint_attr, + draftPoint_angle, + draftPoint_attr, + draftPoint_clone, + draftPoint_copy, + draftPoint_dist, + draftPoint_dx, + draftPoint_dy, + draftPoint_flipx, + draftPoint_flipy, + draftPoint_shift, + draftPoint_shiftfractiontowards, + draftPoint_shifttowards, + draftPoint_shiftoutwards, + draftPoint_sitson, + draftPoint_rotate, + draftPoint_translate, + draftSettings_sa, + draftSnippet_attr, + draftSnippet_clone, + draftUtils_linesintersect, + draftUtils_beamsintersect, + draftUtils_beamintersectsx, + draftUtils_beamintersectsy, + draftUtils_lineintersectscurve, + draftUtils_curvesintersect, + draftUtils_pointonbeam, + draftUtils_pointonline, + draftUtils_pointoncurve, + draftUtils_circlesintersect, + draftUtils_beamintersectscircle, + draftUtils_lineintersectscircle, + draftUtils_curveintersectsx, + draftUtils_curveintersectsy, + draftUtils_splitcurve +}; -Examples.prototype.draftPath_attr = draftPath_attr; -Examples.prototype.draftPath_clone = draftPath_clone; -Examples.prototype.draftPath_divide = draftPath_divide; -Examples.prototype.draftPath_edge = draftPath_edge; -Examples.prototype.draftPath_end = draftPath_end; -Examples.prototype.draftPath_intersects = draftPath_intersects; -Examples.prototype.draftPath_intersectsx = draftPath_intersectsx; -Examples.prototype.draftPath_intersectsy = draftPath_intersectsy; -Examples.prototype.draftPath_join = draftPath_join; -Examples.prototype.draftPath_length = draftPath_length; -Examples.prototype.draftPath_offset = draftPath_offset; -Examples.prototype.draftPath_ops = draftPath_ops; -Examples.prototype.draftPath_reverse = draftPath_reverse; -Examples.prototype.draftPath_shiftalong = draftPath_shiftalong; -Examples.prototype.draftPath_shiftfractionalong = draftPath_shiftfractionalong; -Examples.prototype.draftPath_split = draftPath_split; -Examples.prototype.draftPath_start = draftPath_start; -Examples.prototype.draftPath_translate = draftPath_translate; -Examples.prototype.draftPath_trim = draftPath_trim; +for (let m of Object.keys(methods)) Pattern.prototype[m] = methods[m]; -Examples.prototype.draftPlugin_cutonfold = draftPlugin_cutonfold; -Examples.prototype.draftPlugin_dimension = draftPlugin_dimension; -Examples.prototype.draftPlugin_grainline = draftPlugin_grainline; -Examples.prototype.draftPlugin_logo = draftPlugin_logo; -Examples.prototype.draftPlugin_scalebox = draftPlugin_scalebox; -Examples.prototype.draftPlugin_title = draftPlugin_title; - -Examples.prototype.draftPoint_attr = draftPoint_attr; -Examples.prototype.draftPoint_angle = draftPoint_angle; -Examples.prototype.draftPoint_attr = draftPoint_attr; -Examples.prototype.draftPoint_clone = draftPoint_clone; -Examples.prototype.draftPoint_copy = draftPoint_copy; -Examples.prototype.draftPoint_dist = draftPoint_dist; -Examples.prototype.draftPoint_dx = draftPoint_dx; -Examples.prototype.draftPoint_dy = draftPoint_dy; -Examples.prototype.draftPoint_flipx = draftPoint_flipx; -Examples.prototype.draftPoint_flipy = draftPoint_flipy; -Examples.prototype.draftPoint_shift = draftPoint_shift; -Examples.prototype.draftPoint_shiftfractiontowards = draftPoint_shiftfractiontowards; -Examples.prototype.draftPoint_shifttowards = draftPoint_shifttowards; -Examples.prototype.draftPoint_shiftoutwards = draftPoint_shiftoutwards; -Examples.prototype.draftPoint_sitson = draftPoint_sitson; -Examples.prototype.draftPoint_rotate = draftPoint_rotate; -Examples.prototype.draftPoint_translate = draftPoint_translate; - -Examples.prototype.draftSettings_sa = draftSettings_sa; - -Examples.prototype.draftSnippet_attr = draftSnippet_attr; -Examples.prototype.draftSnippet_clone = draftSnippet_clone; - -Examples.prototype.draftUtils_linesintersect = draftUtils_linesintersect; -Examples.prototype.draftUtils_beamsintersect = draftUtils_beamsintersect; -Examples.prototype.draftUtils_beamintersectsx = draftUtils_beamintersectsx; -Examples.prototype.draftUtils_beamintersectsy = draftUtils_beamintersectsy; -Examples.prototype.draftUtils_lineintersectscurve = draftUtils_lineintersectscurve; -Examples.prototype.draftUtils_curvesintersect = draftUtils_curvesintersect; -Examples.prototype.draftUtils_pointonbeam = draftUtils_pointonbeam; -Examples.prototype.draftUtils_pointonline = draftUtils_pointonline; -Examples.prototype.draftUtils_pointoncurve = draftUtils_pointoncurve; -Examples.prototype.draftUtils_circlesintersect = draftUtils_circlesintersect; -Examples.prototype.draftUtils_beamintersectscircle = draftUtils_beamintersectscircle; -Examples.prototype.draftUtils_lineintersectscircle = draftUtils_lineintersectscircle; -Examples.prototype.draftUtils_curveintersectsx = draftUtils_curveintersectsx; -Examples.prototype.draftUtils_curveintersectsy = draftUtils_curveintersectsy; -Examples.prototype.draftUtils_splitcurve = draftUtils_splitcurve; - -export default Examples; +export default Pattern; diff --git a/packages/florent/package.json b/packages/florent/package.json index 76afe6de4f3..0cf609ebad2 100644 --- a/packages/florent/package.json +++ b/packages/florent/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/florent/src/index.js b/packages/florent/src/index.js index 59e7de07bab..3f50cb95ac1 100644 --- a/packages/florent/src/index.js +++ b/packages/florent/src/index.js @@ -1,4 +1,4 @@ -import freesewing from "freesewing"; +import freesewing from "@freesewing/core"; import plugins from "@freesewing/plugin-bundle"; import config from "../config"; // Parts @@ -9,13 +9,13 @@ import draftBrimTop from "./brimtop"; import draftBrimInterfacing from "./briminterfacing"; // Create new design -const Florent = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attachdraft methods to prototype -Florent.prototype.draftTop = draftTop; -Florent.prototype.draftSide = draftSide; -Florent.prototype.draftBrimBottom = draftBrimBottom; -Florent.prototype.draftBrimTop = draftBrimTop; -Florent.prototype.draftBrimInterfacing = draftBrimInterfacing; +Pattern.prototype.draftTop = draftTop; +Pattern.prototype.draftSide = draftSide; +Pattern.prototype.draftBrimBottom = draftBrimBottom; +Pattern.prototype.draftBrimTop = draftBrimTop; +Pattern.prototype.draftBrimInterfacing = draftBrimInterfacing; -export default Florent; +export default Pattern; diff --git a/packages/huey/package.json b/packages/huey/package.json index bfc6b0c12ff..0f556c94ed8 100644 --- a/packages/huey/package.json +++ b/packages/huey/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/huey/src/index.js b/packages/huey/src/index.js index 0ac8cd877d0..0139436d5cd 100644 --- a/packages/huey/src/index.js +++ b/packages/huey/src/index.js @@ -12,33 +12,32 @@ import draftWaistband from "./waistband"; import draftCuff from "./cuff"; // Create new design -const Huey = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods from Brian to prototype -Huey.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Huey.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function(part) { return new Brian(this.settings).draftFront(part); }; -Huey.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function(part) { return new Brian(this.settings).draftBack(part); }; -Huey.prototype.draftSleevecap = function(part) { +Pattern.prototype.draftSleevecap = function(part) { return new Brian(this.settings).draftSleevecap(part); }; -Huey.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function(part) { return new Brian(this.settings).draftSleeve(part); }; // Attach own draft methods to prototype -Huey.prototype.draftBack = draftBack; -Huey.prototype.draftFront = draftFront; -Huey.prototype.draftSleeve = draftSleeve; -Huey.prototype.draftPocket = draftPocket; -Huey.prototype.draftHood = draftHood; -Huey.prototype.draftWaistband = draftWaistband; -Huey.prototype.draftCuff = draftCuff; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftHood = draftHood; +Pattern.prototype.draftWaistband = draftWaistband; +Pattern.prototype.draftCuff = draftCuff; -export default Huey; -export { config }; +export default Pattern; diff --git a/packages/hugo/package.json b/packages/hugo/package.json index a75d50ee8a2..28523f2cd6d 100644 --- a/packages/hugo/package.json +++ b/packages/hugo/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/hugo/src/index.js b/packages/hugo/src/index.js index d92e1214d57..10cf9dee73d 100644 --- a/packages/hugo/src/index.js +++ b/packages/hugo/src/index.js @@ -14,33 +14,32 @@ import draftWaistband from "./waistband"; import draftCuff from "./cuff"; // Create design -const Hugo = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Hugo.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Hugo.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function(part) { return new Brian(this.settings).draftFront(part); }; -Hugo.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function(part) { return new Brian(this.settings).draftBack(part); }; -Hugo.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function(part) { return new Brian(this.settings).draftSleeve(part); }; -Hugo.prototype.draftSleevecap = function(part) { +Pattern.prototype.draftSleevecap = function(part) { return new Brian(this.settings).draftSleevecap(part); }; -Hugo.prototype.draftBack = draftBack; -Hugo.prototype.draftFront = draftFront; -Hugo.prototype.draftSleeve = draftSleeve; -Hugo.prototype.draftPocket = draftPocket; -Hugo.prototype.draftPocketFacing = draftPocketFacing; -Hugo.prototype.draftHoodSide = draftHoodSide; -Hugo.prototype.draftHoodCenter = draftHoodCenter; -Hugo.prototype.draftWaistband = draftWaistband; -Hugo.prototype.draftCuff = draftCuff; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftPocketFacing = draftPocketFacing; +Pattern.prototype.draftHoodSide = draftHoodSide; +Pattern.prototype.draftHoodCenter = draftHoodCenter; +Pattern.prototype.draftWaistband = draftWaistband; +Pattern.prototype.draftCuff = draftCuff; -export default Hugo; -export { config }; +export default Pattern; diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 93ea694725f..504d97a229e 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -30,7 +30,7 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/pattern-info": "^2.0.0-alpha.3" + "@freesewing/pattern-info": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/i18n/rollup.config.js b/packages/i18n/rollup.config.js index dbee92ea2c2..f822e093103 100644 --- a/packages/i18n/rollup.config.js +++ b/packages/i18n/rollup.config.js @@ -38,11 +38,11 @@ export default { babel({ exclude: "node_modules/**", plugins: ["@babel/plugin-proposal-object-rest-spread"] - }), - minify({ - comments: false, - sourceMap: true, - banner: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` }) + //minify({ + // comments: false, + // sourceMap: true, + // banner: `/**\n * ${name} | v${version}\n * ${description}\n * (c) ${new Date().getFullYear()} ${author}\n * @license ${license}\n */` + //}) ] }; diff --git a/packages/jaeger/package.json b/packages/jaeger/package.json index 93decdb4aeb..adc8fb6f104 100644 --- a/packages/jaeger/package.json +++ b/packages/jaeger/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/jaeger/src/index.js b/packages/jaeger/src/index.js index 3e20046a523..179bf6f9f5b 100644 --- a/packages/jaeger/src/index.js +++ b/packages/jaeger/src/index.js @@ -22,45 +22,44 @@ import draftTopSleeve from "./topsleeve"; import draftUnderSleeve from "./undersleeve"; // Create new design -const Jaeger = new freesewing.Design(config, [plugins, buttons]); +const Pattern = new freesewing.Design(config, [plugins, buttons]); // Attach draft methods from Bent to prototype -Jaeger.prototype.draftBentBase = function(part) { +Pattern.prototype.draftBentBase = function(part) { return new Bent(this.settings).draftBase(part); }; -Jaeger.prototype.draftBentFront = function(part) { +Pattern.prototype.draftBentFront = function(part) { return new Bent(this.settings).draftFront(part); }; -Jaeger.prototype.draftBentBack = function(part) { +Pattern.prototype.draftBentBack = function(part) { return new Bent(this.settings).draftBack(part); }; -Jaeger.prototype.draftBentSleeve = function(part) { +Pattern.prototype.draftBentSleeve = function(part) { return new Bent(this.settings).draftSleeve(part); }; -Jaeger.prototype.draftBentTopSleeve = function(part) { +Pattern.prototype.draftBentTopSleeve = function(part) { return new Bent(this.settings).draftTopSleeve(part); }; -Jaeger.prototype.draftBentUnderSleeve = function(part) { +Pattern.prototype.draftBentUnderSleeve = function(part) { return new Bent(this.settings).draftUnderSleeve(part); }; // Attach own draft methods to prototype -Jaeger.prototype.draftBackBase = draftBackBase; -Jaeger.prototype.draftFrontBase = draftFrontBase; -Jaeger.prototype.draftFront = draftFront; -Jaeger.prototype.draftBack = draftBack; -Jaeger.prototype.draftSide = draftSide; -Jaeger.prototype.draftCollarStand = draftCollarStand; -Jaeger.prototype.draftCollar = draftCollar; -Jaeger.prototype.draftUnderCollar = draftUnderCollar; -Jaeger.prototype.draftPocket = draftPocket; -Jaeger.prototype.draftPocketLining = draftPocketLining; -Jaeger.prototype.draftChestPocketWelt = draftChestPocketWelt; -Jaeger.prototype.draftChestPocketBag = draftChestPocketBag; -Jaeger.prototype.draftInnerPocketWelt = draftInnerPocketWelt; -Jaeger.prototype.draftInnerPocketBag = draftInnerPocketBag; -Jaeger.prototype.draftTopSleeve = draftTopSleeve; -Jaeger.prototype.draftUnderSleeve = draftUnderSleeve; +Pattern.prototype.draftBackBase = draftBackBase; +Pattern.prototype.draftFrontBase = draftFrontBase; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftSide = draftSide; +Pattern.prototype.draftCollarStand = draftCollarStand; +Pattern.prototype.draftCollar = draftCollar; +Pattern.prototype.draftUnderCollar = draftUnderCollar; +Pattern.prototype.draftPocket = draftPocket; +Pattern.prototype.draftPocketLining = draftPocketLining; +Pattern.prototype.draftChestPocketWelt = draftChestPocketWelt; +Pattern.prototype.draftChestPocketBag = draftChestPocketBag; +Pattern.prototype.draftInnerPocketWelt = draftInnerPocketWelt; +Pattern.prototype.draftInnerPocketBag = draftInnerPocketBag; +Pattern.prototype.draftTopSleeve = draftTopSleeve; +Pattern.prototype.draftUnderSleeve = draftUnderSleeve; -export default Jaeger; -export { config }; +export default Pattern; diff --git a/packages/models/package.json b/packages/models/package.json index bca0f2df17c..974338bcde9 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -29,6 +29,9 @@ "pubforce": "npm publish", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, + "peerDependencies": {}, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/mui-theme/src/index.js b/packages/mui-theme/src/index.js index af45f472a7f..79db49b77be 100644 --- a/packages/mui-theme/src/index.js +++ b/packages/mui-theme/src/index.js @@ -33,7 +33,12 @@ const getTheme = mode => { MuiMenuItem: { root: asTitle }, MuiListItemText: { primary: asTitle }, MuiRadio: forceColor, - MuiCheckbox: forceColor + MuiCheckbox: forceColor, + MuiSlider: { + container: { padding: "25px 0" }, + track: { height: "4px" }, + thumb: { width: "16px", height: "16px" } + } }, palette: { primary: { diff --git a/packages/pattern-info/package.json b/packages/pattern-info/package.json index fff13f6915c..6b3b764ec8f 100644 --- a/packages/pattern-info/package.json +++ b/packages/pattern-info/package.json @@ -31,6 +31,9 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -", "prebuild": "node src/prebuild.js" }, + "peerDependencies": {}, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/pattern-info/src/index.js b/packages/pattern-info/src/index.js index 07c4260ff5a..71febfa203e 100644 --- a/packages/pattern-info/src/index.js +++ b/packages/pattern-info/src/index.js @@ -1,8 +1,8 @@ -import options from "./prebuild/options"; -import optionGroups from "./prebuild/option-groups"; -import versions from "./prebuild/versions"; +export { default as options } from "./prebuild/options"; +export { default as optionGroups } from "./prebuild/option-groups"; +export { default as versions } from "./prebuild/versions"; -const list = [ +export const list = [ "aaron", "bent", "brian", @@ -18,5 +18,3 @@ const list = [ "trayvon", "wahid" ]; - -export { list, options, optionGroups, versions }; diff --git a/packages/pattern-info/src/prebuild.js b/packages/pattern-info/src/prebuild.js index 10ccb879b51..30ff557353f 100644 --- a/packages/pattern-info/src/prebuild.js +++ b/packages/pattern-info/src/prebuild.js @@ -1,6 +1,6 @@ const path = require("path"); const fse = require("fs-extra"); -const patterns = require("@freesewing/patterns").default; +const patterns = require("@freesewing/patterns"); const patternOptions = pattern => { let all = []; diff --git a/packages/patterns/package.json b/packages/patterns/package.json index 1c4766fb265..10003418aa8 100644 --- a/packages/patterns/package.json +++ b/packages/patterns/package.json @@ -33,8 +33,8 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, "dependencies": { "@freesewing/aaron": "^2.0.0-alpha.4", diff --git a/packages/patterns/src/index.js b/packages/patterns/src/index.js index 2836c64506b..67b43c7d47b 100644 --- a/packages/patterns/src/index.js +++ b/packages/patterns/src/index.js @@ -1,31 +1,14 @@ -import Aaron from "@freesewing/aaron"; -import Bent from "@freesewing/bent"; -import Brian from "@freesewing/brian"; -import Bruce from "@freesewing/bruce"; -import Carlton from "@freesewing/carlton"; -import Cathrin from "@freesewing/cathrin"; -import Huey from "@freesewing/huey"; -import Hugo from "@freesewing/hugo"; -import Jaeger from "@freesewing/jaeger"; -import Simon from "@freesewing/simon"; -import Sven from "@freesewing/sven"; -import Tamiko from "@freesewing/tamiko"; -import Trayvon from "@freesewing/trayvon"; -import Wahid from "@freesewing/wahid"; - -export default { - Aaron, - Bent, - Brian, - Bruce, - Carlton, - Cathrin, - Huey, - Hugo, - Jaeger, - Simon, - Sven, - Tamiko, - Trayvon, - Wahid -}; +export { default as Aaron } from "@freesewing/aaron"; +export { default as Bent } from "@freesewing/bent"; +export { default as Brian } from "@freesewing/brian"; +export { default as Bruce } from "@freesewing/bruce"; +export { default as Carlton } from "@freesewing/carlton"; +export { default as Cathrin } from "@freesewing/cathrin"; +export { default as Huey } from "@freesewing/huey"; +export { default as Hugo } from "@freesewing/hugo"; +export { default as Jaeger } from "@freesewing/jaeger"; +export { default as Simon } from "@freesewing/simon"; +export { default as Sven } from "@freesewing/sven"; +export { default as Tamiko } from "@freesewing/tamiko"; +export { default as Trayvon } from "@freesewing/trayvon"; +export { default as Wahid } from "@freesewing/wahid"; diff --git a/packages/plugin-banner/package.json b/packages/plugin-banner/package.json index 80c9436c758..dfec3160d5d 100644 --- a/packages/plugin-banner/package.json +++ b/packages/plugin-banner/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-bundle/package.json b/packages/plugin-bundle/package.json index 50f89b198d4..13d93506852 100644 --- a/packages/plugin-bundle/package.json +++ b/packages/plugin-bundle/package.json @@ -34,8 +34,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-bust/package.json b/packages/plugin-bust/package.json index eb1d7943ed9..8fd1cb53a5e 100644 --- a/packages/plugin-bust/package.json +++ b/packages/plugin-bust/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-buttons/package.json b/packages/plugin-buttons/package.json index 6c4591a6cdf..091b99fdbe3 100644 --- a/packages/plugin-buttons/package.json +++ b/packages/plugin-buttons/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-cutonfold/package.json b/packages/plugin-cutonfold/package.json index f790d6bfc6e..4e87962cfca 100644 --- a/packages/plugin-cutonfold/package.json +++ b/packages/plugin-cutonfold/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-debug/package.json b/packages/plugin-debug/package.json index f90561456f4..f09315cbc5d 100644 --- a/packages/plugin-debug/package.json +++ b/packages/plugin-debug/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index 2b8e4ccd517..e854fa56977 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-dimension/package.json b/packages/plugin-dimension/package.json index 2b06951a377..9c163c98fde 100644 --- a/packages/plugin-dimension/package.json +++ b/packages/plugin-dimension/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-flip/package.json b/packages/plugin-flip/package.json index 90d1b124720..947180df412 100644 --- a/packages/plugin-flip/package.json +++ b/packages/plugin-flip/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-grainline/package.json b/packages/plugin-grainline/package.json index 005b1b64a1e..0da499679f7 100644 --- a/packages/plugin-grainline/package.json +++ b/packages/plugin-grainline/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-i18n/package.json b/packages/plugin-i18n/package.json index c8e851f9248..731e7a759e9 100644 --- a/packages/plugin-i18n/package.json +++ b/packages/plugin-i18n/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-logo/package.json b/packages/plugin-logo/package.json index 19cc11e9595..d2185821904 100644 --- a/packages/plugin-logo/package.json +++ b/packages/plugin-logo/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-round/package.json b/packages/plugin-round/package.json index a9212bd5d5d..5f98a1b28fb 100644 --- a/packages/plugin-round/package.json +++ b/packages/plugin-round/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-scalebox/package.json b/packages/plugin-scalebox/package.json index 7c4e2352944..b367f4721cc 100644 --- a/packages/plugin-scalebox/package.json +++ b/packages/plugin-scalebox/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-sprinkle/package.json b/packages/plugin-sprinkle/package.json index c6a3c1d51b6..65101a608d1 100644 --- a/packages/plugin-sprinkle/package.json +++ b/packages/plugin-sprinkle/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-svgattr/package.json b/packages/plugin-svgattr/package.json index 459a4476f41..66225acab1d 100644 --- a/packages/plugin-svgattr/package.json +++ b/packages/plugin-svgattr/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-theme/package.json b/packages/plugin-theme/package.json index 8d1b518263e..a37df8ce4f8 100644 --- a/packages/plugin-theme/package.json +++ b/packages/plugin-theme/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-title/package.json b/packages/plugin-title/package.json index 7d3f2e8c7f9..4669e90d50e 100644 --- a/packages/plugin-title/package.json +++ b/packages/plugin-title/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/plugin-validate/package.json b/packages/plugin-validate/package.json index 456b6126239..b051e5c98f6 100644 --- a/packages/plugin-validate/package.json +++ b/packages/plugin-validate/package.json @@ -33,8 +33,10 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/shin/package.json b/packages/shin/package.json index cd7227a5d74..34fa8230260 100644 --- a/packages/shin/package.json +++ b/packages/shin/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/shin/src/index.js b/packages/shin/src/index.js index 31d2c2ad077..7ef579f57c8 100644 --- a/packages/shin/src/index.js +++ b/packages/shin/src/index.js @@ -7,11 +7,11 @@ import draftFront from "./front"; import draftWaistband from "./waistband"; // Create new design -const Shin = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Shin.prototype.draftBack = draftBack; -Shin.prototype.draftFront = draftFront; -Shin.prototype.draftWaistband = draftWaistband; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftWaistband = draftWaistband; -export default Shin; +export default Pattern; diff --git a/packages/simon/package.json b/packages/simon/package.json index 313302d65ef..0efd556a5d2 100644 --- a/packages/simon/package.json +++ b/packages/simon/package.json @@ -33,11 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/brian": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3", - "@freesewing/plugin-buttons": "^2.0.0-alpha.3", - "@freesewing/plugin-flip": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/brian": "^2.0.0-alpha.4", + "@freesewing/plugin-buttons": "^2.0.0-alpha.4", + "@freesewing/plugin-flip": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/simon/src/index.js b/packages/simon/src/index.js index a4793ad0511..0f35d2725ae 100644 --- a/packages/simon/src/index.js +++ b/packages/simon/src/index.js @@ -20,39 +20,38 @@ import draftSleevePlacketOverlap from "./sleeveplacket-overlap"; import draftCuff from "./cuff"; // Create design -const Simon = new freesewing.Design(config, [ +const Pattern = new freesewing.Design(config, [ plugins, flipPlugin, buttonPlugin ]); // Attach draft methods to prototype -Simon.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Simon.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function(part) { return new Brian(this.settings).draftFront(part); }; -Simon.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function(part) { return new Brian(this.settings).draftBack(part); }; -Simon.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function(part) { let brian = new Brian(this.settings); return brian.draftSleeve(brian.draftSleevecap(part)); }; -Simon.prototype.draftBack = draftBack; -Simon.prototype.draftFront = draftFront; -Simon.prototype.draftFrontRight = draftFrontRight; -Simon.prototype.draftButtonPlacket = draftButtonPlacket; -Simon.prototype.draftFrontLeft = draftFrontLeft; -Simon.prototype.draftButtonholePlacket = draftButtonholePlacket; -Simon.prototype.draftYoke = draftYoke; -Simon.prototype.draftSleeve = draftSleeve; -Simon.prototype.draftCollarStand = draftCollarStand; -Simon.prototype.draftCollar = draftCollar; -Simon.prototype.draftSleevePlacketUnderlap = draftSleevePlacketUnderlap; -Simon.prototype.draftSleevePlacketOverlap = draftSleevePlacketOverlap; -Simon.prototype.draftCuff = draftCuff; +Pattern.prototype.draftBack = draftBack; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftFrontRight = draftFrontRight; +Pattern.prototype.draftButtonPlacket = draftButtonPlacket; +Pattern.prototype.draftFrontLeft = draftFrontLeft; +Pattern.prototype.draftButtonholePlacket = draftButtonholePlacket; +Pattern.prototype.draftYoke = draftYoke; +Pattern.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftCollarStand = draftCollarStand; +Pattern.prototype.draftCollar = draftCollar; +Pattern.prototype.draftSleevePlacketUnderlap = draftSleevePlacketUnderlap; +Pattern.prototype.draftSleevePlacketOverlap = draftSleevePlacketOverlap; +Pattern.prototype.draftCuff = draftCuff; -export default Simon; -export { config }; +export default Pattern; diff --git a/packages/sven/package.json b/packages/sven/package.json index dfd14fdbab7..70200f7710b 100644 --- a/packages/sven/package.json +++ b/packages/sven/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/sven/src/index.js b/packages/sven/src/index.js index 07e6782cd1a..4488809cb80 100644 --- a/packages/sven/src/index.js +++ b/packages/sven/src/index.js @@ -9,27 +9,26 @@ import draftCuff from "./cuff"; import draftWaistband from "./waistband"; // Create design -const Sven = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Sven.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Sven.prototype.draftFrontBase = function(part) { +Pattern.prototype.draftFrontBase = function(part) { return new Brian(this.settings).draftFront(part); }; -Sven.prototype.draftBackBase = function(part) { +Pattern.prototype.draftBackBase = function(part) { return new Brian(this.settings).draftBack(part); }; -Sven.prototype.draftSleeveBase = function(part) { +Pattern.prototype.draftSleeveBase = function(part) { let brian = new Brian(this.settings); return brian.draftSleeve(brian.draftSleevecap(part)); }; -Sven.prototype.draftFront = draftFront; -Sven.prototype.draftBack = draftFront; -Sven.prototype.draftSleeve = draftSleeve; -Sven.prototype.draftCuff = draftCuff; -Sven.prototype.draftWaistband = draftWaistband; +Pattern.prototype.draftFront = draftFront; +Pattern.prototype.draftBack = draftFront; +Pattern.prototype.draftSleeve = draftSleeve; +Pattern.prototype.draftCuff = draftCuff; +Pattern.prototype.draftWaistband = draftWaistband; -export default Sven; -export { config }; +export default Pattern; diff --git a/packages/tamiko/package.json b/packages/tamiko/package.json index fef654c1bc0..445870947d2 100644 --- a/packages/tamiko/package.json +++ b/packages/tamiko/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/tamiko/src/index.js b/packages/tamiko/src/index.js index b8aaec1e5e0..9281e727803 100644 --- a/packages/tamiko/src/index.js +++ b/packages/tamiko/src/index.js @@ -5,10 +5,9 @@ import config from "../config"; import draftTop from "./top"; // Create design -const Tamiko = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Part draft method -Tamiko.prototype.draftTop = part => draftTop(part); +Pattern.prototype.draftTop = part => draftTop(part); -export default Tamiko; -export { config }; +export default Pattern; diff --git a/packages/trayvon/package.json b/packages/trayvon/package.json index aa532496f11..75c4f66a493 100644 --- a/packages/trayvon/package.json +++ b/packages/trayvon/package.json @@ -33,9 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4" }, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/trayvon/src/index.js b/packages/trayvon/src/index.js index 1b729617b38..fc44128b6b7 100644 --- a/packages/trayvon/src/index.js +++ b/packages/trayvon/src/index.js @@ -11,16 +11,15 @@ import draftLiningTail from "./liningtail"; import draftLoop from "./loop"; // Create design -const Trayvon = new freesewing.Design(config, plugins); +const Pattern = new freesewing.Design(config, plugins); // Attach draft methods to prototype -Trayvon.prototype.draftInterfacingTip = part => draftInterfacingTip(part); -Trayvon.prototype.draftInterfacingTail = part => draftInterfacingTail(part); -Trayvon.prototype.draftFabricTip = part => draftFabricTip(part); -Trayvon.prototype.draftFabricTail = part => draftFabricTail(part); -Trayvon.prototype.draftLiningTip = part => draftLiningTip(part); -Trayvon.prototype.draftLiningTail = part => draftLiningTail(part); -Trayvon.prototype.draftLoop = part => draftLoop(part); +Pattern.prototype.draftInterfacingTip = part => draftInterfacingTip(part); +Pattern.prototype.draftInterfacingTail = part => draftInterfacingTail(part); +Pattern.prototype.draftFabricTip = part => draftFabricTip(part); +Pattern.prototype.draftFabricTail = part => draftFabricTail(part); +Pattern.prototype.draftLiningTip = part => draftLiningTip(part); +Pattern.prototype.draftLiningTail = part => draftLiningTail(part); +Pattern.prototype.draftLoop = part => draftLoop(part); -export default Trayvon; -export { config }; +export default Pattern; diff --git a/packages/utils/package.json b/packages/utils/package.json index a36cd3a096c..0ac8e8bf7d2 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -30,6 +30,9 @@ "pubforce": "npm publish", "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, + "peerDependencies": {}, + "dependencies": {}, + "devDependencies": {}, "files": [ "dist/*", "README.md", diff --git a/packages/wahid/package.json b/packages/wahid/package.json index d4237d13966..204c8710664 100644 --- a/packages/wahid/package.json +++ b/packages/wahid/package.json @@ -33,11 +33,11 @@ "symlink": "mkdir -p ./node_modules/@freesewing && cd ./node_modules/@freesewing && ln -s -f ../../../* . && cd -" }, "peerDependencies": { - "@freesewing/brian": "^2.0.0-alpha.3", - "@freesewing/core": "^2.0.0-alpha.3", - "@freesewing/plugin-bundle": "^2.0.0-alpha.3", - "@freesewing/plugin-buttons": "^2.0.0-alpha.3", - "@freesewing/plugin-round": "^2.0.0-alpha.3" + "@freesewing/core": "^2.0.0-alpha.4", + "@freesewing/plugin-bundle": "^2.0.0-alpha.4", + "@freesewing/brian": "^2.0.0-alpha.4", + "@freesewing/plugin-buttons": "^2.0.0-alpha.4", + "@freesewing/plugin-round": "^2.0.0-alpha.4" }, "files": [ "dist/*", diff --git a/packages/wahid/src/index.js b/packages/wahid/src/index.js index e4dd7560c10..55f14a1c257 100644 --- a/packages/wahid/src/index.js +++ b/packages/wahid/src/index.js @@ -15,28 +15,27 @@ import draftPocketFacing from "./pocketfacing"; import draftPocketInterfacing from "./pocketinterfacing"; // Create pattern -const Wahid = new freesewing.Design(config, [plugins, round, buttons]); +const Pattern = new freesewing.Design(config, [plugins, round, buttons]); // Parts we're getting from Brian -Wahid.prototype.draftBase = function(part) { +Pattern.prototype.draftBase = function(part) { return new Brian(this.settings).draftBase(part); }; -Wahid.prototype.draftBackBlock = function(part) { +Pattern.prototype.draftBackBlock = function(part) { return new Brian(this.settings).draftBack(part); }; -Wahid.prototype.draftFrontBlock = function(part) { +Pattern.prototype.draftFrontBlock = function(part) { return new Brian(this.settings).draftFront(part); }; // Attach draft methods to prototype -Wahid.prototype.draftFront = part => draftFront(part); -Wahid.prototype.draftBack = part => draftBack(part); -Wahid.prototype.draftFrontFacing = part => draftFrontFacing(part); -Wahid.prototype.draftFrontLining = part => draftFrontLining(part); -Wahid.prototype.draftPocketWelt = part => draftPocketWelt(part); -Wahid.prototype.draftPocketBag = part => draftPocketBag(part); -Wahid.prototype.draftPocketFacing = part => draftPocketFacing(part); -Wahid.prototype.draftPocketInterfacing = part => draftPocketInterfacing(part); +Pattern.prototype.draftFront = part => draftFront(part); +Pattern.prototype.draftBack = part => draftBack(part); +Pattern.prototype.draftFrontFacing = part => draftFrontFacing(part); +Pattern.prototype.draftFrontLining = part => draftFrontLining(part); +Pattern.prototype.draftPocketWelt = part => draftPocketWelt(part); +Pattern.prototype.draftPocketBag = part => draftPocketBag(part); +Pattern.prototype.draftPocketFacing = part => draftPocketFacing(part); +Pattern.prototype.draftPocketInterfacing = part => draftPocketInterfacing(part); -export default Wahid; -export { config }; +export default Pattern;