Merge branch 'v13/dev' into contrib

# Conflicts:
#	src/Umbraco.Cms.StaticAssets/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Core/EmbeddedResources/Lang/en.xml
#	src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
#	tests/Umbraco.Tests.AcceptanceTest/tests/DefaultConfig/Login/login.spec.ts
This commit is contained in:
Sebastiaan Janssen
2024-01-02 10:33:35 +01:00
54 changed files with 776 additions and 231 deletions

View File

@@ -1,7 +1,6 @@
{
"name": "login",
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
@@ -13,13 +12,13 @@
"npm": ">=10.1"
},
"dependencies": {
"@umbraco-ui/uui": "^1.5.0",
"@umbraco-ui/uui-css": "^1.5.0",
"lit": "^2.8.0",
"msw": "^1.3.2",
"rxjs": "^7.8.1"
},
"devDependencies": {
"@umbraco-ui/uui": "1.5.0",
"@umbraco-ui/uui-css": "1.5.0",
"typescript": "^5.2.2",
"vite": "^4.5.1"
},