Skip to content

Commit

Permalink
Update packages, new build
Browse files Browse the repository at this point in the history
  • Loading branch information
Sampo Kivistö committed Dec 30, 2016
1 parent e0252e4 commit 7f8f923
Show file tree
Hide file tree
Showing 14 changed files with 40 additions and 46 deletions.
2 changes: 1 addition & 1 deletion dist/inferno-compat.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ var WrapperComponent = (function (Component$$1) {
WrapperComponent.prototype.getChildContext = function getChildContext () {
return this.props.context;
};
WrapperComponent.prototype.render = function render (props) {
WrapperComponent.prototype.render = function render$$1 (props) {
return props.children;
};

Expand Down
2 changes: 1 addition & 1 deletion dist/inferno-redux.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions dist/inferno-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@ var isarray = index$4;
* Expose `pathToRegexp`.
*/
var index$2 = pathToRegexp;
var parse_1 = parse$1;
var compile_1 = compile$1;
var tokensToFunction_1 = tokensToFunction$1;
var tokensToRegExp_1 = tokensToRegExp$1;
var parse_1 = parse;
var compile_1 = compile;
var tokensToFunction_1 = tokensToFunction;
var tokensToRegExp_1 = tokensToRegExp;

/**
* The main path matching regexp utility.
Expand All @@ -283,7 +283,7 @@ var PATH_REGEXP = new RegExp([
* @param {Object=} options
* @return {!Array}
*/
function parse$1 (str, options) {
function parse (str, options) {
var tokens = [];
var key = 0;
var index = 0;
Expand Down Expand Up @@ -356,8 +356,8 @@ function parse$1 (str, options) {
* @param {Object=} options
* @return {!function(Object=, Object=)}
*/
function compile$1 (str, options) {
return tokensToFunction$1(parse$1(str, options))
function compile (str, options) {
return tokensToFunction(parse(str, options))
}

/**
Expand Down Expand Up @@ -387,7 +387,7 @@ function encodeAsterisk (str) {
/**
* Expose a method for transforming tokens into the path function.
*/
function tokensToFunction$1 (tokens) {
function tokensToFunction (tokens) {
// Compile all the tokens into regexps.
var matches = new Array(tokens.length);

Expand Down Expand Up @@ -568,7 +568,7 @@ function arrayToRegexp (path, keys, options) {
* @return {!RegExp}
*/
function stringToRegexp (path, keys, options) {
return tokensToRegExp$1(parse$1(path, options), keys, options)
return tokensToRegExp(parse(path, options), keys, options)
}

/**
Expand All @@ -579,7 +579,7 @@ function stringToRegexp (path, keys, options) {
* @param {Object=} options
* @return {!RegExp}
*/
function tokensToRegExp$1 (tokens, keys, options) {
function tokensToRegExp (tokens, keys, options) {
if (!isarray(keys)) {
options = /** @type {!Object} */ (keys || options);
keys = [];
Expand Down
5 changes: 2 additions & 3 deletions dist/inferno-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,15 @@ function normalizeProps(vNode, props, children) {
vNode.children = props.children;
}
if (props.ref) {
vNode.ref = props.ref;
delete props.ref;
}
if (props.key) {
delete props.key;
}
if (props.events) {
vNode.events = props.events;
}
if (!isNullOrUndef(props.key)) {
vNode.key = props.key;
delete props.key;
}
}
function copyPropsTo(copyFrom, copyTo) {
Expand Down
5 changes: 2 additions & 3 deletions dist/inferno-test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -254,16 +254,15 @@ function normalizeProps(vNode, props, children) {
vNode.children = props.children;
}
if (props.ref) {
vNode.ref = props.ref;
delete props.ref;
}
if (props.key) {
delete props.key;
}
if (props.events) {
vNode.events = props.events;
}
if (!isNullOrUndef(props.key)) {
vNode.key = props.key;
delete props.key;
}
}
function copyPropsTo(copyFrom, copyTo) {
Expand Down
2 changes: 1 addition & 1 deletion dist/inferno-test-utils.min.js

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions dist/inferno.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,15 @@ function normalizeProps(vNode, props, children) {
vNode.children = props.children;
}
if (props.ref) {
vNode.ref = props.ref;
delete props.ref;
}
if (props.key) {
delete props.key;
}
if (props.events) {
vNode.events = props.events;
}
if (!isNullOrUndef(props.key)) {
vNode.key = props.key;
delete props.key;
}
}
function copyPropsTo(copyFrom, copyTo) {
Expand Down
2 changes: 1 addition & 1 deletion dist/inferno.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@types/chai": "^3.4.34",
"@types/core-js": "^0.9.35",
"@types/mocha": "^2.2.35",
"@types/node": "^6.0.54",
"@types/node": "^6.0.55",
"@types/sinon": "^1.16.33",
"babel-cli": "^6.18.0",
"babel-core": "^6.21.0",
Expand Down Expand Up @@ -79,7 +79,7 @@
"proptypes": "^0.14.3",
"redux": "^3.6.0",
"rimraf": "^2.5.4",
"rollup": "^0.38.3",
"rollup": "^0.39.0",
"rollup-plugin-babel": "^2.7.1",
"rollup-plugin-buble": "^0.15.0",
"rollup-plugin-commonjs": "^7.0.0",
Expand All @@ -89,7 +89,7 @@
"rollup-plugin-uglify": "^1.0.1",
"sinon": "2.0.0-pre.4",
"ts-loader": "^1.3.3",
"ts-node": "^1.7.3",
"ts-node": "^2.0.0",
"tslint": "^4.2.0",
"typescript": "^2.1.4",
"union-type-es": "^0.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/inferno/dist/inferno-compat.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ var WrapperComponent = (function (Component$$1) {
WrapperComponent.prototype.getChildContext = function getChildContext () {
return this.props.context;
};
WrapperComponent.prototype.render = function render (props) {
WrapperComponent.prototype.render = function render$$1 (props) {
return props.children;
};

Expand Down
Loading

0 comments on commit 7f8f923

Please sign in to comment.