@psync/patch-package 1.0.0 → 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/detectPackageManager.js +55 -21
- package/dist/getPackageResolution.js +50 -25
- package/dist/parseBunLockfile.js +88 -3
- package/package.json +6 -6
|
@@ -3,42 +3,56 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.detectPackageManager = void 0;
|
|
6
|
+
exports.detectPackageManager = exports.LOCKFILE_NAMES = void 0;
|
|
7
|
+
exports.findBunLockfilePath = findBunLockfilePath;
|
|
7
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
8
9
|
const path_1 = require("./path");
|
|
9
10
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
11
|
const process_1 = __importDefault(require("process"));
|
|
11
12
|
const find_yarn_workspace_root_1 = __importDefault(require("find-yarn-workspace-root"));
|
|
13
|
+
/**
|
|
14
|
+
* The set of lockfile filenames patch-package recognises for each package
|
|
15
|
+
* manager. Exposed so other modules can resolve the actual file in use.
|
|
16
|
+
*/
|
|
17
|
+
exports.LOCKFILE_NAMES = {
|
|
18
|
+
yarn: "yarn.lock",
|
|
19
|
+
npm: "package-lock.json",
|
|
20
|
+
"npm-shrinkwrap": "npm-shrinkwrap.json",
|
|
21
|
+
// bun.lockb is the legacy binary lockfile (Bun < 1.2).
|
|
22
|
+
// bun.lock is the text/JSONC lockfile used by Bun >= 1.2 (incl. 1.3.14).
|
|
23
|
+
bun: "bun.lock",
|
|
24
|
+
bunLegacy: "bun.lockb",
|
|
25
|
+
};
|
|
12
26
|
function printNoYarnLockfileError() {
|
|
13
|
-
console.log(`
|
|
14
|
-
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`The --use-yarn option was specified but there is no yarn.lock file`)}
|
|
27
|
+
console.log(`
|
|
28
|
+
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`The --use-yarn option was specified but there is no yarn.lock file`)}
|
|
15
29
|
`);
|
|
16
30
|
}
|
|
17
31
|
function printNoBunLockfileError() {
|
|
18
|
-
console.log(`
|
|
19
|
-
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`The --use-bun option was specified but there is no bun.lockb file`)}
|
|
32
|
+
console.log(`
|
|
33
|
+
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`The --use-bun option was specified but there is no bun.lock or bun.lockb file`)}
|
|
20
34
|
`);
|
|
21
35
|
}
|
|
22
36
|
function printNoLockfilesError() {
|
|
23
|
-
console.log(`
|
|
24
|
-
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`No package-lock.json, npm-shrinkwrap.json, yarn.lock, or bun.lockb file.
|
|
25
|
-
|
|
26
|
-
You must use either npm@>=5, yarn, npm-shrinkwrap, or bun to manage this project's
|
|
27
|
-
dependencies.`)}
|
|
37
|
+
console.log(`
|
|
38
|
+
${chalk_1.default.red.bold("**ERROR**")} ${chalk_1.default.red(`No package-lock.json, npm-shrinkwrap.json, yarn.lock, bun.lock, or bun.lockb file.
|
|
39
|
+
|
|
40
|
+
You must use either npm@>=5, yarn, npm-shrinkwrap, or bun to manage this project's
|
|
41
|
+
dependencies.`)}
|
|
28
42
|
`);
|
|
29
43
|
}
|
|
30
44
|
function printSelectingDefaultMessage() {
|
|
31
|
-
console.info(`${chalk_1.default.bold("patch-package")}: you have multiple lockfiles, e.g. yarn.lock and package-lock.json
|
|
32
|
-
Defaulting to using ${chalk_1.default.bold("npm")}
|
|
33
|
-
You can override this setting by passing --use-yarn, --use-bun, or
|
|
34
|
-
deleting the conflicting lockfile if you don't need it
|
|
45
|
+
console.info(`${chalk_1.default.bold("patch-package")}: you have multiple lockfiles, e.g. yarn.lock and package-lock.json
|
|
46
|
+
Defaulting to using ${chalk_1.default.bold("npm")}
|
|
47
|
+
You can override this setting by passing --use-yarn, --use-bun, or
|
|
48
|
+
deleting the conflicting lockfile if you don't need it
|
|
35
49
|
`);
|
|
36
50
|
}
|
|
37
51
|
function printSelectingDefaultYarnMessage() {
|
|
38
|
-
console.info(`${chalk_1.default.bold("patch-package")}: you have both yarn.lock and bun.lockb
|
|
39
|
-
Defaulting to using ${chalk_1.default.bold("yarn")}
|
|
40
|
-
You can override this setting by passing --use-bun, or
|
|
41
|
-
deleting yarn.lock if you don't need it
|
|
52
|
+
console.info(`${chalk_1.default.bold("patch-package")}: you have both yarn.lock and a bun lockfile (bun.lock or bun.lockb)
|
|
53
|
+
Defaulting to using ${chalk_1.default.bold("yarn")}
|
|
54
|
+
You can override this setting by passing --use-bun, or
|
|
55
|
+
deleting yarn.lock if you don't need it
|
|
42
56
|
`);
|
|
43
57
|
}
|
|
44
58
|
function checkForYarnOverride(overridePackageManager) {
|
|
@@ -58,11 +72,15 @@ const detectPackageManager = (appRootPath, overridePackageManager) => {
|
|
|
58
72
|
const shrinkWrapExists = fs_extra_1.default.existsSync((0, path_1.join)(appRootPath, "npm-shrinkwrap.json"));
|
|
59
73
|
const yarnLockExists = fs_extra_1.default.existsSync((0, path_1.join)((0, find_yarn_workspace_root_1.default)() ?? appRootPath, "yarn.lock"));
|
|
60
74
|
// Bun workspaces seem to work the same as yarn workspaces - https://bun.sh/docs/install/workspaces
|
|
75
|
+
// bun.lock is the text/JSONC format used by Bun >= 1.2 (incl. 1.3.14).
|
|
76
|
+
// bun.lockb is the legacy binary format used by Bun < 1.2.
|
|
77
|
+
const bunLockExists = fs_extra_1.default.existsSync((0, path_1.join)((0, find_yarn_workspace_root_1.default)() ?? appRootPath, "bun.lock"));
|
|
61
78
|
const bunLockbExists = fs_extra_1.default.existsSync((0, path_1.join)((0, find_yarn_workspace_root_1.default)() ?? appRootPath, "bun.lockb"));
|
|
79
|
+
const anyBunLockExists = bunLockExists || bunLockbExists;
|
|
62
80
|
if ([
|
|
63
81
|
packageLockExists || shrinkWrapExists,
|
|
64
82
|
yarnLockExists,
|
|
65
|
-
|
|
83
|
+
anyBunLockExists,
|
|
66
84
|
].filter(Boolean).length > 1) {
|
|
67
85
|
if (overridePackageManager) {
|
|
68
86
|
return overridePackageManager;
|
|
@@ -84,7 +102,7 @@ const detectPackageManager = (appRootPath, overridePackageManager) => {
|
|
|
84
102
|
checkForBunOverride(overridePackageManager);
|
|
85
103
|
return "yarn";
|
|
86
104
|
}
|
|
87
|
-
else if (
|
|
105
|
+
else if (anyBunLockExists) {
|
|
88
106
|
checkForYarnOverride(overridePackageManager);
|
|
89
107
|
return "bun";
|
|
90
108
|
}
|
|
@@ -95,4 +113,20 @@ const detectPackageManager = (appRootPath, overridePackageManager) => {
|
|
|
95
113
|
throw Error();
|
|
96
114
|
};
|
|
97
115
|
exports.detectPackageManager = detectPackageManager;
|
|
98
|
-
|
|
116
|
+
/**
|
|
117
|
+
* Returns the path to the actual bun lockfile that exists on disk, preferring
|
|
118
|
+
* the new `bun.lock` text format over the legacy `bun.lockb` binary format.
|
|
119
|
+
*
|
|
120
|
+
* Returns `null` if neither exists.
|
|
121
|
+
*/
|
|
122
|
+
function findBunLockfilePath(appRootPath) {
|
|
123
|
+
const root = (0, find_yarn_workspace_root_1.default)() ?? appRootPath;
|
|
124
|
+
if (fs_extra_1.default.existsSync((0, path_1.join)(root, "bun.lock"))) {
|
|
125
|
+
return (0, path_1.join)(root, "bun.lock");
|
|
126
|
+
}
|
|
127
|
+
if (fs_extra_1.default.existsSync((0, path_1.join)(root, "bun.lockb"))) {
|
|
128
|
+
return (0, path_1.join)(root, "bun.lockb");
|
|
129
|
+
}
|
|
130
|
+
return null;
|
|
131
|
+
}
|
|
132
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"detectPackageManager.js","sourceRoot":"","sources":["../src/detectPackageManager.ts"],"names":[],"mappings":";;;;;;AAsJA,kDASC;AA/JD,wDAAyB;AACzB,iCAA6B;AAC7B,kDAAyB;AACzB,sDAA6B;AAC7B,wFAAwD;AAIxD;;;GAGG;AACU,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,WAAW;IACjB,GAAG,EAAE,mBAAmB;IACxB,gBAAgB,EAAE,qBAAqB;IACvC,uDAAuD;IACvD,yEAAyE;IACzE,GAAG,EAAE,UAAU;IACf,SAAS,EAAE,WAAW;CACd,CAAA;AAEV,SAAS,wBAAwB;IAC/B,OAAO,CAAC,GAAG,CAAC;EACZ,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,eAAK,CAAC,GAAG,CACtC,oEAAoE,CACrE;CACF,CAAC,CAAA;AACF,CAAC;AAED,SAAS,uBAAuB;IAC9B,OAAO,CAAC,GAAG,CAAC;EACZ,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,eAAK,CAAC,GAAG,CACtC,+EAA+E,CAChF;CACF,CAAC,CAAA;AACF,CAAC;AAED,SAAS,qBAAqB;IAC5B,OAAO,CAAC,GAAG,CAAC;EACZ,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,eAAK,CAAC,GAAG,CACtC;;;cAGU,CACX;CACF,CAAC,CAAA;AACF,CAAC;AAED,SAAS,4BAA4B;IACnC,OAAO,CAAC,IAAI,CACV,GAAG,eAAK,CAAC,IAAI,CACX,eAAe,CAChB;sBACiB,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC;;;CAGtC,CACE,CAAA;AACH,CAAC;AAED,SAAS,gCAAgC;IACvC,OAAO,CAAC,IAAI,CACV,GAAG,eAAK,CAAC,IAAI,CACX,eAAe,CAChB;sBACiB,eAAK,CAAC,IAAI,CAAC,MAAM,CAAC;;;CAGvC,CACE,CAAA;AACH,CAAC;AAED,SAAS,oBAAoB,CAAC,sBAA6C;IACzE,IAAI,sBAAsB,KAAK,MAAM,EAAE,CAAC;QACtC,wBAAwB,EAAE,CAAA;QAC1B,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,sBAA6C;IACxE,IAAI,sBAAsB,KAAK,KAAK,EAAE,CAAC;QACrC,uBAAuB,EAAE,CAAA;QACzB,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;AACH,CAAC;AAEM,MAAM,oBAAoB,GAAG,CAClC,WAAmB,EACnB,sBAA6C,EAC7B,EAAE;IAClB,MAAM,iBAAiB,GAAG,kBAAE,CAAC,UAAU,CACrC,IAAA,WAAI,EAAC,WAAW,EAAE,mBAAmB,CAAC,CACvC,CAAA;IACD,MAAM,gBAAgB,GAAG,kBAAE,CAAC,UAAU,CACpC,IAAA,WAAI,EAAC,WAAW,EAAE,qBAAqB,CAAC,CACzC,CAAA;IACD,MAAM,cAAc,GAAG,kBAAE,CAAC,UAAU,CAClC,IAAA,WAAI,EAAC,IAAA,kCAAiB,GAAE,IAAI,WAAW,EAAE,WAAW,CAAC,CACtD,CAAA;IACD,mGAAmG;IACnG,uEAAuE;IACvE,2DAA2D;IAC3D,MAAM,aAAa,GAAG,kBAAE,CAAC,UAAU,CACjC,IAAA,WAAI,EAAC,IAAA,kCAAiB,GAAE,IAAI,WAAW,EAAE,UAAU,CAAC,CACrD,CAAA;IACD,MAAM,cAAc,GAAG,kBAAE,CAAC,UAAU,CAClC,IAAA,WAAI,EAAC,IAAA,kCAAiB,GAAE,IAAI,WAAW,EAAE,WAAW,CAAC,CACtD,CAAA;IACD,MAAM,gBAAgB,GAAG,aAAa,IAAI,cAAc,CAAA;IACxD,IACE;QACE,iBAAiB,IAAI,gBAAgB;QACrC,cAAc;QACd,gBAAgB;KACjB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAC5B,CAAC;QACD,IAAI,sBAAsB,EAAE,CAAC;YAC3B,OAAO,sBAAsB,CAAA;QAC/B,CAAC;QACD,IAAI,CAAC,iBAAiB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5C,mGAAmG;YACnG,gCAAgC,EAAE,CAAA;YAClC,OAAO,MAAM,CAAA;QACf,CAAC;QACD,4BAA4B,EAAE,CAAA;QAC9B,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAA;IACpD,CAAC;SAAM,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;QACjD,oBAAoB,CAAC,sBAAsB,CAAC,CAAA;QAC5C,mBAAmB,CAAC,sBAAsB,CAAC,CAAA;QAC3C,OAAO,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAA;IACpD,CAAC;SAAM,IAAI,cAAc,EAAE,CAAC;QAC1B,mBAAmB,CAAC,sBAAsB,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAA;IACf,CAAC;SAAM,IAAI,gBAAgB,EAAE,CAAC;QAC5B,oBAAoB,CAAC,sBAAsB,CAAC,CAAA;QAC5C,OAAO,KAAK,CAAA;IACd,CAAC;SAAM,CAAC;QACN,qBAAqB,EAAE,CAAA;QACvB,iBAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACjB,CAAC;IACD,MAAM,KAAK,EAAE,CAAA;AACf,CAAC,CAAA;AAvDY,QAAA,oBAAoB,wBAuDhC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,WAAmB;IACrD,MAAM,IAAI,GAAG,IAAA,kCAAiB,GAAE,IAAI,WAAW,CAAA;IAC/C,IAAI,kBAAE,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAC/B,CAAC;IACD,IAAI,kBAAE,CAAC,UAAU,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAChC,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC","sourcesContent":["import fs from \"fs-extra\"\nimport { join } from \"./path\"\nimport chalk from \"chalk\"\nimport process from \"process\"\nimport findWorkspaceRoot from \"find-yarn-workspace-root\"\n\nexport type PackageManager = \"yarn\" | \"npm\" | \"npm-shrinkwrap\" | \"bun\"\n\n/**\n * The set of lockfile filenames patch-package recognises for each package\n * manager. Exposed so other modules can resolve the actual file in use.\n */\nexport const LOCKFILE_NAMES = {\n  yarn: \"yarn.lock\",\n  npm: \"package-lock.json\",\n  \"npm-shrinkwrap\": \"npm-shrinkwrap.json\",\n  // bun.lockb is the legacy binary lockfile (Bun < 1.2).\n  // bun.lock is the text/JSONC lockfile used by Bun >= 1.2 (incl. 1.3.14).\n  bun: \"bun.lock\",\n  bunLegacy: \"bun.lockb\",\n} as const\n\nfunction printNoYarnLockfileError() {\n  console.log(`\n${chalk.red.bold(\"**ERROR**\")} ${chalk.red(\n    `The --use-yarn option was specified but there is no yarn.lock file`,\n  )}\n`)\n}\n\nfunction printNoBunLockfileError() {\n  console.log(`\n${chalk.red.bold(\"**ERROR**\")} ${chalk.red(\n    `The --use-bun option was specified but there is no bun.lock or bun.lockb file`,\n  )}\n`)\n}\n\nfunction printNoLockfilesError() {\n  console.log(`\n${chalk.red.bold(\"**ERROR**\")} ${chalk.red(\n    `No package-lock.json, npm-shrinkwrap.json, yarn.lock, bun.lock, or bun.lockb file.\n\nYou must use either npm@>=5, yarn, npm-shrinkwrap, or bun to manage this project's\ndependencies.`,\n  )}\n`)\n}\n\nfunction printSelectingDefaultMessage() {\n  console.info(\n    `${chalk.bold(\n      \"patch-package\",\n    )}: you have multiple lockfiles, e.g. yarn.lock and package-lock.json\nDefaulting to using ${chalk.bold(\"npm\")}\nYou can override this setting by passing --use-yarn, --use-bun, or\ndeleting the conflicting lockfile if you don't need it\n`,\n  )\n}\n\nfunction printSelectingDefaultYarnMessage() {\n  console.info(\n    `${chalk.bold(\n      \"patch-package\",\n    )}: you have both yarn.lock and a bun lockfile (bun.lock or bun.lockb)\nDefaulting to using ${chalk.bold(\"yarn\")}\nYou can override this setting by passing --use-bun, or\ndeleting yarn.lock if you don't need it\n`,\n  )\n}\n\nfunction checkForYarnOverride(overridePackageManager: PackageManager | null) {\n  if (overridePackageManager === \"yarn\") {\n    printNoYarnLockfileError()\n    process.exit(1)\n  }\n}\n\nfunction checkForBunOverride(overridePackageManager: PackageManager | null) {\n  if (overridePackageManager === \"bun\") {\n    printNoBunLockfileError()\n    process.exit(1)\n  }\n}\n\nexport const detectPackageManager = (\n  appRootPath: string,\n  overridePackageManager: PackageManager | null,\n): PackageManager => {\n  const packageLockExists = fs.existsSync(\n    join(appRootPath, \"package-lock.json\"),\n  )\n  const shrinkWrapExists = fs.existsSync(\n    join(appRootPath, \"npm-shrinkwrap.json\"),\n  )\n  const yarnLockExists = fs.existsSync(\n    join(findWorkspaceRoot() ?? appRootPath, \"yarn.lock\"),\n  )\n  // Bun workspaces seem to work the same as yarn workspaces - https://bun.sh/docs/install/workspaces\n  // bun.lock is the text/JSONC format used by Bun >= 1.2 (incl. 1.3.14).\n  // bun.lockb is the legacy binary format used by Bun < 1.2.\n  const bunLockExists = fs.existsSync(\n    join(findWorkspaceRoot() ?? appRootPath, \"bun.lock\"),\n  )\n  const bunLockbExists = fs.existsSync(\n    join(findWorkspaceRoot() ?? appRootPath, \"bun.lockb\"),\n  )\n  const anyBunLockExists = bunLockExists || bunLockbExists\n  if (\n    [\n      packageLockExists || shrinkWrapExists,\n      yarnLockExists,\n      anyBunLockExists,\n    ].filter(Boolean).length > 1\n  ) {\n    if (overridePackageManager) {\n      return overridePackageManager\n    }\n    if (!packageLockExists && !shrinkWrapExists) {\n      // The only case where we don't want to default to npm is when we have both yarn and bun lockfiles.\n      printSelectingDefaultYarnMessage()\n      return \"yarn\"\n    }\n    printSelectingDefaultMessage()\n    return shrinkWrapExists ? \"npm-shrinkwrap\" : \"npm\"\n  } else if (packageLockExists || shrinkWrapExists) {\n    checkForYarnOverride(overridePackageManager)\n    checkForBunOverride(overridePackageManager)\n    return shrinkWrapExists ? \"npm-shrinkwrap\" : \"npm\"\n  } else if (yarnLockExists) {\n    checkForBunOverride(overridePackageManager)\n    return \"yarn\"\n  } else if (anyBunLockExists) {\n    checkForYarnOverride(overridePackageManager)\n    return \"bun\"\n  } else {\n    printNoLockfilesError()\n    process.exit(1)\n  }\n  throw Error()\n}\n\n/**\n * Returns the path to the actual bun lockfile that exists on disk, preferring\n * the new `bun.lock` text format over the legacy `bun.lockb` binary format.\n *\n * Returns `null` if neither exists.\n */\nexport function findBunLockfilePath(appRootPath: string): string | null {\n  const root = findWorkspaceRoot() ?? appRootPath\n  if (fs.existsSync(join(root, \"bun.lock\"))) {\n    return join(root, \"bun.lock\")\n  }\n  if (fs.existsSync(join(root, \"bun.lockb\"))) {\n    return join(root, \"bun.lockb\")\n  }\n  return null\n}\n"]}
|
|
@@ -17,38 +17,63 @@ const parseBunLockfile_1 = require("./parseBunLockfile");
|
|
|
17
17
|
function getPackageResolution({ packageDetails, packageManager, appPath, }) {
|
|
18
18
|
if (packageManager === "yarn" || packageManager === "bun") {
|
|
19
19
|
const isBun = packageManager === "bun";
|
|
20
|
-
const lockFileName = isBun ? "bun.lockb" : "yarn.lock";
|
|
21
|
-
let lockFilePath = lockFileName;
|
|
22
|
-
if (!(0, fs_extra_1.existsSync)(lockFilePath)) {
|
|
23
|
-
const workspaceRoot = (0, find_yarn_workspace_root_1.default)();
|
|
24
|
-
if (!workspaceRoot) {
|
|
25
|
-
throw new Error(`Can't find ${lockFileName} file`);
|
|
26
|
-
}
|
|
27
|
-
lockFilePath = (0, path_1.join)(workspaceRoot, lockFilePath);
|
|
28
|
-
}
|
|
29
|
-
if (!(0, fs_extra_1.existsSync)(lockFilePath)) {
|
|
30
|
-
throw new Error(`Can't find ${lockFileName} file`);
|
|
31
|
-
}
|
|
32
|
-
const lockFileString = isBun
|
|
33
|
-
? (0, parseBunLockfile_1.parseBunLockfile)(lockFilePath)
|
|
34
|
-
: (0, fs_extra_1.readFileSync)(lockFilePath).toString();
|
|
35
20
|
let appLockFile;
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
21
|
+
if (isBun) {
|
|
22
|
+
// Bun lockfile resolution. Two formats exist:
|
|
23
|
+
// - bun.lock : text/JSONC, Bun >= 1.2 (incl. 1.3.14) — default
|
|
24
|
+
// - bun.lockb : binary, Bun < 1.2 — legacy
|
|
25
|
+
const bunLockPath = (0, detectPackageManager_1.findBunLockfilePath)(appPath);
|
|
26
|
+
if (!bunLockPath) {
|
|
27
|
+
throw new Error(`Can't find bun.lock or bun.lockb file`);
|
|
28
|
+
}
|
|
29
|
+
if (bunLockPath.endsWith("bun.lock")) {
|
|
30
|
+
// New text format. parseBunLockTextFile already returns a
|
|
31
|
+
// yarn-v1-compatible object, so we can skip the yarn lockfile parser.
|
|
32
|
+
appLockFile = (0, parseBunLockfile_1.parseBunLockTextFile)(bunLockPath);
|
|
40
33
|
}
|
|
41
34
|
else {
|
|
35
|
+
// Legacy binary format: dump to yarn-v1 text via `bun bun.lockb`,
|
|
36
|
+
// then parse it with the yarn lockfile parser.
|
|
37
|
+
const lockFileString = (0, parseBunLockfile_1.parseBunLockfile)(bunLockPath);
|
|
38
|
+
const parsedYarnLockFile = (0, lockfile_1.parse)(lockFileString);
|
|
39
|
+
if (parsedYarnLockFile.type !== "success") {
|
|
40
|
+
throw new Error(`Could not parse yarn v1 lock file - was originally a bun.lockb file`);
|
|
41
|
+
}
|
|
42
42
|
appLockFile = parsedYarnLockFile.object;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
else {
|
|
46
|
-
|
|
47
|
-
|
|
46
|
+
// yarn
|
|
47
|
+
const lockFileName = "yarn.lock";
|
|
48
|
+
let lockFilePath = lockFileName;
|
|
49
|
+
if (!(0, fs_extra_1.existsSync)(lockFilePath)) {
|
|
50
|
+
const workspaceRoot = (0, find_yarn_workspace_root_1.default)();
|
|
51
|
+
if (!workspaceRoot) {
|
|
52
|
+
throw new Error(`Can't find ${lockFileName} file`);
|
|
53
|
+
}
|
|
54
|
+
lockFilePath = (0, path_1.join)(workspaceRoot, lockFilePath);
|
|
48
55
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
56
|
+
if (!(0, fs_extra_1.existsSync)(lockFilePath)) {
|
|
57
|
+
throw new Error(`Can't find ${lockFileName} file`);
|
|
58
|
+
}
|
|
59
|
+
const lockFileString = (0, fs_extra_1.readFileSync)(lockFilePath).toString();
|
|
60
|
+
if (lockFileString.includes("yarn lockfile v1")) {
|
|
61
|
+
const parsedYarnLockFile = (0, lockfile_1.parse)(lockFileString);
|
|
62
|
+
if (parsedYarnLockFile.type !== "success") {
|
|
63
|
+
throw new Error(`Could not parse yarn v1 lock file`);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
appLockFile = parsedYarnLockFile.object;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
try {
|
|
71
|
+
appLockFile = yaml_1.default.parse(lockFileString);
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
console.log(e);
|
|
75
|
+
throw new Error(`Could not parse yarn v2 lock file`);
|
|
76
|
+
}
|
|
52
77
|
}
|
|
53
78
|
}
|
|
54
79
|
const installedVersion = (0, getPackageVersion_1.getPackageVersion)((0, path_1.join)((0, path_1.resolve)(appPath, packageDetails.path), "package.json"));
|
|
@@ -118,4 +143,4 @@ if (require.main === module) {
|
|
|
118
143
|
packageManager: (0, detectPackageManager_1.detectPackageManager)(process.cwd(), null),
|
|
119
144
|
}));
|
|
120
145
|
}
|
|
121
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getPackageResolution.js","sourceRoot":"","sources":["../src/getPackageResolution.ts"],"names":[],"mappings":"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","sourcesContent":["import { join, resolve } from \"./path\"\r\nimport { PackageDetails, getPatchDetailsFromCliString } from \"./PackageDetails\"\r\nimport { PackageManager, detectPackageManager } from \"./detectPackageManager\"\r\nimport { readFileSync, existsSync } from \"fs-extra\"\r\nimport { parse as parseYarnLockFile } from \"@yarnpkg/lockfile\"\r\nimport yaml from \"yaml\"\r\nimport findWorkspaceRoot from \"find-yarn-workspace-root\"\r\nimport { getPackageVersion } from \"./getPackageVersion\"\r\nimport { coerceSemVer } from \"./coerceSemVer\"\r\nimport { parseBunLockfile } from \"./parseBunLockfile\"\r\n\r\nexport function getPackageResolution({\r\n  packageDetails,\r\n  packageManager,\r\n  appPath,\r\n}: {\r\n  packageDetails: PackageDetails\r\n  packageManager: PackageManager\r\n  appPath: string\r\n}) {\r\n  if (packageManager === \"yarn\" || packageManager === \"bun\") {\r\n    const isBun = packageManager === \"bun\"\r\n    const lockFileName = isBun ? \"bun.lockb\" : \"yarn.lock\"\r\n    let lockFilePath = lockFileName\r\n    if (!existsSync(lockFilePath)) {\r\n      const workspaceRoot = findWorkspaceRoot()\r\n      if (!workspaceRoot) {\r\n        throw new Error(`Can't find ${lockFileName} file`)\r\n      }\r\n      lockFilePath = join(workspaceRoot, lockFilePath)\r\n    }\r\n    if (!existsSync(lockFilePath)) {\r\n      throw new Error(`Can't find ${lockFileName} file`)\r\n    }\r\n    const lockFileString = isBun\r\n      ? parseBunLockfile(lockFilePath)\r\n      : readFileSync(lockFilePath).toString()\r\n    let appLockFile\r\n    if (lockFileString.includes(\"yarn lockfile v1\")) {\r\n      const parsedYarnLockFile = parseYarnLockFile(lockFileString)\r\n      if (parsedYarnLockFile.type !== \"success\") {\r\n        throw new Error(\r\n          `Could not parse yarn v1 lock file ${\r\n            isBun ? \"- was originally a bun.lockb file\" : \"\"\r\n          }`,\r\n        )\r\n      } else {\r\n        appLockFile = parsedYarnLockFile.object\r\n      }\r\n    } else {\r\n      try {\r\n        appLockFile = yaml.parse(lockFileString)\r\n      } catch (e) {\r\n        console.log(e)\r\n        throw new Error(\r\n          `Could not parse yarn v2 lock file ${\r\n            isBun ? \"- was originally a bun.lockb file (should not happen)\" : \"\"\r\n          }`,\r\n        )\r\n      }\r\n    }\r\n\r\n    const installedVersion = getPackageVersion(\r\n      join(resolve(appPath, packageDetails.path), \"package.json\"),\r\n    )\r\n\r\n    const entries = Object.entries(appLockFile).filter(\r\n      ([k, v]) =>\r\n        k.startsWith(packageDetails.name + \"@\") &&\r\n        // @ts-ignore\r\n        coerceSemVer(v.version) === coerceSemVer(installedVersion),\r\n    )\r\n\r\n    const resolutions = entries.map(([_, v]) => {\r\n      // @ts-ignore\r\n      return v.resolved\r\n    })\r\n\r\n    if (resolutions.length === 0) {\r\n      throw new Error(\r\n        `\\`${packageDetails.pathSpecifier}\\`'s installed version is ${installedVersion} but a lockfile entry for it couldn't be found. Your lockfile is likely to be corrupt or you forgot to reinstall your packages.`,\r\n      )\r\n    }\r\n\r\n    if (new Set(resolutions).size !== 1) {\r\n      console.log(\r\n        `Ambigious lockfile entries for ${packageDetails.pathSpecifier}. Using version ${installedVersion}`,\r\n      )\r\n      return installedVersion\r\n    }\r\n\r\n    if (resolutions[0]) {\r\n      return resolutions[0]\r\n    }\r\n\r\n    const resolution = entries[0][0].slice(packageDetails.name.length + 1)\r\n\r\n    // resolve relative file path\r\n    if (resolution.startsWith(\"file:.\")) {\r\n      return `file:${resolve(appPath, resolution.slice(\"file:\".length))}`\r\n    }\r\n\r\n    if (resolution.startsWith(\"npm:\")) {\r\n      return resolution.replace(\"npm:\", \"\")\r\n    }\r\n\r\n    return resolution\r\n  } else {\r\n    const lockfile = require(\r\n      join(\r\n        appPath,\r\n        packageManager === \"npm-shrinkwrap\"\r\n          ? \"npm-shrinkwrap.json\"\r\n          : \"package-lock.json\",\r\n      ),\r\n    )\r\n    const lockFileStack = [lockfile]\r\n    for (const name of packageDetails.packageNames.slice(0, -1)) {\r\n      const child = lockFileStack[0].dependencies\r\n      if (child && name in child) {\r\n        lockFileStack.push(child[name])\r\n      }\r\n    }\r\n    lockFileStack.reverse()\r\n    const relevantStackEntry = lockFileStack.find((entry) => {\r\n      if (entry.dependencies) {\r\n        return entry.dependencies && packageDetails.name in entry.dependencies\r\n      } else if (entry.packages) {\r\n        return entry.packages && packageDetails.path in entry.packages\r\n      }\r\n      throw new Error(\"Cannot find dependencies or packages in lockfile\")\r\n    })\r\n    const pkg = relevantStackEntry.dependencies\r\n      ? relevantStackEntry.dependencies[packageDetails.name]\r\n      : relevantStackEntry.packages[packageDetails.path]\r\n    return pkg.resolved || pkg.version || pkg.from\r\n  }\r\n}\r\n\r\nif (require.main === module) {\r\n  const packageDetails = getPatchDetailsFromCliString(process.argv[2])\r\n  if (!packageDetails) {\r\n    console.log(`Can't find package ${process.argv[2]}`)\r\n    process.exit(1)\r\n  }\r\n  console.log(\r\n    getPackageResolution({\r\n      appPath: process.cwd(),\r\n      packageDetails,\r\n      packageManager: detectPackageManager(process.cwd(), null),\r\n    }),\r\n  )\r\n}\r\n"]}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getPackageResolution.js","sourceRoot":"","sources":["../src/getPackageResolution.ts"],"names":[],"mappings":"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","sourcesContent":["import { join, resolve } from \"./path\"\nimport { PackageDetails, getPatchDetailsFromCliString } from \"./PackageDetails\"\nimport {\n  PackageManager,\n  detectPackageManager,\n  findBunLockfilePath,\n} from \"./detectPackageManager\"\nimport { readFileSync, existsSync } from \"fs-extra\"\nimport { parse as parseYarnLockFile } from \"@yarnpkg/lockfile\"\nimport yaml from \"yaml\"\nimport findWorkspaceRoot from \"find-yarn-workspace-root\"\nimport { getPackageVersion } from \"./getPackageVersion\"\nimport { coerceSemVer } from \"./coerceSemVer\"\nimport { parseBunLockfile, parseBunLockTextFile } from \"./parseBunLockfile\"\n\nexport function getPackageResolution({\n  packageDetails,\n  packageManager,\n  appPath,\n}: {\n  packageDetails: PackageDetails\n  packageManager: PackageManager\n  appPath: string\n}) {\n  if (packageManager === \"yarn\" || packageManager === \"bun\") {\n    const isBun = packageManager === \"bun\"\n    let appLockFile: Record<string, any>\n\n    if (isBun) {\n      // Bun lockfile resolution. Two formats exist:\n      //   - bun.lock   : text/JSONC, Bun >= 1.2 (incl. 1.3.14) — default\n      //   - bun.lockb  : binary,     Bun < 1.2 — legacy\n      const bunLockPath = findBunLockfilePath(appPath)\n      if (!bunLockPath) {\n        throw new Error(`Can't find bun.lock or bun.lockb file`)\n      }\n      if (bunLockPath.endsWith(\"bun.lock\")) {\n        // New text format. parseBunLockTextFile already returns a\n        // yarn-v1-compatible object, so we can skip the yarn lockfile parser.\n        appLockFile = parseBunLockTextFile(bunLockPath)\n      } else {\n        // Legacy binary format: dump to yarn-v1 text via `bun bun.lockb`,\n        // then parse it with the yarn lockfile parser.\n        const lockFileString = parseBunLockfile(bunLockPath)\n        const parsedYarnLockFile = parseYarnLockFile(lockFileString)\n        if (parsedYarnLockFile.type !== \"success\") {\n          throw new Error(\n            `Could not parse yarn v1 lock file - was originally a bun.lockb file`,\n          )\n        }\n        appLockFile = parsedYarnLockFile.object\n      }\n    } else {\n      // yarn\n      const lockFileName = \"yarn.lock\"\n      let lockFilePath = lockFileName\n      if (!existsSync(lockFilePath)) {\n        const workspaceRoot = findWorkspaceRoot()\n        if (!workspaceRoot) {\n          throw new Error(`Can't find ${lockFileName} file`)\n        }\n        lockFilePath = join(workspaceRoot, lockFilePath)\n      }\n      if (!existsSync(lockFilePath)) {\n        throw new Error(`Can't find ${lockFileName} file`)\n      }\n      const lockFileString = readFileSync(lockFilePath).toString()\n      if (lockFileString.includes(\"yarn lockfile v1\")) {\n        const parsedYarnLockFile = parseYarnLockFile(lockFileString)\n        if (parsedYarnLockFile.type !== \"success\") {\n          throw new Error(`Could not parse yarn v1 lock file`)\n        } else {\n          appLockFile = parsedYarnLockFile.object\n        }\n      } else {\n        try {\n          appLockFile = yaml.parse(lockFileString)\n        } catch (e) {\n          console.log(e)\n          throw new Error(`Could not parse yarn v2 lock file`)\n        }\n      }\n    }\n\n    const installedVersion = getPackageVersion(\n      join(resolve(appPath, packageDetails.path), \"package.json\"),\n    )\n\n    const entries = Object.entries(appLockFile).filter(\n      ([k, v]) =>\n        k.startsWith(packageDetails.name + \"@\") &&\n        // @ts-ignore\n        coerceSemVer(v.version) === coerceSemVer(installedVersion),\n    )\n\n    const resolutions = entries.map(([_, v]) => {\n      // @ts-ignore\n      return v.resolved\n    })\n\n    if (resolutions.length === 0) {\n      throw new Error(\n        `\\`${packageDetails.pathSpecifier}\\`'s installed version is ${installedVersion} but a lockfile entry for it couldn't be found. Your lockfile is likely to be corrupt or you forgot to reinstall your packages.`,\n      )\n    }\n\n    if (new Set(resolutions).size !== 1) {\n      console.log(\n        `Ambigious lockfile entries for ${packageDetails.pathSpecifier}. Using version ${installedVersion}`,\n      )\n      return installedVersion\n    }\n\n    if (resolutions[0]) {\n      return resolutions[0]\n    }\n\n    const resolution = entries[0][0].slice(packageDetails.name.length + 1)\n\n    // resolve relative file path\n    if (resolution.startsWith(\"file:.\")) {\n      return `file:${resolve(appPath, resolution.slice(\"file:\".length))}`\n    }\n\n    if (resolution.startsWith(\"npm:\")) {\n      return resolution.replace(\"npm:\", \"\")\n    }\n\n    return resolution\n  } else {\n    const lockfile = require(\n      join(\n        appPath,\n        packageManager === \"npm-shrinkwrap\"\n          ? \"npm-shrinkwrap.json\"\n          : \"package-lock.json\",\n      ),\n    )\n    const lockFileStack = [lockfile]\n    for (const name of packageDetails.packageNames.slice(0, -1)) {\n      const child = lockFileStack[0].dependencies\n      if (child && name in child) {\n        lockFileStack.push(child[name])\n      }\n    }\n    lockFileStack.reverse()\n    const relevantStackEntry = lockFileStack.find((entry) => {\n      if (entry.dependencies) {\n        return entry.dependencies && packageDetails.name in entry.dependencies\n      } else if (entry.packages) {\n        return entry.packages && packageDetails.path in entry.packages\n      }\n      throw new Error(\"Cannot find dependencies or packages in lockfile\")\n    })\n    const pkg = relevantStackEntry.dependencies\n      ? relevantStackEntry.dependencies[packageDetails.name]\n      : relevantStackEntry.packages[packageDetails.path]\n    return pkg.resolved || pkg.version || pkg.from\n  }\n}\n\nif (require.main === module) {\n  const packageDetails = getPatchDetailsFromCliString(process.argv[2])\n  if (!packageDetails) {\n    console.log(`Can't find package ${process.argv[2]}`)\n    process.exit(1)\n  }\n  console.log(\n    getPackageResolution({\n      appPath: process.cwd(),\n      packageDetails,\n      packageManager: detectPackageManager(process.cwd(), null),\n    }),\n  )\n}\n"]}
|
package/dist/parseBunLockfile.js
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseBunLockfile = parseBunLockfile;
|
|
4
|
+
exports.parseBunLockTextFile = parseBunLockTextFile;
|
|
4
5
|
const child_process_1 = require("child_process");
|
|
5
|
-
|
|
6
|
-
|
|
6
|
+
const fs_extra_1 = require("fs-extra");
|
|
7
|
+
/**
|
|
8
|
+
* Parses the legacy `bun.lockb` binary lockfile (Bun < 1.2) by running
|
|
9
|
+
* `bun <path>`, which prints the lockfile in yarn-v1 text format.
|
|
10
|
+
*
|
|
11
|
+
* Returns the yarn-v1 text so it can be fed to `@yarnpkg/lockfile`'s parser.
|
|
12
|
+
*/
|
|
7
13
|
function parseBunLockfile(lockFilePath) {
|
|
8
14
|
const process = (0, child_process_1.spawnSync)("bun", [lockFilePath], {
|
|
9
15
|
stdio: ["ignore", "pipe", "pipe"],
|
|
@@ -13,4 +19,83 @@ function parseBunLockfile(lockFilePath) {
|
|
|
13
19
|
}
|
|
14
20
|
return process.stdout.toString();
|
|
15
21
|
}
|
|
16
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Parses the new `bun.lock` text/JSONC lockfile (Bun >= 1.2, including
|
|
24
|
+
* 1.3.14) and converts it into a yarn-v1-lockfile-compatible object so the
|
|
25
|
+
* rest of the resolution logic can treat bun like yarn.
|
|
26
|
+
*
|
|
27
|
+
* Each package entry in `bun.lock` has the form:
|
|
28
|
+
*
|
|
29
|
+
* "name": ["full-specifier@version", "path", { ...metadata }, "integrity"]
|
|
30
|
+
*
|
|
31
|
+
* This is transformed to yarn v1 shape:
|
|
32
|
+
*
|
|
33
|
+
* "full-specifier@version": { version: "version", resolved: undefined }
|
|
34
|
+
*
|
|
35
|
+
* The `resolved` URL is not stored in `bun.lock` (only the integrity hash),
|
|
36
|
+
* so it is left `undefined`. The downstream resolution logic already falls
|
|
37
|
+
* back to the version/alias/file specifier when `resolved` is missing.
|
|
38
|
+
*/
|
|
39
|
+
function parseBunLockTextFile(lockFilePath) {
|
|
40
|
+
const raw = (0, fs_extra_1.readFileSync)(lockFilePath, "utf8");
|
|
41
|
+
const cleaned = stripJsonc(raw);
|
|
42
|
+
let data;
|
|
43
|
+
try {
|
|
44
|
+
data = JSON.parse(cleaned);
|
|
45
|
+
}
|
|
46
|
+
catch (e) {
|
|
47
|
+
throw new Error(`Could not parse bun.lock file at ${lockFilePath}: ${e.message}`);
|
|
48
|
+
}
|
|
49
|
+
const packages = data.packages ?? {};
|
|
50
|
+
const result = {};
|
|
51
|
+
for (const entry of Object.values(packages)) {
|
|
52
|
+
if (!Array.isArray(entry))
|
|
53
|
+
continue;
|
|
54
|
+
const specifier = entry[0];
|
|
55
|
+
if (typeof specifier !== "string")
|
|
56
|
+
continue;
|
|
57
|
+
const version = extractVersion(specifier);
|
|
58
|
+
result[specifier] = { version, resolved: undefined };
|
|
59
|
+
}
|
|
60
|
+
return result;
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Extracts the version (or meaningful resolution token) from a bun.lock
|
|
64
|
+
* package specifier.
|
|
65
|
+
*
|
|
66
|
+
* Specifier forms handled:
|
|
67
|
+
* "name@1.2.3"
|
|
68
|
+
* "@scope/name@1.2.3"
|
|
69
|
+
* "npm:other-name@1.2.3"
|
|
70
|
+
* "file:./path"
|
|
71
|
+
* "workspace:^"
|
|
72
|
+
* "link:./path"
|
|
73
|
+
*/
|
|
74
|
+
function extractVersion(specifier) {
|
|
75
|
+
const prefixMatch = specifier.match(/^(npm:|file:|workspace:|link:)/);
|
|
76
|
+
if (prefixMatch) {
|
|
77
|
+
const rest = specifier.slice(prefixMatch[0].length);
|
|
78
|
+
const atIdx = rest.lastIndexOf("@");
|
|
79
|
+
if (atIdx > 0) {
|
|
80
|
+
return rest.slice(atIdx + 1);
|
|
81
|
+
}
|
|
82
|
+
return rest;
|
|
83
|
+
}
|
|
84
|
+
const atIdx = specifier.lastIndexOf("@");
|
|
85
|
+
if (atIdx > 0) {
|
|
86
|
+
return specifier.slice(atIdx + 1);
|
|
87
|
+
}
|
|
88
|
+
return specifier;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Strips JSONC extensions (// comments and trailing commas) so the file can
|
|
92
|
+
* be parsed with `JSON.parse`. Bun's `bun.lock` allows both.
|
|
93
|
+
*/
|
|
94
|
+
function stripJsonc(text) {
|
|
95
|
+
// Strip single-line `//` comments. (bun.lock does not use block comments.)
|
|
96
|
+
let out = text.replace(/^\s*\/\/.*$/gm, "");
|
|
97
|
+
// Remove trailing commas before } or ]
|
|
98
|
+
out = out.replace(/,(\s*[}\]])/g, "$1");
|
|
99
|
+
return out;
|
|
100
|
+
}
|
|
101
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VCdW5Mb2NrZmlsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wYXJzZUJ1bkxvY2tmaWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsNENBVUM7QUFtQkQsb0RBdUJDO0FBN0RELGlEQUF5QztBQUN6Qyx1Q0FBdUM7QUFFdkM7Ozs7O0dBS0c7QUFDSCxTQUFnQixnQkFBZ0IsQ0FBQyxZQUFvQjtJQUNuRCxNQUFNLE9BQU8sR0FBRyxJQUFBLHlCQUFTLEVBQUMsS0FBSyxFQUFFLENBQUMsWUFBWSxDQUFDLEVBQUU7UUFDL0MsS0FBSyxFQUFFLENBQUMsUUFBUSxFQUFFLE1BQU0sRUFBRSxNQUFNLENBQUM7S0FDbEMsQ0FBQyxDQUFBO0lBQ0YsSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRSxDQUFDO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQ2IseUJBQXlCLE9BQU8sQ0FBQyxNQUFNLEtBQUssT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUN4RSxDQUFBO0lBQ0gsQ0FBQztJQUNELE9BQU8sT0FBTyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQTtBQUNsQyxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7Ozs7Ozs7R0FnQkc7QUFDSCxTQUFnQixvQkFBb0IsQ0FDbEMsWUFBb0I7SUFFcEIsTUFBTSxHQUFHLEdBQUcsSUFBQSx1QkFBWSxFQUFDLFlBQVksRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUM5QyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDL0IsSUFBSSxJQUE0QyxDQUFBO0lBQ2hELElBQUksQ0FBQztRQUNILElBQUksR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ1gsTUFBTSxJQUFJLEtBQUssQ0FDYixvQ0FBb0MsWUFBWSxLQUFNLENBQVcsQ0FBQyxPQUFPLEVBQUUsQ0FDNUUsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQTtJQUNwQyxNQUFNLE1BQU0sR0FBMkQsRUFBRSxDQUFBO0lBQ3pFLEtBQUssTUFBTSxLQUFLLElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQzVDLElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQztZQUFFLFNBQVE7UUFDbkMsTUFBTSxTQUFTLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzFCLElBQUksT0FBTyxTQUFTLEtBQUssUUFBUTtZQUFFLFNBQVE7UUFDM0MsTUFBTSxPQUFPLEdBQUcsY0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFBO1FBQ3pDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLENBQUE7SUFDdEQsQ0FBQztJQUNELE9BQU8sTUFBTSxDQUFBO0FBQ2YsQ0FBQztBQUVEOzs7Ozs7Ozs7OztHQVdHO0FBQ0gsU0FBUyxjQUFjLENBQUMsU0FBaUI7SUFDdkMsTUFBTSxXQUFXLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFBO0lBQ3JFLElBQUksV0FBVyxFQUFFLENBQUM7UUFDaEIsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDbkQsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNuQyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNkLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUE7UUFDOUIsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQztJQUNELE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDeEMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDZCxPQUFPLFNBQVMsQ0FBQyxLQUFLLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQ25DLENBQUM7SUFDRCxPQUFPLFNBQVMsQ0FBQTtBQUNsQixDQUFDO0FBRUQ7OztHQUdHO0FBQ0gsU0FBUyxVQUFVLENBQUMsSUFBWTtJQUM5QiwyRUFBMkU7SUFDM0UsSUFBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDM0MsdUNBQXVDO0lBQ3ZDLEdBQUcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsQ0FBQTtJQUN2QyxPQUFPLEdBQUcsQ0FBQTtBQUNaLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzcGF3blN5bmMgfSBmcm9tIFwiY2hpbGRfcHJvY2Vzc1wiXG5pbXBvcnQgeyByZWFkRmlsZVN5bmMgfSBmcm9tIFwiZnMtZXh0cmFcIlxuXG4vKipcbiAqIFBhcnNlcyB0aGUgbGVnYWN5IGBidW4ubG9ja2JgIGJpbmFyeSBsb2NrZmlsZSAoQnVuIDwgMS4yKSBieSBydW5uaW5nXG4gKiBgYnVuIDxwYXRoPmAsIHdoaWNoIHByaW50cyB0aGUgbG9ja2ZpbGUgaW4geWFybi12MSB0ZXh0IGZvcm1hdC5cbiAqXG4gKiBSZXR1cm5zIHRoZSB5YXJuLXYxIHRleHQgc28gaXQgY2FuIGJlIGZlZCB0byBgQHlhcm5wa2cvbG9ja2ZpbGVgJ3MgcGFyc2VyLlxuICovXG5leHBvcnQgZnVuY3Rpb24gcGFyc2VCdW5Mb2NrZmlsZShsb2NrRmlsZVBhdGg6IHN0cmluZyk6IHN0cmluZyB7XG4gIGNvbnN0IHByb2Nlc3MgPSBzcGF3blN5bmMoXCJidW5cIiwgW2xvY2tGaWxlUGF0aF0sIHtcbiAgICBzdGRpbzogW1wiaWdub3JlXCIsIFwicGlwZVwiLCBcInBpcGVcIl0sXG4gIH0pXG4gIGlmIChwcm9jZXNzLnN0YXR1cyAhPT0gMCkge1xuICAgIHRocm93IG5ldyBFcnJvcihcbiAgICAgIGBCdW4gZXhpdGVkIHdpdGggY29kZTogJHtwcm9jZXNzLnN0YXR1c31cXG4ke3Byb2Nlc3Muc3RkZXJyLnRvU3RyaW5nKCl9YCxcbiAgICApXG4gIH1cbiAgcmV0dXJuIHByb2Nlc3Muc3Rkb3V0LnRvU3RyaW5nKClcbn1cblxuLyoqXG4gKiBQYXJzZXMgdGhlIG5ldyBgYnVuLmxvY2tgIHRleHQvSlNPTkMgbG9ja2ZpbGUgKEJ1biA+PSAxLjIsIGluY2x1ZGluZ1xuICogMS4zLjE0KSBhbmQgY29udmVydHMgaXQgaW50byBhIHlhcm4tdjEtbG9ja2ZpbGUtY29tcGF0aWJsZSBvYmplY3Qgc28gdGhlXG4gKiByZXN0IG9mIHRoZSByZXNvbHV0aW9uIGxvZ2ljIGNhbiB0cmVhdCBidW4gbGlrZSB5YXJuLlxuICpcbiAqIEVhY2ggcGFja2FnZSBlbnRyeSBpbiBgYnVuLmxvY2tgIGhhcyB0aGUgZm9ybTpcbiAqXG4gKiAgIFwibmFtZVwiOiBbXCJmdWxsLXNwZWNpZmllckB2ZXJzaW9uXCIsIFwicGF0aFwiLCB7IC4uLm1ldGFkYXRhIH0sIFwiaW50ZWdyaXR5XCJdXG4gKlxuICogVGhpcyBpcyB0cmFuc2Zvcm1lZCB0byB5YXJuIHYxIHNoYXBlOlxuICpcbiAqICAgXCJmdWxsLXNwZWNpZmllckB2ZXJzaW9uXCI6IHsgdmVyc2lvbjogXCJ2ZXJzaW9uXCIsIHJlc29sdmVkOiB1bmRlZmluZWQgfVxuICpcbiAqIFRoZSBgcmVzb2x2ZWRgIFVSTCBpcyBub3Qgc3RvcmVkIGluIGBidW4ubG9ja2AgKG9ubHkgdGhlIGludGVncml0eSBoYXNoKSxcbiAqIHNvIGl0IGlzIGxlZnQgYHVuZGVmaW5lZGAuIFRoZSBkb3duc3RyZWFtIHJlc29sdXRpb24gbG9naWMgYWxyZWFkeSBmYWxsc1xuICogYmFjayB0byB0aGUgdmVyc2lvbi9hbGlhcy9maWxlIHNwZWNpZmllciB3aGVuIGByZXNvbHZlZGAgaXMgbWlzc2luZy5cbiAqL1xuZXhwb3J0IGZ1bmN0aW9uIHBhcnNlQnVuTG9ja1RleHRGaWxlKFxuICBsb2NrRmlsZVBhdGg6IHN0cmluZyxcbik6IFJlY29yZDxzdHJpbmcsIHsgdmVyc2lvbjogc3RyaW5nOyByZXNvbHZlZD86IHN0cmluZyB9PiB7XG4gIGNvbnN0IHJhdyA9IHJlYWRGaWxlU3luYyhsb2NrRmlsZVBhdGgsIFwidXRmOFwiKVxuICBjb25zdCBjbGVhbmVkID0gc3RyaXBKc29uYyhyYXcpXG4gIGxldCBkYXRhOiB7IHBhY2thZ2VzPzogUmVjb3JkPHN0cmluZywgdW5rbm93bj4gfVxuICB0cnkge1xuICAgIGRhdGEgPSBKU09OLnBhcnNlKGNsZWFuZWQpXG4gIH0gY2F0Y2ggKGUpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICBgQ291bGQgbm90IHBhcnNlIGJ1bi5sb2NrIGZpbGUgYXQgJHtsb2NrRmlsZVBhdGh9OiAkeyhlIGFzIEVycm9yKS5tZXNzYWdlfWAsXG4gICAgKVxuICB9XG4gIGNvbnN0IHBhY2thZ2VzID0gZGF0YS5wYWNrYWdlcyA/PyB7fVxuICBjb25zdCByZXN1bHQ6IFJlY29yZDxzdHJpbmcsIHsgdmVyc2lvbjogc3RyaW5nOyByZXNvbHZlZD86IHN0cmluZyB9PiA9IHt9XG4gIGZvciAoY29uc3QgZW50cnkgb2YgT2JqZWN0LnZhbHVlcyhwYWNrYWdlcykpIHtcbiAgICBpZiAoIUFycmF5LmlzQXJyYXkoZW50cnkpKSBjb250aW51ZVxuICAgIGNvbnN0IHNwZWNpZmllciA9IGVudHJ5WzBdXG4gICAgaWYgKHR5cGVvZiBzcGVjaWZpZXIgIT09IFwic3RyaW5nXCIpIGNvbnRpbnVlXG4gICAgY29uc3QgdmVyc2lvbiA9IGV4dHJhY3RWZXJzaW9uKHNwZWNpZmllcilcbiAgICByZXN1bHRbc3BlY2lmaWVyXSA9IHsgdmVyc2lvbiwgcmVzb2x2ZWQ6IHVuZGVmaW5lZCB9XG4gIH1cbiAgcmV0dXJuIHJlc3VsdFxufVxuXG4vKipcbiAqIEV4dHJhY3RzIHRoZSB2ZXJzaW9uIChvciBtZWFuaW5nZnVsIHJlc29sdXRpb24gdG9rZW4pIGZyb20gYSBidW4ubG9ja1xuICogcGFja2FnZSBzcGVjaWZpZXIuXG4gKlxuICogU3BlY2lmaWVyIGZvcm1zIGhhbmRsZWQ6XG4gKiAgIFwibmFtZUAxLjIuM1wiXG4gKiAgIFwiQHNjb3BlL25hbWVAMS4yLjNcIlxuICogICBcIm5wbTpvdGhlci1uYW1lQDEuMi4zXCJcbiAqICAgXCJmaWxlOi4vcGF0aFwiXG4gKiAgIFwid29ya3NwYWNlOl5cIlxuICogICBcImxpbms6Li9wYXRoXCJcbiAqL1xuZnVuY3Rpb24gZXh0cmFjdFZlcnNpb24oc3BlY2lmaWVyOiBzdHJpbmcpOiBzdHJpbmcge1xuICBjb25zdCBwcmVmaXhNYXRjaCA9IHNwZWNpZmllci5tYXRjaCgvXihucG06fGZpbGU6fHdvcmtzcGFjZTp8bGluazopLylcbiAgaWYgKHByZWZpeE1hdGNoKSB7XG4gICAgY29uc3QgcmVzdCA9IHNwZWNpZmllci5zbGljZShwcmVmaXhNYXRjaFswXS5sZW5ndGgpXG4gICAgY29uc3QgYXRJZHggPSByZXN0Lmxhc3RJbmRleE9mKFwiQFwiKVxuICAgIGlmIChhdElkeCA+IDApIHtcbiAgICAgIHJldHVybiByZXN0LnNsaWNlKGF0SWR4ICsgMSlcbiAgICB9XG4gICAgcmV0dXJuIHJlc3RcbiAgfVxuICBjb25zdCBhdElkeCA9IHNwZWNpZmllci5sYXN0SW5kZXhPZihcIkBcIilcbiAgaWYgKGF0SWR4ID4gMCkge1xuICAgIHJldHVybiBzcGVjaWZpZXIuc2xpY2UoYXRJZHggKyAxKVxuICB9XG4gIHJldHVybiBzcGVjaWZpZXJcbn1cblxuLyoqXG4gKiBTdHJpcHMgSlNPTkMgZXh0ZW5zaW9ucyAoLy8gY29tbWVudHMgYW5kIHRyYWlsaW5nIGNvbW1hcykgc28gdGhlIGZpbGUgY2FuXG4gKiBiZSBwYXJzZWQgd2l0aCBgSlNPTi5wYXJzZWAuIEJ1bidzIGBidW4ubG9ja2AgYWxsb3dzIGJvdGguXG4gKi9cbmZ1bmN0aW9uIHN0cmlwSnNvbmModGV4dDogc3RyaW5nKTogc3RyaW5nIHtcbiAgLy8gU3RyaXAgc2luZ2xlLWxpbmUgYC8vYCBjb21tZW50cy4gKGJ1bi5sb2NrIGRvZXMgbm90IHVzZSBibG9jayBjb21tZW50cy4pXG4gIGxldCBvdXQgPSB0ZXh0LnJlcGxhY2UoL15cXHMqXFwvXFwvLiokL2dtLCBcIlwiKVxuICAvLyBSZW1vdmUgdHJhaWxpbmcgY29tbWFzIGJlZm9yZSB9IG9yIF1cbiAgb3V0ID0gb3V0LnJlcGxhY2UoLywoXFxzKlt9XFxdXSkvZywgXCIkMVwiKVxuICByZXR1cm4gb3V0XG59XG4iXX0=
|
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@psync/patch-package",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1",
|
|
4
4
|
"description": "Fix broken node modules with no fuss",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": "github:New-Elysium/patch-package",
|
|
7
|
-
"author": "
|
|
8
|
-
"license": "
|
|
7
|
+
"author": "Srikanth Gopalakrishnan",
|
|
8
|
+
"license": "Apache-2.0",
|
|
9
9
|
"engines": {
|
|
10
|
-
"node": ">=
|
|
11
|
-
"npm": ">
|
|
10
|
+
"node": ">=24",
|
|
11
|
+
"npm": ">10",
|
|
12
12
|
"bun": ">=1.3.14"
|
|
13
13
|
},
|
|
14
14
|
"bin": {
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"ts-jest": "^29.4.0",
|
|
70
70
|
"ts-node": "^10.9.0",
|
|
71
71
|
"tslib": "^2.8.0",
|
|
72
|
-
"typescript": "^6.0.
|
|
72
|
+
"typescript": "^6.0.3"
|
|
73
73
|
},
|
|
74
74
|
"dependencies": {
|
|
75
75
|
"@yarnpkg/lockfile": "^1.1.0",
|