@dotcom-tool-kit/serverless 3.0.2 → 3.1.1

package/lib/tasks/deploy.d.ts

@@ -1,8 +1,8 @@
-import { Task } from '@dotcom-tool-kit/base';
+import { Task, TaskRunContext } from '@dotcom-tool-kit/base';
 import { ServerlessSchema } from '@dotcom-tool-kit/schemas/lib/plugins/serverless';
 export default class ServerlessDeploy extends Task<{
     plugin: typeof ServerlessSchema;
 }> {
-    run(): Promise<void>;
+    run({ cwd }: TaskRunContext): Promise<void>;
 }
 //# sourceMappingURL=deploy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/tasks/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAGlF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IAC/E,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B3B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/tasks/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAGlF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IAC/E,GAAG,CAAC,EAAC,GAAG,EAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CA2BhD"}

package/lib/tasks/deploy.js

@@ -4,7 +4,7 @@ const logger_1 = require("@dotcom-tool-kit/logger");
 const base_1 = require("@dotcom-tool-kit/base");
 const child_process_1 = require("child_process");
 class ServerlessDeploy extends base_1.Task {
-    async run() {
+    async run({ cwd }) {
         const { configPath, regions, systemCode } = this.pluginOptions;
         for (const region of regions) {
             this.logger.verbose('starting the child serverless process...');
@@ -21,7 +21,8 @@ class ServerlessDeploy extends base_1.Task {
                 args.push('--config', configPath);
             }
             const child = (0, child_process_1.spawn)('serverless', args, {
-                env: process.env
+                env: process.env,
+                cwd
             });
             (0, logger_1.hookFork)(this.logger, 'serverless', child);
             await (0, logger_1.waitOnExit)('serverless', child);

package/lib/tasks/provision.d.ts

@@ -1,8 +1,8 @@
-import { Task } from '@dotcom-tool-kit/base';
+import { Task, TaskRunContext } from '@dotcom-tool-kit/base';
 import { ServerlessSchema } from '@dotcom-tool-kit/schemas/lib/plugins/serverless';
 export default class ServerlessProvision extends Task<{
     plugin: typeof ServerlessSchema;
 }> {
-    run(): Promise<void>;
+    run({ cwd }: TaskRunContext): Promise<void>;
 }
 //# sourceMappingURL=provision.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../src/tasks/provision.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAIlF,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IAClF,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkD3B"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../src/tasks/provision.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAIlF,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IAClF,GAAG,CAAC,EAAC,GAAG,EAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmDhD"}

package/lib/tasks/provision.js

@@ -6,7 +6,7 @@ const base_1 = require("@dotcom-tool-kit/base");
 const child_process_1 = require("child_process");
 const state_1 = require("@dotcom-tool-kit/state");
 class ServerlessProvision extends base_1.Task {
-    async run() {
+    async run({ cwd }) {
         const { configPath, systemCode, regions } = this.pluginOptions;
         const ciState = (0, state_1.readState)('ci');
         if (!ciState) {
@@ -32,7 +32,8 @@ class ServerlessProvision extends base_1.Task {
             args.push('--config', './serverless.yml');
         }
         const child = (0, child_process_1.spawn)('serverless', args, {
-            env: process.env
+            env: process.env,
+            cwd
         });
         (0, logger_1.hookFork)(this.logger, 'serverless', child);
         await (0, logger_1.waitOnExit)('serverless', child);

package/lib/tasks/run.d.ts

@@ -1,10 +1,10 @@
-import { Task } from '@dotcom-tool-kit/base';
+import { Task, TaskRunContext } from '@dotcom-tool-kit/base';
 import { ServerlessSchema } from '@dotcom-tool-kit/schemas/lib/plugins/serverless';
 import { ServerlessRunSchema } from '@dotcom-tool-kit/schemas/src/tasks/serverless-run';
 export default class ServerlessRun extends Task<{
     task: typeof ServerlessRunSchema;
     plugin: typeof ServerlessSchema;
 }> {
-    run(): Promise<void>;
+    run({ cwd, config }: TaskRunContext): 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,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAA;AAOvF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,IAAI,CAAC;IAC9C,IAAI,EAAE,OAAO,mBAAmB,CAAA;IAChC,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAChC,CAAC;IACM,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4C3B"}
+{"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,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mDAAmD,CAAA;AAOvF,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;CA6C1D"}

package/lib/tasks/run.js

@@ -8,12 +8,12 @@ const logger_1 = require("@dotcom-tool-kit/logger");
 const get_port_1 = tslib_1.__importDefault(require("get-port"));
 const wait_port_1 = tslib_1.__importDefault(require("wait-port"));
 class ServerlessRun extends base_1.Task {
-    async run() {
+    async run({ cwd, config }) {
         const { useDoppler, ports } = this.options;
         const { configPath } = this.pluginOptions;
         let dopplerEnv = {};
         if (useDoppler) {
-            const doppler = new doppler_1.DopplerEnvVars(this.logger, 'dev');
+            const doppler = new doppler_1.DopplerEnvVars(this.logger, 'dev', config.pluginOptions['@dotcom-tool-kit/doppler']?.options);
             dopplerEnv = await doppler.get();
         }
         const port = Number(process.env.PORT) ||
@@ -30,7 +30,8 @@ class ServerlessRun extends base_1.Task {
                 ...dopplerEnv,
                 PORT: port.toString(),
                 ...process.env
-            }
+            },
+            cwd
         });
         (0, logger_1.hookFork)(this.logger, 'serverless', child);
         const unhook = (0, logger_1.hookConsole)(this.logger, 'wait-port');

package/lib/tasks/teardown.d.ts

@@ -1,8 +1,8 @@
-import { Task } from '@dotcom-tool-kit/base';
+import { Task, TaskRunContext } from '@dotcom-tool-kit/base';
 import { ServerlessSchema } from '@dotcom-tool-kit/schemas/lib/plugins/serverless';
 export default class ServerlessTeardown extends Task<{
     plugin: typeof ServerlessSchema;
 }> {
-    run(): Promise<void>;
+    run({ cwd }: TaskRunContext): Promise<void>;
 }
 //# sourceMappingURL=teardown.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../src/tasks/teardown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAIlF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IACjF,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkC3B"}
+{"version":3,"file":"teardown.d.ts","sourceRoot":"","sources":["../../src/tasks/teardown.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAA;AAIlF,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,IAAI,CAAC;IAAE,MAAM,EAAE,OAAO,gBAAgB,CAAA;CAAE,CAAC;IACjF,GAAG,CAAC,EAAC,GAAG,EAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmChD"}

package/lib/tasks/teardown.js

@@ -6,7 +6,7 @@ const base_1 = require("@dotcom-tool-kit/base");
 const state_1 = require("@dotcom-tool-kit/state");
 const child_process_1 = require("child_process");
 class ServerlessTeardown extends base_1.Task {
-    async run() {
+    async run({ cwd }) {
         const { configPath, regions, systemCode } = this.pluginOptions;
         const reviewState = (0, state_1.readState)('review');
         if (!reviewState || !reviewState.stageName) {
@@ -26,7 +26,8 @@ class ServerlessTeardown extends base_1.Task {
             args.push('--config', './serverless.yml');
         }
         const child = (0, child_process_1.spawn)('serverless', args, {
-            env: process.env
+            env: process.env,
+            cwd
         });
         (0, logger_1.hookFork)(this.logger, 'serverless', child);
         await (0, logger_1.waitOnExit)('serverless', child);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcom-tool-kit/serverless",
-  "version": "3.0.2",
+  "version": "3.1.1",
   "description": "a plugin to manage and deploy apps using AWS Serverless",
   "main": "lib",
   "scripts": {
@@ -25,10 +25,9 @@
     "serverless-offline": "^12.0.4"
   },
   "dependencies": {
-    "@dotcom-tool-kit/base": "^1.0.0",
-    "@dotcom-tool-kit/doppler": "^2.0.2",
-    "@dotcom-tool-kit/error": "^4.0.0",
-    "@dotcom-tool-kit/options": "^4.0.2",
+    "@dotcom-tool-kit/base": "^1.1.1",
+    "@dotcom-tool-kit/doppler": "^2.0.4",
+    "@dotcom-tool-kit/error": "^4.0.1",
     "@dotcom-tool-kit/state": "^4.0.0",
     "get-port": "^5.1.1",
     "tslib": "^2.3.1",
@@ -39,6 +38,6 @@
     "npm": "7.x || 8.x || 9.x || 10.x"
   },
   "devDependencies": {
-    "@dotcom-tool-kit/schemas": "^1.1.1"
+    "@dotcom-tool-kit/schemas": "^1.3.0"
   }
 }