Merge remote-tracking branch 'origin/v10/dev' into v11/dev

# Conflicts:
#	build/azure-pipelines.yml
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
#	tests/Umbraco.Tests.AcceptanceTest/package-lock.json
This commit is contained in:
Bjarke Berg
2023-11-27 19:37:43 +01:00
50 changed files with 992 additions and 780 deletions

View File

@@ -0,0 +1 @@
20.9

File diff suppressed because it is too large Load Diff

View File

@@ -14,14 +14,14 @@
"lint": "eslint src"
},
"engines": {
"node": ">=16.17",
"npm": ">=8.15"
"node": ">=20.9",
"npm": ">=10.1"
},
"dependencies": {
"@microsoft/signalr": "7.0.7",
"@umbraco-ui/uui": "1.3.0",
"@umbraco-ui/uui-css": "1.3.0",
"ace-builds": "1.22.1",
"@umbraco-ui/uui": "1.5.0",
"@umbraco-ui/uui-css": "1.5.0",
"ace-builds": "1.31.1",
"angular": "1.8.3",
"angular-animate": "1.8.3",
"angular-aria": "1.8.3",
@@ -43,7 +43,7 @@
"diff": "5.1.0",
"flatpickr": "4.6.13",
"font-awesome": "4.7.0",
"jquery": "3.7.0",
"jquery": "3.7.1",
"jquery-ui-dist": "1.13.2",
"jquery-ui-touch-punch": "0.2.3",
"lazyload-js": "1.0.0",
@@ -59,7 +59,7 @@
"devDependencies": {
"@babel/core": "7.21.8",
"@babel/preset-env": "7.21.5",
"autoprefixer": "10.4.14",
"autoprefixer": "10.4.16",
"cssnano": "6.0.1",
"eslint": "8.43.0",
"gulp": "4.0.2",
@@ -80,17 +80,17 @@
"gulp-watch": "5.0.1",
"gulp-wrap": "0.15.0",
"gulp-wrap-js": "0.4.1",
"jasmine-core": "5.0.1",
"jsdom": "21.1.2",
"jasmine-core": "5.1.1",
"jsdom": "22.1.0",
"karma": "6.4.2",
"karma-jasmine": "5.1.0",
"karma-jsdom-launcher": "14.0.0",
"karma-jsdom-launcher": "15.0.0",
"karma-junit-reporter": "2.0.1",
"karma-spec-reporter": "0.0.36",
"less": "4.1.3",
"less": "4.2.0",
"lodash": "4.17.21",
"merge-stream": "2.0.0",
"postcss": "8.4.24",
"postcss": "8.4.31",
"run-sequence": "2.2.1"
}
}