From 48e14ebc9afc2cb0f871e53d61291ee45b156710 Mon Sep 17 00:00:00 2001
From: Travis Fischer <fisch0920@gmail.com>
Date: Sun, 2 Dec 2018 20:02:58 -0500
Subject: [PATCH] Merge pull request #103 from sag1v/master

upgrade to babel 7
---
 .../template/default/.babelrc                 | 10 +++----
 .../template/default/package.json             | 29 ++++++++++++++-----
 .../template/default/rollup.config.js         |  2 +-
 .../template/typescript/package.json          |  6 ++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/packages/create-freesewing-pattern/template/default/.babelrc b/packages/create-freesewing-pattern/template/default/.babelrc
index 723ea64663d..eeb6d8c7726 100644
--- a/packages/create-freesewing-pattern/template/default/.babelrc
+++ b/packages/create-freesewing-pattern/template/default/.babelrc
@@ -1,9 +1,9 @@
 {
   "presets": [
-    ["env", {
+    ["@babel/preset-env", {
       "modules": false
     }],
-    "stage-0",
-    "react"
-  ]
-}
+    "@babel/preset-react"
+  ],
+  "plugins": ["@babel/plugin-proposal-class-properties"]
+}
\ No newline at end of file
diff --git a/packages/create-freesewing-pattern/template/default/package.json b/packages/create-freesewing-pattern/template/default/package.json
index 329c1351def..85977b631c6 100644
--- a/packages/create-freesewing-pattern/template/default/package.json
+++ b/packages/create-freesewing-pattern/template/default/package.json
@@ -27,13 +27,28 @@
     "react-dom": "^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-external-helpers": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-do-expressions": "^7.0.0",
+    "@babel/plugin-proposal-export-default-from": "^7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
+    "@babel/plugin-proposal-function-bind": "^7.0.0",
+    "@babel/plugin-proposal-function-sent": "^7.0.0",
+    "@babel/plugin-proposal-json-strings": "^7.0.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-syntax-import-meta": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
     "@svgr/rollup": "^2.4.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.5",
-    "babel-plugin-external-helpers": "^6.22.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "babel-eslint": "^10.0.1",
     "cross-env": "^5.1.4",
     "eslint": "^5.0.1",
     "eslint-config-standard": "^11.0.0",
@@ -48,7 +63,7 @@
     "react-dom": "^16.4.1",
     "react-scripts": "^1.1.4",
     "rollup": "^0.64.1",
-    "rollup-plugin-babel": "^3.0.7",
+    "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-peer-deps-external": "^2.2.0",
diff --git a/packages/create-freesewing-pattern/template/default/rollup.config.js b/packages/create-freesewing-pattern/template/default/rollup.config.js
index beea189998d..0cc9ef36016 100644
--- a/packages/create-freesewing-pattern/template/default/rollup.config.js
+++ b/packages/create-freesewing-pattern/template/default/rollup.config.js
@@ -31,7 +31,7 @@ export default {
     svgr(),
     babel({
       exclude: 'node_modules/**',
-      plugins: [ 'external-helpers' ]
+      plugins: [ '@babel/external-helpers' ]
     }),
     resolve(),
     commonjs()
diff --git a/packages/create-freesewing-pattern/template/typescript/package.json b/packages/create-freesewing-pattern/template/typescript/package.json
index 722f5cd7a73..e43392049c6 100644
--- a/packages/create-freesewing-pattern/template/typescript/package.json
+++ b/packages/create-freesewing-pattern/template/typescript/package.json
@@ -28,19 +28,19 @@
     "react-dom": "^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "@svgr/rollup": "^2.4.1",
     "@types/jest": "^23.1.5",
     "@types/react": "^16.3.13",
     "@types/react-dom": "^16.0.5",
-    "babel-core": "^6.26.3",
-    "babel-runtime": "^6.26.0",
     "cross-env": "^5.1.4",
     "gh-pages": "^1.2.0",
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
     "react-scripts-ts": "^2.16.0",
     "rollup": "^0.62.0",
-    "rollup-plugin-babel": "^3.0.7",
+    "rollup-plugin-babel": "^4.0.1",
     "rollup-plugin-commonjs": "^9.1.3",
     "rollup-plugin-node-resolve": "^3.3.0",
     "rollup-plugin-peer-deps-external": "^2.2.0",