Skip to content

Commit 13a81f8

Browse files
committed
Merge pull request #1 from pazguille/master
Update ES6 module workflow.
2 parents d8c3792 + af9179a commit 13a81f8

File tree

10 files changed

+228
-27
lines changed

10 files changed

+228
-27
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.DS_Store
2-
node_modules
2+
node_modules
3+
npm-debug.log

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
node_modules
2+
babel.js
3+
browserify.js
4+
.gitignore

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
> A JavaScript Emitter written in ES6.
44
5-
## ES6 Usage
5+
## Usage
66
```js
77
import Emitter from 'emitter';
88

@@ -11,15 +11,6 @@ const bus = new Emitter();
1111
bus.emit('finish');
1212
```
1313

14-
## ES5 Usage
15-
```js
16-
var Emitter = require('emitter/es5');
17-
18-
var bus = new Emitter();
19-
20-
bus.emit('finish');
21-
```
22-
2314
## API
2415

2516
### Emitter#on(event, listener)
@@ -60,7 +51,11 @@ emitter.emit('live', 'data1', 'data2');
6051

6152
## npm-scripts
6253
```
63-
$ npm run es5
54+
$ npm run compile
55+
```
56+
57+
```
58+
$ npm run browser
6459
```
6560

6661
```

babel.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
'use strict';
22

3+
/**
4+
* Dependencies
5+
*/
36
var fs = require('fs');
47
var babel = require('babel');
58

6-
if (!fs.existsSync('./es5')) {
7-
fs.mkdirSync('./es5');
9+
/**
10+
* Create directories
11+
*/
12+
if (!fs.existsSync('./dist')) {
13+
fs.mkdirSync('./dist');
814
}
915

10-
babel.transformFile('index.js', {'loose': ['es6.classes']}, function (err, result) {
16+
/**
17+
* Babel
18+
*/
19+
babel.transformFile('./src/index.js', {'loose': ['es6.classes', 'es6.modules']}, function (err, result) {
1120
if (err) { console.log('Error : ' + err.message); }
12-
fs.writeFileSync('./es5/index.js', result.code);
13-
});
21+
fs.writeFileSync('./dist/index.js', result.code);
22+
});

browser/index.js

Lines changed: 158 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

browserify.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
'use strict';
2+
3+
/**
4+
* Dependencies
5+
*/
6+
var fs = require('fs');
7+
var browserify = require('browserify');
8+
9+
/**
10+
* Create directories
11+
*/
12+
if (!fs.existsSync('./browser')) {
13+
fs.mkdirSync('./browser');
14+
}
15+
16+
/**
17+
* Browserify
18+
*/
19+
browserify({ 'entries': './src/index.js', 'standalone': 'Emitter', 'debug': true })
20+
.transform('babelify', {'loose': ['es6.classes', 'es6.modules']})
21+
.bundle()
22+
.on('error', function (err) { console.log('Error : ' + err.message); })
23+
.pipe(fs.createWriteStream('browser/index.js'));

es5/index.js renamed to dist/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
var _classCallCheck = function (instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } };
44

5+
exports.__esModule = true;
56
/**
67
* Creates a new instance of Emitter.
78
* @class
@@ -148,4 +149,5 @@ var Emitter = (function () {
148149
/**
149150
* Exports Emitter
150151
*/
151-
module.exports = Emitter;
152+
exports["default"] = Emitter;
153+
module.exports = exports["default"];

package.json

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
11
{
22
"name": "emitter",
3-
"repository": "git@github.com:mango/emitter.git",
3+
"repository": {
4+
"type": "git",
5+
"url": "git@github.com:mango/emitter.git"
6+
},
47
"description": "A JavaScript event emitter written in ES6.",
5-
"author": "Guille Paz <guille87paz@gmail.com>",
6-
"version": "0.0.2",
8+
"author": {
9+
"name": "Guille Paz",
10+
"email": "guille87paz@gmail.com"
11+
},
12+
"version": "0.0.4",
713
"scripts": {
814
"test": "_mocha",
9-
"es5": "node babel.js",
10-
"hint": "jshint index.js",
11-
"prepublish": "npm run es5"
15+
"hint": "jshint ./src/index.js",
16+
"compile": "node babel.js",
17+
"browser": "node browserify.js",
18+
"prepublish": "npm run compile"
1219
},
1320
"dependencies": {},
1421
"devDependencies": {
1522
"babel": "^5.0.2",
23+
"babelify": "^6.0.0",
1624
"better-assert": "1.0.2",
25+
"browserify": "^9.0.7",
1726
"jshint": "2.6.3",
1827
"mocha": "2.1.0"
1928
},
20-
"main": "index.js",
29+
"main": "./dist/index.js",
2130
"keywords": [
2231
"emitter"
2332
],
2433
"license": "MIT"
25-
}
34+
}
File renamed without changes.

test/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from 'assert';
2-
import Emitter from '../index.js';
2+
import Emitter from '../src/index.js';
33

44
const bus = new Emitter();
55

0 commit comments

Comments
 (0)