Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions packages/serve/__tests__/createConfig.test.ts

This file was deleted.

29 changes: 0 additions & 29 deletions packages/serve/src/createConfig.ts

This file was deleted.

4 changes: 1 addition & 3 deletions packages/serve/src/startDevServer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { utils } from 'webpack-cli';

import createConfig from './createConfig';
import getDevServerOptions from './getDevServerOptions';
import mergeOptions from './mergeOptions';

Expand All @@ -15,7 +14,7 @@ const { logger } = utils;
*
* @returns {Object[]} array of resulting servers
*/
export default function startDevServer(compiler, devServerArgs): object[] {
export default function startDevServer(compiler, cliOptions): object[] {
let isDevServer4 = false,
devServerVersion,
Server;
Expand All @@ -30,7 +29,6 @@ export default function startDevServer(compiler, devServerArgs): object[] {
}
isDevServer4 = devServerVersion.startsWith('4');

const cliOptions = createConfig(devServerArgs, isDevServer4);
const devServerOptions = getDevServerOptions(compiler);

const servers = [];
Expand Down
20 changes: 20 additions & 0 deletions packages/webpack-cli/__tests__/arg-parser.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ const basicOptions = [
multiple: true,
description: 'multi flag',
},
{
name: 'processor-flag',
usage: '--processor-flag',
type: Boolean,
description: 'flag with processor',
processor(opts) {
opts.processed = opts.processorFlag;
delete opts.processorFlag;
},
},
];

const helpAndVersionOptions = basicOptions.slice(0);
Expand Down Expand Up @@ -421,4 +431,14 @@ describe('arg-parser', () => {
});
expect(warnMock.mock.calls.length).toEqual(0);
});

it('parses --processor-flag', () => {
const res = argParser(basicOptions, ['--processor-flag'], true);
expect(res.unknownArgs.length).toEqual(0);
expect(res.opts).toEqual({
processed: true,
stringFlagWithDefault: 'default-value',
});
expect(warnMock.mock.calls.length).toEqual(0);
});
});
12 changes: 12 additions & 0 deletions packages/webpack-cli/lib/utils/arg-parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const argParser = (options, args, argsOnly = false, name = '') => {
}

const parser = new commander.Command();
const processors = {};

// Set parser name
parser.name(name);
Expand Down Expand Up @@ -151,6 +152,15 @@ const argParser = (options, args, argsOnly = false, name = '') => {
parserInstance.option(negatedFlag, `negates ${option.name}`).action(() => {});
}

if (option.processor) {
// camel-case
const attributeName = option.name.split('-').reduce((str, word) => {
return str + word[0].toUpperCase() + word.slice(1);
});

processors[attributeName] = option.processor;
}

return parserInstance;
}, parser);

Expand Down Expand Up @@ -192,6 +202,8 @@ const argParser = (options, args, argsOnly = false, name = '') => {
Object.keys(opts).forEach((key) => {
if (opts[key] === undefined) {
delete opts[key];
} else if (processors[key]) {
processors[key](opts);
}
});

Expand Down