Merge branch 'next' into permalink

package.json

@@ -3,46 +3,53 @@
   "version": "5.0.0",
   "description": "A better commenting experience from Mozilla, The Washington Post, and The New York Times.",
   "scripts": {
-    "start": "node dist/index.js",
-    "test": "node scripts/test.js --env=jsdom",
     "build": "npm-run-all compile --parallel build:*",
     "build:client": "node ./scripts/build.js",
     "build:server": "tsc -p ./src/tsconfig.json",
-    "watch": "NODE_ENV=development ts-node ./scripts/watcher/bin/watcher.ts --config ./config/watcher.ts",
     "compile": "npm-run-all --parallel compile:*",
     "compile:css-types": "tcm src/core/client/",
-    "compile:relay-stream": "relay-compiler --src ./src/core/client/stream --schema $(ts-node ./scripts/schemaPath.ts tenant) --language typescript --artifactDirectory ./src/core/client/stream/__generated__ --no-watchman",
-    "start:development": "NODE_ENV=development ts-node --project ./src/tsconfig.json -r tsconfig-paths/register ./src/index.ts",
-    "start:webpackDevServer": "node ./scripts/start.js",
+    "compile:relay-stream": "ts-node ./scripts/compileRelay --src ./src/core/client/stream --schema tenant",
+    "compile:schema": "node ./scripts/generateSchemaTypes.js",
+    "docz": "docz",
     "lint-fix": "npm run lint:server -- --fix && npm run lint:client -- --fix && npm run lint:scripts -- --fix",
-    "lint": "npm-run-all --parallel lint:*",
-    "lint:server": "tslint --project ./src/tsconfig.json",
     "lint:client": "tslint --project ./src/core/client/tsconfig.json",
     "lint:scripts": "tslint --project ./tsconfig.json",
-    "docz": "docz"
+    "lint:server": "tslint --project ./src/tsconfig.json",
+    "lint": "npm-run-all --parallel lint:*",
+    "start:development": "cross-env NODE_ENV=development ts-node --project ./src/tsconfig.json -r tsconfig-paths/register ./src/index.ts",
+    "start:webpackDevServer": "node ./scripts/start.js",
+    "start": "node dist/index.js",
+    "test": "node scripts/test.js --env=jsdom",
+    "watch": "cross-env NODE_ENV=development ts-node ./scripts/watcher/bin/watcher.ts --config ./config/watcher.ts"
   },
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
     "apollo-server-express": "^1.3.6",
+    "bcryptjs": "^2.4.3",
     "bunyan": "^1.8.12",
     "convict": "^4.3.1",
     "dataloader": "^1.4.0",
-    "dotenv": "^6.0.0",
     "dotenv-expand": "^4.2.0",
+    "dotenv": "^6.0.0",
     "dotize": "^0.2.0",
-    "express": "^4.16.3",
     "express-static-gzip": "^0.3.2",
+    "express": "^4.16.3",
     "fs-extra": "^6.0.1",
-    "graphql": "^0.13.2",
     "graphql-config": "^2.0.1",
     "graphql-redis-subscriptions": "^1.5.0",
     "graphql-tools": "^3.0.5",
+    "graphql": "^0.13.2",
     "ioredis": "^3.2.2",
     "joi": "^13.4.0",
+    "jsonwebtoken": "^8.3.0",
+    "jwks-rsa": "^1.3.0",
     "lodash": "^4.17.10",
     "luxon": "^1.3.1",
     "mongodb": "^3.1.1",
+    "passport-local": "^1.0.0",
+    "passport-oauth2": "^1.4.0",
+    "passport-strategy": "^1.0.0",
     "passport": "^0.4.0",
     "performance-now": "^2.1.0",
     "subscriptions-transport-ws": "^0.9.12",
@@ -55,6 +62,7 @@
     "@babel/polyfill": "7.0.0-beta.49",
     "@babel/preset-env": "7.0.0-beta.49",
     "@babel/preset-react": "7.0.0-beta.49",
+    "@types/bcryptjs": "^2.4.1",
     "@types/bunyan": "^1.8.4",
     "@types/chokidar": "^1.7.5",
     "@types/classnames": "^2.2.4",
@@ -70,11 +78,15 @@
     "@types/jest": "^23.1.5",
     "@types/joi": "^13.0.8",
     "@types/jsdom": "^11.0.6",
+    "@types/jsonwebtoken": "^7.2.7",
     "@types/lodash": "^4.14.111",
     "@types/luxon": "^0.5.3",
     "@types/mongodb": "^3.1.1",
     "@types/node": "^10.5.2",
-    "@types/passport": "^0.4.5",
+    "@types/passport": "^0.4.6",
+    "@types/passport-local": "^1.0.33",
+    "@types/passport-oauth2": "^1.4.5",
+    "@types/passport-strategy": "^0.2.33",
     "@types/query-string": "^6.1.0",
     "@types/react-copy-to-clipboard": "^4.2.5",
     "@types/react-dom": "^16.0.6",
@@ -99,6 +111,7 @@
     "classnames": "^2.2.5",
     "commander": "^2.16.0",
     "copy-webpack-plugin": "^4.5.1",
+    "cross-env": "^5.2.0",
     "cross-spawn": "^6.0.5",
     "css-loader": "^0.28.11",
     "docz": "^0.5.8",
@@ -113,6 +126,7 @@
     "fluent-langneg": "^0.1.0",
     "fluent-react": "^0.7.0",
     "graphql-playground-middleware-express": "^1.7.2",
+    "graphql-schema-typescript": "^1.2.1",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^23.4.1",
     "jest-junit": "^5.1.0",
@@ -174,4 +188,4 @@
     "webpack-hot-client": "^4.1.1",
     "webpack-manifest-plugin": "^2.0.3"
   }
-}
+}