mirror of
https://github.com/changesets/action
synced 2026-10-26 16:39:56 +08:00
Switch to using resolve-from rather than require.resolve (#71)
This commit is contained in:
Vendored
+5
-3
File diff suppressed because one or more lines are too long
@@ -37,6 +37,7 @@
|
|||||||
"mdast-util-to-string": "^1.0.6",
|
"mdast-util-to-string": "^1.0.6",
|
||||||
"remark-parse": "^7.0.1",
|
"remark-parse": "^7.0.1",
|
||||||
"remark-stringify": "^7.0.3",
|
"remark-stringify": "^7.0.3",
|
||||||
|
"resolve-from": "^5.0.0",
|
||||||
"semver": "^6.3.0",
|
"semver": "^6.3.0",
|
||||||
"unified": "^8.3.2"
|
"unified": "^8.3.2"
|
||||||
},
|
},
|
||||||
|
|||||||
+7
-10
@@ -13,6 +13,7 @@ import {
|
|||||||
} from "./utils";
|
} from "./utils";
|
||||||
import * as gitUtils from "./gitUtils";
|
import * as gitUtils from "./gitUtils";
|
||||||
import readChangesetState from "./readChangesetState";
|
import readChangesetState from "./readChangesetState";
|
||||||
|
import resolveFrom from "resolve-from";
|
||||||
|
|
||||||
const createRelease = async (
|
const createRelease = async (
|
||||||
octokit: ReturnType<typeof github.getOctokit>,
|
octokit: ReturnType<typeof github.getOctokit>,
|
||||||
@@ -181,20 +182,16 @@ export async function runVersion({
|
|||||||
let [versionCommand, ...versionArgs] = script.split(/\s+/);
|
let [versionCommand, ...versionArgs] = script.split(/\s+/);
|
||||||
await exec(versionCommand, versionArgs, { cwd });
|
await exec(versionCommand, versionArgs, { cwd });
|
||||||
} else {
|
} else {
|
||||||
let changesetsCliPkgJson = await require(require.resolve(
|
let changesetsCliPkgJson = await require(resolveFrom(
|
||||||
"@changesets/cli/package.json",
|
cwd,
|
||||||
{ paths: [cwd] }
|
"@changesets/cli/package.json"
|
||||||
));
|
));
|
||||||
let cmd = semver.lt(changesetsCliPkgJson.version, "2.0.0")
|
let cmd = semver.lt(changesetsCliPkgJson.version, "2.0.0")
|
||||||
? "bump"
|
? "bump"
|
||||||
: "version";
|
: "version";
|
||||||
await exec(
|
await exec("node", [resolveFrom(cwd, "@changesets/cli/bin.js"), cmd], {
|
||||||
"node",
|
cwd,
|
||||||
[require.resolve("@changesets/cli/bin.js", { paths: [cwd] }), cmd],
|
});
|
||||||
{
|
|
||||||
cwd,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let searchQuery = `repo:${repo}+state:open+head:${versionBranch}+base:${branch}`;
|
let searchQuery = `repo:${repo}+state:open+head:${versionBranch}+base:${branch}`;
|
||||||
|
|||||||
Reference in New Issue
Block a user