Fixing a bug where the contentBase could not be calculated with an empty publicPath

Author: weaverryan

lib/config/path-util.js

@@ -41,11 +41,12 @@ module.exports = {
         // eventually, you (may) get to the right path
         let contentBase = outputPath;
         while (path.dirname(contentBase) !== contentBase) {
-            contentBase = path.dirname(contentBase);
-
             if (path.join(contentBase, publicPath) === outputPath) {
                 return contentBase;
             }
+
+            // go up one directory
+            contentBase = path.dirname(contentBase);
         }
 
         throw new Error(`Unable to determine contentBase option for webpack's devServer configuration. The ${webpackConfig.manifestKeyPrefix ? 'manifestKeyPrefix' : 'publicPath'} (${webpackConfig.manifestKeyPrefix ? webpackConfig.manifestKeyPrefix : webpackConfig.publicPath}) string does not exist in the outputPath (${webpackConfig.outputPath}), and so the "document root" cannot be determined.`);

test/config/path-util.js

@@ -55,6 +55,20 @@ describe('path-util getContentBase()', () => {
             const actualContentBase = pathUtil.getContentBase(config);
             expect(actualContentBase).to.equal(isWindows ? 'C:\\tmp\\public' : '/tmp/public');
         });
+
+        it('contentBase is calculated correctly with no public path', function() {
+            const config = createConfig();
+            config.runtimeConfig.useDevServer = true;
+            config.runtimeConfig.devServerUrl = 'http://localhost:8080/';
+            config.outputPath = isWindows ? 'C:\\tmp\\public' : '/tmp/public';
+            config.setPublicPath('/');
+            config.addEntry('main', './main');
+
+            const actualContentBase = pathUtil.getContentBase(config);
+            // contentBase should point to the "document root", which
+            // is calculated as outputPath, but without the publicPath portion
+            expect(actualContentBase).to.equal(isWindows ? 'C:\\tmp\\public' : '/tmp/public');
+        });
     });
 
     describe('validatePublicPathAndManifestKeyPrefix', () => {