Yarn workspaces

.circleci/config.yml

@@ -10,45 +10,36 @@ 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-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
           command: |
-            curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
+            curl -o- -L https://yarnpkg.com/install.sh | bash -s
       - run:
           name: "Install root dependencies"
           command: |
             yarn install
       - save_cache:
-          key: root-dependencies-{{ checksum "package.json" }}
+          key: root-dependencies-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
       - restore_cache:
           keys:
-            - package-dependencies-{{ checksum "package.json" }}
+            - package-dependencies-{{ checksum "yarn.lock" }}
             - package-dependencies-
       - run:
           name: "Bootstrapping"
           command: |
-            yarn bootstrap --all
+            yarn bootstrap --core --docs --reactnative --reactnativeapp
       - save_cache:
-          key: package-dependencies-{{ checksum "package.json" }}
+          key: package-dependencies-{{ checksum "yarn.lock" }}
           paths:
             - app/**/node_modules
             - docs/**/node_modules
@@ -60,7 +51,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - root-dependencies-{{ checksum "package.json" }}
+            - root-dependencies-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
@@ -88,7 +79,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - root-dependencies-{{ checksum "package.json" }}
+            - root-dependencies-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
@@ -114,7 +105,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - root-dependencies-{{ checksum "package.json" }}
+            - root-dependencies-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
@@ -134,7 +125,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - root-dependencies-{{ checksum "package.json" }}
+            - root-dependencies-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
@@ -154,7 +145,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - root-dependencies-{{ checksum "package.json" }}
+            - root-dependencies-{{ checksum "yarn.lock" }}
             - root-dependencies-
       - run:
           name: "Install yarn 1.0.0-prerelease"
@@ -180,7 +171,6 @@ workflows:
   version: 2
   build_accept_deploy:
     jobs:
-      - validate
       - build
       - example-kitchen-sinks
       - example-react-native
@@ -192,4 +182,4 @@ workflows:
       #     requires:
       #       - lint
       #       - unit-test
-      #       - docs
+      #       - docs

package.json

@@ -15,7 +15,7 @@
   ],
   "scripts": {
     "bootstrap": "./scripts/bootstrap.js",
-    "bootstrap:core": "yarn install && lerna run prepublish && node ./scripts/hoist-internals.js",
+    "bootstrap:core": "lerna bootstrap -–use-workspaces",
     "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",
@@ -126,4 +126,4 @@
       "other": "Other"
     }
   }
-}
+}

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);
@@ -71,6 +77,9 @@ const tasks = {
     defaultValue: true,
     option: '--core',
     command: () => {
+      log.info(prefix, 'prepublish');
+      spawn('lerna run prepublish -- --silent');
+      log.info(prefix, 'yarn workspace');
       spawn('yarn bootstrap:core');
     },
   }),

scripts/prepublish.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}`)}`));