storybookjs · Hypnosphi · Sep 8, 2017 · Sep 6, 2017 · Sep 6, 2017 · Sep 6, 2017
diff --git 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
diff --git 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 `[email protected]` 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
@@ -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
@@ -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
@@ -6,7 +6,7 @@
   "author": "Muhammed Thanish <[email protected]>",
   "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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
     "storybook"
   ],
   "scripts": {
-    "prepublish": "node ../../scripts/prepublish.js"
+    "prepare": "node ../../scripts/prepare.js"
   },
   "license": "MIT",
   "dependencies": {