From 4e4809ded045c854f90224dec30e584040843746 Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Thu, 16 Jun 2022 15:38:54 +0300 Subject: [PATCH 1/7] feat: native ESM all the packages --- package.json | 4 ++- packages/consts/package.json | 12 +++++-- packages/consts/tsconfig.build.json | 3 +- packages/consts/tsup.config.ts | 3 ++ packages/datastructures/package.json | 14 +++++++-- packages/datastructures/tsconfig.build.json | 3 +- packages/datastructures/tsup.config.ts | 3 ++ packages/git/package.json | 14 +++++++-- packages/git/tsconfig.build.json | 3 +- packages/git/tsup.config.ts | 3 ++ packages/image_proxy_client/package.json | 14 +++++++-- .../image_proxy_client/tsconfig.build.json | 3 +- packages/image_proxy_client/tsup.config.ts | 3 ++ packages/input_schema/package.json | 16 +++++++--- packages/input_schema/scripts/copy-schema.ts | 7 +++++ packages/input_schema/tsconfig.build.json | 3 +- packages/input_schema/tsup.config.ts | 3 ++ packages/log/package.json | 14 +++++++-- packages/log/tsconfig.build.json | 3 +- packages/log/tsup.config.ts | 3 ++ packages/markdown/package.json | 14 +++++++-- packages/markdown/src/marked.ts | 6 ++-- packages/markdown/src/match-all.d.ts | 14 +++++++++ packages/markdown/tsconfig.build.json | 3 +- packages/markdown/tsup.config.ts | 3 ++ packages/payment_qr_codes/package.json | 14 +++++++-- packages/payment_qr_codes/tsconfig.build.json | 3 +- packages/payment_qr_codes/tsup.config.ts | 3 ++ packages/pseudo_url/package.json | 16 +++++++--- packages/pseudo_url/src/pseudo_url.ts | 6 ++-- packages/pseudo_url/tsconfig.build.json | 3 +- packages/pseudo_url/tsup.config.ts | 3 ++ packages/salesforce_client/package.json | 14 +++++++-- .../salesforce_client/tsconfig.build.json | 3 +- packages/salesforce_client/tsup.config.ts | 3 ++ packages/timeout/package.json | 14 +++++++-- packages/timeout/tsconfig.build.json | 3 +- packages/timeout/tsup.config.ts | 3 ++ packages/utilities/package.json | 14 +++++++-- packages/utilities/tsconfig.build.json | 3 +- packages/utilities/tsup.config.ts | 3 ++ scripts/create-tsup-config.ts | 31 +++++++++++++++++++ 42 files changed, 254 insertions(+), 56 deletions(-) create mode 100644 packages/consts/tsup.config.ts create mode 100644 packages/datastructures/tsup.config.ts create mode 100644 packages/git/tsup.config.ts create mode 100644 packages/image_proxy_client/tsup.config.ts create mode 100644 packages/input_schema/scripts/copy-schema.ts create mode 100644 packages/input_schema/tsup.config.ts create mode 100644 packages/log/tsup.config.ts create mode 100644 packages/markdown/src/match-all.d.ts create mode 100644 packages/markdown/tsup.config.ts create mode 100644 packages/payment_qr_codes/tsup.config.ts create mode 100644 packages/pseudo_url/tsup.config.ts create mode 100644 packages/salesforce_client/tsup.config.ts create mode 100644 packages/timeout/tsup.config.ts create mode 100644 packages/utilities/tsup.config.ts create mode 100644 scripts/create-tsup-config.ts diff --git a/package.json b/package.json index 8e80c5f6e..43dca3da2 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "commitlint": "^17.0.0", "deploy-web-to-s3": "^1.3.1", "eslint": "^8.2.0", + "gen-esm-wrapper": "^1.1.3", "husky": "^8.0.0", "jest": "^28.0.0", "lerna": "^5.0.0", @@ -78,7 +79,8 @@ "strip-ansi": "^6.0.0", "ts-jest": "^28.0.0", "ts-node": "^10.2.1", - "typescript": "^4.4.2", + "tsup": "^6.1.2", + "typescript": "^4.7.3", "underscore": "^1.13.1" } } diff --git a/packages/consts/package.json b/packages/consts/package.json index 784052aea..4dfe6466a 100644 --- a/packages/consts/package.json +++ b/packages/consts/package.json @@ -2,8 +2,16 @@ "name": "@apify/consts", "version": "1.11.0", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", + "main": "./dist/index.js", + "module": "./dist/index.mjs", "typings": "dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/consts/tsconfig.build.json b/packages/consts/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/consts/tsconfig.build.json +++ b/packages/consts/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/consts/tsup.config.ts b/packages/consts/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/consts/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/datastructures/package.json b/packages/datastructures/package.json index 50c807493..2f385df33 100644 --- a/packages/datastructures/package.json +++ b/packages/datastructures/package.json @@ -2,8 +2,16 @@ "name": "@apify/datastructures", "version": "1.0.1", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/datastructures/tsconfig.build.json b/packages/datastructures/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/datastructures/tsconfig.build.json +++ b/packages/datastructures/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/datastructures/tsup.config.ts b/packages/datastructures/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/datastructures/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/git/package.json b/packages/git/package.json index 1ee40638f..081b2344d 100644 --- a/packages/git/package.json +++ b/packages/git/package.json @@ -2,8 +2,16 @@ "name": "@apify/git", "version": "1.0.2", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/git/tsconfig.build.json b/packages/git/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/git/tsconfig.build.json +++ b/packages/git/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/git/tsup.config.ts b/packages/git/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/git/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/image_proxy_client/package.json b/packages/image_proxy_client/package.json index 8131bbb87..adc782f4f 100644 --- a/packages/image_proxy_client/package.json +++ b/packages/image_proxy_client/package.json @@ -2,8 +2,16 @@ "name": "@apify/image_proxy_client", "version": "1.0.1", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/image_proxy_client/tsconfig.build.json b/packages/image_proxy_client/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/image_proxy_client/tsconfig.build.json +++ b/packages/image_proxy_client/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/image_proxy_client/tsup.config.ts b/packages/image_proxy_client/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/image_proxy_client/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/input_schema/package.json b/packages/input_schema/package.json index 8a0350da6..9abc4a885 100644 --- a/packages/input_schema/package.json +++ b/packages/input_schema/package.json @@ -2,8 +2,16 @@ "name": "@apify/input_schema", "version": "2.1.0", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,8 +36,8 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", - "copy": "ts-node -T ../../scripts/copy.ts" + "compile": "tsup && tsc -p tsconfig.build.json", + "copy": "ts-node -T ../../scripts/copy.ts && ts-node -T ./scripts/copy-schema.ts" }, "publishConfig": { "access": "public" diff --git a/packages/input_schema/scripts/copy-schema.ts b/packages/input_schema/scripts/copy-schema.ts new file mode 100644 index 000000000..38accc2c5 --- /dev/null +++ b/packages/input_schema/scripts/copy-schema.ts @@ -0,0 +1,7 @@ +import { copyFileSync } from 'node:fs'; +import { resolve } from 'node:path'; + +const root = resolve(__dirname, '../src/schema.json'); +const target = resolve(process.cwd(), 'dist/schema.json'); + +copyFileSync(root, target); diff --git a/packages/input_schema/tsconfig.build.json b/packages/input_schema/tsconfig.build.json index 6a0556d08..cbfd301e5 100644 --- a/packages/input_schema/tsconfig.build.json +++ b/packages/input_schema/tsconfig.build.json @@ -2,7 +2,8 @@ "extends": "../../tsconfig.build.json", "compilerOptions": { "resolveJsonModule": true, - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/input_schema/tsup.config.ts b/packages/input_schema/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/input_schema/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/log/package.json b/packages/log/package.json index 89b26f4ea..11221f3df 100644 --- a/packages/log/package.json +++ b/packages/log/package.json @@ -2,8 +2,16 @@ "name": "@apify/log", "version": "1.2.5", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/log/tsconfig.build.json b/packages/log/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/log/tsconfig.build.json +++ b/packages/log/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/log/tsup.config.ts b/packages/log/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/log/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/markdown/package.json b/packages/markdown/package.json index 2425244df..5c52317ab 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -2,8 +2,16 @@ "name": "@apify/markdown", "version": "1.3.0", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/markdown/src/marked.ts b/packages/markdown/src/marked.ts index 3eca7dee2..9cb85ee11 100644 --- a/packages/markdown/src/marked.ts +++ b/packages/markdown/src/marked.ts @@ -1,6 +1,4 @@ import { Renderer, lexer, parser } from 'marked'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore no typings for this dependency import matchAll from 'match-all'; import { customHeadingRenderer } from './markdown_renderers'; @@ -52,8 +50,8 @@ const codeTabObjectFromCodeTabMarkdown = (markdown: string): Record = {}; for (const match of matches) { - const { header, lang } = match.groups; - tabs[header] = { language: lang, code: match.groups.code.trim() }; + const { header, lang, code } = match.groups!; + tabs[header] = { language: lang, code: code.trim() }; } return tabs; diff --git a/packages/markdown/src/match-all.d.ts b/packages/markdown/src/match-all.d.ts new file mode 100644 index 000000000..22a5fd8d1 --- /dev/null +++ b/packages/markdown/src/match-all.d.ts @@ -0,0 +1,14 @@ +declare module 'match-all' { + interface MatchAllResult { + input: string; + regex: RegExp; + next(): string | null; + nextRaw(): RegExpExecArray | null; + toArray(): (string | null)[]; + reset(index?: number): number; + } + + function matchAll(input: string, pattern: RegExp): MatchAllResult; + + export = matchAll; +} diff --git a/packages/markdown/tsconfig.build.json b/packages/markdown/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/markdown/tsconfig.build.json +++ b/packages/markdown/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/markdown/tsup.config.ts b/packages/markdown/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/markdown/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/payment_qr_codes/package.json b/packages/payment_qr_codes/package.json index ad4341dda..15fd19a8b 100644 --- a/packages/payment_qr_codes/package.json +++ b/packages/payment_qr_codes/package.json @@ -2,8 +2,16 @@ "name": "@apify/payment_qr_codes", "version": "0.1.1", "description": "Tools for creating payment QR codes.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -27,7 +35,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/payment_qr_codes/tsconfig.build.json b/packages/payment_qr_codes/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/payment_qr_codes/tsconfig.build.json +++ b/packages/payment_qr_codes/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/payment_qr_codes/tsup.config.ts b/packages/payment_qr_codes/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/payment_qr_codes/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/pseudo_url/package.json b/packages/pseudo_url/package.json index c3be8e5a7..7238e6c4f 100644 --- a/packages/pseudo_url/package.json +++ b/packages/pseudo_url/package.json @@ -2,8 +2,16 @@ "name": "@apify/pseudo_url", "version": "1.1.6", "description": "Tool to find the matching URLs on a page (or html document) by providing a URL pattern.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -24,7 +32,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { @@ -32,6 +40,6 @@ }, "dependencies": { "@apify/log": "^1.2.5", - "ow": "^0.28.1" + "@sapphire/shapeshift": "^3.2.0" } } diff --git a/packages/pseudo_url/src/pseudo_url.ts b/packages/pseudo_url/src/pseudo_url.ts index 809103d64..a402d7ebf 100644 --- a/packages/pseudo_url/src/pseudo_url.ts +++ b/packages/pseudo_url/src/pseudo_url.ts @@ -1,5 +1,7 @@ import log from '@apify/log'; -import ow from 'ow'; +import { s } from '@sapphire/shapeshift'; + +const inputPredicate = s.union(s.string, s.instance(RegExp)); /** * Represents a pseudo-URL (PURL) - a URL pattern used to find @@ -60,7 +62,7 @@ export class PseudoUrl { * such as making the matching case-sensitive. */ constructor(purl: string | RegExp) { - ow(purl, ow.any(ow.string, ow.regExp)); + inputPredicate.parse(purl); if (purl instanceof RegExp) { this.regex = purl; diff --git a/packages/pseudo_url/tsconfig.build.json b/packages/pseudo_url/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/pseudo_url/tsconfig.build.json +++ b/packages/pseudo_url/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/pseudo_url/tsup.config.ts b/packages/pseudo_url/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/pseudo_url/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/salesforce_client/package.json b/packages/salesforce_client/package.json index bd735919d..a087fffc8 100644 --- a/packages/salesforce_client/package.json +++ b/packages/salesforce_client/package.json @@ -2,8 +2,16 @@ "name": "@apify/salesforce_client", "version": "1.0.7", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/salesforce_client/tsconfig.build.json b/packages/salesforce_client/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/salesforce_client/tsconfig.build.json +++ b/packages/salesforce_client/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/salesforce_client/tsup.config.ts b/packages/salesforce_client/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/salesforce_client/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/timeout/package.json b/packages/timeout/package.json index 469618803..fd11a1e82 100644 --- a/packages/timeout/package.json +++ b/packages/timeout/package.json @@ -2,8 +2,16 @@ "name": "@apify/timeout", "version": "0.2.1", "description": "Helper for adding timeouts to promises that support easy cancellation.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -27,7 +35,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/timeout/tsconfig.build.json b/packages/timeout/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/timeout/tsconfig.build.json +++ b/packages/timeout/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/timeout/tsup.config.ts b/packages/timeout/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/timeout/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/packages/utilities/package.json b/packages/utilities/package.json index 13685b4aa..ece80f337 100644 --- a/packages/utilities/package.json +++ b/packages/utilities/package.json @@ -2,8 +2,16 @@ "name": "@apify/utilities", "version": "1.2.14", "description": "Tools and constants shared across Apify projects.", - "main": "dist/index.js", - "typings": "dist/index.d.ts", + "main": "./dist/index.js", + "module": "./dist/index.mjs", + "typings": "./dist/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.js", + "types": "./dist/index.d.ts" + } + }, "keywords": [ "apify" ], @@ -28,7 +36,7 @@ "scripts": { "build": "npm run clean && npm run compile && npm run copy", "clean": "rimraf ./dist", - "compile": "tsc -p tsconfig.build.json", + "compile": "tsup && tsc -p tsconfig.build.json", "copy": "ts-node -T ../../scripts/copy.ts" }, "publishConfig": { diff --git a/packages/utilities/tsconfig.build.json b/packages/utilities/tsconfig.build.json index 856db0f21..3f47ba58f 100644 --- a/packages/utilities/tsconfig.build.json +++ b/packages/utilities/tsconfig.build.json @@ -1,7 +1,8 @@ { "extends": "../../tsconfig.build.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "emitDeclarationOnly": true }, "include": ["src/**/*"] } diff --git a/packages/utilities/tsup.config.ts b/packages/utilities/tsup.config.ts new file mode 100644 index 000000000..265bee2eb --- /dev/null +++ b/packages/utilities/tsup.config.ts @@ -0,0 +1,3 @@ +import { createTsupConfig } from '../../scripts/create-tsup-config'; + +export default createTsupConfig(); diff --git a/scripts/create-tsup-config.ts b/scripts/create-tsup-config.ts new file mode 100644 index 000000000..aae395e03 --- /dev/null +++ b/scripts/create-tsup-config.ts @@ -0,0 +1,31 @@ +import { relative, resolve as resolveDir } from 'node:path'; +import { defineConfig, type Options } from 'tsup'; + +export const createTsupConfig = ({ + globalName = undefined, + format = ['esm', 'cjs'], + target = 'es2021', + sourcemap = true, + esbuildOptions = (options, context) => { + if (context.format === 'cjs') { + options.banner = { + js: '"use strict";', + }; + } + }, +}: ConfigOptions = {}) => defineConfig({ + clean: true, + dts: false, + entry: ['src/index.ts'], + format, + minify: false, + skipNodeModulesBundle: true, + sourcemap, + target, + tsconfig: relative(__dirname, resolveDir(process.cwd(), 'tsconfig.build.json')), + keepNames: true, + globalName, + esbuildOptions, +}); + +type ConfigOptions = Pick; From e2804547ef2dd6bad67c1b2017c27e9c61dce065 Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Sun, 19 Jun 2022 23:05:01 +0300 Subject: [PATCH 2/7] chore: update shapeshift to support node 14 --- packages/pseudo_url/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pseudo_url/package.json b/packages/pseudo_url/package.json index 7238e6c4f..449a3b35c 100644 --- a/packages/pseudo_url/package.json +++ b/packages/pseudo_url/package.json @@ -40,6 +40,6 @@ }, "dependencies": { "@apify/log": "^1.2.5", - "@sapphire/shapeshift": "^3.2.0" + "@sapphire/shapeshift": "^3.3.0" } } From b5f7a778eabcbd75689bf523d332c46bb56b4524 Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Sun, 19 Jun 2022 23:07:37 +0300 Subject: [PATCH 3/7] chore: remove gen-esm-wrapper didn't need it in the end after all --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 43dca3da2..00c0191a8 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,6 @@ "commitlint": "^17.0.0", "deploy-web-to-s3": "^1.3.1", "eslint": "^8.2.0", - "gen-esm-wrapper": "^1.1.3", "husky": "^8.0.0", "jest": "^28.0.0", "lerna": "^5.0.0", From d5453eeaf03ebcc692e254e2651bed4aaab6844a Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Sun, 19 Jun 2022 23:09:18 +0300 Subject: [PATCH 4/7] chore: no need for duplicate use strict header --- scripts/create-tsup-config.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/create-tsup-config.ts b/scripts/create-tsup-config.ts index aae395e03..d8718fb94 100644 --- a/scripts/create-tsup-config.ts +++ b/scripts/create-tsup-config.ts @@ -4,15 +4,9 @@ import { defineConfig, type Options } from 'tsup'; export const createTsupConfig = ({ globalName = undefined, format = ['esm', 'cjs'], - target = 'es2021', + target = 'es2020', sourcemap = true, - esbuildOptions = (options, context) => { - if (context.format === 'cjs') { - options.banner = { - js: '"use strict";', - }; - } - }, + esbuildOptions = undefined, }: ConfigOptions = {}) => defineConfig({ clean: true, dts: false, From c93fd1de2bb798adbf0d21d7e31717c93712c00e Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Tue, 21 Jun 2022 12:55:33 +0300 Subject: [PATCH 5/7] chore: drop node 12, add node 18 --- .github/workflows/test_and_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index 43e736973..eda1c94aa 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [ 12, 14, 15, 16 ] + node-version: [ 14, 15, 16, 18 ] steps: - uses: actions/checkout@v3 From e6f73a2aa3630f22654bb7d4bdd41a80c3b7038d Mon Sep 17 00:00:00 2001 From: Vlad Frangu Date: Tue, 21 Jun 2022 13:07:21 +0300 Subject: [PATCH 6/7] chore: fix CI Errors that don't appear in editor..yay --- package-lock.json | 1316 +++++++++++++++++++++++++++---- packages/markdown/src/marked.ts | 2 +- 2 files changed, 1172 insertions(+), 146 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9c0a76f4..080606d60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,8 @@ "strip-ansi": "^6.0.0", "ts-jest": "^28.0.0", "ts-node": "^10.2.1", - "typescript": "^4.4.2", + "tsup": "^6.1.2", + "typescript": "^4.7.3", "underscore": "^1.13.1" }, "engines": { @@ -3395,23 +3396,21 @@ "@octokit/openapi-types": "^12.1.0" } }, + "node_modules/@sapphire/shapeshift": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.3.0.tgz", + "integrity": "sha512-6MNupTaIXtyVCHuejbTIE/Wmw35FKbpfRhiPCkxaQHm76iHICaWNO0oej0lipLb7vhK8mQHQn3zE6umOVvwGLw==", + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" + } + }, "node_modules/@sinclair/typebox": { "version": "0.23.5", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz", "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==", "dev": true }, - "node_modules/@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, "node_modules/@sinonjs/commons": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", @@ -4015,6 +4014,12 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true + }, "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -4434,6 +4439,15 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4559,6 +4573,21 @@ "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", "dev": true }, + "node_modules/bundle-require": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-3.0.4.tgz", + "integrity": "sha512-VXG6epB1yrLAvWVQpl92qF347/UXmncQj7J3U8kZEbdVZ1ZkQyr4hYeL/9RvcE8vVVdp53dY78Fd/3pqfRqI1A==", + "dev": true, + "dependencies": { + "load-tsconfig": "^0.2.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "peerDependencies": { + "esbuild": ">=0.13" + } + }, "node_modules/byte-size": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz", @@ -4568,6 +4597,15 @@ "node": ">=10" } }, + "node_modules/cac": { + "version": "6.7.12", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.12.tgz", + "integrity": "sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, "node_modules/cacache": { "version": "16.1.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.1.tgz", @@ -4665,6 +4703,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true, "engines": { "node": ">=6" } @@ -4747,6 +4786,45 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "node_modules/chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + ], + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -5785,6 +5863,361 @@ "integrity": "sha512-n/i7HRSmsnOFsSpFJgU5sEIE9Rl4Fm2+X8XeJjMLB1x0IGi/rkzlaCDrMgIAyZUq8O543ymqOTXnFyE6/ZPAqQ==", "dev": true }, + "node_modules/esbuild": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.47.tgz", + "integrity": "sha512-wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "esbuild-android-64": "0.14.47", + "esbuild-android-arm64": "0.14.47", + "esbuild-darwin-64": "0.14.47", + "esbuild-darwin-arm64": "0.14.47", + "esbuild-freebsd-64": "0.14.47", + "esbuild-freebsd-arm64": "0.14.47", + "esbuild-linux-32": "0.14.47", + "esbuild-linux-64": "0.14.47", + "esbuild-linux-arm": "0.14.47", + "esbuild-linux-arm64": "0.14.47", + "esbuild-linux-mips64le": "0.14.47", + "esbuild-linux-ppc64le": "0.14.47", + "esbuild-linux-riscv64": "0.14.47", + "esbuild-linux-s390x": "0.14.47", + "esbuild-netbsd-64": "0.14.47", + "esbuild-openbsd-64": "0.14.47", + "esbuild-sunos-64": "0.14.47", + "esbuild-windows-32": "0.14.47", + "esbuild-windows-64": "0.14.47", + "esbuild-windows-arm64": "0.14.47" + } + }, + "node_modules/esbuild-android-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.47.tgz", + "integrity": "sha512-R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-android-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.47.tgz", + "integrity": "sha512-OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.47.tgz", + "integrity": "sha512-R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-darwin-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.47.tgz", + "integrity": "sha512-seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.47.tgz", + "integrity": "sha512-ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-freebsd-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.47.tgz", + "integrity": "sha512-ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-32": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.47.tgz", + "integrity": "sha512-FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.47.tgz", + "integrity": "sha512-nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.47.tgz", + "integrity": "sha512-ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.47.tgz", + "integrity": "sha512-ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-mips64le": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.47.tgz", + "integrity": "sha512-mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-ppc64le": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.47.tgz", + "integrity": "sha512-WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-riscv64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.47.tgz", + "integrity": "sha512-1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-linux-s390x": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.47.tgz", + "integrity": "sha512-eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-netbsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.47.tgz", + "integrity": "sha512-Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-openbsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.47.tgz", + "integrity": "sha512-QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-sunos-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.47.tgz", + "integrity": "sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-32": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.47.tgz", + "integrity": "sha512-H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.47.tgz", + "integrity": "sha512-/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/esbuild-windows-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.47.tgz", + "integrity": "sha512-HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -7731,6 +8164,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -7892,6 +8337,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true, "engines": { "node": ">=8" } @@ -9049,6 +9495,15 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/joycon": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz", + "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -9639,6 +10094,15 @@ "node": ">=8" } }, + "node_modules/load-tsconfig": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.3.tgz", + "integrity": "sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -9660,11 +10124,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "node_modules/lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "node_modules/lodash.ismatch": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", @@ -9683,6 +10142,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "dev": true + }, "node_modules/log-update": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", @@ -10388,6 +10853,17 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -11047,50 +11523,6 @@ "node": ">=0.10.0" } }, - "node_modules/ow": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/ow/-/ow-0.28.1.tgz", - "integrity": "sha512-1EZTywPZeUKac9gD7q8np3Aj+V54kvfIcjNEVNDSbG2Ys5xA5foW2HquvMMqgyWGLqIFMlc0Iq/HmyMHqN48sA==", - "dependencies": { - "@sindresorhus/is": "^4.2.0", - "callsites": "^3.1.0", - "dot-prop": "^6.0.1", - "lodash.isequal": "^4.5.0", - "type-fest": "^2.3.4", - "vali-date": "^1.0.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ow/node_modules/dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "dependencies": { - "is-obj": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/ow/node_modules/type-fest": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.1.tgz", - "integrity": "sha512-hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ==", - "engines": { - "node": ">=12.20" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -11756,6 +12188,35 @@ "node": ">=4.0.0" } }, + "node_modules/postcss-load-config": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", + "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", + "dev": true, + "dependencies": { + "lilconfig": "^2.0.5", + "yaml": "^1.10.2" + }, + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": ">=8.0.9", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -12466,6 +12927,18 @@ "once": "^1.3.0" } }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, "node_modules/redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -12741,6 +13214,21 @@ "inherits": "^2.0.1" } }, + "node_modules/rollup": { + "version": "2.75.7", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", + "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==", + "dev": true, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, "node_modules/run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -13345,6 +13833,56 @@ "node": ">=4" } }, + "node_modules/sucrase": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.21.0.tgz", + "integrity": "sha512-FjAhMJjDcifARI7bZej0Bi1yekjWQHoEvWIXhLPwDhC6O4iZ5PtGb86WV56riW87hzpgB13wwBKO9vKAiWu5VQ==", + "dev": true, + "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" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/sucrase/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/sucrase/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "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" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13473,6 +14011,27 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -13558,6 +14117,15 @@ "node": ">=8" } }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true, + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/treeverse": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz", @@ -13576,6 +14144,12 @@ "node": ">=8" } }, + "node_modules/ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "dev": true + }, "node_modules/ts-jest": { "version": "28.0.5", "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz", @@ -13662,50 +14236,133 @@ "@swc/core": { "optional": true }, - "@swc/wasm": { + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/tsconfig-paths": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "dev": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/tsup": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/tsup/-/tsup-6.1.2.tgz", + "integrity": "sha512-Hw4hKDHaAQkm2eVavlArEOrAPA93bziRDamdfwaNs0vXQdUUFfItvUWY0L/F6oQQMVh6GvjQq1+HpDXw8UKtPA==", + "dev": true, + "dependencies": { + "bundle-require": "^3.0.2", + "cac": "^6.7.12", + "chokidar": "^3.5.1", + "debug": "^4.3.1", + "esbuild": "^0.14.25", + "execa": "^5.0.0", + "globby": "^11.0.3", + "joycon": "^3.0.1", + "postcss-load-config": "^3.0.1", + "resolve-from": "^5.0.0", + "rollup": "^2.74.1", + "source-map": "0.8.0-beta.0", + "sucrase": "^3.20.3", + "tree-kill": "^1.2.2" + }, + "bin": { + "tsup": "dist/cli-default.js", + "tsup-node": "dist/cli-node.js" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@swc/core": "^1", + "postcss": "^8.4.12", + "typescript": "^4.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "postcss": { + "optional": true + }, + "typescript": { "optional": true } } }, - "node_modules/tsconfig-paths": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", - "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", + "node_modules/tsup/node_modules/source-map": { + "version": "0.8.0-beta.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", + "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", "dev": true, "dependencies": { - "@types/json5": "^0.0.29", - "json5": "^1.0.1", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" + "whatwg-url": "^7.0.0" + }, + "engines": { + "node": ">= 8" } }, - "node_modules/tsconfig-paths/node_modules/json5": { + "node_modules/tsup/node_modules/tr46": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", "dev": true, "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" + "punycode": "^2.1.0" } }, - "node_modules/tsconfig-paths/node_modules/strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "node_modules/tsup/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true + }, + "node_modules/tsup/node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", "dev": true, - "engines": { - "node": ">=4" + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } }, - "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, "node_modules/tsutils": { "version": "3.21.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", @@ -13924,14 +14581,6 @@ "node": ">=10.12.0" } }, - "node_modules/vali-date": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", - "integrity": "sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -14395,7 +15044,7 @@ }, "packages/markdown": { "name": "@apify/markdown", - "version": "1.2.6", + "version": "1.3.0", "license": "Apache-2.0", "dependencies": { "@apify/consts": "^1.11.0", @@ -14421,7 +15070,7 @@ "license": "Apache-2.0", "dependencies": { "@apify/log": "^1.2.5", - "ow": "^0.28.1" + "@sapphire/shapeshift": "^3.3.0" } }, "packages/salesforce_client": { @@ -14545,7 +15194,7 @@ "version": "file:packages/pseudo_url", "requires": { "@apify/log": "^1.2.5", - "ow": "^0.28.1" + "@sapphire/shapeshift": "^3.3.0" } }, "@apify/salesforce_client": { @@ -17218,17 +17867,17 @@ "@octokit/openapi-types": "^12.1.0" } }, + "@sapphire/shapeshift": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@sapphire/shapeshift/-/shapeshift-3.3.0.tgz", + "integrity": "sha512-6MNupTaIXtyVCHuejbTIE/Wmw35FKbpfRhiPCkxaQHm76iHICaWNO0oej0lipLb7vhK8mQHQn3zE6umOVvwGLw==" + }, "@sinclair/typebox": { "version": "0.23.5", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz", "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg==", "dev": true }, - "@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==" - }, "@sinonjs/commons": { "version": "1.8.3", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz", @@ -17694,6 +18343,12 @@ "color-convert": "^2.0.1" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true + }, "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -18019,6 +18674,12 @@ } } }, + "binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -18108,12 +18769,27 @@ "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==", "dev": true }, + "bundle-require": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-3.0.4.tgz", + "integrity": "sha512-VXG6epB1yrLAvWVQpl92qF347/UXmncQj7J3U8kZEbdVZ1ZkQyr4hYeL/9RvcE8vVVdp53dY78Fd/3pqfRqI1A==", + "dev": true, + "requires": { + "load-tsconfig": "^0.2.0" + } + }, "byte-size": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-7.0.1.tgz", "integrity": "sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==", "dev": true }, + "cac": { + "version": "6.7.12", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.12.tgz", + "integrity": "sha512-rM7E2ygtMkJqD9c7WnFU6fruFcN3xe4FM5yUmgxhZzIKJk4uHl9U/fhwdajGFQbQuv43FAUo1Fe8gX/oIKDeSA==", + "dev": true + }, "cacache": { "version": "16.1.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.1.tgz", @@ -18194,7 +18870,8 @@ "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true }, "camelcase": { "version": "5.3.1", @@ -18246,6 +18923,33 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "chokidar": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", + "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } + }, "chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -19059,6 +19763,174 @@ "integrity": "sha512-n/i7HRSmsnOFsSpFJgU5sEIE9Rl4Fm2+X8XeJjMLB1x0IGi/rkzlaCDrMgIAyZUq8O543ymqOTXnFyE6/ZPAqQ==", "dev": true }, + "esbuild": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.47.tgz", + "integrity": "sha512-wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==", + "dev": true, + "requires": { + "esbuild-android-64": "0.14.47", + "esbuild-android-arm64": "0.14.47", + "esbuild-darwin-64": "0.14.47", + "esbuild-darwin-arm64": "0.14.47", + "esbuild-freebsd-64": "0.14.47", + "esbuild-freebsd-arm64": "0.14.47", + "esbuild-linux-32": "0.14.47", + "esbuild-linux-64": "0.14.47", + "esbuild-linux-arm": "0.14.47", + "esbuild-linux-arm64": "0.14.47", + "esbuild-linux-mips64le": "0.14.47", + "esbuild-linux-ppc64le": "0.14.47", + "esbuild-linux-riscv64": "0.14.47", + "esbuild-linux-s390x": "0.14.47", + "esbuild-netbsd-64": "0.14.47", + "esbuild-openbsd-64": "0.14.47", + "esbuild-sunos-64": "0.14.47", + "esbuild-windows-32": "0.14.47", + "esbuild-windows-64": "0.14.47", + "esbuild-windows-arm64": "0.14.47" + } + }, + "esbuild-android-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.47.tgz", + "integrity": "sha512-R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g==", + "dev": true, + "optional": true + }, + "esbuild-android-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.47.tgz", + "integrity": "sha512-OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ==", + "dev": true, + "optional": true + }, + "esbuild-darwin-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.47.tgz", + "integrity": "sha512-R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA==", + "dev": true, + "optional": true + }, + "esbuild-darwin-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.47.tgz", + "integrity": "sha512-seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw==", + "dev": true, + "optional": true + }, + "esbuild-freebsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.47.tgz", + "integrity": "sha512-ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ==", + "dev": true, + "optional": true + }, + "esbuild-freebsd-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.47.tgz", + "integrity": "sha512-ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ==", + "dev": true, + "optional": true + }, + "esbuild-linux-32": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.47.tgz", + "integrity": "sha512-FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw==", + "dev": true, + "optional": true + }, + "esbuild-linux-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.47.tgz", + "integrity": "sha512-nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw==", + "dev": true, + "optional": true + }, + "esbuild-linux-arm": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.47.tgz", + "integrity": "sha512-ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA==", + "dev": true, + "optional": true + }, + "esbuild-linux-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.47.tgz", + "integrity": "sha512-ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw==", + "dev": true, + "optional": true + }, + "esbuild-linux-mips64le": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.47.tgz", + "integrity": "sha512-mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg==", + "dev": true, + "optional": true + }, + "esbuild-linux-ppc64le": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.47.tgz", + "integrity": "sha512-WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w==", + "dev": true, + "optional": true + }, + "esbuild-linux-riscv64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.47.tgz", + "integrity": "sha512-1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g==", + "dev": true, + "optional": true + }, + "esbuild-linux-s390x": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.47.tgz", + "integrity": "sha512-eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw==", + "dev": true, + "optional": true + }, + "esbuild-netbsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.47.tgz", + "integrity": "sha512-Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ==", + "dev": true, + "optional": true + }, + "esbuild-openbsd-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.47.tgz", + "integrity": "sha512-QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw==", + "dev": true, + "optional": true + }, + "esbuild-sunos-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.47.tgz", + "integrity": "sha512-uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ==", + "dev": true, + "optional": true + }, + "esbuild-windows-32": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.47.tgz", + "integrity": "sha512-H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ==", + "dev": true, + "optional": true + }, + "esbuild-windows-64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.47.tgz", + "integrity": "sha512-/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ==", + "dev": true, + "optional": true + }, + "esbuild-windows-arm64": { + "version": "0.14.47", + "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.47.tgz", + "integrity": "sha512-HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ==", + "dev": true, + "optional": true + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", @@ -20529,6 +21401,15 @@ "has-bigints": "^1.0.1" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, "is-boolean-object": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", @@ -20637,7 +21518,8 @@ "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==" + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", + "dev": true }, "is-plain-obj": { "version": "1.1.0", @@ -21524,6 +22406,12 @@ } } }, + "joycon": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz", + "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==", + "dev": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -21970,6 +22858,12 @@ } } }, + "load-tsconfig": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.3.tgz", + "integrity": "sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ==", + "dev": true + }, "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -21985,11 +22879,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, - "lodash.isequal": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", - "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==" - }, "lodash.ismatch": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", @@ -22008,6 +22897,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "dev": true + }, "log-update": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", @@ -22551,6 +23446,17 @@ "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "requires": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -23065,34 +23971,6 @@ "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true }, - "ow": { - "version": "0.28.1", - "resolved": "https://registry.npmjs.org/ow/-/ow-0.28.1.tgz", - "integrity": "sha512-1EZTywPZeUKac9gD7q8np3Aj+V54kvfIcjNEVNDSbG2Ys5xA5foW2HquvMMqgyWGLqIFMlc0Iq/HmyMHqN48sA==", - "requires": { - "@sindresorhus/is": "^4.2.0", - "callsites": "^3.1.0", - "dot-prop": "^6.0.1", - "lodash.isequal": "^4.5.0", - "type-fest": "^2.3.4", - "vali-date": "^1.0.0" - }, - "dependencies": { - "dot-prop": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz", - "integrity": "sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==", - "requires": { - "is-obj": "^2.0.0" - } - }, - "type-fest": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.13.1.tgz", - "integrity": "sha512-hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ==" - } - } - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -23583,6 +24461,16 @@ "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz", "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==" }, + "postcss-load-config": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", + "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", + "dev": true, + "requires": { + "lilconfig": "^2.0.5", + "yaml": "^1.10.2" + } + }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -24137,6 +25025,15 @@ "once": "^1.3.0" } }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, "redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -24341,6 +25238,15 @@ "inherits": "^2.0.1" } }, + "rollup": { + "version": "2.75.7", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", + "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==", + "dev": true, + "requires": { + "fsevents": "~2.3.2" + } + }, "run-async": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", @@ -24790,6 +25696,42 @@ "through": "^2.3.4" } }, + "sucrase": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.21.0.tgz", + "integrity": "sha512-FjAhMJjDcifARI7bZej0Bi1yekjWQHoEvWIXhLPwDhC6O4iZ5PtGb86WV56riW87hzpgB13wwBKO9vKAiWu5VQ==", + "dev": true, + "requires": { + "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" + }, + "dependencies": { + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "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" + } + } + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -24884,6 +25826,24 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, + "requires": { + "any-promise": "^1.0.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, + "requires": { + "thenify": ">= 3.1.0 < 4" + } + }, "throat": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", @@ -24954,6 +25914,12 @@ "punycode": "^2.1.1" } }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true + }, "treeverse": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-2.0.0.tgz", @@ -24966,6 +25932,12 @@ "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true }, + "ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "dev": true + }, "ts-jest": { "version": "28.0.5", "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-28.0.5.tgz", @@ -25046,6 +26018,65 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true }, + "tsup": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/tsup/-/tsup-6.1.2.tgz", + "integrity": "sha512-Hw4hKDHaAQkm2eVavlArEOrAPA93bziRDamdfwaNs0vXQdUUFfItvUWY0L/F6oQQMVh6GvjQq1+HpDXw8UKtPA==", + "dev": true, + "requires": { + "bundle-require": "^3.0.2", + "cac": "^6.7.12", + "chokidar": "^3.5.1", + "debug": "^4.3.1", + "esbuild": "^0.14.25", + "execa": "^5.0.0", + "globby": "^11.0.3", + "joycon": "^3.0.1", + "postcss-load-config": "^3.0.1", + "resolve-from": "^5.0.0", + "rollup": "^2.74.1", + "source-map": "0.8.0-beta.0", + "sucrase": "^3.20.3", + "tree-kill": "^1.2.2" + }, + "dependencies": { + "source-map": { + "version": "0.8.0-beta.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", + "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", + "dev": true, + "requires": { + "whatwg-url": "^7.0.0" + } + }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true + }, + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + } + } + }, "tsutils": { "version": "3.21.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", @@ -25214,11 +26245,6 @@ "convert-source-map": "^1.6.0" } }, - "vali-date": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", - "integrity": "sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==" - }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", diff --git a/packages/markdown/src/marked.ts b/packages/markdown/src/marked.ts index 9cb85ee11..cc2495c71 100644 --- a/packages/markdown/src/marked.ts +++ b/packages/markdown/src/marked.ts @@ -43,7 +43,7 @@ const codeTabObjectFromCodeTabMarkdown = (markdown: string): Record Date: Tue, 21 Jun 2022 16:12:26 +0200 Subject: [PATCH 7/7] Update .github/workflows/test_and_release.yml --- .github/workflows/test_and_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_release.yml b/.github/workflows/test_and_release.yml index eda1c94aa..220c3290b 100644 --- a/.github/workflows/test_and_release.yml +++ b/.github/workflows/test_and_release.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [ 14, 15, 16, 18 ] + node-version: [ 14, 16, 18 ] steps: - uses: actions/checkout@v3