Merge remote-tracking branch 'origin/master' into feat/upgrade-relay-10.1

Author: maraisr

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v12.0.4 (Fri Jul 24 2020)
+
+#### 🐛  Bug Fix
+
+- Make syncFixtures flexible to get fixtures from other paths [#197](https://github.com/relay-tools/relay-compiler-language-typescript/pull/197) ([@thicodes](https://github.com/thicodes))
+
+#### Authors: 1
+
+- [@thicodes](https://github.com/thicodes)
+
+---
+
 # v12.0.3 (Wed May 20 2020)
 
 #### 🐛  Bug Fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "relay-compiler-language-typescript",
-  "version": "12.0.3",
+  "version": "12.0.4",
   "description": "A language plugin for Relay that adds TypeScript support, including emitting type definitions.",
   "keywords": [
     "graphql",
@@ -27,21 +27,21 @@
       "email": "[email protected]"
     }
   ],
+  "main": "lib/index.js",
   "files": [
     "lib"
   ],
-  "main": "lib/index.js",
   "scripts": {
     "build": "rm -rf lib && tsc",
     "lint": "tslint -c tslint.json --project tsconfig.json",
     "pr-check": "scripts/pr-check.sh",
     "prettier": "prettier --write '{src,types,test}/**/*.ts'",
     "prepublish": "npm run build",
     "relay": "node bin/relay-compiler.js --schema test/schema.graphql --src test/ --outputDir __generated__",
-    "sync-fixtures": "rsync -avh --delete --stats --progress ../relay/packages/relay-compiler/language/javascript/__tests__/fixtures/flow-generator/**/*.graphql test/fixtures/type-generator",
+    "sync-fixtures": "ts-node ./syncFixtures.ts",
     "test": "npm run type-check && jest",
-    "watch": "concurrently 'tsc --watch' 'chokidar \"lib/**/*.js\" -c \"yalc publish --force --push\"'",
-    "type-check": "tsc --noEmit --pretty"
+    "type-check": "tsc --noEmit --pretty",
+    "watch": "concurrently 'tsc --watch' 'chokidar \"lib/**/*.js\" -c \"yalc publish --force --push\"'"
   },
   "husky": {
     "hooks": {
@@ -59,6 +59,7 @@
       "git add"
     ]
   },
+  "prettier": {},
   "jest": {
     "moduleFileExtensions": [
       "js",
@@ -85,6 +86,7 @@
     "babel-plugin-relay": "^9.0.0",
     "chokidar-cli": "^2.0.0",
     "concurrently": "^5.0.0",
+    "glob": "^7.1.6",
     "graphql": "^15.3.0",
     "husky": "^3.0.2",
     "jest": "^24.8.0",
@@ -95,6 +97,7 @@
     "relay-runtime": "^10.0.1",
     "relay-test-utils-internal": "^10.0.1",
     "ts-jest": "^22.0.1",
+    "ts-node": "^8.10.2",
     "tslint": "^5.18.0",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "3.6.4"
@@ -108,6 +111,5 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
-  },
-  "prettier": {}
+  }
 }

syncFixtures.ts

@@ -0,0 +1,44 @@
+import * as fs from "fs";
+import * as glob from "glob";
+import * as path from "path";
+
+type SyncFixturesType = {
+  souceFilePaths: Array<{
+    cwd: string;
+    pattern: string;
+  }>;
+  dest: string;
+};
+
+const syncFixtures = ({ souceFilePaths, dest }: SyncFixturesType) => {
+  souceFilePaths.forEach(({ cwd, pattern }) => {
+    glob
+      .sync(pattern, {
+        cwd
+      })
+      .forEach(filePath => {
+        const file = getFileNameFromPath(filePath);
+        try {
+          fs.copyFileSync(
+            path.join(__dirname, `${cwd}/${filePath}`),
+            `${dest}/${file}`
+          );
+          console.log(`${filePath} was copied`);
+        } catch (error) {
+          console.error(error);
+        }
+      });
+  });
+};
+
+const getFileNameFromPath = (filePath: string) => filePath.split("/").pop();
+
+const souceFilePaths = [
+  {
+    cwd:
+      "../relay/packages/relay-compiler/language/javascript/__tests__/fixtures/flow-generator",
+    pattern: "**/*.graphql"
+  }
+];
+
+syncFixtures({ souceFilePaths, dest: "./test/fixtures/type-generator" });

yarn.lock

@@ -946,6 +946,11 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2551,6 +2556,18 @@ glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -4071,6 +4088,11 @@ make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 [email protected]:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -5487,6 +5509,14 @@ source-map-support@^0.5.0, source-map-support@^0.5.5, source-map-support@^0.5.6:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.17:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -5899,6 +5929,17 @@ ts-jest@^22.0.1:
     source-map-support "^0.5.5"
     yargs "^11.0.0"
 
+ts-node@^8.10.2:
+  version "8.10.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
+  integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
+  dependencies:
+    arg "^4.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    source-map-support "^0.5.17"
+    yn "3.1.1"
+
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
@@ -6245,10 +6286,10 @@ yargs-parser@^13.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+yargs-parser@^15.0.0:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3"
+  integrity sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -6328,3 +6369,8 @@ yargs@^15.3.1:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
+
+[email protected]:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==