Merge branch 'i18n-codemirror-graphql'

# Conflicts: # packages/graphiql-examples/index.html # packages/graphiql-examples/package.json # packages/graphiql/locales/en/Toolbar.json # packages/graphiql/locales/en/translation.json # packages/graphiql/locales/ru/Toolbar.json # packages/graphiql/locales/ru/translation.json # packages/graphiql/package.json # packages/graphiql/resources/build.sh # packages/graphiql/src/components/DocExplorer.js # packages/graphiql/src/components/ExecuteButton.js # packages/graphiql/src/components/GraphiQL.js # packages/graphiql/src/components/HistoryQuery.js # packages/graphiql/src/components/QueryHistory.js # packages/graphiql/src/components/ToolbarButton.js # packages/graphiql/src/i18n.js # yarn.lock
Xambey · Oct 3, 2019 · 0c2c0bd · 0c2c0bd
2 parents ffffb61 + dafec5d
commit 0c2c0bd
Show file tree

Hide file tree

Showing 35 changed files with 3,670 additions and 152 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "eslint-plugin-react": "7.13.0",
     "fetch-mock": "^6.0.0",
     "flow-bin": "^0.101.0",
-    "graphql": "^14.3.1",
+    "graphql": "^14.0.0",
     "husky": "^3.0.5",
     "lerna": "^3.16.4",
     "mocha": "6.1.4",

diff --git a/packages/codemirror-graphql/babel.config.js b/packages/codemirror-graphql/babel.config.js
@@ -4,5 +4,8 @@ module.exports = {
     require.resolve('@babel/preset-flow'),
     require.resolve('@babel/preset-react'),
   ],
-  plugins: [require.resolve('@babel/plugin-proposal-class-properties')],
+  plugins: [
+    require.resolve('@babel/plugin-proposal-class-properties'),
+    require.resolve('babel-plugin-inline-json-import')
+  ],
 };