Merge pull request #39 from vagusX/master

fix: using webpack4
shepherdwind · Mar 27, 2018 · 88ba1b9 · 88ba1b9
2 parents 1df37c6 + c629dd5
commit 88ba1b9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/examples/ts-example/dist/index.html b/examples/ts-example/dist/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <title>css hot loader example</title>
+
+  <link rel="stylesheet" href="output.css">
+</head>
+<body>
+
+  <!-- React stuff -->
+  <div id="root"> hello world</div>
+  <div class="bar">hello world bar</div>
+
+  <script src="output.js"></script> <!-- webpack javascript output -->
+</body>
+</html>
+
diff --git a/examples/webpack4/webpack.config.js b/examples/webpack4/webpack.config.js
@@ -4,7 +4,7 @@ const ExtractTextWebpackPlugin = require('extract-text-webpack-plugin'); // requ
 
 let config = { // config object
   entry: {
-    output: ['css-hot-loader/hotModuleReplacement', './src/index.js'], // entry file
+    output: ['./src/index.js'], // entry file
   },
   output: { // output
     path: path.resolve(__dirname, 'dist'), // ouput path

diff --git a/loader.js b/loader.js
@@ -1,3 +1,4 @@
+const path = require('path');
 const loaderUtils = require('loader-utils');
 const defaultOptions = {
   fileMap: '{fileName}',
@@ -13,7 +14,7 @@ module.exports = function(content) {
   return content + `
     if(module.hot) {
       // ${Date.now()}
-      var cssReload = require(${loaderUtils.stringifyRequest(this, require.resolve('./hotModuleReplacement'))})(module.id, ${JSON.stringify(options)});
+      var cssReload = require(${loaderUtils.stringifyRequest(this, '!' + path.join(__dirname, 'hotModuleReplacement.js'))})(module.id, ${JSON.stringify(options)});
       module.hot.dispose(cssReload);
       module.hot.accept(undefined, cssReload);
     }