diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05b703dc355..8761fb0e6ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,15 +11,19 @@ jobs: strategy: matrix: include: - - NodeVersion: 16 + - NodeVersion: 16.20.x + NodeVersionDisplayName: 16 OS: ubuntu-latest - - NodeVersion: 18 + - NodeVersion: 18.18.x + NodeVersionDisplayName: 18 OS: ubuntu-latest - - NodeVersion: 20 + - NodeVersion: 20.9.x + NodeVersionDisplayName: 20 OS: ubuntu-latest - - NodeVersion: 18 + - NodeVersion: 18.18.x + NodeVersionDisplayName: 18 OS: windows-latest - name: Node.js v${{ matrix.NodeVersion }} (${{ matrix.OS }}) + name: Node.js v${{ matrix.NodeVersionDisplayName }} (${{ matrix.OS }}) runs-on: ${{ matrix.OS }} steps: - uses: actions/checkout@v3 diff --git a/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml b/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml index 28da694636c..47086ab2ddb 100644 --- a/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml +++ b/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/docker-compose.yml @@ -7,9 +7,6 @@ services: ports: - '9000:9000' - '9001:9001' - environment: - MINIO_ROOT_USER: minio - MINIO_ROOT_PASSWORD: minio123 healthcheck: test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] interval: 30s diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts b/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts index 426e69bb254..eb18757ba75 100644 --- a/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts +++ b/build-tests/rush-redis-cobuild-plugin-integration-test/src/testLockProvider.ts @@ -10,7 +10,7 @@ import { OperationStatus, type ICobuildContext, RushSession } from '@microsoft/r const options: IRedisCobuildLockProviderOptions = { url: 'redis://localhost:6379', - password: 'redis123' + password: 'redis123' // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Password used in unit test.")] }; const rushSession: RushSession = new RushSession({ diff --git a/common/changes/@microsoft/rush/1es-templates_2023-10-24-00-46.json b/common/changes/@microsoft/rush/1es-templates_2023-10-24-00-46.json new file mode 100644 index 00000000000..efcd84c45fb --- /dev/null +++ b/common/changes/@microsoft/rush/1es-templates_2023-10-24-00-46.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@microsoft/rush" + } + ], + "packageName": "@microsoft/rush", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@microsoft/rush/dmyers-shrinkwrap-filename_2023-10-18-19-31.json b/common/changes/@microsoft/rush/dmyers-shrinkwrap-filename_2023-10-18-19-31.json new file mode 100644 index 00000000000..566a3d5e1aa --- /dev/null +++ b/common/changes/@microsoft/rush/dmyers-shrinkwrap-filename_2023-10-18-19-31.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Include the filename of the shrinkwrap file in logging messages for all package managers, not just Yarn.", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/common/changes/@microsoft/rush/sanjaiyan-async-concurrent_2023-10-20-07-32.json b/common/changes/@microsoft/rush/sanjaiyan-async-concurrent_2023-10-20-07-32.json new file mode 100644 index 00000000000..1026de56680 --- /dev/null +++ b/common/changes/@microsoft/rush/sanjaiyan-async-concurrent_2023-10-20-07-32.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "performance improvements by running asynchronous code concurrently using Promise.all", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file diff --git a/common/config/azure-pipelines/npm-publish-rush.yaml b/common/config/azure-pipelines/npm-publish-rush.yaml index 946d3efbbc9..2a070ce394d 100644 --- a/common/config/azure-pipelines/npm-publish-rush.yaml +++ b/common/config/azure-pipelines/npm-publish-rush.yaml @@ -1,41 +1,60 @@ -pool: - vmImage: 'ubuntu-latest' - variables: - name: FORCE_COLOR value: 1 - name: SourceBranch value: $[ replace(replace(resources.repositories.self.ref, 'refs/heads/', ''), 'refs/pull/', 'refs/remotes/pull/') ] -steps: - - checkout: self - persistCredentials: true - - - template: templates/install-node.yaml - - - template: templates/build.yaml - - - template: templates/bump-versions.yaml - parameters: - VersionPolicyName: noRush - BranchName: $(SourceBranch) - - - template: templates/bump-versions.yaml - parameters: - VersionPolicyName: rush - BranchName: $(SourceBranch) - - - script: 'node libraries/rush-lib/scripts/plugins-prepublish.js' - displayName: 'Prepublish workaround for rush-lib' - - - template: templates/publish.yaml - parameters: - VersionPolicyName: noRush - BranchName: $(SourceBranch) - - - template: templates/publish.yaml - parameters: - VersionPolicyName: rush - BranchName: $(SourceBranch) - - - template: templates/record-published-versions.yaml +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + parameters: + pool: + name: Azure-Pipelines-1ESPT-ExDShared + os: windows + stages: + - stage: + jobs: + - job: + templateContext: + outputs: + - output: pipelineArtifact + targetPath: $(Build.ArtifactStagingDirectory)/published-versions + artifactName: published-versions + steps: + - checkout: self + persistCredentials: true + + - template: /common/config/azure-pipelines/templates/install-node.yaml@self + + - template: /common/config/azure-pipelines/templates/build.yaml@self + + - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self + parameters: + VersionPolicyName: noRush + BranchName: $(SourceBranch) + + - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self + parameters: + VersionPolicyName: rush + BranchName: $(SourceBranch) + + - script: 'node libraries/rush-lib/scripts/plugins-prepublish.js' + displayName: 'Prepublish workaround for rush-lib' + + - template: /common/config/azure-pipelines/templates/publish.yaml@self + parameters: + VersionPolicyName: noRush + BranchName: $(SourceBranch) + + - template: /common/config/azure-pipelines/templates/publish.yaml@self + parameters: + VersionPolicyName: rush + BranchName: $(SourceBranch) + + - template: /common/config/azure-pipelines/templates/record-published-versions.yaml@self diff --git a/common/config/azure-pipelines/npm-publish.yaml b/common/config/azure-pipelines/npm-publish.yaml index 459125dcb09..fcfc6b50e7a 100644 --- a/common/config/azure-pipelines/npm-publish.yaml +++ b/common/config/azure-pipelines/npm-publish.yaml @@ -1,28 +1,47 @@ -pool: - vmImage: 'ubuntu-latest' - variables: - name: FORCE_COLOR value: 1 - name: SourceBranch value: $[ replace(replace(resources.repositories.self.ref, 'refs/heads/', ''), 'refs/pull/', 'refs/remotes/pull/') ] -steps: - - checkout: self - persistCredentials: true +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + parameters: + pool: + name: Azure-Pipelines-1ESPT-ExDShared + os: windows + stages: + - stage: + jobs: + - job: + templateContext: + outputs: + - output: pipelineArtifact + targetPath: $(Build.ArtifactStagingDirectory)/published-versions + artifactName: published-versions + steps: + - checkout: self + persistCredentials: true - - template: templates/install-node.yaml + - template: /common/config/azure-pipelines/templates/install-node.yaml@self - - template: templates/build.yaml + - template: /common/config/azure-pipelines/templates/build.yaml@self - - template: templates/bump-versions.yaml - parameters: - VersionPolicyName: noRush - BranchName: $(SourceBranch) + - template: /common/config/azure-pipelines/templates/bump-versions.yaml@self + parameters: + VersionPolicyName: noRush + BranchName: $(SourceBranch) - - template: templates/publish.yaml - parameters: - VersionPolicyName: noRush - BranchName: $(SourceBranch) + - template: /common/config/azure-pipelines/templates/publish.yaml@self + parameters: + VersionPolicyName: noRush + BranchName: $(SourceBranch) - - template: templates/record-published-versions.yaml + - template: /common/config/azure-pipelines/templates/record-published-versions.yaml@self diff --git a/common/config/azure-pipelines/templates/record-published-versions.yaml b/common/config/azure-pipelines/templates/record-published-versions.yaml index 29ed653d063..9f234db9f8b 100644 --- a/common/config/azure-pipelines/templates/record-published-versions.yaml +++ b/common/config/azure-pipelines/templates/record-published-versions.yaml @@ -1,6 +1,7 @@ steps: - script: 'node repo-scripts/repo-toolbox/lib/start.js record-versions --out-file $(Build.ArtifactStagingDirectory)/published-versions/published-versions.json' displayName: 'Record Published Versions' - - publish: $(Build.ArtifactStagingDirectory)/published-versions - artifact: published-versions - displayName: 'Publish Artifact: published-versions' + # Published by the 1ES template + # - publish: $(Build.ArtifactStagingDirectory)/published-versions + # artifact: published-versions + # displayName: 'Publish Artifact: published-versions' diff --git a/common/config/azure-pipelines/vscode-extension-publish.yaml b/common/config/azure-pipelines/vscode-extension-publish.yaml index 417c0e2c09b..4e4595f64e3 100644 --- a/common/config/azure-pipelines/vscode-extension-publish.yaml +++ b/common/config/azure-pipelines/vscode-extension-publish.yaml @@ -1,28 +1,42 @@ -pool: - vmImage: 'ubuntu-latest' - variables: - name: FORCE_COLOR value: 1 -steps: - - checkout: self - persistCredentials: true +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + parameters: + pool: + name: Azure-Pipelines-1ESPT-ExDShared + os: windows + stages: + - stage: + jobs: + - job: + steps: + - checkout: self + persistCredentials: true - - template: templates/install-node.yaml + - template: /common/config/azure-pipelines/templates/install-node.yaml@self - - template: templates/build.yaml - parameters: - BuildParameters: > - --to rushstack - PerformValidation: false + - template: /common/config/azure-pipelines/templates/build.yaml@self + parameters: + BuildParameters: > + --to rushstack + PerformValidation: false - - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js package - workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension - displayName: 'Package vscode extension' + - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js package + workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension + displayName: 'Package vscode extension' - - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js deploy - workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension - displayName: 'Publish vscode extension' - env: - VSCE_PAT: $(vscePat) + - script: node $(Build.SourcesDirectory)/common/scripts/install-run-rushx.js deploy + workingDirectory: $(Build.SourcesDirectory)/vscode-extensions/rush-vscode-extension + displayName: 'Publish vscode extension' + env: + VSCE_PAT: $(vscePat) diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.json b/heft-plugins/heft-jest-plugin/CHANGELOG.json index ea231475582..fd5d976eda3 100644 --- a/heft-plugins/heft-jest-plugin/CHANGELOG.json +++ b/heft-plugins/heft-jest-plugin/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@rushstack/heft-jest-plugin", "entries": [ + { + "version": "0.10.1", + "tag": "@rushstack/heft-jest-plugin_v0.10.1", + "date": "Thu, 26 Oct 2023 00:27:48 GMT", + "comments": { + "patch": [ + { + "comment": "Add an option (`enableNodeEnvManagement`) to ensure that the NODE_ENV environment variable is set to `\"test\"` during test execution." + } + ] + } + }, { "version": "0.10.0", "tag": "@rushstack/heft-jest-plugin_v0.10.0", diff --git a/heft-plugins/heft-jest-plugin/CHANGELOG.md b/heft-plugins/heft-jest-plugin/CHANGELOG.md index 4ea4166c79f..30453929287 100644 --- a/heft-plugins/heft-jest-plugin/CHANGELOG.md +++ b/heft-plugins/heft-jest-plugin/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log - @rushstack/heft-jest-plugin -This log was last generated on Mon, 23 Oct 2023 15:18:38 GMT and should not be manually modified. +This log was last generated on Thu, 26 Oct 2023 00:27:48 GMT and should not be manually modified. + +## 0.10.1 +Thu, 26 Oct 2023 00:27:48 GMT + +### Patches + +- Add an option (`enableNodeEnvManagement`) to ensure that the NODE_ENV environment variable is set to `"test"` during test execution. ## 0.10.0 Mon, 23 Oct 2023 15:18:38 GMT diff --git a/heft-plugins/heft-jest-plugin/package.json b/heft-plugins/heft-jest-plugin/package.json index a612b34d308..7ded74098df 100644 --- a/heft-plugins/heft-jest-plugin/package.json +++ b/heft-plugins/heft-jest-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@rushstack/heft-jest-plugin", - "version": "0.10.0", + "version": "0.10.1", "description": "Heft plugin for Jest", "repository": { "type": "git", diff --git a/heft-plugins/heft-jest-plugin/src/JestPlugin.ts b/heft-plugins/heft-jest-plugin/src/JestPlugin.ts index a7683553c4a..f1b9770002b 100644 --- a/heft-plugins/heft-jest-plugin/src/JestPlugin.ts +++ b/heft-plugins/heft-jest-plugin/src/JestPlugin.ts @@ -101,6 +101,7 @@ export interface IJestPluginOptions { detectOpenHandles?: boolean; disableCodeCoverage?: boolean; disableConfigurationModuleResolution?: boolean; + enableNodeEnvManagement?: boolean; findRelatedTests?: string[]; maxWorkers?: string; passWithNoTests?: boolean; @@ -153,6 +154,7 @@ export default class JestPlugin implements IHeftTaskPlugin { private _jestOutputStream: TerminalWritableStream | undefined; private _changedFiles: Set = new Set(); private _requestRun!: () => void; + private _nodeEnvSet: boolean | undefined; private _resolveFirstRunQueued!: () => void; private _firstRunQueuedPromise: Promise; @@ -210,7 +212,7 @@ export default class JestPlugin implements IHeftTaskPlugin { const testTimeoutParameter: CommandLineIntegerParameter = parameters.getIntegerParameter('--test-timeout-ms'); - const combinedOptions: IJestPluginOptions = { + const options: IJestPluginOptions = { ...pluginOptions, configurationPath: configParameter.value || pluginOptions?.configurationPath, debugHeftReporter: debugHeftReporterParameter.value || pluginOptions?.debugHeftReporter, @@ -228,11 +230,12 @@ export default class JestPlugin implements IHeftTaskPlugin { testPathIgnorePatterns: testPathIgnorePatternsParameter.value || pluginOptions?.testPathIgnorePatterns, testPathPattern: testPathPatternParameter.value || pluginOptions?.testPathPattern, testTimeout: testTimeoutParameter.value ?? pluginOptions?.testTimeout, - updateSnapshots: updateSnapshotsParameter.value || pluginOptions?.updateSnapshots + updateSnapshots: updateSnapshotsParameter.value || pluginOptions?.updateSnapshots, + enableNodeEnvManagement: pluginOptions?.enableNodeEnvManagement ?? true }; taskSession.hooks.run.tapPromise(PLUGIN_NAME, async (runOptions: IHeftTaskRunHookOptions) => { - await this._runJestAsync(taskSession, heftConfiguration, combinedOptions); + await this._runJestAsync(taskSession, heftConfiguration, options); }); taskSession.hooks.runIncremental.tapPromise( @@ -241,7 +244,7 @@ export default class JestPlugin implements IHeftTaskPlugin { await this._runJestWatchAsync( taskSession, heftConfiguration, - combinedOptions, + options, runIncrementalOptions.requestRun ); } @@ -259,6 +262,8 @@ export default class JestPlugin implements IHeftTaskPlugin { const logger: IScopedLogger = taskSession.logger; const terminal: ITerminal = logger.terminal; + this._setNodeEnvIfRequested(options, logger); + const { getVersion, runCLI } = await import(`@jest/core`); terminal.writeLine(`Using Jest version ${getVersion()}`); @@ -281,6 +286,8 @@ export default class JestPlugin implements IHeftTaskPlugin { results: jestResults } = await runCLI(jestArgv, [buildFolderPath]); + this._resetNodeEnv(); + if (jestResults.numFailedTests > 0) { logger.emitError( new Error( @@ -491,6 +498,8 @@ export default class JestPlugin implements IHeftTaskPlugin { await Promise.resolve(); if (pendingTestRuns.size > 0) { + this._setNodeEnvIfRequested(options, logger); + this._executing = true; for (const pendingTestRun of pendingTestRuns) { pendingTestRuns.delete(pendingTestRun); @@ -516,6 +525,8 @@ export default class JestPlugin implements IHeftTaskPlugin { } } + this._resetNodeEnv(); + if (!logger.hasErrors) { // If we ran tests and they succeeded, consider the files to no longer be changed. // This might be overly-permissive, but there isn't a great way to identify if the changes @@ -790,6 +801,29 @@ export default class JestPlugin implements IHeftTaskPlugin { return JestPlugin._jestConfigurationFileLoader; } + private _setNodeEnvIfRequested(options: IJestPluginOptions, logger: IScopedLogger): void { + if (options.enableNodeEnvManagement) { + if (process.env.NODE_ENV) { + if (process.env.NODE_ENV !== 'test') { + // In the future, we may consider just setting this and not warning + logger.emitWarning( + new Error(`NODE_ENV variable is set and it's not "test". NODE_ENV=${process.env.NODE_ENV}`) + ); + } + } else { + process.env.NODE_ENV = 'test'; + this._nodeEnvSet = true; + } + } + } + + private _resetNodeEnv(): void { + // unset the NODE_ENV only if we have set it + if (this._nodeEnvSet) { + delete process.env.NODE_ENV; + } + } + private static _extractHeftJestReporters( taskSession: IHeftTaskSession, heftConfiguration: HeftConfiguration, diff --git a/heft-plugins/heft-jest-plugin/src/schemas/heft-jest-plugin.schema.json b/heft-plugins/heft-jest-plugin/src/schemas/heft-jest-plugin.schema.json index 2efdd6cb184..4b11df53547 100644 --- a/heft-plugins/heft-jest-plugin/src/schemas/heft-jest-plugin.schema.json +++ b/heft-plugins/heft-jest-plugin/src/schemas/heft-jest-plugin.schema.json @@ -11,6 +11,11 @@ "title": "Disable Configuration Module Resolution", "description": "If set to true, modules specified in the Jest configuration will be resolved using Jest default (rootDir-relative) resolution. Otherwise, modules will be resolved using Node module resolution.", "type": "boolean" + }, + "enableNodeEnvManagement": { + "title": "Enable management of the NODE_ENV variable", + "description": "If set to false, heft-jest-plugin will not set or unset the NODE_ENV variable. Otherwise, NODE_ENV will be set to `test` before execution and cleared after. If the NODE_ENV value is already set to a value that is not `test`, warning message appears.", + "type": "boolean" } } } diff --git a/libraries/rush-lib/scripts/copyEmptyModules.js b/libraries/rush-lib/scripts/copyEmptyModules.js index 2f5e2f380cc..9c9b5bc718e 100644 --- a/libraries/rush-lib/scripts/copyEmptyModules.js +++ b/libraries/rush-lib/scripts/copyEmptyModules.js @@ -1,6 +1,6 @@ 'use strict'; -const { FileSystem } = require('@rushstack/node-core-library'); +const { FileSystem, Async } = require('@rushstack/node-core-library'); const JS_FILE_EXTENSION = '.js'; const DTS_FILE_EXTENSION = '.d.ts'; @@ -50,7 +50,7 @@ module.exports = { const folderItems = await FileSystem.readFolderItemsAsync( relativeFolderPath ? `${jsInFolderPath}/${relativeFolderPath}` : jsInFolderPath ); - for (const folderItem of folderItems) { + await Async.forEachAsync(folderItems, async (folderItem) => { const itemName = folderItem.name; const relativeItemPath = relativeFolderPath ? `${relativeFolderPath}/${itemName}` : itemName; @@ -76,7 +76,7 @@ module.exports = { await FileSystem.writeFileAsync(outDtsPath, buffer, { ensureFolderExists: true }); } } - } + }); } await searchAsync(undefined); diff --git a/libraries/rush-lib/src/api/RushConfiguration.ts b/libraries/rush-lib/src/api/RushConfiguration.ts index c147dc9184c..1085b04e471 100644 --- a/libraries/rush-lib/src/api/RushConfiguration.ts +++ b/libraries/rush-lib/src/api/RushConfiguration.ts @@ -1153,13 +1153,7 @@ export class RushConfiguration { * package manager. */ public get shrinkwrapFilePhrase(): string { - if (this.packageManager === 'yarn') { - // Eventually we'd like to be consistent with Yarn's terminology of calling this a "lock file", - // but a lot of Rush documentation uses "shrinkwrap" file and would all need to be updated. - return 'shrinkwrap file (yarn.lock)'; - } else { - return 'shrinkwrap file'; - } + return `shrinkwrap file (${this.shrinkwrapFilename})`; } /** diff --git a/rigs/heft-node-rig/CHANGELOG.json b/rigs/heft-node-rig/CHANGELOG.json index 16b1602b4af..5d7a40ba833 100644 --- a/rigs/heft-node-rig/CHANGELOG.json +++ b/rigs/heft-node-rig/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@rushstack/heft-node-rig", "entries": [ + { + "version": "2.3.7", + "tag": "@rushstack/heft-node-rig_v2.3.7", + "date": "Thu, 26 Oct 2023 00:27:48 GMT", + "comments": { + "dependency": [ + { + "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.10.1`" + } + ] + } + }, { "version": "2.3.6", "tag": "@rushstack/heft-node-rig_v2.3.6", diff --git a/rigs/heft-node-rig/CHANGELOG.md b/rigs/heft-node-rig/CHANGELOG.md index 9599f1714a0..f60e726e030 100644 --- a/rigs/heft-node-rig/CHANGELOG.md +++ b/rigs/heft-node-rig/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @rushstack/heft-node-rig -This log was last generated on Mon, 23 Oct 2023 15:18:38 GMT and should not be manually modified. +This log was last generated on Thu, 26 Oct 2023 00:27:48 GMT and should not be manually modified. + +## 2.3.7 +Thu, 26 Oct 2023 00:27:48 GMT + +_Version update only_ ## 2.3.6 Mon, 23 Oct 2023 15:18:38 GMT diff --git a/rigs/heft-node-rig/package.json b/rigs/heft-node-rig/package.json index 59487899b9e..1ba64a2791c 100644 --- a/rigs/heft-node-rig/package.json +++ b/rigs/heft-node-rig/package.json @@ -1,6 +1,6 @@ { "name": "@rushstack/heft-node-rig", - "version": "2.3.6", + "version": "2.3.7", "description": "A rig package for Node.js projects that build using Heft", "license": "MIT", "scripts": { diff --git a/rigs/heft-web-rig/CHANGELOG.json b/rigs/heft-web-rig/CHANGELOG.json index 807297ef18b..6cee902a8b2 100644 --- a/rigs/heft-web-rig/CHANGELOG.json +++ b/rigs/heft-web-rig/CHANGELOG.json @@ -1,6 +1,18 @@ { "name": "@rushstack/heft-web-rig", "entries": [ + { + "version": "0.19.7", + "tag": "@rushstack/heft-web-rig_v0.19.7", + "date": "Thu, 26 Oct 2023 00:27:48 GMT", + "comments": { + "dependency": [ + { + "comment": "Updating dependency \"@rushstack/heft-jest-plugin\" to `0.10.1`" + } + ] + } + }, { "version": "0.19.6", "tag": "@rushstack/heft-web-rig_v0.19.6", diff --git a/rigs/heft-web-rig/CHANGELOG.md b/rigs/heft-web-rig/CHANGELOG.md index eca2a7e041f..819875b5306 100644 --- a/rigs/heft-web-rig/CHANGELOG.md +++ b/rigs/heft-web-rig/CHANGELOG.md @@ -1,6 +1,11 @@ # Change Log - @rushstack/heft-web-rig -This log was last generated on Mon, 23 Oct 2023 15:18:38 GMT and should not be manually modified. +This log was last generated on Thu, 26 Oct 2023 00:27:48 GMT and should not be manually modified. + +## 0.19.7 +Thu, 26 Oct 2023 00:27:48 GMT + +_Version update only_ ## 0.19.6 Mon, 23 Oct 2023 15:18:38 GMT diff --git a/rigs/heft-web-rig/package.json b/rigs/heft-web-rig/package.json index e57d22c4584..0d8d0db05ce 100644 --- a/rigs/heft-web-rig/package.json +++ b/rigs/heft-web-rig/package.json @@ -1,6 +1,6 @@ { "name": "@rushstack/heft-web-rig", - "version": "0.19.6", + "version": "0.19.7", "description": "A rig package for web browser projects that build using Heft", "license": "MIT", "scripts": { diff --git a/rush-plugins/rush-redis-cobuild-plugin/src/test/RedisCobuildLockProvider.test.ts b/rush-plugins/rush-redis-cobuild-plugin/src/test/RedisCobuildLockProvider.test.ts index c27b1f0a9ef..03479caf486 100644 --- a/rush-plugins/rush-redis-cobuild-plugin/src/test/RedisCobuildLockProvider.test.ts +++ b/rush-plugins/rush-redis-cobuild-plugin/src/test/RedisCobuildLockProvider.test.ts @@ -85,7 +85,7 @@ describe(RedisCobuildLockProvider.name, () => { it('expands options with environment variables', () => { const expectedOptions = { - password: 'redis123' + password: 'redis123' // [SuppressMessage("Microsoft.Security", "CS001:SecretInline", Justification="Password used in unit test.")] }; const actualOptions = RedisCobuildLockProvider.expandOptionsWithEnvironmentVariables( { diff --git a/rush.json b/rush.json index 7e4a9a21c1d..cae1e828681 100644 --- a/rush.json +++ b/rush.json @@ -42,7 +42,7 @@ * LTS schedule: https://nodejs.org/en/about/releases/ * LTS versions: https://nodejs.org/en/download/releases/ */ - "nodeSupportedVersionRange": ">=16.13.0 <17.0.0 || >=18.15.0 <19.0.0 || >=20.6.1 <21.0.0", + "nodeSupportedVersionRange": ">=16.13.0 <17.0.0 || >=18.15.0 <19.0.0 || >=20.9.0 <21.0.0", /** * If the version check above fails, Rush will display a message showing the current @@ -63,7 +63,7 @@ * pre-LTS versions in preparation for supporting the first LTS version, you can use this setting * to disable Rush's warning. */ - "suppressNodeLtsWarning": true, // TODO: Remove when Node 20 goes LTS + "suppressNodeLtsWarning": false, /** * If you would like the version specifiers for your dependencies to be consistent, then