Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(serve): refactor code to be more concise #974

Merged
merged 5 commits into from Jul 6, 2019
Merged

chore(serve): refactor code to be more concise #974

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2e3e80
chore(serve): refactor code to be more concise
jamesgeorge007 Jun 26, 2019
0d9aa9a
fix: minor fix
jamesgeorge007 Jun 26, 2019
941da90
chore: include comments
jamesgeorge007 Jun 29, 2019
7553ae7
fix: update comments
jamesgeorge007 Jun 30, 2019
a30a027
fix: minor refactor
jamesgeorge007 Jun 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 20 additions & 18 deletions packages/serve/index.ts
View file
Open in desktop
Expand Up @@ -22,30 +22,32 @@ import { processPromise } from "@webpack-cli/utils/resolve-packages";
* @returns {Void}
*/

interface ConfigType {
installCmd: string;
dependency: string;
devDependency: string;
optionalDependency: string;
interface Commands {
dependency: string[];
devDependency: string[];
optionalDependency: string[];
}

const npmConfig: ConfigType = {
installCmd: "install",
dependency: "--save",
devDependency: "--save-dev",
optionalDependency: "--save-optional"
};
interface PackageManagerConfig {
[key: string]: Commands;
}

const yarnConfig: ConfigType = {
installCmd: "add",
dependency: " ",
devDependency: "--save",
optionalDependency: "--optional"
const pmConfig: PackageManagerConfig = {
npm: {
dependency: ["install", "--save"],
devDependency: ["install", "--save-dev"],
optionalDependency: ["install", "--save-optional"]
},
yarn: {
dependency: ["add"],
devDependency: ["add", "-D"],
optionalDependency: ["add", "--optional"]
}
};

const spawnWithArg = (pm: string, cmd: string): SpawnSyncReturns<Buffer> => {
const pmConfig: ConfigType = pm === "npm" ? npmConfig : yarnConfig;
const options: string[] = [pmConfig.installCmd, "webpack-dev-server", pmConfig[cmd]];
const [installCmd, ...flags] = pmConfig[pm][cmd];
const options: string[] = [installCmd, "webpack-dev-server", ...flags];
return spawn.sync(pm, options, { stdio: "inherit" });
};

Expand Down