Merge tag '0.3.1'

v0.3.1

Author: maniator

.gitignore

@@ -2,3 +2,4 @@
 npm-debug.log
 node_modules
 dist
+lib

.npmignore

@@ -1,7 +1,9 @@
 .idea
 npm-debug.log
 node_modules
-example
 config
 release.js
-src
+_config.yml
+.npmignore
+.gitignore
+rollup.config.js

config/helpers.js

@@ -0,0 +1,31 @@
+// same example as https://github.com/cujojs/most#simple-example
+
+const { fromEvent, combineLatest } = Servable;
+
+const xInput = document.querySelector('input.x');
+const yInput = document.querySelector('input.y');
+const resultNode = document.querySelector('.result');
+
+const add = (x, y) => x + y;
+
+const toNumber = e => Number(e.target.value);
+
+const renderResult = result => {
+  resultNode.textContent = result
+};
+
+const main = () => {
+  // x represents the current value of xInput
+  const x = fromEvent('input', xInput).map(toNumber);
+  
+  // y represents the current value of yInput
+  const y = fromEvent('input', yInput).map(toNumber);
+  
+  // result is the live current value of adding x and y
+  const result = combineLatest(x, y, add);
+  
+  // Observe the result value by rendering it to the resultNode
+  result.subscribe(renderResult);
+};
+
+main();

config/webpack.common.js

@@ -11,7 +11,15 @@ <h3>Observable Example</h3>
     <div id="myTextReverse">Type in input</div>
     <input id="myInput" value="Type in input" />
 
-    <script type="text/javascript" src="../dist/index.js"></script>
+    <div>
+        <form>
+            <h3>Adder</h3>
+            <input class="x"> + <input class="y"> = <span class="result"></span>
+        </form>
+    </div>
+
+    <script type="text/javascript" src="../dist/index.min.js"></script>
     <script type="text/javascript" src="index.js"></script>
+    <script type="text/javascript" src="adder.js"></script>
 </body>
 </html>

example/adder.js

@@ -1,11 +1,13 @@
 {
   "name": "servable",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "From scratch observable",
-  "main": "dist/index.js",
+  "main": "lib/index.js",
+  "jsnext:main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0",
-    "build": "rm -rf dist && webpack --config config/webpack.common.js",
+    "build": "rimraf lib dist && buba src -o lib && rollup -c && uglifyjs dist/index.js -c \"warnings=false\" --comments -m -o dist/index.min.js --verbose",
+    "watch": "rollup -c -w",
     "release": "node release.js"
   },
   "repository": {
@@ -19,13 +21,17 @@
   },
   "homepage": "https://github.com/maniator/servable#readme",
   "devDependencies": {
-    "babel-core": "^6.24.1",
-    "babel-loader": "^7.0.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "buba": "^4.0.2",
     "inquirer": "^3.0.6",
+    "rimraf": "^2.6.1",
+    "rollup": "^0.41.6",
+    "rollup-plugin-buble": "^0.15.0",
+    "rollup-plugin-license": "^0.3.0",
+    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-sizes": "^0.3.0",
+    "rollup-watch": "^3.2.2",
     "semver": "^5.3.0",
     "shelljs": "^0.7.7",
-    "webpack": "^2.4.1"
+    "uglify-js": "^3.0.3"
   }
 }

example/index.html

@@ -0,0 +1,29 @@
+import buble from 'rollup-plugin-buble';
+import nodeResolve from 'rollup-plugin-node-resolve';
+import sizes from 'rollup-plugin-sizes';
+import license from 'rollup-plugin-license';
+
+const pkg = require('./package.json');
+
+const banner = `servable v${pkg.version}
+${pkg.homepage}
+@author ${pkg.author}
+@preserve`;
+
+export default {
+  entry: 'src/index.js',
+  dest: 'dist/index.js',
+  format: 'umd',
+  moduleName: 'Servable',
+  sourceMap: true,
+  plugins: [
+    buble(),
+    sizes(),
+    license({
+      banner,
+    }),
+    nodeResolve({
+      jsnext: true
+    })
+  ]
+}

package.json

@@ -3,32 +3,11 @@ export * from './Observable';
 export * from './Subject';
 export * from './Observer';
 
+export * from './utilities';
 export * from './utilities/makeHot';
 
 // add on operators
-export * from './operators/map';
-export * from './operators/filter';
-export * from './operators/delay';
-export * from './operators/do';
-export * from './operators/debounceTime';
-export * from './operators/take';
-export * from './operators/first';
-export * from './operators/toPromise';
-export * from './operators/flatMap';
-export * from './operators/switchMap';
-export * from './operators/scan';
-export * from './operators/reduce';
-export * from './operators/concat';
-export * from './operators/combineLatest';
-export * from './operators/count';
-export * from './operators/sum';
-export * from './operators/max';
-export * from './operators/min';
-export * from './operators/average';
+export * from './operators';
 
 // add on observable types
-export * from './observables/fromEvent';
-export * from './observables/fromPromise';
-export * from './observables/range';
-export * from './observables/interval';
-export * from './observables/of';
+export * from './observables';

rollup.config.js

@@ -0,0 +1,5 @@
+export * from './observables/fromEvent';
+export * from './observables/fromPromise';
+export * from './observables/range';
+export * from './observables/interval';
+export * from './observables/of';

src/index.js

@@ -0,0 +1,19 @@
+export * from './operators/map';
+export * from './operators/filter';
+export * from './operators/delay';
+export * from './operators/do';
+export * from './operators/debounceTime';
+export * from './operators/take';
+export * from './operators/first';
+export * from './operators/toPromise';
+export * from './operators/flatMap';
+export * from './operators/switchMap';
+export * from './operators/scan';
+export * from './operators/reduce';
+export * from './operators/concat';
+export * from './operators/combineLatest';
+export * from './operators/count';
+export * from './operators/sum';
+export * from './operators/max';
+export * from './operators/min';
+export * from './operators/average';