Merge branch 'develop' of github.com:privatenumber/webpack-localize-assets-plugin

Author: privatenumber

src/index.ts

@@ -118,7 +118,7 @@ class LocalizeAssetsPlugin<LocalizedData = string> {
 					 * The placeholder is a unique enough string to guarantee that we're not accidentally
 					 * replacing `[locale]` if it happens to be in the source JS.
 					 */
-					interpolateLocaleToFileName(compilation, fileNameTemplatePlaceholder);
+					interpolateLocaleToFileName(compilation, fileNameTemplatePlaceholder, true);
 
 					// Create localized assets by swapping out placeholders with localized strings
 					generateLocalizedAssets(

src/utils/localize-filename.ts

@@ -13,15 +13,18 @@ const { name } = require('../../package.json');
 export const interpolateLocaleToFileName = (
 	compilation: WP5.Compilation,
 	replaceWith: LocaleName,
+	requireLocaleInFilename?: boolean,
 ) => {
 	const { filename, chunkFilename } = compilation.outputOptions;
 
-	if (typeof filename === 'string') {
-		assert(filename.includes('[locale]'), 'output.filename must include [locale]');
-	}
+	if (requireLocaleInFilename) {
+		if (typeof filename === 'string') {
+			assert(filename.includes('[locale]'), 'output.filename must include [locale]');
+		}
 
-	if (typeof chunkFilename === 'string') {
-		assert(chunkFilename.includes('[locale]'), 'output.chunkFilename must include [locale]');
+		if (typeof chunkFilename === 'string') {
+			assert(chunkFilename.includes('[locale]'), 'output.chunkFilename must include [locale]');
+		}
 	}
 
 	const interpolateHook = (

tests/webpack-localize-assets-plugin.spec.ts

@@ -269,7 +269,7 @@ describe(`Webpack ${webpack.version}`, () => {
 				expect(errors[0].message).toMatch('Missing localization for key "bad key" used in /src/index.js:1:15 from locales: en, es, ja');
 			});
 
-			test('missing [locale] from filename', async () => {
+			test('missing [locale] from filename on multi locale', async () => {
 				await expect(async () => {
 					await build(
 						{
@@ -279,15 +279,15 @@ describe(`Webpack ${webpack.version}`, () => {
 							config.output.filename = '[name].js';
 							config.plugins.push(
 								new WebpackLocalizeAssetsPlugin({
-									locales: localesSingle,
+									locales: localesMulti,
 								}),
 							);
 						},
 					);
 				}).rejects.toThrow('output.filename must include [locale]');
 			});
 
-			test('missing [locale] from chunkFilename', async () => {
+			test('missing [locale] from chunkFilename on multi locale', async () => {
 				await expect(async () => {
 					await build(
 						{
@@ -299,7 +299,7 @@ describe(`Webpack ${webpack.version}`, () => {
 							config.output.chunkFilename = '[name].js';
 							config.plugins.push(
 								new WebpackLocalizeAssetsPlugin({
-									locales: localesSingle,
+									locales: localesMulti,
 								}),
 							);
 						},
@@ -413,8 +413,6 @@ describe(`Webpack ${webpack.version}`, () => {
 					'/src/index.js': 'export default __("hello-key");',
 				},
 				(config) => {
-					configureWebpack(config);
-
 					config.plugins.push(
 						new WebpackLocalizeAssetsPlugin({
 							locales: localesSingle,
@@ -426,11 +424,11 @@ describe(`Webpack ${webpack.version}`, () => {
 			const { assets } = built.stats.compilation;
 			expect(Object.keys(assets).length).toBe(1);
 
-			const enBuild = built.require('/dist/index.en.js');
+			const enBuild = built.require('/dist/index.js');
 			expect(enBuild).toBe(localesMulti.en['hello-key']);
 
 			const statsOutput = built.stats.toString();
-			expect(statsOutput).toMatch(/index\.en\.js/);
+			expect(statsOutput).toMatch(/index\.js/);
 		});
 
 		test('multi locale', async () => {