Merge branch 'canary'

# Conflicts:
#	examples/with-apollo-and-redux/README.md
#	examples/with-sentry/README.md
#	examples/with-sentry/package.json
#	examples/with-sentry/pages/_app.js
#	package.json
#	packages/next/build/webpack-config.js
#	packages/next/client/index.js
#	server/document.js
#	server/render.js
#	test/integration/production/test/index.test.js

.circleci/config.yml

@@ -6,5 +6,29 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - run: yarn install
-      - run: yarn test
+      - run:
+          name: Installing dependencies
+          command: yarn install
+      - run:
+          name: Bootstrapping
+          command: yarn bootstrap
+      - run:
+          name: Linting
+          command: yarn lint
+      - run:
+          name: Tests
+          command: yarn test
+      - run:
+          name: Potentially save npm token
+          command: "([[ ! -z $NPM_TOKEN ]] && echo \"//registry.npmjs.org/:_authToken=$NPM_TOKEN\" >> ~/.npmrc) || echo \"Did not write npm token\""
+      - run:
+          name: Potentially publish canary release
+          command: "if ls ~/.npmrc >/dev/null 2>&1 && [[ $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; then yarn run lerna publish from-git --npm-tag canary --yes; else  echo \"Did not publish\"; fi"
+      - run:
+          name: Potentially publish stable release
+          command: "if ls ~/.npmrc >/dev/null 2>&1 && [[ ! $(git describe --exact-match 2> /dev/null || :) =~ -canary ]]; then yarn run lerna publish from-git --yes; else  echo \"Did not publish\"; fi"
+workflows:
+  version: 2
+  build-and-deploy:
+    jobs:
+      - build

.gitignore

@@ -6,6 +6,7 @@ dist
 node_modules
 package-lock.json
 yarn.lock
+!/yarn.lock
 test/node_modules
 
 # logs & pids
@@ -19,3 +20,6 @@ coverage
 # test output
 test/**/out
 .DS_Store
+
+# Editors
+**/.idea

.npmrc

@@ -1 +1,2 @@
 save-exact = true
+tag-version-prefix=""

.travis.yml

@@ -8,7 +8,7 @@
     }
   },
   language: "node_js",
-  node_js: ["8"],
+  node_js: ["8", "10"],
   cache: {
     directories: ["node_modules"]
   },
@@ -20,17 +20,6 @@
   before_cache: [
     "rm -rf node_modules/.cache"
   ],
-  after_script: ["npm run coveralls"],
-  deploy: {
-    provider: "npm",
-    email: "[email protected]",
-    tag: "canary",
-    api_key: {
-      secure: "MJfpcAJC1IvPL01NiGRLYAAgb7TZz5K0ukM1n+E+QcoF9+L1gn4WcP056ECchuohEFSwvO/ZcTZM5yhpp10cd72RZykeat/YYgRXFyUDkD3up2FHr4hYdcv/tBHCkeUMJZwt1ZNH4xM69Y02KAmpRBWZGKe6qETlZqxUg79Gi1g6W5PdhbsKedTp2tJJzG58nevKsSRP01S97K7kDC5oJNwuO+cbLwtzX5cB6Rd8hGx6lMetWLzSmSS689N0flfm/R9pxY/WjgBBQ0iYZkosb1VO2NhJMnrHtdr/Wfrkvnz8KSO/KD2n7RrOnSzUQBJSNxx35kr7HU4pKreMxEiOnEbOog4HZmWsM0UyRlbYeREfXLBvIjlnYoWCblZdVbdIl4R7NflVBSeK2eDkZQt2iCqP0fHvJ7kyLQx9J2janlr+96dKSudalercfmV9aXtbCeweqim5l4AZywSggpZAvopE6uN6KtFafO0JM760flbQfDVEQWHrHGvZvu05NrzJvZa6CN47rDHbaO6IibMXakogVz+AIuTZ3t/2bynetkericV8MGdOrwb807DLWTdqNKCj2wTmHgDiX8n3FF7VisLS54mKFfuuzzALdWtlBPbwS+bZ0235/35rs2EUidC5eunryWp4Y150xWfCK2swxM9xR0iCE0KSXrsdGDGyrvE="
-    },
-    skip_cleanup: true,
-    on: {
-      tags: true
-    }
-  }
+  before_script: ["npm run bootstrap"],
+  after_script: ["npm run coveralls"]
 }