Merge branch 'next' into next-passport

This commit is contained in:
Wyatt Johnson
2018-07-05 16:01:44 -06:00
8 changed files with 308 additions and 115 deletions
+6 -3
View File
@@ -5,10 +5,11 @@
"scripts": {
"build:client": "node ./scripts/build.js",
"build:server": "tsc -p ./src/tsconfig.json",
"build": "npm-run-all --parallel compile:* --parallel build:*",
"build": "npm-run-all compile --parallel build:*",
"compile:css-types": "tcm src/core/client/",
"compile:graphql": "node ./scripts/types.js",
"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",
"compile": "npm-run-all --parallel compile:*",
"docz:watch": "docz dev",
"lint-fix": "npm run lint:server -- --fix && npm run lint:client -- --fix && npm run lint:scripts -- --fix",
"lint:client": "tslint --project ./src/core/client/tsconfig.json",
@@ -84,7 +85,8 @@
"@types/passport-strategy": "^0.2.33",
"@types/query-string": "^6.1.0",
"@types/react-dom": "^16.0.6",
"@types/react-relay": "^1.3.6",
"@types/react-relay": "github:coralproject/patched#types/react-relay",
"@types/react-test-renderer": "^16.0.1",
"@types/recompose": "^0.26.1",
"@types/relay-runtime": "github:coralproject/patched#types/relay-runtime",
"@types/uuid": "^3.4.3",
@@ -113,7 +115,7 @@
"graphql-playground-middleware-express": "^1.7.0",
"graphql-schema-typescript": "^1.2.1",
"html-webpack-plugin": "^3.2.0",
"jest": "^23.2.0",
"jest": "^23.3.0",
"loader-utils": "^1.1.0",
"npm-run-all": "^4.1.3",
"postcss-flexbugs-fixes": "^3.3.1",
@@ -128,6 +130,7 @@
"react-dom": "^16.4.0",
"react-final-form": "^3.6.0",
"react-relay": "github:coralproject/patched#react-relay",
"react-test-renderer": "^16.4.1",
"recompose": "^0.27.1",
"relay-compiler": "github:coralproject/patched#relay-compiler",
"relay-compiler-language-typescript": "github:coralproject/patched#relay-compiler-language-typescript",