Skip to content

Commit

Permalink
Merge pull request #70 from maglevhq/upgrade-to-vite5
Browse files Browse the repository at this point in the history
chore: upgrade to vite5
  • Loading branch information
did authored Dec 5, 2023
2 parents 4943329 + f286cad commit cc7568d
Show file tree
Hide file tree
Showing 93 changed files with 1,636 additions and 1,413 deletions.
16 changes: 2 additions & 14 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ module.exports = {
jest: true,
},
extends: [
'plugin:vue/essential',
'eslint:recommended',
'@vue/prettier',
'plugin:vue/essential',
'prettier'
],
parserOptions: {
ecmaVersion: 2020,
Expand All @@ -17,18 +17,6 @@ module.exports = {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
quotes: [2, 'single', { avoidEscape: true, allowTemplateLiterals: true }],
'prettier/prettier': [
'warn',
{
semi: false,
trailingComma: 'all',
singleQuote: true,
printWidth: 80,
tabWidth: 2,
arrow_parens: 'avoid',
endOfLine: 'lf',
},
],
},
overrides: [
{
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
node: [16, 18]
node: [18]
gemfile: ["Gemfile.legacy", "Gemfile"]

steps:
Expand Down Expand Up @@ -60,4 +60,8 @@ jobs:
run: bundle exec rspec

- name: Run Javascript tests
run: yarn test
run: yarn test

# NOTE: disabled because an error of eslint in the GH env
# - name: Run Javascript linter
# run: yarn lint
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,11 @@ node_modules
# https://vitejs.dev/guide/env-and-mode.html#env-files
*.local


# Vite Ruby
/public/vite*
node_modules
# Vite uses dotenv and suggests to ignore local-only env files. See
# https://vitejs.dev/guide/env-and-mode.html#env-files
*.local

9 changes: 5 additions & 4 deletions Gemfile.legacy.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ PATH
kaminari (~> 1.2.1)
maglev-injectable (~> 2.1.1)
rails (>= 6, < 7.2)
vite_rails (>= 3, <= 4)
vite_rails (>= 3, < 4)
vite_ruby (>= 3.5)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -145,7 +146,7 @@ GEM
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pg (1.4.6)
pg (1.5.4)
racc (1.7.3)
rack (2.2.8)
rack-proxy (0.7.7)
Expand Down Expand Up @@ -267,7 +268,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.3.4)
vite_ruby (3.5.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand All @@ -288,7 +289,7 @@ DEPENDENCIES
maglevcms!
mini_magick (~> 4.11)
nokogiri (>= 1.13.10)
pg (~> 1.4.3)
pg (~> 1.5.4)
rails (~> 6.1)
rspec-rails
rubocop
Expand Down
145 changes: 72 additions & 73 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,75 +6,77 @@ PATH
kaminari (~> 1.2.1)
maglev-injectable (~> 2.1.1)
rails (>= 6, < 7.2)
vite_rails (>= 3, <= 4)
vite_rails (>= 3, < 4)
vite_ruby (>= 3.5)

GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.1)
actionpack (= 7.1.1)
activesupport (= 7.1.1)
actioncable (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.1)
actionpack (= 7.1.1)
activejob (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
actionmailbox (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.1)
actionpack (= 7.1.1)
actionview (= 7.1.1)
activejob (= 7.1.1)
activesupport (= 7.1.1)
actionmailer (7.1.2)
actionpack (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activesupport (= 7.1.2)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.1)
actionview (= 7.1.1)
activesupport (= 7.1.1)
actionpack (7.1.2)
actionview (= 7.1.2)
activesupport (= 7.1.2)
nokogiri (>= 1.8.5)
racc
rack (>= 2.2.4)
rack-session (>= 1.0.1)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
actiontext (7.1.1)
actionpack (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
actiontext (7.1.2)
actionpack (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.1)
activesupport (= 7.1.1)
actionview (7.1.2)
activesupport (= 7.1.2)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.1)
activesupport (= 7.1.1)
activejob (7.1.2)
activesupport (= 7.1.2)
globalid (>= 0.3.6)
activemodel (7.1.1)
activesupport (= 7.1.1)
activerecord (7.1.1)
activemodel (= 7.1.1)
activesupport (= 7.1.1)
activemodel (7.1.2)
activesupport (= 7.1.2)
activerecord (7.1.2)
activemodel (= 7.1.2)
activesupport (= 7.1.2)
timeout (>= 0.4.0)
activestorage (7.1.1)
actionpack (= 7.1.1)
activejob (= 7.1.1)
activerecord (= 7.1.1)
activesupport (= 7.1.1)
activestorage (7.1.2)
actionpack (= 7.1.2)
activejob (= 7.1.2)
activerecord (= 7.1.2)
activesupport (= 7.1.2)
marcel (~> 1.0)
activesupport (7.1.1)
activesupport (7.1.2)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand All @@ -86,7 +88,7 @@ GEM
tzinfo (~> 2.0)
ast (2.4.2)
base64 (0.2.0)
bcrypt (3.1.19)
bcrypt (3.1.20)
bigdecimal (3.1.4)
builder (3.2.4)
concurrent-ruby (1.2.2)
Expand Down Expand Up @@ -116,7 +118,7 @@ GEM
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
io-console (0.6.0)
irb (1.8.3)
irb (1.9.1)
rdoc
reline (>= 0.3.8)
jbuilder (2.11.5)
Expand All @@ -136,7 +138,7 @@ GEM
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
language_server-protocol (3.17.0.3)
loofah (2.21.4)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
maglev-injectable (2.1.1)
Expand All @@ -150,7 +152,7 @@ GEM
mini_mime (1.1.5)
minitest (5.20.0)
mutex_m (0.2.0)
net-imap (0.4.4)
net-imap (0.4.6)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -159,18 +161,16 @@ GEM
timeout
net-smtp (0.4.0)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
nio4r (2.6.1)
nokogiri (1.15.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
parallel (1.23.0)
parser (3.2.2.4)
ast (~> 2.4.1)
racc
pg (1.4.6)
pg (1.5.4)
psych (5.1.1.1)
stringio
racc (1.7.3)
Expand All @@ -184,30 +184,30 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.1)
actioncable (= 7.1.1)
actionmailbox (= 7.1.1)
actionmailer (= 7.1.1)
actionpack (= 7.1.1)
actiontext (= 7.1.1)
actionview (= 7.1.1)
activejob (= 7.1.1)
activemodel (= 7.1.1)
activerecord (= 7.1.1)
activestorage (= 7.1.1)
activesupport (= 7.1.1)
rails (7.1.2)
actioncable (= 7.1.2)
actionmailbox (= 7.1.2)
actionmailer (= 7.1.2)
actionpack (= 7.1.2)
actiontext (= 7.1.2)
actionview (= 7.1.2)
activejob (= 7.1.2)
activemodel (= 7.1.2)
activerecord (= 7.1.2)
activestorage (= 7.1.2)
activesupport (= 7.1.2)
bundler (>= 1.15.0)
railties (= 7.1.1)
railties (= 7.1.2)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.1.1)
actionpack (= 7.1.1)
activesupport (= 7.1.1)
railties (7.1.2)
actionpack (= 7.1.2)
activesupport (= 7.1.2)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand All @@ -218,7 +218,7 @@ GEM
rdoc (6.6.0)
psych (>= 4.0.0)
regexp_parser (2.8.2)
reline (0.4.0)
reline (0.4.1)
io-console (~> 0.5)
rexml (3.2.6)
rspec-core (3.12.2)
Expand All @@ -229,7 +229,7 @@ GEM
rspec-mocks (3.12.6)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-rails (6.0.3)
rspec-rails (6.1.0)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
Expand Down Expand Up @@ -264,10 +264,11 @@ GEM
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.22.1)
rubocop-rails (2.22.2)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rails_config (1.16.0)
rubocop (>= 1.57.0)
rubocop-ast (>= 1.26.0)
Expand Down Expand Up @@ -297,7 +298,7 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
stringio (3.0.9)
stringio (3.1.0)
thor (1.3.0)
timeout (0.4.1)
tzinfo (2.0.6)
Expand All @@ -306,7 +307,7 @@ GEM
vite_rails (3.0.17)
railties (>= 5.1, < 8)
vite_ruby (~> 3.0, >= 3.2.2)
vite_ruby (3.3.4)
vite_ruby (3.5.0)
dry-cli (>= 0.7, < 2)
rack-proxy (~> 0.6, >= 0.6.1)
zeitwerk (~> 2.2)
Expand All @@ -317,8 +318,6 @@ GEM
zeitwerk (2.6.12)

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

Expand All @@ -329,7 +328,7 @@ DEPENDENCIES
image_processing (~> 1.12.2)
maglevcms!
nokogiri (>= 1.13.10)
pg (~> 1.4.3)
pg (~> 1.5.4)
rails (~> 7.1)
rspec-rails
rubocop
Expand All @@ -339,4 +338,4 @@ DEPENDENCIES
sprockets-rails

BUNDLED WITH
2.3.10
2.4.22
Loading

0 comments on commit cc7568d

Please sign in to comment.