Skip to content

Commit ec3baa8

Browse files
authored
chore(deps): move devDependencies from packages to root (#1891)
1 parent 414a33e commit ec3baa8

File tree

8 files changed

+13
-20
lines changed

8 files changed

+13
-20
lines changed

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"@babel/preset-env": "^7.11.0",
6060
"@commitlint/cli": "^11.0.0",
6161
"@commitlint/config-lerna-scopes": "^11.0.0",
62+
"@types/cross-spawn": "^6.0.1",
6263
"@types/jest": "^25.1.4",
6364
"@types/node": "13.9.8",
6465
"@typescript-eslint/eslint-plugin": "^2.34.0",
@@ -91,6 +92,7 @@
9192
"typescript": "^3.9.7",
9293
"webpack": "^4.44.2",
9394
"webpack-bundle-analyzer": "^3.9.0",
95+
"webpack-dev-server": "3.10.3",
9496
"yeoman-test": "^2.7.0"
9597
}
9698
}

packages/package-utils/__tests__/index.test.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
'use strict';
22

3-
jest.mock('@webpack-cli/package-utils');
3+
jest.mock('../lib/packageUtils', () => {
4+
return {
5+
packageExists: jest.fn(),
6+
promptInstallation: jest.fn(),
7+
};
8+
});
49

5-
import { packageExists, promptInstallation } from '@webpack-cli/package-utils';
10+
import { packageExists, promptInstallation } from '../lib/packageUtils';
611
import { run } from '../../webpack-cli/lib/commands/resolveCommand';
712

813
describe('@webpack-cli/package-utils', () => {

packages/package-utils/package.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@
3939
"execa": "^4.0.0",
4040
"global-modules": "^2.0.0"
4141
},
42-
"devDependencies": {
43-
"@types/cross-spawn": "^6.0.1",
44-
"@webpack-cli/package-utils": "^1.0.1-rc.1"
45-
},
4642
"peerDependenciesMeta": {
4743
"webpack": {
4844
"optional": true

packages/serve/__tests__/startDevServer.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jest.mock('webpack-dev-server/lib/Server');
77
describe('startDevServer', () => {
88
// eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-extraneous-require
99
const webpack = require('webpack');
10-
// eslint-disable-next-line @typescript-eslint/no-var-requires
10+
// eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-extraneous-require
1111
const DevServer = require('webpack-dev-server/lib/Server');
1212

1313
beforeEach(() => {

packages/serve/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"access": "public"
1010
},
1111
"license": "MIT",
12-
"devDependencies": {
13-
"webpack-dev-server": "3.10.3"
14-
},
1512
"peerDependencies": {
1613
"webpack-cli": "4.x.x"
1714
},

packages/serve/src/parseArgs.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type ArgsType = {
2323
export default function parseArgs(cli: WebpackCLIType, args: string[]): ArgsType {
2424
let devServerFlags: object[];
2525
try {
26+
// eslint-disable-next-line node/no-extraneous-require
2627
devServerFlags = require('webpack-dev-server/bin/cli-flags').devServer;
2728
} catch (err) {
2829
throw new Error(`You need to install 'webpack-dev-server' for running 'webpack serve'.\n${err}`);

packages/serve/src/startDevServer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import mergeOptions from './mergeOptions';
1212
* @returns {Object[]} array of resulting servers
1313
*/
1414
export default function startDevServer(compiler, devServerArgs): object[] {
15-
// eslint-disable-next-line @typescript-eslint/no-var-requires
15+
// eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-extraneous-require
1616
const Server = require('webpack-dev-server/lib/Server');
1717
const cliOptions = createConfig(devServerArgs);
1818
const devServerOptions = getDevServerOptions(compiler);

yarn.lock

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2494,7 +2494,7 @@
24942494
chalk "^4.1.0"
24952495
rxjs ">=6.4.0"
24962496

2497-
"@types/yeoman-generator@*":
2497+
"@types/yeoman-generator@*", "@types/yeoman-generator@^4.11.2":
24982498
version "4.11.2"
24992499
resolved "https://registry.yarnpkg.com/@types/yeoman-generator/-/yeoman-generator-4.11.2.tgz#c46b294a46fc8b3a5c46dff8a8712eaad02a7665"
25002500
integrity sha512-9QYsdVTLlUHg+aiDT1uqWf63oQXedCT4ty5L4KC4nd8gsp1Ef9UdXxpcc4yBU9ciRf4DqE1pViqxc6LTSosdsg==
@@ -2506,14 +2506,6 @@
25062506
"@types/yeoman-environment" "*"
25072507
rxjs ">=6.4.0"
25082508

2509-
"@types/[email protected]", "@types/yeoman-generator@^3.1.4":
2510-
version "3.1.4"
2511-
resolved "https://registry.yarnpkg.com/@types/yeoman-generator/-/yeoman-generator-3.1.4.tgz#21d6599515d41447eb84e2bc45033f1a640bbaf2"
2512-
integrity sha512-5oG9Qlk119qSHQpSClGonDIs4djxZSPurtg6faHItjeg8cffhkKs4twVYE+Wa0crAKJZDOwSd/Vmc6BSqJtgMA==
2513-
dependencies:
2514-
"@types/inquirer" "*"
2515-
rxjs ">=6.4.0"
2516-
25172509
"@types/yeoman-test@^2.0.3":
25182510
version "2.0.4"
25192511
resolved "https://registry.yarnpkg.com/@types/yeoman-test/-/yeoman-test-2.0.4.tgz#4c85e8cf95490411351e1bad57d1a2d6e71a5300"

0 commit comments

Comments
 (0)