Merge pull request #16 from royGil/master

a simpler approach to get output content
ardatan · May 10, 2018 · 38a5557 · 38a5557
2 parents bb23b3f + 77bee70
commit 38a5557
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 8 deletions.
diff --git a/atmosphere-packages/webpack-dev-middleware/dev-server.js b/atmosphere-packages/webpack-dev-middleware/dev-server.js
@@ -241,12 +241,14 @@ if (Meteor.isServer && Meteor.isDevelopment) {
             index: false,
             ...clientConfig.devServer
         }));
-        clientConfig.devServer.index = clientConfig.devServer.index || './index.html';
-        compiler.hooks.done.tap('meteor-webpack', () => {
-            const clientCompiler = compiler.compilers.find(compiler => (compiler.name == 'client'));
-            const indexPath = path.join(clientConfig.devServer.contentBase, clientConfig.devServer.index);
-            if (clientCompiler.outputFileSystem.existsSync(indexPath)) {
-                const content = clientCompiler.outputFileSystem.readFileSync(indexPath, 'utf8');
+
+        compiler.hooks.done.tap('meteor-webpack', ({ stats }) => {
+            const { assets } = stats[0].compilation
+            const index = clientConfig.devServer.index || 'index.html'
+
+            if (index in assets) {
+                const content = assets[index].source()
+
                 WebAppInternals.registerBoilerplateDataCallback('meteor/ardatan:webpack', (req, data) => {
                     const head = HEAD_REGEX.exec(content)[1];
                     data.dynamicHead = data.dynamicHead || '';
@@ -267,4 +269,4 @@ if (Meteor.isServer && Meteor.isDevelopment) {
 
     }
 
-}
+}
diff --git a/examples/react/package-lock.json b/examples/react/package-lock.json
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -28,4 +28,4 @@
     "webpack-dev-middleware": "^3.1.3",
     "webpack-hot-middleware": "^2.22.1"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ @@
         "webpack-dev-middleware": "^3.1.3",
         "webpack-hot-middleware": "^2.22.1"
       }
-    }
+    }