Skip to content

Commit

Permalink
Merge pull request react-bootstrap#1399 from taion/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
AlexKVal committed Oct 9, 2015
2 parents a603715 + bf2ad56 commit 69bca94
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 53 deletions.
5 changes: 1 addition & 4 deletions docs/build.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* eslint no-console: 0 */

import fsp from 'fs-promise';
import createLocation from 'history/lib/createLocation';
import path from 'path';
import React from 'react';
import ReactDOMServer from 'react-dom/server';
Expand Down Expand Up @@ -31,9 +30,7 @@ const readmeDest = path.join(docsBuilt, 'README.md');
*/
function generateHTML(fileName) {
return new Promise( resolve => {
const urlSlug = fileName === 'index.html' ? '/' : `/${fileName}`;
const location = createLocation(urlSlug);

const location = fileName === 'index.html' ? '/' : `/${fileName}`;
match({routes, location}, (error, redirectLocation, renderProps) => {
let html = ReactDOMServer.renderToString(
<RoutingContext {...renderProps} />
Expand Down
3 changes: 1 addition & 2 deletions docs/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import 'colors';
import express from 'express';
import createLocation from 'history/lib/createLocation';
import httpProxy from 'http-proxy';
import ip from 'ip';
import path from 'path';
Expand Down Expand Up @@ -46,7 +45,7 @@ if (development) {
res.header('Access-Control-Allow-Origin', target);
res.header('Access-Control-Allow-Headers', 'X-Requested-With');

const location = createLocation(req.url);
const location = req.url;
match({routes, location}, (error, redirectLocation, renderProps) => {
const html = ReactDOMServer.renderToString(
<RoutingContext {...renderProps} />
Expand Down
94 changes: 47 additions & 47 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,83 +47,83 @@
},
"devDependencies": {
"babel": "^5.8.23",
"babel-core": "^5.8.24",
"babel-eslint": "^4.0.5",
"babel-core": "^5.8.25",
"babel-eslint": "^4.1.3",
"babel-loader": "^5.3.2",
"bootstrap": "^3.3.5",
"brfs": "^1.4.0",
"chai": "^3.2.0",
"brfs": "^1.4.1",
"chai": "^3.3.0",
"child-process-promise": "^1.1.0",
"codemirror": "^5.5.0",
"codemirror": "^5.7.0",
"colors": "^1.1.2",
"css-loader": "^0.19.0",
"es5-shim": "^4.1.10",
"eslint": "^1.5.1",
"es5-shim": "^4.1.14",
"eslint": "^1.6.0",
"eslint-config-airbnb": "^0.1.0",
"eslint-plugin-babel": "^2.0.0",
"eslint-plugin-lodash": "^0.1.3",
"eslint-plugin-babel": "^2.1.1",
"eslint-plugin-lodash": "^0.1.4",
"eslint-plugin-mocha": "^1.0.0",
"eslint-plugin-react": "^3.4.2",
"express": "^4.13.1",
"eslint-plugin-react": "^3.5.1",
"express": "^4.13.3",
"extract-text-webpack-plugin": "^0.8.2",
"file-loader": "^0.8.4",
"fs-extra": "^0.23.0",
"fs-extra": "^0.24.0",
"fs-promise": "^0.3.1",
"glob": "^5.0.14",
"history": "^1.9.0",
"http-proxy": "^1.11.1",
"glob": "^5.0.15",
"history": "^1.12.3",
"http-proxy": "^1.11.2",
"ip": "^1.0.1",
"isparta-loader": "^1.0.0",
"json-loader": "^0.5.2",
"karma": "~0.13.3",
"karma-chrome-launcher": "~0.2.0",
"json-loader": "^0.5.3",
"karma": "~0.13.10",
"karma-chrome-launcher": "~0.2.1",
"karma-cli": "0.1.1",
"karma-coverage": "^0.5.0",
"karma-coverage": "^0.5.2",
"karma-coveralls": "^1.1.2",
"karma-firefox-launcher": "~0.1.6",
"karma-mocha": "~0.2.0",
"karma-mocha-reporter": "^1.0.4",
"karma-phantomjs-launcher": "^0.2.0",
"karma-sinon-chai": "^1.0.0",
"karma-mocha-reporter": "^1.1.1",
"karma-phantomjs-launcher": "^0.2.1",
"karma-sinon-chai": "^1.1.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^1.7.0",
"less": "^2.5.1",
"less-loader": "^2.2.0",
"less": "^2.5.3",
"less-loader": "^2.2.1",
"lodash": "^3.10.1",
"marked": "^0.3.5",
"mocha": "^2.2.5",
"mt-changelog": "^0.6.1",
"node-libs-browser": "^0.5.2",
"nodemon": "^1.4.0",
"mocha": "^2.3.3",
"mt-changelog": "^0.6.2",
"node-libs-browser": "^0.5.3",
"nodemon": "^1.7.1",
"output-file-sync": "^1.1.1",
"phantomjs": "^1.9.17",
"phantomjs": "^1.9.18",
"portfinder": "^0.4.0",
"react": "^0.14.0",
"react-component-metadata": "^1.3.0",
"react-component-metadata": "^1.3.1",
"react-dom": "^0.14.0",
"react-hot-loader": "^1.2.8",
"react-router": "^1.0.0-rc1",
"release-script": "^0.5.0",
"rimraf": "^2.4.2",
"semver": "^5.0.1",
"sinon": "^1.15.4",
"react-hot-loader": "^1.3.0",
"react-router": "^1.0.0-rc3",
"release-script": "^0.5.3",
"rimraf": "^2.4.3",
"semver": "^5.0.3",
"sinon": "^1.17.1",
"sinon-chai": "^2.8.0",
"style-loader": "^0.12.3",
"transform-loader": "^0.2.2",
"webpack": "^1.10.5",
"webpack-dev-server": "^1.10.1",
"yargs": "^3.16.1"
"style-loader": "^0.12.4",
"transform-loader": "^0.2.3",
"webpack": "^1.12.2",
"webpack-dev-server": "^1.12.0",
"yargs": "^3.27.0"
},
"dependencies": {
"babel-runtime": "^5.8.24",
"classnames": "^2.1.3",
"dom-helpers": "^2.2.4",
"keycode": "^2.0.0",
"babel-runtime": "^5.8.25",
"classnames": "^2.1.5",
"dom-helpers": "^2.4.0",
"keycode": "^2.1.0",
"lodash-compat": "^3.10.1",
"react-overlays": "^0.5.0",
"uncontrollable": "^3.1.1",
"uncontrollable": "^3.1.3",
"react-prop-types": "^0.3.0",
"warning": "^2.0.0"
"warning": "^2.1.0"
},
"release-script": {
"skipBuildStep": "true",
Expand Down

0 comments on commit 69bca94

Please sign in to comment.