@vaadin/component-base 24.5.0-alpha9 → 24.5.0-rc1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/component-base",
-  "version": "24.5.0-alpha9",
+  "version": "24.5.0-rc1",
   "publishConfig": {
     "access": "public"
   },
@@ -38,9 +38,9 @@
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "24.5.0-alpha9",
+    "@vaadin/chai-plugins": "24.5.0-rc1",
     "@vaadin/testing-helpers": "^1.0.0",
     "sinon": "^18.0.0"
   },
-  "gitHead": "804744762f3bec0a2247c4bbcbbb204dbcd78bc0"
+  "gitHead": "a8ae853ab69d7938cf507843784f1551a2eeb972"
 }

package/src/define.d.ts

@@ -7,4 +7,4 @@ export interface CustomElementType extends CustomElementConstructor {
   is: string;
 }
 
-export declare function defineCustomElement(CustomElement: CustomElementConstructor): void;
+export declare function defineCustomElement(CustomElement: CustomElementConstructor, version?: string): void;

package/src/define.js

@@ -4,15 +4,15 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 
-export function defineCustomElement(CustomElement) {
+export function defineCustomElement(CustomElement, version = '24.5.0-rc1') {
+  Object.defineProperty(CustomElement, 'version', {
+    get() {
+      return version;
+    },
+  });
+
   const defined = customElements.get(CustomElement.is);
   if (!defined) {
-    Object.defineProperty(CustomElement, 'version', {
-      get() {
-        return '24.5.0-alpha9';
-      },
-    });
-
     customElements.define(CustomElement.is, CustomElement);
   } else {
     const definedVersion = defined.version;

package/src/media-query-controller.d.ts

@@ -19,9 +19,6 @@ export class MediaQueryController implements ReactiveController {
    */
   protected callback: (matches: boolean) => void;
 
-  /**
-   * @param {HTMLElement} host
-   */
   constructor(query: string, callback: (matches: boolean) => void);
 
   hostConnected(): void;

package/src/url-utils.js

@@ -27,15 +27,17 @@ function containsQueryParams(actual, expected) {
  *
  * @param {string} actual The actual URL to match.
  * @param {string} expected The expected URL to match.
+ * @param {Object} matchOptions Options for path matching.
  */
-export function matchPaths(actual, expected) {
+export function matchPaths(actual, expected, matchOptions = { matchNested: false }) {
   const base = document.baseURI;
   const actualUrl = new URL(actual, base);
   const expectedUrl = new URL(expected, base);
 
-  return (
-    actualUrl.origin === expectedUrl.origin &&
-    actualUrl.pathname === expectedUrl.pathname &&
-    containsQueryParams(actualUrl.searchParams, expectedUrl.searchParams)
-  );
+  const matchesOrigin = actualUrl.origin === expectedUrl.origin;
+  const matchesPath = matchOptions.matchNested
+    ? actualUrl.pathname === expectedUrl.pathname || actualUrl.pathname.startsWith(`${expectedUrl.pathname}/`)
+    : actualUrl.pathname === expectedUrl.pathname;
+
+  return matchesOrigin && matchesPath && containsQueryParams(actualUrl.searchParams, expectedUrl.searchParams);
 }