@dotcom-tool-kit/serverless 3.4.3 → 3.5.0

package/lib/tasks/run.d.ts

@@ -1,5 +1,6 @@
 import { Task, TaskRunContext } from '@dotcom-tool-kit/base';
 import type ServerlessSchema from '../schema';
+import { ChildProcess } from 'child_process';
 import * as z from 'zod';
 declare const ServerlessRunSchema: z.ZodObject<{
     ports: z.ZodDefault<z.ZodArray<z.ZodNumber, "many">>;
@@ -16,6 +17,8 @@ export default class ServerlessRun extends Task<{
     task: typeof ServerlessRunSchema;
     plugin: typeof ServerlessSchema;
 }> {
+    child?: ChildProcess;
     run({ cwd, config }: TaskRunContext): Promise<void>;
+    stop(): Promise<void>;
 }
 //# sourceMappingURL=run.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/tasks/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,gBAAgB,MAAM,WAAW,CAAA;AAM7C,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,mBAAmB;;;;;;;;;EAYsB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,IAAI,MAAM,EAAE,CAAA;AAExC,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,IAAI,CAAC;IAC9C,IAAI,EAAE,OAAO,mBAAmB,CAAA;IAChC,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAChC,CAAC;IACM,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAiD1D"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/tasks/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,KAAK,gBAAgB,MAAM,WAAW,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAS,MAAM,eAAe,CAAA;AAKnD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,QAAA,MAAM,mBAAmB;;;;;;;;;EAYsB,CAAA;AAC/C,OAAO,EAAE,mBAAmB,IAAI,MAAM,EAAE,CAAA;AAExC,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,IAAI,CAAC;IAC9C,IAAI,EAAE,OAAO,mBAAmB,CAAA;IAChC,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAChC,CAAC;IACA,KAAK,CAAC,EAAE,YAAY,CAAA;IAEd,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDnD,IAAI;CAMX"}

package/lib/tasks/run.js

@@ -24,6 +24,7 @@ const ServerlessRunSchema = z
     .describe('Run serverless functions locally');
 exports.schema = ServerlessRunSchema;
 class ServerlessRun extends base_1.Task {
+    child;
     async run({ cwd, config }) {
         const { useDoppler, ports } = this.options;
         const { configPath } = this.pluginOptions;
@@ -41,7 +42,7 @@ class ServerlessRun extends base_1.Task {
         if (configPath) {
             args.push('--config', './serverless.yml');
         }
-        const child = (0, child_process_1.spawn)('serverless', args, {
+        this.child = (0, child_process_1.spawn)('serverless', args, {
             env: {
                 ...dopplerEnv,
                 PORT: port.toString(),
@@ -49,7 +50,7 @@ class ServerlessRun extends base_1.Task {
             },
             cwd
         });
-        (0, logger_1.hookFork)(this.logger, 'serverless', child);
+        (0, logger_1.hookFork)(this.logger, 'serverless', this.child);
         const unhook = (0, logger_1.hookConsole)(this.logger, 'wait-port');
         try {
             await (0, wait_port_1.default)({
@@ -61,5 +62,11 @@ class ServerlessRun extends base_1.Task {
             unhook();
         }
     }
+    async stop() {
+        if (this.child && (this.child.exitCode === null || !this.child.killed)) {
+            // SIGINT instead of SIGKILL so the process gets chance to exit gracefully
+            this.child.kill('SIGINT');
+        }
+    }
 }
 exports.default = ServerlessRun;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/serverless",
-  "version": "3.4.3",
+  "version": "3.5.0",
   "description": "a plugin to manage and deploy apps using AWS Serverless",
   "main": "lib",
   "scripts": {
@@ -25,7 +25,7 @@
     "serverless-offline": "12.x || 13.x"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "^1.2.3",
+    "@dotcom-tool-kit/base": "^1.3.0",
     "@dotcom-tool-kit/doppler": "^2.2.3",
     "@dotcom-tool-kit/error": "^4.1.1",
     "@dotcom-tool-kit/logger": "^4.2.2",