diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json deleted file mode 100644 index 5bbefffbabee3..0000000000000 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "commonjs" -} diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/index.js b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/index.js similarity index 100% rename from node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/index.js rename to node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/index.js diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json new file mode 100644 index 0000000000000..0292b9956f2e4 --- /dev/null +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json @@ -0,0 +1 @@ +{"type":"commonjs"} \ No newline at end of file diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/index.js b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/index.js similarity index 100% rename from node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/index.js rename to node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/index.js diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json new file mode 100644 index 0000000000000..7c34deb5837d8 --- /dev/null +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json @@ -0,0 +1 @@ +{"type":"module"} \ No newline at end of file diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json deleted file mode 100644 index 3dbc1ca591c05..0000000000000 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "module" -} diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json index 6faaa247a5bc6..4398347289164 100644 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json @@ -1,22 +1,29 @@ { "name": "minipass", - "version": "7.0.3", + "version": "7.0.4", "description": "minimal implementation of a PassThrough stream", - "main": "./dist/cjs/index.js", - "module": "./dist/mjs/index.js", - "types": "./dist/cjs/index.js", + "main": "./dist/commonjs/index.js", + "types": "./dist/commonjs/index.d.ts", + "type": "module", + "tshy": { + "main": true, + "exports": { + "./package.json": "./package.json", + ".": "./src/index.ts" + } + }, "exports": { + "./package.json": "./package.json", ".": { "import": { - "types": "./dist/mjs/index.d.ts", - "default": "./dist/mjs/index.js" + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" }, "require": { - "types": "./dist/cjs/index.d.ts", - "default": "./dist/cjs/index.js" + "types": "./dist/commonjs/index.d.ts", + "default": "./dist/commonjs/index.js" } - }, - "./package.json": "./package.json" + } }, "files": [ "dist" @@ -25,24 +32,13 @@ "preversion": "npm test", "postversion": "npm publish", "prepublishOnly": "git push origin --follow-tags", - "preprepare": "rm -rf dist", - "prepare": "tsc -p tsconfig.json && tsc -p tsconfig-esm.json && bash ./scripts/fixup.sh", + "prepare": "tshy", "pretest": "npm run prepare", "presnap": "npm run prepare", - "test": "c8 tap", - "snap": "c8 tap", + "test": "tap", + "snap": "tap", "format": "prettier --write . --loglevel warn", - "typedoc": "typedoc --tsconfig tsconfig-esm.json ./src/*.ts" - }, - "tap": { - "coverage": false, - "node-arg": [ - "--enable-source-maps", - "--no-warnings", - "--loader", - "ts-node/esm" - ], - "ts": false + "typedoc": "typedoc --tsconfig .tshy/esm.json ./src/*.ts" }, "prettier": { "semi": false, @@ -56,18 +52,17 @@ "endOfLine": "lf" }, "devDependencies": { + "@types/end-of-stream": "^1.4.2", "@types/node": "^20.1.2", - "@types/tap": "^15.0.8", - "c8": "^7.13.0", - "prettier": "^2.6.2", - "tap": "^16.3.0", - "ts-node": "^10.9.1", - "typedoc": "^0.24.8", - "typescript": "^5.1.3", "end-of-stream": "^1.4.0", "node-abort-controller": "^3.1.1", + "prettier": "^2.6.2", "sync-content": "^1.0.2", - "through2": "^2.0.3" + "tap": "^18.3.0", + "through2": "^2.0.3", + "tshy": "^1.2.2", + "typedoc": "^0.25.1", + "typescript": "^5.2.2" }, "repository": "https://github.com/isaacs/minipass", "keywords": [ @@ -78,5 +73,10 @@ "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" + }, + "tap": { + "include": [ + "test/*.ts" + ] } } diff --git a/package-lock.json b/package-lock.json index d0579286a6699..7ad536ff4d1e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10588,9 +10588,9 @@ } }, "node_modules/node-gyp/node_modules/cacache/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "inBundle": true, "engines": { "node": ">=16 || 14 >=14.17"