Skip to content

Updated the workshop to reflect the current state of ES2015. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tibor19 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated the workshop to reflect the current state of ES2015. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5b98c3
Fixed exporst so it works with the current ES2015 spec
tibor19 May 14, 2017
a38096f
Updated to latest packages and Babel 6
tibor19 May 14, 2017
3bd36e3
Added SDD 2017 to the list
tibor19 May 14, 2017
2fcd77c
Small tweaks
tibor19 May 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)



Expand Down
4 changes: 2 additions & 2 deletions common/Mathy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}

Expand Down
23 changes: 14 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,29 @@
"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"
},
"jest": {
"scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
"testFileExtensions": [
"js"
],
"transform": {".*": "<rootDir>/node_modules/babel-jest"},
"moduleFileExtensions": [
"js",
"json"
],
"testDirectoryName": "spec"
]
},
"dependencies": {
"lodash": "^3.6.0"
"lodash": "^4.17.4"
}
}