From 9a25784479aff970391f39b9dd4e5f30287c6827 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Mon, 26 Jul 2021 22:26:20 -0500 Subject: [PATCH 01/28] chore(client, build): cleanup --- src/packages/client/.gitignore | 37 +- src/packages/client/helpers/build.js | 68 +- src/packages/client/package.json | 3 +- src/packages/client/rollup.config.js | 4 +- .../client/src/{ => generation}/generator.ts | 8 +- src/packages/client/tsconfig.declaration.json | 7 + src/packages/client/tsconfig.eslint.json | 3 +- src/packages/client/tsconfig.generator.json | 17 + src/packages/client/tsconfig.json | 2 +- src/packages/client/tsconfig.runtime.json | 18 +- src/pnpm-lock.yaml | 1575 ++++++++++++++++- 11 files changed, 1578 insertions(+), 164 deletions(-) rename src/packages/client/src/{ => generation}/generator.ts (89%) create mode 100644 src/packages/client/tsconfig.declaration.json create mode 100644 src/packages/client/tsconfig.generator.json diff --git a/src/packages/client/.gitignore b/src/packages/client/.gitignore index 1b1e8174d291..fbb2f48b3172 100644 --- a/src/packages/client/.gitignore +++ b/src/packages/client/.gitignore @@ -1,32 +1,15 @@ -node_modules -dist -build -runtime -runtime-browser -runtime-browser-dist +/node_modules +/dist +/runtime +/generator-build +/declaration -download -generator -cli -.DS_Store -!src/runtime -yarn-error.log -src/utils/transformed-dmmf.json *-dmmf.json *-dmmf-raw.json -db -query-engine* -test.sh -try-getConfig.ts -generator-build -@prisma -getConfig.sh -migrations -/schema.prisma -/dmmf.json -try-getDmmf.ts -write-test prisma-client-*.tgz -*.tsbuildinfo -pnpm-lock.yaml *.zip + +yarn-error.log +pnpm-lock.yaml +*.tsbuildinfo +.DS_Store diff --git a/src/packages/client/helpers/build.js b/src/packages/client/helpers/build.js index 58f6588bf3a5..4c2f0e146967 100644 --- a/src/packages/client/helpers/build.js +++ b/src/packages/client/helpers/build.js @@ -1,66 +1,42 @@ const execa = require('execa') -const fs = require('fs') const chalk = require('chalk') -const { promisify } = require('util') const esbuild = require('esbuild') -const copyFile = promisify(fs.copyFile) -async function main() { - const before = Date.now() +const ESBUILD_DEFAULT = { + bundle: true, + platform: 'node', + target: 'node12', + external: ['_http_common'] +} - // do the job for typescript - if ( - !fs.existsSync('./runtime-dist') && - fs.existsSync('./tsconfig.runtime.tsbuildinfo') - ) { - try { - console.log('unlinking') - fs.unlinkSync('./tsconfig.tsbuildinfo') - } catch (e) { - console.error(e) - // - } - } +async function build() { + const before = Date.now() await Promise.all([ - run('tsc --build tsconfig.runtime.json', true), - run('tsc --build tsconfig.json', true), esbuild.build({ - platform: 'node', - bundle: true, - target: 'node12', + ...ESBUILD_DEFAULT, + entryPoints: ['src/generation/generator.ts'], outfile: 'generator-build/index.js', - entryPoints: ['src/generator.ts'], - external: ['_http_common'] + tsconfig: 'tsconfig.generator.json' }), - ]) - - await Promise.all([ esbuild.build({ - platform: 'node', - bundle: true, - target: 'node12', - outdir: 'runtime', + ...ESBUILD_DEFAULT, entryPoints: ['src/runtime/index.ts'], - external: ['_http_common'] + outfile: 'runtime/index.js', + tsconfig: 'tsconfig.runtime.json' }), esbuild.build({ - platform: 'node', - bundle: true, - format: 'cjs', - target: ['chrome58', 'firefox57', 'safari11', 'edge16'], - outdir: 'runtime', + ...ESBUILD_DEFAULT, entryPoints: ['src/runtime/index-browser.ts'], - external: ['_http_common'] + outfile: 'runtime/index-browser.js', + tsconfig: 'tsconfig.runtime.json', + target: ['chrome58', 'firefox57', 'safari11', 'edge16'], + format: 'cjs', }), - run('rollup -c'), ]) - await Promise.all([ - copyFile('./scripts/backup-index.js', 'index.js'), - copyFile('./scripts/backup-index-browser.js', 'index-browser.js'), - copyFile('./scripts/backup-index.d.ts', 'index.d.ts'), - ]) + await run('tsc --build tsconfig.declaration.json') + await run('rollup -c') const after = Date.now() console.log( @@ -76,7 +52,7 @@ function run(command, preferLocal = true) { return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) } -main().catch((e) => { +build().catch((e) => { console.error(e) process.exit(1) }) diff --git a/src/packages/client/package.json b/src/packages/client/package.json index 828d9f9d1940..999c3aa36b9e 100644 --- a/src/packages/client/package.json +++ b/src/packages/client/package.json @@ -32,7 +32,8 @@ "maintainers": [ "Tim Suchanek ", "Joël Galeran ", - "William Luke " + "William Luke ", + "Pierre-Antoine Mills " ], "bugs": "https://github.com/prisma/prisma/issues", "scripts": { diff --git a/src/packages/client/rollup.config.js b/src/packages/client/rollup.config.js index 215ec70bbcd7..c49c02ec832b 100644 --- a/src/packages/client/rollup.config.js +++ b/src/packages/client/rollup.config.js @@ -2,7 +2,7 @@ import dts from 'rollup-plugin-dts' const config = [ { - input: './runtime-dist/index.d.ts', + input: 'declaration/index.d.ts', output: [{ file: 'runtime/index.d.ts', format: 'es' }], plugins: [ dts({ @@ -11,7 +11,7 @@ const config = [ ], }, { - input: './runtime-dist/index-browser.d.ts', + input: 'declaration/index-browser.d.ts', output: [{ file: 'runtime/index-browser.d.ts', format: 'es' }], plugins: [ dts({ diff --git a/src/packages/client/src/generator.ts b/src/packages/client/src/generation/generator.ts similarity index 89% rename from src/packages/client/src/generator.ts rename to src/packages/client/src/generation/generator.ts index b4c8a969746e..651024cd0fac 100755 --- a/src/packages/client/src/generator.ts +++ b/src/packages/client/src/generation/generator.ts @@ -2,14 +2,14 @@ import Debug from '@prisma/debug' import { enginesVersion } from '@prisma/engines-version' import { generatorHandler } from '@prisma/generator-helper' import { parseEnvValue } from '@prisma/sdk' -import { generateClient } from './generation/generateClient' -import { getDMMF } from './generation/getDMMF' -import { externalToInternalDmmf } from './runtime/externalToInternalDmmf' +import { generateClient } from './generateClient' +import { getDMMF } from './getDMMF' +import { externalToInternalDmmf } from '../runtime/externalToInternalDmmf' const debug = Debug('prisma:client:generator') // As specced in https://github.com/prisma/specs/tree/master/generators -const pkg = require('../package.json') +const pkg = require('../../package.json') const clientVersion = pkg.version if (require.main === module) { diff --git a/src/packages/client/tsconfig.declaration.json b/src/packages/client/tsconfig.declaration.json new file mode 100644 index 000000000000..3dc685adc83d --- /dev/null +++ b/src/packages/client/tsconfig.declaration.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.runtime.json", + "compilerOptions": { + "outDir": "declaration", + "emitDeclarationOnly": true + }, +} diff --git a/src/packages/client/tsconfig.eslint.json b/src/packages/client/tsconfig.eslint.json index 2f038bd3f1ef..1837c69bd56c 100644 --- a/src/packages/client/tsconfig.eslint.json +++ b/src/packages/client/tsconfig.eslint.json @@ -1,5 +1,4 @@ { - "extends": "./tsconfig", - "include": ["src"], + "include": ["**/*.ts"], "exclude": [] } diff --git a/src/packages/client/tsconfig.generator.json b/src/packages/client/tsconfig.generator.json new file mode 100644 index 000000000000..c8f45bf6dbd2 --- /dev/null +++ b/src/packages/client/tsconfig.generator.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "lib": ["esnext"], + "module": "commonjs", + "target": "es2018", + "strict": true, + "esModuleInterop": true, + "sourceMap": true, + "noImplicitAny": false, + "outDir": "generator-build", + "rootDir": "src/generation", + "declaration": true, + "skipDefaultLibCheck": true + }, + "include": ["src/generation"], + "exclude": [] +} diff --git a/src/packages/client/tsconfig.json b/src/packages/client/tsconfig.json index 3d3b80db1f4e..61868bdbaae7 100644 --- a/src/packages/client/tsconfig.json +++ b/src/packages/client/tsconfig.json @@ -15,7 +15,7 @@ "incremental": true, "noUncheckedIndexedAccess": false, // TODO Can't let TS shoot itself on the foot "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true + "noFallthroughCasesInSwitch": true, }, "exclude": [ "dist", diff --git a/src/packages/client/tsconfig.runtime.json b/src/packages/client/tsconfig.runtime.json index e167497b4241..6475bddfdd1c 100644 --- a/src/packages/client/tsconfig.runtime.json +++ b/src/packages/client/tsconfig.runtime.json @@ -1,29 +1,19 @@ { "compilerOptions": { - "lib": ["esnext", "esnext.asynciterable"], + "lib": ["esnext"], "module": "commonjs", "target": "es2018", "strict": true, "esModuleInterop": true, "sourceMap": true, "noImplicitAny": false, - "outDir": "runtime-dist", + "outDir": "runtime", "rootDir": "src/runtime", "declaration": true, "incremental": true, "skipDefaultLibCheck": true, - "tsBuildInfoFile": "tsconfig.runtime.tsbuildinfo" + "tsBuildInfoFile": ".tsbuildinfo" }, "include": ["src/runtime"], - "exclude": [ - "dist", - "build", - "cli", - "examples", - "runtime", - "src/fixtures", - "src/__tests__", - "**/node_modules", - "**/.*/" - ] + "exclude": [] } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 63745a1501f9..ecba728b3d91 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -155,13 +155,15 @@ importers: specifiers: '@prisma/debug': workspace:* '@prisma/engine-core': workspace:* - '@prisma/engines': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 - '@prisma/engines-version': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 - '@prisma/fetch-engine': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 + '@prisma/engines': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 + '@prisma/engines-version': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 + '@prisma/fetch-engine': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@prisma/generator-helper': workspace:* - '@prisma/get-platform': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 + '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@prisma/migrate': workspace:* '@prisma/sdk': workspace:* + '@rollup/plugin-commonjs': ^19.0.2 + '@rollup/plugin-node-resolve': ^13.0.4 '@timsuchanek/copy': 1.4.5 '@types/debug': 4.1.6 '@types/jest': 26.0.24 @@ -203,6 +205,7 @@ importers: rimraf: 3.0.2 rollup: 2.53.3 rollup-plugin-dts: 3.0.2 + rollup-plugin-ts: ^1.4.0 sort-keys: 4.2.0 source-map-support: 0.5.19 sql-template-tag: 4.0.0 @@ -214,16 +217,18 @@ importers: tsd: 0.17.0 typescript: 4.3.5 dependencies: - '@prisma/engines-version': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 + '@prisma/engines-version': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 devDependencies: '@prisma/debug': link:../debug '@prisma/engine-core': link:../engine-core - '@prisma/engines': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 - '@prisma/fetch-engine': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 + '@prisma/engines': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 + '@prisma/fetch-engine': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@prisma/generator-helper': link:../generator-helper - '@prisma/get-platform': 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 + '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@prisma/migrate': link:../migrate '@prisma/sdk': link:../sdk + '@rollup/plugin-commonjs': 19.0.2_rollup@2.53.3 + '@rollup/plugin-node-resolve': 13.0.4_rollup@2.53.3 '@timsuchanek/copy': 1.4.5 '@types/debug': 4.1.6 '@types/jest': 26.0.24 @@ -265,6 +270,7 @@ importers: rimraf: 3.0.2 rollup: 2.53.3 rollup-plugin-dts: 3.0.2_rollup@2.53.3+typescript@4.3.5 + rollup-plugin-ts: 1.4.0_rollup@2.53.3+typescript@4.3.5 sort-keys: 4.2.0 source-map-support: 0.5.19 sql-template-tag: 4.0.0 @@ -973,6 +979,29 @@ packages: - supports-color dev: true + /@babel/core/7.14.8: + resolution: {integrity: sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.14.5 + '@babel/generator': 7.14.8 + '@babel/helper-compilation-targets': 7.14.5_@babel+core@7.14.8 + '@babel/helper-module-transforms': 7.14.8 + '@babel/helpers': 7.14.8 + '@babel/parser': 7.14.8 + '@babel/template': 7.14.5 + '@babel/traverse': 7.14.8 + '@babel/types': 7.14.8 + convert-source-map: 1.8.0 + debug: 4.3.2 + gensync: 1.0.0-beta.2 + json5: 2.2.0 + semver: 6.3.0 + source-map: 0.5.7 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/generator/7.14.5: resolution: {integrity: sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==} engines: {node: '>=6.9.0'} @@ -982,6 +1011,30 @@ packages: source-map: 0.5.7 dev: true + /@babel/generator/7.14.8: + resolution: {integrity: sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.14.8 + jsesc: 2.5.2 + source-map: 0.5.7 + dev: true + + /@babel/helper-annotate-as-pure/7.14.5: + resolution: {integrity: sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.14.8 + dev: true + + /@babel/helper-builder-binary-assignment-operator-visitor/7.14.5: + resolution: {integrity: sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-explode-assignable-expression': 7.14.5 + '@babel/types': 7.14.8 + dev: true + /@babel/helper-compilation-targets/7.14.5_@babel+core@7.14.6: resolution: {integrity: sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==} engines: {node: '>=6.9.0'} @@ -995,6 +1048,72 @@ packages: semver: 6.3.0 dev: true + /@babel/helper-compilation-targets/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/compat-data': 7.14.7 + '@babel/core': 7.14.8 + '@babel/helper-validator-option': 7.14.5 + browserslist: 4.16.6 + semver: 6.3.0 + dev: true + + /@babel/helper-create-class-features-plugin/7.14.8_@babel+core@7.14.8: + resolution: {integrity: sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-annotate-as-pure': 7.14.5 + '@babel/helper-function-name': 7.14.5 + '@babel/helper-member-expression-to-functions': 7.14.7 + '@babel/helper-optimise-call-expression': 7.14.5 + '@babel/helper-replace-supers': 7.14.5 + '@babel/helper-split-export-declaration': 7.14.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/helper-create-regexp-features-plugin/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-annotate-as-pure': 7.14.5 + regexpu-core: 4.7.1 + dev: true + + /@babel/helper-define-polyfill-provider/0.2.3_@babel+core@7.14.8: + resolution: {integrity: sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==} + peerDependencies: + '@babel/core': ^7.4.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-compilation-targets': 7.14.5_@babel+core@7.14.8 + '@babel/helper-module-imports': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/traverse': 7.14.8 + debug: 4.3.2 + lodash.debounce: 4.0.8 + resolve: 1.20.0 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/helper-explode-assignable-expression/7.14.5: + resolution: {integrity: sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.14.8 + dev: true + /@babel/helper-function-name/7.14.5: resolution: {integrity: sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==} engines: {node: '>=6.9.0'} @@ -1048,6 +1167,22 @@ packages: - supports-color dev: true + /@babel/helper-module-transforms/7.14.8: + resolution: {integrity: sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-module-imports': 7.14.5 + '@babel/helper-replace-supers': 7.14.5 + '@babel/helper-simple-access': 7.14.8 + '@babel/helper-split-export-declaration': 7.14.5 + '@babel/helper-validator-identifier': 7.14.8 + '@babel/template': 7.14.5 + '@babel/traverse': 7.14.8 + '@babel/types': 7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helper-optimise-call-expression/7.14.5: resolution: {integrity: sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==} engines: {node: '>=6.9.0'} @@ -1060,6 +1195,17 @@ packages: engines: {node: '>=6.9.0'} dev: true + /@babel/helper-remap-async-to-generator/7.14.5: + resolution: {integrity: sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-annotate-as-pure': 7.14.5 + '@babel/helper-wrap-function': 7.14.5 + '@babel/types': 7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helper-replace-supers/7.14.5: resolution: {integrity: sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==} engines: {node: '>=6.9.0'} @@ -1079,6 +1225,20 @@ packages: '@babel/types': 7.14.5 dev: true + /@babel/helper-simple-access/7.14.8: + resolution: {integrity: sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.14.8 + dev: true + + /@babel/helper-skip-transparent-expression-wrappers/7.14.5: + resolution: {integrity: sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.14.8 + dev: true + /@babel/helper-split-export-declaration/7.14.5: resolution: {integrity: sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==} engines: {node: '>=6.9.0'} @@ -1090,11 +1250,28 @@ packages: resolution: {integrity: sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==} engines: {node: '>=6.9.0'} + /@babel/helper-validator-identifier/7.14.8: + resolution: {integrity: sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==} + engines: {node: '>=6.9.0'} + dev: true + /@babel/helper-validator-option/7.14.5: resolution: {integrity: sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==} engines: {node: '>=6.9.0'} dev: true + /@babel/helper-wrap-function/7.14.5: + resolution: {integrity: sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-function-name': 7.14.5 + '@babel/template': 7.14.5 + '@babel/traverse': 7.14.8 + '@babel/types': 7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/helpers/7.14.6: resolution: {integrity: sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==} engines: {node: '>=6.9.0'} @@ -1106,6 +1283,17 @@ packages: - supports-color dev: true + /@babel/helpers/7.14.8: + resolution: {integrity: sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.14.5 + '@babel/traverse': 7.14.8 + '@babel/types': 7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + /@babel/highlight/7.14.5: resolution: {integrity: sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==} engines: {node: '>=6.9.0'} @@ -1120,118 +1308,209 @@ packages: hasBin: true dev: true - /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.14.6: - resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} + /@babel/parser/7.14.8: + resolution: {integrity: sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==} + engines: {node: '>=6.0.0'} + hasBin: true + dev: true + + /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.13.0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.14.5 + '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.14.8 + dev: true + + /@babel/plugin-proposal-async-generator-functions/7.14.7_@babel+core@7.14.8: + resolution: {integrity: sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-remap-async-to-generator': 7.14.5 + '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.14.8 + transitivePeerDependencies: + - supports-color dev: true - /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} + /@babel/plugin-proposal-class-properties/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 + '@babel/helper-create-class-features-plugin': 7.14.8_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-proposal-class-static-block/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.12.0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-create-class-features-plugin': 7.14.8_@babel+core@7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.14.8 + transitivePeerDependencies: + - supports-color dev: true - /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.14.6: - resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} + /@babel/plugin-proposal-dynamic-import/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.14.6: - resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + /@babel/plugin-proposal-export-namespace-from/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} + /@babel/plugin-proposal-json-strings/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.14.6: - resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} + /@babel/plugin-proposal-logical-assignment-operators/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} + /@babel/plugin-proposal-nullish-coalescing-operator/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.14.6: - resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} + /@babel/plugin-proposal-numeric-separator/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} + /@babel/plugin-proposal-object-rest-spread/7.14.7_@babel+core@7.14.8: + resolution: {integrity: sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/compat-data': 7.14.7 + '@babel/core': 7.14.8 + '@babel/helper-compilation-targets': 7.14.5_@babel+core@7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-transform-parameters': 7.14.5_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} + /@babel/plugin-proposal-optional-catch-binding/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.14.6: - resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} + /@babel/plugin-proposal-optional-chaining/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==} + engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.14.5 + '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.14.8 dev: true - /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.14.6: - resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + /@babel/plugin-proposal-private-methods/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.14.6 + '@babel/core': 7.14.8 + '@babel/helper-create-class-features-plugin': 7.14.8_@babel+core@7.14.8 '@babel/helper-plugin-utils': 7.14.5 + transitivePeerDependencies: + - supports-color dev: true - /@babel/plugin-syntax-typescript/7.14.5_@babel+core@7.14.6: - resolution: {integrity: sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==} + /@babel/plugin-proposal-private-property-in-object/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==} engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-annotate-as-pure': 7.14.5 + '@babel/helper-create-class-features-plugin': 7.14.8_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-proposal-unicode-property-regex/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==} + engines: {node: '>=4'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-create-regexp-features-plugin': 7.14.5_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.14.6: + resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: @@ -1239,26 +1518,761 @@ packages: '@babel/helper-plugin-utils': 7.14.5 dev: true - /@babel/template/7.14.5: - resolution: {integrity: sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==} + /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.14.8: + resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.14.6: + resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.14.8: + resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-class-static-block/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==} engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 dependencies: - '@babel/code-frame': 7.14.5 + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.14.6: + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.14.6: + resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.14.8: + resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.14.6: + resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.14.8: + resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.14.6: + resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.14.8: + resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-private-property-in-object/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.14.6: + resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-syntax-typescript/7.14.5_@babel+core@7.14.6: + resolution: {integrity: sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.6 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-arrow-functions/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-async-to-generator/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-module-imports': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-remap-async-to-generator': 7.14.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-block-scoped-functions/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-block-scoping/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-classes/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-annotate-as-pure': 7.14.5 + '@babel/helper-function-name': 7.14.5 + '@babel/helper-optimise-call-expression': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-replace-supers': 7.14.5 + '@babel/helper-split-export-declaration': 7.14.5 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-computed-properties/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-destructuring/7.14.7_@babel+core@7.14.8: + resolution: {integrity: sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-dotall-regex/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-create-regexp-features-plugin': 7.14.5_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-duplicate-keys/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-exponentiation-operator/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-builder-binary-assignment-operator-visitor': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-for-of/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-function-name/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-function-name': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-literals/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-member-expression-literals/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-modules-amd/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-module-transforms': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + babel-plugin-dynamic-import-node: 2.3.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-modules-commonjs/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-module-transforms': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-simple-access': 7.14.8 + babel-plugin-dynamic-import-node: 2.3.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-modules-systemjs/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-hoist-variables': 7.14.5 + '@babel/helper-module-transforms': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-validator-identifier': 7.14.8 + babel-plugin-dynamic-import-node: 2.3.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-modules-umd/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-module-transforms': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-named-capturing-groups-regex/7.14.7_@babel+core@7.14.8: + resolution: {integrity: sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-create-regexp-features-plugin': 7.14.5_@babel+core@7.14.8 + dev: true + + /@babel/plugin-transform-new-target/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-object-super/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-replace-supers': 7.14.5 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-parameters/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-property-literals/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-regenerator/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + regenerator-transform: 0.14.5 + dev: true + + /@babel/plugin-transform-reserved-words/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-runtime/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-module-imports': 7.14.5 + '@babel/helper-plugin-utils': 7.14.5 + babel-plugin-polyfill-corejs2: 0.2.2_@babel+core@7.14.8 + babel-plugin-polyfill-corejs3: 0.2.3_@babel+core@7.14.8 + babel-plugin-polyfill-regenerator: 0.2.2_@babel+core@7.14.8 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/plugin-transform-shorthand-properties/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-spread/7.14.6_@babel+core@7.14.8: + resolution: {integrity: sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-skip-transparent-expression-wrappers': 7.14.5 + dev: true + + /@babel/plugin-transform-sticky-regex/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-template-literals/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-typeof-symbol/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-unicode-escapes/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/plugin-transform-unicode-regex/7.14.5_@babel+core@7.14.8: + resolution: {integrity: sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-create-regexp-features-plugin': 7.14.5_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + dev: true + + /@babel/preset-env/7.14.8_@babel+core@7.14.8: + resolution: {integrity: sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.14.7 + '@babel/core': 7.14.8 + '@babel/helper-compilation-targets': 7.14.5_@babel+core@7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/helper-validator-option': 7.14.5 + '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-async-generator-functions': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-proposal-class-properties': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-class-static-block': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-dynamic-import': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-export-namespace-from': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-json-strings': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-logical-assignment-operators': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-nullish-coalescing-operator': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-numeric-separator': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-object-rest-spread': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-proposal-optional-catch-binding': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-optional-chaining': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-private-methods': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-private-property-in-object': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-unicode-property-regex': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.14.8 + '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.14.8 + '@babel/plugin-syntax-class-static-block': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-export-namespace-from': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.14.8 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.14.8 + '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-syntax-private-property-in-object': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-arrow-functions': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-async-to-generator': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-block-scoped-functions': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-block-scoping': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-classes': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-computed-properties': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-destructuring': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-transform-dotall-regex': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-duplicate-keys': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-exponentiation-operator': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-for-of': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-function-name': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-literals': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-member-expression-literals': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-modules-amd': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-modules-commonjs': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-modules-systemjs': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-modules-umd': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-named-capturing-groups-regex': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-transform-new-target': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-object-super': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-parameters': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-property-literals': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-regenerator': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-reserved-words': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-shorthand-properties': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-spread': 7.14.6_@babel+core@7.14.8 + '@babel/plugin-transform-sticky-regex': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-template-literals': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-typeof-symbol': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-unicode-escapes': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-unicode-regex': 7.14.5_@babel+core@7.14.8 + '@babel/preset-modules': 0.1.4_@babel+core@7.14.8 + '@babel/types': 7.14.8 + babel-plugin-polyfill-corejs2: 0.2.2_@babel+core@7.14.8 + babel-plugin-polyfill-corejs3: 0.2.3_@babel+core@7.14.8 + babel-plugin-polyfill-regenerator: 0.2.2_@babel+core@7.14.8 + core-js-compat: 3.15.2 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/preset-modules/0.1.4_@babel+core@7.14.8: + resolution: {integrity: sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-plugin-utils': 7.14.5 + '@babel/plugin-proposal-unicode-property-regex': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-transform-dotall-regex': 7.14.5_@babel+core@7.14.8 + '@babel/types': 7.14.8 + esutils: 2.0.3 + dev: true + + /@babel/runtime/7.14.8: + resolution: {integrity: sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.13.9 + dev: true + + /@babel/template/7.14.5: + resolution: {integrity: sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.14.5 + '@babel/parser': 7.14.7 + '@babel/types': 7.14.5 + dev: true + + /@babel/traverse/7.14.7: + resolution: {integrity: sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.14.5 + '@babel/generator': 7.14.5 + '@babel/helper-function-name': 7.14.5 + '@babel/helper-hoist-variables': 7.14.5 + '@babel/helper-split-export-declaration': 7.14.5 '@babel/parser': 7.14.7 '@babel/types': 7.14.5 + debug: 4.3.2 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color dev: true - /@babel/traverse/7.14.7: - resolution: {integrity: sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ==} + /@babel/traverse/7.14.8: + resolution: {integrity: sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.14.5 - '@babel/generator': 7.14.5 + '@babel/generator': 7.14.8 '@babel/helper-function-name': 7.14.5 '@babel/helper-hoist-variables': 7.14.5 '@babel/helper-split-export-declaration': 7.14.5 - '@babel/parser': 7.14.7 - '@babel/types': 7.14.5 + '@babel/parser': 7.14.8 + '@babel/types': 7.14.8 debug: 4.3.2 globals: 11.12.0 transitivePeerDependencies: @@ -1273,6 +2287,14 @@ packages: to-fast-properties: 2.0.0 dev: true + /@babel/types/7.14.8: + resolution: {integrity: sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.14.8 + to-fast-properties: 2.0.0 + dev: true + /@bcoe/v8-coverage/0.2.3: resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==} dev: true @@ -1531,6 +2553,10 @@ packages: resolution: {integrity: sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==} dev: true + /@mdn/browser-compat-data/3.3.12: + resolution: {integrity: sha512-XC9Agp7J5JuD/yfSk212MS2iWZnmcdK+JGPh8bULBrTiduFNttcuBGrHfhyy8YNY3BSIO46J8GkcWPln7fe6wA==} + dev: true + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -1602,6 +2628,11 @@ packages: /@prisma/engines-version/2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019: resolution: {integrity: sha512-/mUTgZIN5ekhilG0Zq1VRNWQoc+pdBMLBqLLNTK0/8e2+mgcRvtWdIICsPrE2Qw387WPLGKkjsYJaCm1nVI1MA==} + dev: true + + /@prisma/engines-version/2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27: + resolution: {integrity: sha512-BWTvF1mGxjG8EtG215uhxdeW5Uf5aiH4xhfzcFPFC3Ux5BdEM1uEBrLIixX67mI+ZNhqNZSBPf0DSf2I1IsaZw==} + dev: false /@prisma/engines/2.28.0-14.dd033a7f179ff445cfb05d062e0c438eef9af38a: resolution: {integrity: sha512-a0uJ70p/qH3qmiSj5ta51iaEv8mwXtNhnvQyWBGx2Rni1+THvE5WKm5W3Pp+islCR/pjAarFy8Lum8hKUdNoXw==} @@ -1611,6 +2642,12 @@ packages: /@prisma/engines/2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019: resolution: {integrity: sha512-JlbZxmKAT81GRa1Y98VxZsW4dS5nnn9TIszc6pQ93C+T48lqWtxzoC5vWdXK1wwfhy2Zr7ZRi5uYDujwBCiVPQ==} requiresBuild: true + dev: false + + /@prisma/engines/2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27: + resolution: {integrity: sha512-r3/EnwKjbu2qz13I98hPQQdeFrOEcwdjlrB9CcoSoqRCjSHLnpdVMUvRfYuRKIoEF7p941R7/Fov0/CxOLF/MQ==} + requiresBuild: true + dev: true /@prisma/fetch-engine/2.28.0-14.dd033a7f179ff445cfb05d062e0c438eef9af38a: resolution: {integrity: sha512-10D/pU2KKHrFA0ukqmNSz/KnOmfz4ciDN3KCgDZ8mo1nEfuGL6uWojC55eqXLoyZYhihLrkrRA8al45FHxepiA==} @@ -1659,6 +2696,30 @@ packages: transitivePeerDependencies: - supports-color + /@prisma/fetch-engine/2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27: + resolution: {integrity: sha512-o30L0+IrnK8ncT5qypnMW0AagpdTGCDL9eitDp59PA4KTPcfyusgcjcIgPm0qfcsiOrbvriBYCDmjXhNKNfaMA==} + dependencies: + '@prisma/debug': 2.27.0 + '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 + chalk: 4.1.1 + execa: 5.1.1 + find-cache-dir: 3.3.1 + hasha: 5.2.2 + http-proxy-agent: 4.0.1 + https-proxy-agent: 5.0.0 + make-dir: 3.1.0 + node-fetch: 2.6.1 + p-filter: 2.1.0 + p-map: 4.0.0 + p-retry: 4.6.1 + progress: 2.0.3 + rimraf: 3.0.2 + temp-dir: 2.0.0 + tempy: 1.0.1 + transitivePeerDependencies: + - supports-color + dev: true + /@prisma/generator-helper/2.28.0-dev.22: resolution: {integrity: sha512-oR9YmqcTKFXj4nfrBISIKsP02aesyf2rHjwbyXmdHZ7E5zkNx4x5cw/NINz8jfd/6OLt9XzHgQ4QTSXKyhe1gQ==} dependencies: @@ -1685,6 +2746,14 @@ packages: transitivePeerDependencies: - supports-color + /@prisma/get-platform/2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27: + resolution: {integrity: sha512-OdTubLy4lVRYNvF3N9eODWxLxUhgh2oapDVvdMO3YmHQSeYQzzHHhYHBKoUY9zpCCAbAPBik+YIXgimJp3lqQQ==} + dependencies: + '@prisma/debug': 2.27.0 + transitivePeerDependencies: + - supports-color + dev: true + /@prisma/sdk/2.28.0-dev.22: resolution: {integrity: sha512-hT1KjlLK7m6KzcgPiZh8aU9syHixXlB+ARIEnVBiZ9ODVZ5Ba9tG0nYDAWZ/I6rRjiM92tpXzZOrJFscCVWVZA==} dependencies: @@ -1761,6 +2830,57 @@ packages: resolution: {integrity: sha512-GuoLd37rvhMOBg5WAkwmNNolKa0wGniaDFsh6fXtaTT6tcoYiQsCY5mXqajVRRr39U/MyfuyE10Bhsm+ii8jRw==} dev: true + /@rollup/plugin-commonjs/19.0.2_rollup@2.53.3: + resolution: {integrity: sha512-gBjarfqlC7qs0AutpRW/hrFNm+cd2/QKxhwyFa+srbg1oX7rDsEU3l+W7LAUhsAp9mPJMAkXDhLbQaVwEaE8bA==} + engines: {node: '>= 8.0.0'} + peerDependencies: + rollup: ^2.38.3 + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.53.3 + commondir: 1.0.1 + estree-walker: 2.0.2 + glob: 7.1.7 + is-reference: 1.2.1 + magic-string: 0.25.7 + resolve: 1.20.0 + rollup: 2.53.3 + dev: true + + /@rollup/plugin-node-resolve/13.0.4_rollup@2.53.3: + resolution: {integrity: sha512-eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==} + engines: {node: '>= 10.0.0'} + peerDependencies: + rollup: ^2.42.0 + dependencies: + '@rollup/pluginutils': 3.1.0_rollup@2.53.3 + '@types/resolve': 1.17.1 + builtin-modules: 3.2.0 + deepmerge: 4.2.2 + is-module: 1.0.0 + resolve: 1.20.0 + rollup: 2.53.3 + dev: true + + /@rollup/pluginutils/3.1.0_rollup@2.53.3: + resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} + engines: {node: '>= 8.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0 + dependencies: + '@types/estree': 0.0.39 + estree-walker: 1.0.1 + picomatch: 2.3.0 + rollup: 2.53.3 + dev: true + + /@rollup/pluginutils/4.1.1: + resolution: {integrity: sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ==} + engines: {node: '>= 8.0.0'} + dependencies: + estree-walker: 2.0.2 + picomatch: 2.3.0 + dev: true + /@sentry/core/6.2.5: resolution: {integrity: sha512-I+AkgIFO6sDUoHQticP6I27TT3L+i6TUS03in3IEtpBcSeP2jyhlxI8l/wdA7gsBqUPdQ4GHOOaNgtFIcr8qag==} engines: {node: '>=6'} @@ -1917,8 +3037,8 @@ packages: /@types/babel__core/7.1.15: resolution: {integrity: sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==} dependencies: - '@babel/parser': 7.14.7 - '@babel/types': 7.14.5 + '@babel/parser': 7.14.8 + '@babel/types': 7.14.8 '@types/babel__generator': 7.6.3 '@types/babel__template': 7.4.1 '@types/babel__traverse': 7.14.2 @@ -1927,14 +3047,14 @@ packages: /@types/babel__generator/7.6.3: resolution: {integrity: sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==} dependencies: - '@babel/types': 7.14.5 + '@babel/types': 7.14.8 dev: true /@types/babel__template/7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.14.7 - '@babel/types': 7.14.5 + '@babel/parser': 7.14.8 + '@babel/types': 7.14.8 dev: true /@types/babel__traverse/7.14.2: @@ -1959,6 +3079,10 @@ packages: '@types/json-schema': 7.0.8 dev: true + /@types/estree/0.0.39: + resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} + dev: true + /@types/estree/0.0.50: resolution: {integrity: sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==} dev: true @@ -2039,6 +3163,10 @@ packages: resolution: {integrity: sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==} dev: true + /@types/node/15.14.3: + resolution: {integrity: sha512-gliNP92vLGGha1nioYHIIT2WrZ450sxpRgyPCEyog2hMVi6LEbhY/Pkj+EDiGWrCXntZ9lrnE2+lTIlyYtaxCg==} + dev: true + /@types/node/16.4.1: resolution: {integrity: sha512-UW7cbLqf/Wu5XH2RKKY1cHwUNLicIDRLMraYKz+HHAerJ0ZffUEk+fMnd8qU2JaS6cAy0r8tsaf7yqHASf/Y0Q==} dev: true @@ -2050,6 +3178,10 @@ packages: /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} + /@types/object-path/0.11.1: + resolution: {integrity: sha512-219LSCO9HPcoXcRTC6DbCs0FRhZgBnEMzf16RRqkT40WbkKx3mOeQuz3e2XqbfhOz/AHfbru0kzB1n1RCAsIIg==} + dev: true + /@types/parse-json/4.0.0: resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==} dev: true @@ -2078,6 +3210,12 @@ packages: '@types/node': 12.20.16 dev: true + /@types/resolve/1.17.1: + resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} + dependencies: + '@types/node': 15.14.3 + dev: true + /@types/resolve/1.20.1: resolution: {integrity: sha512-Ku5+GPFa12S3W26Uwtw+xyrtIpaZsGYHH6zxNbZlstmlvMYSZRzOwzwsXbxlVUbHyUucctSyuFtu6bNxwYomIw==} dev: true @@ -2085,6 +3223,10 @@ packages: /@types/retry/0.12.1: resolution: {integrity: sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==} + /@types/semver/7.3.8: + resolution: {integrity: sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==} + dev: true + /@types/shell-quote/1.7.1: resolution: {integrity: sha512-SWZ2Nom1pkyXCDohRSrkSKvDh8QOG9RfAsrt5/NsPQC4UQJ55eG0qClA40I+Gkez4KTQ0uDUT8ELRXThf3J5jw==} dev: true @@ -2124,6 +3266,10 @@ packages: '@types/node': 12.20.16 dev: true + /@types/ua-parser-js/0.7.36: + resolution: {integrity: sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ==} + dev: true + /@types/ws/7.4.7: resolution: {integrity: sha512-JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww==} dependencies: @@ -2251,6 +3397,11 @@ packages: eslint-visitor-keys: 2.1.0 dev: true + /@wessberg/stringutil/1.0.19: + resolution: {integrity: sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg==} + engines: {node: '>=8.0.0'} + dev: true + /abab/2.0.5: resolution: {integrity: sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==} dev: true @@ -2536,6 +3687,12 @@ packages: - supports-color dev: true + /babel-plugin-dynamic-import-node/2.3.3: + resolution: {integrity: sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==} + dependencies: + object.assign: 4.1.2 + dev: true + /babel-plugin-istanbul/6.0.0: resolution: {integrity: sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==} engines: {node: '>=8'} @@ -2559,6 +3716,42 @@ packages: '@types/babel__traverse': 7.14.2 dev: true + /babel-plugin-polyfill-corejs2/0.2.2_@babel+core@7.14.8: + resolution: {integrity: sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/compat-data': 7.14.7 + '@babel/core': 7.14.8 + '@babel/helper-define-polyfill-provider': 0.2.3_@babel+core@7.14.8 + semver: 6.3.0 + transitivePeerDependencies: + - supports-color + dev: true + + /babel-plugin-polyfill-corejs3/0.2.3_@babel+core@7.14.8: + resolution: {integrity: sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-define-polyfill-provider': 0.2.3_@babel+core@7.14.8 + core-js-compat: 3.15.2 + transitivePeerDependencies: + - supports-color + dev: true + + /babel-plugin-polyfill-regenerator/0.2.2_@babel+core@7.14.8: + resolution: {integrity: sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.14.8 + '@babel/helper-define-polyfill-provider': 0.2.3_@babel+core@7.14.8 + transitivePeerDependencies: + - supports-color + dev: true + /babel-preset-current-node-syntax/1.0.1_@babel+core@7.14.6: resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: @@ -2661,14 +3854,30 @@ packages: resolution: {integrity: sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==} dev: true + /browserslist-generator/1.0.59: + resolution: {integrity: sha512-pY1JNAxBMtsDbmLxTn5AXM5j+R7L0WAEFSFUr7zC9bKQJAqjMG83AUV2+EIdxPGV3297PMKAUW9MB8OQ1IEyVg==} + engines: {node: '>=8.0.0'} + dependencies: + '@mdn/browser-compat-data': 3.3.12 + '@types/object-path': 0.11.1 + '@types/semver': 7.3.8 + '@types/ua-parser-js': 0.7.36 + browserslist: 4.16.6 + caniuse-lite: 1.0.30001247 + isbot: 3.0.26 + object-path: 0.11.5 + semver: 7.3.5 + ua-parser-js: 0.7.28 + dev: true + /browserslist/4.16.6: resolution: {integrity: sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001245 + caniuse-lite: 1.0.30001247 colorette: 1.2.2 - electron-to-chromium: 1.3.778 + electron-to-chromium: 1.3.787 escalade: 3.1.1 node-releases: 1.1.73 dev: true @@ -2708,6 +3917,11 @@ packages: base64-js: 1.5.1 ieee754: 1.2.1 + /builtin-modules/3.2.0: + resolution: {integrity: sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==} + engines: {node: '>=6'} + dev: true + /bytes/3.1.0: resolution: {integrity: sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==} engines: {node: '>= 0.8'} @@ -2744,8 +3958,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite/1.0.30001245: - resolution: {integrity: sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA==} + /caniuse-lite/1.0.30001247: + resolution: {integrity: sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ==} dev: true /caseless/0.12.0: @@ -2880,6 +4094,26 @@ packages: /commondir/1.0.1: resolution: {integrity: sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=} + /compatfactory/0.0.7_typescript@4.3.5: + resolution: {integrity: sha512-O11m9rzI6B8NEVf+u2kVt7dNf5oy8kaEp6i8r3cj8UVsT58zxW0jEABcyijoEcCwqNrJQvn2gSJ/XMLadLQEoQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + typescript: '>=3.x || >= 4.x' + dependencies: + helpertypes: 0.0.2 + typescript: 4.3.5 + dev: true + + /compatfactory/0.0.8_typescript@4.3.5: + resolution: {integrity: sha512-0XBP2rWr98/ONiNqaNfJU9vxtbZ0GokxFFoc1aQIWl85aimUjUfJhIWKDsbJ3rEpHKlFFmHX1EzVziwR+Cg0Ww==} + engines: {node: '>=10.0.0'} + peerDependencies: + typescript: '>=3.x || >= 4.x' + dependencies: + helpertypes: 0.0.3 + typescript: 4.3.5 + dev: true + /compress-commons/3.0.0: resolution: {integrity: sha512-FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==} engines: {node: '>= 8'} @@ -2928,6 +4162,13 @@ packages: engines: {node: '>= 0.6'} dev: true + /core-js-compat/3.15.2: + resolution: {integrity: sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==} + dependencies: + browserslist: 4.16.6 + semver: 7.0.0 + dev: true + /core-util-is/1.0.2: resolution: {integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=} @@ -2974,6 +4215,13 @@ packages: shebang-command: 2.0.0 which: 2.0.2 + /crosspath/0.0.9: + resolution: {integrity: sha512-lhDiWhqHk1IQ0BiGN9/Ji7qEr9LwCG8taDCTgihII/6b91my+GvTNXDB7eKh/FySz488tkt2IboqBJTSZtc4Fw==} + engines: {node: '>=10.0.0'} + dependencies: + '@types/node': 15.14.3 + dev: true + /crypto-random-string/2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} engines: {node: '>=8'} @@ -3093,6 +4341,13 @@ packages: engines: {node: '>=0.10.0'} dev: true + /define-properties/1.1.3: + resolution: {integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==} + engines: {node: '>= 0.4'} + dependencies: + object-keys: 1.1.1 + dev: true + /del/6.0.0: resolution: {integrity: sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==} engines: {node: '>=10'} @@ -3202,8 +4457,8 @@ packages: resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=} dev: true - /electron-to-chromium/1.3.778: - resolution: {integrity: sha512-Lw04qJaPtWdq0d7qKHJTgkam+FhFi3hm/scf1EyqJWdjO3ZIGUJhNmZJRXWb7yb/bRYXQyVGSpa9RqVpjjWMQw==} + /electron-to-chromium/1.3.787: + resolution: {integrity: sha512-zeM5AFwvTlSYvGpBaFZKVo7GQEWSk6hS3rQ7mdrr3qB7CiqVl84K6nIPznyKSu0b8ABiEeMEIqyBuzqMkxnjjg==} dev: true /emittery/0.8.1: @@ -3476,6 +4731,14 @@ packages: engines: {node: '>=4.0'} dev: true + /estree-walker/1.0.1: + resolution: {integrity: sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==} + dev: true + + /estree-walker/2.0.2: + resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + dev: true + /esutils/2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} @@ -3976,9 +5239,19 @@ packages: resolution: {integrity: sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==} engines: {node: '>=8'} dependencies: - is-stream: 2.0.0 + is-stream: 2.0.1 type-fest: 0.8.1 + /helpertypes/0.0.2: + resolution: {integrity: sha512-PKVtWnJ+dcvPeUJRiqtbraN/Hr2rNEnS14T/IxDBb0KgHkAL5w4YwVxMEPowA9vyoMP0DrwO0TxJ+KH3UF/6YA==} + engines: {node: '>=10.0.0'} + dev: true + + /helpertypes/0.0.3: + resolution: {integrity: sha512-+cAWp4/nDChu3u8qEk0/8HkM+vjPv9Ej56IWZ/bipYhCcYrH+uVWPL0rkKIkc4R6sY+eDFa0IbFGqO40DKPftQ==} + engines: {node: '>=10.0.0'} + dev: true + /hosted-git-info/2.8.9: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} @@ -4202,6 +5475,10 @@ packages: is-path-inside: 3.0.3 dev: true + /is-module/1.0.0: + resolution: {integrity: sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=} + dev: true + /is-number/7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} @@ -4238,6 +5515,12 @@ packages: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} dev: true + /is-reference/1.2.1: + resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==} + dependencies: + '@types/estree': 0.0.50 + dev: true + /is-regexp/1.0.0: resolution: {integrity: sha1-/S2INUXEa6xaYz57mgnof6LLUGk=} engines: {node: '>=0.10.0'} @@ -4252,6 +5535,10 @@ packages: resolution: {integrity: sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==} engines: {node: '>=8'} + /is-stream/2.0.1: + resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} + engines: {node: '>=8'} + /is-typedarray/1.0.0: resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=} dev: true @@ -4270,6 +5557,11 @@ packages: /isarray/1.0.0: resolution: {integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=} + /isbot/3.0.26: + resolution: {integrity: sha512-y1IwTPP6pRGDmQUTrCz1bZ9ZPSmij3eWruBBIiCOARX5ueyLv58xuFxvUGg6uI0k9u1swnOmJR8DKYZbcDXLqQ==} + engines: {node: '>=10'} + dev: true + /isexe/2.0.0: resolution: {integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=} @@ -4876,6 +6168,11 @@ packages: - utf-8-validate dev: true + /jsesc/0.5.0: + resolution: {integrity: sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=} + hasBin: true + dev: true + /jsesc/2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} @@ -5092,6 +6389,10 @@ packages: resolution: {integrity: sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=} dev: true + /lodash.debounce/4.0.8: + resolution: {integrity: sha1-gteb/zCmfEAF/9XiUVMArZyk168=} + dev: true + /lodash.deburr/4.1.0: resolution: {integrity: sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s=} @@ -5617,6 +6918,26 @@ packages: resolution: {integrity: sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==} dev: true + /object-keys/1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + dev: true + + /object-path/0.11.5: + resolution: {integrity: sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==} + engines: {node: '>= 10.12.0'} + dev: true + + /object.assign/4.1.2: + resolution: {integrity: sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.1.3 + has-symbols: 1.0.2 + object-keys: 1.1.1 + dev: true + /on-finished/2.3.0: resolution: {integrity: sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=} engines: {node: '>= 0.8'} @@ -6179,11 +7500,55 @@ packages: redis-parser: 3.0.0 dev: true + /regenerate-unicode-properties/8.2.0: + resolution: {integrity: sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==} + engines: {node: '>=4'} + dependencies: + regenerate: 1.4.2 + dev: true + + /regenerate/1.4.2: + resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} + dev: true + + /regenerator-runtime/0.13.9: + resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==} + dev: true + + /regenerator-transform/0.14.5: + resolution: {integrity: sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==} + dependencies: + '@babel/runtime': 7.14.8 + dev: true + /regexpp/3.2.0: resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} engines: {node: '>=8'} dev: true + /regexpu-core/4.7.1: + resolution: {integrity: sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==} + engines: {node: '>=4'} + dependencies: + regenerate: 1.4.2 + regenerate-unicode-properties: 8.2.0 + regjsgen: 0.5.2 + regjsparser: 0.6.9 + unicode-match-property-ecmascript: 1.0.4 + unicode-match-property-value-ecmascript: 1.2.0 + dev: true + + /regjsgen/0.5.2: + resolution: {integrity: sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==} + dev: true + + /regjsparser/0.6.9: + resolution: {integrity: sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==} + hasBin: true + dependencies: + jsesc: 0.5.0 + dev: true + /replace-string/3.1.0: resolution: {integrity: sha512-yPpxc4ZR2makceA9hy/jHNqc7QVkd4Je/N0WRHm6bs3PtivPuPynxE5ejU/mp5EhnCv8+uZL7vhz8rkluSlx+Q==} engines: {node: '>=8'} @@ -6301,6 +7666,40 @@ packages: '@babel/code-frame': 7.14.5 dev: true + /rollup-plugin-ts/1.4.0_rollup@2.53.3+typescript@4.3.5: + resolution: {integrity: sha512-cSKYPzKj+MKOb5iC+amRRCexBnalsZ4n1WXVYPhk9k66eskKAWW/uxT5ioom2FxVP0g4H9vdjzu1ZT8s16WKwg==} + engines: {node: '>=10.0.0'} + peerDependencies: + rollup: '>=1.x || >=2.x' + typescript: '>=3.2.x || >= 4.x' + dependencies: + '@babel/core': 7.14.8 + '@babel/plugin-proposal-async-generator-functions': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-proposal-json-strings': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-object-rest-spread': 7.14.7_@babel+core@7.14.8 + '@babel/plugin-proposal-optional-catch-binding': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-proposal-unicode-property-regex': 7.14.5_@babel+core@7.14.8 + '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.14.8 + '@babel/plugin-transform-runtime': 7.14.5_@babel+core@7.14.8 + '@babel/preset-env': 7.14.8_@babel+core@7.14.8 + '@babel/runtime': 7.14.8 + '@rollup/pluginutils': 4.1.1 + '@types/babel__core': 7.1.15 + '@wessberg/stringutil': 1.0.19 + browserslist: 4.16.6 + browserslist-generator: 1.0.59 + chalk: 4.1.1 + compatfactory: 0.0.7_typescript@4.3.5 + crosspath: 0.0.9 + magic-string: 0.25.7 + rollup: 2.53.3 + ts-clone-node: 0.3.24_typescript@4.3.5 + tslib: 2.3.0 + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + /rollup/2.53.3: resolution: {integrity: sha512-79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA==} engines: {node: '>=10.0.0'} @@ -6368,6 +7767,11 @@ packages: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true + /semver/7.0.0: + resolution: {integrity: sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==} + hasBin: true + dev: true + /semver/7.3.5: resolution: {integrity: sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==} engines: {node: '>=10'} @@ -6853,7 +8257,7 @@ packages: engines: {node: '>=10'} dependencies: del: 6.0.0 - is-stream: 2.0.0 + is-stream: 2.0.1 temp-dir: 2.0.0 type-fest: 0.16.0 unique-string: 2.0.0 @@ -6951,6 +8355,16 @@ packages: engines: {node: '>=8'} dev: true + /ts-clone-node/0.3.24_typescript@4.3.5: + resolution: {integrity: sha512-C6fs6pEyzSqIwnsJ2T9UQmYY4v3wekwQ/enmqMdRsjazRX0aDFq8VJiJuxiIzX7wsd0p1+Jn5hjG2i8UYc/1RQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + typescript: ^3.x || ^4.x + dependencies: + compatfactory: 0.0.8_typescript@4.3.5 + typescript: 4.3.5 + dev: true + /ts-jest/27.0.3_jest@27.0.6+typescript@4.3.5: resolution: {integrity: sha512-U5rdMjnYam9Ucw+h0QvtNDbc5+88nxt7tbIvqaZUhFrfG4+SkWhMXjejCLVGcpILTPuV+H3W/GZDZrnZFpPeXw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -7153,6 +8567,10 @@ packages: hasBin: true dev: true + /ua-parser-js/0.7.28: + resolution: {integrity: sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==} + dev: true + /underscore/1.13.1: resolution: {integrity: sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==} dev: true @@ -7160,6 +8578,29 @@ packages: /undici/3.3.6: resolution: {integrity: sha512-/j3YTZ5AobMB4ZrTY72mzM54uFUX32v0R/JRW9G2vOyF1uSKYAx+WT8dMsAcRS13TOFISv094TxIyWYk+WEPsA==} + /unicode-canonical-property-names-ecmascript/1.0.4: + resolution: {integrity: sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==} + engines: {node: '>=4'} + dev: true + + /unicode-match-property-ecmascript/1.0.4: + resolution: {integrity: sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==} + engines: {node: '>=4'} + dependencies: + unicode-canonical-property-names-ecmascript: 1.0.4 + unicode-property-aliases-ecmascript: 1.1.0 + dev: true + + /unicode-match-property-value-ecmascript/1.2.0: + resolution: {integrity: sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==} + engines: {node: '>=4'} + dev: true + + /unicode-property-aliases-ecmascript/1.1.0: + resolution: {integrity: sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==} + engines: {node: '>=4'} + dev: true + /unique-string/2.0.0: resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==} engines: {node: '>=8'} From 45b32048b6b9351fd86c45898592e7514a5798da Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Tue, 27 Jul 2021 19:14:14 -0500 Subject: [PATCH 02/28] chore(client): cleanup --- src/packages/client/.gitignore | 6 ------ src/packages/client/.npmignore | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/packages/client/.gitignore b/src/packages/client/.gitignore index fbb2f48b3172..3a2b8196ce41 100644 --- a/src/packages/client/.gitignore +++ b/src/packages/client/.gitignore @@ -4,12 +4,6 @@ /generator-build /declaration -*-dmmf.json -*-dmmf-raw.json -prisma-client-*.tgz -*.zip - -yarn-error.log pnpm-lock.yaml *.tsbuildinfo .DS_Store diff --git a/src/packages/client/.npmignore b/src/packages/client/.npmignore index 63532ceb0643..e69de29bb2d1 100644 --- a/src/packages/client/.npmignore +++ b/src/packages/client/.npmignore @@ -1,2 +0,0 @@ -runtime/prisma -runtime/schema-inferrer-bin \ No newline at end of file From 7dbe7139d2dc1406bbf159b86a3275217b75d151 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Tue, 27 Jul 2021 19:14:46 -0500 Subject: [PATCH 03/28] chore(client, eslint): parse other files too --- src/packages/client/tsconfig.eslint.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/client/tsconfig.eslint.json b/src/packages/client/tsconfig.eslint.json index 1837c69bd56c..4c03474eda81 100644 --- a/src/packages/client/tsconfig.eslint.json +++ b/src/packages/client/tsconfig.eslint.json @@ -1,4 +1,4 @@ { - "include": ["**/*.ts"], + "include": ["**/*"], "exclude": [] } From b5846c0f5ed73b04c43c7d28c312b2eb1ba64a0e Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 16:09:50 -0500 Subject: [PATCH 04/28] fix(integration-tests): directly import getTestClient --- .../src/__tests__/__helpers__/integrationTest.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/integration-tests/src/__tests__/__helpers__/integrationTest.ts b/src/packages/integration-tests/src/__tests__/__helpers__/integrationTest.ts index fa9895662900..513b7a91b506 100644 --- a/src/packages/integration-tests/src/__tests__/__helpers__/integrationTest.ts +++ b/src/packages/integration-tests/src/__tests__/__helpers__/integrationTest.ts @@ -5,7 +5,7 @@ import { FSJetpack } from 'fs-jetpack/types' import path from 'path' import hash from 'string-hash' import VError, { MultiError } from 'verror' -import { getTestClient } from '@prisma/client/dist/utils/getTestClient' +import { getTestClient } from '../../../../client/src/utils/getTestClient' process.setMaxListeners(200) From 7be8ea148a269ba179637a06fee19b3758d04ab9 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 17:02:52 -0500 Subject: [PATCH 05/28] chore(client, prisma): generalize tsconfig --- scripts/lint.ts | 2 +- src/packages/client/.gitignore | 5 ++- src/packages/client/helpers/build.js | 5 +-- ...g.declaration.json => tsconfig.build.json} | 4 ++- src/packages/client/tsconfig.eslint.json | 3 +- src/packages/client/tsconfig.generator.json | 17 --------- src/packages/client/tsconfig.json | 35 ++----------------- src/packages/client/tsconfig.runtime.json | 19 ---------- tsconfig.json | 15 ++++++-- 9 files changed, 24 insertions(+), 81 deletions(-) rename src/packages/client/{tsconfig.declaration.json => tsconfig.build.json} (54%) delete mode 100644 src/packages/client/tsconfig.generator.json delete mode 100644 src/packages/client/tsconfig.runtime.json diff --git a/scripts/lint.ts b/scripts/lint.ts index 486937135bb8..925daddefc66 100644 --- a/scripts/lint.ts +++ b/scripts/lint.ts @@ -19,7 +19,7 @@ async function main() { } } - let packages = [] + let packages = [] as string[] if (args['--staged']) { packages = await getStagedPackages() } else { diff --git a/src/packages/client/.gitignore b/src/packages/client/.gitignore index 3a2b8196ce41..584a36c636a5 100644 --- a/src/packages/client/.gitignore +++ b/src/packages/client/.gitignore @@ -1,8 +1,7 @@ /node_modules -/dist -/runtime -/generator-build /declaration +/generator-build +/runtime pnpm-lock.yaml *.tsbuildinfo diff --git a/src/packages/client/helpers/build.js b/src/packages/client/helpers/build.js index 4c2f0e146967..bb50fd30d3c6 100644 --- a/src/packages/client/helpers/build.js +++ b/src/packages/client/helpers/build.js @@ -17,25 +17,22 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: ['src/generation/generator.ts'], outfile: 'generator-build/index.js', - tsconfig: 'tsconfig.generator.json' }), esbuild.build({ ...ESBUILD_DEFAULT, entryPoints: ['src/runtime/index.ts'], outfile: 'runtime/index.js', - tsconfig: 'tsconfig.runtime.json' }), esbuild.build({ ...ESBUILD_DEFAULT, entryPoints: ['src/runtime/index-browser.ts'], outfile: 'runtime/index-browser.js', - tsconfig: 'tsconfig.runtime.json', target: ['chrome58', 'firefox57', 'safari11', 'edge16'], format: 'cjs', }), ]) - await run('tsc --build tsconfig.declaration.json') + await run('tsc --build tsconfig.build.json') await run('rollup -c') const after = Date.now() diff --git a/src/packages/client/tsconfig.declaration.json b/src/packages/client/tsconfig.build.json similarity index 54% rename from src/packages/client/tsconfig.declaration.json rename to src/packages/client/tsconfig.build.json index 3dc685adc83d..c66adbf900a7 100644 --- a/src/packages/client/tsconfig.declaration.json +++ b/src/packages/client/tsconfig.build.json @@ -1,7 +1,9 @@ { - "extends": "./tsconfig.runtime.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "declaration", "emitDeclarationOnly": true }, + "include": ["src/runtime"], + "exclude": [] } diff --git a/src/packages/client/tsconfig.eslint.json b/src/packages/client/tsconfig.eslint.json index 4c03474eda81..fc8520e73765 100644 --- a/src/packages/client/tsconfig.eslint.json +++ b/src/packages/client/tsconfig.eslint.json @@ -1,4 +1,3 @@ { - "include": ["**/*"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/client/tsconfig.generator.json b/src/packages/client/tsconfig.generator.json deleted file mode 100644 index c8f45bf6dbd2..000000000000 --- a/src/packages/client/tsconfig.generator.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "generator-build", - "rootDir": "src/generation", - "declaration": true, - "skipDefaultLibCheck": true - }, - "include": ["src/generation"], - "exclude": [] -} diff --git a/src/packages/client/tsconfig.json b/src/packages/client/tsconfig.json index 61868bdbaae7..241795ffcad8 100644 --- a/src/packages/client/tsconfig.json +++ b/src/packages/client/tsconfig.json @@ -1,37 +1,8 @@ { - "compilerOptions": { - "lib": [ - "esnext" - ], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, // TODO Can't let TS shoot itself on the foot - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "incremental": true, - "noUncheckedIndexedAccess": false, // TODO Can't let TS shoot itself on the foot - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - }, + "extends": "../../../tsconfig.json", "exclude": [ - "dist", - "build", - "cli", - "fixtures", - "runtime", - "runtime-dist", - "generator", - "src/__tests__/generation/node_modules", - "src/__tests__/types", - "src/__tests__/benchmarks", - "src/__tests__/runtime-tests", + "declaration", "generator-build", - "sandbox", - "index.d.ts", - "scripts/backup-index.d.ts" + "runtime" ] } \ No newline at end of file diff --git a/src/packages/client/tsconfig.runtime.json b/src/packages/client/tsconfig.runtime.json deleted file mode 100644 index 6475bddfdd1c..000000000000 --- a/src/packages/client/tsconfig.runtime.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "runtime", - "rootDir": "src/runtime", - "declaration": true, - "incremental": true, - "skipDefaultLibCheck": true, - "tsBuildInfoFile": ".tsbuildinfo" - }, - "include": ["src/runtime"], - "exclude": [] -} diff --git a/tsconfig.json b/tsconfig.json index 37e761d64d6d..87bbd2dbe10e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,18 @@ "compilerOptions": { "target": "es2018", "module": "commonjs", + "lib": ["esnext"], "esModuleInterop": true, - "lib": ["esnext"] - } + "sourceMap": true, + "declaration": true, + "incremental": true, + + "strict": true, + "noImplicitAny": false, // TODO Can't let TS shoot itself on the foot + "noUncheckedIndexedAccess": false, // TODO Can't let TS shoot itself on the foot + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "skipDefaultLibCheck": true + }, + "include": ["**/*"] } From aeb913c7f18163fb74182ed6013990a4dd7fba1f Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 17:36:25 -0500 Subject: [PATCH 06/28] chore(client, prisma): split tsconfigs --- src/packages/client/tsconfig.build.json | 3 +-- src/packages/client/tsconfig.json | 1 + tsconfig.build.json | 23 +++++++++++++++++++++++ tsconfig.json | 19 +++++-------------- 4 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 tsconfig.build.json diff --git a/src/packages/client/tsconfig.build.json b/src/packages/client/tsconfig.build.json index c66adbf900a7..26ec95585c73 100644 --- a/src/packages/client/tsconfig.build.json +++ b/src/packages/client/tsconfig.build.json @@ -1,9 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { "outDir": "declaration", "emitDeclarationOnly": true }, "include": ["src/runtime"], - "exclude": [] } diff --git a/src/packages/client/tsconfig.json b/src/packages/client/tsconfig.json index 241795ffcad8..421c801d8b57 100644 --- a/src/packages/client/tsconfig.json +++ b/src/packages/client/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../../tsconfig.json", "exclude": [ + "node_modules", "declaration", "generator-build", "runtime" diff --git a/tsconfig.build.json b/tsconfig.build.json new file mode 100644 index 000000000000..01ab021b6925 --- /dev/null +++ b/tsconfig.build.json @@ -0,0 +1,23 @@ +{ + "compilerOptions": { + "target": "es2018", + "module": "commonjs", + "lib": ["esnext"], + "esModuleInterop": true, + "sourceMap": true, + "declaration": true, + "incremental": true, + "outDir": "dist", + + "strict": true, + "noImplicitAny": false, + "noUncheckedIndexedAccess": false, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "skipDefaultLibCheck": true + }, + "exclude": [ + "dist", + "node_modules" + ] +} diff --git a/tsconfig.json b/tsconfig.json index 87bbd2dbe10e..7aebc6718cfd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,19 +1,10 @@ { + "extends": "./tsconfig.build.json", "compilerOptions": { - "target": "es2018", - "module": "commonjs", - "lib": ["esnext"], - "esModuleInterop": true, - "sourceMap": true, - "declaration": true, - "incremental": true, - - "strict": true, - "noImplicitAny": false, // TODO Can't let TS shoot itself on the foot - "noUncheckedIndexedAccess": false, // TODO Can't let TS shoot itself on the foot - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "skipDefaultLibCheck": true + "baseUrl": "./src/packages", + "paths": { + "@prisma/client": ["client/src/runtime"] + } }, "include": ["**/*"] } From 6b35f81d5da3b1d2b36d98d5f669e2edd44cd27a Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 18:07:46 -0500 Subject: [PATCH 07/28] chore(client): fix eslint --- src/packages/client/.eslintignore | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/packages/client/.eslintignore b/src/packages/client/.eslintignore index 56eb8c45c112..5eb45266a851 100644 --- a/src/packages/client/.eslintignore +++ b/src/packages/client/.eslintignore @@ -1,19 +1,11 @@ /node_modules -/dist /generator-build +/declaration /runtime -/runtime-dist -/fixtures -/index.d.ts -/scripts/ -sandbox +/sandbox -/src/byline.ts -/src/__tests__/generation/node_modules +generated-dmmf.ts /src/__tests__/types -/src/__tests__/runtime-tests /src/__tests__/benchmarks -/src/sandbox -generated-dmmf.ts /src/__tests__/__helpers__/dmmf-types.ts From acea1da1ea4be53813ab2577a4b1f9c4d561c91b Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 18:08:39 -0500 Subject: [PATCH 08/28] chore(client): cleanup --- src/packages/client/.eslintignore | 1 - src/packages/client/src/byline.ts | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/client/.eslintignore b/src/packages/client/.eslintignore index 5eb45266a851..801970943aea 100644 --- a/src/packages/client/.eslintignore +++ b/src/packages/client/.eslintignore @@ -8,4 +8,3 @@ generated-dmmf.ts /src/__tests__/types /src/__tests__/benchmarks /src/__tests__/__helpers__/dmmf-types.ts - diff --git a/src/packages/client/src/byline.ts b/src/packages/client/src/byline.ts index 35ef4abd5ec9..704fc83d01ec 100644 --- a/src/packages/client/src/byline.ts +++ b/src/packages/client/src/byline.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-this-alias */ // Copyright (C) 2011-2015 John Hewson // // Permission is hereby granted, free of charge, to any person obtaining a copy From 40ebfdb4ade8943292ee73d99e9ab972a29bd6d4 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 18:21:56 -0500 Subject: [PATCH 09/28] chore(client): remove build time --- src/packages/client/helpers/build.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/packages/client/helpers/build.js b/src/packages/client/helpers/build.js index bb50fd30d3c6..c15a4b818db5 100644 --- a/src/packages/client/helpers/build.js +++ b/src/packages/client/helpers/build.js @@ -1,5 +1,4 @@ const execa = require('execa') -const chalk = require('chalk') const esbuild = require('esbuild') const ESBUILD_DEFAULT = { @@ -10,8 +9,6 @@ const ESBUILD_DEFAULT = { } async function build() { - const before = Date.now() - await Promise.all([ esbuild.build({ ...ESBUILD_DEFAULT, @@ -34,15 +31,6 @@ async function build() { await run('tsc --build tsconfig.build.json') await run('rollup -c') - - const after = Date.now() - console.log( - chalk.blueBright( - `\nDone with client build in ${chalk.bold( - ((after - before) / 1000).toFixed(1), - )}s`, - ), - ) } function run(command, preferLocal = true) { From 9a74ac33e4ee8cd65d4615db220d10bc09b1b4fe Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 19:47:17 -0500 Subject: [PATCH 10/28] chore(sdk): esbuild + inherited tsconfig --- src/packages/sdk/.eslintignore | 2 +- src/packages/sdk/helpers/build.js | 32 ++++ src/packages/sdk/package.json | 4 +- src/packages/sdk/src/utils/getEnvPaths.ts | 2 + src/packages/sdk/tsconfig.build.json | 7 +- src/packages/sdk/tsconfig.eslint.json | 4 +- src/packages/sdk/tsconfig.json | 15 +- src/pnpm-lock.yaml | 176 ++++++++++++++++++++-- tsconfig.build.json | 6 +- tsconfig.json | 6 +- 10 files changed, 219 insertions(+), 35 deletions(-) create mode 100644 src/packages/sdk/helpers/build.js diff --git a/src/packages/sdk/.eslintignore b/src/packages/sdk/.eslintignore index 3cab9f0a16b4..0960b933d1dd 100644 --- a/src/packages/sdk/.eslintignore +++ b/src/packages/sdk/.eslintignore @@ -1,4 +1,4 @@ node_modules -dist +/dist src/utils/byline.ts src/highlight/prism.ts \ No newline at end of file diff --git a/src/packages/sdk/helpers/build.js b/src/packages/sdk/helpers/build.js new file mode 100644 index 000000000000..458667084dbb --- /dev/null +++ b/src/packages/sdk/helpers/build.js @@ -0,0 +1,32 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'dist', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json index 0ae4f061f297..e7c5ffd373bd 100644 --- a/src/packages/sdk/package.json +++ b/src/packages/sdk/package.json @@ -13,7 +13,7 @@ "bugs": "https://github.com/prisma/prisma/issues", "license": "Apache-2.0", "scripts": { - "build": "tsc -d -p tsconfig.build.json", + "build": "node helpers/build.js", "prepublishOnly": "pnpm run build && pnpm run test", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", @@ -34,11 +34,13 @@ "@types/tar": "4.0.5", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "prettier": "2.3.2", diff --git a/src/packages/sdk/src/utils/getEnvPaths.ts b/src/packages/sdk/src/utils/getEnvPaths.ts index 62af657186de..094eefca902d 100644 --- a/src/packages/sdk/src/utils/getEnvPaths.ts +++ b/src/packages/sdk/src/utils/getEnvPaths.ts @@ -59,6 +59,8 @@ function getProjectRootEnvPath( debug(`skipping package.json at ${pkgPath}`) } } + + return undefined }, opts) if (!pkgJsonPath) { diff --git a/src/packages/sdk/tsconfig.build.json b/src/packages/sdk/tsconfig.build.json index 4ff65471f47a..e0244d8566d7 100644 --- a/src/packages/sdk/tsconfig.build.json +++ b/src/packages/sdk/tsconfig.build.json @@ -1,7 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { - "outDir": "dist" + "outDir": "dist", + "emitDeclarationOnly": true }, - "exclude": ["dist", "build", "src/__tests__", "sandbox"] + "include": ["src"], } diff --git a/src/packages/sdk/tsconfig.eslint.json b/src/packages/sdk/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/sdk/tsconfig.eslint.json +++ b/src/packages/sdk/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/sdk/tsconfig.json b/src/packages/sdk/tsconfig.json index b28b41a71a4c..b027bb4567b9 100644 --- a/src/packages/sdk/tsconfig.json +++ b/src/packages/sdk/tsconfig.json @@ -1,14 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext", "esnext.asynciterable"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "rootDir": "src", - "declaration": true, - "incremental": true - } -} + "extends": "../../../tsconfig.json" +} \ No newline at end of file diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index be2d247b1764..b72f6b63e069 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -644,14 +644,15 @@ importers: '@types/resolve': 1.20.1 '@types/shell-quote': 1.7.1 '@types/tar': 4.0.5 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 archiver: ^4.0.0 arg: ^5.0.0 chalk: 4.1.1 checkpoint-client: 1.1.20 cli-truncate: ^2.1.0 dotenv: ^10.0.0 + esbuild: ^0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -659,12 +660,13 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 find-up: 5.0.0 + glob: ^7.1.7 global-dirs: ^3.0.0 globby: ^11.0.0 has-yarn: ^2.1.0 is-ci: ^3.0.0 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 make-dir: ^3.0.2 node-fetch: 2.6.1 p-map: ^4.0.0 @@ -682,7 +684,7 @@ importers: tempy: ^1.0.0 terminal-link: ^2.1.1 tmp: 0.2.1 - ts-jest: 27.0.3 + ts-jest: 27.0.4 ts-node: 10.1.0 typescript: 4.3.5 dependencies: @@ -727,17 +729,19 @@ importers: '@types/resolve': 1.20.1 '@types/shell-quote': 1.7.1 '@types/tar': 4.0.5 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca + glob: 7.1.7 jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + lint-staged: 11.1.1 prettier: 2.3.2 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 ts-node: 10.1.0_6a5e1f2f9646ad83684ea4da8a674e6d typescript: 4.3.5 @@ -2144,6 +2148,31 @@ packages: - supports-color dev: true + /@typescript-eslint/eslint-plugin/4.28.5_514553717ff968e20f6d1c6e521f8616: + resolution: {integrity: sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q==} + engines: {node: ^10.12.0 || >=12.0.0} + peerDependencies: + '@typescript-eslint/parser': ^4.0.0 + eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/experimental-utils': 4.28.5_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/scope-manager': 4.28.5 + debug: 4.3.2 + eslint: 7.31.0 + functional-red-black-tree: 1.0.1 + regexpp: 3.2.0 + semver: 7.3.5 + tsutils: 3.21.0_typescript@4.3.5 + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/experimental-utils/4.28.4_eslint@7.31.0+typescript@4.3.5: resolution: {integrity: sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA==} engines: {node: ^10.12.0 || >=12.0.0} @@ -2162,6 +2191,24 @@ packages: - typescript dev: true + /@typescript-eslint/experimental-utils/4.28.5_eslint@7.31.0+typescript@4.3.5: + resolution: {integrity: sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA==} + engines: {node: ^10.12.0 || >=12.0.0} + peerDependencies: + eslint: '*' + dependencies: + '@types/json-schema': 7.0.8 + '@typescript-eslint/scope-manager': 4.28.5 + '@typescript-eslint/types': 4.28.5 + '@typescript-eslint/typescript-estree': 4.28.5_typescript@4.3.5 + eslint: 7.31.0 + eslint-scope: 5.1.1 + eslint-utils: 3.0.0_eslint@7.31.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/parser/4.28.4_eslint@7.31.0+typescript@4.3.5: resolution: {integrity: sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==} engines: {node: ^10.12.0 || >=12.0.0} @@ -2182,6 +2229,26 @@ packages: - supports-color dev: true + /@typescript-eslint/parser/4.28.5_eslint@7.31.0+typescript@4.3.5: + resolution: {integrity: sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==} + engines: {node: ^10.12.0 || >=12.0.0} + peerDependencies: + eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 4.28.5 + '@typescript-eslint/types': 4.28.5 + '@typescript-eslint/typescript-estree': 4.28.5_typescript@4.3.5 + debug: 4.3.2 + eslint: 7.31.0 + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/scope-manager/4.28.4: resolution: {integrity: sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} @@ -2190,11 +2257,24 @@ packages: '@typescript-eslint/visitor-keys': 4.28.4 dev: true + /@typescript-eslint/scope-manager/4.28.5: + resolution: {integrity: sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==} + engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} + dependencies: + '@typescript-eslint/types': 4.28.5 + '@typescript-eslint/visitor-keys': 4.28.5 + dev: true + /@typescript-eslint/types/4.28.4: resolution: {integrity: sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} dev: true + /@typescript-eslint/types/4.28.5: + resolution: {integrity: sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==} + engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} + dev: true + /@typescript-eslint/typescript-estree/4.28.4_typescript@4.3.5: resolution: {integrity: sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ==} engines: {node: ^10.12.0 || >=12.0.0} @@ -2216,6 +2296,27 @@ packages: - supports-color dev: true + /@typescript-eslint/typescript-estree/4.28.5_typescript@4.3.5: + resolution: {integrity: sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==} + engines: {node: ^10.12.0 || >=12.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 4.28.5 + '@typescript-eslint/visitor-keys': 4.28.5 + debug: 4.3.2 + globby: 11.0.4 + is-glob: 4.0.1 + semver: 7.3.5 + tsutils: 3.21.0_typescript@4.3.5 + typescript: 4.3.5 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/visitor-keys/4.28.4: resolution: {integrity: sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} @@ -2224,6 +2325,14 @@ packages: eslint-visitor-keys: 2.1.0 dev: true + /@typescript-eslint/visitor-keys/4.28.5: + resolution: {integrity: sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==} + engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} + dependencies: + '@typescript-eslint/types': 4.28.5 + eslint-visitor-keys: 2.1.0 + dev: true + /abab/2.0.5: resolution: {integrity: sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==} dev: true @@ -3213,6 +3322,12 @@ packages: dependencies: is-arrayish: 0.2.1 + /esbuild/0.12.16: + resolution: {integrity: sha512-XqI9cXP2bmQ6MREIqrYBb13KfYFSERsV1+e5jSVWps8dNlLZK+hln7d0mznzDIpfISsg/AgQW0DW3kSInXWhrg==} + hasBin: true + requiresBuild: true + dev: true + /esbuild/0.8.53: resolution: {integrity: sha512-GIaYGdMukH58hu+lf07XWAeESBYFAsz8fXnrylHDCbBXKOSNtFmoYA8PhSeSF+3/qzeJ0VjzV9AkLURo5yfu3g==} hasBin: true @@ -3287,6 +3402,24 @@ packages: ignore: 5.1.8 dev: true + /eslint-plugin-jest/24.4.0_ac7033cc4dfbdac1051fc5c687b09618: + resolution: {integrity: sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==} + engines: {node: '>=10'} + peerDependencies: + '@typescript-eslint/eslint-plugin': '>= 4' + eslint: '>=5' + peerDependenciesMeta: + '@typescript-eslint/eslint-plugin': + optional: true + dependencies: + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/experimental-utils': 4.28.4_eslint@7.31.0+typescript@4.3.5 + eslint: 7.31.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /eslint-plugin-jest/24.4.0_fc5326c9e782cff3be563ae5197052dc: resolution: {integrity: sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==} engines: {node: '>=10'} @@ -4720,7 +4853,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.0.6 - '@types/node': 12.20.16 + '@types/node': 12.20.17 chalk: 4.1.1 graceful-fs: 4.2.6 is-ci: 3.0.0 @@ -5026,6 +5159,29 @@ packages: - supports-color dev: true + /lint-staged/11.1.1: + resolution: {integrity: sha512-eTNGe6i78PSUUH2BZi1gZmGmNfb8IeN4z2OzMYxSZ1qnP1WXKn1E7D+OHwLbRDm/wQINnzIj0bsKJ6lLVSuZiQ==} + hasBin: true + dependencies: + chalk: 4.1.1 + cli-truncate: 2.1.0 + commander: 7.2.0 + cosmiconfig: 7.0.0 + debug: 4.3.2 + dedent: 0.7.0 + enquirer: 2.3.6 + execa: 5.1.1 + listr2: 3.11.0_enquirer@2.3.6 + log-symbols: 4.1.0 + micromatch: 4.0.4 + normalize-path: 3.0.0 + please-upgrade-node: 3.2.0 + string-argv: 0.3.1 + stringify-object: 3.3.0 + transitivePeerDependencies: + - supports-color + dev: true + /listr2/3.11.0_enquirer@2.3.6: resolution: {integrity: sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ==} engines: {node: '>=10.0.0'} diff --git a/tsconfig.build.json b/tsconfig.build.json index 01ab021b6925..27536b5ea167 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -7,7 +7,6 @@ "sourceMap": true, "declaration": true, "incremental": true, - "outDir": "dist", "strict": true, "noImplicitAny": false, @@ -17,7 +16,8 @@ "skipDefaultLibCheck": true }, "exclude": [ - "dist", - "node_modules" + "**/dist", + "**/node_modules", + "**/src/__tests__" ] } diff --git a/tsconfig.json b/tsconfig.json index 7aebc6718cfd..2683478a720d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,5 +6,9 @@ "@prisma/client": ["client/src/runtime"] } }, - "include": ["**/*"] + "include": ["**/*"], + "exclude": [ + "**/dist", + "**/node_modules" + ] } From fa0e1564b26c9fca36b7a2c166b144abdaf9d791 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 19:50:36 -0500 Subject: [PATCH 11/28] chore(prisma): add sdk to discovery --- tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 2683478a720d..6aa8e66d2a9f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": "./src/packages", "paths": { - "@prisma/client": ["client/src/runtime"] + "@prisma/client": ["client/src/runtime"], + "@prisma/sdk": ["sdk/src"] } }, "include": ["**/*"], From a71fc9ce00e19c83037ec0abe2a34c7829001430 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 20:00:12 -0500 Subject: [PATCH 12/28] chore(sdk): enable source maps --- src/packages/sdk/helpers/build.js | 1 + tsconfig.json | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/packages/sdk/helpers/build.js b/src/packages/sdk/helpers/build.js index 458667084dbb..ed77c422d116 100644 --- a/src/packages/sdk/helpers/build.js +++ b/src/packages/sdk/helpers/build.js @@ -16,6 +16,7 @@ async function build() { }), outdir: 'dist', format: 'cjs', + sourcemap: 'external' }), ]) diff --git a/tsconfig.json b/tsconfig.json index 6aa8e66d2a9f..15fc6341f7f4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,8 @@ "baseUrl": "./src/packages", "paths": { "@prisma/client": ["client/src/runtime"], - "@prisma/sdk": ["sdk/src"] + "@prisma/sdk": ["sdk/src"], + "@prisma/migrate": ["migrate/src"], } }, "include": ["**/*"], From 659f9d53859c92d7b52d0119deb6620b92b9a828 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 20:11:37 -0500 Subject: [PATCH 13/28] chore(migrate): esbuild + inherited config --- src/packages/migrate/helpers/build.js | 33 +++ src/packages/migrate/package.json | 4 +- src/packages/migrate/src/commands/DbPull.ts | 2 + .../migrate/src/utils/ensureDatabaseExists.ts | 2 + src/packages/migrate/src/utils/seed.ts | 2 + src/packages/migrate/tsconfig.build.json | 14 +- src/packages/migrate/tsconfig.eslint.json | 4 +- src/packages/migrate/tsconfig.json | 14 +- src/packages/sdk/helpers/build.js | 2 +- src/packages/sdk/tsconfig.json | 2 +- src/pnpm-lock.yaml | 192 ++++++++++++++++-- 11 files changed, 228 insertions(+), 43 deletions(-) create mode 100644 src/packages/migrate/helpers/build.js diff --git a/src/packages/migrate/helpers/build.js b/src/packages/migrate/helpers/build.js new file mode 100644 index 000000000000..848d3a109b20 --- /dev/null +++ b/src/packages/migrate/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'disto', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json index 9d7ebf4f874b..4e8387256250 100644 --- a/src/packages/migrate/package.json +++ b/src/packages/migrate/package.json @@ -28,12 +28,14 @@ "@typescript-eslint/parser": "4.28.5", "chalk": "4.1.1", "del": "6.0.0", + "esbuild": "^0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", "fs-jetpack": "4.1.0", + "glob": "^7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "make-dir": "3.1.0", @@ -69,13 +71,13 @@ "strip-indent": "^3.0.0" }, "scripts": { + "build": "node helpers/build.js", "run": "node dist/bin.js", "precommit": "lint-staged", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", "lint-ci": "eslint --ext .ts .", "test": "jest --forceExit", - "build": "tsc -d -p tsconfig.build.json", "prepublishOnly": "pnpm run build" }, "files": [ diff --git a/src/packages/migrate/src/commands/DbPull.ts b/src/packages/migrate/src/commands/DbPull.ts index 7fe6a51b0d73..37fbbafbb9f2 100644 --- a/src/packages/migrate/src/commands/DbPull.ts +++ b/src/packages/migrate/src/commands/DbPull.ts @@ -303,6 +303,8 @@ Or run this command with the ${chalk.green( } return message } + + return undefined } const introspectionWarningsMessage = diff --git a/src/packages/migrate/src/utils/ensureDatabaseExists.ts b/src/packages/migrate/src/utils/ensureDatabaseExists.ts index edd7176c3653..e8ed0e1e2bb8 100644 --- a/src/packages/migrate/src/utils/ensureDatabaseExists.ts +++ b/src/packages/migrate/src/utils/ensureDatabaseExists.ts @@ -153,6 +153,8 @@ export async function ensureDatabaseExists( schemaDir, ) } + + return undefined } export async function interactivelyCreateDatabase( diff --git a/src/packages/migrate/src/utils/seed.ts b/src/packages/migrate/src/utils/seed.ts index 02982d0f98e2..c92a0e78c0eb 100644 --- a/src/packages/migrate/src/utils/seed.ts +++ b/src/packages/migrate/src/utils/seed.ts @@ -192,6 +192,8 @@ To install them run: ${chalk.green( }) } } + + return undefined } export async function getScriptsFromPackageJson(cwd: string = process.cwd()) { diff --git a/src/packages/migrate/tsconfig.build.json b/src/packages/migrate/tsconfig.build.json index 279568eddfd2..e0d08b41b96a 100644 --- a/src/packages/migrate/tsconfig.build.json +++ b/src/packages/migrate/tsconfig.build.json @@ -1,14 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { - "outDir": "dist" + "outDir": "disto", + "emitDeclarationOnly": true }, - "exclude": [ - "dist", - "build", - "src/__tests__", - "fixtures", - "fixtures_old", - "tmp" - ] + "include": ["src"], } diff --git a/src/packages/migrate/tsconfig.eslint.json b/src/packages/migrate/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/migrate/tsconfig.eslint.json +++ b/src/packages/migrate/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/migrate/tsconfig.json b/src/packages/migrate/tsconfig.json index e3465a48811b..618c6c3e97b5 100644 --- a/src/packages/migrate/tsconfig.json +++ b/src/packages/migrate/tsconfig.json @@ -1,15 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext", "esnext.asynciterable"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "rootDir": "src", - "declaration": true, - "resolveJsonModule": true, - "incremental": true - } + "extends": "../../../tsconfig.json" } diff --git a/src/packages/sdk/helpers/build.js b/src/packages/sdk/helpers/build.js index ed77c422d116..dbd96447ed9a 100644 --- a/src/packages/sdk/helpers/build.js +++ b/src/packages/sdk/helpers/build.js @@ -5,6 +5,7 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', + sourcemap: 'external' } async function build() { @@ -16,7 +17,6 @@ async function build() { }), outdir: 'dist', format: 'cjs', - sourcemap: 'external' }), ]) diff --git a/src/packages/sdk/tsconfig.json b/src/packages/sdk/tsconfig.json index b027bb4567b9..618c6c3e97b5 100644 --- a/src/packages/sdk/tsconfig.json +++ b/src/packages/sdk/tsconfig.json @@ -1,3 +1,3 @@ { "extends": "../../../tsconfig.json" -} \ No newline at end of file +} diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index b72f6b63e069..2197498fcf3e 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -510,10 +510,11 @@ importers: '@types/pg': 8.6.1 '@types/prompts': 2.0.14 '@types/sqlite3': 3.1.7 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 chalk: 4.1.1 del: 6.0.0 + esbuild: ^0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -521,18 +522,19 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 fs-jetpack: 4.1.0 + glob: ^7.1.7 global-dirs: ^3.0.0 has-yarn: ^2.1.0 indent-string: ^4.0.0 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 log-update: ^4.0.0 make-dir: 3.1.0 mariadb: 2.5.4 mock-stdin: 1.0.0 new-github-issue-url: ^0.2.1 open: ^7.0.3 - pg: 8.6.0 + pg: 8.7.1 pkg-up: ^3.1.0 prettier: 2.3.2 prompts: ^2.3.2 @@ -542,7 +544,7 @@ importers: strip-ansi: ^6.0.0 strip-indent: ^3.0.0 tempy: 1.0.1 - ts-jest: 27.0.3 + ts-jest: 27.0.4 typescript: 4.3.5 dependencies: '@prisma/debug': link:../debug @@ -569,27 +571,29 @@ importers: '@types/pg': 8.6.1 '@types/prompts': 2.0.14 '@types/sqlite3': 3.1.7 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 chalk: 4.1.1 del: 6.0.0 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca fs-jetpack: 4.1.0 - jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + glob: 7.1.7 + jest: 27.0.6 + lint-staged: 11.1.1 make-dir: 3.1.0 mariadb: 2.5.4 mock-stdin: 1.0.0 - pg: 8.6.0 + pg: 8.7.1 prettier: 2.3.2 sqlite-async: 1.1.1 sqlite3: 5.0.2 tempy: 1.0.1 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 typescript: 4.3.5 packages/react-prisma: @@ -1341,6 +1345,52 @@ packages: slash: 3.0.0 dev: true + /@jest/core/27.0.6: + resolution: {integrity: sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/console': 27.0.6 + '@jest/reporters': 27.0.6 + '@jest/test-result': 27.0.6 + '@jest/transform': 27.0.6 + '@jest/types': 27.0.6 + '@types/node': 12.20.16 + ansi-escapes: 4.3.2 + chalk: 4.1.1 + emittery: 0.8.1 + exit: 0.1.2 + graceful-fs: 4.2.6 + jest-changed-files: 27.0.6 + jest-config: 27.0.6 + jest-haste-map: 27.0.6 + jest-message-util: 27.0.6 + jest-regex-util: 27.0.6 + jest-resolve: 27.0.6 + jest-resolve-dependencies: 27.0.6 + jest-runner: 27.0.6 + jest-runtime: 27.0.6 + jest-snapshot: 27.0.6 + jest-util: 27.0.6 + jest-validate: 27.0.6 + jest-watcher: 27.0.6 + micromatch: 4.0.4 + p-each-series: 2.2.0 + rimraf: 3.0.2 + slash: 3.0.0 + strip-ansi: 6.0.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + /@jest/core/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -4465,6 +4515,36 @@ packages: - supports-color dev: true + /jest-cli/27.0.6: + resolution: {integrity: sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.0.6 + '@jest/test-result': 27.0.6 + '@jest/types': 27.0.6 + chalk: 4.1.1 + exit: 0.1.2 + graceful-fs: 4.2.6 + import-local: 3.0.2 + jest-config: 27.0.6 + jest-util: 27.0.6 + jest-validate: 27.0.6 + prompts: 2.4.1 + yargs: 16.2.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + /jest-cli/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -4495,6 +4575,43 @@ packages: - utf-8-validate dev: true + /jest-config/27.0.6: + resolution: {integrity: sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + ts-node: '>=9.0.0' + peerDependenciesMeta: + ts-node: + optional: true + dependencies: + '@babel/core': 7.14.6 + '@jest/test-sequencer': 27.0.6 + '@jest/types': 27.0.6 + babel-jest: 27.0.6_@babel+core@7.14.6 + chalk: 4.1.1 + deepmerge: 4.2.2 + glob: 7.1.7 + graceful-fs: 4.2.6 + is-ci: 3.0.0 + jest-circus: 27.0.6 + jest-environment-jsdom: 27.0.6 + jest-environment-node: 27.0.6 + jest-get-type: 27.0.6 + jest-jasmine2: 27.0.6 + jest-regex-util: 27.0.6 + jest-resolve: 27.0.6 + jest-runner: 27.0.6 + jest-util: 27.0.6 + jest-validate: 27.0.6 + micromatch: 4.0.4 + pretty-format: 27.0.6 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: true + /jest-config/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -4853,7 +4970,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.0.6 - '@types/node': 12.20.17 + '@types/node': 14.17.5 chalk: 4.1.1 graceful-fs: 4.2.6 is-ci: 3.0.0 @@ -4894,6 +5011,27 @@ packages: supports-color: 8.1.1 dev: true + /jest/27.0.6: + resolution: {integrity: sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.0.6 + import-local: 3.0.2 + jest-cli: 27.0.6 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + /jest/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -5957,6 +6095,14 @@ packages: pg: 8.6.0 dev: true + /pg-pool/3.4.1_pg@8.7.1: + resolution: {integrity: sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==} + peerDependencies: + pg: '>=8.0' + dependencies: + pg: 8.7.1 + dev: true + /pg-protocol/1.5.0: resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==} dev: true @@ -5990,6 +6136,24 @@ packages: pgpass: 1.0.4 dev: true + /pg/8.7.1: + resolution: {integrity: sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==} + engines: {node: '>= 8.0.0'} + peerDependencies: + pg-native: '>=2.0.0' + peerDependenciesMeta: + pg-native: + optional: true + dependencies: + buffer-writer: 2.0.0 + packet-reader: 1.0.0 + pg-connection-string: 2.5.0 + pg-pool: 3.4.1_pg@8.7.1 + pg-protocol: 1.5.0 + pg-types: 2.2.0 + pgpass: 1.0.4 + dev: true + /pgpass/1.0.4: resolution: {integrity: sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w==} dependencies: @@ -7124,7 +7288,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6_ts-node@10.1.0 + jest: 27.0.6 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21 From 90733684ff1e0a17815234792cb40334e58b6415 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 20:13:54 -0500 Subject: [PATCH 14/28] chore(migrate): fix dist --- src/packages/migrate/helpers/build.js | 2 +- src/packages/migrate/tsconfig.build.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/migrate/helpers/build.js b/src/packages/migrate/helpers/build.js index 848d3a109b20..dbd96447ed9a 100644 --- a/src/packages/migrate/helpers/build.js +++ b/src/packages/migrate/helpers/build.js @@ -15,7 +15,7 @@ async function build() { entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' }), - outdir: 'disto', + outdir: 'dist', format: 'cjs', }), ]) diff --git a/src/packages/migrate/tsconfig.build.json b/src/packages/migrate/tsconfig.build.json index e0d08b41b96a..e0244d8566d7 100644 --- a/src/packages/migrate/tsconfig.build.json +++ b/src/packages/migrate/tsconfig.build.json @@ -1,7 +1,7 @@ { "extends": "../../../tsconfig.build.json", "compilerOptions": { - "outDir": "disto", + "outDir": "dist", "emitDeclarationOnly": true }, "include": ["src"], From 9a7611752025afc37a6916b99c39e2d05c3b7191 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 20:27:10 -0500 Subject: [PATCH 15/28] chore(generator-helper): esbuild + inherited config --- .../generator-helper/helpers/build.js | 33 +++++++++++++++++++ src/packages/generator-helper/package.json | 4 ++- .../generator-helper/tsconfig.build.json | 8 +++++ .../generator-helper/tsconfig.eslint.json | 4 +-- src/packages/generator-helper/tsconfig.json | 15 +-------- src/packages/migrate/package.json | 4 +-- src/pnpm-lock.yaml | 32 +++++++++++------- 7 files changed, 68 insertions(+), 32 deletions(-) create mode 100644 src/packages/generator-helper/helpers/build.js create mode 100644 src/packages/generator-helper/tsconfig.build.json diff --git a/src/packages/generator-helper/helpers/build.js b/src/packages/generator-helper/helpers/build.js new file mode 100644 index 000000000000..dbd96447ed9a --- /dev/null +++ b/src/packages/generator-helper/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'dist', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/generator-helper/package.json b/src/packages/generator-helper/package.json index c0ac19999230..7e06bba1e97d 100644 --- a/src/packages/generator-helper/package.json +++ b/src/packages/generator-helper/package.json @@ -21,7 +21,7 @@ "cross-spawn": "^7.0.2" }, "scripts": { - "build": "tsc -d", + "build": "node helpers/build.js", "prepublishOnly": "pnpm run build && pnpm run test", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", @@ -34,11 +34,13 @@ "@types/node": "12.20.17", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "prettier": "2.3.2", diff --git a/src/packages/generator-helper/tsconfig.build.json b/src/packages/generator-helper/tsconfig.build.json new file mode 100644 index 000000000000..e0244d8566d7 --- /dev/null +++ b/src/packages/generator-helper/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist", + "emitDeclarationOnly": true + }, + "include": ["src"], +} diff --git a/src/packages/generator-helper/tsconfig.eslint.json b/src/packages/generator-helper/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/generator-helper/tsconfig.eslint.json +++ b/src/packages/generator-helper/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/generator-helper/tsconfig.json b/src/packages/generator-helper/tsconfig.json index 148e3cef6071..618c6c3e97b5 100644 --- a/src/packages/generator-helper/tsconfig.json +++ b/src/packages/generator-helper/tsconfig.json @@ -1,16 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext", "esnext.asynciterable"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "incremental": true - }, - "exclude": ["dist", "build", "src/__tests__", "src/sandbox"] + "extends": "../../../tsconfig.json" } diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json index 4e8387256250..85ad8933f792 100644 --- a/src/packages/migrate/package.json +++ b/src/packages/migrate/package.json @@ -28,14 +28,14 @@ "@typescript-eslint/parser": "4.28.5", "chalk": "4.1.1", "del": "6.0.0", - "esbuild": "^0.12.16", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", "fs-jetpack": "4.1.0", - "glob": "^7.1.7", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "make-dir": "3.1.0", diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 2197498fcf3e..0b72c6cdf4c9 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -380,19 +380,21 @@ importers: '@types/cross-spawn': ^6.0.1 '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 chalk: ^4.0.0 cross-spawn: ^7.0.2 + esbuild: ^0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 + glob: ^7.1.7 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 prettier: 2.3.2 - ts-jest: 27.0.3 + ts-jest: 27.0.4 ts-node: 10.1.0 typescript: 4.3.5 dependencies: @@ -403,17 +405,19 @@ importers: devDependencies: '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca + glob: 7.1.7 jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + lint-staged: 11.1.1 prettier: 2.3.2 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 ts-node: 10.1.0_6a5e1f2f9646ad83684ea4da8a674e6d typescript: 4.3.5 @@ -3659,7 +3663,7 @@ packages: cross-spawn: 7.0.3 get-stream: 6.0.1 human-signals: 2.1.0 - is-stream: 2.0.0 + is-stream: 2.0.1 merge-stream: 2.0.0 npm-run-path: 4.0.1 onetime: 5.1.2 @@ -4408,6 +4412,10 @@ packages: resolution: {integrity: sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==} engines: {node: '>=8'} + /is-stream/2.0.1: + resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} + engines: {node: '>=8'} + /is-typedarray/1.0.0: resolution: {integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=} dev: true @@ -4970,7 +4978,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.0.6 - '@types/node': 14.17.5 + '@types/node': 12.20.17 chalk: 4.1.1 graceful-fs: 4.2.6 is-ci: 3.0.0 @@ -7288,7 +7296,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21 From d81d97fbb3ece807fff5fb30b3f518e7d6115d66 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 20:49:36 -0500 Subject: [PATCH 16/28] chore(engine-core): esbuild + inherited tsconfig --- src/packages/engine-core/helpers/build.js | 33 +++++++++++++++++++ src/packages/engine-core/package.json | 7 ++-- src/packages/engine-core/tsconfig.build.json | 8 +++++ src/packages/engine-core/tsconfig.eslint.json | 4 +-- src/packages/engine-core/tsconfig.json | 13 ++------ src/packages/sdk/package.json | 3 +- src/pnpm-lock.yaml | 26 ++++++++------- tsconfig.json | 2 ++ 8 files changed, 69 insertions(+), 27 deletions(-) create mode 100644 src/packages/engine-core/helpers/build.js create mode 100644 src/packages/engine-core/tsconfig.build.json diff --git a/src/packages/engine-core/helpers/build.js b/src/packages/engine-core/helpers/build.js new file mode 100644 index 000000000000..dbd96447ed9a --- /dev/null +++ b/src/packages/engine-core/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'dist', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/engine-core/package.json b/src/packages/engine-core/package.json index eed276525115..6d1764df78ca 100644 --- a/src/packages/engine-core/package.json +++ b/src/packages/engine-core/package.json @@ -10,7 +10,8 @@ "maintainers": [ "Tim Suchanek ", "Joël Galeran ", - "William Luke " + "William Luke ", + "Pierre-Antoine Mills " ], "bugs": "https://github.com/prisma/prisma/issues", "devDependencies": { @@ -18,11 +19,13 @@ "@types/node": "12.20.17", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "prettier": "2.3.2", @@ -31,7 +34,7 @@ "typescript": "4.3.5" }, "scripts": { - "build": "tsc -d", + "build": "node helpers/build.js", "prepublishOnly": "npm run build", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", diff --git a/src/packages/engine-core/tsconfig.build.json b/src/packages/engine-core/tsconfig.build.json new file mode 100644 index 000000000000..e0244d8566d7 --- /dev/null +++ b/src/packages/engine-core/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist", + "emitDeclarationOnly": true + }, + "include": ["src"], +} diff --git a/src/packages/engine-core/tsconfig.eslint.json b/src/packages/engine-core/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/engine-core/tsconfig.eslint.json +++ b/src/packages/engine-core/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/engine-core/tsconfig.json b/src/packages/engine-core/tsconfig.json index 4e0055942833..e0244d8566d7 100644 --- a/src/packages/engine-core/tsconfig.json +++ b/src/packages/engine-core/tsconfig.json @@ -1,15 +1,8 @@ { + "extends": "../../../tsconfig.build.json", "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, "outDir": "dist", - "rootDir": "src", - "declaration": true + "emitDeclarationOnly": true }, - "exclude": ["dist", "build", "src/__tests__"] + "include": ["src"], } diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json index e7c5ffd373bd..be0bb938ea26 100644 --- a/src/packages/sdk/package.json +++ b/src/packages/sdk/package.json @@ -8,7 +8,8 @@ "author": "Tim Suchanek ", "maintainers": [ "Tim Suchanek ", - "Joël Galeran " + "Joël Galeran ", + "Pierre-Antoine Mills " ], "bugs": "https://github.com/prisma/prisma/issues", "license": "Apache-2.0", diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 0b72c6cdf4c9..5cb67e99f8b0 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -323,9 +323,10 @@ importers: '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 chalk: ^4.0.0 + esbuild: ^0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -333,15 +334,16 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 get-stream: ^6.0.0 + glob: ^7.1.7 indent-string: ^4.0.0 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 new-github-issue-url: ^0.2.1 p-retry: ^4.2.0 prettier: 2.3.2 strip-ansi: 6.0.0 terminal-link: ^2.1.1 - ts-jest: 27.0.3 + ts-jest: 27.0.4 typescript: 4.3.5 undici: 3.3.6 dependencies: @@ -360,18 +362,20 @@ importers: devDependencies: '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca - jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + glob: 7.1.7 + jest: 27.0.6 + lint-staged: 11.1.1 prettier: 2.3.2 strip-ansi: 6.0.0 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 typescript: 4.3.5 packages/generator-helper: @@ -7296,7 +7300,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6_ts-node@10.1.0 + jest: 27.0.6 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21 diff --git a/tsconfig.json b/tsconfig.json index 15fc6341f7f4..f336a4da2bcd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,8 @@ "@prisma/client": ["client/src/runtime"], "@prisma/sdk": ["sdk/src"], "@prisma/migrate": ["migrate/src"], + "@prisma/generator-helper": ["generator-helper/src"], + "@prisma/engine-core": ["engine-core/src"], } }, "include": ["**/*"], From 1aba830a04100fa2fc53ae61a02093677f15955b Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 21:08:47 -0500 Subject: [PATCH 17/28] chore(debug): esbuild + inherited tsconfig --- src/packages/debug/helpers/build.js | 33 +++++++++++++++++++++++++ src/packages/debug/package.json | 8 ++++-- src/packages/debug/tsconfig.build.json | 8 ++++++ src/packages/debug/tsconfig.eslint.json | 4 +-- src/packages/debug/tsconfig.json | 15 +---------- src/pnpm-lock.yaml | 26 +++++++++++-------- 6 files changed, 65 insertions(+), 29 deletions(-) create mode 100644 src/packages/debug/helpers/build.js create mode 100644 src/packages/debug/tsconfig.build.json diff --git a/src/packages/debug/helpers/build.js b/src/packages/debug/helpers/build.js new file mode 100644 index 000000000000..848d3a109b20 --- /dev/null +++ b/src/packages/debug/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'disto', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/debug/package.json b/src/packages/debug/package.json index d82265077064..af46cda4956d 100644 --- a/src/packages/debug/package.json +++ b/src/packages/debug/package.json @@ -10,7 +10,8 @@ "maintainers": [ "Tim Suchanek ", "Joël Galeran ", - "William Luke " + "William Luke ", + "Pierre-Antoine Mills " ], "bugs": "https://github.com/prisma/prisma/issues", "devDependencies": { @@ -18,11 +19,14 @@ "@types/node": "12.20.17", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", + "execa": "5.1.1", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "prettier": "2.3.2", @@ -31,7 +35,7 @@ "typescript": "4.3.5" }, "scripts": { - "build": "tsc -d", + "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", diff --git a/src/packages/debug/tsconfig.build.json b/src/packages/debug/tsconfig.build.json new file mode 100644 index 000000000000..e0244d8566d7 --- /dev/null +++ b/src/packages/debug/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist", + "emitDeclarationOnly": true + }, + "include": ["src"], +} diff --git a/src/packages/debug/tsconfig.eslint.json b/src/packages/debug/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/debug/tsconfig.eslint.json +++ b/src/packages/debug/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/debug/tsconfig.json b/src/packages/debug/tsconfig.json index 66993f6569c9..618c6c3e97b5 100644 --- a/src/packages/debug/tsconfig.json +++ b/src/packages/debug/tsconfig.json @@ -1,16 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "incremental": true - }, - "exclude": ["dist", "build", "src/__tests__", "scripts", "sandbox"] + "extends": "../../../tsconfig.json" } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 5cb67e99f8b0..01288cfc6181 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -280,20 +280,23 @@ importers: specifiers: '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 debug: 4.3.2 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 + execa: ^5.1.1 + glob: 7.1.7 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 ms: ^2.1.3 prettier: 2.3.2 strip-ansi: 6.0.0 - ts-jest: 27.0.3 + ts-jest: 27.0.4 typescript: 4.3.5 dependencies: debug: 4.3.2 @@ -301,18 +304,21 @@ importers: devDependencies: '@types/jest': 26.0.24 '@types/node': 12.20.17 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca - jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + execa: 5.1.1 + glob: 7.1.7 + jest: 27.0.6 + lint-staged: 11.1.1 prettier: 2.3.2 strip-ansi: 6.0.0 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 typescript: 4.3.5 packages/engine-core: From 92d6152490686ef0ab3544fd6e59e8689f3e617c Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 21:16:13 -0500 Subject: [PATCH 18/28] chore(debug): fix build + discovery --- src/packages/debug/helpers/build.js | 2 +- tsconfig.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/debug/helpers/build.js b/src/packages/debug/helpers/build.js index 848d3a109b20..dbd96447ed9a 100644 --- a/src/packages/debug/helpers/build.js +++ b/src/packages/debug/helpers/build.js @@ -15,7 +15,7 @@ async function build() { entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' }), - outdir: 'disto', + outdir: 'dist', format: 'cjs', }), ]) diff --git a/tsconfig.json b/tsconfig.json index f336a4da2bcd..029dc27d50b6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,11 +8,14 @@ "@prisma/migrate": ["migrate/src"], "@prisma/generator-helper": ["generator-helper/src"], "@prisma/engine-core": ["engine-core/src"], + "@prisma/debug": ["debug/src"], + "@prisma/cli": ["debug/cli"], } }, "include": ["**/*"], "exclude": [ "**/dist", + "**/build", "**/node_modules" ] } From ae45e1e0dfb1b017be4971f0bc9c77538185fa14 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 21:41:43 -0500 Subject: [PATCH 19/28] fix(debug): fix debugLib types --- src/packages/debug/package.json | 1 + src/packages/debug/src/index.ts | 8 +++----- src/pnpm-lock.yaml | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/packages/debug/package.json b/src/packages/debug/package.json index af46cda4956d..f4eace2d4f8f 100644 --- a/src/packages/debug/package.json +++ b/src/packages/debug/package.json @@ -15,6 +15,7 @@ ], "bugs": "https://github.com/prisma/prisma/issues", "devDependencies": { + "@types/debug": "4.1.7", "@types/jest": "26.0.24", "@types/node": "12.20.17", "@typescript-eslint/eslint-plugin": "4.28.5", diff --git a/src/packages/debug/src/index.ts b/src/packages/debug/src/index.ts index ab18b160a8d2..bbbd68620d1c 100644 --- a/src/packages/debug/src/index.ts +++ b/src/packages/debug/src/index.ts @@ -1,12 +1,12 @@ -import DebugLib from 'debug' +import 'debug' import DebugNode from './node' const cache: any[] = [] const MAX_LOGS = 100 -export default function Debug(namespace: string): DebugLib.Debugger { - const debug: DebugLib.Debugger = DebugNode(namespace, (...args) => { +export default function Debug(namespace: string): debug.Debugger { + const debug: debug.Debugger = DebugNode(namespace, (...args) => { cache.push(args) // keeping 100 logs is just a heuristic. The real truncating comes later if (cache.length > MAX_LOGS) { @@ -24,8 +24,6 @@ Debug.enable = (namespace: string): void => { Debug.enabled = (namespace: string): boolean => DebugNode.enabled(namespace) -export declare type Debugger = DebugLib.Debugger - // https://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers // we need some space for other characters, so we go for 30k here export function getLogs(numChars = 7500): string { diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 01288cfc6181..09f77f39cebb 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -278,6 +278,7 @@ importers: packages/debug: specifiers: + '@types/debug': ^4.1.7 '@types/jest': 26.0.24 '@types/node': 12.20.17 '@typescript-eslint/eslint-plugin': 4.28.5 @@ -289,7 +290,7 @@ importers: eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 - execa: ^5.1.1 + execa: 5.1.1 glob: 7.1.7 jest: 27.0.6 lint-staged: 11.1.1 @@ -302,6 +303,7 @@ importers: debug: 4.3.2 ms: 2.1.3 devDependencies: + '@types/debug': 4.1.7 '@types/jest': 26.0.24 '@types/node': 12.20.17 '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 From 3edacbf547cef29e90ae452d7c2690065af11a78 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 22:04:40 -0500 Subject: [PATCH 20/28] chore(cli): remove type gen + inherited tsconfig --- src/packages/cli/helpers/build.js | 5 +---- src/packages/cli/tsconfig.build.json | 15 ++++----------- src/packages/cli/tsconfig.eslint.json | 4 +--- src/packages/cli/tsconfig.json | 15 +-------------- tsconfig.json | 2 +- 5 files changed, 8 insertions(+), 33 deletions(-) diff --git a/src/packages/cli/helpers/build.js b/src/packages/cli/helpers/build.js index 0831bf63cb9a..83ed63bc80d3 100644 --- a/src/packages/cli/helpers/build.js +++ b/src/packages/cli/helpers/build.js @@ -14,10 +14,7 @@ async function main() { await makeDir('./build') - await Promise.all([ - run('node ./helpers/copy-prisma-client.js'), - run('tsc --build tsconfig.build.json', true), - ]) + await run('node ./helpers/copy-prisma-client.js') await Promise.all([ esbuild.build({ diff --git a/src/packages/cli/tsconfig.build.json b/src/packages/cli/tsconfig.build.json index 9e33a7b821c6..e0244d8566d7 100644 --- a/src/packages/cli/tsconfig.build.json +++ b/src/packages/cli/tsconfig.build.json @@ -1,15 +1,8 @@ { - "extends": "./tsconfig.json", + "extends": "../../../tsconfig.build.json", "compilerOptions": { - "outDir": "dist" + "outDir": "dist", + "emitDeclarationOnly": true }, - "exclude": [ - "dist", - "build", - "runtime", - "examples", - "src/__tests__", - "fixtures", - "**/node_modules/**" - ] + "include": ["src"], } diff --git a/src/packages/cli/tsconfig.eslint.json b/src/packages/cli/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/cli/tsconfig.eslint.json +++ b/src/packages/cli/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/cli/tsconfig.json b/src/packages/cli/tsconfig.json index a003a80f599d..618c6c3e97b5 100644 --- a/src/packages/cli/tsconfig.json +++ b/src/packages/cli/tsconfig.json @@ -1,16 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext", "esnext.asynciterable", "dom"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "rootDir": "src", - "declaration": true, - "skipLibCheck": true, - "incremental": true - }, - "exclude": ["scripts", "src/__tests__", "**/tmp-*"] + "extends": "../../../tsconfig.json" } diff --git a/tsconfig.json b/tsconfig.json index 029dc27d50b6..112a9c71b316 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,7 @@ "@prisma/generator-helper": ["generator-helper/src"], "@prisma/engine-core": ["engine-core/src"], "@prisma/debug": ["debug/src"], - "@prisma/cli": ["debug/cli"], + "@prisma/cli": ["cli/src"], } }, "include": ["**/*"], From f054c44408d6e46753af62683892d43bba768e44 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 22:11:55 -0500 Subject: [PATCH 21/28] chore(engines-wrapper): type discovery from prisma repo --- tsconfig.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tsconfig.json b/tsconfig.json index 112a9c71b316..2a87f32a412b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,6 +10,10 @@ "@prisma/engine-core": ["engine-core/src"], "@prisma/debug": ["debug/src"], "@prisma/cli": ["cli/src"], + "@prisma/get-platform": ["../../../engines-wrapper/packages/get-platform/src"], + "@prisma/fetch-engine": ["../../../engines-wrapper/packages/fetch-engine/src"], + "@prisma/engines": ["../../../engines-wrapper/packages/engines/src"], + "@prisma/engines-version": ["../../../engines-wrapper/packages/engines-version/src"] } }, "include": ["**/*"], From aff9efd7568cd0b7c5d019c2a6f4cfcc9ad5d263 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 22:18:04 -0500 Subject: [PATCH 22/28] fix(cli): use build/index.js instead of dist/bin.js --- src/packages/cli/fixtures/test.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/packages/cli/fixtures/test.sh b/src/packages/cli/fixtures/test.sh index a052fd708aee..afe5d8df2966 100755 --- a/src/packages/cli/fixtures/test.sh +++ b/src/packages/cli/fixtures/test.sh @@ -4,7 +4,7 @@ # # Test version command # -VERSION=$(node ./dist/bin.js --version) +VERSION=$(node ./build/index.js --version) if [[ ${VERSION} != *"@prisma/client"* ]]; then echo "prisma --version is broken" exit 1 @@ -14,7 +14,7 @@ fi # Test custom generator path # cd ./fixtures/custom\ generator -GENERATE_RESULT=$(node ../../dist/bin.js generate) +GENERATE_RESULT=$(node ../../build/index.js generate) if [[ ${GENERATE_RESULT} != *"onGenerate"* ]]; then echo "custom generators are broken" echo $GENERATE_RESULT @@ -26,7 +26,7 @@ cd ../.. # Test introspection output with warnings # cd fixtures/introspection-warnings -INTROSPECTION=$(node ../../dist/bin.js introspect --url=file:./warnings.db 2>&1) +INTROSPECTION=$(node ../../build/index.js introspect --url=file:./warnings.db 2>&1) if [[ ${INTROSPECTION} != *"column_name_that_becomes_empty_string"* ]]; then echo "prisma introspect column_name_that_becomes_empty_string is broken" echo $INTROSPECTION @@ -46,13 +46,13 @@ cd ../../ # Test generate output command # cd fixtures/project/subdir -GENERATE=$(node ../../../dist/bin.js generate) +GENERATE=$(node ../../../build/index.js generate) if [[ ${GENERATE} != *"Generated "* ]]; then echo "prisma generate is broken" exit 1 fi -GENERATE_DENYLIST=$(node ../../../dist/bin.js generate --schema=denylist.prisma 2>&1) +GENERATE_DENYLIST=$(node ../../../build/index.js generate --schema=denylist.prisma 2>&1) if [[ ${GENERATE_DENYLIST} != *"Error validating model \"public\""* ]]; then echo "prisma generate denylist is broken" exit 1 @@ -64,14 +64,14 @@ fi # Relative path GENERATE_RELATIVE_SCHEMA_PATH="./schema.prisma" -GENERATE_RELATIVE_SCHEMA=$(node ../../../dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH) +GENERATE_RELATIVE_SCHEMA=$(node ../../../build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH) if [[ ${GENERATE_RELATIVE_SCHEMA} != *"Generated "* ]]; then echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_PATH is broken" exit 1 fi # Same case but should fail! GENERATE_RELATIVE_SCHEMA_INVALID_PATH="./invalid.prisma" -GENERATE_RELATIVE_SCHEMA_INVALID=$(node ../../../dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH 2>&1 > /dev/null) +GENERATE_RELATIVE_SCHEMA_INVALID=$(node ../../../build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH 2>&1 > /dev/null) if [[ ${GENERATE_RELATIVE_SCHEMA_INVALID} != *"Provided --schema at $GENERATE_RELATIVE_SCHEMA_INVALID_PATH doesn't exist."* ]]; then echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_INVALID_PATH is broken (should fail)" exit 1 @@ -79,14 +79,14 @@ fi # Absolute path GENERATE_ABSOLUTE_SCHEMA_PATH="$(pwd)/schema.prisma" -GENERATE_ABSOLUTE_SCHEMA=$(node ../../../dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH) +GENERATE_ABSOLUTE_SCHEMA=$(node ../../../build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH) if [[ ${GENERATE_ABSOLUTE_SCHEMA} != *"Generated "* ]]; then echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_PATH is broken" exit 1 fi # Same case but should fail! GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH="$(pwd)/invalid.prisma" -GENERATE_ABSOLUTE_SCHEMA_INVALID=$(node ../../../dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH 2>&1 > /dev/null) +GENERATE_ABSOLUTE_SCHEMA_INVALID=$(node ../../../build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH 2>&1 > /dev/null) if [[ ${GENERATE_ABSOLUTE_SCHEMA_INVALID} != *"Provided --schema at $GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH doesn't exist"* ]]; then echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_INVALID_PATH is broken (should fail)" exit 1 @@ -105,14 +105,14 @@ cd fixtures/project/ && yarn postinstall cd ../.. # Relative path GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH="./fixtures/project/subdir/schema.prisma" -GENERATE_RELATIVE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH) +GENERATE_RELATIVE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH) if [[ ${GENERATE_RELATIVE_SCHEMA_FROM_PARENT} != *"Generated "* ]]; then echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_PATH is broken" exit 1 fi # Same case but should fail! GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH="./fixtures/project/subdir/invalid.prisma" -GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID=$(node ./dist/bin.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null) +GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID=$(node ./build/index.js generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null) if [[ ${GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID} != *"Provided --schema at $GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH doesn't exist."* ]]; then echo "prisma generate --schema=$GENERATE_RELATIVE_SCHEMA_FROM_PARENT_INVALID_PATH is broken (should fail)" exit 1 @@ -120,14 +120,14 @@ fi # Absolute path GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH="$(pwd)/fixtures/project/subdir/schema.prisma" -GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH) +GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT=$(SQLITE_URL=file:dev.db node ./build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH) if [[ ${GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT} != *"Generated "* ]]; then echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_PATH is broken" exit 1 fi # Same case but should fail! GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH="$(pwd)/fixtures/project/subdir/invalid.prisma" -GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID=$(node ./dist/bin.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null) +GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID=$(node ./build/index.js generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH 2>&1 > /dev/null) if [[ ${GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID} != *"Provided --schema at $GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH doesn't exist."* ]]; then echo "prisma generate --schema=$GENERATE_ABSOLUTE_SCHEMA_FROM_PARENT_INVALID_PATH is broken (should fail)" exit 1 From 8c9a7c088fd6240d7cdfc734aab3215fc20e6fdf Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 22:42:32 -0500 Subject: [PATCH 23/28] chore(integration-tests): esbuild + inherited tsconfig --- .../integration-tests/helpers/build.js | 33 +++++++++++++++++++ src/packages/integration-tests/package.json | 4 ++- .../integration-tests/tsconfig.build.json | 8 +++++ .../integration-tests/tsconfig.eslint.json | 4 +-- src/packages/integration-tests/tsconfig.json | 15 +-------- src/pnpm-lock.yaml | 30 +++++++++-------- tsconfig.build.json | 1 - 7 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 src/packages/integration-tests/helpers/build.js create mode 100644 src/packages/integration-tests/tsconfig.build.json diff --git a/src/packages/integration-tests/helpers/build.js b/src/packages/integration-tests/helpers/build.js new file mode 100644 index 000000000000..dbd96447ed9a --- /dev/null +++ b/src/packages/integration-tests/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'dist', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/integration-tests/package.json b/src/packages/integration-tests/package.json index 599cffe7a8c6..01e667441bd2 100644 --- a/src/packages/integration-tests/package.json +++ b/src/packages/integration-tests/package.json @@ -21,6 +21,7 @@ "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", "decimal.js": "10.3.1", + "esbuild": "0.12.16", "escape-string-regexp": "4.0.0", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", @@ -29,6 +30,7 @@ "eslint-plugin-prettier": "3.4.0", "execa": "5.1.1", "fs-jetpack": "4.1.0", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "mariadb": "2.5.4", @@ -55,7 +57,7 @@ "test:mysql": "jest integration.mysql --maxConcurrency=8 --verbose", "test:mariadb": "jest integration.mariadb --maxConcurrency=8 --verbose", "test:mssql": "jest integration.mssql --maxConcurrency=8 --verbose", - "build": "tsc -d", + "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", diff --git a/src/packages/integration-tests/tsconfig.build.json b/src/packages/integration-tests/tsconfig.build.json new file mode 100644 index 000000000000..e0244d8566d7 --- /dev/null +++ b/src/packages/integration-tests/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist", + "emitDeclarationOnly": true + }, + "include": ["src"], +} diff --git a/src/packages/integration-tests/tsconfig.eslint.json b/src/packages/integration-tests/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/integration-tests/tsconfig.eslint.json +++ b/src/packages/integration-tests/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/integration-tests/tsconfig.json b/src/packages/integration-tests/tsconfig.json index 0f64380b6910..618c6c3e97b5 100644 --- a/src/packages/integration-tests/tsconfig.json +++ b/src/packages/integration-tests/tsconfig.json @@ -1,16 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "incremental": true - }, - "exclude": ["dist", "build", "scripts", "src/__tests__", "sandbox"] + "extends": "../../../tsconfig.json" } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 09f77f39cebb..a0c13b489232 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -445,9 +445,10 @@ importers: '@types/node': 12.20.17 '@types/pg': 8.6.1 '@types/sqlite3': 3.1.7 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 decimal.js: 10.3.1 + esbuild: ^0.12.16 escape-string-regexp: 4.0.0 eslint: 7.31.0 eslint-config-prettier: 8.3.0 @@ -456,11 +457,12 @@ importers: eslint-plugin-prettier: 3.4.0 execa: 5.1.1 fs-jetpack: 4.1.0 + glob: ^7.1.7 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 mariadb: 2.5.4 mssql: 7.1.3 - pg: 8.6.0 + pg: 8.7.1 prettier: 2.3.2 replace-string: 3.1.0 segfault-handler: 1.3.0 @@ -469,7 +471,7 @@ importers: string-hash: 1.1.3 strip-ansi: 6.0.0 tempy: 1.0.1 - ts-jest: 27.0.3 + ts-jest: 27.0.4 ts-node: 10.1.0 typescript: 4.3.5 verror: 1.10.0 @@ -484,22 +486,24 @@ importers: '@types/node': 12.20.17 '@types/pg': 8.6.1 '@types/sqlite3': 3.1.7 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 decimal.js: 10.3.1 + esbuild: 0.12.16 escape-string-regexp: 4.0.0 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca execa: 5.1.1 fs-jetpack: 4.1.0 + glob: 7.1.7 jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + lint-staged: 11.1.1 mariadb: 2.5.4 mssql: 7.1.3 - pg: 8.6.0 + pg: 8.7.1 prettier: 2.3.2 replace-string: 3.1.0 segfault-handler: 1.3.0 @@ -508,7 +512,7 @@ importers: string-hash: 1.1.3 strip-ansi: 6.0.0 tempy: 1.0.1 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 ts-node: 10.1.0_6a5e1f2f9646ad83684ea4da8a674e6d typescript: 4.3.5 verror: 1.10.0 @@ -4990,7 +4994,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.0.6 - '@types/node': 12.20.17 + '@types/node': 14.17.5 chalk: 4.1.1 graceful-fs: 4.2.6 is-ci: 3.0.0 @@ -7308,7 +7312,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21 diff --git a/tsconfig.build.json b/tsconfig.build.json index 27536b5ea167..b62162c32b05 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -6,7 +6,6 @@ "esModuleInterop": true, "sourceMap": true, "declaration": true, - "incremental": true, "strict": true, "noImplicitAny": false, From 3be79acff0ac8546bcc75f2cd2bea83b4edac469 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 22:46:29 -0500 Subject: [PATCH 24/28] fix(cli): types --- src/packages/cli/package.json | 1 + src/packages/cli/src/Init.ts | 9 ++- src/pnpm-lock.yaml | 108 ++++++++++++++++++++++------------ 3 files changed, 77 insertions(+), 41 deletions(-) diff --git a/src/packages/cli/package.json b/src/packages/cli/package.json index e9d9e6c950da..d4c97d7d65e2 100644 --- a/src/packages/cli/package.json +++ b/src/packages/cli/package.json @@ -71,6 +71,7 @@ "@prisma/studio-server": "0.417.0", "@timsuchanek/copy": "1.4.5", "@types/jest": "26.0.24", + "@types/rimraf": "3.0.1", "@types/ws": "7.4.7", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", diff --git a/src/packages/cli/src/Init.ts b/src/packages/cli/src/Init.ts index 44fb88aaff7f..392ed997c676 100644 --- a/src/packages/cli/src/Init.ts +++ b/src/packages/cli/src/Init.ts @@ -79,6 +79,8 @@ export const defaultPort = (provider: ConnectorType) => { case 'postgresql': return 5432 } + + return undefined } export const defaultURL = ( @@ -276,12 +278,9 @@ export class Init implements Command { } try { - fs.writeFileSync( - path.join(outputDir, ".gitignore"), - defaultGitIgnore() - ); + fs.writeFileSync(path.join(outputDir, '.gitignore'), defaultGitIgnore()) } catch (error) { - console.error("Failed to write .gitignore file, reason: ", error); + console.error('Failed to write .gitignore file, reason: ', error) } const steps: string[] = [] diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index a0c13b489232..6e04b53b4431 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -63,9 +63,10 @@ importers: '@prisma/studio-server': 0.417.0 '@timsuchanek/copy': 1.4.5 '@types/jest': 26.0.24 + '@types/rimraf': ^3.0.1 '@types/ws': 7.4.7 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 chalk: 4.1.1 checkpoint-client: 1.1.20 dotenv: 10.0.0 @@ -85,12 +86,12 @@ importers: is-installed-globally: 0.4.0 jest: 27.0.6 line-replace: 2.0.1 - lint-staged: 11.1.0 + lint-staged: 11.1.1 log-update: 4.0.0 make-dir: 3.1.0 node-fetch: 2.6.1 open: 7.4.2 - pg: 8.6.0 + pg: 8.7.1 pkg-up: 3.1.0 prettier: 2.3.2 replace-string: 3.1.0 @@ -98,7 +99,7 @@ importers: rimraf: 3.0.2 strip-ansi: 6.0.0 tempy: 1.0.1 - ts-jest: 27.0.3 + ts-jest: 27.0.4 typescript: 4.3.5 dependencies: '@prisma/engines': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 @@ -113,9 +114,10 @@ importers: '@prisma/studio-server': 0.417.0 '@timsuchanek/copy': 1.4.5 '@types/jest': 26.0.24 + '@types/rimraf': 3.0.1 '@types/ws': 7.4.7 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 chalk: 4.1.1 checkpoint-client: 1.1.20 dotenv: 10.0.0 @@ -124,7 +126,7 @@ importers: eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca execa: 5.1.1 fast-deep-equal: 3.1.3 @@ -133,14 +135,14 @@ importers: global-dirs: 3.0.0 indent-string: 4.0.0 is-installed-globally: 0.4.0 - jest: 27.0.6_ts-node@10.1.0 + jest: 27.0.6 line-replace: 2.0.1 - lint-staged: 11.1.0 + lint-staged: 11.1.1 log-update: 4.0.0 make-dir: 3.1.0 node-fetch: 2.6.1 open: 7.4.2 - pg: 8.6.0 + pg: 8.7.1 pkg-up: 3.1.0 prettier: 2.3.2 replace-string: 3.1.0 @@ -148,7 +150,7 @@ importers: rimraf: 3.0.2 strip-ansi: 6.0.0 tempy: 1.0.1 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 typescript: 4.3.5 packages/client: @@ -1646,8 +1648,8 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/debug/2.29.0-dev.1: - resolution: {integrity: sha512-j9osKce1ellaB/I1qn21eAg09WNkRMwPSmrKBjQRRGO8gO7qNNC6vLxDmPaYUyHWaFfESY7EEXoKsuD3i9F70w==} + /@prisma/debug/2.29.0-dev.5: + resolution: {integrity: sha512-qjtrPtYkwEGJJ1h7XprMHaTmholjhyt1q8dLU/TDILSVTSiCoj77t68cVWbsPDPfD+Kb6HJkKXgcu9mWGDk20g==} dependencies: debug: 4.3.2 ms: 2.1.3 @@ -1655,12 +1657,12 @@ packages: - supports-color dev: true - /@prisma/engine-core/2.29.0-dev.1: - resolution: {integrity: sha512-c9jmoppUK6XKcFka8rIXDVzJ4TpDCEfR8r/hSlSCYV51BiS+G90SBu1bPmV13ucQi2Y/Csn+aMcwb+uS/p5+uA==} + /@prisma/engine-core/2.29.0-dev.5: + resolution: {integrity: sha512-JRgTiIMewCR9BGJWBg17yoR0p63F5xChYZS3riwXevo9esIyAh98VT4cnhfrr84gBmZKeUQCEBmXN0ma2sC6nw==} dependencies: - '@prisma/debug': 2.29.0-dev.1 + '@prisma/debug': 2.29.0-dev.5 '@prisma/engines': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 - '@prisma/generator-helper': 2.29.0-dev.1 + '@prisma/generator-helper': 2.29.0-dev.5 '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 chalk: 4.1.1 execa: 5.1.1 @@ -1704,10 +1706,10 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/generator-helper/2.29.0-dev.1: - resolution: {integrity: sha512-Ht7QMS++lNBqjbO4aGaLLVvSe3lHENB0s4jagbOrWgNHTFTs6WarNfns5XyqvpQ+YcjTUQxyuMmWL8pj/3kMeA==} + /@prisma/generator-helper/2.29.0-dev.5: + resolution: {integrity: sha512-hImMQ9BJhI0YUIPEN4L50Whh+O8F+zUbi8/Q160TPEdGZ7zCpqg4bicfs7hbK6b/q0ihBDU62HfZharDmYr5wA==} dependencies: - '@prisma/debug': 2.29.0-dev.1 + '@prisma/debug': 2.29.0-dev.5 '@types/cross-spawn': 6.0.2 chalk: 4.1.1 cross-spawn: 7.0.3 @@ -1722,14 +1724,14 @@ packages: transitivePeerDependencies: - supports-color - /@prisma/sdk/2.29.0-dev.1: - resolution: {integrity: sha512-NH0wpCrRGgTwohHZcxJOlAy6yWQgwWWpl5iOFquO921YLR5vfV+5qYSGNmMVIYOjrETX/F07plX4vWNd4z4WdQ==} + /@prisma/sdk/2.29.0-dev.5: + resolution: {integrity: sha512-Px3OP2mENrG3oDm7AvODAEiuqneiZXAvXtsXNlV6Zehepkd5+QaNof6E7OxO2I/8049DDKpUveNq0y2f3xAiaw==} dependencies: - '@prisma/debug': 2.29.0-dev.1 - '@prisma/engine-core': 2.29.0-dev.1 + '@prisma/debug': 2.29.0-dev.5 + '@prisma/engine-core': 2.29.0-dev.5 '@prisma/engines': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@prisma/fetch-engine': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 - '@prisma/generator-helper': 2.29.0-dev.1 + '@prisma/generator-helper': 2.29.0-dev.5 '@prisma/get-platform': 2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 @@ -1754,7 +1756,7 @@ packages: string-width: 4.2.2 strip-ansi: 6.0.0 strip-indent: 3.0.0 - tar: 6.1.0 + tar: 6.1.2 temp-dir: 2.0.0 temp-write: 4.0.0 tempy: 1.0.1 @@ -1764,13 +1766,13 @@ packages: - supports-color dev: true - /@prisma/studio-pcw/0.417.0_@prisma+sdk@2.29.0-dev.1: + /@prisma/studio-pcw/0.417.0_@prisma+sdk@2.29.0-dev.5: resolution: {integrity: sha512-3idGkeUiifHLyIlF0uP+TZco1V3Cm/gvCSbVFEJDLkrwPf4Qfq4jO8h9ayV1zksrcm7/iK+U/W4e0QQCbfRrRw==} peerDependencies: '@prisma/client': '*' '@prisma/sdk': '*' dependencies: - '@prisma/sdk': 2.29.0-dev.1 + '@prisma/sdk': 2.29.0-dev.5 debug: 4.3.1 lodash: 4.17.21 transitivePeerDependencies: @@ -1780,8 +1782,8 @@ packages: /@prisma/studio-server/0.417.0: resolution: {integrity: sha512-09bxlpzDnRRrQNgINTHO/Q6aNT+PrloGMzzmF8isGXGattXwmw9H9LDwPrzYyYOSu3/9KvohDPOO9jLpU7wfHw==} dependencies: - '@prisma/sdk': 2.29.0-dev.1 - '@prisma/studio-pcw': 0.417.0_@prisma+sdk@2.29.0-dev.1 + '@prisma/sdk': 2.29.0-dev.5 + '@prisma/studio-pcw': 0.417.0_@prisma+sdk@2.29.0-dev.5 '@prisma/studio-transports': 0.417.0 '@sentry/node': 6.2.5 checkpoint-client: 1.1.20 @@ -1790,7 +1792,6 @@ packages: express: 4.17.1 untildify: 4.0.0 transitivePeerDependencies: - - '@prisma/client' - supports-color dev: true @@ -1983,7 +1984,7 @@ packages: /@types/cross-spawn/6.0.2: resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==} dependencies: - '@types/node': 12.20.16 + '@types/node': 16.4.6 /@types/debug/4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} @@ -2006,6 +2007,13 @@ packages: resolution: {integrity: sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==} dev: true + /@types/glob/7.1.4: + resolution: {integrity: sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==} + dependencies: + '@types/minimatch': 3.0.5 + '@types/node': 16.4.6 + dev: true + /@types/graceful-fs/4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: @@ -2047,6 +2055,10 @@ packages: resolution: {integrity: sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==} dev: true + /@types/minimatch/3.0.5: + resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} + dev: true + /@types/minimist/1.2.2: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} dev: true @@ -2077,6 +2089,7 @@ packages: /@types/node/12.20.16: resolution: {integrity: sha512-6CLxw83vQf6DKqXxMPwl8qpF8I7THFZuIwLt4TnNsumxkp1VsRZWT8txQxncT/Rl2UojTsFzWgDG4FRMwafrlA==} + dev: true /@types/node/12.20.17: resolution: {integrity: sha512-so8EHl4S6MmatPS0f9sE1ND94/ocbcEshW5OpyYthRqeRpiYyW2uXYTo/84kmfdfeNrDycARkvuiXl6nO40NGg==} @@ -2090,6 +2103,9 @@ packages: resolution: {integrity: sha512-UW7cbLqf/Wu5XH2RKKY1cHwUNLicIDRLMraYKz+HHAerJ0ZffUEk+fMnd8qU2JaS6cAy0r8tsaf7yqHASf/Y0Q==} dev: true + /@types/node/16.4.6: + resolution: {integrity: sha512-FKyawK3o5KL16AwbeFajen8G4K3mmqUrQsehn5wNKs8IzlKHE8TfnSmILXVMVziAEcnB23u1RCFU1NT6hSyr7Q==} + /@types/node/8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: true @@ -2132,6 +2148,13 @@ packages: /@types/retry/0.12.1: resolution: {integrity: sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==} + /@types/rimraf/3.0.1: + resolution: {integrity: sha512-CAoSlbco40aKZ0CkelBF2g3JeN6aioRaTVnqSX5pWsn/WApm6IDxI4e4tD9D0dY/meCkyyleP1IQDVN13F4maA==} + dependencies: + '@types/glob': 7.1.4 + '@types/node': 16.4.6 + dev: true + /@types/shell-quote/1.7.1: resolution: {integrity: sha512-SWZ2Nom1pkyXCDohRSrkSKvDh8QOG9RfAsrt5/NsPQC4UQJ55eG0qClA40I+Gkez4KTQ0uDUT8ELRXThf3J5jw==} dev: true @@ -4994,7 +5017,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.0.6 - '@types/node': 14.17.5 + '@types/node': 16.4.6 chalk: 4.1.1 graceful-fs: 4.2.6 is-ci: 3.0.0 @@ -7113,6 +7136,19 @@ packages: minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 + dev: false + + /tar/6.1.2: + resolution: {integrity: sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==} + engines: {node: '>= 10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 3.1.3 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: true /tarn/3.0.1: resolution: {integrity: sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw==} @@ -7155,7 +7191,7 @@ packages: engines: {node: '>=8'} dependencies: graceful-fs: 4.2.6 - is-stream: 2.0.0 + is-stream: 2.0.1 make-dir: 3.1.0 temp-dir: 1.0.0 uuid: 3.4.0 @@ -7312,7 +7348,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6_ts-node@10.1.0 + jest: 27.0.6 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21 From 07643a00bee75bffb318749c058c26c5d5412379 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 23:19:06 -0500 Subject: [PATCH 25/28] chore(react-prisma): esbuild + inherited tsconfig --- src/packages/react-prisma/helpers/build.js | 33 +++++++++++++++++++ src/packages/react-prisma/package.json | 14 ++++---- src/packages/react-prisma/tsconfig.build.json | 8 +++++ .../react-prisma/tsconfig.eslint.json | 4 +-- src/packages/react-prisma/tsconfig.json | 15 +-------- src/pnpm-lock.yaml | 28 ++++++++++------ 6 files changed, 69 insertions(+), 33 deletions(-) create mode 100644 src/packages/react-prisma/helpers/build.js create mode 100644 src/packages/react-prisma/tsconfig.build.json diff --git a/src/packages/react-prisma/helpers/build.js b/src/packages/react-prisma/helpers/build.js new file mode 100644 index 000000000000..dbd96447ed9a --- /dev/null +++ b/src/packages/react-prisma/helpers/build.js @@ -0,0 +1,33 @@ +const execa = require('execa') +const esbuild = require('esbuild') +const glob = require('glob') + +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + sourcemap: 'external' +} + +async function build() { + await Promise.all([ + esbuild.build({ + ...ESBUILD_DEFAULT, + entryPoints: glob.sync('./src/**/*.{j,t}s', { + ignore: './src/__tests__/**/*.{j,t}s' + }), + outdir: 'dist', + format: 'cjs', + }), + ]) + + await run('tsc --build tsconfig.build.json') +} + +function run(command, preferLocal = true) { + return execa.command(command, { preferLocal, shell: true, stdio: 'inherit' }) +} + +build().catch((e) => { + console.error(e) + process.exit(1) +}) diff --git a/src/packages/react-prisma/package.json b/src/packages/react-prisma/package.json index 9b4c2ac64a61..bc28b5f292cf 100644 --- a/src/packages/react-prisma/package.json +++ b/src/packages/react-prisma/package.json @@ -8,26 +8,28 @@ "repository": "git@github.com:prisma/prisma.git", "homepage": "https://www.prisma.io", "devDependencies": { + "@prisma/client": "workspace:*", "@types/jest": "26.0.24", "@types/node": "14.17.6", "@typescript-eslint/eslint-plugin": "4.28.5", "@typescript-eslint/parser": "4.28.5", + "esbuild": "0.12.16", "eslint": "7.31.0", "eslint-config-prettier": "8.3.0", "eslint-plugin-eslint-comments": "3.2.0", "eslint-plugin-jest": "24.4.0", "eslint-plugin-prettier": "3.4.0", + "glob": "7.1.7", "jest": "27.0.6", "lint-staged": "11.1.1", "prettier": "2.3.2", + "react": "17.0.0", "strip-ansi": "7.0.0", "ts-jest": "27.0.4", - "typescript": "4.3.5", - "react": "^17.0.0", - "@prisma/client": "workspace:*" + "typescript": "4.3.5" }, "scripts": { - "build": "tsc -d", + "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", @@ -46,7 +48,7 @@ ] }, "peerDependencies": { - "react": "^17.0.0", - "@prisma/client": "*" + "@prisma/client": "*", + "react": "^17.0.0" } } diff --git a/src/packages/react-prisma/tsconfig.build.json b/src/packages/react-prisma/tsconfig.build.json new file mode 100644 index 000000000000..e0244d8566d7 --- /dev/null +++ b/src/packages/react-prisma/tsconfig.build.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.build.json", + "compilerOptions": { + "outDir": "dist", + "emitDeclarationOnly": true + }, + "include": ["src"], +} diff --git a/src/packages/react-prisma/tsconfig.eslint.json b/src/packages/react-prisma/tsconfig.eslint.json index 2f038bd3f1ef..fc8520e73765 100644 --- a/src/packages/react-prisma/tsconfig.eslint.json +++ b/src/packages/react-prisma/tsconfig.eslint.json @@ -1,5 +1,3 @@ { - "extends": "./tsconfig", - "include": ["src"], - "exclude": [] + "extends": "./tsconfig.json" } diff --git a/src/packages/react-prisma/tsconfig.json b/src/packages/react-prisma/tsconfig.json index 66993f6569c9..618c6c3e97b5 100644 --- a/src/packages/react-prisma/tsconfig.json +++ b/src/packages/react-prisma/tsconfig.json @@ -1,16 +1,3 @@ { - "compilerOptions": { - "lib": ["esnext"], - "module": "commonjs", - "target": "es2018", - "strict": true, - "esModuleInterop": true, - "sourceMap": true, - "noImplicitAny": false, - "outDir": "dist", - "rootDir": "src", - "declaration": true, - "incremental": true - }, - "exclude": ["dist", "build", "src/__tests__", "scripts", "sandbox"] + "extends": "../../../tsconfig.json" } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 6e04b53b4431..70139c2bb704 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -622,16 +622,18 @@ importers: specifiers: '@prisma/client': workspace:* '@types/jest': 26.0.24 - '@types/node': 14.17.5 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@types/node': 14.17.6 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 + esbuild: ^0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 + glob: ^7.1.7 jest: 27.0.6 - lint-staged: 11.1.0 + lint-staged: 11.1.1 prettier: 2.3.2 react: ^17.0.0 strip-ansi: 7.0.0 @@ -640,16 +642,18 @@ importers: devDependencies: '@prisma/client': link:../client '@types/jest': 26.0.24 - '@types/node': 14.17.5 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@types/node': 14.17.6 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca - jest: 27.0.6_ts-node@10.1.0 - lint-staged: 11.1.0 + glob: 7.1.7 + jest: 27.0.6 + lint-staged: 11.1.1 prettier: 2.3.2 react: 17.0.2 strip-ansi: 7.0.0 @@ -2099,6 +2103,10 @@ packages: resolution: {integrity: sha512-bjqH2cX/O33jXT/UmReo2pM7DIJREPMnarixbQ57DOOzzFaI6D2+IcwaJQaJpv0M1E9TIhPCYVxrkcityLjlqA==} dev: true + /@types/node/14.17.6: + resolution: {integrity: sha512-iBxsxU7eswQDGhlr3AiamBxOssaYxbM+NKXVil8jg9yFXvrfEFbDumLD/2dMTB+zYyg7w+Xjt8yuxfdbUHAtcQ==} + dev: true + /@types/node/16.4.1: resolution: {integrity: sha512-UW7cbLqf/Wu5XH2RKKY1cHwUNLicIDRLMraYKz+HHAerJ0ZffUEk+fMnd8qU2JaS6cAy0r8tsaf7yqHASf/Y0Q==} dev: true From 67e16d452f3fdf1a648e2886310791b67e4a5ffe Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Wed, 28 Jul 2021 23:54:19 -0500 Subject: [PATCH 26/28] chore(prisma): expose dev command --- src/packages/cli/package.json | 3 ++- src/packages/client/helpers/build.js | 6 ++++-- src/packages/client/package.json | 1 + src/packages/debug/helpers/build.js | 12 +++++++----- src/packages/debug/package.json | 1 + src/packages/engine-core/helpers/build.js | 12 +++++++----- src/packages/engine-core/package.json | 1 + src/packages/generator-helper/helpers/build.js | 12 +++++++----- src/packages/generator-helper/package.json | 1 + src/packages/integration-tests/helpers/build.js | 12 +++++++----- src/packages/integration-tests/package.json | 3 ++- src/packages/migrate/helpers/build.js | 12 +++++++----- src/packages/migrate/package.json | 1 + src/packages/react-prisma/helpers/build.js | 12 +++++++----- src/packages/react-prisma/package.json | 1 + src/packages/react-prisma/test.js | 1 + src/packages/sdk/helpers/build.js | 12 +++++++----- src/packages/sdk/package.json | 1 + tsconfig.json | 8 ++++---- 19 files changed, 69 insertions(+), 43 deletions(-) create mode 100644 src/packages/react-prisma/test.js diff --git a/src/packages/cli/package.json b/src/packages/cli/package.json index d4c97d7d65e2..1d410ecb2e92 100644 --- a/src/packages/cli/package.json +++ b/src/packages/cli/package.json @@ -111,6 +111,8 @@ "typescript": "4.3.5" }, "scripts": { + "dev": "DEV=true node helpers/build.js", + "build": "node helpers/build.js", "test:commands": "./fixtures/test.sh && jest --maxConcurrency=1", "test-update": "pnpm run test:commands -- -u", "test": "pnpm run test:commands", @@ -120,7 +122,6 @@ "lint": "eslint --cache --fix --ext .ts .", "lint-ci": "eslint --ext .ts .", "tsc": "tsc -d -p tsconfig.build.json && bash scripts/copy-runtime-dist.sh", - "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "preinstall": "node scripts/preinstall-entry.js", "precommit": "lint-staged" diff --git a/src/packages/client/helpers/build.js b/src/packages/client/helpers/build.js index c15a4b818db5..070451a56e54 100644 --- a/src/packages/client/helpers/build.js +++ b/src/packages/client/helpers/build.js @@ -29,8 +29,10 @@ async function build() { }), ]) - await run('tsc --build tsconfig.build.json') - await run('rollup -c') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + await run('rollup -c') + } } function run(command, preferLocal = true) { diff --git a/src/packages/client/package.json b/src/packages/client/package.json index 6fed2b480af4..ef3fa75790a8 100644 --- a/src/packages/client/package.json +++ b/src/packages/client/package.json @@ -37,6 +37,7 @@ ], "bugs": "https://github.com/prisma/prisma/issues", "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "test": "jest", "format": "prettier --write .", diff --git a/src/packages/debug/helpers/build.js b/src/packages/debug/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/debug/helpers/build.js +++ b/src/packages/debug/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/debug/package.json b/src/packages/debug/package.json index f4eace2d4f8f..b7faf79778a1 100644 --- a/src/packages/debug/package.json +++ b/src/packages/debug/package.json @@ -36,6 +36,7 @@ "typescript": "4.3.5" }, "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", diff --git a/src/packages/engine-core/helpers/build.js b/src/packages/engine-core/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/engine-core/helpers/build.js +++ b/src/packages/engine-core/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/engine-core/package.json b/src/packages/engine-core/package.json index 6d1764df78ca..2c94e23d549c 100644 --- a/src/packages/engine-core/package.json +++ b/src/packages/engine-core/package.json @@ -34,6 +34,7 @@ "typescript": "4.3.5" }, "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "prepublishOnly": "npm run build", "format": "prettier --write .", diff --git a/src/packages/generator-helper/helpers/build.js b/src/packages/generator-helper/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/generator-helper/helpers/build.js +++ b/src/packages/generator-helper/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/generator-helper/package.json b/src/packages/generator-helper/package.json index 7e06bba1e97d..8da3e92371dc 100644 --- a/src/packages/generator-helper/package.json +++ b/src/packages/generator-helper/package.json @@ -21,6 +21,7 @@ "cross-spawn": "^7.0.2" }, "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "prepublishOnly": "pnpm run build && pnpm run test", "format": "prettier --write .", diff --git a/src/packages/integration-tests/helpers/build.js b/src/packages/integration-tests/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/integration-tests/helpers/build.js +++ b/src/packages/integration-tests/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/integration-tests/package.json b/src/packages/integration-tests/package.json index 01e667441bd2..4a81b9d68078 100644 --- a/src/packages/integration-tests/package.json +++ b/src/packages/integration-tests/package.json @@ -50,6 +50,8 @@ "verror": "1.10.0" }, "scripts": { + "dev": "DEV=true node helpers/build.js", + "build": "node helpers/build.js", "jest": "jest", "test:integration": "jest integration --maxConcurrency=8 --verbose", "test:sqlite": "jest integration.sqlite --verbose", @@ -57,7 +59,6 @@ "test:mysql": "jest integration.mysql --maxConcurrency=8 --verbose", "test:mariadb": "jest integration.mariadb --maxConcurrency=8 --verbose", "test:mssql": "jest integration.mssql --maxConcurrency=8 --verbose", - "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", "lint": "eslint --cache --fix --ext .ts .", diff --git a/src/packages/migrate/helpers/build.js b/src/packages/migrate/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/migrate/helpers/build.js +++ b/src/packages/migrate/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/migrate/package.json b/src/packages/migrate/package.json index 85ad8933f792..d7b868c13d35 100644 --- a/src/packages/migrate/package.json +++ b/src/packages/migrate/package.json @@ -71,6 +71,7 @@ "strip-indent": "^3.0.0" }, "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "run": "node dist/bin.js", "precommit": "lint-staged", diff --git a/src/packages/react-prisma/helpers/build.js b/src/packages/react-prisma/helpers/build.js index dbd96447ed9a..c74c4e4dcea7 100644 --- a/src/packages/react-prisma/helpers/build.js +++ b/src/packages/react-prisma/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -14,13 +16,13 @@ async function build() { ...ESBUILD_DEFAULT, entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' - }), - outdir: 'dist', - format: 'cjs', + }) }), ]) - await run('tsc --build tsconfig.build.json') + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/react-prisma/package.json b/src/packages/react-prisma/package.json index bc28b5f292cf..cd8edef95d0b 100644 --- a/src/packages/react-prisma/package.json +++ b/src/packages/react-prisma/package.json @@ -29,6 +29,7 @@ "typescript": "4.3.5" }, "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "prepublishOnly": "pnpm run build", "format": "prettier --write .", diff --git a/src/packages/react-prisma/test.js b/src/packages/react-prisma/test.js new file mode 100644 index 000000000000..c14050e5f09a --- /dev/null +++ b/src/packages/react-prisma/test.js @@ -0,0 +1 @@ +console.log(process.env.DEV) \ No newline at end of file diff --git a/src/packages/sdk/helpers/build.js b/src/packages/sdk/helpers/build.js index dbd96447ed9a..c070307d5a6c 100644 --- a/src/packages/sdk/helpers/build.js +++ b/src/packages/sdk/helpers/build.js @@ -5,7 +5,9 @@ const glob = require('glob') const ESBUILD_DEFAULT = { platform: 'node', target: 'node12', - sourcemap: 'external' + sourcemap: 'external', + format: 'cjs', + outdir: 'dist' } async function build() { @@ -15,12 +17,12 @@ async function build() { entryPoints: glob.sync('./src/**/*.{j,t}s', { ignore: './src/__tests__/**/*.{j,t}s' }), - outdir: 'dist', - format: 'cjs', }), ]) - - await run('tsc --build tsconfig.build.json') + + if (process.env.DEV !== 'true') { + await run('tsc --build tsconfig.build.json') + } } function run(command, preferLocal = true) { diff --git a/src/packages/sdk/package.json b/src/packages/sdk/package.json index be0bb938ea26..cd8f4151c469 100644 --- a/src/packages/sdk/package.json +++ b/src/packages/sdk/package.json @@ -14,6 +14,7 @@ "bugs": "https://github.com/prisma/prisma/issues", "license": "Apache-2.0", "scripts": { + "dev": "DEV=true node helpers/build.js", "build": "node helpers/build.js", "prepublishOnly": "pnpm run build && pnpm run test", "format": "prettier --write .", diff --git a/tsconfig.json b/tsconfig.json index 2a87f32a412b..3aac93051231 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,10 +10,10 @@ "@prisma/engine-core": ["engine-core/src"], "@prisma/debug": ["debug/src"], "@prisma/cli": ["cli/src"], - "@prisma/get-platform": ["../../../engines-wrapper/packages/get-platform/src"], - "@prisma/fetch-engine": ["../../../engines-wrapper/packages/fetch-engine/src"], - "@prisma/engines": ["../../../engines-wrapper/packages/engines/src"], - "@prisma/engines-version": ["../../../engines-wrapper/packages/engines-version/src"] + // "@prisma/get-platform": ["../../../engines-wrapper/packages/get-platform/src"], + // "@prisma/fetch-engine": ["../../../engines-wrapper/packages/fetch-engine/src"], + // "@prisma/engines": ["../../../engines-wrapper/packages/engines/src"], + // "@prisma/engines-version": ["../../../engines-wrapper/packages/engines-version/src"] } }, "include": ["**/*"], From 1a2b2275185a223bb644f1579ec8428cd9a0ed15 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Thu, 29 Jul 2021 00:06:40 -0500 Subject: [PATCH 27/28] chore(prisma): pass tsconfig to esbuild --- src/packages/cli/helpers/build.js | 28 +++++++++---------- src/packages/client/helpers/build.js | 3 +- src/packages/debug/helpers/build.js | 3 +- src/packages/engine-core/helpers/build.js | 3 +- .../generator-helper/helpers/build.js | 3 +- .../integration-tests/helpers/build.js | 3 +- src/packages/migrate/helpers/build.js | 3 +- src/packages/react-prisma/helpers/build.js | 3 +- src/packages/sdk/helpers/build.js | 3 +- tsconfig.json | 8 +++--- 10 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/packages/cli/helpers/build.js b/src/packages/cli/helpers/build.js index 83ed63bc80d3..d007fd88a4e8 100644 --- a/src/packages/cli/helpers/build.js +++ b/src/packages/cli/helpers/build.js @@ -9,6 +9,13 @@ const { promisify } = require('util') const copyFile = promisify(fs.copyFile) const lineReplace = require('line-replace') +const ESBUILD_DEFAULT = { + platform: 'node', + target: 'node12', + bundle: true, + tsconfig: 'tsconfig.build.json' +} + async function main() { const before = Date.now() @@ -18,28 +25,21 @@ async function main() { await Promise.all([ esbuild.build({ - platform: 'node', - bundle: true, - target: 'node12', - outfile: 'build/index.js', + ...ESBUILD_DEFAULT, entryPoints: ['src/bin.ts'], + outfile: 'build/index.js', external: ['@prisma/engines', '_http_common'], }), esbuild.build({ - platform: 'node', - bundle: true, - minify: true, - target: ['node12'], - outfile: 'preinstall/index.js', + ...ESBUILD_DEFAULT, entryPoints: ['scripts/preinstall.js'], + outfile: 'preinstall/index.js', }), esbuild.build({ - platform: 'node', - bundle: true, - minify: true, - target: ['node12'], - outfile: 'install/index.js', + ...ESBUILD_DEFAULT, entryPoints: ['scripts/install.js'], + outfile: 'install/index.js', + minify: true, }), copy({ from: path.join( diff --git a/src/packages/client/helpers/build.js b/src/packages/client/helpers/build.js index 070451a56e54..62d080f2dcb3 100644 --- a/src/packages/client/helpers/build.js +++ b/src/packages/client/helpers/build.js @@ -5,7 +5,8 @@ const ESBUILD_DEFAULT = { bundle: true, platform: 'node', target: 'node12', - external: ['_http_common'] + external: ['_http_common'], + tsconfig: 'tsconfig.build.json', } async function build() { diff --git a/src/packages/debug/helpers/build.js b/src/packages/debug/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/debug/helpers/build.js +++ b/src/packages/debug/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/engine-core/helpers/build.js b/src/packages/engine-core/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/engine-core/helpers/build.js +++ b/src/packages/engine-core/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/generator-helper/helpers/build.js b/src/packages/generator-helper/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/generator-helper/helpers/build.js +++ b/src/packages/generator-helper/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/integration-tests/helpers/build.js b/src/packages/integration-tests/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/integration-tests/helpers/build.js +++ b/src/packages/integration-tests/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/migrate/helpers/build.js b/src/packages/migrate/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/migrate/helpers/build.js +++ b/src/packages/migrate/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/react-prisma/helpers/build.js b/src/packages/react-prisma/helpers/build.js index c74c4e4dcea7..b3e4be635b3a 100644 --- a/src/packages/react-prisma/helpers/build.js +++ b/src/packages/react-prisma/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/src/packages/sdk/helpers/build.js b/src/packages/sdk/helpers/build.js index c070307d5a6c..1f75fbc7e896 100644 --- a/src/packages/sdk/helpers/build.js +++ b/src/packages/sdk/helpers/build.js @@ -7,7 +7,8 @@ const ESBUILD_DEFAULT = { target: 'node12', sourcemap: 'external', format: 'cjs', - outdir: 'dist' + outdir: 'dist', + tsconfig: 'tsconfig.build.json' } async function build() { diff --git a/tsconfig.json b/tsconfig.json index 3aac93051231..2a87f32a412b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,10 +10,10 @@ "@prisma/engine-core": ["engine-core/src"], "@prisma/debug": ["debug/src"], "@prisma/cli": ["cli/src"], - // "@prisma/get-platform": ["../../../engines-wrapper/packages/get-platform/src"], - // "@prisma/fetch-engine": ["../../../engines-wrapper/packages/fetch-engine/src"], - // "@prisma/engines": ["../../../engines-wrapper/packages/engines/src"], - // "@prisma/engines-version": ["../../../engines-wrapper/packages/engines-version/src"] + "@prisma/get-platform": ["../../../engines-wrapper/packages/get-platform/src"], + "@prisma/fetch-engine": ["../../../engines-wrapper/packages/fetch-engine/src"], + "@prisma/engines": ["../../../engines-wrapper/packages/engines/src"], + "@prisma/engines-version": ["../../../engines-wrapper/packages/engines-version/src"] } }, "include": ["**/*"], From c6546b2586d7d26ec8412bf5505df282362aea47 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Mills Date: Thu, 29 Jul 2021 20:43:17 -0500 Subject: [PATCH 28/28] chore: test --- src/pnpm-lock.yaml | 352 ++++++--------------------------------------- 1 file changed, 42 insertions(+), 310 deletions(-) diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 70139c2bb704..4b84ec2c5b71 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -63,7 +63,7 @@ importers: '@prisma/studio-server': 0.417.0 '@timsuchanek/copy': 1.4.5 '@types/jest': 26.0.24 - '@types/rimraf': ^3.0.1 + '@types/rimraf': 3.0.1 '@types/ws': 7.4.7 '@typescript-eslint/eslint-plugin': 4.28.5 '@typescript-eslint/parser': 4.28.5 @@ -135,7 +135,7 @@ importers: global-dirs: 3.0.0 indent-string: 4.0.0 is-installed-globally: 0.4.0 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 line-replace: 2.0.1 lint-staged: 11.1.1 log-update: 4.0.0 @@ -171,8 +171,8 @@ importers: '@types/mssql': 6.0.8 '@types/node': 12.20.17 '@types/pg': 8.6.1 - '@typescript-eslint/eslint-plugin': 4.28.4 - '@typescript-eslint/parser': 4.28.4 + '@typescript-eslint/eslint-plugin': 4.28.5 + '@typescript-eslint/parser': 4.28.5 arg: 5.0.0 chalk: 4.1.1 decimal.js: 10.3.1 @@ -193,17 +193,17 @@ importers: jest: 27.0.6 js-levenshtein: 1.1.6 klona: 2.0.4 - lint-staged: 11.1.0 + lint-staged: 11.1.1 make-dir: 3.1.0 mariadb: 2.5.4 mssql: 7.1.3 - pg: 8.6.0 + pg: 8.7.1 pkg-up: 3.1.0 pluralize: 8.0.0 prettier: 2.3.2 replace-string: 3.1.0 rimraf: 3.0.2 - rollup: 2.53.3 + rollup: 2.55.0 rollup-plugin-dts: 3.0.2 sort-keys: 4.2.0 source-map-support: 0.5.19 @@ -211,7 +211,7 @@ importers: stacktrace-parser: 0.1.10 strip-ansi: 6.0.0 strip-indent: 3.0.0 - ts-jest: 27.0.3 + ts-jest: 27.0.4 ts-node: 10.1.0 tsd: 0.17.0 typescript: 4.3.5 @@ -233,8 +233,8 @@ importers: '@types/mssql': 6.0.8 '@types/node': 12.20.17 '@types/pg': 8.6.1 - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 + '@typescript-eslint/eslint-plugin': 4.28.5_514553717ff968e20f6d1c6e521f8616 + '@typescript-eslint/parser': 4.28.5_eslint@7.31.0+typescript@4.3.5 arg: 5.0.0 chalk: 4.1.1 decimal.js: 10.3.1 @@ -243,7 +243,7 @@ importers: eslint: 7.31.0 eslint-config-prettier: 8.3.0_eslint@7.31.0 eslint-plugin-eslint-comments: 3.2.0_eslint@7.31.0 - eslint-plugin-jest: 24.4.0_fc5326c9e782cff3be563ae5197052dc + eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca execa: 5.1.1 flat-map-polyfill: 0.3.8 @@ -255,32 +255,32 @@ importers: jest: 27.0.6_ts-node@10.1.0 js-levenshtein: 1.1.6 klona: 2.0.4 - lint-staged: 11.1.0 + lint-staged: 11.1.1 make-dir: 3.1.0 mariadb: 2.5.4 mssql: 7.1.3 - pg: 8.6.0 + pg: 8.7.1 pkg-up: 3.1.0 pluralize: 8.0.0 prettier: 2.3.2 replace-string: 3.1.0 rimraf: 3.0.2 - rollup: 2.53.3 - rollup-plugin-dts: 3.0.2_rollup@2.53.3+typescript@4.3.5 + rollup: 2.55.0 + rollup-plugin-dts: 3.0.2_rollup@2.55.0+typescript@4.3.5 sort-keys: 4.2.0 source-map-support: 0.5.19 sql-template-tag: 4.0.0 stacktrace-parser: 0.1.10 strip-ansi: 6.0.0 strip-indent: 3.0.0 - ts-jest: 27.0.3_jest@27.0.6+typescript@4.3.5 + ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 ts-node: 10.1.0_6a5e1f2f9646ad83684ea4da8a674e6d tsd: 0.17.0 typescript: 4.3.5 packages/debug: specifiers: - '@types/debug': ^4.1.7 + '@types/debug': 4.1.7 '@types/jest': 26.0.24 '@types/node': 12.20.17 '@typescript-eslint/eslint-plugin': 4.28.5 @@ -318,7 +318,7 @@ importers: eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca execa: 5.1.1 glob: 7.1.7 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 lint-staged: 11.1.1 prettier: 2.3.2 strip-ansi: 6.0.0 @@ -336,7 +336,7 @@ importers: '@typescript-eslint/eslint-plugin': 4.28.5 '@typescript-eslint/parser': 4.28.5 chalk: ^4.0.0 - esbuild: ^0.12.16 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -344,7 +344,7 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 get-stream: ^6.0.0 - glob: ^7.1.7 + glob: 7.1.7 indent-string: ^4.0.0 jest: 27.0.6 lint-staged: 11.1.1 @@ -381,7 +381,7 @@ importers: eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca glob: 7.1.7 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 lint-staged: 11.1.1 prettier: 2.3.2 strip-ansi: 6.0.0 @@ -398,13 +398,13 @@ importers: '@typescript-eslint/parser': 4.28.5 chalk: ^4.0.0 cross-spawn: ^7.0.2 - esbuild: ^0.12.16 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 - glob: ^7.1.7 + glob: 7.1.7 jest: 27.0.6 lint-staged: 11.1.1 prettier: 2.3.2 @@ -450,7 +450,7 @@ importers: '@typescript-eslint/eslint-plugin': 4.28.5 '@typescript-eslint/parser': 4.28.5 decimal.js: 10.3.1 - esbuild: ^0.12.16 + esbuild: 0.12.16 escape-string-regexp: 4.0.0 eslint: 7.31.0 eslint-config-prettier: 8.3.0 @@ -459,7 +459,7 @@ importers: eslint-plugin-prettier: 3.4.0 execa: 5.1.1 fs-jetpack: 4.1.0 - glob: ^7.1.7 + glob: 7.1.7 jest: 27.0.6 lint-staged: 11.1.1 mariadb: 2.5.4 @@ -536,7 +536,7 @@ importers: '@typescript-eslint/parser': 4.28.5 chalk: 4.1.1 del: 6.0.0 - esbuild: ^0.12.16 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -544,7 +544,7 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 fs-jetpack: 4.1.0 - glob: ^7.1.7 + glob: 7.1.7 global-dirs: ^3.0.0 has-yarn: ^2.1.0 indent-string: ^4.0.0 @@ -605,7 +605,7 @@ importers: eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca fs-jetpack: 4.1.0 glob: 7.1.7 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 lint-staged: 11.1.1 make-dir: 3.1.0 mariadb: 2.5.4 @@ -625,17 +625,17 @@ importers: '@types/node': 14.17.6 '@typescript-eslint/eslint-plugin': 4.28.5 '@typescript-eslint/parser': 4.28.5 - esbuild: ^0.12.16 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 eslint-plugin-jest: 24.4.0 eslint-plugin-prettier: 3.4.0 - glob: ^7.1.7 + glob: 7.1.7 jest: 27.0.6 lint-staged: 11.1.1 prettier: 2.3.2 - react: ^17.0.0 + react: 17.0.0 strip-ansi: 7.0.0 ts-jest: 27.0.4 typescript: 4.3.5 @@ -652,10 +652,10 @@ importers: eslint-plugin-jest: 24.4.0_ac7033cc4dfbdac1051fc5c687b09618 eslint-plugin-prettier: 3.4.0_19f511d6aa08b367b6cb59e8f50291ca glob: 7.1.7 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 lint-staged: 11.1.1 prettier: 2.3.2 - react: 17.0.2 + react: 17.0.0 strip-ansi: 7.0.0 ts-jest: 27.0.4_52cc4273aa16028085013af47e479e10 typescript: 4.3.5 @@ -682,7 +682,7 @@ importers: checkpoint-client: 1.1.20 cli-truncate: ^2.1.0 dotenv: ^10.0.0 - esbuild: ^0.12.16 + esbuild: 0.12.16 eslint: 7.31.0 eslint-config-prettier: 8.3.0 eslint-plugin-eslint-comments: 3.2.0 @@ -690,7 +690,7 @@ importers: eslint-plugin-prettier: 3.4.0 execa: ^5.0.0 find-up: 5.0.0 - glob: ^7.1.7 + glob: 7.1.7 global-dirs: ^3.0.0 globby: ^11.0.0 has-yarn: ^2.1.0 @@ -1371,52 +1371,6 @@ packages: slash: 3.0.0 dev: true - /@jest/core/27.0.6: - resolution: {integrity: sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/console': 27.0.6 - '@jest/reporters': 27.0.6 - '@jest/test-result': 27.0.6 - '@jest/transform': 27.0.6 - '@jest/types': 27.0.6 - '@types/node': 12.20.16 - ansi-escapes: 4.3.2 - chalk: 4.1.1 - emittery: 0.8.1 - exit: 0.1.2 - graceful-fs: 4.2.6 - jest-changed-files: 27.0.6 - jest-config: 27.0.6 - jest-haste-map: 27.0.6 - jest-message-util: 27.0.6 - jest-regex-util: 27.0.6 - jest-resolve: 27.0.6 - jest-resolve-dependencies: 27.0.6 - jest-runner: 27.0.6 - jest-runtime: 27.0.6 - jest-snapshot: 27.0.6 - jest-util: 27.0.6 - jest-validate: 27.0.6 - jest-watcher: 27.0.6 - micromatch: 4.0.4 - p-each-series: 2.2.0 - rimraf: 3.0.2 - slash: 3.0.0 - strip-ansi: 6.0.0 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: true - /@jest/core/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -2224,31 +2178,6 @@ packages: '@types/yargs-parser': 20.2.1 dev: true - /@typescript-eslint/eslint-plugin/4.28.4_b1648df9f9ba40bdeef3710a5a5af353: - resolution: {integrity: sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw==} - engines: {node: ^10.12.0 || >=12.0.0} - peerDependencies: - '@typescript-eslint/parser': ^4.0.0 - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/experimental-utils': 4.28.4_eslint@7.31.0+typescript@4.3.5 - '@typescript-eslint/parser': 4.28.4_eslint@7.31.0+typescript@4.3.5 - '@typescript-eslint/scope-manager': 4.28.4 - debug: 4.3.2 - eslint: 7.31.0 - functional-red-black-tree: 1.0.1 - regexpp: 3.2.0 - semver: 7.3.5 - tsutils: 3.21.0_typescript@4.3.5 - typescript: 4.3.5 - transitivePeerDependencies: - - supports-color - dev: true - /@typescript-eslint/eslint-plugin/4.28.5_514553717ff968e20f6d1c6e521f8616: resolution: {integrity: sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q==} engines: {node: ^10.12.0 || >=12.0.0} @@ -2310,26 +2239,6 @@ packages: - typescript dev: true - /@typescript-eslint/parser/4.28.4_eslint@7.31.0+typescript@4.3.5: - resolution: {integrity: sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA==} - engines: {node: ^10.12.0 || >=12.0.0} - peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/scope-manager': 4.28.4 - '@typescript-eslint/types': 4.28.4 - '@typescript-eslint/typescript-estree': 4.28.4_typescript@4.3.5 - debug: 4.3.2 - eslint: 7.31.0 - typescript: 4.3.5 - transitivePeerDependencies: - - supports-color - dev: true - /@typescript-eslint/parser/4.28.5_eslint@7.31.0+typescript@4.3.5: resolution: {integrity: sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==} engines: {node: ^10.12.0 || >=12.0.0} @@ -3521,24 +3430,6 @@ packages: - typescript dev: true - /eslint-plugin-jest/24.4.0_fc5326c9e782cff3be563ae5197052dc: - resolution: {integrity: sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==} - engines: {node: '>=10'} - peerDependencies: - '@typescript-eslint/eslint-plugin': '>= 4' - eslint: '>=5' - peerDependenciesMeta: - '@typescript-eslint/eslint-plugin': - optional: true - dependencies: - '@typescript-eslint/eslint-plugin': 4.28.4_b1648df9f9ba40bdeef3710a5a5af353 - '@typescript-eslint/experimental-utils': 4.28.4_eslint@7.31.0+typescript@4.3.5 - eslint: 7.31.0 - transitivePeerDependencies: - - supports-color - - typescript - dev: true - /eslint-plugin-prettier/3.4.0_19f511d6aa08b367b6cb59e8f50291ca: resolution: {integrity: sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==} engines: {node: '>=6.0.0'} @@ -4570,36 +4461,6 @@ packages: - supports-color dev: true - /jest-cli/27.0.6: - resolution: {integrity: sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 27.0.6 - '@jest/test-result': 27.0.6 - '@jest/types': 27.0.6 - chalk: 4.1.1 - exit: 0.1.2 - graceful-fs: 4.2.6 - import-local: 3.0.2 - jest-config: 27.0.6 - jest-util: 27.0.6 - jest-validate: 27.0.6 - prompts: 2.4.1 - yargs: 16.2.0 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: true - /jest-cli/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -4630,43 +4491,6 @@ packages: - utf-8-validate dev: true - /jest-config/27.0.6: - resolution: {integrity: sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - peerDependencies: - ts-node: '>=9.0.0' - peerDependenciesMeta: - ts-node: - optional: true - dependencies: - '@babel/core': 7.14.6 - '@jest/test-sequencer': 27.0.6 - '@jest/types': 27.0.6 - babel-jest: 27.0.6_@babel+core@7.14.6 - chalk: 4.1.1 - deepmerge: 4.2.2 - glob: 7.1.7 - graceful-fs: 4.2.6 - is-ci: 3.0.0 - jest-circus: 27.0.6 - jest-environment-jsdom: 27.0.6 - jest-environment-node: 27.0.6 - jest-get-type: 27.0.6 - jest-jasmine2: 27.0.6 - jest-regex-util: 27.0.6 - jest-resolve: 27.0.6 - jest-runner: 27.0.6 - jest-util: 27.0.6 - jest-validate: 27.0.6 - micromatch: 4.0.4 - pretty-format: 27.0.6 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - utf-8-validate - dev: true - /jest-config/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -5066,27 +4890,6 @@ packages: supports-color: 8.1.1 dev: true - /jest/27.0.6: - resolution: {integrity: sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 27.0.6 - import-local: 3.0.2 - jest-cli: 27.0.6 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: true - /jest/27.0.6_ts-node@10.1.0: resolution: {integrity: sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -5329,29 +5132,6 @@ packages: /lines-and-columns/1.1.6: resolution: {integrity: sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=} - /lint-staged/11.1.0: - resolution: {integrity: sha512-pzwEf+NKbTauAlk7gPPwTfulRXESEPZCSFXYfg20F220UOObebxu5uL5mkr9csQLNOM2Ydfrt3DJXakzAL7aaQ==} - hasBin: true - dependencies: - chalk: 4.1.1 - cli-truncate: 2.1.0 - commander: 7.2.0 - cosmiconfig: 7.0.0 - debug: 4.3.2 - dedent: 0.7.0 - enquirer: 2.3.6 - execa: 5.1.1 - listr2: 3.11.0_enquirer@2.3.6 - log-symbols: 4.1.0 - micromatch: 4.0.4 - normalize-path: 3.0.0 - please-upgrade-node: 3.2.0 - string-argv: 0.3.1 - stringify-object: 3.3.0 - transitivePeerDependencies: - - supports-color - dev: true - /lint-staged/11.1.1: resolution: {integrity: sha512-eTNGe6i78PSUUH2BZi1gZmGmNfb8IeN4z2OzMYxSZ1qnP1WXKn1E7D+OHwLbRDm/wQINnzIj0bsKJ6lLVSuZiQ==} hasBin: true @@ -6142,14 +5922,6 @@ packages: engines: {node: '>=4.0.0'} dev: true - /pg-pool/3.3.0_pg@8.6.0: - resolution: {integrity: sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg==} - peerDependencies: - pg: '>=8.0' - dependencies: - pg: 8.6.0 - dev: true - /pg-pool/3.4.1_pg@8.7.1: resolution: {integrity: sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ==} peerDependencies: @@ -6173,24 +5945,6 @@ packages: postgres-interval: 1.2.0 dev: true - /pg/8.6.0: - resolution: {integrity: sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ==} - engines: {node: '>= 8.0.0'} - peerDependencies: - pg-native: '>=2.0.0' - peerDependenciesMeta: - pg-native: - optional: true - dependencies: - buffer-writer: 2.0.0 - packet-reader: 1.0.0 - pg-connection-string: 2.5.0 - pg-pool: 3.3.0_pg@8.6.0 - pg-protocol: 1.5.0 - pg-types: 2.2.0 - pgpass: 1.0.4 - dev: true - /pg/8.7.1: resolution: {integrity: sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA==} engines: {node: '>= 8.0.0'} @@ -6444,8 +6198,8 @@ packages: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} dev: true - /react/17.0.2: - resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==} + /react/17.0.0: + resolution: {integrity: sha512-rG9bqS3LMuetoSUKHN8G3fMNuQOePKDThK6+2yXFWtoeTDLVNh/QCaxT+Jr+rNf4lwNXpx+atdn3Aa0oi8/6eQ==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 @@ -6635,7 +6389,7 @@ packages: dependencies: glob: 7.1.7 - /rollup-plugin-dts/3.0.2_rollup@2.53.3+typescript@4.3.5: + /rollup-plugin-dts/3.0.2_rollup@2.55.0+typescript@4.3.5: resolution: {integrity: sha512-hswlsdWu/x7k5pXzaLP6OvKRKcx8Bzprksz9i9mUe72zvt8LvqAb/AZpzs6FkLgmyRaN8B6rUQOVtzA3yEt9Yw==} engines: {node: '>=v12.22.1'} peerDependencies: @@ -6643,14 +6397,14 @@ packages: typescript: ^4.2.4 dependencies: magic-string: 0.25.7 - rollup: 2.53.3 + rollup: 2.55.0 typescript: 4.3.5 optionalDependencies: '@babel/code-frame': 7.14.5 dev: true - /rollup/2.53.3: - resolution: {integrity: sha512-79QIGP5DXz5ZHYnCPi3tLz+elOQi6gudp9YINdaJdjG0Yddubo6JRFUM//qCZ0Bap/GJrsUoEBVdSOc4AkMlRA==} + /rollup/2.55.0: + resolution: {integrity: sha512-Atc3QqelKzrKwRkqnSdq0d2Mi8e0iGuL+kZebKMZ4ysyWHD5hw9VfVCAuODIW5837RENV8LXcbAEHurYf+ArvA==} engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: @@ -7312,28 +7066,6 @@ packages: engines: {node: '>=8'} dev: true - /ts-jest/27.0.3_jest@27.0.6+typescript@4.3.5: - resolution: {integrity: sha512-U5rdMjnYam9Ucw+h0QvtNDbc5+88nxt7tbIvqaZUhFrfG4+SkWhMXjejCLVGcpILTPuV+H3W/GZDZrnZFpPeXw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - jest: ^27.0.0 - typescript: '>=3.8 <5.0' - dependencies: - bs-logger: 0.2.6 - buffer-from: 1.1.1 - fast-json-stable-stringify: 2.1.0 - jest: 27.0.6_ts-node@10.1.0 - jest-util: 27.0.6 - json5: 2.2.0 - lodash: 4.17.21 - make-error: 1.3.6 - mkdirp: 1.0.4 - semver: 7.3.5 - typescript: 4.3.5 - yargs-parser: 20.2.9 - dev: true - /ts-jest/27.0.4_52cc4273aa16028085013af47e479e10: resolution: {integrity: sha512-c4E1ECy9Xz2WGfTMyHbSaArlIva7Wi2p43QOMmCqjSSjHP06KXv+aT+eSY+yZMuqsMi3k7pyGsGj2q5oSl5WfQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -7356,7 +7088,7 @@ packages: bs-logger: 0.2.6 buffer-from: 1.1.1 fast-json-stable-stringify: 2.1.0 - jest: 27.0.6 + jest: 27.0.6_ts-node@10.1.0 jest-util: 27.0.6 json5: 2.2.0 lodash: 4.17.21