@emarketeer/ts-microservice-commons 7.0.3 → 7.0.5

package/dist/lib/em-commons.js

@@ -3034,20 +3034,22 @@ var generateServerlessConfig = function () {
     var serviceConfig = YAML.parse(fs.readFileSync('./serverless.yml', 'utf8'));
     var commonConfig = YAML.parse(config);
     var generatedConfig = mergeWith(commonConfig, serviceConfig, mergeCustomizer);
-    fs.writeFileSync('./generated.serverless.yml', YAML.stringify(generatedConfig));
+    fs.writeFileSync('./generated.serverless.json', JSON.stringify(generatedConfig, null, 2));
 };
 var cleanup = function () {
-    if (fs.existsSync('./generated.serverless.yml')) {
-        fs.unlinkSync('./generated.serverless.yml');
+    if (fs.existsSync('./generated.serverless.json')) {
+        fs.unlinkSync('./generated.serverless.json');
     }
 };
+var escapeShellArg = function (arg) {
+    return "'" + arg.replace(/'/g, "'\\''") + "'";
+};
 var runCommand = function (command, additionalArgs) {
     if (additionalArgs === void 0) { additionalArgs = []; }
-    var commandParts = command.split(' ');
-    var program = commandParts[0];
-    var args = commandParts.slice(1).concat(additionalArgs);
-    console.log('running ', program, args.join(' '));
-    return crossSpawn.sync(program, args, { stdio: 'inherit' });
+    var escapedArgs = additionalArgs.map(escapeShellArg).join(' ');
+    var fullCommand = additionalArgs.length > 0 ? command + ' ' + escapedArgs : command;
+    console.log('running ', fullCommand);
+    return crossSpawn.sync(fullCommand, [], { stdio: 'inherit', shell: true });
 };
 
 process.on('unhandledRejection', function (err) {
@@ -3065,25 +3067,25 @@ try {
     }
     if (script === 'deploy') {
         generateServerlessConfig();
-        result = runCommand('npx cross-env AWS_SDK_LOAD_CONFIG=1 NODE_OPTIONS=--max_old_space_size=4096 npx serverless deploy --config generated.serverless.yml', scriptArgs);
+        result = runCommand('npx cross-env AWS_SDK_LOAD_CONFIG=1 NODE_OPTIONS=--max_old_space_size=4096 npx serverless deploy --config generated.serverless.json', scriptArgs);
     }
     if (script === 'dev') {
         generateServerlessConfig();
-        result = runCommand('npx cross-env AWS_SDK_LOAD_CONFIG=1 NODE_OPTIONS=--max_old_space_size=4096 npx serverless dev --config generated.serverless.yml', scriptArgs);
+        result = runCommand('npx cross-env AWS_SDK_LOAD_CONFIG=1 NODE_OPTIONS=--max_old_space_size=4096 npx serverless dev --config generated.serverless.json', scriptArgs);
     }
     if (script === 'invoke-local') {
         generateServerlessConfig();
-        result = runCommand('npx cross-env DISABLE_EPSAGON=TRUE NODE_OPTIONS=--max_old_space_size=4096 npx serverless invoke local --config generated.serverless.yml', scriptArgs);
+        result = runCommand('npx cross-env DISABLE_EPSAGON=TRUE NODE_OPTIONS=--max_old_space_size=4096 npx serverless invoke local --config generated.serverless.json', scriptArgs);
     }
     if (script === 'tsc') {
         result = runCommand('npx tsc --noEmit', scriptArgs);
     }
     if (script === 'jest') {
-        result = runCommand('npx cross-env NODE_OPTIONS=--max_old_space_size=4096 jest -w 4 --ci --forceExit --config node_modules/@emarketeer/ts-microservice-commons/dist/lib/jest.config.js', scriptArgs);
+        result = runCommand('npx cross-env NODE_OPTIONS="--max_old_space_size=4096 --experimental-vm-modules" jest -w 4 --ci --forceExit --config node_modules/@emarketeer/ts-microservice-commons/dist/lib/jest.config.js', scriptArgs);
     }
     if (!supportedCommands.includes(script)) {
         generateServerlessConfig();
-        result = runCommand('npx cross-env NODE_OPTIONS=--max_old_space_size=4096 npx serverless --config generated.serverless.yml', scriptArgs);
+        result = runCommand('npx cross-env NODE_OPTIONS=--max_old_space_size=4096 npx serverless --config generated.serverless.json', scriptArgs);
     }
 }
 finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emarketeer/ts-microservice-commons",
-  "version": "7.0.3",
+  "version": "7.0.5",
   "description": "",
   "keywords": [],
   "bin": {