From a742a854f54111d83b78e97091b5d85ccdaa3e89 Mon Sep 17 00:00:00 2001 From: Oleksii Lozovskyi Date: Sat, 25 Feb 2023 08:23:19 +0900 Subject: [PATCH 1/7] Bump minimatch to 3.1.2 (#64) --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 191d51b..43f2b6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -873,9 +873,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -1952,9 +1952,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" From 7ab0add6fce9c0ed22169b8ebf1c28820969b516 Mon Sep 17 00:00:00 2001 From: Martin Thomson Date: Mon, 1 Jan 2024 14:55:40 +1100 Subject: [PATCH 2/7] differen[t] typo (#74) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59f62dd..7ec1d75 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ jobs: If you want something non-default, like using a specific version of Visual Studio, -or cross-compling for a differen target, +or cross-compling for a different target, you will need to configure those settings via inputs: ```yaml From b8472a4c875d195a2a966b6730fb7dafbe1443ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maj=20Sokli=C4=8D?= Date: Mon, 1 Jan 2024 04:57:22 +0100 Subject: [PATCH 3/7] Update Checkout v2 -> v4 (#71) --- .github/workflows/main.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- README.md | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e37f122..41f7018 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-latest steps: - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download Internet run: npm install - name: Run eslint @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - run: npm install - run: npm audit --audit-level=moderate --production - run: npm audit --audit-level=critical @@ -70,7 +70,7 @@ jobs: runs-on: windows-latest steps: - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download Internet run: npm install - name: Enable Developer Command Prompt diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cd8a649..abcb126 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Developer Command Prompt uses: ilammy/msvc-dev-cmd@release/v1 - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Compile and run some C code shell: cmd run: | @@ -26,6 +26,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out source code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - run: npm audit --audit-level=moderate --production - run: npm audit --audit-level=critical diff --git a/README.md b/README.md index 7ec1d75..05b0f42 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Basic usage for default compilation settings is like this: jobs: test: steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 - name: Build something requiring CL.EXE run: | @@ -41,7 +41,7 @@ jobs: - amd64_x86 - amd64_arm64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ilammy/msvc-dev-cmd@v1 with: arch: ${{ matrix.arch }} From 1e07d4d99dcb1c255849538d14fd2d991fe59c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maj=20Sokli=C4=8D?= Date: Mon, 1 Jan 2024 04:58:10 +0100 Subject: [PATCH 4/7] Update NodeJS to v20 (#72) --- action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action.yml b/action.yml index a5caaf7..b20fad3 100644 --- a/action.yml +++ b/action.yml @@ -15,7 +15,7 @@ inputs: vsversion: description: The Visual Studio version to use. This can be the version number (e.g. 16.0 for 2019) or the year (e.g. "2019"). runs: - using: node16 + using: node20 main: index.js branding: icon: terminal From 6357fb6ce3c5634acae15939b4fd8636de10445f Mon Sep 17 00:00:00 2001 From: Quentin Dreyer Date: Mon, 1 Jan 2024 05:01:54 +0100 Subject: [PATCH 5/7] Add BuildTools edition (#69) --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 9333da0..fde784e 100644 --- a/index.js +++ b/index.js @@ -8,7 +8,7 @@ const PROGRAM_FILES_X86 = process.env['ProgramFiles(x86)'] const PROGRAM_FILES = [process.env['ProgramFiles(x86)'], process.env['ProgramFiles']] -const EDITIONS = ['Enterprise', 'Professional', 'Community'] +const EDITIONS = ['Enterprise', 'Professional', 'Community', 'BuildTools'] const YEARS = ['2022', '2019', '2017'] const VsYearVersion = { From c32fdcf92ea4d4ae2487212858aa5a41a7991d50 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Sun, 31 Dec 2023 20:12:51 -0800 Subject: [PATCH 6/7] Add a lib.js to export functions without running main (#70) --- index.js | 225 +------------------------------------------------------ lib.js | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 226 insertions(+), 224 deletions(-) create mode 100644 lib.js diff --git a/index.js b/index.js index fde784e..1cc8ed6 100644 --- a/index.js +++ b/index.js @@ -1,228 +1,5 @@ +const { setupMSVCDevCmd } = require('./lib') const core = require('@actions/core') -const child_process = require('child_process') -const fs = require('fs') -const path = require('path') -const process = require('process') - -const PROGRAM_FILES_X86 = process.env['ProgramFiles(x86)'] -const PROGRAM_FILES = [process.env['ProgramFiles(x86)'], process.env['ProgramFiles']] - - -const EDITIONS = ['Enterprise', 'Professional', 'Community', 'BuildTools'] -const YEARS = ['2022', '2019', '2017'] - -const VsYearVersion = { - '2022': '17.0', - '2019': '16.0', - '2017': '15.0', - '2015': '14.0', - '2013': '12.0', -} - -function vsversion_to_versionnumber(vsversion) { - if (Object.values(VsYearVersion).includes(vsversion)) { - return vsversion - } else { - if (vsversion in VsYearVersion) { - return VsYearVersion[vsversion] - } - } - return vsversion -} -exports.vsversion_to_versionnumber = vsversion_to_versionnumber - -function vsversion_to_year(vsversion) { - if (Object.keys(VsYearVersion).includes(vsversion)) { - return vsversion - } else { - for (const [year, ver] of Object.entries(VsYearVersion)) { - if (ver === vsversion) { - return year - } - } - } - return vsversion -} -exports.vsversion_to_year = vsversion_to_year - -const VSWHERE_PATH = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\Installer` - -function findWithVswhere(pattern, version_pattern) { - try { - let installationPath = child_process.execSync(`vswhere -products * ${version_pattern} -prerelease -property installationPath`).toString().trim() - return installationPath + '\\' + pattern - } catch (e) { - core.warning(`vswhere failed: ${e}`) - } - return null -} -exports.findWithVswhere = findWithVswhere - -function findVcvarsall(vsversion) { - const vsversion_number = vsversion_to_versionnumber(vsversion) - let version_pattern - if (vsversion_number) { - const upper_bound = vsversion_number.split('.')[0] + '.9' - version_pattern = `-version "${vsversion_number},${upper_bound}"` - } else { - version_pattern = "-latest" - } - - // If vswhere is available, ask it about the location of the latest Visual Studio. - let path = findWithVswhere('VC\\Auxiliary\\Build\\vcvarsall.bat', version_pattern) - if (path && fs.existsSync(path)) { - core.info(`Found with vswhere: ${path}`) - return path - } - core.info("Not found with vswhere") - - // If that does not work, try the standard installation locations, - // starting with the latest and moving to the oldest. - const years = vsversion ? [vsversion_to_year(vsversion)] : YEARS - for (const prog_files of PROGRAM_FILES) { - for (const ver of years) { - for (const ed of EDITIONS) { - path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat` - core.info(`Trying standard location: ${path}`) - if (fs.existsSync(path)) { - core.info(`Found standard location: ${path}`) - return path - } - } - } - } - core.info("Not found in standard locations") - - // Special case for Visual Studio 2015 (and maybe earlier), try it out too. - path = `${PROGRAM_FILES_X86}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat` - if (fs.existsSync(path)) { - core.info(`Found VS 2015: ${path}`) - return path - } - core.info(`Not found in VS 2015 location: ${path}`) - - throw new Error('Microsoft Visual Studio not found') -} -exports.findVcvarsall = findVcvarsall - -function isPathVariable(name) { - const pathLikeVariables = ['PATH', 'INCLUDE', 'LIB', 'LIBPATH'] - return pathLikeVariables.indexOf(name.toUpperCase()) != -1 -} - -function filterPathValue(path) { - let paths = path.split(';') - // Remove duplicates by keeping the first occurance and preserving order. - // This keeps path shadowing working as intended. - function unique(value, index, self) { - return self.indexOf(value) === index - } - return paths.filter(unique).join(';') -} - -/** See https://github.com/ilammy/msvc-dev-cmd#inputs */ -function setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre, vsversion) { - if (process.platform != 'win32') { - core.info('This is not a Windows virtual environment, bye!') - return - } - - // Add standard location of "vswhere" to PATH, in case it's not there. - process.env.PATH += path.delimiter + VSWHERE_PATH - - // There are all sorts of way the architectures are called. In addition to - // values supported by Microsoft Visual C++, recognize some common aliases. - let arch_aliases = { - "win32": "x86", - "win64": "x64", - "x86_64": "x64", - "x86-64": "x64", - } - // Ignore case when matching as that's what humans expect. - if (arch.toLowerCase() in arch_aliases) { - arch = arch_aliases[arch.toLowerCase()] - } - - // Due to the way Microsoft Visual C++ is configured, we have to resort to the following hack: - // Call the configuration batch file and then output *all* the environment variables. - - var args = [arch] - if (uwp == 'true') { - args.push('uwp') - } - if (sdk) { - args.push(sdk) - } - if (toolset) { - args.push(`-vcvars_ver=${toolset}`) - } - if (spectre == 'true') { - args.push('-vcvars_spectre_libs=spectre') - } - - const vcvars = `"${findVcvarsall(vsversion)}" ${args.join(' ')}` - core.debug(`vcvars command-line: ${vcvars}`) - - const cmd_output_string = child_process.execSync(`set && cls && ${vcvars} && cls && set`, {shell: "cmd"}).toString() - const cmd_output_parts = cmd_output_string.split('\f') - - const old_environment = cmd_output_parts[0].split('\r\n') - const vcvars_output = cmd_output_parts[1].split('\r\n') - const new_environment = cmd_output_parts[2].split('\r\n') - - // If vsvars.bat is given an incorrect command line, it will print out - // an error and *still* exit successfully. Parse out errors from output - // which don't look like environment variables, and fail if appropriate. - const error_messages = vcvars_output.filter((line) => { - if (line.match(/^\[ERROR.*\]/)) { - // Don't print this particular line which will be confusing in output. - if (!line.match(/Error in script usage. The correct usage is:$/)) { - return true - } - } - return false - }) - if (error_messages.length > 0) { - throw new Error('invalid parameters' + '\r\n' + error_messages.join('\r\n')) - } - - // Convert old environment lines into a dictionary for easier lookup. - let old_env_vars = {} - for (let string of old_environment) { - const [name, value] = string.split('=') - old_env_vars[name] = value - } - - // Now look at the new environment and export everything that changed. - // These are the variables set by vsvars.bat. Also export everything - // that was not there during the first sweep: those are new variables. - core.startGroup('Environment variables') - for (let string of new_environment) { - // vsvars.bat likes to print some fluff at the beginning. - // Skip lines that don't look like environment variables. - if (!string.includes('=')) { - continue; - } - let [name, new_value] = string.split('=') - let old_value = old_env_vars[name] - // For new variables "old_value === undefined". - if (new_value !== old_value) { - core.info(`Setting ${name}`) - // Special case for a bunch of PATH-like variables: vcvarsall.bat - // just prepends its stuff without checking if its already there. - // This makes repeated invocations of this action fail after some - // point, when the environment variable overflows. Avoid that. - if (isPathVariable(name)) { - new_value = filterPathValue(new_value) - } - core.exportVariable(name, new_value) - } - } - core.endGroup() - - core.info(`Configured Developer Command Prompt`) -} -exports.setupMSVCDevCmd = setupMSVCDevCmd function main() { var arch = core.getInput('arch') diff --git a/lib.js b/lib.js new file mode 100644 index 0000000..e1774d8 --- /dev/null +++ b/lib.js @@ -0,0 +1,225 @@ +const core = require('@actions/core') +const child_process = require('child_process') +const fs = require('fs') +const path = require('path') +const process = require('process') + +const PROGRAM_FILES_X86 = process.env['ProgramFiles(x86)'] +const PROGRAM_FILES = [process.env['ProgramFiles(x86)'], process.env['ProgramFiles']] + + +const EDITIONS = ['Enterprise', 'Professional', 'Community', 'BuildTools'] +const YEARS = ['2022', '2019', '2017'] + +const VsYearVersion = { + '2022': '17.0', + '2019': '16.0', + '2017': '15.0', + '2015': '14.0', + '2013': '12.0', +} + +function vsversion_to_versionnumber(vsversion) { + if (Object.values(VsYearVersion).includes(vsversion)) { + return vsversion + } else { + if (vsversion in VsYearVersion) { + return VsYearVersion[vsversion] + } + } + return vsversion +} +exports.vsversion_to_versionnumber = vsversion_to_versionnumber + +function vsversion_to_year(vsversion) { + if (Object.keys(VsYearVersion).includes(vsversion)) { + return vsversion + } else { + for (const [year, ver] of Object.entries(VsYearVersion)) { + if (ver === vsversion) { + return year + } + } + } + return vsversion +} +exports.vsversion_to_year = vsversion_to_year + +const VSWHERE_PATH = `${PROGRAM_FILES_X86}\\Microsoft Visual Studio\\Installer` + +function findWithVswhere(pattern, version_pattern) { + try { + let installationPath = child_process.execSync(`vswhere -products * ${version_pattern} -prerelease -property installationPath`).toString().trim() + return installationPath + '\\' + pattern + } catch (e) { + core.warning(`vswhere failed: ${e}`) + } + return null +} +exports.findWithVswhere = findWithVswhere + +function findVcvarsall(vsversion) { + const vsversion_number = vsversion_to_versionnumber(vsversion) + let version_pattern + if (vsversion_number) { + const upper_bound = vsversion_number.split('.')[0] + '.9' + version_pattern = `-version "${vsversion_number},${upper_bound}"` + } else { + version_pattern = "-latest" + } + + // If vswhere is available, ask it about the location of the latest Visual Studio. + let path = findWithVswhere('VC\\Auxiliary\\Build\\vcvarsall.bat', version_pattern) + if (path && fs.existsSync(path)) { + core.info(`Found with vswhere: ${path}`) + return path + } + core.info("Not found with vswhere") + + // If that does not work, try the standard installation locations, + // starting with the latest and moving to the oldest. + const years = vsversion ? [vsversion_to_year(vsversion)] : YEARS + for (const prog_files of PROGRAM_FILES) { + for (const ver of years) { + for (const ed of EDITIONS) { + path = `${prog_files}\\Microsoft Visual Studio\\${ver}\\${ed}\\VC\\Auxiliary\\Build\\vcvarsall.bat` + core.info(`Trying standard location: ${path}`) + if (fs.existsSync(path)) { + core.info(`Found standard location: ${path}`) + return path + } + } + } + } + core.info("Not found in standard locations") + + // Special case for Visual Studio 2015 (and maybe earlier), try it out too. + path = `${PROGRAM_FILES_X86}\\Microsoft Visual C++ Build Tools\\vcbuildtools.bat` + if (fs.existsSync(path)) { + core.info(`Found VS 2015: ${path}`) + return path + } + core.info(`Not found in VS 2015 location: ${path}`) + + throw new Error('Microsoft Visual Studio not found') +} +exports.findVcvarsall = findVcvarsall + +function isPathVariable(name) { + const pathLikeVariables = ['PATH', 'INCLUDE', 'LIB', 'LIBPATH'] + return pathLikeVariables.indexOf(name.toUpperCase()) != -1 +} + +function filterPathValue(path) { + let paths = path.split(';') + // Remove duplicates by keeping the first occurance and preserving order. + // This keeps path shadowing working as intended. + function unique(value, index, self) { + return self.indexOf(value) === index + } + return paths.filter(unique).join(';') +} + +/** See https://github.com/ilammy/msvc-dev-cmd#inputs */ +function setupMSVCDevCmd(arch, sdk, toolset, uwp, spectre, vsversion) { + if (process.platform != 'win32') { + core.info('This is not a Windows virtual environment, bye!') + return + } + + // Add standard location of "vswhere" to PATH, in case it's not there. + process.env.PATH += path.delimiter + VSWHERE_PATH + + // There are all sorts of way the architectures are called. In addition to + // values supported by Microsoft Visual C++, recognize some common aliases. + let arch_aliases = { + "win32": "x86", + "win64": "x64", + "x86_64": "x64", + "x86-64": "x64", + } + // Ignore case when matching as that's what humans expect. + if (arch.toLowerCase() in arch_aliases) { + arch = arch_aliases[arch.toLowerCase()] + } + + // Due to the way Microsoft Visual C++ is configured, we have to resort to the following hack: + // Call the configuration batch file and then output *all* the environment variables. + + var args = [arch] + if (uwp == 'true') { + args.push('uwp') + } + if (sdk) { + args.push(sdk) + } + if (toolset) { + args.push(`-vcvars_ver=${toolset}`) + } + if (spectre == 'true') { + args.push('-vcvars_spectre_libs=spectre') + } + + const vcvars = `"${findVcvarsall(vsversion)}" ${args.join(' ')}` + core.debug(`vcvars command-line: ${vcvars}`) + + const cmd_output_string = child_process.execSync(`set && cls && ${vcvars} && cls && set`, {shell: "cmd"}).toString() + const cmd_output_parts = cmd_output_string.split('\f') + + const old_environment = cmd_output_parts[0].split('\r\n') + const vcvars_output = cmd_output_parts[1].split('\r\n') + const new_environment = cmd_output_parts[2].split('\r\n') + + // If vsvars.bat is given an incorrect command line, it will print out + // an error and *still* exit successfully. Parse out errors from output + // which don't look like environment variables, and fail if appropriate. + const error_messages = vcvars_output.filter((line) => { + if (line.match(/^\[ERROR.*\]/)) { + // Don't print this particular line which will be confusing in output. + if (!line.match(/Error in script usage. The correct usage is:$/)) { + return true + } + } + return false + }) + if (error_messages.length > 0) { + throw new Error('invalid parameters' + '\r\n' + error_messages.join('\r\n')) + } + + // Convert old environment lines into a dictionary for easier lookup. + let old_env_vars = {} + for (let string of old_environment) { + const [name, value] = string.split('=') + old_env_vars[name] = value + } + + // Now look at the new environment and export everything that changed. + // These are the variables set by vsvars.bat. Also export everything + // that was not there during the first sweep: those are new variables. + core.startGroup('Environment variables') + for (let string of new_environment) { + // vsvars.bat likes to print some fluff at the beginning. + // Skip lines that don't look like environment variables. + if (!string.includes('=')) { + continue; + } + let [name, new_value] = string.split('=') + let old_value = old_env_vars[name] + // For new variables "old_value === undefined". + if (new_value !== old_value) { + core.info(`Setting ${name}`) + // Special case for a bunch of PATH-like variables: vcvarsall.bat + // just prepends its stuff without checking if its already there. + // This makes repeated invocations of this action fail after some + // point, when the environment variable overflows. Avoid that. + if (isPathVariable(name)) { + new_value = filterPathValue(new_value) + } + core.exportVariable(name, new_value) + } + } + core.endGroup() + + core.info(`Configured Developer Command Prompt`) +} +exports.setupMSVCDevCmd = setupMSVCDevCmd From 1a763147372cb4ca09f2a6716ff70f2f4396bb8c Mon Sep 17 00:00:00 2001 From: Oleksii Lozovskyi Date: Mon, 1 Jan 2024 06:17:50 +0200 Subject: [PATCH 7/7] Make `npm audit` happy (#75) --- package-lock.json | 48 +++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43f2b6a..936b93d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -343,12 +343,20 @@ } }, "node_modules/debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "dependencies": { - "ms": "^2.1.1" + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/deep-is": { @@ -1025,9 +1033,9 @@ } }, "node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1249,9 +1257,9 @@ } }, "node_modules/word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "engines": { "node": ">=0.10.0" @@ -1532,12 +1540,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "deep-is": { @@ -2062,9 +2070,9 @@ } }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -2227,9 +2235,9 @@ } }, "word-wrap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true }, "wrappy": {