Merge remote-tracking branch 'origin/release/18.0'

src/Umbraco.Web.UI.Client/CLAUDE.md

@@ -148,7 +148,7 @@ Why: Normalizes to conventional semver format
   "peerDependencies": {
     "lit": "^3.3.1",
     "rxjs": "^7.8.2",
-    "@umbraco-ui/uui": "^2.0.0-alpha.1",
+    "@umbraco-ui/uui": "^2.0.0",
     "monaco-editor": "^0.55.1",
     "@tiptap/core": "^3.16.0",
     "@hey-api/openapi-ts": ">=0.85.0 <1.0.0"

src/Umbraco.Web.UI.Client/package-lock.json

@@ -3963,9 +3963,9 @@
 			"link": true
 		},
 		"node_modules/@umbraco-ui/uui": {
-			"version": "2.0.0-rc.2",
-			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-2.0.0-rc.2.tgz",
-			"integrity": "sha512-/eRw8byM1zysUF61VrM3MQzZnvuZHuerhiW13eR5vPAxvWT1I5n/jeh+qTKKd3mgZi/rvAV1fnRS05ipqu2hMQ==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/@umbraco-ui/uui/-/uui-2.0.0.tgz",
+			"integrity": "sha512-snH3u1C4gpvO/bxTfTJV6lF3HVpru5v0ssMbz0aESOt66gRyGf//fshgUHgvYa5gc3wE2Fr4uGx8mKgUC/GrXQ==",
 			"license": "MIT",
 			"dependencies": {
 				"culori": "^4.0.2",
@@ -16447,7 +16447,7 @@
 		"src/external/uui": {
 			"name": "@umbraco-backoffice/uui",
 			"dependencies": {
-				"@umbraco-ui/uui": "^2.0.0-rc.2"
+				"@umbraco-ui/uui": "^2.0.0"
 			}
 		},
 		"src/libs/class-api": {

src/Umbraco.Web.UI.Client/package.json

@@ -298,4 +298,4 @@
 		"access": "public",
 		"registry": "https://registry.npmjs.org/"
 	}
-}
+}

src/Umbraco.Web.UI.Client/src/external/uui/package.json

@@ -6,6 +6,6 @@
 		"build": "vite build"
 	},
 	"dependencies": {
-		"@umbraco-ui/uui": "^2.0.0-rc.2"
+		"@umbraco-ui/uui": "^2.0.0"
 	}
 }

src/Umbraco.Web.UI.Client/src/libs/extension-api/initializers/extension-initializer-base.test.ts

@@ -98,10 +98,8 @@ describe('UmbExtensionInitializerBase — loaded signal', () => {
 			.asPromise()
 			.then(() => instantiated.includes('Umb.Test.B.Late'));
 
-		expect(
-			lateExtInstantiatedWhenLoaded,
-			'`loaded` resolved before the late, slow extension finished instantiating',
-		).to.be.true;
+		expect(lateExtInstantiatedWhenLoaded, '`loaded` resolved before the late, slow extension finished instantiating').to
+			.be.true;
 	});
 
 	// Permission-timing guard (re: the #22522 "user permissions resolved too late" concern).
@@ -123,7 +121,7 @@ describe('UmbExtensionInitializerBase — loaded signal', () => {
 			js: () => new Promise((r) => setTimeout(() => r({}), 100)),
 		} as never);
 
-		const {initializer, instantiated} = createTestInitializer(hostElement, extensionRegistry);
+		const { initializer, instantiated } = createTestInitializer(hostElement, extensionRegistry);
 
 		const instantiatedWhenGateOpened = await new UmbObserver(initializer.loaded)
 			.asPromise()

tests/Umbraco.Tests.AcceptanceTest/package-lock.json

@@ -281,4 +281,4 @@
       }
     }
   }
-}
+}

tests/Umbraco.Tests.AcceptanceTest/package.json

@@ -63,4 +63,4 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   }
-}
+}

version.json

@@ -20,4 +20,4 @@
     "setVersionVariables": true,
     "setAllVariables": true
   }
-}
+}