Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main-> latest #218

Merged
merged 3 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ docs/.bridgetown-cache

.DS_Store

# Ignore RubyMine files.
.idea/

/exports
/internal
/cdn
Expand Down
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,29 @@
# Changelog

## 0.13.0

### Minor Changes

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Styles: blockquote has had its icon changed to represent a block code icon.

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Styling of link dialogs has changed now that it follows the selection cursor.

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fix: code blocks now properly display their correct keybinding

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: Added an "inline code" toolbar button, bubble menu buttons, and default styles.

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: Link dialogs now follow your selection cursor instead of always being in the top left of the editor

### Patch Changes

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fix: behavior around cursors with inline-code using Codemark plugin.

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fix: links now properly render inside of `<figcaption>`

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fix: double error extension registration has been fixed

- [#216](https://github.com/KonnorRogers/rhino-editor/pull/216) [`0031ec1`](https://github.com/KonnorRogers/rhino-editor/commit/0031ec1b8f939593724460e7929d531bd5c29ab7) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fix: keybindings now swap to using "option" instead of "alt" for iOS / MacOS.

## 0.12.0

### Minor Changes
Expand Down
23 changes: 19 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,20 @@ We have a test suite using Ruby on Rails and is intended to
provide a good demonstration of how this package can hook
into ActionText.

Contributions should be made on a feature branch in a
forked repository.

### Prerequisites

- Ruby 3.1.2
- Rails 7.0.4
- PNPM (`npm install -g pnpm`)
- Playwright
- Playwright (`npm install -g playwright`)
- Node >= 16
- Docker (Used to run a simulated S3 server)
- Overmind (Preferred, not needed)
- A Docker virtualizer ([Orbstack](https://orbstack.dev/) or
[Docker Desktop](https://www.docker.com/products/docker-desktop/))
- Overmind (Preferred, not needed `npm install -g overmind`)

### Installation

Expand All @@ -42,9 +47,19 @@ pnpm run setup

### Running the server

The easiest way to run the server is using [Overmind](https://github.com/DarthSim/overmind)
The easiest way to run the server is using [Overmind](https://github.com/DarthSim/overmind).
First start up your Docker virtualizer, then in two termainals…

Terminal 1:

```bash
pnpm run start
```

Terminal 2:

```bash
cd tests/rails
overmind start -f Procfile.dev
```

Expand All @@ -53,7 +68,7 @@ Then navigate to `localhost:5100`

#### Without Overmind

To run the server without overmind do the following in
To run the server without Overmind do the following in
seperate terminals:

```bash
Expand Down
8 changes: 0 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,17 @@
"@hotwired/turbo": "^7.3.0",
"@konnorr/bridgetown-quick-search": "^3.10.4",
"@shoelace-style/shoelace": "^2.17.1",
"@tiptap/core": "^2.8.0",
"@tiptap/extension-character-count": "^2.8.0",
"@tiptap/extension-code-block": "^2.8.0",
"@tiptap/extension-code-block-lowlight": "^2.8.0",
"@tiptap/pm": "^2.8.0",
"bridgetown-quick-search": "3.0.3",
"esbuild-plugin-copy": "^2.1.1",
"linkifyjs": "^4.1.3",
"lit": "^3.2.0",
"lowlight": "^3.1.0",
"prism-esm": "1.29.0-fix.6",
"prosemirror-view": "^1.34.3",
"read-cache": "^1.0.0",
"rhino-editor": "link:..",
"web-component-lazy-loader": "^1.0.1"
},
"pnpm": {
"overrides": {
"prosemirror-view": "$prosemirror-view"
}
}
}
14 changes: 1 addition & 13 deletions docs/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 46 additions & 10 deletions docs/src/rhino-editor/exports/styles/trix.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 17 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rhino-editor",
"version": "0.12.0",
"version": "0.13.0",
"description": "A custom element wrapped rich text editor",
"type": "module",
"main": "exports/index.js",
Expand Down Expand Up @@ -43,7 +43,7 @@
"@custom-elements-manifest/analyzer": "^0.10.3",
"@esm-bundle/chai": "4.3.4-fix.0",
"@open-wc/testing": "^3.2.2",
"@playwright/test": "^1.48.0",
"@playwright/test": "^1.48.2",
"@types/mocha": "^10.0.9",
"@types/rails__activestorage": "^7.1.1",
"@typescript-eslint/parser": "^6.21.0",
Expand All @@ -58,35 +58,31 @@
"eslint": "^8.57.1",
"glob": "^10.4.5",
"mocha": "^10.7.3",
"playwright": "^1.48.0",
"playwright": "^1.48.2",
"prettier": "^3.3.3",
"rhino-editor": "link:",
"sinon": "^15.2.0",
"standard-version": "^9.5.0",
"typescript": "^5.6.2"
},
"dependencies": {
"@rails/activestorage": "^7.2.100",
"@tiptap/core": "^2.2.0",
"@tiptap/extension-code-block": "^2.2.0",
"@tiptap/extension-focus": "^2.2.0",
"@tiptap/extension-image": "^2.2.0",
"@tiptap/extension-link": "^2.2.0",
"@tiptap/extension-placeholder": "^2.2.0",
"@tiptap/extension-strike": "^2.2.0",
"@tiptap/pm": "^2.2.0",
"@tiptap/starter-kit": "^2.2.0",
"@rails/activestorage": "^7.2.102",
"@tiptap/core": "^2.9.1",
"@tiptap/extension-code": "^2.9.1",
"@tiptap/extension-code-block": "^2.9.1",
"@tiptap/extension-focus": "^2.9.1",
"@tiptap/extension-image": "^2.9.1",
"@tiptap/extension-link": "^2.9.1",
"@tiptap/extension-placeholder": "^2.9.1",
"@tiptap/extension-strike": "^2.9.1",
"@tiptap/pm": "^2.9.1",
"@tiptap/starter-kit": "^2.9.1",
"linkifyjs": "^4.1.3",
"lit": "^3.2.0",
"prosemirror-codemark": "^0.4.2",
"prosemirror-utils": "^1.2.2",
"prosemirror-view": "~1.28.0",
"role-components": "^3.0.1",
"tslib": "^2.7.0"
},
"pnpm": {
"overrides": {
"prosemirror-view": "$prosemirror-view"
}
"role-components": "^3.1.0",
"tslib": "^2.8.0"
},
"repository": "[email protected]:KonnorRogers/rhino-editor.git",
"bugs": {
Expand Down
Loading
Loading