@fluidframework/test-utils 2.0.0-dev-rc.2.0.0.246488 → 2.0.0-dev-rc.3.0.0.253463

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "2.0.0-dev-rc.2.0.0.246488",
+  "version": "2.0.0-dev-rc.3.0.0.253463",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -14,16 +14,6 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./lib/index.d.ts",
-        "default": "./lib/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
-    "./public": {
       "import": {
         "types": "./lib/test-utils-public.d.ts",
         "default": "./lib/index.js"
@@ -77,34 +67,35 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/container-definitions": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/container-loader": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/container-runtime": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/core-interfaces": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/core-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/datastore": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/driver-definitions": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/driver-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/local-driver": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/map": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluid-internal/test-driver-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/aqueduct": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/container-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/container-loader": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/container-runtime": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/container-runtime-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/core-interfaces": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/core-utils": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/datastore": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/datastore-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/driver-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/driver-utils": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/local-driver": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/map": "2.0.0-dev-rc.3.0.0.253463",
     "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/request-handler": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/routerlicious-driver": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/runtime-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.2.0.0.246488",
-    "@fluidframework/test-driver-definitions": "2.0.0-dev-rc.2.0.0.246488",
+    "@fluidframework/request-handler": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/routerlicious-driver": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/runtime-definitions": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/runtime-utils": "2.0.0-dev-rc.3.0.0.253463",
+    "@fluidframework/telemetry-utils": "2.0.0-dev-rc.3.0.0.253463",
     "best-random": "^1.0.0",
     "debug": "^4.3.4",
     "mocha": "^10.2.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.2.0.0.246488",
+    "@arethetypeswrong/cli": "^0.15.2",
+    "@biomejs/biome": "^1.6.2",
+    "@fluid-internal/mocha-test-setup": "2.0.0-dev-rc.3.0.0.253463",
     "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.34.0",
@@ -175,16 +166,16 @@
     "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 . --entrypoints .",
+    "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",
     "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:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
     "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",

package/src/DriverWrappers.ts

@@ -10,7 +10,7 @@ import {
 	IDocumentStorageService,
 	IResolvedUrl,
 	ISummaryContext,
-} from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import { ISummaryTree } from "@fluidframework/protocol-definitions";
 
 /**

package/src/TestSummaryUtils.ts

@@ -3,31 +3,36 @@
  * Licensed under the MIT License.
  */
 
-import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct";
-import { assert } from "@fluidframework/core-utils";
-import { IContainer, IHostLoader, LoaderHeader } from "@fluidframework/container-definitions";
+import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct/internal";
+import {
+	IContainer,
+	IHostLoader,
+	LoaderHeader,
+} from "@fluidframework/container-definitions/internal";
 import {
 	IOnDemandSummarizeOptions,
 	ISummarizer,
 	ISummaryRuntimeOptions,
-} from "@fluidframework/container-runtime";
+} from "@fluidframework/container-runtime/internal";
 import {
-	ITelemetryBaseLogger,
-	IRequest,
 	IConfigProviderBase,
+	IRequest,
 	IResponse,
+	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
-import { DriverHeader } from "@fluidframework/driver-definitions";
+import { assert } from "@fluidframework/core-utils/internal";
+import { DriverHeader } from "@fluidframework/driver-definitions/internal";
+import { ISummaryTree } from "@fluidframework/protocol-definitions";
 import {
 	IFluidDataStoreFactory,
 	NamedFluidDataStoreRegistryEntries,
-} from "@fluidframework/runtime-definitions";
-import { ISummaryTree } from "@fluidframework/protocol-definitions";
-import { ITestContainerConfig, ITestObjectProvider } from "./testObjectProvider.js";
+} from "@fluidframework/runtime-definitions/internal";
+
 import { createTestConfigProvider } from "./TestConfigs.js";
 import { waitForContainerConnection } from "./containerUtils.js";
-import { timeoutAwait } from "./timeoutUtils.js";
 import { createContainerRuntimeFactoryWithDefaultDataStore } from "./testContainerRuntimeFactoryWithDefaultDataStore.js";
+import { ITestContainerConfig, ITestObjectProvider } from "./testObjectProvider.js";
+import { timeoutAwait } from "./timeoutUtils.js";
 
 const summarizerClientType = "summarizer";
 

package/src/containerUtils.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { IContainer } from "@fluidframework/container-definitions";
+import { IContainer } from "@fluidframework/container-definitions/internal";
 import { ConnectionState } from "@fluidframework/container-loader";
 import { IResponse } from "@fluidframework/core-interfaces";
-import { assert } from "@fluidframework/core-utils";
-import { IDataStore } from "@fluidframework/runtime-definitions";
-import { PromiseExecutor, timeoutPromise, TimeoutWithError } from "./timeoutUtils.js";
+import { assert } from "@fluidframework/core-utils/internal";
+import { IDataStore } from "@fluidframework/runtime-definitions/internal";
+
+import { PromiseExecutor, TimeoutWithError, timeoutPromise } from "./timeoutUtils.js";
 
 /**
  * Utility function to wait for the specified Container to be in Connected state.

package/src/debug.ts

@@ -4,6 +4,7 @@
  */
 
 import registerDebug from "debug";
+
 import { pkgName, pkgVersion } from "./packageVersion.js";
 
 export const debug = registerDebug("fluid:test-utils");

package/src/interfaces.ts

@@ -3,13 +3,13 @@
  * Licensed under the MIT License.
  */
 
+import { IFluidLoadable } from "@fluidframework/core-interfaces";
 import { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
 import { ISharedMap } from "@fluidframework/map";
 import {
-	IFluidDataStoreContext,
 	IFluidDataStoreChannel,
-} from "@fluidframework/runtime-definitions";
-import { IFluidLoadable } from "@fluidframework/core-interfaces";
+	IFluidDataStoreContext,
+} from "@fluidframework/runtime-definitions/internal";
 
 /**
  * @alpha

package/src/loaderContainerTracker.ts

@@ -3,20 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { IContainer, IDeltaQueue, IHostLoader } from "@fluidframework/container-definitions";
+import { IDeltaQueue } from "@fluidframework/container-definitions";
+import { IContainer, IHostLoader } from "@fluidframework/container-definitions/internal";
 import { ConnectionState } from "@fluidframework/container-loader";
-import { canBeCoalescedByService } from "@fluidframework/driver-utils";
-import {
-	IDocumentMessage,
-	ISequencedDocumentMessage,
-	MessageType,
-} from "@fluidframework/protocol-definitions";
 import {
 	IContainerCreateProps,
 	IContainerLoadProps,
 	// eslint-disable-next-line import/no-internal-modules
 } from "@fluidframework/container-loader/test/container";
+import { assert } from "@fluidframework/core-utils/internal";
+import { canBeCoalescedByService } from "@fluidframework/driver-utils/internal";
+import {
+	IDocumentMessage,
+	ISequencedDocumentMessage,
+	MessageType,
+} from "@fluidframework/protocol-definitions";
+
 import { waitForContainerConnection } from "./containerUtils.js";
 import { debug } from "./debug.js";
 import { IOpProcessingController } from "./testObjectProvider.js";

package/src/localCodeLoader.ts

@@ -4,21 +4,22 @@
  */
 
 import assert from "assert";
-import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct";
+
+import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct/internal";
 import {
-	IProvideRuntimeFactory,
-	IFluidModule,
-	IProvideFluidCodeDetailsComparer,
-	IFluidCodeDetails,
 	ICodeDetailsLoader,
+	IFluidCodeDetails,
+	IFluidModule,
 	IFluidModuleWithDetails,
-} from "@fluidframework/container-definitions";
+	IProvideFluidCodeDetailsComparer,
+	IProvideRuntimeFactory,
+} from "@fluidframework/container-definitions/internal";
+import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
 import {
 	IProvideFluidDataStoreFactory,
 	IProvideFluidDataStoreRegistry,
-} from "@fluidframework/runtime-definitions";
-import { createDataStoreFactory } from "@fluidframework/runtime-utils";
-import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
+} from "@fluidframework/runtime-definitions/internal";
+import { createDataStoreFactory } from "@fluidframework/runtime-utils/internal";
 
 /**
  * @internal

package/src/localLoader.ts

@@ -6,14 +6,15 @@
 import {
 	ICodeDetailsLoader,
 	IContainer,
+	IFluidCodeDetails,
 	IHostLoader,
 	ILoaderOptions,
-	IFluidCodeDetails,
-} from "@fluidframework/container-definitions";
-import { Loader } from "@fluidframework/container-loader";
-import { ITelemetryBaseLogger, IRequest } from "@fluidframework/core-interfaces";
-import { IDocumentServiceFactory, IUrlResolver } from "@fluidframework/driver-definitions";
-import { fluidEntryPoint, LocalCodeLoader } from "./localCodeLoader.js";
+} from "@fluidframework/container-definitions/internal";
+import { Loader } from "@fluidframework/container-loader/internal";
+import { IRequest, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import { IDocumentServiceFactory, IUrlResolver } from "@fluidframework/driver-definitions/internal";
+
+import { LocalCodeLoader, fluidEntryPoint } from "./localCodeLoader.js";
 
 /**
  * Creates a loader with the given package entries and driver.

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "2.0.0-dev-rc.2.0.0.246488";
+export const pkgVersion = "2.0.0-dev-rc.3.0.0.253463";

package/src/retry.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { delay } from "@fluidframework/core-utils";
+import { delay } from "@fluidframework/core-utils/internal";
 
 const retry = async <T>(
 	callback: () => Promise<T>,

package/src/testContainerRuntimeFactory.ts

@@ -3,27 +3,30 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
-import { IContainerContext, IRuntime } from "@fluidframework/container-definitions";
+import { IContainerContext, IRuntime } from "@fluidframework/container-definitions/internal";
 import {
 	ContainerRuntime,
-	IContainerRuntimeOptions,
 	DefaultSummaryConfiguration,
-} from "@fluidframework/container-runtime";
-import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+	IContainerRuntimeOptions,
+} from "@fluidframework/container-runtime/internal";
+import { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
 import {
 	FluidObject,
 	IFluidHandleContext,
 	IRequest,
 	IResponse,
 } from "@fluidframework/core-interfaces";
-// eslint-disable-next-line import/no-deprecated
-import { buildRuntimeRequestHandler, RuntimeRequestHandler } from "@fluidframework/request-handler";
+import { assert } from "@fluidframework/core-utils/internal";
+import {
+	RuntimeRequestHandler,
+	// eslint-disable-next-line import/no-deprecated
+	buildRuntimeRequestHandler,
+} from "@fluidframework/request-handler/internal";
 import {
 	IFluidDataStoreFactory,
 	NamedFluidDataStoreRegistryEntries,
-} from "@fluidframework/runtime-definitions";
-import { RequestParser, RuntimeFactoryHelper } from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { RequestParser, RuntimeFactoryHelper } from "@fluidframework/runtime-utils/internal";
 
 interface backCompat_IFluidRouter {
 	IFluidRouter?: backCompat_IFluidRouter;
@@ -130,6 +133,7 @@ export const createTestContainerRuntimeFactory = (
 						["default", Promise.resolve(this.dataStoreFactory)],
 						[this.type, Promise.resolve(this.dataStoreFactory)],
 					],
+					// eslint-disable-next-line import/no-deprecated
 					buildRuntimeRequestHandler(
 						backCompat_DefaultRouteRequestHandler("default"),
 						...this.requestHandlers,
@@ -163,6 +167,7 @@ export const createTestContainerRuntimeFactory = (
 					["default", Promise.resolve(this.dataStoreFactory)],
 					[this.type, Promise.resolve(this.dataStoreFactory)],
 				],
+				// eslint-disable-next-line import/no-deprecated
 				requestHandler: buildRuntimeRequestHandler(
 					getDefaultObject,
 					...this.requestHandlers,

package/src/testContainerRuntimeFactoryWithDefaultDataStore.ts

@@ -3,15 +3,15 @@
  * Licensed under the MIT License.
  */
 
-import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct";
-import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
-import { IContainerRuntime } from "@fluidframework/container-runtime-definitions";
+import { ContainerRuntimeFactoryWithDefaultDataStore } from "@fluidframework/aqueduct/internal";
+import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
+import { IContainerRuntime } from "@fluidframework/container-runtime-definitions/internal";
 import { FluidObject } from "@fluidframework/core-interfaces";
-import { RuntimeRequestHandler } from "@fluidframework/request-handler";
+import { RuntimeRequestHandler } from "@fluidframework/request-handler/internal";
 import {
 	IFluidDataStoreFactory,
 	NamedFluidDataStoreRegistryEntries,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/runtime-definitions/internal";
 
 const getDefaultFluidObject = async (runtime: IContainerRuntime) => {
 	const entryPoint = await runtime.getAliasedDataStoreEntryPoint("default");

package/src/testFluidObject.ts

@@ -3,21 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { IRequest, IResponse, IFluidHandle } from "@fluidframework/core-interfaces";
+import { IFluidHandle, IRequest, IResponse } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
 import {
-	FluidObjectHandle,
 	FluidDataStoreRuntime,
+	FluidObjectHandle,
 	mixinRequestHandler,
-} from "@fluidframework/datastore";
-import { SharedMap, ISharedMap } from "@fluidframework/map";
+} from "@fluidframework/datastore/internal";
+import { IChannelFactory, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
+import { ISharedMap, SharedMap } from "@fluidframework/map";
 import {
+	IFluidDataStoreChannel,
 	IFluidDataStoreContext,
 	IFluidDataStoreFactory,
-	IFluidDataStoreChannel,
-} from "@fluidframework/runtime-definitions";
-import { IFluidDataStoreRuntime, IChannelFactory } from "@fluidframework/datastore-definitions";
-import { assert } from "@fluidframework/core-utils";
-import { create404Response } from "@fluidframework/runtime-utils";
+} from "@fluidframework/runtime-definitions/internal";
+import { create404Response } from "@fluidframework/runtime-utils/internal";
+
 import { ITestFluidObject } from "./interfaces.js";
 
 /**

package/src/testObjectProvider.ts

@@ -3,37 +3,35 @@
  * Licensed under the MIT License.
  */
 
+import { ITestDriver, TestDriverTypes } from "@fluid-internal/test-driver-definitions";
 import {
 	IContainer,
-	IHostLoader,
 	IFluidCodeDetails,
+	IHostLoader,
 	ILoader,
-} from "@fluidframework/container-definitions";
+} from "@fluidframework/container-definitions/internal";
 import {
 	ILoaderProps,
 	Loader,
 	waitContainerToCatchUp as waitContainerToCatchUp_original,
-} from "@fluidframework/container-loader";
-import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
+} from "@fluidframework/container-loader/internal";
+import { IContainerRuntimeOptions } from "@fluidframework/container-runtime/internal";
 import {
-	ITelemetryBaseLogger,
-	ITelemetryBaseEvent,
 	IRequestHeader,
+	ITelemetryBaseEvent,
+	ITelemetryBaseLogger,
 } from "@fluidframework/core-interfaces";
 import {
 	IDocumentServiceFactory,
 	IResolvedUrl,
 	IUrlResolver,
-} from "@fluidframework/driver-definitions";
-import { ITestDriver, TestDriverTypes } from "@fluidframework/test-driver-definitions";
+} from "@fluidframework/driver-definitions/internal";
+import { type ITelemetryGenericEventExt } from "@fluidframework/telemetry-utils";
+import { createChildLogger, createMultiSinkLogger } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
-import {
-	createChildLogger,
-	createMultiSinkLogger,
-	type ITelemetryGenericEventExt,
-} from "@fluidframework/telemetry-utils";
+
 import { LoaderContainerTracker } from "./loaderContainerTracker.js";
-import { fluidEntryPoint, LocalCodeLoader } from "./localCodeLoader.js";
+import { LocalCodeLoader, fluidEntryPoint } from "./localCodeLoader.js";
 import { createAndAttachContainer } from "./localLoader.js";
 import { ChannelFactoryRegistry } from "./testFluidObject.js";
 
@@ -108,10 +106,13 @@ export interface ITestObjectProvider {
 	 * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.
 	 *
 	 * @param packageEntries - list of code details and fluidEntryPoint pairs.
+	 * @param loaderProps - Optional loader properties
+	 * @param forceUseCreateVersion - For Cross-Version compat testing, create a loader based on the create version
 	 */
 	createLoader(
 		packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,
 		loaderProps?: Partial<ILoaderProps>,
+		forceUseCreateVersion?: boolean,
 	): IHostLoader;
 
 	/**
@@ -221,6 +222,9 @@ export interface ITestContainerConfig {
 	/** Whether this runtime should be instantiated using a mixed-in attributor class */
 	enableAttribution?: boolean;
 
+	/** For Cross-Version compat testing, load using the create version (e.g. use this to get a Summarizer on the create version) */
+	forceUseCreateVersion?: true;
+
 	/** Loader options for the loader used to create containers */
 	loaderProps?: Partial<ILoaderProps>;
 }
@@ -832,10 +836,14 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 	public createLoader(
 		packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,
 		loaderProps?: Partial<ILoaderProps>,
+		forceUseCreateVersion = false,
 	) {
+		const useCreateVersion = forceUseCreateVersion === true || this.useCreateApi;
 		if (this.useCreateApi) {
 			// After we create the first loader, we can set this.useCreateApi to false.
 			this.useCreateApi = false;
+		}
+		if (useCreateVersion) {
 			return this.createLoaderForCreating(packageEntries, loaderProps);
 		}
 		return this.createLoaderForLoading(packageEntries, loaderProps);
@@ -925,6 +933,7 @@ export class TestObjectProviderWithVersionedLoad implements ITestObjectProvider
 		return this.createLoader(
 			[[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],
 			testContainerConfig?.loaderProps,
+			testContainerConfig?.forceUseCreateVersion,
 		);
 	}
 

package/src/timeoutUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { assert, Deferred } from "@fluidframework/core-utils";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import type * as Mocha from "mocha";
 
 // @deprecated this value is no longer used