revert some changes

microsoft · Jan 17, 2025 · 4a5f0d5 · 4a5f0d5
1 parent 899ddc8
commit 4a5f0d5
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 39 deletions.
diff --git a/experimental/framework/last-edited/src/setup.ts b/experimental/framework/last-edited/src/setup.ts
@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-// eslint-disable-next-line import/no-deprecated
 import { ContainerMessageType } from "@fluidframework/container-runtime/internal";
 import { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
 import { IQuorumClients } from "@fluidframework/driver-definitions";
@@ -19,11 +18,8 @@ import { IFluidLastEditedTracker, ILastEditDetails } from "./interfaces.js";
  * discarded.
  */
 const shouldDiscardMessageDefault = (message: ISequencedDocumentMessage): boolean =>
-	// eslint-disable-next-line import/no-deprecated
 	message.type !== ContainerMessageType.Attach &&
-	// eslint-disable-next-line import/no-deprecated
 	message.type !== ContainerMessageType.FluidDataStoreOp &&
-	// eslint-disable-next-line import/no-deprecated
 	message.type !== ContainerMessageType.Alias;
 
 /**

diff --git a/packages/runtime/container-runtime/src/containerRuntime.ts b/packages/runtime/container-runtime/src/containerRuntime.ts
@@ -238,7 +238,6 @@ import {
 	ISubmitSummaryOptions,
 	// eslint-disable-next-line import/no-deprecated
 	ISummarizeResults,
-	// eslint-disable-next-line import/no-deprecated
 	ISummarizer,
 	// eslint-disable-next-line import/no-deprecated
 	ISummarizerInternalsProvider,
@@ -591,14 +590,12 @@ export interface IContainerRuntimeOptionsInternal extends IContainerRuntimeOptio
  * @alpha
  * @deprecated - This type will be moved to internal in 2.30. External usage is not necessary or supported.
  */
-
 export const DeletedResponseHeaderKey = "wasDeleted";
 /**
  * Tombstone error responses will have this header set to true
  * @legacy
  * @alpha
  */
-
 export const TombstoneResponseHeaderKey = "isTombstoned";
 /**
  * Inactive error responses will have this header set to true
@@ -789,7 +786,6 @@ const summarizerRequestUrl = "_summarizer";
 /**
  * Create and retrieve the summmarizer
  */
-// eslint-disable-next-line import/no-deprecated
 async function createSummarizer(loader: ILoader, url: string): Promise<ISummarizer> {
 	const request: IRequest = {
 		headers: {
@@ -807,7 +803,6 @@ async function createSummarizer(loader: ILoader, url: string): Promise<ISummariz
 
 	const resolvedContainer = await loader.resolve(request);
 
-	// eslint-disable-next-line import/no-deprecated
 	let fluidObject: FluidObject<ISummarizer> | undefined;
 
 	// Older containers may not have the "getEntryPoint" API

diff --git a/packages/runtime/container-runtime/src/summary/summarizer.ts b/packages/runtime/container-runtime/src/summary/summarizer.ts
@@ -37,7 +37,6 @@ import {
 	ISummarizeHeuristicData,
 	// eslint-disable-next-line import/no-deprecated
 	ISummarizeResults,
-	// eslint-disable-next-line import/no-deprecated
 	ISummarizer,
 	// eslint-disable-next-line import/no-deprecated
 	ISummarizerInternalsProvider,
@@ -87,9 +86,7 @@ export const createSummarizingWarning = (
  * @alpha
  * @deprecated - This type will be moved to internal in 2.30. External usage is not necessary or supported.
  */
-// eslint-disable-next-line import/no-deprecated
 export class Summarizer extends TypedEventEmitter<ISummarizerEvents> implements ISummarizer {
-	// eslint-disable-next-line import/no-deprecated
 	public get ISummarizer(): this {
 		return this;
 	}

diff --git a/packages/runtime/container-runtime/src/summary/summarizerTypes.ts b/packages/runtime/container-runtime/src/summary/summarizerTypes.ts
@@ -528,9 +528,7 @@ export type EnqueueSummarizeResult =
 /**
  * @legacy
  * @alpha
- * @deprecated - This type will be moved to internal in 2.30. External usage is not necessary or supported.
  */
-
 export interface ISummarizer extends IEventProvider<ISummarizerEvents> {
 	/**
 	 * Allows {@link ISummarizer} to be used with our {@link @fluidframework/core-interfaces#FluidObject} pattern.

diff --git a/packages/runtime/container-runtime/src/summary/summaryCollection.ts b/packages/runtime/container-runtime/src/summary/summaryCollection.ts
@@ -70,7 +70,6 @@ export interface ISummary {
  * @legacy
  * @alpha
  */
-
 export interface IAckedSummary {
 	readonly summaryOp: ISummaryOpMessage;
 
@@ -266,7 +265,6 @@ export interface ISummaryCollectionOpEvents extends IEvent {
  * @legacy
  * @alpha
  */
-
 export class SummaryCollection extends TypedEventEmitter<ISummaryCollectionOpEvents> {
 	// key: clientId
 	private readonly summaryWatchers = new Map<string, ClientSummaryWatcher>();

diff --git a/packages/runtime/container-runtime/src/summary/summaryManager.ts b/packages/runtime/container-runtime/src/summary/summaryManager.ts
@@ -36,7 +36,6 @@ import {
 	IOnDemandSummarizeOptions,
 	// eslint-disable-next-line import/no-deprecated
 	ISummarizeResults,
-	// eslint-disable-next-line import/no-deprecated
 	ISummarizer,
 } from "./summarizerTypes.js";
 import { SummaryCollection } from "./summaryCollection.js";
@@ -107,7 +106,6 @@ export class SummaryManager
 	private latestClientId: string | undefined;
 	private state = SummaryManagerState.Off;
 
-	// eslint-disable-next-line import/no-deprecated
 	private summarizer?: ISummarizer;
 	private _disposed = false;
 
@@ -133,7 +131,6 @@ export class SummaryManager
 		 * get back its Summarizer instance.
 		 */
 
-		// eslint-disable-next-line import/no-deprecated
 		private readonly createSummarizerFn: () => Promise<ISummarizer>,
 		private readonly startThrottler: IThrottler,
 		{

diff --git a/packages/test/test-utils/src/TestSummaryUtils.ts b/packages/test/test-utils/src/TestSummaryUtils.ts
@@ -12,7 +12,6 @@ import {
 import {
 	// eslint-disable-next-line import/no-deprecated
 	IOnDemandSummarizeOptions,
-	// eslint-disable-next-line import/no-deprecated
 	ISummarizer,
 	ISummaryRuntimeOptions,
 } from "@fluidframework/container-runtime/internal";
@@ -44,7 +43,6 @@ const summarizerClientType = "summarizer";
  * This function can be removed once LTS version of Loader moves to 2.0.0-internal.7.0.0
  * @internal
  */
-// eslint-disable-next-line import/no-deprecated
 async function getSummarizerBackCompat(container: IContainer): Promise<ISummarizer> {
 	if (container.getEntryPoint !== undefined) {
 		const entryPoint = await container.getEntryPoint();
@@ -53,13 +51,11 @@ async function getSummarizerBackCompat(container: IContainer): Promise<ISummariz
 		// function container.getEntryPoint will be defined for the 2.X container. However, it will not return undefined
 		// since the container's runtime will be on version 1.X, which does not have an entry point defined.
 		if (entryPoint !== undefined) {
-			// eslint-disable-next-line import/no-deprecated
 			return entryPoint as ISummarizer;
 		}
 	}
 	const response: IResponse = await (container as any).request({ url: "_summarizer" });
 	assert(response.status === 200, "requesting '/' should return default data object");
-	// eslint-disable-next-line import/no-deprecated
 	return response.value as ISummarizer;
 }
 
@@ -126,7 +122,6 @@ export async function createSummarizerFromFactory(
 	registryEntries?: NamedFluidDataStoreRegistryEntries,
 	logger?: ITelemetryBaseLogger,
 	configProvider: IConfigProviderBase = createTestConfigProvider(),
-	// eslint-disable-next-line import/no-deprecated
 ): Promise<{ container: IContainer; summarizer: ISummarizer }> {
 	const runtimeFactory = createContainerRuntimeFactoryWithDefaultDataStore(
 		containerRuntimeFactoryType,
@@ -159,7 +154,6 @@ export async function createSummarizer(
 	config?: ITestContainerConfig,
 	summaryVersion?: string,
 	logger?: ITelemetryBaseLogger,
-	// eslint-disable-next-line import/no-deprecated
 ): Promise<{ container: IContainer; summarizer: ISummarizer }> {
 	const testContainerConfig: ITestContainerConfig = {
 		...config,
@@ -187,7 +181,6 @@ export async function createSummarizer(
  * @internal
  */
 export async function summarizeNow(
-	// eslint-disable-next-line import/no-deprecated
 	summarizer: ISummarizer,
 	// eslint-disable-next-line import/no-deprecated
 	inputs: string | IOnDemandSummarizeOptions = "end-to-end test",

diff --git a/packages/test/test-utils/src/testContainerRuntimeFactory.ts b/packages/test/test-utils/src/testContainerRuntimeFactory.ts
@@ -6,7 +6,6 @@
 import { IContainerContext, IRuntime } from "@fluidframework/container-definitions/internal";
 import {
 	ContainerRuntime,
-	// eslint-disable-next-line import/no-deprecated
 	DefaultSummaryConfiguration,
 	type IContainerRuntimeOptionsInternal,
 } from "@fluidframework/container-runtime/internal";
@@ -76,7 +75,6 @@ export const createTestContainerRuntimeFactory = (
 			public runtimeOptions: IContainerRuntimeOptionsInternal = {
 				summaryOptions: {
 					summaryConfigOverrides: {
-						// eslint-disable-next-line import/no-deprecated
 						...DefaultSummaryConfiguration,
 						...{
 							initialSummarizerDelayMs: 0,

diff --git a/packages/tools/fetch-tool/src/fluidAnalyzeMessages.ts b/packages/tools/fetch-tool/src/fluidAnalyzeMessages.ts
@@ -4,7 +4,6 @@
  */
 
 import {
-	// eslint-disable-next-line import/no-deprecated
 	ContainerMessageType,
 	IChunkedOp,
 	unpackRuntimeMessage,
@@ -538,30 +537,24 @@ function processOp(
 	let totalMsgSize = msgSize;
 	let opCount = 1;
 	if (unpackRuntimeMessage(runtimeMessage)) {
-		// eslint-disable-next-line import/no-deprecated
 		const messageType = runtimeMessage.type as ContainerMessageType;
 		switch (messageType) {
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.Attach: {
 				const attachMessage = runtimeMessage.contents as IAttachMessage;
 				processDataStoreAttachOp(attachMessage, dataType);
 				break;
 			}
 			// skip for now because these ops do not have contents
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.BlobAttach: {
 				break;
 			}
 			// The default method to count stats should be used for GC messages.
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.GC: {
 				break;
 			}
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.DocumentSchemaChange: {
 				break;
 			}
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.ChunkedOp: {
 				const chunk = runtimeMessage.contents as IChunkedOp;
 				// TODO: Verify whether this should be able to handle server-generated ops (with null clientId)
@@ -594,13 +587,9 @@ function processOp(
 					return;
 				}
 			}
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.IdAllocation:
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.FluidDataStoreOp:
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.Alias:
-			// eslint-disable-next-line import/no-deprecated
 			case ContainerMessageType.Rejoin: {
 				let envelope = runtimeMessage.contents as IEnvelope;
 				// TODO: Legacy?