From 941f0d53b3aa86d4cfacf1c3333a347d1ae498e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:23:33 +0000 Subject: [PATCH 1/5] Bump @hey-api/openapi-ts from 0.37.3 to 0.48.1 Bumps [@hey-api/openapi-ts](https://github.com/hey-api/openapi-ts) from 0.37.3 to 0.48.1. - [Release notes](https://github.com/hey-api/openapi-ts/releases) - [Changelog](https://github.com/hey-api/openapi-ts/blob/main/docs/CHANGELOG.md) - [Commits](https://github.com/hey-api/openapi-ts/compare/@hey-api/openapi-ts@0.37.3...@hey-api/openapi-ts@0.48.1) --- updated-dependencies: - dependency-name: "@hey-api/openapi-ts" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 54 ++++++++++++--------- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index c1c4159eb0..814ac54bb0 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -43,7 +43,7 @@ "devDependencies": { "@babel/core": "^7.24.3", "@eslint/js": "^9.6.0", - "@hey-api/openapi-ts": "^0.37.3", + "@hey-api/openapi-ts": "^0.48.1", "@mdx-js/react": "^3.0.0", "@open-wc/testing": "^4.0.0", "@playwright/test": "^1.41.1", @@ -143,9 +143,9 @@ } }, "node_modules/@apidevtools/json-schema-ref-parser": { - "version": "11.5.4", - "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.5.4.tgz", - "integrity": "sha512-o2fsypTGU0WxRxbax8zQoHiIB4dyrkwYfcm8TxZ+bx9pCzcWZbQtiMqpgBvWA/nJ2TrGjK5adCLfTH8wUeU/Wg==", + "version": "11.6.4", + "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-11.6.4.tgz", + "integrity": "sha512-9K6xOqeevacvweLGik6LnZCb1fBtCOSIWQs8d096XGeqoLKC33UVMGz9+77Gw44KvbH4pKcQPWo4ZpxkXYj05w==", "dev": true, "dependencies": { "@jsdevtools/ono": "^7.1.3", @@ -2692,19 +2692,19 @@ "dev": true }, "node_modules/@hey-api/openapi-ts": { - "version": "0.37.3", - "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.37.3.tgz", - "integrity": "sha512-bqadMe9YpzwO9nkpCK+XEwbom9V/WNcUSOYKp8lBJbe/Rve/eSnTjANmll65SU/uoc/5kgrnkD0Eh4hcPqSYrA==", + "version": "0.48.1", + "resolved": "https://registry.npmjs.org/@hey-api/openapi-ts/-/openapi-ts-0.48.1.tgz", + "integrity": "sha512-iZBEmS12EWn4yl/nYMui+PA3hprjFR9z+9p+p+s3f0VRXPw+uZWO0yuIfCcsAw1n0isikw2uJEY4qxwlnI07AQ==", "dev": true, "dependencies": { - "@apidevtools/json-schema-ref-parser": "11.5.4", - "c12": "1.10.0", + "@apidevtools/json-schema-ref-parser": "11.6.4", + "c12": "1.11.1", "camelcase": "8.0.0", - "commander": "12.0.0", + "commander": "12.1.0", "handlebars": "4.7.8" }, "bin": { - "openapi-ts": "bin/index.js" + "openapi-ts": "bin/index.cjs" }, "engines": { "node": "^18.0.0 || >=20.0.0" @@ -10329,23 +10329,31 @@ } }, "node_modules/c12": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/c12/-/c12-1.10.0.tgz", - "integrity": "sha512-0SsG7UDhoRWcuSvKWHaXmu5uNjDCDN3nkQLRL4Q42IlFy+ze58FcCoI3uPwINXinkz7ZinbhEgyzYFw9u9ZV8g==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/c12/-/c12-1.11.1.tgz", + "integrity": "sha512-KDU0TvSvVdaYcQKQ6iPHATGz/7p/KiVjPg4vQrB6Jg/wX9R0yl5RZxWm9IoZqaIHD2+6PZd81+KMGwRr/lRIUg==", "dev": true, "dependencies": { "chokidar": "^3.6.0", - "confbox": "^0.1.3", + "confbox": "^0.1.7", "defu": "^6.1.4", "dotenv": "^16.4.5", - "giget": "^1.2.1", - "jiti": "^1.21.0", - "mlly": "^1.6.1", + "giget": "^1.2.3", + "jiti": "^1.21.6", + "mlly": "^1.7.1", "ohash": "^1.1.3", "pathe": "^1.1.2", "perfect-debounce": "^1.0.0", - "pkg-types": "^1.0.3", - "rc9": "^2.1.1" + "pkg-types": "^1.1.1", + "rc9": "^2.1.2" + }, + "peerDependencies": { + "magicast": "^0.3.4" + }, + "peerDependenciesMeta": { + "magicast": { + "optional": true + } } }, "node_modules/cache-content-type": { @@ -10874,9 +10882,9 @@ } }, "node_modules/commander": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", - "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz", + "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==", "dev": true, "engines": { "node": ">=18" diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 14d325f8f2..58c00a258d 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -210,7 +210,7 @@ "devDependencies": { "@babel/core": "^7.24.3", "@eslint/js": "^9.6.0", - "@hey-api/openapi-ts": "^0.37.3", + "@hey-api/openapi-ts": "^0.48.1", "@mdx-js/react": "^3.0.0", "@open-wc/testing": "^4.0.0", "@playwright/test": "^1.41.1", From 6335c78279544692a25fe272c30cc150757eff6d Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 Jul 2024 11:28:31 +0200 Subject: [PATCH 2/5] add getter --- .../core/components/input-entity/input-entity.element.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-entity/input-entity.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-entity/input-entity.element.ts index a4f2c33f83..a36c456d51 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-entity/input-entity.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-entity/input-entity.element.ts @@ -83,11 +83,14 @@ export class UmbInputEntityElement extends UmbFormControlMixin UmbPickerInputContext) { + public set pickerContext(ctor: (new (host: UmbControllerHost) => UmbPickerInputContext) | undefined) { if (this.#pickerContext) return; - this.#pickerContext = new ctor(this); + this.#pickerContext = ctor ? new ctor(this) : undefined; this.#observePickerContext(); } + public get pickerContext(): UmbPickerInputContext | undefined { + return this.#pickerContext; + } @state() private _items?: Array; From e44e55b3ddd43a35f2538f1cce43c12a52bfa1d9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 Jul 2024 11:57:13 +0200 Subject: [PATCH 3/5] fix test runner log filter --- .../web-test-runner.config.mjs | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs index bb99c1da29..7e570f0e20 100644 --- a/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs +++ b/src/Umbraco.Web.UI.Client/web-test-runner.config.mjs @@ -12,6 +12,8 @@ if (!['dev', 'prod'].includes(mode)) { throw new Error(`MODE must be "dev" or "prod", was "${mode}"`); } +const silencedLogs = ['Lit is in dev mode.', 'Multiple versions of Lit loaded.']; + /** @type {import('@web/dev-server').DevServerConfig} */ export default { rootDir: '.', @@ -38,6 +40,14 @@ export default { }), esbuildPlugin({ ts: true, tsconfig: './tsconfig.json', target: 'auto', json: true }), ], + filterBrowserLogs(log) { + for (const arg of log.args) { + if (typeof arg === 'string' && silencedLogs.some((l) => arg.includes(l))) { + return false; + } + } + return true; + }, testRunnerHtml: (testFramework, devMode) => ` @@ -59,19 +69,6 @@ export default { -