From 4d9d35d27f624fd1194eb26ce971d1cf5b5fc497 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Fri, 12 Apr 2024 09:38:22 -0700 Subject: [PATCH] Downgrade semver to only have one version in output --- .ncurc.js | 1 + dist/index.js | 424 +---------------------------------------------- package.json | 4 +- pnpm-lock.yaml | 15 +- src/helpers.ts | 2 +- src/main.test.ts | 2 +- src/main.ts | 2 +- src/schema.ts | 2 +- 8 files changed, 27 insertions(+), 425 deletions(-) diff --git a/.ncurc.js b/.ncurc.js index 4d9e9df..f0073d6 100644 --- a/.ncurc.js +++ b/.ncurc.js @@ -2,6 +2,7 @@ module.exports = { target: (dependencyName, [{ semver, version, operator, major, minor, patch, release, build }]) => { if (dependencyName === "@actions/http-client") return "patch"; // bloated via undici if (dependencyName === "eslint") return "patch"; + if (dependencyName === "semver") return "patch"; // Matching dep from @actions/* if (major === "0") return "minor"; return "latest"; }, diff --git a/dist/index.js b/dist/index.js index 5333065..33b02df 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7542,412 +7542,6 @@ var require_tool_cache = __commonJS({ } }); -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/debug.js -var require_debug = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/debug.js"(exports2, module2) { - var debug = typeof process === "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...args) => console.error("SEMVER", ...args) : () => { - }; - module2.exports = debug; - } -}); - -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/constants.js -var require_constants = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/constants.js"(exports2, module2) { - var SEMVER_SPEC_VERSION = "2.0.0"; - var MAX_LENGTH = 256; - var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */ - 9007199254740991; - var MAX_SAFE_COMPONENT_LENGTH = 16; - var MAX_SAFE_BUILD_LENGTH = MAX_LENGTH - 6; - var RELEASE_TYPES = [ - "major", - "premajor", - "minor", - "preminor", - "patch", - "prepatch", - "prerelease" - ]; - module2.exports = { - MAX_LENGTH, - MAX_SAFE_COMPONENT_LENGTH, - MAX_SAFE_BUILD_LENGTH, - MAX_SAFE_INTEGER, - RELEASE_TYPES, - SEMVER_SPEC_VERSION, - FLAG_INCLUDE_PRERELEASE: 1, - FLAG_LOOSE: 2 - }; - } -}); - -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/re.js -var require_re = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/re.js"(exports2, module2) { - var { - MAX_SAFE_COMPONENT_LENGTH, - MAX_SAFE_BUILD_LENGTH, - MAX_LENGTH - } = require_constants(); - var debug = require_debug(); - exports2 = module2.exports = {}; - var re = exports2.re = []; - var safeRe = exports2.safeRe = []; - var src = exports2.src = []; - var t = exports2.t = {}; - var R = 0; - var LETTERDASHNUMBER = "[a-zA-Z0-9-]"; - var safeRegexReplacements = [ - ["\\s", 1], - ["\\d", MAX_LENGTH], - [LETTERDASHNUMBER, MAX_SAFE_BUILD_LENGTH] - ]; - var makeSafeRegex = (value) => { - for (const [token, max] of safeRegexReplacements) { - value = value.split(`${token}*`).join(`${token}{0,${max}}`).split(`${token}+`).join(`${token}{1,${max}}`); - } - return value; - }; - var createToken = (name, value, isGlobal) => { - const safe = makeSafeRegex(value); - const index = R++; - debug(name, index, value); - t[name] = index; - src[index] = value; - re[index] = new RegExp(value, isGlobal ? "g" : void 0); - safeRe[index] = new RegExp(safe, isGlobal ? "g" : void 0); - }; - createToken("NUMERICIDENTIFIER", "0|[1-9]\\d*"); - createToken("NUMERICIDENTIFIERLOOSE", "\\d+"); - createToken("NONNUMERICIDENTIFIER", `\\d*[a-zA-Z-]${LETTERDASHNUMBER}*`); - createToken("MAINVERSION", `(${src[t.NUMERICIDENTIFIER]})\\.(${src[t.NUMERICIDENTIFIER]})\\.(${src[t.NUMERICIDENTIFIER]})`); - createToken("MAINVERSIONLOOSE", `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.(${src[t.NUMERICIDENTIFIERLOOSE]})\\.(${src[t.NUMERICIDENTIFIERLOOSE]})`); - createToken("PRERELEASEIDENTIFIER", `(?:${src[t.NUMERICIDENTIFIER]}|${src[t.NONNUMERICIDENTIFIER]})`); - createToken("PRERELEASEIDENTIFIERLOOSE", `(?:${src[t.NUMERICIDENTIFIERLOOSE]}|${src[t.NONNUMERICIDENTIFIER]})`); - createToken("PRERELEASE", `(?:-(${src[t.PRERELEASEIDENTIFIER]}(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`); - createToken("PRERELEASELOOSE", `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`); - createToken("BUILDIDENTIFIER", `${LETTERDASHNUMBER}+`); - createToken("BUILD", `(?:\\+(${src[t.BUILDIDENTIFIER]}(?:\\.${src[t.BUILDIDENTIFIER]})*))`); - createToken("FULLPLAIN", `v?${src[t.MAINVERSION]}${src[t.PRERELEASE]}?${src[t.BUILD]}?`); - createToken("FULL", `^${src[t.FULLPLAIN]}$`); - createToken("LOOSEPLAIN", `[v=\\s]*${src[t.MAINVERSIONLOOSE]}${src[t.PRERELEASELOOSE]}?${src[t.BUILD]}?`); - createToken("LOOSE", `^${src[t.LOOSEPLAIN]}$`); - createToken("GTLT", "((?:<|>)?=?)"); - createToken("XRANGEIDENTIFIERLOOSE", `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`); - createToken("XRANGEIDENTIFIER", `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`); - createToken("XRANGEPLAIN", `[v=\\s]*(${src[t.XRANGEIDENTIFIER]})(?:\\.(${src[t.XRANGEIDENTIFIER]})(?:\\.(${src[t.XRANGEIDENTIFIER]})(?:${src[t.PRERELEASE]})?${src[t.BUILD]}?)?)?`); - createToken("XRANGEPLAINLOOSE", `[v=\\s]*(${src[t.XRANGEIDENTIFIERLOOSE]})(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})(?:${src[t.PRERELEASELOOSE]})?${src[t.BUILD]}?)?)?`); - createToken("XRANGE", `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAIN]}$`); - createToken("XRANGELOOSE", `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`); - createToken("COERCEPLAIN", `${"(^|[^\\d])(\\d{1,"}${MAX_SAFE_COMPONENT_LENGTH}})(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?`); - createToken("COERCE", `${src[t.COERCEPLAIN]}(?:$|[^\\d])`); - createToken("COERCEFULL", src[t.COERCEPLAIN] + `(?:${src[t.PRERELEASE]})?(?:${src[t.BUILD]})?(?:$|[^\\d])`); - createToken("COERCERTL", src[t.COERCE], true); - createToken("COERCERTLFULL", src[t.COERCEFULL], true); - createToken("LONETILDE", "(?:~>?)"); - createToken("TILDETRIM", `(\\s*)${src[t.LONETILDE]}\\s+`, true); - exports2.tildeTrimReplace = "$1~"; - createToken("TILDE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`); - createToken("TILDELOOSE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`); - createToken("LONECARET", "(?:\\^)"); - createToken("CARETTRIM", `(\\s*)${src[t.LONECARET]}\\s+`, true); - exports2.caretTrimReplace = "$1^"; - createToken("CARET", `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`); - createToken("CARETLOOSE", `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`); - createToken("COMPARATORLOOSE", `^${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]})$|^$`); - createToken("COMPARATOR", `^${src[t.GTLT]}\\s*(${src[t.FULLPLAIN]})$|^$`); - createToken("COMPARATORTRIM", `(\\s*)${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true); - exports2.comparatorTrimReplace = "$1$2$3"; - createToken("HYPHENRANGE", `^\\s*(${src[t.XRANGEPLAIN]})\\s+-\\s+(${src[t.XRANGEPLAIN]})\\s*$`); - createToken("HYPHENRANGELOOSE", `^\\s*(${src[t.XRANGEPLAINLOOSE]})\\s+-\\s+(${src[t.XRANGEPLAINLOOSE]})\\s*$`); - createToken("STAR", "(<|>)?=?\\s*\\*"); - createToken("GTE0", "^\\s*>=\\s*0\\.0\\.0\\s*$"); - createToken("GTE0PRE", "^\\s*>=\\s*0\\.0\\.0-0\\s*$"); - } -}); - -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/parse-options.js -var require_parse_options = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/parse-options.js"(exports2, module2) { - var looseOption = Object.freeze({ loose: true }); - var emptyOpts = Object.freeze({}); - var parseOptions = (options) => { - if (!options) { - return emptyOpts; - } - if (typeof options !== "object") { - return looseOption; - } - return options; - }; - module2.exports = parseOptions; - } -}); - -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/identifiers.js -var require_identifiers = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/internal/identifiers.js"(exports2, module2) { - var numeric = /^[0-9]+$/; - var compareIdentifiers = (a, b) => { - const anum = numeric.test(a); - const bnum = numeric.test(b); - if (anum && bnum) { - a = +a; - b = +b; - } - return a === b ? 0 : anum && !bnum ? -1 : bnum && !anum ? 1 : a < b ? -1 : 1; - }; - var rcompareIdentifiers = (a, b) => compareIdentifiers(b, a); - module2.exports = { - compareIdentifiers, - rcompareIdentifiers - }; - } -}); - -// node_modules/.pnpm/semver@7.6.0/node_modules/semver/classes/semver.js -var require_semver2 = __commonJS({ - "node_modules/.pnpm/semver@7.6.0/node_modules/semver/classes/semver.js"(exports2, module2) { - var debug = require_debug(); - var { MAX_LENGTH, MAX_SAFE_INTEGER } = require_constants(); - var { safeRe: re, t } = require_re(); - var parseOptions = require_parse_options(); - var { compareIdentifiers } = require_identifiers(); - var SemVer3 = class _SemVer { - constructor(version3, options) { - options = parseOptions(options); - if (version3 instanceof _SemVer) { - if (version3.loose === !!options.loose && version3.includePrerelease === !!options.includePrerelease) { - return version3; - } else { - version3 = version3.version; - } - } else if (typeof version3 !== "string") { - throw new TypeError(`Invalid version. Must be a string. Got type "${typeof version3}".`); - } - if (version3.length > MAX_LENGTH) { - throw new TypeError( - `version is longer than ${MAX_LENGTH} characters` - ); - } - debug("SemVer", version3, options); - this.options = options; - this.loose = !!options.loose; - this.includePrerelease = !!options.includePrerelease; - const m = version3.trim().match(options.loose ? re[t.LOOSE] : re[t.FULL]); - if (!m) { - throw new TypeError(`Invalid Version: ${version3}`); - } - this.raw = version3; - this.major = +m[1]; - this.minor = +m[2]; - this.patch = +m[3]; - if (this.major > MAX_SAFE_INTEGER || this.major < 0) { - throw new TypeError("Invalid major version"); - } - if (this.minor > MAX_SAFE_INTEGER || this.minor < 0) { - throw new TypeError("Invalid minor version"); - } - if (this.patch > MAX_SAFE_INTEGER || this.patch < 0) { - throw new TypeError("Invalid patch version"); - } - if (!m[4]) { - this.prerelease = []; - } else { - this.prerelease = m[4].split(".").map((id) => { - if (/^[0-9]+$/.test(id)) { - const num = +id; - if (num >= 0 && num < MAX_SAFE_INTEGER) { - return num; - } - } - return id; - }); - } - this.build = m[5] ? m[5].split(".") : []; - this.format(); - } - format() { - this.version = `${this.major}.${this.minor}.${this.patch}`; - if (this.prerelease.length) { - this.version += `-${this.prerelease.join(".")}`; - } - return this.version; - } - toString() { - return this.version; - } - compare(other) { - debug("SemVer.compare", this.version, this.options, other); - if (!(other instanceof _SemVer)) { - if (typeof other === "string" && other === this.version) { - return 0; - } - other = new _SemVer(other, this.options); - } - if (other.version === this.version) { - return 0; - } - return this.compareMain(other) || this.comparePre(other); - } - compareMain(other) { - if (!(other instanceof _SemVer)) { - other = new _SemVer(other, this.options); - } - return compareIdentifiers(this.major, other.major) || compareIdentifiers(this.minor, other.minor) || compareIdentifiers(this.patch, other.patch); - } - comparePre(other) { - if (!(other instanceof _SemVer)) { - other = new _SemVer(other, this.options); - } - if (this.prerelease.length && !other.prerelease.length) { - return -1; - } else if (!this.prerelease.length && other.prerelease.length) { - return 1; - } else if (!this.prerelease.length && !other.prerelease.length) { - return 0; - } - let i = 0; - do { - const a = this.prerelease[i]; - const b = other.prerelease[i]; - debug("prerelease compare", i, a, b); - if (a === void 0 && b === void 0) { - return 0; - } else if (b === void 0) { - return 1; - } else if (a === void 0) { - return -1; - } else if (a === b) { - continue; - } else { - return compareIdentifiers(a, b); - } - } while (++i); - } - compareBuild(other) { - if (!(other instanceof _SemVer)) { - other = new _SemVer(other, this.options); - } - let i = 0; - do { - const a = this.build[i]; - const b = other.build[i]; - debug("prerelease compare", i, a, b); - if (a === void 0 && b === void 0) { - return 0; - } else if (b === void 0) { - return 1; - } else if (a === void 0) { - return -1; - } else if (a === b) { - continue; - } else { - return compareIdentifiers(a, b); - } - } while (++i); - } - // preminor will bump the version up to the next minor release, and immediately - // down to pre-release. premajor and prepatch work the same way. - inc(release, identifier, identifierBase) { - switch (release) { - case "premajor": - this.prerelease.length = 0; - this.patch = 0; - this.minor = 0; - this.major++; - this.inc("pre", identifier, identifierBase); - break; - case "preminor": - this.prerelease.length = 0; - this.patch = 0; - this.minor++; - this.inc("pre", identifier, identifierBase); - break; - case "prepatch": - this.prerelease.length = 0; - this.inc("patch", identifier, identifierBase); - this.inc("pre", identifier, identifierBase); - break; - case "prerelease": - if (this.prerelease.length === 0) { - this.inc("patch", identifier, identifierBase); - } - this.inc("pre", identifier, identifierBase); - break; - case "major": - if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0) { - this.major++; - } - this.minor = 0; - this.patch = 0; - this.prerelease = []; - break; - case "minor": - if (this.patch !== 0 || this.prerelease.length === 0) { - this.minor++; - } - this.patch = 0; - this.prerelease = []; - break; - case "patch": - if (this.prerelease.length === 0) { - this.patch++; - } - this.prerelease = []; - break; - case "pre": { - const base = Number(identifierBase) ? 1 : 0; - if (!identifier && identifierBase === false) { - throw new Error("invalid increment argument: identifier is empty"); - } - if (this.prerelease.length === 0) { - this.prerelease = [base]; - } else { - let i = this.prerelease.length; - while (--i >= 0) { - if (typeof this.prerelease[i] === "number") { - this.prerelease[i]++; - i = -2; - } - } - if (i === -1) { - if (identifier === this.prerelease.join(".") && identifierBase === false) { - throw new Error("invalid increment argument: identifier already exists"); - } - this.prerelease.push(base); - } - } - if (identifier) { - let prerelease = [identifier, base]; - if (identifierBase === false) { - prerelease = [identifier]; - } - if (compareIdentifiers(this.prerelease[0], identifier) === 0) { - if (isNaN(this.prerelease[1])) { - this.prerelease = prerelease; - } - } else { - this.prerelease = prerelease; - } - } - break; - } - default: - throw new Error(`invalid increment argument: ${release}`); - } - this.raw = this.format(); - if (this.build.length) { - this.raw += `+${this.build.join(".")}`; - } - return this; - } - }; - module2.exports = SemVer3; - } -}); - // node_modules/.pnpm/isexe@3.1.1/node_modules/isexe/dist/cjs/posix.js var require_posix = __commonJS({ "node_modules/.pnpm/isexe@3.1.1/node_modules/isexe/dist/cjs/posix.js"(exports2) { @@ -9053,7 +8647,7 @@ var path = __toESM(require("node:path")); var core = __toESM(require_core()); var httpClient = __toESM(require_lib()); var tc = __toESM(require_tool_cache()); -var import_semver2 = __toESM(require_semver2()); +var import_semver2 = __toESM(require_semver()); var import_shell_quote = __toESM(require_shell_quote()); var import_which = __toESM(require_lib2()); @@ -10104,7 +9698,7 @@ function union(...options) { } // src/schema.ts -var import_semver = __toESM(require_semver2()); +var import_semver = __toESM(require_semver()); var Position = object({ line: number(), character: number() @@ -10139,7 +9733,7 @@ function parseReport(v) { } function isSemVer(version3) { try { - new import_semver.default(version3); + new import_semver.SemVer(version3); return true; } catch { return false; @@ -10192,7 +9786,7 @@ async function getArgs(execPath) { command = pyrightInfo.command; break; } - const pyrightVersion = new import_semver2.default(pyrightInfo.version); + const pyrightVersion = new import_semver2.SemVer(pyrightInfo.version); const useDashedFlags = pyrightVersion.compare("1.1.309") === -1; const args = []; if (pyrightPath) { @@ -10346,7 +9940,7 @@ async function getPyrightInfo() { const versionRaw = versionOut.trim().split(/\s+/).at(-1); if (!versionRaw) throw new Error(`Failed to parse pyright version from ${JSON.stringify(versionOut)}`); - const version4 = new import_semver2.default(versionRaw); + const version4 = new import_semver2.SemVer(versionRaw); return { kind: "path", version: version4, @@ -10364,7 +9958,7 @@ async function getPyrightInfo() { const parsed = parseNpmRegistryResponse(JSON.parse(body)); return { kind: "npm", - version: new import_semver2.default(parsed.version), + version: new import_semver2.SemVer(parsed.version), tarball: parsed.dist.tarball }; } @@ -10374,12 +9968,12 @@ async function getPyrightVersion() { if (versionSpec.toUpperCase() === "PATH") { return "PATH"; } - return new import_semver2.default(versionSpec); + return new import_semver2.SemVer(versionSpec); } const pylanceVersion = core.getInput("pylance-version"); if (pylanceVersion) { if (pylanceVersion !== "latest-release" && pylanceVersion !== "latest-prerelease") { - new import_semver2.default(pylanceVersion); + new import_semver2.SemVer(pylanceVersion); } return await getPylancePyrightVersion(pylanceVersion); } @@ -10396,7 +9990,7 @@ async function getPylancePyrightVersion(pylanceVersion) { const buildMetadata = parsePylanceBuildMetadata(JSON.parse(body)); const pyrightVersion = buildMetadata.pyrightVersion; core.info(`Pylance ${pylanceVersion} uses pyright ${pyrightVersion}`); - return new import_semver2.default(pyrightVersion); + return new import_semver2.SemVer(pyrightVersion); } // src/main.ts diff --git a/package.json b/package.json index 3b62e26..c1a8432 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@badrap/valita": "^0.3.8", "@iarna/toml": "^2.2.5", "jsonc-parser": "^3.2.1", - "semver": "^7.6.0", + "semver": "^6.3.1", "shell-quote": "^1.8.1", "which": "^4.0.0" }, @@ -28,7 +28,7 @@ "@tsconfig/node20": "^20.1.4", "@tsconfig/strictest": "^2.0.5", "@types/node": "^20.12.7", - "@types/semver": "^7.5.8", + "@types/semver": "^6.2.7", "@types/shell-quote": "^1.7.5", "@types/which": "^3.0.3", "@typescript-eslint/eslint-plugin": "^7.6.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b12de2..55f9949 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ dependencies: specifier: ^3.2.1 version: 3.2.1 semver: - specifier: ^7.6.0 - version: 7.6.0 + specifier: ^6.3.1 + version: 6.3.1 shell-quote: specifier: ^1.8.1 version: 1.8.1 @@ -44,8 +44,8 @@ devDependencies: specifier: ^20.12.7 version: 20.12.7 '@types/semver': - specifier: ^7.5.8 - version: 7.5.8 + specifier: ^6.2.7 + version: 6.2.7 '@types/shell-quote': specifier: ^1.7.5 version: 1.7.5 @@ -758,6 +758,10 @@ packages: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true + /@types/semver@6.2.7: + resolution: {integrity: sha512-blctEWbzUFzQx799RZjzzIdBJOXmE37YYEyDtKkx5Dg+V7o/zyyAxLPiI98A2jdTtDgxZleMdfV+7p8WbRJ1OQ==} + dev: true + /@types/semver@7.5.8: resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true @@ -1925,6 +1929,7 @@ packages: engines: {node: '>=10'} dependencies: yallist: 4.0.0 + dev: true /magic-string@0.30.9: resolution: {integrity: sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==} @@ -2333,6 +2338,7 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 + dev: true /shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} @@ -2778,6 +2784,7 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} diff --git a/src/helpers.ts b/src/helpers.ts index 4b2ff49..7e15eaa 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -4,7 +4,7 @@ import * as path from "node:path"; import * as core from "@actions/core"; import * as httpClient from "@actions/http-client"; import * as tc from "@actions/tool-cache"; -import SemVer from "semver/classes/semver"; +import { SemVer } from "semver"; import { parse } from "shell-quote"; import which from "which"; diff --git a/src/main.test.ts b/src/main.test.ts index 6c19442..b96a1e9 100644 --- a/src/main.test.ts +++ b/src/main.test.ts @@ -6,7 +6,7 @@ import * as fs from "node:fs"; import * as core from "@actions/core"; import * as command from "@actions/core/lib/command"; import * as TOML from "@iarna/toml"; -import SemVer from "semver/classes/semver"; +import { SemVer } from "semver"; import { afterEach, beforeEach, describe, expect, test, vitest } from "vitest"; import * as helpers from "./helpers"; diff --git a/src/main.ts b/src/main.ts index e758c74..e14c213 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,7 +8,7 @@ import * as core from "@actions/core"; import * as actionsCommand from "@actions/core/lib/command"; import * as TOML from "@iarna/toml"; import * as JSONC from "jsonc-parser"; -import SemVer from "semver/classes/semver"; +import { SemVer } from "semver"; import { quote } from "shell-quote"; import { getActionVersion, getArgs, getNodeInfo, type NodeInfo } from "./helpers"; diff --git a/src/schema.ts b/src/schema.ts index cd8c040..f5902ae 100644 --- a/src/schema.ts +++ b/src/schema.ts @@ -1,5 +1,5 @@ import * as v from "@badrap/valita"; -import SemVer from "semver/classes/semver"; +import { SemVer } from "semver"; export type Position = v.Infer; const Position = v.object({