Commit e5aaeba4 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch...

Merge branch '300379-qa-frontend-node-10-job-failed-in-incremental_webpack_compiler-js-11' into 'master'

Resolve "`qa-frontend-node:10` job failed in incremental_webpack_compiler.js:11"

See merge request gitlab-org/gitlab!52856
parents 4d60cf7f 1981c43c
...@@ -126,6 +126,8 @@ ...@@ -126,6 +126,8 @@
.frontend-dependency-patterns: &frontend-dependency-patterns .frontend-dependency-patterns: &frontend-dependency-patterns
- "{package.json,yarn.lock}" - "{package.json,yarn.lock}"
- "config/webpack.config.js"
- "config/helpers/*.js"
.frontend-patterns: &frontend-patterns .frontend-patterns: &frontend-patterns
- "{package.json,yarn.lock}" - "{package.json,yarn.lock}"
......
...@@ -8,7 +8,9 @@ const log = (msg, ...rest) => console.log(`IncrementalWebpackCompiler: ${msg}`, ...@@ -8,7 +8,9 @@ const log = (msg, ...rest) => console.log(`IncrementalWebpackCompiler: ${msg}`,
const TIMEOUT = 5000; const TIMEOUT = 5000;
class NoopCompiler { class NoopCompiler {
enabled = false; constructor() {
this.enabled = false;
}
filterEntryPoints(entryPoints) { filterEntryPoints(entryPoints) {
return entryPoints; return entryPoints;
...@@ -20,8 +22,6 @@ class NoopCompiler { ...@@ -20,8 +22,6 @@ class NoopCompiler {
} }
class IncrementalWebpackCompiler extends NoopCompiler { class IncrementalWebpackCompiler extends NoopCompiler {
enabled = true;
constructor(historyFilePath) { constructor(historyFilePath) {
super(); super();
this.history = {}; this.history = {};
...@@ -33,6 +33,7 @@ class IncrementalWebpackCompiler extends NoopCompiler { ...@@ -33,6 +33,7 @@ class IncrementalWebpackCompiler extends NoopCompiler {
]); ]);
this.historyFilePath = historyFilePath; this.historyFilePath = historyFilePath;
this.loadFromHistory(); this.loadFromHistory();
this.enabled = true;
} }
filterEntryPoints(entrypoints) { filterEntryPoints(entrypoints) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment