Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add “quiet” option #44

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add “quiet” option #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ Once the build finishes, a child process is spawned firing both a python and nod
* `dev`: switch for development environments. This causes scripts to execute once. Useful for running HMR on webpack-dev-server or webpack watch mode. **Default: true**
* `safe`: switches script execution process from spawn to exec. If running into problems with spawn, turn this setting on. **Default: false**
* `verbose`: **DEPRECATED** enable for verbose output. **Default: false**
* `quiet`: disables output for internal messages. **Default: false**

### Developing

Expand Down
203 changes: 72 additions & 131 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,118 +1,5 @@
'use strict';

var asyncGenerator = function () {
function AwaitValue(value) {
this.value = value;
}

function AsyncGenerator(gen) {
var front, back;

function send(key, arg) {
return new Promise(function (resolve, reject) {
var request = {
key: key,
arg: arg,
resolve: resolve,
reject: reject,
next: null
};

if (back) {
back = back.next = request;
} else {
front = back = request;
resume(key, arg);
}
});
}

function resume(key, arg) {
try {
var result = gen[key](arg);
var value = result.value;

if (value instanceof AwaitValue) {
Promise.resolve(value.value).then(function (arg) {
resume("next", arg);
}, function (arg) {
resume("throw", arg);
});
} else {
settle(result.done ? "return" : "normal", result.value);
}
} catch (err) {
settle("throw", err);
}
}

function settle(type, value) {
switch (type) {
case "return":
front.resolve({
value: value,
done: true
});
break;

case "throw":
front.reject(value);
break;

default:
front.resolve({
value: value,
done: false
});
break;
}

front = front.next;

if (front) {
resume(front.key, front.arg);
} else {
back = null;
}
}

this._invoke = send;

if (typeof gen.return !== "function") {
this.return = undefined;
}
}

if (typeof Symbol === "function" && Symbol.asyncIterator) {
AsyncGenerator.prototype[Symbol.asyncIterator] = function () {
return this;
};
}

AsyncGenerator.prototype.next = function (arg) {
return this._invoke("next", arg);
};

AsyncGenerator.prototype.throw = function (arg) {
return this._invoke("throw", arg);
};

AsyncGenerator.prototype.return = function (arg) {
return this._invoke("return", arg);
};

return {
wrap: function (fn) {
return function () {
return new AsyncGenerator(fn.apply(this, arguments));
};
},
await: function (value) {
return new AwaitValue(value);
}
};
}();

var classCallCheck = function (instance, Constructor) {
if (!(instance instanceof Constructor)) {
throw new TypeError("Cannot call a class as a function");
Expand All @@ -137,6 +24,44 @@ var createClass = function () {
};
}();







































var toArray = function (arr) {
return Array.isArray(arr) ? arr : Array.from(arr);
};
Expand All @@ -151,7 +76,8 @@ var defaultOptions = {
onBuildExit: [],
dev: true,
verbose: false,
safe: false
safe: false,
quiet: false
};

var WebpackShellPlugin = function () {
Expand All @@ -163,7 +89,7 @@ var WebpackShellPlugin = function () {

createClass(WebpackShellPlugin, [{
key: 'puts',
value: function puts(error, stdout, stderr) {
value: function puts(error) {
if (error) {
throw error;
}
Expand Down Expand Up @@ -220,13 +146,13 @@ var WebpackShellPlugin = function () {
}
}, {
key: 'mergeOptions',
value: function mergeOptions(options, defaults) {
for (var key in defaults) {
value: function mergeOptions(options, defaults$$1) {
for (var key in defaults$$1) {
if (options.hasOwnProperty(key)) {
defaults[key] = options[key];
defaults$$1[key] = options[key];
}
}
return defaults;
return defaults$$1;
}
}, {
key: 'apply',
Expand All @@ -235,13 +161,20 @@ var WebpackShellPlugin = function () {

compiler.plugin('compilation', function (compilation) {
if (_this.options.verbose) {
console.log('Report compilation: ' + compilation);
console.warn('WebpackShellPlugin [' + new Date() + ']: Verbose is being deprecated, please remove.');
if (!_this.options.quiet) {
console.log('Report compilation: ' + compilation);
//eslint-disable-next-line
console.warn('WebpackShellPlugin [' + new Date() + ']: Verbose is being deprecated, please remove.');
}
}
if (_this.options.onBuildStart.length) {
console.log('Executing pre-build scripts');
for (var i = 0; i < _this.options.onBuildStart.length; i++) {
_this.handleScript(_this.options.onBuildStart[i]);
if (!_this.options.quiet) {
console.log('Executing pre-build scripts');
}
for (var index = 0; index < _this.options.onBuildStart.length;
// eslint-disable-next-line
index += 1) {
_this.handleScript(_this.options.onBuildStart[index]);
}
if (_this.options.dev) {
_this.options.onBuildStart = [];
Expand All @@ -251,9 +184,13 @@ var WebpackShellPlugin = function () {

compiler.plugin('after-emit', function (compilation, callback) {
if (_this.options.onBuildEnd.length) {
console.log('Executing post-build scripts');
for (var i = 0; i < _this.options.onBuildEnd.length; i++) {
_this.handleScript(_this.options.onBuildEnd[i]);
if (!_this.options.quiet) {
console.log('Executing post-build scripts');
}
for (var index = 0; index < _this.options.onBuildEnd.length;
// eslint-disable-next-line
index += 1) {
_this.handleScript(_this.options.onBuildEnd[index]);
}
if (_this.options.dev) {
_this.options.onBuildEnd = [];
Expand All @@ -264,9 +201,13 @@ var WebpackShellPlugin = function () {

compiler.plugin('done', function () {
if (_this.options.onBuildExit.length) {
console.log('Executing additional scripts before exit');
for (var i = 0; i < _this.options.onBuildExit.length; i++) {
_this.handleScript(_this.options.onBuildExit[i]);
if (!_this.options.quiet) {
console.log('Executing additional scripts before exit');
}
for (var index = 0; index < _this.options.onBuildExit.length;
// eslint-disable-next-line
index += 1) {
_this.handleScript(_this.options.onBuildExit[index]);
}
}
});
Expand All @@ -275,4 +216,4 @@ var WebpackShellPlugin = function () {
return WebpackShellPlugin;
}();

module.exports = WebpackShellPlugin;
module.exports = WebpackShellPlugin;
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
},
"homepage": "https://github.com/1337programming/webpack-shell-plugin",
"devDependencies": {
"babel-core": "^6.7.6",
"babel-preset-es2015-rollup": "^1.1.1",
"babel-core": "^6.24.1",
"babel-preset-es2015-rollup": "^3.0.0",
"css-loader": "^0.23.1",
"eslint": "^2.7.0",
"rollup": "^0.25.8",
"rollup-plugin-babel": "^2.4.0",
"rollup": "^0.41.6",
"rollup-plugin-babel": "^2.7.1",
"style-loader": "^0.13.1",
"webpack": "^1.13.1"
}
Expand Down
55 changes: 41 additions & 14 deletions src/webpack-shell-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ const defaultOptions = {
onBuildExit: [],
dev: true,
verbose: false,
safe: false
safe: false,
quiet: false
};

export default class WebpackShellPlugin {
constructor(options) {
this.options = this.validateInput(this.mergeOptions(options, defaultOptions));
this.options = this.validateInput(
this.mergeOptions(options, defaultOptions)
);
}

puts(error, stdout, stderr) {
puts(error) {
if (error) {
throw error;
}
Expand Down Expand Up @@ -72,13 +75,23 @@ export default class WebpackShellPlugin {

compiler.plugin('compilation', (compilation) => {
if (this.options.verbose) {
console.log(`Report compilation: ${compilation}`);
console.warn(`WebpackShellPlugin [${new Date()}]: Verbose is being deprecated, please remove.`);
if (!this.options.quiet) {
console.log(`Report compilation: ${compilation}`);
//eslint-disable-next-line
console.warn(`WebpackShellPlugin [${new Date()}]: Verbose is being deprecated, please remove.`);
}
}
if (this.options.onBuildStart.length) {
console.log('Executing pre-build scripts');
for (let i = 0; i < this.options.onBuildStart.length; i++) {
this.handleScript(this.options.onBuildStart[i]);
if (!this.options.quiet) {
console.log('Executing pre-build scripts');
}
for (
let index = 0;
index < this.options.onBuildStart.length;
// eslint-disable-next-line
index += 1
) {
this.handleScript(this.options.onBuildStart[index]);
}
if (this.options.dev) {
this.options.onBuildStart = [];
Expand All @@ -88,9 +101,16 @@ export default class WebpackShellPlugin {

compiler.plugin('after-emit', (compilation, callback) => {
if (this.options.onBuildEnd.length) {
console.log('Executing post-build scripts');
for (let i = 0; i < this.options.onBuildEnd.length; i++) {
this.handleScript(this.options.onBuildEnd[i]);
if (!this.options.quiet) {
console.log('Executing post-build scripts');
}
for (
let index = 0;
index < this.options.onBuildEnd.length;
// eslint-disable-next-line
index += 1
) {
this.handleScript(this.options.onBuildEnd[index]);
}
if (this.options.dev) {
this.options.onBuildEnd = [];
Expand All @@ -101,9 +121,16 @@ export default class WebpackShellPlugin {

compiler.plugin('done', () => {
if (this.options.onBuildExit.length) {
console.log('Executing additional scripts before exit');
for (let i = 0; i < this.options.onBuildExit.length; i++) {
this.handleScript(this.options.onBuildExit[i]);
if (!this.options.quiet) {
console.log('Executing additional scripts before exit');
}
for (
let index = 0;
index < this.options.onBuildExit.length;
// eslint-disable-next-line
index += 1
) {
this.handleScript(this.options.onBuildExit[index]);
}
}
});
Expand Down