Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:privatenumber/tsx into retry-fla…
Browse files Browse the repository at this point in the history
…ky-test
  • Loading branch information
privatenumber committed Apr 24, 2024
2 parents 835fe2c + 01eee34 commit c249d58
Show file tree
Hide file tree
Showing 7 changed files with 837 additions and 562 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 2 additions & 3 deletions package.json
Expand Up @@ -36,7 +36,7 @@
"scripts": {
"prepare": "pnpm simple-git-hooks",
"build": "pkgroll --target=node12.19 --minify",
"lint": "lint --node --cache .",
"lint": "lintroll --node --cache .",
"type-check": "tsc --noEmit",
"test": "pnpm build && node ./dist/cli.mjs tests/index.ts",
"prepack": "pnpm build && clean-pkg-json",
Expand All @@ -62,7 +62,6 @@
},
"devDependencies": {
"@ampproject/remapping": "^2.2.1",
"@pvtnbr/eslint-config": "^1.0.3",
"@types/cross-spawn": "^6.0.6",
"@types/node": "^20.9.4",
"@types/react": "^18.2.38",
Expand All @@ -74,13 +73,13 @@
"cleye": "^1.3.2",
"cross-spawn": "^7.0.3",
"es-module-lexer": "^1.4.1",
"eslint": "^8.56.0",
"execa": "^8.0.1",
"fs-fixture": "^1.2.0",
"fs-require": "^1.6.0",
"get-node": "^15.0.0",
"kolorist": "^1.8.0",
"lint-staged": "^15.1.0",
"lintroll": "^1.4.1",
"magic-string": "^0.30.5",
"manten": "github:privatenumber/manten#npm/retry",
"memfs": "^4.6.0",
Expand Down
1,390 changes: 833 additions & 557 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/loader.ts
@@ -1,7 +1,7 @@
import './patch-repl.js';

// Hook require() to transform to CJS
// eslint-disable-next-line import/no-unresolved
// eslint-disable-next-line import-x/no-unresolved
require('./cjs/index.cjs');

/*
Expand Down
2 changes: 1 addition & 1 deletion src/preflight.cts
Expand Up @@ -62,7 +62,7 @@ if (isMainThread) {
* Although it is required twice, it's not executed twice because
* it's cached.
*/
// eslint-disable-next-line import/no-unresolved, n/global-require
// eslint-disable-next-line import-x/no-unresolved, n/global-require
require('./cjs/index.cjs');

(async () => {
Expand Down

0 comments on commit c249d58

Please sign in to comment.