Clean up config files (and use new .config dir) (#613)

* Remove unused config files

* Move `eslint` config file to `.config` directory

* Upgrade rubocop version

You will have to run `bundle install` locally.

* Move rubocop and erblint config to `.config` folder

* Add Readme to `.config` directory

* Move `coffeelint` config files to `.config/` folder

* Fix config directory in linter workflow

* Upgrade ESLint version to `9.0.0`

* Fix wording in eslint config comment

* Delete unused `.rspec`

* Remove `.coffeelint.json` config

* Update `.config` Readme

* Fix relative path in rubocop config

.erb-lint.yml → .config/.erb-lint.yml

@@ -1,3 +1,4 @@
+# Not used right now
 ---
 EnableDefaultLinters: true
 linters:

.rubocop.yml → .config/.rubocop.yml

@@ -105,7 +105,7 @@ Style/MethodCallWithArgsParentheses:
   AllowedPatterns: [^redirect_]
   # Don't enforce in migrations, as we have methods like `add_column`,
   # `change_column` etc. and parentheses would be very annoying there.
-  Exclude: ["db/**/*"]
+  Exclude: ["../db/**/*"]
 
 Style/RedundantReturn:
   AllowMultipleReturnValues: true

.config/README.md

@@ -0,0 +1,6 @@
+# Config settings
+
+This directory contains configuration files for the project according to the [`.config/` directory proposal](https://github.com/pi0/config-dir).
+
+Note that we currently don't use these files (but might in the near future):
+- `.erb-lint.myl`

eslint.config.mjs → .config/eslint.mjs

@@ -96,7 +96,7 @@ export default [
   js.configs.recommended,
   // Allow linting of ERB files, see https://github.com/Splines/eslint-plugin-erb
   erb.configs.recommended,
-  // Globally ignore the following files
+  // Globally ignore the following paths
   {
     ignores: [
       "node_modules/",

.dockerignore

@@ -3,7 +3,6 @@ docker/developement/Dockerfile
 docker/run_tests/docker-compose.yml
 docker/run_tests/Dockerfile
 **/.git
-.travis*
 LICENSE
 README.md
 mampf-gui-transparent.png

.github/workflows/linter.yml

@@ -72,4 +72,4 @@ jobs:
           if: ${{ steps.js-changed.outputs.changed-files != ''}}
           run: |
             echo "🚨 Running ESLint version: $(yarn run --silent eslint --version)"
-            yarn run eslint --max-warnings 0 --no-warn-ignored ${{ steps.js-changed.outputs.changed-files }}
+            yarn run eslint --config ./.config/eslint.mjs --max-warnings 0 --no-warn-ignored ${{ steps.js-changed.outputs.changed-files }}

.vscode/settings.json

@@ -16,6 +16,9 @@
     "eslint.experimental.useFlatConfig": true,
     // this disables VSCode built-in formatter (instead we want to use ESLint)
     "javascript.validate.enable": false,
+    "eslint.options": {
+        "overrideConfigFile": ".config/eslint.mjs"
+    },
     //////////////////////////////////////
     // HTML
     //////////////////////////////////////
@@ -93,5 +96,6 @@
         "commontator",
         "helpdesk",
         "turbolinks"
-    ]
+    ],
+    "rubyLsp.customRubyCommand": "set -o allexport && . ./docker-dummy.env && set +o allexport"
 }

Gemfile

@@ -111,9 +111,9 @@ group :development, :docker_development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem "marcel"
   gem "pgreset"
-  gem "rubocop", "~> 1.57", require: false
-  gem "rubocop-performance", "~> 1.16", require: false
-  gem "rubocop-rails", "~> 2.22", ">= 2.22.1", require: false
+  gem "rubocop", "~> 1.63", require: false
+  gem "rubocop-performance", "~> 1.21", require: false
+  gem "rubocop-rails", "~> 2.24", require: false
   gem "spring"
   gem "spring-watcher-listen", "~> 2.0.0"
   #  gem 'bullet'

Gemfile.lock

@@ -284,7 +284,7 @@ GEM
     js-routes (1.4.9)
       railties (>= 4)
       sprockets-rails
-    json (2.6.3)
+    json (2.7.2)
     jsonapi-renderer (0.2.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -359,8 +359,8 @@ GEM
     options (2.3.2)
     orm_adapter (0.5.0)
     pairing_heap (3.0.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pdf-reader (2.11.0)
@@ -443,7 +443,7 @@ GEM
       ffi (~> 1.0)
     redis-client (0.14.1)
       connection_pool
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.0)
@@ -484,26 +484,27 @@ GEM
       rspec-mocks (~> 3.11)
       rspec-support (~> 3.11)
     rspec-support (3.12.0)
-    rubocop (1.57.2)
+    rubocop (1.63.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.22.1)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
     ruby-progressbar (1.13.0)
@@ -701,9 +702,9 @@ DEPENDENCIES
   rgl
   rqrcode
   rspec-rails
-  rubocop (~> 1.57)
-  rubocop-performance (~> 1.16)
-  rubocop-rails (~> 2.22, >= 2.22.1)
+  rubocop (~> 1.63)
+  rubocop-performance (~> 1.21)
+  rubocop-rails (~> 2.24)
   rubyzip (~> 2.3.0)
   sass-rails (>= 6)
   selenium-webdriver

app/views/layouts/_head.html.erb

@@ -17,10 +17,6 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
 <%= javascript_include_tag 'application',
                            'data-turbolinks-track': 'reload' %>
-<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/polyfill.min.js"
-        integrity="sha256-WRc/eG3R84AverJv0zmqxAmdwQxstUpqkiE+avJ3WSo="
-        crossorigin="anonymous">
-</script>
 <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/cytoscape.min.js"
         integrity="sha256-vaWKzwOlHpJzvE1q0q9nfurKXD8xeGaOhdMa6eea+wM="
         crossorigin="anonymous">