chore: fix yarn.lock merge conflict; prevent recurrence (#964)

benjie · web-flow · commit 17b047bf8ba3 · 2019-09-28T18:40:45.000+01:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -29,7 +29,8 @@ module.exports = {
     es6: true,
     node: true,
     jest: true,
-    mocha: true
+    mocha: true,
+    browser: true,
   },
 
   'extends': ['prettier'],
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: node_js
-node_js: 
+node_js:
   - stable
   - lts/*
 before_install:
   - npm config set spin false --global
 install:
-  - yarn --ignore-scripts # ignore prepublish scripts
+  - yarn --frozen-lockfile --ignore-scripts # ignore prepublish scripts
 after_success:
   - codecov
 cache: yarn
diff --git a/packages/codemirror-graphql/src/utils/jump-addon.js b/packages/codemirror-graphql/src/utils/jump-addon.js
@@ -108,7 +108,10 @@ function onKeyDown(cm, event) {
   cm.on('mousedown', onMouseDown);
 }
 
-const isMac = navigator && navigator.appVersion.indexOf('Mac') !== -1;
+const isMac =
+  typeof navigator !== 'undefined' &&
+  navigator &&
+  navigator.appVersion.indexOf('Mac') !== -1;
 
 function isJumpModifier(key) {
   return key === (isMac ? 'Meta' : 'Control');
diff --git a/packages/codemirror-graphql/src/variables/lint.js b/packages/codemirror-graphql/src/variables/lint.js
@@ -156,6 +156,7 @@ function validateValue(type, valueAST) {
       valueAST.kind !== 'String') ||
     (type.name === 'Float' && valueAST.kind !== 'Number') ||
     (type.name === 'Int' &&
+      // eslint-disable-next-line no-bitwise
       (valueAST.kind !== 'Number' || (valueAST.value | 0) !== valueAST.value))
   ) {
     return [[valueAST, `Expected value of type "${type}".`]];
@@ -190,6 +191,7 @@ function lintError(editor, node, message) {
 }
 
 function isNullish(value: mixed): boolean {
+  // eslint-disable-next-line no-self-compare
   return value === null || value === undefined || value !== value;
 }
 
diff --git a/packages/graphiql/src/utility/mergeAst.js b/packages/graphiql/src/utility/mergeAst.js
@@ -38,12 +38,12 @@ export function mergeAst(queryAst) {
       return elem.kind === Kind.FRAGMENT_DEFINITION;
     })
     .forEach(frag => {
-      const copyFragment = Object.assign({}, frag);
+      const copyFragment = { ...frag };
       copyFragment.kind = Kind.INLINE_FRAGMENT;
       fragments[frag.name.value] = copyFragment;
     });
 
-  const copyAst = Object.assign({}, queryAst);
+  const copyAst = { ...queryAst };
   copyAst.definitions = queryAst.definitions
     .filter(elem => {
       return elem.kind !== Kind.FRAGMENT_DEFINITION;
diff --git a/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.js b/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.js
@@ -83,8 +83,8 @@ describe('GraphQLCache', () => {
       expect(wihtoutASTNode(schema.getDirective('customDirective'))).toEqual({
         args: [],
         description: undefined,
-        // TODO: failing now that tests are doing deep comparison
-        // isRepeatable: false,
+        extensions: undefined,
+        isRepeatable: false,
         locations: ['FIELD'],
         name: 'customDirective',
       });
@@ -95,8 +95,8 @@ describe('GraphQLCache', () => {
       expect(wihtoutASTNode(schema.getDirective('customDirective'))).toEqual({
         args: [],
         description: undefined,
-        // TODO: failing now that tests are doing deep comparison
-        // isRepeatable: false,
+        extensions: undefined,
+        isRepeatable: false,
         locations: ['FRAGMENT_SPREAD'],
         name: 'customDirective',
       });
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,7 @@ function validateValue(type, valueAST) {`
`156`	`156`	`valueAST.kind !== 'String') \|\|`
`157`	`157`	`(type.name === 'Float' && valueAST.kind !== 'Number') \|\|`
`158`	`158`	`(type.name === 'Int' &&`
	`159`	`+ // eslint-disable-next-line no-bitwise`
`159`	`160`	`(valueAST.kind !== 'Number' \|\| (valueAST.value \| 0) !== valueAST.value))`
`160`	`161`	`) {`
`161`	`162`	return [[valueAST, `Expected value of type "${type}".`]];
`@@ -190,6 +191,7 @@ function lintError(editor, node, message) {`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`function isNullish(value: mixed): boolean {`
	`194`	`+ // eslint-disable-next-line no-self-compare`
`193`	`195`	`return value === null \|\| value === undefined \|\| value !== value;`
`194`	`196`	`}`
`195`	`197`