Skip to content

Commit 295ccc3

Browse files
authored
Merge branch 'master' into issue_40_allow_delaying_service_start
2 parents 053f218 + 256eb96 commit 295ccc3

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

lib/index.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,17 @@ ForkTsCheckerWebpackPlugin.prototype.spawnService = function () {
244244
[],
245245
{
246246
execArgv: this.workersNumber > 1 ? [] : ['--max-old-space-size=' + this.memoryLimit],
247-
env: {
248-
TSCONFIG: this.tsconfigPath,
249-
TSLINT: this.tslintPath || '',
250-
WATCH: this.isWatching ? this.watchPaths.join('|') : '',
251-
WORK_DIVISION: Math.max(1, this.workersNumber),
252-
MEMORY_LIMIT: this.memoryLimit
253-
},
247+
env: Object.assign(
248+
{},
249+
process.env,
250+
{
251+
TSCONFIG: this.tsconfigPath,
252+
TSLINT: this.tslintPath || '',
253+
WATCH: this.isWatching ? this.watchPaths.join('|') : '',
254+
WORK_DIVISION: Math.max(1, this.workersNumber),
255+
MEMORY_LIMIT: this.memoryLimit
256+
}
257+
),
254258
stdio: ['inherit', 'inherit', 'inherit', 'ipc']
255259
}
256260
);

0 commit comments

Comments
 (0)