From 2971f62b3c660f8fff3de85694125876e3277085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sat, 7 Mar 2020 20:11:40 +0100 Subject: [PATCH 1/3] Cleanup build-javascript --- packages/gatsby/src/commands/build-javascript.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/gatsby/src/commands/build-javascript.ts b/packages/gatsby/src/commands/build-javascript.ts index 21bf971741ff4..e577c02ec2538 100644 --- a/packages/gatsby/src/commands/build-javascript.ts +++ b/packages/gatsby/src/commands/build-javascript.ts @@ -1,14 +1,16 @@ -import webpack from "webpack" +import { Span } from "opentracing" +import webpack, { Stats } from "webpack" + import webpackConfig from "../utils/webpack.config" + import { IProgram } from "./types" -import { Span } from "opentracing" import { reportWebpackWarnings } from "../utils/webpack-error-utils" export const buildProductionBundle = async ( program: IProgram, parentSpan: Span -): Promise => { +): Promise => { const { directory } = program const compilerConfig = await webpackConfig( From 22be04a328ca2c5f0aadeabe702f01a20ca763d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Sun, 8 Mar 2020 05:34:15 +0100 Subject: [PATCH 2/3] Update build-javascript.ts --- packages/gatsby/src/commands/build-javascript.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gatsby/src/commands/build-javascript.ts b/packages/gatsby/src/commands/build-javascript.ts index e577c02ec2538..93e9beffa6461 100644 --- a/packages/gatsby/src/commands/build-javascript.ts +++ b/packages/gatsby/src/commands/build-javascript.ts @@ -1,5 +1,5 @@ import { Span } from "opentracing" -import webpack, { Stats } from "webpack" +import webpack from "webpack" import webpackConfig from "../utils/webpack.config" @@ -10,7 +10,7 @@ import { reportWebpackWarnings } from "../utils/webpack-error-utils" export const buildProductionBundle = async ( program: IProgram, parentSpan: Span -): Promise => { +): Promise => { const { directory } = program const compilerConfig = await webpackConfig( From 4ab9154c5df4a6a8c7187fc099d00d29f910edb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 9 Mar 2020 17:22:51 +0100 Subject: [PATCH 3/3] Cleanup even more --- packages/gatsby/src/commands/build-javascript.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/gatsby/src/commands/build-javascript.ts b/packages/gatsby/src/commands/build-javascript.ts index 93e9beffa6461..fce9929715d5e 100644 --- a/packages/gatsby/src/commands/build-javascript.ts +++ b/packages/gatsby/src/commands/build-javascript.ts @@ -24,18 +24,16 @@ export const buildProductionBundle = async ( return new Promise((resolve, reject) => { webpack(compilerConfig).run((err, stats) => { if (err) { - reject(err) - return + return reject(err) } reportWebpackWarnings(stats) if (stats.hasErrors()) { - reject(stats.compilation.errors) - return + return reject(stats.compilation.errors) } - resolve(stats) + return resolve(stats) }) }) }