From 48b841995e5519d27cc02d31aff4e388afd3a42b Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Sat, 22 Dec 2018 11:47:02 +0100
Subject: [PATCH] boom: pattern.mergeSettings() is now pattern.apply()

---
 packages/cathrin/config/config.js  |  3 +++
 packages/cathrin/index.html        | 12 ++++++------
 packages/cathrin/package-lock.json | 18 ++++++++++++------
 packages/cathrin/package.json      |  4 ++--
 packages/cathrin/src/index.js      | 16 ++++++++--------
 5 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/packages/cathrin/config/config.js b/packages/cathrin/config/config.js
index 0913aa04ab6..e91db0d1e47 100644
--- a/packages/cathrin/config/config.js
+++ b/packages/cathrin/config/config.js
@@ -1,5 +1,8 @@
+import { version } from "../package.json";
+
 export default {
   name: "cathrin",
+  version,
   measurements: [
     "underbust",
     "naturalWaist",
diff --git a/packages/cathrin/index.html b/packages/cathrin/index.html
index 79ab565a2ba..ee11f1912ce 100644
--- a/packages/cathrin/index.html
+++ b/packages/cathrin/index.html
@@ -18,13 +18,13 @@
     <script type="text/javascript" src="node_modules/@freesewing/models/dist/browser.js"></script>
     <script type="text/javascript" src="node_modules/@freesewing/antman/dist/browser.js"></script>
     <script>
-       var pattern = new freesewing.patterns.cathrin;
+       var pattern = new freesewing.patterns.cathrin();
        pattern
-         .with(freesewing.plugins.debug)
-         .with(freesewing.plugins.theme)
-         .with(freesewing.plugins.designer)
-         .with(freesewing.plugins.validate)
-         .with(freesewing.plugins.i18n)
+         .use(freesewing.plugins.debug)
+         .use(freesewing.plugins.theme)
+         .use(freesewing.plugins.designer)
+         .use(freesewing.plugins.validate)
+         .use(freesewing.plugins.i18n)
        ;
        pattern.settings.locale = 'nl';
        pattern.settings.paperless = true;
diff --git a/packages/cathrin/package-lock.json b/packages/cathrin/package-lock.json
index e14bda77111..7aa80901375 100644
--- a/packages/cathrin/package-lock.json
+++ b/packages/cathrin/package-lock.json
@@ -923,14 +923,15 @@
       "dev": true
     },
     "@freesewing/plugin-bundle": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.5.1.tgz",
-      "integrity": "sha512-43dF2OkLE6ZxFwK5aLElX/6ejQl4tgLhMFlYO7igqLRjaEufC3Q9mAIR+AyuzyUzDkDdgGdefqTdmOjTdO4PTg==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@freesewing/plugin-bundle/-/plugin-bundle-0.6.0.tgz",
+      "integrity": "sha512-gytm7G6CQtgi7wAxXe2ib8vwqak8DpMhR7v++fX418EgR16WBgxTVdglqLVQ8j/qF+W7QRbcS+jomCfU7FLxXQ==",
       "requires": {
         "@freesewing/plugin-cutonfold": "0.10.2",
         "@freesewing/plugin-dimension": "0.7.3",
         "@freesewing/plugin-grainline": "0.2.2",
         "@freesewing/plugin-logo": "0.5.2",
+        "@freesewing/plugin-round": "0.2.0",
         "@freesewing/plugin-scalebox": "0.3.1",
         "@freesewing/plugin-title": "0.9.1"
       }
@@ -973,6 +974,11 @@
       "resolved": "https://registry.npmjs.org/@freesewing/plugin-logo/-/plugin-logo-0.5.2.tgz",
       "integrity": "sha512-g+lk/nBYxnzs7hQYUdQ/YDPJCUmUeZcNdk0+xUWoADdoZY95NwrXVxfNz/O2wI9kRCgFpFojgT0dD2HKtkv0/w=="
     },
+    "@freesewing/plugin-round": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@freesewing/plugin-round/-/plugin-round-0.2.0.tgz",
+      "integrity": "sha512-uzAxICxNHQ0rtS4W07mhQQ0qcm4nHWNUzkInK/322k7BCYYb/v8tsC2EW9PISCvHZqUEhlDBR+vXPsusNSRNhA=="
+    },
     "@freesewing/plugin-scalebox": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/@freesewing/plugin-scalebox/-/plugin-scalebox-0.3.1.tgz",
@@ -2750,9 +2756,9 @@
       }
     },
     "freesewing": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.23.2.tgz",
-      "integrity": "sha512-6EWJnr/X6lsyCkN4NJK1KAP6TTI4YF7NIaAP0eATOebAU87FENqBaHLH8x+PoY/0BcekprGIen/hhQelUOLc5g==",
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/freesewing/-/freesewing-0.26.1.tgz",
+      "integrity": "sha512-j6y7JuM+n3vyKwBPkEYOjpXc4QoU0cBcHDQTaWBi/YXITrIvi2zYcbTW6xwGnQcohBjNDb3feqZSgGhf4dB/xw==",
       "requires": {
         "bezier-js": "^2.2.15",
         "bin-pack": "1.0.2"
diff --git a/packages/cathrin/package.json b/packages/cathrin/package.json
index 91e5d647e24..b4f030523ee 100644
--- a/packages/cathrin/package.json
+++ b/packages/cathrin/package.json
@@ -47,8 +47,8 @@
     ]
   },
   "dependencies": {
-    "freesewing": "^0.23.2",
-    "@freesewing/plugin-bundle": "^0.5.1"
+    "freesewing": "^0.26.1",
+    "@freesewing/plugin-bundle": "^0.6.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0-beta.56",
diff --git a/packages/cathrin/src/index.js b/packages/cathrin/src/index.js
index 99daa8a8d87..c5dda8aca35 100644
--- a/packages/cathrin/src/index.js
+++ b/packages/cathrin/src/index.js
@@ -1,7 +1,6 @@
 import freesewing from "freesewing";
-import pluginBundle from "@freesewing/plugin-bundle";
+import plugins from "@freesewing/plugin-bundle";
 import config from "../config/config";
-import { version } from "../package.json";
 //Parts
 import draftBase from "./base";
 import draftPanels from "./panels";
@@ -12,16 +11,17 @@ import draftPanel4 from "./panel4";
 import draftPanel5 from "./panel5";
 import draftPanel6 from "./panel6";
 
-// Constructor boilerplate
-const Cathrin = function(settings = false) {
-  freesewing.Pattern.call(this, { version: version, ...config });
-  this.with(pluginBundle);
-  if (settings !== false) this.mergeSettings(settings);
+// Constructor
+const Cathrin = function(settings) {
+  freesewing.Pattern.call(this, config);
+  this
+    .use(plugins)
+    .apply(settings);
 
   return this;
 };
 
-// Inheritance boilerplate
+// Set up inheritance
 Cathrin.prototype = Object.create(freesewing.Pattern.prototype);
 Cathrin.prototype.constructor = Cathrin;