Merge pull request #2 from DevWurm/bugfix/unnormalized-asset-paths

Bugfix/unnormalized asset paths

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-war-plugin",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Webpack plugin for bundling build outputs into a WAR archive",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/WebpackWarPlugin.spec.ts

@@ -144,6 +144,36 @@ describe('WebpackWarPlugin', function () {
         assert.calledWith(spyAppend, resolve((compiler as any).options.output.path, asset), { name: asset }));
     });
 
+    it('Should normalize asset paths', function () {
+      const ArchiverDummy = {
+        append: (() => null),
+        pipe: (() => null),
+        on: (() => null),
+        finalize: (() => null)
+      };
+      const spyAppend = spy(ArchiverDummy, 'append');
+
+      const assets = {
+        './asset1.txt': {},
+        './assets/./asset2.txt': {}
+      };
+
+      compilation.assets = assets;
+
+      const plugin = new WebpackWarPlugin({ archiveName: 'Test' });
+      (plugin as any).archiver = (() => ArchiverDummy);
+      plugin.apply(compiler);
+
+      assert.calledWith(spyAppend,
+        resolve((compiler as any).options.output.path, Object.getOwnPropertyNames(assets)[0]),
+        { name: 'asset1.txt' }
+      );
+      assert.calledWith(spyAppend,
+        resolve((compiler as any).options.output.path, Object.getOwnPropertyNames(assets)[1]),
+        { name: 'assets/asset2.txt' }
+      );
+    });
+
     it('Should add the WEB-INF folder to the archive', function () {
       const ArchiverStub = {
         append: (() => null),

src/WebpackWarPlugin.ts

@@ -42,7 +42,7 @@ export class WebpackWarPlugin implements Plugin {
 
       Object.getOwnPropertyNames(compilation.assets).forEach(asset => {
         const srcPath = resolve(outputPath, asset);
-        archive.append(srcPath, { name: asset });
+        archive.append(srcPath, { name: normalize(asset) });
       });
 
       additionalElements.forEach(({ path, destPath }) => {