Skip to content
This repository was archived by the owner on Dec 5, 2019. It is now read-only.

Commit aa7a9fc

Browse files
evilebottnawievilebottnawi
authoredDec 17, 2018
fix: catch worker-farm errors (#380)
·
v2.2.0v2.1.0
1 parent bf36e21 commit aa7a9fc

12 files changed

+1215
-1248
lines changed
 

‎package-lock.json

+735-1,111
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/TaskRunner.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ export default class TaskRunner {
4141
}
4242
: { maxConcurrentWorkers: this.maxConcurrentWorkers };
4343
this.workers = workerFarm(workerOptions, workerFile);
44-
this.boundWorkers = (options, cb) => this.workers(serialize(options), cb);
44+
this.boundWorkers = (options, cb) => {
45+
try {
46+
this.workers(serialize(options), cb);
47+
} catch (error) {
48+
// worker-farm can fail with ENOMEM or something else
49+
cb(error);
50+
}
51+
};
4552
} else {
4653
this.boundWorkers = (options, cb) => {
4754
try {

‎src/minify.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ const buildUglifyOptions = ({
2424
mangle == null
2525
? true
2626
: typeof mangle === 'boolean'
27-
? mangle
28-
: { ...mangle },
27+
? mangle
28+
: { ...mangle },
2929
output: {
3030
shebang: true,
3131
comments: false,

‎test/__snapshots__/cache-option.test.js.snap

+45-45
Large diffs are not rendered by default.

‎test/__snapshots__/exclude-option.test.js.snap

+12-12
Large diffs are not rendered by default.

‎test/__snapshots__/include-option.test.js.snap

+12-12
Large diffs are not rendered by default.

‎test/__snapshots__/parallel-option-failure.test.js.snap

+231
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\` and \`cache\` is \`true\`: errors 1`] = `
4+
Array [
5+
"Error: one.9cf5e356924aeff1105d.js from UglifyJs
6+
Error: worker-farm failed",
7+
]
8+
`;
9+
10+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\` and \`cache\` is \`true\`: one.9cf5e356924aeff1105d.js 1`] = `
11+
"/******/ (function(modules) { // webpackBootstrap
12+
/******/ // The module cache
13+
/******/ var installedModules = {};
14+
/******/
15+
/******/ // The require function
16+
/******/ function __webpack_require__(moduleId) {
17+
/******/
18+
/******/ // Check if module is in cache
19+
/******/ if(installedModules[moduleId]) {
20+
/******/ return installedModules[moduleId].exports;
21+
/******/ }
22+
/******/ // Create a new module (and put it into the cache)
23+
/******/ var module = installedModules[moduleId] = {
24+
/******/ i: moduleId,
25+
/******/ l: false,
26+
/******/ exports: {}
27+
/******/ };
28+
/******/
29+
/******/ // Execute the module function
30+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
31+
/******/
32+
/******/ // Flag the module as loaded
33+
/******/ module.l = true;
34+
/******/
35+
/******/ // Return the exports of the module
36+
/******/ return module.exports;
37+
/******/ }
38+
/******/
39+
/******/
40+
/******/ // expose the modules object (__webpack_modules__)
41+
/******/ __webpack_require__.m = modules;
42+
/******/
43+
/******/ // expose the module cache
44+
/******/ __webpack_require__.c = installedModules;
45+
/******/
46+
/******/ // define getter function for harmony exports
47+
/******/ __webpack_require__.d = function(exports, name, getter) {
48+
/******/ if(!__webpack_require__.o(exports, name)) {
49+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
50+
/******/ }
51+
/******/ };
52+
/******/
53+
/******/ // define __esModule on exports
54+
/******/ __webpack_require__.r = function(exports) {
55+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
56+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
57+
/******/ }
58+
/******/ Object.defineProperty(exports, '__esModule', { value: true });
59+
/******/ };
60+
/******/
61+
/******/ // create a fake namespace object
62+
/******/ // mode & 1: value is a module id, require it
63+
/******/ // mode & 2: merge all properties of value into the ns
64+
/******/ // mode & 4: return value when already ns object
65+
/******/ // mode & 8|1: behave like require
66+
/******/ __webpack_require__.t = function(value, mode) {
67+
/******/ if(mode & 1) value = __webpack_require__(value);
68+
/******/ if(mode & 8) return value;
69+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
70+
/******/ var ns = Object.create(null);
71+
/******/ __webpack_require__.r(ns);
72+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
73+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
74+
/******/ return ns;
75+
/******/ };
76+
/******/
77+
/******/ // getDefaultExport function for compatibility with non-harmony modules
78+
/******/ __webpack_require__.n = function(module) {
79+
/******/ var getter = module && module.__esModule ?
80+
/******/ function getDefault() { return module['default']; } :
81+
/******/ function getModuleExports() { return module; };
82+
/******/ __webpack_require__.d(getter, 'a', getter);
83+
/******/ return getter;
84+
/******/ };
85+
/******/
86+
/******/ // Object.prototype.hasOwnProperty.call
87+
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
88+
/******/
89+
/******/ // __webpack_public_path__
90+
/******/ __webpack_require__.p = \\"\\";
91+
/******/
92+
/******/
93+
/******/ // Load entry module and return exports
94+
/******/ return __webpack_require__(__webpack_require__.s = 0);
95+
/******/ })
96+
/************************************************************************/
97+
/******/ ([
98+
/* 0 */
99+
/***/ (function(module, exports) {
100+
101+
// foo
102+
/* @preserve*/
103+
// bar
104+
var a = 2 + 2;
105+
106+
module.exports = function Foo() {
107+
var b = 2 + 2;
108+
console.log(b + 1 + 2);
109+
};
110+
111+
112+
/***/ })
113+
/******/ ]);"
114+
`;
115+
116+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\` and \`cache\` is \`true\`: warnings 1`] = `Array []`;
117+
118+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\`: errors 1`] = `
119+
Array [
120+
"Error: one.9cf5e356924aeff1105d.js from UglifyJs
121+
Error: worker-farm failed",
122+
]
123+
`;
124+
125+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\`: one.9cf5e356924aeff1105d.js 1`] = `
126+
"/******/ (function(modules) { // webpackBootstrap
127+
/******/ // The module cache
128+
/******/ var installedModules = {};
129+
/******/
130+
/******/ // The require function
131+
/******/ function __webpack_require__(moduleId) {
132+
/******/
133+
/******/ // Check if module is in cache
134+
/******/ if(installedModules[moduleId]) {
135+
/******/ return installedModules[moduleId].exports;
136+
/******/ }
137+
/******/ // Create a new module (and put it into the cache)
138+
/******/ var module = installedModules[moduleId] = {
139+
/******/ i: moduleId,
140+
/******/ l: false,
141+
/******/ exports: {}
142+
/******/ };
143+
/******/
144+
/******/ // Execute the module function
145+
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
146+
/******/
147+
/******/ // Flag the module as loaded
148+
/******/ module.l = true;
149+
/******/
150+
/******/ // Return the exports of the module
151+
/******/ return module.exports;
152+
/******/ }
153+
/******/
154+
/******/
155+
/******/ // expose the modules object (__webpack_modules__)
156+
/******/ __webpack_require__.m = modules;
157+
/******/
158+
/******/ // expose the module cache
159+
/******/ __webpack_require__.c = installedModules;
160+
/******/
161+
/******/ // define getter function for harmony exports
162+
/******/ __webpack_require__.d = function(exports, name, getter) {
163+
/******/ if(!__webpack_require__.o(exports, name)) {
164+
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
165+
/******/ }
166+
/******/ };
167+
/******/
168+
/******/ // define __esModule on exports
169+
/******/ __webpack_require__.r = function(exports) {
170+
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
171+
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
172+
/******/ }
173+
/******/ Object.defineProperty(exports, '__esModule', { value: true });
174+
/******/ };
175+
/******/
176+
/******/ // create a fake namespace object
177+
/******/ // mode & 1: value is a module id, require it
178+
/******/ // mode & 2: merge all properties of value into the ns
179+
/******/ // mode & 4: return value when already ns object
180+
/******/ // mode & 8|1: behave like require
181+
/******/ __webpack_require__.t = function(value, mode) {
182+
/******/ if(mode & 1) value = __webpack_require__(value);
183+
/******/ if(mode & 8) return value;
184+
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
185+
/******/ var ns = Object.create(null);
186+
/******/ __webpack_require__.r(ns);
187+
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
188+
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
189+
/******/ return ns;
190+
/******/ };
191+
/******/
192+
/******/ // getDefaultExport function for compatibility with non-harmony modules
193+
/******/ __webpack_require__.n = function(module) {
194+
/******/ var getter = module && module.__esModule ?
195+
/******/ function getDefault() { return module['default']; } :
196+
/******/ function getModuleExports() { return module; };
197+
/******/ __webpack_require__.d(getter, 'a', getter);
198+
/******/ return getter;
199+
/******/ };
200+
/******/
201+
/******/ // Object.prototype.hasOwnProperty.call
202+
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
203+
/******/
204+
/******/ // __webpack_public_path__
205+
/******/ __webpack_require__.p = \\"\\";
206+
/******/
207+
/******/
208+
/******/ // Load entry module and return exports
209+
/******/ return __webpack_require__(__webpack_require__.s = 0);
210+
/******/ })
211+
/************************************************************************/
212+
/******/ ([
213+
/* 0 */
214+
/***/ (function(module, exports) {
215+
216+
// foo
217+
/* @preserve*/
218+
// bar
219+
var a = 2 + 2;
220+
221+
module.exports = function Foo() {
222+
var b = 2 + 2;
223+
console.log(b + 1 + 2);
224+
};
225+
226+
227+
/***/ })
228+
/******/ ]);"
229+
`;
230+
231+
exports[`when applied with \`parallel\` option matches snapshot for errors into \`worker-farm\`: warnings 1`] = `Array []`;

‎test/__snapshots__/parallel-option.test.js.snap

+9-9
Large diffs are not rendered by default.

‎test/__snapshots__/test-option.test.js.snap

+29-29
Large diffs are not rendered by default.

‎test/cache-option.test.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ describe('when applied with `cache` option', () => {
3030
});
3131

3232
afterEach(() =>
33-
Promise.all([cacache.rm.all(cacheDir), cacache.rm.all(otherCacheDir)]));
33+
Promise.all([cacache.rm.all(cacheDir), cacache.rm.all(otherCacheDir)])
34+
);
3435

3536
it('matches snapshot for `false` value', () => {
3637
new UglifyJsPlugin({ cache: false }).apply(compiler);

‎test/parallel-option-failure.test.js

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
import os from 'os';
2+
3+
import cacache from 'cacache';
4+
import workerFarm from 'worker-farm';
5+
import findCacheDir from 'find-cache-dir';
6+
7+
import UglifyJsPlugin from '../src/index';
8+
9+
import { createCompiler, compile, cleanErrorStack } from './helpers';
10+
11+
const cacheDir = findCacheDir({ name: 'uglifyjs-webpack-plugin' });
12+
13+
// Based on https://github.com/facebook/jest/blob/edde20f75665c2b1e3c8937f758902b5cf28a7b4/packages/jest-runner/src/__tests__/test_runner.test.js
14+
let workerFarmMock;
15+
16+
jest.mock('os', () => {
17+
const actualOs = require.requireActual('os');
18+
19+
actualOs.cpus = jest.fn(() => {
20+
return { length: 4 };
21+
});
22+
23+
return actualOs;
24+
});
25+
26+
jest.mock('worker-farm', () => {
27+
const mock = jest.fn(
28+
() =>
29+
(workerFarmMock = jest.fn(() => {
30+
throw new Error('worker-farm failed');
31+
}))
32+
);
33+
34+
mock.end = jest.fn();
35+
36+
return mock;
37+
});
38+
39+
describe('when applied with `parallel` option', () => {
40+
let compiler;
41+
42+
beforeEach(() => {
43+
os.cpus.mockClear();
44+
workerFarm.mockClear();
45+
workerFarm.end.mockClear();
46+
47+
compiler = createCompiler({
48+
entry: {
49+
one: `${__dirname}/fixtures/entry.js`,
50+
},
51+
});
52+
53+
return cacache.rm.all(cacheDir);
54+
});
55+
56+
it('matches snapshot for errors into `worker-farm`', () => {
57+
new UglifyJsPlugin({ parallel: true, cache: false }).apply(compiler);
58+
59+
return compile(compiler).then((stats) => {
60+
const errors = stats.compilation.errors.map(cleanErrorStack);
61+
const warnings = stats.compilation.warnings.map(cleanErrorStack);
62+
63+
expect(workerFarm.mock.calls.length).toBe(1);
64+
expect(workerFarmMock.mock.calls.length).toBe(
65+
Object.keys(stats.compilation.assets).length
66+
);
67+
expect(workerFarm.end.mock.calls.length).toBe(1);
68+
expect(errors).toMatchSnapshot('errors');
69+
expect(warnings).toMatchSnapshot('warnings');
70+
71+
for (const file in stats.compilation.assets) {
72+
if (
73+
Object.prototype.hasOwnProperty.call(stats.compilation.assets, file)
74+
) {
75+
expect(stats.compilation.assets[file].source()).toMatchSnapshot(file);
76+
}
77+
}
78+
});
79+
});
80+
81+
it('matches snapshot for errors into `worker-farm` and `cache` is `true`', () => {
82+
new UglifyJsPlugin({ parallel: true, cache: true }).apply(compiler);
83+
84+
return compile(compiler).then((stats) => {
85+
const errors = stats.compilation.errors.map(cleanErrorStack);
86+
const warnings = stats.compilation.warnings.map(cleanErrorStack);
87+
88+
expect(workerFarm.mock.calls.length).toBe(1);
89+
expect(workerFarmMock.mock.calls.length).toBe(
90+
Object.keys(stats.compilation.assets).length
91+
);
92+
expect(workerFarm.end.mock.calls.length).toBe(1);
93+
expect(errors).toMatchSnapshot('errors');
94+
expect(warnings).toMatchSnapshot('warnings');
95+
96+
for (const file in stats.compilation.assets) {
97+
if (
98+
Object.prototype.hasOwnProperty.call(stats.compilation.assets, file)
99+
) {
100+
expect(stats.compilation.assets[file].source()).toMatchSnapshot(file);
101+
}
102+
}
103+
});
104+
});
105+
});

‎test/parallel-option.test.js

+25-26
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ import UglifyJsPlugin from '../src/index';
66

77
import { createCompiler, compile, cleanErrorStack } from './helpers';
88

9+
jest.mock('os', () => {
10+
const actualOs = require.requireActual('os');
11+
12+
actualOs.cpus = jest.fn(() => {
13+
return { length: 4 };
14+
});
15+
16+
return actualOs;
17+
});
18+
919
// Based on https://github.com/facebook/jest/blob/edde20f75665c2b1e3c8937f758902b5cf28a7b4/packages/jest-runner/src/__tests__/test_runner.test.js
1020
let workerFarmMock;
1121

@@ -25,6 +35,7 @@ describe('when applied with `parallel` option', () => {
2535
let compiler;
2636

2737
beforeEach(() => {
38+
os.cpus.mockClear();
2839
workerFarm.mockClear();
2940
workerFarm.end.mockClear();
3041

@@ -68,20 +79,14 @@ describe('when applied with `parallel` option', () => {
6879
const errors = stats.compilation.errors.map(cleanErrorStack);
6980
const warnings = stats.compilation.warnings.map(cleanErrorStack);
7081

71-
const cpus = os.cpus() || { length: 1 };
72-
const maxConcurrentWorkers = cpus.length - 1;
73-
74-
if (maxConcurrentWorkers > 1) {
75-
expect(workerFarm.mock.calls.length).toBe(1);
76-
expect(workerFarm.mock.calls[0][0].maxConcurrentWorkers).toBe(
77-
os.cpus().length - 1
78-
);
79-
expect(workerFarmMock.mock.calls.length).toBe(
80-
Object.keys(stats.compilation.assets).length
81-
);
82-
expect(workerFarm.end.mock.calls.length).toBe(1);
83-
}
84-
82+
expect(workerFarm.mock.calls.length).toBe(1);
83+
expect(workerFarm.mock.calls[0][0].maxConcurrentWorkers).toBe(
84+
os.cpus().length - 1
85+
);
86+
expect(workerFarmMock.mock.calls.length).toBe(
87+
Object.keys(stats.compilation.assets).length
88+
);
89+
expect(workerFarm.end.mock.calls.length).toBe(1);
8590
expect(errors).toMatchSnapshot('errors');
8691
expect(warnings).toMatchSnapshot('warnings');
8792

@@ -102,18 +107,12 @@ describe('when applied with `parallel` option', () => {
102107
const errors = stats.compilation.errors.map(cleanErrorStack);
103108
const warnings = stats.compilation.warnings.map(cleanErrorStack);
104109

105-
const cpus = os.cpus() || { length: 1 };
106-
const maxConcurrentWorkers = cpus.length - 1;
107-
108-
if (maxConcurrentWorkers > 1) {
109-
expect(workerFarm.mock.calls.length).toBe(1);
110-
expect(workerFarm.mock.calls[0][0].maxConcurrentWorkers).toBe(2);
111-
expect(workerFarmMock.mock.calls.length).toBe(
112-
Object.keys(stats.compilation.assets).length
113-
);
114-
expect(workerFarm.end.mock.calls.length).toBe(1);
115-
}
116-
110+
expect(workerFarm.mock.calls.length).toBe(1);
111+
expect(workerFarm.mock.calls[0][0].maxConcurrentWorkers).toBe(2);
112+
expect(workerFarmMock.mock.calls.length).toBe(
113+
Object.keys(stats.compilation.assets).length
114+
);
115+
expect(workerFarm.end.mock.calls.length).toBe(1);
117116
expect(errors).toMatchSnapshot('errors');
118117
expect(warnings).toMatchSnapshot('warnings');
119118

0 commit comments

Comments
 (0)
This repository has been archived.