Skip to content

Commit 54d5837

Browse files
authored
chore: update dependencies (#625)
1 parent 4b003f4 commit 54d5837

29 files changed

Lines changed: 1834 additions & 1766 deletions

File tree

integration_tests/react_native_0_60x_multibundle/__tests__/multiBundle.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ function assertBundles(
168168
} else {
169169
expect(bundles.app1).toMatch('function asyncEval');
170170
expect(bundles.app1).toMatch(
171-
/return asyncEval\("" \+ chunkId \+ "\.app1\.(ios|android)\.bundle"\);/g
171+
/return asyncEval\(__webpack_require__\.p \+ "" \+ chunkId \+ "\.app1\.(ios|android)\.bundle"\);/g
172172
);
173173

174174
expect(bundles.app1Chunk).toMatch('this["webpackChunkapp1"]');

integration_tests/utils/runHaul.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
*/
44

55
import path from 'path';
6-
import {
7-
spawn,
8-
spawnSync,
9-
ChildProcessWithoutNullStreams,
10-
} from 'child_process';
6+
import { spawn, spawnSync, ChildProcess } from 'child_process';
117
import { ExecOutput } from './common';
128

139
const BIN_PATH = path.resolve(__dirname, '../../packages/haul-cli/bin/haul.js');
@@ -49,7 +45,7 @@ export function runHaul(
4945
dir: string,
5046
args?: Array<string>,
5147
options: RunHaulOptions = {}
52-
): ChildProcessWithoutNullStreams {
48+
): ChildProcess {
5349
let cwd = dir;
5450
const isRelative = cwd[0] !== '/';
5551

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"dependencies": {
1717
"chalk": "^2.4.2",
1818
"escape-string-regexp": "^2.0.0",
19-
"lerna": "^3.15.0",
19+
"lerna": "^3.16.4",
2020
"mkdirp": "^0.5.1",
21-
"node-fetch": "^2.3.0",
21+
"node-fetch": "^2.6.0",
2222
"rimraf": "^2.6.3",
2323
"strip-ansi": "^5.2.0",
2424
"traverse": "^0.6.6"
@@ -31,18 +31,18 @@
3131
"@babel/plugin-transform-react-jsx": "^7.3.0",
3232
"@babel/preset-env": "^7.4.3",
3333
"@babel/preset-typescript": "^7.3.3",
34-
"@callstack/eslint-config": "^4.2.0",
35-
"@types/jest": "^24.0.11",
36-
"@types/webpack": "^4.4.29",
34+
"@callstack/eslint-config": "^7.0.0",
35+
"@types/jest": "^24.0.17",
3736
"@types/mkdirp": "^0.5.2",
38-
"@types/node": "^11.13.4",
37+
"@types/node": "^10.14.15",
3938
"@types/rimraf": "^2.0.2",
40-
"@typescript-eslint/eslint-plugin": "^1.6.0",
41-
"@typescript-eslint/parser": "^1.6.0",
42-
"babel-eslint": "^10.0.1",
43-
"babel-jest": "^24.7.1",
44-
"eslint": "^5.16.0",
45-
"jest": "^24.7.1",
46-
"typescript": "^3.4.3"
39+
"@types/webpack": "^4.32.1",
40+
"@typescript-eslint/eslint-plugin": "^1.13.0",
41+
"@typescript-eslint/parser": "^1.13.0",
42+
"babel-eslint": "^10.0.2",
43+
"babel-jest": "^24.8.0",
44+
"eslint": "^6.1.0",
45+
"jest": "^24.8.0",
46+
"typescript": "^3.5.3"
4747
}
4848
}

packages/haul-basic-bundle-webpack-plugin/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
"license": "MIT",
1212
"bugs": "https://github.com/callstack/haul/issues",
1313
"peerDependencies": {
14-
"webpack": "^4.30.0",
15-
"webpack-sources": "^1.3.0"
14+
"webpack": "4.x",
15+
"webpack-sources": "1.x"
1616
},
1717
"dependencies": {
1818
"concat-with-sourcemaps": "^1.1.0"
1919
},
2020
"devDependencies": {
2121
"@types/webpack-sources": "^0.1.5",
22-
"webpack": "^4.30.0",
23-
"webpack-sources": "^1.3.0"
22+
"webpack": "^4.39.1",
23+
"webpack-sources": "^1.4.3"
2424
}
2525
}

packages/haul-cli/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"license": "MIT",
1919
"bugs": "https://github.com/callstack/haul/issues",
2020
"peerDependencies": {
21-
"react-native": "^0.59.0",
22-
"webpack": "^4.30.0"
21+
"react-native": ">=0.59.0",
22+
"webpack": "4.x"
2323
},
2424
"dependencies": {
2525
"@haul-bundler/core": "^0.10.0",
@@ -28,20 +28,20 @@
2828
"ansi-fragments": "^0.2.1",
2929
"dedent": "^0.7.0",
3030
"execa": "^2.0.3",
31-
"inquirer": "^6.3.1",
31+
"inquirer": "^6.5.0",
3232
"ora": "^3.4.0",
3333
"simple-progress-webpack-plugin": "^1.1.2",
3434
"which": "1.3.1",
3535
"ws": "^6.2.1",
36-
"yargs": "^13.2.2",
37-
"yargs-parser": "^13.1.0"
36+
"yargs": "^13.3.0",
37+
"yargs-parser": "^13.1.1"
3838
},
3939
"devDependencies": {
4040
"@types/dedent": "^0.7.0",
41-
"@types/inquirer": "^6.0.1",
41+
"@types/inquirer": "^6.5.0",
4242
"@types/which": "^1.3.1",
43-
"@types/ws": "^6.0.1",
44-
"@types/yargs": "^13.0.0",
45-
"webpack": "^4.30.0"
43+
"@types/ws": "^6.0.2",
44+
"@types/yargs": "^13.0.2",
45+
"webpack": "^4.39.1"
4646
}
4747
}

packages/haul-cli/src/commands/multiBundle.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ function build(webpackConfig: webpack.Configuration) {
142142
compiler.run((err, info) => {
143143
if (err || info.hasErrors()) {
144144
reject(
145-
new Error(err ? err : info.toJson({ errorDetails: true }).errors)
145+
err
146+
? err
147+
: new Error(info.toJson({ errorDetails: true }).errors.join('\n'))
146148
);
147149
} else {
148150
resolve(info);

packages/haul-cli/src/commands/start.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,9 @@ export default function startCommand(runtime: Runtime) {
109109
const { userChoice } = await inquirer.prompt({
110110
type: 'list',
111111
name: 'userChoice',
112-
message: `Port ${
113-
projectConfig.server.port
114-
} is already in use. What should we do?`,
112+
message: `Port ${projectConfig.server.port} is already in use. What should we do?`,
115113
choices: [
116-
`Kill process using port ${
117-
projectConfig.server.port
118-
} and start Haul`,
114+
`Kill process using port ${projectConfig.server.port} and start Haul`,
119115
'Quit',
120116
],
121117
});
@@ -133,9 +129,7 @@ export default function startCommand(runtime: Runtime) {
133129
runtime.logger.info(`Successfully killed processes.`);
134130
} else {
135131
runtime.logger.error(
136-
`Could not spawn process! Reason: Port ${
137-
projectConfig.server.port
138-
} already in use.`
132+
`Could not spawn process! Reason: Port ${projectConfig.server.port} already in use.`
139133
);
140134
runtime.complete(1);
141135
}

packages/haul-cli/src/messages/bundleMessages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function getBuildTime(stats: webpack.Stats) {
5353
const jsonStats = stats.toJson({ timings: true });
5454
return jsonStats.time
5555
? jsonStats.time
56-
: Math.max(...jsonStats.children.map(({ time }: any) => time));
56+
: Math.max(...jsonStats.children!.map(({ time }: any) => time));
5757
}
5858

5959
export function bundleBuilt(

packages/haul-cli/src/messages/multiBundleMessages.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function getBuildTime(stats: webpack.Stats) {
4646
const jsonStats = stats.toJson({ timings: true });
4747
return jsonStats.time
4848
? jsonStats.time
49-
: Math.max(...jsonStats.children.map(({ time }: any) => time));
49+
: Math.max(...jsonStats.children!.map(({ time }: any) => time));
5050
}
5151

5252
export function bundleBuilt(

packages/haul-core-legacy/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@
2626
"dependencies": {
2727
"mime-types": "^2.1.24",
2828
"mkdirp": "^0.5.1",
29-
"ws": "^2.2.2",
29+
"ws": "^6.2.1",
3030
"xpipe": "^1.0.5"
3131
},
3232
"devDependencies": {
33-
"jest": "^24.7.1",
34-
"snapshot-diff": "^0.3.0"
33+
"snapshot-diff": "^0.5.2"
3534
}
3635
}

0 commit comments

Comments
 (0)