From 3677d44a58251b0cba76f584e7985b5eeead317d Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Mon, 8 May 2023 22:08:11 +0530 Subject: [PATCH] Revert "Replace esno & ts-node with tsx" This reverts commit 75337287ea000d76cd835181cb7395d467271ea3. --- .lintstagedrc.mjs | 2 +- package.json | 11 ++++++----- packages/mermaid/package.json | 8 ++++---- packages/mermaid/src/docs/package.json | 4 ++-- pnpm-lock.yaml | 20 +++++++++++++++----- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs index 231c91f8f..3ae66bba2 100644 --- a/.lintstagedrc.mjs +++ b/.lintstagedrc.mjs @@ -6,6 +6,6 @@ export default { // https://prettier.io/docs/en/cli.html#--cache 'prettier --write', ], - 'cSpell.json': ['tsx scripts/fixCSpell.ts'], + 'cSpell.json': ['ts-node-esm scripts/fixCSpell.ts'], '**/*.jison': ['pnpm -w run lint:jison'], }; diff --git a/package.json b/package.json index d1cbfd76c..fe7a3ba00 100644 --- a/package.json +++ b/package.json @@ -15,17 +15,18 @@ "git graph" ], "scripts": { - "build:vite": "tsx .vite/build.ts", + "build:vite": "ts-node-esm --transpileOnly .vite/build.ts", "build:mermaid": "pnpm build:vite --mermaid", "build:viz": "pnpm build:mermaid --visualize", "build:types": "tsc -p ./packages/mermaid/tsconfig.json --emitDeclarationOnly && tsc -p ./packages/mermaid-example-diagram/tsconfig.json --emitDeclarationOnly", "build:watch": "pnpm build:vite --watch", "build": "pnpm run -r clean && pnpm build:types && pnpm build:vite", - "dev": "concurrently \"pnpm build:vite --watch\" \"tsx .vite/server.ts\"", + "dev": "concurrently \"pnpm build:vite --watch\" \"ts-node-esm .vite/server.ts\"", "release": "pnpm build", "lint": "eslint --cache --cache-strategy content --ignore-path .gitignore . && pnpm lint:jison && prettier --cache --check .", - "lint:fix": "eslint --cache --cache-strategy content --fix --ignore-path .gitignore . && prettier --write . && tsx scripts/fixCSpell.ts", - "lint:jison": "tsx ./scripts/jison/lint.mts", + "lint:fix": "eslint --cache --cache-strategy content --fix --ignore-path .gitignore . && prettier --write . && ts-node-esm scripts/fixCSpell.ts", + "lint:jison": "ts-node-esm ./scripts/jison/lint.mts", + "contributors": "ts-node-esm scripts/updateContributors.ts", "cypress": "cypress run", "cypress:open": "cypress open", "e2e": "start-server-and-test dev http://localhost:9000/ cypress", @@ -107,7 +108,7 @@ "rimraf": "^5.0.0", "rollup-plugin-visualizer": "^5.9.0", "start-server-and-test": "^2.0.0", - "tsx": "^3.12.7", + "ts-node": "^10.9.1", "typescript": "^5.0.4", "vite": "^4.3.1", "vitest": "^0.31.0" diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json index c6edd1038..dd4f5344b 100644 --- a/packages/mermaid/package.json +++ b/packages/mermaid/package.json @@ -25,11 +25,11 @@ "scripts": { "clean": "rimraf dist", "docs:code": "typedoc src/defaultConfig.ts src/config.ts src/mermaidAPI.ts && prettier --write ./src/docs/config/setup", - "docs:build": "rimraf ../../docs && pnpm docs:spellcheck && pnpm docs:code && tsx src/docs.mts", - "docs:verify": "pnpm docs:spellcheck && pnpm docs:code && tsx src/docs.mts --verify", - "docs:pre:vitepress": "rimraf src/vitepress && pnpm docs:code && tsx src/docs.mts --vitepress", + "docs:build": "rimraf ../../docs && pnpm docs:spellcheck && pnpm docs:code && ts-node-esm src/docs.mts", + "docs:verify": "pnpm docs:spellcheck && pnpm docs:code && ts-node-esm src/docs.mts --verify", + "docs:pre:vitepress": "rimraf src/vitepress && pnpm docs:code && ts-node-esm src/docs.mts --vitepress", "docs:build:vitepress": "pnpm docs:pre:vitepress && (cd src/vitepress && pnpm --filter ./ install && pnpm run build) && cpy --flat src/docs/landing/ ./src/vitepress/.vitepress/dist/landing", - "docs:dev": "pnpm docs:pre:vitepress && concurrently \"pnpm --filter ./ src/vitepress dev\" \"tsx src/docs.mts --watch --vitepress\"", + "docs:dev": "pnpm docs:pre:vitepress && concurrently \"pnpm --filter ./ src/vitepress dev\" \"ts-node-esm src/docs.mts --watch --vitepress\"", "docs:serve": "pnpm docs:build:vitepress && vitepress serve src/vitepress", "docs:spellcheck": "cspell --config ../../cSpell.json \"src/docs/**/*.md\"", "release": "pnpm build", diff --git a/packages/mermaid/src/docs/package.json b/packages/mermaid/src/docs/package.json index b9e245029..6135fa15b 100644 --- a/packages/mermaid/src/docs/package.json +++ b/packages/mermaid/src/docs/package.json @@ -10,8 +10,8 @@ "preview-https": "pnpm build && serve .vitepress/dist", "preview-https-no-prefetch": "pnpm build-no-prefetch && serve .vitepress/dist", "prefetch": "pnpm fetch-contributors && pnpm fetch-avatars", - "fetch-avatars": "tsx .vitepress/scripts/fetch-avatars.ts", - "fetch-contributors": "tsx .vitepress/scripts/fetch-contributors.ts" + "fetch-avatars": "ts-node-esm .vitepress/scripts/fetch-avatars.ts", + "fetch-contributors": "ts-node-esm .vitepress/scripts/fetch-contributors.ts" }, "dependencies": { "@vueuse/core": "^10.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea5ab4518..346e4999e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -163,9 +163,9 @@ importers: start-server-and-test: specifier: ^2.0.0 version: 2.0.0 - tsx: - specifier: ^3.12.7 - version: 3.12.7 + ts-node: + specifier: ^10.9.1 + version: 10.9.1(@types/node@18.16.0)(typescript@5.0.4) typescript: specifier: ^5.0.4 version: 5.0.4 @@ -397,6 +397,9 @@ importers: '@vitejs/plugin-vue': specifier: ^4.2.1 version: 4.2.1(vite@4.3.3)(vue@3.2.47) + esno: + specifier: ^0.16.3 + version: 0.16.3 fast-glob: specifier: ^3.2.12 version: 3.2.12 @@ -7845,6 +7848,13 @@ packages: - supports-color dev: true + /esno@0.16.3: + resolution: {integrity: sha512-6slSBEV1lMKcX13DBifvnDFpNno5WXhw4j/ff7RI0y51BZiDqEe5dNhhjhIQ3iCOQuzsm2MbVzmwqbN78BBhPg==} + hasBin: true + dependencies: + tsx: 3.12.3 + dev: true + /espree@9.5.1: resolution: {integrity: sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -13664,8 +13674,8 @@ packages: typescript: 5.0.4 dev: true - /tsx@3.12.7: - resolution: {integrity: sha512-C2Ip+jPmqKd1GWVQDvz/Eyc6QJbGfE7NrR3fx5BpEHMZsEHoIxHL1j+lKdGobr8ovEyqeNkPLSKp6SCSOt7gmw==} + /tsx@3.12.3: + resolution: {integrity: sha512-Wc5BFH1xccYTXaQob+lEcimkcb/Pq+0en2s+ruiX0VEIC80nV7/0s7XRahx8NnsoCnpCVUPz8wrqVSPi760LkA==} hasBin: true dependencies: '@esbuild-kit/cjs-loader': 2.4.2