From f34e88a7da8914d8a30902cc33263482bf0df5b0 Mon Sep 17 00:00:00 2001 From: Mikhail Novikov Date: Thu, 14 Feb 2019 14:18:14 +0200 Subject: [PATCH] Move to @gatsbyjs scoped version of yarn (#11759) Move to @gatsbyjs scoped version of yarn --- packages/gatsby/package.json | 2 +- .../query-runner/query-compiler.js | 12 ++--- yarn.lock | 44 +++++++++---------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 32e791dbc9566..490f738234018 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -105,7 +105,7 @@ "react-error-overlay": "^3.0.0", "react-hot-loader": "^4.6.2", "redux": "^4.0.0", - "relay-compiler": "2.0.0", + "@gatsbyjs/relay-compiler": "2.0.0-printer-fix", "request": "^2.85.0", "semver": "^5.6.0", "shallow-compare": "^1.2.2", diff --git a/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js b/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js index 3419589574a54..9965885e72762 100644 --- a/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js +++ b/packages/gatsby/src/internal-plugins/query-runner/query-compiler.js @@ -4,16 +4,16 @@ const normalize = require(`normalize-path`) import glob from "glob" import { validate } from "graphql" -import { IRTransforms } from "relay-compiler" -import RelayParser from "relay-compiler/lib/RelayParser" -import ASTConvert from "relay-compiler/lib/ASTConvert" -import GraphQLCompilerContext from "relay-compiler/lib/GraphQLCompilerContext" -import filterContextForNode from "relay-compiler/lib/filterContextForNode" +import { IRTransforms } from "@gatsbyjs/relay-compiler" +import RelayParser from "@gatsbyjs/relay-compiler/lib/RelayParser" +import ASTConvert from "@gatsbyjs/relay-compiler/lib/ASTConvert" +import GraphQLCompilerContext from "@gatsbyjs/relay-compiler/lib/GraphQLCompilerContext" +import filterContextForNode from "@gatsbyjs/relay-compiler/lib/filterContextForNode" const _ = require(`lodash`) import { store } from "../../redux" import FileParser from "./file-parser" -import GraphQLIRPrinter from "relay-compiler/lib/GraphQLIRPrinter" +import GraphQLIRPrinter from "@gatsbyjs/relay-compiler/lib/GraphQLIRPrinter" import { graphqlError, graphqlValidationError, diff --git a/yarn.lock b/yarn.lock index f1332ca98d08f..218edd5685a29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -983,6 +983,28 @@ resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.11.1.tgz#8529b7412a6eb4b48bdf6e720cc1b8e6e1e17628" integrity sha512-8M3VN0hetwhsJ8dH8VkVy7xo5/1VoBsDOk/T4SJOeXwTO1c4uIqVNx2qyecLFnnUWD5vvUqHQ1gASSeUN6zcTg== +"@gatsbyjs/relay-compiler@2.0.0-printer-fix": + version "2.0.0-printer-fix" + resolved "https://registry.yarnpkg.com/@gatsbyjs/relay-compiler/-/relay-compiler-2.0.0-printer-fix.tgz#542b3eb8e7f28142ccbde051dfc47c6ce506d022" + integrity sha512-oxUgELwerXuQWQhQz+G3xXAP9H4uMgj8aNGmNp0IYKv9D0puvUw+W6884jae57Ng+Vj2K5rxUkn0ApivSTvutQ== + dependencies: + "@babel/generator" "^7.0.0" + "@babel/parser" "^7.0.0" + "@babel/polyfill" "^7.0.0" + "@babel/runtime" "^7.0.0" + "@babel/traverse" "^7.0.0" + "@babel/types" "^7.0.0" + babel-preset-fbjs "^3.1.2" + chalk "^2.4.1" + fast-glob "^2.2.2" + fb-watchman "^2.0.0" + fbjs "^1.0.0" + immutable "~3.7.6" + nullthrows "^1.1.0" + relay-runtime "2.0.0" + signedsource "^1.0.0" + yargs "^9.0.0" + "@lerna/add@3.10.6": version "3.10.6" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.10.6.tgz#6f2c6b26eb905c40fef4180f3ffa34ad9dbb860b" @@ -16398,28 +16420,6 @@ relateurl@0.2.x: resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -relay-compiler@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-2.0.0.tgz#f51b8e4fdf337b24ceb45cb7f80dac2729ab132a" - integrity sha512-OcWHdFJAp9++8xhES5rZMDolB2USKn940bc/jDMYrMyHtVM+FnvlZaXDSvXpOjlzPeucpDYPiqFlx+/UQoGF2g== - dependencies: - "@babel/generator" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/polyfill" "^7.0.0" - "@babel/runtime" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - babel-preset-fbjs "^3.1.2" - chalk "^2.4.1" - fast-glob "^2.2.2" - fb-watchman "^2.0.0" - fbjs "^1.0.0" - immutable "~3.7.6" - nullthrows "^1.1.0" - relay-runtime "2.0.0" - signedsource "^1.0.0" - yargs "^9.0.0" - relay-runtime@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-2.0.0.tgz#0e42df90365cc69f104f7e4b20fdcf975f5a9c0b"