Merge branch 'next' into tech/example-for-cra15-support

# Conflicts: # yarn.lock
storybookjs · May 7, 2019 · 22e87a7 · 22e87a7
2 parents 3ae04b4 + 60ba42a
commit 22e87a7
Show file tree

Hide file tree

Showing 3 changed files with 462 additions and 302 deletions.
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -49,7 +49,7 @@
  "@storybook/angular": "5.1.0-alpha.39",
  "@types/core-js": "^2.5.0",
  "@types/jest": "^24.0.11",
- "@types/node": "~11.13.4",
+ "@types/node": "~12.0.0",
  "@types/webpack-env": "^1.13.7",
  "babel-plugin-require-context-hook": "^1.0.0",
  "global": "^4.3.2",

diff --git a/package.json b/package.json
@@ -124,7 +124,7 @@
  "@types/common-tags": "^1.8.0",
  "@types/jest": "^24.0.11",
  "@types/lodash": "^4.14.123",
- "@types/node": "~11.13.4",
+ "@types/node": "~12.0.0",
  "@types/react": "^16.8.14",
  "@types/webpack": "^4.4.25",
  "@types/webpack-env": "^1.13.7",