Merge branch 'develop' of github.com:freesewing/freesewing into develop

2019-11-01 18:08:44 +01:00 · 2019-11-01 18:08:44 +01:00 · 4c0aead0ea
commit 4c0aead0ea
parent 06a789fdfa 3149d53c50
29 changed files with 900 additions and 898 deletions
--- a/package.json
+++ b/package.json
@ -83,7 +83,7 @@
    "eslint-plugin-react": "^7.10.0",
    "eslint-plugin-standard": "^4.0.1",
    "fs-extra": "^8.1.0",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "husky": "^3.0.5",
    "js-yaml": "^3.13.1",
    "jsonlint": "^1.6.3",
--- a/packages/aaron/package.json
+++ b/packages/aaron/package.json
@ -54,9 +54,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/benjamin/package.json
+++ b/packages/benjamin/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/bent/package.json
+++ b/packages/bent/package.json
@ -54,9 +54,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/brian/package.json
+++ b/packages/brian/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/bruce/package.json
+++ b/packages/bruce/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/carlita/package.json
+++ b/packages/carlita/package.json
@ -57,9 +57,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/carlton/package.json
+++ b/packages/carlton/package.json
@ -55,9 +55,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/cathrin/package.json
+++ b/packages/cathrin/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/create-freesewing-pattern/package.json
+++ b/packages/create-freesewing-pattern/package.json
@ -27,7 +27,7 @@
  "dependencies": {
    "chalk": "^2.4.2",
    "commander": "^2.19.0",
-    "conf": "^2.2.0",
+    "conf": "^6.1.0",
    "cp-file": "^6.0.0",
    "execa": "^1.0.0",
    "git-config-path": "^2.0.0",
@ -36,11 +36,11 @@
    "handlebars": "^4.1.0",
    "inquirer": "^6.2.2",
    "make-dir": "^2.0.0",
-    "ora": "^3.1.0",
+    "ora": "^4.0.2",
    "p-each-series": "^1.0.0",
    "parse-git-config": "^3.0.0",
    "validate-npm-package-name": "^3.0.0",
-    "which": "^1.3.1",
+    "which": "^2.0.1",
    "@freesewing/i18n": "^2.1.3",
    "@freesewing/pattern-info": "^2.1.3"
  },
--- a/packages/examples/package.json
+++ b/packages/examples/package.json
@ -48,9 +48,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/florent/package.json
+++ b/packages/florent/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/huey/package.json
+++ b/packages/huey/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/hugo/package.json
+++ b/packages/hugo/package.json
@ -54,9 +54,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/jaeger/package.json
+++ b/packages/jaeger/package.json
@ -55,9 +55,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/penelope/package.json
+++ b/packages/penelope/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/rendertest/package.json
+++ b/packages/rendertest/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/sandy/package.json
+++ b/packages/sandy/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/shin/package.json
+++ b/packages/shin/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/simon/package.json
+++ b/packages/simon/package.json
@ -56,9 +56,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/simone/package.json
+++ b/packages/simone/package.json
@ -58,9 +58,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/sven/package.json
+++ b/packages/sven/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/tamiko/package.json
+++ b/packages/tamiko/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/theo/package.json
+++ b/packages/theo/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/trayvon/package.json
+++ b/packages/trayvon/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/tutorial/package.json
+++ b/packages/tutorial/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/wahid/package.json
+++ b/packages/wahid/package.json
@ -56,9 +56,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/packages/waralee/package.json
+++ b/packages/waralee/package.json
@ -53,9 +53,9 @@
    "@freesewing/plugin-buttons": "^2.1.3",
    "@freesewing/plugin-flip": "^2.1.3",
    "@freesewing/utils": "^2.1.3",
-    "@svgr/rollup": "^2.4.1",
+    "@svgr/rollup": "^4.3.3",
    "cross-env": "^5.1.4",
-    "gh-pages": "^1.2.0",
+    "gh-pages": "^2.1.1",
    "react-scripts": "^3.0.0",
    "webpack": "4.29.6",
    "rollup": "^0.64.1",
--- a/yarn.lock
+++ b/yarn.lock