From 73a363c8b3c0839046c255774580143eee6e1ee8 Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:23:34 +0300 Subject: [PATCH 1/6] feat: add auto-changelog --- CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++ changelog-template.hbs | 11 ++++++++ commitlint.config.js | 3 +++ lerna.json | 2 +- package.json | 13 +++++++--- packages/backend/package.json | 4 +-- packages/bridge/package.json | 2 +- packages/client/package.json | 4 +-- packages/example/package.json | 6 ++--- 9 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 changelog-template.hbs create mode 100644 commitlint.config.js diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..dea7c84 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,49 @@ +### Changelog + +All notable changes to this project will be documented in this file. Dates are displayed in UTC. + +Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). + +#### [v0.6.5](https://github.com/cudr/slate-collaborative/compare/v0.6.4...v0.6.5) + +> 21 June 2020 + +#### [v0.6.4](https://github.com/cudr/slate-collaborative/compare/v0.6.3...v0.6.4) + +> 22 June 2020 + +- feat: add auto-changelog [`c66c01a`](https://github.com/cudr/slate-collaborative/commit/c66c01ac07d6e3ca59db765f45ce53868e103f31) +- feat: add auto-changelog [`ca8b4b7`](https://github.com/cudr/slate-collaborative/commit/ca8b4b741c79381e41319bf58a6980a30128be67) + +#### [v0.6.3](https://github.com/cudr/slate-collaborative/compare/v0.5.1...v0.6.3) + +> 22 June 2020 + +- Implement link editor [`#20`](https://github.com/cudr/slate-collaborative/pull/20) +- Missing query argument in nspMiddleware [`#16`](https://github.com/cudr/slate-collaborative/pull/16) +- feat: add onError cb [`#15`](https://github.com/cudr/slate-collaborative/pull/15) +- Changed the backend socket config types fom Element[] to Node[] and m… [`#14`](https://github.com/cudr/slate-collaborative/pull/14) +- Fix typing of SyncValue. [`#12`](https://github.com/cudr/slate-collaborative/pull/12) +- feat: update to slate 0.58 && fix site build [`6adf408`](https://github.com/cudr/slate-collaborative/commit/6adf4082dc9f81c52c779e23e6bbb8ebe6ef5e9d) +- feat: update site styles [`aa2255a`](https://github.com/cudr/slate-collaborative/commit/aa2255a03c605fbb6303298ef1ab462a088239d7) +- feat: add auto-changelog [`ff77059`](https://github.com/cudr/slate-collaborative/commit/ff77059a49402931e2d87a6e9b6d11d7549cb4c4) + +#### [v0.5.1](https://github.com/cudr/slate-collaborative/compare/v0.5.0...v0.5.1) + +> 10 May 2020 + +- feat: update to slate 0.5x [`#10`](https://github.com/cudr/slate-collaborative/pull/10) +- chore(release): 0.5.0 [`a88c5c0`](https://github.com/cudr/slate-collaborative/commit/a88c5c0ec967eeb107d2973f9c72537c537c830a) +- chore(release): 0.5.1 [`1711f76`](https://github.com/cudr/slate-collaborative/commit/1711f76f9b802c7d8369936a457f434d4b1f192b) + +#### v0.5.0 + +> 10 May 2020 + +- feat: refactoring types && handle annotation ops [`#6`](https://github.com/cudr/slate-collaborative/pull/6) +- feat: travis-ci [`#3`](https://github.com/cudr/slate-collaborative/pull/3) +- Inner annotations [`#2`](https://github.com/cudr/slate-collaborative/pull/2) +- feat: mark data [`#1`](https://github.com/cudr/slate-collaborative/pull/1) +- feat: update to slate 0.5x [`a557a58`](https://github.com/cudr/slate-collaborative/commit/a557a58bda775107a37054bf4a8a697569308d48) +- initial commit [`a817eb1`](https://github.com/cudr/slate-collaborative/commit/a817eb1cebf296495099e67a7939e7a09f0e5b48) +- feat: extract CollaborationBackend [`9a59a0a`](https://github.com/cudr/slate-collaborative/commit/9a59a0ac34754f89dd7d8f7943b7073ad042e8bb) diff --git a/changelog-template.hbs b/changelog-template.hbs new file mode 100644 index 0000000..8675a29 --- /dev/null +++ b/changelog-template.hbs @@ -0,0 +1,11 @@ +### Changelog + +{{#each releases}} + Released {{title}} {{href}} at {{niceDate}} + {{#each merges}} + - Merge {{message}} {{id}} {{href}} + {{/each}} + {{#each fixes}} + - Fix {{commit}} {{commit.subject}} {{id}} linked to {{href}}. + {{/each}} +{{/each}} \ No newline at end of file diff --git a/commitlint.config.js b/commitlint.config.js new file mode 100644 index 0000000..a4f4369 --- /dev/null +++ b/commitlint.config.js @@ -0,0 +1,3 @@ +module.exports = { + extends: ['@commitlint/config-conventional'] +} diff --git a/lerna.json b/lerna.json index 9cb34aa..8101ba4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.5.0", + "version": "0.6.4", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index c504124..24869c0 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "private": true, - "version": "0.6.0", "description": "Slate collaborative plugin & microservice", "scripts": { "bootstrap": "lerna bootstrap", + "version": "auto-changelog -p --template changelog-template.hbs && git add CHANGELOG.md", "clean": "rimraf ./packages/**/lib/ && rimraf ./packages/**/tsconfig.tsbuildinfo && lerna clean --yes", - "release": "yarn prebuild && yarn build && lerna publish from-package", + "release": "yarn prebuild && yarn build && lerna version && lerna publish from-package", "deploy:site": "git subtree push --prefix packages/example heroku master", "dev": "lerna run --stream build:js && concurrently \"yarn watch\" \"lerna run dev --stream\"", "build": "lerna run build:module --stream", @@ -26,7 +26,8 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "lint-staged", + "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } }, "lint-staged": { @@ -36,11 +37,15 @@ ] }, "devDependencies": { + "@commitlint/cli": "^9.0.1", + "@commitlint/config-conventional": "^9.0.1", + "auto-changelog": "^2.1.0", "concurrently": "^4.1.2", "husky": "^3.0.5", "lerna": "^3.20.2", "lint-staged": "^9.2.5", "prettier": "^1.18.2", "rimraf": "^3.0.2" - } + }, + "version": "0.6.5" } diff --git a/packages/backend/package.json b/packages/backend/package.json index cdcdb2a..9759e2f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/backend", - "version": "0.6.2", + "version": "0.6.4", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "0.6.1", + "@slate-collaborative/bridge": "^0.6.4", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index b7f16fe..a2c0503 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/bridge", - "version": "0.6.1", + "version": "0.6.4", "files": [ "lib" ], diff --git a/packages/client/package.json b/packages/client/package.json index 91e0d4e..539e8b0 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/client", - "version": "0.6.2", + "version": "0.6.4", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "0.6.1", + "@slate-collaborative/bridge": "^0.6.4", "automerge": "0.14.0", "slate": "0.58.3", "socket.io-client": "^2.3.0", diff --git a/packages/example/package.json b/packages/example/package.json index f1e0016..bf266e8 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,12 +1,12 @@ { "name": "@slate-collaborative/example", - "version": "0.6.0", + "version": "0.6.4", "private": true, "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.6.2", - "@slate-collaborative/client": "^0.6.2", + "@slate-collaborative/backend": "^0.6.4", + "@slate-collaborative/client": "^0.6.4", "@types/faker": "^4.1.5", "@types/is-url": "^1.2.28", "@types/jest": "24.0.18", From be1bb1205e253527b4c946864df4ce1fefe24535 Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:31:53 +0300 Subject: [PATCH 2/6] v0.6.5 --- CHANGELOG.md | 63 +++++++++-------------------------- lerna.json | 2 +- packages/backend/package.json | 4 +-- packages/bridge/package.json | 2 +- packages/client/package.json | 4 +-- packages/example/package.json | 6 ++-- 6 files changed, 25 insertions(+), 56 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dea7c84..e02fd3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,49 +1,18 @@ ### Changelog -All notable changes to this project will be documented in this file. Dates are displayed in UTC. - -Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). - -#### [v0.6.5](https://github.com/cudr/slate-collaborative/compare/v0.6.4...v0.6.5) - -> 21 June 2020 - -#### [v0.6.4](https://github.com/cudr/slate-collaborative/compare/v0.6.3...v0.6.4) - -> 22 June 2020 - -- feat: add auto-changelog [`c66c01a`](https://github.com/cudr/slate-collaborative/commit/c66c01ac07d6e3ca59db765f45ce53868e103f31) -- feat: add auto-changelog [`ca8b4b7`](https://github.com/cudr/slate-collaborative/commit/ca8b4b741c79381e41319bf58a6980a30128be67) - -#### [v0.6.3](https://github.com/cudr/slate-collaborative/compare/v0.5.1...v0.6.3) - -> 22 June 2020 - -- Implement link editor [`#20`](https://github.com/cudr/slate-collaborative/pull/20) -- Missing query argument in nspMiddleware [`#16`](https://github.com/cudr/slate-collaborative/pull/16) -- feat: add onError cb [`#15`](https://github.com/cudr/slate-collaborative/pull/15) -- Changed the backend socket config types fom Element[] to Node[] and m… [`#14`](https://github.com/cudr/slate-collaborative/pull/14) -- Fix typing of SyncValue. [`#12`](https://github.com/cudr/slate-collaborative/pull/12) -- feat: update to slate 0.58 && fix site build [`6adf408`](https://github.com/cudr/slate-collaborative/commit/6adf4082dc9f81c52c779e23e6bbb8ebe6ef5e9d) -- feat: update site styles [`aa2255a`](https://github.com/cudr/slate-collaborative/commit/aa2255a03c605fbb6303298ef1ab462a088239d7) -- feat: add auto-changelog [`ff77059`](https://github.com/cudr/slate-collaborative/commit/ff77059a49402931e2d87a6e9b6d11d7549cb4c4) - -#### [v0.5.1](https://github.com/cudr/slate-collaborative/compare/v0.5.0...v0.5.1) - -> 10 May 2020 - -- feat: update to slate 0.5x [`#10`](https://github.com/cudr/slate-collaborative/pull/10) -- chore(release): 0.5.0 [`a88c5c0`](https://github.com/cudr/slate-collaborative/commit/a88c5c0ec967eeb107d2973f9c72537c537c830a) -- chore(release): 0.5.1 [`1711f76`](https://github.com/cudr/slate-collaborative/commit/1711f76f9b802c7d8369936a457f434d4b1f192b) - -#### v0.5.0 - -> 10 May 2020 - -- feat: refactoring types && handle annotation ops [`#6`](https://github.com/cudr/slate-collaborative/pull/6) -- feat: travis-ci [`#3`](https://github.com/cudr/slate-collaborative/pull/3) -- Inner annotations [`#2`](https://github.com/cudr/slate-collaborative/pull/2) -- feat: mark data [`#1`](https://github.com/cudr/slate-collaborative/pull/1) -- feat: update to slate 0.5x [`a557a58`](https://github.com/cudr/slate-collaborative/commit/a557a58bda775107a37054bf4a8a697569308d48) -- initial commit [`a817eb1`](https://github.com/cudr/slate-collaborative/commit/a817eb1cebf296495099e67a7939e7a09f0e5b48) -- feat: extract CollaborationBackend [`9a59a0a`](https://github.com/cudr/slate-collaborative/commit/9a59a0ac34754f89dd7d8f7943b7073ad042e8bb) +Released v0.6.5 https://github.com/cudr/slate-collaborative/compare/v0.6.5...v0.6.5 at 21 June 2020 +Released v0.6.5 https://github.com/cudr/slate-collaborative/compare/v0.6.4...v0.6.5 at 22 June 2020 +Released v0.6.4 https://github.com/cudr/slate-collaborative/compare/v0.6.3...v0.6.4 at 22 June 2020 +Released v0.6.3 https://github.com/cudr/slate-collaborative/compare/v0.5.1...v0.6.3 at 22 June 2020 +- Merge Implement link editor 20 https://github.com/cudr/slate-collaborative/pull/20 +- Merge Missing query argument in nspMiddleware 16 https://github.com/cudr/slate-collaborative/pull/16 +- Merge feat: add onError cb 15 https://github.com/cudr/slate-collaborative/pull/15 +- Merge Changed the backend socket config types fom Element[] to Node[] and m… 14 https://github.com/cudr/slate-collaborative/pull/14 +- Merge Fix typing of SyncValue. 12 https://github.com/cudr/slate-collaborative/pull/12 +Released v0.5.1 https://github.com/cudr/slate-collaborative/compare/v0.5.0...v0.5.1 at 10 May 2020 +- Merge feat: update to slate 0.5x 10 https://github.com/cudr/slate-collaborative/pull/10 +Released v0.5.0 at 10 May 2020 +- Merge feat: refactoring types && handle annotation ops 6 https://github.com/cudr/slate-collaborative/pull/6 +- Merge feat: travis-ci 3 https://github.com/cudr/slate-collaborative/pull/3 +- Merge Inner annotations 2 https://github.com/cudr/slate-collaborative/pull/2 +- Merge feat: mark data 1 https://github.com/cudr/slate-collaborative/pull/1 diff --git a/lerna.json b/lerna.json index 8101ba4..c996818 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.6.4", + "version": "0.6.5", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/backend/package.json b/packages/backend/package.json index 9759e2f..5f484c2 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/backend", - "version": "0.6.4", + "version": "0.6.5", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "^0.6.4", + "@slate-collaborative/bridge": "^0.6.5", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index a2c0503..175e425 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/bridge", - "version": "0.6.4", + "version": "0.6.5", "files": [ "lib" ], diff --git a/packages/client/package.json b/packages/client/package.json index 539e8b0..ebf3689 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/client", - "version": "0.6.4", + "version": "0.6.5", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "^0.6.4", + "@slate-collaborative/bridge": "^0.6.5", "automerge": "0.14.0", "slate": "0.58.3", "socket.io-client": "^2.3.0", diff --git a/packages/example/package.json b/packages/example/package.json index bf266e8..d0266af 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,12 +1,12 @@ { "name": "@slate-collaborative/example", - "version": "0.6.4", + "version": "0.6.5", "private": true, "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.6.4", - "@slate-collaborative/client": "^0.6.4", + "@slate-collaborative/backend": "^0.6.5", + "@slate-collaborative/client": "^0.6.5", "@types/faker": "^4.1.5", "@types/is-url": "^1.2.28", "@types/jest": "24.0.18", From e36c4318e2579ccfabfa70efcaf96856669b5305 Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:32:44 +0300 Subject: [PATCH 3/6] v0.6.6 --- lerna.json | 2 +- packages/backend/package.json | 4 ++-- packages/bridge/package.json | 2 +- packages/client/package.json | 4 ++-- packages/example/package.json | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lerna.json b/lerna.json index c996818..68ffcf6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.6.5", + "version": "0.6.6", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/backend/package.json b/packages/backend/package.json index 5f484c2..7894935 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/backend", - "version": "0.6.5", + "version": "0.6.6", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "^0.6.5", + "@slate-collaborative/bridge": "^0.6.6", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index 175e425..7eaa6ec 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/bridge", - "version": "0.6.5", + "version": "0.6.6", "files": [ "lib" ], diff --git a/packages/client/package.json b/packages/client/package.json index ebf3689..83a7b75 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/client", - "version": "0.6.5", + "version": "0.6.6", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "^0.6.5", + "@slate-collaborative/bridge": "^0.6.6", "automerge": "0.14.0", "slate": "0.58.3", "socket.io-client": "^2.3.0", diff --git a/packages/example/package.json b/packages/example/package.json index d0266af..2f88a1c 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,12 +1,12 @@ { "name": "@slate-collaborative/example", - "version": "0.6.5", + "version": "0.6.6", "private": true, "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.6.5", - "@slate-collaborative/client": "^0.6.5", + "@slate-collaborative/backend": "^0.6.6", + "@slate-collaborative/client": "^0.6.6", "@types/faker": "^4.1.5", "@types/is-url": "^1.2.28", "@types/jest": "24.0.18", From c40cdda45d478b733f195058ef7b239bbb476aeb Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:34:54 +0300 Subject: [PATCH 4/6] feat: modify changelog template --- changelog-template.hbs | 27 ++++++++++++++++++++++++--- lerna.json | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/changelog-template.hbs b/changelog-template.hbs index 8675a29..34c8bd6 100644 --- a/changelog-template.hbs +++ b/changelog-template.hbs @@ -1,11 +1,32 @@ ### Changelog +{{#unless options.hideCredit}} + Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +{{/unless}} + {{#each releases}} - Released {{title}} {{href}} at {{niceDate}} + {{#if href}} + ###{{#unless major}}#{{/unless}} [{{title}}]({{href}}) + {{else}} + #### {{title}} + {{/if}} + + {{#if tag}} + > {{niceDate}} + {{/if}} + + {{#if summary}} + {{summary}} + {{/if}} + {{#each merges}} - - Merge {{message}} {{id}} {{href}} + - {{#if commit.breaking}}**Breaking change:** {{/if}}{{message}}{{#if href}} [`#{{id}}`]({{href}}){{/if}} {{/each}} {{#each fixes}} - - Fix {{commit}} {{commit.subject}} {{id}} linked to {{href}}. + - {{#if commit.breaking}}**Breaking change:** {{/if}}{{commit.subject}}{{#each fixes}}{{#if href}} [`#{{id}}`]({{href}}){{/if}}{{/each}} + {{/each}} + {{#each commits}} + - {{#if breaking}}**Breaking change:** {{/if}}{{subject}}{{#if href}} [`{{shorthash}}`]({{href}}){{/if}} {{/each}} + {{/each}} \ No newline at end of file diff --git a/lerna.json b/lerna.json index 68ffcf6..8a59b70 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.6.6", + "version": "0.6.7", "npmClient": "yarn", "useWorkspaces": true } From f5bd03cf27a1c620c69e6823b433963aea84610e Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:46:15 +0300 Subject: [PATCH 5/6] feat: add license --- lerna.json | 2 +- packages/backend/License.md | 9 +++++++++ packages/bridge/License.md | 9 +++++++++ packages/client/License.md | 9 +++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 packages/backend/License.md create mode 100644 packages/bridge/License.md create mode 100644 packages/client/License.md diff --git a/lerna.json b/lerna.json index 8a59b70..68ffcf6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.6.7", + "version": "0.6.6", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/backend/License.md b/packages/backend/License.md new file mode 100644 index 0000000..8233070 --- /dev/null +++ b/packages/backend/License.md @@ -0,0 +1,9 @@ +The MIT License + +Copyright © 2019–2020, [George Kukushin](https://github.com/cudr) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/packages/bridge/License.md b/packages/bridge/License.md new file mode 100644 index 0000000..8233070 --- /dev/null +++ b/packages/bridge/License.md @@ -0,0 +1,9 @@ +The MIT License + +Copyright © 2019–2020, [George Kukushin](https://github.com/cudr) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/packages/client/License.md b/packages/client/License.md new file mode 100644 index 0000000..8233070 --- /dev/null +++ b/packages/client/License.md @@ -0,0 +1,9 @@ +The MIT License + +Copyright © 2019–2020, [George Kukushin](https://github.com/cudr) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file From 1fcfae96e336a2a8eaedfe543c2debe8f172a09b Mon Sep 17 00:00:00 2001 From: cudr Date: Mon, 22 Jun 2020 01:46:56 +0300 Subject: [PATCH 6/6] v0.6.7 --- CHANGELOG.md | 74 +++++++++++++++++++++++++++-------- lerna.json | 2 +- packages/backend/package.json | 4 +- packages/bridge/package.json | 2 +- packages/client/package.json | 4 +- packages/example/package.json | 6 +-- 6 files changed, 67 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e02fd3a..b34c4ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,60 @@ ### Changelog -Released v0.6.5 https://github.com/cudr/slate-collaborative/compare/v0.6.5...v0.6.5 at 21 June 2020 -Released v0.6.5 https://github.com/cudr/slate-collaborative/compare/v0.6.4...v0.6.5 at 22 June 2020 -Released v0.6.4 https://github.com/cudr/slate-collaborative/compare/v0.6.3...v0.6.4 at 22 June 2020 -Released v0.6.3 https://github.com/cudr/slate-collaborative/compare/v0.5.1...v0.6.3 at 22 June 2020 -- Merge Implement link editor 20 https://github.com/cudr/slate-collaborative/pull/20 -- Merge Missing query argument in nspMiddleware 16 https://github.com/cudr/slate-collaborative/pull/16 -- Merge feat: add onError cb 15 https://github.com/cudr/slate-collaborative/pull/15 -- Merge Changed the backend socket config types fom Element[] to Node[] and m… 14 https://github.com/cudr/slate-collaborative/pull/14 -- Merge Fix typing of SyncValue. 12 https://github.com/cudr/slate-collaborative/pull/12 -Released v0.5.1 https://github.com/cudr/slate-collaborative/compare/v0.5.0...v0.5.1 at 10 May 2020 -- Merge feat: update to slate 0.5x 10 https://github.com/cudr/slate-collaborative/pull/10 -Released v0.5.0 at 10 May 2020 -- Merge feat: refactoring types && handle annotation ops 6 https://github.com/cudr/slate-collaborative/pull/6 -- Merge feat: travis-ci 3 https://github.com/cudr/slate-collaborative/pull/3 -- Merge Inner annotations 2 https://github.com/cudr/slate-collaborative/pull/2 -- Merge feat: mark data 1 https://github.com/cudr/slate-collaborative/pull/1 +Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). + +#### [v0.6.5](https://github.com/cudr/slate-collaborative/compare/v0.6.6...v0.6.5) + +> 21 June 2020 + +- feat: add license [`f5bd03c`](https://github.com/cudr/slate-collaborative/commit/f5bd03cf27a1c620c69e6823b433963aea84610e) +- feat: modify changelog template [`c40cdda`](https://github.com/cudr/slate-collaborative/commit/c40cdda45d478b733f195058ef7b239bbb476aeb) + +#### [v0.6.6](https://github.com/cudr/slate-collaborative/compare/v0.6.5...v0.6.6) + +> 22 June 2020 + +- feat: add auto-changelog [`73a363c`](https://github.com/cudr/slate-collaborative/commit/73a363c8b3c0839046c255774580143eee6e1ee8) + +#### [v0.6.5](https://github.com/cudr/slate-collaborative/compare/v0.6.4...v0.6.5) + +> 22 June 2020 + +#### [v0.6.4](https://github.com/cudr/slate-collaborative/compare/v0.6.3...v0.6.4) + +> 22 June 2020 + +- feat: add auto-changelog [`c66c01a`](https://github.com/cudr/slate-collaborative/commit/c66c01ac07d6e3ca59db765f45ce53868e103f31) +- feat: add auto-changelog [`ca8b4b7`](https://github.com/cudr/slate-collaborative/commit/ca8b4b741c79381e41319bf58a6980a30128be67) + +#### [v0.6.3](https://github.com/cudr/slate-collaborative/compare/v0.5.1...v0.6.3) + +> 22 June 2020 + +- Implement link editor [`#20`](https://github.com/cudr/slate-collaborative/pull/20) +- Missing query argument in nspMiddleware [`#16`](https://github.com/cudr/slate-collaborative/pull/16) +- feat: add onError cb [`#15`](https://github.com/cudr/slate-collaborative/pull/15) +- Changed the backend socket config types fom Element[] to Node[] and m… [`#14`](https://github.com/cudr/slate-collaborative/pull/14) +- Fix typing of SyncValue. [`#12`](https://github.com/cudr/slate-collaborative/pull/12) +- feat: update to slate 0.58 && fix site build [`6adf408`](https://github.com/cudr/slate-collaborative/commit/6adf4082dc9f81c52c779e23e6bbb8ebe6ef5e9d) +- feat: update site styles [`aa2255a`](https://github.com/cudr/slate-collaborative/commit/aa2255a03c605fbb6303298ef1ab462a088239d7) +- feat: add auto-changelog [`ff77059`](https://github.com/cudr/slate-collaborative/commit/ff77059a49402931e2d87a6e9b6d11d7549cb4c4) + +#### [v0.5.1](https://github.com/cudr/slate-collaborative/compare/v0.5.0...v0.5.1) + +> 10 May 2020 + +- feat: update to slate 0.5x [`#10`](https://github.com/cudr/slate-collaborative/pull/10) +- chore(release): 0.5.0 [`a88c5c0`](https://github.com/cudr/slate-collaborative/commit/a88c5c0ec967eeb107d2973f9c72537c537c830a) +- chore(release): 0.5.1 [`1711f76`](https://github.com/cudr/slate-collaborative/commit/1711f76f9b802c7d8369936a457f434d4b1f192b) + +#### v0.5.0 + +> 10 May 2020 + +- feat: refactoring types && handle annotation ops [`#6`](https://github.com/cudr/slate-collaborative/pull/6) +- feat: travis-ci [`#3`](https://github.com/cudr/slate-collaborative/pull/3) +- Inner annotations [`#2`](https://github.com/cudr/slate-collaborative/pull/2) +- feat: mark data [`#1`](https://github.com/cudr/slate-collaborative/pull/1) +- feat: update to slate 0.5x [`a557a58`](https://github.com/cudr/slate-collaborative/commit/a557a58bda775107a37054bf4a8a697569308d48) +- initial commit [`a817eb1`](https://github.com/cudr/slate-collaborative/commit/a817eb1cebf296495099e67a7939e7a09f0e5b48) +- feat: extract CollaborationBackend [`9a59a0a`](https://github.com/cudr/slate-collaborative/commit/9a59a0ac34754f89dd7d8f7943b7073ad042e8bb) diff --git a/lerna.json b/lerna.json index 68ffcf6..8a59b70 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.7.1", - "version": "0.6.6", + "version": "0.6.7", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/backend/package.json b/packages/backend/package.json index 7894935..fe4e9ab 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/backend", - "version": "0.6.6", + "version": "0.6.7", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "^0.6.6", + "@slate-collaborative/bridge": "^0.6.7", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index 7eaa6ec..7b0a416 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/bridge", - "version": "0.6.6", + "version": "0.6.7", "files": [ "lib" ], diff --git a/packages/client/package.json b/packages/client/package.json index 83a7b75..0ab6857 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/client", - "version": "0.6.6", + "version": "0.6.7", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "^0.6.6", + "@slate-collaborative/bridge": "^0.6.7", "automerge": "0.14.0", "slate": "0.58.3", "socket.io-client": "^2.3.0", diff --git a/packages/example/package.json b/packages/example/package.json index 2f88a1c..f934af9 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,12 +1,12 @@ { "name": "@slate-collaborative/example", - "version": "0.6.6", + "version": "0.6.7", "private": true, "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.6.6", - "@slate-collaborative/client": "^0.6.6", + "@slate-collaborative/backend": "^0.6.7", + "@slate-collaborative/client": "^0.6.7", "@types/faker": "^4.1.5", "@types/is-url": "^1.2.28", "@types/jest": "24.0.18",