Merge branch 'master' into release/3.3

# Conflicts: # addons/a11y/package.json # addons/comments/package.json # addons/knobs/package.json # package.json # yarn.lock
storybookjs · Dec 21, 2017 · 4d59b5f · 4d59b5f
2 parents be68cdf + fb94010
commit 4d59b5f
Show file tree

Hide file tree

Showing 10 changed files with 551 additions and 587 deletions.
diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@storybook/components": "^3.3.0-alpha.4",
-    "axe-core": "^2.0.7",
+    "axe-core": "^2.6.0",
     "prop-types": "^15.6.0"
   },
   "peerDependencies": {

diff --git a/addons/knobs/package.json b/addons/knobs/package.json
@@ -19,7 +19,7 @@
     "global": "^4.3.2",
     "insert-css": "^2.0.0",
     "lodash.debounce": "^4.0.8",
-    "moment": "^2.20.0",
+    "moment": "^2.20.1",
     "prop-types": "^15.6.0",
     "react-color": "^2.11.4",
     "react-datetime": "^2.11.1",
@@ -29,7 +29,7 @@
   "devDependencies": {
     "raw-loader": "^0.5.1",
     "style-loader": "^0.19.1",
-    "vue": "^2.5.11"
+    "vue": "^2.5.12"
   },
   "peerDependencies": {
     "@storybook/addons": "^3.3.0-alpha.4",

diff --git a/app/vue/package.json b/app/vue/package.json
@@ -78,13 +78,13 @@
   },
   "devDependencies": {
     "nodemon": "^1.13.3",
-    "vue": "^2.5.11",
+    "vue": "^2.5.12",
     "vue-loader": "^13.6.0",
-    "vue-template-compiler": "^2.5.11"
+    "vue-template-compiler": "^2.5.12"
   },
   "peerDependencies": {
-    "vue": "2.5.11",
+    "vue": "2.5.12",
     "vue-loader": "13.6.0",
-    "vue-template-compiler": "2.5.11"
+    "vue-template-compiler": "2.5.12"
   }
 }
diff --git a/docs/package.json b/docs/package.json
@@ -30,7 +30,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "bootstrap": "^3.3.7",
-    "gatsby": "^1.9.142",
+    "gatsby": "^1.9.144",
     "gatsby-link": "^1.6.32",
     "gatsby-plugin-sharp": "^1.6.24",
     "gatsby-remark-autolink-headers": "^1.4.10",

diff --git a/docs/yarn.lock b/docs/yarn.lock
@@ -4235,9 +4235,9 @@ gatsby-1-config-css-modules@^1.0.8:
   dependencies:
     babel-runtime "^6.26.0"
 
-gatsby-cli@^1.1.27:
-  version "1.1.27"
-  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.27.tgz#40be97cde1721ee61c25d21a21c84867e7ba3678"
+gatsby-cli@^1.1.28:
+  version "1.1.28"
+  resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.28.tgz#0d0a397566154a3ce3e4680d545c9cfdc33ad95b"
   dependencies:
     babel-code-frame "^6.26.0"
     babel-runtime "^6.26.0"
@@ -4289,9 +4289,9 @@ gatsby-plugin-sharp@^1.6.24:
     sharp "^0.17.3"
     svgo "^0.7.2"
 
-gatsby-react-router-scroll@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.6.tgz#7cf83afec00ed5441522c3db3b84ec4a12df509a"
+gatsby-react-router-scroll@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.7.tgz#50be2d6d3857625eb087c14f2a6789672fd73219"
   dependencies:
     babel-runtime "^6.26.0"
     scroll-behavior "^0.9.1"
@@ -4378,9 +4378,9 @@ gatsby-transformer-remark@^1.7.25:
     unist-util-select "^1.5.0"
     unist-util-visit "^1.1.1"
 
-gatsby@^1.9.142:
-  version "1.9.142"
-  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.142.tgz#020393389a759675012b120253e16663abe8dc14"
+gatsby@^1.9.144:
+  version "1.9.144"
+  resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.144.tgz#1b0b3a0c547b617b07b7c99c4c1a146525cf0708"
   dependencies:
     async "^2.1.2"
     babel-code-frame "^6.22.0"
@@ -4420,10 +4420,10 @@ gatsby@^1.9.142:
     front-matter "^2.1.0"
     fs-extra "^4.0.1"
     gatsby-1-config-css-modules "^1.0.8"
-    gatsby-cli "^1.1.27"
+    gatsby-cli "^1.1.28"
     gatsby-link "^1.6.30"
     gatsby-module-loader "^1.0.9"
-    gatsby-react-router-scroll "^1.0.6"
+    gatsby-react-router-scroll "^1.0.7"
     glob "^7.1.1"
     graphql "^0.11.7"
     graphql-relay "^0.5.1"

diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -21,12 +21,12 @@
     "vue-hot-reload-api": "^2.2.4",
     "vue-loader": "^13.6.0",
     "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.11",
+    "vue-template-compiler": "^2.5.12",
     "webpack": "^3.10.0",
     "webpack-dev-server": "^2.9.7"
   },
   "dependencies": {
-    "vue": "^2.5.11",
+    "vue": "^2.5.12",
     "vuex": "^3.0.0"
   },
   "scripts": {

diff --git a/netlify.toml b/netlify.toml
@@ -4,3 +4,4 @@
 [build.environment]
   NODE_VERSION = "8"
   YARN_VERSION = "1.3.2"
+  YARN_FLAGS = "--version"
diff --git a/package.json b/package.json
@@ -1,27 +1,16 @@
 {
-  "private": true,
-  "name": "storybook",
+  "name": "@storybook/root",
   "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/storybooks/storybook.git"
   },
-  "workspaces": [
-    "addons/*",
-    "app/*",
-    "lib/*",
-    "examples/angular-cli",
-    "examples/cra-kitchen-sink",
-    "examples/vue-kitchen-sink",
-    "lib/cli/test/run/*"
-  ],
   "scripts": {
     "bootstrap": "node ./scripts/bootstrap.js",
+    "bootstrap:crna-kitchen-sink": "npm --prefix examples/crna-kitchen-sink install",
     "bootstrap:docs": "yarn install --cwd docs",
     "bootstrap:react-native-vanilla": "npm --prefix examples/react-native-vanilla install",
-    "bootstrap:crna-kitchen-sink": "npm --prefix examples/crna-kitchen-sink install",
     "build-packs": "lerna exec --scope '@storybook/*' --parallel -- ../../scripts/build-pack.sh ../../packs",
-    "start": "npm --prefix examples/cra-kitchen-sink run storybook",
     "changelog": "pr-log --sloppy",
     "precommit": "lint-staged",
     "coverage": "codecov",
@@ -36,9 +25,10 @@
     "lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
     "lint:md": "remark",
     "publish": "lerna publish",
+    "repo-dirty-check": "node ./scripts/repo-dirty-check",
+    "start": "npm --prefix examples/cra-kitchen-sink run storybook",
     "test": "node ./scripts/test.js",
-    "test-latest-cra": "npm --prefix lib/cli run test-latest-cra",
-    "repo-dirty-check": "node ./scripts/repo-dirty-check"
+    "test-latest-cra": "npm --prefix lib/cli run test-latest-cra"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
@@ -56,7 +46,7 @@
     "cross-env": "^5.1.1",
     "danger": "^2.1.6",
     "enzyme": "^3.2.0",
-    "enzyme-adapter-react-16": "^1.1.0",
+    "enzyme-adapter-react-16": "^1.1.1",
     "eslint": "^4.13.1",
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-prettier": "^2.9.0",
@@ -74,7 +64,7 @@
     "jest": "^21.2.0",
     "jest-cli": "^21.2.1",
     "jest-enzyme": "^4.0.1",
-    "jest-image-snapshot": "^2.2.0",
+    "jest-image-snapshot": "^2.2.1",
     "lerna": "^2.5.1",
     "lint-staged": "^6.0.0",
     "lodash": "^4.17.4",
@@ -98,6 +88,7 @@
     "node": ">=8.0.0",
     "yarn": ">=1.0.0"
   },
+  "private": true,
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/storybook"
@@ -128,5 +119,14 @@
       "dependencies": "Dependency Upgrades",
       "other": "Other"
     }
-  }
+  },
+  "workspaces": [
+    "addons/*",
+    "app/*",
+    "lib/*",
+    "examples/angular-cli",
+    "examples/cra-kitchen-sink",
+    "examples/vue-kitchen-sink",
+    "lib/cli/test/run/*"
+  ]
 }
diff --git a/scripts/netlify-build.sh b/scripts/netlify-build.sh
@@ -3,8 +3,10 @@
 # Make sure to set $BUILD_CONTEXT in the Netlify "Deploy Settings"
 echo "Building for Netlify. BUILD_CONTEXT: $BUILD_CONTEXT"
 
+# Fixes
+npm i -g process-nextick-args util-deprecate gauge
+
 yarn
-yarn add gauge --ignore-workspace-root-check # quirk with netlify build instance
 yarn bootstrap --core
 
 if [ "$BUILD_CONTEXT" = "DOCS" ]; then