From c74ae7713766472b1e072d938ce6f8df8fd5ce09 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Wed, 29 Mar 2023 00:12:24 +0100 Subject: [PATCH 1/9] Upgrade to TypeScript 5.0, get typechecking working but build still broken Need to make some decisions about whether/how to emit CJS modules, because as long as we have verbatimModuleSyntax enabled, we cannot use the typical `export const = "x"` format, and tsc-multi rewriting is also now breaking for this on v5, and patching it to do the rewrites may be non trivial since it can involve shifting large blocks of code. Alternatively we could just not opt into the flag, in which case we should also restore the `isolatedModules` flag (which was removed as redunant). See: * https://devblogs.microsoft.com/typescript/announcing-typescript-5-0/#verbatimmodulesyntax * https://github.com/microsoft/TypeScript/pull/52203 * https://github.com/tommy351/tsc-multi/issues/19 --- package.json | 2 +- packages/base-db/base-db.ts | 8 ++--- packages/base-db/plugin-registry.test.ts | 4 +-- packages/client-http/client-http.ts | 10 +++---- packages/db-seafowl/db-seafowl.ts | 2 +- packages/db-splitgraph/db-splitgraph.ts | 10 +++---- .../plugins/exporters/export-query-plugin.ts | 5 +++- packages/yeet/package.json | 4 +-- tsconfig.base-noncomposite-esno.json | 3 +- tsconfig.base.json | 3 +- tsconfig.build-base.json | 3 +- yarn.lock | 30 +++++++++---------- 12 files changed, 43 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 192a34a..aa5fadd 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "prettier": "2.7.1", "rimraf": "3.0.2", "tsc-multi": "0.6.1", - "typescript": "4.9.5", + "typescript": "5.0.2", "undici": "5.10.0", "verdaccio": "5.13.1", "vitest": "0.22.1", diff --git a/packages/base-db/base-db.ts b/packages/base-db/base-db.ts index d0e552f..bb4a876 100644 --- a/packages/base-db/base-db.ts +++ b/packages/base-db/base-db.ts @@ -1,10 +1,10 @@ import type { Plugin } from "./plugin-bindings"; import { - WithPluginRegistry, + type WithPluginRegistry, PluginRegistry, - PluggableInterfaceShape, - PluginList, - ExtractPlugin, + type PluggableInterfaceShape, + type PluginList, + type ExtractPlugin, } from "./plugin-registry"; import { diff --git a/packages/base-db/plugin-registry.test.ts b/packages/base-db/plugin-registry.test.ts index a066b6f..3deb392 100644 --- a/packages/base-db/plugin-registry.test.ts +++ b/packages/base-db/plugin-registry.test.ts @@ -5,9 +5,9 @@ import type { NotEqual, } from "@madatdata/test-helpers/type-test-utils"; import { - PluginList, + type PluginList, PluginRegistry, - WithPluginRegistry, + type WithPluginRegistry, } from "./plugin-registry"; type SomeKindOfChampionPlugin = { diff --git a/packages/client-http/client-http.ts b/packages/client-http/client-http.ts index 4cda41d..c332e23 100644 --- a/packages/client-http/client-http.ts +++ b/packages/client-http/client-http.ts @@ -6,11 +6,11 @@ import { type Database, type Host, type UnknownCredential, - UnknownRowShape, - ExecutionResultWithObjectShapedRows, - ExecutionResultWithArrayShapedRows, - UnknownArrayShape, - UnknownObjectShape, + type UnknownRowShape, + type ExecutionResultWithObjectShapedRows, + type ExecutionResultWithArrayShapedRows, + type UnknownArrayShape, + type UnknownObjectShape, } from "@madatdata/base-client"; export interface WebBridgeResponse { diff --git a/packages/db-seafowl/db-seafowl.ts b/packages/db-seafowl/db-seafowl.ts index 65db175..dcca715 100644 --- a/packages/db-seafowl/db-seafowl.ts +++ b/packages/db-seafowl/db-seafowl.ts @@ -7,7 +7,7 @@ import { type ExportPlugin, type ExtractPlugin, type PluginList, - WithOptionsInterface, + type WithOptionsInterface, } from "@madatdata/base-db"; // TODO: This sould be injected in the constructor as the actual plugin map diff --git a/packages/db-splitgraph/db-splitgraph.ts b/packages/db-splitgraph/db-splitgraph.ts index 52bb8dd..475474b 100644 --- a/packages/db-splitgraph/db-splitgraph.ts +++ b/packages/db-splitgraph/db-splitgraph.ts @@ -2,11 +2,11 @@ import { BaseDb, type DbOptions, type DbPluggableInterface, - WithPluginRegistry, - ImportPlugin, - ExportPlugin, - PluginList, - ExtractPlugin, + type WithPluginRegistry, + type ImportPlugin, + type ExportPlugin, + type PluginList, + type ExtractPlugin, type WithOptionsInterface, } from "@madatdata/base-db"; diff --git a/packages/db-splitgraph/plugins/exporters/export-query-plugin.ts b/packages/db-splitgraph/plugins/exporters/export-query-plugin.ts index 368ca2e..9d8ecd1 100644 --- a/packages/db-splitgraph/plugins/exporters/export-query-plugin.ts +++ b/packages/db-splitgraph/plugins/exporters/export-query-plugin.ts @@ -1,6 +1,9 @@ import type { ExportPlugin, WithOptionsInterface } from "@madatdata/base-db"; import { SplitgraphGraphQLClient } from "../../gql-client/splitgraph-graphql-client"; -import { ExportFormat, ExportJobOutput } from "../../gql-client/unified-types"; +import { + ExportFormat, + type ExportJobOutput, +} from "../../gql-client/unified-types"; import { Retryable, BackOffPolicy } from "typescript-retry-decorator"; import { gql } from "graphql-request"; diff --git a/packages/yeet/package.json b/packages/yeet/package.json index 5bfc2da..10709ab 100644 --- a/packages/yeet/package.json +++ b/packages/yeet/package.json @@ -7,11 +7,11 @@ "yeet-debug": "yarn run esno --inspect-brk=127.0.0.1:9229 start.ts" }, "dependencies": { - "@rushstack/ts-command-line": "4.12.1", + "@rushstack/ts-command-line": "4.13.2", "chalk": "5.0.1", "esno": "0.16.3", "playwright": "1.23.2", - "typescript": "4.9.5" + "typescript": "5.0.2" }, "devDependencies": { "@types/node": "18.7.13" diff --git a/tsconfig.base-noncomposite-esno.json b/tsconfig.base-noncomposite-esno.json index 50a7eed..f02bf56 100644 --- a/tsconfig.base-noncomposite-esno.json +++ b/tsconfig.base-noncomposite-esno.json @@ -3,6 +3,7 @@ "compilerOptions": { "noEmit": true, "emitDeclarationOnly": false, - "module": "commonjs" + "module": "commonjs", + "verbatimModuleSyntax": false } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 48744ed..2de1328 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -16,13 +16,12 @@ "module": "esnext", "moduleResolution": "node", "resolveJsonModule": true, - "isolatedModules": true, "jsx": "react-jsx", "noUnusedLocals": true, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, "noPropertyAccessFromIndexSignature": true, - "importsNotUsedAsValues": "error", + "verbatimModuleSyntax": true, "incremental": true, "baseUrl": ".", "composite": true, diff --git a/tsconfig.build-base.json b/tsconfig.build-base.json index 931e48b..00611cc 100644 --- a/tsconfig.build-base.json +++ b/tsconfig.build-base.json @@ -3,7 +3,6 @@ "extends": "./tsconfig.base.json", "compilerOptions": { "emitDeclarationOnly": false, - "resolveJsonModule": false, - "isolatedModules": false + "resolveJsonModule": false } } diff --git a/yarn.lock b/yarn.lock index 5886c3c..6ad2a0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1783,7 +1783,7 @@ __metadata: prettier: 2.7.1 rimraf: 3.0.2 tsc-multi: 0.6.1 - typescript: 4.9.5 + typescript: 5.0.2 undici: 5.10.0 verdaccio: 5.13.1 vitest: 0.22.1 @@ -1832,12 +1832,12 @@ __metadata: version: 0.0.0-use.local resolution: "@madatdata/yeet@workspace:packages/yeet" dependencies: - "@rushstack/ts-command-line": 4.12.1 + "@rushstack/ts-command-line": 4.13.2 "@types/node": 18.7.13 chalk: 5.0.1 esno: 0.16.3 playwright: 1.23.2 - typescript: 4.9.5 + typescript: 5.0.2 languageName: unknown linkType: soft @@ -1930,15 +1930,15 @@ __metadata: languageName: node linkType: hard -"@rushstack/ts-command-line@npm:4.12.1": - version: 4.12.1 - resolution: "@rushstack/ts-command-line@npm:4.12.1" +"@rushstack/ts-command-line@npm:4.13.2": + version: 4.13.2 + resolution: "@rushstack/ts-command-line@npm:4.13.2" dependencies: "@types/argparse": 1.0.38 argparse: ~1.0.9 colors: ~1.2.1 string-argv: ~0.3.1 - checksum: e9479bd001f4f206d207c867ec7b91444727cf8a1c685dac7589c6a33b54f47200deabc450d6831a1cc38501f0322eb7003c1f78f1fa43230541c4b7ddc4718d + checksum: 3938e533e08d5cf4007a651d1aab658a7a60d6136a56414e2370b64434657a5d5a9eff442da4ddc260d5e6dc90f82428de64dbcfa1285e9ae176629f7fcd821d languageName: node linkType: hard @@ -9153,23 +9153,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:5.0.2": + version: 5.0.2 + resolution: "typescript@npm:5.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db + checksum: bef1dcd166acfc6934b2ec4d72f93edb8961a5fab36b8dd2aaf6f4f4cd5c0210f2e0850aef4724f3b4913d5aef203a94a28ded731b370880c8bcff7e4ff91fc1 languageName: node linkType: hard -"typescript@patch:typescript@4.9.5#~builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=f456af" +"typescript@patch:typescript@5.0.2#~builtin": + version: 5.0.2 + resolution: "typescript@patch:typescript@npm%3A5.0.2#~builtin::version=5.0.2&hash=f456af" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20 + checksum: bdbf3d0aac0d6cf010fbe0536753dc19f278eb4aba88140dcd25487dfe1c56ca8b33abc0dcd42078790a939b08ebc4046f3e9bb961d77d3d2c3cfa9829da4d53 languageName: node linkType: hard From ea969c7d1aa2dfdae8bd2f2171e287aff45dd871 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 21:34:37 +0100 Subject: [PATCH 2/9] Upgrade tsc-multi and chalk --- ...h => tsc-multi-npm-1.0.0-509fa4971c.patch} | 4 +- package.json | 6 +- packages/ast-parser/package.json | 2 +- packages/yeet/package.json | 2 +- yarn.lock | 148 +++++++++++------- 5 files changed, 102 insertions(+), 60 deletions(-) rename .yarn/patches/{tsc-multi-npm-0.6.1-6c7411b6ff.patch => tsc-multi-npm-1.0.0-509fa4971c.patch} (84%) diff --git a/.yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch b/.yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch similarity index 84% rename from .yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch rename to .yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch index 1bc3e49..128c8d5 100644 --- a/.yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch +++ b/.yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch @@ -1,5 +1,5 @@ diff --git a/dist/build.js b/dist/build.js -index a669851a62851955a921cc070c4ee34fc7b07e4d..8c864827494011f3ebcbed952bd08bf6c81aa340 100644 +index 29144bc5cdb118655229a1f8998c3168170ca257..ba0595bd0a2a9789aac96ba8e7c97b037da34536 100644 --- a/dist/build.js +++ b/dist/build.js @@ -20,10 +20,12 @@ function validateTargets(targets) { @@ -13,7 +13,7 @@ index a669851a62851955a921cc070c4ee34fc7b07e4d..8c864827494011f3ebcbed952bd08bf6 + // PATCHED by Splitgraph + // NOTE: duplicate extensions are okay as long as targets have different outDir and tsBuildInfoFile + // const existedIndex = extMap.get(ext); -+ // if (existedIndex != null && !targets[i].) { ++ // if (existedIndex != null) { + // throw new Error(`targets[${i}].extname is already used in targets[${existedIndex}].extname`); + // } extMap.set(ext, i); diff --git a/package.json b/package.json index aa5fadd..33f19c3 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "msw": "https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true", "prettier": "2.7.1", "rimraf": "3.0.2", - "tsc-multi": "0.6.1", + "tsc-multi": "1.0.0", "typescript": "5.0.2", "undici": "5.10.0", "verdaccio": "5.13.1", @@ -23,8 +23,8 @@ "wireit": "0.7.1" }, "resolutions": { - "tsc-multi@0.6.1": "patch:tsc-multi@npm:0.6.1#.yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch", - "@madatdata/tiny-react-sandbox/react": "^18" + "@madatdata/tiny-react-sandbox/react": "^18", + "tsc-multi@1.0.0": "patch:tsc-multi@npm:1.0.0#.yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch" }, "dependencies": { "cross-fetch": "3.1.5" diff --git a/packages/ast-parser/package.json b/packages/ast-parser/package.json index e8f8bfc..48e6bda 100644 --- a/packages/ast-parser/package.json +++ b/packages/ast-parser/package.json @@ -11,7 +11,7 @@ "@types/node": "18.7.13" }, "dependencies": { - "chalk": "5.0.1", + "chalk": "5.2.0", "esno": "0.16.3", "pgsql-ast-parser": "10.5.2" } diff --git a/packages/yeet/package.json b/packages/yeet/package.json index 10709ab..f125d60 100644 --- a/packages/yeet/package.json +++ b/packages/yeet/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@rushstack/ts-command-line": "4.13.2", - "chalk": "5.0.1", + "chalk": "5.2.0", "esno": "0.16.3", "playwright": "1.23.2", "typescript": "5.0.2" diff --git a/yarn.lock b/yarn.lock index 6ad2a0c..bd0a478 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1639,7 +1639,7 @@ __metadata: resolution: "@madatdata/ast-parser@workspace:packages/ast-parser" dependencies: "@types/node": 18.7.13 - chalk: 5.0.1 + chalk: 5.2.0 esno: 0.16.3 pgsql-ast-parser: 10.5.2 languageName: unknown @@ -1690,7 +1690,7 @@ __metadata: dependencies: "@madatdata/base-client": "workspace:*" "@types/node": 18.7.13 - postgres: 3.2.4 + postgres: 3.3.4 peerDependencies: postgres: ^3.0.0 languageName: unknown @@ -1782,7 +1782,7 @@ __metadata: msw: "https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true" prettier: 2.7.1 rimraf: 3.0.2 - tsc-multi: 0.6.1 + tsc-multi: 1.0.0 typescript: 5.0.2 undici: 5.10.0 verdaccio: 5.13.1 @@ -1834,7 +1834,7 @@ __metadata: dependencies: "@rushstack/ts-command-line": 4.13.2 "@types/node": 18.7.13 - chalk: 5.0.1 + chalk: 5.2.0 esno: 0.16.3 playwright: 1.23.2 typescript: 5.0.2 @@ -3060,10 +3060,10 @@ __metadata: languageName: node linkType: hard -"chalk@npm:5.0.1": - version: 5.0.1 - resolution: "chalk@npm:5.0.1" - checksum: 7b45300372b908f0471fbf7389ce2f5de8d85bb949026fd51a1b95b10d0ed32c7ed5aab36dd5e9d2bf3191867909b4404cef75c5f4d2d1daeeacd301dd280b76 +"chalk@npm:5.2.0": + version: 5.2.0 + resolution: "chalk@npm:5.2.0" + checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa languageName: node linkType: hard @@ -3252,6 +3252,17 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.1 + wrap-ansi: ^7.0.0 + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 + languageName: node + linkType: hard + "clone@npm:^1.0.2": version: 1.0.4 resolution: "clone@npm:1.0.4" @@ -4787,7 +4798,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.5, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9": version: 3.2.11 resolution: "fast-glob@npm:3.2.11" dependencies: @@ -4800,6 +4811,19 @@ __metadata: languageName: node linkType: hard +"fast-glob@npm:^3.2.12": + version: 3.2.12 + resolution: "fast-glob@npm:3.2.12" + dependencies: + "@nodelib/fs.stat": ^2.0.2 + "@nodelib/fs.walk": ^1.2.3 + glob-parent: ^5.1.2 + merge2: ^1.3.0 + micromatch: ^4.0.4 + checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2 + languageName: node + linkType: hard + "fast-json-stable-stringify@npm:^2.0.0": version: 2.1.0 resolution: "fast-json-stable-stringify@npm:2.1.0" @@ -7671,10 +7695,10 @@ __metadata: languageName: node linkType: hard -"postgres@npm:3.2.4": - version: 3.2.4 - resolution: "postgres@npm:3.2.4" - checksum: 613d09d66927bd436e286685881fa40297bac97ca3fc34359abf347f1e9cf00fb3c6fea328b004c632c507129e279883354b4e411d9c0c7478f88d670df78503 +"postgres@npm:3.3.4": + version: 3.3.4 + resolution: "postgres@npm:3.3.4" + checksum: aafbf70d4a5fbaaf8c6804fc19d012845e7b832798c7dfcb2d472d672e99a4ae84b4103500cc1f3c178edec9cf9dae1a9d9a14eb6a6bc487c94b4d737c75289a languageName: node linkType: hard @@ -8420,7 +8444,7 @@ __metadata: languageName: node linkType: hard -"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7": +"signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" checksum: a2f098f247adc367dffc27845853e9959b9e88b01cb301658cfe4194352d8d2bb32e18467c786a7fe15f1d44b233ea35633d076d5e737870b7139949d1ab6318 @@ -8708,10 +8732,10 @@ __metadata: languageName: node linkType: hard -"superstruct@npm:^0.14.0": - version: 0.14.2 - resolution: "superstruct@npm:0.14.2" - checksum: c5c4840f432da82125b923ec45faca5113217e83ae416e314d80eae012b8bb603d2e745025d173450758d116348820bc7028157f8c9a72b6beae879f94b837c0 +"superstruct@npm:^1.0.3": + version: 1.0.3 + resolution: "superstruct@npm:1.0.3" + checksum: 761790bb111e6e21ddd608299c252f3be35df543263a7ebbc004e840d01fcf8046794c274bcb351bdf3eae4600f79d317d085cdbb19ca05803a4361840cc9bb1 languageName: node linkType: hard @@ -8733,15 +8757,6 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.1.1": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: ^4.0.0 - checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 - languageName: node - linkType: hard - "supports-preserve-symlinks-flag@npm:^1.0.0": version: 1.0.0 resolution: "supports-preserve-symlinks-flag@npm:1.0.0" @@ -8985,49 +9000,47 @@ __metadata: languageName: node linkType: hard -"tsc-multi@npm:0.6.1": - version: 0.6.1 - resolution: "tsc-multi@npm:0.6.1" +"tsc-multi@npm:1.0.0": + version: 1.0.0 + resolution: "tsc-multi@npm:1.0.0" dependencies: - chalk: ^4.1.0 - debug: ^4.3.1 - fast-glob: ^3.2.5 + debug: ^4.3.4 + fast-glob: ^3.2.12 get-stdin: ^8.0.0 p-all: ^3.0.0 - signal-exit: ^3.0.3 + picocolors: ^1.0.0 + signal-exit: ^3.0.7 string-to-stream: ^3.0.1 - superstruct: ^0.14.0 - supports-color: ^8.1.1 - tslib: ^2.1.0 - yargs: ^16.2.0 + superstruct: ^1.0.3 + tslib: ^2.5.0 + yargs: ^17.7.1 peerDependencies: - typescript: ">=3" + typescript: ">=4.3.0" bin: tsc-multi: bin/tsc-multi.js - checksum: cff3945dacccc4c9aba354fa1bc89bbd8d36220c5e234b22e0a2e0a2e9fdb75edb7a4467cb756b18b7bf7bc088b584d87650222b1b387482344ecbe83817bc58 + checksum: 7b41f6179b0e199903853cbe25beac49ecc2352a0b605714ac104fbc97a1fb294982af3fbf1fb71bbe2f9964ba23a37044e15bb36c5e9ba45c6bae3371bbdf9b languageName: node linkType: hard -"tsc-multi@patch:tsc-multi@npm:0.6.1#.yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch::locator=%40madatdata%2Froot%40workspace%3A.": - version: 0.6.1 - resolution: "tsc-multi@patch:tsc-multi@npm%3A0.6.1#.yarn/patches/tsc-multi-npm-0.6.1-6c7411b6ff.patch::version=0.6.1&hash=09ac3c&locator=%40madatdata%2Froot%40workspace%3A." +"tsc-multi@patch:tsc-multi@npm:1.0.0#.yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch::locator=%40madatdata%2Froot%40workspace%3A.": + version: 1.0.0 + resolution: "tsc-multi@patch:tsc-multi@npm%3A1.0.0#.yarn/patches/tsc-multi-npm-1.0.0-509fa4971c.patch::version=1.0.0&hash=0588e6&locator=%40madatdata%2Froot%40workspace%3A." dependencies: - chalk: ^4.1.0 - debug: ^4.3.1 - fast-glob: ^3.2.5 + debug: ^4.3.4 + fast-glob: ^3.2.12 get-stdin: ^8.0.0 p-all: ^3.0.0 - signal-exit: ^3.0.3 + picocolors: ^1.0.0 + signal-exit: ^3.0.7 string-to-stream: ^3.0.1 - superstruct: ^0.14.0 - supports-color: ^8.1.1 - tslib: ^2.1.0 - yargs: ^16.2.0 + superstruct: ^1.0.3 + tslib: ^2.5.0 + yargs: ^17.7.1 peerDependencies: - typescript: ">=3" + typescript: ">=4.3.0" bin: tsc-multi: bin/tsc-multi.js - checksum: d57750d3a8db67e771de860aade2bd4e8b46d190e68b7eba57e34d3d7fe7e57bf8d3aae33251d372d09d67a436bfe62d42227f22c25712c011dc12559d0858e8 + checksum: e4485be841994a62a84a4218eb4535d8db87288e2b8d77acab0cdcd9ef6028ba1ea0f5a6f6c171102a4a0165c7cf141820cc4a33473cf18edc2b2fd3e7e1ef64 languageName: node linkType: hard @@ -9038,6 +9051,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2.5.0": + version: 2.5.0 + resolution: "tslib@npm:2.5.0" + checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1 + languageName: node + linkType: hard + "tsscmp@npm:1.0.6": version: 1.0.6 resolution: "tsscmp@npm:1.0.6" @@ -9929,6 +9949,13 @@ __metadata: languageName: node linkType: hard +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c + languageName: node + linkType: hard + "yargs@npm:^15.3.1": version: 15.4.1 resolution: "yargs@npm:15.4.1" @@ -9978,6 +10005,21 @@ __metadata: languageName: node linkType: hard +"yargs@npm:^17.7.1": + version: 17.7.1 + resolution: "yargs@npm:17.7.1" + dependencies: + cliui: ^8.0.1 + escalade: ^3.1.1 + get-caller-file: ^2.0.5 + require-directory: ^2.1.1 + string-width: ^4.2.3 + y18n: ^5.0.5 + yargs-parser: ^21.1.1 + checksum: 3d8a43c336a4942bc68080768664aca85c7bd406f018bad362fd255c41c8f4e650277f42fd65d543fce99e084124ddafee7bbfc1a5c6a8fda4cec78609dcf8d4 + languageName: node + linkType: hard + "yn@npm:3.1.1": version: 3.1.1 resolution: "yn@npm:3.1.1" From aae2917ae1bc2e4dbb9172cfb5d4097126e30d1e Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 21:36:01 +0100 Subject: [PATCH 3/9] Get typecheck, build, test all working with various exports combinations However, vitest is not respecting the conditions flag, so right now it's using `node` conditions flag in a way that would optimally be `dev` with `customConditions` in `tsconfig.json`, but now any downstream dependencies would try to use the `node` resolver too. Will try upgrading vitest next. --- packages/base-client/index.ts | 2 ++ packages/base-client/package.json | 5 +++ packages/base-db/package.json | 5 +++ packages/client-http/client-http.test.ts | 2 +- packages/client-http/package.json | 5 +++ packages/client-postgres/client-postgres.ts | 38 ++++++++++---------- packages/client-postgres/package.json | 7 +++- packages/core/package.json | 5 +++ packages/db-seafowl/package.json | 5 +++ packages/db-splitgraph/db-splitgraph.test.ts | 2 +- packages/db-splitgraph/package.json | 5 +++ packages/react/package.json | 5 +++ packages/yeet/actions/open-devtools.ts | 8 ++--- tsc-multi.json | 6 +++- tsconfig.base.json | 9 +++-- vitest-setup.ts | 1 + vitest.config.ts | 35 +++++------------- 17 files changed, 87 insertions(+), 58 deletions(-) diff --git a/packages/base-client/index.ts b/packages/base-client/index.ts index ac41372..eeb195e 100644 --- a/packages/base-client/index.ts +++ b/packages/base-client/index.ts @@ -9,6 +9,8 @@ export { type Host, defaultHost, type Database, defaultDatabase }; export { type CredentialOptions, Credential }; +export * from "./host"; + export { type AuthenticatedCredential, type UnknownCredential, diff --git a/packages/base-client/package.json b/packages/base-client/package.json index f41d48d..d85a268 100644 --- a/packages/base-client/package.json +++ b/packages/base-client/package.json @@ -21,6 +21,11 @@ "build/*/**", "package.json" ], + "exports": { + ".": { + "node": "./index.ts" + } + }, "scripts": { "version": "yarn version", "publish": "yarn npm publish" diff --git a/packages/base-db/package.json b/packages/base-db/package.json index b5b210d..a7f606b 100644 --- a/packages/base-db/package.json +++ b/packages/base-db/package.json @@ -20,6 +20,11 @@ "main": "./build/es2020-commonjs/index.cjs", "module": "./build/es2020/index.mjs" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "files": [ "build/*/**", "package.json" diff --git a/packages/client-http/client-http.test.ts b/packages/client-http/client-http.test.ts index 4739e05..9dd9133 100644 --- a/packages/client-http/client-http.test.ts +++ b/packages/client-http/client-http.test.ts @@ -5,7 +5,7 @@ import { setupMswServerTestHooks } from "@madatdata/test-helpers/msw-server-hook import { shouldSkipIntegrationTests } from "@madatdata/test-helpers/env-config"; import { rest } from "msw"; -import { defaultHost } from "@madatdata/base-client/host"; +import { defaultHost } from "@madatdata/base-client"; // NOTE: Previously, the default http-client was hardcoded for Splitgraph, which // is why all the tests reflect its shape. But we don't want this package to diff --git a/packages/client-http/package.json b/packages/client-http/package.json index 80b3f7f..33f9693 100644 --- a/packages/client-http/package.json +++ b/packages/client-http/package.json @@ -24,6 +24,11 @@ "main": "./build/es2020-commonjs/index.cjs", "module": "./build/es2020/index.mjs" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "files": [ "build/*/**", "package.json" diff --git a/packages/client-postgres/client-postgres.ts b/packages/client-postgres/client-postgres.ts index bbc8e08..92078e8 100644 --- a/packages/client-postgres/client-postgres.ts +++ b/packages/client-postgres/client-postgres.ts @@ -105,22 +105,22 @@ export const makeClient = (args: ClientOptions) => { // TEMPORARY: add .values() to typings by copying unreleased bugfix from commit: // https://github.com/porsager/postgres/commit/ac1bca41004c7923b877c26f2ffc3039b70b4432 -declare module "postgres" { - type ValuesRowList = - T[number][keyof T[number]][][] & - postgres.ResultQueryMeta; - - interface PendingValuesQuery - extends Promise>, - postgres.PendingQueryModifiers { - describe(): postgres.PendingDescribeQuery; - } - - interface PendingQuery - extends Promise>, - postgres.PendingQueryModifiers { - describe(): postgres.PendingDescribeQuery; - values(): PendingValuesQuery; - raw(): postgres.PendingRawQuery; - } -} +// declare module "postgres" { +// type ValuesRowList = +// T[number][keyof T[number]][][] & +// postgres.ResultQueryMeta; + +// interface PendingValuesQuery +// extends Promise>, +// postgres.PendingQueryModifiers { +// describe(): postgres.PendingDescribeQuery; +// } + +// interface PendingQuery +// extends Promise>, +// postgres.PendingQueryModifiers { +// describe(): postgres.PendingDescribeQuery; +// values(): PendingValuesQuery; +// raw(): postgres.PendingRawQuery; +// } +// } diff --git a/packages/client-postgres/package.json b/packages/client-postgres/package.json index ac071ce..5f51dc1 100644 --- a/packages/client-postgres/package.json +++ b/packages/client-postgres/package.json @@ -6,7 +6,7 @@ "types": "./build/es2020/index.d.ts", "devDependencies": { "@types/node": "18.7.13", - "postgres": "3.2.4" + "postgres": "3.3.4" }, "dependencies": { "@madatdata/base-client": "workspace:*" @@ -19,6 +19,11 @@ "main": "./build/es2020-commonjs/index.cjs", "module": "./build/es2020/index.mjs" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "files": [ "build/*/**", "package.json" diff --git a/packages/core/package.json b/packages/core/package.json index 4171861..c279d58 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -21,6 +21,11 @@ "main": "./build/es2020-commonjs/index.cjs", "module": "./build/es2020/index.mjs" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "files": [ "build/*/**", "package.json" diff --git a/packages/db-seafowl/package.json b/packages/db-seafowl/package.json index 1f2ae3a..7210261 100644 --- a/packages/db-seafowl/package.json +++ b/packages/db-seafowl/package.json @@ -23,6 +23,11 @@ "build/*/**", "package.json" ], + "exports": { + ".": { + "node": "./index.ts" + } + }, "scripts": { "version": "yarn version", "publish": "yarn npm publish" diff --git a/packages/db-splitgraph/db-splitgraph.test.ts b/packages/db-splitgraph/db-splitgraph.test.ts index fe12b77..e37246f 100644 --- a/packages/db-splitgraph/db-splitgraph.test.ts +++ b/packages/db-splitgraph/db-splitgraph.test.ts @@ -10,7 +10,7 @@ import { setupMswServerTestHooks } from "@madatdata/test-helpers/msw-server-hook import { setupMemo } from "@madatdata/test-helpers/setup-memo"; import { compose, graphql, rest, type DefaultBodyType } from "msw"; -import { defaultHost } from "@madatdata/base-client/host"; +import { defaultHost } from "@madatdata/base-client"; import { faker } from "@faker-js/faker"; diff --git a/packages/db-splitgraph/package.json b/packages/db-splitgraph/package.json index d1d5e3a..bd3408e 100644 --- a/packages/db-splitgraph/package.json +++ b/packages/db-splitgraph/package.json @@ -26,6 +26,11 @@ "json-schema-to-typescript": "10.1.5", "rimraf": "3.0.2" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "publishConfig": { "access": "public", "main": "./build/es2020-commonjs/index.cjs", diff --git a/packages/react/package.json b/packages/react/package.json index e87443b..459276c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -21,6 +21,11 @@ "react": ">=17 || >=18", "react-dom": ">=17 || >=18" }, + "exports": { + ".": { + "node": "./index.ts" + } + }, "publishConfig": { "access": "public", "main": "./build/es2020-commonjs/index.cjs", diff --git a/packages/yeet/actions/open-devtools.ts b/packages/yeet/actions/open-devtools.ts index ec2e9a9..06ad018 100644 --- a/packages/yeet/actions/open-devtools.ts +++ b/packages/yeet/actions/open-devtools.ts @@ -1,6 +1,5 @@ import { CommandLineAction } from "@rushstack/ts-command-line"; import { chromium } from "playwright"; -import chalk from "chalk"; import path from "path"; export class OpenDevtoolsAction extends CommandLineAction { @@ -30,11 +29,8 @@ export class OpenDevtoolsAction extends CommandLineAction { debugConfig, }); } catch (openDevtoolsError) { - console.error( - chalk.red("Error"), - "Encountered exception during openDevtools." - ); - console.error(chalk.yellow("Traceback:")); + console.error("Error", "Encountered exception during openDevtools."); + console.error("Traceback:"); console.trace(openDevtoolsError); } } diff --git a/tsc-multi.json b/tsc-multi.json index cc40393..c8946bc 100644 --- a/tsc-multi.json +++ b/tsc-multi.json @@ -5,7 +5,11 @@ "tsBuildInfoFile": "build/es2020-commonjs.tsbuildinfo", "module": "CommonJS", "target": "ES2020", - "extname": ".cjs" + "extname": ".cjs", + "verbatimModuleSyntax": false, + "isolatedModules": false, + "importsNotUsedAsValues": "error", + "ignoreDeprecations": "5.0" }, { "outDir": "build/es2020", diff --git a/tsconfig.base.json b/tsconfig.base.json index 2de1328..beeb181 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -14,14 +14,19 @@ "emitDeclarationOnly": true, "esModuleInterop": true, "module": "esnext", - "moduleResolution": "node", + "moduleResolution": "nodenext", + // "customConditions": ["dev"], "resolveJsonModule": true, "jsx": "react-jsx", "noUnusedLocals": true, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, "noPropertyAccessFromIndexSignature": true, - "verbatimModuleSyntax": true, + // "verbatimModuleSyntax": true, + "verbatimModuleSyntax": false, + "isolatedModules": false, + "importsNotUsedAsValues": "error", + "ignoreDeprecations": "5.0", "incremental": true, "baseUrl": ".", "composite": true, diff --git a/vitest-setup.ts b/vitest-setup.ts index df0fb65..a8f2438 100644 --- a/vitest-setup.ts +++ b/vitest-setup.ts @@ -37,6 +37,7 @@ if (process.env.INSECURE_TLS === "1") { // Developer is responsible for operation of proxy, but we recommend `mitmproxy` // NOTE: It's also posible to set `GLOBAL_AGENT_*` env variables directly, // see: https://github.com/gajus/global-agent#environment-variables +// TODO: In node 18, setting GLOBAL_AGENT directly won't affect agent proxy URI if (process.env.MITM) { if (!process.env.GLOBAL_AGENT_HTTP_PROXY) { process.env["GLOBAL_AGENT_HTTP_PROXY"] = process.env.MITM; diff --git a/vitest.config.ts b/vitest.config.ts index 03ea2d8..36ab950 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, configDefaults } from "vitest/config"; import { fileURLToPath } from "url"; -import { join, dirname } from "path"; +import { dirname } from "path"; import react from "@vitejs/plugin-react"; const currentDirectoryPath = dirname(fileURLToPath(import.meta.url)); @@ -12,32 +12,13 @@ export default defineConfig({ }), ], resolve: { - alias: [ - { - find: "@madatdata/root", - replacement: currentDirectoryPath, - }, - { - find: "@madatdata/client-http", - replacement: join(currentDirectoryPath, "packages", "client-http"), - }, - { - find: "@madatdata/db-seafowl", - replacement: join(currentDirectoryPath, "packages", "db-seafowl"), - }, - { - find: "@madatdata/db-splitgraph", - replacement: join(currentDirectoryPath, "packages", "db-splitgraph"), - }, - { - find: "@madatdata/core", - replacement: join(currentDirectoryPath, "packages", "core"), - }, - { - find: "@madatdata/react", - replacement: join(currentDirectoryPath, "packages", "react"), - }, - ], + // conditions: ["dev"], + // alias: [ + // { + // find: "@madatdata/root", + // replacement: currentDirectoryPath, + // }, + // ], }, test: { environment: "jsdom", From 4a8e37adacd7051fa550ef9effa4ef1bddfb7703 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 22:04:40 +0100 Subject: [PATCH 4/9] Upgrade vitest to latest, and upgrade msw to latest (replace tarballed patch) Upgrade vitest to latest, and finally upgrade msw to the latest version that supports Node 18 without our hacky patch. --- package.json | 6 +- packages/client-http/client-http.test.ts | 2 +- packages/client-postgres/client-postgres.ts | 22 - packages/core/seafowl.test.ts | 6 +- packages/react/hooks.test.tsx | 1 + .../test-helpers/msw-server-hooks.test.ts | 51 +- vitest-setup.ts | 2 +- yarn.lock | 1276 +++++++++-------- 8 files changed, 724 insertions(+), 642 deletions(-) diff --git a/package.json b/package.json index 33f19c3..fe1a94c 100644 --- a/package.json +++ b/package.json @@ -8,18 +8,18 @@ "devDependencies": { "@types/node": "18.7.13", "@vitejs/plugin-react": "2.0.1", - "@vitest/coverage-c8": "0.22.1", + "@vitest/coverage-c8": "0.30.0", "c8": "7.11.3", "global-agent": "3.0.0", "jsdom": "20.0.0", - "msw": "https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true", + "msw": "^1.2.1", "prettier": "2.7.1", "rimraf": "3.0.2", "tsc-multi": "1.0.0", "typescript": "5.0.2", "undici": "5.10.0", "verdaccio": "5.13.1", - "vitest": "0.22.1", + "vitest": "0.30.0", "wireit": "0.7.1" }, "resolutions": { diff --git a/packages/client-http/client-http.test.ts b/packages/client-http/client-http.test.ts index 9dd9133..f6098c2 100644 --- a/packages/client-http/client-http.test.ts +++ b/packages/client-http/client-http.test.ts @@ -190,7 +190,7 @@ describe("client handles errors correctly because it", () => { expect(error).toMatchInlineSnapshot(` { - "name": "NetworkError", + "cause": [NetworkError: Some fake network error from MSW request handler], "success": false, "type": "network", } diff --git a/packages/client-postgres/client-postgres.ts b/packages/client-postgres/client-postgres.ts index 92078e8..53c5e2d 100644 --- a/packages/client-postgres/client-postgres.ts +++ b/packages/client-postgres/client-postgres.ts @@ -102,25 +102,3 @@ export const makeClient = (args: ClientOptions) => { const client = new SplitgraphPostgresClient(args); return client; }; - -// TEMPORARY: add .values() to typings by copying unreleased bugfix from commit: -// https://github.com/porsager/postgres/commit/ac1bca41004c7923b877c26f2ffc3039b70b4432 -// declare module "postgres" { -// type ValuesRowList = -// T[number][keyof T[number]][][] & -// postgres.ResultQueryMeta; - -// interface PendingValuesQuery -// extends Promise>, -// postgres.PendingQueryModifiers { -// describe(): postgres.PendingDescribeQuery; -// } - -// interface PendingQuery -// extends Promise>, -// postgres.PendingQueryModifiers { -// describe(): postgres.PendingDescribeQuery; -// values(): PendingValuesQuery; -// raw(): postgres.PendingRawQuery; -// } -// } diff --git a/packages/core/seafowl.test.ts b/packages/core/seafowl.test.ts index e51248b..a1ccd66 100644 --- a/packages/core/seafowl.test.ts +++ b/packages/core/seafowl.test.ts @@ -175,22 +175,24 @@ describe("makeSeafowlHTTPContext", () => { }, }, "plugins": [ - _SeafowlImportFilePlugin { + SeafowlImportFilePlugin { "__name": "csv", "opts": { "seafowlClient": undefined, }, + "seafowlClient": undefined, }, ], }, "plugins": PluginRegistry { "hostContext": {}, "plugins": [ - _SeafowlImportFilePlugin { + SeafowlImportFilePlugin { "__name": "csv", "opts": { "seafowlClient": undefined, }, + "seafowlClient": undefined, }, ], }, diff --git a/packages/react/hooks.test.tsx b/packages/react/hooks.test.tsx index ab348f6..7fa7e1f 100644 --- a/packages/react/hooks.test.tsx +++ b/packages/react/hooks.test.tsx @@ -164,6 +164,7 @@ describe("makeDefaultAnonymousContext", () => { }, }, "db": DbSplitgraph { + "authenticatedCredential": undefined, "database": { "dbname": "ddn", }, diff --git a/packages/test-helpers/msw-server-hooks.test.ts b/packages/test-helpers/msw-server-hooks.test.ts index 9e98a42..8bb5448 100644 --- a/packages/test-helpers/msw-server-hooks.test.ts +++ b/packages/test-helpers/msw-server-hooks.test.ts @@ -1,56 +1,7 @@ -import { - describe, - it, - expect, - beforeEach, - beforeAll, - afterAll, - vi, -} from "vitest"; +import { describe, it, expect, beforeEach } from "vitest"; import { setupMswServerTestHooks } from "./msw-server-hooks"; import { rest } from "msw"; -import { FetchInterceptor } from "@mswjs/interceptors/lib/interceptors/fetch"; - -/** - * The "raw interceptor" (`FetchInterceptor`) intercepts global fetch, including - * the "node native" (undici) fetch enabled by default in Node v18+. - * - * The upstream `msw` package does not currently provide an easy way to add - * interceptors, and it does not enable the fetch interceptor by default in - * the node environment. However, it does work. So until this is fixed upstream, - * we patch it with Yarn patch to include this same FetchInterceptor, which we - * test directly here as a smoke test to make sure `msw` could even be working - */ -describe("can use raw msw FetchInterceptor", () => { - const resolver = vi.fn((req: any) => { - console.log("got req: ", req); - }); - - const interceptor = new FetchInterceptor(); - interceptor.on("request", (...args) => { - return resolver(...args); - }); - - beforeAll(() => { - interceptor.apply(); - }); - - beforeEach(() => { - resolver.mockReset(); - }); - - it("intercepts HTTP GET request", async () => { - const response = await fetch("https://www.httpbin.org/headers"); - expect(resolver).toHaveBeenCalledOnce(); - expect(response).not.toBeNull(); - }); - - afterAll(() => { - interceptor.dispose(); - }); -}); - /** * Test that we can setup an msw "server", which will be using `FetchInterceptor` * because it's provided by our patched version of `msw` (see yarn patch) diff --git a/vitest-setup.ts b/vitest-setup.ts index a8f2438..9ca495a 100644 --- a/vitest-setup.ts +++ b/vitest-setup.ts @@ -9,7 +9,7 @@ const [nodeMajorVersion, _nodeMinorVersion, _nodePatchVersion] = process.version // The dependency is in the root of the mono-repo, and any package that relies // on it is responsible for polyfilling it in its own bundle // import "cross-fetch/polyfill"; -window.fetch = globalThis.fetch; +// window.fetch = globalThis.fetch; // Optionally disable TLS verification and suppress its resultant warning spam import "./suppress-insecure-tls-warning"; diff --git a/yarn.lock b/yarn.lock index bd0a478..fc2c2f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -933,6 +933,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/android-arm64@npm:0.17.16" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/android-arm@npm:0.17.11" @@ -940,6 +947,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/android-arm@npm:0.17.16" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/android-x64@npm:0.17.11" @@ -947,6 +961,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/android-x64@npm:0.17.16" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/darwin-arm64@npm:0.17.11" @@ -954,6 +975,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/darwin-arm64@npm:0.17.16" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/darwin-x64@npm:0.17.11" @@ -961,6 +989,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/darwin-x64@npm:0.17.16" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/freebsd-arm64@npm:0.17.11" @@ -968,6 +1003,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/freebsd-arm64@npm:0.17.16" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/freebsd-x64@npm:0.17.11" @@ -975,6 +1017,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/freebsd-x64@npm:0.17.16" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-arm64@npm:0.17.11" @@ -982,6 +1031,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-arm64@npm:0.17.16" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-arm@npm:0.17.11" @@ -989,6 +1045,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-arm@npm:0.17.16" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-ia32@npm:0.17.11" @@ -996,6 +1059,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-ia32@npm:0.17.16" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-loong64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-loong64@npm:0.17.11" @@ -1003,6 +1073,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-loong64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-loong64@npm:0.17.16" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-mips64el@npm:0.17.11" @@ -1010,6 +1087,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-mips64el@npm:0.17.16" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-ppc64@npm:0.17.11" @@ -1017,6 +1101,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-ppc64@npm:0.17.16" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-riscv64@npm:0.17.11" @@ -1024,6 +1115,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-riscv64@npm:0.17.16" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-s390x@npm:0.17.11" @@ -1031,6 +1129,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-s390x@npm:0.17.16" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/linux-x64@npm:0.17.11" @@ -1038,6 +1143,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/linux-x64@npm:0.17.16" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/netbsd-x64@npm:0.17.11" @@ -1045,6 +1157,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/netbsd-x64@npm:0.17.16" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/openbsd-x64@npm:0.17.11" @@ -1052,6 +1171,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/openbsd-x64@npm:0.17.16" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/sunos-x64@npm:0.17.11" @@ -1059,6 +1185,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/sunos-x64@npm:0.17.16" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/win32-arm64@npm:0.17.11" @@ -1066,6 +1199,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/win32-arm64@npm:0.17.16" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/win32-ia32@npm:0.17.11" @@ -1073,6 +1213,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/win32-ia32@npm:0.17.16" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.17.11": version: 0.17.11 resolution: "@esbuild/win32-x64@npm:0.17.11" @@ -1080,6 +1227,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.17.16": + version: 0.17.16 + resolution: "@esbuild/win32-x64@npm:0.17.16" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@faker-js/faker@npm:7.3.0": version: 7.3.0 resolution: "@faker-js/faker@npm:7.3.0" @@ -1617,6 +1771,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.4.13": + version: 1.4.15 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" + checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.14 resolution: "@jridgewell/trace-mapping@npm:0.3.14" @@ -1774,19 +1935,19 @@ __metadata: dependencies: "@types/node": 18.7.13 "@vitejs/plugin-react": 2.0.1 - "@vitest/coverage-c8": 0.22.1 + "@vitest/coverage-c8": 0.30.0 c8: 7.11.3 cross-fetch: 3.1.5 global-agent: 3.0.0 jsdom: 20.0.0 - msw: "https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true" + msw: ^1.2.1 prettier: 2.7.1 rimraf: 3.0.2 tsc-multi: 1.0.0 typescript: 5.0.2 undici: 5.10.0 verdaccio: 5.13.1 - vitest: 0.22.1 + vitest: 0.30.0 wireit: 0.7.1 languageName: unknown linkType: soft @@ -1851,19 +2012,19 @@ __metadata: languageName: node linkType: hard -"@mswjs/interceptors@https://github.com/milesforks/msw-interceptors/blob/released/patched/pr-283-support-node-v18/msw-interceptors-6aaf5a14562f9deffc044aa3b2872e649612f957.tgz?raw=true": - version: 0.17.5 - resolution: "@mswjs/interceptors@https://github.com/milesforks/msw-interceptors/blob/released/patched/pr-283-support-node-v18/msw-interceptors-6aaf5a14562f9deffc044aa3b2872e649612f957.tgz?raw=true" +"@mswjs/interceptors@npm:^0.17.5": + version: 0.17.9 + resolution: "@mswjs/interceptors@npm:0.17.9" dependencies: "@open-draft/until": ^1.0.3 "@types/debug": ^4.1.7 - "@xmldom/xmldom": ^0.7.5 + "@xmldom/xmldom": ^0.8.3 debug: ^4.3.3 headers-polyfill: ^3.1.0 outvariant: ^1.2.1 strict-event-emitter: ^0.2.4 web-encoding: ^1.1.5 - checksum: 351538e4060e8b08ac07df4b09d40a0841f7e44ce593edf948130f83678c569f3d1ca5edb3b5d7e37d1eaa475205b3d9a8ce8d07aace77e00616343f92840b6a + checksum: 4df726cbee93d8baa54ead1ecb11e98124468659f51eb659ef8ead4aca7d6375198baf412ea17d4810fa5f1ee4fa53994702cb3b0b4f6f427a2f0fb890020192 languageName: node linkType: hard @@ -2009,10 +2170,10 @@ __metadata: languageName: node linkType: hard -"@types/chai@npm:^4.3.3": - version: 4.3.3 - resolution: "@types/chai@npm:4.3.3" - checksum: 20cd094753e137cfc35939cae7f0ed78ecda7861e5c94704efab6979b9121a63807e9b631bdcf3a2792d6c6dba44050b13387262f9e63ebb040741c01c345f0a +"@types/chai@npm:^4.3.4": + version: 4.3.4 + resolution: "@types/chai@npm:4.3.4" + checksum: 571184967beb03bf64c4392a13a7d44e72da9af5a1e83077ff81c39cf59c0fda2a5c78d2005084601cf8f3d11726608574d8b5b4a0e3e9736792807afd926cd0 languageName: node linkType: hard @@ -2275,20 +2436,77 @@ __metadata: languageName: node linkType: hard -"@vitest/coverage-c8@npm:0.22.1": - version: 0.22.1 - resolution: "@vitest/coverage-c8@npm:0.22.1" +"@vitest/coverage-c8@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/coverage-c8@npm:0.30.0" dependencies: - c8: ^7.12.0 - vitest: 0.22.1 - checksum: 141c10127a556ff32e43c6d92a468d800d7c62c767feef1a4123e204a07b58456b410efdba720fa3035639903098dc12767602aa7dabadd40e2d60abc0b008f1 + c8: ^7.13.0 + picocolors: ^1.0.0 + std-env: ^3.3.2 + peerDependencies: + vitest: ">=0.30.0 <1" + checksum: b0d08eb91c9616a8d0b3c9ccd747c8aff2eaf7399df8f9f917c16cab4d857b021096da3a4236e3e3baa52fcf50ff786e3f0cdd95ad508b365f0c048d573d5e34 languageName: node linkType: hard -"@xmldom/xmldom@npm:^0.7.5": - version: 0.7.5 - resolution: "@xmldom/xmldom@npm:0.7.5" - checksum: 8d7ec35c1ef6183b4f621df08e01d7e61f244fb964a4719025e65fe6ac06fac418919be64fb40fe5908e69158ef728f2d936daa082db326fe04603012b5f2a84 +"@vitest/expect@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/expect@npm:0.30.0" + dependencies: + "@vitest/spy": 0.30.0 + "@vitest/utils": 0.30.0 + chai: ^4.3.7 + checksum: f891554ff22e8305cd9ce4c8c1d3ff06129c6c628698231541c92a1a20e14e5f5a502aa19141e3c8d78dfd9b5081bbcc6b2f945d0e794f0b5adf1627c2f57281 + languageName: node + linkType: hard + +"@vitest/runner@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/runner@npm:0.30.0" + dependencies: + "@vitest/utils": 0.30.0 + concordance: ^5.0.4 + p-limit: ^4.0.0 + pathe: ^1.1.0 + checksum: 9bd68b3fb65a3f58e38f5853eb520c49812622bcd444baab616fd7f862bc9727f3ce4614c28eba47e274d2f9479bd6325f8f914398fdc1f034d7d964dee6fee8 + languageName: node + linkType: hard + +"@vitest/snapshot@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/snapshot@npm:0.30.0" + dependencies: + magic-string: ^0.30.0 + pathe: ^1.1.0 + pretty-format: ^27.5.1 + checksum: bbaaab44d45cadc417a3897b5902e055d8c684adb25c2edd1b526209eb71233cd6d914e0670d49e9ec3cda4410cbbeb04a983c33f674bc9eab15c9e0e53ecb2b + languageName: node + linkType: hard + +"@vitest/spy@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/spy@npm:0.30.0" + dependencies: + tinyspy: ^2.1.0 + checksum: 3b01a544ffa7d5aec3b0f5abeb0d8cb58c5746d83f8c01e7259c36f6da1666bf7cd5bbffd480c9889882efa392cf24b0fe4b4ec1d5ded4138b2d54d242f29d2f + languageName: node + linkType: hard + +"@vitest/utils@npm:0.30.0": + version: 0.30.0 + resolution: "@vitest/utils@npm:0.30.0" + dependencies: + concordance: ^5.0.4 + loupe: ^2.3.6 + pretty-format: ^27.5.1 + checksum: 5be61df96b16a501bd6c0c5313056ef60b427b0ebb9734a62898aecf23f5415c1ceca9e0bdcd53e2ce4675e750fe48e7f7fa9d2b86be9a9d4f4fee5b28c8d8ce + languageName: node + linkType: hard + +"@xmldom/xmldom@npm:^0.8.3": + version: 0.8.7 + resolution: "@xmldom/xmldom@npm:0.8.7" + checksum: 593d4429c2281ee7799adcb6ff8604b68cf30ce0721537e3e380287b423e67c7ac197d90987f932b4fd3febc409ded8435706e7f90fbba6e22e08740477341d1 languageName: node linkType: hard @@ -2378,6 +2596,13 @@ __metadata: languageName: node linkType: hard +"acorn-walk@npm:^8.2.0": + version: 8.2.0 + resolution: "acorn-walk@npm:8.2.0" + checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1 + languageName: node + linkType: hard + "acorn@npm:^6.0.1": version: 6.4.2 resolution: "acorn@npm:6.4.2" @@ -2405,6 +2630,15 @@ __metadata: languageName: node linkType: hard +"acorn@npm:^8.8.2": + version: 8.8.2 + resolution: "acorn@npm:8.8.2" + bin: + acorn: bin/acorn + checksum: f790b99a1bf63ef160c967e23c46feea7787e531292bb827126334612c234ed489a0dc2c7ba33156416f0ffa8d25bf2b0fdb7f35c2ba60eb3e960572bece4001 + languageName: node + linkType: hard + "agent-base@npm:6, agent-base@npm:^6.0.2": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -2767,6 +3001,13 @@ __metadata: languageName: node linkType: hard +"blueimp-md5@npm:^2.10.0": + version: 2.19.0 + resolution: "blueimp-md5@npm:2.19.0" + checksum: 28095dcbd2c67152a2938006e8d7c74c3406ba6556071298f872505432feb2c13241b0476644160ee0a5220383ba94cb8ccdac0053b51f68d168728f9c382530 + languageName: node + linkType: hard + "body-parser@npm:1.20.0": version: 1.20.0 resolution: "body-parser@npm:1.20.0" @@ -2921,9 +3162,9 @@ __metadata: languageName: node linkType: hard -"c8@npm:^7.12.0": - version: 7.12.0 - resolution: "c8@npm:7.12.0" +"c8@npm:^7.13.0": + version: 7.13.0 + resolution: "c8@npm:7.13.0" dependencies: "@bcoe/v8-coverage": ^0.2.3 "@istanbuljs/schema": ^0.1.3 @@ -2939,7 +3180,14 @@ __metadata: yargs-parser: ^20.2.9 bin: c8: bin/c8.js - checksum: 3b7fa9ad7cff2cb0bb579467e6b544498fbd46e9353a809ad3b8cf749df4beadd074cde277356b0552f3c8055b1b3ec3ebaf2209e9ad4bdefed92dbf64d283ab + checksum: 491abf4cf3097cdcfd24dbac49162f1383861c22c77fdd9280bcd38240e1e07d2c6a59da5d4df59a61a8204e2fc297d31fd526e495faf8d2f20dcc12a37b144c + languageName: node + linkType: hard + +"cac@npm:^6.7.14": + version: 6.7.14 + resolution: "cac@npm:6.7.14" + checksum: 45a2496a9443abbe7f52a49b22fbe51b1905eff46e03fd5e6c98e3f85077be3f8949685a1849b1a9cd2bc3e5567dfebcf64f01ce01847baf918f1b37c839791a languageName: node linkType: hard @@ -3035,18 +3283,18 @@ __metadata: languageName: node linkType: hard -"chai@npm:^4.3.6": - version: 4.3.6 - resolution: "chai@npm:4.3.6" +"chai@npm:^4.3.7": + version: 4.3.7 + resolution: "chai@npm:4.3.7" dependencies: assertion-error: ^1.1.0 check-error: ^1.0.2 - deep-eql: ^3.0.1 + deep-eql: ^4.1.2 get-func-name: ^2.0.0 loupe: ^2.3.1 pathval: ^1.1.1 type-detect: ^4.0.5 - checksum: acff93fd537f96d4a4d62dd83810285dffcfccb5089e1bf2a1205b28ec82d93dff551368722893cf85004282df10ee68802737c33c90c5493957ed449ed7ce71 + checksum: 0bba7d267848015246a66995f044ce3f0ebc35e530da3cbdf171db744e14cbe301ab913a8d07caf7952b430257ccbb1a4a983c570a7c5748dc537897e5131f7c languageName: node linkType: hard @@ -3379,6 +3627,22 @@ __metadata: languageName: node linkType: hard +"concordance@npm:^5.0.4": + version: 5.0.4 + resolution: "concordance@npm:5.0.4" + dependencies: + date-time: ^3.1.0 + esutils: ^2.0.3 + fast-diff: ^1.2.0 + js-string-escape: ^1.0.1 + lodash: ^4.17.15 + md5-hex: ^3.0.1 + semver: ^7.3.2 + well-known-symbols: ^2.0.0 + checksum: 749153ba711492feb7c3d2f5bb04c107157440b3e39509bd5dd19ee7b3ac751d1e4cd75796d9f702e0a713312dbc661421c68aa4a2c34d5f6d91f47e3a1c64a6 + languageName: node + linkType: hard + "console-control-strings@npm:^1.1.0": version: 1.1.0 resolution: "console-control-strings@npm:1.1.0" @@ -3619,6 +3883,15 @@ __metadata: languageName: node linkType: hard +"date-time@npm:^3.1.0": + version: 3.1.0 + resolution: "date-time@npm:3.1.0" + dependencies: + time-zone: ^1.0.0 + checksum: f9cfcd1b15dfeabab15c0b9d18eb9e4e2d9d4371713564178d46a8f91ad577a290b5178b80050718d02d9c0cf646f8a875011e12d1ed05871e9f72c72c8a8fe6 + languageName: node + linkType: hard + "dayjs@npm:1.11.3": version: 1.11.3 resolution: "dayjs@npm:1.11.3" @@ -3677,12 +3950,12 @@ __metadata: languageName: node linkType: hard -"deep-eql@npm:^3.0.1": - version: 3.0.1 - resolution: "deep-eql@npm:3.0.1" +"deep-eql@npm:^4.1.2": + version: 4.1.3 + resolution: "deep-eql@npm:4.1.3" dependencies: type-detect: ^4.0.0 - checksum: 4f4c9fb79eb994fb6e81d4aa8b063adc40c00f831588aa65e20857d5d52f15fb23034a6576ecf886f7ff6222d5ae42e71e9b7d57113e0715b1df7ea1e812b125 + checksum: 7f6d30cb41c713973dc07eaadded848b2ab0b835e518a88b91bea72f34e08c4c71d167a722a6f302d3a6108f05afd8e6d7650689a84d5d29ec7fe6220420397f languageName: node linkType: hard @@ -3702,7 +3975,7 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4": +"define-properties@npm:^1.1.3": version: 1.1.4 resolution: "define-properties@npm:1.1.4" dependencies: @@ -3942,37 +4215,6 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.0": - version: 1.20.1 - resolution: "es-abstract@npm:1.20.1" - dependencies: - call-bind: ^1.0.2 - es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 - function.prototype.name: ^1.1.5 - get-intrinsic: ^1.1.1 - get-symbol-description: ^1.0.0 - has: ^1.0.3 - has-property-descriptors: ^1.0.0 - has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - is-callable: ^1.2.4 - is-negative-zero: ^2.0.2 - is-regex: ^1.1.4 - is-shared-array-buffer: ^1.0.2 - is-string: ^1.0.7 - is-weakref: ^1.0.2 - object-inspect: ^1.12.0 - object-keys: ^1.1.1 - object.assign: ^4.1.2 - regexp.prototype.flags: ^1.4.3 - string.prototype.trimend: ^1.0.5 - string.prototype.trimstart: ^1.0.5 - unbox-primitive: ^1.0.2 - checksum: 28da27ae0ed9c76df7ee8ef5c278df79dcfdb554415faf7068bb7c58f8ba8e2a16bfb59e586844be6429ab4c302ca7748979d48442224cb1140b051866d74b7f - languageName: node - linkType: hard - "es-module-lexer@npm:^0.10.5": version: 0.10.5 resolution: "es-module-lexer@npm:0.10.5" @@ -3980,17 +4222,6 @@ __metadata: languageName: node linkType: hard -"es-to-primitive@npm:^1.2.1": - version: 1.2.1 - resolution: "es-to-primitive@npm:1.2.1" - dependencies: - is-callable: ^1.1.4 - is-date-object: ^1.0.1 - is-symbol: ^1.0.2 - checksum: 4ead6671a2c1402619bdd77f3503991232ca15e17e46222b0a41a5d81aebc8740a77822f5b3c965008e631153e9ef0580540007744521e72de8e33599fca2eed - languageName: node - linkType: hard - "es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.59, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46": version: 0.10.61 resolution: "es5-ext@npm:0.10.61" @@ -4049,13 +4280,6 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-android-64@npm:0.14.49" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - "esbuild-android-arm64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-android-arm64@npm:0.14.38" @@ -4063,13 +4287,6 @@ __metadata: languageName: node linkType: hard -"esbuild-android-arm64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-android-arm64@npm:0.14.49" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - "esbuild-darwin-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-darwin-64@npm:0.14.38" @@ -4077,13 +4294,6 @@ __metadata: languageName: node linkType: hard -"esbuild-darwin-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-darwin-64@npm:0.14.49" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - "esbuild-darwin-arm64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-darwin-arm64@npm:0.14.38" @@ -4091,13 +4301,6 @@ __metadata: languageName: node linkType: hard -"esbuild-darwin-arm64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-darwin-arm64@npm:0.14.49" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - "esbuild-freebsd-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-freebsd-64@npm:0.14.38" @@ -4105,13 +4308,6 @@ __metadata: languageName: node linkType: hard -"esbuild-freebsd-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-freebsd-64@npm:0.14.49" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - "esbuild-freebsd-arm64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-freebsd-arm64@npm:0.14.38" @@ -4119,13 +4315,6 @@ __metadata: languageName: node linkType: hard -"esbuild-freebsd-arm64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-freebsd-arm64@npm:0.14.49" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - "esbuild-linux-32@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-32@npm:0.14.38" @@ -4133,13 +4322,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-32@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-32@npm:0.14.49" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - "esbuild-linux-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-64@npm:0.14.38" @@ -4147,13 +4329,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-64@npm:0.14.49" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - "esbuild-linux-arm64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-arm64@npm:0.14.38" @@ -4161,13 +4336,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-arm64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-arm64@npm:0.14.49" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - "esbuild-linux-arm@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-arm@npm:0.14.38" @@ -4175,13 +4343,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-arm@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-arm@npm:0.14.49" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - "esbuild-linux-mips64le@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-mips64le@npm:0.14.38" @@ -4189,13 +4350,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-mips64le@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-mips64le@npm:0.14.49" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - "esbuild-linux-ppc64le@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-ppc64le@npm:0.14.38" @@ -4203,13 +4357,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-ppc64le@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-ppc64le@npm:0.14.49" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - "esbuild-linux-riscv64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-riscv64@npm:0.14.38" @@ -4217,13 +4364,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-riscv64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-riscv64@npm:0.14.49" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - "esbuild-linux-s390x@npm:0.14.38": version: 0.14.38 resolution: "esbuild-linux-s390x@npm:0.14.38" @@ -4231,13 +4371,6 @@ __metadata: languageName: node linkType: hard -"esbuild-linux-s390x@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-linux-s390x@npm:0.14.49" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - "esbuild-netbsd-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-netbsd-64@npm:0.14.38" @@ -4245,13 +4378,6 @@ __metadata: languageName: node linkType: hard -"esbuild-netbsd-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-netbsd-64@npm:0.14.49" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - "esbuild-openbsd-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-openbsd-64@npm:0.14.38" @@ -4259,13 +4385,6 @@ __metadata: languageName: node linkType: hard -"esbuild-openbsd-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-openbsd-64@npm:0.14.49" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - "esbuild-sunos-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-sunos-64@npm:0.14.38" @@ -4273,13 +4392,6 @@ __metadata: languageName: node linkType: hard -"esbuild-sunos-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-sunos-64@npm:0.14.49" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - "esbuild-windows-32@npm:0.14.38": version: 0.14.38 resolution: "esbuild-windows-32@npm:0.14.38" @@ -4287,13 +4399,6 @@ __metadata: languageName: node linkType: hard -"esbuild-windows-32@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-windows-32@npm:0.14.49" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - "esbuild-windows-64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-windows-64@npm:0.14.38" @@ -4301,13 +4406,6 @@ __metadata: languageName: node linkType: hard -"esbuild-windows-64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-windows-64@npm:0.14.49" - conditions: os=win32 & cpu=x64 - languageName: node - linkType: hard - "esbuild-windows-arm64@npm:0.14.38": version: 0.14.38 resolution: "esbuild-windows-arm64@npm:0.14.38" @@ -4315,13 +4413,6 @@ __metadata: languageName: node linkType: hard -"esbuild-windows-arm64@npm:0.14.49": - version: 0.14.49 - resolution: "esbuild-windows-arm64@npm:0.14.49" - conditions: os=win32 & cpu=arm64 - languageName: node - linkType: hard - "esbuild@npm:0.14.38": version: 0.14.38 resolution: "esbuild@npm:0.14.38" @@ -4470,74 +4561,80 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.14.47": - version: 0.14.49 - resolution: "esbuild@npm:0.14.49" - dependencies: - esbuild-android-64: 0.14.49 - esbuild-android-arm64: 0.14.49 - esbuild-darwin-64: 0.14.49 - esbuild-darwin-arm64: 0.14.49 - esbuild-freebsd-64: 0.14.49 - esbuild-freebsd-arm64: 0.14.49 - esbuild-linux-32: 0.14.49 - esbuild-linux-64: 0.14.49 - esbuild-linux-arm: 0.14.49 - esbuild-linux-arm64: 0.14.49 - esbuild-linux-mips64le: 0.14.49 - esbuild-linux-ppc64le: 0.14.49 - esbuild-linux-riscv64: 0.14.49 - esbuild-linux-s390x: 0.14.49 - esbuild-netbsd-64: 0.14.49 - esbuild-openbsd-64: 0.14.49 - esbuild-sunos-64: 0.14.49 - esbuild-windows-32: 0.14.49 - esbuild-windows-64: 0.14.49 - esbuild-windows-arm64: 0.14.49 +"esbuild@npm:^0.17.5": + version: 0.17.16 + resolution: "esbuild@npm:0.17.16" + dependencies: + "@esbuild/android-arm": 0.17.16 + "@esbuild/android-arm64": 0.17.16 + "@esbuild/android-x64": 0.17.16 + "@esbuild/darwin-arm64": 0.17.16 + "@esbuild/darwin-x64": 0.17.16 + "@esbuild/freebsd-arm64": 0.17.16 + "@esbuild/freebsd-x64": 0.17.16 + "@esbuild/linux-arm": 0.17.16 + "@esbuild/linux-arm64": 0.17.16 + "@esbuild/linux-ia32": 0.17.16 + "@esbuild/linux-loong64": 0.17.16 + "@esbuild/linux-mips64el": 0.17.16 + "@esbuild/linux-ppc64": 0.17.16 + "@esbuild/linux-riscv64": 0.17.16 + "@esbuild/linux-s390x": 0.17.16 + "@esbuild/linux-x64": 0.17.16 + "@esbuild/netbsd-x64": 0.17.16 + "@esbuild/openbsd-x64": 0.17.16 + "@esbuild/sunos-x64": 0.17.16 + "@esbuild/win32-arm64": 0.17.16 + "@esbuild/win32-ia32": 0.17.16 + "@esbuild/win32-x64": 0.17.16 dependenciesMeta: - esbuild-android-64: + "@esbuild/android-arm": optional: true - esbuild-android-arm64: + "@esbuild/android-arm64": optional: true - esbuild-darwin-64: + "@esbuild/android-x64": optional: true - esbuild-darwin-arm64: + "@esbuild/darwin-arm64": optional: true - esbuild-freebsd-64: + "@esbuild/darwin-x64": optional: true - esbuild-freebsd-arm64: + "@esbuild/freebsd-arm64": optional: true - esbuild-linux-32: + "@esbuild/freebsd-x64": optional: true - esbuild-linux-64: + "@esbuild/linux-arm": optional: true - esbuild-linux-arm: + "@esbuild/linux-arm64": optional: true - esbuild-linux-arm64: + "@esbuild/linux-ia32": optional: true - esbuild-linux-mips64le: + "@esbuild/linux-loong64": optional: true - esbuild-linux-ppc64le: + "@esbuild/linux-mips64el": optional: true - esbuild-linux-riscv64: + "@esbuild/linux-ppc64": optional: true - esbuild-linux-s390x: + "@esbuild/linux-riscv64": optional: true - esbuild-netbsd-64: + "@esbuild/linux-s390x": optional: true - esbuild-openbsd-64: + "@esbuild/linux-x64": optional: true - esbuild-sunos-64: + "@esbuild/netbsd-x64": optional: true - esbuild-windows-32: + "@esbuild/openbsd-x64": optional: true - esbuild-windows-64: + "@esbuild/sunos-x64": optional: true - esbuild-windows-arm64: + "@esbuild/win32-arm64": + optional: true + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": optional: true bin: esbuild: bin/esbuild - checksum: b718f4c9eaf2f83bb26f2cdb18d82d70365179ae8d1d88636afc3073a0c328364340695798b9a6322ae15e31b90e1f71266151f61637412649fb31bb3ecb2e0a + checksum: c9787d8e05b9c4f762761be31a7847b5b4492b9b997808b7098479fef9a3260f1b8ca01e9b38376b6698f4394bfe088acb4f797a697b45b965cd664e103aafa7 languageName: node linkType: hard @@ -4652,7 +4749,7 @@ __metadata: languageName: node linkType: hard -"esutils@npm:^2.0.2": +"esutils@npm:^2.0.2, esutils@npm:^2.0.3": version: 2.0.3 resolution: "esutils@npm:2.0.3" checksum: 22b5b08f74737379a840b8ed2036a5fb35826c709ab000683b092d9054e5c2a82c27818f12604bfc2a9a76b90b6834ef081edbc1c7ae30d1627012e067c6ec87 @@ -4798,6 +4895,13 @@ __metadata: languageName: node linkType: hard +"fast-diff@npm:^1.2.0": + version: 1.2.0 + resolution: "fast-diff@npm:1.2.0" + checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae + languageName: node + linkType: hard + "fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9": version: 3.2.11 resolution: "fast-glob@npm:3.2.11" @@ -5084,25 +5188,6 @@ __metadata: languageName: node linkType: hard -"function.prototype.name@npm:^1.1.5": - version: 1.1.5 - resolution: "function.prototype.name@npm:1.1.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.0 - functions-have-names: ^1.2.2 - checksum: acd21d733a9b649c2c442f067567743214af5fa248dbeee69d8278ce7df3329ea5abac572be9f7470b4ec1cd4d8f1040e3c5caccf98ebf2bf861a0deab735c27 - languageName: node - linkType: hard - -"functions-have-names@npm:^1.2.2": - version: 1.2.3 - resolution: "functions-have-names@npm:1.2.3" - checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5 - languageName: node - linkType: hard - "gauge@npm:^4.0.3": version: 4.0.4 resolution: "gauge@npm:4.0.4" @@ -5140,14 +5225,25 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1": - version: 1.1.2 - resolution: "get-intrinsic@npm:1.1.2" +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1": + version: 1.1.2 + resolution: "get-intrinsic@npm:1.1.2" + dependencies: + function-bind: ^1.1.1 + has: ^1.0.3 + has-symbols: ^1.0.3 + checksum: 252f45491f2ba88ebf5b38018020c7cc3279de54b1d67ffb70c0cdf1dfa8ab31cd56467b5d117a8b4275b7a4dde91f86766b163a17a850f036528a7b2faafb2b + languageName: node + linkType: hard + +"get-intrinsic@npm:^1.1.3": + version: 1.2.0 + resolution: "get-intrinsic@npm:1.2.0" dependencies: function-bind: ^1.1.1 has: ^1.0.3 has-symbols: ^1.0.3 - checksum: 252f45491f2ba88ebf5b38018020c7cc3279de54b1d67ffb70c0cdf1dfa8ab31cd56467b5d117a8b4275b7a4dde91f86766b163a17a850f036528a7b2faafb2b + checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d languageName: node linkType: hard @@ -5158,16 +5254,6 @@ __metadata: languageName: node linkType: hard -"get-symbol-description@npm:^1.0.0": - version: 1.0.0 - resolution: "get-symbol-description@npm:1.0.0" - dependencies: - call-bind: ^1.0.2 - get-intrinsic: ^1.1.1 - checksum: 9ceff8fe968f9270a37a1f73bf3f1f7bda69ca80f4f80850670e0e7b9444ff99323f7ac52f96567f8b5f5fbe7ac717a0d81d3407c7313e82810c6199446a5247 - languageName: node - linkType: hard - "get-tsconfig@npm:^3.0.1": version: 3.0.1 resolution: "get-tsconfig@npm:3.0.1" @@ -5288,6 +5374,15 @@ __metadata: languageName: node linkType: hard +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: ^1.1.3 + checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6 + languageName: node + linkType: hard + "graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" @@ -5412,13 +5507,6 @@ __metadata: languageName: node linkType: hard -"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2": - version: 1.0.2 - resolution: "has-bigints@npm:1.0.2" - checksum: 390e31e7be7e5c6fe68b81babb73dfc35d413604d7ee5f56da101417027a4b4ce6a27e46eff97ad040c835b5d228676eae99a9b5c3bc0e23c8e81a49241ff45b - languageName: node - linkType: hard - "has-flag@npm:^3.0.0": version: 3.0.0 resolution: "has-flag@npm:3.0.0" @@ -5484,10 +5572,10 @@ __metadata: languageName: node linkType: hard -"headers-polyfill@npm:^3.1.0": - version: 3.1.0 - resolution: "headers-polyfill@npm:3.1.0" - checksum: a95257065684653b7185efbb9a380c547ea832002991b5adf0d90cd222073da2701be9dc2849d1970ecf15e8c35b383984358566afe6e76ca8ff1dbd7cdce3af +"headers-polyfill@npm:^3.1.0, headers-polyfill@npm:^3.1.2": + version: 3.1.2 + resolution: "headers-polyfill@npm:3.1.2" + checksum: 510ca9637ef652404dbd432e680418f8d418ba18094ef2f64c3d8de955ebf6e68d553c7f0aeaa5fc937d130b139c1e2d7c2066cd4cf0f740a4627924eaaee9db languageName: node linkType: hard @@ -5678,7 +5766,7 @@ __metadata: languageName: node linkType: hard -"inquirer@npm:^8.0.0, inquirer@npm:^8.2.0": +"inquirer@npm:^8.0.0": version: 8.2.4 resolution: "inquirer@npm:8.2.4" dependencies: @@ -5701,14 +5789,26 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.3": - version: 1.0.3 - resolution: "internal-slot@npm:1.0.3" +"inquirer@npm:^8.2.0": + version: 8.2.5 + resolution: "inquirer@npm:8.2.5" dependencies: - get-intrinsic: ^1.1.0 - has: ^1.0.3 - side-channel: ^1.0.4 - checksum: 1944f92e981e47aebc98a88ff0db579fd90543d937806104d0b96557b10c1f170c51fb777b97740a8b6ddeec585fca8c39ae99fd08a8e058dfc8ab70937238bf + ansi-escapes: ^4.2.1 + chalk: ^4.1.1 + cli-cursor: ^3.1.0 + cli-width: ^3.0.0 + external-editor: ^3.0.3 + figures: ^3.0.0 + lodash: ^4.17.21 + mute-stream: 0.0.8 + ora: ^5.4.1 + run-async: ^2.4.0 + rxjs: ^7.5.5 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + through: ^2.3.6 + wrap-ansi: ^7.0.0 + checksum: f13ee4c444187786fb393609dedf6b30870115a57b603f2e6424f29a99abc13446fd45ee22461c33c9c40a92a60a8df62d0d6b25d74fc6676fa4cb211de55b55 languageName: node linkType: hard @@ -5769,15 +5869,6 @@ __metadata: languageName: node linkType: hard -"is-bigint@npm:^1.0.1": - version: 1.0.4 - resolution: "is-bigint@npm:1.0.4" - dependencies: - has-bigints: ^1.0.1 - checksum: c56edfe09b1154f8668e53ebe8252b6f185ee852a50f9b41e8d921cb2bed425652049fbe438723f6cb48a63ca1aa051e948e7e401e093477c99c84eba244f666 - languageName: node - linkType: hard - "is-binary-path@npm:~2.1.0": version: 2.1.0 resolution: "is-binary-path@npm:2.1.0" @@ -5787,20 +5878,10 @@ __metadata: languageName: node linkType: hard -"is-boolean-object@npm:^1.1.0": - version: 1.1.2 - resolution: "is-boolean-object@npm:1.1.2" - dependencies: - call-bind: ^1.0.2 - has-tostringtag: ^1.0.0 - checksum: c03b23dbaacadc18940defb12c1c0e3aaece7553ef58b162a0f6bba0c2a7e1551b59f365b91e00d2dbac0522392d576ef322628cb1d036a0fe51eb466db67222 - languageName: node - linkType: hard - -"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.4": - version: 1.2.4 - resolution: "is-callable@npm:1.2.4" - checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f +"is-callable@npm:^1.1.3": + version: 1.2.7 + resolution: "is-callable@npm:1.2.7" + checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac languageName: node linkType: hard @@ -5813,15 +5894,6 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1": - version: 1.0.5 - resolution: "is-date-object@npm:1.0.5" - dependencies: - has-tostringtag: ^1.0.0 - checksum: baa9077cdf15eb7b58c79398604ca57379b2fc4cf9aa7a9b9e295278648f628c9b201400c01c5e0f7afae56507d741185730307cbe7cad3b9f90a77e5ee342fc - languageName: node - linkType: hard - "is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" @@ -5877,26 +5949,10 @@ __metadata: languageName: node linkType: hard -"is-negative-zero@npm:^2.0.2": - version: 2.0.2 - resolution: "is-negative-zero@npm:2.0.2" - checksum: f3232194c47a549da60c3d509c9a09be442507616b69454716692e37ae9f37c4dea264fb208ad0c9f3efd15a796a46b79df07c7e53c6227c32170608b809149a - languageName: node - linkType: hard - -"is-node-process@npm:^1.0.1": - version: 1.0.1 - resolution: "is-node-process@npm:1.0.1" - checksum: 3ddb8a892a00f6eb9c2aea7e7e1426b8683512d9419933d95114f4f64b5455e26601c23a31c0682463890032136dd98a326988a770ab6b4eed54a43ade8bed50 - languageName: node - linkType: hard - -"is-number-object@npm:^1.0.4": - version: 1.0.7 - resolution: "is-number-object@npm:1.0.7" - dependencies: - has-tostringtag: ^1.0.0 - checksum: d1e8d01bb0a7134c74649c4e62da0c6118a0bfc6771ea3c560914d52a627873e6920dd0fd0ebc0e12ad2ff4687eac4c308f7e80320b973b2c8a2c8f97a7524f7 +"is-node-process@npm:^1.2.0": + version: 1.2.0 + resolution: "is-node-process@npm:1.2.0" + checksum: 930765cdc6d81ab8f1bbecbea4a8d35c7c6d88a3ff61f3630e0fc7f22d624d7661c1df05c58547d0eb6a639dfa9304682c8e342c4113a6ed51472b704cee2928 languageName: node linkType: hard @@ -5921,16 +5977,6 @@ __metadata: languageName: node linkType: hard -"is-regex@npm:^1.1.4": - version: 1.1.4 - resolution: "is-regex@npm:1.1.4" - dependencies: - call-bind: ^1.0.2 - has-tostringtag: ^1.0.0 - checksum: 362399b33535bc8f386d96c45c9feb04cf7f8b41c182f54174c1a45c9abbbe5e31290bbad09a458583ff6bf3b2048672cdb1881b13289569a7c548370856a652 - languageName: node - linkType: hard - "is-relative@npm:^1.0.0": version: 1.0.0 resolution: "is-relative@npm:1.0.0" @@ -5940,43 +5986,16 @@ __metadata: languageName: node linkType: hard -"is-shared-array-buffer@npm:^1.0.2": - version: 1.0.2 - resolution: "is-shared-array-buffer@npm:1.0.2" - dependencies: - call-bind: ^1.0.2 - checksum: 9508929cf14fdc1afc9d61d723c6e8d34f5e117f0bffda4d97e7a5d88c3a8681f633a74f8e3ad1fe92d5113f9b921dc5ca44356492079612f9a247efbce7032a - languageName: node - linkType: hard - -"is-string@npm:^1.0.5, is-string@npm:^1.0.7": - version: 1.0.7 - resolution: "is-string@npm:1.0.7" - dependencies: - has-tostringtag: ^1.0.0 - checksum: 323b3d04622f78d45077cf89aab783b2f49d24dc641aa89b5ad1a72114cfeff2585efc8c12ef42466dff32bde93d839ad321b26884cf75e5a7892a938b089989 - languageName: node - linkType: hard - -"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": - version: 1.0.4 - resolution: "is-symbol@npm:1.0.4" - dependencies: - has-symbols: ^1.0.2 - checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510 - languageName: node - linkType: hard - -"is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": - version: 1.1.9 - resolution: "is-typed-array@npm:1.1.9" +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3": + version: 1.1.10 + resolution: "is-typed-array@npm:1.1.10" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 - es-abstract: ^1.20.0 for-each: ^0.3.3 + gopd: ^1.0.1 has-tostringtag: ^1.0.0 - checksum: 11910f1e58755fef43bf0074e52fa5b932bf101ec65d613e0a83d40e8e4c6e3f2ee142d624ebc7624c091d3bbe921131f8db7d36ecbbb71909f2fe310c1faa65 + checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017 languageName: node linkType: hard @@ -6012,15 +6031,6 @@ __metadata: languageName: node linkType: hard -"is-weakref@npm:^1.0.2": - version: 1.0.2 - resolution: "is-weakref@npm:1.0.2" - dependencies: - call-bind: ^1.0.2 - checksum: 95bd9a57cdcb58c63b1c401c60a474b0f45b94719c30f548c891860f051bc2231575c290a6b420c6bc6e7ed99459d424c652bd5bf9a1d5259505dc35b4bf83de - languageName: node - linkType: hard - "is-windows@npm:^1.0.1": version: 1.0.2 resolution: "is-windows@npm:1.0.2" @@ -6096,6 +6106,13 @@ __metadata: languageName: node linkType: hard +"js-string-escape@npm:^1.0.1": + version: 1.0.1 + resolution: "js-string-escape@npm:1.0.1" + checksum: f11e0991bf57e0c183b55c547acec85bd2445f043efc9ea5aa68b41bd2a3e7d3ce94636cb233ae0d84064ba4c1a505d32e969813c5b13f81e7d4be12c59256fe + languageName: node + linkType: hard + "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0": version: 4.0.0 resolution: "js-tokens@npm:4.0.0" @@ -6306,6 +6323,13 @@ __metadata: languageName: node linkType: hard +"jsonc-parser@npm:^3.2.0": + version: 3.2.0 + resolution: "jsonc-parser@npm:3.2.0" + checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 + languageName: node + linkType: hard + "jsonify@npm:~0.0.0": version: 0.0.0 resolution: "jsonify@npm:0.0.0" @@ -6425,10 +6449,10 @@ __metadata: languageName: node linkType: hard -"local-pkg@npm:^0.4.2": - version: 0.4.2 - resolution: "local-pkg@npm:0.4.2" - checksum: 22be451353c25c4411b552bf01880ebc9e995b93574b2facc7757968d888356df59199cacada14162ab53bbc9da055bb692c907b4171f008dbce45a2afc777c1 +"local-pkg@npm:^0.4.3": + version: 0.4.3 + resolution: "local-pkg@npm:0.4.3" + checksum: 7825aca531dd6afa3a3712a0208697aa4a5cd009065f32e3fb732aafcc42ed11f277b5ac67229222e96f4def55197171cdf3d5522d0381b489d2e5547b407d55 languageName: node linkType: hard @@ -6522,7 +6546,7 @@ __metadata: languageName: node linkType: hard -"lodash@npm:4, lodash@npm:4.17.21, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:~4.17.0": +"lodash@npm:4, lodash@npm:4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:~4.17.0": version: 4.17.21 resolution: "lodash@npm:4.17.21" checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7 @@ -6571,6 +6595,15 @@ __metadata: languageName: node linkType: hard +"loupe@npm:^2.3.6": + version: 2.3.6 + resolution: "loupe@npm:2.3.6" + dependencies: + get-func-name: ^2.0.0 + checksum: cc83f1b124a1df7384601d72d8d1f5fe95fd7a8185469fec48bb2e4027e45243949e7a013e8d91051a138451ff0552310c32aa9786e60b6a30d1e801bdc2163f + languageName: node + linkType: hard + "lowdb@npm:1.0.0": version: 1.0.0 resolution: "lowdb@npm:1.0.0" @@ -6661,6 +6694,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.0": + version: 0.30.0 + resolution: "magic-string@npm:0.30.0" + dependencies: + "@jridgewell/sourcemap-codec": ^1.4.13 + checksum: 7bdf22e27334d8a393858a16f5f840af63a7c05848c000fd714da5aa5eefa09a1bc01d8469362f25cc5c4a14ec01b46557b7fff8751365522acddf21e57c488d + languageName: node + linkType: hard + "make-dir@npm:^3.0.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" @@ -6735,6 +6777,15 @@ __metadata: languageName: node linkType: hard +"md5-hex@npm:^3.0.1": + version: 3.0.1 + resolution: "md5-hex@npm:3.0.1" + dependencies: + blueimp-md5: ^2.10.0 + checksum: 6799a19e8bdd3e0c2861b94c1d4d858a89220488d7885c1fa236797e367d0c2e5f2b789e05309307083503f85be3603a9686a5915568a473137d6b4117419cc2 + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -6966,6 +7017,18 @@ __metadata: languageName: node linkType: hard +"mlly@npm:^1.1.1, mlly@npm:^1.2.0": + version: 1.2.0 + resolution: "mlly@npm:1.2.0" + dependencies: + acorn: ^8.8.2 + pathe: ^1.1.0 + pkg-types: ^1.0.2 + ufo: ^1.1.1 + checksum: 640b019eb20e8e556bd623141b861d47e5c05f8af00210376ce1015912695dbd93a38cfe7ba18ca04f00e75645378f0f94a48a90bfa6e1b5dee1f0ec9c14eed1 + languageName: node + linkType: hard + "moo@npm:^0.5.0, moo@npm:^0.5.1": version: 0.5.1 resolution: "moo@npm:0.5.1" @@ -6994,12 +7057,12 @@ __metadata: languageName: node linkType: hard -"msw@https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true": - version: 0.47.3 - resolution: "msw@https://github.com/milesforks/msw/blob/released/patched/intercept-node-v18-native-fetch/unreleased-msw-1190f5560178babd232abbb9a96ce8ba4f1abfb1.tgz?raw=true" +"msw@npm:^1.2.1": + version: 1.2.1 + resolution: "msw@npm:1.2.1" dependencies: "@mswjs/cookies": ^0.2.2 - "@mswjs/interceptors": "https://github.com/milesforks/msw-interceptors/blob/released/patched/pr-283-support-node-v18/msw-interceptors-6aaf5a14562f9deffc044aa3b2872e649612f957.tgz?raw=true" + "@mswjs/interceptors": ^0.17.5 "@open-draft/until": ^1.0.3 "@types/cookie": ^0.4.1 "@types/js-levenshtein": ^1.1.1 @@ -7007,25 +7070,24 @@ __metadata: chokidar: ^3.4.2 cookie: ^0.4.2 graphql: ^15.0.0 || ^16.0.0 - headers-polyfill: ^3.1.0 + headers-polyfill: ^3.1.2 inquirer: ^8.2.0 - is-node-process: ^1.0.1 + is-node-process: ^1.2.0 js-levenshtein: ^1.1.6 node-fetch: ^2.6.7 - outvariant: ^1.3.0 + outvariant: ^1.4.0 path-to-regexp: ^6.2.0 - statuses: ^2.0.0 - strict-event-emitter: ^0.2.0 + strict-event-emitter: ^0.4.3 type-fest: ^2.19.0 yargs: ^17.3.1 peerDependencies: - typescript: ">= 4.2.x <= 4.8.x" + typescript: ">= 4.4.x <= 5.0.x" peerDependenciesMeta: typescript: optional: true bin: msw: cli/index.js - checksum: fa1561a751df9284003350eb8fbd1dd3a4ca36254c61c607944eb41f5c00be38d32d6051cd1df396cdec32912139bd7637942b3ca94128f744e98f39b6e209fa + checksum: 97b9c5ffc81b4380dd24ff40ac52ca02f406c88f86d8209ba991da19aad0bcfc37e807794aa1b9bf29f89cd86fd31e492bf4418c5ff02559b4f80d6ce4fb417b languageName: node linkType: hard @@ -7246,7 +7308,7 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0": +"object-inspect@npm:^1.9.0": version: 1.12.2 resolution: "object-inspect@npm:1.12.2" checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 @@ -7272,18 +7334,6 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:^4.1.2": - version: 4.1.4 - resolution: "object.assign@npm:4.1.4" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - has-symbols: ^1.0.3 - object-keys: ^1.1.1 - checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 - languageName: node - linkType: hard - "on-finished@npm:2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" @@ -7356,10 +7406,10 @@ __metadata: languageName: node linkType: hard -"outvariant@npm:^1.2.1, outvariant@npm:^1.3.0": - version: 1.3.0 - resolution: "outvariant@npm:1.3.0" - checksum: ac76ca375c1c642989e1c74f0e9ebac84c05bc9fdc8f28be949c16fae1658e9f1f2fb1133fe3cc1e98afabef78fe4298fe9360b5734baf8e6ad440c182680848 +"outvariant@npm:^1.2.1, outvariant@npm:^1.4.0": + version: 1.4.0 + resolution: "outvariant@npm:1.4.0" + checksum: ec32dfc315c464bb6e4906b2f450d259ce0b86caf70b70b249054359d9af21a7fccf53a8b6aa232f8d718449e31c1cfa594e6ebffaafe7bf908b502495256d7b languageName: node linkType: hard @@ -7390,6 +7440,15 @@ __metadata: languageName: node linkType: hard +"p-limit@npm:^4.0.0": + version: 4.0.0 + resolution: "p-limit@npm:4.0.0" + dependencies: + yocto-queue: ^1.0.0 + checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b + languageName: node + linkType: hard + "p-locate@npm:^4.1.0": version: 4.1.0 resolution: "p-locate@npm:4.1.0" @@ -7581,6 +7640,13 @@ __metadata: languageName: node linkType: hard +"pathe@npm:^1.1.0": + version: 1.1.0 + resolution: "pathe@npm:1.1.0" + checksum: 6b9be9968ea08a90c0824934799707a1c6a1ad22ac1f22080f377e3f75856d5e53a331b01d327329bfce538a14590587cfb250e8e7947f64408797c84c252056 + languageName: node + linkType: hard + "pathval@npm:^1.1.1": version: 1.1.1 resolution: "pathval@npm:1.1.1" @@ -7650,6 +7716,17 @@ __metadata: languageName: node linkType: hard +"pkg-types@npm:^1.0.2": + version: 1.0.2 + resolution: "pkg-types@npm:1.0.2" + dependencies: + jsonc-parser: ^3.2.0 + mlly: ^1.1.1 + pathe: ^1.1.0 + checksum: 2d0a70c1721c2ebbe075b912531a4f43136e6658fdcc59dc76c39966201ab5ddf265868d1211943183406d4b70d373c17e3b176487bc2020ea737d030b0fd080 + languageName: node + linkType: hard + "pkginfo@npm:0.4.1": version: 0.4.1 resolution: "pkginfo@npm:0.4.1" @@ -7684,14 +7761,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.4.14": - version: 8.4.14 - resolution: "postcss@npm:8.4.14" +"postcss@npm:^8.4.21": + version: 8.4.21 + resolution: "postcss@npm:8.4.21" dependencies: nanoid: ^3.3.4 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816 + checksum: e39ac60ccd1542d4f9d93d894048aac0d686b3bb38e927d8386005718e6793dbbb46930f0a523fe382f1bbd843c6d980aaea791252bf5e176180e5a4336d9679 languageName: node linkType: hard @@ -7725,7 +7802,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^27.0.2": +"pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" dependencies: @@ -7948,17 +8025,6 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.3": - version: 1.4.3 - resolution: "regexp.prototype.flags@npm:1.4.3" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - functions-have-names: ^1.2.2 - checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6 - languageName: node - linkType: hard - "relay-runtime@npm:12.0.0": version: 12.0.0 resolution: "relay-runtime@npm:12.0.0" @@ -8206,9 +8272,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.75.6": - version: 2.76.0 - resolution: "rollup@npm:2.76.0" +"rollup@npm:^3.18.0": + version: 3.20.2 + resolution: "rollup@npm:3.20.2" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -8216,7 +8282,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 58293e1c63c11d4afcfcf619601d5c5136dd3d0c9d3bd6a0b6141fede32027edc1eb53873bbb9a9c1e95e86c67f6ad66185720031b6eadf325972174d1d8fbcb + checksum: 34b0932839b7c2a5d1742fb21ce95a47e0b49a0849f4abee2dccf25833187aa7babb898ca90d4fc761cffa4102b9ed0ac6ad7f6f6b96c8b8e2d67305abc5da65 languageName: node linkType: hard @@ -8397,9 +8463,9 @@ __metadata: linkType: hard "set-cookie-parser@npm:^2.4.6": - version: 2.5.0 - resolution: "set-cookie-parser@npm:2.5.0" - checksum: df277b2c49f05738997f78a9848b8a9954a77ff57989d32e373622921788cf6b154c30b7fab8d69bc8d1cf7687cb904efa642d5adee7a9ebae883c15cea3c145 + version: 2.6.0 + resolution: "set-cookie-parser@npm:2.6.0" + checksum: bf11ebc594c53d84588f1b4c04f1b8ce14e0498b1c011b3d76b5c6d5aac481bbc3f7c5260ec4ce99bdc1d9aed19f9fc315e73166a36ca74d0f12349a73f6bdc9 languageName: node linkType: hard @@ -8444,6 +8510,13 @@ __metadata: languageName: node linkType: hard +"siginfo@npm:^2.0.0": + version: 2.0.0 + resolution: "siginfo@npm:2.0.0" + checksum: 8aa5a98640ca09fe00d74416eca97551b3e42991614a3d1b824b115fc1401543650914f651ab1311518177e4d297e80b953f4cd4cd7ea1eabe824e8f2091de01 + languageName: node + linkType: hard + "signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.7": version: 3.0.7 resolution: "signal-exit@npm:3.0.7" @@ -8619,13 +8692,27 @@ __metadata: languageName: node linkType: hard -"statuses@npm:2.0.1, statuses@npm:^2.0.0": +"stackback@npm:0.0.2": + version: 0.0.2 + resolution: "stackback@npm:0.0.2" + checksum: 2d4dc4e64e2db796de4a3c856d5943daccdfa3dd092e452a1ce059c81e9a9c29e0b9badba91b43ef0d5ff5c04ee62feb3bcc559a804e16faf447bac2d883aa99 + languageName: node + linkType: hard + +"statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb languageName: node linkType: hard +"std-env@npm:^3.3.2": + version: 3.3.2 + resolution: "std-env@npm:3.3.2" + checksum: c02256bb041ba1870d23f8360bc7e47a9cf1fabcd02c8b7c4246d48f2c6bb47b4f45c70964348844e6d36521df84c4a9d09d468654b51e0eb5c600e3392b4570 + languageName: node + linkType: hard + "stealthy-require@npm:^1.1.1": version: 1.1.1 resolution: "stealthy-require@npm:1.1.1" @@ -8649,12 +8736,19 @@ __metadata: languageName: node linkType: hard -"strict-event-emitter@npm:^0.2.0, strict-event-emitter@npm:^0.2.4": - version: 0.2.4 - resolution: "strict-event-emitter@npm:0.2.4" +"strict-event-emitter@npm:^0.2.4": + version: 0.2.8 + resolution: "strict-event-emitter@npm:0.2.8" dependencies: events: ^3.3.0 - checksum: fe6af7baf4002910ffd04d16f37c994e7b9f56b4c01c8846a3b394efcea6689a9eba3ebcd5283774476c3a7632aae6b47ef89061b0fbf7f2256b8e07a5cab32d + checksum: 6ac06fe72a6ee6ae64d20f1dd42838ea67342f1b5f32b03b3050d73ee6ecee44b4d5c4ed2965a7154b47991e215f373d4e789e2b2be2769cd80e356126c2ca53 + languageName: node + linkType: hard + +"strict-event-emitter@npm:^0.4.3": + version: 0.4.6 + resolution: "strict-event-emitter@npm:0.4.6" + checksum: 4f4f2909613e7811de789991c06bfb770d6d6987e2ec5c66fa7485d0f07cc4e7e32eba0dcf26cee6d86af6c92946d7f4acdfaff57d0c4114df2cfa1bf0e3c091 languageName: node linkType: hard @@ -8692,28 +8786,6 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimend@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimend@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: d44f543833112f57224e79182debadc9f4f3bf9d48a0414d6f0cbd2a86f2b3e8c0ca1f95c3f8e5b32ae83e91554d79d932fc746b411895f03f93d89ed3dfb6bc - languageName: node - linkType: hard - -"string.prototype.trimstart@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimstart@npm:1.0.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: a4857c5399ad709d159a77371eeaa8f9cc284469a0b5e1bfe405de16f1fd4166a8ea6f4180e55032f348d1b679b1599fd4301fbc7a8b72bdb3e795e43f7b1048 - languageName: node - linkType: hard - "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -8732,6 +8804,15 @@ __metadata: languageName: node linkType: hard +"strip-literal@npm:^1.0.1": + version: 1.0.1 + resolution: "strip-literal@npm:1.0.1" + dependencies: + acorn: ^8.8.2 + checksum: ab40496820f02220390d95cdd620a997168efb69d5bd7d180bc4ef83ca562a95447843d8c7c88b8284879a29cf4eedc89d8001d1e098c1a1e23d12a9c755dff4 + languageName: node + linkType: hard + "superstruct@npm:^1.0.3": version: 1.0.3 resolution: "superstruct@npm:1.0.3" @@ -8840,6 +8921,13 @@ __metadata: languageName: node linkType: hard +"time-zone@npm:^1.0.0": + version: 1.0.0 + resolution: "time-zone@npm:1.0.0" + checksum: e46f5a69b8c236dcd8e91e29d40d4e7a3495ed4f59888c3f84ce1d9678e20461421a6ba41233509d47dd94bc18f1a4377764838b21b584663f942b3426dcbce8 + languageName: node + linkType: hard + "timers-ext@npm:^0.1.7": version: 0.1.7 resolution: "timers-ext@npm:0.1.7" @@ -8850,17 +8938,24 @@ __metadata: languageName: node linkType: hard -"tinypool@npm:^0.2.4": - version: 0.2.4 - resolution: "tinypool@npm:0.2.4" - checksum: f050bd36c89529a2a0d3f9c1fdbba3f317114e3ee6eb5d5ba72c51e887d45ef3ef8d8533fb2ca2eba7189d19d2231712b81b3a75e099248532f5563369929c33 +"tinybench@npm:^2.4.0": + version: 2.4.0 + resolution: "tinybench@npm:2.4.0" + checksum: cfbe90f75755488653dde256019cc810f65e90f63fdd962e71e8b209b49598c5fc90c2227d2087eb807944895fafe7f12fe9ecae2b5e89db5adde66415e9b836 languageName: node linkType: hard -"tinyspy@npm:^1.0.2": - version: 1.0.2 - resolution: "tinyspy@npm:1.0.2" - checksum: 32096121aa8d52bb625ad62c9314b3e4daba4ab9ac428217b12b1e1dfe9860e3c94d54a7affa279cc70dc6f10d88c6ba46b51de68896b318a06d02f05e87dcc3 +"tinypool@npm:^0.4.0": + version: 0.4.0 + resolution: "tinypool@npm:0.4.0" + checksum: 8abcac9e784793499f1eeeace8290c026454b9d7338c74029ce6a821643bab8dcab7caeb4051e39006baf681d6a62d57c3319e9c0f6e2317a45ab0fdbd76ee26 + languageName: node + linkType: hard + +"tinyspy@npm:^2.1.0": + version: 2.1.0 + resolution: "tinyspy@npm:2.1.0" + checksum: cb83c1f74a79dd5934018bad94f60a304a29d98a2d909ea45fc367f7b80b21b0a7d8135a2ce588deb2b3ba56c7c607258b2a03e6001d89e4d564f9a95cc6a81f languageName: node linkType: hard @@ -9200,6 +9295,13 @@ __metadata: languageName: node linkType: hard +"ufo@npm:^1.1.1": + version: 1.1.1 + resolution: "ufo@npm:1.1.1" + checksum: 6bd210ed93d8c0dedd76c456b1d1dfb0e3b08c2216ee6080e61f0f545de0bac24b3d3a5530cd6a403810855f8d8fc3922583965296142e04cfc287442635e6c7 + languageName: node + linkType: hard + "uglify-js@npm:^3.1.4": version: 3.16.2 resolution: "uglify-js@npm:3.16.2" @@ -9209,18 +9311,6 @@ __metadata: languageName: node linkType: hard -"unbox-primitive@npm:^1.0.2": - version: 1.0.2 - resolution: "unbox-primitive@npm:1.0.2" - dependencies: - call-bind: ^1.0.2 - has-bigints: ^1.0.2 - has-symbols: ^1.0.3 - which-boxed-primitive: ^1.0.2 - checksum: b7a1cf5862b5e4b5deb091672ffa579aa274f648410009c81cca63fed3b62b610c4f3b773f912ce545bb4e31edc3138975b5bc777fc6e4817dca51affb6380e9 - languageName: node - linkType: hard - "unc-path-regex@npm:^0.1.2": version: 0.1.2 resolution: "unc-path-regex@npm:0.1.2" @@ -9339,16 +9429,15 @@ __metadata: linkType: hard "util@npm:^0.12.3": - version: 0.12.4 - resolution: "util@npm:0.12.4" + version: 0.12.5 + resolution: "util@npm:0.12.5" dependencies: inherits: ^2.0.3 is-arguments: ^1.0.4 is-generator-function: ^1.0.7 is-typed-array: ^1.1.3 - safe-buffer: ^5.1.2 which-typed-array: ^1.1.2 - checksum: 8eac7a6e6b341c0f1b3eb73bbe5dfcae31a7e9699c8fc3266789f3e95f7637946a7700dcf1904dbd3749a58a36760ebf7acf4bb5b717f7468532a8a79f44eff0 + checksum: 705e51f0de5b446f4edec10739752ac25856541e0254ea1e7e45e5b9f9b0cb105bc4bd415736a6210edc68245a7f903bf085ffb08dd7deb8a0e847f60538a38a languageName: node linkType: hard @@ -9488,57 +9577,99 @@ __metadata: languageName: node linkType: hard -"vite@npm:^2.9.12 || ^3.0.0-0": - version: 3.0.0-beta.10 - resolution: "vite@npm:3.0.0-beta.10" +"vite-node@npm:0.30.0": + version: 0.30.0 + resolution: "vite-node@npm:0.30.0" + dependencies: + cac: ^6.7.14 + debug: ^4.3.4 + mlly: ^1.2.0 + pathe: ^1.1.0 + picocolors: ^1.0.0 + vite: ^3.0.0 || ^4.0.0 + bin: + vite-node: vite-node.mjs + checksum: 05238f13abc051d7b7649ec70c5d8f4b0d98ea02da7d52a060760fcc3697bbfe8348caf39add45907287afb39abbb1b918fde8f7ec425863af60dbc6bccf1d23 + languageName: node + linkType: hard + +"vite@npm:^3.0.0 || ^4.0.0": + version: 4.2.1 + resolution: "vite@npm:4.2.1" dependencies: - esbuild: ^0.14.47 + esbuild: ^0.17.5 fsevents: ~2.3.2 - postcss: ^8.4.14 + postcss: ^8.4.21 resolve: ^1.22.1 - rollup: ^2.75.6 + rollup: ^3.18.0 peerDependencies: + "@types/node": ">= 14" less: "*" sass: "*" stylus: "*" + sugarss: "*" terser: ^5.4.0 dependenciesMeta: fsevents: optional: true peerDependenciesMeta: + "@types/node": + optional: true less: optional: true sass: optional: true stylus: optional: true + sugarss: + optional: true terser: optional: true bin: vite: bin/vite.js - checksum: 2b27107dac3e240c7fd5bc5be40e62befce6de6d31220f8cc0d25e1c583e9e00c259c5eaa423c58e0ee87ab7bc46b5e07dd774d081f6439a3e747ee908e375b0 + checksum: 70eb162ffc299017a3c310e3adc95e9661def6b17aafd1f8e5e02e516766060435590dbe3df1e4e95acc3583c728a76e91f07c546221d1e701f1b2b021293f45 languageName: node linkType: hard -"vitest@npm:0.22.1": - version: 0.22.1 - resolution: "vitest@npm:0.22.1" +"vitest@npm:0.30.0": + version: 0.30.0 + resolution: "vitest@npm:0.30.0" dependencies: - "@types/chai": ^4.3.3 + "@types/chai": ^4.3.4 "@types/chai-subset": ^1.3.3 "@types/node": "*" - chai: ^4.3.6 + "@vitest/expect": 0.30.0 + "@vitest/runner": 0.30.0 + "@vitest/snapshot": 0.30.0 + "@vitest/spy": 0.30.0 + "@vitest/utils": 0.30.0 + acorn: ^8.8.2 + acorn-walk: ^8.2.0 + cac: ^6.7.14 + chai: ^4.3.7 + concordance: ^5.0.4 debug: ^4.3.4 - local-pkg: ^0.4.2 - tinypool: ^0.2.4 - tinyspy: ^1.0.2 - vite: ^2.9.12 || ^3.0.0-0 + local-pkg: ^0.4.3 + magic-string: ^0.30.0 + pathe: ^1.1.0 + picocolors: ^1.0.0 + source-map: ^0.6.1 + std-env: ^3.3.2 + strip-literal: ^1.0.1 + tinybench: ^2.4.0 + tinypool: ^0.4.0 + vite: ^3.0.0 || ^4.0.0 + vite-node: 0.30.0 + why-is-node-running: ^2.2.2 peerDependencies: "@edge-runtime/vm": "*" "@vitest/browser": "*" "@vitest/ui": "*" happy-dom: "*" jsdom: "*" + playwright: "*" + safaridriver: "*" + webdriverio: "*" peerDependenciesMeta: "@edge-runtime/vm": optional: true @@ -9550,9 +9681,15 @@ __metadata: optional: true jsdom: optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true bin: vitest: vitest.mjs - checksum: 7abe50ceb51181e77cd62eb3a07c2da17f13078f09be34cc2e98f1f94a77eba33a56c644d48ae16bb474945ffc1cfc8664b1f4976c3de495c5e474057420c4ca + checksum: 0f5add3c717d775243c4f41e87ab48ee9946001ecf7c063f42e3f88925b339c9fdfb00129dd137276288039c5315010d66f9999738980f223d47d0b32612a948 languageName: node linkType: hard @@ -9642,6 +9779,13 @@ __metadata: languageName: node linkType: hard +"well-known-symbols@npm:^2.0.0": + version: 2.0.0 + resolution: "well-known-symbols@npm:2.0.0" + checksum: 4f54bbc3012371cb4d228f436891b8e7536d34ac61a57541890257e96788608e096231e0121ac24d08ef2f908b3eb2dc0adba35023eaeb2a7df655da91415402 + languageName: node + linkType: hard + "whatwg-encoding@npm:^1.0.1, whatwg-encoding@npm:^1.0.5": version: 1.0.5 resolution: "whatwg-encoding@npm:1.0.5" @@ -9712,19 +9856,6 @@ __metadata: languageName: node linkType: hard -"which-boxed-primitive@npm:^1.0.2": - version: 1.0.2 - resolution: "which-boxed-primitive@npm:1.0.2" - dependencies: - is-bigint: ^1.0.1 - is-boolean-object: ^1.1.0 - is-number-object: ^1.0.4 - is-string: ^1.0.5 - is-symbol: ^1.0.3 - checksum: 53ce774c7379071729533922adcca47220228405e1895f26673bbd71bdf7fb09bee38c1d6399395927c6289476b5ae0629863427fd151491b71c4b6cb04f3a5e - languageName: node - linkType: hard - "which-module@npm:^2.0.0": version: 2.0.0 resolution: "which-module@npm:2.0.0" @@ -9733,16 +9864,16 @@ __metadata: linkType: hard "which-typed-array@npm:^1.1.2": - version: 1.1.8 - resolution: "which-typed-array@npm:1.1.8" + version: 1.1.9 + resolution: "which-typed-array@npm:1.1.9" dependencies: available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 - es-abstract: ^1.20.0 for-each: ^0.3.3 + gopd: ^1.0.1 has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.9 - checksum: bedf4d30a738e848404fe67fe0ace33433a7298cf3f5a4d4b2c624ba99c4d25f06a7fd6f3566c3d16af5f8a54f0c6293cbfded5b1208ce11812753990223b45a + is-typed-array: ^1.1.10 + checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef languageName: node linkType: hard @@ -9757,6 +9888,18 @@ __metadata: languageName: node linkType: hard +"why-is-node-running@npm:^2.2.2": + version: 2.2.2 + resolution: "why-is-node-running@npm:2.2.2" + dependencies: + siginfo: ^2.0.0 + stackback: 0.0.2 + bin: + why-is-node-running: cli.js + checksum: 50820428f6a82dfc3cbce661570bcae9b658723217359b6037b67e495255409b4c8bc7931745f5c175df71210450464517cab32b2f7458ac9c40b4925065200a + languageName: node + linkType: hard + "wide-align@npm:^1.1.5": version: 1.1.5 resolution: "wide-align@npm:1.1.5" @@ -9990,7 +10133,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.0, yargs@npm:^17.3.1": +"yargs@npm:^17.0.0": version: 17.5.1 resolution: "yargs@npm:17.5.1" dependencies: @@ -10005,7 +10148,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.7.1": +"yargs@npm:^17.3.1, yargs@npm:^17.7.1": version: 17.7.1 resolution: "yargs@npm:17.7.1" dependencies: @@ -10033,3 +10176,10 @@ __metadata: checksum: f77b3d8d00310def622123df93d4ee654fc6a0096182af8bd60679ddcdfb3474c56c6c7190817c84a2785648cdee9d721c0154eb45698c62176c322fb46fc700 languageName: node linkType: hard + +"yocto-queue@npm:^1.0.0": + version: 1.0.0 + resolution: "yocto-queue@npm:1.0.0" + checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801 + languageName: node + linkType: hard From 3ab826e1d27938cc2b3d47186c0c8b8e373964ba Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 22:11:31 +0100 Subject: [PATCH 5/9] Use custom resolver condition "dev" in tsc and vitest Use "conditional exports" in `exports` field of package.json, with an export named `dev` that is opt-in by `tsc` (via `tsconfig.base.json`) and vitest (via `vitest.config.ts`, which passes the flag to `vite`, which passes it to node using `--conditions` flag) This is a new feature in TS5.0, and was fixed in vitest v0.23.0 (previously workers were not respecting the flag), so now we can use it, which is good, because that leaves the `node` conditional export to be filled by files from `dist` for the published config. --- packages/base-client/package.json | 2 +- packages/base-db/package.json | 2 +- packages/client-http/package.json | 2 +- packages/client-postgres/package.json | 2 +- packages/core/package.json | 2 +- packages/db-seafowl/package.json | 2 +- packages/db-splitgraph/package.json | 2 +- packages/react/package.json | 2 +- tsconfig.base.json | 2 +- vitest.config.ts | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/base-client/package.json b/packages/base-client/package.json index d85a268..4b5bfc1 100644 --- a/packages/base-client/package.json +++ b/packages/base-client/package.json @@ -23,7 +23,7 @@ ], "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "scripts": { diff --git a/packages/base-db/package.json b/packages/base-db/package.json index a7f606b..31cba2f 100644 --- a/packages/base-db/package.json +++ b/packages/base-db/package.json @@ -22,7 +22,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "files": [ diff --git a/packages/client-http/package.json b/packages/client-http/package.json index 33f9693..d0e68f9 100644 --- a/packages/client-http/package.json +++ b/packages/client-http/package.json @@ -26,7 +26,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "files": [ diff --git a/packages/client-postgres/package.json b/packages/client-postgres/package.json index 5f51dc1..aa5c025 100644 --- a/packages/client-postgres/package.json +++ b/packages/client-postgres/package.json @@ -21,7 +21,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index c279d58..e14afb9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -23,7 +23,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "files": [ diff --git a/packages/db-seafowl/package.json b/packages/db-seafowl/package.json index 7210261..288ad42 100644 --- a/packages/db-seafowl/package.json +++ b/packages/db-seafowl/package.json @@ -25,7 +25,7 @@ ], "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "scripts": { diff --git a/packages/db-splitgraph/package.json b/packages/db-splitgraph/package.json index bd3408e..b2ba022 100644 --- a/packages/db-splitgraph/package.json +++ b/packages/db-splitgraph/package.json @@ -28,7 +28,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "publishConfig": { diff --git a/packages/react/package.json b/packages/react/package.json index 459276c..49982ff 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -23,7 +23,7 @@ }, "exports": { ".": { - "node": "./index.ts" + "dev": "./index.ts" } }, "publishConfig": { diff --git a/tsconfig.base.json b/tsconfig.base.json index beeb181..36dae4c 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -15,7 +15,7 @@ "esModuleInterop": true, "module": "esnext", "moduleResolution": "nodenext", - // "customConditions": ["dev"], + "customConditions": ["dev"], "resolveJsonModule": true, "jsx": "react-jsx", "noUnusedLocals": true, diff --git a/vitest.config.ts b/vitest.config.ts index 36ab950..82570de 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -12,7 +12,7 @@ export default defineConfig({ }), ], resolve: { - // conditions: ["dev"], + conditions: ["dev"], // alias: [ // { // find: "@madatdata/root", From 7d68d1d6050522fa3d0131534f556b7b7f239239 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 22:25:10 +0100 Subject: [PATCH 6/9] Add conditional exports for `require`, `import`, and `default` None of these will be used in dev (since we use `dev` for that), but they should be consumed by downstream packages that install madatdata packages from the registry, hopefully pointing them to the right file. --- packages/base-client/package.json | 14 +++++++++++++- packages/base-db/package.json | 14 +++++++++++++- packages/client-http/package.json | 14 +++++++++++++- packages/client-postgres/package.json | 14 +++++++++++++- packages/core/package.json | 14 +++++++++++++- packages/db-seafowl/package.json | 14 +++++++++++++- packages/db-splitgraph/package.json | 14 +++++++++++++- packages/react/package.json | 14 +++++++++++++- 8 files changed, 104 insertions(+), 8 deletions(-) diff --git a/packages/base-client/package.json b/packages/base-client/package.json index 4b5bfc1..a1ae439 100644 --- a/packages/base-client/package.json +++ b/packages/base-client/package.json @@ -23,7 +23,19 @@ ], "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "scripts": { diff --git a/packages/base-db/package.json b/packages/base-db/package.json index 31cba2f..9183c72 100644 --- a/packages/base-db/package.json +++ b/packages/base-db/package.json @@ -22,7 +22,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "files": [ diff --git a/packages/client-http/package.json b/packages/client-http/package.json index d0e68f9..1e534ed 100644 --- a/packages/client-http/package.json +++ b/packages/client-http/package.json @@ -26,7 +26,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "files": [ diff --git a/packages/client-postgres/package.json b/packages/client-postgres/package.json index aa5c025..1a16dd2 100644 --- a/packages/client-postgres/package.json +++ b/packages/client-postgres/package.json @@ -21,7 +21,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "files": [ diff --git a/packages/core/package.json b/packages/core/package.json index e14afb9..fef3bd9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -23,7 +23,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "files": [ diff --git a/packages/db-seafowl/package.json b/packages/db-seafowl/package.json index 288ad42..717e5a1 100644 --- a/packages/db-seafowl/package.json +++ b/packages/db-seafowl/package.json @@ -25,7 +25,19 @@ ], "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "scripts": { diff --git a/packages/db-splitgraph/package.json b/packages/db-splitgraph/package.json index b2ba022..4e9d585 100644 --- a/packages/db-splitgraph/package.json +++ b/packages/db-splitgraph/package.json @@ -28,7 +28,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "publishConfig": { diff --git a/packages/react/package.json b/packages/react/package.json index 49982ff..72fb846 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -23,7 +23,19 @@ }, "exports": { ".": { - "dev": "./index.ts" + "dev": "./index.ts", + "require": { + "types": "./build/es2020-commonjs/index.d.ts", + "default": "./build/es2020-commonjs/index.cjs" + }, + "import": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + }, + "default": { + "types": "./build/es2020/index.d.ts", + "default": "./build/es2020/index.mjs" + } } }, "publishConfig": { From 3edf81664d2ffcac7622d6736e1d06c110e90497 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 22:28:08 +0100 Subject: [PATCH 7/9] Update `build-examples-from-local.sh` script to install/clean all examples Loop over each example and run `yarn install` (which I think is basically a no-op, but whatever) and also delete any `.next` directory if it's found in there. If any other future examples have similar cache directories that should be cleaned up, then those directories should be added to this script too, but hopefully the hack of a script will be gone by then. Also update `examples/README.md` to reference the correct command --- build-examples-from-local.sh | 53 ++++++++++++++++++++++-------------- examples/README.md | 15 ++++------ 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/build-examples-from-local.sh b/build-examples-from-local.sh index 44de04f..ddfda4a 100755 --- a/build-examples-from-local.sh +++ b/build-examples-from-local.sh @@ -15,17 +15,8 @@ REPO_ROOT="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)" -WORKING_EXAMPLE="${1-notadirectory}" -shift - set -e -if [[ ! -d "$WORKING_EXAMPLE" ]] ; then - echo "error: first argument shuld be directory of example you're focusing on" - echo "e.g.: $0 examples/react-nextjs-seafowl" - exit 2 -fi - if [[ "$REPO_ROOT" != "$(pwd)" ]] ; then echo "error: script must be run in root directory" echo "expected root directory: $REPO_ROOT" @@ -71,15 +62,35 @@ VERDACCIO=http://localhost:4873 yarn install echo "[+] Return to repo root" cd "$REPO_ROOT" -# Install focused example -echo "[+] FOCUS: $WORKING_EXAMPLE" -cd "$WORKING_EXAMPLE" -if [[ -d ".next" ]] ; then - echo "[+] found .next, delete it" - rm -rf .next -fi -echo "[+] install example" -VERDACCIO=http://localhost:4873 yarn install +# Clean install examples +cd "$REPO_ROOT/examples" +# Get workspace names that are directories (except for the current one), +# and run yarn install in each of them. I'm not sure this is even necessary, +# but it doesn't hurt. And regardless, we do want to perform cleanup steps in +# each directory (e.g. deleting .next) anyway. (REMINDER: This script is a hack) +while read -r workspace_dir ; do + if ! test -d "$workspace_dir" ; then + echo "[+] WARNING: detected workspace that's not a directory: $workspace_dir" + continue + fi + + echo "[+] $workspace_dir : start install" + set -x + cd "$workspace_dir" + set +x + + if [[ -d ".next" ]] ; then + echo "[+] found .next, delete it" + rm -rf .next + fi + echo "[+] install example from Verdaccio" + VERDACCIO=http://localhost:4873 yarn install + + echo "[+] $workspace_dir : done install" + echo "[+] cd back to examples" + cd "$REPO_ROOT/examples" +done < <(cd "$REPO_ROOT/examples" ; yarn workspaces list | awk '{print $3}' | grep -vE '^Done$|^\.$') + echo "[+] return to repo root" cd "$REPO_ROOT" @@ -103,8 +114,8 @@ set -x ps aux | grep verdaccio set +x -echo "[+] READY TO GO: $WORKING_EXAMPLE" -echo "[+] You can now cd into the example:" -echo "cd $WORKING_EXAMPLE" +echo "[+] READY TO GO: all examples installed" +echo "[+] You can now cd into a example, e.g.:" +echo "cd examples/react-nextjs-basic-hooks" echo "[+] NOTE: When you are done, if you want to go back to regular development" echo " outside of the examples repo, you will probably want to run 'yarn clean'" diff --git a/examples/README.md b/examples/README.md index 5386ab4..ddef037 100644 --- a/examples/README.md +++ b/examples/README.md @@ -40,10 +40,7 @@ cleanup (keeping in mind it will kill any process on machine matching `verdaccio` in its command line args). ```bash -# This example is for examples/react-nextjs-basic-hooks -# Modify the snippet accordingly depending on which example you're focused on - -./build-examples.sh examples/react-nextjs-basic-hooks +./build-examples-from-local.sh ``` **WARNING**: After running this, if you are doing regular development (i.e. not @@ -51,12 +48,12 @@ including examples), you will probably need to run `yarn clean` in the repo root to make sure everything rebuilds properly (this especially applies to `@madatdata/react`) -Note: this specific example also removes the `.next` directory in -`examples/react-nextjs-basic-hooks`. Other examples might have similar -directories that need to be deleted - by the nature of having realistic -examples, it can vary wildly and depends on the software being used. +Note: this specific example also removes the `.next` directory (if it exists) in +each workspace. Some examples might have similar directories that need to be +deleted - by the nature of having realistic examples, it can vary wildly and +depends on the software being used, and is currently hardcoded to only`.next`. -See `build-examples.sh` for exactly what is happening. +See `build-examples-from-local.sh` for exactly what is happening. Note: Each test cycle will change `yarn.lock` (which is why we do `yarn install` and not `yarn install --immutable` here), as the hash of each local package From 6d71c838eebf89c5515d20553e7718b63b857fe2 Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 23:13:46 +0100 Subject: [PATCH 8/9] Go back to `isolatedModules: true` (didn't end up being necessary to opt out) We're still opting out of `verbatimModuleSyntax`, but we can continue using our `isolatedModules` config from prior to TS5.0. --- tsc-multi.json | 6 +----- tsconfig.base-noncomposite-esno.json | 3 +-- tsconfig.base.json | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/tsc-multi.json b/tsc-multi.json index c8946bc..cc40393 100644 --- a/tsc-multi.json +++ b/tsc-multi.json @@ -5,11 +5,7 @@ "tsBuildInfoFile": "build/es2020-commonjs.tsbuildinfo", "module": "CommonJS", "target": "ES2020", - "extname": ".cjs", - "verbatimModuleSyntax": false, - "isolatedModules": false, - "importsNotUsedAsValues": "error", - "ignoreDeprecations": "5.0" + "extname": ".cjs" }, { "outDir": "build/es2020", diff --git a/tsconfig.base-noncomposite-esno.json b/tsconfig.base-noncomposite-esno.json index f02bf56..50a7eed 100644 --- a/tsconfig.base-noncomposite-esno.json +++ b/tsconfig.base-noncomposite-esno.json @@ -3,7 +3,6 @@ "compilerOptions": { "noEmit": true, "emitDeclarationOnly": false, - "module": "commonjs", - "verbatimModuleSyntax": false + "module": "commonjs" } } diff --git a/tsconfig.base.json b/tsconfig.base.json index 36dae4c..c464802 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -22,9 +22,8 @@ "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, "noPropertyAccessFromIndexSignature": true, - // "verbatimModuleSyntax": true, "verbatimModuleSyntax": false, - "isolatedModules": false, + "isolatedModules": true, "importsNotUsedAsValues": "error", "ignoreDeprecations": "5.0", "incremental": true, From 908a3ecbb8c21a0fdead20956e0317f7e3093b3e Mon Sep 17 00:00:00 2001 From: Miles Richardson Date: Mon, 10 Apr 2023 23:16:43 +0100 Subject: [PATCH 9/9] Cleanup some unused variables and outdated comments --- vitest-setup.ts | 9 +++------ vitest.config.ts | 10 ---------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/vitest-setup.ts b/vitest-setup.ts index 9ca495a..4e4f199 100644 --- a/vitest-setup.ts +++ b/vitest-setup.ts @@ -5,11 +5,7 @@ const [nodeMajorVersion, _nodeMinorVersion, _nodePatchVersion] = process.version .split(".") .map((x) => parseInt(x[0] === "v" ? x.slice(1) : x)); -// NOTE: `fetch` needs to be polyfilled in Node. -// The dependency is in the root of the mono-repo, and any package that relies -// on it is responsible for polyfilling it in its own bundle -// import "cross-fetch/polyfill"; -// window.fetch = globalThis.fetch; +// NOTE: `fetch` would need to be polyfilled in Node < v18, but we're only running tests in v18+ // Optionally disable TLS verification and suppress its resultant warning spam import "./suppress-insecure-tls-warning"; @@ -37,7 +33,8 @@ if (process.env.INSECURE_TLS === "1") { // Developer is responsible for operation of proxy, but we recommend `mitmproxy` // NOTE: It's also posible to set `GLOBAL_AGENT_*` env variables directly, // see: https://github.com/gajus/global-agent#environment-variables -// TODO: In node 18, setting GLOBAL_AGENT directly won't affect agent proxy URI +// NOTE: In node 18, setting GLOBAL_AGENT directly won't affect agent proxy URI, +// which is why we et it with setGlobalDispatcher (from undici) if (process.env.MITM) { if (!process.env.GLOBAL_AGENT_HTTP_PROXY) { process.env["GLOBAL_AGENT_HTTP_PROXY"] = process.env.MITM; diff --git a/vitest.config.ts b/vitest.config.ts index 82570de..14c56a6 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,10 +1,6 @@ import { defineConfig, configDefaults } from "vitest/config"; -import { fileURLToPath } from "url"; -import { dirname } from "path"; import react from "@vitejs/plugin-react"; -const currentDirectoryPath = dirname(fileURLToPath(import.meta.url)); - export default defineConfig({ plugins: [ react({ @@ -13,12 +9,6 @@ export default defineConfig({ ], resolve: { conditions: ["dev"], - // alias: [ - // { - // find: "@madatdata/root", - // replacement: currentDirectoryPath, - // }, - // ], }, test: { environment: "jsdom",