Skip to content

Commit 6d3267d

Browse files
authored
fix(server): Generate help message before using attempting to resolve any require statements (#1910)
The `requireOverride` resolves TSServer from the command line arguments. The `createLogger` import will end up executing this code. As a result, we need to parse and show the help message before the logger import or the --help option will fail due to a failure to resolve the TS dependency. fixes #1899
1 parent e251907 commit 6d3267d

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

server/src/server.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9+
// Parse command line arguments
10+
const options = parseCommandLine(process.argv);
11+
12+
if (options.help) {
13+
console.error(generateHelpMessage(process.argv));
14+
process.exit(0);
15+
}
16+
917
import {generateHelpMessage, parseCommandLine} from './cmdline_utils';
1018
import {createLogger} from './logger';
1119
import {ServerHost} from './server_host';
1220
import {Session} from './session';
1321
import {resolveNgLangSvc, resolveTsServer} from './version_provider';
1422

1523
function main() {
16-
// Parse command line arguments
17-
const options = parseCommandLine(process.argv);
18-
19-
if (options.help) {
20-
console.error(generateHelpMessage(process.argv));
21-
process.exit(0);
22-
}
23-
2424
// Create a logger that logs to file. OK to emit verbose entries.
2525
const logger = createLogger({
2626
logFile: options.logFile,

0 commit comments

Comments
 (0)