Merge branch 'release/16.0'

Author: nielslyngsoe

src/Umbraco.Cms.Api.Management/Middleware/BackOfficeAuthorizationInitializationMiddleware.cs

@@ -65,13 +65,21 @@ private async Task InitializeBackOfficeAuthorizationOnceAsync(HttpContext contex
             return;
         }
 
-        if (_knownHosts.Add($"{context.Request.Scheme}://{context.Request.Host}") is false)
+        var host = $"{context.Request.Scheme}://{context.Request.Host}";
+        if (_knownHosts.Contains(host))
         {
             return;
         }
 
         await _firstBackOfficeRequestLocker.WaitAsync();
 
+        // NOTE: _knownHosts is not thread safe; check again after entering the semaphore
+        if (_knownHosts.Add(host) is false)
+        {
+            _firstBackOfficeRequestLocker.Release();
+            return;
+        }
+
         // ensure we explicitly add UmbracoApplicationUrl if configured (https://github.com/umbraco/Umbraco-CMS/issues/16179)
         if (_webRoutingSettings.UmbracoApplicationUrl.IsNullOrWhiteSpace() is false)
         {

src/Umbraco.Web.UI.Client/devops/publish/cleanse-pkg.js

@@ -1,4 +1,6 @@
-import { readFileSync, writeFileSync } from 'fs';
+import { readFileSync, writeFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import glob from 'tiny-glob'
 
 console.log('[Prepublish] Cleansing package.json');
 
@@ -12,5 +14,40 @@ delete packageJson.devDependencies;
 packageJson.peerDependencies = { ...packageJson.dependencies };
 delete packageJson.dependencies;
 
+// Iterate all workspaces and hoist the dependencies to the root package.json
+const workspaces = packageJson.workspaces || [];
+const workspacePromises = workspaces.map(async workspaceGlob => {
+	// Use glob to find the workspace path
+	const localWorkspace = workspaceGlob.replace(/\.\/src/, './dist-cms');
+	const workspacePaths = await glob(localWorkspace, { cwd: './', absolute: true });
+
+	workspacePaths.forEach(workspace => {
+		const workspacePackageFile = join(workspace, 'package.json');
+
+		// Ensure the workspace package.json exists
+		if (!existsSync(workspacePackageFile)) {
+			// If the package.json does not exist, log a warning and continue
+			console.warn(`No package.json found in workspace: ${workspace}`);
+			return;
+		}
+
+		const workspacePackageJson = JSON.parse(readFileSync(workspacePackageFile, 'utf8'));
+
+		// Move dependencies from the workspace to the root package.json
+		if (workspacePackageJson.dependencies) {
+			Object.entries(workspacePackageJson.dependencies).forEach(([key, value]) => {
+				console.log('Hoisting dependency:', key, 'from workspace:', workspace, 'with version:', value);
+				packageJson.peerDependencies[key] = value;
+			});
+		}
+	})
+});
+
+// Wait for all workspace processing to complete
+await Promise.all(workspacePromises);
+
+// Remove the workspaces field from the root package.json
+delete packageJson.workspaces;
+
 // Write the package.json back to disk
 writeFileSync(packageFile, JSON.stringify(packageJson, null, 2), 'utf8');