Merge pull request #201 from pharindoko/dev

merge Dev

Author: pharindoko

.DS_Store

@@ -6,4 +6,11 @@ jspm_packages
 .serverless
 /dist
 .env
-.webpack
+.webpack
+**/**/lerna_backup
+**/**/lerna-debug.log
+**/package.json.lerna_backup
+**/**/appconfig.json
+**/**/serverlessconfig.json
+**/.DS_Store
+.npmrc

.gitignore

@@ -1,6 +1,7 @@
 sudo: required
 dist: trusty
-
+git:
+  depth: false
 language: node_js
 cache:
   directories:
@@ -9,18 +10,30 @@ notifications:
   email: true
 node_js:
   - '10'
-install: npm ci
+install: make install
 jobs:
   include:
-    - stage: build
+    - stage: build-server
+      before_script: cd packages/server
       script:
         - npm run build
-    - stage: test
+    - stage: build-cli
+      before_script: cd packages/cli
+      script:
+        - npm run build
+        - bin/run --version
+    - stage: test-server
+      before_script: cd packages/server
       script:
         - npm run test
         - npx snyk test
     - stage: release
-      if: branch = master
+      if: (type = push AND branch = master)
+      before_script:
+        - echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" >> $HOME/.npmrc 2> /dev/null
+        - git remote add pub https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
+        - git fetch pub master
+        - git checkout master
       script:
-        - npx semantic-release
-          
+        - make fake-credentials
+        - make publish

.travis.yml

@@ -1,3 +1,58 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [1.5.7](https://github.com/pharindoko/json-serverless/compare/v1.5.6...v1.5.7) (2019-12-31)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+## [1.5.6](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v1.5.6) (2019-12-30)
+
+
+### Features
+
+* **cli:** add cli to json-serverless project ([bf1213a](https://github.com/pharindoko/json-serverless/commit/bf1213a1ad18c59ae3cafacd8a6cb3c737caf6cc))
+
+
+### Reverts
+
+* Revert "v0.1.0-alpha.0" ([ccc6a6d](https://github.com/pharindoko/json-serverless/commit/ccc6a6d3e6bb349d8c51b83375610f8db25a762f))
+* Revert "v0.0.6-alpha.16" ([8a7f087](https://github.com/pharindoko/json-serverless/commit/8a7f08784289b7936c704caecfbb8f757719b876))
+* Revert "v0.0.6-alpha.10" ([dfb59d2](https://github.com/pharindoko/json-serverless/commit/dfb59d2458dfa2fb3e1426f1749409abfa4dd37d))
+
+
+
+
+
+## [1.5.5](https://github.com/pharindoko/json-serverless/compare/v1.5.4...v1.5.5) (2019-12-30)
+
+**Note:** Version bump only for package json-serverless
+
+
+
+
+
+## [0.0.6](https://github.com/pharindoko/json-serverless/compare/v1.5.3...v0.0.6) (2019-12-30)
+
+
+### Features
+
+* **cli:** add cli to json-serverless project ([bf1213a](https://github.com/pharindoko/json-serverless/commit/bf1213a1ad18c59ae3cafacd8a6cb3c737caf6cc))
+
+
+### Reverts
+
+* Revert "v0.1.0-alpha.0" ([ccc6a6d](https://github.com/pharindoko/json-serverless/commit/ccc6a6d3e6bb349d8c51b83375610f8db25a762f))
+* Revert "v0.0.6-alpha.16" ([8a7f087](https://github.com/pharindoko/json-serverless/commit/8a7f08784289b7936c704caecfbb8f757719b876))
+* Revert "v0.0.6-alpha.10" ([dfb59d2](https://github.com/pharindoko/json-serverless/commit/dfb59d2458dfa2fb3e1426f1749409abfa4dd37d))
+
+
+
+
 ## [1.5.3](https://github.com/pharindoko/json-serverless/compare/v1.5.2...v1.5.3) (2019-12-15)
 
 

docs/CHANGELOG.md renamed to CHANGELOG.md

@@ -0,0 +1,52 @@
+SHELL := /bin/bash
+.DEFAULT_GOAL := help
+
+.PHONY: help
+help:  ## help target to show available commands with information
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) |  awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+.PHONY: install
+install: 
+	npm i
+	npx lerna bootstrap
+
+.PHONY: download
+download: 
+	npm i -g json-serverless
+	jsonsls
+
+.PHONY: publish-manually
+publish-manually:
+ifndef GH_TOKEN
+	$(error GH_TOKEN is undefined)
+endif
+	make install
+	npx lerna version --include-merged-tags --force-publish --conventional-commits --create-release github
+	npx lerna publish from-git --yes
+
+.PHONY: publish
+publish:
+ifndef GH_TOKEN
+	$(error GH_TOKEN is undefined)
+endif
+	make install
+	git status
+	npx lerna version patch -m "chore(release): Travis CI update [ci skip]" --include-merged-tags --force-publish --conventional-commits --create-release github --yes --git-remote pub
+	npx lerna publish from-git --yes
+
+.PHONY: start-test
+start-test:
+	make install
+	npx lerna run --scope json-serverless  --stream test:start
+
+.PHONY: deploy-test
+deploy-test:
+	make install
+	npx lerna run --scope json-serverless  --stream test:create-stack
+
+.PHONY: fake-credentials
+fake-credentials:
+	mkdir -p ~/.aws
+	touch ~/.aws/credentials
+	echo -e "[default]\naws_access_key_id=xxxx\naws_secret_access_key=xxx" > ~/.aws/credentials
+	echo -e "[profile default]\nregion=eu-central-1" > ~/.aws/config

Makefile

@@ -1,6 +1,7 @@
 {
     "posts": [
-      { "id": 1, "title": "json-server", "author": "typicode" }
+      { "id": 1, "title": "json-server", "author": "typicode" },
+      { "id": 2, "title": "test", "author": "yourAuthor" }
     ],
     "comments": [
       { "id": 1, "body": "some comment", "postId": 1 }

config/serverlessconfig.json

@@ -0,0 +1,8 @@
+{
+  "packages": [
+    "packages/cli",
+    "packages/cli/template",
+    "packages/server"
+  ],
+  "version": "1.5.7"
+}