Skip to content

Commit 0c2c0bd

Browse files
author
Панасенко Андрей Викторович
committed
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
2 parents ffffb61 + dafec5d commit 0c2c0bd

35 files changed

Lines changed: 3670 additions & 152 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"eslint-plugin-react": "7.13.0",
6161
"fetch-mock": "^6.0.0",
6262
"flow-bin": "^0.101.0",
63-
"graphql": "^14.3.1",
63+
"graphql": "^14.0.0",
6464
"husky": "^3.0.5",
6565
"lerna": "^3.16.4",
6666
"mocha": "6.1.4",

‎packages/codemirror-graphql/babel.config.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ module.exports = {
44
require.resolve('@babel/preset-flow'),
55
require.resolve('@babel/preset-react'),
66
],
7-
plugins: [require.resolve('@babel/plugin-proposal-class-properties')],
7+
plugins: [
8+
require.resolve('@babel/plugin-proposal-class-properties'),
9+
require.resolve('babel-plugin-inline-json-import')
10+
],
811
};

0 commit comments

Comments
 (0)