diff --git a/.circleci/config.yml b/.circleci/config.yml index 40fed8faa967..299d29bc4dce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,48 +2,38 @@ defaults: &defaults working_directory: /tmp/storybook docker: - image: node:8 + environment: + BASH_ENV: ~/.bashrc version: 2 dependencies: pre: - yarn global add npm jobs: - validate: - <<: *defaults - steps: - - run: - name: "Checking Versions" - command: | - node --version - npm --version - yarn --version build: <<: *defaults steps: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- + - run: + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s - run: - name: "Install root dependencies" + name: "Install dependencies" command: | yarn install - - save_cache: - key: root-dependencies-{{ checksum "package.json" }} - paths: - - node_modules - - restore_cache: - keys: - - package-dependencies-{{ checksum "package.json" }} - - package-dependencies- - run: name: "Bootstrapping" command: | - yarn bootstrap -- --all + yarn bootstrap --core --docs --reactnative --reactnativeapp - save_cache: - key: package-dependencies-{{ checksum "package.json" }} + key: dependencies-{{ checksum "yarn.lock" }} paths: + - node_modules - app/**/node_modules - docs/**/node_modules - examples/**/node_modules @@ -54,70 +44,82 @@ jobs: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- + - run: + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s - run: - name: "Install root dependencies" + name: "Install dependencies" command: | yarn install - run: name: "Bootstrapping" command: | - yarn bootstrap -- --core + yarn bootstrap --core - run: name: "Build react kitchen-sink" command: | cd examples/cra-kitchen-sink yarn build-storybook - yarn storybook -- --smoke-test + yarn storybook --smoke-test - run: name: "Build vue kitchen-sink" command: | cd examples/vue-kitchen-sink yarn build-storybook - yarn storybook -- --smoke-test + yarn storybook --smoke-test example-react-native: <<: *defaults steps: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- - run: - name: "Install root dependencies" + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s + - run: + name: "Install dependencies" command: | yarn install - run: name: "Bootstrapping packages" command: | - yarn bootstrap -- --core --reactnative --reactnativeapp + yarn bootstrap --core --reactnative --reactnativeapp - run: name: "Running React-Native example" command: | cd examples/react-native-vanilla - yarn storybook -- --smoke-test + yarn storybook --smoke-test - run: name: "Running React-Native-App example" command: | cd examples/crna-kitchen-sink - yarn storybook -- --smoke-test + yarn storybook --smoke-test docs: <<: *defaults steps: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- - run: - name: "Install root dependencies" + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s + - run: + name: "Install dependencies" command: | yarn install - run: name: "Bootstrapping" command: | - yarn bootstrap -- --docs + yarn bootstrap --docs - run: name: "Running docs" command: | @@ -128,10 +130,14 @@ jobs: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- + - run: + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s - run: - name: "Install root dependencies" + name: "Install dependencies" command: | yarn install - run: @@ -144,20 +150,24 @@ jobs: - checkout - restore_cache: keys: - - root-dependencies-{{ checksum "package.json" }} - - root-dependencies- + - dependencies-{{ checksum "yarn.lock" }} + - dependencies- + - run: + name: "Install latest yarn version" + command: | + curl -o- -L https://yarnpkg.com/install.sh | bash -s - run: - name: "Install root dependencies" + name: "Install dependencies" command: | yarn install - run: name: "Bootstrapping" command: | - yarn bootstrap -- --core --reactnative + yarn bootstrap --core --reactnative - run: name: "Unit testing" command: | - yarn test -- --all --coverage --runInBand + yarn test --all --coverage --runInBand yarn coverage deploy: <<: *defaults @@ -170,7 +180,6 @@ workflows: version: 2 build_accept_deploy: jobs: - - validate - build - example-kitchen-sinks - example-react-native @@ -182,4 +191,4 @@ workflows: # requires: # - lint # - unit-test - # - docs + # - docs \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ee43a20d4f8e..e1c5e7785bc1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thanks for your interest in improving Storybook! We are a community-driven proje Please review this document to help to streamline the process and save everyone's precious time. -This guide assumes you're using `yarn` as package manager. You may have some success using `npm` as well, but there are chances you'll get wrong versions of root dependencies in that case (we only commit `yarn.lock` to the repo). +This repo uses yarn workspaces, so you should `yarn@1.0.0` or higher as package manager. See [installation guide](<>). ## Issues @@ -35,7 +35,7 @@ The bootstrap command will ask which sections of the codebase you want to bootst You can also pick directly from CLI: - yarn bootstrap -- --core + yarn bootstrap --core #### 2a. Run unit tests @@ -52,7 +52,7 @@ _Note that in order to run the tests fro ReactNative, you must have bootstrapped You can also pick suites from CLI: ```sh -yarn test -- --core +yarn test --core ``` In order to run ALL unit tests, you must have bootstrapped the react-native @@ -224,7 +224,7 @@ git status # clean out extra files & build all the packages # WARNING: destructive if you have extra files lying around! -yarn bootstrap -- --reset --all +yarn bootstrap --reset --all ``` From here there are different procedures for prerelease (e.g. alpha/beta/rc) and proper release. @@ -235,7 +235,7 @@ From here there are different procedures for prerelease (e.g. alpha/beta/rc) and ```sh # publish and tag the release -yarn run publish -- --concurrency 1 --npm-tag=alpha +yarn run publish --concurrency 1 --npm-tag=alpha # push the tags git push --tags @@ -245,7 +245,7 @@ git push --tags ```sh # publish but don't commit to git -yarn publish -- --concurrency 1 --skip-git +yarn run publish --concurrency 1 --skip-git # Update `CHANGELOG.md` # - Edit PR titles/labels on github until output is good diff --git a/README.md b/README.md index d7918c911aab..248a57f803e1 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,8 @@ We welcome contributions to Storybook! - `yarn lint:js` - will check js - `yarn lint:md` - will check markdown + code samples -- `yarn lint:js -- --fix` - will automatically fix js -- `yarn lint:md -- -o` - will automatically fix markdown +- `yarn lint:js --fix` - will automatically fix js +- `yarn lint:md -o` - will automatically fix markdown #### `yarn test` diff --git a/addons/actions/package.json b/addons/actions/package.json index 2b2ada65acbd..1002a204efb2 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -17,7 +17,7 @@ }, "scripts": { "deploy-storybook": "storybook-to-ghpages", - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 9001" }, "dependencies": { diff --git a/addons/centered/package.json b/addons/centered/package.json index 93a13404fdeb..30234b64224a 100644 --- a/addons/centered/package.json +++ b/addons/centered/package.json @@ -6,7 +6,7 @@ "author": "Muhammed Thanish ", "main": "dist/index.js", "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "global": "^4.3.2" diff --git a/addons/comments/package.json b/addons/comments/package.json index fcbdff9ffc16..bbf6af2c71da 100644 --- a/addons/comments/package.json +++ b/addons/comments/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "publish-storybook": "bash .scripts/publish_storybook.sh", "storybook": "start-storybook -p 3006", "storybook-local": "STORYBOOK_CLOUD_SERVER='http://localhost:3003/graphql' start-storybook -p 9010", diff --git a/addons/events/package.json b/addons/events/package.json index 591c5537e6e0..43ab12b9bc94 100644 --- a/addons/events/package.json +++ b/addons/events/package.json @@ -16,7 +16,7 @@ }, "scripts": { "build-storybook": "build-storybook", - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 6006" }, "dependencies": { diff --git a/addons/graphql/package.json b/addons/graphql/package.json index 8a471e2b501a..781fb610ec75 100644 --- a/addons/graphql/package.json +++ b/addons/graphql/package.json @@ -17,7 +17,7 @@ }, "scripts": { "deploy-storybook": "storybook-to-ghpages", - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 9001" }, "dependencies": { diff --git a/addons/info/package.json b/addons/info/package.json index 51fcfa1813a5..3f863e804e6c 100644 --- a/addons/info/package.json +++ b/addons/info/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "publish-storybook": "bash .scripts/publish_storybook.sh", "storybook": "start-storybook -p 9010" }, diff --git a/addons/knobs/package.json b/addons/knobs/package.json index 88ff3d33ccdb..30c74606f786 100644 --- a/addons/knobs/package.json +++ b/addons/knobs/package.json @@ -9,9 +9,9 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "publish-storybook": "bash .scripts/publish_storybook.sh", - "start": "./example/prepublish.sh", + "start": "./example/prepare.sh", "storybook": "start-storybook -p 9010" }, "dependencies": { diff --git a/addons/links/package.json b/addons/links/package.json index 1d570779dfa4..c596e206363c 100644 --- a/addons/links/package.json +++ b/addons/links/package.json @@ -17,7 +17,7 @@ }, "scripts": { "deploy-storybook": "storybook-to-ghpages", - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 9001" }, "dependencies": { diff --git a/addons/notes/package.json b/addons/notes/package.json index e4b47131d309..9ff830c68822 100644 --- a/addons/notes/package.json +++ b/addons/notes/package.json @@ -14,7 +14,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "publish-storybook": "bash .scripts/publish_storybook.sh", "storybook": "start-storybook -p 9010" }, diff --git a/addons/options/package.json b/addons/options/package.json index 3d8711b1075f..d55969533fde 100644 --- a/addons/options/package.json +++ b/addons/options/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 9001" }, "dependencies": { diff --git a/addons/storyshots/package.json b/addons/storyshots/package.json index 8bbddf72235d..919691bea545 100644 --- a/addons/storyshots/package.json +++ b/addons/storyshots/package.json @@ -10,7 +10,7 @@ }, "scripts": { "build-storybook": "build-storybook", - "prepublish": "babel ./src --out-dir ./dist", + "prepare": "babel ./src --out-dir ./dist", "storybook": "start-storybook -p 6006", "example": "jest storyshot.test" }, diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 7ad3170f32c5..4e1a4cddea68 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -7,7 +7,7 @@ "storybook" ], "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "license": "MIT", "dependencies": { diff --git a/app/react-native/package.json b/app/react-native/package.json index 858181a9c505..a3422df537bf 100644 --- a/app/react-native/package.json +++ b/app/react-native/package.json @@ -21,7 +21,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "@storybook/addon-actions": "^3.3.0-alpha.0", diff --git a/app/react/bin/build.js b/app/react/bin/build.js new file mode 100755 index 000000000000..780773c6cd31 --- /dev/null +++ b/app/react/bin/build.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../dist/server/build'); diff --git a/app/react/bin/index.js b/app/react/bin/index.js new file mode 100755 index 000000000000..2e96258ce63d --- /dev/null +++ b/app/react/bin/index.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../dist/server'); diff --git a/app/react/package.json b/app/react/package.json index 6c30d5357e3b..fed02e073f6e 100644 --- a/app/react/package.json +++ b/app/react/package.json @@ -9,17 +9,17 @@ "license": "MIT", "main": "dist/client/index.js", "bin": { - "build-storybook": "./dist/server/build.js", - "start-storybook": "./dist/server/index.js", - "storybook-server": "./dist/server/index.js" + "build-storybook": "./bin/build.js", + "start-storybook": "./bin/index.js", + "storybook-server": "./bin/index.js" }, "repository": { "type": "git", "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'npm run prepublish'", - "prepublish": "node ../../scripts/prepublish.js" + "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'", + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "@storybook/addon-actions": "^3.3.0-alpha.0", diff --git a/app/react/src/server/build.js b/app/react/src/server/build.js index 99df39a8f57b..74fc769d1a5b 100755 --- a/app/react/src/server/build.js +++ b/app/react/src/server/build.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import webpack from 'webpack'; import program from 'commander'; import path from 'path'; diff --git a/app/react/src/server/index.js b/app/react/src/server/index.js index b6aa21c5a25a..e2328e73d52d 100755 --- a/app/react/src/server/index.js +++ b/app/react/src/server/index.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import express from 'express'; import https from 'https'; import favicon from 'serve-favicon'; diff --git a/app/vue/bin/build.js b/app/vue/bin/build.js new file mode 100755 index 000000000000..780773c6cd31 --- /dev/null +++ b/app/vue/bin/build.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../dist/server/build'); diff --git a/app/vue/bin/index.js b/app/vue/bin/index.js new file mode 100755 index 000000000000..2e96258ce63d --- /dev/null +++ b/app/vue/bin/index.js @@ -0,0 +1,3 @@ +#!/usr/bin/env node + +require('../dist/server'); diff --git a/app/vue/package.json b/app/vue/package.json index 7af1d7d982bd..6d36ed59b8fd 100644 --- a/app/vue/package.json +++ b/app/vue/package.json @@ -9,17 +9,17 @@ "license": "MIT", "main": "dist/client/index.js", "bin": { - "build-storybook": "./dist/server/build.js", - "start-storybook": "./dist/server/index.js", - "storybook-server": "./dist/server/index.js" + "build-storybook": "./bin/build.js", + "start-storybook": "bin/index.js", + "storybook-server": "bin/index.js" }, "repository": { "type": "git", "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'npm run prepublish'", - "prepublish": "node ../../scripts/prepublish.js" + "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepare'", + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "@storybook/addon-actions": "^3.3.0-alpha.0", diff --git a/app/vue/src/server/build.js b/app/vue/src/server/build.js index 99df39a8f57b..74fc769d1a5b 100755 --- a/app/vue/src/server/build.js +++ b/app/vue/src/server/build.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import webpack from 'webpack'; import program from 'commander'; import path from 'path'; diff --git a/app/vue/src/server/index.js b/app/vue/src/server/index.js index b6aa21c5a25a..e2328e73d52d 100755 --- a/app/vue/src/server/index.js +++ b/app/vue/src/server/index.js @@ -1,5 +1,3 @@ -#!/usr/bin/env node - import express from 'express'; import https from 'https'; import favicon from 'serve-favicon'; diff --git a/docs/pages/basics/guide-vue/index.md b/docs/pages/basics/guide-vue/index.md index c8218608a276..d3adada5fc47 100644 --- a/docs/pages/basics/guide-vue/index.md +++ b/docs/pages/basics/guide-vue/index.md @@ -1,7 +1,8 @@ ---- +* * * + id: 'guide-vue' -title: 'Storybook for Vue' ---- + +## title: 'Storybook for Vue' You may have tried to use our quick start guide to setup your project for Storybook. If you want to set up Storybook manually, this is the guide for you. diff --git a/docs/yarn.lock b/docs/yarn.lock index 09df315740e1..6f14a36c78b2 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -481,7 +481,7 @@ b64@2.x.x: dependencies: hoek "2.x.x" -babel-cli@^6.24.1: +babel-cli@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" dependencies: @@ -1266,7 +1266,7 @@ babel-plugin-transform-undefined-to-void@^6.8.3: version "6.8.3" resolved "https://registry.yarnpkg.com/babel-plugin-transform-undefined-to-void/-/babel-plugin-transform-undefined-to-void-6.8.3.tgz#fc52707f6ee1ddc71bb91b0d314fbefdeef9beb4" -babel-polyfill@^6.23.0, babel-polyfill@^6.26.0: +babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" dependencies: diff --git a/lerna.json b/lerna.json index 9b1256fe6ca8..c9f78490e1b0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,27 +1,15 @@ { "lerna": "2.0.0", + "npmClient": "yarn", + "useWorkspaces": true, "commands": { - "bootstrap": { - "ignore": [ - "crna-kitchen-sink", - "react-native-vanilla" - ] - }, "publish": { "ignore": [ "cra-kitchen-sink", - "crna-kitchen-sink", - "react-native-vanilla", - "vue-example" + "vue-kitchen-sink" ] } }, - "packages": [ - "addons/*", - "app/*", - "lib/*", - "examples/*" - ], "concurrency": 1, "version": "3.3.0-alpha.0" } diff --git a/lib/addons/package.json b/lib/addons/package.json index cc1781b1886c..4e351aee8b7c 100644 --- a/lib/addons/package.json +++ b/lib/addons/package.json @@ -16,7 +16,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "devDependencies": { "shelljs": "^0.7.8" diff --git a/lib/channel-postmessage/package.json b/lib/channel-postmessage/package.json index 241a688b1fc7..02a784409247 100644 --- a/lib/channel-postmessage/package.json +++ b/lib/channel-postmessage/package.json @@ -5,7 +5,7 @@ "license": "MIT", "main": "dist/index.js", "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "@storybook/channels": "^3.3.0-alpha.0", diff --git a/lib/channel-websocket/package.json b/lib/channel-websocket/package.json index ebd4f0a86d07..a59556a507d3 100644 --- a/lib/channel-websocket/package.json +++ b/lib/channel-websocket/package.json @@ -5,7 +5,7 @@ "license": "MIT", "main": "dist/index.js", "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "@storybook/channels": "^3.3.0-alpha.0", diff --git a/lib/channels/package.json b/lib/channels/package.json index 1aa502d3ec98..2e69dda0ad6a 100644 --- a/lib/channels/package.json +++ b/lib/channels/package.json @@ -5,7 +5,7 @@ "license": "MIT", "main": "dist/index.js", "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "devDependencies": { "shelljs": "^0.7.8" diff --git a/lib/codemod/package.json b/lib/codemod/package.json index 62472814a8bc..f4783a14cbf4 100644 --- a/lib/codemod/package.json +++ b/lib/codemod/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js" + "prepare": "node ../../scripts/prepare.js" }, "dependencies": { "jscodeshift": "^0.3.30" diff --git a/lib/components/package.json b/lib/components/package.json index 7fe22510b535..41d0abb1ebcf 100644 --- a/lib/components/package.json +++ b/lib/components/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook" }, diff --git a/lib/ui/package.json b/lib/ui/package.json index 09ed3bdc2ad7..510211e904e4 100644 --- a/lib/ui/package.json +++ b/lib/ui/package.json @@ -9,7 +9,7 @@ "url": "https://github.com/storybooks/storybook.git" }, "scripts": { - "prepublish": "node ../../scripts/prepublish.js", + "prepare": "node ../../scripts/prepare.js", "publish-storybook": "bash ./.scripts/publish_storybook.sh", "storybook": "start-storybook -p 9010" }, diff --git a/package.json b/package.json index a51643ae6ad4..d9c78cf2eed8 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,21 @@ { + "private": true, "name": "storybook", "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": "./scripts/bootstrap.js", - "bootstrap:core": "lerna bootstrap --concurrency 1 --npm-client=\"yarn\" --hoist && node ./scripts/hoist-internals.js", - "bootstrap:docs": "cd docs && yarn 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", @@ -23,7 +30,7 @@ "docs:deploy:manual": "cd docs && npm run deploy:manual", "docs:dev": "cd docs && npm run dev", "github-release": "github-release-from-changelog", - "lint": "npm run lint:js . && npm run lint:md .", + "lint": "yarn lint:js . && yarn lint:md .", "lint:js": "eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.json", "lint:md": "remark", "publish": "lerna publish", @@ -80,7 +87,8 @@ "symlink-dir": "^1.1.0" }, "engines": { - "node": ">=8.0.0" + "node": ">=8.0.0", + "yarn": ">=1.0.0" }, "collective": { "type": "opencollective", @@ -89,11 +97,11 @@ "lint-staged": { "linters": { "*.js": [ - "npm run lint:js -- --fix", + "yarn lint:js --fix", "git add" ], "*.json": [ - "npm run lint:js -- --fix", + "yarn lint:js --fix", "git add" ], "*.md": [ diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 4ffd11ba0655..b4f86563f31d 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -18,11 +18,17 @@ log.heading = 'storybook'; const prefix = 'bootstrap'; log.addLevel('aborted', 3001, { fg: 'red', bold: true }); -const spawn = command => { - const out = childProcess.spawnSync(`${command}`, { - shell: true, - stdio: 'inherit', - }); +const spawn = (command, options = {}) => { + const out = childProcess.spawnSync( + `${command}`, + Object.assign( + { + shell: true, + stdio: 'inherit', + }, + options + ) + ); if (out.status !== 0) { process.exit(out.status); @@ -56,7 +62,7 @@ const createTask = ({ defaultValue, option, name, check = () => true, command, p const tasks = { reset: createTask({ - name: `Clean and re-install root dependencies ${chalk.red('(reset)')}`, + name: `Clean and re-install dependencies ${chalk.red('(reset)')}`, defaultValue: false, option: '--reset', command: () => { @@ -71,7 +77,10 @@ const tasks = { defaultValue: true, option: '--core', command: () => { - spawn('yarn bootstrap:core'); + log.info(prefix, 'yarn workspace'); + spawn('yarn install'); + log.info(prefix, 'prepare'); + spawn('lerna run prepare -- --silent'); }, }), docs: createTask({ diff --git a/scripts/hoist-internals.js b/scripts/hoist-internals.js index d943fb84ee1f..12fe6fa16197 100755 --- a/scripts/hoist-internals.js +++ b/scripts/hoist-internals.js @@ -15,7 +15,7 @@ log.addLevel('success', 3001, { fg: 'green', bold: true }); log.info(prefix, 'Hoisting internal packages'); const getLernaPackages = () => - fse.readJson(path.join(__dirname, '..', 'lerna.json')).then(json => json.packages); + fse.readJson(path.join(__dirname, '..', 'package.json')).then(json => json.workspaces); const passingLog = fn => i => { fn(i); return i; diff --git a/scripts/prepublish.js b/scripts/prepare.js similarity index 53% rename from scripts/prepublish.js rename to scripts/prepare.js index d13952b9e4c1..5884489540e9 100644 --- a/scripts/prepublish.js +++ b/scripts/prepare.js @@ -1,12 +1,12 @@ const path = require('path'); const shell = require('shelljs'); const chalk = require('chalk'); +const log = require('npmlog'); -const packageJson = require('../package.json'); +const modulePath = path.resolve('./'); +// eslint-disable-next-line import/no-dynamic-require +const packageJson = require(path.join(modulePath, 'package.json')); -shell.echo(chalk.bold(`${packageJson.name}@${packageJson.version}`)); - -shell.echo(chalk.gray('\n=> Clean dist.')); shell.rm('-rf', 'dist'); const babel = path.join(__dirname, '..', 'node_modules', '.bin', 'babel'); @@ -18,16 +18,14 @@ const args = [ ].join(' '); const command = `${babel} ${args}`; -shell.echo(chalk.gray('\n=> Transpiling "src" into ES5 ...\n')); -shell.echo(chalk.gray(command)); -shell.echo(''); -const code = shell.exec(command).code; -if (code === 0) { - shell.echo(chalk.gray('\n=> Transpiling completed.')); -} else { +const code = shell.exec(command, { silent: true }).code; + +if (code !== 0) { + log.error(`FAILED: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`); shell.exit(code); } const licence = path.join(__dirname, '..', 'LICENSE'); -shell.echo(chalk.gray('\n=> Copy LICENSE.')); shell.cp(licence, './'); + +console.log(chalk.gray(`Built: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`)); diff --git a/yarn.lock b/yarn.lock index aa9249a94275..5e3cf85a0e56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -35,8 +35,8 @@ "@types/node" "*" "@types/node@*", "@types/node@^8.0.0": - version "8.0.25" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.25.tgz#66ecaf4df93f5281b48427ee96fbcdfc4f0cdce1" + version "8.0.27" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.27.tgz#13fbe7e92afeecebb843d7cea6c15b521e0000e1" "@types/node@^7.0.12": version "7.0.43" @@ -46,7 +46,7 @@ version "16.0.5" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.5.tgz#d713cf67cc211dea20463d2a0b66005c22070c4b" -"@types/react@^15.0.21", "@types/react@^15.0.22": +"@types/react@^15.0.21", "@types/react@^15.0.22", "@types/react@^15.0.24": version "15.6.2" resolved "https://registry.yarnpkg.com/@types/react/-/react-15.6.2.tgz#2c8495aa853cb37591d0046e9afe544fb837c612" @@ -109,14 +109,10 @@ acorn@^4.0.3, acorn@^4.0.4: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.0: +acorn@^5.0.0, acorn@^5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.2.tgz#911cb53e036807cf0fa778dc5d370fbd864246d7" -acorn@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75" - add-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" @@ -501,14 +497,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^7.1.1: - version "7.1.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.3.tgz#0e8d337976d6f13644db9f8813b4c42f3d1ccc34" + version "7.1.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.4.tgz#960847dbaa4016bc8e8e52ec891cbf8f1257a748" dependencies: browserslist "^2.4.0" - caniuse-lite "^1.0.30000718" + caniuse-lite "^1.0.30000726" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.10" + postcss "^6.0.11" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -1908,7 +1904,7 @@ babylon@^5.8.38, babylon@~5.8.3: version "5.8.38" resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd" -babylon@^6.11.0, babylon@^6.14.1, babylon@^6.17.0, babylon@^6.17.3, babylon@^6.17.4, babylon@^6.18.0: +babylon@^6.11.0, babylon@^6.14.1, babylon@^6.17.0, babylon@^6.17.3, babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" @@ -2282,7 +2278,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000726" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7" -caniuse-lite@^1.0.30000669, caniuse-lite@^1.0.30000718: +caniuse-lite@^1.0.30000669, caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726: version "1.0.30000726" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000726.tgz#966a753fa107a09d4131cf8b3d616723a06ccf7e" @@ -2408,8 +2404,8 @@ chokidar@^1.5.1, chokidar@^1.6.0, chokidar@^1.6.1, chokidar@^1.7.0: fsevents "^1.0.0" ci-info@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534" + version "1.1.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.1.tgz#47b44df118c48d2597b56d342e7e25791060171a" cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" @@ -2801,48 +2797,46 @@ content-type@~1.0.1, content-type@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed" -conventional-changelog-angular@^1.3.4: - version "1.4.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.4.0.tgz#118b9f7d41a3d99500bfb6bea1f3525e055e8b9b" +conventional-changelog-angular@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.5.0.tgz#50b2d45008448455fdf67e06ea01972fbd08182a" dependencies: compare-func "^1.3.1" - github-url-from-git "^1.4.0" q "^1.4.1" - read-pkg-up "^2.0.0" -conventional-changelog-atom@^0.1.0: +conventional-changelog-atom@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.1.1.tgz#d40a9b297961b53c745e5d1718fd1a3379f6a92f" dependencies: q "^1.4.1" conventional-changelog-cli@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.2.tgz#33abf2b5720a9b094df38e81741ccb502e1a4125" + version "1.3.3" + resolved "https://registry.yarnpkg.com/conventional-changelog-cli/-/conventional-changelog-cli-1.3.3.tgz#ca38f229a27ec14036021b1786a48f5b8d48d7ff" dependencies: add-stream "^1.0.0" - conventional-changelog "^1.1.4" + conventional-changelog "^1.1.5" lodash "^4.1.0" meow "^3.7.0" tempfile "^1.1.1" -conventional-changelog-codemirror@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.1.0.tgz#7577a591dbf9b538e7a150a7ee62f65a2872b334" +conventional-changelog-codemirror@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.2.0.tgz#3cc925955f3b14402827b15168049821972d9459" dependencies: q "^1.4.1" -conventional-changelog-core@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.0.tgz#de5dfbc091847656508d4a389e35c9a1bc49e7f4" +conventional-changelog-core@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-1.9.1.tgz#ddf767c405850dfc8df31726c80fa1a6a10bdc7b" dependencies: - conventional-changelog-writer "^1.1.0" - conventional-commits-parser "^1.0.0" + conventional-changelog-writer "^2.0.1" + conventional-commits-parser "^2.0.0" dateformat "^1.0.12" get-pkg-repo "^1.0.0" git-raw-commits "^1.2.0" git-remote-origin-url "^2.0.0" - git-semver-tags "^1.2.0" + git-semver-tags "^1.2.1" lodash "^4.0.0" normalize-package-data "^2.3.5" q "^1.4.1" @@ -2850,21 +2844,21 @@ conventional-changelog-core@^1.9.0: read-pkg-up "^1.0.1" through2 "^2.0.0" -conventional-changelog-ember@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.6.tgz#8b7355419f5127493c4c562473ab2fc792f1c2b6" +conventional-changelog-ember@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.2.7.tgz#c6aff35976284e7222649f81c62bd96ff3217bd2" dependencies: q "^1.4.1" -conventional-changelog-eslint@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.1.0.tgz#a52411e999e0501ce500b856b0a643d0330907e2" +conventional-changelog-eslint@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-0.2.0.tgz#b4b9b5dc09417844d87c7bcfb16bdcc686c4b1c1" dependencies: q "^1.4.1" -conventional-changelog-express@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.1.0.tgz#55c6c841c811962036c037bdbd964a54ae310fce" +conventional-changelog-express@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.2.0.tgz#8d666ad41b10ebf964a4602062ddd2e00deb518d" dependencies: q "^1.4.1" @@ -2880,16 +2874,16 @@ conventional-changelog-jscs@^0.1.0: dependencies: q "^1.4.1" -conventional-changelog-jshint@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.1.0.tgz#00cab8e9a3317487abd94c4d84671342918d2a07" +conventional-changelog-jshint@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.2.0.tgz#63ad7aec66cd1ae559bafe80348c4657a6eb1872" dependencies: compare-func "^1.3.1" q "^1.4.1" -conventional-changelog-writer@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-1.4.1.tgz#3f4cb4d003ebb56989d30d345893b52a43639c8e" +conventional-changelog-writer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-2.0.1.tgz#47c10d0faba526b78d194389d1e931d09ee62372" dependencies: compare-func "^1.3.1" conventional-commits-filter "^1.0.0" @@ -2902,20 +2896,20 @@ conventional-changelog-writer@^1.1.0: split "^1.0.0" through2 "^2.0.0" -conventional-changelog@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.4.tgz#108bc750c2a317e200e2f9b413caaa1f8c7efa3b" - dependencies: - conventional-changelog-angular "^1.3.4" - conventional-changelog-atom "^0.1.0" - conventional-changelog-codemirror "^0.1.0" - conventional-changelog-core "^1.9.0" - conventional-changelog-ember "^0.2.6" - conventional-changelog-eslint "^0.1.0" - conventional-changelog-express "^0.1.0" +conventional-changelog@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.5.tgz#4c46fb64b2986cab19888d8c4b87ca7c0e431bfd" + dependencies: + conventional-changelog-angular "^1.5.0" + conventional-changelog-atom "^0.1.1" + conventional-changelog-codemirror "^0.2.0" + conventional-changelog-core "^1.9.1" + conventional-changelog-ember "^0.2.7" + conventional-changelog-eslint "^0.2.0" + conventional-changelog-express "^0.2.0" conventional-changelog-jquery "^0.1.0" conventional-changelog-jscs "^0.1.0" - conventional-changelog-jshint "^0.1.0" + conventional-changelog-jshint "^0.2.0" conventional-commits-filter@^1.0.0: version "1.0.0" @@ -2924,18 +2918,6 @@ conventional-commits-filter@^1.0.0: is-subset "^0.1.1" modify-values "^1.0.0" -conventional-commits-parser@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-1.3.0.tgz#e327b53194e1a7ad5dc63479ee9099a52b024865" - dependencies: - JSONStream "^1.0.4" - is-text-path "^1.0.0" - lodash "^4.2.1" - meow "^3.3.0" - split2 "^2.0.0" - through2 "^2.0.0" - trim-off-newlines "^1.0.0" - conventional-commits-parser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.0.0.tgz#71d01910cb0a99aeb20c144e50f81f4df3178447" @@ -2987,14 +2969,10 @@ core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" -core-js@^2.2.2, core-js@^2.4.1: +core-js@^2.2.2, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: version "2.5.1" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b" -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.0.tgz#569c050918be6486b3837552028ae0466b717086" - core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -3347,6 +3325,12 @@ debug@2, debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0, debug@^2.6.3, de dependencies: ms "2.0.0" +debug@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" + dependencies: + ms "2.0.0" + debug@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" @@ -3515,8 +3499,8 @@ detective@^4.3.1: defined "^1.0.0" diff@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9" + version "3.3.1" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75" diffie-hellman@^5.0.0: version "5.0.2" @@ -3691,13 +3675,9 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.2.7: - version "1.3.20" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.20.tgz#2eedd5ccbae7ddc557f68ad1fce9c172e915e4e5" - -electron-to-chromium@^1.3.18: - version "1.3.18" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz#3dcc99da3e6b665f6abbc71c28ad51a2cd731a9c" +electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.18: + version "1.3.21" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.21.tgz#a967ebdcfe8ed0083fc244d1894022a8e8113ea2" elegant-spinner@^1.0.1: version "1.0.1" @@ -3806,7 +3786,7 @@ errorhandler@~1.4.2: accepts "~1.3.0" escape-html "~1.0.3" -es-abstract@^1.4.3, es-abstract@^1.5.1: +es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0: version "1.8.2" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.2.tgz#25103263dc4decbda60e0c737ca32313518027ee" dependencies: @@ -3816,16 +3796,6 @@ es-abstract@^1.4.3, es-abstract@^1.5.1: is-callable "^1.1.3" is-regex "^1.0.4" -es-abstract@^1.6.1, es-abstract@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.8.0.tgz#3b00385e85729932beffa9163bbea1234e932914" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.0" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - es-to-primitive@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" @@ -3835,8 +3805,8 @@ es-to-primitive@^1.1.1: is-symbol "^1.0.1" es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.29" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.29.tgz#768eb2dfc4957bcf35fa0568f193ab71ede53fd8" + version "0.10.30" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.30.tgz#7141a16836697dbabfaaaeee41495ce29f52c939" dependencies: es6-iterator "2" es6-symbol "~3.1" @@ -4764,14 +4734,14 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@1.0.17, fsevents@^1.0.0: +fsevents@1.0.17: version "1.0.17" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558" dependencies: nan "^2.3.0" node-pre-gyp "^0.6.29" -fsevents@^1.1.1: +fsevents@^1.0.0, fsevents@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" dependencies: @@ -4795,11 +4765,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: mkdirp ">=0.5 0" rimraf "2" -function-bind@^1.0.2, function-bind@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" - -function-bind@^1.1.1: +function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4925,7 +4891,7 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^1.2.0, git-semver-tags@^1.2.1: +git-semver-tags@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.2.1.tgz#6ccd2a52e735b736748dc762444fcd9588e27490" dependencies: @@ -4964,11 +4930,16 @@ github-slugger@^1.0.0, github-slugger@^1.1.1: dependencies: emoji-regex ">=6.0.0 <=6.1.1" -github-url-from-git@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/github-url-from-git/-/github-url-from-git-1.5.0.tgz#f985fedcc0a9aa579dc88d7aff068d55cc6251a0" +github@^10.0.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/github/-/github-10.1.0.tgz#cfa4ebaccfa67635032d7e6e578bb75ed2b2bd96" + dependencies: + follow-redirects "0.0.7" + https-proxy-agent "^1.0.0" + mime "^1.2.11" + netrc "^0.1.4" -github@^9.0.0, github@^9.2.0: +github@^9.2.0: version "9.3.1" resolved "https://registry.yarnpkg.com/github/-/github-9.3.1.tgz#6a3c5a9cc2a1cd0b5d097a47baefb9d11caef89e" dependencies: @@ -5172,13 +5143,13 @@ graphqlify@^1.0.0: resolved "https://registry.yarnpkg.com/graphqlify/-/graphqlify-1.1.0.tgz#1d1d81e37b209fc09742fe48da3ac4763e20ddc7" grizzly@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/grizzly/-/grizzly-2.1.3.tgz#8ead92804b1ede275d56e0a34148bcea3dedd8a3" + version "2.1.4" + resolved "https://registry.yarnpkg.com/grizzly/-/grizzly-2.1.4.tgz#6085d987c90e49f6bea8fba642a61470e0812ad2" dependencies: checkup "^1.3.0" - debug "^2.2.0" + debug "^3.0.0" execon "^1.2.0" - github "^9.0.0" + github "^10.0.0" minimist "^1.2.0" os-homedir "^1.0.0" readjson "^1.1.0" @@ -5553,8 +5524,8 @@ ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" ignore@^3.2.0, ignore@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.3.tgz#432352e57accd87ab3110e82d3fea0e47812156d" + version "3.3.5" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.5.tgz#c4e715455f6073a8d7e5dae72d2fc9d71663dba6" image-size@^0.3.5: version "0.3.5" @@ -6093,17 +6064,17 @@ isstream@~0.1.2: resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" istanbul-api@^1.1.1: - version "1.1.12" - resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.12.tgz#92d67e9d8f9ea87349a64a70ddf5a7a8cdf97f21" + version "1.1.14" + resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.14.tgz#25bc5701f7c680c0ffff913de46e3619a3a6e680" dependencies: async "^2.1.4" fileset "^2.0.2" istanbul-lib-coverage "^1.1.1" istanbul-lib-hook "^1.0.7" - istanbul-lib-instrument "^1.7.5" + istanbul-lib-instrument "^1.8.0" istanbul-lib-report "^1.1.1" istanbul-lib-source-maps "^1.2.1" - istanbul-reports "^1.1.1" + istanbul-reports "^1.1.2" js-yaml "^3.7.0" mkdirp "^0.5.1" once "^1.4.0" @@ -6118,15 +6089,15 @@ istanbul-lib-hook@^1.0.7: dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.2, istanbul-lib-instrument@^1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.5.tgz#adb596f8f0cb8b95e739206351a38a586af21b1e" +istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.2, istanbul-lib-instrument@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz#66f6c9421cc9ec4704f76f2db084ba9078a2b532" dependencies: babel-generator "^6.18.0" babel-template "^6.16.0" babel-traverse "^6.18.0" babel-types "^6.18.0" - babylon "^6.17.4" + babylon "^6.18.0" istanbul-lib-coverage "^1.1.1" semver "^5.3.0" @@ -6149,9 +6120,9 @@ istanbul-lib-source-maps@^1.1.0, istanbul-lib-source-maps@^1.2.1: rimraf "^2.6.1" source-map "^0.5.3" -istanbul-reports@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.1.tgz#042be5c89e175bc3f86523caab29c014e77fee4e" +istanbul-reports@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.2.tgz#0fb2e3f6aa9922bd3ce45d05d8ab4d5e8e07bd4f" dependencies: handlebars "^4.0.3" @@ -6613,6 +6584,12 @@ jest@20.0.3: dependencies: jest-cli "^20.0.3" +jest@^20.0.4: + version "20.0.4" + resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac" + dependencies: + jest-cli "^20.0.4" + jest@^21.0.1: version "21.0.1" resolved "https://registry.yarnpkg.com/jest/-/jest-21.0.1.tgz#746cddc89477beaea5b208e7017ca26652bfdb38" @@ -6817,8 +6794,8 @@ jsx-ast-utils@^1.3.4, jsx-ast-utils@^1.4.0: resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" jsx-ast-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.0.tgz#ec06a3d60cf307e5e119dac7bad81e89f096f0f8" + version "2.0.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f" dependencies: array-includes "^3.0.3" @@ -6931,8 +6908,8 @@ levn@^0.3.0, levn@~0.3.0: type-check "~0.3.2" lint-staged@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.1.2.tgz#d49caa518032eba51a45a5ce9a13d8641c0cf0c0" + version "4.1.3" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-4.1.3.tgz#07c592e4b8dee914450a183c761187dc53d079e2" dependencies: app-root-path "^2.0.0" chalk "^2.1.0" @@ -6942,6 +6919,7 @@ lint-staged@^4.1.2: jest-validate "^20.0.3" listr "^0.12.0" lodash "^4.17.4" + log-symbols "^2.0.0" minimatch "^3.0.0" npm-which "^3.0.1" p-map "^1.1.1" @@ -7366,6 +7344,12 @@ log-symbols@^1.0.2: dependencies: chalk "^1.0.0" +log-symbols@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.0.0.tgz#595e63be4d5c8cbf294a9e09e0d5629f5913fc0c" + dependencies: + chalk "^2.0.1" + log-update@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/log-update/-/log-update-1.0.2.tgz#19929f64c4093d2d2e7075a1dad8af59c296b8d1" @@ -7612,23 +7596,13 @@ mime-db@~1.23.0: version "1.23.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.23.0.tgz#a31b4070adaea27d732ea333740a64d0ec9a6659" -mime-db@~1.29.0: - version "1.29.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878" - -mime-types@2.1.11, mime-types@~2.1.7: +mime-types@2.1.11: version "2.1.11" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.11.tgz#c259c471bda808a85d6cd193b430a5fae4473b3c" dependencies: mime-db "~1.23.0" -mime-types@^2.1.12: - version "2.1.16" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.16.tgz#2b858a52e5ecd516db897ac2be87487830698e23" - dependencies: - mime-db "~1.29.0" - -mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.6, mime-types@~2.1.9: +mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16, mime-types@~2.1.6, mime-types@~2.1.7, mime-types@~2.1.9: version "2.1.17" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" dependencies: @@ -7638,11 +7612,11 @@ mime@1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" -mime@1.3.x, mime@^1.2.11: +mime@1.3.x: version "1.3.6" resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0" -mime@^1.3.4: +mime@^1.2.11, mime@^1.3.4: version "1.4.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.0.tgz#69e9e0db51d44f2a3b56e48b7817d7d137f1a343" @@ -7781,8 +7755,8 @@ mz@^2.4.0: thenify-all "^1.0.0" nan@^2.3.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45" + version "2.7.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" natural-compare@^1.4.0: version "1.4.0" @@ -8335,8 +8309,8 @@ parse-entities@^1.0.2: is-hexadecimal "^1.0.0" parse-github-repo-url@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.0.tgz#286c53e2c9962e0641649ee3ac9508fca4dd959c" + version "1.4.1" + resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50" parse-glob@^3.0.4: version "3.0.4" @@ -8850,7 +8824,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.10, postcss@^6.0.2, postcss@^6.x: +postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.2, postcss@^6.x: version "6.0.11" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.11.tgz#f48db210b1d37a7f7ab6499b7a54982997ab6f72" dependencies: @@ -9774,11 +9748,10 @@ regenerator@0.8.40: through "~2.3.8" regex-cache@^0.4.2: - version "0.4.3" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" + version "0.4.4" + resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" dependencies: is-equal-shallow "^0.1.3" - is-primitive "^2.0.0" regexpu-core@^1.0.0: version "1.0.0" @@ -10663,8 +10636,8 @@ source-map-support@^0.2.10: source-map "0.1.32" source-map-support@^0.4.15: - version "0.4.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.16.tgz#16fecf98212467d017d586a2af68d628b9421cd8" + version "0.4.17" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.17.tgz#6f2150553e6375375d0ccb3180502b78c18ba430" dependencies: source-map "^0.5.6" @@ -10990,13 +10963,7 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co dependencies: has-flag "^1.0.0" -supports-color@^4.0.0, supports-color@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836" - dependencies: - has-flag "^2.0.0" - -supports-color@^4.2.1, supports-color@^4.4.0: +supports-color@^4.0.0, supports-color@^4.1.0, supports-color@^4.2.1, supports-color@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.4.0.tgz#883f7ddabc165142b2a61427f3352ded195d1a3e" dependencies: @@ -11160,8 +11127,8 @@ test-exclude@^4.1.1: require-main-filename "^1.0.1" text-extensions@^1.0.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.5.0.tgz#d1cb2d14b5d0bc45bfdca8a08a473f68c7eb0cbc" + version "1.6.0" + resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.6.0.tgz#771561b26022783a45f5b6c2e78ad6e7de9fe322" text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" @@ -11449,8 +11416,8 @@ unified-args@^4.0.0: unified-engine "^4.0.0" unified-engine@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-4.0.0.tgz#507ff99115c861ba507d9bdc8825b298840752a4" + version "4.0.1" + resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-4.0.1.tgz#9692aa97fd5c4ec36889779e12514bef8e863fc3" dependencies: concat-stream "^1.5.1" debug "^2.2.0" @@ -11932,8 +11899,8 @@ webpack-dev-server@^2.4.5: yargs "^6.0.0" webpack-hot-middleware@^2.18.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.19.0.tgz#7ab2607159496ff3f3314dda491cd96d8f2d5124" + version "2.19.1" + resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.19.1.tgz#5db32c31c955c1ead114d37c7519ea554da0d405" dependencies: ansi-html "0.0.7" html-entities "^1.2.0"