Introduce an ESLint rule to coalesce imports. (#5414)

iclanton · web-flow · commit 33631a8202c8 · 2025-10-13T11:07:33.000-07:00
* Use the no-duplicate-imports rule.

* fixup! Use the no-duplicate-imports rule.

* fixup! Use the no-duplicate-imports rule.

* Fix duplicate import issues.

* Use the import/no-duplicates rule.

* Manual fixes.
diff --git a/apps/rush-mcp-server/src/utilities/common.ts b/apps/rush-mcp-server/src/utilities/common.ts
@@ -1,13 +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 * as RushLib from '@rushstack/rush-sdk';
 import type { RushConfiguration } from '@rushstack/rush-sdk';
 
 export const getRushConfiguration = async (): Promise<RushConfiguration> => {
   // Since the MCP server is not always started from the directory of the Rush monorepo,
   // it’s necessary to use dynamic import to load the Rush SDK.
-  const Rush: typeof RushLib = await import('@rushstack/rush-sdk');
+  const Rush: typeof import('@rushstack/rush-sdk') = await import('@rushstack/rush-sdk');
   const rushConfiguration: RushConfiguration = Rush.RushConfiguration.loadFromDefaultLocation();
   return rushConfiguration;
 };
diff --git a/common/changes/@microsoft/rush/import-coalescence2_2025-10-11-21-53.json b/common/changes/@microsoft/rush/import-coalescence2_2025-10-11-21-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@microsoft/rush"
+    }
+  ],
+  "packageName": "@microsoft/rush",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@rushstack/mcp-server/import-coalescence2_2025-10-11-21-53.json b/common/changes/@rushstack/mcp-server/import-coalescence2_2025-10-11-21-53.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "type": "none",
+      "packageName": "@rushstack/mcp-server"
+    }
+  ],
+  "packageName": "@rushstack/mcp-server",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@rushstack/webpack-plugin-utilities/import-coalescence2_2025-10-11-21-53.json b/common/changes/@rushstack/webpack-plugin-utilities/import-coalescence2_2025-10-11-21-53.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"
+}
diff --git a/common/changes/@rushstack/webpack5-module-minifier-plugin/import-coalescence2_2025-10-11-21-53.json b/common/changes/@rushstack/webpack5-module-minifier-plugin/import-coalescence2_2025-10-11-21-53.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"
+}
diff --git a/libraries/rush-lib/src/api/RushProjectConfiguration.ts b/libraries/rush-lib/src/api/RushProjectConfiguration.ts
@@ -11,7 +11,7 @@ import { RushConstants } from '../logic/RushConstants';
 import type { IPhase } from './CommandLineConfiguration';
 import { OverlappingPathAnalyzer } from '../utilities/OverlappingPathAnalyzer';
 import schemaJson from '../schemas/rush-project.schema.json';
-import anythingSchemaJson from '../schemas/rush-project.schema.json';
+import anythingSchemaJson from '../schemas/anything.schema.json';
 import { HotlinkManager } from '../utilities/HotlinkManager';
 import type { RushConfiguration } from './RushConfiguration';
 
diff --git a/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts b/libraries/rush-lib/src/cli/RushPnpmCommandLineParser.ts
@@ -16,9 +16,9 @@ import {
   ConsoleTerminalProvider,
   type ITerminal,
   type ITerminalProvider,
-  Terminal
+  Terminal,
+  PrintUtilities
 } from '@rushstack/terminal';
-import { PrintUtilities } from '@rushstack/terminal';
 
 import { RushConfiguration } from '../api/RushConfiguration';
 import { NodeJsCompatibility } from '../logic/NodeJsCompatibility';
diff --git a/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts b/libraries/rush-lib/src/logic/operations/CacheableOperationPlugin.ts
@@ -5,8 +5,14 @@ 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';
-import { SplitterTransform, type TerminalWritable, type ITerminal, Terminal } from '@rushstack/terminal';
+import {
+  DiscardStdoutTransform,
+  TextRewriterTransform,
+  SplitterTransform,
+  type TerminalWritable,
+  type ITerminal,
+  Terminal
+} from '@rushstack/terminal';
 
 import { CollatedTerminalProvider } from '../../utilities/CollatedTerminalProvider';
 import { OperationStatus } from './OperationStatus';
diff --git a/libraries/rush-lib/src/logic/operations/test/OperationExecutionManager.test.ts b/libraries/rush-lib/src/logic/operations/test/OperationExecutionManager.test.ts
@@ -16,9 +16,8 @@ jest.mock('@rushstack/terminal', () => {
   };
 });
 
-import { Terminal } from '@rushstack/terminal';
+import { Terminal, MockWritable, PrintUtilities } from '@rushstack/terminal';
 import { CollatedTerminal } from '@rushstack/stream-collator';
-import { MockWritable, PrintUtilities } from '@rushstack/terminal';
 
 import type { IPhase } from '../../../api/CommandLineConfiguration';
 import type { RushConfigurationProject } from '../../../api/RushConfigurationProject';
diff --git a/libraries/rush-lib/src/utilities/WebClient.ts b/libraries/rush-lib/src/utilities/WebClient.ts
@@ -3,8 +3,7 @@
 
 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 httpRequest, type IncomingMessage, type Agent as HttpAgent } from 'node:http';
 import { request as httpsRequest, type RequestOptions } from 'node:https';
 
 import { Import, LegacyAdapters } from '@rushstack/node-core-library';
@@ -287,7 +286,7 @@ export class WebClient {
         break;
     }
 
-    let agent: http.Agent | undefined = undefined;
+    let agent: HttpAgent | undefined = undefined;
     if (proxyUrl) {
       agent = createHttpsProxyAgent(proxyUrl);
     }
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
@@ -169,7 +169,9 @@ module.exports = {
             ],
             'newlines-between': 'always'
           }
-        ]
+        ],
+
+        'import/no-duplicates': 'warn'
       }
     },
     {
@@ -191,7 +193,8 @@ module.exports = {
         '**/test/**/*.tsx'
       ],
       rules: {
-        'import/order': 'off'
+        'import/order': 'off',
+        'import/no-duplicates': 'off'
       }
     }
   ]
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
@@ -14,9 +14,9 @@ import {
   VisualStudioCodeCredential,
   AzureCliCredential,
   AzureDeveloperCliCredential,
-  AzurePowerShellCredential
+  AzurePowerShellCredential,
+  type TokenCredentialOptions
 } from '@azure/identity';
-import type { TokenCredentialOptions } from '@azure/identity';
 
 import type { ITerminal } from '@rushstack/terminal';
 import { CredentialCache } from '@rushstack/rush-sdk';
diff --git a/rush-plugins/rush-resolver-cache-plugin/src/externals.ts b/rush-plugins/rush-resolver-cache-plugin/src/externals.ts
@@ -3,11 +3,10 @@
 
 import type { Operation as OperationType, OperationStatus as OperationStatusType } from '@rushstack/rush-sdk';
 import type { PnpmShrinkwrapFile as PnpmShrinkwrapFileType } from '@rushstack/rush-sdk/lib/logic/pnpm/PnpmShrinkwrapFile';
-import type * as rushSdkType from '@rushstack/rush-sdk';
 
 // Ultra-cheap "I am a Rush plugin" import of rush-lib
 // eslint-disable-next-line @typescript-eslint/naming-convention
-declare const ___rush___rushLibModule: typeof rushSdkType;
+declare const ___rush___rushLibModule: typeof import('@rushstack/rush-sdk');
 
 const { Operation, OperationStatus } = ___rush___rushLibModule;
 // eslint-disable-next-line @typescript-eslint/no-redeclare
diff --git a/webpack/webpack-plugin-utilities/src/Testing.ts b/webpack/webpack-plugin-utilities/src/Testing.ts
@@ -4,9 +4,16 @@
 import path from 'node:path';
 
 import { createFsFromVolume, Volume, type IFs } from 'memfs';
-import type { StatsCompilation as WebpackStatsCompilation } from 'webpack';
+import type {
+  StatsCompilation as WebpackStatsCompilation,
+  MultiStats,
+  Stats,
+  Configuration,
+  Compiler,
+  StatsError,
+  OutputFileSystem
+} from 'webpack';
 import webpackMerge from 'webpack-merge';
-import type { MultiStats, Stats, Configuration, Compiler, StatsError, OutputFileSystem } from 'webpack';
 
 /**
  * @public
diff --git a/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts b/webpack/webpack5-module-minifier-plugin/src/GenerateLicenseFileForAsset.ts
@@ -4,8 +4,7 @@
 import * as path from 'node:path';
 
 import type { Comment } from 'estree';
-import type { Compilation, Module } from 'webpack';
-import type { sources } from 'webpack';
+import type { Compilation, Module, sources } from 'webpack';
 
 import type { IAssetInfo } from './ModuleMinifierPlugin.types';
 
diff --git a/webpack/webpack5-module-minifier-plugin/src/RehydrateAsset.ts b/webpack/webpack5-module-minifier-plugin/src/RehydrateAsset.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 { sources } from 'webpack';
-import type { Compilation } from 'webpack';
+import type { sources, Compilation } from 'webpack';
 
 import { CHUNK_MODULE_TOKEN, CHUNK_MODULE_REGEX } from './Constants';
 import type { IAssetInfo, IModuleMap, IModuleInfo } from './ModuleMinifierPlugin.types';
