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,6 +2,8 @@ defaults: &defaults
   working_directory: /tmp/storybook
   docker:
     - image: node:8
+  environment:
+    BASH_ENV: ~/.bashrc
 
 version: 2
 dependencies:
@@ -25,6 +27,10 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root dependencies"
           command: |
@@ -40,7 +46,7 @@ jobs:
       - run:
           name: "Bootstrapping"
           command: |
-            yarn bootstrap -- --all
+            yarn bootstrap --all
       - save_cache:
           key: package-dependencies-{{ checksum "package.json" }}
           paths:
@@ -56,26 +62,30 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root 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:
@@ -84,24 +94,28 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root 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:
@@ -110,14 +124,18 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root dependencies"
           command: |
             yarn install
       - run:
           name: "Bootstrapping"
           command: |
-            yarn bootstrap -- --docs
+            yarn bootstrap --docs
       - run:
           name: "Running docs"
           command: |
@@ -130,6 +148,10 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root dependencies"
           command: |
@@ -146,18 +168,22 @@ jobs:
           keys:
             - root-dependencies-{{ checksum "package.json" }}
             - root-dependencies-
+      - run:
+          name: "Install yarn 1.0.0-prerelease"
+          command: |
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
       - run:
           name: "Install root 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

diff --git a/app/react/bin/build.js 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
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/server');
diff --git a/app/react/package.json b/app/react/package.json
@@ -9,16 +9,16 @@
   "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'",
+    "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepublish'",
     "prepublish": "node ../../scripts/prepublish.js"
   },
   "dependencies": {

diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../dist/server');
diff --git a/app/vue/package.json b/app/vue/package.json
@@ -9,16 +9,16 @@
   "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'",
+    "dev": "DEV_BUILD=1 nodemon --watch ./src --exec 'yarn prepublish'",
     "prepublish": "node ../../scripts/prepublish.js"
   },
   "dependencies": {

diff --git 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
@@ -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/yarn.lock b/docs/yarn.lock
@@ -481,7 +481,7 @@ [email protected]:
   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
@@ -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"
+        "crna-kitchen-sink"
       ]
     }
   },
-  "packages": [
-    "addons/*",
-    "app/*",
-    "lib/*",
-    "examples/*"
-  ],
   "concurrency": 1,
   "version": "3.3.0-alpha.0"
 }
diff --git a/package.json b/package.json
@@ -1,14 +1,22 @@
 {
+  "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:core": "yarn install && lerna run prepublish && node ./scripts/hoist-internals.js",
+    "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 +31,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 +88,8 @@
     "symlink-dir": "^1.1.0"
   },
   "engines": {
-    "node": "node"
+    "node": "^8.0.0",
+    "yarn": "^1.0.0-0"
   },
   "collective": {
     "type": "opencollective",
@@ -89,11 +98,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/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/yarn.lock b/yarn.lock
@@ -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"
 
@@ -6613,6 +6613,12 @@ [email protected]:
   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"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env node

		require('../dist/server/build');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env node

		require('../dist/server');