From 186c89c1515a750c296a9dd55d624e6e81d560a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20S=C3=A1ez?= Date: Tue, 3 Aug 2021 22:22:49 -0400 Subject: [PATCH] update prismaloader & fix mkdirp import --- packages/graphql-codegen-cli/package.json | 2 +- .../src/generate-and-save.ts | 4 +- packages/utils/config-schema/src/index.ts | 6 +- yarn.lock | 58 ++++--------------- 4 files changed, 18 insertions(+), 52 deletions(-) diff --git a/packages/graphql-codegen-cli/package.json b/packages/graphql-codegen-cli/package.json index b0e4dec516b2..32335c7443f6 100644 --- a/packages/graphql-codegen-cli/package.json +++ b/packages/graphql-codegen-cli/package.json @@ -49,7 +49,7 @@ "@graphql-tools/graphql-file-loader": "^7.0.1", "@graphql-tools/json-file-loader": "^7.0.1", "@graphql-tools/load": "^7.1.0", - "@graphql-tools/prisma-loader": "^7.0.1", + "@graphql-tools/prisma-loader": "^7.0.2", "@graphql-tools/url-loader": "^7.0.3", "@graphql-tools/utils": "^8.0.1", "ansi-escapes": "^4.3.1", diff --git a/packages/graphql-codegen-cli/src/generate-and-save.ts b/packages/graphql-codegen-cli/src/generate-and-save.ts index dd06a051eda8..7359c855e50a 100644 --- a/packages/graphql-codegen-cli/src/generate-and-save.ts +++ b/packages/graphql-codegen-cli/src/generate-and-save.ts @@ -3,7 +3,7 @@ import { Types } from '@graphql-codegen/plugin-helpers'; import { executeCodegen } from './codegen'; import { createWatcher } from './utils/watcher'; import { fileExists, readSync, writeSync, unlinkFile } from './utils/file-system'; -import { sync as mkdirpSync } from 'mkdirp'; +import mkdirp from 'mkdirp'; import { dirname, join, isAbsolute } from 'path'; import { debugLog } from './utils/debugging'; import { CodegenContext, ensureContext } from './config'; @@ -81,7 +81,7 @@ export async function generate( const basedir = dirname(result.filename); await lifecycleHooks(result.hooks).beforeOneFileWrite(result.filename); await lifecycleHooks(config.hooks).beforeOneFileWrite(result.filename); - mkdirpSync(basedir); + mkdirp.sync(basedir); const absolutePath = isAbsolute(result.filename) ? result.filename : join(input.cwd || process.cwd(), result.filename); diff --git a/packages/utils/config-schema/src/index.ts b/packages/utils/config-schema/src/index.ts index bc7f46a7376e..c52b870e1f1c 100644 --- a/packages/utils/config-schema/src/index.ts +++ b/packages/utils/config-schema/src/index.ts @@ -2,7 +2,7 @@ import * as TJS from 'typescript-json-schema'; import { writeFile } from 'fs-extra'; import { generateDocs } from './docs'; -import { sync as mkdirp } from 'mkdirp'; +import mkdirp from 'mkdirp'; import { pluginsConfigurations, presetsConfigurations } from './plugins'; import { join } from 'path'; import { apply } from 'jsonpath'; @@ -133,7 +133,7 @@ async function generate() { const docsMarkdown = generateDocs(schema, [...pluginsConfigurations, ...presetsConfigurations]); - mkdirp(docsOutDir); + mkdirp.sync(docsOutDir); await Promise.all( Object.keys(docsMarkdown).map(identifier => writeFile(join(docsOutDir, `./${identifier}.md`), docsMarkdown[identifier]) @@ -156,7 +156,7 @@ async function generate() { return v; }); - mkdirp(schemaOutDir); + mkdirp.sync(schemaOutDir); await writeFile(join(schemaOutDir, './config.schema.json'), JSON.stringify(schema, null, 2)); } diff --git a/yarn.lock b/yarn.lock index 9015405a740d..84bd0ffa04b5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2283,10 +2283,10 @@ dependencies: tslib "~2.0.1" -"@graphql-tools/prisma-loader@^7.0.1": - version "7.0.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.0.1.tgz#62f0988fde5c57e1971aee2a58056bf670b39953" - integrity sha512-tft8+An89QXyLaz1ITqwMZMewACp8QfGHtgMNq2aAYnDNltoLzjYbIDepX0xtRD/NxQU7ivkpUDQRUwtk9RS3w== +"@graphql-tools/prisma-loader@^7.0.2": + version "7.0.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.0.2.tgz#134f9e188fb6ce424f72b5e9475b6a94400c6dc8" + integrity sha512-2jLBRWlsgKqxO/4w6TdGAlnyOKAKQwyVyR9zkfHnibZmpskKVBBDfPK/JrixlVncBaSP4nBOA+1D1CuJnyR4yw== dependencies: "@graphql-tools/url-loader" "^7.0.3" "@graphql-tools/utils" "8.0.1" @@ -3387,41 +3387,12 @@ dependencies: "@types/node" "*" -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -"@types/node@*", "@types/node@14.17.7", "@types/node@^14.14.33": -======= -======= ->>>>>>> 14d7c10a7 (fix enum-array package ESM exports) -<<<<<<< HEAD -"@types/node@*", "@types/node@^15.0.1": - version "15.6.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz#f0ddca5a61e52627c9dcb771a6039d44694597bc" - integrity sha512-gCYSfQpy+LYhOFTKAeE8BkyGqaxmlFxe+n4DKM6DR0wzw/HISUE/hAmkC/KT8Sw5PCJblqg062b3z9gucv3k0A== - -"@types/node@14.17.7", "@types/node@^14.14.33": -======= -<<<<<<< HEAD -"@types/node@*", "@types/node@14.17.7", "@types/node@^14.14.33": ->>>>>>> 02cc0dfac (ESM support) -<<<<<<< HEAD ->>>>>>> 007d5fce3 (ESM support) -======= -======= -======= ->>>>>>> 2cafbcdde (fix gql-tag-operations-preset package) "@types/node@*": version "16.4.10" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.10.tgz#e57e2a54fc6da58da94b3571b1cb456d39f88597" integrity sha512-TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ== "@types/node@14.17.7", "@types/node@^14.14.33": -<<<<<<< HEAD ->>>>>>> 449218115 (fix enum-array package ESM exports) ->>>>>>> 14d7c10a7 (fix enum-array package ESM exports) -======= ->>>>>>> 2cafbcdde (fix gql-tag-operations-preset package) version "14.17.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.7.tgz#e106997493e617edeba52fdbd965930da494113b" integrity sha512-SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag== @@ -3441,11 +3412,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.5.tgz#7b5b3532053fd14c771ad6598a4ee2c7a85aceca" integrity sha512-6ewfMNmkumZieB/EeJ4cdP1bbJyOlOt5MTwbKMr7WKxyCt2j09H8YWRK6zOd/Jh35Vu/gls39ZUmeu4vHu1WKQ== -"@types/node@^15.0.1": - version "15.6.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.6.0.tgz#f0ddca5a61e52627c9dcb771a6039d44694597bc" - integrity sha512-gCYSfQpy+LYhOFTKAeE8BkyGqaxmlFxe+n4DKM6DR0wzw/HISUE/hAmkC/KT8Sw5PCJblqg062b3z9gucv3k0A== - "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -6913,9 +6879,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.793: - version "1.3.793" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.793.tgz#c10dff5f3126238004de344db458f1da3641d554" - integrity sha512-l9NrGV6Mr4ov5mayYPvIWcwklNw5ROmy6rllzz9dCACw9nKE5y+s5uQk+CBJMetxrWZ6QJFsvEfG6WDcH2IGUg== + version "1.3.795" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz#91f09b4c77f8dab562dd592ce929b009201c24ff" + integrity sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ== elegant-spinner@^1.0.1: version "1.0.1" @@ -13694,12 +13660,12 @@ rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.1, rxjs@^6.6.0, rxjs@^6.6.3, rxjs@^6.6.7: dependencies: tslib "^1.9.0" -safe-buffer@5.1.2, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -15050,9 +15016,9 @@ ts-invariant@^0.4.0: tslib "^1.9.3" ts-invariant@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.9.0.tgz#4c60e9159a31742ab0103f13d7f63314fb5409c9" - integrity sha512-+JqhKqywk+ue5JjAC6eTWe57mOIxYXypMUkBDStkAzvnlfkDJ1KGyeMuNRMwOt6GXzHSC1UT9JecowpZDmgXqA== + version "0.9.1" + resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.9.1.tgz#87dfde9894a4ce3c7711b02b1b449e7fd7384b13" + integrity sha512-hSeYibh29ULlHkuEfukcoiyTct+s2RzczMLTv4x3NWC/YrBy7x7ps5eYq/b4Y3Sb9/uAlf54+/5CAEMVxPhuQw== dependencies: tslib "^2.1.0"