Skip to content

Commit

Permalink
FIX the failing netlify builds
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen committed Dec 21, 2017
1 parent 4cbc697 commit 5bfae45
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 15 deletions.
1 change: 1 addition & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
[build.environment]
NODE_VERSION = "8"
YARN_VERSION = "1.3.2"
YARN_FLAGS = "--version"
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +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/cra-kitchen-sink",
"examples/vue-kitchen-sink"
],
"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",
Expand All @@ -34,8 +25,9 @@
"lint:js": "NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json",
"lint:md": "remark",
"publish": "lerna publish",
"test": "node ./scripts/test.js",
"repo-dirty-check": "node ./scripts/repo-dirty-check"
"repo-dirty-check": "node ./scripts/repo-dirty-check",
"start": "npm --prefix examples/cra-kitchen-sink run storybook",
"test": "node ./scripts/test.js"
},
"devDependencies": {
"babel-cli": "^6.26.0",
Expand Down Expand Up @@ -95,6 +87,7 @@
"node": ">=8.0.0",
"yarn": ">=1.0.0"
},
"private": true,
"collective": {
"type": "opencollective",
"url": "https://opencollective.com/storybook"
Expand Down Expand Up @@ -125,5 +118,12 @@
"dependencies": "Dependency Upgrades",
"other": "Other"
}
}
},
"workspaces": [
"addons/*",
"app/*",
"lib/*",
"examples/cra-kitchen-sink",
"examples/vue-kitchen-sink"
]
}
4 changes: 3 additions & 1 deletion scripts/netlify-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5bfae45

Please sign in to comment.