@fluidframework/routerlicious-driver 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/routerlicious-driver",
-  "version": "2.0.0-rc.2.0.1",
+  "version": "2.0.0-rc.3.0.0",
   "description": "Socket.IO + Git implementation of Fluid service API",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,72 +11,62 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/index.d.ts",
+        "types": "./dist/public.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./alpha": {
+    "./beta": {
       "import": {
-        "types": "./lib/routerlicious-driver-alpha.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/beta.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/routerlicious-driver-alpha.d.ts",
+        "types": "./dist/beta.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./beta": {
+    "./legacy": {
       "import": {
-        "types": "./lib/routerlicious-driver-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/legacy.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/routerlicious-driver-beta.d.ts",
+        "types": "./dist/legacy.d.ts",
         "default": "./dist/index.js"
       }
     },
     "./internal": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
-    },
-    "./public": {
-      "import": {
-        "types": "./lib/routerlicious-driver-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/routerlicious-driver-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
-  "main": "dist/index.js",
-  "module": "lib/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/public.d.ts",
   "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
     "exclude": [
       "src/test/**/*.*ts",
-      "dist/test/**/*.*js"
+      "lib/test/**/*.*js"
     ],
     "exclude-after-remap": false,
     "include": [
       "src/**/*.*ts",
-      "dist/**/*.*js"
+      "lib/**/*.*js"
     ],
     "report-dir": "nyc/report",
     "reporter": [
@@ -87,29 +77,30 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/driver-base": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/driver-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/driver-base": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "@fluidframework/gitresources": "^4.0.0",
     "@fluidframework/protocol-base": "^4.0.0",
     "@fluidframework/protocol-definitions": "^3.2.0",
     "@fluidframework/server-services-client": "^4.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "cross-fetch": "^3.1.5",
     "json-stringify-safe": "5.0.1",
     "socket.io-client": "^4.7.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluid-tools/build-cli": "^0.34.0",
+    "@arethetypeswrong/cli": "^0.15.2",
+    "@biomejs/biome": "^1.6.2",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluid-tools/build-cli": "^0.37.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.34.0",
-    "@fluidframework/eslint-config-fluid": "^4.0.0",
+    "@fluidframework/build-tools": "^0.37.0",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
     "@fluidframework/routerlicious-driver-previous": "npm:@fluidframework/routerlicious-driver@2.0.0-internal.8.0.0",
     "@microsoft/api-extractor": "^7.42.3",
     "@types/mocha": "^9.1.1",
@@ -130,21 +121,8 @@
     "prettier": "~3.0.3",
     "rimraf": "^4.4.0",
     "sinon": "^17.0.1",
-    "tsc-multi": "^1.1.0",
     "typescript": "~5.1.6"
   },
-  "fluidBuild": {
-    "tasks": {
-      "build:docs": {
-        "dependsOn": [
-          "...",
-          "api-extractor:commonjs",
-          "api-extractor:esnext"
-        ],
-        "script": false
-      }
-    }
-  },
   "typeValidation": {
     "broken": {
       "RemovedEnumDeclaration_RouterliciousErrorType": {
@@ -158,31 +136,35 @@
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "api-extractor:commonjs": "flub generate entrypoints --outFileAlpha legacy --outDir ./dist",
+    "api-extractor:esnext": "flub generate entrypoints --outFileAlpha legacy --outDir ./lib --node10TypeCompat",
     "build": "fluid-build . --task build",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
-    "build:docs": "fluid-build . --task api",
-    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
+    "build:docs": "api-extractor run --local",
+    "build:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
-    "check:are-the-types-wrong": "attw --pack . --entrypoints .",
+    "build:test": "npm run build:test:esm && npm run build:test:cjs",
+    "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
+    "build:test:esm": "tsc --project ./src/test/tsconfig.json",
+    "check:are-the-types-wrong": "attw --pack .",
+    "check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
-    "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
+    "clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "format": "npm run prettier:fix",
-    "lint": "npm run prettier && npm run check:release-tags && npm run eslint",
-    "lint:fix": "npm run prettier:fix && npm run eslint:fix",
-    "prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
-    "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "format": "fluid-build --task format .",
+    "format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "lint": "fluid-build . --task lint",
+    "lint:fix": "fluid-build . --task eslint:fix --task format",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -r node_modules/@fluid-internal/mocha-test-setup",
+    "test:mocha": "npm run test:mocha:esm && npm run test:mocha:cjs",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
+    "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }

package/src/axios.cts

@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+import type { AxiosRequestConfig, AxiosRequestHeaders, RawAxiosRequestHeaders } from "axios";
+
+export { AxiosRequestConfig, AxiosRequestHeaders, RawAxiosRequestHeaders };

package/src/cache.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { MapWithExpiration } from "./mapWithExpiration";
+import { MapWithExpiration } from "./mapWithExpiration.js";
 
 export interface ICache<T> {
 	get(key: string): Promise<T | undefined>;

package/src/defaultTokenProvider.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITokenProvider, ITokenResponse } from "./tokens";
+import { ITokenProvider, ITokenResponse } from "./tokens.js";
 
 /**
  * Default token provider in case the host does not provide one. It simply caches the provided jwt and returns it back.

package/src/deltaStorageService.ts

@@ -4,23 +4,25 @@
  */
 
 import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import { getW3CData, validateMessages } from "@fluidframework/driver-base";
+import { getW3CData, validateMessages } from "@fluidframework/driver-base/internal";
 import {
 	IDeltaStorageService,
-	IDocumentDeltaStorageService,
 	IDeltasFetchResult,
+	IDocumentDeltaStorageService,
 	IStream,
-} from "@fluidframework/driver-definitions";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import {
+	emptyMessageStream,
 	readAndParse,
 	requestOps,
-	emptyMessageStream,
 	streamObserver,
-} from "@fluidframework/driver-utils";
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
-import { DocumentStorageService } from "./documentStorageService";
-import { RestWrapper } from "./restWrapperBase";
+} from "@fluidframework/driver-utils/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { PerformanceEvent } from "@fluidframework/telemetry-utils/internal";
+
+import { DocumentStorageService } from "./documentStorageService.js";
+import { RestWrapper } from "./restWrapperBase.js";
 
 /**
  * Maximum number of ops we can fetch at a time. This should be kept at 2k, as

package/src/documentDeltaConnection.ts

@@ -3,13 +3,15 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { DocumentDeltaConnection } from "@fluidframework/driver-base";
-import { IAnyDriverError, IDocumentDeltaConnection } from "@fluidframework/driver-definitions";
+import { DocumentDeltaConnection } from "@fluidframework/driver-base/internal";
+import { IAnyDriverError } from "@fluidframework/driver-definitions";
+import { IDocumentDeltaConnection } from "@fluidframework/driver-definitions/internal";
 import { IClient, IConnect } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import type { io as SocketIOClientStatic } from "socket.io-client";
-import { errorObjectFromSocketError, IR11sSocketError } from "./errorUtils";
-import { pkgVersion as driverVersion } from "./packageVersion";
+
+import { IR11sSocketError, errorObjectFromSocketError } from "./errorUtils.js";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
 
 const protocolVersions = ["^0.4.0", "^0.3.0", "^0.2.0", "^0.1.0"];
 

package/src/documentService.ts

@@ -4,31 +4,37 @@
  */
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
-import { assert } from "@fluidframework/core-utils";
-import * as api from "@fluidframework/driver-definitions";
-import { RateLimiter, NetworkErrorBasic, canRetryOnError } from "@fluidframework/driver-utils";
+import { assert } from "@fluidframework/core-utils/internal";
+import * as api from "@fluidframework/driver-definitions/internal";
+import {
+	NetworkErrorBasic,
+	RateLimiter,
+	canRetryOnError,
+} from "@fluidframework/driver-utils/internal";
 import { IClient } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { PerformanceEvent, wrapError } from "@fluidframework/telemetry-utils/internal";
 import io from "socket.io-client";
-import { PerformanceEvent, wrapError, ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { RouterliciousErrorTypes } from "./errorUtils";
-import { DeltaStorageService, DocumentDeltaStorageService } from "./deltaStorageService";
-import { DocumentStorageService } from "./documentStorageService";
-import { R11sDocumentDeltaConnection } from "./documentDeltaConnection";
-import { NullBlobStorageService } from "./nullBlobStorageService";
-import { ITokenProvider } from "./tokens";
+
+import { ICache } from "./cache.js";
+import { INormalizedWholeSnapshot } from "./contracts.js";
+import { ISnapshotTreeVersion } from "./definitions.js";
+import { DeltaStorageService, DocumentDeltaStorageService } from "./deltaStorageService.js";
+import { R11sDocumentDeltaConnection } from "./documentDeltaConnection.js";
+import { DocumentStorageService } from "./documentStorageService.js";
+import { RouterliciousErrorTypes } from "./errorUtils.js";
+import { GitManager } from "./gitManager.js";
+import { Historian } from "./historian.js";
+import { NullBlobStorageService } from "./nullBlobStorageService.js";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
+import { IRouterliciousDriverPolicies } from "./policies.js";
 import {
 	RouterliciousOrdererRestWrapper,
 	RouterliciousStorageRestWrapper,
 	TokenFetcher,
-} from "./restWrapper";
-import { IRouterliciousDriverPolicies } from "./policies";
-import { ICache } from "./cache";
-import { ISnapshotTreeVersion } from "./definitions";
-import { pkgVersion as driverVersion } from "./packageVersion";
-import { GitManager } from "./gitManager";
-import { Historian } from "./historian";
-import { RestWrapper } from "./restWrapperBase";
-import { INormalizedWholeSnapshot } from "./contracts";
+} from "./restWrapper.js";
+import { RestWrapper } from "./restWrapperBase.js";
+import { ITokenProvider } from "./tokens.js";
 
 /**
  * Amount of time between discoveries within which we don't need to rediscover on re-connect.
@@ -42,9 +48,9 @@ const RediscoverAfterTimeSinceDiscoveryMs = 5 * 60000; // 5 minute
  * The DocumentService manages the Socket.IO connection and manages routing requests to connected
  * clients.
  */
-// eslint-disable-next-line import/namespace
 export class DocumentService
 	extends TypedEventEmitter<api.IDocumentServiceEvents>
+	// eslint-disable-next-line import/namespace
 	implements api.IDocumentService
 {
 	private lastDiscoveredAt: number = Date.now();

package/src/documentServiceFactory.ts

@@ -3,8 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { getW3CData } from "@fluidframework/driver-base";
+import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
+import { getW3CData } from "@fluidframework/driver-base/internal";
 import {
 	FiveDaysMs,
 	IDocumentService,
@@ -12,35 +13,35 @@ import {
 	IDocumentStorageServicePolicies,
 	IResolvedUrl,
 	LoaderCachingPolicy,
-} from "@fluidframework/driver-definitions";
-import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { ISummaryTree } from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import {
+	RateLimiter,
 	getDocAttributesFromProtocolSummary,
 	getQuorumValuesFromProtocolSummary,
 	isCombinedAppAndProtocolSummary,
-	RateLimiter,
-} from "@fluidframework/driver-utils";
-import { createChildLogger, PerformanceEvent } from "@fluidframework/telemetry-utils";
+} from "@fluidframework/driver-utils/internal";
+import { ISummaryTree } from "@fluidframework/protocol-definitions";
 import {
 	ISession,
 	convertSummaryTreeToWholeSummaryTree,
 } from "@fluidframework/server-services-client";
-import { ICache, InMemoryCache, NullCache } from "./cache";
-import { INormalizedWholeSnapshot } from "./contracts";
-import { ISnapshotTreeVersion } from "./definitions";
-import { DocumentService } from "./documentService";
-import { pkgVersion as driverVersion } from "./packageVersion";
-import { IRouterliciousDriverPolicies } from "./policies";
+import { PerformanceEvent, createChildLogger } from "@fluidframework/telemetry-utils/internal";
+
+import { ICache, InMemoryCache, NullCache } from "./cache.js";
+import { INormalizedWholeSnapshot } from "./contracts.js";
+import { ISnapshotTreeVersion } from "./definitions.js";
+import { DocumentService } from "./documentService.js";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
+import { IRouterliciousDriverPolicies } from "./policies.js";
 import {
 	RouterliciousOrdererRestWrapper,
 	RouterliciousStorageRestWrapper,
 	toInstrumentedR11sOrdererTokenFetcher,
 	toInstrumentedR11sStorageTokenFetcher,
-} from "./restWrapper";
-import { isRouterliciousResolvedUrl } from "./routerliciousResolvedUrl";
-import { ITokenProvider } from "./tokens";
-import { replaceDocumentIdInPath, getDiscoveredFluidResolvedUrl } from "./urlUtils";
+} from "./restWrapper.js";
+import { isRouterliciousResolvedUrl } from "./routerliciousResolvedUrl.js";
+import { ITokenProvider } from "./tokens.js";
+import { getDiscoveredFluidResolvedUrl, replaceDocumentIdInPath } from "./urlUtils.js";
 
 const maximumSnapshotCacheDurationMs: FiveDaysMs = 432_000_000; // 5 days in ms
 

package/src/documentStorageService.ts

@@ -3,24 +3,25 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
 	LoaderCachingPolicy,
-} from "@fluidframework/driver-definitions";
-import { ISnapshotTree, IVersion } from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import {
 	DocumentStorageServiceProxy,
 	PrefetchDocumentStorageService,
-} from "@fluidframework/driver-utils";
-import { IRouterliciousDriverPolicies } from "./policies";
-import { ICache } from "./cache";
-import { WholeSummaryDocumentStorageService } from "./wholeSummaryDocumentStorageService";
-import { ShreddedSummaryDocumentStorageService } from "./shreddedSummaryDocumentStorageService";
-import { GitManager } from "./gitManager";
-import { ISnapshotTreeVersion } from "./definitions";
-import { INormalizedWholeSnapshot } from "./contracts";
+} from "@fluidframework/driver-utils/internal";
+import { ISnapshotTree, IVersion } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+
+import { ICache } from "./cache.js";
+import { INormalizedWholeSnapshot } from "./contracts.js";
+import { ISnapshotTreeVersion } from "./definitions.js";
+import { GitManager } from "./gitManager.js";
+import { IRouterliciousDriverPolicies } from "./policies.js";
+import { ShreddedSummaryDocumentStorageService } from "./shreddedSummaryDocumentStorageService.js";
+import { WholeSummaryDocumentStorageService } from "./wholeSummaryDocumentStorageService.js";
 
 export class DocumentStorageService extends DocumentStorageServiceProxy {
 	private _logTailSha: string | undefined = undefined;

package/src/errorUtils.ts

@@ -3,19 +3,17 @@
  * Licensed under the MIT License.
  */
 
+import { DriverErrorTypes, IDriverErrorBase } from "@fluidframework/driver-definitions";
+import { DriverError } from "@fluidframework/driver-definitions/internal";
 import {
-	DriverError,
-	IDriverErrorBase,
-	DriverErrorTypes,
-} from "@fluidframework/driver-definitions";
-import {
-	NonRetryableError,
+	AuthorizationError,
 	GenericNetworkError,
+	NonRetryableError,
 	createGenericNetworkError,
-	AuthorizationError,
-} from "@fluidframework/driver-utils";
-import { IFluidErrorBase } from "@fluidframework/telemetry-utils";
-import { pkgVersion as driverVersion } from "./packageVersion";
+} from "@fluidframework/driver-utils/internal";
+import { IFluidErrorBase } from "@fluidframework/telemetry-utils/internal";
+
+import { pkgVersion as driverVersion } from "./packageVersion.js";
 
 /**
  * Routerlicious Error types
@@ -39,7 +37,7 @@ export type RouterliciousErrorTypes =
 
 /**
  * Interface for error responses for the WebSocket connection
- * Intended to be compatible with output from {@link NetworkError.toJSON}
+ * Intended to be compatible with output from `NetworkError.toJSON`.
  */
 export interface IR11sSocketError {
 	/**
@@ -118,7 +116,6 @@ export function throwR11sNetworkError(
 ): never {
 	const networkError = createR11sNetworkError(errorMessage, statusCode, retryAfterMs);
 
-	// eslint-disable-next-line @typescript-eslint/no-throw-literal
 	throw networkError;
 }
 

package/src/gitManager.ts

@@ -8,9 +8,10 @@ import {
 	IWholeSummaryPayload,
 	IWriteSummaryResponse,
 } from "@fluidframework/server-services-client";
-import { IGitManager, IHistorian } from "./storageContracts";
-import { IR11sResponse } from "./restWrapper";
-import { IWholeFlatSnapshot } from "./contracts";
+
+import { IWholeFlatSnapshot } from "./contracts.js";
+import { IR11sResponse } from "./restWrapper.js";
+import { IGitManager, IHistorian } from "./storageContracts.js";
 
 export class GitManager implements IGitManager {
 	constructor(private readonly historian: IHistorian) {}

package/src/historian.ts

@@ -9,10 +9,11 @@ import {
 	IWholeSummaryPayload,
 	IWriteSummaryResponse,
 } from "@fluidframework/server-services-client";
-import { QueryStringType, RestWrapper } from "./restWrapperBase";
-import { IR11sResponse } from "./restWrapper";
-import { IHistorian } from "./storageContracts";
-import { IWholeFlatSnapshot } from "./contracts";
+
+import { IWholeFlatSnapshot } from "./contracts.js";
+import { IR11sResponse } from "./restWrapper.js";
+import { QueryStringType, RestWrapper } from "./restWrapperBase.js";
+import { IHistorian } from "./storageContracts.js";
 
 export interface ICredentials {
 	user: string;

package/src/index.ts

@@ -4,20 +4,20 @@
  */
 
 // URL
-export type { IRouterliciousResolvedUrl } from "./routerliciousResolvedUrl";
+export type { IRouterliciousResolvedUrl } from "./routerliciousResolvedUrl.js";
 
 // Tokens
-export { DefaultTokenProvider } from "./defaultTokenProvider";
-export { ITokenProvider, ITokenResponse, ITokenService } from "./tokens";
+export { DefaultTokenProvider } from "./defaultTokenProvider.js";
+export { ITokenProvider, ITokenResponse, ITokenService } from "./tokens.js";
 
 // Errors
-export { RouterliciousErrorTypes } from "./errorUtils";
+export { RouterliciousErrorTypes } from "./errorUtils.js";
 
 // Factory
 export {
 	DocumentPostCreateError,
 	RouterliciousDocumentServiceFactory,
-} from "./documentServiceFactory";
+} from "./documentServiceFactory.js";
 
 // Configuration
-export { IRouterliciousDriverPolicies } from "./policies";
+export { IRouterliciousDriverPolicies } from "./policies.js";

package/src/mapWithExpiration.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
+import { assert } from "@fluidframework/core-utils/internal";
 
 /**
  * An extension of Map that expires (deletes) entries after a period of inactivity.

package/src/nullBlobStorageService.ts

@@ -3,7 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { IDocumentStorageService, ISummaryContext } from "@fluidframework/driver-definitions";
+import {
+	IDocumentStorageService,
+	ISummaryContext,
+} from "@fluidframework/driver-definitions/internal";
 import * as api from "@fluidframework/protocol-definitions";
 
 /**

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-rc.2.0.1";
+export const pkgVersion = "2.0.0-rc.3.0.0";

package/src/r11sSnapshotParser.ts

@@ -3,9 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import { ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { stringToBuffer } from "@fluid-internal/client-utils";
-import { INormalizedWholeSnapshot, IWholeFlatSnapshot, IWholeFlatSnapshotTree } from "./contracts";
+import { ISnapshotTree } from "@fluidframework/protocol-definitions";
+
+import {
+	INormalizedWholeSnapshot,
+	IWholeFlatSnapshot,
+	IWholeFlatSnapshotTree,
+} from "./contracts.js";
 
 /**
  * Build a tree hierarchy from a flat tree.