diff --git a/netlify.toml b/netlify.toml index 3d2fd195c821..a2251b21abba 100644 --- 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 index f53b4ede9f5a..f0426d522ddd 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", @@ -95,6 +87,7 @@ "node": ">=8.0.0", "yarn": ">=1.0.0" }, + "private": true, "collective": { "type": "opencollective", "url": "https://opencollective.com/storybook" @@ -125,5 +118,12 @@ "dependencies": "Dependency Upgrades", "other": "Other" } - } + }, + "workspaces": [ + "addons/*", + "app/*", + "lib/*", + "examples/cra-kitchen-sink", + "examples/vue-kitchen-sink" + ] } diff --git a/scripts/netlify-build.sh b/scripts/netlify-build.sh index b248b3769af7..92e6b309a984 100644 --- 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