Skip to content

Commit

Permalink
[core] Upgrade some dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Apr 30, 2017
1 parent f560e0a commit 7cf8d3c
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 78 deletions.
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "material-ui-docs",
"private": true,
"version": "0.16.0",
"description": "Documentation site for material-ui",
"version": "1.0.0",
"description": "Documentation site for Material-UI",
"repository": {
"type": "git",
"url": "https://github.com/callemall/material-ui.git"
Expand Down Expand Up @@ -31,7 +31,7 @@
"rimraf": "^2.6.1",
"style-loader": "^0.16.1",
"webpack": "^2.4.1",
"webpack-dev-server": "^2.4.4"
"webpack-dev-server": "^2.4.5"
},
"dependencies": {
"babel-runtime": "^6.23.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/src/pages/getting-started/server-rendering.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const { styleManager, theme } = createStyleManager();
render(
<MuiThemeProvider styleManager={styleManager} theme={theme}>
<Main />
</Provider>,
</MuiThemeProvider>,
document.querySelector('#root'),
);
```
6 changes: 3 additions & 3 deletions docs/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5147,9 +5147,9 @@ webpack-dev-middleware@^1.10.2:
path-is-absolute "^1.0.0"
range-parser "^1.0.3"

webpack-dev-server@^2.4.4:
version "2.4.4"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.4.tgz#1adb41640970421ec7b866e82384e8cebeed85de"
webpack-dev-server@^2.4.5:
version "2.4.5"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
dependencies:
ansi-html "0.0.7"
chokidar "^1.6.0"
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"object-assign": "^4.1.1",
"prop-types": "^15.0.0",
"react-event-listener": "^0.4.5",
"react-scrollbar-size": "^1.0.0",
"react-scrollbar-size": "^1.0.1",
"react-transition-group": "^1.1.2",
"recompose": "^0.23.0",
"scroll": "^2.0.0",
Expand All @@ -74,11 +74,11 @@
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-loader": "^7.0.0",
"babel-plugin-istanbul": "^4.1.1",
"babel-plugin-istanbul": "^4.1.3",
"babel-plugin-react-remove-properties": "^0.2.3",
"babel-plugin-transform-dev-warning": "^0.1.0",
"babel-plugin-transform-react-constant-elements": "^6.23.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.1",
"babel-plugin-transform-react-remove-prop-types": "^0.4.3",
"babel-plugin-transform-replace-object-assign": "^0.2.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.23.0",
Expand All @@ -100,8 +100,8 @@
"eslint-plugin-mocha": "^4.9.0",
"eslint-plugin-react": "^6.10.3",
"eventsource-polyfill": "^0.9.6",
"flow-bin": "^0.44.2",
"fs-extra": "^2.1.2",
"flow-bin": "^0.45.0",
"fs-extra": "^3.0.0",
"glob": "^7.1.1",
"html-looks-like": "^1.0.2",
"jsdom": "^10.0.0",
Expand All @@ -114,7 +114,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^2.0.3",
"mocha": "^3.3.0",
"nyc": "^10.2.0",
"nyc": "^10.3.0",
"phantomjs-prebuilt": "^2.1.14",
"random-words": "0.0.1",
"raw-loader": "^0.5.1",
Expand Down
9 changes: 7 additions & 2 deletions src/Tabs/Tabs.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ describe('<Tabs />', () => {
assert.strictEqual(instance.updateScrollButtonState.called, true,
'should have called updateScrollButtonState');
done();
}, 100);
}, 150);
});

it('should get a scrollbar size listener', () => {
Expand Down Expand Up @@ -235,7 +235,7 @@ describe('<Tabs />', () => {
assert.strictEqual(instance.updateIndicatorState.called, true,
'should have called updateIndicatorState');
done();
}, 100);
}, 150);
});

describe('scroll button visibility states', () => {
Expand Down Expand Up @@ -339,6 +339,7 @@ describe('<Tabs />', () => {
let scrollStub;
let instance;
let metaStub;

before(() => {
scrollStub = stub(scroll, 'left');
const wrapper = shallowWithWidth(
Expand All @@ -355,6 +356,10 @@ describe('<Tabs />', () => {
metaStub = stub(instance, 'getTabsMeta');
});

after(() => {
scroll.left.restore();
});

it('should scroll left tab into view', () => {
metaStub.returns({
tabsMeta: { left: 0, right: 100, scrollLeft: 10 },
Expand Down
4 changes: 2 additions & 2 deletions test/integration/fixtures/perf/TimeWaster.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow weak

import React, { Component, PropTypes } from 'react';
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import Perf from 'react-addons-perf';
import { find } from 'src/utils/helpers';
import randomWords from 'random-words';
Expand All @@ -10,7 +11,6 @@ import randomWords from 'random-words';
* WIP Component
*/
export default class TimeWaster extends Component {

static propTypes = {
children: PropTypes.any,
loops: PropTypes.number,
Expand Down
2 changes: 1 addition & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ module.exports = function setKarmaConfig(config) {

let newConfig = baseConfig;

if (browserStack.accessKey) {
if (browserStack.accessKey && false) {
newConfig = Object.assign({}, baseConfig, {
browserStack,
browsers: baseConfig.browsers.concat([
Expand Down
4 changes: 4 additions & 0 deletions test/karma.tests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
// @flow weak

import consoleError from './utils/consoleError';

consoleError();

const integrationContext = require.context('./integration', true, /\.js$/);
integrationContext.keys().forEach(integrationContext);

Expand Down
3 changes: 2 additions & 1 deletion test/utils/consoleError.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
*/
function consoleError() {
console.error = (...args) => {
console.log(...args);
// Can't use log as karam is not displaying them.
console.info(...args);
throw new Error(...args);
};
}
Expand Down
Loading

0 comments on commit 7cf8d3c

Please sign in to comment.