fix: cleanup package-utils package

.eslintignore

@@ -7,7 +7,6 @@ packages/generators/lib
 packages/info/lib
 packages/init/lib
 packages/migrate/lib
-packages/package-utils/lib
 packages/serve/lib
 packages/utils/lib
 packages/webpack-scaffold/lib
@@ -28,4 +27,4 @@ test/loader/test-loader/examples/simple/webpack.config.js
 test/loader/test-loader/examples/simple/src/static-esm-module.js
 test/loader/test-loader/examples/simple/src/lazy-module.js
 test/loader/test-loader/examples/simple/example_dist/**
-lib/test/loader/error-test/src/index.d.ts
+lib/test/loader/error-test/src/index.d.ts

.gitignore

@@ -52,6 +52,8 @@ packages/**/*.map
 # build files
 packages/**/lib
 packages/**/yarn.lock
+!packages/webpack-cli/lib/utils/__tests__/**/yarn.lock
+!packages/webpack-cli/lib/utils/__tests__/**/package-lock.json
 !packages/webpack-cli/lib
 
 # test output files

packages/generators/__tests__/addon-generator.test.ts

@@ -1,12 +1,12 @@
-jest.setMock('@webpack-cli/package-utils', {
+jest.setMock('@webpack-cli/utils', {
     getPackageManager: jest.fn(),
 });
 
 import fs from 'fs';
 import path from 'path';
 import mkdirp from 'mkdirp';
 import rimraf from 'rimraf';
-import { getPackageManager } from '@webpack-cli/package-utils';
+import { getPackageManager } from 'webpack-cli/lib/utils/get-package-manager';
 import addonGenerator from '../src/addon-generator';
 
 // TODO: enable after jest release

packages/generators/package.json

@@ -14,7 +14,6 @@
     "templates"
   ],
   "dependencies": {
-    "@webpack-cli/package-utils": "^1.0.1-rc.1",
     "@webpack-cli/utils": "^1.0.1-rc.1",
     "@webpack-cli/webpack-scaffold": "^1.0.1-rc.1",
     "colorette": "^1.2.1",

packages/generators/src/addon-generator.ts

@@ -2,8 +2,8 @@ import logger from 'webpack-cli/lib/utils/logger';
 import mkdirp from 'mkdirp';
 import path from 'path';
 import Generator from 'yeoman-generator';
-import { getPackageManager } from '@webpack-cli/package-utils';
 import { generatorCopy, generatorCopyTpl } from '@webpack-cli/utils';
+import { getPackageManager } from 'webpack-cli/lib/utils/get-package-manager';
 
 /**
  * Creates a Yeoman Generator that generates a project conforming

packages/generators/src/init-generator.ts

@@ -2,7 +2,7 @@ import { blue, green, bold } from 'colorette';
 import logger from 'webpack-cli/lib/utils/logger';
 import logSymbols from 'log-symbols';
 import path from 'path';
-import { getPackageManager } from '@webpack-cli/package-utils';
+import { getPackageManager } from 'webpack-cli/lib/utils/get-package-manager';
 import { Confirm, Input, List } from '@webpack-cli/webpack-scaffold';
 
 import {

packages/generators/tsconfig.json

@@ -5,5 +5,5 @@
     "rootDir": "src"
   },
   "include": ["src"],
-  "references": [{ "path": "../package-utils" }, { "path": "../utils" }, { "path": "../webpack-scaffold" }]
+  "references": [{ "path": "../utils" }, { "path": "../webpack-scaffold" }]
 }