react-icons-sprite 1.2.0 → 1.3.0

package/dist/{build-sprite-DpqABaHa.mjs → build-sprite-Dci5SlWn.mjs}

@@ -1,4 +1,4 @@
-import { o as resolveIconImport, t as computeIconId } from "./compute-icon-id-CGZBEP3i.mjs";
+import { o as resolveIconImport, t as computeIconId } from "./compute-icon-id-1Gop_fRM.mjs";
 import { existsSync, readFileSync, statSync } from "node:fs";
 import path from "node:path";
 import { pathToFileURL } from "node:url";

package/dist/{collector-D0VUmoK8.mjs → collector-dvzR3TG1.mjs}

@@ -1,4 +1,4 @@
-import { s as createCollector } from "./compute-icon-id-CGZBEP3i.mjs";
+import { s as createCollector } from "./compute-icon-id-1Gop_fRM.mjs";
 //#region src/collector.ts
 const collector = createCollector();
 //#endregion

package/dist/{compute-icon-id-CGZBEP3i.mjs → compute-icon-id-1Gop_fRM.mjs}

@@ -52,7 +52,8 @@ const DEFAULT_ICON_SOURCES = [
 	/^@ant-design\/icons(?:\/.*)?$/,
 	/^@fluentui\/react-icons(?:\/svg\/[\w-]+)?$/,
 	/^@primer\/octicons-react$/,
-	/^@hugeicons\/core-free-icons(?:\/.*)?$/
+	/^@hugeicons\/core-free-icons(?:\/.*)?$/,
+	/^@pillage-first\/graphics$/
 ];
 const phosphorIconPathName = (name) => name.endsWith("Icon") ? name.slice(0, -4) : name;
 const fluentIconPathName = (name) => {
@@ -71,7 +72,7 @@ const exactResolvers = {
 	"devicons-react": (pack, name) => `${pack}/icons/${name}`,
 	"@carbon/icons-react": (pack, name) => `${pack}/es/${name}.js`,
 	"@ant-design/icons": (pack, name) => `${pack}/lib/icons/${name}.js`,
-	"@fluentui/react-icons": (pack, name) => `${pack}/lib-cjs/atoms/svg/${fluentIconPathName(name)}.js`,
+	"@fluentui/react-icons": (pack, name) => `${pack}/lib/atoms/svg/${fluentIconPathName(name)}`,
 	"@primer/octicons-react": (pack) => pack,
 	"@hugeicons/core-free-icons": (pack, name) => `${pack}/${name}`
 };
@@ -81,7 +82,7 @@ const resolveIconImport = (pack, exportName) => {
 	if (/^@mui\/icons-material(?:\/.*)?$/.test(pack)) return pack.split("/").length > 2 ? pack : `${pack}/${exportName}`;
 	if (/^@ant-design\/icons\/.+$/.test(pack)) return `@ant-design/icons/lib/icons/${exportName === "default" ? pack.split("/").at(-1) : exportName}.js`;
 	const fluentSubpath = /^@fluentui\/react-icons\/svg\/(.+)$/.exec(pack);
-	if (fluentSubpath) return `@fluentui/react-icons/lib-cjs/atoms/svg/${fluentSubpath[1]}.js`;
+	if (fluentSubpath) return `@fluentui/react-icons/lib/atoms/svg/${fluentSubpath[1]}`;
 	if (/^@hugeicons\/core-free-icons\/.+$/.test(pack)) return pack;
 	if (/^@heroicons\/react\/(?:\d{2})\/(?:outline|solid)$/.test(pack)) return `${pack}/${exportName}`;
 	if (/^@fortawesome\/[\w-]+-svg-icons$/.test(pack)) return `${pack}/${exportName}`;

package/dist/{transform-module-DglDSarv.mjs → transform-module-BakS0Tzh.mjs}

@@ -1,4 +1,4 @@
-import { a as DEFAULT_ICON_SOURCES, n as normalizePackAlias } from "./compute-icon-id-CGZBEP3i.mjs";
+import { a as DEFAULT_ICON_SOURCES, n as normalizePackAlias } from "./compute-icon-id-1Gop_fRM.mjs";
 import MagicString from "magic-string";
 //#region src/transform/edit-applier.ts
 const applyEdits = (code, edits) => {
@@ -94,10 +94,26 @@ const parseNamedSpecifiers = (specifier, specifierOffset, imports) => {
 		});
 	}
 };
+const parseImportSpecifiers = (specifier, specifierOffset) => {
+	const specifiers = [];
+	const braceStart = specifier.indexOf("{");
+	const defaultText = (braceStart === -1 ? specifier : specifier.slice(0, braceStart)).replace(/,\s*$/, "");
+	const defaultRange = trimRange(defaultText, specifierOffset);
+	if (defaultRange && !specifier.slice(defaultRange[0] - specifierOffset, defaultRange[1] - specifierOffset).startsWith("type ")) {
+		const local = specifier.slice(defaultRange[0] - specifierOffset, defaultRange[1] - specifierOffset);
+		if (local && /^[A-Za-z_$][\w$]*$/.test(local)) specifiers.push({
+			local,
+			exportName: "default",
+			range: defaultRange
+		});
+	}
+	parseNamedSpecifiers(specifier, specifierOffset, specifiers);
+	return specifiers;
+};
 const countImportSpecifiers = (specifier) => {
 	let count = 0;
 	const braceStart = specifier.indexOf("{");
-	if ((braceStart === -1 ? specifier : specifier.slice(0, braceStart)).replace(/,$/, "").trim()) count += 1;
+	if ((braceStart === -1 ? specifier : specifier.slice(0, braceStart)).replace(/,\s*$/, "").trim()) count += 1;
 	const braceEnd = specifier.lastIndexOf("}");
 	if (braceStart !== -1 && braceEnd > braceStart) {
 		const named = specifier.slice(braceStart + 1, braceEnd);
@@ -114,22 +130,11 @@ const scanImportsDetailed = (code, sources) => {
 		if (specifier.trim().startsWith("type ")) continue;
 		const matchStart = match.index;
 		const specifierOffset = matchStart + statement.indexOf(specifier);
-		const specifiers = [];
-		const braceStart = specifier.indexOf("{");
-		const defaultText = (braceStart === -1 ? specifier : specifier.slice(0, braceStart)).replace(/,$/, "");
-		const defaultRange = trimRange(defaultText, specifierOffset);
-		if (defaultRange && !specifier.slice(defaultRange[0] - specifierOffset, defaultRange[1] - specifierOffset).startsWith("type ")) {
-			const local = specifier.slice(defaultRange[0] - specifierOffset, defaultRange[1] - specifierOffset);
-			if (local && /^[A-Za-z_$][\w$]*$/.test(local)) specifiers.push({
-				local,
-				exportName: "default",
-				range: defaultRange
-			});
-		}
-		parseNamedSpecifiers(specifier, specifierOffset, specifiers);
+		const specifiers = parseImportSpecifiers(specifier, specifierOffset);
 		if (specifiers.length) imports.push({
 			pack,
 			declarationRange: [matchStart, matchStart + statement.length],
+			specifierRange: [specifierOffset, specifierOffset + specifier.length],
 			specifiers,
 			specifierCount: countImportSpecifiers(specifier)
 		});
@@ -484,43 +489,71 @@ const cleanupScannedImports = (code, imports, usedLocals) => {
 			});
 			continue;
 		}
-		for (const specifier of usedSpecifiers) {
-			const [from, to] = specifierRemovalRange(code, specifier.range);
-			edits.push({
-				type: "remove",
-				from,
-				to
-			});
-		}
+		const edit = removeImportSpecifiers(code, item, usedLocals);
+		if (edit) edits.push(edit);
 	}
 	return edits;
 };
+const removeImportSpecifiers = (code, item, usedLocals) => {
+	const specifierText = code.slice(item.specifierRange[0], item.specifierRange[1]);
+	const braceStart = specifierText.indexOf("{");
+	const braceEnd = specifierText.lastIndexOf("}");
+	const defaultSpecifier = item.specifiers.find((specifier) => specifier.exportName === "default");
+	const defaultLocal = (braceStart === -1 ? specifierText : specifierText.slice(0, braceStart)).replace(/,\s*$/, "").trim();
+	const parts = [];
+	if (defaultLocal && (!defaultSpecifier || !usedLocals.has(defaultSpecifier.local))) parts.push(defaultLocal);
+	if (braceStart !== -1 && braceEnd > braceStart) {
+		const namedSpecifiers = collectKeptNamedSpecifiers(specifierText.slice(braceStart + 1, braceEnd), usedLocals);
+		if (namedSpecifiers.length) parts.push(`{ ${namedSpecifiers.join(", ")} }`);
+	}
+	if (!parts.length) return {
+		type: "remove",
+		from: item.declarationRange[0],
+		to: extendToLineEnd(code, item.declarationRange[1])
+	};
+	return {
+		type: "replace",
+		from: item.specifierRange[0],
+		to: item.specifierRange[1],
+		value: parts.join(", ")
+	};
+};
+const collectKeptNamedSpecifiers = (namedText, usedLocals) => {
+	const kept = [];
+	let segmentStart = 0;
+	for (let index = 0; index <= namedText.length; index += 1) {
+		if (index !== namedText.length && namedText[index] !== ",") continue;
+		const text = namedText.slice(segmentStart, index).trim();
+		segmentStart = index + 1;
+		if (!text) continue;
+		if (text.startsWith("type ")) {
+			kept.push(text);
+			continue;
+		}
+		const aliasMatch = /^(.*?)\s+as\s+([A-Za-z_$][\w$]*)$/.exec(text);
+		const local = aliasMatch ? aliasMatch[2] : text;
+		if (!usedLocals.has(local)) kept.push(text);
+	}
+	return kept;
+};
 const cleanupScannedFontAwesomeComponentImports = (code, usedLocals) => {
 	const edits = [];
 	IMPORT_RE.lastIndex = 0;
 	for (const match of code.matchAll(IMPORT_RE)) {
 		const [statement, specifier, , source] = match;
 		if (source !== FONTAWESOME_REACT_PACK) continue;
-		const specifiers = [];
-		parseNamedSpecifiers(specifier, match.index + statement.indexOf(specifier), specifiers);
+		const specifierOffset = match.index + statement.indexOf(specifier);
+		const specifiers = parseImportSpecifiers(specifier, specifierOffset);
 		const removableSpecifiers = specifiers.filter((item) => item.exportName === "FontAwesomeIcon" && usedLocals.has(item.local));
 		if (!removableSpecifiers.length) continue;
-		if (removableSpecifiers.length === specifiers.length) {
-			edits.push({
-				type: "remove",
-				from: match.index,
-				to: extendToLineEnd(code, match.index + statement.length)
-			});
-			continue;
-		}
-		for (const specifier of removableSpecifiers) {
-			const [from, to] = specifierRemovalRange(code, specifier.range);
-			edits.push({
-				type: "remove",
-				from,
-				to
-			});
-		}
+		const edit = removeImportSpecifiers(code, {
+			pack: source,
+			declarationRange: [match.index, match.index + statement.length],
+			specifierRange: [specifierOffset, specifierOffset + specifier.length],
+			specifiers,
+			specifierCount: countImportSpecifiers(specifier)
+		}, new Set(removableSpecifiers.map((item) => item.local)));
+		if (edit) edits.push(edit);
 	}
 	return edits;
 };
@@ -530,26 +563,18 @@ const cleanupScannedHugeiconsComponentImports = (code, usedLocals) => {
 	for (const match of code.matchAll(IMPORT_RE)) {
 		const [statement, specifier, , source] = match;
 		if (source !== HUGEICONS_REACT_PACK) continue;
-		const specifiers = [];
-		parseNamedSpecifiers(specifier, match.index + statement.indexOf(specifier), specifiers);
+		const specifierOffset = match.index + statement.indexOf(specifier);
+		const specifiers = parseImportSpecifiers(specifier, specifierOffset);
 		const removableSpecifiers = specifiers.filter((item) => item.exportName === "HugeiconsIcon" && usedLocals.has(item.local));
 		if (!removableSpecifiers.length) continue;
-		if (removableSpecifiers.length === specifiers.length) {
-			edits.push({
-				type: "remove",
-				from: match.index,
-				to: extendToLineEnd(code, match.index + statement.length)
-			});
-			continue;
-		}
-		for (const specifier of removableSpecifiers) {
-			const [from, to] = specifierRemovalRange(code, specifier.range);
-			edits.push({
-				type: "remove",
-				from,
-				to
-			});
-		}
+		const edit = removeImportSpecifiers(code, {
+			pack: source,
+			declarationRange: [match.index, match.index + statement.length],
+			specifierRange: [specifierOffset, specifierOffset + specifier.length],
+			specifiers,
+			specifierCount: countImportSpecifiers(specifier)
+		}, new Set(removableSpecifiers.map((item) => item.local)));
+		if (edit) edits.push(edit);
 	}
 	return edits;
 };
@@ -564,20 +589,6 @@ const extendToLineEnd = (code, end) => {
 	if (code[to] === "\n") return to + 1;
 	return to;
 };
-const specifierRemovalRange = (code, [start, end]) => {
-	let from = start;
-	let to = end;
-	let before = start - 1;
-	while (before >= 0 && isWhitespaceCode(code.charCodeAt(before))) before -= 1;
-	if (before >= 0 && code[before] === ",") {
-		from = before;
-		return [from, to];
-	}
-	let after = end;
-	while (after < code.length && isWhitespaceCode(code.charCodeAt(after))) after += 1;
-	if (after < code.length && code[after] === ",") to = consumeTrailingWhitespace(code, after + 1);
-	return [from, to];
-};
 const consumeTrailingWhitespace = (code, start) => {
 	let to = start;
 	while (to < code.length && isWhitespaceCode(code.charCodeAt(to))) to += 1;
@@ -590,11 +601,44 @@ const editRange = (edit) => {
 const rangeContains = ([start, end], index) => {
 	return index >= start && index < end;
 };
+const findPreviousJsxTextBoundary = (code, start) => {
+	let index = start - 1;
+	while (index >= 0) {
+		const char = code[index];
+		if (char === ">" || char === "<" || char === "{" || char === "}") return index;
+		index -= 1;
+	}
+	return -1;
+};
+const findNextJsxTextBoundary = (code, start) => {
+	let index = start;
+	while (index < code.length) {
+		const char = code[index];
+		if (char === "<" || char === "{") return index;
+		index += 1;
+	}
+	return -1;
+};
+const isLikelyJsxTagStart = (code, index) => {
+	const next = code[index + 1];
+	return next === "/" || next === ">" || isIdentifierStart(next);
+};
+const isLikelyJsxTextIdentifier = (code, start, end) => {
+	const previousBoundary = findPreviousJsxTextBoundary(code, start);
+	if (previousBoundary === -1 || code[previousBoundary] !== ">" && code[previousBoundary] !== "}") return false;
+	const nextBoundary = findNextJsxTextBoundary(code, end);
+	if (nextBoundary === -1) return false;
+	if (code[nextBoundary] === "<" && !isLikelyJsxTagStart(code, nextBoundary)) return false;
+	const text = code.slice(previousBoundary + 1, nextBoundary);
+	return !/[=()[\]{};,+*/%|?]/.test(text);
+};
 const collectUsedLocalsOutsideRanges = (code, usedLocals, ignoredRanges) => {
 	const ranges = [...ignoredRanges].sort((left, right) => left[0] - right[0]);
 	const found = /* @__PURE__ */ new Set();
 	let rangeIndex = 0;
 	let quote = null;
+	let template = false;
+	let templateExpressionDepth = 0;
 	let lineComment = false;
 	let blockComment = false;
 	for (let index = 0; index < code.length; index += 1) {
@@ -625,6 +669,21 @@ const collectUsedLocalsOutsideRanges = (code, usedLocals, ignoredRanges) => {
 			if (char === quote) quote = null;
 			continue;
 		}
+		if (template && templateExpressionDepth === 0) {
+			if (char === "\\") {
+				index += 1;
+				continue;
+			}
+			if (char === "`") {
+				template = false;
+				continue;
+			}
+			if (char === "$" && next === "{") {
+				templateExpressionDepth = 1;
+				index += 1;
+			}
+			continue;
+		}
 		if (char === "/" && next === "/") {
 			lineComment = true;
 			index += 1;
@@ -635,16 +694,27 @@ const collectUsedLocalsOutsideRanges = (code, usedLocals, ignoredRanges) => {
 			index += 1;
 			continue;
 		}
+		if (template && templateExpressionDepth > 0) {
+			if (char === "{") templateExpressionDepth += 1;
+			if (char === "}") {
+				templateExpressionDepth -= 1;
+				if (templateExpressionDepth === 0) continue;
+			}
+		}
 		if (char === "\"" || char === "'") {
 			quote = char;
 			continue;
 		}
+		if (char === "`") {
+			template = true;
+			continue;
+		}
 		if (!isIdentifierStart(char)) continue;
 		const start = index;
 		index += 1;
 		while (isIdentifierPart(code[index])) index += 1;
 		const local = code.slice(start, index);
-		if (usedLocals.has(local)) found.add(local);
+		if (usedLocals.has(local) && !isLikelyJsxTextIdentifier(code, start, index)) found.add(local);
 		index -= 1;
 	}
 	return found;

package/dist/vite/plugin.mjs

@@ -1,7 +1,7 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
-import { i as createSpriteAssetName, r as createIconSources, s as createCollector } from "../compute-icon-id-CGZBEP3i.mjs";
-import { t as buildSprite } from "../build-sprite-DpqABaHa.mjs";
-import { t as transformModule } from "../transform-module-DglDSarv.mjs";
+import { i as createSpriteAssetName, r as createIconSources, s as createCollector } from "../compute-icon-id-1Gop_fRM.mjs";
+import { t as buildSprite } from "../build-sprite-Dci5SlWn.mjs";
+import { t as transformModule } from "../transform-module-BakS0Tzh.mjs";
 import { createHash } from "node:crypto";
 //#region src/vite/plugin.ts
 const reactIconsSprite = (options = {}) => {

package/dist/webpack/loader.mjs

@@ -1,6 +1,6 @@
-import { r as createIconSources } from "../compute-icon-id-CGZBEP3i.mjs";
-import { t as transformModule } from "../transform-module-DglDSarv.mjs";
-import { t as collector } from "../collector-D0VUmoK8.mjs";
+import { r as createIconSources } from "../compute-icon-id-1Gop_fRM.mjs";
+import { t as transformModule } from "../transform-module-BakS0Tzh.mjs";
+import { t as collector } from "../collector-dvzR3TG1.mjs";
 //#region src/webpack/loader.ts
 const reactIconsSpriteLoader = async function(source) {
 	if (this.mode === "development") return source;

package/dist/webpack/plugin.mjs

@@ -1,7 +1,7 @@
 import { REACT_ICONS_SPRITE_URL_PLACEHOLDER } from "../index.mjs";
-import { i as createSpriteAssetName } from "../compute-icon-id-CGZBEP3i.mjs";
-import { t as buildSprite } from "../build-sprite-DpqABaHa.mjs";
-import { t as collector } from "../collector-D0VUmoK8.mjs";
+import { i as createSpriteAssetName } from "../compute-icon-id-1Gop_fRM.mjs";
+import { t as buildSprite } from "../build-sprite-Dci5SlWn.mjs";
+import { t as collector } from "../collector-dvzR3TG1.mjs";
 import { createHash } from "node:crypto";
 //#region src/webpack/plugin.ts
 var ReactIconsSpriteWebpackPlugin = class {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "react-icons-sprite",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "A lightweight Vite, Rsbuild and Webpack plugin for popular icon libraries that builds a single SVG sprite and rewrites icons to <use>, reducing bundle size and runtime overhead.",
   "author": "Jure Rotar <hello@jurerotar.com>",