Skip to content

Commit

Permalink
Merge pull request #203 from KonnorRogers/main
Browse files Browse the repository at this point in the history
Main -> Latest
  • Loading branch information
KonnorRogers authored Oct 13, 2024
2 parents be6b0ab + 07efbb8 commit 819efe7
Show file tree
Hide file tree
Showing 59 changed files with 7,338 additions and 3,946 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
ruby: ['2.7', '3.0', '3.1']
ruby: ['3.2', '3.1']
node-version: [20.x]

services:
Expand Down Expand Up @@ -85,6 +85,7 @@ jobs:
- name: Install via pnpm
run: |
pnpm run setup
pnpm exec playwright install
- name: Lint
run: |
pnpm run lint
Expand All @@ -97,7 +98,6 @@ jobs:
pnpm run test:rails
- name: Doc Tests
run: |
pnpm exec playwright install --with-deps
pnpm run test:docs
- name: Unit Tests
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 20.9.0
ruby 3.0.4
ruby 3.3.4
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## 0.11.0

### Minor Changes

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Added `rhinoBubbleMenu` to the default list of extensions.

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: Added some CSS fallbacks for dark color schemes

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: added events for direct upload in the form of `rhino-direct-upload:*`, you can read more in the editor events section.

- [#201](https://github.com/KonnorRogers/rhino-editor/pull/201) [`0611c16`](https://github.com/KonnorRogers/rhino-editor/commit/0611c16a209a909a6ed6f37f2cfc26f0b97e2124) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Update package versions

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: added the `rhino-update` event. Useful for tracking when the component has updated.

### Patch Changes

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Feature: Added the `rhino-update` event for tracking updates to the editor

- [#199](https://github.com/KonnorRogers/rhino-editor/pull/199) [`7de4762`](https://github.com/KonnorRogers/rhino-editor/commit/7de4762741b5e6bb1e6ed01493aa6932a83b5ca1) Thanks [@KonnorRogers](https://github.com/KonnorRogers)! - Fixed a bug where rhino editor would not find inputs if loaded in the shadow dom

## 0.10.2

### Patch Changes
Expand Down
1 change: 0 additions & 1 deletion docs/.tool-versions

This file was deleted.

6 changes: 3 additions & 3 deletions docs/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# This will help ensure the proper Bridgetown version is running.
####

gem "bridgetown", "~> 1.3"
gem "bridgetown", "~> 2.0.0.beta2"

# Uncomment to add file-based dynamic routing to your project:
# gem "bridgetown-routes", "~> 1.3"
Expand All @@ -28,6 +28,6 @@ gem "nokogiri", "~> 1.13"

# Puma is a Rack-compatible server used by Bridgetown
# (you can optionally limit this to the "development" group)
gem "puma", "~> 5.6"
gem "puma", "~> 6.0"

gem "bridgetown-quick-search", "~> 2.0"
gem "bridgetown-quick-search", "~> 3.0"
123 changes: 71 additions & 52 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,73 +1,82 @@
GEM
remote: https://rubygems.org/
specs:
activemodel (7.1.3.3)
activesupport (= 7.1.3.3)
activesupport (7.1.3.3)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
amazing_print (1.6.0)
base64 (0.2.0)
bigdecimal (3.1.8)
bridgetown (1.3.4)
bridgetown-builder (= 1.3.4)
bridgetown-core (= 1.3.4)
bridgetown-paginate (= 1.3.4)
bridgetown-builder (1.3.4)
bridgetown-core (= 1.3.4)
bridgetown-core (1.3.4)
activemodel (>= 6.0, < 8.0)
bridgetown (2.0.0.beta2)
bridgetown-builder (= 2.0.0.beta2)
bridgetown-core (= 2.0.0.beta2)
bridgetown-foundation (= 2.0.0.beta2)
bridgetown-paginate (= 2.0.0.beta2)
bridgetown-builder (2.0.0.beta2)
bridgetown-core (= 2.0.0.beta2)
bridgetown-core (2.0.0.beta2)
activesupport (>= 6.0, < 8.0)
addressable (~> 2.4)
amazing_print (~> 1.2)
colorator (~> 1.0)
bridgetown-foundation (= 2.0.0.beta2)
csv (~> 3.2)
dry-inflector (>= 1.0)
erubi (~> 1.9)
faraday (~> 2.0)
faraday-follow_redirects (~> 0.3)
hash_with_dot_access (~> 1.2)
i18n (~> 1.0)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (>= 5.0, < 5.5)
listen (~> 3.0)
rack (>= 3.0)
rackup (~> 2.0)
rake (>= 13.0)
roda (~> 3.46)
rouge (>= 3.0, < 5.0)
serbea (~> 1.0)
serbea (~> 2.1)
signalize (~> 1.3)
streamlined (>= 0.5.2)
thor (~> 1.1)
tilt (~> 2.0)
zeitwerk (~> 2.5)
bridgetown-paginate (1.3.4)
bridgetown-core (= 1.3.4)
bridgetown-quick-search (2.0.0)
bridgetown (>= 1.2.0.beta2, < 2.0)
colorator (1.1.0)
concurrent-ruby (1.2.3)
bridgetown-foundation (2.0.0.beta2)
hash_with_dot_access (~> 2.0)
inclusive (~> 1.0)
zeitwerk (~> 2.5)
bridgetown-paginate (2.0.0.beta2)
bridgetown-core (= 2.0.0.beta2)
bridgetown-quick-search (3.0.3)
bridgetown (>= 1.2.0.beta2, < 3.0)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
csv (3.3.0)
drb (2.2.1)
erubi (1.12.0)
faraday (2.9.0)
dry-inflector (1.1.0)
erubi (1.13.0)
faraday (2.10.1)
faraday-net_http (>= 2.0, < 3.2)
logger
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.1.0)
faraday-net_http (3.1.1)
net-http
ffi (1.16.3)
hash_with_dot_access (1.2.0)
activesupport (>= 5.0.0, < 8.0)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
hash_with_dot_access (2.1.1)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
inclusive (1.0.0)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand All @@ -76,51 +85,61 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
minitest (5.23.1)
mutex_m (0.2.0)
logger (1.6.0)
minitest (5.25.1)
net-http (0.4.1)
uri
nio4r (2.5.8)
nokogiri (1.13.9-arm64-darwin)
nio4r (2.7.3)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.9-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
public_suffix (5.0.5)
puma (5.6.5)
public_suffix (6.0.1)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.6.0)
rack (3.0.11)
racc (1.8.1)
rack (3.1.7)
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.2.8)
strscan (>= 3.0.9)
roda (3.80.0)
rexml (3.3.6)
strscan
roda (3.83.0)
rack
rouge (4.2.1)
serbea (1.0.1)
activesupport (>= 6.0)
rouge (4.3.0)
securerandom (0.3.1)
serbea (2.2.0)
erubi (>= 1.10)
tilt (~> 2.0)
signalize (1.3.0)
concurrent-ruby (~> 1.2)
streamlined (0.5.2)
serbea (>= 2.1)
zeitwerk (~> 2.5)
strscan (3.1.0)
thor (1.3.1)
tilt (2.3.0)
tilt (2.4.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uri (0.13.0)
zeitwerk (2.6.14)
webrick (1.8.1)
zeitwerk (2.6.17)

PLATFORMS
arm64-darwin-21
arm64-darwin-22
arm64-darwin-23
x86_64-linux

DEPENDENCIES
bridgetown (~> 1.3)
bridgetown-quick-search (~> 2.0)
bridgetown (~> 2.0.0.beta2)
bridgetown-quick-search (~> 3.0)
nokogiri (~> 1.13)
puma (~> 5.6)
puma (~> 6.0)

BUNDLED WITH
2.3.22
2.5.11
4 changes: 2 additions & 2 deletions docs/config/esbuild.defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// when an update is applied hence we strongly recommend adding overrides to
// `esbuild.config.js` instead of editing this file.
//
// Shipped with Bridgetown v1.3.4
// Shipped with Bridgetown v2.0.0.beta2

// DO NOT MANUALLY EDIT THIS CONFIGURATION:
const autogeneratedBridgetownConfig = {
Expand Down Expand Up @@ -155,7 +155,7 @@ const sassPlugin = (options) => ({
// Process .scss and .sass files with Sass
build.onLoad({ filter: /\.(sass|scss)$/ }, async (args) => {
if (!sass) {
console.error("error: Sass is not installed. Try running `yarn add sass` and then building again.")
console.error("error: Sass is not installed. Try running `npm i sass -D` and then building again.")
return
}

Expand Down
16 changes: 14 additions & 2 deletions docs/esbuild.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const build = require("./config/esbuild.defaults.js")
const path = require("path")

// Update this if you need to configure a destination folder other than `output`
const outputFolder = "output"
Expand All @@ -7,7 +8,7 @@ const outputFolder = "output"
//
// ```
// const path = require("path")
// const esbuildCopy = require('esbuild-plugin-copy').default
const esbuildCopy = require('esbuild-plugin-copy').default
// const esbuildOptions = {
// plugins: [
// esbuildCopy({
Expand Down Expand Up @@ -36,7 +37,18 @@ const esbuildOptions = {
"frontend/javascript/entrypoints/syntax-highlighting.js"
],
splitting: true,
format: "esm"
format: "esm",
plugins: [
esbuildCopy({
assets: {
from: [path.resolve(__dirname, '../exports/styles/trix.css')],
to: [path.resolve(__dirname, 'src/rhino-editor/exports/styles/trix.css')],
},
verbose: false,
watch: true,

}),
]
}

build(outputFolder, esbuildOptions)
5 changes: 5 additions & 0 deletions docs/frontend/javascript/src/lazy-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@ export default function lazyLoader() {
);
},
},
"light-preview": {
register () {
import("light-pen/exports/components/light-preview/light-preview-register.js")
}
}
},
}).start();
}
11 changes: 11 additions & 0 deletions docs/frontend/styles/_content.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,14 @@ code.highlighter-rouge {
color: var(--code-color);
}

:is(h1,h2,h3,h4,h5,h6)[id] a {
color: var(--sl-color-neutral-900);
text-decoration-color: var(--sl-color-primary-400);
text-decoration-thickness: 4px;
}


:is(h1,h2,h3,h4,h5,h6)[id] a:hover {
color: var(--sl-color-primary-600);
}

9 changes: 8 additions & 1 deletion docs/frontend/styles/_normalize.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ html {
box-sizing: border-box;
height: 100%;
scrollbar-gutter: stable;
/* letter-spacing: 0.025em; */
-webkit-box-decoration-break: clone;
box-decoration-break: clone;
}


*, *:before, *:after {
box-sizing: border-box;
}
Expand All @@ -25,6 +27,11 @@ body {
font-size: 115%;
}


light-code {
isolation: isolate;
}

[hidden] {
display: none !important;
}
Expand Down
1 change: 1 addition & 0 deletions docs/frontend/styles/_overrides.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import "./overrides/bridgetown-ninja-keys.css";
@import "./overrides/rhino-editor.css";
@import "./overrides/shoelace.css";
@import "./overrides/light-pen.css";
Loading

0 comments on commit 819efe7

Please sign in to comment.