Fix sprite name equal to entry name when contains slashes

Author: yoriiis

src/index.ts

@@ -306,9 +306,21 @@ class SvgChunkWebpackPlugin {
 		entryName: string;
 		sprite: string;
 	}): string {
-		let filename = compilation.getPath(this.options.filename, {
-			filename: entryName
-		});
+		let filename = this.options.filename;
+
+		// Check if the filename option contains the placeholder [name]
+		// [name] corresponds to the entrypoint name
+		if (/\[name\]/i.test(filename)) {
+			filename = filename.replace('[name]', entryName);
+		}
+
+		// Check if the filename option contains the placeholder [fullhash]
+		// [fullhash] corresponds to the Webpack compilation hash
+		if (/\[fullhash\]/i.test(filename)) {
+			const { hashDigestLength } = compilation.outputOptions;
+			const hash = compilation.fullHash.substring(0, hashDigestLength);
+			filename = filename.replace('[fullhash]', hash);
+		}
 
 		// Check if the filename option contains the placeholder [contenthash]
 		// [contenthash] corresponds to the sprite content hash

tests/index.test.js

@@ -472,20 +472,45 @@ describe('SvgChunkWebpackPlugin', () => {
 
 	describe('SvgChunkWebpackPlugin getFilename', () => {
 		it('Should call the getFilename function with default name', () => {
-			svgChunkWebpackPlugin.options.filename = 'sprite/[name].svg';
-			compilationWebpack.getPath.mockReturnValue('sprite/home.svg');
+			svgChunkWebpackPlugin.options.filename = 'sprites/[name].svg';
 
 			const result = svgChunkWebpackPlugin.getFilename({
 				compilation: compilationWebpack,
 				entryName: 'home',
 				output: spritesFixture.home
 			});
 
-			expect(compilationWebpack.getPath).toHaveBeenCalledWith('sprite/[name].svg', {
-				filename: 'home'
+			expect(compilationWebpack.compiler.webpack.util.createHash).not.toHaveBeenCalled();
+			expect(result).toBe('sprites/home.svg');
+		});
+
+		it('Should call the getFilename function with default name with slashes', () => {
+			svgChunkWebpackPlugin.options.filename = 'sprites/[name].svg';
+
+			const result = svgChunkWebpackPlugin.getFilename({
+				compilation: compilationWebpack,
+				entryName: 'home/components/footer',
+				output: spritesFixture.home
 			});
+
 			expect(compilationWebpack.compiler.webpack.util.createHash).not.toHaveBeenCalled();
-			expect(result).toBe('sprite/home.svg');
+			expect(result).toBe('sprites/home/components/footer.svg');
+		});
+
+		it('Should call the getFilename function with [fullhash]', () => {
+			svgChunkWebpackPlugin.options.filename = 'sprites/[name].[fullhash].svg';
+			compilationWebpack.outputOptions = {
+				hashDigestLength: 20
+			};
+			compilationWebpack.fullHash = '117b8f68975f36a8c463a1b2c3d4e5f6';
+
+			const result = svgChunkWebpackPlugin.getFilename({
+				compilation: compilationWebpack,
+				entryName: 'home',
+				sprite: spritesFixture.home
+			});
+
+			expect(result).toStrictEqual('sprites/home.117b8f68975f36a8c463.svg');
 		});
 
 		it('Should call the getFilename function with [contenthash]', () => {
@@ -495,19 +520,20 @@ describe('SvgChunkWebpackPlugin', () => {
 				hashDigest: 'hex',
 				hashDigestLength: 20
 			};
-			compilationWebpack.getPath.mockReturnValue('sprites/home.[contenthash].svg');
 			compilationWebpack.compiler.webpack.util.createHash.mockReturnValue({
 				update: jest.fn().mockReturnValue({
 					digest: jest.fn().mockReturnValue({
 						substring: jest.fn().mockReturnValue('a1b2c3d4e5f6')
 					})
 				})
 			});
+
 			const result = svgChunkWebpackPlugin.getFilename({
 				compilation: compilationWebpack,
 				entryName: 'home',
 				sprite: spritesFixture.home
 			});
+
 			expect(compilationWebpack.compiler.webpack.util.createHash).toHaveBeenCalledWith('md4');
 			expect(
 				compilationWebpack.compiler.webpack.util.createHash().update