Skip to content

Commit 819efe7

Browse files
authored
Merge pull request #203 from KonnorRogers/main
Main -> Latest
2 parents be6b0ab + 07efbb8 commit 819efe7

Some content is hidden

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

59 files changed

+7338
-3946
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
ruby: ['2.7', '3.0', '3.1']
25+
ruby: ['3.2', '3.1']
2626
node-version: [20.x]
2727

2828
services:
@@ -85,6 +85,7 @@ jobs:
8585
- name: Install via pnpm
8686
run: |
8787
pnpm run setup
88+
pnpm exec playwright install
8889
- name: Lint
8990
run: |
9091
pnpm run lint
@@ -97,7 +98,6 @@ jobs:
9798
pnpm run test:rails
9899
- name: Doc Tests
99100
run: |
100-
pnpm exec playwright install --with-deps
101101
pnpm run test:docs
102102
- name: Unit Tests
103103
run: |

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
nodejs 20.9.0
2-
ruby 3.0.4
2+
ruby 3.3.4

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# Changelog
22

3+
## 0.11.0
4+
5+
### Minor Changes
6+
7+
- [#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.
8+
9+
- [#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
10+
11+
- [#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.
12+
13+
- [#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
14+
15+
- [#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.
16+
17+
### Patch Changes
18+
19+
- [#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
20+
21+
- [#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
22+
323
## 0.10.2
424

525
### Patch Changes

docs/.tool-versions

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
1717
# This will help ensure the proper Bridgetown version is running.
1818
####
1919

20-
gem "bridgetown", "~> 1.3"
20+
gem "bridgetown", "~> 2.0.0.beta2"
2121

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

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

33-
gem "bridgetown-quick-search", "~> 2.0"
33+
gem "bridgetown-quick-search", "~> 3.0"

docs/Gemfile.lock

Lines changed: 71 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,82 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activemodel (7.1.3.3)
5-
activesupport (= 7.1.3.3)
6-
activesupport (7.1.3.3)
4+
activesupport (7.2.1)
75
base64
86
bigdecimal
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
7+
concurrent-ruby (~> 1.0, >= 1.3.1)
108
connection_pool (>= 2.2.5)
119
drb
1210
i18n (>= 1.6, < 2)
11+
logger (>= 1.4.2)
1312
minitest (>= 5.1)
14-
mutex_m
15-
tzinfo (~> 2.0)
16-
addressable (2.8.6)
17-
public_suffix (>= 2.0.2, < 6.0)
13+
securerandom (>= 0.3)
14+
tzinfo (~> 2.0, >= 2.0.5)
15+
addressable (2.8.7)
16+
public_suffix (>= 2.0.2, < 7.0)
1817
amazing_print (1.6.0)
1918
base64 (0.2.0)
2019
bigdecimal (3.1.8)
21-
bridgetown (1.3.4)
22-
bridgetown-builder (= 1.3.4)
23-
bridgetown-core (= 1.3.4)
24-
bridgetown-paginate (= 1.3.4)
25-
bridgetown-builder (1.3.4)
26-
bridgetown-core (= 1.3.4)
27-
bridgetown-core (1.3.4)
28-
activemodel (>= 6.0, < 8.0)
20+
bridgetown (2.0.0.beta2)
21+
bridgetown-builder (= 2.0.0.beta2)
22+
bridgetown-core (= 2.0.0.beta2)
23+
bridgetown-foundation (= 2.0.0.beta2)
24+
bridgetown-paginate (= 2.0.0.beta2)
25+
bridgetown-builder (2.0.0.beta2)
26+
bridgetown-core (= 2.0.0.beta2)
27+
bridgetown-core (2.0.0.beta2)
2928
activesupport (>= 6.0, < 8.0)
3029
addressable (~> 2.4)
3130
amazing_print (~> 1.2)
32-
colorator (~> 1.0)
31+
bridgetown-foundation (= 2.0.0.beta2)
3332
csv (~> 3.2)
33+
dry-inflector (>= 1.0)
3434
erubi (~> 1.9)
3535
faraday (~> 2.0)
3636
faraday-follow_redirects (~> 0.3)
37-
hash_with_dot_access (~> 1.2)
3837
i18n (~> 1.0)
3938
kramdown (~> 2.1)
4039
kramdown-parser-gfm (~> 1.0)
4140
liquid (>= 5.0, < 5.5)
4241
listen (~> 3.0)
42+
rack (>= 3.0)
43+
rackup (~> 2.0)
4344
rake (>= 13.0)
4445
roda (~> 3.46)
4546
rouge (>= 3.0, < 5.0)
46-
serbea (~> 1.0)
47+
serbea (~> 2.1)
48+
signalize (~> 1.3)
49+
streamlined (>= 0.5.2)
4750
thor (~> 1.1)
4851
tilt (~> 2.0)
4952
zeitwerk (~> 2.5)
50-
bridgetown-paginate (1.3.4)
51-
bridgetown-core (= 1.3.4)
52-
bridgetown-quick-search (2.0.0)
53-
bridgetown (>= 1.2.0.beta2, < 2.0)
54-
colorator (1.1.0)
55-
concurrent-ruby (1.2.3)
53+
bridgetown-foundation (2.0.0.beta2)
54+
hash_with_dot_access (~> 2.0)
55+
inclusive (~> 1.0)
56+
zeitwerk (~> 2.5)
57+
bridgetown-paginate (2.0.0.beta2)
58+
bridgetown-core (= 2.0.0.beta2)
59+
bridgetown-quick-search (3.0.3)
60+
bridgetown (>= 1.2.0.beta2, < 3.0)
61+
concurrent-ruby (1.3.4)
5662
connection_pool (2.4.1)
5763
csv (3.3.0)
5864
drb (2.2.1)
59-
erubi (1.12.0)
60-
faraday (2.9.0)
65+
dry-inflector (1.1.0)
66+
erubi (1.13.0)
67+
faraday (2.10.1)
6168
faraday-net_http (>= 2.0, < 3.2)
69+
logger
6270
faraday-follow_redirects (0.3.0)
6371
faraday (>= 1, < 3)
64-
faraday-net_http (3.1.0)
72+
faraday-net_http (3.1.1)
6573
net-http
66-
ffi (1.16.3)
67-
hash_with_dot_access (1.2.0)
68-
activesupport (>= 5.0.0, < 8.0)
74+
ffi (1.17.0-arm64-darwin)
75+
ffi (1.17.0-x86_64-linux-gnu)
76+
hash_with_dot_access (2.1.1)
6977
i18n (1.14.5)
7078
concurrent-ruby (~> 1.0)
79+
inclusive (1.0.0)
7180
kramdown (2.4.0)
7281
rexml
7382
kramdown-parser-gfm (1.1.0)
@@ -76,51 +85,61 @@ GEM
7685
listen (3.9.0)
7786
rb-fsevent (~> 0.10, >= 0.10.3)
7887
rb-inotify (~> 0.9, >= 0.9.10)
79-
minitest (5.23.1)
80-
mutex_m (0.2.0)
88+
logger (1.6.0)
89+
minitest (5.25.1)
8190
net-http (0.4.1)
8291
uri
83-
nio4r (2.5.8)
84-
nokogiri (1.13.9-arm64-darwin)
92+
nio4r (2.7.3)
93+
nokogiri (1.16.7-arm64-darwin)
8594
racc (~> 1.4)
86-
nokogiri (1.13.9-x86_64-linux)
95+
nokogiri (1.16.7-x86_64-linux)
8796
racc (~> 1.4)
88-
public_suffix (5.0.5)
89-
puma (5.6.5)
97+
public_suffix (6.0.1)
98+
puma (6.4.2)
9099
nio4r (~> 2.0)
91-
racc (1.6.0)
92-
rack (3.0.11)
100+
racc (1.8.1)
101+
rack (3.1.7)
102+
rackup (2.1.0)
103+
rack (>= 3)
104+
webrick (~> 1.8)
93105
rake (13.2.1)
94106
rb-fsevent (0.11.2)
95107
rb-inotify (0.11.1)
96108
ffi (~> 1.0)
97-
rexml (3.2.8)
98-
strscan (>= 3.0.9)
99-
roda (3.80.0)
109+
rexml (3.3.6)
110+
strscan
111+
roda (3.83.0)
100112
rack
101-
rouge (4.2.1)
102-
serbea (1.0.1)
103-
activesupport (>= 6.0)
113+
rouge (4.3.0)
114+
securerandom (0.3.1)
115+
serbea (2.2.0)
104116
erubi (>= 1.10)
105117
tilt (~> 2.0)
118+
signalize (1.3.0)
119+
concurrent-ruby (~> 1.2)
120+
streamlined (0.5.2)
121+
serbea (>= 2.1)
122+
zeitwerk (~> 2.5)
106123
strscan (3.1.0)
107124
thor (1.3.1)
108-
tilt (2.3.0)
125+
tilt (2.4.0)
109126
tzinfo (2.0.6)
110127
concurrent-ruby (~> 1.0)
111128
uri (0.13.0)
112-
zeitwerk (2.6.14)
129+
webrick (1.8.1)
130+
zeitwerk (2.6.17)
113131

114132
PLATFORMS
115133
arm64-darwin-21
116134
arm64-darwin-22
135+
arm64-darwin-23
117136
x86_64-linux
118137

119138
DEPENDENCIES
120-
bridgetown (~> 1.3)
121-
bridgetown-quick-search (~> 2.0)
139+
bridgetown (~> 2.0.0.beta2)
140+
bridgetown-quick-search (~> 3.0)
122141
nokogiri (~> 1.13)
123-
puma (~> 5.6)
142+
puma (~> 6.0)
124143

125144
BUNDLED WITH
126-
2.3.22
145+
2.5.11

docs/config/esbuild.defaults.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// when an update is applied hence we strongly recommend adding overrides to
77
// `esbuild.config.js` instead of editing this file.
88
//
9-
// Shipped with Bridgetown v1.3.4
9+
// Shipped with Bridgetown v2.0.0.beta2
1010

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

docs/esbuild.config.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const build = require("./config/esbuild.defaults.js")
2+
const path = require("path")
23

34
// Update this if you need to configure a destination folder other than `output`
45
const outputFolder = "output"
@@ -7,7 +8,7 @@ const outputFolder = "output"
78
//
89
// ```
910
// const path = require("path")
10-
// const esbuildCopy = require('esbuild-plugin-copy').default
11+
const esbuildCopy = require('esbuild-plugin-copy').default
1112
// const esbuildOptions = {
1213
// plugins: [
1314
// esbuildCopy({
@@ -36,7 +37,18 @@ const esbuildOptions = {
3637
"frontend/javascript/entrypoints/syntax-highlighting.js"
3738
],
3839
splitting: true,
39-
format: "esm"
40+
format: "esm",
41+
plugins: [
42+
esbuildCopy({
43+
assets: {
44+
from: [path.resolve(__dirname, '../exports/styles/trix.css')],
45+
to: [path.resolve(__dirname, 'src/rhino-editor/exports/styles/trix.css')],
46+
},
47+
verbose: false,
48+
watch: true,
49+
50+
}),
51+
]
4052
}
4153

4254
build(outputFolder, esbuildOptions)

docs/frontend/javascript/src/lazy-loader.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ export default function lazyLoader() {
9191
);
9292
},
9393
},
94+
"light-preview": {
95+
register () {
96+
import("light-pen/exports/components/light-preview/light-preview-register.js")
97+
}
98+
}
9499
},
95100
}).start();
96101
}

docs/frontend/styles/_content.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,14 @@ code.highlighter-rouge {
3737
color: var(--code-color);
3838
}
3939

40+
:is(h1,h2,h3,h4,h5,h6)[id] a {
41+
color: var(--sl-color-neutral-900);
42+
text-decoration-color: var(--sl-color-primary-400);
43+
text-decoration-thickness: 4px;
44+
}
45+
46+
47+
:is(h1,h2,h3,h4,h5,h6)[id] a:hover {
48+
color: var(--sl-color-primary-600);
49+
}
50+

docs/frontend/styles/_normalize.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ html {
22
box-sizing: border-box;
33
height: 100%;
44
scrollbar-gutter: stable;
5-
/* letter-spacing: 0.025em; */
5+
-webkit-box-decoration-break: clone;
6+
box-decoration-break: clone;
67
}
78

9+
810
*, *:before, *:after {
911
box-sizing: border-box;
1012
}
@@ -25,6 +27,11 @@ body {
2527
font-size: 115%;
2628
}
2729

30+
31+
light-code {
32+
isolation: isolate;
33+
}
34+
2835
[hidden] {
2936
display: none !important;
3037
}

docs/frontend/styles/_overrides.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
@import "./overrides/bridgetown-ninja-keys.css";
22
@import "./overrides/rhino-editor.css";
33
@import "./overrides/shoelace.css";
4+
@import "./overrides/light-pen.css";

0 commit comments

Comments
 (0)