Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 34 dependencies from npm #3712

Merged
merged 36 commits into from
Jun 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8ad51e5
Update babel-plugin-macros from 2.2.1 to 2.2.2 in /
dependencies-bot Jun 4, 2018
f527d88
Update danger from 3.7.14 to 3.7.15 in /
dependencies-bot Jun 4, 2018
a99ff9b
Update eslint-plugin-react from 7.8.2 to 7.9.1 in /
dependencies-bot Jun 4, 2018
3b8cc1c
Update eslint-teamcity from 2.0.0 to 2.0.1 in /
dependencies-bot Jun 4, 2018
254e94a
Update lint-staged from 7.1.2 to 7.1.3 in /
dependencies-bot Jun 4, 2018
4e58cf9
Update prettier from 1.13.2 to 1.13.4 in /
dependencies-bot Jun 4, 2018
41ca359
Update remark-lint from 6.0.1 to 6.0.2 in /
dependencies-bot Jun 4, 2018
e94cd8e
Update remark-preset-lint-recommended from 3.0.1 to 3.0.2 in /
dependencies-bot Jun 4, 2018
71bfbbc
Update typescript from 2.8.3 to 2.9.1 in /
dependencies-bot Jun 4, 2018
96cc2a9
Update airbnb-js-shims from 1.5.2 to 1.6.0 in lib/core
dependencies-bot Jun 4, 2018
92b299b
Update autoprefixer from 8.5.1 to 8.6.0 in lib/core
dependencies-bot Jun 4, 2018
de6d007
Update babel-plugin-macros from 2.2.1 to 2.2.2 in lib/core
dependencies-bot Jun 4, 2018
f5e2b3b
Update dotenv-webpack from 1.5.5 to 1.5.6 in lib/core
dependencies-bot Jun 4, 2018
0916962
Update webpack from 4.10.1 to 4.10.2 in lib/core
dependencies-bot Jun 4, 2018
0fcf3c7
Update sass-loader from 7.0.1 to 7.0.2 in app/angular
dependencies-bot Jun 4, 2018
fd19baa
Update ts-loader from 4.3.0 to 4.3.1 in app/angular
dependencies-bot Jun 4, 2018
af5a84b
Update axe-core from 3.0.2 to 3.0.3 in addons/a11y
dependencies-bot Jun 4, 2018
23c6b45
Update moment from 2.22.1 to 2.22.2 in addons/knobs
dependencies-bot Jun 4, 2018
6a08d2e
Update prettier from 1.13.3 to 1.13.4 in addons/storysource
dependencies-bot Jun 4, 2018
995667d
Update react-modal from 3.4.4 to 3.4.5 in lib/ui
dependencies-bot Jun 4, 2018
3abba6d
Update babel-plugin-macros from 2.2.1 to 2.2.2 in app/react-native
dependencies-bot Jun 4, 2018
97efeb8
Update dotenv-webpack from 1.5.5 to 1.5.6 in app/react-native
dependencies-bot Jun 4, 2018
a80b3da
Update webpack from 4.10.1 to 4.10.2 in app/react-native
dependencies-bot Jun 4, 2018
80238a2
Update prettier from 1.13.2 to 1.13.4 in examples/marko-cli
dependencies-bot Jun 4, 2018
16bd10f
Update webpack from 4.10.1 to 4.10.2 in examples/marko-cli
dependencies-bot Jun 4, 2018
86c5675
Update webpack from 4.10.1 to 4.10.2 in examples/polymer-cli
dependencies-bot Jun 4, 2018
69763e6
Update @types/jasmine from 2.8.7 to 2.8.8 in examples/angular-cli
dependencies-bot Jun 4, 2018
e473826
Update @types/node from 9.6.18 to 9.6.20 in examples/angular-cli
dependencies-bot Jun 4, 2018
b7e879a
Update ts-node from 6.0.5 to 6.1.0 in examples/angular-cli
dependencies-bot Jun 4, 2018
ca69ab1
Update typescript from 2.8.3 to 2.9.1 in examples/angular-cli
dependencies-bot Jun 4, 2018
0cf5afa
Update webpack from 4.10.1 to 4.10.2 in examples/cra-kitchen-sink
dependencies-bot Jun 4, 2018
5411959
Update webpack from 4.10.1 to 4.10.2 in examples/mithril-kitchen-sink
dependencies-bot Jun 4, 2018
ee6762c
Update webpack from 4.10.1 to 4.10.2 in examples/vue-kitchen-sink
dependencies-bot Jun 4, 2018
d67fd52
Update webpack from 4.10.1 to 4.10.2 in examples/official-storybook
dependencies-bot Jun 4, 2018
691d09b
batch bootstrap
dependencies-bot Jun 4, 2018
aebf131
Fix eslint warnings
Hypnosphi Jun 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@storybook/client-logger": "4.0.0-alpha.8",
"@storybook/components": "4.0.0-alpha.8",
"@storybook/core-events": "4.0.0-alpha.8",
"axe-core": "^3.0.2",
"axe-core": "^3.0.3",
"babel-runtime": "^6.26.0",
"emotion": "^9.1.3",
"global": "^4.3.2",
Expand Down
24 changes: 12 additions & 12 deletions addons/events/src/components/Event.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ const Wrapper = styled('div')({
width: '100%',
});

function getJSONFromString(str) {
try {
return JSON.parse(str);
} catch (e) {
return str;
}
}

class Item extends Component {
static propTypes = {
name: PropTypes.string.isRequired,
Expand All @@ -89,32 +97,24 @@ class Item extends Component {
payload: {},
};

static getJSONFromString(str) {
try {
return JSON.parse(str);
} catch (e) {
return str;
}
}
state = {
isTextAreaShowed: false,
};

static getDerivedStateFromProps = ({ payload }, { prevPayload }) => {
if (payload !== prevPayload) {
const payloadString = json.plain(payload);

return {
failed: false,
payload: Item.getJSONFromString(payloadString),
payload: getJSONFromString(payloadString),
payloadString,
prevPayload,
};
}
return null;
};

state = {
isTextAreaShowed: false,
};

onChange = ({ target: { value } }) => {
const newState = {
payloadString: value,
Expand Down
4 changes: 2 additions & 2 deletions addons/jest/src/components/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ const SuiteTotals = styled(({ successNumber, failedNumber, result, className })

const SuiteProgress = styled(({ successNumber, result, className }) => (
<div className={className} role="progressbar">
<span style={{ width: `${successNumber / result.assertionResults.length * 100}%` }}>
{`${successNumber / result.assertionResults.length * 100}%`}
<span style={{ width: `${(successNumber / result.assertionResults.length) * 100}%` }}>
{`${(successNumber / result.assertionResults.length) * 100}%`}
</span>
</div>
))(() => ({
Expand Down
2 changes: 1 addition & 1 deletion addons/knobs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"global": "^4.3.2",
"insert-css": "^2.0.0",
"lodash.debounce": "^4.0.8",
"moment": "^2.22.1",
"moment": "^2.22.2",
"prop-types": "^15.6.1",
"react-color": "^2.14.1",
"react-datetime": "^2.14.0",
Expand Down
2 changes: 1 addition & 1 deletion addons/storysource/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"babel-runtime": "^6.26.0",
"estraverse": "^4.2.0",
"loader-utils": "^1.1.0",
"prettier": "^1.13.3",
"prettier": "^1.13.4",
"prop-types": "^15.6.1",
"react-syntax-highlighter": "^7.0.4"
},
Expand Down
34 changes: 15 additions & 19 deletions addons/storysource/src/StoryPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,27 @@ const styles = {
},
};

export default class StoryPanel extends Component {
static areLocationsEqual(a, b) {
return (
a.startLoc.line === b.startLoc.line &&
a.startLoc.col === b.startLoc.col &&
a.endLoc.line === b.endLoc.line &&
a.endLoc.col === b.endLoc.col
);
}

static getLocationKeys(locationsMap) {
return locationsMap
? Array.from(Object.keys(locationsMap)).sort(
(key1, key2) => locationsMap[key1].startLoc.line - locationsMap[key2].startLoc.line
)
: [];
}
const areLocationsEqual = (a, b) =>
a.startLoc.line === b.startLoc.line &&
a.startLoc.col === b.startLoc.col &&
a.endLoc.line === b.endLoc.line &&
a.endLoc.col === b.endLoc.col;

const getLocationKeys = locationsMap =>
locationsMap
? Array.from(Object.keys(locationsMap)).sort(
(key1, key2) => locationsMap[key1].startLoc.line - locationsMap[key2].startLoc.line
)
: [];

export default class StoryPanel extends Component {
state = { source: '// Here will be dragons 🐉' };

componentDidMount() {
const { channel } = this.props;

channel.on(EVENT_ID, ({ source, currentLocation, locationsMap }) => {
const locationsKeys = StoryPanel.getLocationKeys(locationsMap);
const locationsKeys = getLocationKeys(locationsMap);

this.setState({
source,
Expand Down Expand Up @@ -116,7 +112,7 @@ export default class StoryPanel extends Component {
const story = this.createPart(storyRows, stylesheet, useInlineStyles);
const storyKey = `${first}-${last}`;

if (StoryPanel.areLocationsEqual(location, currentLocation)) {
if (areLocationsEqual(location, currentLocation)) {
return (
<div key={storyKey} ref={this.setSelectedStoryRef} style={styles.selectedStory}>
{story}
Expand Down
10 changes: 5 additions & 5 deletions addons/viewport/src/manager/components/Panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ const getViewports = viewports =>
const setStoryDefaultViewportWait = 100;

export class Panel extends Component {
static propTypes = {
channel: PropTypes.shape({}).isRequired,
api: PropTypes.shape({}).isRequired,
};

static defaultOptions = {
viewports: INITIAL_VIEWPORTS,
defaultViewport: DEFAULT_VIEWPORT,
};

static propTypes = {
channel: PropTypes.shape({}).isRequired,
api: PropTypes.shape({}).isRequired,
};

constructor(props, context) {
super(props, context);
this.state = {
Expand Down
4 changes: 2 additions & 2 deletions app/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"global": "^4.3.2",
"react": "^16.4.0",
"react-dom": "^16.4.0",
"sass-loader": "^7.0.1",
"ts-loader": "^4.3.0",
"sass-loader": "^7.0.2",
"ts-loader": "^4.3.1",
"zone.js": "^0.8.26"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions app/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@storybook/react-dev-utils": "^5.0.0",
"@storybook/ui": "4.0.0-alpha.8",
"babel-loader": "^7.1.4",
"babel-plugin-macros": "^2.2.1",
"babel-plugin-macros": "^2.2.2",
"babel-plugin-syntax-async-functions": "^6.13.0",
"babel-plugin-syntax-trailing-function-commas": "^6.22.0",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand All @@ -47,7 +47,7 @@
"babel-runtime": "^6.26.0",
"case-sensitive-paths-webpack-plugin": "^2.1.2",
"commander": "^2.15.1",
"dotenv-webpack": "^1.5.5",
"dotenv-webpack": "^1.5.6",
"express": "^4.16.3",
"find-cache-dir": "^1.0.0",
"global": "^4.3.2",
Expand All @@ -60,7 +60,7 @@
"shelljs": "^0.8.2",
"url-parse": "^1.4.0",
"uuid": "^3.2.1",
"webpack": "^4.9.2",
"webpack": "^4.10.2",
"webpack-dev-middleware": "^3.1.3",
"webpack-hot-middleware": "^2.22.2",
"ws": "^5.2.0"
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ collectors:
settings:
batch_mode: true
batch_bootstrap: true
bootstrap_command: yarn --ignore-scripts --ignore-engines --silent
bootstrap_command: yarn --ignore-scripts --ignore-engines --silent && yarn lint:ts . --fix && yarn lint:js . --fix
github_labels:
- dependencies:update
github_assignees:
Expand Down
8 changes: 4 additions & 4 deletions examples/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
"@storybook/addon-storysource": "4.0.0-alpha.8",
"@storybook/addons": "4.0.0-alpha.8",
"@storybook/angular": "4.0.0-alpha.8",
"@types/jasmine": "~2.8.7",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.3",
"@types/jest": "^22.2.3",
"@types/node": "~9.6.18",
"@types/node": "~9.6.20",
"babel-core": "^6.26.3",
"global": "^4.3.2",
"jasmine-core": "~3.1.0",
"jasmine-spec-reporter": "~4.2.1",
"jest": "^22.4.4",
"jest-preset-angular": "^5.2.2",
"protractor": "~5.3.2",
"ts-node": "~6.0.5",
"typescript": "^2.8.3"
"ts-node": "~6.1.0",
"typescript": "^2.9.1"
}
}
2 changes: 1 addition & 1 deletion examples/cra-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
"enzyme-to-json": "^3.3.4",
"jest": "^20.0.4",
"react-scripts": "^1.1.4",
"webpack": "^4.9.2"
"webpack": "^4.10.2"
}
}
4 changes: 2 additions & 2 deletions examples/marko-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"eslint": "^4.2.0",
"eslint-config-prettier": "^2.3.0",
"eslint-plugin-prettier": "^2.1.2",
"prettier": "^1.13.0",
"webpack": "^4.9.2"
"prettier": "^1.13.4",
"webpack": "^4.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/mithril-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@storybook/mithril": "4.0.0-alpha.8",
"babel-core": "^6.26.3",
"babel-plugin-transform-react-jsx": "^6.24.1",
"webpack": "^4.9.2"
"webpack": "^4.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@
"react-dom": "^16.4.0",
"react-emotion": "^9.1.3",
"uuid": "^3.2.1",
"webpack": "^4.9.2"
"webpack": "^4.10.2"
}
}
2 changes: 1 addition & 1 deletion examples/polymer-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"global": "^4.3.2",
"lit-html": "^0.10.0",
"polymer-webpack-loader": "^2.0.2",
"webpack": "^4.9.2"
"webpack": "^4.10.2"
},
"devDependencies": {
"babel-core": "^6.26.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/vue-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"file-loader": "^1.1.11",
"svg-url-loader": "^2.3.2",
"vue-loader": "^14.2.3",
"webpack": "^4.9.2",
"webpack": "^4.10.2",
"webpack-dev-server": "^3.1.4"
}
}
10 changes: 5 additions & 5 deletions lib/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"@storybook/node-logger": "4.0.0-alpha.8",
"@storybook/react-dev-utils": "^5.0.0",
"@storybook/ui": "4.0.0-alpha.8",
"airbnb-js-shims": "^1.5.2",
"autoprefixer": "^8.5.1",
"airbnb-js-shims": "^1.6.0",
"autoprefixer": "^8.6.0",
"babel-loader": "^7.1.4",
"babel-runtime": "^6.26.0",
"babel-plugin-macros": "^2.2.1",
"babel-plugin-macros": "^2.2.2",
"babel-plugin-transform-regenerator": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
Expand All @@ -39,7 +39,7 @@
"core-js": "^2.5.7",
"css-loader": "^0.28.11",
"dotenv": "^5.0.1",
"dotenv-webpack": "^1.5.5",
"dotenv-webpack": "^1.5.6",
"emotion": "^9.1.3",
"express": "^4.16.3",
"file-loader": "^1.1.11",
Expand All @@ -59,7 +59,7 @@
"style-loader": "^0.21.0",
"svg-url-loader": "^2.3.2",
"url-loader": "^1.0.1",
"webpack": "^4.9.2",
"webpack": "^4.10.2",
"webpack-dev-middleware": "^3.1.3",
"webpack-hot-middleware": "^2.22.2"
},
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"react-fuzzy": "^0.5.2",
"react-icons": "^2.2.7",
"react-lifecycles-compat": "^3.0.4",
"react-modal": "^3.4.4",
"react-modal": "^3.4.5",
"react-treebeard": "^2.1.0"
},
"devDependencies": {
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.3",
"babel-plugin-emotion": "^9.1.2",
"babel-plugin-macros": "^2.2.1",
"babel-plugin-macros": "^2.2.2",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
Expand All @@ -60,7 +60,7 @@
"commander": "^2.15.1",
"concurrently": "^3.5.1",
"cross-env": "^5.1.6",
"danger": "^3.7.14",
"danger": "^3.7.15",
"emotion": "^9.1.3",
"emotion-theming": "^9.1.2",
"enzyme": "^3.3.0",
Expand All @@ -73,8 +73,8 @@
"eslint-plugin-json": "^1.2.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-prettier": "^2.6.0",
"eslint-plugin-react": "^7.8.2",
"eslint-teamcity": "^2.0.0",
"eslint-plugin-react": "^7.9.1",
"eslint-teamcity": "^2.0.1",
"github-release-from-changelog": "^1.3.1",
"glob": "^7.1.2",
"husky": "^0.14.3",
Expand All @@ -93,23 +93,23 @@
"jest-teamcity-reporter": "^0.9.0",
"jest-vue-preprocessor": "^1.4.0",
"lerna": "2.11.0",
"lint-staged": "^7.1.2",
"lint-staged": "^7.1.3",
"lodash": "^4.17.10",
"npmlog": "^4.1.2",
"polymer-webpack-loader": "^2.0.2",
"prettier": "^1.13.0",
"prettier": "^1.13.4",
"raf": "^3.4.0",
"react": "^16.4.0",
"react-dom": "^16.4.0",
"react-test-renderer": "^16.4.0",
"remark-cli": "^5.0.0",
"remark-lint": "^6.0.1",
"remark-preset-lint-recommended": "^3.0.1",
"remark-lint": "^6.0.2",
"remark-preset-lint-recommended": "^3.0.2",
"shelljs": "^0.8.2",
"tslint": "~5.10.0",
"tslint-config-prettier": "^1.13.0",
"tslint-plugin-prettier": "^1.3.0",
"typescript": "^2.8.3"
"typescript": "^2.9.1"
},
"engines": {
"node": ">=8.0.0",
Expand Down
Loading