Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.

Commit af036ec

Browse files
committed
fix(workers): generate context in worker threads
1 parent e835a65 commit af036ec

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/cleancss.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { join } from 'path';
22
import { BuildContext, TaskInfo } from './util/interfaces';
33
import { BuildError } from './util/errors';
4-
import { fillConfigDefaults, getUserConfigFile } from './util/config';
4+
import { fillConfigDefaults, generateContext, getUserConfigFile } from './util/config';
55
import { Logger } from './logger/logger';
66
import { readFileAsync, writeFileAsync } from './util/helpers';
77
import { runWorker } from './worker-client';
@@ -25,6 +25,7 @@ export function cleancss(context: BuildContext, configFile?: string) {
2525

2626
export function cleancssWorker(context: BuildContext, configFile: string): Promise<any> {
2727
return new Promise((resolve, reject) => {
28+
context = generateContext(context);
2829
const cleanCssConfig: CleanCssConfig = fillConfigDefaults(configFile, taskInfo.defaultConfigFile);
2930
const srcFile = join(context.buildDir, cleanCssConfig.sourceFileName);
3031
const destFile = join(context.buildDir, cleanCssConfig.destFileName);

src/closure.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { execSync } from 'child_process';
22
import { BuildContext, TaskInfo } from './util/interfaces';
3-
import { fillConfigDefaults, getUserConfigFile } from './util/config';
3+
import { fillConfigDefaults, generateContext, getUserConfigFile } from './util/config';
44
import { Logger } from './logger/logger';
55
import { runWorker } from './worker-client';
66

@@ -20,6 +20,7 @@ export function closure(context: BuildContext, configFile?: string) {
2020

2121
export function closureWorker(context: BuildContext, configFile: string): Promise<any> {
2222
return new Promise((resolve, reject) => {
23+
context = generateContext(context);
2324
Logger.warn('Closer Compiler unsupported at this time.');
2425
resolve();
2526
});

src/uglifyjs.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BuildContext, TaskInfo } from './util/interfaces';
22
import { BuildError } from './util/errors';
3-
import { fillConfigDefaults, getUserConfigFile } from './util/config';
3+
import { fillConfigDefaults, generateContext, getUserConfigFile } from './util/config';
44
import { join } from 'path';
55
import { Logger } from './logger/logger';
66
import { runWorker } from './worker-client';
@@ -27,6 +27,7 @@ export function uglifyjsWorker(context: BuildContext, configFile: string): Promi
2727
return new Promise((resolve, reject) => {
2828
try {
2929
// provide a full path for the config options
30+
context = generateContext(context);
3031
const uglifyJsConfig: UglifyJsConfig = fillConfigDefaults(configFile, taskInfo.defaultConfigFile);
3132
uglifyJsConfig.sourceFile = join(context.buildDir, uglifyJsConfig.sourceFile);
3233
uglifyJsConfig.inSourceMap = join(context.buildDir, uglifyJsConfig.inSourceMap);

0 commit comments

Comments
 (0)