Skip to content

Commit

Permalink
Merge pull request #181 from KonnorRogers/main
Browse files Browse the repository at this point in the history
Main -> Latest
  • Loading branch information
KonnorRogers authored May 18, 2024
2 parents a21df73 + 195f28e commit 001757f
Show file tree
Hide file tree
Showing 26 changed files with 7,109 additions and 5,968 deletions.
5 changes: 0 additions & 5 deletions .changeset/small-moons-taste.md

This file was deleted.

32 changes: 20 additions & 12 deletions .github/workflows/preview-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,33 +13,41 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js v18
uses: actions/setup-node@v3
- name: Setup Node.js v20
uses: actions/setup-node@v4
with:
node-version: '18.x'
node-version: '20.x'

- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
rubygems: latest
bundler-cache: true

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: use node.js 18
uses: actions/setup-node@v3
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
node-version: 18.x
cache: 'pnpm'
cache-dependency-path: |
pnpm-lock.yaml
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
run: pnpm install

- name: Install Vercel CLI
run: npm install --global vercel@canary
- name: Pull Vercel Environment Information
Expand Down
31 changes: 19 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,31 @@ jobs:
node-version: [18.x]
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js v${{ matrix.node-version }}
uses: actions/setup-node@v3
- name: Setup Node.js v20
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
node-version: '20.x'

- uses: pnpm/action-setup@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: use node.js v${{ matrix.node-version }}
uses: actions/setup-node@v3
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache-dependency-path: |
pnpm-lock.yaml
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install dependencies
run: pnpm install
Expand Down
32 changes: 21 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
ruby: ['2.7', '3.0', '3.1']
node-version: [16.x, 18.x]
node-version: [20.x]

services:
minio:
Expand All @@ -36,7 +36,7 @@ jobs:
MINIO_ROOT_PASSWORD: minioadmin
options: --name=minio --health-cmd "curl http://localhost:9000/minio/health/live" --health-interval=0.1s --health-timeout=5s --health-retries=20
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# - uses: microsoft/playwright-github-action@v1
- run: wget https://dl.min.io/client/mc/release/linux-amd64/mc
- run: chmod +x ./mc
Expand All @@ -58,19 +58,29 @@ jobs:
bundler-cache: true
working-directory: "tests/rails"

- uses: pnpm/action-setup@v2
- name: Setup Node.js v20
uses: actions/setup-node@v4
with:
version: 8.x.x
node-version: '20.x'

- uses: pnpm/action-setup@v4
name: Install pnpm
with:
version: 9
run_install: false

- name: use node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache-dependency-path: |
pnpm-lock.yaml
tests/rails/pnpm-lock.yaml
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Install via pnpm
run: |
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 18.9.0
nodejs 20.9.0
ruby 3.0.4
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# Changelog

## 0.10.0

### Minor Changes

- [#178](https://github.com/KonnorRogers/rhino-editor/pull/178) [`abddbac`](https://github.com/KonnorRogers/rhino-editor/commit/abddbac90ffd69aa77e47b3ff9c78bf4e25309f2) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Add `getHTMLContentFromRange()` and `getTextContentFromRange()` functions

- [#176](https://github.com/KonnorRogers/rhino-editor/pull/176) [`fd8cc08`](https://github.com/KonnorRogers/rhino-editor/commit/fd8cc0873fbade6a2f9eeeb3259872c11a50836d) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - upgrade TipTap versions to 2.4.0

### Patch Changes

- [#176](https://github.com/KonnorRogers/rhino-editor/pull/176) [`fd8cc08`](https://github.com/KonnorRogers/rhino-editor/commit/fd8cc0873fbade6a2f9eeeb3259872c11a50836d) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fixed an issue where updating translations would not update the editor

- [#178](https://github.com/KonnorRogers/rhino-editor/pull/178) [`abddbac`](https://github.com/KonnorRogers/rhino-editor/commit/abddbac90ffd69aa77e47b3ff9c78bf4e25309f2) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fixed a bug where the current focused figure did not have an outline

- [#178](https://github.com/KonnorRogers/rhino-editor/pull/178) [`abddbac`](https://github.com/KonnorRogers/rhino-editor/commit/abddbac90ffd69aa77e47b3ff9c78bf4e25309f2) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Close link dialogs when clicking outside the editor or on other toolbar items

- [#176](https://github.com/KonnorRogers/rhino-editor/pull/176) [`fd8cc08`](https://github.com/KonnorRogers/rhino-editor/commit/fd8cc0873fbade6a2f9eeeb3259872c11a50836d) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - - Fixed `tooltip-arrow` and `tooltip-base` parts renamed to `toolbar__tooltip__arrow` and `toolbar__tooltip__base` respectively.

- [#178](https://github.com/KonnorRogers/rhino-editor/pull/178) [`abddbac`](https://github.com/KonnorRogers/rhino-editor/commit/abddbac90ffd69aa77e47b3ff9c78bf4e25309f2) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fixed a bug where figcaptions would never update if you did not interact with the editor

## 0.9.3

### Patch Changes

- [#170](https://github.com/KonnorRogers/rhino-editor/pull/170) [`bb3f160`](https://github.com/KonnorRogers/rhino-editor/commit/bb3f16057056a9fa2ac69dfb5e4562f060382de6) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fixed a bug with removing attachments

## 0.9.2

### Patch Changes

- [#163](https://github.com/KonnorRogers/rhino-editor/pull/163) [`65a86d1`](https://github.com/KonnorRogers/rhino-editor/commit/65a86d1b61dd333d36fb8a8d069debd6c2136916) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Docs: Added documentation for importmaps workaround

## 0.9.1

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"@hotwired/turbo": "^7.3.0",
"@konnorr/bridgetown-quick-search": "^3.8.0",
"@shoelace-style/shoelace": "^2.12.0",
"@tiptap/extension-character-count": "~2.1.7",
"@tiptap/extension-code-block-lowlight": "~2.1.7",
"@tiptap/extension-character-count": "~2.4.0",
"@tiptap/extension-code-block-lowlight": "~2.4.0",
"bridgetown-quick-search": "2.0.0",
"linkifyjs": "^4.1.1",
"lowlight": "^3.1.0",
"prosemirror-view": "1.28.2",
"prosemirror-view": "1.33.6",
"read-cache": "^1.0.0",
"rhino-editor": "link:../",
"web-component-lazy-loader": "^1.0.1"
Expand Down
Loading

0 comments on commit 001757f

Please sign in to comment.