Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dominic Gannaway committed Sep 8, 2016
2 parents 8a5eb8c + 70e6a84 commit 679661d
Show file tree
Hide file tree
Showing 27 changed files with 7,728 additions and 7,737 deletions.
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ npm install --save inferno-router
Pre-bundled files for browser consumption can be found on [our cdnjs](https://cdnjs.com/libraries/inferno):

```
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-create-element.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-create-class.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-component.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-dom.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-server.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.26/inferno-router.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-create-element.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-create-class.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-component.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-dom.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-server.min.js
https://cdnjs.cloudflare.com/ajax/libs/inferno/0.7.27/inferno-router.min.js
```

## Overview
Expand Down
6 changes: 4 additions & 2 deletions config/rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,17 @@ const pkg = JSON.parse(fs.readFileSync('./package.json'));
const external = Object.keys(pkg.peerDependencies || {}).concat(Object.keys(pkg.dependencies || {}));

const plugins = [
buble(),
buble({
objectAssign: 'Object.assign'
}),
nodeResolve({
jsnext: true,
main: true,
skip: external
}),
commonjs({
include: 'node_modules/**',
exclude: '**/*.css'
exclude: ['node_modules/symbol-observable/**', '**/*.css']
}),
replace({
'process.env.NODE_ENV': JSON.stringify('production'),
Expand Down
44 changes: 22 additions & 22 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "inferno-src",
"license": "MIT",
"version": "0.7.26",
"version": "0.7.27",
"author": {
"name": "Dominic Gannaway",
"email": "[email protected]"
Expand All @@ -10,52 +10,52 @@
"url": "https://github.com/trueadm/inferno/issues"
},
"devDependencies": {
"babel-cli": "^6.11.4",
"babel-core": "^6.11.4",
"babel-cli": "^6.14.0",
"babel-core": "^6.14.0",
"babel-eslint": "^6.1.2",
"babel-loader": "^6.2.4",
"babel-loader": "^6.2.5",
"babel-plugin-inferno": "^0.7.7",
"babel-plugin-syntax-jsx": "^6.8.0",
"babel-plugin-syntax-object-rest-spread": "^6.8.0",
"babel-plugin-syntax-jsx": "^6.13.0",
"babel-plugin-syntax-object-rest-spread": "^6.13.0",
"babel-plugin-transform-es2015-modules-umd": "^6.12.0",
"babel-plugin-transform-inline-environment-variables": "^6.8.0",
"babel-plugin-transform-object-assign": "^6.8.0",
"babel-plugin-transform-object-rest-spread": "^6.8.0",
"babel-plugin-transform-undefined-to-void": "^6.8.0",
"babel-polyfill": "^6.9.1",
"babel-preset-es2015": "^6.9.0",
"babel-preset-es2015-rollup": "^1.1.1",
"babel-polyfill": "^6.13.0",
"babel-preset-es2015": "^6.14.0",
"babel-preset-es2015-rollup": "^1.2.0",
"babel-preset-stage-0": "^6.5.0",
"babel-register": "^6.11.6",
"babel-register": "^6.14.0",
"chai": "^3.5.0",
"concat-stream": "^1.5.1",
"coveralls": "^2.11.12",
"cross-env": "^2.0.0",
"eslint": "^3.2.2",
"cross-env": "^2.0.1",
"eslint": "^3.4.0",
"eslint-plugin-babel": "^3.3.0",
"glob": "^7.0.5",
"glob": "^7.0.6",
"hoist-non-inferno-statics": "^1.1.1",
"invariant": "^2.2.1",
"isparta": "^4.0.0",
"jsdom": "^9.4.1",
"karma": "^1.1.2",
"jsdom": "^9.4.5",
"karma": "^1.2.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.0.0",
"karma-firefox-launcher": "^1.0.0",
"karma-ie-launcher": "^1.0.0",
"karma-mocha": "^1.1.1",
"karma-mocha-reporter": "^2.1.0",
"karma-phantomjs-launcher": "^1.0.1",
"karma-webpack": "^1.7.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-webpack": "^1.8.0",
"mkdirp": "^0.5.1",
"mocha": "^3.0.0",
"mocha": "^3.0.2",
"mocha-lcov-reporter": "^1.2.0",
"phantomjs-prebuilt": "^2.1.9",
"phantomjs-prebuilt": "^2.1.12",
"pre-commit": "^1.1.3",
"proptypes": "^0.14.3",
"redux": "^3.5.2",
"rimraf": "^2.5.4",
"rollup": "^0.34.3",
"rollup": "^0.34.11",
"rollup-plugin-babel": "^2.6.1",
"rollup-plugin-buble": "^0.13.0",
"rollup-plugin-commonjs": "^4.0.1",
Expand All @@ -64,8 +64,8 @@
"rollup-plugin-replace": "^1.1.1",
"rollup-plugin-uglify": "^1.0.1",
"sinon": "2.0.0-pre",
"webpack": "^1.13.1",
"webpack-dev-server": "^1.14.1"
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.0"
},
"files": [
"src"
Expand Down
4 changes: 2 additions & 2 deletions packages/inferno-compat/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-compat",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides a compatibility with React codebases",
"author": {
Expand All @@ -21,7 +21,7 @@
"user interfaces"
],
"dependencies": {
"inferno": "^0.7.26",
"inferno": "^0.7.27",
"proptypes": "^0.14.3"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-component/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-component",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides ES2015 stateful components (with lifecycle events) to Inferno",
"author": {
Expand All @@ -27,6 +27,6 @@
"rollup"
],
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-create-class/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-create-class",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides a helper to create Inferno Components without needing ES2015",
"author": {
Expand All @@ -21,6 +21,6 @@
"user interfaces"
],
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-create-element/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-create-element",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides methods to create Inferno VNodes",
"author": {
Expand All @@ -21,6 +21,6 @@
"user interfaces"
],
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-dom/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-dom",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides methods to render DOM nodes from Inferno elements",
"author": {
Expand All @@ -22,6 +22,6 @@
],
"repository": "https://github.com/trueadm/inferno",
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-redux/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-redux",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Official Inferno bindings for Redux",
"author": {
Expand All @@ -23,6 +23,6 @@
],
"repository": "https://github.com/trueadm/inferno",
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-router/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-router",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides routing functionality for Inferno",
"author": {
Expand All @@ -23,6 +23,6 @@
],
"repository": "https://github.com/trueadm/inferno",
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-server/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-server",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides methods to render HTML strings from Inferno elements",
"author": {
Expand Down Expand Up @@ -28,6 +28,6 @@
"main": "inferno-server.js",
"repository": "https://github.com/trueadm/inferno",
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
}
}
4 changes: 2 additions & 2 deletions packages/inferno-test-utils/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "inferno-test-utils",
"version": "0.7.26",
"version": "0.7.27",
"license": "MIT",
"description": "Provides test utilities to help with creating and maintaining tests for Inferno applications",
"author": {
Expand All @@ -20,7 +20,7 @@
"user interfaces"
],
"dependencies": {
"inferno": "^0.7.26"
"inferno": "^0.7.27"
},
"main": "inferno-test-utils.js",
"repository": "https://github.com/trueadm/inferno"
Expand Down
Loading

0 comments on commit 679661d

Please sign in to comment.