Merge branch 'main' into v14/bugfix/add-getter-to-remove-lit-warning

Author: madsrasmussen

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);

package-lock.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",

package.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"

src/packages/core/icon-registry/icon-dictionary.json

@@ -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"),

src/packages/core/icon-registry/icons.ts

@@ -1 +1,6 @@
-export default `<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Microsoft Azure</title><path fill="currentColor" d="M22.379 23.343a1.62 1.62 0 0 0 1.536-2.14v.002L17.35 1.76A1.62 1.62 0 0 0 15.816.657H8.184A1.62 1.62 0 0 0 6.65 1.76L.086 21.204a1.62 1.62 0 0 0 1.536 2.139h4.741a1.62 1.62 0 0 0 1.535-1.103l.977-2.892 4.947 3.675c.28.208.618.32.966.32m-3.084-12.531 3.624 10.739a.54.54 0 0 1-.51.713v-.001h-.03a.54.54 0 0 1-.322-.106l-9.287-6.9h4.853m6.313 7.006c.116-.326.13-.694.007-1.058L9.79 1.76a1.722 1.722 0 0 0-.007-.02h6.034a.54.54 0 0 1 .512.366l6.562 19.445a.54.54 0 0 1-.338.684"/></svg>`;
+export default `<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<title>Microsoft Azure</title>
+	<path fill="currentColor"
+		d="M22.379 23.343a1.62 1.62 0 0 0 1.536-2.14v.002L17.35 1.76A1.62 1.62 0 0 0 15.816.657H8.184A1.62 1.62 0 0 0 6.65 1.76L.086 21.204a1.62 1.62 0 0 0 1.536 2.139h4.741a1.62 1.62 0 0 0 1.535-1.103l.977-2.892 4.947 3.675c.28.208.618.32.966.32m-3.084-12.531 3.624 10.739a.54.54 0 0 1-.51.713v-.001h-.03a.54.54 0 0 1-.322-.106l-9.287-6.9h4.853m6.313 7.006c.116-.326.13-.694.007-1.058L9.79 1.76a1.722 1.722 0 0 0-.007-.02h6.034a.54.54 0 0 1 .512.366l6.562 19.445a.54.54 0 0 1-.338.684" />
+</svg>
+`;

src/packages/core/icon-registry/icons/icon-azure.ts

@@ -1 +1,6 @@
-export default `<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Microsoft</title><path fill="currentColor" d="M0 0v11.408h11.408V0zm12.594 0v11.408H24V0zM0 12.594V24h11.408V12.594zm12.594 0V24H24V12.594z"/></svg>`;
+export default `<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<title>Microsoft</title>
+	<path fill="currentColor"
+		d="M0 0v11.408h11.408V0zm12.594 0v11.408H24V0zM0 12.594V24h11.408V12.594zm12.594 0V24H24V12.594z" />
+</svg>
+`;

src/packages/core/icon-registry/icons/icon-microsoft.ts

@@ -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) =>
 		`<html lang="en-us">
 			<head>
@@ -59,19 +69,6 @@ export default {
 			</head>
       <body>
         <script type="module" src="${testFramework}"></script>
-				<script type="module">
-					/* Hack to disable Lit dev mode warnings */
-					const systemWarn = window.console.warn;
-					window.console.warn = (...args) => {
-						if (args[0].indexOf('Lit is in dev mode.') === 0) {
-							return;
-						}
-						if (args[0].indexOf('Multiple versions of Lit loaded.') === 0) {
-							return;
-						}
-						systemWarn(...args);
-					};
-				</script>
         <script type="module">
 					import 'element-internals-polyfill';
 					import '@umbraco-ui/uui';