Merge branch 'master' into typenames

dotansimha · Apr 23, 2019 · 697f393 · 697f393
2 parents 6ed53b3 + e7aa983
commit 697f393
Show file tree

Hide file tree

Showing 56 changed files with 187,591 additions and 272 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,16 +19,18 @@ jobs:
       - run:
           name: Test
           command: yarn test
+      - store_test_results:
+          path: test-results
       - run:
           name: Publish Canary
           command: |
             echo "Fork PR username: $CIRCLE_PR_USERNAME"
-            if [ "${CIRCLE_PR_USERNAME}" == "" ]
+            if [ "${CIRCLE_PR_USERNAME}" == "" ] && [ "${NPM_AUTH_TOKEN}" != "" ]
             then
                 echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > .npmrc
                 npm run ci:release:canary
             else    
-                echo "Skipping canary publish due to a fork PR..."
+                echo "Skipping canary publish due to a fork/PR..."
             fi
       - save_cache:
           key: dependency-cache-{{ checksum "package.json" }}

diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ website/functions
 website/i18n
 website/static/live-demo
 temp
+test-results/
+
diff --git a/docs/getting-started/index.md b/docs/getting-started/index.md
@@ -115,10 +115,10 @@ There are different methods to use GraphQL Code Generator besides the [CLI](../c
 
 ### Using in Runtime
 
-We can `require()` (or `import`) `@graphql-codegen/core` directly with Node.JS:
+We can `require()` (or `import`) `@graphql-codegen/cli` directly with Node.JS:
 
 ```js
-import { generate } from '@graphql-codegen/core';
+import { generate } from '@graphql-codegen/cli';
 
 async function doSomething() {
   const generatedFiles = await generate(

diff --git a/jest.config.js b/jest.config.js
@@ -4,7 +4,18 @@ module.exports = {
   rootDir: process.cwd(),
   globals: {
     'ts-jest': {
-      diagnostics: false
-    }
-  }
+      diagnostics: false,
+    },
+  },
+  reporters: [
+    'default',
+    [
+      'jest-junit',
+      {
+        classNameTemplate: '{classname}',
+        titleTemplate: '{title}',
+        addFileAttribute: 'true',
+      },
+    ],
+  ],
 };
diff --git a/package.json b/package.json
@@ -31,24 +31,25 @@
     "@types/graphql": "14.2.0",
     "@types/jest": "24.0.11",
     "@types/mkdirp": "0.5.2",
-    "@types/node": "10.14.4",
+    "@types/node": "10.14.5",
     "@types/request": "2.48.1",
     "apollo-link": "1.2.11",
+    "apollo-server": "2.4.8",
     "graphql": "14.2.1",
     "graphql-tag": "2.10.1",
     "graphql-tools": "4.0.4",
     "husky": "1.3.1",
     "jest": "24.7.1",
+    "jest-junit": "6.3.0",
     "lerna": "3.13.3",
     "lint-staged": "8.1.5",
     "microbundle": "0.11.0",
+    "react-apollo": "2.5.5",
+    "react-apollo-hooks": "0.4.5",
     "rimraf": "2.6.3",
     "ts-jest": "24.0.2",
     "tslint": "5.16.0",
-    "typescript": "3.4.3",
-    "react-apollo": "2.5.4",
-    "react-apollo-hooks": "0.4.5",
-    "apollo-server": "2.4.8"
+    "typescript": "3.4.4"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

diff --git a/packages/graphql-codegen-cli/package.json b/packages/graphql-codegen-cli/package.json
@@ -49,7 +49,7 @@
     "@types/babylon": "6.16.5",
     "@types/is-glob": "4.0.1",
     "@types/mkdirp": "0.5.2",
-    "@types/prettier": "1.16.2",
+    "@types/prettier": "1.16.3",
     "@types/valid-url": "1.0.2",
     "babel-types": "7.0.0-beta.3",
     "babylon": "7.0.0-beta.47",
@@ -98,6 +98,9 @@
   "typescript": {
     "definition": "dist/esnext/index.d.ts"
   },
+  "jest-junit": {
+    "outputDirectory": "../../test-results/cli"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/graphql-codegen-core/package.json b/packages/graphql-codegen-core/package.json
@@ -53,6 +53,9 @@
   "typescript": {
     "definition": "dist/esnext/index.d.ts"
   },
+  "jest-junit": {
+    "outputDirectory": "../../test-results/core"
+  },
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/plugins/flow-resolvers/tests/__snapshots__/flow-resolvers.spec.ts.snap b/packages/plugins/flow-resolvers/tests/__snapshots__/flow-resolvers.spec.ts.snap
diff --git a/packages/plugins/flow/flow/package.json b/packages/plugins/flow/flow/package.json
@@ -15,12 +15,10 @@
   },
   "devDependencies": {
     "@graphql-codegen/testing": "1.1.0",
-    "flow-bin": "0.97.0",
-    "flow-parser": "0.97.0",
     "graphql": "14.2.1",
     "jest": "24.7.1",
     "ts-jest": "24.0.2",
-    "typescript": "3.4.3"
+    "typescript": "3.4.4"
   },
   "sideEffects": false,
   "main": "dist/commonjs/index.js",
@@ -29,6 +27,9 @@
   "typescript": {
     "definition": "dist/esnext/index.d.ts"
   },
+  "jest-junit": {
+    "outputDirectory": "../../../../test-results/flow"
+  },
   "publishConfig": {
     "access": "public"
   }