From dbb4bcf0cdaa7669773695649ca56d4c96ea299c Mon Sep 17 00:00:00 2001 From: sorrycc Date: Fri, 15 Jul 2022 09:47:54 +0800 Subject: [PATCH] chore: use tsx instead of esno --- .husky/commit-msg | 2 +- package.json | 2 +- pnpm-lock.yaml | 97 +++++++++++++++++--------------------- scripts/bin/umi-scripts.js | 2 +- 4 files changed, 45 insertions(+), 58 deletions(-) diff --git a/.husky/commit-msg b/.husky/commit-msg index 0deb683bc3a6..2eaf51ce9a07 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -npx --no-install esno scripts/verifyCommit.ts $1 +npx --no-install tsx scripts/verifyCommit.ts $1 diff --git a/package.json b/package.json index 8bc3066481e8..2868142044ab 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,6 @@ "@umijs/utils": "workspace:*", "@vercel/ncc": "0.33.3", "dts-packer": "^0.0.3", - "esno": "^0.14.1", "expect-playwright": "^0.8.0", "git-repo-info": "^2.1.1", "husky": "^7.0.4", @@ -82,6 +81,7 @@ "resolve": "^1.22.0", "rimraf": "^3.0.2", "ts-node": "^10.7.0", + "tsx": "^3.8.0", "turbo": "^1.3.1", "typescript": "^4.7.2", "uglify-js": "^3.15.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d7be75e28f1..694f00d84557 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,7 +24,6 @@ importers: '@umijs/utils': workspace:* '@vercel/ncc': 0.33.3 dts-packer: ^0.0.3 - esno: ^0.14.1 expect-playwright: ^0.8.0 git-repo-info: ^2.1.1 husky: ^7.0.4 @@ -45,6 +44,7 @@ importers: resolve: ^1.22.0 rimraf: ^3.0.2 ts-node: ^10.7.0 + tsx: ^3.8.0 turbo: ^1.3.1 typescript: ^4.7.2 uglify-js: ^3.15.4 @@ -72,7 +72,6 @@ importers: '@umijs/utils': link:packages/utils '@vercel/ncc': 0.33.3 dts-packer: 0.0.3 - esno: 0.14.1 expect-playwright: 0.8.0 git-repo-info: 2.1.1 husky: 7.0.4 @@ -93,6 +92,7 @@ importers: resolve: 1.22.1 rimraf: 3.0.2 ts-node: 10.8.1_x2utdhayajzrh747hktprshhby + tsx: 3.8.0 turbo: 1.3.1 typescript: 4.7.4 uglify-js: 3.16.1 @@ -6060,6 +6060,27 @@ packages: resolution: {integrity: sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==} dev: false + /@esbuild-kit/cjs-loader/2.3.1: + resolution: {integrity: sha512-ov6ALYD9xZSPoo5mmGOQtEC/b0xXeUlPy65p8aHMHLF4DfBEe8Y+iquH2lTDsy6Iskc1uMTadF+SVADTSTNJMA==} + dependencies: + '@esbuild-kit/core-utils': 2.1.0 + get-tsconfig: 4.2.0 + dev: true + + /@esbuild-kit/core-utils/2.1.0: + resolution: {integrity: sha512-fZirrc2KjeTumVjE4bpleWOk2gD83b7WuGeQqOceKFQL+heNKKkNB5G5pekOUTLzfSBc0hP7hCSBoD9TuR0hLw==} + dependencies: + esbuild: 0.14.47 + source-map-support: 0.5.21 + dev: true + + /@esbuild-kit/esm-loader/2.4.1: + resolution: {integrity: sha512-6x44rygVfNODm27v0RW3wX5y61mqSrXDvB39G0nomgWWqxG3mjiKtPSwrFppdkrA39QIqDgVlD4gJmPOxnleSw==} + dependencies: + '@esbuild-kit/core-utils': 2.1.0 + get-tsconfig: 4.2.0 + dev: true + /@eslint/eslintrc/1.3.0: resolution: {integrity: sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -10691,7 +10712,7 @@ packages: /axios/0.21.4_debug@4.3.2: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.1_debug@4.3.2 + follow-redirects: 1.15.1 transitivePeerDependencies: - debug dev: true @@ -10699,7 +10720,7 @@ packages: /axios/0.27.2: resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==} dependencies: - follow-redirects: 1.15.1_debug@4.3.2 + follow-redirects: 1.15.1 form-data: 4.0.0 transitivePeerDependencies: - debug @@ -10708,7 +10729,7 @@ packages: /axios/0.27.2_debug@4.3.4: resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==} dependencies: - follow-redirects: 1.15.1_debug@4.3.2 + follow-redirects: 1.15.1 form-data: 4.0.0 transitivePeerDependencies: - debug @@ -11278,12 +11299,6 @@ packages: resolution: {integrity: sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==} dev: true - /builtins/4.1.0: - resolution: {integrity: sha512-1bPRZQtmKaO6h7qV1YHXNtr6nCK28k0Zo95KM4dXfILcZZwoHJBN1m3lfLv9LPkcOZlrSr+J1bzMaZFO98Yq0w==} - dependencies: - semver: 7.3.7 - dev: true - /busboy/0.2.14: resolution: {integrity: sha512-InWFDomvlkEj+xWLBfU3AvnbVYqeTWmQopiW0tWWEy5yehYm2YkGEc59sUmw/4ty5Zj/b0WHGs1LgecuBSBGrg==} engines: {node: '>=0.8.0'} @@ -12963,6 +12978,7 @@ packages: optional: true dependencies: ms: 2.1.2 + dev: true /debug/4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} @@ -14155,12 +14171,6 @@ packages: dev: true optional: true - /esbuild-node-loader/0.6.5: - resolution: {integrity: sha512-uPP+dllWm38cFvDysdocutN3lfe5pTIbddAHp1ENyLzpHYqE2r+3Wo+pfg9X3p8DFWwzIisft5YkeBIthIcixw==} - dependencies: - esbuild: 0.14.47 - dev: true - /esbuild-openbsd-64/0.14.35: resolution: {integrity: sha512-uNWRf9p69irg4X2yZ5M5GrPi7+F54+DsmYKBXGTIImtyanSAy0nEH6ejmHD2/uypPrlKFf+U746bMwZFIxy5zw==} engines: {node: '>=12'} @@ -14188,14 +14198,6 @@ packages: dev: true optional: true - /esbuild-register/3.3.3_esbuild@0.14.47: - resolution: {integrity: sha512-eFHOkutgIMJY5gc8LUp/7c+LLlDqzNi9T6AwCZ2WKKl3HmT+5ef3ZRyPPxDOynInML0fgaC50yszPKfPnjC0NQ==} - peerDependencies: - esbuild: '>=0.12 <1' - dependencies: - esbuild: 0.14.47 - dev: true - /esbuild-sunos-64/0.14.35: resolution: {integrity: sha512-WwAS084DuK2AHe+9z0DGbLbv3Cf9H4H7YsBhS7sBIIZ9iY2r0Oikrw11p1VSPDXjgtB/6AYIckJDCRAFEX07rQ==} engines: {node: '>=12'} @@ -14637,17 +14639,6 @@ packages: - supports-color dev: true - /esno/0.14.1: - resolution: {integrity: sha512-yDFYw6dGUjCT1qKsdG7WOc/RzIh/qwxUEVZ+ohCltaxBxEFMNqeqbQL9xjRl6Yvdwrfc5OCjUA9JbFmuu/8BKg==} - hasBin: true - dependencies: - cross-spawn: 7.0.3 - esbuild: 0.14.47 - esbuild-node-loader: 0.6.5 - esbuild-register: 3.3.3_esbuild@0.14.47 - import-meta-resolve: 1.1.1 - dev: true - /espree/9.3.2: resolution: {integrity: sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -15296,18 +15287,6 @@ packages: peerDependenciesMeta: debug: optional: true - dev: true - - /follow-redirects/1.15.1_debug@4.3.2: - resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - dependencies: - debug: 4.3.2 /for-each/0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -15631,6 +15610,10 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.1.2 + /get-tsconfig/4.2.0: + resolution: {integrity: sha512-X8u8fREiYOE6S8hLbq99PeykTDoLVnxvF4DjWKJmz9xy2nNRdUcV8ZN9tniJFeKyTU3qnC9lL8n4Chd6LmVKHg==} + dev: true + /get-value/2.0.6: resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==} engines: {node: '>=0.10.0'} @@ -16513,12 +16496,6 @@ packages: resolve-cwd: 3.0.0 dev: true - /import-meta-resolve/1.1.1: - resolution: {integrity: sha512-JiTuIvVyPaUg11eTrNDx5bgQ/yMKMZffc7YSjvQeSMXy58DO2SQ8BtAf3xteZvmzvjYh14wnqNjL8XVeDy2o9A==} - dependencies: - builtins: 4.1.0 - dev: true - /imurmurhash/0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} engines: {node: '>=0.8.19'} @@ -22592,7 +22569,6 @@ packages: prettier: '>= 1.16.0' dependencies: sort-package-json: 1.57.0 - dev: false /prettier-plugin-packagejson/2.2.18_prettier@2.7.1: resolution: {integrity: sha512-iBjQ3IY6IayFrQHhXvg+YvKprPUUiIJ04Vr9+EbeQPfwGajznArIqrN33c5bi4JcIvmLHGROIMOm9aYakJj/CA==} @@ -27789,6 +27765,17 @@ packages: tslib: 1.14.1 dev: false + /tsx/3.8.0: + resolution: {integrity: sha512-PcvTwRXTm6hDWfPihA4n5WW/9SmgFNxKaDKqvLLG+FKNEPA4crsipChzC7PVozPtdOaMfR5QctDlkC/hKoIsxw==} + hasBin: true + dependencies: + '@esbuild-kit/cjs-loader': 2.3.1 + '@esbuild-kit/core-utils': 2.1.0 + '@esbuild-kit/esm-loader': 2.4.1 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /tty-browserify/0.0.0: resolution: {integrity: sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=} dev: false diff --git a/scripts/bin/umi-scripts.js b/scripts/bin/umi-scripts.js index 243a2a35133b..7c76aff80400 100755 --- a/scripts/bin/umi-scripts.js +++ b/scripts/bin/umi-scripts.js @@ -18,7 +18,7 @@ assert( console.log(chalk.cyan(`umi-scripts: ${name}\n`)) const spawn = sync( - 'esno', + 'tsx', [scriptsPath, ...argv.slice(1)], { env: process.env,