@dotcom-tool-kit/webpack 1.0.0-beta.9 → 1.0.2-beta.2

package/lib/index.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tasks = void 0;
 const tslib_1 = require("tslib");
-const development_1 = tslib_1.__importDefault(require("./tasks/development"));
-const production_1 = tslib_1.__importDefault(require("./tasks/production"));
+const development_1 = (0, tslib_1.__importDefault)(require("./tasks/development"));
+const production_1 = (0, tslib_1.__importDefault)(require("./tasks/production"));
 exports.tasks = [development_1.default, production_1.default];

package/lib/run-webpack.d.ts

@@ -1,6 +1,4 @@
-export declare type WebpackOptions = {
-    configPath?: string;
-    mode: 'production' | 'development';
-};
-export default function runWebpack(options: WebpackOptions): Promise<void>;
+import { Logger } from 'winston';
+import type { WebpackOptions } from '@dotcom-tool-kit/types/lib/schema/webpack';
+export default function runWebpack(logger: Logger, options: WebpackOptions): Promise<void>;
 //# sourceMappingURL=run-webpack.d.ts.map

package/lib/run-webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-webpack.d.ts","sourceRoot":"","sources":["../src/run-webpack.ts"],"names":[],"mappings":"AAIA,oBAAY,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,YAAY,GAAG,aAAa,CAAA;CACnC,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBzE"}
+{"version":3,"file":"run-webpack.d.ts","sourceRoot":"","sources":["../src/run-webpack.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAA;AAK/E,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CASzF"}

package/lib/run-webpack.js

@@ -1,22 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
+const logger_1 = require("@dotcom-tool-kit/logger");
 const webpackCLIPath = require.resolve('webpack-cli/bin/cli');
-function runWebpack(options) {
-    return new Promise((resolve, reject) => {
-        const child = child_process_1.fork(webpackCLIPath, [
-            'build',
-            `--mode=${options.mode}`,
-            options.configPath ? `--config=${options.configPath}` : ''
-        ]);
-        child.on('exit', (code) => {
-            if (code === 0) {
-                resolve();
-            }
-            else {
-                reject(new Error(`Webpack returned an error`));
-            }
-        });
-    });
+function runWebpack(logger, options) {
+    logger.info('starting Webpack...');
+    const args = ['build', '--color', `--mode=${options.mode}`];
+    if (options.configPath) {
+        args.push(`--config=${options.configPath}`);
+    }
+    const child = (0, child_process_1.fork)(webpackCLIPath, args, { silent: true });
+    (0, logger_1.hookFork)(logger, 'webpack', child);
+    return (0, logger_1.waitOnExit)('webpack', child);
 }
 exports.default = runWebpack;

package/lib/tasks/development.d.ts

@@ -1,6 +1,6 @@
-import { Task } from '@dotcom-tool-kit/task';
-import { WebpackOptions } from '../run-webpack';
-export default class WebpackDevelopment extends Task<WebpackOptions> {
+import { Task } from '@dotcom-tool-kit/types';
+import { WebpackSchema } from '@dotcom-tool-kit/types/lib/schema/webpack';
+export default class WebpackDevelopment extends Task<typeof WebpackSchema> {
     static description: string;
     run(): Promise<void>;
 }

package/lib/tasks/development.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"development.d.ts","sourceRoot":"","sources":["../../src/tasks/development.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAmB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,IAAI,CAAC,cAAc,CAAC;IAClE,MAAM,CAAC,WAAW,SAAkB;IAE9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAM3B"}
+{"version":3,"file":"development.d.ts","sourceRoot":"","sources":["../../src/tasks/development.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAA;AAGzE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,IAAI,CAAC,OAAO,aAAa,CAAC;IACxE,MAAM,CAAC,WAAW,SAAkB;IAE9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAM3B"}

package/lib/tasks/development.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const task_1 = require("@dotcom-tool-kit/task");
-const run_webpack_1 = tslib_1.__importDefault(require("../run-webpack"));
-class WebpackDevelopment extends task_1.Task {
+const types_1 = require("@dotcom-tool-kit/types");
+const run_webpack_1 = (0, tslib_1.__importDefault)(require("../run-webpack"));
+class WebpackDevelopment extends types_1.Task {
     async run() {
-        await run_webpack_1.default({
+        await (0, run_webpack_1.default)(this.logger, {
             ...this.options,
             mode: 'development'
         });

package/lib/tasks/production.d.ts

@@ -1,6 +1,6 @@
-import { Task } from '@dotcom-tool-kit/task';
-import { WebpackOptions } from '../run-webpack';
-export default class WebpackProduction extends Task<WebpackOptions> {
+import { Task } from '@dotcom-tool-kit/types';
+import { WebpackSchema } from '@dotcom-tool-kit/types/lib/schema/webpack';
+export default class WebpackProduction extends Task<typeof WebpackSchema> {
     static description: string;
     run(): Promise<void>;
 }

package/lib/tasks/production.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"production.d.ts","sourceRoot":"","sources":["../../src/tasks/production.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAmB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAE3D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,IAAI,CAAC,cAAc,CAAC;IACjE,MAAM,CAAC,WAAW,SAAkB;IAE9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAM3B"}
+{"version":3,"file":"production.d.ts","sourceRoot":"","sources":["../../src/tasks/production.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAA;AAGzE,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,IAAI,CAAC,OAAO,aAAa,CAAC;IACvE,MAAM,CAAC,WAAW,SAAkB;IAE9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAM3B"}

package/lib/tasks/production.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const task_1 = require("@dotcom-tool-kit/task");
-const run_webpack_1 = tslib_1.__importDefault(require("../run-webpack"));
-class WebpackProduction extends task_1.Task {
+const types_1 = require("@dotcom-tool-kit/types");
+const run_webpack_1 = (0, tslib_1.__importDefault)(require("../run-webpack"));
+class WebpackProduction extends types_1.Task {
     async run() {
-        await run_webpack_1.default({
+        await (0, run_webpack_1.default)(this.logger, {
             ...this.options,
             mode: 'production'
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/webpack",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.2-beta.2",
   "main": "lib",
   "description": "",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
@@ -8,30 +8,34 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/financial-times/dotcom-tool-kit.git",
-    "directory": "packages/webpack"
+    "directory": "plugins/webpack"
   },
-  "homepage": "https://github.com/financial-times/dotcom-tool-kit/main/packages/webpack",
+  "homepage": "https://github.com/financial-times/dotcom-tool-kit/main/plugins/webpack",
   "bugs": "https://github.com/financial-times/dotcom-tool-kit/issues",
   "keywords": [],
   "scripts": {
-    "test": "jest --silent"
+    "test": "cd ../../ ; npx jest --silent --projects plugins/webpack"
   },
   "dependencies": {
-    "@dotcom-tool-kit/task": "^1.0.0-beta.9",
+    "@dotcom-tool-kit/error": "^1.0.2-beta.2",
+    "@dotcom-tool-kit/logger": "^1.0.2-beta.2",
+    "@dotcom-tool-kit/types": "^1.0.2-beta.2",
     "webpack-cli": "^4.6.0"
   },
   "peerDependencies": {
     "webpack": "4.x.x || 5.x.x"
   },
   "devDependencies": {
-    "@jest/globals": "^26.6.2",
-    "jest": "^26.6.3",
-    "ts-jest": "^26.5.6",
+    "@jest/globals": "^27.4.6",
     "ts-node": "^10.0.0",
-    "webpack": "^4.42.1"
+    "webpack": "^4.42.1",
+    "winston": "^3.5.1"
   },
   "files": [
     "/lib",
     ".toolkitrc.yml"
-  ]
+  ],
+  "volta": {
+    "extends": "../../package.json"
+  }
 }