From acead5d844494844513c4e4552267d94875d2d96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 18:27:45 +0000 Subject: [PATCH 01/10] Bump simple-icons from 12.2.0 to 13.0.0 Bumps [simple-icons](https://github.com/simple-icons/simple-icons) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/simple-icons/simple-icons/releases) - [Commits](https://github.com/simple-icons/simple-icons/compare/12.2.0...13.0.0) --- updated-dependencies: - dependency-name: simple-icons dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 1f4033931b..08265a8904 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -88,7 +88,7 @@ "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-web-worker-loader": "^1.6.1", - "simple-icons": "^12.0.0", + "simple-icons": "^13.0.0", "storybook": "^7.6.17", "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", @@ -18485,9 +18485,9 @@ "dev": true }, "node_modules/simple-icons": { - "version": "12.2.0", - "resolved": "https://registry.npmjs.org/simple-icons/-/simple-icons-12.2.0.tgz", - "integrity": "sha512-q8Qpts9HIW1PP1gdwT2/NqJBgou3XG44Z4xDGvdqFZYG+eINDyHu7PEidHkPFHpP5TLcB9s4Ne70Uy5u83u7Ig==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/simple-icons/-/simple-icons-13.0.0.tgz", + "integrity": "sha512-emybHoFXO9IorOH8Uy8GwavS1oOQk6bVMxrIAXztNn/EcRc17yHmJM6XpUUd1CcDpax0dHAbpqvGp4hqWlQapg==", "dev": true, "engines": { "node": ">=0.12.18" diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index feec6dd657..63d0742d56 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -255,7 +255,7 @@ "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-web-worker-loader": "^1.6.1", - "simple-icons": "^12.0.0", + "simple-icons": "^13.0.0", "storybook": "^7.6.17", "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", From 73bdef82e3817bd6ec8b9ccd246102d659c963e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:23:35 +0000 Subject: [PATCH 02/10] Bump simple-icons from 12.2.0 to 13.0.0 Bumps [simple-icons](https://github.com/simple-icons/simple-icons) from 12.2.0 to 13.0.0. - [Release notes](https://github.com/simple-icons/simple-icons/releases) - [Commits](https://github.com/simple-icons/simple-icons/compare/12.2.0...13.0.0) --- updated-dependencies: - dependency-name: simple-icons dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/Umbraco.Web.UI.Client/package-lock.json | 8 ++++---- src/Umbraco.Web.UI.Client/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index c1c4159eb0..18c3aa3313 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -89,7 +89,7 @@ "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-web-worker-loader": "^1.6.1", - "simple-icons": "^12.0.0", + "simple-icons": "^13.0.0", "storybook": "^7.6.17", "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", @@ -19361,9 +19361,9 @@ "dev": true }, "node_modules/simple-icons": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/simple-icons/-/simple-icons-12.4.0.tgz", - "integrity": "sha512-2uL8PHFDyBLQGhZsAvYcaHqm5KjNzIepPshTLZky9Dc6HgPFI83SAVC8of3KYtr+7O8zJggrGYTxyUu/9hyYgA==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/simple-icons/-/simple-icons-13.0.0.tgz", + "integrity": "sha512-emybHoFXO9IorOH8Uy8GwavS1oOQk6bVMxrIAXztNn/EcRc17yHmJM6XpUUd1CcDpax0dHAbpqvGp4hqWlQapg==", "dev": true, "engines": { "node": ">=0.12.18" diff --git a/src/Umbraco.Web.UI.Client/package.json b/src/Umbraco.Web.UI.Client/package.json index 14d325f8f2..3e282485bb 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -256,7 +256,7 @@ "rollup-plugin-esbuild": "^6.1.1", "rollup-plugin-import-css": "^3.5.0", "rollup-plugin-web-worker-loader": "^1.6.1", - "simple-icons": "^12.0.0", + "simple-icons": "^13.0.0", "storybook": "^7.6.17", "tiny-glob": "^0.2.9", "tsc-alias": "^1.8.8", From 14f72dbea91390959ff64ee1b48c020763fc0948 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:04:59 +0200 Subject: [PATCH 03/10] build: ignore src/mocks because of too many false-positives --- src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml index fbb9d054cd..d81f322cea 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml @@ -30,7 +30,7 @@ jobs: with: directory-to-scan: src should-scan-archives: false - ignore-globs: '**/.git/**,*.md,*.mdx,*.stories.ts,*.js' + ignore-globs: '**/.git/**,src/mocks/**/*,*.md,*.mdx,*.stories.ts,*.js' - name: Upload DevSkim scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 From c8f54c834e688229504b88b76736ba777312ef80 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:11:14 +0200 Subject: [PATCH 04/10] correct glob --- src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml index d81f322cea..0d27f32901 100644 --- a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml +++ b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml @@ -30,7 +30,7 @@ jobs: with: directory-to-scan: src should-scan-archives: false - ignore-globs: '**/.git/**,src/mocks/**/*,*.md,*.mdx,*.stories.ts,*.js' + ignore-globs: '**/.git/**,src/mocks/**,*.md,*.mdx,*.stories.ts,*.js' - name: Upload DevSkim scan results to GitHub Security tab uses: github/codeql-action/upload-sarif@v3 From c0db3fcfa0bffa04e51c922a6de8f112398dad25 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:14:16 +0200 Subject: [PATCH 05/10] remove faulty job --- .../.github/workflows/devskim.yml | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml diff --git a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml b/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml deleted file mode 100644 index 0d27f32901..0000000000 --- a/src/Umbraco.Web.UI.Client/.github/workflows/devskim.yml +++ /dev/null @@ -1,38 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -name: DevSkim - -on: - push: - branches: - - main - - release/* - schedule: - - cron: '19 14 * * 5' - -jobs: - lint: - name: DevSkim - runs-on: ubuntu-20.04 - permissions: - actions: read - contents: read - security-events: write - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Run DevSkim scanner - uses: microsoft/DevSkim-Action@v1 - with: - directory-to-scan: src - should-scan-archives: false - ignore-globs: '**/.git/**,src/mocks/**,*.md,*.mdx,*.stories.ts,*.js' - - - name: Upload DevSkim scan results to GitHub Security tab - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: devskim-results.sarif From 567f57423e835ab9791bbef79868658fa94d0025 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:20:00 +0200 Subject: [PATCH 06/10] update packagelock --- src/Umbraco.Web.UI.Client/package-lock.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 3333dc4b2f..2e7be9bc15 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -22275,7 +22275,9 @@ "src/packages/tags": { "name": "@umbraco-backoffice/tag" }, - "src/packages/templating": {}, + "src/packages/templating": { + "name": "@umbraco-backoffice/templating" + }, "src/packages/umbraco-news": { "name": "@umbraco-backoffice/umbraco-news" }, From 01c55e71880dfbbe08e67a18bfd7e6569eb56c61 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:26:55 +0200 Subject: [PATCH 07/10] move missing icons into local svgs --- .../core/icon-registry/icon-dictionary.json | 16 +++++++-------- .../src/packages/core/icon-registry/icons.ts | 20 +++++++++++-------- .../core/icon-registry/icons/icon-azure.ts | 7 ++++++- .../icon-registry/icons/icon-microsoft.ts | 7 ++++++- .../icon-registry/svgs/icon-microsoft.svg | 5 +++++ .../svgs/icon-microsoftazure.svg | 5 +++++ 6 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoft.svg create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json index c9667aae86..c23d92367f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json @@ -2451,10 +2451,6 @@ } ], "simpleIcons": [ - { - "name": "icon-azure", - "file": "microsoftazure.svg" - }, { "name": "icon-facebook", "file": "facebook.svg" @@ -2483,10 +2479,6 @@ "name": "icon-mastodon", "file": "mastodon.svg" }, - { - "name": "icon-microsoft", - "file": "microsoft.svg" - }, { "name": "icon-twitter-x", "file": "x.svg" @@ -2496,6 +2488,14 @@ { "name": "icon-umbraco", "file": "icon-umbraco.svg" + }, + { + "name": "icon-microsoft", + "file": "icon-microsoft.svg" + }, + { + "name": "icon-azure", + "file": "icon-microsoftazure.svg" } ] } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts index a6f123db8a..2a59a220a2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts @@ -2099,10 +2099,6 @@ name: "icon-database", path: () => import("./icons/icon-database.js"), },{ -name: "icon-azure", - -path: () => import("./icons/icon-azure.js"), -},{ name: "icon-facebook", path: () => import("./icons/icon-facebook.js"), @@ -2131,10 +2127,6 @@ name: "icon-mastodon", path: () => import("./icons/icon-mastodon.js"), },{ -name: "icon-microsoft", - -path: () => import("./icons/icon-microsoft.js"), -},{ name: "icon-twitter-x", path: () => import("./icons/icon-twitter-x.js"), @@ -2143,6 +2135,14 @@ name: "icon-umbraco", path: () => import("./icons/icon-umbraco.js"), },{ +name: "icon-microsoft", + +path: () => import("./icons/icon-microsoft.js"), +},{ +name: "icon-azure", + +path: () => import("./icons/icon-azure.js"), +},{ name: "icon-art-easel", legacy: true, path: () => import("./icons/icon-art-easel.js"), @@ -2351,6 +2351,10 @@ name: "icon-male-symbol", legacy: true, path: () => import("./icons/icon-male-symbol.js"), },{ +name: "icon-microsoftazure", +legacy: true, +path: () => import("./icons/icon-microsoftazure.js"), +},{ name: "icon-molecular-network", legacy: true, path: () => import("./icons/icon-molecular-network.js"), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-azure.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-azure.ts index c12ff1b97a..812b7e83ee 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-azure.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-azure.ts @@ -1 +1,6 @@ -export default `Microsoft Azure`; \ No newline at end of file +export default ` + Microsoft Azure + + +`; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-microsoft.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-microsoft.ts index 48d6ba0e9a..61caa12b42 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-microsoft.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons/icon-microsoft.ts @@ -1 +1,6 @@ -export default `Microsoft`; \ No newline at end of file +export default ` + Microsoft + + +`; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoft.svg b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoft.svg new file mode 100644 index 0000000000..aceab2c2d7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoft.svg @@ -0,0 +1,5 @@ + + Microsoft + + diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg new file mode 100644 index 0000000000..a42782c0bb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg @@ -0,0 +1,5 @@ + + Microsoft Azure + + From 923f219f24181bb380800934c29fcc3013a92bf1 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:30:45 +0200 Subject: [PATCH 08/10] empty outdir before writing icons --- src/Umbraco.Web.UI.Client/devops/icons/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/devops/icons/index.js b/src/Umbraco.Web.UI.Client/devops/icons/index.js index 19e684c7dd..0e35e7815c 100644 --- a/src/Umbraco.Web.UI.Client/devops/icons/index.js +++ b/src/Umbraco.Web.UI.Client/devops/icons/index.js @@ -1,4 +1,4 @@ -import { readFileSync, writeFile, mkdir } from 'fs'; +import { readFileSync, writeFile, mkdir, rmSync } from 'fs'; import * as globModule from 'tiny-glob'; import * as pathModule from 'path'; @@ -15,6 +15,9 @@ const lucideSvgDirectory = 'node_modules/lucide-static/icons'; const simpleIconsSvgDirectory = 'node_modules/simple-icons/icons'; const run = async () => { + // Empty output directory: + rmSync(iconsOutputDirectory, { recursive: true }); + var icons = await collectDictionaryIcons(); icons = await collectDiskIcons(icons); writeIconsToDisk(icons); From 22365ddba20eb23f18f9e1ad5fe648e65908969c Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:31:13 +0200 Subject: [PATCH 09/10] move icons from dictionary to disk --- .../core/icon-registry/icon-dictionary.json | 8 -------- .../src/packages/core/icon-registry/icons.ts | 16 ++++++---------- .../{icon-microsoftazure.svg => icon-azure.svg} | 0 3 files changed, 6 insertions(+), 18 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/{icon-microsoftazure.svg => icon-azure.svg} (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json index c23d92367f..e6e06752d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-dictionary.json @@ -2488,14 +2488,6 @@ { "name": "icon-umbraco", "file": "icon-umbraco.svg" - }, - { - "name": "icon-microsoft", - "file": "icon-microsoft.svg" - }, - { - "name": "icon-azure", - "file": "icon-microsoftazure.svg" } ] } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts index 2a59a220a2..8f0b5beb5f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icons.ts @@ -2135,14 +2135,6 @@ name: "icon-umbraco", path: () => import("./icons/icon-umbraco.js"), },{ -name: "icon-microsoft", - -path: () => import("./icons/icon-microsoft.js"), -},{ -name: "icon-azure", - -path: () => import("./icons/icon-azure.js"), -},{ name: "icon-art-easel", legacy: true, path: () => import("./icons/icon-art-easel.js"), @@ -2155,6 +2147,10 @@ name: "icon-auction-hammer", legacy: true, path: () => import("./icons/icon-auction-hammer.js"), },{ +name: "icon-azure", +legacy: true, +path: () => import("./icons/icon-azure.js"), +},{ name: "icon-baby-stroller", legacy: true, path: () => import("./icons/icon-baby-stroller.js"), @@ -2351,9 +2347,9 @@ name: "icon-male-symbol", legacy: true, path: () => import("./icons/icon-male-symbol.js"), },{ -name: "icon-microsoftazure", +name: "icon-microsoft", legacy: true, -path: () => import("./icons/icon-microsoftazure.js"), +path: () => import("./icons/icon-microsoft.js"), },{ name: "icon-molecular-network", legacy: true, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-azure.svg similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-microsoftazure.svg rename to src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-azure.svg From e44e55b3ddd43a35f2538f1cce43c12a52bfa1d9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 3 Jul 2024 11:57:13 +0200 Subject: [PATCH 10/10] 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 { -