Merge pull request #236 from pharindoko/fix/222-cors-issue

Fix/222 cors issue

Author: pharindoko

package-lock.json

@@ -20,25 +20,25 @@
   "homepage": "https://github.com/pharindoko/json-serverless.git#readme",
   "devDependencies": {
     "@semantic-release/changelog": "3.0.6",
-    "@semantic-release/git": "7.0.18",
+    "@semantic-release/git": "8.0.0",
     "@types/aws-lambda": "8.10.39",
     "@types/dotenv": "6.1.1",
     "@types/express": "4.17.2",
-    "@types/jest": "24.0.25",
+    "@types/jest": "24.9.0",
     "@types/json-server": "0.14.2",
     "@types/lodash": "4.14.149",
     "@types/lowdb": "1.0.9",
     "@types/node": "10.14.16",
-    "@types/pino": "5.15.1",
+    "@types/pino": "5.15.3",
     "@types/supertest": "2.0.8",
     "@types/swagger-schema-official": "2.0.20",
     "@types/swagger-ui-express": "4.1.1",
     "copy-webpack-plugin": "5.1.1",
     "cz-conventional-changelog": "3.0.2",
     "eslint": "6.8.0",
     "eslint-config-airbnb-base": "14.0.0",
-    "eslint-plugin-import": "2.19.1",
-    "express-swagger-generator": "1.1.15",
+    "eslint-plugin-import": "2.20.0",
+    "express-swagger-generator": "1.1.17",
     "gts": "1.1.2",
     "jest": "24.9.0",
     "lerna": "3.20.2",
@@ -48,10 +48,10 @@
     "pino-pretty": "3.5.0",
     "serverless-offline": "5.12.1",
     "serverless-webpack": "5.3.1",
-    "terser-webpack-plugin": "2.3.1",
-    "ts-jest": "24.2.0",
+    "terser-webpack-plugin": "2.3.2",
+    "ts-jest": "24.3.0",
     "ts-loader": "6.2.1",
-    "typescript": "3.7.4",
+    "typescript": "3.7.5",
     "webpack": "4.41.5",
     "webpack-cli": "3.3.10",
     "webpack-node-externals": "1.7.2"

package.json

@@ -20,7 +20,7 @@
     "copy-webpack-plugin": "^5.1.1",
     "express": "^4.17.1",
     "figlet": "^1.2.4",
-    "globby": "^10.0.1",
+    "globby": "^11.0.0",
     "inquirer": "^7.0.1",
     "json-serverless-lib": "^1.5.16",
     "listr": "^0.14.3",
@@ -31,7 +31,7 @@
     "serverless": "^1.60.4",
     "serverless-http": "^2.3.0",
     "serverless-webpack": "^5.3.1",
-    "terser-webpack-plugin": "2.3.1",
+    "terser-webpack-plugin": "2.3.2",
     "ts-loader": "^6.2.1",
     "tslib": "^1.10.0",
     "typescript": "^3.7.4",
@@ -43,7 +43,7 @@
     "@oclif/dev-cli": "1.22.2",
     "@types/listr": "0.14.2",
     "@types/node": "10.17.13",
-    "ts-node": "8.5.4"
+    "ts-node": "8.6.2"
   },
   "engines": {
     "node": ">=8.0.0"

packages/cli/package-lock.json

@@ -8,7 +8,7 @@ import cli from 'cli-ux';
 import { Helpers } from '../actions/helpers';
 import { AWSActions } from '../actions/aws-actions';
 import { ServerlessConfig } from '../classes/serverlessconfig';
-import chalk from 'chalk'
+import chalk from 'chalk';
 export class CreateStackCommand extends Command {
   static description = 'describe the command here';
 
@@ -58,26 +58,33 @@ export class CreateStackCommand extends Command {
     await Helpers.generateLogo('json-serverless');
     this.log();
     const { args, flags } = this.parse(CreateStackCommand);
-    cli.action.start(`${chalk.blueBright('Check AWS Identity')}`, `${chalk.blueBright('initializing')}`, { stdout: true });
+    cli.action.start(
+      `${chalk.blueBright('Check AWS Identity')}`,
+      `${chalk.blueBright('initializing')}`,
+      { stdout: true }
+    );
     try {
       const identity = await AWSActions.checkValidAWSIdentity();
       this.log(`${chalk.green('AWS Account: ' + identity.Account)}`);
     } catch (error) {
-
       this.error(`${chalk.red(error.message)}`);
     }
     cli.action.stop();
     this.log();
- 
 
-    const stackName = await cli.prompt(`${chalk.magenta('What is the name of the api ?')}`);
+    const stackName = await cli.prompt(
+      `${chalk.magenta('What is the name of the api ?')}`
+    );
     this.log();
     const region = await this.getRegion();
     let filePath = path.normalize(args.file);
     const templateFolder = path.normalize(this.config.root + '/template');
     const stackFolder = path.normalize(process.cwd() + '/' + stackName);
     this.log();
-    this.log('New stack template folder will be created under path: ' + `${chalk.blueBright.bold.underline(stackFolder)}`);
+    this.log(
+      'New stack template folder will be created under path: ' +
+        `${chalk.blueBright.bold.underline(stackFolder)}`
+    );
     this.log();
     await cli.confirm(`${chalk.magenta('Continue ? y/n')}`);
     this.log();
@@ -109,7 +116,7 @@ export class CreateStackCommand extends Command {
           appconfig.readOnly = flags.readonly;
           appconfig.enableSwagger = flags.swagger;
           appconfig.stackName = stackName;
-          Helpers.createDir(stackFolder + "/config");
+          Helpers.createDir(stackFolder + '/config');
           fs.writeFileSync(
             path.normalize(stackFolder + '/config/appconfig.json'),
             JSON.stringify(appconfig, null, 2),
@@ -123,7 +130,7 @@ export class CreateStackCommand extends Command {
           const serverlessConfig = new ServerlessConfig();
           serverlessConfig.awsRegion = region;
           serverlessConfig.stage = args.stage;
-          Helpers.createDir(stackFolder + "/config");
+          Helpers.createDir(stackFolder + '/config');
           fs.writeFileSync(
             path.normalize(stackFolder + '/config/serverlessconfig.json'),
             JSON.stringify(serverlessConfig, null, 2),
@@ -133,7 +140,7 @@ export class CreateStackCommand extends Command {
       },
       {
         title: 'Install Dependencies',
-        task: async (task) => {
+        task: async task => {
           task.output = 'INSTALL DEPENDENCIES';
           await Helpers.executeChildProcess(
             'npm i',
@@ -148,7 +155,7 @@ export class CreateStackCommand extends Command {
         title: 'Deploy Stack on AWS',
         task: async () => {
           await Helpers.executeChildProcess(
-            'sls deploy',
+            'node_modules/serverless/bin/serverless deploy',
             {
               cwd: stackFolder,
             },
@@ -159,7 +166,10 @@ export class CreateStackCommand extends Command {
     ]);
     try {
       await tasks.run();
-      await Helpers.executeChildProcess('sls info', { cwd: stackFolder });
+      await Helpers.executeChildProcess(
+        'node_modules/serverless/bin/serverless info',
+        { cwd: stackFolder }
+      );
     } catch (error) {
       this.error(`${chalk.red(error.message)}`);
     }
@@ -176,7 +186,7 @@ export class CreateStackCommand extends Command {
           name: 'region',
           message: 'select a region',
           type: 'list',
-          choices: regions
+          choices: regions,
         },
       ]);
       region = responses.region;