chore(cli): remove findup-sync from package dir and move to utils

remove findup-sycn from package dir and move to utils ISSUES CLOSED: webpack#805
anshumanv · Mar 27, 2019 · 26fbaae · 26fbaae
1 parent 3e870e2
commit 26fbaae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 33 deletions.
diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js
@@ -6,7 +6,7 @@ const prepareOptions = require("./prepareOptions");
 const webpackConfigurationSchema = require("../config/webpackConfigurationSchema.json");
 const validateSchema = require("webpack").validateSchema;
 const WebpackOptionsValidationError = require("webpack").WebpackOptionsValidationError;
-const findup = require("findup-sync");
+const { webpackConfigPath } = require("../../packages/utils/webpack-config-path");
 
 module.exports = function(...args) {
 	const argv = args[1] || args[0];
@@ -70,8 +70,7 @@ module.exports = function(...args) {
 		configFiles = configArgList.map(mapConfigArg);
 	} else {
 		const defaultConfigFileNames = ["webpack.config", "webpackfile"].join("|");
-		const webpackConfigFileRegExp = `(${defaultConfigFileNames})(${extensions.join("|")})`;
-		const pathToWebpackConfig = findup(webpackConfigFileRegExp);
+		const pathToWebpackConfig = webpackConfigPath(extensions);
 
 		if (pathToWebpackConfig) {
 			const resolvedPath = path.resolve(pathToWebpackConfig);

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/utils/webpack-config-path.ts b/packages/utils/webpack-config-path.ts
@@ -0,0 +1,7 @@
+import * as findup from "findup-sync";
+
+export function webpackConfigPath(extensions: string[]): string {
+  const defaultConfigFileNames = ["webpack.config", "webpackfile"].join("|");
+  const webpackConfigFileRegExp = `(${defaultConfigFileNames})(${extensions.join("|")})`;
+  return findup(webpackConfigFileRegExp);
+}