Merge remote-tracking branch 'origin/main' into v14/bugfix/mntp-min-max-validation

Author: leekelleher

eslint.config.js

@@ -1,11 +1,11 @@
-import js from "@eslint/js";
-import globals from "globals";
-import importPlugin from "eslint-plugin-import";
-import localRules from "eslint-plugin-local-rules";
-import wcPlugin from "eslint-plugin-wc";
-import litPlugin from "eslint-plugin-lit";
-import litA11yPlugin from "eslint-plugin-lit-a11y";
-import storybookPlugin from "eslint-plugin-storybook";
+import js from '@eslint/js';
+import globals from 'globals';
+import importPlugin from 'eslint-plugin-import';
+import localRules from 'eslint-plugin-local-rules';
+import wcPlugin from 'eslint-plugin-wc';
+import litPlugin from 'eslint-plugin-lit';
+import litA11yPlugin from 'eslint-plugin-lit-a11y';
+import storybookPlugin from 'eslint-plugin-storybook';
 import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
 import tseslint from 'typescript-eslint';
 
@@ -18,11 +18,11 @@ export default [
 	// Global ignores
 	{
 		ignores: [
-			"**/rollup.config.js",
-			"**/vite.config.ts",
-			"src/external",
-			"src/packages/core/icon-registry/icons",
-			"src/packages/core/icon-registry/icons.ts"
+			'**/rollup.config.js',
+			'**/vite.config.ts',
+			'src/external',
+			'src/packages/core/icon-registry/icons',
+			'src/packages/core/icon-registry/icons.ts',
 		],
 	},
 
@@ -35,52 +35,53 @@ export default [
 			},
 			globals: {
 				...globals.browser,
-			}
+			},
 		},
 		plugins: {
 			import: importPlugin,
-			"local-rules": localRules,
-			"wc": wcPlugin,
-			"lit": litPlugin,
-			"lit-a11y": litA11yPlugin,
-			"storybook": storybookPlugin
+			'local-rules': localRules,
+			wc: wcPlugin,
+			lit: litPlugin,
+			'lit-a11y': litA11yPlugin,
+			storybook: storybookPlugin,
 		},
 		rules: {
-			semi: ["warn", "always"],
-			"no-unused-vars": "warn",
-			"no-var": "error",
-			"import/no-unresolved": "off",
-			"import/order": ["warn", { "groups": ["builtin", "parent", "sibling", "index", "external"] }],
-			"import/no-self-import": "error",
-			"import/no-cycle": ["error", { "maxDepth": 6, "allowUnsafeDynamicCyclicDependency": true }],
-			"local-rules/bad-type-import": "error",
-			"local-rules/enforce-element-suffix-on-element-class-name": "error",
-			"local-rules/enforce-umb-prefix-on-element-name": "error",
-			"local-rules/ensure-relative-import-use-js-extension": "error",
-			"local-rules/no-direct-api-import": "warn",
-			"local-rules/prefer-import-aliases": "error",
-			"local-rules/prefer-static-styles-last": "warn",
-			"local-rules/umb-class-prefix": "error",
-			"local-rules/no-relative-import-to-import-map-module": "error",
-			"local-rules/enforce-umbraco-external-imports": [
-				"error",
+			semi: ['warn', 'always'],
+			"prettier/prettier": ["warn", {"endOfLine": "auto" }],
+			'no-unused-vars': 'off', //Let '@typescript-eslint/no-unused-vars' catch the errors to allow unused function parameters (ex: in interfaces)
+			'no-var': 'error',
+			'import/no-unresolved': 'off',
+			'import/order': ['warn', { groups: ['builtin', 'parent', 'sibling', 'index', 'external'] }],
+			'import/no-self-import': 'error',
+			'import/no-cycle': ['error', { maxDepth: 6, allowUnsafeDynamicCyclicDependency: true }],
+			'local-rules/bad-type-import': 'error',
+			'local-rules/enforce-element-suffix-on-element-class-name': 'error',
+			'local-rules/enforce-umb-prefix-on-element-name': 'error',
+			'local-rules/ensure-relative-import-use-js-extension': 'error',
+			'local-rules/no-direct-api-import': 'warn',
+			'local-rules/prefer-import-aliases': 'error',
+			'local-rules/prefer-static-styles-last': 'warn',
+			'local-rules/umb-class-prefix': 'error',
+			'local-rules/no-relative-import-to-import-map-module': 'error',
+			'local-rules/enforce-umbraco-external-imports': [
+				'error',
 				{
-					"exceptions": ["@umbraco-cms", "@open-wc/testing", "@storybook", "msw", ".", "vite"]
-				}
+					exceptions: ['@umbraco-cms', '@open-wc/testing', '@storybook', 'msw', '.', 'vite'],
+				},
 			],
-			"local-rules/exported-string-constant-naming": [
-				"error",
+			'local-rules/exported-string-constant-naming': [
+				'error',
 				{
-					"excludedFileNames": ["umbraco-package", "input-tiny-mce.defaults"] // TODO: what to do about the tiny mce defaults?
-				}
+					excludedFileNames: ['umbraco-package', 'input-tiny-mce.defaults'], // TODO: what to do about the tiny mce defaults?
+				},
 			],
-			"@typescript-eslint/no-non-null-assertion": "off",
-			"@typescript-eslint/no-explicit-any": "warn",
-			"@typescript-eslint/no-unused-vars": "warn",
-			"@typescript-eslint/consistent-type-exports": "error",
-			"@typescript-eslint/consistent-type-imports": "error",
-			"@typescript-eslint/no-import-type-side-effects": "warn"
-		}
+			'@typescript-eslint/no-non-null-assertion': 'off',
+			'@typescript-eslint/no-explicit-any': 'warn',
+			'@typescript-eslint/no-unused-vars': 'error',
+			'@typescript-eslint/consistent-type-exports': 'error',
+			'@typescript-eslint/consistent-type-imports': 'error',
+			'@typescript-eslint/no-import-type-side-effects': 'warn',
+		},
 	},
 
 	// Pattern-specific overrides
@@ -90,7 +91,7 @@ export default [
 		languageOptions: {
 			globals: {
 				...globals.node,
-			}
-		}
+			},
+		},
 	},
 ];

package-lock.json

@@ -25,8 +25,8 @@
 		"./code-editor": "./dist-cms/packages/templating/code-editor/index.js",
 		"./collection": "./dist-cms/packages/core/collection/index.js",
 		"./components": "./dist-cms/packages/core/components/index.js",
-		"./content": "./dist-cms/packages/core/content/index.js",
 		"./content-type": "./dist-cms/packages/core/content-type/index.js",
+		"./content": "./dist-cms/packages/core/content/index.js",
 		"./culture": "./dist-cms/packages/core/culture/index.js",
 		"./current-user": "./dist-cms/packages/user/current-user/index.js",
 		"./data-type": "./dist-cms/packages/data-type/index.js",
@@ -35,9 +35,9 @@
 		"./document-blueprint": "./dist-cms/packages/documents/document-blueprints/index.js",
 		"./document-type": "./dist-cms/packages/documents/document-types/index.js",
 		"./document": "./dist-cms/packages/documents/documents/index.js",
-		"./entity": "./dist-cms/packages/core/entity/index.js",
 		"./entity-action": "./dist-cms/packages/core/entity-action/index.js",
 		"./entity-bulk-action": "./dist-cms/packages/core/entity-bulk-action/index.js",
+		"./entity": "./dist-cms/packages/core/entity/index.js",
 		"./event": "./dist-cms/packages/core/event/index.js",
 		"./extension-registry": "./dist-cms/packages/core/extension-registry/index.js",
 		"./icon": "./dist-cms/packages/core/icon-registry/index.js",
@@ -63,6 +63,7 @@
 		"./picker-input": "./dist-cms/packages/core/picker-input/index.js",
 		"./property-action": "./dist-cms/packages/core/property-action/index.js",
 		"./property-editor": "./dist-cms/packages/core/property-editor/index.js",
+		"./property-type": "./dist-cms/packages/core/property-type/index.js",
 		"./property": "./dist-cms/packages/core/property/index.js",
 		"./recycle-bin": "./dist-cms/packages/core/recycle-bin/index.js",
 		"./relation-type": "./dist-cms/packages/relations/relation-types/index.js",
@@ -73,8 +74,8 @@
 		"./script": "./dist-cms/packages/templating/scripts/index.js",
 		"./search": "./dist-cms/packages/search/index.js",
 		"./section": "./dist-cms/packages/core/section/index.js",
-		"./settings": "./dist-cms/packages/settings/index.js",
 		"./server-file-system": "./dist-cms/packages/core/server-file-system/index.js",
+		"./settings": "./dist-cms/packages/settings/index.js",
 		"./sorter": "./dist-cms/packages/core/sorter/index.js",
 		"./static-file": "./dist-cms/packages/static-file/index.js",
 		"./store": "./dist-cms/packages/core/store/index.js",
@@ -141,7 +142,8 @@
 		"./src/packages/tags",
 		"./src/packages/templating",
 		"./src/packages/property-editors",
-		"./src/packages/media"
+		"./src/packages/media",
+		"./src/packages/user"
 	],
 	"scripts": {
 		"backoffice:test:e2e": "npx playwright test",

package.json

@@ -48,7 +48,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 	/**
 	 * Method to cancel navigation if changed.
 	 */
-	private _cancelNavigation ?:() => void;
+	private _cancelNavigation?: () => void;
 
 	/**
 	 * Listeners on the router.
@@ -208,7 +208,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 				if (this.isConnected) {
 					const newMatch = this.getRouteMatch();
 					// Check if this match matches the current match (aka. If the path has changed), if so we should navigate. [NL]
-					if(newMatch) {
+					if (newMatch) {
 						navigate = shouldNavigate(this.match, newMatch);
 					}
 				}
@@ -318,7 +318,6 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 	 * Returns true if a navigation was made to a new page.
 	 */
 	protected async renderPath(path: string | PathFragment): Promise<boolean> {
-
 		// Notice: Since this is never called from any other place than one higher in this file(when writing this...), we could just retrieve the path and find a match by using this.getRouteMatch() [NL]
 		// Find the corresponding route.
 		const match = matchRoutes(this._routes, path);
@@ -336,7 +335,6 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 			// Only change route if its a new route.
 			const navigate = shouldNavigate(this.match, match);
 			if (navigate) {
-
 				// If another navigation is still begin resolved in this very moment, then we need to cancel that so it does not end up overriding this new navigation.[NL]
 				this._cancelNavigation?.();
 				// Listen for another push state event. If another push state event happens
@@ -412,7 +410,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 					// We have some routes that share the same component instance, those should not be removed and re-appended [NL]
 					const isTheSameComponent = this.firstChild === page;
 
-					if(!isTheSameComponent) {
+					if (!isTheSameComponent) {
 						// Remove the old page by clearing the slot
 						this.clearChildren();
 					}
@@ -421,7 +419,7 @@ export class RouterSlot<D = any, P = any> extends HTMLElement implements IRouter
 					// We do this to ensure that we can find the match in the connectedCallback of the page.
 					this._routeMatch = match;
 
-					if(!isTheSameComponent) {
+					if (!isTheSameComponent) {
 						if (page) {
 							// Append the new page
 							this.appendChild(page);

src/external/router-slot/router-slot.ts

@@ -51,7 +51,7 @@ describe('UmbController', () => {
 	let hostElement: UmbControllerHostElement;
 
 	beforeEach(() => {
-		hostElement = document.createElement('test-my-controller-host') as UmbControllerHostElement;
+		hostElement = new UmbTestControllerHostElement();
 	});
 
 	describe('Controller Host Public API', () => {

src/libs/controller-api/controller.test.ts

@@ -152,6 +152,7 @@ describe('UmbElementMixin', () => {
 			expect(hostElement.hasUmbController(ctrl)).to.be.true;
 
 			const ctrl2 = hostElement.observe(myObservable, (value) => {
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const a = value + 'bla';
 			});
 
@@ -172,6 +173,7 @@ describe('UmbElementMixin', () => {
 			const ctrl2 = hostElement.observe(
 				undefined,
 				() => {
+					// eslint-disable-next-line @typescript-eslint/no-unused-vars
 					const a = 1;
 				},
 				'observer',

src/libs/element-api/element.test.ts

@@ -16,6 +16,8 @@ import { UmbSwitchCondition } from '@umbraco-cms/backoffice/extension-registry';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
 
 @customElement('umb-test-controller-host')
+// Element is used in tests
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 class UmbTestControllerHostElement extends UmbControllerHostElementMixin(HTMLElement) {}
 
 class UmbTestExtensionController extends UmbBaseExtensionInitializer {
@@ -57,12 +59,12 @@ class UmbTestConditionAlwaysInvalid extends UmbControllerBase implements UmbExte
 
 describe('UmbBaseExtensionController', () => {
 	describe('Manifest without conditions', () => {
-		let hostElement: UmbControllerHostElement;
+		//let hostElement: UmbControllerHostElement;
 		let extensionRegistry: UmbExtensionRegistry<ManifestWithDynamicConditions>;
 		let manifest: ManifestWithDynamicConditions;
 
 		beforeEach(async () => {
-			hostElement = await fixture(html`<umb-test-controller-host></umb-test-controller-host>`);
+			//hostElement = await fixture(html`<umb-test-controller-host></umb-test-controller-host>`);
 			extensionRegistry = new UmbExtensionRegistry();
 			manifest = {
 				type: 'section',
@@ -94,12 +96,12 @@ describe('UmbBaseExtensionController', () => {
 	});
 
 	describe('Manifest with empty conditions', () => {
-		let hostElement: UmbControllerHostElement;
+		//let hostElement: UmbControllerHostElement;
 		let extensionRegistry: UmbExtensionRegistry<ManifestWithDynamicConditions>;
 		let manifest: ManifestWithDynamicConditions;
 
 		beforeEach(async () => {
-			hostElement = await fixture(html`<umb-test-controller-host></umb-test-controller-host>`);
+			//hostElement = await fixture(html`<umb-test-controller-host></umb-test-controller-host>`);
 			extensionRegistry = new UmbExtensionRegistry();
 			manifest = {
 				type: 'section',