Skip to content

Commit

Permalink
Merge branch 'bundless'
Browse files Browse the repository at this point in the history 
* bundless:
  fix: alias @proscenium/stimulus-loading
  chore: Support for Rails 8
  chore: bump version to 0.19.0.beta4
  fix(bundless): ensure absolute path is returned for external imports
  chore: bump to 0.19.0.beta3
  fix: vendored engines
  chore: bump ruby version to 3.3.6
  fix: test/build_bundless_test.go: fix test to not depend on absolute paths
  chore: Bump version to 0.19.0.beta2
  fix: correctly resolve vendored engine paths in resolver
  chore: Bump version to 0.19.0.beta1
  chore: Unify libs and UI libs and support bundless
  chore(deps): Update ruby deps
  chore(deps): Update go deps
  Added bundle config option (true by default) to enable/disable bundling
  • Loading branch information
@joelmoss
joelmoss committed Jan 4, 2025
2 parents f6b0845 + c29d020 commit e1aac65
Show file tree
Hide file tree
Showing 140 changed files with 11,593 additions and 894 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6
2 changes: 1 addition & 1 deletion Appraisals
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ appraise 'rails-7.2' do
end

appraise 'rails-8' do
gem 'rails', '~> 8.0.0'
gem 'rails', '~> 8.0.1'
end
1 change: 1 addition & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ group :test do
gem 'gem2', path: './fixtures/external/gem2'
gem 'gem3', path: './fixtures/dummy/vendor/gem3'
gem 'gem4', path: './fixtures/external/gem4'
gem 'gem5', path: './fixtures/dummy/vendor/bundle/ruby/3.3.0/bundler/gems/gem5'
gem 'maxitest'
gem 'minitest-focus'
gem 'minitest-spec-rails'
Expand Down
186 changes: 98 additions & 88 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
PATH
remote: .
specs:
proscenium (0.18.0)
proscenium (0.19.0.beta4)
activesupport (>= 7.1.0, < 9.0)
ffi (~> 1.17.0)
literal (~> 1.0)
oj (~> 3.13)
railties (>= 7.1.0, < 9.0)
ruby-next (~> 1.0.1)

PATH
remote: fixtures/dummy/vendor/bundle/ruby/3.3.0/bundler/gems/gem5
specs:
gem5 (0.1.0)
rails (>= 7.0.4)

PATH
remote: fixtures/dummy/vendor/gem1
specs:
Expand Down Expand Up @@ -36,29 +42,29 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
actioncable (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actionmailbox (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
actionmailer (7.2.2)
actionpack (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activesupport (= 7.2.2)
actionmailer (7.2.2.1)
actionpack (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activesupport (= 7.2.2.1)
mail (>= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.2)
actionview (= 7.2.2)
activesupport (= 7.2.2)
actionpack (7.2.2.1)
actionview (= 7.2.2.1)
activesupport (= 7.2.2.1)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4, < 3.2)
Expand All @@ -67,35 +73,35 @@ GEM
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
useragent (~> 0.16)
actiontext (7.2.2)
actionpack (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
actiontext (7.2.2.1)
actionpack (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.2.2)
activesupport (= 7.2.2)
actionview (7.2.2.1)
activesupport (= 7.2.2.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.2.2)
activesupport (= 7.2.2)
activejob (7.2.2.1)
activesupport (= 7.2.2.1)
globalid (>= 0.3.6)
activemodel (7.2.2)
activesupport (= 7.2.2)
activerecord (7.2.2)
activemodel (= 7.2.2)
activesupport (= 7.2.2)
activemodel (7.2.2.1)
activesupport (= 7.2.2.1)
activerecord (7.2.2.1)
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activestorage (7.2.2)
actionpack (= 7.2.2)
activejob (= 7.2.2)
activerecord (= 7.2.2)
activesupport (= 7.2.2)
activestorage (7.2.2.1)
actionpack (= 7.2.2.1)
activejob (= 7.2.2.1)
activerecord (= 7.2.2.1)
activesupport (= 7.2.2.1)
marcel (~> 1.0)
activesupport (7.2.2)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand Down Expand Up @@ -135,14 +141,14 @@ GEM
cuprite (0.15.1)
capybara (~> 3.0)
ferrum (~> 0.15.0)
date (3.4.0)
debug (1.9.2)
date (3.4.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
diff-lcs (1.5.1)
drb (2.2.1)
erubi (1.13.0)
fakefs (2.5.0)
erubi (1.13.1)
fakefs (2.8.0)
ferrum (0.15)
addressable (~> 2.5)
concurrent-ruby (~> 1.1)
Expand All @@ -155,14 +161,14 @@ GEM
htmlbeautifier (1.4.3)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.1)
io-console (0.8.0)
irb (1.14.3)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.8.2)
json (2.9.1)
language_server-protocol (3.17.0.3)
literal (1.1.0)
logger (1.6.1)
literal (1.4.0)
logger (1.6.4)
loofah (2.23.1)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -177,13 +183,13 @@ GEM
minitest (>= 5.14.0, < 5.26.0)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.1)
minitest (5.25.4)
minitest-focus (1.4.0)
minitest (>= 4, < 6)
minitest-spec-rails (7.4.1)
minitest (>= 5.0)
railties (>= 4.1)
net-imap (0.5.1)
net-imap (0.5.3)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -193,11 +199,11 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.16.7-arm64-darwin)
nokogiri (1.17.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
nokogiri (1.17.2-x86_64-linux)
racc (~> 1.4)
oj (3.16.7)
oj (3.16.9)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
ostruct (0.6.1)
Expand All @@ -216,10 +222,11 @@ GEM
phlexible (2.0.0)
phlex (>= 1.10.0, < 2.0.0)
phlex-rails (>= 1.2.1, < 2.0.0)
psych (5.2.0)
psych (5.2.2)
date
stringio
public_suffix (6.0.1)
puma (6.4.3)
puma (6.5.0)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.8)
Expand All @@ -229,55 +236,55 @@ GEM
rack (>= 1.3)
rackup (2.2.1)
rack (>= 3)
rails (7.2.2)
actioncable (= 7.2.2)
actionmailbox (= 7.2.2)
actionmailer (= 7.2.2)
actionpack (= 7.2.2)
actiontext (= 7.2.2)
actionview (= 7.2.2)
activejob (= 7.2.2)
activemodel (= 7.2.2)
activerecord (= 7.2.2)
activestorage (= 7.2.2)
activesupport (= 7.2.2)
rails (7.2.2.1)
actioncable (= 7.2.2.1)
actionmailbox (= 7.2.2.1)
actionmailer (= 7.2.2.1)
actionpack (= 7.2.2.1)
actiontext (= 7.2.2.1)
actionview (= 7.2.2.1)
activejob (= 7.2.2.1)
activemodel (= 7.2.2.1)
activerecord (= 7.2.2.1)
activestorage (= 7.2.2.1)
activesupport (= 7.2.2.1)
bundler (>= 1.15.0)
railties (= 7.2.2)
railties (= 7.2.2.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.2.2)
actionpack (= 7.2.2)
activesupport (= 7.2.2)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (7.2.2.1)
actionpack (= 7.2.2.1)
activesupport (= 7.2.2.1)
irb (~> 1.13)
rackup (>= 1.0.0)
rake (>= 12.2)
thor (~> 1.0, >= 1.2.2)
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.8.1)
rdoc (6.10.0)
psych (>= 4.0.0)
regexp_parser (2.9.2)
reline (0.5.11)
regexp_parser (2.9.3)
reline (0.6.0)
io-console (~> 0.5)
require-hooks (0.2.2)
rouge (4.5.1)
rubocop (1.68.0)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-minitest (0.36.0)
rubocop (>= 1.61, < 2.0)
Expand All @@ -299,20 +306,22 @@ GEM
ruby-next-parser (3.2.2.0)
parser (>= 3.0.3.1)
ruby-progressbar (1.13.0)
securerandom (0.3.2)
sqlite3 (2.2.0-arm64-darwin)
sqlite3 (2.2.0-x86_64-linux-gnu)
securerandom (0.4.1)
sqlite3 (2.4.1-arm64-darwin)
sqlite3 (2.4.1-x86_64-linux-gnu)
stringio (3.1.2)
thor (1.3.2)
timeout (0.4.2)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.1.2)
unicode-emoji (~> 4.0, >= 4.0.4)
unicode-emoji (4.0.4)
unparser (0.6.15)
diff-lcs (~> 1.3)
parser (>= 3.3.0)
useragent (0.16.10)
view_component (3.20.0)
useragent (0.16.11)
view_component (3.21.0)
activesupport (>= 5.2.0, < 8.1)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand All @@ -321,7 +330,7 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webrick (1.9.0)
webrick (1.9.1)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -347,6 +356,7 @@ DEPENDENCIES
gem2!
gem3!
gem4!
gem5!
htmlbeautifier
maxitest
minitest-focus
Expand Down
7 changes: 7 additions & 0 deletions fixtures/dummy/lib/engines/fonts.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@font-face {
font-family: SomeFont;
font-weight: 300;
font-style: normal;
font-display: swap;
src: local("SomeFont"), url("/gem5/somefont.woff2") format("woff2");
}
1 change: 1 addition & 0 deletions fixtures/dummy/lib/engines/gem3.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import "/gem3/lib/gem3/console.js";
1 change: 1 addition & 0 deletions fixtures/dummy/lib/import_npm_module_with_ext.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "mypackage/styles.css";
0 fixtures/dummy/lib/svg/absolute.jsx → fixtures/dummy/lib/svg/absolute_jsx.jsx
View file
File renamed without changes.
0 fixtures/dummy/lib/svg/absolute.tsx → fixtures/dummy/lib/svg/absolute_tsx.tsx
View file
File renamed without changes.
3 changes: 3 additions & 0 deletions fixtures/dummy/lib/ui/test.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import "@proscenium/ui/test";

console.log("lib/ui/test.js");
6 changes: 5 additions & 1 deletion fixtures/dummy/node_modules/.modules.yaml
View file

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

Loading

0 comments on commit e1aac65

Please sign in to comment.