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 fbb9d054cd..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/**,*.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 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); diff --git a/src/Umbraco.Web.UI.Client/package-lock.json b/src/Umbraco.Web.UI.Client/package-lock.json index 2e7be9bc15..2c6d1f6c2f 100644 --- a/src/Umbraco.Web.UI.Client/package-lock.json +++ b/src/Umbraco.Web.UI.Client/package-lock.json @@ -90,7 +90,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", @@ -19366,9 +19366,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 a1aa6b2ab8..5cfe39dbf2 100644 --- a/src/Umbraco.Web.UI.Client/package.json +++ b/src/Umbraco.Web.UI.Client/package.json @@ -257,7 +257,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", 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..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 @@ -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" 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..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 @@ -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"), @@ -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,6 +2347,10 @@ name: "icon-male-symbol", legacy: true, path: () => import("./icons/icon-male-symbol.js"), },{ +name: "icon-microsoft", +legacy: true, +path: () => import("./icons/icon-microsoft.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-azure.svg b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-azure.svg new file mode 100644 index 0000000000..a42782c0bb --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/svgs/icon-azure.svg @@ -0,0 +1,5 @@ + + Microsoft Azure + + 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/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 { -