Skip to content

Commit 4ffc7ef

Browse files
authored
Merge pull request #601 from streamich/build
Build
2 parents bc8b817 + 48e7ab4 commit 4ffc7ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+170
-273
lines changed

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Node.js CI
1+
name: GitHub Pages
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66

77
jobs:
88
gh-pages:
@@ -11,9 +11,9 @@ jobs:
1111
matrix:
1212
node-version: [20.x]
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Use Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v3
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: ${{ matrix.node-version }}
1919
cache: yarn
@@ -22,7 +22,7 @@ jobs:
2222
- run: yarn coverage
2323
- run: yarn build:pages
2424
- name: Publish to gh-pages
25-
uses: peaceiris/actions-gh-pages@v3
25+
uses: peaceiris/actions-gh-pages@v4
2626
with:
2727
github_token: ${{ secrets.GITHUB_TOKEN }}
2828
publish_dir: ./gh-pages

.github/workflows/mirror.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Node.js CI
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66

77
jobs:
88
mirror:
@@ -12,7 +12,7 @@ jobs:
1212
with:
1313
fetch-depth: 0
1414
- name: Push To Gitlab
15-
env:
15+
env:
1616
token: ${{ secrets.GITLAB_TOKEN }}
1717
run: |
1818
git config user.name "streamich"

.github/workflows/pr.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Node.js CI
22

33
on:
44
pull_request:
5-
branches: [ master, next ]
5+
branches: [master, next]
66

77
concurrency:
88
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -58,5 +58,3 @@ jobs:
5858
cache: yarn
5959
- run: yarn install --frozen-lockfile
6060
- run: yarn typedoc
61-
62-

.github/workflows/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ name: Node.js CI
22

33
on:
44
push:
5-
branches: [ master, next ]
5+
branches: [master, next]
66

77
jobs:
88
release:
9-
if:
10-
${{ github.event_name == 'push' && (github.event.ref == 'refs/heads/master' || github.event.ref == 'refs/heads/next') }}
9+
if: ${{ github.event_name == 'push' && (github.event.ref == 'refs/heads/master' || github.event.ref == 'refs/heads/next') }}
1110
runs-on: ubuntu-latest
1211
strategy:
1312
matrix:

CHANGELOG.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# [15.5.0](https://github.com/streamich/json-joy/compare/v15.4.1...v15.5.0) (2024-04-26)
22

3-
43
### Features
54

6-
* **json-crdt-extensions:** 🎸 add block tag type ([120ba2f](https://github.com/streamich/json-joy/commit/120ba2f56be87640fe8eff09918eef55a609f56f))
7-
* **json-crdt-extensions:** 🎸 add OverlayPoint implementation ([ca037e6](https://github.com/streamich/json-joy/commit/ca037e6a0d3a3a94511755c06c4d8a350a339649))
8-
* **json-crdt-extensions:** 🎸 implement overlay "ref" concept ([7c31a6f](https://github.com/streamich/json-joy/commit/7c31a6fadb84c391a7ede68dd094bb8dd63bd0bd))
9-
* **json-crdt-extensions:** 🎸 improve overlay point layer insertion ([70748ac](https://github.com/streamich/json-joy/commit/70748ac60fc15b8f35e5ed5361011c873d46753b))
10-
* **json-crdt-extensions:** 🎸 improve OverlayPoint marker operations ([7aea094](https://github.com/streamich/json-joy/commit/7aea094eaefc5a8ce6a0691e4a189b3a96718ef6))
11-
* **json-crdt-extensions:** 🎸 improve OverlayPoint ref operations ([8a23776](https://github.com/streamich/json-joy/commit/8a237760a999987c5e00baaa40ccc1110faeb5cf))
12-
5+
- **json-crdt-extensions:** 🎸 add block tag type ([120ba2f](https://github.com/streamich/json-joy/commit/120ba2f56be87640fe8eff09918eef55a609f56f))
6+
- **json-crdt-extensions:** 🎸 add OverlayPoint implementation ([ca037e6](https://github.com/streamich/json-joy/commit/ca037e6a0d3a3a94511755c06c4d8a350a339649))
7+
- **json-crdt-extensions:** 🎸 implement overlay "ref" concept ([7c31a6f](https://github.com/streamich/json-joy/commit/7c31a6fadb84c391a7ede68dd094bb8dd63bd0bd))
8+
- **json-crdt-extensions:** 🎸 improve overlay point layer insertion ([70748ac](https://github.com/streamich/json-joy/commit/70748ac60fc15b8f35e5ed5361011c873d46753b))
9+
- **json-crdt-extensions:** 🎸 improve OverlayPoint marker operations ([7aea094](https://github.com/streamich/json-joy/commit/7aea094eaefc5a8ce6a0691e4a189b3a96718ef6))
10+
- **json-crdt-extensions:** 🎸 improve OverlayPoint ref operations ([8a23776](https://github.com/streamich/json-joy/commit/8a237760a999987c5e00baaa40ccc1110faeb5cf))
1311

1412
### Performance Improvements
1513

16-
* **json-crdt-extensions:** ⚡️ remove immediately from the right bucket ([faf466f](https://github.com/streamich/json-joy/commit/faf466f71f3a1c8d68702f58181cd85b11981c4b))
14+
- **json-crdt-extensions:** ⚡️ remove immediately from the right bucket ([faf466f](https://github.com/streamich/json-joy/commit/faf466f71f3a1c8d68702f58181cd85b11981c4b))

README.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<br />
99
</div>
1010

11-
1211
# json-joy
1312

1413
[![npm version](https://badge.fury.io/js/json-joy.svg)](https://badge.fury.io/js/json-joy)
@@ -19,21 +18,20 @@ Major focus of `json-joy` is development of the JSON CRDT protocol, a
1918
Conflict-free Replicated Data Type that enables seamless
2019
merging of changes in JSON data models, avoiding conflicts between replicas.
2120

22-
- [__Website__](https://jsonjoy.com)
23-
- [__Documentation__](https://jsonjoy.com/libs/json-joy-js)
24-
- [__Blog posts__](https://jsonjoy.com/blog)
25-
- [*Fuzz Testing RGA CRDT*](https://jsonjoy.com/blog/fuzz-testing-rga-crdt)
26-
- [*Benchmarking JSON Serialization Codecs*](https://jsonjoy.com/blog/json-codec-benchmarks)
27-
- [*List CRDT Benchmarks*](https://jsonjoy.com/blog/list-crdt-benchmarks)
28-
- [*Blazing Fast List CRDT*](https://jsonjoy.com/blog/performant-rga-list-crdt-algorithm)
29-
- [__JSON CRDT__](https://jsonjoy.com/specs/json-crdt) `specification`
30-
- [__JSON CRDT Patch__](https://jsonjoy.com/specs/json-crdt-patch) `specification`
31-
- [__JSON Expression__](https://jsonjoy.com/specs/json-expression) `specification`
32-
- [__JSON Reactive RPC__](https://jsonjoy.com/specs/json-rx) `specification`
33-
- [__Compact JSON__](https://jsonjoy.com/specs/compact-json) `encoding`
34-
- [__API Reference__](https://streamich.github.io/json-joy/)
35-
- [__Test coverage__](https://streamich.github.io/json-joy/coverage/lcov-report/)
36-
21+
- [**Website**](https://jsonjoy.com)
22+
- [**Documentation**](https://jsonjoy.com/libs/json-joy-js)
23+
- [**Blog posts**](https://jsonjoy.com/blog)
24+
- [_Fuzz Testing RGA CRDT_](https://jsonjoy.com/blog/fuzz-testing-rga-crdt)
25+
- [_Benchmarking JSON Serialization Codecs_](https://jsonjoy.com/blog/json-codec-benchmarks)
26+
- [_List CRDT Benchmarks_](https://jsonjoy.com/blog/list-crdt-benchmarks)
27+
- [_Blazing Fast List CRDT_](https://jsonjoy.com/blog/performant-rga-list-crdt-algorithm)
28+
- [**JSON CRDT**](https://jsonjoy.com/specs/json-crdt) `specification`
29+
- [**JSON CRDT Patch**](https://jsonjoy.com/specs/json-crdt-patch) `specification`
30+
- [**JSON Expression**](https://jsonjoy.com/specs/json-expression) `specification`
31+
- [**JSON Reactive RPC**](https://jsonjoy.com/specs/json-rx) `specification`
32+
- [**Compact JSON**](https://jsonjoy.com/specs/compact-json) `encoding`
33+
- [**API Reference**](https://streamich.github.io/json-joy/)
34+
- [**Test coverage**](https://streamich.github.io/json-joy/coverage/lcov-report/)
3735

3836
## Notable features
3937

@@ -43,7 +41,7 @@ merging of changes in JSON data models, avoiding conflicts between replicas.
4341
- The fastest implementation of CBOR, DAG-CBOR, MessagePack, UBJSON, and JSON codecs in JavaScript.
4442
- The fastest (HTTP) router implementation in JavaScript.
4543
- The fastest JSON schema validation implementation in JavaScript.
46-
- Very fast binary tree (Radix, AVL, Red-black*, Splay) implementations in JavaScript.
44+
- Very fast binary tree (Radix, AVL, Red-black\*, Splay) implementations in JavaScript.
4745
- Very fast JSON Patch (and JSON Pointer) implementation in JavaScript, including many non-standard operations, and JSON Predicate implementation.
4846
- Very fast JSON Expression implementation in JavaScript.
4947

bin/jj.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env node
22

33
// eslint-disable-next-line import/no-unassigned-import
4-
require("../lib/json-cli/jj");
4+
require('../lib/json-cli/jj');

bin/json-pack-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env node
22

33
// eslint-disable-next-line import/no-unassigned-import
4-
require("../lib/json-cli/json-pack-test");
4+
require('../lib/json-cli/json-pack-test');

bin/json-pack.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env node
22

33
// eslint-disable-next-line import/no-unassigned-import
4-
require("../lib/json-cli/json-pack");
4+
require('../lib/json-cli/json-pack');

bin/json-patch-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env node
22

33
// eslint-disable-next-line import/no-unassigned-import
4-
require("../lib/json-cli/json-patch-test");
4+
require('../lib/json-cli/json-patch-test');

0 commit comments

Comments
 (0)