Fixing entrypoints.json so that it points to the unversioned filename

The id that the user will first find the entry filenames in
entrypoints.json and THEN use manifest.json to find the final path

Author: weaverryan

lib/webpack/entry-files-manifest-plugin.js

@@ -26,13 +26,17 @@ function extractFiles(entryPoint) {
         jsFiles: [],
         cssFiles: [],
     };
-    for (let filename of entryPoint.getFiles()) {
-        if (/\.js$/.test(filename)) {
-            files.jsFiles.push(filename);
-        } else if (/\.css$/.test(filename)) {
-            files.cssFiles.push(filename);
-        } else {
-            logger.debug(`Unable to determine file type for entry ${filename}. This is possibly a bug, but will not impact your setup unless you use the entrypoints.json file.`);
+
+    for (let chunk of entryPoint.chunks) {
+        for (let filename of chunk.files) {
+            if (/\.js$/.test(filename)) {
+                // use the chunk id because we do not want the versioned filename
+                files.jsFiles.push(`${chunk.id}.js`);
+            } else if (/\.css$/.test(filename)) {
+                files.cssFiles.push(`${chunk.id}.css`);
+            } else {
+                logger.debug(`Unable to determine file type for entry ${filename}. This is possibly a bug, but will not impact your setup unless you use the entrypoints.json file. To be super awesome, please report this as an issue.`);
+            }
         }
     }
 

test/functional.js

@@ -1247,6 +1247,8 @@ module.exports = {
                 config.addEntry('main', ['./css/roboto_font.css', './js/no_require', 'vue']);
                 config.addEntry('other', ['./css/roboto_font.css', 'vue']);
                 config.setPublicPath('/build');
+                // enable versioning to make sure entrypoints.json is not affected
+                config.enableVersioning();
                 config.configureSplitChunks((splitChunks) => {
                     splitChunks.chunks = 'all';
                     splitChunks.minSize = 0;
@@ -1264,6 +1266,39 @@ module.exports = {
                         },
                     });
 
+                    // make split chunks are correct in manifest
+                    webpackAssert.assertManifestKeyExists('build/vendors~main~other.js');
+
+                    done();
+                });
+            });
+
+            it('Custom public path does not affect entrypoints.json or manifest.json', (done) => {
+                const config = createWebpackConfig('web/build', 'dev');
+                config.addEntry('main', ['./css/roboto_font.css', './js/no_require', 'vue']);
+                config.addEntry('other', ['./css/roboto_font.css', 'vue']);
+                config.setPublicPath('http://localhost:8080/build');
+                config.setManifestKeyPrefix('custom_prefix');
+                config.configureSplitChunks((splitChunks) => {
+                    splitChunks.chunks = 'all';
+                    splitChunks.minSize = 0;
+                });
+
+                testSetup.runWebpack(config, (webpackAssert) => {
+                    webpackAssert.assertOutputJsonFileMatches('entrypoints.json', {
+                        main: {
+                            js: ['vendors~main~other.js', 'main~other.js', 'main.js'],
+                            css: ['main~other.css']
+                        },
+                        other: {
+                            js: ['vendors~main~other.js', 'main~other.js', 'other.js'],
+                            css: ['main~other.css']
+                        },
+                    });
+
+                    // make split chunks are correct in manifest
+                    webpackAssert.assertManifestKeyExists('custom_prefix/vendors~main~other.js');
+
                     done();
                 });
             });

test/helpers/assert.js

@@ -100,15 +100,21 @@ class Assert {
     assertManifestPath(sourcePath, expectedDestinationPath) {
         const manifestData = loadManifest(this.webpackConfig);
 
-        if (!manifestData[sourcePath]) {
-            throw new Error(`No ${sourcePath} key found in manifest ${JSON.stringify(manifestData)}`);
-        }
+        this.assertManifestKeyExists(sourcePath);
 
         if (manifestData[sourcePath] !== expectedDestinationPath) {
             throw new Error(`source path ${sourcePath} expected to be set to ${expectedDestinationPath}, was actually ${manifestData[sourcePath]}`);
         }
     }
 
+    assertManifestKeyExists(key) {
+        const manifestData = loadManifest(this.webpackConfig);
+
+        if (!manifestData[key]) {
+            throw new Error(`No ${key} key found in manifest ${JSON.stringify(manifestData)}`);
+        }
+    }
+
     assertManifestPathDoesNotExist(sourcePath) {
         const manifestData = loadManifest(this.webpackConfig);
 

test/package-helper.js

@@ -73,7 +73,7 @@ describe('package-helper', () => {
             expect(packageRecommendations.installCommand).to.contain('yarn add foo@^0.1.0 bar');
         });
 
-        it.only('Recommends correct install with a more complex constraint', () => {
+        it('Recommends correct install with a more complex constraint', () => {
             // e.g. ^7.0|^8.0
             const packageRecommendations = packageHelper.getMissingPackageRecommendations([
                 { name: 'foo', version: '^7.0|^8.0' },