From 26fbaae78ffb30697ac91c33683514331889e2dd Mon Sep 17 00:00:00 2001
From: Anshuman Verma <anshu.av97@gmail.com>
Date: Wed, 27 Mar 2019 18:59:20 +0530
Subject: [PATCH] chore(cli): remove findup-sync from package dir and move to
 utils

remove findup-sycn from package dir and move to utils

ISSUES CLOSED: #805
---
 bin/utils/convert-argv.js             |  5 ++--
 package-lock.json                     | 41 +++++++--------------------
 packages/utils/webpack-config-path.ts |  7 +++++
 3 files changed, 20 insertions(+), 33 deletions(-)
 create mode 100644 packages/utils/webpack-config-path.ts

diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js
index d1c8d8d2f43..9c7537bb1dd 100644
--- 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
index 741b984d2a2..f7221d58954 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7461,8 +7461,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7483,14 +7482,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7505,20 +7502,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7635,8 +7629,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7648,7 +7641,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7663,7 +7655,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7671,14 +7662,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -7697,7 +7686,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7778,8 +7766,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7791,7 +7778,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7877,8 +7863,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7914,7 +7899,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7934,7 +7918,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7978,14 +7961,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
diff --git a/packages/utils/webpack-config-path.ts b/packages/utils/webpack-config-path.ts
new file mode 100644
index 00000000000..7189f8876b3
--- /dev/null
+++ 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);
+}