From cb252440079f34ddfdfff1b891f6f73b98db9d59 Mon Sep 17 00:00:00 2001 From: Kasper Fabricius Kristensen <45367945+kasperkristensen@users.noreply.github.com> Date: Mon, 16 Jan 2023 11:44:24 -0500 Subject: [PATCH] hotfix(medusa-js, medusa-react): Fix issue with JS client bundle (#3038) --- .changeset/witty-parents-wink.md | 6 + packages/medusa-js/jest.config.js | 13 +- packages/medusa-js/package.json | 36 +- packages/medusa-js/rollup.config.js | 34 -- packages/medusa-js/src/index.ts | 7 +- .../medusa-js/src/resources/admin/uploads.ts | 40 +- packages/medusa-js/src/typings.ts | 2 + packages/medusa-js/tsconfig.json | 3 +- packages/medusa-js/tsup.config.ts | 16 + packages/medusa-react/src/contexts/medusa.tsx | 2 +- .../src/hooks/admin/uploads/mutations.ts | 11 +- yarn.lock | 572 +++++++++++++----- 12 files changed, 517 insertions(+), 225 deletions(-) create mode 100644 .changeset/witty-parents-wink.md delete mode 100644 packages/medusa-js/rollup.config.js create mode 100644 packages/medusa-js/tsup.config.ts diff --git a/.changeset/witty-parents-wink.md b/.changeset/witty-parents-wink.md new file mode 100644 index 0000000000..df6bbe6974 --- /dev/null +++ b/.changeset/witty-parents-wink.md @@ -0,0 +1,6 @@ +--- +"@medusajs/medusa-js": patch +"medusa-react": patch +--- + +hotfix: Fixes bundling error making JS client unable to run in Node enviornments. Also fixes wrong payload type of admin file uploads. diff --git a/packages/medusa-js/jest.config.js b/packages/medusa-js/jest.config.js index 0e82112490..50fff6d7e5 100644 --- a/packages/medusa-js/jest.config.js +++ b/packages/medusa-js/jest.config.js @@ -1,7 +1,12 @@ module.exports = { - transform: { - "^.+\\.(t|j)sx?$": require.resolve("ts-jest"), + globals: { + "ts-jest": { + diagnostics: false, + isolatedModules: true, + }, }, - testRegex: "(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$", - moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"], + transform: { + ".(ts|tsx)$": require.resolve("ts-jest/dist/"), + }, + testEnvironment: "jsdom", } diff --git a/packages/medusa-js/package.json b/packages/medusa-js/package.json index 45c6eda36b..a3c70c1ea7 100644 --- a/packages/medusa-js/package.json +++ b/packages/medusa-js/package.json @@ -3,23 +3,30 @@ "version": "1.3.6", "description": "Client for Medusa Commerce Rest API", "main": "dist/index.js", - "module": "dist/index.esm.js", - "files": [ - "dist/**/*" - ], + "module": "dist/index.mjs", "types": "dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js" + }, + "./package.json": "./package.json" + }, "scripts": { - "build": "rollup -c --bundleConfigAsCjs", + "build": "tsup src/index.ts", "prepare": "cross-env NODE_ENV=production yarn run build", "test": "jest --passWithNoTests" }, "author": "Oliver Juhl", "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, "dependencies": { - "axios": "0.26.1", - "form-data": "^4.0.0", + "axios": "^0.24.0", "qs": "^6.10.3", - "retry-axios": "^2.6.0" + "retry-axios": "^2.6.0", + "uuid": "^9.0.0" }, "peerDependencies": { "@medusajs/medusa": "^1.7.3" @@ -34,15 +41,12 @@ }, "devDependencies": { "@medusajs/medusa": "^1.7.3", - "@rollup/plugin-commonjs": "^24.0.0", - "@rollup/plugin-node-resolve": "^15.0.1", - "@types/jest": "^26.0.19", + "@types/uuid": "^9.0.0", "cross-env": "^7.0.3", - "jest": "^26.6.3", - "rollup": "^3.9.1", - "rollup-plugin-terser": "^7.0.2", - "rollup-plugin-typescript2": "^0.34.1", - "typescript": "^4.1.3" + "jest": "^27.4.7", + "ts-jest": "^27.1.5", + "tsup": "^6.5.0", + "typescript": "^4.9.4" }, "gitHead": "cd1f5afa5aa8c0b15ea957008ee19f1d695cbd2e", "homepage": "https://docs.medusajs.com/js-client/overview" diff --git a/packages/medusa-js/rollup.config.js b/packages/medusa-js/rollup.config.js deleted file mode 100644 index 6eac2240ab..0000000000 --- a/packages/medusa-js/rollup.config.js +++ /dev/null @@ -1,34 +0,0 @@ -import commonjs from "@rollup/plugin-commonjs" -import resolve from "@rollup/plugin-node-resolve" -import { defineConfig } from "rollup" -import { terser } from "rollup-plugin-terser" -import typescript from "rollup-plugin-typescript2" - -const packageJson = require("./package.json") - -export default defineConfig({ - input: "src/index.ts", - external: ["@medusajs/medusa"], - output: [ - { - file: packageJson.main, - format: "cjs", - sourcemap: true, - }, - { - file: packageJson.module, - format: "esm", - sourcemap: true, - }, - ], - plugins: [ - terser(), - resolve({ - browser: true, - }), - commonjs(), - typescript({ - useTsconfigDeclarationDir: true, - }), - ], -}) diff --git a/packages/medusa-js/src/index.ts b/packages/medusa-js/src/index.ts index f813c06068..7ab4f18f04 100644 --- a/packages/medusa-js/src/index.ts +++ b/packages/medusa-js/src/index.ts @@ -1,4 +1,5 @@ import MedusaError from "./error" +import KeyManager from "./key-manager" import Client, { Config } from "./request" import Admin from "./resources/admin" import AuthResource from "./resources/auth" @@ -6,18 +7,17 @@ import CartsResource from "./resources/carts" import CollectionsResource from "./resources/collections" import CustomersResource from "./resources/customers" import GiftCardsResource from "./resources/gift-cards" -import OrdersResource from "./resources/orders" import OrderEditsResource from "./resources/order-edits" +import OrdersResource from "./resources/orders" import PaymentCollectionsResource from "./resources/payment-collections" import PaymentMethodsResource from "./resources/payment-methods" -import ProductsResource from "./resources/products" import ProductTypesResource from "./resources/product-types" +import ProductsResource from "./resources/products" import RegionsResource from "./resources/regions" import ReturnReasonsResource from "./resources/return-reasons" import ReturnsResource from "./resources/returns" import ShippingOptionsResource from "./resources/shipping-options" import SwapsResource from "./resources/swaps" -import KeyManager from "./key-manager" class Medusa { private client: Client @@ -78,5 +78,4 @@ class Medusa { export default Medusa export { default as KeyManager } from "./key-manager" - export * from "./typings" diff --git a/packages/medusa-js/src/resources/admin/uploads.ts b/packages/medusa-js/src/resources/admin/uploads.ts index 612db158b6..8dab2e3a82 100644 --- a/packages/medusa-js/src/resources/admin/uploads.ts +++ b/packages/medusa-js/src/resources/admin/uploads.ts @@ -1,13 +1,11 @@ import { AdminDeleteUploadsReq, - IAdminPostUploadsFileReq, AdminDeleteUploadsRes, AdminPostUploadsDownloadUrlReq, AdminUploadsDownloadUrlRes, AdminUploadsRes, } from "@medusajs/medusa" -import FormData from "form-data" -import { ResponsePromise } from "../../typings" +import { AdminCreateUploadPayload, ResponsePromise } from "../../typings" import BaseResource from "../base" class AdminUploadsResource extends BaseResource { @@ -15,20 +13,30 @@ class AdminUploadsResource extends BaseResource { "Content-Type": "multipart/form-data", } - create(file: IAdminPostUploadsFileReq): ResponsePromise { + /** + * @description Uploads at least one file to the specific fileservice that is installed in Medusa. + * @param file File or array of files to upload. + * @returns Uploaded file or files. + */ + create(file: AdminCreateUploadPayload): ResponsePromise { const path = `/admin/uploads` - const payload = new FormData() - payload.append("files", file) + const payload = this._createPayload(file) return this.client.request("POST", path, payload, {}, this.headers) } - - createProtected(file: IAdminPostUploadsFileReq): ResponsePromise { + + /** + * @description Uploads at least one file with ACL or a non-public bucket to the specific fileservice that is installed in Medusa. + * @param file File or array of files to upload. + * @returns Uploaded file or files. + */ + createProtected( + file: AdminCreateUploadPayload + ): ResponsePromise { const path = `/admin/uploads/protected` - const payload = new FormData() - payload.append("files", file) + const payload = this._createPayload(file) return this.client.request("POST", path, payload, {}, this.headers) } @@ -50,6 +58,18 @@ class AdminUploadsResource extends BaseResource { return this.client.request("POST", path, payload, {}, customHeaders) } + + private _createPayload(file: AdminCreateUploadPayload) { + const payload = new FormData() + + if (Array.isArray(file)) { + file.forEach((f) => payload.append("files", f)) + } else { + payload.append("files", file) + } + + return payload + } } export default AdminUploadsResource diff --git a/packages/medusa-js/src/typings.ts b/packages/medusa-js/src/typings.ts index 63f46f3a47..4e75906ff4 100644 --- a/packages/medusa-js/src/typings.ts +++ b/packages/medusa-js/src/typings.ts @@ -47,3 +47,5 @@ export type InviteUserRolesEnum = `${AdminPostInvitesReq["role"]}` export type AdminPostInvitesPayload = Omit & { role: InviteUserRolesEnum } + +export type AdminCreateUploadPayload = File | File[] diff --git a/packages/medusa-js/tsconfig.json b/packages/medusa-js/tsconfig.json index 4a45df0293..128bc71202 100644 --- a/packages/medusa-js/tsconfig.json +++ b/packages/medusa-js/tsconfig.json @@ -2,8 +2,7 @@ "compilerOptions": { "rootDir": "src", "module": "esnext", - "target": "es5", - "lib": ["es6", "dom", "es2016", "es2017"], + "target": "ES2015", "outDir": "./dist", "declarationDir": "./dist", "esModuleInterop": true, diff --git a/packages/medusa-js/tsup.config.ts b/packages/medusa-js/tsup.config.ts new file mode 100644 index 0000000000..df703de84a --- /dev/null +++ b/packages/medusa-js/tsup.config.ts @@ -0,0 +1,16 @@ +import type { Options } from "tsup" + +const config: Options = { + entry: ["src/**/*.ts"], + dts: true, + clean: true, + minify: true, + bundle: true, + sourcemap: true, + format: ["cjs", "esm"], + target: "es2020", + skipNodeModulesBundle: true, + tsconfig: "./tsconfig.json", +} + +export default config diff --git a/packages/medusa-react/src/contexts/medusa.tsx b/packages/medusa-react/src/contexts/medusa.tsx index 193839c42a..8caa1cd5c7 100644 --- a/packages/medusa-react/src/contexts/medusa.tsx +++ b/packages/medusa-react/src/contexts/medusa.tsx @@ -1,6 +1,6 @@ +import Medusa from "@medusajs/medusa-js" import React from "react" import { QueryClientProvider, QueryClientProviderProps } from "react-query" -import Medusa from "@medusajs/medusa-js" interface MedusaContextState { client: Medusa diff --git a/packages/medusa-react/src/hooks/admin/uploads/mutations.ts b/packages/medusa-react/src/hooks/admin/uploads/mutations.ts index ffd79eaa56..49a6adf8c3 100644 --- a/packages/medusa-react/src/hooks/admin/uploads/mutations.ts +++ b/packages/medusa-react/src/hooks/admin/uploads/mutations.ts @@ -1,12 +1,11 @@ import { AdminDeleteUploadsReq, - IAdminPostUploadsFileReq, AdminDeleteUploadsRes, AdminPostUploadsDownloadUrlReq, AdminUploadsDownloadUrlRes, AdminUploadsRes, } from "@medusajs/medusa" -import { Response } from "@medusajs/medusa-js" +import { AdminCreateUploadPayload, Response } from "@medusajs/medusa-js" import { useMutation, UseMutationOptions, useQueryClient } from "react-query" import { useMedusa } from "../../../contexts" import { buildOptions } from "../../utils/buildOptions" @@ -15,13 +14,13 @@ export const useAdminUploadFile = ( options?: UseMutationOptions< Response, Error, - IAdminPostUploadsFileReq + AdminCreateUploadPayload > ) => { const { client } = useMedusa() const queryClient = useQueryClient() - return useMutation((payload: IAdminPostUploadsFileReq) => { + return useMutation((payload: AdminCreateUploadPayload) => { return client.admin.uploads.create(payload) }, buildOptions(queryClient, undefined, options)) } @@ -30,13 +29,13 @@ export const useAdminUploadProtectedFile = ( options?: UseMutationOptions< Response, Error, - IAdminPostUploadsFileReq + AdminCreateUploadPayload > ) => { const { client } = useMedusa() const queryClient = useQueryClient() - return useMutation((payload: IAdminPostUploadsFileReq) => { + return useMutation((payload: AdminCreateUploadPayload) => { return client.admin.uploads.createProtected(payload) }, buildOptions(queryClient, undefined, options)) } diff --git a/yarn.lock b/yarn.lock index 6fcf7c35f9..bc1eca698f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2441,6 +2441,20 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.15.18": + version: 0.15.18 + resolution: "@esbuild/android-arm@npm:0.15.18" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + +"@esbuild/linux-loong64@npm:0.15.18": + version: 0.15.18 + resolution: "@esbuild/linux-loong64@npm:0.15.18" + conditions: os=linux & cpu=loong64 + languageName: node + linkType: hard + "@eslint/eslintrc@npm:^0.4.3": version: 0.4.3 resolution: "@eslint/eslintrc@npm:0.4.3" @@ -4141,7 +4155,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13": +"@jridgewell/sourcemap-codec@npm:^1.4.10": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" checksum: 3fbaff1387c1338b097eeb6ff92890d7838f7de0dde259e4983763b44540bfd5ca6a1f7644dc8ad003a57f7e80670d5b96a8402f1386ba9aee074743ae9bad51 @@ -4398,19 +4412,16 @@ __metadata: resolution: "@medusajs/medusa-js@workspace:packages/medusa-js" dependencies: "@medusajs/medusa": ^1.7.3 - "@rollup/plugin-commonjs": ^24.0.0 - "@rollup/plugin-node-resolve": ^15.0.1 - "@types/jest": ^26.0.19 - axios: 0.26.1 + "@types/uuid": ^9.0.0 + axios: ^0.24.0 cross-env: ^7.0.3 - form-data: ^4.0.0 - jest: ^26.6.3 + jest: ^27.4.7 qs: ^6.10.3 retry-axios: ^2.6.0 - rollup: ^3.9.1 - rollup-plugin-terser: ^7.0.2 - rollup-plugin-typescript2: ^0.34.1 - typescript: ^4.1.3 + ts-jest: ^27.1.5 + tsup: ^6.5.0 + typescript: ^4.9.4 + uuid: ^9.0.0 peerDependencies: "@medusajs/medusa": ^1.7.3 languageName: unknown @@ -5581,25 +5592,6 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-commonjs@npm:^24.0.0": - version: 24.0.0 - resolution: "@rollup/plugin-commonjs@npm:24.0.0" - dependencies: - "@rollup/pluginutils": ^5.0.1 - commondir: ^1.0.1 - estree-walker: ^2.0.2 - glob: ^8.0.3 - is-reference: 1.2.1 - magic-string: ^0.27.0 - peerDependencies: - rollup: ^2.68.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: ae2ed1d49722fad55f7ef7629baad5fb31bc389e6042912fb5cb9623c2c9c0def27c66bbd1aea72f1fcd65caa1410a9de80a0377f85d8cd8068f97c0adeaf3da - languageName: node - linkType: hard - "@rollup/plugin-json@npm:^4.1.0": version: 4.1.0 resolution: "@rollup/plugin-json@npm:4.1.0" @@ -5643,25 +5635,6 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-node-resolve@npm:^15.0.1": - version: 15.0.1 - resolution: "@rollup/plugin-node-resolve@npm:15.0.1" - dependencies: - "@rollup/pluginutils": ^5.0.1 - "@types/resolve": 1.20.2 - deepmerge: ^4.2.2 - is-builtin-module: ^3.2.0 - is-module: ^1.0.0 - resolve: ^1.22.1 - peerDependencies: - rollup: ^2.78.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: 82af7876281e9459ea86cedf571816b61883055f98d3ecd9306e869674b344b5e38d57d589f409d255fe22021dd81f4a65702e9e8c859eded45bebccb8644e1b - languageName: node - linkType: hard - "@rollup/plugin-replace@npm:^3.1.0": version: 3.1.0 resolution: "@rollup/plugin-replace@npm:3.1.0" @@ -5697,22 +5670,6 @@ __metadata: languageName: node linkType: hard -"@rollup/pluginutils@npm:^5.0.1": - version: 5.0.2 - resolution: "@rollup/pluginutils@npm:5.0.2" - dependencies: - "@types/estree": ^1.0.0 - estree-walker: ^2.0.2 - picomatch: ^2.3.1 - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - checksum: b06f73c15bb59418aa6fbfead5675bab2d6922e15663525ffc2eb8429530bc5add516600adb251cfbf9b60f3d12fb821cde155cb5103415154a476bd0f163432 - languageName: node - linkType: hard - "@segment/loosely-validate-event@npm:^2.0.0": version: 2.0.0 resolution: "@segment/loosely-validate-event@npm:2.0.0" @@ -7754,13 +7711,6 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:^1.0.0": - version: 1.0.0 - resolution: "@types/estree@npm:1.0.0" - checksum: 4e73ff606bf7c7ccdaa66092de650c410a4ad2ecc388fdbed8242cac9dbcad72407e1ceff041b7da691babb02ff74ab885d6231fb09368fdd1eabbf1b5253d49 - languageName: node - linkType: hard - "@types/express-serve-static-core@npm:^4.17.18": version: 4.17.29 resolution: "@types/express-serve-static-core@npm:4.17.29" @@ -7931,16 +7881,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^26.0.19": - version: 26.0.24 - resolution: "@types/jest@npm:26.0.24" - dependencies: - jest-diff: ^26.0.0 - pretty-format: ^26.0.0 - checksum: 1085ac96af43566518daf3aca60cb7881bfe2ffe1f5343738933e386ebf909095fde15273c3e99c685854dfc833b05b156fb5daf68707c0daa1c0c0db13a665b - languageName: node - linkType: hard - "@types/jest@npm:^27.0.1, @types/jest@npm:^27.0.3, @types/jest@npm:^27.5.0, @types/jest@npm:^27.5.2": version: 27.5.2 resolution: "@types/jest@npm:27.5.2" @@ -8282,13 +8222,6 @@ __metadata: languageName: node linkType: hard -"@types/resolve@npm:1.20.2": - version: 1.20.2 - resolution: "@types/resolve@npm:1.20.2" - checksum: c5b7e1770feb5ccfb6802f6ad82a7b0d50874c99331e0c9b259e415e55a38d7a86ad0901c57665d93f75938be2a6a0bc9aa06c9749192cadb2e4512800bbc6e6 - languageName: node - linkType: hard - "@types/responselike@npm:*, @types/responselike@npm:^1.0.0": version: 1.0.0 resolution: "@types/responselike@npm:1.0.0" @@ -8436,6 +8369,13 @@ __metadata: languageName: node linkType: hard +"@types/uuid@npm:^9.0.0": + version: 9.0.0 + resolution: "@types/uuid@npm:9.0.0" + checksum: b0dc4582249b4efdbb6a9ebcd6acbcb864da14d558acfd5b17648972f8756e1a8e1de216a5e49a52b51d3804d56e60314467d9ac9450c8b90de138130021ed87 + languageName: node + linkType: hard + "@types/webpack-env@npm:^1.16.0": version: 1.17.0 resolution: "@types/webpack-env@npm:1.17.0" @@ -10441,15 +10381,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:0.26.1, axios@npm:^0.26.0, axios@npm:^0.26.1": - version: 0.26.1 - resolution: "axios@npm:0.26.1" - dependencies: - follow-redirects: ^1.14.8 - checksum: 77ad7f1e6ca04fcd3fa8af1795b09d8b7c005b71a31f28d99ba40cda0bdcc12a4627801d7fac5efa62b9f667a8402bd54c669039694373bc8d44f6be611f785c - languageName: node - linkType: hard - "axios@npm:^0.19.0, axios@npm:^0.19.2": version: 0.19.2 resolution: "axios@npm:0.19.2" @@ -10486,6 +10417,15 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.26.0, axios@npm:^0.26.1": + version: 0.26.1 + resolution: "axios@npm:0.26.1" + dependencies: + follow-redirects: ^1.14.8 + checksum: 77ad7f1e6ca04fcd3fa8af1795b09d8b7c005b71a31f28d99ba40cda0bdcc12a4627801d7fac5efa62b9f667a8402bd54c669039694373bc8d44f6be611f785c + languageName: node + linkType: hard + "axobject-query@npm:^2.2.0": version: 2.2.0 resolution: "axobject-query@npm:2.2.0" @@ -11601,7 +11541,7 @@ __metadata: languageName: node linkType: hard -"builtin-modules@npm:^3.0.0, builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0": +"builtin-modules@npm:^3.0.0, builtin-modules@npm:^3.1.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" checksum: 2cb3448b4f7306dc853632a4fcddc95e8d4e4b9868c139400027b71938fc6806d4ff44007deffb362ac85724bd40c2c6452fb6a0aa4531650eeddb98d8e5ee8a @@ -11633,6 +11573,17 @@ __metadata: languageName: node linkType: hard +"bundle-require@npm:^3.1.2": + version: 3.1.2 + resolution: "bundle-require@npm:3.1.2" + dependencies: + load-tsconfig: ^0.2.0 + peerDependencies: + esbuild: ">=0.13" + checksum: 73f77df391a46f2cefc3bfc4777cd0169a47db1e69a64a16cb6a37208a03992ef68f02921e18ae4fba3387e076f37bcac8388077cba316ce9fd96105aec43f89 + languageName: node + linkType: hard + "bunyan@npm:1.8.15": version: 1.8.15 resolution: "bunyan@npm:1.8.15" @@ -11716,6 +11667,13 @@ __metadata: languageName: node linkType: hard +"cac@npm:^6.7.12": + version: 6.7.14 + resolution: "cac@npm:6.7.14" + checksum: 4ee06aaa7bab8981f0d54e5f5f9d4adcd64058e9697563ce336d8a3878ed018ee18ebe5359b2430eceae87e0758e62ea2019c3f52ae6e211b1bd2e133856cd10 + languageName: node + linkType: hard + "cacache@npm:^12.0.2": version: 12.0.4 resolution: "cacache@npm:12.0.4" @@ -12717,7 +12675,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^4.0.1, commander@npm:^4.1.1": +"commander@npm:^4.0.0, commander@npm:^4.0.1, commander@npm:^4.1.1": version: 4.1.1 resolution: "commander@npm:4.1.1" checksum: 84a76c08fe6cc08c9c93f62ac573d2907d8e79138999312c92d4155bc2325d487d64d13f669b2000c9f8caf70493c1be2dac74fec3c51d5a04f8bc3ae1830bab @@ -15192,6 +15150,223 @@ __metadata: languageName: node linkType: hard +"esbuild-android-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-android-64@npm:0.15.18" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + +"esbuild-android-arm64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-android-arm64@npm:0.15.18" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-darwin-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-darwin-64@npm:0.15.18" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + +"esbuild-darwin-arm64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-darwin-arm64@npm:0.15.18" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-freebsd-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-freebsd-64@npm:0.15.18" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-freebsd-arm64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-freebsd-arm64@npm:0.15.18" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-32@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-32@npm:0.15.18" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-linux-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-64@npm:0.15.18" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + +"esbuild-linux-arm64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-arm64@npm:0.15.18" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + +"esbuild-linux-arm@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-arm@npm:0.15.18" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + +"esbuild-linux-mips64le@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-mips64le@npm:0.15.18" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + +"esbuild-linux-ppc64le@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-ppc64le@npm:0.15.18" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + +"esbuild-linux-riscv64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-riscv64@npm:0.15.18" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + +"esbuild-linux-s390x@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-linux-s390x@npm:0.15.18" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + +"esbuild-netbsd-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-netbsd-64@npm:0.15.18" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-openbsd-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-openbsd-64@npm:0.15.18" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + +"esbuild-sunos-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-sunos-64@npm:0.15.18" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + +"esbuild-windows-32@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-windows-32@npm:0.15.18" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + +"esbuild-windows-64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-windows-64@npm:0.15.18" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + +"esbuild-windows-arm64@npm:0.15.18": + version: 0.15.18 + resolution: "esbuild-windows-arm64@npm:0.15.18" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + +"esbuild@npm:^0.15.1": + version: 0.15.18 + resolution: "esbuild@npm:0.15.18" + dependencies: + "@esbuild/android-arm": 0.15.18 + "@esbuild/linux-loong64": 0.15.18 + esbuild-android-64: 0.15.18 + esbuild-android-arm64: 0.15.18 + esbuild-darwin-64: 0.15.18 + esbuild-darwin-arm64: 0.15.18 + esbuild-freebsd-64: 0.15.18 + esbuild-freebsd-arm64: 0.15.18 + esbuild-linux-32: 0.15.18 + esbuild-linux-64: 0.15.18 + esbuild-linux-arm: 0.15.18 + esbuild-linux-arm64: 0.15.18 + esbuild-linux-mips64le: 0.15.18 + esbuild-linux-ppc64le: 0.15.18 + esbuild-linux-riscv64: 0.15.18 + esbuild-linux-s390x: 0.15.18 + esbuild-netbsd-64: 0.15.18 + esbuild-openbsd-64: 0.15.18 + esbuild-sunos-64: 0.15.18 + esbuild-windows-32: 0.15.18 + esbuild-windows-64: 0.15.18 + esbuild-windows-arm64: 0.15.18 + dependenciesMeta: + "@esbuild/android-arm": + optional: true + "@esbuild/linux-loong64": + optional: true + esbuild-android-64: + optional: true + esbuild-android-arm64: + optional: true + esbuild-darwin-64: + optional: true + esbuild-darwin-arm64: + optional: true + esbuild-freebsd-64: + optional: true + esbuild-freebsd-arm64: + optional: true + esbuild-linux-32: + optional: true + esbuild-linux-64: + optional: true + esbuild-linux-arm: + optional: true + esbuild-linux-arm64: + optional: true + esbuild-linux-mips64le: + optional: true + esbuild-linux-ppc64le: + optional: true + esbuild-linux-riscv64: + optional: true + esbuild-linux-s390x: + optional: true + esbuild-netbsd-64: + optional: true + esbuild-openbsd-64: + optional: true + esbuild-sunos-64: + optional: true + esbuild-windows-32: + optional: true + esbuild-windows-64: + optional: true + esbuild-windows-arm64: + optional: true + bin: + esbuild: bin/esbuild + checksum: 4eb13979ae2e52eab529b79a0f236e03d08a7bd90c46924d60af73ea4de32d819abf916d0fd7a12b4908f91297e1477739f3ea9c53a68fbcc47a08ab173c41b0 + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.1 resolution: "escalade@npm:3.1.1" @@ -15935,7 +16110,7 @@ __metadata: languageName: node linkType: hard -"estree-walker@npm:^2.0.1, estree-walker@npm:^2.0.2": +"estree-walker@npm:^2.0.1": version: 2.0.2 resolution: "estree-walker@npm:2.0.2" checksum: 53a6c54e2019b8c914dc395890153ffdc2322781acf4bd7d1a32d7aedc1710807bdcd866ac133903d5629ec601fbb50abe8c2e5553c7f5a0afdd9b6af6c945af @@ -17082,7 +17257,7 @@ __metadata: languageName: node linkType: hard -"form-data@npm:4.0.0, form-data@npm:^4.0.0": +"form-data@npm:4.0.0": version: 4.0.0 resolution: "form-data@npm:4.0.0" dependencies: @@ -18163,6 +18338,20 @@ __metadata: languageName: node linkType: hard +"glob@npm:7.1.6": + version: 7.1.6 + resolution: "glob@npm:7.1.6" + dependencies: + fs.realpath: ^1.0.0 + inflight: ^1.0.4 + inherits: 2 + minimatch: ^3.0.4 + once: ^1.3.0 + path-is-absolute: ^1.0.0 + checksum: 2575cce9306ac534388db751f0aa3e78afedb6af8f3b529ac6b2354f66765545145dba8530abf7bff49fb399a047d3f9b6901c38ee4c9503f592960d9af67763 + languageName: node + linkType: hard + "glob@npm:^6.0.1": version: 6.0.4 resolution: "glob@npm:6.0.4" @@ -18190,7 +18379,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.1, glob@npm:^8.0.3": +"glob@npm:^8.0.1": version: 8.0.3 resolution: "glob@npm:8.0.3" dependencies: @@ -19853,15 +20042,6 @@ __metadata: languageName: node linkType: hard -"is-builtin-module@npm:^3.2.0": - version: 3.2.0 - resolution: "is-builtin-module@npm:3.2.0" - dependencies: - builtin-modules: ^3.3.0 - checksum: dd911ba5b5e9615d4da19fad3bbd839bcce8f279b28e094ff0883147a70e36fa4fd2d2aebc85886585106f8fc11d45ca60234afc4e3fa261ad58f013a26d3f1a - 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" @@ -20295,7 +20475,7 @@ __metadata: languageName: node linkType: hard -"is-reference@npm:1.2.1, is-reference@npm:^1.2.1": +"is-reference@npm:^1.2.1": version: 1.2.1 resolution: "is-reference@npm:1.2.1" dependencies: @@ -20966,7 +21146,7 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^26.0.0, jest-diff@npm:^26.6.2": +"jest-diff@npm:^26.6.2": version: 26.6.2 resolution: "jest-diff@npm:26.6.2" dependencies: @@ -22143,6 +22323,13 @@ __metadata: languageName: node linkType: hard +"joycon@npm:^3.0.1": + version: 3.1.1 + resolution: "joycon@npm:3.1.1" + checksum: 131fb1e98c9065d067fd49b6e685487ac4ad4d254191d7aa2c9e3b90f4e9ca70430c43cad001602bdbdabcf58717d3b5c5b7461c1bd8e39478c8de706b3fe6ae + languageName: node + linkType: hard + "jpeg-js@npm:0.4.2": version: 0.4.2 resolution: "jpeg-js@npm:0.4.2" @@ -23009,6 +23196,13 @@ __metadata: languageName: node linkType: hard +"load-tsconfig@npm:^0.2.0": + version: 0.2.3 + resolution: "load-tsconfig@npm:0.2.3" + checksum: 82d0851020ecf8e226f328c0958cfbf5a34c8ffc7b04d396f25f53861e408c948866f2536123986a13ad9357c3cb2d2b90f51a04eb9474abbfef92399a6caa3d + languageName: node + linkType: hard + "load-yaml-file@npm:^0.2.0": version: 0.2.0 resolution: "load-yaml-file@npm:0.2.0" @@ -23595,15 +23789,6 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.27.0": - version: 0.27.0 - resolution: "magic-string@npm:0.27.0" - dependencies: - "@jridgewell/sourcemap-codec": ^1.4.13 - checksum: cddacfea14441ca57ae8a307bc3cf90bac69efaa4138dd9a80804cffc2759bf06f32da3a293fb13eaa96334b7d45b7768a34f1d226afae25d2f05b05a3bb37d8 - languageName: node - linkType: hard - "mailchimp-api-v3@npm:^1.14.0": version: 1.15.0 resolution: "mailchimp-api-v3@npm:1.15.0" @@ -25650,7 +25835,7 @@ __metadata: languageName: node linkType: hard -"mz@npm:^2.4.0": +"mz@npm:^2.4.0, mz@npm:^2.7.0": version: 2.7.0 resolution: "mz@npm:2.7.0" dependencies: @@ -27897,7 +28082,7 @@ __metadata: languageName: node linkType: hard -"postcss-load-config@npm:^3.0.0": +"postcss-load-config@npm:^3.0.0, postcss-load-config@npm:^3.0.1": version: 3.1.4 resolution: "postcss-load-config@npm:3.1.4" dependencies: @@ -28467,7 +28652,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^26.0.0, pretty-format@npm:^26.6.2": +"pretty-format@npm:^26.6.2": version: 26.6.2 resolution: "pretty-format@npm:26.6.2" dependencies: @@ -30155,7 +30340,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2": +"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.18.1, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.3.2": version: 1.22.1 resolution: "resolve@npm:1.22.1" dependencies: @@ -30197,7 +30382,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.18.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin, resolve@patch:resolve@^1.3.2#~builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.18.1#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin, resolve@patch:resolve@^1.3.2#~builtin": version: 1.22.1 resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=07638b" dependencies: @@ -30472,22 +30657,6 @@ __metadata: languageName: node linkType: hard -"rollup-plugin-typescript2@npm:^0.34.1": - version: 0.34.1 - resolution: "rollup-plugin-typescript2@npm:0.34.1" - dependencies: - "@rollup/pluginutils": ^4.1.2 - find-cache-dir: ^3.3.2 - fs-extra: ^10.0.0 - semver: ^7.3.7 - tslib: ^2.4.0 - peerDependencies: - rollup: ">=1.26.3" - typescript: ">=2.4.0" - checksum: 957171f167e6bbefab68bd05ed2796aafd14c8d47bf544b92532bcea056b5a63fe300816a428c49361736160b2ffc7e8b1109bf4fa9de95e54a9fdd161e0bf62 - languageName: node - linkType: hard - "rollup-pluginutils@npm:^2.8.2": version: 2.8.2 resolution: "rollup-pluginutils@npm:2.8.2" @@ -30511,9 +30680,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.9.1": - version: 3.9.1 - resolution: "rollup@npm:3.9.1" +"rollup@npm:^3.2.5": + version: 3.10.0 + resolution: "rollup@npm:3.10.0" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -30521,7 +30690,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 48875f9414b17dda1f3a8eea3a2cfffbe847451f986e0c4f6363f06cde05d508730f29486d3f25f27db28dc76bb411a23959b826b1054d3848bab0d84a471fdd + checksum: 2803c8142865de4d5f68267a6e8810d2dff0a5414927b936773b7c27504ab7302c5ada1f85b0871de26a1e6d10363bdc2928fddcd3d55bb93c2c2570f704f8f6 languageName: node linkType: hard @@ -31706,6 +31875,15 @@ __metadata: languageName: node linkType: hard +"source-map@npm:0.8.0-beta.0": + version: 0.8.0-beta.0 + resolution: "source-map@npm:0.8.0-beta.0" + dependencies: + whatwg-url: ^7.0.0 + checksum: fb4d9bde9a9fdb2c29b10e5eae6c71d10e09ef467e1afb75fdec2eb7e11fa5b343a2af553f74f18b695dbc0b81f9da2e9fa3d7a317d5985e9939499ec6087835 + languageName: node + linkType: hard + "source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:^0.5.7": version: 0.5.7 resolution: "source-map@npm:0.5.7" @@ -32536,6 +32714,23 @@ __metadata: languageName: node linkType: hard +"sucrase@npm:^3.20.3": + version: 3.29.0 + resolution: "sucrase@npm:3.29.0" + dependencies: + commander: ^4.0.0 + glob: 7.1.6 + lines-and-columns: ^1.1.6 + mz: ^2.7.0 + pirates: ^4.0.1 + ts-interface-checker: ^0.1.9 + bin: + sucrase: bin/sucrase + sucrase-node: bin/sucrase-node + checksum: 4932ca76122f1f0cbd19f864265ce7c95652723994cf5a5c73b7b2bdef8d9b9257ba65085f61760e83cb8624d18b2fa309fe901dba77169264f4eb6a2e12719c + languageName: node + linkType: hard + "sudo-prompt@npm:^8.2.0": version: 8.2.5 resolution: "sudo-prompt@npm:8.2.5" @@ -33287,6 +33482,15 @@ __metadata: languageName: node linkType: hard +"tree-kill@npm:^1.2.2": + version: 1.2.2 + resolution: "tree-kill@npm:1.2.2" + bin: + tree-kill: cli.js + checksum: 7b1b7c7f17608a8f8d20a162e7957ac1ef6cd1636db1aba92f4e072dc31818c2ff0efac1e3d91064ede67ed5dc57c565420531a8134090a12ac10cf792ab14d2 + languageName: node + linkType: hard + "trim-newlines@npm:^1.0.0": version: 1.0.0 resolution: "trim-newlines@npm:1.0.0" @@ -33350,6 +33554,13 @@ __metadata: languageName: node linkType: hard +"ts-interface-checker@npm:^0.1.9": + version: 0.1.13 + resolution: "ts-interface-checker@npm:0.1.13" + checksum: 232509f1b84192d07b81d1e9b9677088e590ac1303436da1e92b296e9be8e31ea042e3e1fd3d29b1742ad2c959e95afe30f63117b8f1bc3a3850070a5142fea7 + languageName: node + linkType: hard + "ts-jest@npm:^25.5.1": version: 25.5.1 resolution: "ts-jest@npm:25.5.1" @@ -33621,6 +33832,42 @@ __metadata: languageName: node linkType: hard +"tsup@npm:^6.5.0": + version: 6.5.0 + resolution: "tsup@npm:6.5.0" + dependencies: + bundle-require: ^3.1.2 + cac: ^6.7.12 + chokidar: ^3.5.1 + debug: ^4.3.1 + esbuild: ^0.15.1 + execa: ^5.0.0 + globby: ^11.0.3 + joycon: ^3.0.1 + postcss-load-config: ^3.0.1 + resolve-from: ^5.0.0 + rollup: ^3.2.5 + source-map: 0.8.0-beta.0 + sucrase: ^3.20.3 + tree-kill: ^1.2.2 + peerDependencies: + "@swc/core": ^1 + postcss: ^8.4.12 + typescript: ^4.1.0 + peerDependenciesMeta: + "@swc/core": + optional: true + postcss: + optional: true + typescript: + optional: true + bin: + tsup: dist/cli-default.js + tsup-node: dist/cli-node.js + checksum: 6372a480db2dca02bb10ff27b888114d4347ce4c635ae95a7d558be0e5e23ff81373389bcce98c3086136527b63590b02f3000e266d0cb8be0fcdca6119e716e + languageName: node + linkType: hard + "tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" @@ -34041,6 +34288,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^4.9.4": + version: 4.9.4 + resolution: "typescript@npm:4.9.4" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 5008b97a2a3afdbe57ea70e504ebc8ec98f18d888059dfb7932a41f566a1360a28afc8de2a440fd6143b4014cc6d2616079931dc690c7513c2d21fa53957e0ec + languageName: node + linkType: hard + "typescript@patch:typescript@^4.1.3#~builtin, typescript@patch:typescript@^4.4.4#~builtin, typescript@patch:typescript@^4.5.2#~builtin, typescript@patch:typescript@^4.5.5#~builtin": version: 4.7.4 resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=7ad353" @@ -34051,6 +34308,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^4.9.4#~builtin": + version: 4.9.4 + resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin::version=4.9.4&hash=7ad353" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: b8cba6ab3ee30218578663352bcd74220ef20c42544fd1cc1382f24dee385002e784702b176c451da9c14c39965c035815902ef43b06eeefd5faae18ee700cea + languageName: node + linkType: hard + "ua-parser-js@npm:^0.7.30": version: 0.7.31 resolution: "ua-parser-js@npm:0.7.31" @@ -34702,6 +34969,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^9.0.0": + version: 9.0.0 + resolution: "uuid@npm:9.0.0" + bin: + uuid: dist/bin/uuid + checksum: 8867e438990d1d33ac61093e2e4e3477a2148b844e4fa9e3c2360fa4399292429c4b6ec64537eb1659c97b2d10db349c673ad58b50e2824a11e0d3630de3c056 + languageName: node + linkType: hard + "v8-compile-cache-lib@npm:^3.0.1": version: 3.0.1 resolution: "v8-compile-cache-lib@npm:3.0.1"