Merge pull request #19 from bekos/publicpath

Fix Respect `output.publicPath`

Author: addyosmani

index.js

@@ -68,7 +68,10 @@ class PreloadPlugin {
               })
               .map(chunk => chunk.files);
         }
+
+        const publicPath = compilation.outputOptions.publicPath || '';
         extractedChunks.forEach(entry => {
+          entry = `${publicPath}${entry}`;
           if (options.rel === 'preload') {
             filesToInclude+= `<link rel="${options.rel}" href="${entry}" as="${options.as}">\n`;
           } else {

test/spec.js

@@ -44,8 +44,8 @@ describe('PreloadPlugin preloads or prefetches async chunks', function() {
       expect(err).toBeFalsy();
       expect(JSON.stringify(result.compilation.errors)).toBe('[]');
       const html = result.compilation.assets['index.html'].source();
-      expect(html).toContain('<link rel="preload" href="chunk.');
-      expect(html).not.toContain('<link rel="preload" href="bundle.');
+      expect(html).toContain('<link rel="preload" href="/chunk.');
+      expect(html).not.toContain('<link rel="preload" href="/bundle.');
       done();
     });
     compiler.outputFileSystem = new MemoryFileSystem();
@@ -72,7 +72,33 @@ describe('PreloadPlugin preloads or prefetches async chunks', function() {
       expect(err).toBeFalsy();
       expect(JSON.stringify(result.compilation.errors)).toBe('[]');
       const html = result.compilation.assets['index.html'].source();
-      expect(html).toContain('<link rel="prefetch" href="chunk.');
+      expect(html).toContain('<link rel="prefetch" href="/chunk.');
+      done();
+    });
+    compiler.outputFileSystem = new MemoryFileSystem();
+  });
+
+  it('respects publicPath', function(done) {
+    const compiler = webpack({
+      entry: {
+        js: path.join(__dirname, 'fixtures', 'file.js')
+      },
+      output: {
+        path: OUTPUT_DIR,
+        filename: 'bundle.js',
+        chunkFilename: 'chunk.[chunkhash].js',
+        publicPath: 'http://mycdn.com/',
+      },
+      plugins: [
+        new HtmlWebpackPlugin(),
+        new PreloadPlugin()
+      ]
+    }, function(err, result) {
+      expect(err).toBeFalsy();
+      expect(JSON.stringify(result.compilation.errors)).toBe('[]');
+      const html = result.compilation.assets['index.html'].source();
+      expect(html).toContain('<link rel="preload" href="http://mycdn.com/chunk.');
+      expect(html).not.toContain('<link rel="preload" href="http://mycdn.com/bundle.');
       done();
     });
     compiler.outputFileSystem = new MemoryFileSystem();
@@ -101,8 +127,8 @@ describe('PreloadPlugin preloads normal chunks', function() {
       expect(err).toBeFalsy();
       expect(JSON.stringify(result.compilation.errors)).toBe('[]');
       const html = result.compilation.assets['index.html'].source();
-      expect(html).toContain('<link rel="preload" href="chunk');
-      expect(html).toContain('<link rel="preload" href="bundle.js"');
+      expect(html).toContain('<link rel="preload" href="/chunk');
+      expect(html).toContain('<link rel="preload" href="/bundle.js"');
       done();
     });
     compiler.outputFileSystem = new MemoryFileSystem();
@@ -157,8 +183,8 @@ describe('PreloadPlugin filters chunks', function() {
       expect(err).toBeFalsy();
       expect(JSON.stringify(result.compilation.errors)).toBe('[]');
       const html = result.compilation.assets['index.html'].source();
-      expect(html).toContain('<link rel="preload" href="home');
-      expect(html).not.toContain('<link rel="preload" href="bundle.js"');
+      expect(html).toContain('<link rel="preload" href="/home');
+      expect(html).not.toContain('<link rel="preload" href="/bundle.js"');
       done();
     });
     compiler.outputFileSystem = new MemoryFileSystem();