chore: use yarn workspaces

.yarnrc

@@ -0,0 +1 @@
+workspaces-experimental true

circle.yml

@@ -17,7 +17,6 @@ dependencies:
       - sudo apt-get update && sudo apt-get install libzmq3-dev rethinkdb
       # install node dependencies
       - yarn install
-      - yarn run prepare
 
 test:
   pre:

lerna.json

@@ -1,7 +1,8 @@
 {
-  "lerna": "2.0.0-rc.4",
+  "lerna": "2.0.0",
   "version": "independent",
   "npmClient": "yarn",
+  "useWorkspaces": true,
   "hoist": true,
   "nohoist": [
     "graphi",
@@ -10,8 +11,5 @@
     "jest-cli",
     "react-scripts",
     "react-styleguidist"
-  ],
-  "packages": [
-    "packages/*"
   ]
 }

package.json

@@ -29,7 +29,7 @@
     "dev:gql-mock-server": "lerna run dev --scope joyent-cp-gql-mock-server",
     "commitmsg": "conventional-changelog-lint -e",
     "precommit": "cross-env CI=1 redrun -s lint-staged format-staged test-staged",
-    "prepare": "redrun -s clean bootstrap"
+    "postinstall": "lerna run postinstall"
   },
   "devDependencies": {
     "apr-awaitify": "^1.0.4",
@@ -66,7 +66,7 @@
     "force-array": "^3.1.0",
     "husky": "^0.13.4",
     "inquirer": "^3.1.0",
-    "lerna": "^2.0.0-rc.5",
+    "lerna": "^2.0.0",
     "lerna-wizard": "ramitos/lerna-wizard#7bcdc11",
     "license-to-fail": "^2.2.0",
     "lodash.flatten": "^4.4.0",
@@ -88,5 +88,8 @@
       "portal-api",
       "control-tower"
     ]
-  }
+  },
+  "workspaces": [
+    "packages/*"
+  ]
 }

packages/babel-preset/package.json

@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/babel-preset-joyent-portal.xml",
     "test": "echo 0",
-    "test-ci": "echo 0"
+    "test-ci": "echo 0",
+    "postinstall": "echo 0"
   },
   "dependencies": {
     "babel-preset-react-app": "^3.0.0"

packages/cloudapi-gql/package.json

@@ -10,7 +10,8 @@
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cloudapi-gql.xml",
     "test": "echo 0",
     "test-ci": "echo 0",
-    "start": "node src/index.js"
+    "start": "node src/index.js",
+    "postinstall": "echo 0"
   },
   "dependencies": {
     "bunyan": "^1.8.10",

packages/cp-frontend/Dockerfile

@@ -6,7 +6,7 @@ ENV CONTAINERPILOT /etc/containerpilot.json5
 
 RUN npm install -g npm@^4
 RUN npm config set loglevel info \
-	&& yarn add lerna@^2.0.0-rc.5
+	&& yarn add lerna@^2.0.0
 
 RUN ./node_modules/.bin/lerna clean --yes --scope joyent-cp-frontend --include-filtered-dependencies \
 	&& ./node_modules/.bin/lerna bootstrap --scope joyent-cp-frontend --include-filtered-dependencies

packages/cp-frontend/scripts/postinstall.js

@@ -3,7 +3,7 @@ const main = require('apr-main');
 const forEach = require('apr-for-each');
 const path = require('path');
 
-const ROOT = path.join(__dirname, '../node_modules/react-scripts/config');
+const ROOT = path.join(__dirname, '../../../node_modules/react-scripts/config');
 const configs = ['webpack.config.dev', 'webpack.config.prod'];
 
 const toCopy = [

packages/cp-gql-mock-server/Dockerfile

@@ -4,7 +4,7 @@ ENV CONTAINERPILOT /etc/containerpilot.json5
 
 RUN npm install -g npm@^4 \
  && npm config set loglevel info \
- && yarn add lerna@^2.0.0-rc.5 serve \
+ && yarn add lerna@^2.0.0 serve \
  && ./node_modules/.bin/lerna clean --yes --scope joyent-cp-gql-mock-server --include-filtered-dependencies \
  && ./node_modules/.bin/lerna bootstrap --scope joyent-cp-gql-mock-server --include-filtered-dependencies
 

packages/cp-gql-mock-server/package.json

@@ -11,7 +11,8 @@
     "test": "nyc --reporter=lcov --reporter=text ava --verbose",
     "test-ci": "echo 0 `# nyc --report-dir=$CIRCLE_ARTIFACTS/cp-gql-mock-server --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/cp-gql-mock-server.xml`",
     "start": "node src/index.js",
-    "dev": "PORT=3000 nodemon src/index.js"
+    "dev": "PORT=3000 nodemon src/index.js",
+    "postinstall": "echo 0"
   },
   "dependencies": {
     "build-array": "^1.0.0",

packages/cp-gql-schema/package.json

@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-gql-schema.xml",
     "test": "echo 0",
-    "test-ci": "echo 0"
+    "test-ci": "echo 0",
+    "postinstall": "echo 0"
   },
   "dependencies": {},
   "devDependencies": {

packages/cp-rdb-bootstrap/package.json

@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-rdb-bootstrap.xml",
     "test": "echo 0",
-    "test-ci": "echo 0"
+    "test-ci": "echo 0",
+    "postinstall": "echo 0"
   },
   "devDependencies": {
     "eslint": "^3.19.0",

packages/docker-compose-client/package.json

@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/docker-compose-client.xml",
     "test": "lab -t 100",
-    "test-ci": "lab -t 100 -r console -o stdout -r tap -o $CIRCLE_TEST_REPORTS/test/docker-compose-client.xml"
+    "test-ci": "lab -t 100 -r console -o stdout -r tap -o $CIRCLE_TEST_REPORTS/test/docker-compose-client.xml",
+    "postinstall": "echo 0"
   },
   "dependencies": {
     "zerorpc": "^0.9.7"

packages/eslint-config/package.json

@@ -8,7 +8,8 @@
     "lint": "eslint . --fix",
     "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/eslint-config-joyent-portal.xml",
     "test": "echo 0",
-    "test-ci": "echo 0"
+    "test-ci": "echo 0",
+    "postinstall": "echo 0"
   },
   "devDependencies": {
     "babel-eslint": "^7.2.3",

packages/manifest-editor/package.json

@@ -19,6 +19,7 @@
     "test": "echo 0 `# bup && NODE_ENV=test jest --coverage`",
     "test-ci": "echo 0 `# NODE_ENV=test JEST_JUNIT_OUTPUT=$CIRCLE_TEST_REPORTS/test/manifest-editor.xml jest --coverage --coverageDirectory=$CIRCLE_ARTIFACTS/manifest-editor --testResultsProcessor=$(node -e \"console.log(require.resolve('jest-junit'))\")`",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "redrun build"
   },
   "dependencies": {

packages/normalized-styled-components/package.json

@@ -27,6 +27,7 @@
     "test": "bup && NODE_ENV=test jest --coverage",
     "test-ci": "NODE_ENV=test JEST_JUNIT_OUTPUT=$CIRCLE_TEST_REPORTS/test/normalized-styled-components.xml jest --coverage --coverageDirectory=$CIRCLE_ARTIFACTS/normalized-styled-components --testResultsProcessor=$(node -e \"console.log(require.resolve('jest-junit'))\")",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "redrun build"
   },
   "dependencies": {
@@ -63,11 +64,11 @@
   "jest": {
     "testEnvironment": "jsdom",
     "testRegex": "test/index.js",
-    "setupFiles": ["<rootDir>/node_modules/react-scripts/config/polyfills.js"],
+    "setupFiles": ["<rootDir>/../../node_modules/react-scripts/config/polyfills.js"],
     "testEnvironment": "node",
     "transform": {
-      "^.+\\.(js|jsx)$": "<rootDir>/node_modules/react-scripts/config/jest/babelTransform.js",
+      "^.+\\.(js|jsx)$": "<rootDir>/../../node_modules/react-scripts/config/jest/babelTransform.js",
-      "^(?!.*\\.(js|jsx|css|json)$)": "<rootDir>/node_modules/react-scripts/config/jest/fileTransform.js"
+      "^(?!.*\\.(js|jsx|css|json)$)": "<rootDir>/../../node_modules/react-scripts/config/jest/fileTransform.js"
     },
     "transformIgnorePatterns": ["[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"],
     "rootDir": "."

packages/portal-api/package.json

@@ -12,7 +12,8 @@
     "test": "lab -c",
     "test-ci": "echo 0",
     "start": "node server.js",
-    "dev": "CORS=1 NAMESPACE=api node server.js"
+    "dev": "CORS=1 NAMESPACE=api node server.js",
+    "postinstall": "echo 0"
   },
   "keywords": [],
   "author": "wyatt",

packages/pseudo-json-ast/package.json

@@ -27,6 +27,7 @@
     "test": "redrun -s build test:run",
     "test-ci": "redrun -s build test-ci:run",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "bup"
   },
   "dependencies": {

packages/pseudo-yaml-ast/package.json

@@ -29,6 +29,7 @@
     "test": "redrun build test:run",
     "test-ci": "redrun build test-ci:run",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "bup"
   },
   "dependencies": {

packages/remcalc/package.json

@@ -15,6 +15,7 @@
     "test": "bup && cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava",
     "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/remcalc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/remcalc.xml",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "bup"
   },
   "dependencies": {

packages/rnd-id/package.json

@@ -15,6 +15,7 @@
     "test": "bup && cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava",
     "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/rnd-id --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/rnd-id.xml",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "bup"
   },
   "dependencies": {

packages/rnd-id/test/index.js

@@ -1,6 +1,6 @@
 const test = require('ava');
 const uniq = require('lodash.uniq');
-const rndId = require('../');
+const rndId = require('../src');
 
 test('should generate strings', t => {
   t.truthy(

packages/styled-is/package.json

@@ -24,6 +24,7 @@
     "test": "redrun -s build test:run",
     "test-ci": "redrun -s build test-ci:run",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "redrun build"
   },
   "devDependencies": {

packages/ui-toolkit/Dockerfile

@@ -4,7 +4,7 @@ ENV CONTAINERPILOT /etc/containerpilot.json5
 
 RUN npm install -g npm@^4 \
  && npm config set loglevel info \
- && yarn add lerna@^2.0.0-rc.5 serve \
+ && yarn add lerna@^2.0.0 serve \
  && ./node_modules/.bin/lerna clean --yes --scope joyent-ui-toolkit --include-filtered-dependencies \
  && ./node_modules/.bin/lerna bootstrap --scope joyent-ui-toolkit --include-filtered-dependencies
 

packages/unitcalc/package.json

@@ -24,6 +24,7 @@
     "test": "bup && cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava",
     "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/unitcalc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/unitcalc.xml",
     "build": "bup",
+    "postinstall": "bup",
     "prepublish": "bup"
   },
   "dependencies": {