diff --git a/apps/api-documenter/src/cli/ApiDocumenterCommandLine.ts b/apps/api-documenter/src/cli/ApiDocumenterCommandLine.ts index b201d6456b6..cc6c6774111 100644 --- a/apps/api-documenter/src/cli/ApiDocumenterCommandLine.ts +++ b/apps/api-documenter/src/cli/ApiDocumenterCommandLine.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { CommandLineParser } from '@rushstack/ts-command-line'; + import { MarkdownAction } from './MarkdownAction'; import { YamlAction } from './YamlAction'; import { GenerateAction } from './GenerateAction'; diff --git a/apps/api-documenter/src/cli/BaseAction.ts b/apps/api-documenter/src/cli/BaseAction.ts index e45d679b9c4..fbd3f10a14f 100644 --- a/apps/api-documenter/src/cli/BaseAction.ts +++ b/apps/api-documenter/src/cli/BaseAction.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import type * as tsdoc from '@microsoft/tsdoc'; +import * as path from 'node:path'; +import type * as tsdoc from '@microsoft/tsdoc'; import { CommandLineAction, type CommandLineStringParameter, diff --git a/apps/api-documenter/src/cli/GenerateAction.ts b/apps/api-documenter/src/cli/GenerateAction.ts index 91e5c726ff6..155b22320d1 100644 --- a/apps/api-documenter/src/cli/GenerateAction.ts +++ b/apps/api-documenter/src/cli/GenerateAction.ts @@ -1,14 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + +import { FileSystem } from '@rushstack/node-core-library'; import type { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine'; import { BaseAction } from './BaseAction'; import { DocumenterConfig } from '../documenters/DocumenterConfig'; import { ExperimentalYamlDocumenter } from '../documenters/ExperimentalYamlDocumenter'; - -import { FileSystem } from '@rushstack/node-core-library'; import { MarkdownDocumenter } from '../documenters/MarkdownDocumenter'; export class GenerateAction extends BaseAction { diff --git a/apps/api-documenter/src/cli/YamlAction.ts b/apps/api-documenter/src/cli/YamlAction.ts index 3c819af64f3..7ed4161fb2d 100644 --- a/apps/api-documenter/src/cli/YamlAction.ts +++ b/apps/api-documenter/src/cli/YamlAction.ts @@ -8,7 +8,6 @@ import type { import type { ApiDocumenterCommandLine } from './ApiDocumenterCommandLine'; import { BaseAction } from './BaseAction'; - import { YamlDocumenter, type YamlFormat } from '../documenters/YamlDocumenter'; import { OfficeYamlDocumenter } from '../documenters/OfficeYamlDocumenter'; diff --git a/apps/api-documenter/src/documenters/DocumenterConfig.ts b/apps/api-documenter/src/documenters/DocumenterConfig.ts index e3fee70e3cd..3a0e32c3736 100644 --- a/apps/api-documenter/src/documenters/DocumenterConfig.ts +++ b/apps/api-documenter/src/documenters/DocumenterConfig.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { JsonSchema, JsonFile, NewlineKind } from '@rushstack/node-core-library'; + import type { IConfigFile } from './IConfigFile'; import apiDocumenterSchema from '../schemas/api-documenter.schema.json'; diff --git a/apps/api-documenter/src/documenters/MarkdownDocumenter.ts b/apps/api-documenter/src/documenters/MarkdownDocumenter.ts index 68895c679f4..0deb6ed6edf 100644 --- a/apps/api-documenter/src/documenters/MarkdownDocumenter.ts +++ b/apps/api-documenter/src/documenters/MarkdownDocumenter.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { PackageName, FileSystem, NewlineKind } from '@rushstack/node-core-library'; import { DocSection, diff --git a/apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts b/apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts index a080458ddb6..b8b178a9ce1 100644 --- a/apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts +++ b/apps/api-documenter/src/documenters/OfficeYamlDocumenter.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import yaml = require('js-yaml'); import type { ApiModel } from '@microsoft/api-extractor-model'; diff --git a/apps/api-documenter/src/documenters/YamlDocumenter.ts b/apps/api-documenter/src/documenters/YamlDocumenter.ts index 0d51be689f6..3ca47d82954 100644 --- a/apps/api-documenter/src/documenters/YamlDocumenter.ts +++ b/apps/api-documenter/src/documenters/YamlDocumenter.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import yaml = require('js-yaml'); + import { JsonFile, JsonSchema, @@ -50,6 +51,7 @@ import { Navigation, Meaning } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import type { IYamlApiFile, IYamlItem, diff --git a/apps/api-documenter/src/nodes/CustomDocNodeKind.ts b/apps/api-documenter/src/nodes/CustomDocNodeKind.ts index c1186d3fd38..9d0af5fdab8 100644 --- a/apps/api-documenter/src/nodes/CustomDocNodeKind.ts +++ b/apps/api-documenter/src/nodes/CustomDocNodeKind.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { TSDocConfiguration, DocNodeKind } from '@microsoft/tsdoc'; + import { DocEmphasisSpan } from './DocEmphasisSpan'; import { DocHeading } from './DocHeading'; import { DocNoteBox } from './DocNoteBox'; diff --git a/apps/api-documenter/src/nodes/DocEmphasisSpan.ts b/apps/api-documenter/src/nodes/DocEmphasisSpan.ts index e48d8c3c340..bc2197689fc 100644 --- a/apps/api-documenter/src/nodes/DocEmphasisSpan.ts +++ b/apps/api-documenter/src/nodes/DocEmphasisSpan.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type DocNode, DocNodeContainer, type IDocNodeContainerParameters } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; /** diff --git a/apps/api-documenter/src/nodes/DocHeading.ts b/apps/api-documenter/src/nodes/DocHeading.ts index 838e1a71f79..ee40a8bb6bc 100644 --- a/apps/api-documenter/src/nodes/DocHeading.ts +++ b/apps/api-documenter/src/nodes/DocHeading.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type IDocNodeParameters, DocNode } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; /** diff --git a/apps/api-documenter/src/nodes/DocNoteBox.ts b/apps/api-documenter/src/nodes/DocNoteBox.ts index f1075e5fcbb..cccece1460c 100644 --- a/apps/api-documenter/src/nodes/DocNoteBox.ts +++ b/apps/api-documenter/src/nodes/DocNoteBox.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type IDocNodeParameters, DocNode, DocSection } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; /** diff --git a/apps/api-documenter/src/nodes/DocTable.ts b/apps/api-documenter/src/nodes/DocTable.ts index 19f09013b99..945098a4adb 100644 --- a/apps/api-documenter/src/nodes/DocTable.ts +++ b/apps/api-documenter/src/nodes/DocTable.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type IDocNodeParameters, DocNode } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; import { DocTableRow } from './DocTableRow'; import type { DocTableCell } from './DocTableCell'; diff --git a/apps/api-documenter/src/nodes/DocTableCell.ts b/apps/api-documenter/src/nodes/DocTableCell.ts index f4fefe18eca..f0911dbfd59 100644 --- a/apps/api-documenter/src/nodes/DocTableCell.ts +++ b/apps/api-documenter/src/nodes/DocTableCell.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type IDocNodeParameters, DocNode, DocSection } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; /** diff --git a/apps/api-documenter/src/nodes/DocTableRow.ts b/apps/api-documenter/src/nodes/DocTableRow.ts index 421be24fe9c..85bd873d907 100644 --- a/apps/api-documenter/src/nodes/DocTableRow.ts +++ b/apps/api-documenter/src/nodes/DocTableRow.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type IDocNodeParameters, DocNode, DocPlainText } from '@microsoft/tsdoc'; + import { CustomDocNodeKind } from './CustomDocNodeKind'; import { DocTableCell } from './DocTableCell'; diff --git a/apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts b/apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts index a0ea2e8b82f..0666b8097b3 100644 --- a/apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts +++ b/apps/api-documenter/src/plugin/MarkdownDocumenterFeature.ts @@ -3,6 +3,7 @@ import type { ApiItem, ApiModel } from '@microsoft/api-extractor-model'; import { TypeUuid } from '@rushstack/node-core-library'; + import { PluginFeature } from './PluginFeature'; import type { MarkdownDocumenterAccessor } from './MarkdownDocumenterAccessor'; diff --git a/apps/api-documenter/src/plugin/PluginLoader.ts b/apps/api-documenter/src/plugin/PluginLoader.ts index 543e674a94e..6d926f6ea66 100644 --- a/apps/api-documenter/src/plugin/PluginLoader.ts +++ b/apps/api-documenter/src/plugin/PluginLoader.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as resolve from 'resolve'; import type { IApiDocumenterPluginManifest, IFeatureDefinition } from './IApiDocumenterPluginManifest'; diff --git a/apps/api-documenter/src/start.ts b/apps/api-documenter/src/start.ts index e5b6330b6f7..e6266aa99fa 100644 --- a/apps/api-documenter/src/start.ts +++ b/apps/api-documenter/src/start.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; import { PackageJsonLookup } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; diff --git a/apps/api-documenter/src/utils/ToSdpConvertHelper.ts b/apps/api-documenter/src/utils/ToSdpConvertHelper.ts index 73815485793..8d12f9df7f8 100644 --- a/apps/api-documenter/src/utils/ToSdpConvertHelper.ts +++ b/apps/api-documenter/src/utils/ToSdpConvertHelper.ts @@ -1,6 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + +import yaml = require('js-yaml'); + +import { FileSystem, Encoding, NewlineKind } from '@rushstack/node-core-library'; + import type { IYamlItem, IYamlApiFile, @@ -17,9 +23,6 @@ import type { FunctionYamlModel, CommonYamlModel } from '../yaml/ISDPYamlFile'; -import path from 'path'; -import { FileSystem, Encoding, NewlineKind } from '@rushstack/node-core-library'; -import yaml = require('js-yaml'); export function convertUDPYamlToSDP(folderPath: string): void { convert(folderPath, folderPath); diff --git a/apps/api-extractor/src/aedoc/PackageDocComment.ts b/apps/api-extractor/src/aedoc/PackageDocComment.ts index 09cca1835aa..3cc10e34526 100644 --- a/apps/api-extractor/src/aedoc/PackageDocComment.ts +++ b/apps/api-extractor/src/aedoc/PackageDocComment.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import type { Collector } from '../collector/Collector'; import { ExtractorMessageId } from '../api/ExtractorMessageId'; diff --git a/apps/api-extractor/src/analyzer/AstDeclaration.ts b/apps/api-extractor/src/analyzer/AstDeclaration.ts index 24a2a65e9c7..78cc4ed7337 100644 --- a/apps/api-extractor/src/analyzer/AstDeclaration.ts +++ b/apps/api-extractor/src/analyzer/AstDeclaration.ts @@ -2,9 +2,11 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + +import { InternalError } from '@rushstack/node-core-library'; + import type { AstSymbol } from './AstSymbol'; import { Span } from './Span'; -import { InternalError } from '@rushstack/node-core-library'; import type { AstEntity } from './AstEntity'; /** diff --git a/apps/api-extractor/src/analyzer/AstImport.ts b/apps/api-extractor/src/analyzer/AstImport.ts index bc2b685949d..38d4b1928a9 100644 --- a/apps/api-extractor/src/analyzer/AstImport.ts +++ b/apps/api-extractor/src/analyzer/AstImport.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { AstSymbol } from './AstSymbol'; import { InternalError } from '@rushstack/node-core-library'; + +import type { AstSymbol } from './AstSymbol'; import { AstSyntheticEntity } from './AstEntity'; /** diff --git a/apps/api-extractor/src/analyzer/AstReferenceResolver.ts b/apps/api-extractor/src/analyzer/AstReferenceResolver.ts index 25a1c359ef7..e51de2f1934 100644 --- a/apps/api-extractor/src/analyzer/AstReferenceResolver.ts +++ b/apps/api-extractor/src/analyzer/AstReferenceResolver.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import * as tsdoc from '@microsoft/tsdoc'; import type { AstSymbolTable } from './AstSymbolTable'; diff --git a/apps/api-extractor/src/analyzer/AstSymbol.ts b/apps/api-extractor/src/analyzer/AstSymbol.ts index a0a8d67251f..c8052d13dbb 100644 --- a/apps/api-extractor/src/analyzer/AstSymbol.ts +++ b/apps/api-extractor/src/analyzer/AstSymbol.ts @@ -2,8 +2,10 @@ // See LICENSE in the project root for license information. import type * as ts from 'typescript'; -import type { AstDeclaration } from './AstDeclaration'; + import { InternalError } from '@rushstack/node-core-library'; + +import type { AstDeclaration } from './AstDeclaration'; import { AstEntity } from './AstEntity'; /** diff --git a/apps/api-extractor/src/analyzer/AstSymbolTable.ts b/apps/api-extractor/src/analyzer/AstSymbolTable.ts index e589ea10097..1bfa982b578 100644 --- a/apps/api-extractor/src/analyzer/AstSymbolTable.ts +++ b/apps/api-extractor/src/analyzer/AstSymbolTable.ts @@ -4,6 +4,7 @@ /* eslint-disable no-bitwise */ // for ts.SymbolFlags import * as ts from 'typescript'; + import { type PackageJsonLookup, InternalError } from '@rushstack/node-core-library'; import { AstDeclaration } from './AstDeclaration'; diff --git a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts index c92d817e7bf..0bc6236aa4d 100644 --- a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts +++ b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import { InternalError } from '@rushstack/node-core-library'; import { TypeScriptHelpers } from './TypeScriptHelpers'; diff --git a/apps/api-extractor/src/analyzer/PackageMetadataManager.ts b/apps/api-extractor/src/analyzer/PackageMetadataManager.ts index c234174829a..22b9be7e891 100644 --- a/apps/api-extractor/src/analyzer/PackageMetadataManager.ts +++ b/apps/api-extractor/src/analyzer/PackageMetadataManager.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; + import semver from 'semver'; import { @@ -13,6 +14,7 @@ import { type JsonObject, type IPackageJsonExports } from '@rushstack/node-core-library'; + import { Extractor } from '../api/Extractor'; import type { MessageRouter } from '../collector/MessageRouter'; import { ConsoleMessageId } from '../api/ConsoleMessageId'; diff --git a/apps/api-extractor/src/analyzer/SourceFileLocationFormatter.ts b/apps/api-extractor/src/analyzer/SourceFileLocationFormatter.ts index 1a38c5541e4..939f9aa5ba2 100644 --- a/apps/api-extractor/src/analyzer/SourceFileLocationFormatter.ts +++ b/apps/api-extractor/src/analyzer/SourceFileLocationFormatter.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; + import type * as ts from 'typescript'; -import * as path from 'path'; + import { Path, Text } from '@rushstack/node-core-library'; export interface ISourceFileLocationFormatOptions { diff --git a/apps/api-extractor/src/analyzer/Span.ts b/apps/api-extractor/src/analyzer/Span.ts index 96841d800a0..e4d1f2970ab 100644 --- a/apps/api-extractor/src/analyzer/Span.ts +++ b/apps/api-extractor/src/analyzer/Span.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import { InternalError, Sort, Text } from '@rushstack/node-core-library'; import { IndentedWriter } from '../generators/IndentedWriter'; diff --git a/apps/api-extractor/src/analyzer/TypeScriptHelpers.ts b/apps/api-extractor/src/analyzer/TypeScriptHelpers.ts index d63e3ffe8d1..5c28b30d354 100644 --- a/apps/api-extractor/src/analyzer/TypeScriptHelpers.ts +++ b/apps/api-extractor/src/analyzer/TypeScriptHelpers.ts @@ -4,9 +4,11 @@ /* eslint-disable no-bitwise */ import * as ts from 'typescript'; + +import { InternalError } from '@rushstack/node-core-library'; + import { SourceFileLocationFormatter } from './SourceFileLocationFormatter'; import { TypeScriptInternals } from './TypeScriptInternals'; -import { InternalError } from '@rushstack/node-core-library'; export class TypeScriptHelpers { // Matches TypeScript's encoded names for well-known ECMAScript symbols like diff --git a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts index d9df4c6413d..00d04aa07fe 100644 --- a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts +++ b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts @@ -4,6 +4,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import * as ts from 'typescript'; + import { InternalError } from '@rushstack/node-core-library'; /** diff --git a/apps/api-extractor/src/analyzer/test/PackageMetadataManager.test.ts b/apps/api-extractor/src/analyzer/test/PackageMetadataManager.test.ts index f1efae6064e..7f5acef9c2f 100644 --- a/apps/api-extractor/src/analyzer/test/PackageMetadataManager.test.ts +++ b/apps/api-extractor/src/analyzer/test/PackageMetadataManager.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -jest.mock('path', () => { - const actualPath: typeof import('path') = jest.requireActual('path'); +jest.mock('node:path', () => { + const actualPath: typeof import('path') = jest.requireActual('node:path'); return { ...actualPath, resolve: actualPath.posix.resolve diff --git a/apps/api-extractor/src/api/CompilerState.ts b/apps/api-extractor/src/api/CompilerState.ts index a14bcb1af40..7862c1c2e85 100644 --- a/apps/api-extractor/src/api/CompilerState.ts +++ b/apps/api-extractor/src/api/CompilerState.ts @@ -1,14 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as ts from 'typescript'; import { JsonFile } from '@rushstack/node-core-library'; +import { Colorize } from '@rushstack/terminal'; import { ExtractorConfig } from './ExtractorConfig'; import type { IExtractorInvokeOptions } from './Extractor'; -import { Colorize } from '@rushstack/terminal'; /** * Options for {@link CompilerState.create} diff --git a/apps/api-extractor/src/api/Extractor.ts b/apps/api-extractor/src/api/Extractor.ts index f93c244a1d1..9b204b02054 100644 --- a/apps/api-extractor/src/api/Extractor.ts +++ b/apps/api-extractor/src/api/Extractor.ts @@ -1,10 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; import * as ts from 'typescript'; import * as resolve from 'resolve'; + +import type { ApiPackage } from '@microsoft/api-extractor-model'; +import { TSDocConfigFile } from '@microsoft/tsdoc-config'; import { FileSystem, type NewlineKind, @@ -18,7 +22,6 @@ import { ExtractorConfig, type IExtractorConfigApiReport } from './ExtractorConf import { Collector } from '../collector/Collector'; import { DtsRollupGenerator, DtsRollupKind } from '../generators/DtsRollupGenerator'; import { ApiModelGenerator } from '../generators/ApiModelGenerator'; -import type { ApiPackage } from '@microsoft/api-extractor-model'; import { ApiReportGenerator } from '../generators/ApiReportGenerator'; import { PackageMetadataManager } from '../analyzer/PackageMetadataManager'; import { ValidationEnhancer } from '../enhancers/ValidationEnhancer'; @@ -27,7 +30,6 @@ import { CompilerState } from './CompilerState'; import type { ExtractorMessage } from './ExtractorMessage'; import { MessageRouter } from '../collector/MessageRouter'; import { ConsoleMessageId } from './ConsoleMessageId'; -import { TSDocConfigFile } from '@microsoft/tsdoc-config'; import { SourceMapper } from '../collector/SourceMapper'; /** diff --git a/apps/api-extractor/src/api/ExtractorConfig.ts b/apps/api-extractor/src/api/ExtractorConfig.ts index 5f9a739c820..47f16e6c020 100644 --- a/apps/api-extractor/src/api/ExtractorConfig.ts +++ b/apps/api-extractor/src/api/ExtractorConfig.ts @@ -1,9 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as resolve from 'resolve'; import lodash = require('lodash'); + +import { EnumMemberOrder, ReleaseTag } from '@microsoft/api-extractor-model'; +import { TSDocConfiguration, TSDocTagDefinition } from '@microsoft/tsdoc'; +import { TSDocConfigFile } from '@microsoft/tsdoc-config'; +import { type IRigConfig, RigConfig } from '@rushstack/rig-package'; import { JsonFile, JsonSchema, @@ -16,10 +22,6 @@ import { Path, NewlineKind } from '@rushstack/node-core-library'; -import { type IRigConfig, RigConfig } from '@rushstack/rig-package'; -import { EnumMemberOrder, ReleaseTag } from '@microsoft/api-extractor-model'; -import { TSDocConfiguration, TSDocTagDefinition } from '@microsoft/tsdoc'; -import { TSDocConfigFile } from '@microsoft/tsdoc-config'; import type { ApiReportVariant, @@ -30,7 +32,6 @@ import type { import { PackageMetadataManager } from '../analyzer/PackageMetadataManager'; import { MessageRouter } from '../collector/MessageRouter'; import type { IApiModelGenerationOptions } from '../generators/ApiModelGenerator'; - import apiExtractorSchema from '../schemas/api-extractor.schema.json'; /** diff --git a/apps/api-extractor/src/api/ExtractorMessage.ts b/apps/api-extractor/src/api/ExtractorMessage.ts index 4b27f876e3b..1238a1a9c04 100644 --- a/apps/api-extractor/src/api/ExtractorMessage.ts +++ b/apps/api-extractor/src/api/ExtractorMessage.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type * as tsdoc from '@microsoft/tsdoc'; + import type { ExtractorMessageId } from './ExtractorMessageId'; import { ExtractorLogLevel } from './ExtractorLogLevel'; import type { ConsoleMessageId } from './ConsoleMessageId'; diff --git a/apps/api-extractor/src/api/IConfigFile.ts b/apps/api-extractor/src/api/IConfigFile.ts index 4c7333f2818..f05b943f796 100644 --- a/apps/api-extractor/src/api/IConfigFile.ts +++ b/apps/api-extractor/src/api/IConfigFile.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { EnumMemberOrder } from '@microsoft/api-extractor-model'; + import type { ExtractorLogLevel } from './ExtractorLogLevel'; /** diff --git a/apps/api-extractor/src/api/test/Extractor-custom-tags.test.ts b/apps/api-extractor/src/api/test/Extractor-custom-tags.test.ts index dfe102bcea4..357e7c1dc00 100644 --- a/apps/api-extractor/src/api/test/Extractor-custom-tags.test.ts +++ b/apps/api-extractor/src/api/test/Extractor-custom-tags.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. import { StandardTags } from '@microsoft/tsdoc'; -import * as path from 'path'; +import * as path from 'node:path'; import { ExtractorConfig } from '../ExtractorConfig'; diff --git a/apps/api-extractor/src/api/test/ExtractorConfig-lookup.test.ts b/apps/api-extractor/src/api/test/ExtractorConfig-lookup.test.ts index c2a771d0f80..e93e1d8b4ed 100644 --- a/apps/api-extractor/src/api/test/ExtractorConfig-lookup.test.ts +++ b/apps/api-extractor/src/api/test/ExtractorConfig-lookup.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { Path } from '@rushstack/node-core-library'; import { ExtractorConfig } from '../ExtractorConfig'; diff --git a/apps/api-extractor/src/api/test/ExtractorConfig-merge.test.ts b/apps/api-extractor/src/api/test/ExtractorConfig-merge.test.ts index ec7d52eed6c..d422c2fd54f 100644 --- a/apps/api-extractor/src/api/test/ExtractorConfig-merge.test.ts +++ b/apps/api-extractor/src/api/test/ExtractorConfig-merge.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { ExtractorConfig } from '../ExtractorConfig'; diff --git a/apps/api-extractor/src/api/test/ExtractorConfig-tagsToReport.test.ts b/apps/api-extractor/src/api/test/ExtractorConfig-tagsToReport.test.ts index cc53a7fc5ba..c941fd94308 100644 --- a/apps/api-extractor/src/api/test/ExtractorConfig-tagsToReport.test.ts +++ b/apps/api-extractor/src/api/test/ExtractorConfig-tagsToReport.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { ExtractorConfig } from '../ExtractorConfig'; diff --git a/apps/api-extractor/src/cli/ApiExtractorCommandLine.ts b/apps/api-extractor/src/cli/ApiExtractorCommandLine.ts index 56c05a5cc6b..2c434e32cec 100644 --- a/apps/api-extractor/src/cli/ApiExtractorCommandLine.ts +++ b/apps/api-extractor/src/cli/ApiExtractorCommandLine.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; import { CommandLineParser, type CommandLineFlagParameter } from '@rushstack/ts-command-line'; import { AlreadyReportedError, InternalError } from '@rushstack/node-core-library'; diff --git a/apps/api-extractor/src/cli/InitAction.ts b/apps/api-extractor/src/cli/InitAction.ts index 519115a77e0..834e2a7660f 100644 --- a/apps/api-extractor/src/cli/InitAction.ts +++ b/apps/api-extractor/src/cli/InitAction.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem } from '@rushstack/node-core-library'; import { CommandLineAction } from '@rushstack/ts-command-line'; import { Colorize } from '@rushstack/terminal'; diff --git a/apps/api-extractor/src/cli/RunAction.ts b/apps/api-extractor/src/cli/RunAction.ts index 4bfbf48333c..6eeb0cb17ee 100644 --- a/apps/api-extractor/src/cli/RunAction.ts +++ b/apps/api-extractor/src/cli/RunAction.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; +import * as os from 'node:os'; +import * as path from 'node:path'; + import { PackageJsonLookup, FileSystem, diff --git a/apps/api-extractor/src/collector/ApiItemMetadata.ts b/apps/api-extractor/src/collector/ApiItemMetadata.ts index 7355f3fe68f..4448f416b63 100644 --- a/apps/api-extractor/src/collector/ApiItemMetadata.ts +++ b/apps/api-extractor/src/collector/ApiItemMetadata.ts @@ -3,6 +3,7 @@ import type * as tsdoc from '@microsoft/tsdoc'; import type { ReleaseTag } from '@microsoft/api-extractor-model'; + import { VisitorState } from './VisitorState'; /** diff --git a/apps/api-extractor/src/collector/Collector.ts b/apps/api-extractor/src/collector/Collector.ts index 8f6d74320ed..b2e872565f6 100644 --- a/apps/api-extractor/src/collector/Collector.ts +++ b/apps/api-extractor/src/collector/Collector.ts @@ -2,7 +2,10 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; +import { minimatch } from 'minimatch'; + import * as tsdoc from '@microsoft/tsdoc'; +import { ReleaseTag } from '@microsoft/api-extractor-model'; import { PackageJsonLookup, Sort, @@ -10,11 +13,8 @@ import { type INodePackageJson, PackageName } from '@rushstack/node-core-library'; -import { ReleaseTag } from '@microsoft/api-extractor-model'; -import { minimatch } from 'minimatch'; import { ExtractorMessageId } from '../api/ExtractorMessageId'; - import { CollectorEntity } from './CollectorEntity'; import { AstSymbolTable } from '../analyzer/AstSymbolTable'; import type { AstEntity } from '../analyzer/AstEntity'; diff --git a/apps/api-extractor/src/collector/CollectorEntity.ts b/apps/api-extractor/src/collector/CollectorEntity.ts index df75ffbe88a..36bb07353d9 100644 --- a/apps/api-extractor/src/collector/CollectorEntity.ts +++ b/apps/api-extractor/src/collector/CollectorEntity.ts @@ -3,9 +3,10 @@ import * as ts from 'typescript'; +import { Sort } from '@rushstack/node-core-library'; + import { AstSymbol } from '../analyzer/AstSymbol'; import { Collector } from './Collector'; -import { Sort } from '@rushstack/node-core-library'; import type { AstEntity } from '../analyzer/AstEntity'; import { AstNamespaceExport } from '../analyzer/AstNamespaceExport'; diff --git a/apps/api-extractor/src/collector/DeclarationMetadata.ts b/apps/api-extractor/src/collector/DeclarationMetadata.ts index 41aa83eea57..f3d44de3a17 100644 --- a/apps/api-extractor/src/collector/DeclarationMetadata.ts +++ b/apps/api-extractor/src/collector/DeclarationMetadata.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type * as tsdoc from '@microsoft/tsdoc'; + import type { AstDeclaration } from '../analyzer/AstDeclaration'; /** diff --git a/apps/api-extractor/src/collector/MessageRouter.ts b/apps/api-extractor/src/collector/MessageRouter.ts index 4ea05d81442..d97742b4b06 100644 --- a/apps/api-extractor/src/collector/MessageRouter.ts +++ b/apps/api-extractor/src/collector/MessageRouter.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import type * as tsdoc from '@microsoft/tsdoc'; import { Sort, InternalError } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; diff --git a/apps/api-extractor/src/collector/SourceMapper.ts b/apps/api-extractor/src/collector/SourceMapper.ts index 7e7aee397af..368ea15fa07 100644 --- a/apps/api-extractor/src/collector/SourceMapper.ts +++ b/apps/api-extractor/src/collector/SourceMapper.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { SourceMapConsumer, type RawSourceMap, type MappingItem, type Position } from 'source-map'; -import { FileSystem, InternalError, JsonFile, NewlineKind } from '@rushstack/node-core-library'; import type ts from 'typescript'; +import { FileSystem, InternalError, JsonFile, NewlineKind } from '@rushstack/node-core-library'; + interface ISourceMap { sourceMapConsumer: SourceMapConsumer; diff --git a/apps/api-extractor/src/collector/WorkingPackage.ts b/apps/api-extractor/src/collector/WorkingPackage.ts index 537da4adeba..d85e88e4c11 100644 --- a/apps/api-extractor/src/collector/WorkingPackage.ts +++ b/apps/api-extractor/src/collector/WorkingPackage.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. import type * as ts from 'typescript'; -import type * as tsdoc from '@microsoft/tsdoc'; +import type * as tsdoc from '@microsoft/tsdoc'; import type { INodePackageJson } from '@rushstack/node-core-library'; /** diff --git a/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts b/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts index dc7244e60b2..17b228afe35 100644 --- a/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts +++ b/apps/api-extractor/src/enhancers/DocCommentEnhancer.ts @@ -2,13 +2,14 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import * as tsdoc from '@microsoft/tsdoc'; +import { ReleaseTag } from '@microsoft/api-extractor-model'; import type { Collector } from '../collector/Collector'; import { AstSymbol } from '../analyzer/AstSymbol'; import type { AstDeclaration } from '../analyzer/AstDeclaration'; import type { ApiItemMetadata } from '../collector/ApiItemMetadata'; -import { ReleaseTag } from '@microsoft/api-extractor-model'; import { ExtractorMessageId } from '../api/ExtractorMessageId'; import { VisitorState } from '../collector/VisitorState'; import { ResolverFailure } from '../analyzer/AstReferenceResolver'; diff --git a/apps/api-extractor/src/enhancers/ValidationEnhancer.ts b/apps/api-extractor/src/enhancers/ValidationEnhancer.ts index dd6331b666c..09d80f862cc 100644 --- a/apps/api-extractor/src/enhancers/ValidationEnhancer.ts +++ b/apps/api-extractor/src/enhancers/ValidationEnhancer.ts @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as ts from 'typescript'; +import { ReleaseTag } from '@microsoft/api-extractor-model'; + import type { Collector } from '../collector/Collector'; import { AstSymbol } from '../analyzer/AstSymbol'; import type { AstDeclaration } from '../analyzer/AstDeclaration'; @@ -11,7 +14,6 @@ import type { ApiItemMetadata } from '../collector/ApiItemMetadata'; import type { SymbolMetadata } from '../collector/SymbolMetadata'; import type { CollectorEntity } from '../collector/CollectorEntity'; import { ExtractorMessageId } from '../api/ExtractorMessageId'; -import { ReleaseTag } from '@microsoft/api-extractor-model'; import { AstNamespaceImport } from '../analyzer/AstNamespaceImport'; import type { IAstModuleExportInfo } from '../analyzer/AstModule'; import type { AstEntity } from '../analyzer/AstEntity'; diff --git a/apps/api-extractor/src/generators/ApiModelGenerator.ts b/apps/api-extractor/src/generators/ApiModelGenerator.ts index 2a9679c70f9..1ca3c340f9a 100644 --- a/apps/api-extractor/src/generators/ApiModelGenerator.ts +++ b/apps/api-extractor/src/generators/ApiModelGenerator.ts @@ -3,8 +3,10 @@ /* eslint-disable no-bitwise */ -import * as path from 'path'; +import * as path from 'node:path'; + import * as ts from 'typescript'; + import type * as tsdoc from '@microsoft/tsdoc'; import { ApiModel, diff --git a/apps/api-extractor/src/generators/ApiReportGenerator.ts b/apps/api-extractor/src/generators/ApiReportGenerator.ts index 0c5ed48c981..e59d7603ba6 100644 --- a/apps/api-extractor/src/generators/ApiReportGenerator.ts +++ b/apps/api-extractor/src/generators/ApiReportGenerator.ts @@ -2,8 +2,9 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; -import { Text, InternalError } from '@rushstack/node-core-library'; + import { ReleaseTag } from '@microsoft/api-extractor-model'; +import { Text, InternalError } from '@rushstack/node-core-library'; import { Collector } from '../collector/Collector'; import { TypeScriptHelpers } from '../analyzer/TypeScriptHelpers'; diff --git a/apps/api-extractor/src/generators/DeclarationReferenceGenerator.ts b/apps/api-extractor/src/generators/DeclarationReferenceGenerator.ts index 4171f819f94..6f136fb9829 100644 --- a/apps/api-extractor/src/generators/DeclarationReferenceGenerator.ts +++ b/apps/api-extractor/src/generators/DeclarationReferenceGenerator.ts @@ -3,6 +3,7 @@ /* eslint-disable no-bitwise */ import * as ts from 'typescript'; + import { DeclarationReference, ModuleSource, @@ -11,6 +12,7 @@ import { Meaning } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; import { type INodePackageJson, InternalError } from '@rushstack/node-core-library'; + import { TypeScriptHelpers } from '../analyzer/TypeScriptHelpers'; import { TypeScriptInternals } from '../analyzer/TypeScriptInternals'; import type { Collector } from '../collector/Collector'; diff --git a/apps/api-extractor/src/generators/DtsEmitHelpers.ts b/apps/api-extractor/src/generators/DtsEmitHelpers.ts index 3e7a339115e..6cbb23c71b0 100644 --- a/apps/api-extractor/src/generators/DtsEmitHelpers.ts +++ b/apps/api-extractor/src/generators/DtsEmitHelpers.ts @@ -4,6 +4,7 @@ import * as ts from 'typescript'; import { InternalError } from '@rushstack/node-core-library'; + import type { CollectorEntity } from '../collector/CollectorEntity'; import { AstImport, AstImportKind } from '../analyzer/AstImport'; import { AstDeclaration } from '../analyzer/AstDeclaration'; diff --git a/apps/api-extractor/src/generators/DtsRollupGenerator.ts b/apps/api-extractor/src/generators/DtsRollupGenerator.ts index 2d7c497f4dd..baa933c9440 100644 --- a/apps/api-extractor/src/generators/DtsRollupGenerator.ts +++ b/apps/api-extractor/src/generators/DtsRollupGenerator.ts @@ -2,8 +2,9 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; -import { FileSystem, type NewlineKind, InternalError } from '@rushstack/node-core-library'; + import { ReleaseTag } from '@microsoft/api-extractor-model'; +import { FileSystem, type NewlineKind, InternalError } from '@rushstack/node-core-library'; import type { Collector } from '../collector/Collector'; import { TypeScriptHelpers } from '../analyzer/TypeScriptHelpers'; diff --git a/apps/api-extractor/src/generators/ExcerptBuilder.ts b/apps/api-extractor/src/generators/ExcerptBuilder.ts index 69bead2a9af..8b10b4674d1 100644 --- a/apps/api-extractor/src/generators/ExcerptBuilder.ts +++ b/apps/api-extractor/src/generators/ExcerptBuilder.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as ts from 'typescript'; + import type { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; import { ExcerptTokenKind, diff --git a/apps/api-extractor/src/start.ts b/apps/api-extractor/src/start.ts index 846e9fc4f96..2274fea6b22 100644 --- a/apps/api-extractor/src/start.ts +++ b/apps/api-extractor/src/start.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; + import { Colorize } from '@rushstack/terminal'; import { ApiExtractorCommandLine } from './cli/ApiExtractorCommandLine'; diff --git a/apps/heft/src/cli/HeftActionRunner.ts b/apps/heft/src/cli/HeftActionRunner.ts index d0d60d26553..b9d5c7f7f26 100644 --- a/apps/heft/src/cli/HeftActionRunner.ts +++ b/apps/heft/src/cli/HeftActionRunner.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { performance } from 'perf_hooks'; -import { createInterface, type Interface as ReadlineInterface } from 'readline'; -import os from 'os'; +import { performance } from 'node:perf_hooks'; +import { createInterface, type Interface as ReadlineInterface } from 'node:readline'; +import os from 'node:os'; import { AlreadyReportedError, InternalError, type IPackageJson } from '@rushstack/node-core-library'; import { Colorize, ConsoleTerminalProvider, type ITerminal } from '@rushstack/terminal'; diff --git a/apps/heft/src/cli/HeftCommandLineParser.ts b/apps/heft/src/cli/HeftCommandLineParser.ts index ea96af713e4..67389a7d053 100644 --- a/apps/heft/src/cli/HeftCommandLineParser.ts +++ b/apps/heft/src/cli/HeftCommandLineParser.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import os from 'node:os'; + import { CommandLineParser, type AliasCommandLineAction, diff --git a/apps/heft/src/configuration/HeftConfiguration.ts b/apps/heft/src/configuration/HeftConfiguration.ts index 6177278e7c4..e6079a8a3f6 100644 --- a/apps/heft/src/configuration/HeftConfiguration.ts +++ b/apps/heft/src/configuration/HeftConfiguration.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { type IPackageJson, PackageJsonLookup, InternalError, Path } from '@rushstack/node-core-library'; import { Terminal, type ITerminalProvider, type ITerminal } from '@rushstack/terminal'; import { diff --git a/apps/heft/src/configuration/HeftPluginDefinition.ts b/apps/heft/src/configuration/HeftPluginDefinition.ts index 21de40a5cb3..4ce4bd0c19a 100644 --- a/apps/heft/src/configuration/HeftPluginDefinition.ts +++ b/apps/heft/src/configuration/HeftPluginDefinition.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { InternalError, JsonSchema } from '@rushstack/node-core-library'; import type { IHeftPlugin } from '../pluginFramework/IHeftPlugin'; diff --git a/apps/heft/src/configuration/RigPackageResolver.ts b/apps/heft/src/configuration/RigPackageResolver.ts index bd40e3937e2..03a70db6dc4 100644 --- a/apps/heft/src/configuration/RigPackageResolver.ts +++ b/apps/heft/src/configuration/RigPackageResolver.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { PackageJsonLookup, Import, diff --git a/apps/heft/src/metrics/MetricsCollector.ts b/apps/heft/src/metrics/MetricsCollector.ts index 82b70abf685..b7f6352387d 100644 --- a/apps/heft/src/metrics/MetricsCollector.ts +++ b/apps/heft/src/metrics/MetricsCollector.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; +import { performance } from 'node:perf_hooks'; + import { AsyncParallelHook } from 'tapable'; -import { performance } from 'perf_hooks'; + import { InternalError } from '@rushstack/node-core-library'; /** diff --git a/apps/heft/src/operations/runners/TaskOperationRunner.ts b/apps/heft/src/operations/runners/TaskOperationRunner.ts index 995d10ffbed..5cdd397d9b4 100644 --- a/apps/heft/src/operations/runners/TaskOperationRunner.ts +++ b/apps/heft/src/operations/runners/TaskOperationRunner.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { createHash, type Hash } from 'node:crypto'; + import { glob } from 'fast-glob'; import { @@ -9,7 +10,6 @@ import { type IOperationRunnerContext, OperationStatus } from '@rushstack/operation-graph'; - import { AlreadyReportedError, InternalError } from '@rushstack/node-core-library'; import type { HeftTask } from '../../pluginFramework/HeftTask'; diff --git a/apps/heft/src/pluginFramework/HeftLifecycle.ts b/apps/heft/src/pluginFramework/HeftLifecycle.ts index 29f598c1258..b762e23f238 100644 --- a/apps/heft/src/pluginFramework/HeftLifecycle.ts +++ b/apps/heft/src/pluginFramework/HeftLifecycle.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { AsyncParallelHook, SyncHook } from 'tapable'; + import { InternalError } from '@rushstack/node-core-library'; import { HeftPluginConfiguration } from '../configuration/HeftPluginConfiguration'; diff --git a/apps/heft/src/pluginFramework/HeftLifecycleSession.ts b/apps/heft/src/pluginFramework/HeftLifecycleSession.ts index b881f0cd742..b95d20d5e16 100644 --- a/apps/heft/src/pluginFramework/HeftLifecycleSession.ts +++ b/apps/heft/src/pluginFramework/HeftLifecycleSession.ts @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { AsyncParallelHook, SyncHook } from 'tapable'; +import type { Operation, OperationGroupRecord } from '@rushstack/operation-graph'; + import type { IHeftRecordMetricsHookOptions, MetricsCollector } from '../metrics/MetricsCollector'; import type { ScopedLogger, IScopedLogger } from './logging/ScopedLogger'; import type { IInternalHeftSessionOptions } from './InternalHeftSession'; @@ -11,7 +14,6 @@ import type { IHeftParameters } from './HeftParameterManager'; import type { IDeleteOperation } from '../plugins/DeleteFilesPlugin'; import type { HeftPluginDefinitionBase } from '../configuration/HeftPluginDefinition'; import type { HeftPluginHost } from './HeftPluginHost'; -import type { Operation, OperationGroupRecord } from '@rushstack/operation-graph'; import type { IHeftPhaseOperationMetadata, IHeftTaskOperationMetadata } from '../cli/HeftActionRunner'; /** diff --git a/apps/heft/src/pluginFramework/HeftPluginHost.ts b/apps/heft/src/pluginFramework/HeftPluginHost.ts index a6dc607feb1..9f3dad8edcc 100644 --- a/apps/heft/src/pluginFramework/HeftPluginHost.ts +++ b/apps/heft/src/pluginFramework/HeftPluginHost.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { SyncHook } from 'tapable'; + import { InternalError } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/apps/heft/src/pluginFramework/HeftTaskSession.ts b/apps/heft/src/pluginFramework/HeftTaskSession.ts index 152e6967b9b..9898b11a492 100644 --- a/apps/heft/src/pluginFramework/HeftTaskSession.ts +++ b/apps/heft/src/pluginFramework/HeftTaskSession.ts @@ -3,6 +3,8 @@ import { AsyncParallelHook, AsyncSeriesWaterfallHook } from 'tapable'; +import { InternalError } from '@rushstack/node-core-library'; + import type { MetricsCollector } from '../metrics/MetricsCollector'; import type { IScopedLogger } from './logging/ScopedLogger'; import type { HeftTask } from './HeftTask'; @@ -12,7 +14,6 @@ import type { IDeleteOperation } from '../plugins/DeleteFilesPlugin'; import type { ICopyOperation } from '../plugins/CopyFilesPlugin'; import type { HeftPluginHost } from './HeftPluginHost'; import type { GlobFn, WatchGlobFn } from '../plugins/FileGlobSpecifier'; -import { InternalError } from '@rushstack/node-core-library'; import type { IWatchFileSystem } from '../utilities/WatchFileSystemAdapter'; /** diff --git a/apps/heft/src/pluginFramework/IncrementalBuildInfo.ts b/apps/heft/src/pluginFramework/IncrementalBuildInfo.ts index 56eb74ed6b9..3c30d07cec5 100644 --- a/apps/heft/src/pluginFramework/IncrementalBuildInfo.ts +++ b/apps/heft/src/pluginFramework/IncrementalBuildInfo.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem, Path } from '@rushstack/node-core-library'; diff --git a/apps/heft/src/pluginFramework/StaticFileSystemAdapter.ts b/apps/heft/src/pluginFramework/StaticFileSystemAdapter.ts index c21b7a122f6..89129078af2 100644 --- a/apps/heft/src/pluginFramework/StaticFileSystemAdapter.ts +++ b/apps/heft/src/pluginFramework/StaticFileSystemAdapter.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as fs from 'fs'; -import * as path from 'path'; +import type * as fs from 'node:fs'; +import * as path from 'node:path'; + import type { FileSystemAdapter } from 'fast-glob'; + import { Path } from '@rushstack/node-core-library'; interface IVirtualFileSystemEntry { diff --git a/apps/heft/src/pluginFramework/logging/LoggingManager.ts b/apps/heft/src/pluginFramework/logging/LoggingManager.ts index c3601902870..36c243a8084 100644 --- a/apps/heft/src/pluginFramework/logging/LoggingManager.ts +++ b/apps/heft/src/pluginFramework/logging/LoggingManager.ts @@ -1,13 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { ScopedLogger } from './ScopedLogger'; import { FileError, type FileLocationStyle, type IFileErrorFormattingOptions } from '@rushstack/node-core-library'; import type { ITerminalProvider } from '@rushstack/terminal'; + +import { ScopedLogger } from './ScopedLogger'; export interface ILoggingManagerOptions { terminalProvider: ITerminalProvider; } diff --git a/apps/heft/src/pluginFramework/tests/IncrementalBuildInfo.test.ts b/apps/heft/src/pluginFramework/tests/IncrementalBuildInfo.test.ts index e2921fb22e3..0a5d3be7f65 100644 --- a/apps/heft/src/pluginFramework/tests/IncrementalBuildInfo.test.ts +++ b/apps/heft/src/pluginFramework/tests/IncrementalBuildInfo.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { Path } from '@rushstack/node-core-library'; diff --git a/apps/heft/src/plugins/DeleteFilesPlugin.ts b/apps/heft/src/plugins/DeleteFilesPlugin.ts index e85047a6597..73976dad8f4 100644 --- a/apps/heft/src/plugins/DeleteFilesPlugin.ts +++ b/apps/heft/src/plugins/DeleteFilesPlugin.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as fs from 'fs'; +import type * as fs from 'node:fs'; + import { FileSystem, Async } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/apps/heft/src/plugins/FileGlobSpecifier.ts b/apps/heft/src/plugins/FileGlobSpecifier.ts index 8f147cb148b..96d3223dd5a 100644 --- a/apps/heft/src/plugins/FileGlobSpecifier.ts +++ b/apps/heft/src/plugins/FileGlobSpecifier.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as fs from 'fs'; -import * as path from 'path'; +import type * as fs from 'node:fs'; +import * as path from 'node:path'; + import glob, { type FileSystemAdapter, type Entry } from 'fast-glob'; import { Async } from '@rushstack/node-core-library'; diff --git a/apps/heft/src/plugins/NodeServicePlugin.ts b/apps/heft/src/plugins/NodeServicePlugin.ts index 86a954a747b..dfb8e42760f 100644 --- a/apps/heft/src/plugins/NodeServicePlugin.ts +++ b/apps/heft/src/plugins/NodeServicePlugin.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as child_process from 'child_process'; -import * as process from 'process'; +import * as child_process from 'node:child_process'; +import * as process from 'node:process'; + import { InternalError, SubprocessTerminator } from '@rushstack/node-core-library'; import type { IHeftTaskPlugin } from '../pluginFramework/IHeftPlugin'; diff --git a/apps/heft/src/plugins/RunScriptPlugin.ts b/apps/heft/src/plugins/RunScriptPlugin.ts index 62188ec1134..6c74d9dfd56 100644 --- a/apps/heft/src/plugins/RunScriptPlugin.ts +++ b/apps/heft/src/plugins/RunScriptPlugin.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { HeftConfiguration } from '../configuration/HeftConfiguration'; import type { IHeftTaskPlugin } from '../pluginFramework/IHeftPlugin'; import type { IHeftTaskSession, IHeftTaskRunHookOptions } from '../pluginFramework/HeftTaskSession'; diff --git a/apps/heft/src/startWithVersionSelector.ts b/apps/heft/src/startWithVersionSelector.ts index d78da294bbe..d4a3a3dc150 100644 --- a/apps/heft/src/startWithVersionSelector.ts +++ b/apps/heft/src/startWithVersionSelector.ts @@ -5,9 +5,11 @@ // NOTE: Since startWithVersionSelector.ts is loaded in the same process as start.ts, any dependencies that // we import here may become side-by-side versions. We want to minimize any dependencies. -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; + import type { IPackageJson } from '@rushstack/node-core-library'; + import { getToolParameterNamesFromArgs } from './utilities/CliUtilities'; import { Constants } from './utilities/Constants'; diff --git a/apps/heft/src/utilities/CoreConfigFiles.ts b/apps/heft/src/utilities/CoreConfigFiles.ts index 8ca28874cae..3ad45c6fda9 100644 --- a/apps/heft/src/utilities/CoreConfigFiles.ts +++ b/apps/heft/src/utilities/CoreConfigFiles.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { ProjectConfigurationFile, InheritanceType, diff --git a/apps/heft/src/utilities/GitUtilities.ts b/apps/heft/src/utilities/GitUtilities.ts index 937beddd5db..3877f9255df 100644 --- a/apps/heft/src/utilities/GitUtilities.ts +++ b/apps/heft/src/utilities/GitUtilities.ts @@ -1,12 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import type { ChildProcess, SpawnSyncReturns } from 'child_process'; +import * as path from 'node:path'; +import type { ChildProcess, SpawnSyncReturns } from 'node:child_process'; + import { default as getGitRepoInfo, type GitRepoInfo as IGitRepoInfo } from 'git-repo-info'; -import { Executable, FileSystem, InternalError, Path, Text } from '@rushstack/node-core-library'; import { default as ignore, type Ignore as IIgnoreMatcher } from 'ignore'; +import { Executable, FileSystem, InternalError, Path, Text } from '@rushstack/node-core-library'; + // Matches lines starting with "#" and whitepace lines const GITIGNORE_IGNORABLE_LINE_REGEX: RegExp = /^(?:(?:#.*)|(?:\s+))$/; const UNINITIALIZED: 'UNINITIALIZED' = 'UNINITIALIZED'; diff --git a/apps/heft/src/utilities/WatchFileSystemAdapter.ts b/apps/heft/src/utilities/WatchFileSystemAdapter.ts index 0380c6db56a..97c1ae5bdd3 100644 --- a/apps/heft/src/utilities/WatchFileSystemAdapter.ts +++ b/apps/heft/src/utilities/WatchFileSystemAdapter.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; import Watchpack from 'watchpack'; diff --git a/apps/heft/src/utilities/test/GitUtilities.test.ts b/apps/heft/src/utilities/test/GitUtilities.test.ts index 100156c3590..9b51b6d1f1d 100644 --- a/apps/heft/src/utilities/test/GitUtilities.test.ts +++ b/apps/heft/src/utilities/test/GitUtilities.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { GitUtilities, type GitignoreFilterFn } from '../GitUtilities'; import { PackageJsonLookup } from '@rushstack/node-core-library'; diff --git a/apps/lockfile-explorer-web/src/App.tsx b/apps/lockfile-explorer-web/src/App.tsx index a83f7831908..ac1c2fbdbb6 100644 --- a/apps/lockfile-explorer-web/src/App.tsx +++ b/apps/lockfile-explorer-web/src/App.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React, { useEffect } from 'react'; + import styles from './App.scss'; import { readLockfileAsync } from './parsing/readLockfile'; import { LockfileViewer } from './containers/LockfileViewer'; diff --git a/apps/lockfile-explorer-web/src/components/ConnectionModal/index.tsx b/apps/lockfile-explorer-web/src/components/ConnectionModal/index.tsx index 9a29a13d849..1215e47d612 100644 --- a/apps/lockfile-explorer-web/src/components/ConnectionModal/index.tsx +++ b/apps/lockfile-explorer-web/src/components/ConnectionModal/index.tsx @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import React, { useCallback, useEffect, useState } from 'react'; + import { Button, Text } from '@rushstack/rush-themed-ui'; + import styles from './styles.scss'; import appStyles from '../../App.scss'; import { checkAliveAsync } from '../../helpers/lfxApiClient'; diff --git a/apps/lockfile-explorer-web/src/containers/BookmarksSidebar/index.tsx b/apps/lockfile-explorer-web/src/containers/BookmarksSidebar/index.tsx index c15fd3772ed..4e975aafe19 100644 --- a/apps/lockfile-explorer-web/src/containers/BookmarksSidebar/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/BookmarksSidebar/index.tsx @@ -2,12 +2,14 @@ // See LICENSE in the project root for license information. import React, { useCallback } from 'react'; + +import { Button, ScrollArea, Text } from '@rushstack/rush-themed-ui'; + import appStyles from '../../App.scss'; import styles from './styles.scss'; import { useAppDispatch, useAppSelector } from '../../store/hooks'; import type { LfxGraphEntry } from '../../packlets/lfx-shared'; import { clearStackAndPush, removeBookmark } from '../../store/slices/entrySlice'; -import { Button, ScrollArea, Text } from '@rushstack/rush-themed-ui'; export const BookmarksSidebar = (): JSX.Element => { const bookmarks = useAppSelector((state) => state.entry.bookmarkedEntries); diff --git a/apps/lockfile-explorer-web/src/containers/LockfileEntryDetailsView/index.tsx b/apps/lockfile-explorer-web/src/containers/LockfileEntryDetailsView/index.tsx index 8b0fb3769e1..8e439c36b0b 100644 --- a/apps/lockfile-explorer-web/src/containers/LockfileEntryDetailsView/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/LockfileEntryDetailsView/index.tsx @@ -2,11 +2,11 @@ // See LICENSE in the project root for license information. import React, { useCallback, useEffect, useState } from 'react'; + import { ScrollArea, Text } from '@rushstack/rush-themed-ui'; import styles from './styles.scss'; import appStyles from '../../App.scss'; - import { LfxDependencyKind, type LfxGraphDependency, type LfxGraphEntry } from '../../packlets/lfx-shared'; import { readPackageJsonAsync } from '../../helpers/lfxApiClient'; import { useAppDispatch, useAppSelector } from '../../store/hooks'; diff --git a/apps/lockfile-explorer-web/src/containers/LockfileViewer/index.tsx b/apps/lockfile-explorer-web/src/containers/LockfileViewer/index.tsx index bd90300589e..2d1ed77775b 100644 --- a/apps/lockfile-explorer-web/src/containers/LockfileViewer/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/LockfileViewer/index.tsx @@ -2,6 +2,9 @@ // See LICENSE in the project root for license information. import React, { useCallback, useEffect, useRef, useState } from 'react'; + +import { Tabs, Checkbox, ScrollArea, Input, Text } from '@rushstack/rush-themed-ui'; + import styles from './styles.scss'; import { type LfxGraphEntry, LfxGraphEntryKind } from '../../packlets/lfx-shared'; import { ReactNull } from '../../types/ReactNull'; @@ -13,7 +16,6 @@ import { setFilter as selectFilter } from '../../store/slices/entrySlice'; import { getFilterFromLocalStorage, saveFilterToLocalStorage } from '../../helpers/localStorage'; -import { Tabs, Checkbox, ScrollArea, Input, Text } from '@rushstack/rush-themed-ui'; interface ILockfileEntryGroup { entryName: string; diff --git a/apps/lockfile-explorer-web/src/containers/LogoPanel/index.tsx b/apps/lockfile-explorer-web/src/containers/LogoPanel/index.tsx index 45313bac8da..330be195eb6 100644 --- a/apps/lockfile-explorer-web/src/containers/LogoPanel/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/LogoPanel/index.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React from 'react'; + import styles from './styles.scss'; export const LogoPanel = (): JSX.Element => { diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx index 6294d35a121..627dab524f1 100644 --- a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx +++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/CodeBox.tsx @@ -2,7 +2,6 @@ // See LICENSE in the project root for license information. import React from 'react'; - import { Highlight, themes } from 'prism-react-renderer'; // Generate this list by doing console.log(Object.keys(Prism.languages)) diff --git a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx index a0be0ebd7c3..736e4749d76 100644 --- a/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/PackageJsonViewer/index.tsx @@ -3,6 +3,8 @@ import React, { useCallback, useEffect, useState } from 'react'; +import { ScrollArea, Tabs, Text } from '@rushstack/rush-themed-ui'; + import { readPnpmfileAsync, readPackageSpecAsync, readPackageJsonAsync } from '../../helpers/lfxApiClient'; import { useAppDispatch, useAppSelector } from '../../store/hooks'; import { selectCurrentEntry } from '../../store/slices/entrySlice'; @@ -11,10 +13,8 @@ import { compareSpec } from '../../parsing/compareSpec'; import { loadSpecChanges } from '../../store/slices/workspaceSlice'; import { displaySpecChanges } from '../../helpers/displaySpecChanges'; import { isEntryModified } from '../../helpers/isEntryModified'; -import { ScrollArea, Tabs, Text } from '@rushstack/rush-themed-ui'; import { LfxGraphEntryKind } from '../../packlets/lfx-shared'; import { CodeBox } from './CodeBox'; - import styles from './styles.scss'; const PackageView: { [key: string]: string } = { diff --git a/apps/lockfile-explorer-web/src/containers/SelectedEntryPreview/index.tsx b/apps/lockfile-explorer-web/src/containers/SelectedEntryPreview/index.tsx index 0745c0f39c2..a6f1f4a4e9d 100644 --- a/apps/lockfile-explorer-web/src/containers/SelectedEntryPreview/index.tsx +++ b/apps/lockfile-explorer-web/src/containers/SelectedEntryPreview/index.tsx @@ -2,6 +2,9 @@ // See LICENSE in the project root for license information. import React, { useCallback } from 'react'; + +import { Button, ScrollArea, Text } from '@rushstack/rush-themed-ui'; + import styles from './styles.scss'; import { useAppDispatch, useAppSelector } from '../../store/hooks'; import { @@ -11,7 +14,6 @@ import { removeBookmark, selectCurrentEntry } from '../../store/slices/entrySlice'; -import { Button, ScrollArea, Text } from '@rushstack/rush-themed-ui'; export const SelectedEntryPreview = (): JSX.Element => { const selectedEntry = useAppSelector(selectCurrentEntry); diff --git a/apps/lockfile-explorer-web/src/start.tsx b/apps/lockfile-explorer-web/src/start.tsx index 02a1aa1ebae..acc11f30b48 100644 --- a/apps/lockfile-explorer-web/src/start.tsx +++ b/apps/lockfile-explorer-web/src/start.tsx @@ -3,11 +3,11 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; -import { App } from './App'; +import { Provider } from 'react-redux'; +import { App } from './App'; import './start.css'; import { store } from './store'; -import { Provider } from 'react-redux'; const rootDiv: HTMLElement = document.getElementById('root') as HTMLElement; ReactDOM.render( diff --git a/apps/lockfile-explorer-web/src/store/hooks.ts b/apps/lockfile-explorer-web/src/store/hooks.ts index 1d31107cdb4..2dd2721fbb1 100644 --- a/apps/lockfile-explorer-web/src/store/hooks.ts +++ b/apps/lockfile-explorer-web/src/store/hooks.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'; + import type { RootState, AppDispatch } from '.'; // Use throughout your app instead of plain `useDispatch` and `useSelector` diff --git a/apps/lockfile-explorer-web/src/store/slices/entrySlice.ts b/apps/lockfile-explorer-web/src/store/slices/entrySlice.ts index 6c3f4c8de50..72f07827db2 100644 --- a/apps/lockfile-explorer-web/src/store/slices/entrySlice.ts +++ b/apps/lockfile-explorer-web/src/store/slices/entrySlice.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { createSlice, type PayloadAction, type Reducer } from '@reduxjs/toolkit'; + import { type LfxGraphEntry, LfxGraphEntryKind } from '../../packlets/lfx-shared'; import type { RootState } from '../index'; import { diff --git a/apps/lockfile-explorer-web/src/store/slices/workspaceSlice.ts b/apps/lockfile-explorer-web/src/store/slices/workspaceSlice.ts index e3a1f64405b..6b202997ef0 100644 --- a/apps/lockfile-explorer-web/src/store/slices/workspaceSlice.ts +++ b/apps/lockfile-explorer-web/src/store/slices/workspaceSlice.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { createSlice, type PayloadAction, type Reducer } from '@reduxjs/toolkit'; + import type { ISpecChange } from '../../parsing/compareSpec'; // eslint-disable-next-line @typescript-eslint/consistent-type-definitions diff --git a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts index aa351cd1e81..1add863add5 100644 --- a/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts +++ b/apps/lockfile-explorer/src/cli/explorer/ExplorerCommandLineParser.ts @@ -1,13 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import process from 'node:process'; +import * as path from 'node:path'; + import express from 'express'; import yaml from 'js-yaml'; import cors from 'cors'; -import process from 'process'; import open from 'open'; import updateNotifier from 'update-notifier'; -import * as path from 'node:path'; + import { FileSystem, type IPackageJson, JsonFile, PackageJsonLookup } from '@rushstack/node-core-library'; import { ConsoleTerminalProvider, type ITerminal, Terminal, Colorize } from '@rushstack/terminal'; import { @@ -24,7 +26,6 @@ import { type IJsonLfxWorkspace } from '../../../build/lfx-shared'; import * as lockfilePath from '../../graph/lockfilePath'; - import type { IAppState } from '../../state'; import { init } from '../../utils/init'; import { PnpmfileRunner } from '../../graph/PnpmfileRunner'; diff --git a/apps/lockfile-explorer/src/cli/lint/LintCommandLineParser.ts b/apps/lockfile-explorer/src/cli/lint/LintCommandLineParser.ts index 188c2623803..dfd9ae1b4e6 100644 --- a/apps/lockfile-explorer/src/cli/lint/LintCommandLineParser.ts +++ b/apps/lockfile-explorer/src/cli/lint/LintCommandLineParser.ts @@ -3,9 +3,10 @@ import { ConsoleTerminalProvider, type ITerminal, Terminal, Colorize } from '@rushstack/terminal'; import { CommandLineParser } from '@rushstack/ts-command-line'; +import { type IPackageJson, JsonFile, PackageJsonLookup } from '@rushstack/node-core-library'; + import { InitAction } from './actions/InitAction'; import { CheckAction } from './actions/CheckAction'; -import { type IPackageJson, JsonFile, PackageJsonLookup } from '@rushstack/node-core-library'; const LINT_TOOL_FILENAME: 'lockfile-lint' = 'lockfile-lint'; diff --git a/apps/lockfile-explorer/src/cli/lint/actions/CheckAction.ts b/apps/lockfile-explorer/src/cli/lint/actions/CheckAction.ts index 12390a1b274..261af43cf7e 100644 --- a/apps/lockfile-explorer/src/cli/lint/actions/CheckAction.ts +++ b/apps/lockfile-explorer/src/cli/lint/actions/CheckAction.ts @@ -1,14 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Colorize, type ITerminal } from '@rushstack/terminal'; -import { CommandLineAction } from '@rushstack/ts-command-line'; -import { RushConfiguration, type RushConfigurationProject, type Subspace } from '@rushstack/rush-sdk'; -import path from 'path'; +import path from 'node:path'; + import yaml from 'js-yaml'; import semver from 'semver'; import type * as lockfileTypes from '@pnpm/lockfile.types'; import type * as pnpmTypes from '@pnpm/types'; + +import { RushConfiguration, type RushConfigurationProject, type Subspace } from '@rushstack/rush-sdk'; +import { CommandLineAction } from '@rushstack/ts-command-line'; +import { Colorize, type ITerminal } from '@rushstack/terminal'; import { AlreadyReportedError, Async, FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; import lockfileLintSchema from '../../../schemas/lockfile-lint.schema.json'; diff --git a/apps/lockfile-explorer/src/cli/lint/actions/InitAction.ts b/apps/lockfile-explorer/src/cli/lint/actions/InitAction.ts index 385cdfa340e..c848dc47734 100644 --- a/apps/lockfile-explorer/src/cli/lint/actions/InitAction.ts +++ b/apps/lockfile-explorer/src/cli/lint/actions/InitAction.ts @@ -1,12 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { CommandLineAction } from '@rushstack/ts-command-line'; +import path from 'node:path'; +import { CommandLineAction } from '@rushstack/ts-command-line'; import { Colorize, type ITerminal } from '@rushstack/terminal'; import { RushConfiguration } from '@rushstack/rush-sdk'; import { FileSystem } from '@rushstack/node-core-library'; -import path from 'path'; import type { LintCommandLineParser } from '../LintCommandLineParser'; import { LOCKFILE_EXPLORER_FOLDERNAME, LOCKFILE_LINT_JSON_FILENAME } from '../../../constants/common'; diff --git a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts index 6049f215fcb..10c09e7d40b 100644 --- a/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts +++ b/apps/lockfile-explorer/src/graph/PnpmfileRunner.ts @@ -3,6 +3,7 @@ import { Worker } from 'node:worker_threads'; import * as path from 'node:path'; + import type { IPackageJson } from '@rushstack/node-core-library'; import type { IRequestMessage, ResponseMessage } from './pnpmfileRunnerWorkerThread'; diff --git a/apps/lockfile-explorer/src/graph/lfxGraphLoader.ts b/apps/lockfile-explorer/src/graph/lfxGraphLoader.ts index ba421861c21..cf920d46f09 100644 --- a/apps/lockfile-explorer/src/graph/lfxGraphLoader.ts +++ b/apps/lockfile-explorer/src/graph/lfxGraphLoader.ts @@ -3,6 +3,7 @@ import type * as lockfileTypes from '@pnpm/lockfile.types'; import type * as pnpmTypes from '@pnpm/types'; + import { Text } from '@rushstack/node-core-library'; import { diff --git a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts index da87f43b115..a49ff655aae 100644 --- a/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts +++ b/apps/lockfile-explorer/src/graph/pnpmfileRunnerWorkerThread.ts @@ -3,6 +3,7 @@ import { parentPort, workerData, type MessagePort } from 'node:worker_threads'; import * as path from 'node:path'; + import type { IPackageJson } from '@rushstack/node-core-library'; import type { IPnpmfileModule, IReadPackageContext } from './IPnpmfileModule'; diff --git a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts index 118e75afbba..4e87d88cc0a 100644 --- a/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts +++ b/apps/lockfile-explorer/src/graph/test/PnpmfileRunner.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import inspector from 'inspector'; +import inspector from 'node:inspector'; import { Path } from '@rushstack/node-core-library'; import { PnpmfileRunner } from '../PnpmfileRunner'; diff --git a/apps/lockfile-explorer/src/graph/test/graphTestHelpers.ts b/apps/lockfile-explorer/src/graph/test/graphTestHelpers.ts index 74d99eb35de..f75ffd2fd2a 100644 --- a/apps/lockfile-explorer/src/graph/test/graphTestHelpers.ts +++ b/apps/lockfile-explorer/src/graph/test/graphTestHelpers.ts @@ -1,16 +1,18 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import yaml from 'js-yaml'; + import { FileSystem, NewlineKind } from '@rushstack/node-core-library'; + import { type IJsonLfxGraph, type IJsonLfxWorkspace, lfxGraphSerializer, type LfxGraph } from '../../../build/lfx-shared'; - import * as lfxGraphLoader from '../lfxGraphLoader'; const FIXTURES_FOLDER: string = path.resolve(__dirname, '../../../src/graph/test/fixtures/'); diff --git a/apps/lockfile-explorer/src/test/help.test.ts b/apps/lockfile-explorer/src/test/help.test.ts index 3832ac674d8..bbfd935f88b 100644 --- a/apps/lockfile-explorer/src/test/help.test.ts +++ b/apps/lockfile-explorer/src/test/help.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { execSync } from 'child_process'; +import { execSync } from 'node:child_process'; describe('CLI Tool Tests', () => { it('should display help for "lockfile-explorer --help"', () => { diff --git a/apps/lockfile-explorer/src/utils/init.ts b/apps/lockfile-explorer/src/utils/init.ts index fe7bf5e8f2d..0fe6c7f9eb6 100644 --- a/apps/lockfile-explorer/src/utils/init.ts +++ b/apps/lockfile-explorer/src/utils/init.ts @@ -4,10 +4,11 @@ // This function will read the current directory and try to figure out if it's a rush project or regular pnpm workspace // Currently it will throw error if neither can be determined +import path from 'node:path'; + import { FileSystem, Path } from '@rushstack/node-core-library'; import { RushConfiguration } from '@microsoft/rush-lib/lib/api/RushConfiguration'; import type { Subspace } from '@microsoft/rush-lib/lib/api/Subspace'; -import path from 'path'; import * as lockfilePath from '../graph/lockfilePath'; import type { IAppState } from '../state'; diff --git a/apps/rundown/src/Rundown.ts b/apps/rundown/src/Rundown.ts index 37bda42f559..9b63ac8438f 100644 --- a/apps/rundown/src/Rundown.ts +++ b/apps/rundown/src/Rundown.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { FileSystem, PackageJsonLookup, Sort, Text } from '@rushstack/node-core-library'; -import * as child_process from 'child_process'; -import * as path from 'path'; +import * as child_process from 'node:child_process'; +import * as path from 'node:path'; + import stringArgv from 'string-argv'; +import { FileSystem, PackageJsonLookup, Sort, Text } from '@rushstack/node-core-library'; + import type { IpcMessage } from './LauncherTypes'; export class Rundown { diff --git a/apps/rundown/src/cli/SnapshotAction.ts b/apps/rundown/src/cli/SnapshotAction.ts index e95d30bfeac..3d5983a6370 100644 --- a/apps/rundown/src/cli/SnapshotAction.ts +++ b/apps/rundown/src/cli/SnapshotAction.ts @@ -2,7 +2,6 @@ // See LICENSE in the project root for license information. import { BaseReportAction } from './BaseReportAction'; - import { Rundown } from '../Rundown'; export class SnapshotAction extends BaseReportAction { diff --git a/apps/rundown/src/launcher.ts b/apps/rundown/src/launcher.ts index 8df4d4a9ef7..0804e456618 100644 --- a/apps/rundown/src/launcher.ts +++ b/apps/rundown/src/launcher.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. import moduleApi = require('module'); -import process from 'process'; +import process from 'node:process'; import { LauncherAction } from './LauncherTypes'; // "import type" doesn't work with const enums import type { IIpcTrace, IIpcDone, IIpcTraceRecord } from './LauncherTypes'; diff --git a/apps/rush-mcp-server/src/pluginFramework/RushMcpPluginLoader.ts b/apps/rush-mcp-server/src/pluginFramework/RushMcpPluginLoader.ts index f0715d4d0fe..33603216342 100644 --- a/apps/rush-mcp-server/src/pluginFramework/RushMcpPluginLoader.ts +++ b/apps/rush-mcp-server/src/pluginFramework/RushMcpPluginLoader.ts @@ -1,16 +1,17 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + +import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp'; + import { FileSystem, Import, JsonFile, type JsonObject, JsonSchema } from '@rushstack/node-core-library'; import { Autoinstaller } from '@rushstack/rush-sdk/lib/logic/Autoinstaller'; import { RushGlobalFolder } from '@rushstack/rush-sdk/lib/api/RushGlobalFolder'; import { RushConfiguration } from '@rushstack/rush-sdk/lib/api/RushConfiguration'; -import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp'; import type { IRushMcpPlugin, RushMcpPluginFactory } from './IRushMcpPlugin'; import { RushMcpPluginSessionInternal } from './RushMcpPluginSession'; - import rushMcpJsonSchemaObject from '../schemas/rush-mcp.schema.json'; import rushMcpPluginSchemaObject from '../schemas/rush-mcp-plugin.schema.json'; diff --git a/apps/rush-mcp-server/src/pluginFramework/zodTypes.ts b/apps/rush-mcp-server/src/pluginFramework/zodTypes.ts index 19bf22a2f12..80dbfa01a51 100644 --- a/apps/rush-mcp-server/src/pluginFramework/zodTypes.ts +++ b/apps/rush-mcp-server/src/pluginFramework/zodTypes.ts @@ -2,10 +2,9 @@ // See LICENSE in the project root for license information. import type * as zod from 'zod'; -export type { zod as zodModule }; - import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types'; +export type { zod as zodModule }; export { CallToolResultSchema }; /** diff --git a/apps/rush-mcp-server/src/server.ts b/apps/rush-mcp-server/src/server.ts index b6132bd0faf..5eceb116012 100644 --- a/apps/rush-mcp-server/src/server.ts +++ b/apps/rush-mcp-server/src/server.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'; + import { type BaseTool, RushConflictResolverTool, diff --git a/apps/rush-mcp-server/src/start.ts b/apps/rush-mcp-server/src/start.ts index fa74da180ea..7c191e15582 100644 --- a/apps/rush-mcp-server/src/start.ts +++ b/apps/rush-mcp-server/src/start.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as process from 'process'; +import * as path from 'node:path'; +import * as process from 'node:process'; + +import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'; + import { FileSystem } from '@rushstack/node-core-library'; import { RushSdkLoader } from '@rushstack/rush-sdk/loader'; -import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'; import { log } from './utilities/log'; import type { RushMCPServer } from './server'; diff --git a/apps/rush-mcp-server/src/tools/conflict-resolver.tool.ts b/apps/rush-mcp-server/src/tools/conflict-resolver.tool.ts index 20fc16261e8..3c9a085b9f4 100644 --- a/apps/rush-mcp-server/src/tools/conflict-resolver.tool.ts +++ b/apps/rush-mcp-server/src/tools/conflict-resolver.tool.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { z } from 'zod'; + import type { RushConfiguration } from '@rushstack/rush-sdk'; import type { IExecutableSpawnSyncOptions } from '@rushstack/node-core-library'; diff --git a/apps/rush-mcp-server/src/tools/migrate-project.tool.ts b/apps/rush-mcp-server/src/tools/migrate-project.tool.ts index 88481c3125d..d4069a1d79c 100644 --- a/apps/rush-mcp-server/src/tools/migrate-project.tool.ts +++ b/apps/rush-mcp-server/src/tools/migrate-project.tool.ts @@ -1,17 +1,19 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import { z } from 'zod'; -import { FileSystem, JsonFile } from '@rushstack/node-core-library'; -import { BaseTool, type CallToolResult } from './base.tool'; -import { getRushConfiguration } from '../utilities/common'; -import path from 'path'; +import { FileSystem, JsonFile } from '@rushstack/node-core-library'; import type { ISubspacesConfigurationJson } from '@rushstack/rush-sdk/lib/api/SubspacesConfiguration'; import type { RushConfiguration, RushConfigurationProject } from '@rushstack/rush-sdk'; import type { IRushConfigurationProjectJson } from '@rushstack/rush-sdk/lib/api/RushConfigurationProject'; import type { IRushConfigurationJson } from '@rushstack/rush-sdk/lib/api/RushConfiguration'; +import { BaseTool, type CallToolResult } from './base.tool'; +import { getRushConfiguration } from '../utilities/common'; + export class RushMigrateProjectTool extends BaseTool { private _rushWorkspacePath: string; diff --git a/apps/rush-mcp-server/src/tools/project-details.tool.ts b/apps/rush-mcp-server/src/tools/project-details.tool.ts index 21644eef1f1..b78227398df 100644 --- a/apps/rush-mcp-server/src/tools/project-details.tool.ts +++ b/apps/rush-mcp-server/src/tools/project-details.tool.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { z } from 'zod'; + import type { RushConfiguration, RushConfigurationProject } from '@rushstack/rush-sdk'; import { getRushConfiguration } from '../utilities/common'; diff --git a/apps/rush-mcp-server/src/tools/rush-command-validator.tool.ts b/apps/rush-mcp-server/src/tools/rush-command-validator.tool.ts index cd02cbc2cb2..196f5570d33 100644 --- a/apps/rush-mcp-server/src/tools/rush-command-validator.tool.ts +++ b/apps/rush-mcp-server/src/tools/rush-command-validator.tool.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import { z } from 'zod'; + import { JsonFile } from '@rushstack/node-core-library'; -import path from 'path'; import type { ICommandLineJson } from '@rushstack/rush-sdk/lib/api/CommandLineJson'; import type { RushConfiguration } from '@rushstack/rush-sdk'; diff --git a/apps/rush-mcp-server/src/utilities/command-runner.ts b/apps/rush-mcp-server/src/utilities/command-runner.ts index db51f551c7c..d94424757cb 100644 --- a/apps/rush-mcp-server/src/utilities/command-runner.ts +++ b/apps/rush-mcp-server/src/utilities/command-runner.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { ChildProcess } from 'child_process'; +import type { ChildProcess } from 'node:child_process'; + import { Executable, type IExecutableSpawnSyncOptions } from '@rushstack/node-core-library'; interface ICommandResult { diff --git a/apps/rush/src/MinimalRushConfiguration.ts b/apps/rush/src/MinimalRushConfiguration.ts index 7078f4af812..902aea3224a 100644 --- a/apps/rush/src/MinimalRushConfiguration.ts +++ b/apps/rush/src/MinimalRushConfiguration.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { JsonFile } from '@rushstack/node-core-library'; import { RushConfiguration } from '@microsoft/rush-lib'; diff --git a/apps/rush/src/RushCommandSelector.ts b/apps/rush/src/RushCommandSelector.ts index 3fe04ce8cd5..148d07e6d1e 100644 --- a/apps/rush/src/RushCommandSelector.ts +++ b/apps/rush/src/RushCommandSelector.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type * as rushLib from '@microsoft/rush-lib'; import { Colorize } from '@rushstack/terminal'; diff --git a/apps/rush/src/RushVersionSelector.ts b/apps/rush/src/RushVersionSelector.ts index b4ba82fb444..1fc8a73b9ce 100644 --- a/apps/rush/src/RushVersionSelector.ts +++ b/apps/rush/src/RushVersionSelector.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; import { LockFile } from '@rushstack/node-core-library'; diff --git a/apps/rush/src/start.ts b/apps/rush/src/start.ts index 90f79a835d1..14c0dbad96c 100644 --- a/apps/rush/src/start.ts +++ b/apps/rush/src/start.ts @@ -5,6 +5,7 @@ // we check to see if the Node.js version is too old. If, for whatever reason, Rush crashes with // an old Node.js version when evaluating one of the more complex imports, we'll at least // shown a meaningful error message. +// eslint-disable-next-line import/order import { NodeJsCompatibility } from '@microsoft/rush-lib/lib/logic/NodeJsCompatibility'; if (NodeJsCompatibility.reportAncientIncompatibleVersion()) { @@ -18,7 +19,8 @@ const alreadyReportedNodeTooNewError: boolean = NodeJsCompatibility.warnAboutVer alreadyReportedNodeTooNewError: false }); -import * as os from 'os'; +import * as os from 'node:os'; + import * as semver from 'semver'; import { Text, PackageJsonLookup } from '@rushstack/node-core-library'; diff --git a/apps/rush/src/test/MinimalRushConfiguration.test.ts b/apps/rush/src/test/MinimalRushConfiguration.test.ts index dccbe83783f..391c9feeeb2 100644 --- a/apps/rush/src/test/MinimalRushConfiguration.test.ts +++ b/apps/rush/src/test/MinimalRushConfiguration.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { MinimalRushConfiguration } from '../MinimalRushConfiguration'; diff --git a/apps/trace-import/src/traceImport.ts b/apps/trace-import/src/traceImport.ts index 26e8b4c4e36..28ae8ddc8a8 100644 --- a/apps/trace-import/src/traceImport.ts +++ b/apps/trace-import/src/traceImport.ts @@ -1,6 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; +import * as process from 'node:process'; + +import * as Resolve from 'resolve'; + +import { Colorize } from '@rushstack/terminal'; import { FileSystem, type IPackageJson, @@ -8,11 +14,6 @@ import { JsonFile, PackageName } from '@rushstack/node-core-library'; -import { Colorize } from '@rushstack/terminal'; - -import * as path from 'path'; -import * as process from 'process'; -import * as Resolve from 'resolve'; const jsExtensions: string[] = ['.js', '.cjs', '.jsx', '.json']; const tsExtensions: string[] = ['.d.ts', '.ts', '.tsx', '.json']; diff --git a/apps/zipsync/src/test/benchmark.test.ts b/apps/zipsync/src/test/benchmark.test.ts index dab74ac15c5..244b30ab203 100644 --- a/apps/zipsync/src/test/benchmark.test.ts +++ b/apps/zipsync/src/test/benchmark.test.ts @@ -1,5 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + /* eslint-disable no-console */ import { execSync } from 'node:child_process'; diff --git a/apps/zipsync/src/test/testUtils.ts b/apps/zipsync/src/test/testUtils.ts index 5adc33184d6..6d75dbcfdfc 100644 --- a/apps/zipsync/src/test/testUtils.ts +++ b/apps/zipsync/src/test/testUtils.ts @@ -5,6 +5,7 @@ import { tmpdir } from 'node:os'; import * as path from 'node:path'; import * as fs from 'node:fs'; import * as crypto from 'node:crypto'; + import type { IMetadata } from '../zipSyncUtils'; export function getTempDir(): string { diff --git a/build-tests-samples/heft-serverless-stack-tutorial/src/stacks/index.ts b/build-tests-samples/heft-serverless-stack-tutorial/src/stacks/index.ts index e4f89b8b419..d8e9f7ecc71 100644 --- a/build-tests-samples/heft-serverless-stack-tutorial/src/stacks/index.ts +++ b/build-tests-samples/heft-serverless-stack-tutorial/src/stacks/index.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import MyStack from './MyStack'; import type * as sst from '@serverless-stack/resources'; +import MyStack from './MyStack'; + export default function main(app: sst.App): void { // Set default runtime for all functions app.setDefaultFunctionProps({ diff --git a/build-tests-samples/heft-storybook-react-tutorial-app/config/rush-project.json b/build-tests-samples/heft-storybook-react-tutorial-app/config/rush-project.json index b0ee347694e..f3549d52dfd 100644 --- a/build-tests-samples/heft-storybook-react-tutorial-app/config/rush-project.json +++ b/build-tests-samples/heft-storybook-react-tutorial-app/config/rush-project.json @@ -4,7 +4,7 @@ "operationSettings": [ { - "operationName": "_phase:build", + "operationName": "_phase:lite-build", "outputFolderNames": ["dist"] } ] diff --git a/build-tests-samples/heft-storybook-react-tutorial-app/package.json b/build-tests-samples/heft-storybook-react-tutorial-app/package.json index 4de772bbf20..837d98a0703 100644 --- a/build-tests-samples/heft-storybook-react-tutorial-app/package.json +++ b/build-tests-samples/heft-storybook-react-tutorial-app/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "build": "heft build --clean --storybook", - "_phase:build": "heft run --only build -- --clean --storybook", + "_phase:lite-build": "heft run --only build -- --clean --storybook", "_phase:test": "" }, "dependencies": { diff --git a/build-tests-samples/heft-storybook-react-tutorial/src/ExampleApp.tsx b/build-tests-samples/heft-storybook-react-tutorial/src/ExampleApp.tsx index 10e4a3fcba8..d81154eaefe 100644 --- a/build-tests-samples/heft-storybook-react-tutorial/src/ExampleApp.tsx +++ b/build-tests-samples/heft-storybook-react-tutorial/src/ExampleApp.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as React from 'react'; + import { ToggleSwitch, type IToggleEventArgs } from './ToggleSwitch'; /** diff --git a/build-tests-samples/heft-storybook-react-tutorial/src/ToggleSwitch.stories.tsx b/build-tests-samples/heft-storybook-react-tutorial/src/ToggleSwitch.stories.tsx index 0ec512f7e7a..f9b6d3ab7ee 100644 --- a/build-tests-samples/heft-storybook-react-tutorial/src/ToggleSwitch.stories.tsx +++ b/build-tests-samples/heft-storybook-react-tutorial/src/ToggleSwitch.stories.tsx @@ -2,7 +2,6 @@ // See LICENSE in the project root for license information. import * as React from 'react'; - import type { ComponentStory, ComponentMeta } from 'heft-storybook-react-tutorial-storykit'; import { ToggleSwitch } from './ToggleSwitch'; diff --git a/build-tests-samples/heft-storybook-react-tutorial/src/index.tsx b/build-tests-samples/heft-storybook-react-tutorial/src/index.tsx index 7fef1fe79f7..d2a345895ca 100644 --- a/build-tests-samples/heft-storybook-react-tutorial/src/index.tsx +++ b/build-tests-samples/heft-storybook-react-tutorial/src/index.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; + import { ExampleApp } from './ExampleApp'; import './index.css'; diff --git a/build-tests-samples/heft-web-rig-app-tutorial/src/start.tsx b/build-tests-samples/heft-web-rig-app-tutorial/src/start.tsx index 3a89740ca4a..b7b46cebfa9 100644 --- a/build-tests-samples/heft-web-rig-app-tutorial/src/start.tsx +++ b/build-tests-samples/heft-web-rig-app-tutorial/src/start.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; + import { ExampleApp } from './ExampleApp'; import './start.css'; diff --git a/build-tests-samples/heft-webpack-basic-tutorial/src/ExampleApp.tsx b/build-tests-samples/heft-webpack-basic-tutorial/src/ExampleApp.tsx index 10e4a3fcba8..d81154eaefe 100644 --- a/build-tests-samples/heft-webpack-basic-tutorial/src/ExampleApp.tsx +++ b/build-tests-samples/heft-webpack-basic-tutorial/src/ExampleApp.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as React from 'react'; + import { ToggleSwitch, type IToggleEventArgs } from './ToggleSwitch'; /** diff --git a/build-tests-samples/heft-webpack-basic-tutorial/src/index.tsx b/build-tests-samples/heft-webpack-basic-tutorial/src/index.tsx index 7fef1fe79f7..d2a345895ca 100644 --- a/build-tests-samples/heft-webpack-basic-tutorial/src/index.tsx +++ b/build-tests-samples/heft-webpack-basic-tutorial/src/index.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; + import { ExampleApp } from './ExampleApp'; import './index.css'; diff --git a/build-tests-subspace/rush-lib-test/src/start.ts b/build-tests-subspace/rush-lib-test/src/start.ts index 8add230a7e2..086a84b52d0 100644 --- a/build-tests-subspace/rush-lib-test/src/start.ts +++ b/build-tests-subspace/rush-lib-test/src/start.ts @@ -7,6 +7,7 @@ console.log('rush-lib-test loading Rush configuration...'); // Important: Since we're calling an internal API, we need to use the unbundled .d.ts files // instead of the normal .d.ts rollup +// eslint-disable-next-line import/order import { RushConfiguration } from '@microsoft/rush-lib/lib/'; const config: RushConfiguration = RushConfiguration.loadFromDefaultLocation(); diff --git a/build-tests-subspace/rush-sdk-test/src/start.ts b/build-tests-subspace/rush-sdk-test/src/start.ts index ca5f9f7f4ee..92517a312f9 100644 --- a/build-tests-subspace/rush-sdk-test/src/start.ts +++ b/build-tests-subspace/rush-sdk-test/src/start.ts @@ -7,6 +7,7 @@ console.log('rush-sdk-test loading Rush configuration...'); // Important: Since we're calling an internal API, we need to use the unbundled .d.ts files // instead of the normal .d.ts rollup +// eslint-disable-next-line import/order import { RushConfiguration } from '@rushstack/rush-sdk/lib/index'; const config: RushConfiguration = RushConfiguration.loadFromDefaultLocation(); diff --git a/build-tests/api-documenter-scenarios/src/inheritedMembers/index.ts b/build-tests/api-documenter-scenarios/src/inheritedMembers/index.ts index 9457efd30f7..72ecba86fed 100644 --- a/build-tests/api-documenter-scenarios/src/inheritedMembers/index.ts +++ b/build-tests/api-documenter-scenarios/src/inheritedMembers/index.ts @@ -1,5 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + import { Extractor } from '@microsoft/api-extractor'; /** @public */ diff --git a/build-tests/api-documenter-scenarios/src/runScenarios.ts b/build-tests/api-documenter-scenarios/src/runScenarios.ts index 0a0b3ddb9a6..1b89ed09e1e 100644 --- a/build-tests/api-documenter-scenarios/src/runScenarios.ts +++ b/build-tests/api-documenter-scenarios/src/runScenarios.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IRunScriptOptions } from '@rushstack/heft'; import type { ChildProcess } from 'node:child_process'; -import { Executable, FileSystem, JsonFile } from '@rushstack/node-core-library'; + import { runScenariosAsync } from 'run-scenarios-helpers'; +import type { IRunScriptOptions } from '@rushstack/heft'; +import { Executable, FileSystem, JsonFile } from '@rushstack/node-core-library'; + export async function runAsync(runScriptOptions: IRunScriptOptions): Promise { const { heftConfiguration: { buildFolderPath } diff --git a/build-tests/api-documenter-test/src/test/snapshot.test.ts b/build-tests/api-documenter-test/src/test/snapshot.test.ts index 6d90191dd7e..a1019e7d538 100644 --- a/build-tests/api-documenter-test/src/test/snapshot.test.ts +++ b/build-tests/api-documenter-test/src/test/snapshot.test.ts @@ -1,5 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + import { Async, Executable, @@ -7,7 +8,7 @@ import { type FolderItem, PackageJsonLookup } from '@rushstack/node-core-library'; -import process from 'process'; +import process from 'node:process'; const PROJECT_FOLDER: string | undefined = PackageJsonLookup.instance.tryGetPackageFolderFor(__dirname); const API_DOCUMENTER_PATH: string = require.resolve('@microsoft/api-documenter/lib/start'); diff --git a/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json b/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json index d95757eac5e..018ab4c3f23 100644 --- a/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json +++ b/build-tests/api-extractor-test-05/dist/tsdoc-metadata.json @@ -5,7 +5,7 @@ "toolPackages": [ { "packageName": "@microsoft/api-extractor", - "packageVersion": "7.52.13" + "packageVersion": "7.52.15" } ] } diff --git a/build-tests/heft-copy-files-test/config/rush-project.json b/build-tests/heft-copy-files-test/config/rush-project.json index c7051638984..e3df32c4de7 100644 --- a/build-tests/heft-copy-files-test/config/rush-project.json +++ b/build-tests/heft-copy-files-test/config/rush-project.json @@ -3,7 +3,7 @@ "operationSettings": [ { - "operationName": "_phase:build", + "operationName": "_phase:lite-build", "outputFolderNames": [ "out-all", "out-all-except-for-images", diff --git a/build-tests/heft-copy-files-test/package.json b/build-tests/heft-copy-files-test/package.json index 5258d276510..5ef07daffea 100644 --- a/build-tests/heft-copy-files-test/package.json +++ b/build-tests/heft-copy-files-test/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "build": "heft build --clean", - "_phase:build": "heft run --only build -- --clean" + "_phase:lite-build": "heft run --only build -- --clean" }, "devDependencies": { "@rushstack/heft": "workspace:*" diff --git a/build-tests/heft-example-plugin-01/src/index.ts b/build-tests/heft-example-plugin-01/src/index.ts index 4854eb3bb9d..8bc385908fa 100644 --- a/build-tests/heft-example-plugin-01/src/index.ts +++ b/build-tests/heft-example-plugin-01/src/index.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { SyncHook } from 'tapable'; + import type { IHeftTaskPlugin, IHeftTaskSession, diff --git a/build-tests/heft-example-plugin-02/src/index.ts b/build-tests/heft-example-plugin-02/src/index.ts index 08daa048fdb..d1382dd8527 100644 --- a/build-tests/heft-example-plugin-02/src/index.ts +++ b/build-tests/heft-example-plugin-02/src/index.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IHeftTaskSession, HeftConfiguration, IHeftTaskPlugin } from '@rushstack/heft'; import type { PLUGIN_NAME as ExamplePlugin01Name, IExamplePlugin01Accessor } from 'heft-example-plugin-01'; +import type { IHeftTaskSession, HeftConfiguration, IHeftTaskPlugin } from '@rushstack/heft'; + export const PLUGIN_NAME: 'example-plugin-02' = 'example-plugin-02'; const EXAMPLE_PLUGIN_01_NAME: typeof ExamplePlugin01Name = 'example-plugin-01'; diff --git a/build-tests/heft-sass-test/src/index.tsx b/build-tests/heft-sass-test/src/index.tsx index cfd1b429ec2..d6ba6e6cac2 100644 --- a/build-tests/heft-sass-test/src/index.tsx +++ b/build-tests/heft-sass-test/src/index.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; + import { ExampleApp } from './ExampleApp'; const rootDiv: HTMLElement = document.getElementById('root') as HTMLElement; diff --git a/build-tests/localization-plugin-test-02/src/indexB.ts b/build-tests/localization-plugin-test-02/src/indexB.ts index 81f4321d691..7eb6c75c7e8 100644 --- a/build-tests/localization-plugin-test-02/src/indexB.ts +++ b/build-tests/localization-plugin-test-02/src/indexB.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import strings3 from './strings3.resjson'; + const strings4: string = require('./strings4.loc.json'); // eslint-disable-next-line no-console diff --git a/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/src/startProxyServer.ts b/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/src/startProxyServer.ts index a9809fc09b6..c7c6a54b9a8 100644 --- a/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/src/startProxyServer.ts +++ b/build-tests/rush-amazon-s3-build-cache-plugin-integration-test/src/startProxyServer.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as http from 'node:http'; + import * as httpProxy from 'http-proxy'; -import * as http from 'http'; const proxy: httpProxy = httpProxy.createProxyServer({}); diff --git a/build-tests/rush-redis-cobuild-plugin-integration-test/src/paths.ts b/build-tests/rush-redis-cobuild-plugin-integration-test/src/paths.ts index 56bbcdf0c8e..c3dfdb36914 100644 --- a/build-tests/rush-redis-cobuild-plugin-integration-test/src/paths.ts +++ b/build-tests/rush-redis-cobuild-plugin-integration-test/src/paths.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; const sandboxRepoFolder: string = path.resolve(__dirname, '../sandbox/repo'); diff --git a/common/changes/@microsoft/api-documenter/imports-cleanup_2025-10-02-21-25.json b/common/changes/@microsoft/api-documenter/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..771f7e84c78 --- /dev/null +++ b/common/changes/@microsoft/api-documenter/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@microsoft/api-documenter" + } + ], + "packageName": "@microsoft/api-documenter", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@microsoft/api-extractor-model/imports-cleanup_2025-10-02-21-25.json b/common/changes/@microsoft/api-extractor-model/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..52f6a7d52bc --- /dev/null +++ b/common/changes/@microsoft/api-extractor-model/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@microsoft/api-extractor-model" + } + ], + "packageName": "@microsoft/api-extractor-model", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@microsoft/api-extractor/imports-cleanup_2025-10-02-21-25.json b/common/changes/@microsoft/api-extractor/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..f7c3a8a84e4 --- /dev/null +++ b/common/changes/@microsoft/api-extractor/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@microsoft/api-extractor" + } + ], + "packageName": "@microsoft/api-extractor", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@microsoft/rush/imports-cleanup_2025-10-02-21-25.json b/common/changes/@microsoft/rush/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..efcd84c45fb --- /dev/null +++ b/common/changes/@microsoft/rush/imports-cleanup_2025-10-02-21-25.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/webpack5-load-themed-styles-loader/imports-cleanup_2025-10-02-21-25.json b/common/changes/@microsoft/webpack5-load-themed-styles-loader/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..bb02423ee02 --- /dev/null +++ b/common/changes/@microsoft/webpack5-load-themed-styles-loader/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@microsoft/webpack5-load-themed-styles-loader" + } + ], + "packageName": "@microsoft/webpack5-load-themed-styles-loader", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/debug-certificate-manager/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/debug-certificate-manager/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..585dea266f6 --- /dev/null +++ b/common/changes/@rushstack/debug-certificate-manager/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/debug-certificate-manager" + } + ], + "packageName": "@rushstack/debug-certificate-manager", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-bulk/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/eslint-bulk/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..d3216600e50 --- /dev/null +++ b/common/changes/@rushstack/eslint-bulk/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/eslint-bulk" + } + ], + "packageName": "@rushstack/eslint-bulk", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-patch/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/eslint-patch/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..6a61cc13329 --- /dev/null +++ b/common/changes/@rushstack/eslint-patch/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/eslint-patch" + } + ], + "packageName": "@rushstack/eslint-patch", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin-packlets/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/eslint-plugin-packlets/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..a04cd0021ef --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin-packlets/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/eslint-plugin-packlets" + } + ], + "packageName": "@rushstack/eslint-plugin-packlets", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin-security/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/eslint-plugin-security/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..e8c34c96411 --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin-security/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/eslint-plugin-security" + } + ], + "packageName": "@rushstack/eslint-plugin-security", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/eslint-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..5669a1df6aa --- /dev/null +++ b/common/changes/@rushstack/eslint-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/eslint-plugin" + } + ], + "packageName": "@rushstack/eslint-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/hashed-folder-copy-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/hashed-folder-copy-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..3d00044f953 --- /dev/null +++ b/common/changes/@rushstack/hashed-folder-copy-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/hashed-folder-copy-plugin" + } + ], + "packageName": "@rushstack/hashed-folder-copy-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-api-extractor-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-api-extractor-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..aeb8de3babe --- /dev/null +++ b/common/changes/@rushstack/heft-api-extractor-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-api-extractor-plugin" + } + ], + "packageName": "@rushstack/heft-api-extractor-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-config-file/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-config-file/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..ebc8dd79c07 --- /dev/null +++ b/common/changes/@rushstack/heft-config-file/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-config-file" + } + ], + "packageName": "@rushstack/heft-config-file", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..6e97e4a5cf0 --- /dev/null +++ b/common/changes/@rushstack/heft-isolated-typescript-transpile-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-isolated-typescript-transpile-plugin" + } + ], + "packageName": "@rushstack/heft-isolated-typescript-transpile-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-jest-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-jest-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..5175001a683 --- /dev/null +++ b/common/changes/@rushstack/heft-jest-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-jest-plugin" + } + ], + "packageName": "@rushstack/heft-jest-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-json-schema-typings-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-json-schema-typings-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..dffdbf5ca8a --- /dev/null +++ b/common/changes/@rushstack/heft-json-schema-typings-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-json-schema-typings-plugin" + } + ], + "packageName": "@rushstack/heft-json-schema-typings-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-lint-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-lint-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..29f880f4781 --- /dev/null +++ b/common/changes/@rushstack/heft-lint-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-lint-plugin" + } + ], + "packageName": "@rushstack/heft-lint-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-sass-load-themed-styles-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-sass-load-themed-styles-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..a924a51c4c4 --- /dev/null +++ b/common/changes/@rushstack/heft-sass-load-themed-styles-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-sass-load-themed-styles-plugin" + } + ], + "packageName": "@rushstack/heft-sass-load-themed-styles-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-sass-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-sass-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..9b91da609ca --- /dev/null +++ b/common/changes/@rushstack/heft-sass-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-sass-plugin" + } + ], + "packageName": "@rushstack/heft-sass-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-serverless-stack-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-serverless-stack-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..47b4f12cda5 --- /dev/null +++ b/common/changes/@rushstack/heft-serverless-stack-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-serverless-stack-plugin" + } + ], + "packageName": "@rushstack/heft-serverless-stack-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-storybook-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-storybook-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..e4683c353d5 --- /dev/null +++ b/common/changes/@rushstack/heft-storybook-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-storybook-plugin" + } + ], + "packageName": "@rushstack/heft-storybook-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-typescript-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-typescript-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..4a8e9132357 --- /dev/null +++ b/common/changes/@rushstack/heft-typescript-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-typescript-plugin" + } + ], + "packageName": "@rushstack/heft-typescript-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-webpack4-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-webpack4-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..93df4fb8f95 --- /dev/null +++ b/common/changes/@rushstack/heft-webpack4-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-webpack4-plugin" + } + ], + "packageName": "@rushstack/heft-webpack4-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft-webpack5-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft-webpack5-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..9340dce0c15 --- /dev/null +++ b/common/changes/@rushstack/heft-webpack5-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft-webpack5-plugin" + } + ], + "packageName": "@rushstack/heft-webpack5-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/heft/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/heft/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..ef525830e37 --- /dev/null +++ b/common/changes/@rushstack/heft/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/heft" + } + ], + "packageName": "@rushstack/heft", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/loader-raw-script/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/loader-raw-script/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..57a3fb4e860 --- /dev/null +++ b/common/changes/@rushstack/loader-raw-script/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/loader-raw-script" + } + ], + "packageName": "@rushstack/loader-raw-script", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/localization-utilities/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/localization-utilities/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..df6824522c4 --- /dev/null +++ b/common/changes/@rushstack/localization-utilities/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/localization-utilities" + } + ], + "packageName": "@rushstack/localization-utilities", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/lockfile-explorer/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/lockfile-explorer/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..6db4dbd541c --- /dev/null +++ b/common/changes/@rushstack/lockfile-explorer/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/lockfile-explorer" + } + ], + "packageName": "@rushstack/lockfile-explorer", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/mcp-server/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/mcp-server/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..df2697e982c --- /dev/null +++ b/common/changes/@rushstack/mcp-server/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/mcp-server" + } + ], + "packageName": "@rushstack/mcp-server", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/module-minifier/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/module-minifier/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..d1e73450eca --- /dev/null +++ b/common/changes/@rushstack/module-minifier/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/module-minifier" + } + ], + "packageName": "@rushstack/module-minifier", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/node-core-library/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/node-core-library/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..db57b2feb86 --- /dev/null +++ b/common/changes/@rushstack/node-core-library/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/node-core-library" + } + ], + "packageName": "@rushstack/node-core-library", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/operation-graph/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/operation-graph/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..ccb47662fbf --- /dev/null +++ b/common/changes/@rushstack/operation-graph/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/operation-graph" + } + ], + "packageName": "@rushstack/operation-graph", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/package-deps-hash/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/package-deps-hash/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..3aafebf85be --- /dev/null +++ b/common/changes/@rushstack/package-deps-hash/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/package-deps-hash" + } + ], + "packageName": "@rushstack/package-deps-hash", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/package-extractor/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/package-extractor/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..75d96dca0c8 --- /dev/null +++ b/common/changes/@rushstack/package-extractor/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/package-extractor" + } + ], + "packageName": "@rushstack/package-extractor", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/rig-package/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/rig-package/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..c66505525a1 --- /dev/null +++ b/common/changes/@rushstack/rig-package/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/rig-package" + } + ], + "packageName": "@rushstack/rig-package", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/rundown/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/rundown/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..96f1931da4f --- /dev/null +++ b/common/changes/@rushstack/rundown/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/rundown" + } + ], + "packageName": "@rushstack/rundown", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/rush-mcp-docs-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/rush-mcp-docs-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..b71bacbec32 --- /dev/null +++ b/common/changes/@rushstack/rush-mcp-docs-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/rush-mcp-docs-plugin" + } + ], + "packageName": "@rushstack/rush-mcp-docs-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/set-webpack-public-path-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/set-webpack-public-path-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..d68748afb18 --- /dev/null +++ b/common/changes/@rushstack/set-webpack-public-path-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/set-webpack-public-path-plugin" + } + ], + "packageName": "@rushstack/set-webpack-public-path-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/terminal/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/terminal/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..13894830365 --- /dev/null +++ b/common/changes/@rushstack/terminal/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/terminal" + } + ], + "packageName": "@rushstack/terminal", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/trace-import/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/trace-import/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..f8cda6a0c07 --- /dev/null +++ b/common/changes/@rushstack/trace-import/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/trace-import" + } + ], + "packageName": "@rushstack/trace-import", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/ts-command-line/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/ts-command-line/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..1f3658b8dc4 --- /dev/null +++ b/common/changes/@rushstack/ts-command-line/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/ts-command-line" + } + ], + "packageName": "@rushstack/ts-command-line", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/typings-generator/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/typings-generator/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..28ecf6f355b --- /dev/null +++ b/common/changes/@rushstack/typings-generator/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/typings-generator" + } + ], + "packageName": "@rushstack/typings-generator", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack-embedded-dependencies-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack-embedded-dependencies-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..908583cfa6f --- /dev/null +++ b/common/changes/@rushstack/webpack-embedded-dependencies-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack-embedded-dependencies-plugin" + } + ], + "packageName": "@rushstack/webpack-embedded-dependencies-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack-plugin-utilities/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack-plugin-utilities/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..df473b1f248 --- /dev/null +++ b/common/changes/@rushstack/webpack-plugin-utilities/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack-plugin-utilities" + } + ], + "packageName": "@rushstack/webpack-plugin-utilities", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack-workspace-resolve-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack-workspace-resolve-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..61302ca72e6 --- /dev/null +++ b/common/changes/@rushstack/webpack-workspace-resolve-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack-workspace-resolve-plugin" + } + ], + "packageName": "@rushstack/webpack-workspace-resolve-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack4-localization-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack4-localization-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..c5d7cdffa66 --- /dev/null +++ b/common/changes/@rushstack/webpack4-localization-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack4-localization-plugin" + } + ], + "packageName": "@rushstack/webpack4-localization-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack4-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack4-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..5197fc2ef25 --- /dev/null +++ b/common/changes/@rushstack/webpack4-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack4-module-minifier-plugin" + } + ], + "packageName": "@rushstack/webpack4-module-minifier-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack5-localization-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack5-localization-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..ea6c4f790aa --- /dev/null +++ b/common/changes/@rushstack/webpack5-localization-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack5-localization-plugin" + } + ], + "packageName": "@rushstack/webpack5-localization-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/webpack5-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/webpack5-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..150960dd0a1 --- /dev/null +++ b/common/changes/@rushstack/webpack5-module-minifier-plugin/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/webpack5-module-minifier-plugin" + } + ], + "packageName": "@rushstack/webpack5-module-minifier-plugin", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/worker-pool/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/worker-pool/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..3785d25cb4e --- /dev/null +++ b/common/changes/@rushstack/worker-pool/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/worker-pool" + } + ], + "packageName": "@rushstack/worker-pool", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/changes/@rushstack/zipsync/imports-cleanup_2025-10-02-21-25.json b/common/changes/@rushstack/zipsync/imports-cleanup_2025-10-02-21-25.json new file mode 100644 index 00000000000..16632b6ae34 --- /dev/null +++ b/common/changes/@rushstack/zipsync/imports-cleanup_2025-10-02-21-25.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "", + "type": "none", + "packageName": "@rushstack/zipsync" + } + ], + "packageName": "@rushstack/zipsync", + "email": "iclanton@users.noreply.github.com" +} \ No newline at end of file diff --git a/common/config/rush/command-line.json b/common/config/rush/command-line.json index 90ddbb0784e..42a4467c79e 100644 --- a/common/config/rush/command-line.json +++ b/common/config/rush/command-line.json @@ -14,14 +14,14 @@ { "commandKind": "phased", "name": "build", - "phases": ["_phase:build"] + "phases": ["_phase:lite-build", "_phase:build"] }, { "commandKind": "phased", "name": "test", "summary": "Builds all projects and runs their tests.", - "phases": ["_phase:build", "_phase:test"], + "phases": ["_phase:lite-build", "_phase:build", "_phase:test"], "enableParallelism": true, "incremental": true }, @@ -30,7 +30,7 @@ "commandKind": "phased", "name": "retest", "summary": "Rebuilds all projects and reruns their tests.", - "phases": ["_phase:build", "_phase:test"], + "phases": ["_phase:lite-build", "_phase:build", "_phase:test"], "enableParallelism": true, "incremental": false }, @@ -45,12 +45,12 @@ "enableParallelism": true, "incremental": true, // Initial execution only uses the build phase so that all dependencies of watch phases have been built - "phases": ["_phase:build"], + "phases": ["_phase:lite-build", "_phase:build"], "watchOptions": { // Act as though `--watch` is always passed. If false, adds support for passing `--watch`. "alwaysWatch": true, // During watch recompilation run both build and test for affected projects - "watchPhases": ["_phase:build", "_phase:test"] + "watchPhases": ["_phase:lite-build", "_phase:build", "_phase:test"] } }, // { @@ -233,20 +233,30 @@ ], "phases": [ + { + // Used for very simple builds that don't support CLI arguments like `--production` or `--fix` + "name": "_phase:lite-build", + "dependencies": { + "upstream": ["_phase:lite-build", "_phase:build"] + }, + "missingScriptBehavior": "silent", + "allowWarningsOnSuccess": false + }, { "name": "_phase:build", "dependencies": { + "self": ["_phase:lite-build"], "upstream": ["_phase:build"] }, - "ignoreMissingScript": true, + "missingScriptBehavior": "log", "allowWarningsOnSuccess": false }, { "name": "_phase:test", "dependencies": { - "self": ["_phase:build"] + "self": ["_phase:lite-build", "_phase:build"] }, - "ignoreMissingScript": true, + "missingScriptBehavior": "silent", "allowWarningsOnSuccess": false } ], diff --git a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml index fbab9dd0b1d..29b7e3f3324 100644 --- a/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml +++ b/common/config/subspaces/build-tests-subspace/pnpm-lock.yaml @@ -1716,6 +1716,20 @@ packages: is-string: 1.1.0 dev: true + /array-includes@3.1.9: + resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 + es-abstract: 1.24.0 + es-object-atoms: 1.1.1 + get-intrinsic: 1.3.0 + is-string: 1.1.1 + math-intrinsics: 1.1.0 + dev: true + /array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} @@ -1755,14 +1769,14 @@ packages: es-shim-unscopables: 1.0.2 dev: true - /array.prototype.flatmap@1.3.2: - resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} + /array.prototype.flat@1.3.3: + resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.5 - es-shim-unscopables: 1.0.2 + es-abstract: 1.23.9 + es-shim-unscopables: 1.1.0 dev: true /array.prototype.flatmap@1.3.3: @@ -2642,6 +2656,66 @@ packages: which-typed-array: 1.1.19 dev: true + /es-abstract@1.24.0: + resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==} + engines: {node: '>= 0.4'} + dependencies: + array-buffer-byte-length: 1.0.2 + arraybuffer.prototype.slice: 1.0.4 + available-typed-arrays: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 + data-view-buffer: 1.0.2 + data-view-byte-length: 1.0.2 + data-view-byte-offset: 1.0.1 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + es-set-tostringtag: 2.1.0 + es-to-primitive: 1.3.0 + function.prototype.name: 1.1.8 + get-intrinsic: 1.3.0 + get-proto: 1.0.1 + get-symbol-description: 1.1.0 + globalthis: 1.0.4 + gopd: 1.2.0 + has-property-descriptors: 1.0.2 + has-proto: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + internal-slot: 1.1.0 + is-array-buffer: 3.0.5 + is-callable: 1.2.7 + is-data-view: 1.0.2 + is-negative-zero: 2.0.3 + is-regex: 1.2.1 + is-set: 2.0.3 + is-shared-array-buffer: 1.0.4 + is-string: 1.1.1 + is-typed-array: 1.1.15 + is-weakref: 1.1.1 + math-intrinsics: 1.1.0 + object-inspect: 1.13.4 + object-keys: 1.1.1 + object.assign: 4.1.7 + own-keys: 1.0.1 + regexp.prototype.flags: 1.5.4 + safe-array-concat: 1.1.3 + safe-push-apply: 1.0.0 + safe-regex-test: 1.1.0 + set-proto: 1.0.0 + stop-iteration-iterator: 1.1.0 + string.prototype.trim: 1.2.10 + string.prototype.trimend: 1.0.9 + string.prototype.trimstart: 1.0.8 + typed-array-buffer: 1.0.3 + typed-array-byte-length: 1.0.3 + typed-array-byte-offset: 1.0.4 + typed-array-length: 1.0.7 + unbox-primitive: 1.1.0 + which-typed-array: 1.1.19 + dev: true + /es-define-property@1.0.0: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} @@ -2766,8 +2840,8 @@ packages: resolve: 1.22.8 dev: true - /eslint-module-utils@2.12.0(eslint@9.25.1): - resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==} + /eslint-module-utils@2.12.1(eslint@9.25.1): + resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==} engines: {node: '>=4'} peerDependencies: eslint: '*' @@ -2796,31 +2870,31 @@ packages: eslint: 9.25.1 dev: true - /eslint-plugin-import@2.31.0(eslint@9.25.1): - resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==} + /eslint-plugin-import@2.32.0(eslint@9.25.1): + resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==} engines: {node: '>=4'} peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9 dependencies: '@rtsao/scc': 1.1.0 - array-includes: 3.1.8 + array-includes: 3.1.9 array.prototype.findlastindex: 1.2.6 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 + array.prototype.flat: 1.3.3 + array.prototype.flatmap: 1.3.3 debug: 3.2.7 doctrine: 2.1.0 eslint: 9.25.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(eslint@9.25.1) + eslint-module-utils: 2.12.1(eslint@9.25.1) hasown: 2.0.2 - is-core-module: 2.15.1 + is-core-module: 2.16.1 is-glob: 4.0.3 minimatch: 3.1.2 object.fromentries: 2.0.8 object.groupby: 1.0.3 - object.values: 1.2.0 + object.values: 1.2.1 semver: 6.3.1 - string.prototype.trimend: 1.0.8 + string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 dev: true @@ -3733,6 +3807,13 @@ packages: dependencies: hasown: 2.0.2 + /is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} + engines: {node: '>= 0.4'} + dependencies: + hasown: 2.0.2 + dev: true + /is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} engines: {node: '>= 0.4'} @@ -5024,6 +5105,11 @@ packages: engines: {node: '>= 0.4'} dev: true + /object-inspect@1.13.4: + resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==} + engines: {node: '>= 0.4'} + dev: true + /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} @@ -5075,18 +5161,9 @@ packages: resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.5 - dev: true - - /object.values@1.2.0: - resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-abstract: 1.23.9 dev: true /object.values@1.2.1: @@ -5546,6 +5623,18 @@ packages: set-function-name: 2.0.2 dev: true + /regexp.prototype.flags@1.5.4: + resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.8 + define-properties: 1.2.1 + es-errors: 1.3.0 + get-proto: 1.0.1 + gopd: 1.2.0 + set-function-name: 2.0.2 + dev: true + /registry-auth-token@4.2.2: resolution: {integrity: sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==} engines: {node: '>=6.0.0'} @@ -5912,6 +6001,14 @@ packages: /stackframe@1.3.4: resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==} + /stop-iteration-iterator@1.1.0: + resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + internal-slot: 1.1.0 + dev: true + /strict-uri-encode@2.0.0: resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==} engines: {node: '>=4'} @@ -6901,7 +6998,7 @@ packages: eslint-import-resolver-node: 0.3.9 eslint-plugin-header: 3.1.1(eslint@9.25.1) eslint-plugin-headers: 1.2.1(eslint@9.25.1) - eslint-plugin-import: 2.31.0(eslint@9.25.1) + eslint-plugin-import: 2.32.0(eslint@9.25.1) eslint-plugin-jsdoc: 50.6.11(eslint@9.25.1) eslint-plugin-react-hooks: 5.2.0(eslint@9.25.1) typescript: 5.8.2 diff --git a/common/config/subspaces/build-tests-subspace/repo-state.json b/common/config/subspaces/build-tests-subspace/repo-state.json index e3f8022a1b2..3ce7bd98eca 100644 --- a/common/config/subspaces/build-tests-subspace/repo-state.json +++ b/common/config/subspaces/build-tests-subspace/repo-state.json @@ -1,6 +1,6 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "7ab9e7468f870fadac72aa3c99cb34a957affe05", + "pnpmShrinkwrapHash": "9eaf55ba29de8d94e17af33463f3b6ce0480400b", "preferredVersionsHash": "550b4cee0bef4e97db6c6aad726df5149d20e7d9", - "packageJsonInjectedDependenciesHash": "9ea14ceb9e69fa7a123d25164e75a11965e4b2cc" + "packageJsonInjectedDependenciesHash": "5f2a311100f4ad0bc6735377670f5d7cfd664127" } diff --git a/common/config/subspaces/default/pnpm-lock.yaml b/common/config/subspaces/default/pnpm-lock.yaml index 2d917a3c804..c51e1839bce 100644 --- a/common/config/subspaces/default/pnpm-lock.yaml +++ b/common/config/subspaces/default/pnpm-lock.yaml @@ -2753,8 +2753,8 @@ importers: specifier: ~1.2.1 version: 1.2.1(eslint@9.25.1) eslint-plugin-import: - specifier: 2.31.0 - version: 2.31.0(eslint@9.25.1) + specifier: 2.32.0 + version: 2.32.0(eslint@9.25.1) eslint-plugin-jsdoc: specifier: 50.6.11 version: 50.6.11(eslint@9.25.1) @@ -4121,8 +4121,8 @@ importers: specifier: ~1.2.1 version: 1.2.1(eslint@9.25.1) eslint-plugin-import: - specifier: 2.31.0 - version: 2.31.0(eslint@9.25.1) + specifier: 2.32.0 + version: 2.32.0(eslint@9.25.1) eslint-plugin-jsdoc: specifier: 50.6.11 version: 50.6.11(eslint@9.25.1) @@ -15815,7 +15815,7 @@ packages: resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 is-array-buffer: 3.0.4 /array-buffer-byte-length@1.0.2: @@ -15844,6 +15844,20 @@ packages: get-intrinsic: 1.2.4 is-string: 1.0.7 + /array-includes@3.1.9: + resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.8 + call-bound: 1.0.4 + define-properties: 1.2.1 + es-abstract: 1.24.0 + es-object-atoms: 1.1.1 + get-intrinsic: 1.3.0 + is-string: 1.1.1 + math-intrinsics: 1.1.0 + dev: false + /array-union@1.0.2: resolution: {integrity: sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==} engines: {node: '>=0.10.0'} @@ -15892,19 +15906,19 @@ packages: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.2 - es-shim-unscopables: 1.0.2 + es-abstract: 1.23.9 + es-shim-unscopables: 1.1.0 - /array.prototype.flatmap@1.3.2: - resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==} + /array.prototype.flat@1.3.3: + resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.2 - es-shim-unscopables: 1.0.2 + es-abstract: 1.23.9 + es-shim-unscopables: 1.1.0 dev: false /array.prototype.flatmap@1.3.3: @@ -15914,29 +15928,29 @@ packages: call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 - es-shim-unscopables: 1.0.2 + es-shim-unscopables: 1.1.0 /array.prototype.map@1.0.7: resolution: {integrity: sha512-XpcFfLoBEAhezrrNw1V+yLXkE7M6uR7xJEsxbG6c/V9v043qurwVJB9r9UTnoSioFDoz1i1VOydpWGmJpfVZbg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 es-array-method-boxes-properly: 1.0.0 es-object-atoms: 1.1.1 - is-string: 1.0.7 + is-string: 1.1.1 dev: true /array.prototype.reduce@1.0.6: resolution: {integrity: sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.9 es-array-method-boxes-properly: 1.0.0 - is-string: 1.0.7 + is-string: 1.1.1 /array.prototype.tosorted@1.1.4: resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==} @@ -15953,7 +15967,7 @@ packages: engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 es-errors: 1.3.0 @@ -15968,7 +15982,7 @@ packages: array-buffer-byte-length: 1.0.2 call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.9 + es-abstract: 1.24.0 es-errors: 1.3.0 get-intrinsic: 1.3.0 is-array-buffer: 3.0.5 @@ -18021,7 +18035,7 @@ packages: resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 is-data-view: 1.0.1 @@ -18037,7 +18051,7 @@ packages: resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 is-data-view: 1.0.1 @@ -18053,7 +18067,7 @@ packages: resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 is-data-view: 1.0.1 @@ -18770,7 +18784,7 @@ packages: array-buffer-byte-length: 1.0.1 arraybuffer.prototype.slice: 1.0.3 available-typed-arrays: 1.0.7 - call-bind: 1.0.7 + call-bind: 1.0.8 data-view-buffer: 1.0.1 data-view-byte-length: 1.0.1 data-view-byte-offset: 1.0.0 @@ -18795,7 +18809,7 @@ packages: is-negative-zero: 2.0.3 is-regex: 1.1.4 is-shared-array-buffer: 1.0.3 - is-string: 1.0.7 + is-string: 1.1.1 is-typed-array: 1.1.13 is-weakref: 1.0.2 object-inspect: 1.13.4 @@ -18805,7 +18819,7 @@ packages: safe-array-concat: 1.1.2 safe-regex-test: 1.0.3 string.prototype.trim: 1.2.9 - string.prototype.trimend: 1.0.8 + string.prototype.trimend: 1.0.9 string.prototype.trimstart: 1.0.7 typed-array-buffer: 1.0.2 typed-array-byte-length: 1.0.1 @@ -18870,6 +18884,65 @@ packages: unbox-primitive: 1.1.0 which-typed-array: 1.1.19 + /es-abstract@1.24.0: + resolution: {integrity: sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==} + engines: {node: '>= 0.4'} + dependencies: + array-buffer-byte-length: 1.0.2 + arraybuffer.prototype.slice: 1.0.4 + available-typed-arrays: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 + data-view-buffer: 1.0.2 + data-view-byte-length: 1.0.2 + data-view-byte-offset: 1.0.1 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + es-set-tostringtag: 2.1.0 + es-to-primitive: 1.3.0 + function.prototype.name: 1.1.8 + get-intrinsic: 1.3.0 + get-proto: 1.0.1 + get-symbol-description: 1.1.0 + globalthis: 1.0.4 + gopd: 1.2.0 + has-property-descriptors: 1.0.2 + has-proto: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + internal-slot: 1.1.0 + is-array-buffer: 3.0.5 + is-callable: 1.2.7 + is-data-view: 1.0.2 + is-negative-zero: 2.0.3 + is-regex: 1.2.1 + is-set: 2.0.3 + is-shared-array-buffer: 1.0.4 + is-string: 1.1.1 + is-typed-array: 1.1.15 + is-weakref: 1.1.1 + math-intrinsics: 1.1.0 + object-inspect: 1.13.4 + object-keys: 1.1.1 + object.assign: 4.1.7 + own-keys: 1.0.1 + regexp.prototype.flags: 1.5.4 + safe-array-concat: 1.1.3 + safe-push-apply: 1.0.0 + safe-regex-test: 1.1.0 + set-proto: 1.0.0 + stop-iteration-iterator: 1.1.0 + string.prototype.trim: 1.2.10 + string.prototype.trimend: 1.0.9 + string.prototype.trimstart: 1.0.8 + typed-array-buffer: 1.0.3 + typed-array-byte-length: 1.0.3 + typed-array-byte-offset: 1.0.4 + typed-array-length: 1.0.7 + unbox-primitive: 1.1.0 + which-typed-array: 1.1.19 + /es-array-method-boxes-properly@1.0.0: resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==} @@ -18884,13 +18957,13 @@ packages: /es-get-iterator@1.1.3: resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 get-intrinsic: 1.3.0 has-symbols: 1.1.0 is-arguments: 1.1.1 is-map: 2.0.3 is-set: 2.0.3 - is-string: 1.0.7 + is-string: 1.1.1 isarray: 2.0.5 stop-iteration-iterator: 1.0.0 dev: true @@ -18958,7 +19031,6 @@ packages: engines: {node: '>= 0.4'} dependencies: hasown: 2.0.2 - dev: false /es-to-primitive@1.2.1: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} @@ -18973,8 +19045,8 @@ packages: engines: {node: '>= 0.4'} dependencies: is-callable: 1.2.7 - is-date-object: 1.0.5 - is-symbol: 1.0.4 + is-date-object: 1.1.0 + is-symbol: 1.1.1 /es5-shim@4.6.7: resolution: {integrity: sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==} @@ -19282,8 +19354,8 @@ packages: resolve: 1.22.8 dev: false - /eslint-module-utils@2.12.0(eslint@9.25.1): - resolution: {integrity: sha512-wALZ0HFoytlyh/1+4wuZ9FJCD/leWHQzzrxJ8+rebyReSLk7LApMyd3WJaLVoN+D5+WIdJyDK1c6JnE65V4Zyg==} + /eslint-module-utils@2.12.1(eslint@9.25.1): + resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==} engines: {node: '>=4'} peerDependencies: eslint: '*' @@ -19312,31 +19384,31 @@ packages: eslint: 9.25.1(supports-color@8.1.1) dev: false - /eslint-plugin-import@2.31.0(eslint@9.25.1): - resolution: {integrity: sha512-ixmkI62Rbc2/w8Vfxyh1jQRTdRTF52VxwRVHl/ykPAmqG+Nb7/kNn+byLP0LxPgI7zWA16Jt82SybJInmMia3A==} + /eslint-plugin-import@2.32.0(eslint@9.25.1): + resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==} engines: {node: '>=4'} peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9 dependencies: '@rtsao/scc': 1.1.0 - array-includes: 3.1.8 + array-includes: 3.1.9 array.prototype.findlastindex: 1.2.6 - array.prototype.flat: 1.3.2 - array.prototype.flatmap: 1.3.2 + array.prototype.flat: 1.3.3 + array.prototype.flatmap: 1.3.3 debug: 3.2.7 doctrine: 2.1.0 eslint: 9.25.1(supports-color@8.1.1) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(eslint@9.25.1) + eslint-module-utils: 2.12.1(eslint@9.25.1) hasown: 2.0.2 is-core-module: 2.16.1 is-glob: 4.0.3 minimatch: 3.1.2 object.fromentries: 2.0.8 object.groupby: 1.0.3 - object.values: 1.2.0 + object.values: 1.2.1 semver: 6.3.1 - string.prototype.trimend: 1.0.8 + string.prototype.trimend: 1.0.9 tsconfig-paths: 3.15.0 dev: false @@ -20926,7 +20998,7 @@ packages: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 functions-have-names: 1.2.3 @@ -21063,7 +21135,7 @@ packages: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 get-intrinsic: 1.3.0 @@ -22107,7 +22179,7 @@ packages: resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 has-tostringtag: 1.0.2 dev: true @@ -22115,7 +22187,7 @@ packages: resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 get-intrinsic: 1.3.0 /is-array-buffer@3.0.5: @@ -22135,11 +22207,6 @@ packages: dependencies: has-tostringtag: 1.0.2 - /is-bigint@1.0.4: - resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} - dependencies: - has-bigints: 1.0.2 - /is-bigint@1.1.0: resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==} engines: {node: '>= 0.4'} @@ -22160,13 +22227,6 @@ packages: dependencies: binary-extensions: 2.3.0 - /is-boolean-object@1.1.2: - resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - /is-boolean-object@1.2.2: resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} engines: {node: '>= 0.4'} @@ -22290,11 +22350,6 @@ packages: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} - /is-finalizationregistry@1.0.2: - resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==} - dependencies: - call-bind: 1.0.8 - /is-finalizationregistry@1.1.1: resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==} engines: {node: '>= 0.4'} @@ -22388,12 +22443,6 @@ packages: resolution: {integrity: sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==} engines: {node: '>=10'} - /is-number-object@1.0.7: - resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} - engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - /is-number-object@1.1.1: resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==} engines: {node: '>= 0.4'} @@ -22479,7 +22528,7 @@ packages: resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 /is-shared-array-buffer@1.0.4: resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==} @@ -22556,7 +22605,7 @@ packages: /is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 /is-weakref@1.1.1: resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==} @@ -25042,7 +25091,7 @@ packages: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 @@ -25071,10 +25120,10 @@ packages: resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.2 - es-object-atoms: 1.0.0 + es-abstract: 1.23.9 + es-object-atoms: 1.1.1 /object.getownpropertydescriptors@2.1.7: resolution: {integrity: sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==} @@ -25090,9 +25139,9 @@ packages: resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.9 dev: false /object.hasown@1.1.3: @@ -25108,15 +25157,6 @@ packages: dependencies: isobject: 3.0.1 - /object.values@1.2.0: - resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - dev: false - /object.values@1.2.1: resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==} engines: {node: '>= 0.4'} @@ -25124,7 +25164,7 @@ packages: call-bind: 1.0.8 call-bound: 1.0.4 define-properties: 1.2.1 - es-object-atoms: 1.0.0 + es-object-atoms: 1.1.1 /objectorarray@1.0.5: resolution: {integrity: sha512-eJJDYkhJFFbBBAxeh8xW+weHlkI28n2ZdQV/J/DNfWfSKlGEf2xcfAbZTv3riEXHAhL9SVOTs2pRmXiSTf78xg==} @@ -26275,7 +26315,7 @@ packages: engines: {node: '>= 0.4'} dependencies: array.prototype.map: 1.0.7 - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 get-intrinsic: 1.3.0 @@ -26286,7 +26326,7 @@ packages: resolution: {integrity: sha512-aVDtsXOml9iuMJzUco9J1je/UrIT3oMYfWkCTiUhkt+AvZw72q4dUZnR/R/eB3h5GeAagQVXvM1ApoYniJiwoA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 es-errors: 1.3.0 @@ -26980,25 +27020,13 @@ packages: dependencies: call-bind: 1.0.8 define-properties: 1.2.1 - es-abstract: 1.23.9 + es-abstract: 1.24.0 es-errors: 1.3.0 es-object-atoms: 1.1.1 get-intrinsic: 1.3.0 get-proto: 1.0.1 which-builtin-type: 1.2.1 - /reflect.getprototypeof@1.0.6: - resolution: {integrity: sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.8 - define-properties: 1.2.1 - es-abstract: 1.23.9 - es-errors: 1.3.0 - get-intrinsic: 1.3.0 - globalthis: 1.0.4 - which-builtin-type: 1.1.3 - /refractor@3.6.0: resolution: {integrity: sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==} dependencies: @@ -27042,7 +27070,7 @@ packages: resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-errors: 1.3.0 set-function-name: 2.0.2 @@ -27399,7 +27427,7 @@ packages: resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} engines: {node: '>=0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 get-intrinsic: 1.3.0 has-symbols: 1.1.0 isarray: 2.0.5 @@ -27435,7 +27463,7 @@ packages: resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 is-regex: 1.1.4 @@ -28473,9 +28501,16 @@ packages: resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==} engines: {node: '>= 0.4'} dependencies: - internal-slot: 1.0.7 + internal-slot: 1.1.0 dev: true + /stop-iteration-iterator@1.1.0: + resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + internal-slot: 1.1.0 + /stoppable@1.1.0: resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==} engines: {node: '>=4', npm: '>=6'} @@ -28601,7 +28636,7 @@ packages: resolution: {integrity: sha512-DOB27b/2UTTD+4myKUFh+/fXWcu/UDyASIXfg+7VzoCNNGOfWvoyU/x5pvVHr++ztyt/oSYI1BcWBBG/hmlNjA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 dev: true @@ -28610,7 +28645,7 @@ packages: resolution: {integrity: sha512-1y15lz7otgfRTAVK5qbp3eHIga+w8j7+jIH+7HpUrOfnLVl6n0hbspi4EXf4tR+PNOpBjPstltemkx0SvViOCg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 es-object-atoms: 1.1.1 @@ -28630,7 +28665,7 @@ packages: call-bound: 1.0.4 define-data-property: 1.1.4 define-properties: 1.2.1 - es-abstract: 1.23.9 + es-abstract: 1.24.0 es-object-atoms: 1.1.1 has-property-descriptors: 1.0.2 @@ -28638,18 +28673,11 @@ packages: resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 es-object-atoms: 1.1.1 - /string.prototype.trimend@1.0.8: - resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - /string.prototype.trimend@1.0.9: resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==} engines: {node: '>= 0.4'} @@ -28662,7 +28690,7 @@ packages: /string.prototype.trimstart@1.0.7: resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 define-properties: 1.2.1 es-abstract: 1.23.9 @@ -28838,9 +28866,9 @@ packages: resolution: {integrity: sha512-VgVgtEabORsQtmuindtO7v8fF+bsKxUkvEMFj+ecBK6bomrwv5JUSWdMoC3ypa9+Jaqp/wOzkWk4f6I+p5GzyA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 - get-symbol-description: 1.0.2 + get-symbol-description: 1.1.0 has-symbols: 1.1.0 object.getownpropertydescriptors: 2.1.7 dev: true @@ -29549,7 +29577,7 @@ packages: resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 es-errors: 1.3.0 is-typed-array: 1.1.13 @@ -29565,7 +29593,7 @@ packages: resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 for-each: 0.3.3 gopd: 1.2.0 has-proto: 1.0.3 @@ -29576,7 +29604,7 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.8 - for-each: 0.3.3 + for-each: 0.3.5 gopd: 1.2.0 has-proto: 1.2.0 is-typed-array: 1.1.15 @@ -29586,7 +29614,7 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.7 - call-bind: 1.0.7 + call-bind: 1.0.8 for-each: 0.3.3 gopd: 1.2.0 has-proto: 1.0.3 @@ -29598,7 +29626,7 @@ packages: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.8 - for-each: 0.3.3 + for-each: 0.3.5 gopd: 1.2.0 has-proto: 1.2.0 is-typed-array: 1.1.15 @@ -29608,7 +29636,7 @@ packages: resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 for-each: 0.3.3 gopd: 1.2.0 has-proto: 1.0.3 @@ -29620,11 +29648,11 @@ packages: engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.8 - for-each: 0.3.3 + for-each: 0.3.5 gopd: 1.2.0 is-typed-array: 1.1.15 possible-typed-array-names: 1.0.0 - reflect.getprototypeof: 1.0.6 + reflect.getprototypeof: 1.0.10 /typed-rest-client@1.8.11: resolution: {integrity: sha512-5UvfMpd1oelmUPRbbaVnq+rHP7ng2cE4qoQkQeAqxRL6PklkxsM0g32/HL0yfvruK6ojQ5x8EE+HF4YV6DtuCA==} @@ -29680,7 +29708,7 @@ packages: /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 has-bigints: 1.0.2 has-symbols: 1.1.0 which-boxed-primitive: 1.0.2 @@ -30577,11 +30605,11 @@ packages: /which-boxed-primitive@1.0.2: resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} dependencies: - is-bigint: 1.0.4 - is-boolean-object: 1.1.2 - is-number-object: 1.0.7 - is-string: 1.0.7 - is-symbol: 1.0.4 + is-bigint: 1.1.0 + is-boolean-object: 1.2.2 + is-number-object: 1.1.1 + is-string: 1.1.1 + is-symbol: 1.1.1 /which-boxed-primitive@1.1.1: resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==} @@ -30593,23 +30621,6 @@ packages: is-string: 1.1.1 is-symbol: 1.1.1 - /which-builtin-type@1.1.3: - resolution: {integrity: sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==} - engines: {node: '>= 0.4'} - dependencies: - function.prototype.name: 1.1.8 - has-tostringtag: 1.0.2 - is-async-function: 2.0.0 - is-date-object: 1.0.5 - is-finalizationregistry: 1.0.2 - is-generator-function: 1.0.10 - is-regex: 1.2.1 - is-weakref: 1.1.1 - isarray: 2.0.5 - which-boxed-primitive: 1.0.2 - which-collection: 1.0.2 - which-typed-array: 1.1.19 - /which-builtin-type@1.2.1: resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==} engines: {node: '>= 0.4'} @@ -30654,7 +30665,7 @@ packages: engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.7 - call-bind: 1.0.7 + call-bind: 1.0.8 for-each: 0.3.3 gopd: 1.2.0 has-tostringtag: 1.0.2 diff --git a/common/config/subspaces/default/repo-state.json b/common/config/subspaces/default/repo-state.json index ceffb8a3503..d0a87256738 100644 --- a/common/config/subspaces/default/repo-state.json +++ b/common/config/subspaces/default/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "473506da62f432cad1de808edb5a5fbad5862ec2", + "pnpmShrinkwrapHash": "b14e05fb6e67142fd6a574fe462bee93cb828511", "preferredVersionsHash": "61cd419c533464b580f653eb5f5a7e27fe7055ca" } diff --git a/common/reviews/api/heft.api.md b/common/reviews/api/heft.api.md index 7c13f35565a..96f4281126f 100644 --- a/common/reviews/api/heft.api.md +++ b/common/reviews/api/heft.api.md @@ -17,7 +17,7 @@ import { CommandLineParameter } from '@rushstack/ts-command-line'; import { CommandLineStringListParameter } from '@rushstack/ts-command-line'; import { CommandLineStringParameter } from '@rushstack/ts-command-line'; import { CustomValidationFunction } from '@rushstack/heft-config-file'; -import * as fs from 'fs'; +import * as fs from 'node:fs'; import { ICustomJsonPathMetadata } from '@rushstack/heft-config-file'; import { ICustomPropertyInheritance } from '@rushstack/heft-config-file'; import { IJsonPathMetadata } from '@rushstack/heft-config-file'; diff --git a/common/reviews/api/module-minifier.api.md b/common/reviews/api/module-minifier.api.md index b74aba5638a..e4aa1c13a60 100644 --- a/common/reviews/api/module-minifier.api.md +++ b/common/reviews/api/module-minifier.api.md @@ -8,8 +8,8 @@ import { MinifyOptions } from 'terser'; import type { RawSourceMap } from 'source-map'; -import type { ResourceLimits } from 'worker_threads'; -import type * as WorkerThreads from 'worker_threads'; +import type { ResourceLimits } from 'node:worker_threads'; +import type * as WorkerThreads from 'node:worker_threads'; // @public export function getIdentifier(ordinal: number): string; diff --git a/common/reviews/api/node-core-library.api.md b/common/reviews/api/node-core-library.api.md index 2abcd7652be..c3e208d1b19 100644 --- a/common/reviews/api/node-core-library.api.md +++ b/common/reviews/api/node-core-library.api.md @@ -6,9 +6,9 @@ /// -import * as child_process from 'child_process'; -import * as nodeFs from 'fs'; -import * as nodePath from 'path'; +import * as child_process from 'node:child_process'; +import * as nodeFs from 'node:fs'; +import * as nodePath from 'node:path'; // @public export enum AlreadyExistsBehavior { diff --git a/common/reviews/api/terminal.api.md b/common/reviews/api/terminal.api.md index ddd03856320..cd5edfb7e06 100644 --- a/common/reviews/api/terminal.api.md +++ b/common/reviews/api/terminal.api.md @@ -11,8 +11,8 @@ import type { IProblem } from '@rushstack/problem-matcher'; import type { IProblemMatcher } from '@rushstack/problem-matcher'; import type { IProblemMatcherJson } from '@rushstack/problem-matcher'; import { NewlineKind } from '@rushstack/node-core-library'; -import { Writable } from 'stream'; -import { WritableOptions } from 'stream'; +import { Writable } from 'node:stream'; +import { WritableOptions } from 'node:stream'; // @public export class AnsiEscape { diff --git a/common/reviews/api/worker-pool.api.md b/common/reviews/api/worker-pool.api.md index 1b5a387b8d3..5761d9d92ce 100644 --- a/common/reviews/api/worker-pool.api.md +++ b/common/reviews/api/worker-pool.api.md @@ -6,8 +6,8 @@ /// -import { ResourceLimits } from 'worker_threads'; -import { Worker } from 'worker_threads'; +import { ResourceLimits } from 'node:worker_threads'; +import { Worker } from 'node:worker_threads'; // Warning: (ae-internal-missing-underscore) The name "IWorkerPoolOptions" should be prefixed with an underscore because the declaration is marked as @internal // diff --git a/eslint/eslint-bulk/src/start.ts b/eslint/eslint-bulk/src/start.ts index 3e650167b08..b61f9fb6b71 100644 --- a/eslint/eslint-bulk/src/start.ts +++ b/eslint/eslint-bulk/src/start.ts @@ -6,9 +6,9 @@ import { type SpawnSyncOptionsWithBufferEncoding, execSync, spawnSync -} from 'child_process'; -import * as process from 'process'; -import * as fs from 'fs'; +} from 'node:child_process'; +import * as process from 'node:process'; +import * as fs from 'node:fs'; const ESLINT_CONFIG_FILES: string[] = [ 'eslint.config.js', diff --git a/eslint/eslint-patch/src/_patch-base.ts b/eslint/eslint-patch/src/_patch-base.ts index 171f93a134b..d4fa0056538 100644 --- a/eslint/eslint-patch/src/_patch-base.ts +++ b/eslint/eslint-patch/src/_patch-base.ts @@ -8,7 +8,7 @@ // require("@rushstack/eslint-patch/modern-module-resolution"); // -import path from 'path'; +import path from 'node:path'; const isModuleResolutionError: (ex: unknown) => boolean = (ex) => typeof ex === 'object' && !!ex && 'code' in ex && (ex as { code: unknown }).code === 'MODULE_NOT_FOUND'; diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-file.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-file.ts index fd59c918307..2526196eca7 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-file.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-file.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import fs from 'fs'; +import fs from 'node:fs'; + import { VSCODE_PID_ENV_VAR_NAME } from './constants'; export interface ISuppression { diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts index 4c2beeca30f..549ad21b2bf 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import fs from 'node:fs'; + import type { TSESTree } from '@typescript-eslint/types'; -import fs from 'fs'; import * as Guards from './ast-guards'; - import { eslintFolder } from '../_patch-base'; import { ESLINT_BULK_ENABLE_ENV_VAR_NAME, diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts index 5b77c3de6f6..ecbc702a63b 100755 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/prune.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import fs from 'fs'; +import fs from 'node:fs'; import { printPruneHelp } from './utils/print-help'; import { runEslintAsync } from './runEslint'; diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/runEslint.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/runEslint.ts index 512b3b3339f..8d73302aa8a 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/runEslint.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/runEslint.ts @@ -3,6 +3,7 @@ import type { ESLint as TEslintLegacy } from 'eslint-8'; import type { ESLint as TEslint } from 'eslint-9'; + import { getEslintPathAndVersion } from './utils/get-eslint-cli'; export async function runEslintAsync(files: string[], mode: 'suppress' | 'prune'): Promise { diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/get-eslint-cli.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/get-eslint-cli.ts index 8325f01d8a4..e4d0450eef2 100755 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/get-eslint-cli.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/get-eslint-cli.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; + import { BULK_SUPPRESSIONS_CLI_ESLINT_PACKAGE_NAME } from '../../constants'; // When this list is updated, update the `eslint-bulk-suppressions-newest-test` diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/is-correct-cwd.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/is-correct-cwd.ts index a4db8e08d1d..eff0c18cb68 100755 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/is-correct-cwd.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/cli/utils/is-correct-cwd.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import fs from 'fs'; +import fs from 'node:fs'; export function isCorrectCwd(cwd: string): boolean { return ( diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts index e07b2dfd76d..79efac9dd6c 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/generate-patched-file.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import fs from 'fs'; +import fs from 'node:fs'; + import { ESLINT_BULK_FORCE_REGENERATE_PATCH_ENV_VAR_NAME, ESLINT_BULK_PATCH_PATH_ENV_VAR_NAME diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts index 8a79c5e6eb2..bae84358e31 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/path-utils.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import fs from 'fs'; -import os from 'os'; +import fs from 'node:fs'; +import os from 'node:os'; + import { eslintFolder, eslintPackageVersion } from '../_patch-base'; import { ESLINT_BULK_DETECT_ENV_VAR_NAME } from './constants'; import currentPackageJson from '../../package.json'; diff --git a/eslint/eslint-plugin-packlets/src/PackletAnalyzer.ts b/eslint/eslint-plugin-packlets/src/PackletAnalyzer.ts index eae3d2b6ce8..b0149b24519 100644 --- a/eslint/eslint-plugin-packlets/src/PackletAnalyzer.ts +++ b/eslint/eslint-plugin-packlets/src/PackletAnalyzer.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; +import * as fs from 'node:fs'; + import { Path } from './Path'; export type InputFileMessageIds = diff --git a/eslint/eslint-plugin-packlets/src/Path.ts b/eslint/eslint-plugin-packlets/src/Path.ts index a6b4e9d8b84..b49def2434d 100644 --- a/eslint/eslint-plugin-packlets/src/Path.ts +++ b/eslint/eslint-plugin-packlets/src/Path.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; export type ParsedPath = path.ParsedPath; diff --git a/eslint/eslint-plugin-packlets/src/circular-deps.ts b/eslint/eslint-plugin-packlets/src/circular-deps.ts index accdbe45d81..e36b0546e2c 100644 --- a/eslint/eslint-plugin-packlets/src/circular-deps.ts +++ b/eslint/eslint-plugin-packlets/src/circular-deps.ts @@ -2,7 +2,6 @@ // See LICENSE in the project root for license information. import type * as ts from 'typescript'; - import type { TSESLint, TSESTree } from '@typescript-eslint/utils'; import { ESLintUtils } from '@typescript-eslint/utils'; diff --git a/eslint/eslint-plugin-packlets/src/index.ts b/eslint/eslint-plugin-packlets/src/index.ts index 9f80f769502..7958fa842df 100644 --- a/eslint/eslint-plugin-packlets/src/index.ts +++ b/eslint/eslint-plugin-packlets/src/index.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { TSESLint } from '@typescript-eslint/utils'; + import { mechanics } from './mechanics'; import { circularDeps } from './circular-deps'; import { readme } from './readme'; diff --git a/eslint/eslint-plugin-packlets/src/readme.ts b/eslint/eslint-plugin-packlets/src/readme.ts index af44ce7c573..20ceb014c09 100644 --- a/eslint/eslint-plugin-packlets/src/readme.ts +++ b/eslint/eslint-plugin-packlets/src/readme.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; + import type { TSESLint, TSESTree } from '@typescript-eslint/utils'; import { ESLintUtils } from '@typescript-eslint/utils'; diff --git a/eslint/eslint-plugin-packlets/src/test/Path.test.ts b/eslint/eslint-plugin-packlets/src/test/Path.test.ts index d0093a99acf..57d75b1be1b 100644 --- a/eslint/eslint-plugin-packlets/src/test/Path.test.ts +++ b/eslint/eslint-plugin-packlets/src/test/Path.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { Path } from '../Path'; function toPosixPath(value: string): string { diff --git a/eslint/eslint-plugin-security/src/index.ts b/eslint/eslint-plugin-security/src/index.ts index 78c620b45f2..8e2d433001c 100644 --- a/eslint/eslint-plugin-security/src/index.ts +++ b/eslint/eslint-plugin-security/src/index.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { TSESLint } from '@typescript-eslint/utils'; + import { noUnsafeRegExp } from './no-unsafe-regexp'; interface IPlugin { diff --git a/eslint/eslint-plugin/src/LintUtilities.ts b/eslint/eslint-plugin/src/LintUtilities.ts index 80ebad9bf67..3921ac3b7c0 100644 --- a/eslint/eslint-plugin/src/LintUtilities.ts +++ b/eslint/eslint-plugin/src/LintUtilities.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { ESLintUtils, TSESTree, type TSESLint } from '@typescript-eslint/utils'; import type { Program } from 'typescript'; diff --git a/eslint/eslint-plugin/src/no-backslash-imports.ts b/eslint/eslint-plugin/src/no-backslash-imports.ts index a4ad28f756b..82fbb1bb791 100644 --- a/eslint/eslint-plugin/src/no-backslash-imports.ts +++ b/eslint/eslint-plugin/src/no-backslash-imports.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { TSESTree, TSESLint } from '@typescript-eslint/utils'; + import { parseImportSpecifierFromExpression, serializeImportSpecifier, diff --git a/eslint/eslint-plugin/src/no-external-local-imports.ts b/eslint/eslint-plugin/src/no-external-local-imports.ts index 7466b765910..9fb8c3fd3f8 100644 --- a/eslint/eslint-plugin/src/no-external-local-imports.ts +++ b/eslint/eslint-plugin/src/no-external-local-imports.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { TSESTree, TSESLint } from '@typescript-eslint/utils'; + import { getRootDirectoryFromContext, getImportAbsolutePathFromExpression } from './LintUtilities'; export const MESSAGE_ID: 'error-external-local-imports' = 'error-external-local-imports'; diff --git a/eslint/eslint-plugin/src/no-transitive-dependency-imports.ts b/eslint/eslint-plugin/src/no-transitive-dependency-imports.ts index 04df0d0a2a7..e7677826f14 100644 --- a/eslint/eslint-plugin/src/no-transitive-dependency-imports.ts +++ b/eslint/eslint-plugin/src/no-transitive-dependency-imports.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { TSESTree, TSESLint } from '@typescript-eslint/utils'; + import { parseImportSpecifierFromExpression, type IParsedImportSpecifier } from './LintUtilities'; export const MESSAGE_ID: 'error-transitive-dependency-imports' = 'error-transitive-dependency-imports'; diff --git a/eslint/eslint-plugin/src/normalized-imports.ts b/eslint/eslint-plugin/src/normalized-imports.ts index f5ba7d927e1..1534642a20c 100644 --- a/eslint/eslint-plugin/src/normalized-imports.ts +++ b/eslint/eslint-plugin/src/normalized-imports.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { TSESTree, TSESLint } from '@typescript-eslint/utils'; + import { getFilePathFromContext, parseImportSpecifierFromExpression, diff --git a/eslint/local-eslint-config/config/rush-project.json b/eslint/local-eslint-config/config/rush-project.json index 340c4fd0356..a2c8bc8a483 100644 --- a/eslint/local-eslint-config/config/rush-project.json +++ b/eslint/local-eslint-config/config/rush-project.json @@ -1,11 +1,10 @@ { "$schema": "https://developer.microsoft.com/json-schemas/rush/v5/rush-project.schema.json", - // TODO: Uncomment the commented lines once the decoupled-local-node-rig is updated to support ESLint 9 "operationSettings": [ - // { - // "operationName": "_phase:build", - // "outputFolderNames": ["mixins", "patch", "profile"] - // } + { + "operationName": "_phase:lite-build", + "outputFolderNames": ["flat"] + } ] } diff --git a/eslint/local-eslint-config/package.json b/eslint/local-eslint-config/package.json index 50726d4b577..a1a5836a752 100644 --- a/eslint/local-eslint-config/package.json +++ b/eslint/local-eslint-config/package.json @@ -5,7 +5,7 @@ "description": "An ESLint configuration consumed projects inside the rushstack repo.", "scripts": { "build": "heft build --clean", - "_phase:build": "heft build --clean" + "_phase:lite-build": "heft build --clean" }, "peerDependencies": { "eslint": "^9.25.1", @@ -26,7 +26,7 @@ "eslint-import-resolver-node": "0.3.9", "eslint-plugin-header": "~3.1.1", "eslint-plugin-headers": "~1.2.1", - "eslint-plugin-import": "2.31.0", + "eslint-plugin-import": "2.32.0", "eslint-plugin-jsdoc": "50.6.11", "eslint-plugin-react-hooks": "5.2.0" } diff --git a/heft-plugins/heft-api-extractor-plugin/src/ApiExtractorRunner.ts b/heft-plugins/heft-api-extractor-plugin/src/ApiExtractorRunner.ts index 5f4998b3a25..f0e6856ec1c 100644 --- a/heft-plugins/heft-api-extractor-plugin/src/ApiExtractorRunner.ts +++ b/heft-plugins/heft-api-extractor-plugin/src/ApiExtractorRunner.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import type { IScopedLogger } from '@rushstack/heft'; import { FileError, InternalError } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts index 4ac859ef33c..2dd940fc342 100644 --- a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts +++ b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/SwcIsolatedTranspilePlugin.ts @@ -5,6 +5,17 @@ import type { Dirent } from 'node:fs'; import path from 'node:path'; import { type ChildProcess, fork } from 'node:child_process'; +import type { + Config, + JscTarget, + ModuleConfig, + Options as SwcOptions, + ParserConfig, + ReactConfig, + TransformConfig +} from '@swc/core'; +import { SyncWaterfallHook } from 'tapable'; + import { Async, Path } from '@rushstack/node-core-library'; import type { HeftConfiguration, @@ -21,16 +32,6 @@ import { type _TTypeScript as TTypeScript, _getTsconfigFilePath as getTsconfigFilePath } from '@rushstack/heft-typescript-plugin'; -import type { - Config, - JscTarget, - ModuleConfig, - Options as SwcOptions, - ParserConfig, - ReactConfig, - TransformConfig -} from '@swc/core'; -import { SyncWaterfallHook } from 'tapable'; import type { ISwcIsolatedTranspileOptions, diff --git a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/TranspileWorker.ts b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/TranspileWorker.ts index e7982822e1a..06c119173f1 100644 --- a/heft-plugins/heft-isolated-typescript-transpile-plugin/src/TranspileWorker.ts +++ b/heft-plugins/heft-isolated-typescript-transpile-plugin/src/TranspileWorker.ts @@ -4,10 +4,11 @@ import { mkdirSync, writeFileSync } from 'node:fs'; import { basename, dirname } from 'node:path'; -import { Async } from '@rushstack/node-core-library/lib/Async'; import type { Output } from '@swc/core'; import { transformFile } from '@swc/core/binding'; +import { Async } from '@rushstack/node-core-library/lib/Async'; + import type { IWorkerResult, ITransformTask, ITransformModulesRequestMessage } from './types'; interface ISourceMap { diff --git a/heft-plugins/heft-jest-plugin/src/HeftJestReporter.ts b/heft-plugins/heft-jest-plugin/src/HeftJestReporter.ts index 774592d37bb..3f4e7089c3c 100644 --- a/heft-plugins/heft-jest-plugin/src/HeftJestReporter.ts +++ b/heft-plugins/heft-jest-plugin/src/HeftJestReporter.ts @@ -1,9 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { InternalError, Text } from '@rushstack/node-core-library'; -import { type ITerminal, Colorize } from '@rushstack/terminal'; +import * as path from 'node:path'; + import type { Reporter, Test, @@ -14,6 +13,8 @@ import type { Config } from '@jest/reporters'; +import { InternalError, Text } from '@rushstack/node-core-library'; +import { type ITerminal, Colorize } from '@rushstack/terminal'; import type { HeftConfiguration, IScopedLogger } from '@rushstack/heft'; export interface IHeftJestReporterOptions { diff --git a/heft-plugins/heft-jest-plugin/src/JestPlugin.ts b/heft-plugins/heft-jest-plugin/src/JestPlugin.ts index cf4ace4e53e..5bf31ed257e 100644 --- a/heft-plugins/heft-jest-plugin/src/JestPlugin.ts +++ b/heft-plugins/heft-jest-plugin/src/JestPlugin.ts @@ -4,13 +4,14 @@ // Load the Jest patches before anything else loads import './patches/jestWorkerPatch'; -import type { EventEmitter } from 'events'; -import * as path from 'path'; +import type { EventEmitter } from 'node:events'; +import * as path from 'node:path'; import type { AggregatedResult } from '@jest/reporters'; import type { Config } from '@jest/types'; import { resolveRunner, resolveSequencer, resolveTestEnvironment, resolveWatchPlugin } from 'jest-resolve'; import { mergeWith, isObject } from 'lodash'; + import type { HeftConfiguration, IScopedLogger, diff --git a/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts b/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts index 404af5e3766..71440b051b6 100644 --- a/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts +++ b/heft-plugins/heft-jest-plugin/src/JestRealPathPatch.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as path from 'node:path'; + import { RealNodeModulePathResolver } from '@rushstack/node-core-library/lib/RealNodeModulePath'; const jestResolvePackageFolder: string = path.dirname(require.resolve('jest-resolve/package.json')); diff --git a/heft-plugins/heft-jest-plugin/src/JestUtils.ts b/heft-plugins/heft-jest-plugin/src/JestUtils.ts index dc92937d473..89e6b5069c8 100644 --- a/heft-plugins/heft-jest-plugin/src/JestUtils.ts +++ b/heft-plugins/heft-jest-plugin/src/JestUtils.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { createHash } from 'crypto'; +import * as path from 'node:path'; +import { createHash } from 'node:crypto'; + import { default as JestResolver } from 'jest-resolve'; import type { TransformOptions } from '@jest/transform'; diff --git a/heft-plugins/heft-jest-plugin/src/SourceMapSnapshotResolver.ts b/heft-plugins/heft-jest-plugin/src/SourceMapSnapshotResolver.ts index 2e3124ab10f..6dd1791ff19 100644 --- a/heft-plugins/heft-jest-plugin/src/SourceMapSnapshotResolver.ts +++ b/heft-plugins/heft-jest-plugin/src/SourceMapSnapshotResolver.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; function findSourcePath(testPath: string, snapshotExtension: string): string { const sourceMapFilePath: string = `${testPath}.map`; diff --git a/heft-plugins/heft-jest-plugin/src/TerminalWritableStream.ts b/heft-plugins/heft-jest-plugin/src/TerminalWritableStream.ts index 12583bf5aa2..285bd520478 100644 --- a/heft-plugins/heft-jest-plugin/src/TerminalWritableStream.ts +++ b/heft-plugins/heft-jest-plugin/src/TerminalWritableStream.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { Writable } from 'node:stream'; + import type { ITerminal } from '@rushstack/terminal'; -import { Writable } from 'stream'; // Regex to filter out screen clearing directives // Can't use the AnsiEscape.removeCodes() function from node-core-library because we are only diff --git a/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts b/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts index b59d7673462..ba3ae8ff04e 100644 --- a/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts +++ b/heft-plugins/heft-jest-plugin/src/patches/jestWorkerPatch.ts @@ -3,7 +3,8 @@ /* eslint-disable no-console */ -import * as path from 'path'; +import * as path from 'node:path'; + import { Import, FileSystem } from '@rushstack/node-core-library'; // This patch is a fix for a problem where Jest reports this error spuriously on a machine that is under heavy load: diff --git a/heft-plugins/heft-jest-plugin/src/test/JestPlugin.test.ts b/heft-plugins/heft-jest-plugin/src/test/JestPlugin.test.ts index 9833d353a33..1ef210d665e 100644 --- a/heft-plugins/heft-jest-plugin/src/test/JestPlugin.test.ts +++ b/heft-plugins/heft-jest-plugin/src/test/JestPlugin.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type { Config } from '@jest/types'; import type { IHeftTaskSession, HeftConfiguration, CommandLineParameter } from '@rushstack/heft'; import type { ProjectConfigurationFile } from '@rushstack/heft-config-file'; diff --git a/heft-plugins/heft-jest-plugin/src/transformers/IdentityMockTransformer.ts b/heft-plugins/heft-jest-plugin/src/transformers/IdentityMockTransformer.ts index b076523f52b..c6423bcad8f 100644 --- a/heft-plugins/heft-jest-plugin/src/transformers/IdentityMockTransformer.ts +++ b/heft-plugins/heft-jest-plugin/src/transformers/IdentityMockTransformer.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { FileSystem } from '@rushstack/node-core-library'; +import * as path from 'node:path'; + import type { SyncTransformer, TransformedSource, TransformOptions } from '@jest/transform'; +import { FileSystem } from '@rushstack/node-core-library'; + // The transpiled output for IdentityMockProxy.ts const proxyCode: string = FileSystem.readFile(path.join(__dirname, '..', 'identityMock.js')).toString(); diff --git a/heft-plugins/heft-jest-plugin/src/transformers/StringMockTransformer.ts b/heft-plugins/heft-jest-plugin/src/transformers/StringMockTransformer.ts index 4ec9b8c3de2..23766ffc9de 100644 --- a/heft-plugins/heft-jest-plugin/src/transformers/StringMockTransformer.ts +++ b/heft-plugins/heft-jest-plugin/src/transformers/StringMockTransformer.ts @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + import { relative } from 'node:path'; + import type { SyncTransformer, TransformedSource, TransformOptions } from '@jest/transform'; const isWindows: boolean = process.platform === 'win32'; diff --git a/heft-plugins/heft-json-schema-typings-plugin/src/JsonSchemaTypingsGenerator.ts b/heft-plugins/heft-json-schema-typings-plugin/src/JsonSchemaTypingsGenerator.ts index f97ffbdbe85..8b0cadc7e23 100644 --- a/heft-plugins/heft-json-schema-typings-plugin/src/JsonSchemaTypingsGenerator.ts +++ b/heft-plugins/heft-json-schema-typings-plugin/src/JsonSchemaTypingsGenerator.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { type ITypingsGeneratorBaseOptions, TypingsGenerator } from '@rushstack/typings-generator'; +import path from 'node:path'; + import { compileFromFile } from 'json-schema-to-typescript'; -import path from 'path'; + +import { type ITypingsGeneratorBaseOptions, TypingsGenerator } from '@rushstack/typings-generator'; interface IJsonSchemaTypingsGeneratorBaseOptions extends ITypingsGeneratorBaseOptions {} diff --git a/heft-plugins/heft-lint-plugin/src/Eslint.ts b/heft-plugins/heft-lint-plugin/src/Eslint.ts index 30b7b7520ca..665e7c78e85 100644 --- a/heft-plugins/heft-lint-plugin/src/Eslint.ts +++ b/heft-plugins/heft-lint-plugin/src/Eslint.ts @@ -4,11 +4,13 @@ import path from 'node:path'; import { createHash, type Hash } from 'node:crypto'; import { performance } from 'node:perf_hooks'; + import type * as TTypescript from 'typescript'; import type * as TEslint from 'eslint'; import type * as TEslintLegacy from 'eslint-8'; import * as semver from 'semver'; import stableStringify from 'json-stable-stringify-without-jsonify'; + import { FileError, FileSystem } from '@rushstack/node-core-library'; import type { HeftConfiguration } from '@rushstack/heft'; diff --git a/heft-plugins/heft-lint-plugin/src/LintPlugin.ts b/heft-plugins/heft-lint-plugin/src/LintPlugin.ts index b0e72afb775..74a4e384d97 100644 --- a/heft-plugins/heft-lint-plugin/src/LintPlugin.ts +++ b/heft-plugins/heft-lint-plugin/src/LintPlugin.ts @@ -3,6 +3,8 @@ import path from 'node:path'; +import type * as TTypescript from 'typescript'; + import type { HeftConfiguration, IHeftTaskSession, @@ -17,8 +19,6 @@ import type { } from '@rushstack/heft-typescript-plugin'; import { AlreadyReportedError } from '@rushstack/node-core-library'; -import type * as TTypescript from 'typescript'; - import type { LinterBase } from './LinterBase'; import { Eslint } from './Eslint'; import { Tslint } from './Tslint'; diff --git a/heft-plugins/heft-lint-plugin/src/LinterBase.ts b/heft-plugins/heft-lint-plugin/src/LinterBase.ts index 4604f2359c3..1c981496008 100644 --- a/heft-plugins/heft-lint-plugin/src/LinterBase.ts +++ b/heft-plugins/heft-lint-plugin/src/LinterBase.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { performance } from 'perf_hooks'; -import { createHash, type Hash } from 'crypto'; +import * as path from 'node:path'; +import { performance } from 'node:perf_hooks'; +import { createHash, type Hash } from 'node:crypto'; + import { FileSystem, JsonFile, Path } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import type { IScopedLogger } from '@rushstack/heft'; diff --git a/heft-plugins/heft-lint-plugin/src/SarifFormatter.ts b/heft-plugins/heft-lint-plugin/src/SarifFormatter.ts index e0842cc35d2..1a55bfa2cc8 100644 --- a/heft-plugins/heft-lint-plugin/src/SarifFormatter.ts +++ b/heft-plugins/heft-lint-plugin/src/SarifFormatter.ts @@ -1,8 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + +import path from 'node:path'; + import type * as TEslint from 'eslint'; import type * as TEslintLegacy from 'eslint-8'; -import path from 'node:path'; + import { Path, Text } from '@rushstack/node-core-library'; export interface ISerifFormatterOptions { diff --git a/heft-plugins/heft-lint-plugin/src/Tslint.ts b/heft-plugins/heft-lint-plugin/src/Tslint.ts index 5e2f68770d7..4f90117c351 100644 --- a/heft-plugins/heft-lint-plugin/src/Tslint.ts +++ b/heft-plugins/heft-lint-plugin/src/Tslint.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as crypto from 'crypto'; +import * as path from 'node:path'; +import * as crypto from 'node:crypto'; + import type * as TTslint from 'tslint'; import type * as TTypescript from 'typescript'; + import { Import, JsonFile, FileError, FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import type { HeftConfiguration } from '@rushstack/heft'; diff --git a/heft-plugins/heft-lint-plugin/src/test/SarifFormatter.test.ts b/heft-plugins/heft-lint-plugin/src/test/SarifFormatter.test.ts index 1c15c944853..abae66cd8cd 100644 --- a/heft-plugins/heft-lint-plugin/src/test/SarifFormatter.test.ts +++ b/heft-plugins/heft-lint-plugin/src/test/SarifFormatter.test.ts @@ -1,5 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + import { formatEslintResultsAsSARIF } from '../SarifFormatter'; import type { ISerifFormatterOptions } from '../SarifFormatter'; import type { ESLint } from 'eslint'; diff --git a/heft-plugins/heft-sass-load-themed-styles-plugin/src/SassLoadThemedStylesPlugin.ts b/heft-plugins/heft-sass-load-themed-styles-plugin/src/SassLoadThemedStylesPlugin.ts index 145a9d2594f..0111e2580fa 100644 --- a/heft-plugins/heft-sass-load-themed-styles-plugin/src/SassLoadThemedStylesPlugin.ts +++ b/heft-plugins/heft-sass-load-themed-styles-plugin/src/SassLoadThemedStylesPlugin.ts @@ -3,7 +3,6 @@ import type { HeftConfiguration, IHeftTaskPlugin, IHeftTaskSession } from '@rushstack/heft'; import type { SassPluginName, ISassPluginAccessor } from '@rushstack/heft-sass-plugin'; - import { replaceTokensWithVariables } from '@microsoft/load-themed-styles'; const PLUGIN_NAME: 'sass-load-themed-styles-plugin' = 'sass-load-themed-styles-plugin'; diff --git a/heft-plugins/heft-sass-plugin/src/SassPlugin.ts b/heft-plugins/heft-sass-plugin/src/SassPlugin.ts index 16f2589420b..3525cbfa817 100644 --- a/heft-plugins/heft-sass-plugin/src/SassPlugin.ts +++ b/heft-plugins/heft-sass-plugin/src/SassPlugin.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. + import path from 'node:path'; import { AsyncSeriesWaterfallHook } from 'tapable'; + import type { HeftConfiguration, IHeftTaskSession, diff --git a/heft-plugins/heft-serverless-stack-plugin/src/ServerlessStackPlugin.ts b/heft-plugins/heft-serverless-stack-plugin/src/ServerlessStackPlugin.ts index 339e734ba14..3dd5368e47a 100644 --- a/heft-plugins/heft-serverless-stack-plugin/src/ServerlessStackPlugin.ts +++ b/heft-plugins/heft-serverless-stack-plugin/src/ServerlessStackPlugin.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as process from 'process'; -import * as child_process from 'child_process'; +import * as path from 'node:path'; +import * as process from 'node:process'; +import * as child_process from 'node:child_process'; + import type { CommandLineFlagParameter, CommandLineStringParameter, diff --git a/heft-plugins/heft-storybook-plugin/src/StorybookPlugin.ts b/heft-plugins/heft-storybook-plugin/src/StorybookPlugin.ts index b393b4da7a5..d5182c5c2a9 100644 --- a/heft-plugins/heft-storybook-plugin/src/StorybookPlugin.ts +++ b/heft-plugins/heft-storybook-plugin/src/StorybookPlugin.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as child_process from 'child_process'; -import * as path from 'path'; +import * as child_process from 'node:child_process'; +import * as path from 'node:path'; import { AlreadyExistsBehavior, diff --git a/heft-plugins/heft-typescript-plugin/src/TranspilerWorker.ts b/heft-plugins/heft-typescript-plugin/src/TranspilerWorker.ts index 0e873849b1a..9021218e3c5 100644 --- a/heft-plugins/heft-typescript-plugin/src/TranspilerWorker.ts +++ b/heft-plugins/heft-typescript-plugin/src/TranspilerWorker.ts @@ -4,6 +4,7 @@ import { parentPort, workerData } from 'node:worker_threads'; import type * as TTypescript from 'typescript'; + import type { ITranspilationErrorMessage, ITranspilationRequestMessage, diff --git a/heft-plugins/heft-typescript-plugin/src/TypeScriptBuilder.ts b/heft-plugins/heft-typescript-plugin/src/TypeScriptBuilder.ts index d72044277ec..a398242aafa 100644 --- a/heft-plugins/heft-typescript-plugin/src/TypeScriptBuilder.ts +++ b/heft-plugins/heft-typescript-plugin/src/TypeScriptBuilder.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as crypto from 'crypto'; -import * as path from 'path'; -import { Worker } from 'worker_threads'; +import * as crypto from 'node:crypto'; +import * as path from 'node:path'; +import { Worker } from 'node:worker_threads'; import type * as TTypescript from 'typescript'; + import { Path, FileError } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import type { HeftConfiguration, IScopedLogger } from '@rushstack/heft'; diff --git a/heft-plugins/heft-typescript-plugin/src/TypeScriptPlugin.ts b/heft-plugins/heft-typescript-plugin/src/TypeScriptPlugin.ts index 3d8f3edc5c5..d0e40e5edb9 100644 --- a/heft-plugins/heft-typescript-plugin/src/TypeScriptPlugin.ts +++ b/heft-plugins/heft-typescript-plugin/src/TypeScriptPlugin.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type * as TTypescript from 'typescript'; import { SyncHook } from 'tapable'; + import { FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import { ProjectConfigurationFile, InheritanceType, PathResolutionMethod } from '@rushstack/heft-config-file'; diff --git a/heft-plugins/heft-typescript-plugin/src/configureProgramForMultiEmit.ts b/heft-plugins/heft-typescript-plugin/src/configureProgramForMultiEmit.ts index 0e97090f1b2..a9fe703e7ec 100644 --- a/heft-plugins/heft-typescript-plugin/src/configureProgramForMultiEmit.ts +++ b/heft-plugins/heft-typescript-plugin/src/configureProgramForMultiEmit.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type * as TTypescript from 'typescript'; + import { InternalError } from '@rushstack/node-core-library'; import type { ExtendedTypeScript } from './internalTypings/TypeScriptInternals'; diff --git a/heft-plugins/heft-typescript-plugin/src/loadTypeScriptTool.ts b/heft-plugins/heft-typescript-plugin/src/loadTypeScriptTool.ts index 97f000191ab..5fb9ad86fb8 100644 --- a/heft-plugins/heft-typescript-plugin/src/loadTypeScriptTool.ts +++ b/heft-plugins/heft-typescript-plugin/src/loadTypeScriptTool.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import semver from 'semver'; + import type { HeftConfiguration } from '@rushstack/heft'; import type { ITerminal } from '@rushstack/terminal'; import { type IPackageJson, JsonFile, RealNodeModulePathResolver } from '@rushstack/node-core-library'; diff --git a/heft-plugins/heft-typescript-plugin/src/tsconfigLoader.ts b/heft-plugins/heft-typescript-plugin/src/tsconfigLoader.ts index f677c419135..3e3e3f94d46 100644 --- a/heft-plugins/heft-typescript-plugin/src/tsconfigLoader.ts +++ b/heft-plugins/heft-typescript-plugin/src/tsconfigLoader.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import path from 'node:path'; + import type * as TTypescript from 'typescript'; + import { Path } from '@rushstack/node-core-library'; import type { HeftConfiguration } from '@rushstack/heft'; diff --git a/heft-plugins/heft-webpack4-plugin/src/Webpack4Plugin.ts b/heft-plugins/heft-webpack4-plugin/src/Webpack4Plugin.ts index 272452a9d4e..644f585c8e8 100644 --- a/heft-plugins/heft-webpack4-plugin/src/Webpack4Plugin.ts +++ b/heft-plugins/heft-webpack4-plugin/src/Webpack4Plugin.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { AddressInfo } from 'net'; +import type { AddressInfo } from 'node:net'; + import type * as TWebpack from 'webpack'; import type TWebpackDevServer from 'webpack-dev-server'; import { AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, type SyncBailHook } from 'tapable'; + import { CertificateManager, type ICertificate } from '@rushstack/debug-certificate-manager'; import { InternalError, LegacyAdapters } from '@rushstack/node-core-library'; import type { diff --git a/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts b/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts index d4623f45831..cd1b0c36052 100644 --- a/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts +++ b/heft-plugins/heft-webpack4-plugin/src/WebpackConfigurationLoader.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type * as TWebpack from 'webpack'; + import { FileSystem } from '@rushstack/node-core-library'; import type { IHeftTaskSession, HeftConfiguration } from '@rushstack/heft'; diff --git a/heft-plugins/heft-webpack4-plugin/src/shared.ts b/heft-plugins/heft-webpack4-plugin/src/shared.ts index 9ec054efe3a..22589b3d54e 100644 --- a/heft-plugins/heft-webpack4-plugin/src/shared.ts +++ b/heft-plugins/heft-webpack4-plugin/src/shared.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +// eslint-disable-next-line import/order import type * as TWebpack from 'webpack'; // Compensate for webpack-dev-server referencing constructs from webpack 5 declare module 'webpack' { @@ -15,6 +16,7 @@ declare module 'webpack' { } import type { Configuration as WebpackDevServerConfiguration } from 'webpack-dev-server'; import type { AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook } from 'tapable'; + import type { IHeftTaskSession, HeftConfiguration } from '@rushstack/heft'; /** diff --git a/heft-plugins/heft-webpack5-plugin/src/Webpack5Plugin.ts b/heft-plugins/heft-webpack5-plugin/src/Webpack5Plugin.ts index 40f01da335e..5324c10e993 100644 --- a/heft-plugins/heft-webpack5-plugin/src/Webpack5Plugin.ts +++ b/heft-plugins/heft-webpack5-plugin/src/Webpack5Plugin.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { AddressInfo } from 'net'; +import type { AddressInfo } from 'node:net'; import type * as TWebpack from 'webpack'; import type TWebpackDevServer from 'webpack-dev-server'; diff --git a/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts b/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts index 6e64a379c3f..c8516cfbe1f 100644 --- a/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts +++ b/heft-plugins/heft-webpack5-plugin/src/WebpackConfigurationLoader.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type * as TWebpack from 'webpack'; + import { FileSystem } from '@rushstack/node-core-library'; import type { IHeftTaskSession, HeftConfiguration } from '@rushstack/heft'; diff --git a/heft-plugins/heft-webpack5-plugin/src/shared.ts b/heft-plugins/heft-webpack5-plugin/src/shared.ts index 7a002311158..def9c86ea17 100644 --- a/heft-plugins/heft-webpack5-plugin/src/shared.ts +++ b/heft-plugins/heft-webpack5-plugin/src/shared.ts @@ -9,6 +9,7 @@ import type { AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable'; + import type { IHeftTaskSession, HeftConfiguration } from '@rushstack/heft'; /** diff --git a/libraries/api-extractor-model/src/items/ApiDeclaredItem.ts b/libraries/api-extractor-model/src/items/ApiDeclaredItem.ts index c24dfa5908a..75d4e279f62 100644 --- a/libraries/api-extractor-model/src/items/ApiDeclaredItem.ts +++ b/libraries/api-extractor-model/src/items/ApiDeclaredItem.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiDocumentedItem, type IApiDocumentedItemJson, diff --git a/libraries/api-extractor-model/src/items/ApiDocumentedItem.ts b/libraries/api-extractor-model/src/items/ApiDocumentedItem.ts index a5edc7b8a08..126c0983afe 100644 --- a/libraries/api-extractor-model/src/items/ApiDocumentedItem.ts +++ b/libraries/api-extractor-model/src/items/ApiDocumentedItem.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as tsdoc from '@microsoft/tsdoc'; + import { ApiItem, type IApiItemOptions, type IApiItemJson } from './ApiItem'; import type { DeserializerContext } from '../model/DeserializerContext'; diff --git a/libraries/api-extractor-model/src/items/ApiItem.ts b/libraries/api-extractor-model/src/items/ApiItem.ts index 89722351c55..1eb7fb014c6 100644 --- a/libraries/api-extractor-model/src/items/ApiItem.ts +++ b/libraries/api-extractor-model/src/items/ApiItem.ts @@ -2,11 +2,12 @@ // See LICENSE in the project root for license information. import type { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; +import { InternalError } from '@rushstack/node-core-library'; + import type { Constructor, PropertiesOf } from '../mixins/Mixin'; import type { ApiPackage } from '../model/ApiPackage'; import { ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; import type { DeserializerContext } from '../model/DeserializerContext'; -import { InternalError } from '@rushstack/node-core-library'; import { ApiItemContainerMixin } from '../mixins/ApiItemContainerMixin'; import type { ApiModel } from '../model/ApiModel'; diff --git a/libraries/api-extractor-model/src/mixins/ApiExportedMixin.ts b/libraries/api-extractor-model/src/mixins/ApiExportedMixin.ts index 8aacbf466f9..13909545473 100644 --- a/libraries/api-extractor-model/src/mixins/ApiExportedMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiExportedMixin.ts @@ -4,6 +4,7 @@ /* eslint-disable @typescript-eslint/no-redeclare */ import { DeclarationReference, Navigation } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import type { ApiItem, IApiItemJson, IApiItemConstructor, IApiItemOptions } from '../items/ApiItem'; import type { DeserializerContext } from '../model/DeserializerContext'; diff --git a/libraries/api-extractor-model/src/mixins/ApiInitializerMixin.ts b/libraries/api-extractor-model/src/mixins/ApiInitializerMixin.ts index ff84f0ac979..ff25a29b020 100644 --- a/libraries/api-extractor-model/src/mixins/ApiInitializerMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiInitializerMixin.ts @@ -3,10 +3,11 @@ /* eslint-disable @typescript-eslint/no-redeclare */ +import { InternalError } from '@rushstack/node-core-library'; + import type { ApiItem, IApiItemJson, IApiItemConstructor, IApiItemOptions } from '../items/ApiItem'; import type { IExcerptTokenRange, Excerpt } from './Excerpt'; import { ApiDeclaredItem } from '../items/ApiDeclaredItem'; -import { InternalError } from '@rushstack/node-core-library'; import type { DeserializerContext } from '../model/DeserializerContext'; /** diff --git a/libraries/api-extractor-model/src/mixins/ApiItemContainerMixin.ts b/libraries/api-extractor-model/src/mixins/ApiItemContainerMixin.ts index cfbb29caef8..fa6adee67c8 100644 --- a/libraries/api-extractor-model/src/mixins/ApiItemContainerMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiItemContainerMixin.ts @@ -3,6 +3,9 @@ /* eslint-disable @typescript-eslint/no-redeclare */ +import { InternalError } from '@rushstack/node-core-library'; +import type { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItem, apiItem_onParentChanged, @@ -22,8 +25,6 @@ import { type IFindApiItemsMessage, FindApiItemsMessageId } from './IFindApiItemsResult'; -import { InternalError } from '@rushstack/node-core-library'; -import type { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; import type { HeritageType } from '../model/HeritageType'; import type { IResolveDeclarationReferenceResult } from '../model/ModelReferenceResolver'; diff --git a/libraries/api-extractor-model/src/mixins/ApiParameterListMixin.ts b/libraries/api-extractor-model/src/mixins/ApiParameterListMixin.ts index 67cb004f617..29d82f81bc1 100644 --- a/libraries/api-extractor-model/src/mixins/ApiParameterListMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiParameterListMixin.ts @@ -3,11 +3,12 @@ /* eslint-disable @typescript-eslint/no-redeclare */ +import { InternalError } from '@rushstack/node-core-library'; + import type { ApiItem, IApiItemJson, IApiItemConstructor, IApiItemOptions } from '../items/ApiItem'; import { Parameter } from '../model/Parameter'; import { ApiDeclaredItem } from '../items/ApiDeclaredItem'; import type { IExcerptTokenRange } from './Excerpt'; -import { InternalError } from '@rushstack/node-core-library'; import type { DeserializerContext } from '../model/DeserializerContext'; /** diff --git a/libraries/api-extractor-model/src/mixins/ApiReturnTypeMixin.ts b/libraries/api-extractor-model/src/mixins/ApiReturnTypeMixin.ts index d2ae94db0c6..754305ad1e1 100644 --- a/libraries/api-extractor-model/src/mixins/ApiReturnTypeMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiReturnTypeMixin.ts @@ -3,10 +3,11 @@ /* eslint-disable @typescript-eslint/no-redeclare */ +import { InternalError } from '@rushstack/node-core-library'; + import type { ApiItem, IApiItemJson, IApiItemConstructor, IApiItemOptions } from '../items/ApiItem'; import type { IExcerptTokenRange, Excerpt } from './Excerpt'; import { ApiDeclaredItem } from '../items/ApiDeclaredItem'; -import { InternalError } from '@rushstack/node-core-library'; import type { DeserializerContext } from '../model/DeserializerContext'; /** diff --git a/libraries/api-extractor-model/src/mixins/ApiTypeParameterListMixin.ts b/libraries/api-extractor-model/src/mixins/ApiTypeParameterListMixin.ts index 6ee3eb1ed95..9af4943bb6e 100644 --- a/libraries/api-extractor-model/src/mixins/ApiTypeParameterListMixin.ts +++ b/libraries/api-extractor-model/src/mixins/ApiTypeParameterListMixin.ts @@ -3,10 +3,11 @@ /* eslint-disable @typescript-eslint/no-redeclare */ +import { InternalError } from '@rushstack/node-core-library'; + import type { ApiItem, IApiItemJson, IApiItemConstructor, IApiItemOptions } from '../items/ApiItem'; import type { Excerpt, IExcerptTokenRange } from './Excerpt'; import { TypeParameter } from '../model/TypeParameter'; -import { InternalError } from '@rushstack/node-core-library'; import { ApiDeclaredItem } from '../items/ApiDeclaredItem'; import type { DeserializerContext } from '../model/DeserializerContext'; diff --git a/libraries/api-extractor-model/src/model/ApiCallSignature.ts b/libraries/api-extractor-model/src/model/ApiCallSignature.ts index 6cf16c0b909..738fdec23fe 100644 --- a/libraries/api-extractor-model/src/model/ApiCallSignature.ts +++ b/libraries/api-extractor-model/src/model/ApiCallSignature.ts @@ -6,6 +6,7 @@ import { Meaning, Navigation } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; import { type IApiParameterListMixinOptions, ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiClass.ts b/libraries/api-extractor-model/src/model/ApiClass.ts index 9b854474b2b..90ea079f0f4 100644 --- a/libraries/api-extractor-model/src/model/ApiClass.ts +++ b/libraries/api-extractor-model/src/model/ApiClass.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiDeclaredItem, diff --git a/libraries/api-extractor-model/src/model/ApiConstructSignature.ts b/libraries/api-extractor-model/src/model/ApiConstructSignature.ts index 69a738db755..707b155ef5f 100644 --- a/libraries/api-extractor-model/src/model/ApiConstructSignature.ts +++ b/libraries/api-extractor-model/src/model/ApiConstructSignature.ts @@ -6,6 +6,7 @@ import { Meaning, Navigation } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; import { type IApiParameterListMixinOptions, ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiConstructor.ts b/libraries/api-extractor-model/src/model/ApiConstructor.ts index 412c6a29f92..2ff037a9329 100644 --- a/libraries/api-extractor-model/src/model/ApiConstructor.ts +++ b/libraries/api-extractor-model/src/model/ApiConstructor.ts @@ -6,6 +6,7 @@ import { Meaning, Navigation } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; import { type IApiParameterListMixinOptions, ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiEntryPoint.ts b/libraries/api-extractor-model/src/model/ApiEntryPoint.ts index b9509ec59cb..4d03a35fdd5 100644 --- a/libraries/api-extractor-model/src/model/ApiEntryPoint.ts +++ b/libraries/api-extractor-model/src/model/ApiEntryPoint.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItem, ApiItemKind } from '../items/ApiItem'; import { ApiItemContainerMixin, type IApiItemContainerMixinOptions } from '../mixins/ApiItemContainerMixin'; import { type IApiNameMixinOptions, ApiNameMixin } from '../mixins/ApiNameMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiEnum.ts b/libraries/api-extractor-model/src/model/ApiEnum.ts index 0d075bf3f98..23528c219bd 100644 --- a/libraries/api-extractor-model/src/model/ApiEnum.ts +++ b/libraries/api-extractor-model/src/model/ApiEnum.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiDeclaredItem, type IApiDeclaredItemOptions } from '../items/ApiDeclaredItem'; import { ApiReleaseTagMixin, type IApiReleaseTagMixinOptions } from '../mixins/ApiReleaseTagMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiEnumMember.ts b/libraries/api-extractor-model/src/model/ApiEnumMember.ts index cd7d4bae353..2c95578cf47 100644 --- a/libraries/api-extractor-model/src/model/ApiEnumMember.ts +++ b/libraries/api-extractor-model/src/model/ApiEnumMember.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiDeclaredItem, type IApiDeclaredItemOptions } from '../items/ApiDeclaredItem'; import { ApiReleaseTagMixin, type IApiReleaseTagMixinOptions } from '../mixins/ApiReleaseTagMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiFunction.ts b/libraries/api-extractor-model/src/model/ApiFunction.ts index 1b6d1e0043a..39a10cacdab 100644 --- a/libraries/api-extractor-model/src/model/ApiFunction.ts +++ b/libraries/api-extractor-model/src/model/ApiFunction.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; import { type IApiParameterListMixinOptions, ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiIndexSignature.ts b/libraries/api-extractor-model/src/model/ApiIndexSignature.ts index c131ab789a6..4a2d2f9092a 100644 --- a/libraries/api-extractor-model/src/model/ApiIndexSignature.ts +++ b/libraries/api-extractor-model/src/model/ApiIndexSignature.ts @@ -6,6 +6,7 @@ import { Meaning, Navigation } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; import { type IApiParameterListMixinOptions, ApiParameterListMixin } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiInterface.ts b/libraries/api-extractor-model/src/model/ApiInterface.ts index 66d3eb5077e..aa8cdd7083d 100644 --- a/libraries/api-extractor-model/src/model/ApiInterface.ts +++ b/libraries/api-extractor-model/src/model/ApiInterface.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiItemContainerMixin, diff --git a/libraries/api-extractor-model/src/model/ApiMethod.ts b/libraries/api-extractor-model/src/model/ApiMethod.ts index a0ec885d902..88816d09389 100644 --- a/libraries/api-extractor-model/src/model/ApiMethod.ts +++ b/libraries/api-extractor-model/src/model/ApiMethod.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiProtectedMixin, type IApiProtectedMixinOptions } from '../mixins/ApiProtectedMixin'; import { ApiStaticMixin, type IApiStaticMixinOptions } from '../mixins/ApiStaticMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiMethodSignature.ts b/libraries/api-extractor-model/src/model/ApiMethodSignature.ts index d1cc81b6928..b69d9649a4e 100644 --- a/libraries/api-extractor-model/src/model/ApiMethodSignature.ts +++ b/libraries/api-extractor-model/src/model/ApiMethodSignature.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiDeclaredItem, type IApiDeclaredItemOptions } from '../items/ApiDeclaredItem'; import { ApiParameterListMixin, type IApiParameterListMixinOptions } from '../mixins/ApiParameterListMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiModel.ts b/libraries/api-extractor-model/src/model/ApiModel.ts index 674783d080f..ef60535ffb5 100644 --- a/libraries/api-extractor-model/src/model/ApiModel.ts +++ b/libraries/api-extractor-model/src/model/ApiModel.ts @@ -2,12 +2,13 @@ // See LICENSE in the project root for license information. import { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; +import { PackageName } from '@rushstack/node-core-library'; +import { DocDeclarationReference } from '@microsoft/tsdoc'; + import { ApiItem, ApiItemKind } from '../items/ApiItem'; import { ApiItemContainerMixin } from '../mixins/ApiItemContainerMixin'; import { ApiPackage } from './ApiPackage'; -import { PackageName } from '@rushstack/node-core-library'; import { ModelReferenceResolver, type IResolveDeclarationReferenceResult } from './ModelReferenceResolver'; -import { DocDeclarationReference } from '@microsoft/tsdoc'; /** * A serializable representation of a collection of API declarations. diff --git a/libraries/api-extractor-model/src/model/ApiNamespace.ts b/libraries/api-extractor-model/src/model/ApiNamespace.ts index 5a47381ff69..22cb9545cd1 100644 --- a/libraries/api-extractor-model/src/model/ApiNamespace.ts +++ b/libraries/api-extractor-model/src/model/ApiNamespace.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiItemContainerMixin, type IApiItemContainerMixinOptions } from '../mixins/ApiItemContainerMixin'; import { type IApiDeclaredItemOptions, ApiDeclaredItem } from '../items/ApiDeclaredItem'; diff --git a/libraries/api-extractor-model/src/model/ApiPackage.ts b/libraries/api-extractor-model/src/model/ApiPackage.ts index fb557e52f6e..0a28b932933 100644 --- a/libraries/api-extractor-model/src/model/ApiPackage.ts +++ b/libraries/api-extractor-model/src/model/ApiPackage.ts @@ -2,8 +2,6 @@ // See LICENSE in the project root for license information. import { DeclarationReference } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; -import { ApiItem, ApiItemKind, type IApiItemJson } from '../items/ApiItem'; -import { ApiItemContainerMixin, type IApiItemContainerMixinOptions } from '../mixins/ApiItemContainerMixin'; import { JsonFile, type IJsonFileSaveOptions, @@ -11,12 +9,15 @@ import { type IPackageJson, type JsonObject } from '@rushstack/node-core-library'; +import { TSDocConfiguration } from '@microsoft/tsdoc'; +import { TSDocConfigFile } from '@microsoft/tsdoc-config'; + +import { ApiItem, ApiItemKind, type IApiItemJson } from '../items/ApiItem'; +import { ApiItemContainerMixin, type IApiItemContainerMixinOptions } from '../mixins/ApiItemContainerMixin'; import { ApiDocumentedItem, type IApiDocumentedItemOptions } from '../items/ApiDocumentedItem'; import type { ApiEntryPoint } from './ApiEntryPoint'; import { type IApiNameMixinOptions, ApiNameMixin } from '../mixins/ApiNameMixin'; import { DeserializerContext, ApiJsonSchemaVersion } from './DeserializerContext'; -import { TSDocConfiguration } from '@microsoft/tsdoc'; -import { TSDocConfigFile } from '@microsoft/tsdoc-config'; /** * Constructor options for {@link ApiPackage}. diff --git a/libraries/api-extractor-model/src/model/ApiProperty.ts b/libraries/api-extractor-model/src/model/ApiProperty.ts index 7af22584d9c..e7a46f8ed4f 100644 --- a/libraries/api-extractor-model/src/model/ApiProperty.ts +++ b/libraries/api-extractor-model/src/model/ApiProperty.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiAbstractMixin, type IApiAbstractMixinOptions } from '../mixins/ApiAbstractMixin'; import { ApiProtectedMixin, type IApiProtectedMixinOptions } from '../mixins/ApiProtectedMixin'; diff --git a/libraries/api-extractor-model/src/model/ApiPropertySignature.ts b/libraries/api-extractor-model/src/model/ApiPropertySignature.ts index 7050a6a49fd..490b19b2ae9 100644 --- a/libraries/api-extractor-model/src/model/ApiPropertySignature.ts +++ b/libraries/api-extractor-model/src/model/ApiPropertySignature.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiPropertyItem, type IApiPropertyItemOptions } from '../items/ApiPropertyItem'; diff --git a/libraries/api-extractor-model/src/model/ApiTypeAlias.ts b/libraries/api-extractor-model/src/model/ApiTypeAlias.ts index b0e7e48f785..db46b4e6740 100644 --- a/libraries/api-extractor-model/src/model/ApiTypeAlias.ts +++ b/libraries/api-extractor-model/src/model/ApiTypeAlias.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import type { Excerpt, IExcerptTokenRange } from '../mixins/Excerpt'; import { ApiItemKind } from '../items/ApiItem'; import { diff --git a/libraries/api-extractor-model/src/model/ApiVariable.ts b/libraries/api-extractor-model/src/model/ApiVariable.ts index 74514780290..d49c3ea738f 100644 --- a/libraries/api-extractor-model/src/model/ApiVariable.ts +++ b/libraries/api-extractor-model/src/model/ApiVariable.ts @@ -7,6 +7,7 @@ import { Navigation, type Component } from '@microsoft/tsdoc/lib-commonjs/beta/DeclarationReference'; + import { ApiItemKind } from '../items/ApiItem'; import { ApiDeclaredItem, diff --git a/libraries/api-extractor-model/src/model/ModelReferenceResolver.ts b/libraries/api-extractor-model/src/model/ModelReferenceResolver.ts index 6b62b8f4369..e8282dedaab 100644 --- a/libraries/api-extractor-model/src/model/ModelReferenceResolver.ts +++ b/libraries/api-extractor-model/src/model/ModelReferenceResolver.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { type DocDeclarationReference, type DocMemberSelector, SelectorKind } from '@microsoft/tsdoc'; + import { type ApiItem, ApiItemKind } from '../items/ApiItem'; import type { ApiModel } from './ApiModel'; import type { ApiPackage } from './ApiPackage'; diff --git a/libraries/api-extractor-model/src/model/SourceLocation.ts b/libraries/api-extractor-model/src/model/SourceLocation.ts index c6e9f641a37..4d92a07c66c 100644 --- a/libraries/api-extractor-model/src/model/SourceLocation.ts +++ b/libraries/api-extractor-model/src/model/SourceLocation.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { URL } from 'url'; +import { URL } from 'node:url'; /** * Constructor options for `SourceLocation`. diff --git a/libraries/debug-certificate-manager/src/CertificateManager.ts b/libraries/debug-certificate-manager/src/CertificateManager.ts index 58d1301c156..4cfa1bef29b 100644 --- a/libraries/debug-certificate-manager/src/CertificateManager.ts +++ b/libraries/debug-certificate-manager/src/CertificateManager.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { pki } from 'node-forge'; import * as path from 'node:path'; import { EOL } from 'node:os'; + +import type { pki } from 'node-forge'; + import { FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/libraries/debug-certificate-manager/src/CertificateStore.ts b/libraries/debug-certificate-manager/src/CertificateStore.ts index ebc8728f709..4f3ff73d1fa 100644 --- a/libraries/debug-certificate-manager/src/CertificateStore.ts +++ b/libraries/debug-certificate-manager/src/CertificateStore.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { homedir } from 'os'; +import * as path from 'node:path'; +import { homedir } from 'node:os'; import { FileSystem } from '@rushstack/node-core-library'; diff --git a/libraries/debug-certificate-manager/src/runCommand.ts b/libraries/debug-certificate-manager/src/runCommand.ts index b2a06e04eab..e2febdb653a 100644 --- a/libraries/debug-certificate-manager/src/runCommand.ts +++ b/libraries/debug-certificate-manager/src/runCommand.ts @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Executable, FileSystem, Text } from '@rushstack/node-core-library'; -import type { ITerminal } from '@rushstack/terminal'; import type * as child_process from 'node:child_process'; import * as path from 'node:path'; import * as os from 'node:os'; +import type { ITerminal } from '@rushstack/terminal'; +import { Executable, FileSystem, Text } from '@rushstack/node-core-library'; + export interface IRunResult { stdout: string[]; stderr: string[]; diff --git a/libraries/heft-config-file/src/ConfigurationFileBase.ts b/libraries/heft-config-file/src/ConfigurationFileBase.ts index 4e16bd86bd7..d21e0c0d476 100644 --- a/libraries/heft-config-file/src/ConfigurationFileBase.ts +++ b/libraries/heft-config-file/src/ConfigurationFileBase.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as nodeJsPath from 'path'; +import * as nodeJsPath from 'node:path'; + import { JSONPath } from 'jsonpath-plus'; -import { JsonSchema, JsonFile, Import, FileSystem } from '@rushstack/node-core-library'; import structuredClone from '@ungap/structured-clone'; + +import { JsonSchema, JsonFile, Import, FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; interface IConfigurationJson { diff --git a/libraries/heft-config-file/src/ProjectConfigurationFile.ts b/libraries/heft-config-file/src/ProjectConfigurationFile.ts index 6b93d262722..4ccbb659db7 100644 --- a/libraries/heft-config-file/src/ProjectConfigurationFile.ts +++ b/libraries/heft-config-file/src/ProjectConfigurationFile.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as nodeJsPath from 'path'; +import * as nodeJsPath from 'node:path'; + import { FileSystem, PackageJsonLookup } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import type { IRigConfig } from '@rushstack/rig-package'; diff --git a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts index 9b519beab09..12e130d11ec 100644 --- a/libraries/heft-config-file/src/test/ConfigurationFile.test.ts +++ b/libraries/heft-config-file/src/test/ConfigurationFile.test.ts @@ -3,7 +3,7 @@ /* eslint-disable max-lines */ -import * as nodeJsPath from 'path'; +import * as nodeJsPath from 'node:path'; import { FileSystem, JsonFile, Path, Text } from '@rushstack/node-core-library'; import { StringBufferTerminalProvider, Terminal } from '@rushstack/terminal'; import { RigConfig } from '@rushstack/rig-package'; diff --git a/libraries/localization-utilities/src/Pseudolocalization.ts b/libraries/localization-utilities/src/Pseudolocalization.ts index 0b990412f8f..af6cc69161a 100644 --- a/libraries/localization-utilities/src/Pseudolocalization.ts +++ b/libraries/localization-utilities/src/Pseudolocalization.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import vm from 'vm'; +import vm from 'node:vm'; + import { FileSystem } from '@rushstack/node-core-library'; import type { IPseudolocaleOptions } from './interfaces'; diff --git a/libraries/localization-utilities/src/parsers/parseResx.ts b/libraries/localization-utilities/src/parsers/parseResx.ts index 2b06cda65df..d7f72d4a012 100644 --- a/libraries/localization-utilities/src/parsers/parseResx.ts +++ b/libraries/localization-utilities/src/parsers/parseResx.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { XmlDocument, type XmlElement } from 'xmldoc'; + import { Text, type NewlineKind } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import { XmlDocument, type XmlElement } from 'xmldoc'; import type { ILocalizedString, ILocalizationFile, IParseFileOptions } from '../interfaces'; diff --git a/libraries/module-minifier/src/LocalMinifier.ts b/libraries/module-minifier/src/LocalMinifier.ts index 2c624fdec53..9f64006cc0f 100644 --- a/libraries/module-minifier/src/LocalMinifier.ts +++ b/libraries/module-minifier/src/LocalMinifier.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; + import serialize from 'serialize-javascript'; import type { MinifyOptions } from 'terser'; diff --git a/libraries/module-minifier/src/MessagePortMinifier.ts b/libraries/module-minifier/src/MessagePortMinifier.ts index 4b7fb6a8ae7..45259e90665 100644 --- a/libraries/module-minifier/src/MessagePortMinifier.ts +++ b/libraries/module-minifier/src/MessagePortMinifier.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { once } from 'events'; -import type * as WorkerThreads from 'worker_threads'; +import { once } from 'node:events'; +import type * as WorkerThreads from 'node:worker_threads'; import type { IMinifierConnection, diff --git a/libraries/module-minifier/src/MinifierWorker.ts b/libraries/module-minifier/src/MinifierWorker.ts index 6c3619471c9..6eea649283f 100644 --- a/libraries/module-minifier/src/MinifierWorker.ts +++ b/libraries/module-minifier/src/MinifierWorker.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { parentPort, workerData } from 'node:worker_threads'; + import type { MinifyOptions } from 'terser'; -import { parentPort, workerData } from 'worker_threads'; import { minifySingleFileAsync } from './MinifySingleFile'; import type { IModuleMinificationRequest, IModuleMinificationResult } from './types'; diff --git a/libraries/module-minifier/src/WorkerPoolMinifier.ts b/libraries/module-minifier/src/WorkerPoolMinifier.ts index 7dee034a867..4a81fbc75a0 100644 --- a/libraries/module-minifier/src/WorkerPoolMinifier.ts +++ b/libraries/module-minifier/src/WorkerPoolMinifier.ts @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { createHash } from 'crypto'; -import os from 'os'; -import type { ResourceLimits } from 'worker_threads'; +import { createHash } from 'node:crypto'; +import os from 'node:os'; +import type { ResourceLimits } from 'node:worker_threads'; import serialize from 'serialize-javascript'; import type { MinifyOptions } from 'terser'; + import { WorkerPool } from '@rushstack/worker-pool'; import type { diff --git a/libraries/node-core-library/src/EnvironmentMap.ts b/libraries/node-core-library/src/EnvironmentMap.ts index 716ee43ffee..c672f1be36b 100644 --- a/libraries/node-core-library/src/EnvironmentMap.ts +++ b/libraries/node-core-library/src/EnvironmentMap.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import process from 'process'; +import process from 'node:process'; + import { InternalError } from './InternalError'; /** diff --git a/libraries/node-core-library/src/Executable.ts b/libraries/node-core-library/src/Executable.ts index abd2efb083a..1d85b97e82c 100644 --- a/libraries/node-core-library/src/Executable.ts +++ b/libraries/node-core-library/src/Executable.ts @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as child_process from 'child_process'; -import * as path from 'path'; -import { EnvironmentMap } from './EnvironmentMap'; +import * as os from 'node:os'; +import * as child_process from 'node:child_process'; +import * as path from 'node:path'; +import { EnvironmentMap } from './EnvironmentMap'; import { FileSystem } from './FileSystem'; import { PosixModeBits } from './PosixModeBits'; import { Text } from './Text'; diff --git a/libraries/node-core-library/src/FileError.ts b/libraries/node-core-library/src/FileError.ts index 4e92d214c8a..32fac1b5742 100644 --- a/libraries/node-core-library/src/FileError.ts +++ b/libraries/node-core-library/src/FileError.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IProblemPattern } from '@rushstack/problem-matcher'; + import { type FileLocationStyle, Path } from './Path'; import { TypeUuid } from './TypeUuid'; diff --git a/libraries/node-core-library/src/FileSystem.ts b/libraries/node-core-library/src/FileSystem.ts index 8624350dc84..da107dd1604 100644 --- a/libraries/node-core-library/src/FileSystem.ts +++ b/libraries/node-core-library/src/FileSystem.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as nodeJsPath from 'path'; -import * as fs from 'fs'; -import * as fsPromises from 'fs/promises'; +import * as nodeJsPath from 'node:path'; +import * as fs from 'node:fs'; +import * as fsPromises from 'node:fs/promises'; + import * as fsx from 'fs-extra'; import { Text, type NewlineKind, Encoding } from './Text'; diff --git a/libraries/node-core-library/src/Import.ts b/libraries/node-core-library/src/Import.ts index cfb8aaf6140..c794fc8500f 100644 --- a/libraries/node-core-library/src/Import.ts +++ b/libraries/node-core-library/src/Import.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; +import nodeModule = require('module'); + import importLazy = require('import-lazy'); import * as Resolve from 'resolve'; -import nodeModule = require('module'); import { PackageJsonLookup } from './PackageJsonLookup'; import { FileSystem } from './FileSystem'; diff --git a/libraries/node-core-library/src/JsonFile.ts b/libraries/node-core-library/src/JsonFile.ts index e396de08131..21f55b6fc2c 100644 --- a/libraries/node-core-library/src/JsonFile.ts +++ b/libraries/node-core-library/src/JsonFile.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; + import * as jju from 'jju'; import type { JsonSchema, IJsonSchemaErrorInfo, IJsonSchemaValidateOptions } from './JsonSchema'; diff --git a/libraries/node-core-library/src/JsonSchema.ts b/libraries/node-core-library/src/JsonSchema.ts index dcbe8e81052..2ca3f227190 100644 --- a/libraries/node-core-library/src/JsonSchema.ts +++ b/libraries/node-core-library/src/JsonSchema.ts @@ -1,16 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; - -import { FileSystem } from './FileSystem'; -import { JsonFile, type JsonObject } from './JsonFile'; +import * as os from 'node:os'; +import * as path from 'node:path'; import Ajv, { type Options as AjvOptions, type ErrorObject, type ValidateFunction } from 'ajv'; import AjvDraft04 from 'ajv-draft-04'; import addFormats from 'ajv-formats'; +import { JsonFile, type JsonObject } from './JsonFile'; +import { FileSystem } from './FileSystem'; + interface ISchemaWithId { // draft-04 uses "id" id: string | undefined; diff --git a/libraries/node-core-library/src/LockFile.ts b/libraries/node-core-library/src/LockFile.ts index 6b73339c8eb..5753ccfdd67 100644 --- a/libraries/node-core-library/src/LockFile.ts +++ b/libraries/node-core-library/src/LockFile.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as child_process from 'child_process'; +import * as path from 'node:path'; +import * as child_process from 'node:child_process'; + import { FileSystem } from './FileSystem'; import { FileWriter } from './FileWriter'; import { Async } from './Async'; diff --git a/libraries/node-core-library/src/PackageJsonLookup.ts b/libraries/node-core-library/src/PackageJsonLookup.ts index ce676d36de5..dc9e3f6853b 100644 --- a/libraries/node-core-library/src/PackageJsonLookup.ts +++ b/libraries/node-core-library/src/PackageJsonLookup.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { JsonFile } from './JsonFile'; import type { IPackageJson, INodePackageJson } from './IPackageJson'; import { FileConstants } from './Constants'; diff --git a/libraries/node-core-library/src/Path.ts b/libraries/node-core-library/src/Path.ts index 6ebcb907795..c6f0a2db1ea 100644 --- a/libraries/node-core-library/src/Path.ts +++ b/libraries/node-core-library/src/Path.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; /** * The format that the FileError message should conform to. The supported formats are: diff --git a/libraries/node-core-library/src/RealNodeModulePath.ts b/libraries/node-core-library/src/RealNodeModulePath.ts index 574759230f8..dc4c74ac345 100644 --- a/libraries/node-core-library/src/RealNodeModulePath.ts +++ b/libraries/node-core-library/src/RealNodeModulePath.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as nodeFs from 'fs'; -import * as nodePath from 'path'; +import * as nodeFs from 'node:fs'; +import * as nodePath from 'node:path'; /** * Arguments used to create a function that resolves symlinked node_modules in a path diff --git a/libraries/node-core-library/src/SubprocessTerminator.ts b/libraries/node-core-library/src/SubprocessTerminator.ts index 12e2185a0d0..0c256e6c7ba 100644 --- a/libraries/node-core-library/src/SubprocessTerminator.ts +++ b/libraries/node-core-library/src/SubprocessTerminator.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as child_process from 'child_process'; -import process from 'process'; +import type * as child_process from 'node:child_process'; +import process from 'node:process'; import { Executable } from './Executable'; diff --git a/libraries/node-core-library/src/Text.ts b/libraries/node-core-library/src/Text.ts index 1737087604a..4630a9328d8 100644 --- a/libraries/node-core-library/src/Text.ts +++ b/libraries/node-core-library/src/Text.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; /** * The allowed types of encodings, as supported by Node.js diff --git a/libraries/node-core-library/src/test/EnvironmentMap.test.ts b/libraries/node-core-library/src/test/EnvironmentMap.test.ts index 3e8999400e4..be51e8163b4 100644 --- a/libraries/node-core-library/src/test/EnvironmentMap.test.ts +++ b/libraries/node-core-library/src/test/EnvironmentMap.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import process from 'process'; +import process from 'node:process'; import { EnvironmentMap } from '../EnvironmentMap'; diff --git a/libraries/node-core-library/src/test/Executable.test.ts b/libraries/node-core-library/src/test/Executable.test.ts index a44056e726d..d7a2b0ced81 100644 --- a/libraries/node-core-library/src/test/Executable.test.ts +++ b/libraries/node-core-library/src/test/Executable.test.ts @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; -import type * as child_process from 'child_process'; -import { once } from 'events'; +import * as os from 'node:os'; +import * as path from 'node:path'; +import type * as child_process from 'node:child_process'; +import { once } from 'node:events'; import { Executable, @@ -17,7 +17,7 @@ import { import { FileSystem } from '../FileSystem'; import { PosixModeBits } from '../PosixModeBits'; import { Text } from '../Text'; -import { Readable } from 'stream'; +import { Readable } from 'node:stream'; describe('Executable process tests', () => { // The PosixModeBits are intended to be used with bitwise operations. diff --git a/libraries/node-core-library/src/test/FileError.test.ts b/libraries/node-core-library/src/test/FileError.test.ts index 425df02ffb8..03887d624fd 100644 --- a/libraries/node-core-library/src/test/FileError.test.ts +++ b/libraries/node-core-library/src/test/FileError.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileError } from '../FileError'; import type { FileLocationStyle } from '../Path'; diff --git a/libraries/node-core-library/src/test/Import.test.ts b/libraries/node-core-library/src/test/Import.test.ts index 75414ebe3ab..c58420be51e 100644 --- a/libraries/node-core-library/src/test/Import.test.ts +++ b/libraries/node-core-library/src/test/Import.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as nodeJsPath from 'path'; +import * as nodeJsPath from 'node:path'; import { Import } from '../Import'; import { PackageJsonLookup } from '../PackageJsonLookup'; import { Path } from '../Path'; diff --git a/libraries/node-core-library/src/test/LockFile.test.ts b/libraries/node-core-library/src/test/LockFile.test.ts index f2ac754e064..ea927795713 100644 --- a/libraries/node-core-library/src/test/LockFile.test.ts +++ b/libraries/node-core-library/src/test/LockFile.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { LockFile, getProcessStartTime, getProcessStartTimeFromProcStat } from '../LockFile'; import { FileSystem } from '../FileSystem'; import { FileWriter } from '../FileWriter'; diff --git a/libraries/node-core-library/src/test/PackageJsonLookup.test.ts b/libraries/node-core-library/src/test/PackageJsonLookup.test.ts index fbbe852858d..81ffc038dcd 100644 --- a/libraries/node-core-library/src/test/PackageJsonLookup.test.ts +++ b/libraries/node-core-library/src/test/PackageJsonLookup.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { PackageJsonLookup } from '../PackageJsonLookup'; import type { IPackageJson, INodePackageJson } from '../IPackageJson'; import { FileConstants } from '../Constants'; diff --git a/libraries/node-core-library/src/test/Path.test.ts b/libraries/node-core-library/src/test/Path.test.ts index e3ac3587120..eb79424d6de 100644 --- a/libraries/node-core-library/src/test/Path.test.ts +++ b/libraries/node-core-library/src/test/Path.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { Path } from '../Path'; describe(Path.name, () => { diff --git a/libraries/node-core-library/src/test/RealNodeModulePath.test.ts b/libraries/node-core-library/src/test/RealNodeModulePath.test.ts index ad2dfb242e5..b7e60e77e8d 100644 --- a/libraries/node-core-library/src/test/RealNodeModulePath.test.ts +++ b/libraries/node-core-library/src/test/RealNodeModulePath.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as fs from 'fs'; -import * as path from 'path'; +import type * as fs from 'node:fs'; +import * as path from 'node:path'; import { type IRealNodeModulePathResolverOptions, RealNodeModulePathResolver } from '../RealNodeModulePath'; diff --git a/libraries/node-core-library/src/test/writeBuffersToFile.test.ts b/libraries/node-core-library/src/test/writeBuffersToFile.test.ts index df7c91cd35c..9e3c8bf086a 100644 --- a/libraries/node-core-library/src/test/writeBuffersToFile.test.ts +++ b/libraries/node-core-library/src/test/writeBuffersToFile.test.ts @@ -18,7 +18,7 @@ jest.mock('fs-extra', () => { writevSync }; }); -jest.mock('fs/promises', () => { +jest.mock('node:fs/promises', () => { return { open: openHandle }; diff --git a/libraries/operation-graph/src/IOperationRunner.ts b/libraries/operation-graph/src/IOperationRunner.ts index eb803b8abb0..4f66f332d1b 100644 --- a/libraries/operation-graph/src/IOperationRunner.ts +++ b/libraries/operation-graph/src/IOperationRunner.ts @@ -1,9 +1,8 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. +// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. import type { OperationStatus } from './OperationStatus'; import type { OperationError } from './OperationError'; - import type { Stopwatch } from './Stopwatch'; /** diff --git a/libraries/package-deps-hash/src/getPackageDeps.ts b/libraries/package-deps-hash/src/getPackageDeps.ts index 6811f83c6cc..a284af5600a 100644 --- a/libraries/package-deps-hash/src/getPackageDeps.ts +++ b/libraries/package-deps-hash/src/getPackageDeps.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as child_process from 'child_process'; -import * as path from 'path'; +import type * as child_process from 'node:child_process'; +import * as path from 'node:path'; + import { Executable } from '@rushstack/node-core-library'; import { ensureGitMinimumVersion } from './getRepoState'; diff --git a/libraries/package-deps-hash/src/getRepoState.ts b/libraries/package-deps-hash/src/getRepoState.ts index e932833e491..db21877b78d 100644 --- a/libraries/package-deps-hash/src/getRepoState.ts +++ b/libraries/package-deps-hash/src/getRepoState.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as child_process from 'child_process'; -import { once } from 'events'; -import { Readable, pipeline } from 'stream'; +import type * as child_process from 'node:child_process'; +import { once } from 'node:events'; +import { Readable, pipeline } from 'node:stream'; import { Executable, FileSystem, type IExecutableSpawnOptions } from '@rushstack/node-core-library'; diff --git a/libraries/package-deps-hash/src/test/getPackageDeps.test.ts b/libraries/package-deps-hash/src/test/getPackageDeps.test.ts index 264131a0fc4..adae400ab4b 100644 --- a/libraries/package-deps-hash/src/test/getPackageDeps.test.ts +++ b/libraries/package-deps-hash/src/test/getPackageDeps.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { execSync } from 'child_process'; +import * as path from 'node:path'; +import { execSync } from 'node:child_process'; import { getPackageDeps, parseGitLsTree, parseGitFilename } from '../getPackageDeps'; diff --git a/libraries/package-deps-hash/src/test/getRepoDeps.test.ts b/libraries/package-deps-hash/src/test/getRepoDeps.test.ts index d81ad662e5f..63325761544 100644 --- a/libraries/package-deps-hash/src/test/getRepoDeps.test.ts +++ b/libraries/package-deps-hash/src/test/getRepoDeps.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import { execSync } from 'child_process'; +import * as path from 'node:path'; +import { execSync } from 'node:child_process'; import { getDetailedRepoStateAsync, diff --git a/libraries/package-extractor/src/ArchiveManager.ts b/libraries/package-extractor/src/ArchiveManager.ts index 2bc90ec60c6..a463fbe45af 100644 --- a/libraries/package-extractor/src/ArchiveManager.ts +++ b/libraries/package-extractor/src/ArchiveManager.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import JSZip from 'jszip'; + import { FileSystem, type FileSystemStats, Path } from '@rushstack/node-core-library'; // 755 are default permissions to allow read/write/execute for owner and read/execute for group and others. diff --git a/libraries/package-extractor/src/AssetHandler.ts b/libraries/package-extractor/src/AssetHandler.ts index a043d93dc6e..e177c009067 100644 --- a/libraries/package-extractor/src/AssetHandler.ts +++ b/libraries/package-extractor/src/AssetHandler.ts @@ -3,8 +3,10 @@ import path from 'node:path'; import fs from 'node:fs'; + import { Async, FileSystem, Path, type FileSystemStats } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; + import { ArchiveManager } from './ArchiveManager'; import type { IExtractorOptions, LinkCreationMode } from './PackageExtractor'; import type { ILinkInfo, SymlinkAnalyzer } from './SymlinkAnalyzer'; diff --git a/libraries/package-extractor/src/PackageExtractor.ts b/libraries/package-extractor/src/PackageExtractor.ts index 666c4515bfc..1170c315034 100644 --- a/libraries/package-extractor/src/PackageExtractor.ts +++ b/libraries/package-extractor/src/PackageExtractor.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { Minimatch } from 'minimatch'; import semver from 'semver'; import npmPacklist from 'npm-packlist'; import ignore, { type Ignore } from 'ignore'; + import { Async, AsyncQueue, diff --git a/libraries/package-extractor/src/SymlinkAnalyzer.ts b/libraries/package-extractor/src/SymlinkAnalyzer.ts index 9f56be20264..36eaff95481 100644 --- a/libraries/package-extractor/src/SymlinkAnalyzer.ts +++ b/libraries/package-extractor/src/SymlinkAnalyzer.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { FileSystem, type FileSystemStats, Sort } from '@rushstack/node-core-library'; +import * as path from 'node:path'; -import * as path from 'path'; +import { FileSystem, type FileSystemStats, Sort } from '@rushstack/node-core-library'; export interface IPathNodeBase { kind: 'file' | 'folder' | 'link'; diff --git a/libraries/package-extractor/src/Utils.ts b/libraries/package-extractor/src/Utils.ts index 0a76e1ce4d7..0bf49be52ab 100644 --- a/libraries/package-extractor/src/Utils.ts +++ b/libraries/package-extractor/src/Utils.ts @@ -2,9 +2,12 @@ // See LICENSE in the project root for license information. import path from 'node:path'; + import pnpmLinkBins from '@pnpm/link-bins'; + import { Async, FileSystem, Path, Text } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; + import { MAX_CONCURRENCY } from './scripts/createLinks/utilities/constants'; export function matchesWithStar(patternWithStar: string, input: string): boolean { diff --git a/libraries/package-extractor/src/scripts/createLinks/cli/actions/CreateLinksAction.ts b/libraries/package-extractor/src/scripts/createLinks/cli/actions/CreateLinksAction.ts index 582b35e36d6..146bb76b46c 100644 --- a/libraries/package-extractor/src/scripts/createLinks/cli/actions/CreateLinksAction.ts +++ b/libraries/package-extractor/src/scripts/createLinks/cli/actions/CreateLinksAction.ts @@ -2,9 +2,11 @@ // See LICENSE in the project root for license information. import path from 'node:path'; + import { Async, FileSystem, Path } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import { CommandLineAction, type CommandLineFlagParameter } from '@rushstack/ts-command-line'; + import type { IExtractorMetadataJson, IProjectInfoJson } from '../../../../PackageExtractor'; import { makeBinLinksAsync } from '../../../../Utils'; import { getExtractorMetadataAsync } from '../../utilities/CreateLinksUtilities'; diff --git a/libraries/package-extractor/src/scripts/createLinks/cli/actions/RemoveLinksAction.ts b/libraries/package-extractor/src/scripts/createLinks/cli/actions/RemoveLinksAction.ts index 248f35f8780..bea0e60f9e4 100644 --- a/libraries/package-extractor/src/scripts/createLinks/cli/actions/RemoveLinksAction.ts +++ b/libraries/package-extractor/src/scripts/createLinks/cli/actions/RemoveLinksAction.ts @@ -2,9 +2,11 @@ // See LICENSE in the project root for license information. import path from 'node:path'; + import { Async, FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import { CommandLineAction } from '@rushstack/ts-command-line'; + import type { IExtractorMetadataJson } from '../../../../PackageExtractor'; import { getExtractorMetadataAsync } from '../../utilities/CreateLinksUtilities'; import { TARGET_ROOT_FOLDER, MAX_CONCURRENCY } from '../../utilities/constants'; diff --git a/libraries/package-extractor/src/scripts/createLinks/utilities/CreateLinksUtilities.ts b/libraries/package-extractor/src/scripts/createLinks/utilities/CreateLinksUtilities.ts index 2fe01d34b7b..69f4443e241 100644 --- a/libraries/package-extractor/src/scripts/createLinks/utilities/CreateLinksUtilities.ts +++ b/libraries/package-extractor/src/scripts/createLinks/utilities/CreateLinksUtilities.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { FileSystem } from '@rushstack/node-core-library'; + import type { IExtractorMetadataJson } from '../../../PackageExtractor'; import { EXTRACTOR_METADATA_FILENAME } from '../../../PathConstants'; diff --git a/libraries/package-extractor/src/scripts/createLinks/utilities/constants.ts b/libraries/package-extractor/src/scripts/createLinks/utilities/constants.ts index 941b9a423ba..707a3f08e41 100644 --- a/libraries/package-extractor/src/scripts/createLinks/utilities/constants.ts +++ b/libraries/package-extractor/src/scripts/createLinks/utilities/constants.ts @@ -3,6 +3,7 @@ import os from 'node:os'; import path from 'node:path'; + import type { TARGET_ROOT_SCRIPT_RELATIVE_PATH_TEMPLATE_STRING as TargetRootScriptRelativePathTemplateString } from '../../../PackageExtractor'; /** diff --git a/libraries/package-extractor/src/test/PackageExtractor.test.ts b/libraries/package-extractor/src/test/PackageExtractor.test.ts index 82f9fb8da7e..3a9f14e5928 100644 --- a/libraries/package-extractor/src/test/PackageExtractor.test.ts +++ b/libraries/package-extractor/src/test/PackageExtractor.test.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; -import type { ChildProcess } from 'child_process'; +import path from 'node:path'; +import type { ChildProcess } from 'node:child_process'; import { Executable, FileSystem, Sort } from '@rushstack/node-core-library'; import { Terminal, StringBufferTerminalProvider } from '@rushstack/terminal'; diff --git a/libraries/rig-package/src/Helpers.ts b/libraries/rig-package/src/Helpers.ts index 6e306125930..d2d0fd9282b 100644 --- a/libraries/rig-package/src/Helpers.ts +++ b/libraries/rig-package/src/Helpers.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; + import nodeResolve from 'resolve'; // These helpers avoid taking dependencies on other NPM packages diff --git a/libraries/rig-package/src/RigConfig.ts b/libraries/rig-package/src/RigConfig.ts index 51c127a51a3..31ab62e2d76 100644 --- a/libraries/rig-package/src/RigConfig.ts +++ b/libraries/rig-package/src/RigConfig.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; + import * as nodeResolve from 'resolve'; import stripJsonComments from 'strip-json-comments'; diff --git a/libraries/rig-package/src/test/RigConfig.test.ts b/libraries/rig-package/src/test/RigConfig.test.ts index 322dd295c5c..743c5ddd05a 100644 --- a/libraries/rig-package/src/test/RigConfig.test.ts +++ b/libraries/rig-package/src/test/RigConfig.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. import Ajv, { type ValidateFunction } from 'ajv'; -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; import stripJsonComments from 'strip-json-comments'; import { RigConfig } from '../RigConfig'; diff --git a/libraries/rush-lib/src/api/ApprovedPackagesConfiguration.ts b/libraries/rush-lib/src/api/ApprovedPackagesConfiguration.ts index f05f2661010..e7b48f2c842 100644 --- a/libraries/rush-lib/src/api/ApprovedPackagesConfiguration.ts +++ b/libraries/rush-lib/src/api/ApprovedPackagesConfiguration.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { JsonFile, JsonSchema, FileSystem, NewlineKind, InternalError } from '@rushstack/node-core-library'; import { JsonSchemaUrls } from '../logic/JsonSchemaUrls'; diff --git a/libraries/rush-lib/src/api/ApprovedPackagesPolicy.ts b/libraries/rush-lib/src/api/ApprovedPackagesPolicy.ts index 6a8a5f61dab..32038e636e4 100644 --- a/libraries/rush-lib/src/api/ApprovedPackagesPolicy.ts +++ b/libraries/rush-lib/src/api/ApprovedPackagesPolicy.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { ApprovedPackagesConfiguration } from './ApprovedPackagesConfiguration'; import { RushConstants } from '../logic/RushConstants'; diff --git a/libraries/rush-lib/src/api/ChangeFile.ts b/libraries/rush-lib/src/api/ChangeFile.ts index d6f7bc80fb2..d2022c7e90d 100644 --- a/libraries/rush-lib/src/api/ChangeFile.ts +++ b/libraries/rush-lib/src/api/ChangeFile.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type gitInfo from 'git-repo-info'; diff --git a/libraries/rush-lib/src/api/CobuildConfiguration.ts b/libraries/rush-lib/src/api/CobuildConfiguration.ts index 8e7da0a6ec6..d96cfc96dc2 100644 --- a/libraries/rush-lib/src/api/CobuildConfiguration.ts +++ b/libraries/rush-lib/src/api/CobuildConfiguration.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { randomUUID } from 'node:crypto'; + import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import { randomUUID } from 'node:crypto'; import { EnvironmentConfiguration } from './EnvironmentConfiguration'; import type { CobuildLockProviderFactory, RushSession } from '../pluginFramework/RushSession'; diff --git a/libraries/rush-lib/src/api/CommonVersionsConfiguration.ts b/libraries/rush-lib/src/api/CommonVersionsConfiguration.ts index 73ae342733b..9333d06d04f 100644 --- a/libraries/rush-lib/src/api/CommonVersionsConfiguration.ts +++ b/libraries/rush-lib/src/api/CommonVersionsConfiguration.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import crypto from 'crypto'; -import * as path from 'path'; +import crypto from 'node:crypto'; +import * as path from 'node:path'; + import { JsonFile, JsonSchema, diff --git a/libraries/rush-lib/src/api/CustomTipsConfiguration.ts b/libraries/rush-lib/src/api/CustomTipsConfiguration.ts index 6a184bfad04..c45dd2aa86b 100644 --- a/libraries/rush-lib/src/api/CustomTipsConfiguration.ts +++ b/libraries/rush-lib/src/api/CustomTipsConfiguration.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; import { type ITerminal, PrintUtilities, Colorize } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/api/EnvironmentConfiguration.ts b/libraries/rush-lib/src/api/EnvironmentConfiguration.ts index d8c9a16b4af..5ccc3d06909 100644 --- a/libraries/rush-lib/src/api/EnvironmentConfiguration.ts +++ b/libraries/rush-lib/src/api/EnvironmentConfiguration.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; +import * as os from 'node:os'; +import * as path from 'node:path'; + import { trueCasePathSync } from 'true-case-path'; import type { IEnvironment } from '../utilities/Utilities'; diff --git a/libraries/rush-lib/src/api/EventHooks.ts b/libraries/rush-lib/src/api/EventHooks.ts index bfd679b38b4..8d671c50b38 100644 --- a/libraries/rush-lib/src/api/EventHooks.ts +++ b/libraries/rush-lib/src/api/EventHooks.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IEventHooksJson } from './RushConfiguration'; import { Enum } from '@rushstack/node-core-library'; +import type { IEventHooksJson } from './RushConfiguration'; + /** * Events happen during Rush runs. * @beta diff --git a/libraries/rush-lib/src/api/FlagFile.ts b/libraries/rush-lib/src/api/FlagFile.ts index e6710136165..13466552817 100644 --- a/libraries/rush-lib/src/api/FlagFile.ts +++ b/libraries/rush-lib/src/api/FlagFile.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { FileSystem, JsonFile, type JsonObject } from '@rushstack/node-core-library'; + import { objectsAreDeepEqual } from '../utilities/objectUtilities'; /** diff --git a/libraries/rush-lib/src/api/LastInstallFlag.ts b/libraries/rush-lib/src/api/LastInstallFlag.ts index 2d7a2a6db01..a20688cca32 100644 --- a/libraries/rush-lib/src/api/LastInstallFlag.ts +++ b/libraries/rush-lib/src/api/LastInstallFlag.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { JsonFile, type JsonObject, Path, type IPackageJson } from '@rushstack/node-core-library'; import { pnpmSyncGetJsonVersion } from 'pnpm-sync-lib'; + +import { JsonFile, type JsonObject, Path, type IPackageJson } from '@rushstack/node-core-library'; + import type { PackageManagerName } from './packageManager/PackageManager'; import type { RushConfiguration } from './RushConfiguration'; import * as objectUtilities from '../utilities/objectUtilities'; diff --git a/libraries/rush-lib/src/api/PackageJsonEditor.ts b/libraries/rush-lib/src/api/PackageJsonEditor.ts index 8212164169b..27106a38ad1 100644 --- a/libraries/rush-lib/src/api/PackageJsonEditor.ts +++ b/libraries/rush-lib/src/api/PackageJsonEditor.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import { InternalError, type IPackageJson, JsonFile, Sort, JsonSyntax } from '@rushstack/node-core-library'; + import { cloneDeep } from '../utilities/objectUtilities'; /** diff --git a/libraries/rush-lib/src/api/Rush.ts b/libraries/rush-lib/src/api/Rush.ts index ba146179a2d..af1187d1598 100644 --- a/libraries/rush-lib/src/api/Rush.ts +++ b/libraries/rush-lib/src/api/Rush.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { InternalError, type IPackageJson, PackageJsonLookup } from '@rushstack/node-core-library'; import type { ITerminalProvider } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/api/RushConfiguration.ts b/libraries/rush-lib/src/api/RushConfiguration.ts index feac52b0c18..c1398ea0622 100644 --- a/libraries/rush-lib/src/api/RushConfiguration.ts +++ b/libraries/rush-lib/src/api/RushConfiguration.ts @@ -3,8 +3,11 @@ /* eslint max-lines: off */ -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; +import { trueCasePathSync } from 'true-case-path'; + import { JsonFile, JsonSchema, @@ -16,7 +19,6 @@ import { type JsonNull } from '@rushstack/node-core-library'; import { LookupByPath } from '@rushstack/lookup-by-path'; -import { trueCasePathSync } from 'true-case-path'; import { Rush } from './Rush'; import { RushConfigurationProject, type IRushConfigurationProjectJson } from './RushConfigurationProject'; @@ -39,7 +41,6 @@ import { type IPnpmOptionsJson, PnpmOptionsConfiguration } from '../logic/pnpm/P import { type INpmOptionsJson, NpmOptionsConfiguration } from '../logic/npm/NpmOptionsConfiguration'; import { type IYarnOptionsJson, YarnOptionsConfiguration } from '../logic/yarn/YarnOptionsConfiguration'; import schemaJson from '../schemas/rush.schema.json'; - import type * as DependencyAnalyzerModuleType from '../logic/DependencyAnalyzer'; import type { PackageManagerOptionsConfigurationBase } from '../logic/base/BasePackageManagerOptionsConfiguration'; import { CustomTipsConfiguration } from './CustomTipsConfiguration'; diff --git a/libraries/rush-lib/src/api/RushConfigurationProject.ts b/libraries/rush-lib/src/api/RushConfigurationProject.ts index 5d16dbd4610..e80dce4bbde 100644 --- a/libraries/rush-lib/src/api/RushConfigurationProject.ts +++ b/libraries/rush-lib/src/api/RushConfigurationProject.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; + import { type IPackageJson, FileSystem, FileConstants } from '@rushstack/node-core-library'; import type { RushConfiguration } from './RushConfiguration'; diff --git a/libraries/rush-lib/src/api/RushGlobalFolder.ts b/libraries/rush-lib/src/api/RushGlobalFolder.ts index 1d0541d05bd..e1081f2d4f7 100644 --- a/libraries/rush-lib/src/api/RushGlobalFolder.ts +++ b/libraries/rush-lib/src/api/RushGlobalFolder.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { Utilities } from '../utilities/Utilities'; import { EnvironmentConfiguration } from './EnvironmentConfiguration'; diff --git a/libraries/rush-lib/src/api/RushUserConfiguration.ts b/libraries/rush-lib/src/api/RushUserConfiguration.ts index 656bbd86480..6b20ace19a3 100644 --- a/libraries/rush-lib/src/api/RushUserConfiguration.ts +++ b/libraries/rush-lib/src/api/RushUserConfiguration.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; + import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; -import * as path from 'path'; import { Utilities } from '../utilities/Utilities'; import { RushConstants } from '../logic/RushConstants'; diff --git a/libraries/rush-lib/src/api/SaveCallbackPackageJsonEditor.ts b/libraries/rush-lib/src/api/SaveCallbackPackageJsonEditor.ts index b314f081aac..1462d824548 100644 --- a/libraries/rush-lib/src/api/SaveCallbackPackageJsonEditor.ts +++ b/libraries/rush-lib/src/api/SaveCallbackPackageJsonEditor.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IPackageJson } from '@rushstack/node-core-library'; + import { PackageJsonEditor } from './PackageJsonEditor'; export interface IFromObjectOptions { diff --git a/libraries/rush-lib/src/api/Subspace.ts b/libraries/rush-lib/src/api/Subspace.ts index 7ec49d40558..741240d5f36 100644 --- a/libraries/rush-lib/src/api/Subspace.ts +++ b/libraries/rush-lib/src/api/Subspace.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as crypto from 'crypto'; +import * as path from 'node:path'; +import * as crypto from 'node:crypto'; import { FileSystem } from '@rushstack/node-core-library'; +import type { IPackageJson } from '@rushstack/node-core-library'; + import type { RushConfiguration } from './RushConfiguration'; import type { RushConfigurationProject } from './RushConfigurationProject'; import { EnvironmentConfiguration } from './EnvironmentConfiguration'; @@ -13,7 +15,6 @@ import { CommonVersionsConfiguration } from './CommonVersionsConfiguration'; import { RepoStateFile } from '../logic/RepoStateFile'; import type { PnpmPackageManager } from './packageManager/PnpmPackageManager'; import { PnpmOptionsConfiguration } from '../logic/pnpm/PnpmOptionsConfiguration'; -import type { IPackageJson } from '@rushstack/node-core-library'; import { SubspacePnpmfileConfiguration } from '../logic/pnpm/SubspacePnpmfileConfiguration'; import type { ISubspacePnpmfileShimSettings } from '../logic/pnpm/IPnpmfile'; diff --git a/libraries/rush-lib/src/api/VersionPolicy.ts b/libraries/rush-lib/src/api/VersionPolicy.ts index 8d357bbaeb7..f2df9deaf58 100644 --- a/libraries/rush-lib/src/api/VersionPolicy.ts +++ b/libraries/rush-lib/src/api/VersionPolicy.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import { type IPackageJson, Enum } from '@rushstack/node-core-library'; import type { diff --git a/libraries/rush-lib/src/api/packageManager/PnpmPackageManager.ts b/libraries/rush-lib/src/api/packageManager/PnpmPackageManager.ts index a1ddd769278..d00a35c64a1 100644 --- a/libraries/rush-lib/src/api/packageManager/PnpmPackageManager.ts +++ b/libraries/rush-lib/src/api/packageManager/PnpmPackageManager.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; + import * as semver from 'semver'; -import * as path from 'path'; import { RushConstants } from '../../logic/RushConstants'; import { PackageManager } from './PackageManager'; diff --git a/libraries/rush-lib/src/api/test/EnvironmentConfiguration.test.ts b/libraries/rush-lib/src/api/test/EnvironmentConfiguration.test.ts index 83ebc055b5a..78f597c2a3d 100644 --- a/libraries/rush-lib/src/api/test/EnvironmentConfiguration.test.ts +++ b/libraries/rush-lib/src/api/test/EnvironmentConfiguration.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { EnvironmentConfiguration } from '../EnvironmentConfiguration'; describe(EnvironmentConfiguration.name, () => { diff --git a/libraries/rush-lib/src/api/test/FlagFile.test.ts b/libraries/rush-lib/src/api/test/FlagFile.test.ts index aaad8a06e52..017c648aeb1 100644 --- a/libraries/rush-lib/src/api/test/FlagFile.test.ts +++ b/libraries/rush-lib/src/api/test/FlagFile.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem } from '@rushstack/node-core-library'; import { FlagFile } from '../FlagFile'; diff --git a/libraries/rush-lib/src/api/test/LastInstallFlag.test.ts b/libraries/rush-lib/src/api/test/LastInstallFlag.test.ts index 7b0bfc43280..32f1859ae74 100644 --- a/libraries/rush-lib/src/api/test/LastInstallFlag.test.ts +++ b/libraries/rush-lib/src/api/test/LastInstallFlag.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem } from '@rushstack/node-core-library'; import { LastInstallFlag } from '../LastInstallFlag'; diff --git a/libraries/rush-lib/src/api/test/RushConfiguration.test.ts b/libraries/rush-lib/src/api/test/RushConfiguration.test.ts index f5edac12662..a70ebc19b35 100644 --- a/libraries/rush-lib/src/api/test/RushConfiguration.test.ts +++ b/libraries/rush-lib/src/api/test/RushConfiguration.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { JsonFile, Path, Text } from '@rushstack/node-core-library'; import { RushConfiguration } from '../RushConfiguration'; diff --git a/libraries/rush-lib/src/cli/RushCommandLineParser.ts b/libraries/rush-lib/src/cli/RushCommandLineParser.ts index d21b637f931..9cacc08fdbf 100644 --- a/libraries/rush-lib/src/cli/RushCommandLineParser.ts +++ b/libraries/rush-lib/src/cli/RushCommandLineParser.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { CommandLineParser, @@ -25,7 +25,6 @@ import { type IGlobalCommandConfig, type IPhasedCommandConfig } from '../api/CommandLineConfiguration'; - import { AddAction } from './actions/AddAction'; import { AlertAction } from './actions/AlertAction'; import { BridgePackageAction } from './actions/BridgePackageAction'; @@ -50,11 +49,9 @@ import { UpdateAutoinstallerAction } from './actions/UpdateAutoinstallerAction'; import { UpdateCloudCredentialsAction } from './actions/UpdateCloudCredentialsAction'; import { UpgradeInteractiveAction } from './actions/UpgradeInteractiveAction'; import { VersionAction } from './actions/VersionAction'; - import { GlobalScriptAction } from './scriptActions/GlobalScriptAction'; import { PhasedScriptAction } from './scriptActions/PhasedScriptAction'; import type { IBaseScriptActionOptions } from './scriptActions/BaseScriptAction'; - import { Telemetry } from '../logic/Telemetry'; import { RushGlobalFolder } from '../api/RushGlobalFolder'; import { NodeJsCompatibility } from '../logic/NodeJsCompatibility'; @@ -65,7 +62,6 @@ import type { IBuiltInPluginConfiguration } from '../pluginFramework/PluginLoade import { InitSubspaceAction } from './actions/InitSubspaceAction'; import { RushAlerts } from '../utilities/RushAlerts'; import { initializeDotEnv } from '../logic/dotenv'; - import { measureAsyncFn } from '../utilities/performance'; /** diff --git a/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts b/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts index ffee5ae280d..51ef8e7c703 100644 --- a/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts +++ b/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { AlreadyReportedError, EnvironmentMap, @@ -17,14 +18,13 @@ import { type ITerminalProvider, Terminal } from '@rushstack/terminal'; +import { PrintUtilities } from '@rushstack/terminal'; import { RushConfiguration } from '../api/RushConfiguration'; import { NodeJsCompatibility } from '../logic/NodeJsCompatibility'; -import { PrintUtilities } from '@rushstack/terminal'; import { RushConstants } from '../logic/RushConstants'; import { RushGlobalFolder } from '../api/RushGlobalFolder'; import { PurgeManager } from '../logic/PurgeManager'; - import type { IBuiltInPluginConfiguration } from '../pluginFramework/PluginLoader/BuiltInPluginLoader'; import type { BaseInstallManager } from '../logic/base/BaseInstallManager'; import type { IInstallManagerOptions } from '../logic/base/BaseInstallManagerTypes'; diff --git a/libraries/rush-lib/src/cli/RushXCommandLine.ts b/libraries/rush-lib/src/cli/RushXCommandLine.ts index 4542b8dad60..7efd2431f89 100644 --- a/libraries/rush-lib/src/cli/RushXCommandLine.ts +++ b/libraries/rush-lib/src/cli/RushXCommandLine.ts @@ -1,7 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + +import { type ILogMessageCallbackOptions, pnpmSyncCopyAsync } from 'pnpm-sync-lib'; + import { PackageJsonLookup, type IPackageJson, Text, FileSystem, Async } from '@rushstack/node-core-library'; import { Colorize, @@ -12,7 +15,6 @@ import { Terminal, type ITerminal } from '@rushstack/terminal'; -import { type ILogMessageCallbackOptions, pnpmSyncCopyAsync } from 'pnpm-sync-lib'; import { Utilities } from '../utilities/Utilities'; import { ProjectCommandSet } from '../logic/ProjectCommandSet'; diff --git a/libraries/rush-lib/src/cli/actions/AddAction.ts b/libraries/rush-lib/src/cli/actions/AddAction.ts index f0c2fe25593..9e9f23d53c1 100644 --- a/libraries/rush-lib/src/cli/actions/AddAction.ts +++ b/libraries/rush-lib/src/cli/actions/AddAction.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import type { CommandLineFlagParameter, CommandLineStringListParameter, diff --git a/libraries/rush-lib/src/cli/actions/BaseHotlinkPackageAction.ts b/libraries/rush-lib/src/cli/actions/BaseHotlinkPackageAction.ts index d5617b8405f..0d357d8f729 100644 --- a/libraries/rush-lib/src/cli/actions/BaseHotlinkPackageAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseHotlinkPackageAction.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; -import path from 'path'; import { HotlinkManager } from '../../utilities/HotlinkManager'; import { BaseRushAction, type IBaseRushActionOptions } from './BaseRushAction'; diff --git a/libraries/rush-lib/src/cli/actions/BaseRushAction.ts b/libraries/rush-lib/src/cli/actions/BaseRushAction.ts index 048cf51ca2b..85469814a89 100644 --- a/libraries/rush-lib/src/cli/actions/BaseRushAction.ts +++ b/libraries/rush-lib/src/cli/actions/BaseRushAction.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { CommandLineAction, type ICommandLineActionOptions } from '@rushstack/ts-command-line'; import { LockFile } from '@rushstack/node-core-library'; diff --git a/libraries/rush-lib/src/cli/actions/BridgePackageAction.ts b/libraries/rush-lib/src/cli/actions/BridgePackageAction.ts index caac467d775..a380251c099 100644 --- a/libraries/rush-lib/src/cli/actions/BridgePackageAction.ts +++ b/libraries/rush-lib/src/cli/actions/BridgePackageAction.ts @@ -5,6 +5,7 @@ import type { CommandLineStringListParameter, IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; +import { Async } from '@rushstack/node-core-library'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseHotlinkPackageAction } from './BaseHotlinkPackageAction'; @@ -12,7 +13,6 @@ import type { HotlinkManager } from '../../utilities/HotlinkManager'; import { BRIDGE_PACKAGE_ACTION_NAME, LINK_PACKAGE_ACTION_NAME } from '../../utilities/actionNameConstants'; import { RushConstants } from '../../logic/RushConstants'; import type { Subspace } from '../../api/Subspace'; -import { Async } from '@rushstack/node-core-library'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; export class BridgePackageAction extends BaseHotlinkPackageAction { diff --git a/libraries/rush-lib/src/cli/actions/ChangeAction.ts b/libraries/rush-lib/src/cli/actions/ChangeAction.ts index d0f5134e3be..5ed9fc1af4d 100644 --- a/libraries/rush-lib/src/cli/actions/ChangeAction.ts +++ b/libraries/rush-lib/src/cli/actions/ChangeAction.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as child_process from 'child_process'; +import * as path from 'node:path'; +import * as child_process from 'node:child_process'; + +import type * as InquirerType from 'inquirer'; import type { CommandLineFlagParameter, @@ -12,7 +14,6 @@ import type { import { FileSystem, AlreadyReportedError } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; import { getRepoRoot } from '@rushstack/package-deps-hash'; -import type * as InquirerType from 'inquirer'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; import { type IChangeFile, type IChangeInfo, ChangeType } from '../../api/ChangeManagement'; diff --git a/libraries/rush-lib/src/cli/actions/DeployAction.ts b/libraries/rush-lib/src/cli/actions/DeployAction.ts index 5f67445dc8a..ebbf57c7eeb 100644 --- a/libraries/rush-lib/src/cli/actions/DeployAction.ts +++ b/libraries/rush-lib/src/cli/actions/DeployAction.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { CommandLineFlagParameter, CommandLineStringParameter } from '@rushstack/ts-command-line'; import type { PackageExtractor, diff --git a/libraries/rush-lib/src/cli/actions/InitAction.ts b/libraries/rush-lib/src/cli/actions/InitAction.ts index efcadd12cf4..7eeb7480312 100644 --- a/libraries/rush-lib/src/cli/actions/InitAction.ts +++ b/libraries/rush-lib/src/cli/actions/InitAction.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, InternalError, @@ -13,7 +14,6 @@ import { Colorize } from '@rushstack/terminal'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseConfiglessRushAction } from './BaseRushAction'; - import { assetsFolderPath } from '../../utilities/PathConstants'; import { copyTemplateFileAsync } from '../../utilities/templateUtilities'; diff --git a/libraries/rush-lib/src/cli/actions/InitSubspaceAction.ts b/libraries/rush-lib/src/cli/actions/InitSubspaceAction.ts index 4e3df2dd491..6659ae9ac81 100644 --- a/libraries/rush-lib/src/cli/actions/InitSubspaceAction.ts +++ b/libraries/rush-lib/src/cli/actions/InitSubspaceAction.ts @@ -2,12 +2,13 @@ // See LICENSE in the project root for license information. import type { IRequiredCommandLineStringParameter } from '@rushstack/ts-command-line'; +import { Async, FileSystem, JsonFile } from '@rushstack/node-core-library'; +import { ConsoleTerminalProvider, Terminal } from '@rushstack/terminal'; + import { assetsFolderPath } from '../../utilities/PathConstants'; import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseRushAction } from './BaseRushAction'; import { type ISubspacesConfigurationJson, SubspacesConfiguration } from '../../api/SubspacesConfiguration'; -import { Async, FileSystem, JsonFile } from '@rushstack/node-core-library'; -import { ConsoleTerminalProvider, Terminal } from '@rushstack/terminal'; import { copyTemplateFileAsync } from '../../utilities/templateUtilities'; export class InitSubspaceAction extends BaseRushAction { diff --git a/libraries/rush-lib/src/cli/actions/LinkAction.ts b/libraries/rush-lib/src/cli/actions/LinkAction.ts index 90cb151407e..eabf19c414c 100644 --- a/libraries/rush-lib/src/cli/actions/LinkAction.ts +++ b/libraries/rush-lib/src/cli/actions/LinkAction.ts @@ -4,7 +4,6 @@ import type { CommandLineFlagParameter } from '@rushstack/ts-command-line'; import type { RushCommandLineParser } from '../RushCommandLineParser'; - import type { BaseLinkManager } from '../../logic/base/BaseLinkManager'; import { BaseRushAction } from './BaseRushAction'; diff --git a/libraries/rush-lib/src/cli/actions/PublishAction.ts b/libraries/rush-lib/src/cli/actions/PublishAction.ts index e80874c8858..af90f85d813 100644 --- a/libraries/rush-lib/src/cli/actions/PublishAction.ts +++ b/libraries/rush-lib/src/cli/actions/PublishAction.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; + import type { CommandLineFlagParameter, CommandLineStringParameter, diff --git a/libraries/rush-lib/src/cli/actions/ScanAction.ts b/libraries/rush-lib/src/cli/actions/ScanAction.ts index b99e7da7f63..0bcd7e08c7a 100644 --- a/libraries/rush-lib/src/cli/actions/ScanAction.ts +++ b/libraries/rush-lib/src/cli/actions/ScanAction.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import builtinPackageNames from 'builtin-modules'; + import { Colorize } from '@rushstack/terminal'; import type { CommandLineFlagParameter } from '@rushstack/ts-command-line'; import { FileSystem } from '@rushstack/node-core-library'; diff --git a/libraries/rush-lib/src/cli/actions/UpgradeInteractiveAction.ts b/libraries/rush-lib/src/cli/actions/UpgradeInteractiveAction.ts index be5bbf28994..273b67ba91b 100644 --- a/libraries/rush-lib/src/cli/actions/UpgradeInteractiveAction.ts +++ b/libraries/rush-lib/src/cli/actions/UpgradeInteractiveAction.ts @@ -2,9 +2,9 @@ // See LICENSE in the project root for license information. import type { CommandLineFlagParameter, CommandLineStringParameter } from '@rushstack/ts-command-line'; + import type { RushCommandLineParser } from '../RushCommandLineParser'; import { BaseRushAction } from './BaseRushAction'; - import type * as PackageJsonUpdaterType from '../../logic/PackageJsonUpdater'; import type * as InteractiveUpgraderType from '../../logic/InteractiveUpgrader'; import { getVariantAsync, VARIANT_PARAMETER } from '../../api/Variants'; diff --git a/libraries/rush-lib/src/cli/actions/VersionAction.ts b/libraries/rush-lib/src/cli/actions/VersionAction.ts index 128864955d7..de854535680 100644 --- a/libraries/rush-lib/src/cli/actions/VersionAction.ts +++ b/libraries/rush-lib/src/cli/actions/VersionAction.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import { type IPackageJson, FileConstants, Enum } from '@rushstack/node-core-library'; import type { CommandLineFlagParameter, CommandLineStringParameter } from '@rushstack/ts-command-line'; @@ -15,7 +16,6 @@ import { BaseRushAction } from './BaseRushAction'; import { PublishGit } from '../../logic/PublishGit'; import { Git } from '../../logic/Git'; import { RushConstants } from '../../logic/RushConstants'; - import type * as VersionManagerType from '../../logic/VersionManager'; export const DEFAULT_PACKAGE_UPDATE_MESSAGE: string = 'Bump versions [skip ci]'; diff --git a/libraries/rush-lib/src/cli/parsing/ParseParallelism.ts b/libraries/rush-lib/src/cli/parsing/ParseParallelism.ts index ea2aed70e35..5185cc70e44 100644 --- a/libraries/rush-lib/src/cli/parsing/ParseParallelism.ts +++ b/libraries/rush-lib/src/cli/parsing/ParseParallelism.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; +import * as os from 'node:os'; /** * Parses a command line specification for desired parallelism. diff --git a/libraries/rush-lib/src/cli/scriptActions/BaseScriptAction.ts b/libraries/rush-lib/src/cli/scriptActions/BaseScriptAction.ts index d2c57df634d..2da245a5b7a 100644 --- a/libraries/rush-lib/src/cli/scriptActions/BaseScriptAction.ts +++ b/libraries/rush-lib/src/cli/scriptActions/BaseScriptAction.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { CommandLineParameter } from '@rushstack/ts-command-line'; + import { BaseRushAction, type IBaseRushActionOptions } from '../actions/BaseRushAction'; import type { Command, CommandLineConfiguration, IParameterJson } from '../../api/CommandLineConfiguration'; import { RushConstants } from '../../logic/RushConstants'; diff --git a/libraries/rush-lib/src/cli/scriptActions/GlobalScriptAction.ts b/libraries/rush-lib/src/cli/scriptActions/GlobalScriptAction.ts index 3efb9b3d6a2..9b35156f188 100644 --- a/libraries/rush-lib/src/cli/scriptActions/GlobalScriptAction.ts +++ b/libraries/rush-lib/src/cli/scriptActions/GlobalScriptAction.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type { AsyncSeriesHook } from 'tapable'; diff --git a/libraries/rush-lib/src/cli/test/Cli.test.ts b/libraries/rush-lib/src/cli/test/Cli.test.ts index a5b596d8b1d..51a89ca7d8c 100644 --- a/libraries/rush-lib/src/cli/test/Cli.test.ts +++ b/libraries/rush-lib/src/cli/test/Cli.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { Utilities } from '../../utilities/Utilities'; diff --git a/libraries/rush-lib/src/cli/test/RushCommandLineParserFailureCases.test.ts b/libraries/rush-lib/src/cli/test/RushCommandLineParserFailureCases.test.ts index 4cfd7647f02..a5a671afef3 100644 --- a/libraries/rush-lib/src/cli/test/RushCommandLineParserFailureCases.test.ts +++ b/libraries/rush-lib/src/cli/test/RushCommandLineParserFailureCases.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. // Mock child_process so we can verify tasks are (or are not) invoked as we expect -jest.mock('child_process'); +jest.mock('node:child_process', () => jest.requireActual('./mock_child_process')); jest.mock('@rushstack/terminal'); jest.mock(`@rushstack/package-deps-hash`, () => { return { diff --git a/libraries/rush-lib/src/cli/test/RushPluginCommandLineParameters.test.ts b/libraries/rush-lib/src/cli/test/RushPluginCommandLineParameters.test.ts index c8141d11cd9..04c968f136d 100644 --- a/libraries/rush-lib/src/cli/test/RushPluginCommandLineParameters.test.ts +++ b/libraries/rush-lib/src/cli/test/RushPluginCommandLineParameters.test.ts @@ -3,7 +3,7 @@ import './mockRushCommandLineParser'; -import path from 'path'; +import path from 'node:path'; import { FileSystem, LockFile } from '@rushstack/node-core-library'; import { RushCommandLineParser } from '../RushCommandLineParser'; import { Autoinstaller } from '../../logic/Autoinstaller'; diff --git a/libraries/rush-lib/src/cli/test/TestUtils.ts b/libraries/rush-lib/src/cli/test/TestUtils.ts index 2341939d13b..e4534498d00 100644 --- a/libraries/rush-lib/src/cli/test/TestUtils.ts +++ b/libraries/rush-lib/src/cli/test/TestUtils.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { AlreadyExistsBehavior, FileSystem, PackageJsonLookup } from '@rushstack/node-core-library'; + import type { RushCommandLineParser as RushCommandLineParserType } from '../RushCommandLineParser'; import { FlagFile } from '../../api/FlagFile'; import { RushConstants } from '../../logic/RushConstants'; @@ -16,7 +17,7 @@ export interface IParserTestInstance { } /** - * See `__mocks__/child_process.js`. + * See `./mock_child_process`. */ export interface ISpawnMockConfig { emitError: boolean; @@ -34,10 +35,10 @@ export interface IChildProcessModuleMock { /** * Configure the `child_process` `spawn` mock for these tests. This relies on the mock implementation - * in `__mocks__/child_process.js`. + * in `mock_child_process`. */ export function setSpawnMock(options?: ISpawnMockConfig): jest.Mock { - const cpMocked: IChildProcessModuleMock = require('child_process'); + const cpMocked: IChildProcessModuleMock = require('node:child_process'); cpMocked.__setSpawnMockConfig(options); const spawnMock: jest.Mock = cpMocked.spawn; diff --git a/libraries/rush-lib/src/cli/test/mockRushCommandLineParser.ts b/libraries/rush-lib/src/cli/test/mockRushCommandLineParser.ts index b4f11e529f6..9904cfcabf8 100644 --- a/libraries/rush-lib/src/cli/test/mockRushCommandLineParser.ts +++ b/libraries/rush-lib/src/cli/test/mockRushCommandLineParser.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. // Mock child_process so we can verify tasks are (or are not) invoked as we expect -jest.mock('child_process'); +jest.mock('node:child_process', () => jest.requireActual('./mock_child_process')); function mockReportErrorAndSetExitCode(error: Error): void { // Just rethrow the error so the unit tests can catch it diff --git a/libraries/rush-lib/src/__mocks__/child_process.ts b/libraries/rush-lib/src/cli/test/mock_child_process.ts similarity index 90% rename from libraries/rush-lib/src/__mocks__/child_process.ts rename to libraries/rush-lib/src/cli/test/mock_child_process.ts index f3ed28847e0..12b7be1b26e 100644 --- a/libraries/rush-lib/src/__mocks__/child_process.ts +++ b/libraries/rush-lib/src/cli/test/mock_child_process.ts @@ -3,10 +3,10 @@ /* eslint-disable */ -const EventEmitter = require('events'); +const EventEmitter = require('node:events'); -const childProcess: any = jest.genMockFromModule('child_process'); -const childProcessActual = jest.requireActual('child_process'); +const childProcess: any = jest.genMockFromModule('node:child_process'); +const childProcessActual = jest.requireActual('node:child_process'); childProcess.spawn.mockImplementation(spawn); childProcess.__setSpawnMockConfig = setSpawnMockConfig; diff --git a/libraries/rush-lib/src/logic/ApprovedPackagesChecker.ts b/libraries/rush-lib/src/logic/ApprovedPackagesChecker.ts index 6058152b3e4..c20f3b525d9 100644 --- a/libraries/rush-lib/src/logic/ApprovedPackagesChecker.ts +++ b/libraries/rush-lib/src/logic/ApprovedPackagesChecker.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import type { IPackageJson } from '@rushstack/node-core-library'; + import type { ApprovedPackagesPolicy } from '../api/ApprovedPackagesPolicy'; import type { RushConfiguration } from '../api/RushConfiguration'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; import { DependencySpecifier } from './DependencySpecifier'; -import type { IPackageJson } from '@rushstack/node-core-library'; export class ApprovedPackagesChecker { private readonly _rushConfiguration: RushConfiguration; diff --git a/libraries/rush-lib/src/logic/Autoinstaller.ts b/libraries/rush-lib/src/logic/Autoinstaller.ts index 8dd5b0e4dbf..8c35ea07b82 100644 --- a/libraries/rush-lib/src/logic/Autoinstaller.ts +++ b/libraries/rush-lib/src/logic/Autoinstaller.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem, diff --git a/libraries/rush-lib/src/logic/ChangelogGenerator.ts b/libraries/rush-lib/src/logic/ChangelogGenerator.ts index cdcc4880ec1..a00fa0e1ff8 100644 --- a/libraries/rush-lib/src/logic/ChangelogGenerator.ts +++ b/libraries/rush-lib/src/logic/ChangelogGenerator.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; diff --git a/libraries/rush-lib/src/logic/CredentialCache.ts b/libraries/rush-lib/src/logic/CredentialCache.ts index 5c1c775821e..0e52c9ad52c 100644 --- a/libraries/rush-lib/src/logic/CredentialCache.ts +++ b/libraries/rush-lib/src/logic/CredentialCache.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, JsonFile, JsonSchema, LockFile } from '@rushstack/node-core-library'; import { Utilities } from '../utilities/Utilities'; diff --git a/libraries/rush-lib/src/logic/DependencyAnalyzer.ts b/libraries/rush-lib/src/logic/DependencyAnalyzer.ts index c8492903b19..addb6054cc8 100644 --- a/libraries/rush-lib/src/logic/DependencyAnalyzer.ts +++ b/libraries/rush-lib/src/logic/DependencyAnalyzer.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import type { CommonVersionsConfiguration } from '../api/CommonVersionsConfiguration'; import { DependencyType, type PackageJsonDependency } from '../api/PackageJsonEditor'; import type { RushConfiguration } from '../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/DependencySpecifier.ts b/libraries/rush-lib/src/logic/DependencySpecifier.ts index 3c0eefc96f9..52eefceb0dc 100644 --- a/libraries/rush-lib/src/logic/DependencySpecifier.ts +++ b/libraries/rush-lib/src/logic/DependencySpecifier.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import npmPackageArg from 'npm-package-arg'; + import { InternalError } from '@rushstack/node-core-library'; /** diff --git a/libraries/rush-lib/src/logic/Git.ts b/libraries/rush-lib/src/logic/Git.ts index 94455106b1b..3877f6e5f9f 100644 --- a/libraries/rush-lib/src/logic/Git.ts +++ b/libraries/rush-lib/src/logic/Git.ts @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type child_process from 'child_process'; -import gitInfo from 'git-repo-info'; -import * as path from 'path'; -import * as url from 'url'; +import type child_process from 'node:child_process'; +import * as path from 'node:path'; +import * as url from 'node:url'; +import gitInfo from 'git-repo-info'; import { trueCasePathSync } from 'true-case-path'; + import { Executable, AlreadyReportedError, Path, Async } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; import { ensureGitMinimumVersion } from '@rushstack/package-deps-hash'; diff --git a/libraries/rush-lib/src/logic/InstallManagerFactory.ts b/libraries/rush-lib/src/logic/InstallManagerFactory.ts index f68de2d8c0c..c86ad166c0e 100644 --- a/libraries/rush-lib/src/logic/InstallManagerFactory.ts +++ b/libraries/rush-lib/src/logic/InstallManagerFactory.ts @@ -5,7 +5,6 @@ import { WorkspaceInstallManager } from './installManager/WorkspaceInstallManage import type { PurgeManager } from './PurgeManager'; import type { RushConfiguration } from '../api/RushConfiguration'; import type { RushGlobalFolder } from '../api/RushGlobalFolder'; - import type { BaseInstallManager } from './base/BaseInstallManager'; import type { IInstallManagerOptions } from './base/BaseInstallManagerTypes'; diff --git a/libraries/rush-lib/src/logic/InteractiveUpgrader.ts b/libraries/rush-lib/src/logic/InteractiveUpgrader.ts index 2fb737a1b9f..3eb8d238a7e 100644 --- a/libraries/rush-lib/src/logic/InteractiveUpgrader.ts +++ b/libraries/rush-lib/src/logic/InteractiveUpgrader.ts @@ -5,13 +5,13 @@ import npmCheck from 'npm-check'; import type * as NpmCheck from 'npm-check'; +import Prompt from 'inquirer/lib/ui/prompt'; + import { Colorize } from '@rushstack/terminal'; import type { RushConfiguration } from '../api/RushConfiguration'; import { upgradeInteractive, type IDepsToUpgradeAnswers } from '../utilities/InteractiveUpgradeUI'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; -import Prompt from 'inquirer/lib/ui/prompt'; - import { SearchListPrompt } from '../utilities/prompts/SearchListPrompt'; interface IUpgradeInteractiveDeps { diff --git a/libraries/rush-lib/src/logic/NodeJsCompatibility.ts b/libraries/rush-lib/src/logic/NodeJsCompatibility.ts index 5290f454ee6..ea760937f3e 100644 --- a/libraries/rush-lib/src/logic/NodeJsCompatibility.ts +++ b/libraries/rush-lib/src/logic/NodeJsCompatibility.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import { Colorize } from '@rushstack/terminal'; // Minimize dependencies to avoid compatibility errors that might be encountered before diff --git a/libraries/rush-lib/src/logic/PackageJsonUpdater.ts b/libraries/rush-lib/src/logic/PackageJsonUpdater.ts index b133361107f..4a6091984d6 100644 --- a/libraries/rush-lib/src/logic/PackageJsonUpdater.ts +++ b/libraries/rush-lib/src/logic/PackageJsonUpdater.ts @@ -5,6 +5,7 @@ import * as semver from 'semver'; import type * as NpmCheck from 'npm-check'; + import { Colorize, type ITerminal } from '@rushstack/terminal'; import type { RushConfiguration } from '../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/ProjectChangeAnalyzer.ts b/libraries/rush-lib/src/logic/ProjectChangeAnalyzer.ts index 0d1b16e9a76..ecf09749f5a 100644 --- a/libraries/rush-lib/src/logic/ProjectChangeAnalyzer.ts +++ b/libraries/rush-lib/src/logic/ProjectChangeAnalyzer.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import ignore, { type Ignore } from 'ignore'; import type { IReadonlyLookupByPath, LookupByPath } from '@rushstack/lookup-by-path'; diff --git a/libraries/rush-lib/src/logic/ProjectImpactGraphGenerator.ts b/libraries/rush-lib/src/logic/ProjectImpactGraphGenerator.ts index 9bfb3a888c1..5f23e9d6339 100644 --- a/libraries/rush-lib/src/logic/ProjectImpactGraphGenerator.ts +++ b/libraries/rush-lib/src/logic/ProjectImpactGraphGenerator.ts @@ -1,14 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { FileSystem, Text, Async } from '@rushstack/node-core-library'; import yaml from 'js-yaml'; +import { FileSystem, Text, Async } from '@rushstack/node-core-library'; +import { Colorize, type ITerminal } from '@rushstack/terminal'; + import type { RushConfiguration } from '../api/RushConfiguration'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; import { Stopwatch } from '../utilities/Stopwatch'; import { RushConstants } from './RushConstants'; -import { Colorize, type ITerminal } from '@rushstack/terminal'; /** * Project property configuration diff --git a/libraries/rush-lib/src/logic/ProjectWatcher.ts b/libraries/rush-lib/src/logic/ProjectWatcher.ts index 07f52e82aec..27ff8b72b47 100644 --- a/libraries/rush-lib/src/logic/ProjectWatcher.ts +++ b/libraries/rush-lib/src/logic/ProjectWatcher.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; -import * as os from 'os'; -import * as readline from 'readline'; -import { once } from 'events'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import * as readline from 'node:readline'; +import { once } from 'node:events'; + import { getRepoRoot } from '@rushstack/package-deps-hash'; import { AlreadyReportedError, Path, type FileSystemStats, FileSystem } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/PublishUtilities.ts b/libraries/rush-lib/src/logic/PublishUtilities.ts index f0cb821008f..8f9c8556db7 100644 --- a/libraries/rush-lib/src/logic/PublishUtilities.ts +++ b/libraries/rush-lib/src/logic/PublishUtilities.ts @@ -6,9 +6,11 @@ * which itself is a thin wrapper around these helpers. */ -import * as path from 'path'; +import * as path from 'node:path'; +import { execSync } from 'node:child_process'; + import * as semver from 'semver'; -import { execSync } from 'child_process'; + import { type IPackageJson, JsonFile, diff --git a/libraries/rush-lib/src/logic/PurgeManager.ts b/libraries/rush-lib/src/logic/PurgeManager.ts index 80081d21d1d..58df2009851 100644 --- a/libraries/rush-lib/src/logic/PurgeManager.ts +++ b/libraries/rush-lib/src/logic/PurgeManager.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { Colorize } from '@rushstack/terminal'; import { AsyncRecycler } from '../utilities/AsyncRecycler'; diff --git a/libraries/rush-lib/src/logic/SetupChecks.ts b/libraries/rush-lib/src/logic/SetupChecks.ts index 9f60b71708e..3b6b9f1de1d 100644 --- a/libraries/rush-lib/src/logic/SetupChecks.ts +++ b/libraries/rush-lib/src/logic/SetupChecks.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; + import { FileSystem, AlreadyReportedError } from '@rushstack/node-core-library'; import { Colorize, PrintUtilities } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/Telemetry.ts b/libraries/rush-lib/src/logic/Telemetry.ts index 28c2976d829..8d855cd46a0 100644 --- a/libraries/rush-lib/src/logic/Telemetry.ts +++ b/libraries/rush-lib/src/logic/Telemetry.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; +import * as os from 'node:os'; +import * as path from 'node:path'; import type { PerformanceEntry } from 'node:perf_hooks'; + import { FileSystem, type FileSystemStats, JsonFile } from '@rushstack/node-core-library'; import type { RushConfiguration } from '../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/TempProjectHelper.ts b/libraries/rush-lib/src/logic/TempProjectHelper.ts index fdcdc800d2b..8cd0bcc94e2 100644 --- a/libraries/rush-lib/src/logic/TempProjectHelper.ts +++ b/libraries/rush-lib/src/logic/TempProjectHelper.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { FileConstants, FileSystem, PosixModeBits } from '@rushstack/node-core-library'; +import * as path from 'node:path'; + import * as tar from 'tar'; -import * as path from 'path'; + +import { FileConstants, FileSystem, PosixModeBits } from '@rushstack/node-core-library'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; import type { RushConfiguration } from '../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/UnlinkManager.ts b/libraries/rush-lib/src/logic/UnlinkManager.ts index fa667dc1a6f..d77a73b97b4 100644 --- a/libraries/rush-lib/src/logic/UnlinkManager.ts +++ b/libraries/rush-lib/src/logic/UnlinkManager.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, AlreadyReportedError } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/VersionManager.ts b/libraries/rush-lib/src/logic/VersionManager.ts index 92ddb7b4701..7a2f57840e9 100644 --- a/libraries/rush-lib/src/logic/VersionManager.ts +++ b/libraries/rush-lib/src/logic/VersionManager.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; + import { type IPackageJson, JsonFile, FileConstants } from '@rushstack/node-core-library'; import { type VersionPolicy, type BumpType, LockStepVersionPolicy } from '../api/VersionPolicy'; diff --git a/libraries/rush-lib/src/logic/base/BaseInstallManager.ts b/libraries/rush-lib/src/logic/base/BaseInstallManager.ts index 0de25480f03..a38af503f97 100644 --- a/libraries/rush-lib/src/logic/base/BaseInstallManager.ts +++ b/libraries/rush-lib/src/logic/base/BaseInstallManager.ts @@ -1,10 +1,21 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as path from 'path'; -import * as crypto from 'crypto'; +import * as os from 'node:os'; +import * as path from 'node:path'; +import * as crypto from 'node:crypto'; +import { existsSync } from 'node:fs'; +import { readFile, unlink } from 'node:fs/promises'; + import * as semver from 'semver'; +import { + type ILockfile, + type ILockfilePackage, + type ILogMessageCallbackOptions, + pnpmSyncGetJsonVersion, + pnpmSyncPrepareAsync +} from 'pnpm-sync-lib'; + import { FileSystem, JsonFile, @@ -16,16 +27,7 @@ import { type FolderItem, Async } from '@rushstack/node-core-library'; -import { existsSync } from 'fs'; -import { readFile, unlink } from 'fs/promises'; import { PrintUtilities, Colorize, type ITerminal } from '@rushstack/terminal'; -import { - type ILockfile, - type ILockfilePackage, - type ILogMessageCallbackOptions, - pnpmSyncGetJsonVersion, - pnpmSyncPrepareAsync -} from 'pnpm-sync-lib'; import { ApprovedPackagesChecker } from '../ApprovedPackagesChecker'; import type { AsyncRecycler } from '../../utilities/AsyncRecycler'; diff --git a/libraries/rush-lib/src/logic/base/BaseInstallManagerTypes.ts b/libraries/rush-lib/src/logic/base/BaseInstallManagerTypes.ts index 47017a1da12..2825f927fe4 100644 --- a/libraries/rush-lib/src/logic/base/BaseInstallManagerTypes.ts +++ b/libraries/rush-lib/src/logic/base/BaseInstallManagerTypes.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { ITerminal } from '@rushstack/terminal'; + import type { Subspace } from '../../api/Subspace'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; diff --git a/libraries/rush-lib/src/logic/base/BaseLinkManager.ts b/libraries/rush-lib/src/logic/base/BaseLinkManager.ts index d469210d4c6..ace4c2d0943 100644 --- a/libraries/rush-lib/src/logic/base/BaseLinkManager.ts +++ b/libraries/rush-lib/src/logic/base/BaseLinkManager.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem, diff --git a/libraries/rush-lib/src/logic/base/BaseShrinkwrapFile.ts b/libraries/rush-lib/src/logic/base/BaseShrinkwrapFile.ts index bfedfdcd88e..04d64cc8ebd 100644 --- a/libraries/rush-lib/src/logic/base/BaseShrinkwrapFile.ts +++ b/libraries/rush-lib/src/logic/base/BaseShrinkwrapFile.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import * as semver from 'semver'; + import { Colorize, type ITerminal } from '@rushstack/terminal'; import { RushConstants } from '../RushConstants'; diff --git a/libraries/rush-lib/src/logic/buildCache/FileSystemBuildCacheProvider.ts b/libraries/rush-lib/src/logic/buildCache/FileSystemBuildCacheProvider.ts index 240dc6477e0..8fdd54bf444 100644 --- a/libraries/rush-lib/src/logic/buildCache/FileSystemBuildCacheProvider.ts +++ b/libraries/rush-lib/src/logic/buildCache/FileSystemBuildCacheProvider.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/buildCache/OperationBuildCache.ts b/libraries/rush-lib/src/logic/buildCache/OperationBuildCache.ts index d603c094547..7fbc065881d 100644 --- a/libraries/rush-lib/src/logic/buildCache/OperationBuildCache.ts +++ b/libraries/rush-lib/src/logic/buildCache/OperationBuildCache.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as crypto from 'crypto'; +import * as path from 'node:path'; +import * as crypto from 'node:crypto'; import { FileSystem, type FolderItem, InternalError, Async } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/deploy/DeployScenarioConfiguration.ts b/libraries/rush-lib/src/logic/deploy/DeployScenarioConfiguration.ts index c0c2534929e..c4d6f0c1cfd 100644 --- a/libraries/rush-lib/src/logic/deploy/DeployScenarioConfiguration.ts +++ b/libraries/rush-lib/src/logic/deploy/DeployScenarioConfiguration.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, JsonFile, JsonSchema } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/dotenv.ts b/libraries/rush-lib/src/logic/dotenv.ts index cee2f677f28..7df044eecac 100644 --- a/libraries/rush-lib/src/logic/dotenv.ts +++ b/libraries/rush-lib/src/logic/dotenv.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import path from 'node:path'; + import dotenv from 'dotenv'; + import type { ITerminal } from '@rushstack/terminal'; import { RushUserConfiguration } from '../api/RushUserConfiguration'; diff --git a/libraries/rush-lib/src/logic/installManager/InstallHelpers.ts b/libraries/rush-lib/src/logic/installManager/InstallHelpers.ts index 40f3354879c..65a640c69db 100644 --- a/libraries/rush-lib/src/logic/installManager/InstallHelpers.ts +++ b/libraries/rush-lib/src/logic/installManager/InstallHelpers.ts @@ -1,7 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + +import * as semver from 'semver'; + import { FileConstants, FileSystem, @@ -21,7 +24,6 @@ import type { PnpmOptionsConfiguration } from '../pnpm/PnpmOptionsConfiguration' import { merge } from '../../utilities/objectUtilities'; import type { Subspace } from '../../api/Subspace'; import { RushConstants } from '../RushConstants'; -import * as semver from 'semver'; interface ICommonPackageJson extends IPackageJson { pnpm?: { diff --git a/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts b/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts index 61553a000be..1c328e29410 100644 --- a/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts +++ b/libraries/rush-lib/src/logic/installManager/RushInstallManager.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; + import * as semver from 'semver'; import * as ssri from 'ssri'; + import { JsonFile, Text, diff --git a/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts b/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts index 3846b1217ca..c97af72bba1 100644 --- a/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts +++ b/libraries/rush-lib/src/logic/installManager/WorkspaceInstallManager.ts @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; +import { createHash } from 'node:crypto'; + import * as semver from 'semver'; import yaml from 'js-yaml'; + import { FileSystem, FileConstants, @@ -13,7 +16,7 @@ import { Path, Sort } from '@rushstack/node-core-library'; -import { createHash } from 'crypto'; +import { Colorize, ConsoleTerminalProvider } from '@rushstack/terminal'; import { BaseInstallManager } from '../base/BaseInstallManager'; import type { IInstallManagerOptions } from '../base/BaseInstallManagerTypes'; @@ -38,7 +41,6 @@ import { type CustomTipId, type ICustomTipInfo, PNPM_CUSTOM_TIPS } from '../../a import type { PnpmShrinkwrapFile } from '../pnpm/PnpmShrinkwrapFile'; import { objectsAreDeepEqual } from '../../utilities/objectUtilities'; import type { Subspace } from '../../api/Subspace'; -import { Colorize, ConsoleTerminalProvider } from '@rushstack/terminal'; import { BaseLinkManager, SymlinkKind } from '../base/BaseLinkManager'; import { FlagFile } from '../../api/FlagFile'; import { Stopwatch } from '../../utilities/Stopwatch'; diff --git a/libraries/rush-lib/src/logic/npm/NpmLinkManager.ts b/libraries/rush-lib/src/logic/npm/NpmLinkManager.ts index d1173492c23..97e4098d7ef 100644 --- a/libraries/rush-lib/src/logic/npm/NpmLinkManager.ts +++ b/libraries/rush-lib/src/logic/npm/NpmLinkManager.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; import * as tar from 'tar'; import readPackageTree from 'read-package-tree'; + import { FileSystem, FileConstants, LegacyAdapters } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/npm/NpmPackage.ts b/libraries/rush-lib/src/logic/npm/NpmPackage.ts index 352d0925b53..354b32475af 100644 --- a/libraries/rush-lib/src/logic/npm/NpmPackage.ts +++ b/libraries/rush-lib/src/logic/npm/NpmPackage.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type readPackageTree from 'read-package-tree'; + import { JsonFile, type IPackageJson } from '@rushstack/node-core-library'; import { BasePackage, type IRushTempPackageJson } from '../base/BasePackage'; diff --git a/libraries/rush-lib/src/logic/operations/BuildPlanPlugin.ts b/libraries/rush-lib/src/logic/operations/BuildPlanPlugin.ts index 6fca2858c0b..85376112da5 100644 --- a/libraries/rush-lib/src/logic/operations/BuildPlanPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/BuildPlanPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { ITerminal } from '@rushstack/terminal'; + import type { IExecuteOperationsContext, IPhasedCommandPlugin, diff --git a/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts b/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts index 48eecc16abc..25103ee9220 100644 --- a/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as crypto from 'crypto'; +import * as crypto from 'node:crypto'; + import { InternalError, NewlineKind, Sort } from '@rushstack/node-core-library'; import { CollatedTerminal, type CollatedWriter } from '@rushstack/stream-collator'; import { DiscardStdoutTransform, TextRewriterTransform } from '@rushstack/terminal'; @@ -22,7 +23,6 @@ import type { CobuildConfiguration } from '../../api/CobuildConfiguration'; import { DisjointSet } from '../cobuild/DisjointSet'; import { PeriodicCallback } from './PeriodicCallback'; import { NullTerminalProvider } from '../../utilities/NullTerminalProvider'; - import type { Operation } from './Operation'; import type { IOperationRunnerContext } from './IOperationRunner'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; diff --git a/libraries/rush-lib/src/logic/operations/DebugHashesPlugin.ts b/libraries/rush-lib/src/logic/operations/DebugHashesPlugin.ts index c0f8acda653..8af179838d6 100644 --- a/libraries/rush-lib/src/logic/operations/DebugHashesPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/DebugHashesPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { Colorize, type ITerminal } from '@rushstack/terminal'; + import type { IPhasedCommandPlugin, PhasedCommandHooks } from '../../pluginFramework/PhasedCommandHooks'; import type { Operation } from './Operation'; import type { IOperationExecutionResult } from './IOperationExecutionResult'; diff --git a/libraries/rush-lib/src/logic/operations/IOperationExecutionResult.ts b/libraries/rush-lib/src/logic/operations/IOperationExecutionResult.ts index e25c84359b5..e7658c210b8 100644 --- a/libraries/rush-lib/src/logic/operations/IOperationExecutionResult.ts +++ b/libraries/rush-lib/src/logic/operations/IOperationExecutionResult.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { StdioSummarizer, IProblemCollector } from '@rushstack/terminal'; + import type { OperationStatus } from './OperationStatus'; import type { Operation } from './Operation'; import type { IStopwatchResult } from '../../utilities/Stopwatch'; diff --git a/libraries/rush-lib/src/logic/operations/NodeDiagnosticDirPlugin.ts b/libraries/rush-lib/src/logic/operations/NodeDiagnosticDirPlugin.ts index 159d3d1e161..28df11044c4 100644 --- a/libraries/rush-lib/src/logic/operations/NodeDiagnosticDirPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/NodeDiagnosticDirPlugin.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { FileSystem } from '@rushstack/node-core-library'; diff --git a/libraries/rush-lib/src/logic/operations/OperationExecutionRecord.ts b/libraries/rush-lib/src/logic/operations/OperationExecutionRecord.ts index 8534a50aa72..63da9421b54 100644 --- a/libraries/rush-lib/src/logic/operations/OperationExecutionRecord.ts +++ b/libraries/rush-lib/src/logic/operations/OperationExecutionRecord.ts @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as crypto from 'crypto'; + +import * as crypto from 'node:crypto'; import { type ITerminal, diff --git a/libraries/rush-lib/src/logic/operations/OperationMetadataManager.ts b/libraries/rush-lib/src/logic/operations/OperationMetadataManager.ts index b1244a6e0a6..e3f1f2f0dc5 100644 --- a/libraries/rush-lib/src/logic/operations/OperationMetadataManager.ts +++ b/libraries/rush-lib/src/logic/operations/OperationMetadataManager.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as fs from 'fs'; +import * as fs from 'node:fs'; + import { Async, FileSystem, type IFileSystemCopyFileOptions } from '@rushstack/node-core-library'; import { type ITerminalChunk, @@ -13,7 +14,6 @@ import { import { OperationStateFile } from './OperationStateFile'; import { RushConstants } from '../RushConstants'; - import type { IOperationStateJson } from './OperationStateFile'; import type { Operation } from './Operation'; import { type IStopwatchResult, Stopwatch } from '../../utilities/Stopwatch'; diff --git a/libraries/rush-lib/src/logic/operations/PhasedOperationPlugin.ts b/libraries/rush-lib/src/logic/operations/PhasedOperationPlugin.ts index c52cb285530..d83ff4bad07 100644 --- a/libraries/rush-lib/src/logic/operations/PhasedOperationPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/PhasedOperationPlugin.ts @@ -3,7 +3,6 @@ import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; import type { IPhase } from '../../api/CommandLineConfiguration'; - import { Operation } from './Operation'; import type { ICreateOperationsContext, diff --git a/libraries/rush-lib/src/logic/operations/PnpmSyncCopyOperationPlugin.ts b/libraries/rush-lib/src/logic/operations/PnpmSyncCopyOperationPlugin.ts index 942e8156639..457ec654d23 100644 --- a/libraries/rush-lib/src/logic/operations/PnpmSyncCopyOperationPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/PnpmSyncCopyOperationPlugin.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { type ILogMessageCallbackOptions, pnpmSyncCopyAsync } from 'pnpm-sync-lib'; + import { Async, FileSystem } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import { type ILogMessageCallbackOptions, pnpmSyncCopyAsync } from 'pnpm-sync-lib'; import { OperationStatus } from './OperationStatus'; import type { IOperationRunnerContext } from './IOperationRunner'; diff --git a/libraries/rush-lib/src/logic/operations/ValidateOperationsPlugin.ts b/libraries/rush-lib/src/logic/operations/ValidateOperationsPlugin.ts index b5e3529b80c..3b75af31dd2 100644 --- a/libraries/rush-lib/src/logic/operations/ValidateOperationsPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/ValidateOperationsPlugin.ts @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import type { ITerminal } from '@rushstack/terminal'; + import type { Operation } from './Operation'; import type { ICreateOperationsContext, @@ -10,7 +12,6 @@ import type { import type { IOperationExecutionResult } from './IOperationExecutionResult'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; import type { RushProjectConfiguration } from '../../api/RushProjectConfiguration'; -import type { ITerminal } from '@rushstack/terminal'; import type { IPhase } from '../../api/CommandLineConfiguration'; const PLUGIN_NAME: 'ValidateOperationsPlugin' = 'ValidateOperationsPlugin'; diff --git a/libraries/rush-lib/src/logic/operations/WeightedOperationPlugin.ts b/libraries/rush-lib/src/logic/operations/WeightedOperationPlugin.ts index 9df7cc40d7e..4df5596df2c 100644 --- a/libraries/rush-lib/src/logic/operations/WeightedOperationPlugin.ts +++ b/libraries/rush-lib/src/logic/operations/WeightedOperationPlugin.ts @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { Async } from '@rushstack/node-core-library'; + import type { Operation } from './Operation'; import type { ICreateOperationsContext, @@ -10,7 +12,6 @@ import type { import type { IOperationSettings, RushProjectConfiguration } from '../../api/RushProjectConfiguration'; import type { IOperationExecutionResult } from './IOperationExecutionResult'; import type { OperationExecutionRecord } from './OperationExecutionRecord'; -import { Async } from '@rushstack/node-core-library'; const PLUGIN_NAME: 'WeightedOperationPlugin' = 'WeightedOperationPlugin'; diff --git a/libraries/rush-lib/src/logic/operations/test/BuildPlanPlugin.test.ts b/libraries/rush-lib/src/logic/operations/test/BuildPlanPlugin.test.ts index dd35166dd80..20c1586e58f 100644 --- a/libraries/rush-lib/src/logic/operations/test/BuildPlanPlugin.test.ts +++ b/libraries/rush-lib/src/logic/operations/test/BuildPlanPlugin.test.ts @@ -22,7 +22,7 @@ import { PhasedOperationPlugin } from '../PhasedOperationPlugin'; import type { RushConfigurationProject } from '../../../api/RushConfigurationProject'; import { RushConstants } from '../../RushConstants'; import { MockOperationRunner } from './MockOperationRunner'; -import path from 'path'; +import path from 'node:path'; import type { ICommandLineJson } from '../../../api/CommandLineJson'; import type { IInputsSnapshot } from '../../incremental/InputsSnapshot'; diff --git a/libraries/rush-lib/src/logic/operations/test/OperationMetadataManager.test.ts b/libraries/rush-lib/src/logic/operations/test/OperationMetadataManager.test.ts index f1da66fe429..5663d143e39 100644 --- a/libraries/rush-lib/src/logic/operations/test/OperationMetadataManager.test.ts +++ b/libraries/rush-lib/src/logic/operations/test/OperationMetadataManager.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.mock('../OperationStateFile'); -jest.mock('fs'); +jest.mock('node:fs'); import { MockWritable, StringBufferTerminalProvider, Terminal, TerminalChunkKind } from '@rushstack/terminal'; import type { IPhase } from '../../../api/CommandLineConfiguration'; @@ -11,8 +11,8 @@ import { OperationMetadataManager } from '../OperationMetadataManager'; import { CollatedTerminalProvider } from '../../../utilities/CollatedTerminalProvider'; import { CollatedTerminal } from '@rushstack/stream-collator'; import { FileSystem } from '@rushstack/node-core-library'; -import * as fs from 'fs'; -import { Readable } from 'stream'; +import * as fs from 'node:fs'; +import { Readable } from 'node:stream'; import { Operation } from '../Operation'; const mockWritable: MockWritable = new MockWritable(); diff --git a/libraries/rush-lib/src/logic/operations/test/PhasedOperationPlugin.test.ts b/libraries/rush-lib/src/logic/operations/test/PhasedOperationPlugin.test.ts index c2325c34d8c..ef16651af85 100644 --- a/libraries/rush-lib/src/logic/operations/test/PhasedOperationPlugin.test.ts +++ b/libraries/rush-lib/src/logic/operations/test/PhasedOperationPlugin.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { JsonFile } from '@rushstack/node-core-library'; import { RushConfiguration } from '../../../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/operations/test/ShellOperationRunnerPlugin.test.ts b/libraries/rush-lib/src/logic/operations/test/ShellOperationRunnerPlugin.test.ts index d259ddcccd1..912531e3eef 100644 --- a/libraries/rush-lib/src/logic/operations/test/ShellOperationRunnerPlugin.test.ts +++ b/libraries/rush-lib/src/logic/operations/test/ShellOperationRunnerPlugin.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { JsonFile } from '@rushstack/node-core-library'; import { RushConfiguration } from '../../../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/logic/pnpm/IPnpmfile.ts b/libraries/rush-lib/src/logic/pnpm/IPnpmfile.ts index 0104bc238b7..0e8620f318c 100644 --- a/libraries/rush-lib/src/logic/pnpm/IPnpmfile.ts +++ b/libraries/rush-lib/src/logic/pnpm/IPnpmfile.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import type { LogBase } from '@pnpm/logger'; + import type { IPackageJson } from '@rushstack/node-core-library'; + import type { IPnpmShrinkwrapYaml } from './PnpmShrinkwrapFile'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmLinkManager.ts b/libraries/rush-lib/src/logic/pnpm/PnpmLinkManager.ts index a0b1466ee48..15facc8eeef 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmLinkManager.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmLinkManager.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import * as crypto from 'crypto'; +import * as path from 'node:path'; +import * as crypto from 'node:crypto'; + import uriEncode from 'strict-uri-encode'; import pnpmLinkBins from '@pnpm/link-bins'; import * as semver from 'semver'; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmProjectShrinkwrapFile.ts b/libraries/rush-lib/src/logic/pnpm/PnpmProjectShrinkwrapFile.ts index 8832b233b6c..64308b19fa8 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmProjectShrinkwrapFile.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmProjectShrinkwrapFile.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as crypto from 'crypto'; +import * as crypto from 'node:crypto'; + import { InternalError, JsonFile } from '@rushstack/node-core-library'; import { BaseProjectShrinkwrapFile } from '../base/BaseProjectShrinkwrapFile'; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmShrinkWrapFileConverters.ts b/libraries/rush-lib/src/logic/pnpm/PnpmShrinkWrapFileConverters.ts index ca57585da1d..c2c549fb21c 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmShrinkWrapFileConverters.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmShrinkWrapFileConverters.ts @@ -24,6 +24,7 @@ import type { ProjectSnapshot, ResolvedDependencies } from '@pnpm/lockfile.types'; + import { removeNullishProps } from '../../utilities/objectUtilities'; type DepPath = string & { __brand: 'DepPath' }; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmShrinkwrapFile.ts b/libraries/rush-lib/src/logic/pnpm/PnpmShrinkwrapFile.ts index 5c63d293cd9..4c1bad0346c 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmShrinkwrapFile.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmShrinkwrapFile.ts @@ -1,9 +1,20 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; +import crypto from 'node:crypto'; + import * as semver from 'semver'; -import crypto from 'crypto'; +import * as dependencyPathLockfilePreV9 from '@pnpm/dependency-path-lockfile-pre-v9'; +import * as dependencyPath from '@pnpm/dependency-path'; +import type { + ProjectId, + Lockfile, + PackageSnapshot, + ProjectSnapshot, + LockfileFileV9, + ResolvedDependencies +} from '@pnpm/lockfile.types'; import { FileSystem, @@ -14,8 +25,7 @@ import { InternalError } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; -import * as dependencyPathLockfilePreV9 from '@pnpm/dependency-path-lockfile-pre-v9'; -import * as dependencyPath from '@pnpm/dependency-path'; +import type { IReadonlyLookupByPath } from '@rushstack/lookup-by-path'; import { BaseShrinkwrapFile } from '../base/BaseShrinkwrapFile'; import { DependencySpecifier } from '../DependencySpecifier'; @@ -33,16 +43,7 @@ import { PnpmOptionsConfiguration } from './PnpmOptionsConfiguration'; import type { IPnpmfile, IPnpmfileContext } from './IPnpmfile'; import type { Subspace } from '../../api/Subspace'; import { CustomTipId, type CustomTipsConfiguration } from '../../api/CustomTipsConfiguration'; -import type { - ProjectId, - Lockfile, - PackageSnapshot, - ProjectSnapshot, - LockfileFileV9, - ResolvedDependencies -} from '@pnpm/lockfile.types'; import { convertLockfileV9ToLockfileObject } from './PnpmShrinkWrapFileConverters'; -import type { IReadonlyLookupByPath } from '@rushstack/lookup-by-path'; const yamlModule: typeof import('js-yaml') = Import.lazy('js-yaml', require); diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmWorkspaceFile.ts b/libraries/rush-lib/src/logic/pnpm/PnpmWorkspaceFile.ts index 989ad898f77..8ecccd04c0f 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmWorkspaceFile.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmWorkspaceFile.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { Sort, Import, Path } from '@rushstack/node-core-library'; import { BaseWorkspaceFile } from '../base/BaseWorkspaceFile'; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts b/libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts index 9b89c94ced0..de73e3a5cc9 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmfileConfiguration.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import * as semver from 'semver'; + import { FileSystem, Import, type IPackageJson, JsonFile, MapExtensions } from '@rushstack/node-core-library'; import type { PnpmPackageManager } from '../../api/packageManager/PnpmPackageManager'; @@ -11,7 +13,6 @@ import type { CommonVersionsConfiguration } from '../../api/CommonVersionsConfig import type { PnpmOptionsConfiguration } from './PnpmOptionsConfiguration'; import * as pnpmfile from './PnpmfileShim'; import { pnpmfileShimFilename, scriptsFolderPath } from '../../utilities/PathConstants'; - import type { IPnpmfileContext, IPnpmfileShimSettings } from './IPnpmfile'; import type { Subspace } from '../../api/Subspace'; diff --git a/libraries/rush-lib/src/logic/pnpm/PnpmfileShim.ts b/libraries/rush-lib/src/logic/pnpm/PnpmfileShim.ts index dee28859b8c..924ce92c7eb 100644 --- a/libraries/rush-lib/src/logic/pnpm/PnpmfileShim.ts +++ b/libraries/rush-lib/src/logic/pnpm/PnpmfileShim.ts @@ -9,6 +9,7 @@ // This file can use "import type" but otherwise should not reference any other modules, since it will // be run from the "common/temp" directory import type * as TSemver from 'semver'; + import type { IPackageJson } from '@rushstack/node-core-library'; import type { IPnpmShrinkwrapYaml } from './PnpmShrinkwrapFile'; diff --git a/libraries/rush-lib/src/logic/pnpm/SubspaceGlobalPnpmfileShim.ts b/libraries/rush-lib/src/logic/pnpm/SubspaceGlobalPnpmfileShim.ts index 83573297750..02c143fcb31 100644 --- a/libraries/rush-lib/src/logic/pnpm/SubspaceGlobalPnpmfileShim.ts +++ b/libraries/rush-lib/src/logic/pnpm/SubspaceGlobalPnpmfileShim.ts @@ -6,11 +6,12 @@ // It reads its input data from "common/temp/pnpmfileSettings.json". The pnpmfile is // required directly by this shim and is called after Rush's transformations are applied. -import path from 'path'; +import path from 'node:path'; // This file can use "import type" but otherwise should not reference any other modules, since it will // be run from the "common/temp" directory import type * as TSemver from 'semver'; + import type { IPackageJson } from '@rushstack/node-core-library'; import type { diff --git a/libraries/rush-lib/src/logic/pnpm/SubspacePnpmfileConfiguration.ts b/libraries/rush-lib/src/logic/pnpm/SubspacePnpmfileConfiguration.ts index 327f1787de7..6493ea0fa66 100644 --- a/libraries/rush-lib/src/logic/pnpm/SubspacePnpmfileConfiguration.ts +++ b/libraries/rush-lib/src/logic/pnpm/SubspacePnpmfileConfiguration.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, Import, JsonFile, type IDependenciesMetaTable } from '@rushstack/node-core-library'; -import { subspacePnpmfileShimFilename, scriptsFolderPath } from '../../utilities/PathConstants'; +import { subspacePnpmfileShimFilename, scriptsFolderPath } from '../../utilities/PathConstants'; import type { ISubspacePnpmfileShimSettings, IWorkspaceProjectInfo } from './IPnpmfile'; import type { RushConfiguration } from '../../api/RushConfiguration'; import type { RushConfigurationProject } from '../../api/RushConfigurationProject'; diff --git a/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts b/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts index 8fc9a7552d2..4d4ab4a7bb2 100644 --- a/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts +++ b/libraries/rush-lib/src/logic/pnpm/test/PnpmOptionsConfiguration.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { PnpmOptionsConfiguration } from '../PnpmOptionsConfiguration'; import { TestUtilities } from '@rushstack/heft-config-file'; diff --git a/libraries/rush-lib/src/logic/setup/KeyboardLoop.ts b/libraries/rush-lib/src/logic/setup/KeyboardLoop.ts index 403ba12ebb3..f599e548413 100644 --- a/libraries/rush-lib/src/logic/setup/KeyboardLoop.ts +++ b/libraries/rush-lib/src/logic/setup/KeyboardLoop.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as readline from 'readline'; -import * as process from 'process'; +import * as readline from 'node:readline'; +import * as process from 'node:process'; + import { AlreadyReportedError, InternalError } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/setup/SetupPackageRegistry.ts b/libraries/rush-lib/src/logic/setup/SetupPackageRegistry.ts index a9097e7182f..3a681a5b75e 100644 --- a/libraries/rush-lib/src/logic/setup/SetupPackageRegistry.ts +++ b/libraries/rush-lib/src/logic/setup/SetupPackageRegistry.ts @@ -1,8 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import type * as child_process from 'child_process'; +import * as path from 'node:path'; +import type * as child_process from 'node:child_process'; + import { AlreadyReportedError, Executable, diff --git a/libraries/rush-lib/src/logic/setup/TerminalInput.ts b/libraries/rush-lib/src/logic/setup/TerminalInput.ts index 740e6c92de2..84546ddce9d 100644 --- a/libraries/rush-lib/src/logic/setup/TerminalInput.ts +++ b/libraries/rush-lib/src/logic/setup/TerminalInput.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as readline from 'readline'; -import * as process from 'process'; +import * as readline from 'node:readline'; +import * as process from 'node:process'; import { AnsiEscape, Colorize } from '@rushstack/terminal'; diff --git a/libraries/rush-lib/src/logic/test/BaseInstallManager.test.ts b/libraries/rush-lib/src/logic/test/BaseInstallManager.test.ts index 74bbc2afacf..21a2f460d3c 100644 --- a/libraries/rush-lib/src/logic/test/BaseInstallManager.test.ts +++ b/libraries/rush-lib/src/logic/test/BaseInstallManager.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { ConsoleTerminalProvider, type ITerminal, Terminal } from '@rushstack/terminal'; import { PurgeManager } from '../PurgeManager'; diff --git a/libraries/rush-lib/src/logic/test/PublishGit.test.ts b/libraries/rush-lib/src/logic/test/PublishGit.test.ts index 75db6cc8405..6cb8fb98453 100644 --- a/libraries/rush-lib/src/logic/test/PublishGit.test.ts +++ b/libraries/rush-lib/src/logic/test/PublishGit.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { RushConfiguration } from '../../api/RushConfiguration'; import { Git } from '../Git'; diff --git a/libraries/rush-lib/src/logic/test/ShrinkwrapFile.test.ts b/libraries/rush-lib/src/logic/test/ShrinkwrapFile.test.ts index 2104bb07b10..7211e1af79f 100644 --- a/libraries/rush-lib/src/logic/test/ShrinkwrapFile.test.ts +++ b/libraries/rush-lib/src/logic/test/ShrinkwrapFile.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { JsonFile } from '@rushstack/node-core-library'; import type { BaseShrinkwrapFile } from '../base/BaseShrinkwrapFile'; diff --git a/libraries/rush-lib/src/logic/yarn/YarnShrinkwrapFile.ts b/libraries/rush-lib/src/logic/yarn/YarnShrinkwrapFile.ts index 70d851802e1..cbf068a8d41 100644 --- a/libraries/rush-lib/src/logic/yarn/YarnShrinkwrapFile.ts +++ b/libraries/rush-lib/src/logic/yarn/YarnShrinkwrapFile.ts @@ -1,13 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { BaseShrinkwrapFile } from '../base/BaseShrinkwrapFile'; import { FileSystem, type IParsedPackageNameOrError, InternalError, Import } from '@rushstack/node-core-library'; + +import { BaseShrinkwrapFile } from '../base/BaseShrinkwrapFile'; import { RushConstants } from '../RushConstants'; import type { DependencySpecifier } from '../DependencySpecifier'; import { PackageNameParsers } from '../../api/PackageNameParsers'; diff --git a/libraries/rush-lib/src/pluginFramework/PhasedCommandHooks.ts b/libraries/rush-lib/src/pluginFramework/PhasedCommandHooks.ts index 84f3fbd58ab..97ccdb064aa 100644 --- a/libraries/rush-lib/src/pluginFramework/PhasedCommandHooks.ts +++ b/libraries/rush-lib/src/pluginFramework/PhasedCommandHooks.ts @@ -9,6 +9,7 @@ import { SyncHook, SyncWaterfallHook } from 'tapable'; + import type { CommandLineParameter } from '@rushstack/ts-command-line'; import type { BuildCacheConfiguration } from '../api/BuildCacheConfiguration'; diff --git a/libraries/rush-lib/src/pluginFramework/PluginLoader/AutoinstallerPluginLoader.ts b/libraries/rush-lib/src/pluginFramework/PluginLoader/AutoinstallerPluginLoader.ts index b5a1270cb12..ad19acb0386 100644 --- a/libraries/rush-lib/src/pluginFramework/PluginLoader/AutoinstallerPluginLoader.ts +++ b/libraries/rush-lib/src/pluginFramework/PluginLoader/AutoinstallerPluginLoader.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { FileSystem, JsonFile, diff --git a/libraries/rush-lib/src/pluginFramework/PluginLoader/PluginLoaderBase.ts b/libraries/rush-lib/src/pluginFramework/PluginLoader/PluginLoaderBase.ts index 9c31c38e060..1c56731bdbe 100644 --- a/libraries/rush-lib/src/pluginFramework/PluginLoader/PluginLoaderBase.ts +++ b/libraries/rush-lib/src/pluginFramework/PluginLoader/PluginLoaderBase.ts @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; + import { FileSystem, InternalError, @@ -9,7 +11,6 @@ import { JsonSchema } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import * as path from 'path'; import { CommandLineConfiguration } from '../../api/CommandLineConfiguration'; import type { RushConfiguration } from '../../api/RushConfiguration'; diff --git a/libraries/rush-lib/src/pluginFramework/RushLifeCycle.ts b/libraries/rush-lib/src/pluginFramework/RushLifeCycle.ts index df190a0d598..76e51d8e17d 100644 --- a/libraries/rush-lib/src/pluginFramework/RushLifeCycle.ts +++ b/libraries/rush-lib/src/pluginFramework/RushLifeCycle.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. import { AsyncParallelHook, AsyncSeriesHook, HookMap } from 'tapable'; -import type { ITelemetryData } from '../logic/Telemetry'; +import type { ITelemetryData } from '../logic/Telemetry'; import type { PhasedCommandHooks } from './PhasedCommandHooks'; import type { Subspace } from '../api/Subspace'; diff --git a/libraries/rush-lib/src/pluginFramework/RushSession.ts b/libraries/rush-lib/src/pluginFramework/RushSession.ts index 221a23133f8..0e512764438 100644 --- a/libraries/rush-lib/src/pluginFramework/RushSession.ts +++ b/libraries/rush-lib/src/pluginFramework/RushSession.ts @@ -3,9 +3,9 @@ import { InternalError } from '@rushstack/node-core-library'; import type { ITerminalProvider } from '@rushstack/terminal'; + import { type ILogger, type ILoggerOptions, Logger } from './logging/Logger'; import { RushLifecycleHooks } from './RushLifeCycle'; - import type { IBuildCacheJson } from '../api/BuildCacheConfiguration'; import type { ICloudBuildCacheProvider } from '../logic/buildCache/ICloudBuildCacheProvider'; import type { ICobuildJson } from '../api/CobuildConfiguration'; diff --git a/libraries/rush-lib/src/scripts/install-run-rush.ts b/libraries/rush-lib/src/scripts/install-run-rush.ts index ce48c4d8fde..bfb986d46e4 100644 --- a/libraries/rush-lib/src/scripts/install-run-rush.ts +++ b/libraries/rush-lib/src/scripts/install-run-rush.ts @@ -3,8 +3,8 @@ /* eslint-disable no-console */ -import * as path from 'path'; -import * as fs from 'fs'; +import * as path from 'node:path'; +import * as fs from 'node:fs'; const { installAndRun, diff --git a/libraries/rush-lib/src/scripts/install-run.ts b/libraries/rush-lib/src/scripts/install-run.ts index 775e87eb89e..03b15d8567c 100644 --- a/libraries/rush-lib/src/scripts/install-run.ts +++ b/libraries/rush-lib/src/scripts/install-run.ts @@ -3,11 +3,13 @@ /* eslint-disable no-console */ -import * as childProcess from 'child_process'; -import * as fs from 'fs'; -import * as os from 'os'; -import * as path from 'path'; +import * as childProcess from 'node:child_process'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import * as path from 'node:path'; + import type { IPackageJson } from '@rushstack/node-core-library'; + import { syncNpmrc, type ILogger } from '../utilities/npmrcUtilities'; import type { RushConstants } from '../logic/RushConstants'; diff --git a/libraries/rush-lib/src/utilities/AsyncRecycler.ts b/libraries/rush-lib/src/utilities/AsyncRecycler.ts index 3ca0949917c..bfb58a81c4f 100644 --- a/libraries/rush-lib/src/utilities/AsyncRecycler.ts +++ b/libraries/rush-lib/src/utilities/AsyncRecycler.ts @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as child_process from 'child_process'; -import * as fs from 'fs'; -import * as os from 'os'; -import * as path from 'path'; +import * as child_process from 'node:child_process'; +import * as fs from 'node:fs'; +import * as os from 'node:os'; +import * as path from 'node:path'; import { Text, Path, FileSystem, type FolderItem } from '@rushstack/node-core-library'; diff --git a/libraries/rush-lib/src/utilities/HotlinkManager.ts b/libraries/rush-lib/src/utilities/HotlinkManager.ts index 4018c37f8c1..677e2b770f8 100644 --- a/libraries/rush-lib/src/utilities/HotlinkManager.ts +++ b/libraries/rush-lib/src/utilities/HotlinkManager.ts @@ -1,6 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { pnpmSyncUpdateFileAsync, pnpmSyncCopyAsync, type ILogMessageCallbackOptions } from 'pnpm-sync-lib'; +import * as semver from 'semver'; + import { Colorize, type ITerminal } from '@rushstack/terminal'; import { AlreadyExistsBehavior, @@ -14,8 +17,6 @@ import { type IPackageJsonDependencyTable } from '@rushstack/node-core-library'; import { PackageExtractor } from '@rushstack/package-extractor'; -import { pnpmSyncUpdateFileAsync, pnpmSyncCopyAsync, type ILogMessageCallbackOptions } from 'pnpm-sync-lib'; -import * as semver from 'semver'; import type { RushConfiguration } from '../api/RushConfiguration'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; diff --git a/libraries/rush-lib/src/utilities/InteractiveUpgradeUI.ts b/libraries/rush-lib/src/utilities/InteractiveUpgradeUI.ts index f5e99b10032..11e9640de3c 100644 --- a/libraries/rush-lib/src/utilities/InteractiveUpgradeUI.ts +++ b/libraries/rush-lib/src/utilities/InteractiveUpgradeUI.ts @@ -11,6 +11,7 @@ import inquirer from 'inquirer'; import CliTable from 'cli-table'; import type Separator from 'inquirer/lib/objects/separator'; import type * as NpmCheck from 'npm-check'; + import { AnsiEscape, Colorize } from '@rushstack/terminal'; export interface IUIGroup { diff --git a/libraries/rush-lib/src/utilities/Npm.ts b/libraries/rush-lib/src/utilities/Npm.ts index 066be706e9a..f023e188e67 100644 --- a/libraries/rush-lib/src/utilities/Npm.ts +++ b/libraries/rush-lib/src/utilities/Npm.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Utilities } from './Utilities'; import * as semver from 'semver'; +import { Utilities } from './Utilities'; + export class Npm { public static async getPublishedVersionsAsync( packageName: string, diff --git a/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts b/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts index f9bf84a8d89..1c443374339 100644 --- a/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts +++ b/libraries/rush-lib/src/utilities/PnpmSyncUtilities.ts @@ -1,14 +1,16 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { AlreadyReportedError } from '@rushstack/node-core-library'; -import { Colorize, type ITerminal } from '@rushstack/terminal'; import { type ILogMessageCallbackOptions, LogMessageIdentifier, type LogMessageDetails, LogMessageKind } from 'pnpm-sync-lib'; + +import { AlreadyReportedError } from '@rushstack/node-core-library'; +import { Colorize, type ITerminal } from '@rushstack/terminal'; + import { RushConstants } from '../logic/RushConstants'; export class PnpmSyncUtilities { diff --git a/libraries/rush-lib/src/utilities/RushAlerts.ts b/libraries/rush-lib/src/utilities/RushAlerts.ts index 602099a50ed..19a0a0606b9 100644 --- a/libraries/rush-lib/src/utilities/RushAlerts.ts +++ b/libraries/rush-lib/src/utilities/RushAlerts.ts @@ -2,8 +2,9 @@ // See LICENSE in the project root for license information. import { Colorize, PrintUtilities, type ITerminal } from '@rushstack/terminal'; -import type { RushConfiguration } from '../api/RushConfiguration'; import { FileSystem, JsonFile, JsonSchema, JsonSyntax } from '@rushstack/node-core-library'; + +import type { RushConfiguration } from '../api/RushConfiguration'; import rushAlertsSchemaJson from '../schemas/rush-alerts.schema.json'; import { RushConstants } from '../logic/RushConstants'; import { PURGE_ACTION_NAME } from './actionNameConstants'; diff --git a/libraries/rush-lib/src/utilities/TarExecutable.ts b/libraries/rush-lib/src/utilities/TarExecutable.ts index 237f8662239..e8f8f4fdd2a 100644 --- a/libraries/rush-lib/src/utilities/TarExecutable.ts +++ b/libraries/rush-lib/src/utilities/TarExecutable.ts @@ -1,12 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; -import os from 'os'; +import * as path from 'node:path'; +import os from 'node:os'; +import type { ChildProcess } from 'node:child_process'; +import events from 'node:events'; + import { Executable, FileSystem, FileWriter } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; -import type { ChildProcess } from 'child_process'; -import events from 'events'; import type { RushConfigurationProject } from '../api/RushConfigurationProject'; import { EnvironmentConfiguration } from '../api/EnvironmentConfiguration'; diff --git a/libraries/rush-lib/src/utilities/Utilities.ts b/libraries/rush-lib/src/utilities/Utilities.ts index 14436e687fc..dac1ec89015 100644 --- a/libraries/rush-lib/src/utilities/Utilities.ts +++ b/libraries/rush-lib/src/utilities/Utilities.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as child_process from 'child_process'; -import * as os from 'os'; -import * as path from 'path'; -import { performance } from 'perf_hooks'; -import { Transform } from 'stream'; +import * as child_process from 'node:child_process'; +import * as os from 'node:os'; +import * as path from 'node:path'; +import { performance } from 'node:perf_hooks'; +import { Transform } from 'node:stream'; + import { JsonFile, type IPackageJson, diff --git a/libraries/rush-lib/src/utilities/WebClient.ts b/libraries/rush-lib/src/utilities/WebClient.ts index 6cee2f138cd..668a4253998 100644 --- a/libraries/rush-lib/src/utilities/WebClient.ts +++ b/libraries/rush-lib/src/utilities/WebClient.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as os from 'os'; -import * as process from 'process'; -import type * as http from 'http'; +import * as os from 'node:os'; +import * as process from 'node:process'; +import type * as http from 'node:http'; import { request as httpRequest, type IncomingMessage } from 'node:http'; import { request as httpsRequest, type RequestOptions } from 'node:https'; + import { Import, LegacyAdapters } from '@rushstack/node-core-library'; const createHttpsProxyAgent: typeof import('https-proxy-agent') = Import.lazy('https-proxy-agent', require); @@ -156,7 +157,7 @@ const makeRequestAsync: FetchFn = async ( if (decodedBuffer === undefined) { let encodings: string | string[] | undefined = headers[CONTENT_ENCODING_HEADER_NAME]; if (!noDecode && encodings !== undefined) { - const zlib: typeof import('zlib') = await import('zlib'); + const zlib: typeof import('zlib') = await import('node:zlib'); if (!Array.isArray(encodings)) { encodings = encodings.split(','); } diff --git a/libraries/rush-lib/src/utilities/npmrcUtilities.ts b/libraries/rush-lib/src/utilities/npmrcUtilities.ts index db15a0d17d4..b5a61e45aff 100644 --- a/libraries/rush-lib/src/utilities/npmrcUtilities.ts +++ b/libraries/rush-lib/src/utilities/npmrcUtilities.ts @@ -3,8 +3,8 @@ // IMPORTANT - do not use any non-built-in libraries in this file -import * as fs from 'fs'; -import * as path from 'path'; +import * as fs from 'node:fs'; +import * as path from 'node:path'; export interface ILogger { info: (string: string) => void; diff --git a/libraries/rush-lib/src/utilities/prompts/SearchListPrompt.ts b/libraries/rush-lib/src/utilities/prompts/SearchListPrompt.ts index 0e455b3e13b..a1e76cc008e 100644 --- a/libraries/rush-lib/src/utilities/prompts/SearchListPrompt.ts +++ b/libraries/rush-lib/src/utilities/prompts/SearchListPrompt.ts @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { Interface } from 'readline'; -import { Colorize } from '@rushstack/terminal'; +import type { Interface } from 'node:readline'; // Modified from the choice list prompt in inquirer: // https://github.com/SBoudrias/Inquirer.js/blob/inquirer%407.3.3/packages/inquirer/lib/prompts/list.js @@ -14,11 +13,11 @@ import Paginator from 'inquirer/lib/utils/paginator'; import type Separator from 'inquirer/lib/objects/separator'; import type Choice from 'inquirer/lib/objects/choice'; import type Choices from 'inquirer/lib/objects/choices'; - import figures from 'figures'; - import { map, takeUntil } from 'rxjs/operators'; +import { Colorize } from '@rushstack/terminal'; + interface IKeyPressEvent { key: { name: string; ctrl: boolean; sequence?: string }; } diff --git a/libraries/rush-lib/src/utilities/templateUtilities.ts b/libraries/rush-lib/src/utilities/templateUtilities.ts index efa3fae6c21..a2ccdcef326 100644 --- a/libraries/rush-lib/src/utilities/templateUtilities.ts +++ b/libraries/rush-lib/src/utilities/templateUtilities.ts @@ -3,6 +3,7 @@ import { FileSystem, InternalError, NewlineKind } from '@rushstack/node-core-library'; import { Colorize } from '@rushstack/terminal'; + import { Rush } from '../api/Rush'; // Matches a well-formed BEGIN macro starting a block section. diff --git a/libraries/rush-lib/src/utilities/test/Npm.test.ts b/libraries/rush-lib/src/utilities/test/Npm.test.ts index 6e0d7cc4552..14326ebfd58 100644 --- a/libraries/rush-lib/src/utilities/test/Npm.test.ts +++ b/libraries/rush-lib/src/utilities/test/Npm.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import process from 'process'; +import process from 'node:process'; import { Npm } from '../Npm'; import { Utilities } from '../Utilities'; diff --git a/libraries/rush-lib/src/utilities/test/global-teardown.ts b/libraries/rush-lib/src/utilities/test/global-teardown.ts index 98b5d0b77f9..49f18a332d9 100644 --- a/libraries/rush-lib/src/utilities/test/global-teardown.ts +++ b/libraries/rush-lib/src/utilities/test/global-teardown.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { FileSystem } from '@rushstack/node-core-library'; + import { TEST_REPO_FOLDER_PATH } from '../../cli/test/TestUtils'; export default async function globalTeardown(): Promise { diff --git a/libraries/rush-sdk/src/generate-stubs.ts b/libraries/rush-sdk/src/generate-stubs.ts index 1657eddcfef..c25cce990cc 100644 --- a/libraries/rush-sdk/src/generate-stubs.ts +++ b/libraries/rush-sdk/src/generate-stubs.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { FileSystem, Import, Path } from '@rushstack/node-core-library'; diff --git a/libraries/rush-sdk/src/helpers.ts b/libraries/rush-sdk/src/helpers.ts index dd610721139..58266cf579c 100644 --- a/libraries/rush-sdk/src/helpers.ts +++ b/libraries/rush-sdk/src/helpers.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { Import, FileSystem } from '@rushstack/node-core-library'; import type { EnvironmentVariableNames } from '@microsoft/rush-lib'; diff --git a/libraries/rush-sdk/src/index.ts b/libraries/rush-sdk/src/index.ts index aebb2dd133e..d42a1398b91 100644 --- a/libraries/rush-sdk/src/index.ts +++ b/libraries/rush-sdk/src/index.ts @@ -1,7 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; +import type { SpawnSyncReturns } from 'node:child_process'; + import { JsonFile, type JsonObject, @@ -11,7 +13,7 @@ import { } from '@rushstack/node-core-library'; import { Terminal, ConsoleTerminalProvider } from '@rushstack/terminal'; import { RushGlobalFolder } from '@microsoft/rush-lib/lib-esnext/api/RushGlobalFolder'; -import type { SpawnSyncReturns } from 'child_process'; + import { RUSH_LIB_NAME, RUSH_LIB_PATH_ENV_VAR_NAME, diff --git a/libraries/rush-sdk/src/loader.ts b/libraries/rush-sdk/src/loader.ts index c60ba6dd3fc..c3357278664 100644 --- a/libraries/rush-sdk/src/loader.ts +++ b/libraries/rush-sdk/src/loader.ts @@ -3,8 +3,9 @@ /// -import * as path from 'path'; -import type { SpawnSyncReturns } from 'child_process'; +import * as path from 'node:path'; +import type { SpawnSyncReturns } from 'node:child_process'; + import { JsonFile, type JsonObject, Executable } from '@rushstack/node-core-library'; import { diff --git a/libraries/rush-sdk/src/test/script.test.ts b/libraries/rush-sdk/src/test/script.test.ts index f77c86ed034..d7c8b8d0de1 100644 --- a/libraries/rush-sdk/src/test/script.test.ts +++ b/libraries/rush-sdk/src/test/script.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import { Executable } from '@rushstack/node-core-library'; const rushSdkPath: string = path.join(__dirname, '../../lib-shim/index.js'); diff --git a/libraries/rush-themed-ui/src/components/Button/index.tsx b/libraries/rush-themed-ui/src/components/Button/index.tsx index 5fccc974bdc..f7ef0fad804 100644 --- a/libraries/rush-themed-ui/src/components/Button/index.tsx +++ b/libraries/rush-themed-ui/src/components/Button/index.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React from 'react'; + import { Text } from '../Text'; import styles from './styles.scss'; diff --git a/libraries/rush-themed-ui/src/components/Checkbox/index.tsx b/libraries/rush-themed-ui/src/components/Checkbox/index.tsx index 2cfa201e062..a0003820716 100644 --- a/libraries/rush-themed-ui/src/components/Checkbox/index.tsx +++ b/libraries/rush-themed-ui/src/components/Checkbox/index.tsx @@ -4,6 +4,7 @@ import React from 'react'; import * as RadixCheckbox from '@radix-ui/react-checkbox'; import { CheckIcon } from '@radix-ui/react-icons'; + import styles from './styles.scss'; /** diff --git a/libraries/rush-themed-ui/src/components/Input/index.tsx b/libraries/rush-themed-ui/src/components/Input/index.tsx index ad9d466ee3e..6f4d7e2ab67 100644 --- a/libraries/rush-themed-ui/src/components/Input/index.tsx +++ b/libraries/rush-themed-ui/src/components/Input/index.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React from 'react'; + import styles from './styles.scss'; /** diff --git a/libraries/rush-themed-ui/src/components/ScrollArea/index.tsx b/libraries/rush-themed-ui/src/components/ScrollArea/index.tsx index 585526efe1d..88c19a3814a 100644 --- a/libraries/rush-themed-ui/src/components/ScrollArea/index.tsx +++ b/libraries/rush-themed-ui/src/components/ScrollArea/index.tsx @@ -3,6 +3,7 @@ import React from 'react'; import * as RadixScrollArea from '@radix-ui/react-scroll-area'; + import styles from './styles.scss'; /** diff --git a/libraries/rush-themed-ui/src/components/Tabs/index.tsx b/libraries/rush-themed-ui/src/components/Tabs/index.tsx index 25751b7e290..418dda17385 100644 --- a/libraries/rush-themed-ui/src/components/Tabs/index.tsx +++ b/libraries/rush-themed-ui/src/components/Tabs/index.tsx @@ -3,6 +3,7 @@ import React from 'react'; import * as RadixTabs from '@radix-ui/react-tabs'; + import styles from './styles.scss'; /** diff --git a/libraries/rush-themed-ui/src/components/Text/index.tsx b/libraries/rush-themed-ui/src/components/Text/index.tsx index 4cbee373f50..a356167a19d 100644 --- a/libraries/rush-themed-ui/src/components/Text/index.tsx +++ b/libraries/rush-themed-ui/src/components/Text/index.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React from 'react'; + import styles from './styles.scss'; /** diff --git a/libraries/rushell/src/Rushell.ts b/libraries/rushell/src/Rushell.ts index c467fce3472..086b4127c10 100644 --- a/libraries/rushell/src/Rushell.ts +++ b/libraries/rushell/src/Rushell.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type * as child_process from 'child_process'; +import type * as child_process from 'node:child_process'; + import { Executable } from '@rushstack/node-core-library'; -import { Parser } from './Parser'; +import { Parser } from './Parser'; import { Tokenizer } from './Tokenizer'; import { type AstNode, type AstScript, AstKind, type AstCommand } from './AstNode'; import { ParseError } from './ParseError'; diff --git a/libraries/terminal/src/ConsoleTerminalProvider.ts b/libraries/terminal/src/ConsoleTerminalProvider.ts index ce46d40dffc..ff7a4dfabf2 100644 --- a/libraries/terminal/src/ConsoleTerminalProvider.ts +++ b/libraries/terminal/src/ConsoleTerminalProvider.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { EOL } from 'os'; +import { EOL } from 'node:os'; + import supportsColor from 'supports-color'; import { type ITerminalProvider, TerminalProviderSeverity } from './ITerminalProvider'; diff --git a/libraries/terminal/src/NormalizeNewlinesTextRewriter.ts b/libraries/terminal/src/NormalizeNewlinesTextRewriter.ts index 43247bb46b8..a88ac3d2403 100644 --- a/libraries/terminal/src/NormalizeNewlinesTextRewriter.ts +++ b/libraries/terminal/src/NormalizeNewlinesTextRewriter.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { Text, type NewlineKind } from '@rushstack/node-core-library'; + import { TextRewriter, type TextRewriterState } from './TextRewriter'; interface INormalizeNewlinesTextRewriterState extends TextRewriterState { diff --git a/libraries/terminal/src/PrefixProxyTerminalProvider.ts b/libraries/terminal/src/PrefixProxyTerminalProvider.ts index 3d69d49ffa7..94d4194b5e5 100644 --- a/libraries/terminal/src/PrefixProxyTerminalProvider.ts +++ b/libraries/terminal/src/PrefixProxyTerminalProvider.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { Text } from '@rushstack/node-core-library'; + import type { ITerminalProvider, TerminalProviderSeverity } from './ITerminalProvider'; /** diff --git a/libraries/terminal/src/PrintUtilities.ts b/libraries/terminal/src/PrintUtilities.ts index 1c9732d4896..6fe00c13651 100644 --- a/libraries/terminal/src/PrintUtilities.ts +++ b/libraries/terminal/src/PrintUtilities.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { Text } from '@rushstack/node-core-library'; + import type { ITerminal } from './ITerminal'; /** diff --git a/libraries/terminal/src/StdioWritable.ts b/libraries/terminal/src/StdioWritable.ts index 76dcad4e1ca..5b83bc44bf3 100644 --- a/libraries/terminal/src/StdioWritable.ts +++ b/libraries/terminal/src/StdioWritable.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import process from 'process'; +import process from 'node:process'; + import { type ITerminalChunk, TerminalChunkKind } from './ITerminalChunk'; import { TerminalWritable } from './TerminalWritable'; diff --git a/libraries/terminal/src/StringBufferTerminalProvider.ts b/libraries/terminal/src/StringBufferTerminalProvider.ts index 72c9bc2d352..5c57b6a9237 100644 --- a/libraries/terminal/src/StringBufferTerminalProvider.ts +++ b/libraries/terminal/src/StringBufferTerminalProvider.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { StringBuilder, Text } from '@rushstack/node-core-library'; + import { type ITerminalProvider, TerminalProviderSeverity } from './ITerminalProvider'; import { AnsiEscape } from './AnsiEscape'; diff --git a/libraries/terminal/src/TerminalStreamWritable.ts b/libraries/terminal/src/TerminalStreamWritable.ts index 8a45ed3fa9e..8b84a1bcdf3 100644 --- a/libraries/terminal/src/TerminalStreamWritable.ts +++ b/libraries/terminal/src/TerminalStreamWritable.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Writable, type WritableOptions } from 'stream'; +import { Writable, type WritableOptions } from 'node:stream'; + import type { ITerminal } from './ITerminal'; import { TerminalProviderSeverity } from './ITerminalProvider'; diff --git a/libraries/terminal/src/test/TerminalStreamWritable.test.ts b/libraries/terminal/src/test/TerminalStreamWritable.test.ts index f876d68bbf2..a44a4150fde 100644 --- a/libraries/terminal/src/test/TerminalStreamWritable.test.ts +++ b/libraries/terminal/src/test/TerminalStreamWritable.test.ts @@ -5,7 +5,7 @@ import { Terminal } from '../Terminal'; import { StringBufferTerminalProvider } from '../StringBufferTerminalProvider'; import { TerminalStreamWritable } from '../TerminalStreamWritable'; import { TerminalProviderSeverity } from '../ITerminalProvider'; -import type { Writable } from 'stream'; +import type { Writable } from 'node:stream'; let terminal: Terminal; let provider: StringBufferTerminalProvider; diff --git a/libraries/ts-command-line/src/providers/CommandLineParser.ts b/libraries/ts-command-line/src/providers/CommandLineParser.ts index 7855cd5a301..ab717adc3a0 100644 --- a/libraries/ts-command-line/src/providers/CommandLineParser.ts +++ b/libraries/ts-command-line/src/providers/CommandLineParser.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type * as argparse from 'argparse'; + import { Colorize } from '@rushstack/terminal'; import type { CommandLineAction } from './CommandLineAction'; diff --git a/libraries/ts-command-line/src/test/helpTestUtilities.ts b/libraries/ts-command-line/src/test/helpTestUtilities.ts index e2c8aa015d0..8c7a9a59e86 100644 --- a/libraries/ts-command-line/src/test/helpTestUtilities.ts +++ b/libraries/ts-command-line/src/test/helpTestUtilities.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { AnsiEscape } from '@rushstack/terminal'; + import type { CommandLineParser } from '../providers/CommandLineParser'; export function ensureHelpTextMatchesSnapshot(parser: CommandLineParser): void { diff --git a/libraries/typings-generator/src/StringValuesTypingsGenerator.ts b/libraries/typings-generator/src/StringValuesTypingsGenerator.ts index f69482a9524..1e05aa9379c 100644 --- a/libraries/typings-generator/src/StringValuesTypingsGenerator.ts +++ b/libraries/typings-generator/src/StringValuesTypingsGenerator.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { EOL } from 'os'; +import { EOL } from 'node:os'; + import { Text } from '@rushstack/node-core-library'; import { diff --git a/libraries/typings-generator/src/TypingsGenerator.ts b/libraries/typings-generator/src/TypingsGenerator.ts index 39cef23ebbe..cc080fc3795 100644 --- a/libraries/typings-generator/src/TypingsGenerator.ts +++ b/libraries/typings-generator/src/TypingsGenerator.ts @@ -1,13 +1,15 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { FileSystem, Path, NewlineKind, Async } from '@rushstack/node-core-library'; -import { type ITerminal, Terminal, ConsoleTerminalProvider } from '@rushstack/terminal'; +import * as path from 'node:path'; +import { EOL } from 'node:os'; + import glob from 'fast-glob'; -import * as path from 'path'; -import { EOL } from 'os'; import * as chokidar from 'chokidar'; +import { type ITerminal, Terminal, ConsoleTerminalProvider } from '@rushstack/terminal'; +import { FileSystem, Path, NewlineKind, Async } from '@rushstack/node-core-library'; + /** * @public */ diff --git a/libraries/worker-pool/src/WorkerPool.ts b/libraries/worker-pool/src/WorkerPool.ts index 28efb038469..d47274673fd 100644 --- a/libraries/worker-pool/src/WorkerPool.ts +++ b/libraries/worker-pool/src/WorkerPool.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { type ResourceLimits, Worker } from 'worker_threads'; +import { type ResourceLimits, Worker } from 'node:worker_threads'; /** * Symbol to read the ID off of a worker diff --git a/repo-scripts/doc-plugin-rush-stack/src/RushStackFeature.ts b/repo-scripts/doc-plugin-rush-stack/src/RushStackFeature.ts index d214295a313..5af1e34684b 100644 --- a/repo-scripts/doc-plugin-rush-stack/src/RushStackFeature.ts +++ b/repo-scripts/doc-plugin-rush-stack/src/RushStackFeature.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import yaml = require('js-yaml'); + import { FileSystem } from '@rushstack/node-core-library'; import type { ApiItem } from '@microsoft/api-extractor-model'; import { diff --git a/repo-scripts/doc-plugin-rush-stack/src/index.ts b/repo-scripts/doc-plugin-rush-stack/src/index.ts index 5e747c9257a..7b7171e5219 100644 --- a/repo-scripts/doc-plugin-rush-stack/src/index.ts +++ b/repo-scripts/doc-plugin-rush-stack/src/index.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IApiDocumenterPluginManifest } from '@microsoft/api-documenter'; + import { RushStackFeature } from './RushStackFeature'; export const apiDocumenterPluginManifest: IApiDocumenterPluginManifest = { diff --git a/repo-scripts/repo-toolbox/src/BumpCyclicsAction.ts b/repo-scripts/repo-toolbox/src/BumpCyclicsAction.ts index 14e11d9feb0..2c43ef5874f 100644 --- a/repo-scripts/repo-toolbox/src/BumpCyclicsAction.ts +++ b/repo-scripts/repo-toolbox/src/BumpCyclicsAction.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import type { ChildProcess } from 'node:child_process'; + import { Async, Executable, JsonFile } from '@rushstack/node-core-library'; import { ConsoleTerminalProvider, Terminal } from '@rushstack/terminal'; import { DependencyType, RushConfiguration } from '@microsoft/rush-lib'; import { CommandLineAction } from '@rushstack/ts-command-line'; -import type { ChildProcess } from 'child_process'; export class BumpCyclicsAction extends CommandLineAction { public constructor() { diff --git a/repo-scripts/repo-toolbox/src/ReadmeAction.ts b/repo-scripts/repo-toolbox/src/ReadmeAction.ts index ff4a6dabaf9..01961880ea3 100644 --- a/repo-scripts/repo-toolbox/src/ReadmeAction.ts +++ b/repo-scripts/repo-toolbox/src/ReadmeAction.ts @@ -1,12 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + +import * as Diff from 'diff'; + import { StringBuilder, Sort, FileSystem, Text, AlreadyReportedError } from '@rushstack/node-core-library'; import { Terminal, ConsoleTerminalProvider, Colorize } from '@rushstack/terminal'; import { RushConfiguration, type RushConfigurationProject, LockStepVersionPolicy } from '@microsoft/rush-lib'; import { CommandLineAction, type CommandLineFlagParameter } from '@rushstack/ts-command-line'; -import * as Diff from 'diff'; const GENERATED_PROJECT_SUMMARY_START_COMMENT_TEXT: string = ''; const GENERATED_PROJECT_SUMMARY_END_COMMENT_TEXT: string = ''; diff --git a/repo-scripts/repo-toolbox/src/RecordVersionsAction.ts b/repo-scripts/repo-toolbox/src/RecordVersionsAction.ts index c31dd6b6b57..affd6978605 100644 --- a/repo-scripts/repo-toolbox/src/RecordVersionsAction.ts +++ b/repo-scripts/repo-toolbox/src/RecordVersionsAction.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import { JsonFile } from '@rushstack/node-core-library'; import { Terminal, ConsoleTerminalProvider } from '@rushstack/terminal'; import { RushConfiguration } from '@microsoft/rush-lib'; diff --git a/rigs/decoupled-local-node-rig/package.json b/rigs/decoupled-local-node-rig/package.json index 2ebeb4baf89..2deac4f04f3 100644 --- a/rigs/decoupled-local-node-rig/package.json +++ b/rigs/decoupled-local-node-rig/package.json @@ -21,7 +21,7 @@ "@typescript-eslint/parser": "~8.31.0", "eslint-plugin-header": "~3.1.1", "eslint-plugin-headers": "~1.2.1", - "eslint-plugin-import": "2.31.0", + "eslint-plugin-import": "2.32.0", "eslint-plugin-jsdoc": "50.6.11", "eslint-plugin-react-hooks": "5.2.0", "eslint": "~9.25.1", diff --git a/rigs/decoupled-local-node-rig/profiles/default/includes/eslint/flat/profile/_common.js b/rigs/decoupled-local-node-rig/profiles/default/includes/eslint/flat/profile/_common.js index c7a8b144da3..71d95e8ea20 100644 --- a/rigs/decoupled-local-node-rig/profiles/default/includes/eslint/flat/profile/_common.js +++ b/rigs/decoupled-local-node-rig/profiles/default/includes/eslint/flat/profile/_common.js @@ -102,6 +102,7 @@ module.exports = { { source: 'string', style: 'line', + trailingNewlines: 2, content: 'Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.\n' + 'See LICENSE in the project root for license information.' @@ -136,6 +137,38 @@ module.exports = { } } ]) + ], + + // Require `node:` protocol for imports of Node.js built-in modules + 'import/enforce-node-protocol-usage': ['warn', 'always'], + + // Group imports in the following way: + // 1. Built-in modules (fs, path, etc.) + // 2. External modules (lodash, react, etc.) + // a. `@rushstack` and `@microsoft` scoped packages + // 3. Internal modules (and other types: parent, sibling, index) + 'import/order': [ + 'warn', + { + // This option ensures that the @rushstack and @microsoft packages end up in their own group + distinctGroup: true, + pathGroups: [ + { + pattern: '@{rushstack,microsoft}/**', + group: 'external', + position: 'after' + } + ], + // Ensure the @rushstack and @microsoft packages are grouped with other external packages. By default this + // option includes 'external' + pathGroupsExcludedImportTypes: ['builtin', 'object'], + groups: [ + 'builtin', + 'external' + // And then everything else (internal, parent, sibling, index) + ], + 'newlines-between': 'always' + } ] } }, @@ -157,7 +190,9 @@ module.exports = { '**/test/**/*.ts', '**/test/**/*.tsx' ], - rules: {} + rules: { + 'import/order': 'off' + } } ] }; diff --git a/rush-plugins/rush-amazon-s3-build-cache-plugin/src/AmazonS3Client.ts b/rush-plugins/rush-amazon-s3-build-cache-plugin/src/AmazonS3Client.ts index 384e33feb11..890aeba8593 100644 --- a/rush-plugins/rush-amazon-s3-build-cache-plugin/src/AmazonS3Client.ts +++ b/rush-plugins/rush-amazon-s3-build-cache-plugin/src/AmazonS3Client.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as crypto from 'node:crypto'; + import { Async } from '@rushstack/node-core-library'; import { Colorize, type ITerminal } from '@rushstack/terminal'; -import * as crypto from 'crypto'; import { type IGetFetchOptions, type IFetchOptionsWithBody, diff --git a/rush-plugins/rush-amazon-s3-build-cache-plugin/src/RushAmazonS3BuildCachePlugin.ts b/rush-plugins/rush-amazon-s3-build-cache-plugin/src/RushAmazonS3BuildCachePlugin.ts index dc67e12a55e..180ce14e77a 100644 --- a/rush-plugins/rush-amazon-s3-build-cache-plugin/src/RushAmazonS3BuildCachePlugin.ts +++ b/rush-plugins/rush-amazon-s3-build-cache-plugin/src/RushAmazonS3BuildCachePlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRushPlugin, RushSession, RushConfiguration } from '@rushstack/rush-sdk'; + import type { IAmazonS3BuildCacheProviderOptionsAdvanced, IAmazonS3BuildCacheProviderOptionsSimple diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AdoCodespacesAuthCredential.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AdoCodespacesAuthCredential.ts index 86b2acfca26..744b8e63ad5 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AdoCodespacesAuthCredential.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AdoCodespacesAuthCredential.ts @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Executable } from '@rushstack/node-core-library'; + import { CredentialUnavailableError, type AccessToken, @@ -8,6 +8,8 @@ import { type TokenCredential } from '@azure/identity'; +import { Executable } from '@rushstack/node-core-library'; + interface IDecodedJwt { header: { type?: string; diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureAuthenticationBase.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureAuthenticationBase.ts index d51757ac1f9..4320c561399 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureAuthenticationBase.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureAuthenticationBase.ts @@ -17,7 +17,7 @@ import { AzurePowerShellCredential } from '@azure/identity'; import type { TokenCredentialOptions } from '@azure/identity'; -import { AdoCodespacesAuthCredential } from './AdoCodespacesAuthCredential'; + import type { ITerminal } from '@rushstack/terminal'; import { CredentialCache } from '@rushstack/rush-sdk'; // Use a separate import line so the .d.ts file ends up with an `import type { ... }` @@ -25,6 +25,8 @@ import { CredentialCache } from '@rushstack/rush-sdk'; import type { ICredentialCacheEntry } from '@rushstack/rush-sdk'; import { PrintUtilities } from '@rushstack/terminal'; +import { AdoCodespacesAuthCredential } from './AdoCodespacesAuthCredential'; + /** * @public */ diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageAuthentication.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageAuthentication.ts index 253c85fdaa1..982eb9f51fd 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageAuthentication.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageAuthentication.ts @@ -9,7 +9,9 @@ import { type SASQueryParameters, type ServiceGetUserDelegationKeyResponse } from '@azure/storage-blob'; + import type { ITerminal } from '@rushstack/terminal'; + import { AzureAuthenticationBase, type ICredentialResult, diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageBuildCacheProvider.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageBuildCacheProvider.ts index cfbf7ff1b45..146ee2e8f00 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageBuildCacheProvider.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/AzureStorageBuildCacheProvider.ts @@ -1,6 +1,14 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { + type BlobClient, + BlobServiceClient, + type BlockBlobClient, + type ContainerClient +} from '@azure/storage-blob'; +import { AzureAuthorityHosts } from '@azure/identity'; + import type { ITerminal } from '@rushstack/terminal'; import { type ICloudBuildCacheProvider, @@ -9,13 +17,6 @@ import { EnvironmentConfiguration, type ICredentialCacheEntry } from '@rushstack/rush-sdk'; -import { - type BlobClient, - BlobServiceClient, - type BlockBlobClient, - type ContainerClient -} from '@azure/storage-blob'; -import { AzureAuthorityHosts } from '@azure/identity'; import { AzureStorageAuthentication, diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureInteractiveAuthPlugin.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureInteractiveAuthPlugin.ts index aef43ad6df2..ce61c039522 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureInteractiveAuthPlugin.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureInteractiveAuthPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRushPlugin, RushSession, RushConfiguration, ILogger } from '@rushstack/rush-sdk'; + import type { AzureEnvironmentName, LoginFlowType } from './AzureAuthenticationBase'; const PLUGIN_NAME: 'AzureInteractiveAuthPlugin' = 'AzureInteractiveAuthPlugin'; diff --git a/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureStorageBuildCachePlugin.ts b/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureStorageBuildCachePlugin.ts index fe13be09eb6..4f3f440c5f7 100644 --- a/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureStorageBuildCachePlugin.ts +++ b/rush-plugins/rush-azure-storage-build-cache-plugin/src/RushAzureStorageBuildCachePlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRushPlugin, RushSession, RushConfiguration } from '@rushstack/rush-sdk'; + import type { AzureEnvironmentName, LoginFlowFailoverMap, LoginFlowType } from './AzureAuthenticationBase'; const PLUGIN_NAME: string = 'AzureStorageBuildCachePlugin'; diff --git a/rush-plugins/rush-buildxl-graph-plugin/src/dropGraph.ts b/rush-plugins/rush-buildxl-graph-plugin/src/dropGraph.ts index 1200fd40b0c..c60eb558092 100644 --- a/rush-plugins/rush-buildxl-graph-plugin/src/dropGraph.ts +++ b/rush-plugins/rush-buildxl-graph-plugin/src/dropGraph.ts @@ -1,7 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; + import type { ICreateOperationsContext, ILogger, Operation, RushConfiguration } from '@rushstack/rush-sdk'; import { JsonFile } from '@rushstack/node-core-library'; diff --git a/rush-plugins/rush-http-build-cache-plugin/src/HttpBuildCacheProvider.ts b/rush-plugins/rush-http-build-cache-plugin/src/HttpBuildCacheProvider.ts index 4a6368b998d..8868fdbd09f 100644 --- a/rush-plugins/rush-http-build-cache-plugin/src/HttpBuildCacheProvider.ts +++ b/rush-plugins/rush-http-build-cache-plugin/src/HttpBuildCacheProvider.ts @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import type { SpawnSyncReturns } from 'node:child_process'; + import { Executable, Async } from '@rushstack/node-core-library'; import type { ITerminal } from '@rushstack/terminal'; import { @@ -11,7 +13,6 @@ import { EnvironmentConfiguration } from '@rushstack/rush-sdk'; import { WebClient, type IWebClientResponse } from '@rushstack/rush-sdk/lib/utilities/WebClient'; -import type { SpawnSyncReturns } from 'child_process'; enum CredentialsOptions { Optional, diff --git a/rush-plugins/rush-http-build-cache-plugin/src/RushHttpBuildCachePlugin.ts b/rush-plugins/rush-http-build-cache-plugin/src/RushHttpBuildCachePlugin.ts index c1577afb1f6..5768d179ef4 100644 --- a/rush-plugins/rush-http-build-cache-plugin/src/RushHttpBuildCachePlugin.ts +++ b/rush-plugins/rush-http-build-cache-plugin/src/RushHttpBuildCachePlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRushPlugin, RushSession, RushConfiguration } from '@rushstack/rush-sdk'; + import type { IHttpBuildCacheProviderOptions, UploadMethod } from './HttpBuildCacheProvider'; const PLUGIN_NAME: string = 'HttpBuildCachePlugin'; diff --git a/rush-plugins/rush-mcp-docs-plugin/src/DocsPlugin.ts b/rush-plugins/rush-mcp-docs-plugin/src/DocsPlugin.ts index 5d12e5ea1bd..7111ab126e3 100644 --- a/rush-plugins/rush-mcp-docs-plugin/src/DocsPlugin.ts +++ b/rush-plugins/rush-mcp-docs-plugin/src/DocsPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IRushMcpPlugin, RushMcpPluginSession } from '@rushstack/mcp-server'; + import { DocsTool } from './DocsTool'; export interface IDocsPluginConfigFile {} diff --git a/rush-plugins/rush-mcp-docs-plugin/src/DocsTool.ts b/rush-plugins/rush-mcp-docs-plugin/src/DocsTool.ts index cc8ecd2c064..f0f830b339f 100644 --- a/rush-plugins/rush-mcp-docs-plugin/src/DocsTool.ts +++ b/rush-plugins/rush-mcp-docs-plugin/src/DocsTool.ts @@ -1,9 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import type { IRushMcpTool, RushMcpPluginSession, CallToolResult, zodModule } from '@rushstack/mcp-server'; import { JsonFile } from '@rushstack/node-core-library'; -import path from 'path'; import type { DocsPlugin } from './DocsPlugin'; diff --git a/rush-plugins/rush-mcp-docs-plugin/src/index.ts b/rush-plugins/rush-mcp-docs-plugin/src/index.ts index 569aef9dd9f..1dd62636461 100644 --- a/rush-plugins/rush-mcp-docs-plugin/src/index.ts +++ b/rush-plugins/rush-mcp-docs-plugin/src/index.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { RushMcpPluginSession, RushMcpPluginFactory } from '@rushstack/mcp-server'; + import { DocsPlugin, type IDocsPluginConfigFile } from './DocsPlugin'; function createPlugin( diff --git a/rush-plugins/rush-redis-cobuild-plugin/src/RedisCobuildLockProvider.ts b/rush-plugins/rush-redis-cobuild-plugin/src/RedisCobuildLockProvider.ts index 21a35f10a27..effa7ec8cf2 100644 --- a/rush-plugins/rush-redis-cobuild-plugin/src/RedisCobuildLockProvider.ts +++ b/rush-plugins/rush-redis-cobuild-plugin/src/RedisCobuildLockProvider.ts @@ -2,13 +2,6 @@ // See LICENSE in the project root for license information. import { createClient } from '@redis/client'; - -import type { - ICobuildLockProvider, - ICobuildContext, - ICobuildCompletedState, - RushSession -} from '@rushstack/rush-sdk'; import type { RedisClientOptions, RedisClientType, @@ -16,6 +9,13 @@ import type { RedisModules, RedisScripts } from '@redis/client'; + +import type { + ICobuildLockProvider, + ICobuildContext, + ICobuildCompletedState, + RushSession +} from '@rushstack/rush-sdk'; import type { ITerminal } from '@rushstack/terminal'; /** diff --git a/rush-plugins/rush-redis-cobuild-plugin/src/RushRedisCobuildPlugin.ts b/rush-plugins/rush-redis-cobuild-plugin/src/RushRedisCobuildPlugin.ts index 4e8f07d7f70..3e3f8d00baf 100644 --- a/rush-plugins/rush-redis-cobuild-plugin/src/RushRedisCobuildPlugin.ts +++ b/rush-plugins/rush-redis-cobuild-plugin/src/RushRedisCobuildPlugin.ts @@ -3,6 +3,7 @@ import { Import } from '@rushstack/node-core-library'; import type { IRushPlugin, RushSession, RushConfiguration } from '@rushstack/rush-sdk'; + import type { IRedisCobuildLockProviderOptions, RedisCobuildLockProvider } from './RedisCobuildLockProvider'; const RedisCobuildLockProviderModule: typeof import('./RedisCobuildLockProvider') = Import.lazy( diff --git a/rush-plugins/rush-serve-plugin/src/RushProjectServeConfigFile.ts b/rush-plugins/rush-serve-plugin/src/RushProjectServeConfigFile.ts index cc7cb2d8220..561c9e2337c 100644 --- a/rush-plugins/rush-serve-plugin/src/RushProjectServeConfigFile.ts +++ b/rush-plugins/rush-serve-plugin/src/RushProjectServeConfigFile.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { ProjectConfigurationFile, InheritanceType } from '@rushstack/heft-config-file'; import { Async } from '@rushstack/node-core-library'; diff --git a/rush-plugins/rush-serve-plugin/src/RushServePlugin.ts b/rush-plugins/rush-serve-plugin/src/RushServePlugin.ts index 1a4ab89a099..c5a06761d2e 100644 --- a/rush-plugins/rush-serve-plugin/src/RushServePlugin.ts +++ b/rush-plugins/rush-serve-plugin/src/RushServePlugin.ts @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type { IRushPlugin, RushSession, RushConfiguration, IPhasedCommand } from '@rushstack/rush-sdk'; -import { PLUGIN_NAME } from './constants'; +import { PLUGIN_NAME } from './constants'; import type { IBaseRoutingRuleJson, IRoutingRule } from './types'; export interface IGlobalRoutingFolderRuleJson extends IBaseRoutingRuleJson { diff --git a/rush-plugins/rush-serve-plugin/src/phasedCommandHandler.ts b/rush-plugins/rush-serve-plugin/src/phasedCommandHandler.ts index b4805180bf2..4c76680f170 100644 --- a/rush-plugins/rush-serve-plugin/src/phasedCommandHandler.ts +++ b/rush-plugins/rush-serve-plugin/src/phasedCommandHandler.ts @@ -25,7 +25,6 @@ import { type CommandLineIntegerParameter, CommandLineParameterKind } from '@rus import { PLUGIN_NAME } from './constants'; import { RushServeConfiguration } from './RushProjectServeConfigFile'; import type { IRoutingRule, IPhasedCommandHandlerOptions } from './types'; - import { getLogServePathForProject, tryEnableBuildStatusWebSocketServer, diff --git a/vscode-extensions/rush-vscode-command-webview/src/App.tsx b/vscode-extensions/rush-vscode-command-webview/src/App.tsx index 35c8cd2dd1c..85836a298a0 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/App.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/App.tsx @@ -4,11 +4,6 @@ import { /*IStackStyles, IStackTokens, */ initializeIcons } from '@fluentui/react'; import * as React from 'react'; import { useEffect } from 'react'; -import { fromExtensionListener } from './Message/fromExtension'; -// import { ParameterView } from './ParameterView'; -// import { Toolbar } from './Toolbar'; -// import { useAppSelector } from './store/hooks'; -import { ProjectView } from './ProjectView'; import { type SelectTabData, type SelectTabEvent, @@ -16,6 +11,12 @@ import { TabList, type TabValue } from '@fluentui/react-components'; + +import { fromExtensionListener } from './Message/fromExtension'; +// import { ParameterView } from './ParameterView'; +// import { Toolbar } from './Toolbar'; +// import { useAppSelector } from './store/hooks'; +import { ProjectView } from './ProjectView'; import { VersionsView } from './VersionsView'; initializeIcons(); diff --git a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledComboBox.tsx b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledComboBox.tsx index d42a90aaa90..bf4e880319a 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledComboBox.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledComboBox.tsx @@ -4,8 +4,8 @@ import { ComboBox, type IComboBoxOption, type IComboBoxProps } from '@fluentui/react'; import * as React from 'react'; import { Controller, useFormState } from 'react-hook-form'; -import { ErrorMessage } from './ErrorMessage'; +import { ErrorMessage } from './ErrorMessage'; import type { IHookFormProps } from './interface'; export type IControlledComboBoxProps = IComboBoxProps & IHookFormProps; diff --git a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledTextFieldArray.tsx b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledTextFieldArray.tsx index 22663709864..ff265c24a57 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledTextFieldArray.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledTextFieldArray.tsx @@ -6,7 +6,6 @@ import * as React from 'react'; import { Controller, useFieldArray, useFormContext } from 'react-hook-form'; import { IconButton } from '../components/IconButton'; - import type { IHookFormProps } from './interface'; export type IControlledTextFieldArrayProps = ITextFieldProps & IHookFormProps; diff --git a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledToggle.tsx b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledToggle.tsx index aec193a08ff..b7acd4281cc 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledToggle.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ControlledFormComponents/ControlledToggle.tsx @@ -4,8 +4,8 @@ import { type IToggleProps, Toggle } from '@fluentui/react'; import * as React from 'react'; import { Controller } from 'react-hook-form'; -import { ErrorMessage } from './ErrorMessage'; +import { ErrorMessage } from './ErrorMessage'; import type { IHookFormProps } from './interface'; export type IControlledToggleProps = IToggleProps & IHookFormProps; diff --git a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/Watcher.tsx b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/Watcher.tsx index 7699786d635..b7b2c6e8255 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/Watcher.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/Watcher.tsx @@ -3,14 +3,13 @@ import * as React from 'react'; import { useEffect } from 'react'; - import type { FieldValues, UseFormWatch } from 'react-hook-form'; -import { useAppDispatch } from '../../store/hooks'; -import { onChangeFormValues } from '../../store/slices/parameter'; - import type { AnyAction, Dispatch } from '@reduxjs/toolkit'; import type { Subscription } from 'react-hook-form/dist/utils/createSubject'; +import { useAppDispatch } from '../../store/hooks'; +import { onChangeFormValues } from '../../store/slices/parameter'; + export interface IParameterFormWatcherProps { watch: UseFormWatch; } diff --git a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/index.tsx b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/index.tsx index 506151b94a1..e99ebee4fb5 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/index.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/ParameterForm/index.tsx @@ -3,10 +3,6 @@ import * as React from 'react'; import { type CSSProperties, type ReactNode, useCallback, useEffect, useMemo } from 'react'; -import { CommandLineParameterKind } from '@rushstack/ts-command-line/lib/parameters/BaseClasses'; -import type { CommandLineChoiceListParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineChoiceListParameter'; -import type { CommandLineChoiceParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineChoiceParameter'; -import type { CommandLineIntegerParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineIntegerParameter'; import { type FieldValues, FormProvider, @@ -15,6 +11,12 @@ import { type UseFormReturn } from 'react-hook-form'; import { DefaultButton, Label } from '@fluentui/react'; +import type { AnyAction, Dispatch } from '@reduxjs/toolkit'; + +import { CommandLineParameterKind } from '@rushstack/ts-command-line/lib/parameters/BaseClasses'; +import type { CommandLineChoiceListParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineChoiceListParameter'; +import type { CommandLineChoiceParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineChoiceParameter'; +import type { CommandLineIntegerParameter } from '@rushstack/ts-command-line/lib/parameters/CommandLineIntegerParameter'; import { ControlledTextField } from '../../ControlledFormComponents/ControlledTextField'; import { ControlledComboBox } from '../../ControlledFormComponents/ControlledComboBox'; @@ -29,8 +31,6 @@ import { } from '../../store/slices/parameter'; import { useAppDispatch, useAppSelector } from '../../store/hooks'; import { ParameterFormWatcher } from './Watcher'; - -import type { AnyAction, Dispatch } from '@reduxjs/toolkit'; import { ControlledToggle } from '../../ControlledFormComponents/ControlledToggle'; import { FIELD_ANCHOR_CLASSNAME } from '../../hooks/parametersFormScroll'; import { setFormValidateAsync, useUserSelectedParameterName } from '../../store/slices/ui'; diff --git a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/index.tsx b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/index.tsx index cdddba1db76..02fc3432256 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ParameterView/index.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ParameterView/index.tsx @@ -3,6 +3,7 @@ import * as React from 'react'; import { type IStackStyles, type IStackItemStyles, type IStackTokens, Stack } from '@fluentui/react'; + import { useScrollableElement } from '../hooks/parametersFormScroll'; import { ParameterForm } from './ParameterForm'; import { ParameterNav } from './ParameterNav'; diff --git a/vscode-extensions/rush-vscode-command-webview/src/ProjectView/index.tsx b/vscode-extensions/rush-vscode-command-webview/src/ProjectView/index.tsx index 4e8afcf9a6f..fef6dcb5a5d 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/ProjectView/index.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/ProjectView/index.tsx @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import React from 'react'; + import { useAppSelector } from '../store/hooks'; export const ProjectView: React.FC = () => { diff --git a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/RunButton.tsx b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/RunButton.tsx index 3980489850c..695901f7a92 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/RunButton.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/RunButton.tsx @@ -4,8 +4,8 @@ import { PrimaryButton } from '@fluentui/react/lib/Button'; import * as React from 'react'; import { useCallback } from 'react'; -import { sendMessageToExtension } from '../Message/toExtension'; +import { sendMessageToExtension } from '../Message/toExtension'; import { useAppSelector } from '../store/hooks'; import { useParameterArgs } from '../store/slices/parameter'; diff --git a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/SearchBar.tsx b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/SearchBar.tsx index d7d6917dc99..b74757ff3f1 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/SearchBar.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/SearchBar.tsx @@ -3,9 +3,9 @@ import { SearchBox } from '@fluentui/react'; import * as React from 'react'; -import { useAppDispatch, useAppSelector } from '../store/hooks'; - import type { AnyAction, Dispatch } from '@reduxjs/toolkit'; + +import { useAppDispatch, useAppSelector } from '../store/hooks'; import { onChangeSearchText } from '../store/slices/parameter'; export const SearchBar = (): JSX.Element => { diff --git a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/index.tsx b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/index.tsx index 30982884025..c77f1a3b6bd 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/Toolbar/index.tsx +++ b/vscode-extensions/rush-vscode-command-webview/src/Toolbar/index.tsx @@ -9,12 +9,12 @@ import { Stack } from '@fluentui/react'; import * as React from 'react'; +import type { CSSProperties } from 'react'; + import { useStickyToolbar } from '../hooks/parametersFormScroll'; import { RunButton } from './RunButton'; import { SearchBar } from './SearchBar'; -import type { CSSProperties } from 'react'; - // Styles definition const stackStyles: IStackStyles = { root: { diff --git a/vscode-extensions/rush-vscode-command-webview/src/hooks/parametersFormScroll.ts b/vscode-extensions/rush-vscode-command-webview/src/hooks/parametersFormScroll.ts index f2d573daa09..e53224f5e71 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/hooks/parametersFormScroll.ts +++ b/vscode-extensions/rush-vscode-command-webview/src/hooks/parametersFormScroll.ts @@ -2,6 +2,8 @@ // See LICENSE in the project root for license information. import { type MutableRefObject, type UIEventHandler, useCallback, useEffect, useRef } from 'react'; +import type { Dispatch, AnyAction } from '@reduxjs/toolkit'; + import { useAppDispatch } from '../store/hooks'; import { setCurretParameterName, @@ -12,8 +14,6 @@ import { useUserSelectedParameterName } from '../store/slices/ui'; -import type { Dispatch, AnyAction } from '@reduxjs/toolkit'; - export const SCROLLABLE_ELEMENT_ID: string = 'parameters-scrollable-element'; export const FIELD_ANCHOR_CLASSNAME: string = 'parameters-field-anchor'; diff --git a/vscode-extensions/rush-vscode-command-webview/src/store/index.ts b/vscode-extensions/rush-vscode-command-webview/src/store/index.ts index 0e2d507e8e7..2927dd515ee 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/store/index.ts +++ b/vscode-extensions/rush-vscode-command-webview/src/store/index.ts @@ -3,6 +3,7 @@ import { configureStore } from '@reduxjs/toolkit'; import type { EnhancedStore } from '@reduxjs/toolkit'; + import parameterReducer, { type IParameterState } from './slices/parameter'; import uiReducer, { type IUIState } from './slices/ui'; import projectReducer, { type IProjectState } from './slices/project'; diff --git a/vscode-extensions/rush-vscode-command-webview/src/store/slices/parameter.ts b/vscode-extensions/rush-vscode-command-webview/src/store/slices/parameter.ts index 66ad85378b8..3fd1fcc69ac 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/store/slices/parameter.ts +++ b/vscode-extensions/rush-vscode-command-webview/src/store/slices/parameter.ts @@ -2,9 +2,10 @@ // See LICENSE in the project root for license information. import { type SliceCaseReducers, createSlice, type Slice, type PayloadAction } from '@reduxjs/toolkit'; -import type { CommandLineParameterKind } from '@rushstack/ts-command-line'; import type { FieldValues } from 'react-hook-form'; +import type { CommandLineParameterKind } from '@rushstack/ts-command-line'; + import { useAppSelector } from '../hooks'; export interface ICommandLineParameter { diff --git a/vscode-extensions/rush-vscode-command-webview/src/store/slices/ui.ts b/vscode-extensions/rush-vscode-command-webview/src/store/slices/ui.ts index d0ec77ca931..99fddf77433 100644 --- a/vscode-extensions/rush-vscode-command-webview/src/store/slices/ui.ts +++ b/vscode-extensions/rush-vscode-command-webview/src/store/slices/ui.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { createSlice, type Slice, type SliceCaseReducers } from '@reduxjs/toolkit'; + import { useAppSelector } from '../hooks'; export interface IUIState { diff --git a/webpack/hashed-folder-copy-plugin/src/HashedFolderCopyPlugin.ts b/webpack/hashed-folder-copy-plugin/src/HashedFolderCopyPlugin.ts index a4a8e7d89e5..c69bf568dcd 100644 --- a/webpack/hashed-folder-copy-plugin/src/HashedFolderCopyPlugin.ts +++ b/webpack/hashed-folder-copy-plugin/src/HashedFolderCopyPlugin.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Async } from '@rushstack/node-core-library'; import type { CallExpression, Expression, UnaryExpression } from 'estree'; import type webpack from 'webpack'; import type glob from 'fast-glob'; +import { Async } from '@rushstack/node-core-library'; + import { type IHashedFolderDependency, getHashedFolderDependencyForWebpackInstance diff --git a/webpack/hashed-folder-copy-plugin/src/HashedFolderDependency.ts b/webpack/hashed-folder-copy-plugin/src/HashedFolderDependency.ts index 7180a65cb70..078f3929a22 100644 --- a/webpack/hashed-folder-copy-plugin/src/HashedFolderDependency.ts +++ b/webpack/hashed-folder-copy-plugin/src/HashedFolderDependency.ts @@ -3,9 +3,11 @@ import path from 'node:path'; import crypto from 'node:crypto'; + import glob from 'fast-glob'; import type webpack from 'webpack'; import type { SourceLocation } from 'estree'; + import { LegacyAdapters } from '@rushstack/node-core-library'; import { renderError } from './HashedFolderCopyPlugin'; diff --git a/webpack/hashed-folder-copy-plugin/src/test/HashedFolderCopyPlugin.test.ts b/webpack/hashed-folder-copy-plugin/src/test/HashedFolderCopyPlugin.test.ts index d62c66e42bb..22c23ce6cbf 100644 --- a/webpack/hashed-folder-copy-plugin/src/test/HashedFolderCopyPlugin.test.ts +++ b/webpack/hashed-folder-copy-plugin/src/test/HashedFolderCopyPlugin.test.ts @@ -73,7 +73,7 @@ async function runTestAsync(inputFolderPath: string): Promise { const [{ Volume }, { default: webpack }, { promisify }, { HashedFolderCopyPlugin }] = await Promise.all([ import('memfs/lib/volume'), import('webpack'), - import('util'), + import('node:util'), import('../HashedFolderCopyPlugin') ]); diff --git a/webpack/loader-raw-script/src/RawScriptLoader.ts b/webpack/loader-raw-script/src/RawScriptLoader.ts index 48c5ec90faf..b33bb849a57 100644 --- a/webpack/loader-raw-script/src/RawScriptLoader.ts +++ b/webpack/loader-raw-script/src/RawScriptLoader.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { EOL } from 'os'; +import { EOL } from 'node:os'; const loaderFn: (content: string) => string = (content: string) => { content = content.replace(/\\/g, '\\\\'); diff --git a/webpack/set-webpack-public-path-plugin/src/SetPublicPathCurrentScriptPlugin.ts b/webpack/set-webpack-public-path-plugin/src/SetPublicPathCurrentScriptPlugin.ts index e8b1c07bbad..07df200d9ae 100644 --- a/webpack/set-webpack-public-path-plugin/src/SetPublicPathCurrentScriptPlugin.ts +++ b/webpack/set-webpack-public-path-plugin/src/SetPublicPathCurrentScriptPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type webpack from 'webpack'; + import { SetPublicPathPluginBase } from './SetPublicPathPluginBase'; const PLUGIN_NAME: string = 'set-webpack-public-path-current-script-plugin'; diff --git a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts index a06fc98e85c..c328e320b16 100644 --- a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts +++ b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { Text } from '@rushstack/node-core-library'; - import type webpack from 'webpack'; +import { Text } from '@rushstack/node-core-library'; + import { type IInternalOptions, getSetPublicPathCode } from './codeGenerator'; import { SetPublicPathPluginBase } from './SetPublicPathPluginBase'; diff --git a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPluginBase.ts b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPluginBase.ts index a805c00ad7a..f10019fa03d 100644 --- a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPluginBase.ts +++ b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPluginBase.ts @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import type webpack from 'webpack'; + import { VersionDetection } from '@rushstack/webpack-plugin-utilities'; import { PackageJsonLookup, type IPackageJson } from '@rushstack/node-core-library'; -import type webpack from 'webpack'; - /** * @public */ diff --git a/webpack/set-webpack-public-path-plugin/src/test/testBase.ts b/webpack/set-webpack-public-path-plugin/src/test/testBase.ts index 2a144a1c807..bb0a3545175 100644 --- a/webpack/set-webpack-public-path-plugin/src/test/testBase.ts +++ b/webpack/set-webpack-public-path-plugin/src/test/testBase.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { promisify } from 'util'; +import { promisify } from 'node:util'; import webpack, { type InputFileSystem, type OutputFileSystem, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack-deep-imports-plugin/src/DeepImportsPlugin.ts b/webpack/webpack-deep-imports-plugin/src/DeepImportsPlugin.ts index 548e6977dcb..281035faa6f 100644 --- a/webpack/webpack-deep-imports-plugin/src/DeepImportsPlugin.ts +++ b/webpack/webpack-deep-imports-plugin/src/DeepImportsPlugin.ts @@ -1,8 +1,10 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import { DllPlugin, type Compiler, WebpackError, type Chunk, type NormalModule } from 'webpack'; -import path from 'path'; + import { Async, FileSystem, LegacyAdapters, Path } from '@rushstack/node-core-library'; const PLUGIN_NAME: 'DeepImportsPlugin' = 'DeepImportsPlugin'; diff --git a/webpack/webpack-embedded-dependencies-plugin/src/EmbeddedDependenciesWebpackPlugin.ts b/webpack/webpack-embedded-dependencies-plugin/src/EmbeddedDependenciesWebpackPlugin.ts index a2d7c1b1f03..4fac8ba3f23 100644 --- a/webpack/webpack-embedded-dependencies-plugin/src/EmbeddedDependenciesWebpackPlugin.ts +++ b/webpack/webpack-embedded-dependencies-plugin/src/EmbeddedDependenciesWebpackPlugin.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; -import { Async, Sort, LegacyAdapters, FileSystem } from '@rushstack/node-core-library'; +import path from 'node:path'; import type { Compiler, Compilation, WebpackPluginInstance, WebpackError, InputFileSystem } from 'webpack'; + +import { Async, Sort, LegacyAdapters, FileSystem } from '@rushstack/node-core-library'; import type { IPackageJson } from '@rushstack/node-core-library'; import { LICENSE_FILES_REGEXP, COPYRIGHT_REGEX } from './regexpUtils'; diff --git a/webpack/webpack-embedded-dependencies-plugin/src/test/WebpackEmbeddedDependenciesPlugin.test.ts b/webpack/webpack-embedded-dependencies-plugin/src/test/WebpackEmbeddedDependenciesPlugin.test.ts index a8cbe28611d..f867f8434e5 100644 --- a/webpack/webpack-embedded-dependencies-plugin/src/test/WebpackEmbeddedDependenciesPlugin.test.ts +++ b/webpack/webpack-embedded-dependencies-plugin/src/test/WebpackEmbeddedDependenciesPlugin.test.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import { createFsFromVolume, type IFs, Volume } from 'memfs'; import EmbeddedDependenciesWebpackPlugin from '../EmbeddedDependenciesWebpackPlugin'; diff --git a/webpack/webpack-plugin-utilities/src/Testing.ts b/webpack/webpack-plugin-utilities/src/Testing.ts index 3c4b92e4b17..db3f001d435 100644 --- a/webpack/webpack-plugin-utilities/src/Testing.ts +++ b/webpack/webpack-plugin-utilities/src/Testing.ts @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import path from 'node:path'; + import { createFsFromVolume, Volume, type IFs } from 'memfs'; -import path from 'path'; import type { StatsCompilation as WebpackStatsCompilation } from 'webpack'; import webpackMerge from 'webpack-merge'; - import type { MultiStats, Stats, Configuration, Compiler, StatsError, OutputFileSystem } from 'webpack'; /** diff --git a/webpack/webpack-workspace-resolve-plugin/src/KnownDescriptionFilePlugin.ts b/webpack/webpack-workspace-resolve-plugin/src/KnownDescriptionFilePlugin.ts index ac81157b3c0..30b26319570 100644 --- a/webpack/webpack-workspace-resolve-plugin/src/KnownDescriptionFilePlugin.ts +++ b/webpack/webpack-workspace-resolve-plugin/src/KnownDescriptionFilePlugin.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import type { InputFileSystem, Resolver } from 'webpack'; + import type { IPrefixMatch } from '@rushstack/lookup-by-path'; + import type { IResolveContext, WorkspaceLayoutCache } from './WorkspaceLayoutCache'; type ResolveRequest = Parameters[1]; diff --git a/webpack/webpack-workspace-resolve-plugin/src/KnownPackageDependenciesPlugin.ts b/webpack/webpack-workspace-resolve-plugin/src/KnownPackageDependenciesPlugin.ts index d3ad1503249..2f721e018fb 100644 --- a/webpack/webpack-workspace-resolve-plugin/src/KnownPackageDependenciesPlugin.ts +++ b/webpack/webpack-workspace-resolve-plugin/src/KnownPackageDependenciesPlugin.ts @@ -2,7 +2,9 @@ // See LICENSE in the project root for license information. import type { Resolver } from 'webpack'; + import type { IPrefixMatch } from '@rushstack/lookup-by-path'; + import type { IResolveContext, WorkspaceLayoutCache } from './WorkspaceLayoutCache'; type ResolveRequest = Parameters[1]; diff --git a/webpack/webpack4-localization-plugin/src/LocalizationPlugin.ts b/webpack/webpack4-localization-plugin/src/LocalizationPlugin.ts index 9c021acfe09..2e4a05b7c06 100644 --- a/webpack/webpack4-localization-plugin/src/LocalizationPlugin.ts +++ b/webpack/webpack4-localization-plugin/src/LocalizationPlugin.ts @@ -1,11 +1,13 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { JsonFile, FileSystem, NewlineKind } from '@rushstack/node-core-library'; -import type { ITerminal } from '@rushstack/terminal'; +import * as path from 'node:path'; + import * as Webpack from 'webpack'; -import * as path from 'path'; import type * as Tapable from 'tapable'; + +import { JsonFile, FileSystem, NewlineKind } from '@rushstack/node-core-library'; +import type { ITerminal } from '@rushstack/terminal'; import { getPseudolocalizer, type ILocalizationFile, diff --git a/webpack/webpack4-localization-plugin/src/WebpackConfigurationUpdater.ts b/webpack/webpack4-localization-plugin/src/WebpackConfigurationUpdater.ts index 02f27a2546e..a2f11ca07a1 100644 --- a/webpack/webpack4-localization-plugin/src/WebpackConfigurationUpdater.ts +++ b/webpack/webpack4-localization-plugin/src/WebpackConfigurationUpdater.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as path from 'node:path'; + import { minimatch } from 'minimatch'; -import * as path from 'path'; import type * as Webpack from 'webpack'; + import type * as SetPublicPathPluginPackageType from '@rushstack/set-webpack-public-path-plugin'; import { type NewlineKind, Text } from '@rushstack/node-core-library'; import type { IgnoreStringFunction } from '@rushstack/localization-utilities'; diff --git a/webpack/webpack4-localization-plugin/src/loaders/InPlaceLocFileLoader.ts b/webpack/webpack4-localization-plugin/src/loaders/InPlaceLocFileLoader.ts index 7b6d6856e30..ef8717477e5 100644 --- a/webpack/webpack4-localization-plugin/src/loaders/InPlaceLocFileLoader.ts +++ b/webpack/webpack4-localization-plugin/src/loaders/InPlaceLocFileLoader.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { loader } from 'webpack'; + import { Terminal } from '@rushstack/terminal'; import { type ILocalizationFile, parseLocFile } from '@rushstack/localization-utilities'; diff --git a/webpack/webpack4-localization-plugin/src/loaders/LoaderFactory.ts b/webpack/webpack4-localization-plugin/src/loaders/LoaderFactory.ts index 9d6f09374ec..66d4d7d2d3a 100644 --- a/webpack/webpack4-localization-plugin/src/loaders/LoaderFactory.ts +++ b/webpack/webpack4-localization-plugin/src/loaders/LoaderFactory.ts @@ -3,6 +3,7 @@ import type { loader } from 'webpack'; import * as loaderUtils from 'loader-utils'; + import type { NewlineKind } from '@rushstack/node-core-library'; import type { IgnoreStringFunction } from '@rushstack/localization-utilities'; diff --git a/webpack/webpack4-localization-plugin/src/loaders/LocLoader.ts b/webpack/webpack4-localization-plugin/src/loaders/LocLoader.ts index efe2b6cd098..d6baf976164 100644 --- a/webpack/webpack4-localization-plugin/src/loaders/LocLoader.ts +++ b/webpack/webpack4-localization-plugin/src/loaders/LocLoader.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { loader } from 'webpack'; + import { Terminal } from '@rushstack/terminal'; import { type ILocalizationFile, parseLocFile } from '@rushstack/localization-utilities'; diff --git a/webpack/webpack4-localization-plugin/src/utilities/LoaderTerminalProvider.ts b/webpack/webpack4-localization-plugin/src/utilities/LoaderTerminalProvider.ts index 49582f72b2a..7e33f70f568 100644 --- a/webpack/webpack4-localization-plugin/src/utilities/LoaderTerminalProvider.ts +++ b/webpack/webpack4-localization-plugin/src/utilities/LoaderTerminalProvider.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type * as webpack from 'webpack'; + import { type ITerminalProvider, TerminalProviderSeverity } from '@rushstack/terminal'; export class LoaderTerminalProvider { diff --git a/webpack/webpack4-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/webpack4-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts index 1d62fbb29da..ce519780e3c 100644 --- a/webpack/webpack4-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts +++ b/webpack/webpack4-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts @@ -1,9 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type * as webpack from 'webpack'; import { ConcatSource } from 'webpack-sources'; + import type { IAssetInfo, IModuleMap, diff --git a/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.ts index 49c691ef91f..40716e76ee6 100644 --- a/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.ts +++ b/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { createHash, type Hash } from 'crypto'; +import { createHash, type Hash } from 'node:crypto'; import { CachedSource, @@ -14,13 +14,6 @@ import { import * as webpack from 'webpack'; import { AsyncSeriesWaterfallHook, type SyncHook, SyncWaterfallHook, type TapOptions } from 'tapable'; -import { - CHUNK_MODULES_TOKEN, - MODULE_WRAPPER_PREFIX, - MODULE_WRAPPER_SUFFIX, - STAGE_BEFORE, - STAGE_AFTER -} from './Constants'; import type { IMinifierConnection, IModuleMinifier, @@ -29,6 +22,13 @@ import type { } from '@rushstack/module-minifier'; import { getIdentifier } from '@rushstack/module-minifier'; +import { + CHUNK_MODULES_TOKEN, + MODULE_WRAPPER_PREFIX, + MODULE_WRAPPER_SUFFIX, + STAGE_BEFORE, + STAGE_AFTER +} from './Constants'; import type { IModuleMinifierPluginOptions, IModuleMap, diff --git a/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts b/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts index 5e3d1fe5c57..45c5c9e5c4b 100644 --- a/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts +++ b/webpack/webpack4-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IModuleMinifier } from '@rushstack/module-minifier'; import type { AsyncSeriesWaterfallHook, SyncWaterfallHook } from 'tapable'; import type * as webpack from 'webpack'; import type { ReplaceSource, Source } from 'webpack-sources'; +import type { IModuleMinifier } from '@rushstack/module-minifier'; + /** * Information about where the module was rendered in the emitted asset. * @public diff --git a/webpack/webpack4-module-minifier-plugin/src/OverrideWebpackIdentifierAllocation.ts b/webpack/webpack4-module-minifier-plugin/src/OverrideWebpackIdentifierAllocation.ts index 2256759e2c5..04d9267e5da 100644 --- a/webpack/webpack4-module-minifier-plugin/src/OverrideWebpackIdentifierAllocation.ts +++ b/webpack/webpack4-module-minifier-plugin/src/OverrideWebpackIdentifierAllocation.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import { Template } from 'webpack'; + import { getIdentifier } from '@rushstack/module-minifier'; // Configure webpack to use the same identifier allocation logic as Terser to maximize gzip compressibility diff --git a/webpack/webpack4-module-minifier-plugin/src/ParallelCompiler.ts b/webpack/webpack4-module-minifier-plugin/src/ParallelCompiler.ts index 5fd0626b8d4..194da4d4d89 100644 --- a/webpack/webpack4-module-minifier-plugin/src/ParallelCompiler.ts +++ b/webpack/webpack4-module-minifier-plugin/src/ParallelCompiler.ts @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import os from 'os'; -import { resolve } from 'path'; -import type { Worker } from 'worker_threads'; +import os from 'node:os'; +import { resolve } from 'node:path'; +import type { Worker } from 'node:worker_threads'; import type { Configuration } from 'webpack'; diff --git a/webpack/webpack4-module-minifier-plugin/src/PortableMinifierIdsPlugin.ts b/webpack/webpack4-module-minifier-plugin/src/PortableMinifierIdsPlugin.ts index e3b1ca78c0f..d52230ee6b1 100644 --- a/webpack/webpack4-module-minifier-plugin/src/PortableMinifierIdsPlugin.ts +++ b/webpack/webpack4-module-minifier-plugin/src/PortableMinifierIdsPlugin.ts @@ -1,10 +1,11 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import { createHash } from 'node:crypto'; + import type { Compiler, Plugin } from 'webpack'; import type webpack from 'webpack'; import type { ReplaceSource } from 'webpack-sources'; -import { createHash } from 'crypto'; import type { TapOptions } from 'tapable'; import RequestShortener from 'webpack/lib/RequestShortener'; diff --git a/webpack/webpack4-module-minifier-plugin/src/workerPool/WebpackWorker.ts b/webpack/webpack4-module-minifier-plugin/src/workerPool/WebpackWorker.ts index e6b8cf8f59b..6300e7a0895 100644 --- a/webpack/webpack4-module-minifier-plugin/src/workerPool/WebpackWorker.ts +++ b/webpack/webpack4-module-minifier-plugin/src/workerPool/WebpackWorker.ts @@ -1,9 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. +import * as workerThreads from 'node:worker_threads'; + import webpack = require('webpack'); -import * as workerThreads from 'worker_threads'; + import { MessagePortMinifier } from '@rushstack/module-minifier'; + import { ModuleMinifierPlugin } from '../ModuleMinifierPlugin'; import '../OverrideWebpackIdentifierAllocation'; diff --git a/webpack/webpack5-load-themed-styles-loader/src/test/testData/getCompiler.ts b/webpack/webpack5-load-themed-styles-loader/src/test/testData/getCompiler.ts index ab10030aeb8..595310b824d 100644 --- a/webpack/webpack5-load-themed-styles-loader/src/test/testData/getCompiler.ts +++ b/webpack/webpack5-load-themed-styles-loader/src/test/testData/getCompiler.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import path from 'path'; +import path from 'node:path'; import webpack from 'webpack'; import type { Compiler, OutputFileSystem, Stats } from 'webpack'; import { Volume } from 'memfs'; diff --git a/webpack/webpack5-localization-plugin/src/LocalizationPlugin.ts b/webpack/webpack5-localization-plugin/src/LocalizationPlugin.ts index 1848be90f98..e5a54496bad 100644 --- a/webpack/webpack5-localization-plugin/src/LocalizationPlugin.ts +++ b/webpack/webpack5-localization-plugin/src/LocalizationPlugin.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; import type { Asset, diff --git a/webpack/webpack5-localization-plugin/src/interfaces.ts b/webpack/webpack5-localization-plugin/src/interfaces.ts index 06f8786a2f1..db77ea44c1b 100644 --- a/webpack/webpack5-localization-plugin/src/interfaces.ts +++ b/webpack/webpack5-localization-plugin/src/interfaces.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { LoaderContext, Compilation } from 'webpack'; + import type { IPseudolocaleOptions } from '@rushstack/localization-utilities'; /** diff --git a/webpack/webpack5-localization-plugin/src/loaders/IResxLoaderOptions.ts b/webpack/webpack5-localization-plugin/src/loaders/IResxLoaderOptions.ts index 0e7948bb737..fef594a5dab 100644 --- a/webpack/webpack5-localization-plugin/src/loaders/IResxLoaderOptions.ts +++ b/webpack/webpack5-localization-plugin/src/loaders/IResxLoaderOptions.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { IParseResxOptionsBase } from '@rushstack/localization-utilities'; + import type { IBaseLocLoaderOptions } from './LoaderFactory'; /** diff --git a/webpack/webpack5-localization-plugin/src/loaders/default-locale-loader.ts b/webpack/webpack5-localization-plugin/src/loaders/default-locale-loader.ts index 024370dad5b..c05af860807 100644 --- a/webpack/webpack5-localization-plugin/src/loaders/default-locale-loader.ts +++ b/webpack/webpack5-localization-plugin/src/loaders/default-locale-loader.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { LoaderContext, LoaderDefinitionFunction } from 'webpack'; + import { Terminal } from '@rushstack/terminal'; import { type ILocalizationFile, parseLocFile } from '@rushstack/localization-utilities'; diff --git a/webpack/webpack5-localization-plugin/src/loaders/locjson-loader.ts b/webpack/webpack5-localization-plugin/src/loaders/locjson-loader.ts index 9d611186acb..2ee1d3c1485 100644 --- a/webpack/webpack5-localization-plugin/src/loaders/locjson-loader.ts +++ b/webpack/webpack5-localization-plugin/src/loaders/locjson-loader.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { LoaderContext, LoaderDefinitionFunction } from 'webpack'; + import { parseLocJson } from '@rushstack/localization-utilities'; import { createLoader, type IBaseLocLoaderOptions } from './LoaderFactory'; diff --git a/webpack/webpack5-localization-plugin/src/loaders/resjson-loader.ts b/webpack/webpack5-localization-plugin/src/loaders/resjson-loader.ts index 5acaddcdf50..78e491ccbc8 100644 --- a/webpack/webpack5-localization-plugin/src/loaders/resjson-loader.ts +++ b/webpack/webpack5-localization-plugin/src/loaders/resjson-loader.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { LoaderContext, LoaderDefinitionFunction } from 'webpack'; + import { parseResJson } from '@rushstack/localization-utilities'; import { createLoader, type IBaseLocLoaderOptions } from './LoaderFactory'; diff --git a/webpack/webpack5-localization-plugin/src/loaders/resx-loader.ts b/webpack/webpack5-localization-plugin/src/loaders/resx-loader.ts index 46bef0f73b9..64e1ba2bf70 100644 --- a/webpack/webpack5-localization-plugin/src/loaders/resx-loader.ts +++ b/webpack/webpack5-localization-plugin/src/loaders/resx-loader.ts @@ -2,10 +2,11 @@ // See LICENSE in the project root for license information. import type { LoaderContext, LoaderDefinitionFunction } from 'webpack'; + import { Terminal } from '@rushstack/terminal'; import { parseResx } from '@rushstack/localization-utilities'; -import type { IResxLocLoaderOptions } from './IResxLoaderOptions'; +import type { IResxLocLoaderOptions } from './IResxLoaderOptions'; import { createLoader } from './LoaderFactory'; import { LoaderTerminalProvider } from '../utilities/LoaderTerminalProvider'; diff --git a/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamic.test.ts b/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamic.test.ts index 87aef19bde3..187c101ecd2 100644 --- a/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamic.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamic.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamicFormatWithNoLocaleFallback.test.ts b/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamicFormatWithNoLocaleFallback.test.ts index 3c2ec58b434..c7aa827939c 100644 --- a/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamicFormatWithNoLocaleFallback.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/LocalizedAsyncDynamicFormatWithNoLocaleFallback.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/LocalizedNoAsync.test.ts b/webpack/webpack5-localization-plugin/src/test/LocalizedNoAsync.test.ts index 063435adf49..901f44ebe15 100644 --- a/webpack/webpack5-localization-plugin/src/test/LocalizedNoAsync.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/LocalizedNoAsync.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeDifferentHashLengths.test.ts b/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeDifferentHashLengths.test.ts index f2cb276e654..7f91f3b68e4 100644 --- a/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeDifferentHashLengths.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeDifferentHashLengths.test.ts @@ -3,7 +3,7 @@ jest.disableAutomock(); -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; import { runTests } from './LocalizedRuntimeTestBase'; diff --git a/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeTestBase.ts b/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeTestBase.ts index 08c5df649bf..bb8af0ad213 100644 --- a/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeTestBase.ts +++ b/webpack/webpack5-localization-plugin/src/test/LocalizedRuntimeTestBase.ts @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/MixedAsync.test.ts b/webpack/webpack5-localization-plugin/src/test/MixedAsync.test.ts index 734999a647e..9da131a98e2 100644 --- a/webpack/webpack5-localization-plugin/src/test/MixedAsync.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/MixedAsync.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/MixedAsyncDynamic.test.ts b/webpack/webpack5-localization-plugin/src/test/MixedAsyncDynamic.test.ts index d9aa504f3ee..0f4a3f61e80 100644 --- a/webpack/webpack5-localization-plugin/src/test/MixedAsyncDynamic.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/MixedAsyncDynamic.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/MixedAsyncNonHashed.test.ts b/webpack/webpack5-localization-plugin/src/test/MixedAsyncNonHashed.test.ts index 9f1992ec6d0..91ee9a41e88 100644 --- a/webpack/webpack5-localization-plugin/src/test/MixedAsyncNonHashed.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/MixedAsyncNonHashed.test.ts @@ -2,8 +2,8 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { resolve } from 'path'; -import { promisify } from 'util'; +import { resolve } from 'node:path'; +import { promisify } from 'node:util'; import webpack, { type Compiler, type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/NoLocalizedFiles.test.ts b/webpack/webpack5-localization-plugin/src/test/NoLocalizedFiles.test.ts index b1dc7da9e2c..c6478476623 100644 --- a/webpack/webpack5-localization-plugin/src/test/NoLocalizedFiles.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/NoLocalizedFiles.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { promisify } from 'util'; +import { promisify } from 'node:util'; import webpack, { type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/test/NonHashedNonLocalizedAssets.test.ts b/webpack/webpack5-localization-plugin/src/test/NonHashedNonLocalizedAssets.test.ts index b94d85fdc8b..e1564db0b48 100644 --- a/webpack/webpack5-localization-plugin/src/test/NonHashedNonLocalizedAssets.test.ts +++ b/webpack/webpack5-localization-plugin/src/test/NonHashedNonLocalizedAssets.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { promisify } from 'util'; +import { promisify } from 'node:util'; import webpack, { type Stats } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-localization-plugin/src/trueHashes.ts b/webpack/webpack5-localization-plugin/src/trueHashes.ts index 6f3f7501e60..8b9ec93547e 100644 --- a/webpack/webpack5-localization-plugin/src/trueHashes.ts +++ b/webpack/webpack5-localization-plugin/src/trueHashes.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { default as webpack, Compilation, Chunk, Asset, sources, util } from 'webpack'; + import { Text } from '@rushstack/node-core-library'; import type { ILocalizedWebpackChunk } from './webpackInterfaces'; diff --git a/webpack/webpack5-localization-plugin/src/utilities/LoaderTerminalProvider.ts b/webpack/webpack5-localization-plugin/src/utilities/LoaderTerminalProvider.ts index 74812ad9ff0..49520cb30be 100644 --- a/webpack/webpack5-localization-plugin/src/utilities/LoaderTerminalProvider.ts +++ b/webpack/webpack5-localization-plugin/src/utilities/LoaderTerminalProvider.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { LoaderContext } from 'webpack'; + import { type ITerminalProvider, TerminalProviderSeverity } from '@rushstack/terminal'; export class LoaderTerminalProvider { diff --git a/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts index 03de3b85a24..1e2cad30692 100644 --- a/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts +++ b/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts @@ -1,10 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import * as path from 'path'; +import * as path from 'node:path'; + import type { Comment } from 'estree'; import type { Compilation, Module } from 'webpack'; import type { sources } from 'webpack'; + import type { IAssetInfo } from './ModuleMinifierPlugin.types'; function getAllComments(modules: Iterable): Set { diff --git a/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.ts b/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.ts index 243a5a461e0..84ba7a0771d 100644 --- a/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.ts +++ b/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.ts @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import { createHash } from 'crypto'; +import { createHash } from 'node:crypto'; import type { Comment } from 'estree'; import type { @@ -17,13 +17,6 @@ import type { } from 'webpack'; import { AsyncSeriesWaterfallHook, SyncWaterfallHook, type Tap } from 'tapable'; -import { - CHUNK_MODULE_TOKEN, - MODULE_WRAPPER_PREFIX, - MODULE_WRAPPER_SUFFIX, - STAGE_BEFORE, - STAGE_AFTER -} from './Constants'; import type { IMinifierConnection, IModuleMinifier, @@ -32,6 +25,13 @@ import type { } from '@rushstack/module-minifier'; import { getIdentifier } from '@rushstack/module-minifier'; +import { + CHUNK_MODULE_TOKEN, + MODULE_WRAPPER_PREFIX, + MODULE_WRAPPER_SUFFIX, + STAGE_BEFORE, + STAGE_AFTER +} from './Constants'; import type { IModuleMinifierPluginOptions, IModuleMap, diff --git a/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts b/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts index e2ae4751317..8d6e7de5902 100644 --- a/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts +++ b/webpack/webpack5-module-minifier-plugin/src/ModuleMinifierPlugin.types.ts @@ -1,11 +1,12 @@ // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. // See LICENSE in the project root for license information. -import type { IModuleMinifier } from '@rushstack/module-minifier'; import type { AsyncSeriesWaterfallHook, SyncWaterfallHook } from 'tapable'; import type { Chunk, Compilation, Module, sources } from 'webpack'; import type { Comment } from 'estree'; +import type { IModuleMinifier } from '@rushstack/module-minifier'; + /** * Information about where the module was rendered in the emitted asset. * @public diff --git a/webpack/webpack5-module-minifier-plugin/src/test/AmdExternals.test.ts b/webpack/webpack5-module-minifier-plugin/src/test/AmdExternals.test.ts index d5aa941a91f..dd41c3a6313 100644 --- a/webpack/webpack5-module-minifier-plugin/src/test/AmdExternals.test.ts +++ b/webpack/webpack5-module-minifier-plugin/src/test/AmdExternals.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { promisify } from 'util'; +import { promisify } from 'node:util'; import webpack, { type Stats, type InputFileSystem, type OutputFileSystem } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-module-minifier-plugin/src/test/MultipleRuntimes.test.ts b/webpack/webpack5-module-minifier-plugin/src/test/MultipleRuntimes.test.ts index bcb14e9d159..d7c0fd190d5 100644 --- a/webpack/webpack5-module-minifier-plugin/src/test/MultipleRuntimes.test.ts +++ b/webpack/webpack5-module-minifier-plugin/src/test/MultipleRuntimes.test.ts @@ -2,7 +2,7 @@ // See LICENSE in the project root for license information. jest.disableAutomock(); -import { promisify } from 'util'; +import { promisify } from 'node:util'; import webpack, { type Stats, type InputFileSystem, type OutputFileSystem } from 'webpack'; import { Volume } from 'memfs/lib/volume'; diff --git a/webpack/webpack5-module-minifier-plugin/src/test/RecordMetadataPlugin.ts b/webpack/webpack5-module-minifier-plugin/src/test/RecordMetadataPlugin.ts index 32370533fbd..6b0fb035659 100644 --- a/webpack/webpack5-module-minifier-plugin/src/test/RecordMetadataPlugin.ts +++ b/webpack/webpack5-module-minifier-plugin/src/test/RecordMetadataPlugin.ts @@ -2,6 +2,7 @@ // See LICENSE in the project root for license information. import type { Compilation, Compiler, WebpackPluginInstance } from 'webpack'; + import type { IModuleStats, IModuleMinifierPluginStats, IAssetStats } from '../ModuleMinifierPlugin.types'; import { ModuleMinifierPlugin } from '../ModuleMinifierPlugin';