Merge branch 'master' into dev

pharindoko · web-flow · commit 83f1d6cf70b9 · 2019-12-31T15:32:17.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,20 +15,20 @@ install:
   - make install
 jobs:
   include:
-    - script:
-        - npm run build
+    - stage: build-server
       before_script: cd packages/server
-      name: build-server
-    - script:
+      script:
         - npm run build
-        - bin/run --version
+    - stage: build-cli
       before_script: cd packages/cli
-      name: build-cli
-    - script:
+      script:
+        - npm run build
+        - bin/run --version
+    - stage: test-server
+      before_script: cd packages/server
+      script:
         - npm run test
         - npx snyk test
-      before_script: cd packages/server
-      name: test-server
     - stage: release
       if: (type = push AND branch = master)
       before_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.10](https://github.com/pharindoko/json-serverless/compare/v1.5.9...v1.5.10) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+
+## [1.5.9](https://github.com/pharindoko/json-serverless/compare/v1.5.8...v1.5.9) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+
 ## [1.5.8](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v1.5.8) (2019-12-31)
 
 
diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "packages/cli/template",
     "packages/server"
   ],
-  "version": "1.5.8"
+  "version": "1.5.10"
 }
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.10](https://github.com/pharindoko/json-serverless/compare/v1.5.9...v1.5.10) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+
+## [1.5.9](https://github.com/pharindoko/json-serverless/compare/v1.5.8...v1.5.9) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+
 ## [1.5.8](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v1.5.8) (2019-12-31)
 
 
diff --git a/packages/cli/README.md b/packages/cli/README.md
@@ -19,7 +19,7 @@ $ npm install -g json-serverless
 $ jsonsls COMMAND
 running command...
 $ jsonsls (-v|--version|version)
-json-serverless/1.5.8 linux-x64 node-v10.18.0
+json-serverless/1.5.10 linux-x64 node-v10.18.0
 $ jsonsls --help [COMMAND]
 USAGE
   $ jsonsls COMMAND
diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "json-serverless",
   "description": "cli for json-serverless project",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "author": "pharindoko",
   "bin": {
     "jsonsls": "./bin/run"
@@ -22,7 +22,7 @@
     "figlet": "^1.2.4",
     "globby": "^10.0.1",
     "inquirer": "^7.0.1",
-    "json-serverless-lib": "^1.5.8",
+    "json-serverless-lib": "^1.5.10",
     "listr": "^0.14.3",
     "node-env-webpack-plugin": "1.1.0",
     "nodemon": "2.0.2",
diff --git a/packages/cli/template/CHANGELOG.md b/packages/cli/template/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.10](https://github.com/pharindoko/json-serverless/compare/v1.5.9...v1.5.10) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless-template
+
+
+
+
+
+## [1.5.9](https://github.com/pharindoko/json-serverless/compare/v1.5.8...v1.5.9) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless-template
+
+
+
+
+
 ## [1.5.8](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v1.5.8) (2019-12-31)
 
 **Note:** Version bump only for package json-serverless-template
diff --git a/packages/cli/template/package.json b/packages/cli/template/package.json
@@ -1,13 +1,13 @@
 {
   "name": "json-serverless-template",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "template for json-serverless project",
   "author": "pharindoko",
   "bugs": "https://github.com/pharindoko/json-serverless/issues",
   "dependencies": {
     "@types/express": "4.17.1",
     "express": "4.17.1",
-    "json-serverless-lib": "^1.5.8",
+    "json-serverless-lib": "^1.5.10",
     "serverless-http": "^2.3.0"
   },
   "devDependencies": {
diff --git a/packages/server/CHANGELOG.md b/packages/server/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.5.10](https://github.com/pharindoko/json-serverless/compare/v1.5.9...v1.5.10) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless-lib
+
+
+
+
+
+## [1.5.9](https://github.com/pharindoko/json-serverless/compare/v1.5.8...v1.5.9) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless-lib
+
+
+
+
+
 ## [1.5.8](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v1.5.8) (2019-12-31)
 
 
diff --git a/packages/server/package-lock.json b/packages/server/package-lock.json
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-serverless-lib",
-  "version": "1.5.8",
+  "version": "1.5.10",
   "description": "Transform a json file into an api",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`"packages/cli/template",`
`5`	`5`	`"packages/server"`
`6`	`6`	`],`
`7`		`- "version": "1.5.8"`
	`7`	`+ "version": "1.5.10"`
`8`	`8`	`}`