- added onDoneWatch

- Dependencies update
s00d · Apr 20, 2020 · 5b01643 · 5b01643
1 parent d9116ea
commit 5b01643
Show file tree

Hide file tree

Showing 10 changed files with 419 additions and 449 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.8] - 2019-12-09
+
+### Changed
+- added onDoneWatch
+- Dependencies update
+
 ## [1.1.5] - 2019-12-09
 
 ### Changed

diff --git a/README.md b/README.md
@@ -68,6 +68,9 @@ module.exports = {
 
 ***Default: ```{scripts: [],blocking: false,parallel: false}```***
 
+* `onDoneWatch`: configuration object for scripts that execute after files are emitted at the end of the compilation with watch. 
+
+***Default: ```{scripts: [],blocking: false,parallel: false}```***
 
 * `blocking (onBeforeBuild, onBuildStart, onBuildEnd, onBuildExit, onBuildExit, onWatchRun)`: block webpack until scripts finish execution.
 * `parallel (onBeforeBuild, onBuildStart, onBuildEnd, onBuildExit, onBuildExit, onWatchRun)`: execute scripts in parallel, otherwise execute scripts in the order in which they are specified in the scripts array.

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -12,6 +12,7 @@ export default class WebpackShellPlugin {
     private onBuildExit;
     private onBuildError;
     private onWatchRun;
+    private onDoneWatch;
     private env;
     private dev;
     private safe;
@@ -27,6 +28,7 @@ export default class WebpackShellPlugin {
     private handleScriptAsync;
     private executeScripts;
     apply(compiler: webpack.Compiler): void;
+    private readonly afterCompile;
     private readonly onInvalid;
     private readonly onCompilation;
     private readonly onAfterEmit;

diff --git a/lib/index.js b/lib/index.js
@@ -63,6 +63,29 @@ var WebpackShellPlugin = /** @class */ (function () {
         this.safe = false;
         this.logging = true;
         this.swallowError = false;
+        this.afterCompile = function (compilation, callback) { return __awaiter(_this, void 0, void 0, function () {
+            var onDoneWatch;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        onDoneWatch = this.onDoneWatch;
+                        if (!(onDoneWatch.scripts && onDoneWatch.scripts.length > 0)) return [3 /*break*/, 2];
+                        this.log('Executing additional scripts before exit');
+                        return [4 /*yield*/, this.executeScripts(onDoneWatch.scripts, onDoneWatch.parallel, onDoneWatch.blocking)];
+                    case 1:
+                        _a.sent();
+                        if (this.dev) {
+                            this.onBuildExit = JSON.parse(JSON.stringify(defaultTask));
+                        }
+                        _a.label = 2;
+                    case 2:
+                        if (callback) {
+                            callback();
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        }); };
         this.onInvalid = function (compilation) { return __awaiter(_this, void 0, void 0, function () {
             var onBeforeBuild;
             return __generator(this, function (_a) {
@@ -191,7 +214,8 @@ var WebpackShellPlugin = /** @class */ (function () {
         this.onBuildExit = this.validateEvent(options.onBuildExit);
         this.onBuildError = this.validateEvent(options.onBuildError);
         this.onWatchRun = this.validateEvent(options.onWatchRun);
-        if (options.hasOwnProperty('env')) {
+        this.onDoneWatch = this.validateEvent(options.onDoneWatch);
+        if (options.env !== undefined) {
             this.env = options.env;
         }
         if (options.dev !== undefined) {
@@ -332,13 +356,15 @@ var WebpackShellPlugin = /** @class */ (function () {
             compiler.hooks.compilation.tap('webpack-shell-plugin-next', this.onCompilation);
             compiler.hooks.afterEmit.tapAsync('webpack-shell-plugin-next', this.onAfterEmit);
             compiler.hooks.done.tapAsync('webpack-shell-plugin-next', this.onDone);
+            compiler.hooks.afterCompile.tapAsync('webpack-shell-plugin-next', this.afterCompile);
             compiler.hooks.watchRun.tapAsync('webpack-shell-plugin-next', this.watchRun);
         }
         else {
             compiler.plugin('invalid', this.onInvalid);
             compiler.plugin('compilation', this.onCompilation);
             compiler.plugin('after-emit', this.onAfterEmit);
             compiler.plugin('done', this.onDone);
+            compiler.plugin('after-compile', this.afterCompile);
             compiler.plugin('watch-run', this.watchRun);
         }
     };

diff --git a/lib/types.d.ts b/lib/types.d.ts
@@ -24,6 +24,8 @@ export declare type Options = {
     onBuildError?: Tasks | string;
     /** Scripts to execute after onWatchRun. Defaults to []. */
     onWatchRun?: Tasks | string;
+    /** Scripts to execute after files are emitted at the end with watch. Defaults to []. */
+    onDoneWatch?: Tasks | string;
     /**
      * Switch for development environments. This causes scripts to execute once.
      * Useful for running HMR on webpack-dev-server or webpack watch mode.