Merge pull request #22 from simonfyi/master

Update build-file to Webpack 4 to use .hooks instead of .plugin

Author: pirelenito

fixtures/project/webpack.config.js

@@ -7,10 +7,10 @@ module.exports = {
   },
 
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.(txt)$/,
-        loader: 'file?name=[name]-[git-revision-branch]-[git-revision-version].[ext]'
+        use: 'file-loader?name=[name]-[git-revision-branch]-[git-revision-version].[ext]'
       }
     ]
   }

lib/build-file.js

@@ -3,8 +3,8 @@ var runGitCommand = require('./helpers/run-git-command')
 module.exports = function buildFile (compiler, gitWorkTree, command, replacePattern, asset) {
   var data = ''
 
-  compiler.plugin('compilation', function (compilation) {
-    compilation.plugin('optimize-tree', function (chunks, modules, callback) {
+  compiler.hooks.compilation.tap('compilation', (compilation) => {
+    compilation.hooks.optimizeTree.tapAsync('optimize-tree', (chunks, modules, callback) => {
       runGitCommand(gitWorkTree, command, function (err, res) {
         if (err) { return callback(err) }
         data = res
@@ -13,12 +13,12 @@ module.exports = function buildFile (compiler, gitWorkTree, command, replacePatt
       })
     })
 
-    compilation.mainTemplate.plugin('asset-path', function (path) {
+    compilation.mainTemplate.hooks.assetPath.tap('asset-path', (path) => {
       return path.replace(replacePattern, data)
     })
   })
 
-  compiler.plugin('emit', function (compilation, callback) {
+  compiler.hooks.emit.tapAsync('emit', (compilation, callback) => {
     compilation.assets[asset] = {
       source: function () {
         return data

lib/index.integration.spec.js

@@ -31,8 +31,8 @@ describe('git-revision-webpack-plugin (integration)', function () {
     config.output.path = targetBuild
     config.plugins = [
       new GitRevisionPlugin({
-        gitWorkTree: targetProject,
-        branch: true
+        branch: true,
+        gitWorkTree: targetProject
       })
     ]
 
@@ -70,9 +70,9 @@ describe('git-revision-webpack-plugin (integration)', function () {
 
     it('should support setting the public path', function () {
       var versionPath = path.join(targetBuild, 'main-master-v1.0.0-1-g9a15b3b.js')
-      var mainJs = fs.readFileSync(versionPath)
 
-      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/master/v1.0.0-1-g9a15b3b/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
+      var mainJs = fs.readFileSync(versionPath, 'utf8')
+      var expectedPublicPath = 'r.p="http://cdn.com/assets/master/v1.0.0-1-g9a15b3b/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2"'
 
       expect(mainJs.indexOf(expectedPublicPath) !== -1).to.eql(true)
     })
@@ -152,9 +152,9 @@ describe('git-revision-webpack-plugin with lightweightTags option', function ()
 
     it('should support setting the public path', function () {
       var versionPath = path.join(targetBuild, 'main-master-v2.0.0-beta.js')
-      var mainJs = fs.readFileSync(versionPath)
+      var mainJs = fs.readFileSync(versionPath, 'utf8')
 
-      var expectedPublicPath = '__webpack_require__.p = "http://cdn.com/assets/master/v2.0.0-beta/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2";'
+      var expectedPublicPath = 'r.p="http://cdn.com/assets/master/v2.0.0-beta/9a15b3ba1f8c347f9db94bcfde9630ed4fdeb1b2"'
 
       expect(mainJs.indexOf(expectedPublicPath) !== -1).to.eql(true)
     })