chore(util): single path util file

single path util file ISSUES CLOSED: webpack#805
anshumanv · Mar 30, 2019 · 96d325e · 96d325e
1 parent 26fbaae
commit 96d325e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 30 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 { webpackConfigPath } = require("../../packages/utils/webpack-config-path");
+const { webpackConfigPath } = require("@webpack-cli/utils/path-utils");
 
 module.exports = function(...args) {
 	const argv = args[1] || args[0];

diff --git a/packages/utils/__tests__/is-local-path.test.ts b/packages/utils/__tests__/is-local-path.test.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 import * as path from "path";
-import isLocalPath from "../is-local-path";
+import { isLocalPath } from "../path-utils";
 
 describe("is-local-path", () => {
 	it("returns true for paths beginning in the current directory", () => {

diff --git a/packages/utils/find-root.ts b/packages/utils/find-root.ts
diff --git a/packages/utils/is-local-path.ts b/packages/utils/is-local-path.ts
diff --git a/packages/utils/npm-packages-exists.ts b/packages/utils/npm-packages-exists.ts
@@ -1,7 +1,7 @@
 import chalk from "chalk";
 
-import isLocalPath from "./is-local-path";
 import npmExists from "./npm-exists";
+import { isLocalPath } from "./path-utils";
 import { resolvePackages } from "./resolve-packages";
 
 const WEBPACK_SCAFFOLD_PREFIX = "webpack-scaffold";

diff --git a/packages/utils/resolve-packages.ts b/packages/utils/resolve-packages.ts
@@ -1,10 +1,10 @@
 import chalk from "chalk";
 import * as path from "path";
 
-import isLocalPath from "./is-local-path";
 import modifyConfigHelper from "./modify-config-helper";
 import { getPathToGlobalPackages } from "./package-manager";
 import { spawnChild } from "./package-manager";
+import { isLocalPath } from "./path-utils";
 
 interface IChildProcess {
 	status: number;

diff --git a/packages/utils/scaffold.ts b/packages/utils/scaffold.ts
@@ -2,7 +2,7 @@ import chalk from "chalk";
 import * as j from "jscodeshift";
 import pEachSeries = require("p-each-series");
 import * as path from "path";
-import { findProjectRoot } from "./find-root";
+import { findProjectRoot } from "./path-utils";
 
 import { IError } from "../init/types";
 import { IConfig, ITransformConfig } from "./modify-config-helper";