Making shared entry working with versioning

Author: weaverryan

lib/webpack/shared-entry-concat-plugin.js

@@ -18,6 +18,24 @@ function SharedEntryConcatPlugin(sharedEntryName, buildDir) {
     this.buildDir = buildDir;
 }
 
+function getChunkFilename(stats, chunkName) {
+    const chunk = stats.compilation.namedChunks.get(chunkName);
+
+    if (!chunk) {
+        throw new Error(`Cannot find chunk ${chunkName}`);
+    }
+
+    const jsFiles = chunk.files.filter(filename => {
+        return /\.js$/.test(filename);
+    });
+
+    if (jsFiles.length !== 1) {
+        throw new Error(`Invalid number of files for chunk ${chunkName} - got ${jsFiles.join(', ')}`);
+    }
+
+    return jsFiles[0];
+}
+
 SharedEntryConcatPlugin.prototype.apply = function(compiler) {
     const done = (stats) => {
         if (stats.hasErrors()) {
@@ -41,8 +59,8 @@ SharedEntryConcatPlugin.prototype.apply = function(compiler) {
          * executed. This fixes that.
          */
 
-        const sharedEntryOutputFile = path.join(this.buildDir, this.sharedEntryName + '.js');
-        const tmpEntryBootstrapFile = path.join(this.buildDir, sharedEntryTmpName + '.js');
+        const sharedEntryOutputFile = path.join(this.buildDir, getChunkFilename(stats, this.sharedEntryName));
+        const tmpEntryBootstrapFile = path.join(this.buildDir, getChunkFilename(stats, sharedEntryTmpName));
 
         if (!fs.existsSync(sharedEntryOutputFile)) {
             throw new Error(`Could not find shared entry output file: ${sharedEntryOutputFile}`);

test/functional.js

@@ -698,6 +698,30 @@ describe('Functional tests using webpack', function() {
             });
         });
 
+        it('createdSharedEntry() works with versioning', (done) => {
+            const config = createWebpackConfig('www/build', 'dev');
+            config.setPublicPath('/build');
+            config.addEntry('main', ['./js/no_require', './js/code_splitting', './js/arrow_function', './js/print_to_app']);
+            config.addEntry('other', ['./js/no_require', './css/h1_style.css']);
+            config.createSharedEntry('shared', './js/shared_example');
+            config.enableVersioning();
+
+            testSetup.runWebpack(config, (webpackAssert) => {
+                testSetup.requestTestPage(
+                    path.join(config.getContext(), 'www'),
+                    [
+                        convertToManifestPath('build/runtime.js', config),
+                        convertToManifestPath('build/shared.js', config),
+                    ],
+                    (browser) => {
+                        // assert that the javascript brought into shared is executed
+                        browser.assert.text('#app', 'Welcome to Encore!');
+                        done();
+                    }
+                );
+            });
+        });
+
         it('in production mode, code is uglified', (done) => {
             const config = createWebpackConfig('www/build', 'production');
             config.setPublicPath('/build');