chore(linting): resolve linting

webpack · May 14, 2018 · 80c9e9a · 80c9e9a
1 parent 8f6f1db
commit 80c9e9a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -63,12 +63,12 @@ module.exports = {
 				"resolvePaths": ["./packages"],
 				"allowModules": [
 					"webpack",
-					"webpack-cli-generators",
-					"webpack-cli-init",
-					"webpack-cli-migrate",
-					"webpack-cli-utils",
-					"webpack-loader-generators",
-					"webpack-plugin-generators"
+					"@webpack-cli/generators",
+					"@webpack-cli/init",
+					"@webpack-cli/migrate",
+					"@webpack-cli/utils",
+					"@webpack-cli/generate-loader",
+					"@webpack-cli/generate-plugin"
 				]
 			}
 		],
@@ -92,11 +92,11 @@ module.exports = {
 			"error",
 			{
 				"allowModules": [					
-					"webpack-cli-migrate",
-					"webpack-cli-generators",
-					"webpack-cli-utils",
-					"webpack-loader-generators",
-					"webpack-plugin-generators"
+					"@webpack-cli/migrate",
+					"@webpack-cli/generators",
+					"@webpack-cli/utils",
+					"@webpack-cli/generate-loader",
+					"@webpack-cli/generate-plugin"
 				]
 			}
 		],

diff --git a/packages/generators/add-generator.js b/packages/generators/add-generator.js
@@ -7,7 +7,7 @@ const Input = require("webpack-addons").Input;
 
 const webpackSchema = require("webpack/schemas/WebpackOptions");
 const webpackDevServerSchema = require("webpack-dev-server/lib/optionsSchema.json");
-const PROP_TYPES = require("@webpack-utils/utils/prop-types");
+const PROP_TYPES = require("@webpack-cli/utils/prop-types");
 
 const getPackageManager = require("@webpack-cli/utils/package-manager")
 	.getPackageManager;

diff --git a/packages/generators/addon-generator.js b/packages/generators/addon-generator.js
@@ -1,7 +1,7 @@
 const path = require("path");
 const mkdirp = require("mkdirp");
 const Generator = require("yeoman-generator");
-const copyUtils = require("webpack-cli-utils/copy-utils");
+const copyUtils = require("@webpack-cli/utils/copy-utils");
 
 /**
  * Creates a Yeoman Generator that generates a project conforming

diff --git a/packages/generators/init-generator.js b/packages/generators/init-generator.js
@@ -8,7 +8,7 @@ const Input = require("webpack-addons").Input;
 const Confirm = require("webpack-addons").Confirm;
 const List = require("webpack-addons").List;
 
-const getPackageManager = require("webpack-cli-utils/package-manager")
+const getPackageManager = require("@webpack-cli/utils/package-manager")
 	.getPackageManager;
 
 const entryQuestions = require("./utils/entry");

diff --git a/packages/generators/package.json b/packages/generators/package.json
@@ -14,7 +14,8 @@
     "mkdirp": "^0.5.1",
     "webpack-addons": "^1.1.5",
     "webpack-dev-server": "^3.1.4",
-    "yeoman-generator": "^2.0.5"
+    "yeoman-generator": "^2.0.5",
+    "@webpack-cli/utils": "0.0.1"
   },
   "peerDependencies": {
     "webpack": "^4.0.0"