From b5b98c3126aa3cdbab8ca2bfa51f36c9d9cb2e3d Mon Sep 17 00:00:00 2001
From: Tiberiu Covaci <tibi@covaci.se>
Date: Sun, 14 May 2017 21:43:15 +0100
Subject: [PATCH 1/4] Fixed exporst so it works with the current ES2015 spec

---
 common/Mathy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/Mathy.js b/common/Mathy.js
index d9df4bd..1afab7e 100644
--- a/common/Mathy.js
+++ b/common/Mathy.js
@@ -1,8 +1,8 @@
-function sqrt(num){
+export function sqrt(num){
   return Math.sqrt(num);
 }
 
-function square(num){
+export function square(num){
   return num * num;
 }
 

From a38096fff586528d7aa20a8a88eec26949917c5c Mon Sep 17 00:00:00 2001
From: Tiberiu Covaci <tibi@covaci.se>
Date: Sun, 14 May 2017 21:43:55 +0100
Subject: [PATCH 2/4] Updated to latest packages and Babel 6

---
 package.json | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 467f2fb..604d072 100644
--- a/package.json
+++ b/package.json
@@ -2,14 +2,23 @@
   "name": "ES6-Workshop",
   "version": "0.0.1",
   "devDependencies": {
-    "babel-jest": "*",
-    "jest-cli": "*"
+    "babel-core": "^6.24.1",
+    "babel-jest": "^20.0.1",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-es2016": "^6.24.1",
+    "babel-preset-es2017": "^6.24.1",
+    "jest-cli": "^20.0.1"
+  },
+  "babel": {
+    "presets": [
+      "es2015"
+    ]
   },
   "scripts": {
-    "test": "jest"
+    "test": "jest  --watch"
   },
   "jest": {
-    "scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
+    "transform": {".*": "<rootDir>/node_modules/babel-jest"},
     "testFileExtensions": [
       "js"
     ],
@@ -17,9 +26,9 @@
       "js",
       "json"
     ],
-    "testDirectoryName": "spec"
+    "testPathPattern": "spec"
   },
   "dependencies": {
-    "lodash": "^3.6.0"
+    "lodash": "^4.17.4"
   }
 }

From 3bd36e3328b557d77aca771f8d48abdea64dba5d Mon Sep 17 00:00:00 2001
From: Tiberiu Covaci <tibi@covaci.se>
Date: Sun, 14 May 2017 21:44:07 +0100
Subject: [PATCH 3/4] Added SDD 2017 to the list

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9f245c6..cec9698 100644
--- a/README.md
+++ b/README.md
@@ -53,12 +53,13 @@ If you have any questions, [let me know](https://www.twitter.com/js_dev).
 If you use this workshop, please Pull Request this readme with a link to your event.
 
 ###Events
+
 [FluentConf 2015 - Axel Rauschmayer & Aaron Frost](http://fluentconf.com/javascript-html-2015/public/schedule/detail/38811)
 Framsieforum 19.05, Finn.no
 
 [SLC JS Learners April 2015 - Kent C. Dodds](https://youtu.be/_Pn32tTtbuQ)
 
-
+[Software Design & Development Conference 2017 - Tiberiu Covaci](http://sddconf.com/agenda/?p=4968)
 
 
 

From 2fcd77c659c878713a45e309ccc867ed33579912 Mon Sep 17 00:00:00 2001
From: Tiberiu Covaci <tibi@covaci.se>
Date: Sun, 14 May 2017 22:16:34 +0100
Subject: [PATCH 4/4] Small tweaks

---
 README.md    | 2 +-
 package.json | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index cec9698..4050801 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ By the time that the workshop is over, all of your tests will be passing.
 ###Clone the repo
 You will need to start by cloning this repo. From your terminal, type:
 ```
-git clone https://github.com/aaronfrost/es6-workshop.git && cd es6-workshop
+git clone https://github.com/tibor19/es6-workshop.git && cd es6-workshop
 ```
 
 ###Install Dependencies
diff --git a/package.json b/package.json
index 604d072..18561c3 100644
--- a/package.json
+++ b/package.json
@@ -15,18 +15,14 @@
     ]
   },
   "scripts": {
-    "test": "jest  --watch"
+    "test": "jest"
   },
   "jest": {
     "transform": {".*": "<rootDir>/node_modules/babel-jest"},
-    "testFileExtensions": [
-      "js"
-    ],
     "moduleFileExtensions": [
       "js",
       "json"
-    ],
-    "testPathPattern": "spec"
+    ]
   },
   "dependencies": {
     "lodash": "^4.17.4"