microsoft · tylerbutler · Apr 8, 2024 · Apr 8, 2024 · Apr 8, 2024 · Apr 8, 2024
diff --git a/layerInfo.json b/layerInfo.json
@@ -195,7 +195,7 @@
 				"deps": ["Server-Libs"]
 			},
 			"GitRest": {
-				"dirs": ["server/gitrest/", "server/gitrest/packages/"],
+				"dirs": ["server/routerlicious/gitrest/"],
 				"deps": [
 					"Server-Libs",
 					"Common-Utils",
@@ -206,7 +206,7 @@
 				]
 			},
 			"Historian": {
-				"dirs": ["server/historian/", "server/historian/packages/"],
+				"dirs": ["server/routerlicious/historian/"],
 				"deps": [
 					"Server-Libs",
 					"Common-Utils",

diff --git a/server/gitrest/pnpm-lock.yaml b/server/gitrest/pnpm-lock.yaml
diff --git a/server/historian/pnpm-lock.yaml b/server/historian/pnpm-lock.yaml
diff --git a/server/routerlicious/feeds/internal-dev.txt b/server/routerlicious/feeds/internal-dev.txt
@@ -0,0 +1,4 @@
+@fluid-internal/historian-base
+@fluid-internal/historian
+@fluid-internal/gitrest-base
+@fluid-internal/gitrest
diff --git a/server/routerlicious/feeds/internal-test.txt b/server/routerlicious/feeds/internal-test.txt
@@ -17,4 +17,8 @@ tinylicious
 @fluidframework/server-lambdas-driver
 @fluidframework/server-lambdas
 @fluidframework/server-kafka-orderer
-@fluidframework/gitresources
+@fluidframework/gitresources
+@fluid-internal/historian-base
+@fluid-internal/historian
+@fluid-internal/gitrest-base
+@fluid-internal/gitrest
diff --git a/...trest/packages/gitrest-base/.eslintignore → ...icious/gitrest/gitrest-base/.eslintignore b/...trest/packages/gitrest-base/.eslintignore → ...icious/gitrest/gitrest-base/.eslintignore
diff --git a/...trest/packages/gitrest-base/.eslintrc.cjs → ...icious/gitrest/gitrest-base/.eslintrc.cjs b/...trest/packages/gitrest-base/.eslintrc.cjs → ...icious/gitrest/gitrest-base/.eslintrc.cjs
diff --git a/.../gitrest/packages/gitrest-base/.gitignore → ...erlicious/gitrest/gitrest-base/.gitignore b/.../gitrest/packages/gitrest-base/.gitignore → ...erlicious/gitrest/gitrest-base/.gitignore
diff --git a/server/gitrest/packages/gitrest-base/LICENSE → ...outerlicious/gitrest/gitrest-base/LICENSE b/server/gitrest/packages/gitrest-base/LICENSE → ...outerlicious/gitrest/gitrest-base/LICENSE
diff --git a/...r/gitrest/packages/gitrest-base/README.md → ...terlicious/gitrest/gitrest-base/README.md b/...r/gitrest/packages/gitrest-base/README.md → ...terlicious/gitrest/gitrest-base/README.md
diff --git a/...itrest/packages/gitrest-base/package.json → ...licious/gitrest/gitrest-base/package.json b/...itrest/packages/gitrest-base/package.json → ...licious/gitrest/gitrest-base/package.json
@@ -1,12 +1,12 @@
 {
-	"name": "@fluidframework/gitrest-base",
+	"name": "@fluid-internal/gitrest-base",
 	"version": "1.0.0",
 	"description": "Git REST API base components",
 	"homepage": "https://fluidframework.com",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/microsoft/FluidFramework.git",
-		"directory": "server/gitrest/packages/gitrest-base"
+		"directory": "server/routerlicious/gitrest/gitrest-base"
 	},
 	"license": "MIT",
 	"author": "Microsoft and contributors",
@@ -52,15 +52,15 @@
 	},
 	"dependencies": {
 		"@fluidframework/common-utils": "^1.1.1",
-		"@fluidframework/gitresources": "6.0.0-310414",
-		"@fluidframework/protocol-base": "6.0.0-314981",
+		"@fluidframework/gitresources": "workspace:^",
+		"@fluidframework/protocol-base": "workspace:^",
 		"@fluidframework/protocol-definitions": "^3.2.0",
-		"@fluidframework/server-services-client": "6.0.0-314981",
-		"@fluidframework/server-services-core": "6.0.0-314981",
-		"@fluidframework/server-services-shared": "6.0.0-314981",
-		"@fluidframework/server-services-telemetry": "6.0.0-314981",
-		"@fluidframework/server-services-utils": "6.0.0-314981",
-		"@fluidframework/server-test-utils": "6.0.0-314981",
+		"@fluidframework/server-services-client": "workspace:^",
+		"@fluidframework/server-services-core": "workspace:^",
+		"@fluidframework/server-services-shared": "workspace:^",
+		"@fluidframework/server-services-telemetry": "workspace:^",
+		"@fluidframework/server-services-utils": "workspace:^",
+		"@fluidframework/server-test-utils": "workspace:^",
 		"async-mutex": "^0.3.2",
 		"axios": "^1.7.7",
 		"body-parser": "^1.20.3",

diff --git a/.../gitrest/packages/gitrest-base/src/app.ts → ...erlicious/gitrest/gitrest-base/src/app.ts b/.../gitrest/packages/gitrest-base/src/app.ts → ...erlicious/gitrest/gitrest-base/src/app.ts
diff --git a/...ckages/gitrest-base/src/customizations.ts → ...itrest/gitrest-base/src/customizations.ts b/...ckages/gitrest-base/src/customizations.ts → ...itrest/gitrest-base/src/customizations.ts
diff --git a/...itrest-base/src/externalStorageManager.ts → ...itrest-base/src/externalStorageManager.ts b/...itrest-base/src/externalStorageManager.ts → ...itrest-base/src/externalStorageManager.ts
diff --git a/...itrest/packages/gitrest-base/src/index.ts → ...licious/gitrest/gitrest-base/src/index.ts b/...itrest/packages/gitrest-base/src/index.ts → ...licious/gitrest/gitrest-base/src/index.ts
diff --git a/...trest/packages/gitrest-base/src/logger.ts → ...icious/gitrest/gitrest-base/src/logger.ts b/...trest/packages/gitrest-base/src/logger.ts → ...icious/gitrest/gitrest-base/src/logger.ts
diff --git a/...ages/gitrest-base/src/routes/git/blobs.ts → ...rest/gitrest-base/src/routes/git/blobs.ts b/...ages/gitrest-base/src/routes/git/blobs.ts → ...rest/gitrest-base/src/routes/git/blobs.ts
diff --git a/...es/gitrest-base/src/routes/git/commits.ts → ...st/gitrest-base/src/routes/git/commits.ts b/...es/gitrest-base/src/routes/git/commits.ts → ...st/gitrest-base/src/routes/git/commits.ts
diff --git a/...kages/gitrest-base/src/routes/git/refs.ts → ...trest/gitrest-base/src/routes/git/refs.ts b/...kages/gitrest-base/src/routes/git/refs.ts → ...trest/gitrest-base/src/routes/git/refs.ts
diff --git a/...ages/gitrest-base/src/routes/git/repos.ts → ...rest/gitrest-base/src/routes/git/repos.ts b/...ages/gitrest-base/src/routes/git/repos.ts → ...rest/gitrest-base/src/routes/git/repos.ts
diff --git a/...kages/gitrest-base/src/routes/git/tags.ts → ...trest/gitrest-base/src/routes/git/tags.ts b/...kages/gitrest-base/src/routes/git/tags.ts → ...trest/gitrest-base/src/routes/git/tags.ts
diff --git a/...ages/gitrest-base/src/routes/git/trees.ts → ...rest/gitrest-base/src/routes/git/trees.ts b/...ages/gitrest-base/src/routes/git/trees.ts → ...rest/gitrest-base/src/routes/git/trees.ts
diff --git a/...packages/gitrest-base/src/routes/index.ts → .../gitrest/gitrest-base/src/routes/index.ts b/...packages/gitrest-base/src/routes/index.ts → .../gitrest/gitrest-base/src/routes/index.ts
diff --git a/...est-base/src/routes/repository/commits.ts → ...est-base/src/routes/repository/commits.ts b/...est-base/src/routes/repository/commits.ts → ...est-base/src/routes/repository/commits.ts
diff --git a/...st-base/src/routes/repository/contents.ts → ...st-base/src/routes/repository/contents.ts b/...st-base/src/routes/repository/contents.ts → ...st-base/src/routes/repository/contents.ts
diff --git a/...ages/gitrest-base/src/routes/summaries.ts → ...rest/gitrest-base/src/routes/summaries.ts b/...ages/gitrest-base/src/routes/summaries.ts → ...rest/gitrest-base/src/routes/summaries.ts
diff --git a/...trest/packages/gitrest-base/src/runner.ts → ...icious/gitrest/gitrest-base/src/runner.ts b/...trest/packages/gitrest-base/src/runner.ts → ...icious/gitrest/gitrest-base/src/runner.ts
diff --git a/...ackages/gitrest-base/src/runnerFactory.ts → ...gitrest/gitrest-base/src/runnerFactory.ts b/...ackages/gitrest-base/src/runnerFactory.ts → ...gitrest/gitrest-base/src/runnerFactory.ts
diff --git a/...ackages/gitrest-base/src/test/examples.ts → ...gitrest/gitrest-base/src/test/examples.ts b/...ackages/gitrest-base/src/test/examples.ts → ...gitrest/gitrest-base/src/test/examples.ts
diff --git a/...ckages/gitrest-base/src/test/examples2.ts → ...itrest/gitrest-base/src/test/examples2.ts b/...ckages/gitrest-base/src/test/examples2.ts → ...itrest/gitrest-base/src/test/examples2.ts
diff --git a/.../gitrest-base/src/test/gitManager.spec.ts → .../gitrest-base/src/test/gitManager.spec.ts b/.../gitrest-base/src/test/gitManager.spec.ts → .../gitrest-base/src/test/gitManager.spec.ts
diff --git a/...kages/gitrest-base/src/test/redis.spec.ts → ...trest/gitrest-base/src/test/redis.spec.ts b/...kages/gitrest-base/src/test/redis.spec.ts → ...trest/gitrest-base/src/test/redis.spec.ts
diff --git a/...ages/gitrest-base/src/test/routes.spec.ts → ...rest/gitrest-base/src/test/routes.spec.ts b/...ages/gitrest-base/src/test/routes.spec.ts → ...rest/gitrest-base/src/test/routes.spec.ts
diff --git a/...es/gitrest-base/src/test/storageAccess.ts → ...st/gitrest-base/src/test/storageAccess.ts b/...es/gitrest-base/src/test/storageAccess.ts → ...st/gitrest-base/src/test/storageAccess.ts
diff --git a/...s/gitrest-base/src/test/summaries.spec.ts → ...t/gitrest-base/src/test/summaries.spec.ts b/...s/gitrest-base/src/test/summaries.spec.ts → ...t/gitrest-base/src/test/summaries.spec.ts
diff --git a/...lientConnectionManagerWithInvalidation.ts → ...lientConnectionManagerWithInvalidation.ts b/...lientConnectionManagerWithInvalidation.ts → ...lientConnectionManagerWithInvalidation.ts
diff --git a/...kages/gitrest-base/src/test/tsconfig.json → ...trest/gitrest-base/src/test/tsconfig.json b/...kages/gitrest-base/src/test/tsconfig.json → ...trest/gitrest-base/src/test/tsconfig.json
diff --git a/...t/packages/gitrest-base/src/test/utils.ts → ...us/gitrest/gitrest-base/src/test/utils.ts b/...t/packages/gitrest-base/src/test/utils.ts → ...us/gitrest/gitrest-base/src/test/utils.ts
diff --git a/...ges/gitrest-base/src/utils/definitions.ts → ...est/gitrest-base/src/utils/definitions.ts b/...ges/gitrest-base/src/utils/definitions.ts → ...est/gitrest-base/src/utils/definitions.ts
diff --git a/.../gitrest-base/src/utils/fileSystemBase.ts → .../gitrest-base/src/utils/fileSystemBase.ts b/.../gitrest-base/src/utils/fileSystemBase.ts → .../gitrest-base/src/utils/fileSystemBase.ts
diff --git a/...itrest-base/src/utils/fileSystemHelper.ts → ...itrest-base/src/utils/fileSystemHelper.ts b/...itrest-base/src/utils/fileSystemHelper.ts → ...itrest-base/src/utils/fileSystemHelper.ts
diff --git a/...ges/gitrest-base/src/utils/filesystems.ts → ...est/gitrest-base/src/utils/filesystems.ts b/...ges/gitrest-base/src/utils/filesystems.ts → ...est/gitrest-base/src/utils/filesystems.ts
diff --git a/...-base/src/utils/gitWholeSummaryManager.ts → ...-base/src/utils/gitWholeSummaryManager.ts b/...-base/src/utils/gitWholeSummaryManager.ts → ...-base/src/utils/gitWholeSummaryManager.ts
diff --git a/.../src/utils/gitrestTelemetryDefinitions.ts → .../src/utils/gitrestTelemetryDefinitions.ts b/.../src/utils/gitrestTelemetryDefinitions.ts → .../src/utils/gitrestTelemetryDefinitions.ts
diff --git a/...ackages/gitrest-base/src/utils/helpers.ts → ...gitrest/gitrest-base/src/utils/helpers.ts b/...ackages/gitrest-base/src/utils/helpers.ts → ...gitrest/gitrest-base/src/utils/helpers.ts
diff --git a/.../packages/gitrest-base/src/utils/index.ts → ...s/gitrest/gitrest-base/src/utils/index.ts b/.../packages/gitrest-base/src/utils/index.ts → ...s/gitrest/gitrest-base/src/utils/index.ts
diff --git a/...ase/src/utils/isomorphicgitConversions.ts → ...ase/src/utils/isomorphicgitConversions.ts b/...ase/src/utils/isomorphicgitConversions.ts → ...ase/src/utils/isomorphicgitConversions.ts
diff --git a/...st-base/src/utils/isomorphicgitManager.ts → ...st-base/src/utils/isomorphicgitManager.ts b/...st-base/src/utils/isomorphicgitManager.ts → ...st-base/src/utils/isomorphicgitManager.ts
diff --git a/...gitrest-base/src/utils/redisFs/helpers.ts → ...gitrest-base/src/utils/redisFs/helpers.ts b/...gitrest-base/src/utils/redisFs/helpers.ts → ...gitrest-base/src/utils/redisFs/helpers.ts
diff --git a/...s/gitrest-base/src/utils/redisFs/index.ts → ...t/gitrest-base/src/utils/redisFs/index.ts b/...s/gitrest-base/src/utils/redisFs/index.ts → ...t/gitrest-base/src/utils/redisFs/index.ts
diff --git a/...s/gitrest-base/src/utils/redisFs/redis.ts → ...t/gitrest-base/src/utils/redisFs/redis.ts b/...s/gitrest-base/src/utils/redisFs/redis.ts → ...t/gitrest-base/src/utils/redisFs/redis.ts
diff --git a/...-base/src/utils/redisFs/redisFsManager.ts → ...-base/src/utils/redisFs/redisFsManager.ts b/...-base/src/utils/redisFs/redisFsManager.ts → ...-base/src/utils/redisFs/redisFsManager.ts
diff --git a/...t-base/src/utils/repositoryManagerBase.ts → ...t-base/src/utils/repositoryManagerBase.ts b/...t-base/src/utils/repositoryManagerBase.ts → ...t-base/src/utils/repositoryManagerBase.ts
diff --git a/...src/utils/repositoryManagerFactoryBase.ts → ...src/utils/repositoryManagerFactoryBase.ts b/...src/utils/repositoryManagerFactoryBase.ts → ...src/utils/repositoryManagerFactoryBase.ts
diff --git a/...-base/src/utils/wholeSummary/constants.ts → ...-base/src/utils/wholeSummary/constants.ts b/...-base/src/utils/wholeSummary/constants.ts → ...-base/src/utils/wholeSummary/constants.ts
diff --git a/...ase/src/utils/wholeSummary/conversions.ts → ...ase/src/utils/wholeSummary/conversions.ts b/...ase/src/utils/wholeSummary/conversions.ts → ...ase/src/utils/wholeSummary/conversions.ts
diff --git a/.../src/utils/wholeSummary/coreWriteUtils.ts → .../src/utils/wholeSummary/coreWriteUtils.ts b/.../src/utils/wholeSummary/coreWriteUtils.ts → .../src/utils/wholeSummary/coreWriteUtils.ts
diff --git a/...ase/src/utils/wholeSummary/definitions.ts → ...ase/src/utils/wholeSummary/definitions.ts b/...ase/src/utils/wholeSummary/definitions.ts → ...ase/src/utils/wholeSummary/definitions.ts
diff --git a/...rest-base/src/utils/wholeSummary/index.ts → ...rest-base/src/utils/wholeSummary/index.ts b/...rest-base/src/utils/wholeSummary/index.ts → ...rest-base/src/utils/wholeSummary/index.ts
diff --git a/...src/utils/wholeSummary/lowIoWriteUtils.ts → ...src/utils/wholeSummary/lowIoWriteUtils.ts b/...src/utils/wholeSummary/lowIoWriteUtils.ts → ...src/utils/wholeSummary/lowIoWriteUtils.ts
diff --git a/...rc/utils/wholeSummary/readWholeSummary.ts → ...rc/utils/wholeSummary/readWholeSummary.ts b/...rc/utils/wholeSummary/readWholeSummary.ts → ...rc/utils/wholeSummary/readWholeSummary.ts
diff --git a/...c/utils/wholeSummary/writeWholeSummary.ts → ...c/utils/wholeSummary/writeWholeSummary.ts b/...c/utils/wholeSummary/writeWholeSummary.ts → ...c/utils/wholeSummary/writeWholeSummary.ts
diff --git a/...trest/packages/gitrest-base/tsconfig.json → ...icious/gitrest/gitrest-base/tsconfig.json b/...trest/packages/gitrest-base/tsconfig.json → ...icious/gitrest/gitrest-base/tsconfig.json
diff --git a/...er/gitrest/packages/gitrest/.eslintignore → ...uterlicious/gitrest/gitrest/.eslintignore b/...er/gitrest/packages/gitrest/.eslintignore → ...uterlicious/gitrest/gitrest/.eslintignore
diff --git a/...er/gitrest/packages/gitrest/.eslintrc.cjs → ...uterlicious/gitrest/gitrest/.eslintrc.cjs b/...er/gitrest/packages/gitrest/.eslintrc.cjs → ...uterlicious/gitrest/gitrest/.eslintrc.cjs
diff --git a/server/gitrest/packages/gitrest/.gitignore → .../routerlicious/gitrest/gitrest/.gitignore b/server/gitrest/packages/gitrest/.gitignore → .../routerlicious/gitrest/gitrest/.gitignore
diff --git a/server/gitrest/packages/gitrest/LICENSE → server/routerlicious/gitrest/gitrest/LICENSE b/server/gitrest/packages/gitrest/LICENSE → server/routerlicious/gitrest/gitrest/LICENSE
diff --git a/server/gitrest/packages/gitrest/README.md → ...r/routerlicious/gitrest/gitrest/README.md b/server/gitrest/packages/gitrest/README.md → ...r/routerlicious/gitrest/gitrest/README.md
diff --git a/server/gitrest/packages/gitrest/config.json → ...routerlicious/gitrest/gitrest/config.json b/server/gitrest/packages/gitrest/config.json → ...routerlicious/gitrest/gitrest/config.json
diff --git a/server/gitrest/packages/gitrest/package.json → ...outerlicious/gitrest/gitrest/package.json b/server/gitrest/packages/gitrest/package.json → ...outerlicious/gitrest/gitrest/package.json
@@ -1,12 +1,12 @@
 {
-	"name": "@fluidframework/gitrest",
+	"name": "@fluid-internal/gitrest",
 	"version": "1.0.0",
 	"description": "Entry point of the GitRest core services",
 	"homepage": "https://fluidframework.com",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/microsoft/FluidFramework.git",
-		"directory": "server/gitrest/packages/gitrest"
+		"directory": "server/routerlicious/gitrest/gitrest"
 	},
 	"license": "MIT",
 	"author": "Microsoft and contributors",
@@ -27,9 +27,9 @@
 		"tsc": "tsc"
 	},
 	"dependencies": {
-		"@fluidframework/gitrest-base": "workspace:~",
-		"@fluidframework/server-services-shared": "6.0.0-287165",
-		"@fluidframework/server-services-utils": "6.0.0-287165",
+		"@fluid-internal/gitrest-base": "workspace:^",
+		"@fluidframework/server-services-shared": "workspace:^",
+		"@fluidframework/server-services-utils": "workspace:^",
 		"body-parser": "^1.20.3",
 		"compression": "^1.7.3",
 		"cors": "^2.8.5",

diff --git a/server/gitrest/packages/gitrest/src/www.ts → .../routerlicious/gitrest/gitrest/src/www.ts b/server/gitrest/packages/gitrest/src/www.ts → .../routerlicious/gitrest/gitrest/src/www.ts
@@ -7,7 +7,7 @@ import * as path from "path";
 import winston from "winston";
 import { runService } from "@fluidframework/server-services-shared";
 import { configureLogging } from "@fluidframework/server-services-utils";
-import { GitrestResourcesFactory, GitrestRunnerFactory } from "@fluidframework/gitrest-base";
+import { GitrestResourcesFactory, GitrestRunnerFactory } from "@fluid-internal/gitrest-base";
 
 const configPath = path.join(__dirname, "../config.json");
 

diff --git a/...er/gitrest/packages/gitrest/tsconfig.json → ...uterlicious/gitrest/gitrest/tsconfig.json b/...er/gitrest/packages/gitrest/tsconfig.json → ...uterlicious/gitrest/gitrest/tsconfig.json
diff --git a/...ian/packages/historian-base/.eslintignore → ...us/historian/historian-base/.eslintignore b/...ian/packages/historian-base/.eslintignore → ...us/historian/historian-base/.eslintignore
diff --git a/...ian/packages/historian-base/.eslintrc.cjs → ...us/historian/historian-base/.eslintrc.cjs b/...ian/packages/historian-base/.eslintrc.cjs → ...us/historian/historian-base/.eslintrc.cjs
diff --git a/...torian/packages/historian-base/.gitignore → ...cious/historian/historian-base/.gitignore b/...torian/packages/historian-base/.gitignore → ...cious/historian/historian-base/.gitignore
diff --git a/...historian/packages/historian-base/LICENSE → ...rlicious/historian/historian-base/LICENSE b/...historian/packages/historian-base/LICENSE → ...rlicious/historian/historian-base/LICENSE
diff --git a/...storian/packages/historian-base/README.md → ...icious/historian/historian-base/README.md b/...storian/packages/historian-base/README.md → ...icious/historian/historian-base/README.md
diff --git a/...rian/packages/historian-base/package.json → ...ous/historian/historian-base/package.json b/...rian/packages/historian-base/package.json → ...ous/historian/historian-base/package.json
@@ -1,12 +1,12 @@
 {
-	"name": "@fluidframework/historian-base",
+	"name": "@fluid-internal/historian-base",
 	"version": "0.0.1",
 	"description": "Base classes for historian",
 	"homepage": "https://fluidframework.com",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/microsoft/FluidFramework.git",
-		"directory": "server/historian/packages/historian-base"
+		"directory": "server/routerlicious/historian/historian-base"
 	},
 	"license": "MIT",
 	"author": "Microsoft and contributors",
@@ -53,14 +53,14 @@
 	},
 	"dependencies": {
 		"@fluidframework/common-utils": "^1.1.1",
-		"@fluidframework/gitresources": "6.0.0-310414",
+		"@fluidframework/gitresources": "workspace:^",
 		"@fluidframework/protocol-definitions": "^3.2.0",
-		"@fluidframework/server-services": "6.0.0-314981",
-		"@fluidframework/server-services-client": "6.0.0-314981",
-		"@fluidframework/server-services-core": "6.0.0-314981",
-		"@fluidframework/server-services-shared": "6.0.0-314981",
-		"@fluidframework/server-services-telemetry": "6.0.0-314981",
-		"@fluidframework/server-services-utils": "6.0.0-314981",
+		"@fluidframework/server-services": "workspace:^",
+		"@fluidframework/server-services-client": "workspace:^",
+		"@fluidframework/server-services-core": "workspace:^",
+		"@fluidframework/server-services-shared": "workspace:^",
+		"@fluidframework/server-services-telemetry": "workspace:^",
+		"@fluidframework/server-services-utils": "workspace:^",
 		"@types/ioredis-mock": "^8.2.5",
 		"axios": "^1.7.7",
 		"body-parser": "^1.20.3",
@@ -79,7 +79,7 @@
 	"devDependencies": {
 		"@fluidframework/build-common": "^2.0.3",
 		"@fluidframework/eslint-config-fluid": "^5.1.0",
-		"@fluidframework/server-test-utils": "6.0.0-314981",
+		"@fluidframework/server-test-utils": "workspace:^",
 		"@types/compression": "0.0.36",
 		"@types/cors": "^2.8.4",
 		"@types/debug": "^4.1.5",

diff --git a/...torian/packages/historian-base/src/app.ts → ...cious/historian/historian-base/src/app.ts b/...torian/packages/historian-base/src/app.ts → ...cious/historian/historian-base/src/app.ts
diff --git a/...ages/historian-base/src/customizations.ts → ...rian/historian-base/src/customizations.ts b/...ages/historian-base/src/customizations.ts → ...rian/historian-base/src/customizations.ts
diff --git a/...rian/packages/historian-base/src/index.ts → ...ous/historian/historian-base/src/index.ts b/...rian/packages/historian-base/src/index.ts → ...ous/historian/historian-base/src/index.ts
diff --git a/...ian/packages/historian-base/src/logger.ts → ...us/historian/historian-base/src/logger.ts b/...ian/packages/historian-base/src/logger.ts → ...us/historian/historian-base/src/logger.ts
diff --git a/...es/historian-base/src/routes/git/blobs.ts → ...an/historian-base/src/routes/git/blobs.ts b/...es/historian-base/src/routes/git/blobs.ts → ...an/historian-base/src/routes/git/blobs.ts
diff --git a/.../historian-base/src/routes/git/commits.ts → .../historian-base/src/routes/git/commits.ts b/.../historian-base/src/routes/git/commits.ts → .../historian-base/src/routes/git/commits.ts
diff --git a/...ges/historian-base/src/routes/git/refs.ts → ...ian/historian-base/src/routes/git/refs.ts b/...ges/historian-base/src/routes/git/refs.ts → ...ian/historian-base/src/routes/git/refs.ts
diff --git a/...ges/historian-base/src/routes/git/tags.ts → ...ian/historian-base/src/routes/git/tags.ts b/...ges/historian-base/src/routes/git/tags.ts → ...ian/historian-base/src/routes/git/tags.ts
diff --git a/...es/historian-base/src/routes/git/trees.ts → ...an/historian-base/src/routes/git/trees.ts b/...es/historian-base/src/routes/git/trees.ts → ...an/historian-base/src/routes/git/trees.ts
diff --git a/...ckages/historian-base/src/routes/index.ts → ...torian/historian-base/src/routes/index.ts b/...ckages/historian-base/src/routes/index.ts → ...torian/historian-base/src/routes/index.ts
diff --git a/...ian-base/src/routes/repository/commits.ts → ...ian-base/src/routes/repository/commits.ts b/...ian-base/src/routes/repository/commits.ts → ...ian-base/src/routes/repository/commits.ts
diff --git a/...an-base/src/routes/repository/contents.ts → ...an-base/src/routes/repository/contents.ts b/...an-base/src/routes/repository/contents.ts → ...an-base/src/routes/repository/contents.ts
diff --git a/...ian-base/src/routes/repository/headers.ts → ...ian-base/src/routes/repository/headers.ts b/...ian-base/src/routes/repository/headers.ts → ...ian-base/src/routes/repository/headers.ts
diff --git a/...es/historian-base/src/routes/summaries.ts → ...an/historian-base/src/routes/summaries.ts b/...es/historian-base/src/routes/summaries.ts → ...an/historian-base/src/routes/summaries.ts
diff --git a/...ckages/historian-base/src/routes/utils.ts → ...torian/historian-base/src/routes/utils.ts b/...ckages/historian-base/src/routes/utils.ts → ...torian/historian-base/src/routes/utils.ts
diff --git a/...ian/packages/historian-base/src/runner.ts → ...us/historian/historian-base/src/runner.ts b/...ian/packages/historian-base/src/runner.ts → ...us/historian/historian-base/src/runner.ts
diff --git a/...kages/historian-base/src/runnerFactory.ts → ...orian/historian-base/src/runnerFactory.ts b/...kages/historian-base/src/runnerFactory.ts → ...orian/historian-base/src/runnerFactory.ts
diff --git a/...istorian-base/src/services/definitions.ts → ...istorian-base/src/services/definitions.ts b/...istorian-base/src/services/definitions.ts → ...istorian-base/src/services/definitions.ts
diff --git a/...s/historian-base/src/services/denyList.ts → ...n/historian-base/src/services/denyList.ts b/...s/historian-base/src/services/denyList.ts → ...n/historian-base/src/services/denyList.ts
diff --git a/...ages/historian-base/src/services/index.ts → ...rian/historian-base/src/services/index.ts b/...ages/historian-base/src/services/index.ts → ...rian/historian-base/src/services/index.ts
diff --git a/...historian-base/src/services/redisCache.ts → ...historian-base/src/services/redisCache.ts b/...historian-base/src/services/redisCache.ts → ...historian-base/src/services/redisCache.ts
diff --git a/...ian-base/src/services/redisTenantCache.ts → ...ian-base/src/services/redisTenantCache.ts b/...ian-base/src/services/redisTenantCache.ts → ...ian-base/src/services/redisTenantCache.ts
diff --git a/...orian-base/src/services/restGitService.ts → ...orian-base/src/services/restGitService.ts b/...orian-base/src/services/restGitService.ts → ...orian-base/src/services/restGitService.ts
diff --git a/...orian-base/src/services/riddlerService.ts → ...orian-base/src/services/riddlerService.ts b/...orian-base/src/services/riddlerService.ts → ...orian-base/src/services/riddlerService.ts
diff --git a/...services/simplifiedCustomDataRetriever.ts → ...services/simplifiedCustomDataRetriever.ts b/...services/simplifiedCustomDataRetriever.ts → ...services/simplifiedCustomDataRetriever.ts
diff --git a/.../historian-base/src/test/denyList.spec.ts → .../historian-base/src/test/denyList.spec.ts b/.../historian-base/src/test/denyList.spec.ts → .../historian-base/src/test/denyList.spec.ts
diff --git a/...ges/historian-base/src/test/redis.spec.ts → ...ian/historian-base/src/test/redis.spec.ts b/...ges/historian-base/src/test/redis.spec.ts → ...ian/historian-base/src/test/redis.spec.ts
diff --git a/...es/historian-base/src/test/routes.spec.ts → ...an/historian-base/src/test/routes.spec.ts b/...es/historian-base/src/test/routes.spec.ts → ...an/historian-base/src/test/routes.spec.ts
diff --git a/...lientConnectionManagerWithInvalidation.ts → ...lientConnectionManagerWithInvalidation.ts b/...lientConnectionManagerWithInvalidation.ts → ...lientConnectionManagerWithInvalidation.ts
diff --git a/...ges/historian-base/src/test/tsconfig.json → ...ian/historian-base/src/test/tsconfig.json b/...ges/historian-base/src/test/tsconfig.json → ...ian/historian-base/src/test/tsconfig.json
diff --git a/...es/historian-base/src/test/utils/index.ts → ...an/historian-base/src/test/utils/index.ts b/...es/historian-base/src/test/utils/index.ts → ...an/historian-base/src/test/utils/index.ts
diff --git a/...istorian-base/src/test/utils/testCache.ts → ...istorian-base/src/test/utils/testCache.ts b/...istorian-base/src/test/utils/testCache.ts → ...istorian-base/src/test/utils/testCache.ts
diff --git a/...ase/src/test/utils/testDocumentManager.ts → ...ase/src/test/utils/testDocumentManager.ts b/...ase/src/test/utils/testDocumentManager.ts → ...ase/src/test/utils/testDocumentManager.ts
diff --git a/...n-base/src/test/utils/testLumberEngine.ts → ...n-base/src/test/utils/testLumberEngine.ts b/...n-base/src/test/utils/testLumberEngine.ts → ...n-base/src/test/utils/testLumberEngine.ts
diff --git a/...-base/src/test/utils/testTenantService.ts → ...-base/src/test/utils/testTenantService.ts b/...-base/src/test/utils/testTenantService.ts → ...-base/src/test/utils/testTenantService.ts
diff --git a/...rian/packages/historian-base/src/utils.ts → ...ous/historian/historian-base/src/utils.ts b/...rian/packages/historian-base/src/utils.ts → ...ous/historian/historian-base/src/utils.ts
diff --git a/...ian/packages/historian-base/tsconfig.json → ...us/historian/historian-base/tsconfig.json b/...ian/packages/historian-base/tsconfig.json → ...us/historian/historian-base/tsconfig.json
diff --git a/...istorian/packages/historian/.eslintignore → ...licious/historian/historian/.eslintignore b/...istorian/packages/historian/.eslintignore → ...licious/historian/historian/.eslintignore
diff --git a/...istorian/packages/historian/.eslintrc.cjs → ...licious/historian/historian/.eslintrc.cjs b/...istorian/packages/historian/.eslintrc.cjs → ...licious/historian/historian/.eslintrc.cjs
diff --git a/...r/historian/packages/historian/.gitignore → ...terlicious/historian/historian/.gitignore b/...r/historian/packages/historian/.gitignore → ...terlicious/historian/historian/.gitignore
diff --git a/server/historian/packages/historian/LICENSE → ...routerlicious/historian/historian/LICENSE b/server/historian/packages/historian/LICENSE → ...routerlicious/historian/historian/LICENSE
diff --git a/...er/historian/packages/historian/README.md → ...uterlicious/historian/historian/README.md b/...er/historian/packages/historian/README.md → ...uterlicious/historian/historian/README.md
diff --git a/.../historian/packages/historian/config.json → ...erlicious/historian/historian/config.json b/.../historian/packages/historian/config.json → ...erlicious/historian/historian/config.json
diff --git a/...historian/packages/historian/package.json → ...rlicious/historian/historian/package.json b/...historian/packages/historian/package.json → ...rlicious/historian/historian/package.json
@@ -1,12 +1,12 @@
 {
-	"name": "@fluidframework/historian",
+	"name": "@fluid-internal/historian",
 	"version": "0.0.1",
 	"description": "Git REST API",
 	"homepage": "https://fluidframework.com",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/microsoft/FluidFramework.git",
-		"directory": "server/historian/packages/historian"
+		"directory": "server/routerlicious/historian/historian"
 	},
 	"license": "MIT",
 	"author": "Microsoft and contributors",
@@ -28,10 +28,10 @@
 		"tslint": "tslint \"src/**/*.ts\""
 	},
 	"dependencies": {
-		"@fluidframework/historian-base": "^0.0.1",
-		"@fluidframework/server-services-shared": "6.0.0-287165",
-		"@fluidframework/server-services-utils": "6.0.0-287165",
-		"body-parser": "^1.20.3",
+		"@fluid-internal/historian-base": "workspace:^",
+		"@fluidframework/server-services-shared": "workspace:^",
+		"@fluidframework/server-services-utils": "workspace:^",
+		"body-parser": "^1.17.2",
 		"compression": "^1.7.3",
 		"cors": "^2.8.5",
 		"debug": "^4.3.4",

diff --git a/...r/historian/packages/historian/src/www.ts → ...terlicious/historian/historian/src/www.ts b/...r/historian/packages/historian/src/www.ts → ...terlicious/historian/historian/src/www.ts
@@ -7,7 +7,7 @@ import * as path from "path";
 import * as winston from "winston";
 import { runService } from "@fluidframework/server-services-shared";
 import { configureLogging } from "@fluidframework/server-services-utils";
-import { HistorianResourcesFactory, HistorianRunnerFactory } from "@fluidframework/historian-base";
+import { HistorianResourcesFactory, HistorianRunnerFactory } from "@fluid-internal/historian-base";
 
 const configPath = path.join(__dirname, "../config.json");
 

diff --git a/...istorian/packages/historian/tsconfig.json → ...licious/historian/historian/tsconfig.json b/...istorian/packages/historian/tsconfig.json → ...licious/historian/historian/tsconfig.json