Skip to content

Commit

Permalink
Merge pull request #309 from diegosteiner/develop
Browse files Browse the repository at this point in the history
chore: update dependencies
  • Loading branch information
diegosteiner authored May 6, 2024
2 parents 3495aa7 + 2fdbe12 commit 488b90e
Show file tree
Hide file tree
Showing 10 changed files with 647 additions and 748 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ gem 'faker', require: false
gem 'faraday', require: false
gem 'iban-tools'
gem 'icalendar'
gem 'inline_svg'
gem 'kramdown'
gem 'liquid'
gem 'matrix'
Expand Down
36 changes: 16 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,17 @@ GEM
rake (>= 10.4, < 14.0)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.921.0)
aws-sdk-core (3.193.0)
aws-partitions (1.924.0)
aws-sdk-core (3.194.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.80.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.148.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sdk-s3 (1.149.0)
aws-sdk-core (~> 3, >= 3.194.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
Expand Down Expand Up @@ -167,9 +167,9 @@ GEM
discard (1.3.0)
activerecord (>= 4.2, < 8)
docile (1.4.0)
dotenv (3.1.0)
dotenv-rails (3.1.0)
dotenv (= 3.1.0)
dotenv (3.1.1)
dotenv-rails (3.1.1)
dotenv (= 3.1.1)
railties (>= 6.1)
drb (2.2.1)
dry-cli (1.0.0)
Expand Down Expand Up @@ -252,20 +252,17 @@ GEM
icalendar (2.10.1)
ice_cube (~> 0.16)
ice_cube (0.16.4)
inline_svg (1.9.0)
activesupport (>= 3.0)
nokogiri (>= 1.6)
interception (0.5)
io-console (0.7.2)
irb (1.12.0)
rdoc
irb (1.13.1)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.7.2)
kramdown (2.4.0)
rexml
language_server-protocol (3.17.0.3)
launchy (3.0.0)
launchy (3.0.1)
addressable (~> 2.8)
childprocess (~> 5.0)
liquid (5.5.0)
Expand Down Expand Up @@ -408,9 +405,9 @@ GEM
redis-client (0.22.1)
connection_pool
regexp_parser (2.9.0)
reline (0.5.3)
reline (0.5.5)
io-console (~> 0.5)
request_store (1.6.0)
request_store (1.7.0)
rack (>= 1.4)
responders (3.1.1)
actionpack (>= 5.2)
Expand Down Expand Up @@ -448,8 +445,8 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.2)
parser (>= 3.3.0.4)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.20.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.25.1)
Expand All @@ -462,7 +459,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (2.29.1)
rubocop-rspec (2.29.2)
rubocop (~> 1.40)
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
Expand Down Expand Up @@ -505,7 +502,7 @@ GEM
actionpack (>= 3.1)
railties (>= 3.1)
slim (>= 3.0, < 6.0, != 5.0.0)
sorbet-runtime (0.5.11361)
sorbet-runtime (0.5.11368)
squasher (0.8.0)
statesman (12.1.0)
statsd-ruby (1.5.0)
Expand Down Expand Up @@ -582,7 +579,6 @@ DEPENDENCIES
i18n-tasks-csv
iban-tools
icalendar
inline_svg
kramdown
liquid
listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def invoke # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedCompl
write_booking_log
redirect_to @result.redirect_proc || manage_booking_path(@booking), notice: t('.success')
else
ExceptionNotification.notify_exception(@result&.error) if defined?(ExceptionNotification)
ExceptionNotifier.notify_exception(@result&.error) if defined?(ExceptionNotifier)
redirect_to manage_booking_path(@booking), alert: @result&.error.presence || t('.failure')
end
end
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/components/calendar/CalendarDate.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parseISO, isSameDay } from "date-fns/esm";
import { parseISO, isSameDay } from "date-fns";
import { memo } from "react";

export type DateElementFactory = (dateString: string, label: (date: Date) => string) => React.ReactElement;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useContext, useRef, useState } from "react";
import { CalendarDate, DateElementFactory } from "../calendar/CalendarDate";
import { isAfter, isBefore } from "date-fns/esm";
import { isAfter, isBefore } from "date-fns";
import * as React from "react";
import { formatISO, isSameDay, parseISO } from "date-fns";
import Calendar, { ViewType } from "../calendar/Calendar";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useContext } from "react";
import { CalendarDate, DateElementFactory } from "../calendar/CalendarDate";
import { isAfter, isBefore } from "date-fns/esm";
import { isAfter, isBefore } from "date-fns";
import * as React from "react";
import { parseISO } from "date-fns";
import Calendar, { ViewType } from "../calendar/Calendar";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { isWithinInterval } from "date-fns";
import { addHours, endOfDay, isBefore, startOfDay } from "date-fns/esm";
import { isAfter } from "date-fns/esm";
import { addHours, endOfDay, isBefore, startOfDay } from "date-fns";
import { isAfter } from "date-fns";
import { MouseEventHandler, useMemo } from "react";
import { findMostRelevantOccupancy, Occupancy } from "../../models/Occupancy";
import { OccupancyWindowWithOccupiedDates } from "../../models/OccupancyWindow";
Expand Down
2 changes: 1 addition & 1 deletion app/views/manage/pages/flow.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
h1.mb-5.text-center= t('.title')
.row.justify-content-center
.col-md-4
= inline_svg_pack_tag('static/images/states.svg')
== render file: Rails.root.join('app/javascript/images/states.svg')
.col-md-1
.col-md-4
- @booking_states.each do |booking_state|
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"dependencies": {
"@babel/core": "7.24.4",
"@babel/core": "7.24.5",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.4",
"@babel/preset-env": "7.24.5",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.12.7",
"@babel/runtime": "7.24.4",
"@babel/runtime": "7.24.5",
"@emotion/babel-plugin": "^11.9.2",
"@emotion/css": "^11.11.2",
"@emotion/react": "^11.8.2",
"@modyfi/vite-plugin-yaml": "^1.1.0",
"@popperjs/core": "^2.11.4",
"@types/react": "^18.3.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.2.1",
"axios": "^1.2.0",
"bootstrap": "^5.3.2",
"date-fns": "^2.29.2",
"date-fns": "^3.6.0",
"font-awesome": "^4.7.0",
"i18next": "^23.11.2",
"i18next": "^23.11.3",
"postcss": "^8.4.38",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-import": "^16.1.0",
"postcss-preset-env": "^9.5.9",
"prop-types": "^15.8.1",
"rails-ujs": "^5.2.8",
"react": "^18.3.0",
"react": "^18.3.1",
"react-bootstrap": "^2.3.1",
"react-dom": "^18.3.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.51.3",
"react-i18next": "^14.1.1",
"react-sortablejs": "^6.1.4",
Expand All @@ -45,8 +45,8 @@
"devDependencies": {
"@types/sortablejs": "^1.15.7",
"@types/tinymce": "^4.6.6",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.7.1",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"eslint": "^9.1.1",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
Expand Down
Loading

0 comments on commit 488b90e

Please sign in to comment.