Skip to content

Commit

Permalink
fix(package): put extra operators in xstream/extra
Browse files Browse the repository at this point in the history
Extra operators used to be accessible under require(xstream/lib/extra), now there are accessible
under require(xstream/extra). For instance, delay would be imported from xstream/extra/delay.

BREAKING CHANGE:
Import extra operators from xstream/extra/the-operator-you-want not from
xstream/lib/extra/the-operator-you-want
  • Loading branch information
staltz committed Apr 27, 2016
1 parent 66a2f6a commit 2735a74
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 23 deletions.
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ coverage
# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Generated code
core.d.ts
core.js
core.js.map
index.d.ts
index.js
index.js.map
extra/

# Generated directories
lib/
.sass-cache/
_site/

Expand Down
2 changes: 1 addition & 1 deletion .markdown-doctest-setup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var xstream = require('./lib/index').default;
var xstream = require('./index').default;

function noop () {}

Expand Down
2 changes: 1 addition & 1 deletion examples/map-filter-take.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var xs = require('../lib/index').default;
var xs = require('../index').default;

var stream = xs.periodic(1000)
.take(10)
Expand Down
2 changes: 1 addition & 1 deletion examples/of.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var xs = require('../lib/index').default;
var xs = require('../index').default;

var stream = xs.of(10, 20, 30, 40, 41, 42);

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
"name": "xstream",
"version": "1.1.1",
"description": "An extremely intuitive, small, and fast functional reactive stream library for JavaScript",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
"main": "index.js",
"typings": "index.d.ts",
"scripts": {
"commit": "git-cz",
"changelog": "conventional-changelog --infile CHANGELOG.md --same-file --release-count 0 --preset angular",
"lint": "tslint -c tslint.json src/**/*.ts",
"premocha": "npm run lib",
"premocha": "npm run compile",
"mocha": "mocha tests/*.ts tests/**/*.ts --require ts-node/register",
"postmocha": "rm -rf tests/**/*.js",
"test": "npm run lint && npm run mocha && npm run doctest",
"doctest": "markdown-doctest",
"prelib": "rm -rf lib/ && mkdirp lib/ && typings install",
"lib": "tsc",
"precompile": "typings install",
"compile": "tsc",
"prepage-content": "npm run changelog",
"page-content": "npm run lib && node tools/make-toc.js && node tools/make-factories.js && node tools/make-methods.js && cat markdown/header.md markdown/generated-toc.md markdown/overview.md markdown/generated-factories.md markdown/generated-methods.md markdown/footer.md CHANGELOG.md > .ignore/content.md",
"page-content": "npm run compile && node tools/make-toc.js && node tools/make-factories.js && node tools/make-methods.js && cat markdown/header.md markdown/generated-toc.md markdown/overview.md markdown/generated-factories.md markdown/generated-methods.md markdown/footer.md CHANGELOG.md > .ignore/content.md",
"readme": "npm run page-content && cat markdown/readme-title.md .ignore/content.md > README.md",
"predist": "rm -rf dist/ && mkdirp dist/ && npm run lib",
"dist": "browserify lib/index.js --standalone xstream | node tools/strip-comments.js > dist/xstream.js",
"predist": "rm -rf dist/ && mkdirp dist/ && npm run compile",
"dist": "browserify index.js --standalone xstream | node tools/strip-comments.js > dist/xstream.js",
"postdist": "uglifyjs dist/xstream.js -o dist/xstream.min.js",
"start": "npm install && npm prune",
"prepublish": "npm run lib",
"prepublish": "npm run compile",
"preversion": "npm test",
"version": "npm run readme && npm run dist && git add -A",
"postversion": "git push origin master && git push origin --tags && npm publish",
Expand Down
2 changes: 1 addition & 1 deletion perf/filter-map-fusion.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs')
Expand Down
2 changes: 1 addition & 1 deletion perf/filter-map-reduce.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs')
Expand Down
2 changes: 1 addition & 1 deletion perf/flatMap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs')
Expand Down
2 changes: 1 addition & 1 deletion perf/merge.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs');
Expand Down
2 changes: 1 addition & 1 deletion perf/scan.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs');
Expand Down
2 changes: 1 addition & 1 deletion perf/switchMap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Benchmark = require('benchmark');
var xs = require('../lib/index').default;
var xs = require('../index').default;
var most = require('most');
var rx = require('rx');
var rxjs = require('@reactivex/rxjs')
Expand Down
2 changes: 1 addition & 1 deletion tools/make-factories.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var generateDocs = require('./generate-docs');

generateDocs({
src: './lib/core.js',
src: './core.js',
output: './markdown/generated-factories.md',
template: './tools/template-factories.md.ejs'
});
2 changes: 1 addition & 1 deletion tools/make-methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var generateDocs = require('./generate-docs');

generateDocs({
src: './lib/core.js',
src: './core.js',
output: './markdown/generated-methods.md',
template: './tools/template-methods.md.ejs'
});
2 changes: 1 addition & 1 deletion tools/make-toc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var generateDocs = require('./generate-docs');

generateDocs({
src: './lib/core.js',
src: './core.js',
output: './markdown/generated-toc.md',
template: './tools/template-toc.md.ejs'
});
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"module": "commonjs",
"noEmitHelpers": false,
"target": "ES5",
"outDir": "lib/"
"outDir": "./"
},
"formatCodeOptions": {
"indentSize": 2,
Expand Down

0 comments on commit 2735a74

Please sign in to comment.