dva - npm Package Compare versions

Comparing version 0.0.9 to 0.0.10

CHANGELOG.md

 
+## `0.0.10`
+
+- [28](https://github.com/dvajs/dva/pull/28), Support plugin with `app.use` 
+- Export api from react-router-redux, so we can use actions like `push`, `go`, `replace`, ...
+- Use whatwg-fetch instead of isomorphic-fetch
+
 ## `0.0.9`
@@ -3,0 +9,0 @@

dist/fetch-min.js

@@ -1,1 +0,1 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}(g.dva||(g.dva={})).fetch=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){module.exports=require("isomorphic-fetch")},{"isomorphic-fetch":2}],2:[function(require,module,exports){require("whatwg-fetch");module.exports=self.fetch.bind(self)},{"whatwg-fetch":3}],3:[function(require,module,exports){(function(self){"use strict";if(self.fetch){return}var support={searchParams:"URLSearchParams"in self,iterable:"Symbol"in self&&"iterator"in Symbol,blob:"FileReader"in self&&"Blob"in self&&function(){try{new Blob;return true}catch(e){return false}}(),formData:"FormData"in self,arrayBuffer:"ArrayBuffer"in self};function normalizeName(name){if(typeof name!=="string"){name=String(name)}if(/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)){throw new TypeError("Invalid character in header field name")}return name.toLowerCase()}function normalizeValue(value){if(typeof value!=="string"){value=String(value)}return value}function iteratorFor(items){var iterator={next:function(){var value=items.shift();return{done:value===undefined,value:value}}};if(support.iterable){iterator[Symbol.iterator]=function(){return iterator}}return iterator}function Headers(headers){this.map={};if(headers instanceof Headers){headers.forEach(function(value,name){this.append(name,value)},this)}else if(headers){Object.getOwnPropertyNames(headers).forEach(function(name){this.append(name,headers[name])},this)}}Headers.prototype.append=function(name,value){name=normalizeName(name);value=normalizeValue(value);var list=this.map[name];if(!list){list=[];this.map[name]=list}list.push(value)};Headers.prototype["delete"]=function(name){delete this.map[normalizeName(name)]};Headers.prototype.get=function(name){var values=this.map[normalizeName(name)];return values?values[0]:null};Headers.prototype.getAll=function(name){return this.map[normalizeName(name)]||[]};Headers.prototype.has=function(name){return this.map.hasOwnProperty(normalizeName(name))};Headers.prototype.set=function(name,value){this.map[normalizeName(name)]=[normalizeValue(value)]};Headers.prototype.forEach=function(callback,thisArg){Object.getOwnPropertyNames(this.map).forEach(function(name){this.map[name].forEach(function(value){callback.call(thisArg,value,name,this)},this)},this)};Headers.prototype.keys=function(){var items=[];this.forEach(function(value,name){items.push(name)});return iteratorFor(items)};Headers.prototype.values=function(){var items=[];this.forEach(function(value){items.push(value)});return iteratorFor(items)};Headers.prototype.entries=function(){var items=[];this.forEach(function(value,name){items.push([name,value])});return iteratorFor(items)};if(support.iterable){Headers.prototype[Symbol.iterator]=Headers.prototype.entries}function consumed(body){if(body.bodyUsed){return Promise.reject(new TypeError("Already read"))}body.bodyUsed=true}function fileReaderReady(reader){return new Promise(function(resolve,reject){reader.onload=function(){resolve(reader.result)};reader.onerror=function(){reject(reader.error)}})}function readBlobAsArrayBuffer(blob){var reader=new FileReader;reader.readAsArrayBuffer(blob);return fileReaderReady(reader)}function readBlobAsText(blob){var reader=new FileReader;reader.readAsText(blob);return fileReaderReady(reader)}function Body(){this.bodyUsed=false;this._initBody=function(body){this._bodyInit=body;if(typeof body==="string"){this._bodyText=body}else if(support.blob&&Blob.prototype.isPrototypeOf(body)){this._bodyBlob=body}else if(support.formData&&FormData.prototype.isPrototypeOf(body)){this._bodyFormData=body}else if(support.searchParams&&URLSearchParams.prototype.isPrototypeOf(body)){this._bodyText=body.toString()}else if(!body){this._bodyText=""}else if(support.arrayBuffer&&ArrayBuffer.prototype.isPrototypeOf(body)){}else{throw new Error("unsupported BodyInit type")}if(!this.headers.get("content-type")){if(typeof body==="string"){this.headers.set("content-type","text/plain;charset=UTF-8")}else if(this._bodyBlob&&this._bodyBlob.type){this.headers.set("content-type",this._bodyBlob.type)}else if(support.searchParams&&URLSearchParams.prototype.isPrototypeOf(body)){this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8")}}};if(support.blob){this.blob=function(){var rejected=consumed(this);if(rejected){return rejected}if(this._bodyBlob){return Promise.resolve(this._bodyBlob)}else if(this._bodyFormData){throw new Error("could not read FormData body as blob")}else{return Promise.resolve(new Blob([this._bodyText]))}};this.arrayBuffer=function(){return this.blob().then(readBlobAsArrayBuffer)};this.text=function(){var rejected=consumed(this);if(rejected){return rejected}if(this._bodyBlob){return readBlobAsText(this._bodyBlob)}else if(this._bodyFormData){throw new Error("could not read FormData body as text")}else{return Promise.resolve(this._bodyText)}}}else{this.text=function(){var rejected=consumed(this);return rejected?rejected:Promise.resolve(this._bodyText)}}if(support.formData){this.formData=function(){return this.text().then(decode)}}this.json=function(){return this.text().then(JSON.parse)};return this}var methods=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];function normalizeMethod(method){var upcased=method.toUpperCase();return methods.indexOf(upcased)>-1?upcased:method}function Request(input,options){options=options||{};var body=options.body;if(Request.prototype.isPrototypeOf(input)){if(input.bodyUsed){throw new TypeError("Already read")}this.url=input.url;this.credentials=input.credentials;if(!options.headers){this.headers=new Headers(input.headers)}this.method=input.method;this.mode=input.mode;if(!body){body=input._bodyInit;input.bodyUsed=true}}else{this.url=input}this.credentials=options.credentials||this.credentials||"omit";if(options.headers||!this.headers){this.headers=new Headers(options.headers)}this.method=normalizeMethod(options.method||this.method||"GET");this.mode=options.mode||this.mode||null;this.referrer=null;if((this.method==="GET"||this.method==="HEAD")&&body){throw new TypeError("Body not allowed for GET or HEAD requests")}this._initBody(body)}Request.prototype.clone=function(){return new Request(this)};function decode(body){var form=new FormData;body.trim().split("&").forEach(function(bytes){if(bytes){var split=bytes.split("=");var name=split.shift().replace(/\+/g," ");var value=split.join("=").replace(/\+/g," ");form.append(decodeURIComponent(name),decodeURIComponent(value))}});return form}function headers(xhr){var head=new Headers;var pairs=(xhr.getAllResponseHeaders()||"").trim().split("\n");pairs.forEach(function(header){var split=header.trim().split(":");var key=split.shift().trim();var value=split.join(":").trim();head.append(key,value)});return head}Body.call(Request.prototype);function Response(bodyInit,options){if(!options){options={}}this.type="default";this.status=options.status;this.ok=this.status>=200&&this.status<300;this.statusText=options.statusText;this.headers=options.headers instanceof Headers?options.headers:new Headers(options.headers);this.url=options.url||"";this._initBody(bodyInit)}Body.call(Response.prototype);Response.prototype.clone=function(){return new Response(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new Headers(this.headers),url:this.url})};Response.error=function(){var response=new Response(null,{status:0,statusText:""});response.type="error";return response};var redirectStatuses=[301,302,303,307,308];Response.redirect=function(url,status){if(redirectStatuses.indexOf(status)===-1){throw new RangeError("Invalid status code")}return new Response(null,{status:status,headers:{location:url}})};self.Headers=Headers;self.Request=Request;self.Response=Response;self.fetch=function(input,init){return new Promise(function(resolve,reject){var request;if(Request.prototype.isPrototypeOf(input)&&!init){request=input}else{request=new Request(input,init)}var xhr=new XMLHttpRequest;function responseURL(){if("responseURL"in xhr){return xhr.responseURL}if(/^X-Request-URL:/m.test(xhr.getAllResponseHeaders())){return xhr.getResponseHeader("X-Request-URL")}return}xhr.onload=function(){var options={status:xhr.status,statusText:xhr.statusText,headers:headers(xhr),url:responseURL()};var body="response"in xhr?xhr.response:xhr.responseText;resolve(new Response(body,options))};xhr.onerror=function(){reject(new TypeError("Network request failed"))};xhr.ontimeout=function(){reject(new TypeError("Network request failed"))};xhr.open(request.method,request.url,true);if(request.credentials==="include"){xhr.withCredentials=true}if("responseType"in xhr&&support.blob){xhr.responseType="blob"}request.headers.forEach(function(value,name){xhr.setRequestHeader(name,value)});xhr.send(typeof request._bodyInit==="undefined"?null:request._bodyInit)})};self.fetch.polyfill=true})(typeof self!=="undefined"?self:this)},{}]},{},[1])(1)});
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}(g.dva||(g.dva={})).fetch=f()}})(function(){var define,module,exports;return function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s}({1:[function(require,module,exports){module.exports=require("whatwg-fetch")},{"whatwg-fetch":2}],2:[function(require,module,exports){(function(self){"use strict";if(self.fetch){return}var support={searchParams:"URLSearchParams"in self,iterable:"Symbol"in self&&"iterator"in Symbol,blob:"FileReader"in self&&"Blob"in self&&function(){try{new Blob;return true}catch(e){return false}}(),formData:"FormData"in self,arrayBuffer:"ArrayBuffer"in self};function normalizeName(name){if(typeof name!=="string"){name=String(name)}if(/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)){throw new TypeError("Invalid character in header field name")}return name.toLowerCase()}function normalizeValue(value){if(typeof value!=="string"){value=String(value)}return value}function iteratorFor(items){var iterator={next:function(){var value=items.shift();return{done:value===undefined,value:value}}};if(support.iterable){iterator[Symbol.iterator]=function(){return iterator}}return iterator}function Headers(headers){this.map={};if(headers instanceof Headers){headers.forEach(function(value,name){this.append(name,value)},this)}else if(headers){Object.getOwnPropertyNames(headers).forEach(function(name){this.append(name,headers[name])},this)}}Headers.prototype.append=function(name,value){name=normalizeName(name);value=normalizeValue(value);var list=this.map[name];if(!list){list=[];this.map[name]=list}list.push(value)};Headers.prototype["delete"]=function(name){delete this.map[normalizeName(name)]};Headers.prototype.get=function(name){var values=this.map[normalizeName(name)];return values?values[0]:null};Headers.prototype.getAll=function(name){return this.map[normalizeName(name)]||[]};Headers.prototype.has=function(name){return this.map.hasOwnProperty(normalizeName(name))};Headers.prototype.set=function(name,value){this.map[normalizeName(name)]=[normalizeValue(value)]};Headers.prototype.forEach=function(callback,thisArg){Object.getOwnPropertyNames(this.map).forEach(function(name){this.map[name].forEach(function(value){callback.call(thisArg,value,name,this)},this)},this)};Headers.prototype.keys=function(){var items=[];this.forEach(function(value,name){items.push(name)});return iteratorFor(items)};Headers.prototype.values=function(){var items=[];this.forEach(function(value){items.push(value)});return iteratorFor(items)};Headers.prototype.entries=function(){var items=[];this.forEach(function(value,name){items.push([name,value])});return iteratorFor(items)};if(support.iterable){Headers.prototype[Symbol.iterator]=Headers.prototype.entries}function consumed(body){if(body.bodyUsed){return Promise.reject(new TypeError("Already read"))}body.bodyUsed=true}function fileReaderReady(reader){return new Promise(function(resolve,reject){reader.onload=function(){resolve(reader.result)};reader.onerror=function(){reject(reader.error)}})}function readBlobAsArrayBuffer(blob){var reader=new FileReader;reader.readAsArrayBuffer(blob);return fileReaderReady(reader)}function readBlobAsText(blob){var reader=new FileReader;reader.readAsText(blob);return fileReaderReady(reader)}function Body(){this.bodyUsed=false;this._initBody=function(body){this._bodyInit=body;if(typeof body==="string"){this._bodyText=body}else if(support.blob&&Blob.prototype.isPrototypeOf(body)){this._bodyBlob=body}else if(support.formData&&FormData.prototype.isPrototypeOf(body)){this._bodyFormData=body}else if(support.searchParams&&URLSearchParams.prototype.isPrototypeOf(body)){this._bodyText=body.toString()}else if(!body){this._bodyText=""}else if(support.arrayBuffer&&ArrayBuffer.prototype.isPrototypeOf(body)){}else{throw new Error("unsupported BodyInit type")}if(!this.headers.get("content-type")){if(typeof body==="string"){this.headers.set("content-type","text/plain;charset=UTF-8")}else if(this._bodyBlob&&this._bodyBlob.type){this.headers.set("content-type",this._bodyBlob.type)}else if(support.searchParams&&URLSearchParams.prototype.isPrototypeOf(body)){this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8")}}};if(support.blob){this.blob=function(){var rejected=consumed(this);if(rejected){return rejected}if(this._bodyBlob){return Promise.resolve(this._bodyBlob)}else if(this._bodyFormData){throw new Error("could not read FormData body as blob")}else{return Promise.resolve(new Blob([this._bodyText]))}};this.arrayBuffer=function(){return this.blob().then(readBlobAsArrayBuffer)};this.text=function(){var rejected=consumed(this);if(rejected){return rejected}if(this._bodyBlob){return readBlobAsText(this._bodyBlob)}else if(this._bodyFormData){throw new Error("could not read FormData body as text")}else{return Promise.resolve(this._bodyText)}}}else{this.text=function(){var rejected=consumed(this);return rejected?rejected:Promise.resolve(this._bodyText)}}if(support.formData){this.formData=function(){return this.text().then(decode)}}this.json=function(){return this.text().then(JSON.parse)};return this}var methods=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];function normalizeMethod(method){var upcased=method.toUpperCase();return methods.indexOf(upcased)>-1?upcased:method}function Request(input,options){options=options||{};var body=options.body;if(Request.prototype.isPrototypeOf(input)){if(input.bodyUsed){throw new TypeError("Already read")}this.url=input.url;this.credentials=input.credentials;if(!options.headers){this.headers=new Headers(input.headers)}this.method=input.method;this.mode=input.mode;if(!body){body=input._bodyInit;input.bodyUsed=true}}else{this.url=input}this.credentials=options.credentials||this.credentials||"omit";if(options.headers||!this.headers){this.headers=new Headers(options.headers)}this.method=normalizeMethod(options.method||this.method||"GET");this.mode=options.mode||this.mode||null;this.referrer=null;if((this.method==="GET"||this.method==="HEAD")&&body){throw new TypeError("Body not allowed for GET or HEAD requests")}this._initBody(body)}Request.prototype.clone=function(){return new Request(this)};function decode(body){var form=new FormData;body.trim().split("&").forEach(function(bytes){if(bytes){var split=bytes.split("=");var name=split.shift().replace(/\+/g," ");var value=split.join("=").replace(/\+/g," ");form.append(decodeURIComponent(name),decodeURIComponent(value))}});return form}function headers(xhr){var head=new Headers;var pairs=(xhr.getAllResponseHeaders()||"").trim().split("\n");pairs.forEach(function(header){var split=header.trim().split(":");var key=split.shift().trim();var value=split.join(":").trim();head.append(key,value)});return head}Body.call(Request.prototype);function Response(bodyInit,options){if(!options){options={}}this.type="default";this.status=options.status;this.ok=this.status>=200&&this.status<300;this.statusText=options.statusText;this.headers=options.headers instanceof Headers?options.headers:new Headers(options.headers);this.url=options.url||"";this._initBody(bodyInit)}Body.call(Response.prototype);Response.prototype.clone=function(){return new Response(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new Headers(this.headers),url:this.url})};Response.error=function(){var response=new Response(null,{status:0,statusText:""});response.type="error";return response};var redirectStatuses=[301,302,303,307,308];Response.redirect=function(url,status){if(redirectStatuses.indexOf(status)===-1){throw new RangeError("Invalid status code")}return new Response(null,{status:status,headers:{location:url}})};self.Headers=Headers;self.Request=Request;self.Response=Response;self.fetch=function(input,init){return new Promise(function(resolve,reject){var request;if(Request.prototype.isPrototypeOf(input)&&!init){request=input}else{request=new Request(input,init)}var xhr=new XMLHttpRequest;function responseURL(){if("responseURL"in xhr){return xhr.responseURL}if(/^X-Request-URL:/m.test(xhr.getAllResponseHeaders())){return xhr.getResponseHeader("X-Request-URL")}return}xhr.onload=function(){var options={status:xhr.status,statusText:xhr.statusText,headers:headers(xhr),url:responseURL()};var body="response"in xhr?xhr.response:xhr.responseText;resolve(new Response(body,options))};xhr.onerror=function(){reject(new TypeError("Network request failed"))};xhr.ontimeout=function(){reject(new TypeError("Network request failed"))};xhr.open(request.method,request.url,true);if(request.credentials==="include"){xhr.withCredentials=true}if("responseType"in xhr&&support.blob){xhr.responseType="blob"}request.headers.forEach(function(value,name){xhr.setRequestHeader(name,value)});xhr.send(typeof request._bodyInit==="undefined"?null:request._bodyInit)})};self.fetch.polyfill=true})(typeof self!=="undefined"?self:this)},{}]},{},[1])(1)});

dist/fetch.js

 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}(g.dva || (g.dva = {})).fetch = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-module.exports = require('isomorphic-fetch');
+module.exports = require('whatwg-fetch');
 
-},{"isomorphic-fetch":2}],2:[function(require,module,exports){
-// the whatwg-fetch polyfill installs the fetch() function
-// on the global object (window or self)
-//
-// Return that as the export for use in Webpack, Browserify etc.
-require('whatwg-fetch');
-module.exports = self.fetch.bind(self);
-
-},{"whatwg-fetch":3}],3:[function(require,module,exports){
+},{"whatwg-fetch":2}],2:[function(require,module,exports){
 (function(self) {
@@ -14,0 +6,0 @@ 'use strict';

fetch.js

@@ -1,1 +0,1 @@
-module.exports = require('isomorphic-fetch');
+module.exports = require('whatwg-fetch');

lib/index.js

@@ -7,2 +7,6 @@ 'use strict';
 
+var _getIterator2 = require('babel-runtime/core-js/get-iterator');
+
+var _getIterator3 = _interopRequireDefault(_getIterator2);
+
 var _regenerator = require('babel-runtime/regenerator');
@@ -58,2 +62,4 @@
 
+var _plugin = require('./plugin');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -64,11 +70,3 @@
 
-  var onError = opts.onError || function (err) {
-    throw new Error(err);
-  };
-  var onErrorWrapper = function onErrorWrapper(err) {
-    if (err) {
-      if (_utils.is.string(err)) err = new Error(err);
-      onError(err);
-    }
-  };
+  (0, _plugin.use)(opts);
 
@@ -81,2 +79,3 @@ var _routes = null;
     start: start,
+    use: _plugin.use,
     store: null
@@ -118,2 +117,13 @@ };
 
+    // Handle onError.
+    var onError = (0, _plugin.apply)('onError', function (err) {
+      throw new Error(err.stack || err);
+    });
+    var onErrorWrapper = function onErrorWrapper(err) {
+      if (err) {
+        if (_utils.is.string(err)) err = new Error(err);
+        onError(err);
+      }
+    };
+
     // Get sagas and reducers from model.
@@ -139,19 +149,22 @@ var sagas = {};
     // Support external reducers.
-    if (_utils.is.notUndef(opts.reducers)) {
-      (0, _utils.check)(opts.reducers, _utils.is.object, 'Reducers must be object.');
-      (0, _utils.check)(opts.reducers, function (optReducers) {
-        for (var k in optReducers) {
-          if (k in reducers) return false;
-        }
-        return true;
-      }, 'Reducers should not be conflict with namespace in model.');
-      reducers = (0, _extends3.default)({}, reducers, opts.reducers);
-    }
+    var extraReducers = (0, _plugin.get)('extraReducers');
+    (0, _utils.check)(extraReducers, function (extraReducers) {
+      for (var k in extraReducers) {
+        if (k in reducers) return false;
+      }
+      return true;
+    }, 'extraReducers should not be conflict with namespace in model.');
+    reducers = (0, _extends3.default)({}, reducers, extraReducers);
 
+    // Sync history.
+    // Use try catch because it don't work in test.
+    var history = void 0;
+    try {
+      history = (0, _reactRouterRedux.syncHistoryWithStore)(opts.history || _reactRouter.hashHistory, store);
+    } catch (e) {} /*eslint-disable no-empty*/
+
     // Create store.
-    if (_utils.is.notUndef(opts.middlewares)) {
-      (0, _utils.check)(opts.middlewares, _utils.is.array, 'Middlewares must be array.');
-    }
+    var extraMiddlewares = (0, _plugin.get)('onAction');
     var sagaMiddleware = (0, _reduxSaga2.default)();
-    var enhancer = (0, _redux.compose)(_redux.applyMiddleware.apply(null, [sagaMiddleware].concat((0, _toConsumableArray3.default)(opts.middlewares || []))), _window2.default.devToolsExtension ? _window2.default.devToolsExtension() : function (f) {
+    var enhancer = (0, _redux.compose)(_redux.applyMiddleware.apply(null, [(0, _reactRouterRedux.routerMiddleware)(history), sagaMiddleware].concat((0, _toConsumableArray3.default)(extraMiddlewares || []))), _window2.default.devToolsExtension ? _window2.default.devToolsExtension() : function (f) {
       return f;
@@ -162,10 +175,31 @@ });
 
-    // Sync history.
-    // Use try catch because it don't work in test.
-    var history = void 0;
+    // Handle onStateChange.
+    var listeners = (0, _plugin.get)('onStateChange');
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
     try {
-      history = (0, _reactRouterRedux.syncHistoryWithStore)(opts.history || _reactRouter.hashHistory, store);
-    } catch (e) {} /*eslint-disable no-empty*/
+      for (var _iterator = (0, _getIterator3.default)(listeners), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var listener = _step.value;
 
-    // Start saga.
+        store.subscribe(listener);
+      }
+
+      // Start saga.
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
     sagaMiddleware.run(rootSaga);
@@ -189,5 +223,3 @@
       render();
-      if (opts.hmr) {
-        opts.hmr(render);
-      }
+      (0, _plugin.apply)('onHmr')(render);
     } else {
@@ -194,0 +226,0 @@ var _ret = function () {

lib/utils.js

@@ -70,3 +70,3 @@ 'use strict';
   if (typeof window === 'undefined') {
-    console.log('redux-saga ' + level + ': ' + message + '\n' + (error && error.stack || error));
+    console.log('dva ' + level + ': ' + message + '\n' + (error && error.stack || error));
   } else {
@@ -73,0 +73,0 @@ console[level].call(console, message, error);

package.json

 {
   "name": "dva",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Front-end framework based on react, redux, react-redux, react-router and redux-saga, inspired by elm and choo.",
@@ -26,3 +26,3 @@ "repository": {
     "debug": "mocha --compilers js:babel-register --no-timeouts",
-    "build": "rm -rf lib && babel src --out-dir lib --ignore __tests__",
+    "build": "rimraf lib && babel src --out-dir lib",
     "lint": "eslint --ext .js src test",
@@ -34,9 +34,9 @@ "coveralls": "nyc report --reporter=text-lcov | coveralls"
     "is-plain-object": "^2.0.1",
-    "isomorphic-fetch": "^2.2.1",
     "react-redux": "4.4.x",
-    "react-router": "^2.5.1",
+    "react-router": "^2.6.0",
     "react-router-redux": "^4.0.5",
     "redux": "^3.5.2",
-    "redux-actions": "^0.10.0",
-    "redux-saga": "^0.10.5"
+    "redux-actions": "^0.10.1",
+    "redux-saga": "^0.11.0",
+    "whatwg-fetch": "^1.0.0"
   },
@@ -48,14 +48,14 @@ "peerDependencies": {
   "devDependencies": {
-    "babel-cli": "^6.10.1",
-    "babel-eslint": "^6.0.4",
+    "babel-cli": "^6.11.4",
+    "babel-eslint": "^6.1.2",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-runtime": "^6.9.0",
     "babel-preset-es2015": "^6.9.0",
-    "babel-preset-react": "^6.5.0",
+    "babel-preset-react": "^6.11.1",
     "babel-preset-stage-0": "~6.5.0",
-    "babel-register": "^6.9.0",
+    "babel-register": "^6.11.5",
     "babel-runtime": "^6.9.2",
-    "browserify": "^13.0.1",
+    "browserify": "^13.1.0",
     "browserify-shim": "^3.8.12",
-    "coveralls": "^2.11.9",
+    "coveralls": "^2.11.11",
     "envify": "^3.4.1",
@@ -67,5 +67,6 @@ "eslint": "^3.0.1",
     "mocha": "^2.5.3",
-    "nyc": "^7.0.0",
-    "react": "^15.1.0",
-    "react-dom": "^15.1.0",
+    "nyc": "^7.1.0",
+    "react": "^15.2.1",
+    "react-dom": "^15.2.1",
+    "rimraf": "^2.5.4",
     "uglifyjs": "^2.4.10"
@@ -72,0 +73,0 @@ },

README.md

@@ -14,5 +14,6 @@ # dva
 
-- [dva 简介](https://github.com/sorrycc/dva/issues/1)
+- [dva 入门：手把手教你用写应用](https://github.com/sorrycc/blog/issues/8)
+- [dva 简介](https://github.com/dvajs/dva/issues/1)
 - [React + Redux 最佳实践](https://github.com/sorrycc/blog/issues/1) (dva 基于此封装)
-- [subscription 及其适用场景](https://github.com/sorrycc/dva/issues/3#issuecomment-229250708)
+- [subscription 及其适用场景](https://github.com/dvajs/dva/issues/3#issuecomment-229250708)
 - [支付宝前端应用架构的发展和选择: 从 roof 到 redux 再到 dva](https://github.com/sorrycc/blog/issues/6)
@@ -19,0 +20,0 @@

router.js

 module.exports = require('react-router');
+module.exports.routerRedux = require('react-router-redux');

src/index.js

@@ -7,3 +7,3 @@ import React from 'react';
 import { hashHistory, Router } from 'react-router';
-import { syncHistoryWithStore, routerReducer as routing } from 'react-router-redux';
+import { routerMiddleware, syncHistoryWithStore, routerReducer as routing } from 'react-router-redux';
 import { handleActions } from 'redux-actions';
@@ -13,13 +13,6 @@ import { fork } from 'redux-saga/effects';
 import { is, check, warn } from './utils';
+import { use, apply, get } from './plugin';
 
 function dva(opts = {}) {
-  const onError = opts.onError || function (err) {
-    throw new Error(err);
-  };
-  const onErrorWrapper = (err) => {
-    if (err) {
-      if (is.string(err)) err = new Error(err);
-      onError(err);
-    }
-  };
+  use(opts);
 
@@ -32,2 +25,3 @@ let _routes = null;
     start,
+    use,
     store: null
@@ -64,2 +58,13 @@ };
 
+    // Handle onError.
+    const onError = apply('onError', function(err) {
+      throw new Error(err.stack || err);
+    });
+    const onErrorWrapper = (err) => {
+      if (err) {
+        if (is.string(err)) err = new Error(err);
+        onError(err);
+      }
+    };
+
     // Get sagas and reducers from model.
@@ -81,20 +86,23 @@ let sagas = {};
     // Support external reducers.
-    if (is.notUndef(opts.reducers)) {
-      check(opts.reducers, is.object, 'Reducers must be object.');
-      check(opts.reducers, optReducers => {
-        for (let k in optReducers) {
-          if (k in reducers) return false;
-        }
-        return true;
-      }, 'Reducers should not be conflict with namespace in model.');
-      reducers = { ...reducers, ...opts.reducers };
-    }
+    const extraReducers = get('extraReducers');
+    check(extraReducers, extraReducers => {
+      for (let k in extraReducers) {
+        if (k in reducers) return false;
+      }
+      return true;
+    }, 'extraReducers should not be conflict with namespace in model.');
+    reducers = { ...reducers, ...extraReducers };
 
+    // Sync history.
+    // Use try catch because it don't work in test.
+    let history;
+    try {
+      history = syncHistoryWithStore(opts.history || hashHistory, store);
+    } catch (e) { /*eslint-disable no-empty*/ }
+
     // Create store.
-    if (is.notUndef(opts.middlewares)) {
-      check(opts.middlewares, is.array, 'Middlewares must be array.');
-    }
+    const extraMiddlewares = get('onAction');
     const sagaMiddleware = createSagaMiddleware();
     const enhancer = compose(
-      applyMiddleware.apply(null, [ sagaMiddleware, ...(opts.middlewares || []) ]),
+      applyMiddleware.apply(null, [ routerMiddleware(history), sagaMiddleware, ...(extraMiddlewares || []) ]),
       window.devToolsExtension ? window.devToolsExtension() : f => f
@@ -107,8 +115,7 @@ );
 
-    // Sync history.
-    // Use try catch because it don't work in test.
-    let history;
-    try {
-      history = syncHistoryWithStore(opts.history || hashHistory, store);
-    } catch (e) { /*eslint-disable no-empty*/ }
+    // Handle onStateChange.
+    const listeners = get('onStateChange');
+    for (const listener of listeners) {
+      store.subscribe(listener);
+    }
 
@@ -132,5 +139,3 @@ // Start saga.
       render();
-      if (opts.hmr) {
-        opts.hmr(render);
-      }
+      apply('onHmr')(render);
     } else {
@@ -137,0 +142,0 @@ const Routes = _routes;

src/utils.js

@@ -35,3 +35,3 @@ import isPlainObject from 'is-plain-object';
   if(typeof window === 'undefined') {
-    console.log(`redux-saga ${level}: ${message}\n${(error && error.stack) || error}`);
+    console.log(`dva ${level}: ${message}\n${(error && error.stack) || error}`);
   } else {
@@ -38,0 +38,0 @@ console[level].call(console, message, error);

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1080192

increased by2.93%

Number of package files

21

increased by10.53%

Lines of code

17236

increased by3.46%

Number of lines in readme file

90

increased by1.12%

Worsened metrics

Dev dependency count

23

increased by4.55%

Dependency changes

• + Addedwhatwg-fetch@^1.0.0

• + Addedredux-saga@0.11.1(transitive)

• + Addedwhatwg-fetch@1.1.1(transitive)

• - Removedisomorphic-fetch@^2.2.1

• - Removedredux-saga@0.10.5(transitive)

• - Removedwhatwg-fetch@3.6.20(transitive)

• Updatedreact-router@^2.6.0

• Updatedredux-actions@^0.10.1

• Updatedredux-saga@^0.11.0