@stackbit/cms-core 3.1.8 → 3.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,8 +1,20 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
- import { CommandRunner } from '@stackbit/types';
3
+ /// <reference types="node" />
4
+ /// <reference types="node" />
5
+ import childProcess from 'child_process';
6
+ import { CommandRunner, Logger } from '@stackbit/types';
7
+ type RunCommandOptions = {
8
+ cwd?: string;
9
+ shell?: boolean;
10
+ env?: NodeJS.ProcessEnv;
11
+ logger?: Logger;
12
+ uid?: number;
13
+ };
14
+ export declare function runCommand(command: string, args?: string[], options?: RunCommandOptions): childProcess.ChildProcessWithoutNullStreams;
4
15
  export declare function getCommandRunner(commandRunnerOptions: {
5
16
  env: NodeJS.ProcessEnv;
6
17
  uid?: number;
7
18
  }): CommandRunner;
19
+ export {};
8
20
  //# sourceMappingURL=run.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/services/run.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,aAAa,EAAqB,MAAM,iBAAiB,CAAC;AAGnE,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,aAAa,CAmB9G"}
1
+ {"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/services/run.ts"],"names":[],"mappings":";;;;AAAA,OAAO,YAAgD,MAAM,eAAe,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,EAAa,MAAM,iBAAiB,CAAC;AAGnE,KAAK,iBAAiB,GAAG;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,iBAAiB,+CAcvF;AAED,wBAAgB,gBAAgB,CAAC,oBAAoB,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,aAAa,CAY9G"}
@@ -3,26 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getCommandRunner = void 0;
6
+ exports.getCommandRunner = exports.runCommand = void 0;
7
7
  const child_process_1 = __importDefault(require("child_process"));
8
8
  const utils_1 = require("@stackbit/utils");
9
+ function runCommand(command, args, options) {
10
+ if (options?.logger) {
11
+ options.logger.info(`Running command '${command}${args ? ' ' : ''}${args?.join(' ')}'${options?.cwd ? ` in '${options.cwd}'` : ''} ...`);
12
+ }
13
+ const process = child_process_1.default.spawn(command, args, {
14
+ cwd: options?.cwd,
15
+ shell: options?.shell,
16
+ env: options?.env,
17
+ ...(options?.uid ? { uid: options.uid } : {})
18
+ });
19
+ if (options?.logger) {
20
+ (0, utils_1.logProcess)(process, 'run', options.logger);
21
+ }
22
+ return process;
23
+ }
24
+ exports.runCommand = runCommand;
9
25
  function getCommandRunner(commandRunnerOptions) {
10
26
  return (command, args, options) => {
11
- if (options?.logger) {
12
- options.logger.info(`Running command '${command}${args ? ' ' : ''}${args?.join(' ')}'${options?.cwd ? ` in '${options.cwd}'` : ''} ...`);
13
- }
14
- const process = child_process_1.default.spawn(command, args, {
15
- cwd: options?.cwd,
16
- shell: options?.shell,
27
+ const process = runCommand(command, args, {
28
+ ...options,
29
+ uid: options?.uid ?? commandRunnerOptions.uid,
17
30
  env: {
18
31
  ...commandRunnerOptions.env,
19
32
  ...options?.env
20
- },
21
- ...(commandRunnerOptions.uid ? { uid: commandRunnerOptions.uid } : {})
33
+ }
22
34
  });
23
- if (options?.logger) {
24
- (0, utils_1.logProcess)(process, 'run', options.logger);
25
- }
26
35
  return getProcessPromise(process);
27
36
  };
28
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/services/run.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/services/run.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stackbit/cms-core",
3
- "version": "3.1.8",
3
+ "version": "3.1.9",
4
4
  "description": "stackbit-dev",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -27,9 +27,9 @@
27
27
  "@iarna/toml": "^2.2.3",
28
28
  "@netlify/content-engine": "^1.4.0",
29
29
  "@netlify/sdk": "^1.17.2",
30
- "@stackbit/sdk": "2.1.5",
31
- "@stackbit/types": "2.1.2",
32
- "@stackbit/utils": "0.7.4",
30
+ "@stackbit/sdk": "2.1.6",
31
+ "@stackbit/types": "2.1.3",
32
+ "@stackbit/utils": "0.7.5",
33
33
  "chalk": "^4.0.1",
34
34
  "esm": "^3.2.25",
35
35
  "fs-extra": "^8.1.0",
@@ -44,5 +44,5 @@
44
44
  "slugify": "^1.6.5",
45
45
  "uuid": "^9.0.0"
46
46
  },
47
- "gitHead": "d3caf25a936b87557f1b8d5489192998c4886179"
47
+ "gitHead": "1f36e9510a47bb14a69d8e8d1f306c7b7ed7f006"
48
48
  }
@@ -2,23 +2,34 @@ import childProcess, { ChildProcessWithoutNullStreams } from 'child_process';
2
2
  import { CommandRunner, Logger, RunResult } from '@stackbit/types';
3
3
  import { logProcess } from '@stackbit/utils';
4
4
 
5
+ type RunCommandOptions = { cwd?: string; shell?: boolean; env?: NodeJS.ProcessEnv; logger?: Logger; uid?: number };
6
+
7
+ export function runCommand(command: string, args?: string[], options?: RunCommandOptions) {
8
+ if (options?.logger) {
9
+ options.logger.info(`Running command '${command}${args ? ' ' : ''}${args?.join(' ')}'${options?.cwd ? ` in '${options.cwd}'` : ''} ...`);
10
+ }
11
+ const process = childProcess.spawn(command, args, {
12
+ cwd: options?.cwd,
13
+ shell: options?.shell,
14
+ env: options?.env,
15
+ ...(options?.uid ? { uid: options.uid } : {})
16
+ });
17
+ if (options?.logger) {
18
+ logProcess(process, 'run', options.logger);
19
+ }
20
+ return process;
21
+ }
22
+
5
23
  export function getCommandRunner(commandRunnerOptions: { env: NodeJS.ProcessEnv; uid?: number }): CommandRunner {
6
- return (command: string, args?: string[], options?: { cwd?: string; shell?: boolean; env?: NodeJS.ProcessEnv; logger?: Logger }): Promise<RunResult> => {
7
- if (options?.logger) {
8
- options.logger.info(`Running command '${command}${args ? ' ' : ''}${args?.join(' ')}'${options?.cwd ? ` in '${options.cwd}'` : ''} ...`);
9
- }
10
- const process = childProcess.spawn(command, args, {
11
- cwd: options?.cwd,
12
- shell: options?.shell,
24
+ return (command: string, args?: string[], options?: RunCommandOptions): Promise<RunResult> => {
25
+ const process = runCommand(command, args, {
26
+ ...options,
27
+ uid: options?.uid ?? commandRunnerOptions.uid,
13
28
  env: {
14
29
  ...commandRunnerOptions.env,
15
30
  ...options?.env
16
- },
17
- ...(commandRunnerOptions.uid ? { uid: commandRunnerOptions.uid } : {})
31
+ }
18
32
  });
19
- if (options?.logger) {
20
- logProcess(process, 'run', options.logger);
21
- }
22
33
  return getProcessPromise(process);
23
34
  };
24
35
  }