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.

Sign up for GitHub

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

Update dependencies #1835

Merged
merged 1 commit into from
Oct 16, 2024
+820 −897
Merged

Update dependencies #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 84 additions & 4 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,104 @@ permissions:
contents: read

jobs:
lint:
name: Lint
rubocop:
name: RuboCop
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: tj-actions/changed-files@v45
id: changed-files
with:
files: |
.github/workflows/lint.yml
.rubocop.yml
**.rb
**.rake
Gemfile*
Rakefile
- name: Set up Ruby
if: steps.changed-files.outputs.any_changed == 'true'
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.5'
bundler-cache: true
- name: Run RuboCop
if: steps.changed-files.outputs.any_changed == 'true'
run: bundle exec rubocop --format github

slimlint:
name: Slim-Lint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: tj-actions/changed-files@v45
id: changed-files
with:
files: |
.github/workflows/lint.yml
.slim-lint.yml
**.slim
- name: Set up Ruby
if: steps.changed-files.outputs.any_changed == 'true'
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.5'
bundler-cache: true
- name: Run Slim-Lint
if: steps.changed-files.outputs.any_changed == 'true'
run: bundle exec slim-lint . -r github

eslint:
name: ESLint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: tj-actions/changed-files@v45
id: changed-files
with:
files: |
.eslintignore
.eslintrc.cjs
.github/workflows/lint.yml
app/**/*.js
- uses: pnpm/action-setup@v4
- name: Set up Node
if: steps.changed-files.outputs.any_changed == 'true'
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
- name: Install node dependencies
run: pnpm install
- name: Run ESLint
if: steps.changed-files.outputs.any_changed == 'true'
run: pnpm eslint app/**/*.js

stylelint:
name: Stylelint
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: tj-actions/changed-files@v45
id: changed-files
with:
files: |
.github/workflows/lint.yml
.stylelintrc
app/**/*.{scss,css}
- uses: pnpm/action-setup@v4
- name: Set up Node
if: steps.changed-files.outputs.any_changed == 'true'
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'pnpm'
- name: Install node dependencies
run: pnpm install
- name: Run lints
run: bundle exec rake lint
- name: Run Stylelint
if: steps.changed-files.outputs.any_changed == 'true'
run: pnpm stylelint app/**/*.{scss,css} --formatter=github
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ end

ruby '3.3.5'

gem 'rails', '7.1.4'
gem 'rails', '7.1.4.1'

gem 'activerecord-postgis-adapter', '~> 9.0'
gem 'airbrake', '~> 13.0'
Expand Down
116 changes: 58 additions & 58 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,74 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (7.1.4)
actionpack (= 7.1.4)
activesupport (= 7.1.4)
actioncable (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
zeitwerk (~> 2.6)
actionmailbox (7.1.4)
actionpack (= 7.1.4)
activejob (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
actionmailbox (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.1.4)
actionpack (= 7.1.4)
actionview (= 7.1.4)
activejob (= 7.1.4)
activesupport (= 7.1.4)
actionmailer (7.1.4.1)
actionpack (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activesupport (= 7.1.4.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.2)
actionpack (7.1.4)
actionview (= 7.1.4)
activesupport (= 7.1.4)
actionpack (7.1.4.1)
actionview (= 7.1.4.1)
activesupport (= 7.1.4.1)
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.4)
actionpack (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
actiontext (7.1.4.1)
actionpack (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.1.4)
activesupport (= 7.1.4)
actionview (7.1.4.1)
activesupport (= 7.1.4.1)
builder (~> 3.1)
erubi (~> 1.11)
rails-dom-testing (~> 2.2)
rails-html-sanitizer (~> 1.6)
activejob (7.1.4)
activesupport (= 7.1.4)
activejob (7.1.4.1)
activesupport (= 7.1.4.1)
globalid (>= 0.3.6)
activemodel (7.1.4)
activesupport (= 7.1.4)
activerecord (7.1.4)
activemodel (= 7.1.4)
activesupport (= 7.1.4)
activemodel (7.1.4.1)
activesupport (= 7.1.4.1)
activerecord (7.1.4.1)
activemodel (= 7.1.4.1)
activesupport (= 7.1.4.1)
timeout (>= 0.4.0)
activerecord-postgis-adapter (9.0.2)
activerecord (~> 7.1.0)
rgeo-activerecord (~> 7.0.0)
activestorage (7.1.4)
actionpack (= 7.1.4)
activejob (= 7.1.4)
activerecord (= 7.1.4)
activesupport (= 7.1.4)
activestorage (7.1.4.1)
actionpack (= 7.1.4.1)
activejob (= 7.1.4.1)
activerecord (= 7.1.4.1)
activesupport (= 7.1.4.1)
marcel (~> 1.0)
activesupport (7.1.4)
activesupport (7.1.4.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -231,7 +231,7 @@ GEM
mutex_m (0.2.0)
net-http (0.4.1)
uri
net-imap (0.4.16)
net-imap (0.4.17)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -287,7 +287,7 @@ GEM
puma (6.4.3)
nio4r (~> 2.0)
racc (1.8.1)
rack (3.1.7)
rack (3.1.8)
rack-protection (4.0.0)
base64 (>= 0.1.0)
rack (>= 3.0.0, < 4)
Expand All @@ -300,30 +300,30 @@ GEM
rackup (2.1.0)
rack (>= 3)
webrick (~> 1.8)
rails (7.1.4)
actioncable (= 7.1.4)
actionmailbox (= 7.1.4)
actionmailer (= 7.1.4)
actionpack (= 7.1.4)
actiontext (= 7.1.4)
actionview (= 7.1.4)
activejob (= 7.1.4)
activemodel (= 7.1.4)
activerecord (= 7.1.4)
activestorage (= 7.1.4)
activesupport (= 7.1.4)
rails (7.1.4.1)
actioncable (= 7.1.4.1)
actionmailbox (= 7.1.4.1)
actionmailer (= 7.1.4.1)
actionpack (= 7.1.4.1)
actiontext (= 7.1.4.1)
actionview (= 7.1.4.1)
activejob (= 7.1.4.1)
activemodel (= 7.1.4.1)
activerecord (= 7.1.4.1)
activestorage (= 7.1.4.1)
activesupport (= 7.1.4.1)
bundler (>= 1.15.0)
railties (= 7.1.4)
railties (= 7.1.4.1)
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.4)
actionpack (= 7.1.4)
activesupport (= 7.1.4)
railties (7.1.4.1)
actionpack (= 7.1.4.1)
activesupport (= 7.1.4.1)
irb
rackup (>= 1.0.0)
rake (>= 12.2)
Expand Down Expand Up @@ -369,7 +369,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.66.1)
rubocop (1.67.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down Expand Up @@ -474,7 +474,7 @@ GEM
xpath (3.2.0)
nokogiri (~> 1.8)
zache (0.13.2)
zeitwerk (2.6.18)
zeitwerk (2.7.0)

PLATFORMS
ruby
Expand Down Expand Up @@ -508,7 +508,7 @@ DEPENDENCIES
pry-byebug
pry-rails
puma (~> 6.4)
rails (= 7.1.4)
rails (= 7.1.4.1)
rgeo (~> 3.0)
rspec-rails
rubocop-capybara
Expand Down
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
},
"packageManager": "pnpm@^9.12.1",
"dependencies": {
"@babel/core": "^7.25.7",
"@babel/core": "^7.25.8",
"@babel/plugin-transform-runtime": "^7.25.7",
"@babel/preset-env": "^7.25.7",
"@babel/preset-env": "^7.25.8",
"@babel/runtime": "^7.25.7",
"@client-side-validations/client-side-validations": "^0.4.0",
"@client-side-validations/simple-form": "^0.4.0",
"@fortawesome/fontawesome-svg-core": "^6.6.0",
"@fortawesome/free-brands-svg-icons": "^6.6.0",
"@fortawesome/free-solid-svg-icons": "^6.6.0",
"@popperjs/core": "^2.11.8",
"@rails/actioncable": "7.1.400",
"@rails/activestorage": "7.1.400",
"@rails/actioncable": "7.1.401",
"@rails/activestorage": "7.1.401",
"babel-loader": "^9.2.1",
"babel-plugin-macros": "^3.1.0",
"bootstrap": "~5.3.3",
Expand All @@ -30,15 +30,15 @@
"expose-loader": "^5.0.0",
"handlebars": "^4.7.8",
"handlebars-loader": "^1.7.3",
"i18n-js": "^4.4.3",
"i18n-js": "^4.5.0",
"jquery": "^3.7.1",
"jquery-ujs": "^1.2.3",
"mini-css-extract-plugin": "^2.9.1",
"postcss": "^8.4.47",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^16.1.0",
"postcss-loader": "^8.1.1",
"postcss-preset-env": "^10.0.6",
"postcss-preset-env": "^10.0.7",
"resolve-url-loader": "^5.0.0",
"sass": "1.77.6",
"sass-loader": "^16.0.2",
Expand All @@ -52,7 +52,7 @@
"webpack-merge": "^6.0.1"
},
"devDependencies": {
"@babel/eslint-parser": "^7.25.7",
"@babel/eslint-parser": "^7.25.8",
"@types/express": "^4.17.21",
"@webpack-cli/serve": "^2.0.5",
"eslint": "^8.57.1",
Expand All @@ -61,10 +61,10 @@
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-promise": "^6.6.0",
"eslint-webpack-plugin": "^4.2.0",
"stylelint": "^16.9.0",
"stylelint": "^16.10.0",
"stylelint-config-twbs-bootstrap": "^15.1.0",
"stylelint-order": "^6.0.4",
"stylelint-scss": "^6.7.0",
"stylelint-scss": "^6.8.0",
"stylelint-webpack-plugin": "^5.0.1",
"webpack-dev-server": "^5.1.0"
},
Expand Down
Loading
Loading