Merge pull request #2628 from storybooks/tmeasday/shilman-refactor-co…

…re-rebase Merge `master` into `shilman/refactor-core`
storybookjs · Jan 3, 2018 · b4dec5f · b4dec5f
2 parents 1af4e8d + b60ac0a
commit b4dec5f
Show file tree

Hide file tree

Showing 40 changed files with 220 additions and 1,519 deletions.
diff --git a/app/angular/package.json b/app/angular/package.json
@@ -27,6 +27,7 @@
     "@storybook/addon-links": "^3.3.3",
     "@storybook/addons": "^3.3.3",
     "@storybook/channel-postmessage": "^3.3.3",
+    "@storybook/core": "^3.3.3",
     "@storybook/ui": "^3.3.3",
     "airbnb-js-shims": "^1.1.1",
     "angular2-template-loader": "^0.6.2",
@@ -59,7 +60,7 @@
     "postcss-flexbugs-fixes": "^3.0.0",
     "postcss-loader": "^2.0.5",
     "prop-types": "^15.5.10",
-    "qs": "^6.4.0",
+    "qs": "^6.5.1",
     "raw-loader": "^0.5.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",

diff --git a/app/angular/src/client/preview/client_api.js b/app/angular/src/client/preview/client_api.js
diff --git a/app/angular/src/client/preview/client_api.test.js b/app/angular/src/client/preview/client_api.test.js