diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml index 97d283b4..36b98fa1 100644 --- a/.github/workflows/build-image.yml +++ b/.github/workflows/build-image.yml @@ -20,7 +20,7 @@ jobs: cancel-in-progress: true steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Discover build-time variables run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f9e7b3ec..da1c33c7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3.6.0 + uses: actions/checkout@v4.0.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 35683ad1..27e57015 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,10 +11,10 @@ jobs: name: Rubocop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.rb" - name: Install dependencies @@ -37,10 +37,10 @@ jobs: name: ESLint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.ts" - name: Set up Node 14 @@ -63,10 +63,10 @@ jobs: haml-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.haml" - name: Install dependencies @@ -86,10 +86,10 @@ jobs: stylelint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v38 + uses: tj-actions/changed-files@v39 with: files: "**/*.scss" - name: Set up Node 14 @@ -104,7 +104,7 @@ jobs: yarn install --frozen-lockfile if: steps.changed-files.outputs.any_changed == 'true' - name: stylelint - uses: reviewdog/action-stylelint@v1.17.1 + uses: reviewdog/action-stylelint@v1.18.1 with: github_token: ${{ secrets.github_token }} reporter: github-pr-check diff --git a/.github/workflows/retrospring.yml b/.github/workflows/retrospring.yml index 31d1cae1..fefbfc04 100644 --- a/.github/workflows/retrospring.yml +++ b/.github/workflows/retrospring.yml @@ -41,7 +41,7 @@ jobs: BUNDLE_WITHOUT: 'production' steps: - - uses: actions/checkout@v3.6.0 + - uses: actions/checkout@v4.0.0 - name: Install dependencies run: sudo apt update && sudo apt-get install -y libpq-dev libxml2-dev libxslt1-dev libmagickwand-dev imagemagick libidn11-dev - name: Set up Ruby diff --git a/.gitignore b/.gitignore index 2c2a36f8..e171f448 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /config/database.yml .env -.env.production .env.development /coverage diff --git a/Gemfile b/Gemfile index 2b038f3e..54a8c3a1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,12 +5,11 @@ source "https://rubygems.org" gem "i18n-js", "4.0" gem "rails", "~> 6.1" gem "rails-i18n", "~> 7.0" -gem "dotenv-rails", "~> 2.8" gem "cssbundling-rails", "~> 1.2" gem "jsbundling-rails", "~> 1.1" gem "sassc-rails" -gem "sprockets", "~> 4.1" +gem "sprockets", "~> 4.2" gem "sprockets-rails", require: "sprockets/railtie" gem "pg" @@ -80,6 +79,7 @@ group :development, :test do gem "better_errors" gem "bullet" gem "database_cleaner" + gem "dotenv-rails", "~> 2.8" gem "factory_bot_rails", require: false gem "faker" gem "haml_lint", require: false @@ -92,7 +92,7 @@ group :development, :test do gem "rspec-rails", "~> 6.0" gem "rspec-sidekiq", "~> 4.0", require: false gem "rubocop", "~> 1.56" - gem "rubocop-rails", "~> 2.20" + gem "rubocop-rails", "~> 2.21" gem "shoulda-matchers", "~> 5.3" gem "simplecov", require: false gem "simplecov-cobertura", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 1e5ed261..7abeada8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,7 +259,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.4) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.6.0) multi_json (1.15.0) multi_xml (0.6.0) @@ -281,15 +281,15 @@ GEM nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.0) + oj (3.16.1) openssl (3.1.0) orm_adapter (0.5.0) parallel (1.23.0) parser (3.2.2.3) ast (~> 2.4.1) racc - pg (1.5.3) - pghero (3.3.3) + pg (1.5.4) + pghero (3.3.4) activerecord (>= 6) prometheus-client (4.2.1) public_suffix (5.0.1) @@ -395,7 +395,7 @@ GEM rspec-mocks (~> 3.0) sidekiq (>= 5, < 8) rspec-support (3.12.1) - rubocop (1.56.1) + rubocop (1.56.3) base64 (~> 0.1.1) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -409,7 +409,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-rails (2.20.2) + rubocop-rails (2.21.0) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -455,7 +455,7 @@ GEM simplecov simplecov_json_formatter (0.1.4) spring (4.1.1) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) @@ -561,7 +561,7 @@ DEPENDENCIES rspec-rails (~> 6.0) rspec-sidekiq (~> 4.0) rubocop (~> 1.56) - rubocop-rails (~> 2.20) + rubocop-rails (~> 2.21) rubyzip (~> 2.3) sanitize sassc-rails @@ -574,7 +574,7 @@ DEPENDENCIES simplecov-cobertura simplecov-json spring (~> 4.1) - sprockets (~> 4.1) + sprockets (~> 4.2) sprockets-rails tldv (~> 0.1.0) turbo-rails diff --git a/package.json b/package.json index 40aa3a5b..49f471aa 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "eslint": "^7.16.0", "eslint-plugin-import": "^2.28.1", "stylelint": "^15.10.3", - "stylelint-config-standard-scss": "^10.0.0", + "stylelint-config-standard-scss": "^11.0.0", "stylelint-scss": "^5.1.0" } } diff --git a/yarn.lock b/yarn.lock index 336d0fde..83cc6805 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2097,10 +2097,10 @@ postcss-safe-parser@^6.0.0: resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== -postcss-scss@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd" - integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ== +postcss-scss@^4.0.7: + version "4.0.7" + resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.7.tgz#cfe5507aaff81b3d8992039ad015da4bd3dccd2f" + integrity sha512-xPv2GseoyXPa58Nro7M73ZntttusuCmZdeOojUFR5PZDz2BR62vfYx1w9TyOnp1+nYFowgOMipsCBhxzVkAEPw== postcss-selector-parser@^6.0.13: version "6.0.13" @@ -2446,36 +2446,36 @@ style-search@^0.1.0: resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg== -stylelint-config-recommended-scss@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-12.0.0.tgz#9d9e82c46012649f11bfebcbc788f58e61860f33" - integrity sha512-5Bb2mlGy6WLa30oNeKpZvavv2lowJUsUJO25+OA68GFTemlwd1zbFsL7q0bReKipOSU3sG47hKneZ6Nd+ctrFA== +stylelint-config-recommended-scss@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.0.0.tgz#dd8c319e15a6412262cd8554e4aad9bfba1bbb11" + integrity sha512-7AmMIsHTsuwUQm7I+DD5BGeIgCvqYZ4BpeYJJpb1cUXQwrJAKjA+GBotFZgUEGP8lAM+wmd91ovzOi8xfAyWEw== dependencies: - postcss-scss "^4.0.6" - stylelint-config-recommended "^12.0.0" - stylelint-scss "^5.0.0" + postcss-scss "^4.0.7" + stylelint-config-recommended "^13.0.0" + stylelint-scss "^5.1.0" -stylelint-config-recommended@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz#d0993232fca017065fd5acfcb52dd8a188784ef4" - integrity sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ== +stylelint-config-recommended@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz#c48a358cc46b629ea01f22db60b351f703e00597" + integrity sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ== -stylelint-config-standard-scss@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-10.0.0.tgz#159a54a01b80649bf0143fa7ba086b676a1a749e" - integrity sha512-bChBEo1p3xUVWh/wenJI+josoMk21f2yuLDGzGjmKYcALfl2u3DFltY+n4UHswYiXghqXaA8mRh+bFy/q1hQlg== +stylelint-config-standard-scss@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.0.0.tgz#98332b68a9c98b6fce54c7698741e103719942b5" + integrity sha512-fGE79NBOLg09a9afqGH/guJulRULCaQWWv4cv1v2bMX92B+fGb0y56WqIguwvFcliPmmUXiAhKrrnXilIeXoHA== dependencies: - stylelint-config-recommended-scss "^12.0.0" - stylelint-config-standard "^33.0.0" + stylelint-config-recommended-scss "^13.0.0" + stylelint-config-standard "^34.0.0" -stylelint-config-standard@^33.0.0: - version "33.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz#1f7bb299153a53874073e93829e37a475842f0f9" - integrity sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg== +stylelint-config-standard@^34.0.0: + version "34.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-34.0.0.tgz#309f3c48118a02aae262230c174282e40e766cf4" + integrity sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ== dependencies: - stylelint-config-recommended "^12.0.0" + stylelint-config-recommended "^13.0.0" -stylelint-scss@^5.0.0, stylelint-scss@^5.1.0: +stylelint-scss@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-5.1.0.tgz#dd318bc5c65f7a11f3ecacc7b6e8b67e7f2f1df1" integrity sha512-E+KlQFXv1Euha43qw3q+wKBSli557wxbbo6/39DWhRNXlUa9Cz+FYrcgz+PT6ag0l6UisCYjAGCNhoSl4FcwlA==