From c38bc10116da8d4f335bf85362386331c4675938 Mon Sep 17 00:00:00 2001 From: Adam Soffer Date: Fri, 7 Dec 2018 13:21:38 -0500 Subject: [PATCH] Fix production build (#265) * Fix production build The production build failing was the result of a bug related to an older version react-scripts not playing nice with the latest version of graphql (https://github.com/graphql/graphql-js/issues/1248). Updating to the latest version of react-scripts (v2.1.1) fixed the bug. It also reduces the production build *considerably* (from over 1mb down to 48kb). * Downgrade babel-preset-react-app to 3.1.0 --- docs/explorer/README.md | 2 +- package.json | 2 +- packages/apollo/package.json | 17 +- packages/apollo/src/index.js | 11 +- .../__snapshots__/index.test.js.snap | 12 +- packages/explorer/README.md | 12 +- packages/explorer/package.json | 21 +- packages/explorer/webpack.config.prod.js | 348 - packages/graphql-sdk/package.json | 2 +- packages/graphql-sdk/schema.json | 56 +- packages/player/package.json | 9 +- packages/player/webpack.config.prod.js | 348 - packages/subgraph/README.md | 4 +- packages/subgraph/yarn.lock | 596 +- yarn.lock | 8480 +++++++++++++---- 15 files changed, 7036 insertions(+), 2884 deletions(-) delete mode 100644 packages/explorer/webpack.config.prod.js delete mode 100644 packages/player/webpack.config.prod.js diff --git a/docs/explorer/README.md b/docs/explorer/README.md index 929e7d096e..2f87d5a241 100644 --- a/docs/explorer/README.md +++ b/docs/explorer/README.md @@ -61,7 +61,7 @@ This project is bootstrapped with [create-react-app](https://github.com/facebook | Directory | Description | | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------- | -| `.` | config files: .prettierrc, .gitignore, webpack.config.prod.js, package.json, README.md, etc | +| `.` | config files: .prettierrc, .gitignore, package.json, README.md, etc | | `public/.` | assets (images, fonts, etc) go here | | `public/index.html` | the app's html entrypoint | | `src/index.js` | the app's js entrypoint | diff --git a/package.json b/package.json index 56e0f1580e..e4e49b72ac 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "release:alpha": "npx lerna publish --cd-version prerelease --conventional-commits --yes", "test": - "npx lerna run test --ignore @livepeer/explorer --ignore @livepeer/player", + "npx lerna run test --ignore @livepeer/explorer --ignore @livepeer/player --ignore @livepeer/chroma", "updated": "npx lerna updated --json" }, "devDependencies": { diff --git a/packages/apollo/package.json b/packages/apollo/package.json index 0632be2b24..71ec9561d0 100644 --- a/packages/apollo/package.json +++ b/packages/apollo/package.json @@ -15,15 +15,6 @@ "prepack": "npm -s run build", "test": "npx ava" }, - "peerDependencies": { - "@livepeer/graphql-sdk": "^1.0.0-alpha.3", - "@livepeer/sdk": "^1.0.0-alpha.3", - "apollo-cache-inmemory": "1.1.10", - "apollo-client": "2.2.6", - "apollo-link": "1.2.1", - "babel-runtime": "^6.26.0", - "graphql": "14.0.0" - }, "devDependencies": { "ava": "0.25.0", "babel-cli": "^6.26.0", @@ -33,6 +24,7 @@ "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.6.1", "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", "express": "4.16.3", "express-graphql": "0.6.12" }, @@ -44,10 +36,15 @@ "babel": "inherit" }, "dependencies": { + "@livepeer/graphql-sdk": "^1.0.0-alpha.5", + "@livepeer/sdk": "^1.0.0-alpha.5", + "apollo-cache-inmemory": "^1.3.11", "apollo-cache-persist": "^0.1.1", - "apollo-client": "2.2.6", + "apollo-client": "^2.4.7", "apollo-link-http": "^1.5.5", "apollo-link-state": "^0.4.1", + "apollo-link": "^1.2.4", + "graphql": "^14.0.2", "graphql-tools": "^4.0.0", "node-fetch": "^2.2.0" } diff --git a/packages/apollo/src/index.js b/packages/apollo/src/index.js index 0c1e49ab96..76e890fe35 100644 --- a/packages/apollo/src/index.js +++ b/packages/apollo/src/index.js @@ -10,17 +10,11 @@ import { graphql, parse, print, subscribe } from 'graphql' import Livepeer from '@livepeer/sdk' import { schema, introspectionQueryResultData } from '@livepeer/graphql-sdk' import { - makeExecutableSchema, introspectSchema, makeRemoteExecutableSchema, mergeSchemas, - transformSchema, - RenameTypes, - RenameRootFields, } from 'graphql-tools' -import { onError } from 'apollo-link-error' import { HttpLink } from 'apollo-link-http' -import fetch from 'node-fetch' import axios from 'axios' type OnAccountChangeCallback = ( @@ -110,7 +104,6 @@ export default async function createApolloClient( const subgraphServiceLink = new HttpLink({ uri: options.livepeerSubgraph, - fetch, }) const createSubgraphServiceSchema = async () => { @@ -134,6 +127,9 @@ export default async function createApolloClient( * @return {boolean} */ async function isSubgraphAvailable(url: string): boolean { + if (!url) { + return false + } try { await axios({ url, @@ -150,7 +146,6 @@ export default async function createApolloClient( }) return true } catch (e) { - console.log(e) return false } } diff --git a/packages/chroma/src/VideoPlayer/__snapshots__/index.test.js.snap b/packages/chroma/src/VideoPlayer/__snapshots__/index.test.js.snap index 89a820761c..10350608ca 100644 --- a/packages/chroma/src/VideoPlayer/__snapshots__/index.test.js.snap +++ b/packages/chroma/src/VideoPlayer/__snapshots__/index.test.js.snap @@ -11,9 +11,7 @@ exports[`should render as expected 1`] = ` muted="" playsinline="" preload="auto" - > - - + /> + />