config/lint (#946)

* Removed trunk

* Moved to ruby-lsp and sorbet

* Fix lint

* Remove duplicates

* sorbet

.eslintrc.json

@@ -1,25 +1,37 @@
 {
   "root": true,
-  "ignorePatterns": ["*.config.js"],
+  "ignorePatterns": [
+    "*.config.js"
+  ],
   "env": {
     "browser": true,
     "es2021": true
   },
   "extends": [
     "eslint:recommended",
     "plugin:tailwindcss/recommended",
+    "plugin:import/recommended",
     "plugin:prettier/recommended",
-    "plugin:import/recommended"
+    "prettier/prettier"
   ],
   "parserOptions": {
     "ecmaVersion": "latest",
     "sourceType": "module"
   },
-  "plugins": ["import", "html-erb", "tailwindcss", "prettier"],
+  "plugins": [
+    "import",
+    "tailwindcss",
+    "prettier"
+  ],
   "settings": {
     "import/resolver": {
       "alias": {
-        "map": [["~", "./app/frontend"]]
+        "map": [
+          [
+            "~",
+            "./app/frontend"
+          ]
+        ]
       }
     }
   },
@@ -34,7 +46,10 @@
     ],
     "no-underscore-dangle": "off",
     "no-param-reassign": "off",
-    "comma-dangle": ["error", "only-multiline"],
+    "comma-dangle": [
+      "error",
+      "only-multiline"
+    ],
     "no-undef": "warn",
     "prettier/prettier": "error",
     "import/no-extraneous-dependencies": "off",

.github/workflows/combine-dependabot-prs.yml

@@ -8,7 +8,6 @@ on:
   schedule:
     - cron: 0 1 * * 3
   workflow_dispatch:
-    # trunk-ignore-begin(checkov)
     inputs:
       branchPrefix:
         description: Branch prefix to find combinable PRs based on
@@ -30,7 +29,6 @@ on:
         description: Exclude PRs with this label
         required: true
         default: nocombine
-    # trunk-ignore-end(checkov)
 
 jobs:
   combine-prs:

.gitignore

@@ -54,3 +54,8 @@ vendor
 # https://vitejs.dev/guide/env-and-mode.html#env-files
 *.local
 .scannerwork
+
+# VSCode
+.vscode/*
+!.vscode/multi-terminals.json
+!.vscode/*.shared.json

.nvmrc

@@ -1 +1 @@
-v18.17.0
+v18.18.0

.prettierignore

@@ -6,6 +6,5 @@ package-lock.json
 yarn.lock
 package.json
 coverage
-.trunk/
 public/
 db/

.prettierrc

@@ -3,6 +3,5 @@
   "semi": true,
   "singleQuote": false,
   "arrowParens": "avoid",
-  "endOfLine": "auto",
-  "plugins": ["prettier-plugin-tailwindcss"]
+  "endOfLine": "auto"
 }

.rubocop.yml

@@ -5,7 +5,7 @@ require:
 
 AllCops:
   TargetRubyVersion: 3.2.2
-  TargetRailsVersion: 7.0.7
+  TargetRailsVersion: 7.0.8
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
@@ -26,6 +26,7 @@ AllCops:
     - "**/bin/**/*"
     - "**/config/**/*"
     - "**/db/**/*"
+    - "**/sorbet/rbi/**/*"
     - Gemfile
     - Rakefile
     - config.ru

.vscode/settings.shared.json

@@ -0,0 +1,45 @@
+{
+  "files.associations": {
+    "*.html.erb": "erb"
+  },
+  "[ruby]": {
+    "editor.defaultFormatter": "Shopify.ruby-lsp",
+    "editor.formatOnSave": true
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+    "editor.formatOnSave": true
+  },
+  "[erb]": {
+    "editor.defaultFormatter": "elia.erb-formatter",
+    "editor.formatOnSave": true
+  },
+  "tailwindCSS.emmetCompletions": true,
+  "tailwindCSS.codeActions": true,
+  "tailwindCSS.colorDecorators": true,
+  "tailwindCSS.hovers": true,
+  "editor.defaultFormatter": "dbaeumer.vscode-eslint",
+  "editor.formatOnPaste": true,
+  "editor.formatOnType": true,
+  "formattingToggle.affects": [
+    "editor.formatOnSave"
+  ],
+  "tailwindCSS.includeLanguages": {
+    "javascript": "javascript",
+    "html": "html",
+    "erb": "html"
+  },
+  "git.enableCommitSigning": true,
+  "sonarlint.connectedMode.project": {
+    "connectionId": "aldwin7894",
+    "projectKey": "aldwin7894:project-cyan"
+  },
+  "[jsonc]": {
+    "editor.defaultFormatter": "vscode.json-language-features"
+  },
+  "emmet.includeLanguages": {
+    "*.html.erb": "html",
+    "erb": "html"
+  },
+  "erb-formatter.lineLength": 500,
+}

Dockerfile

@@ -1,7 +1,7 @@
 FROM ruby:3.2.2-slim-bookworm AS build-env
 
-ENV NODE_VERSION 18.17.0
-ENV NPM_VERSION 9.8.1
+ENV NODE_VERSION 18.18.0
+ENV NPM_VERSION 10.1.0
 ENV YARN_VERSION 1.22.19
 ENV BUNDLE_PATH=/gems
 ENV PATH="/node-v${NODE_VERSION}-linux-x64/bin:${PATH}"
@@ -55,7 +55,7 @@ RUN --mount=type=secret,id=TZ \
 #==============================================
 FROM ruby:3.2.2-slim-bookworm
 
-ENV NODE_VERSION 18.17.0
+ENV NODE_VERSION 18.18.0
 ENV BUNDLE_PATH=/gems
 ENV PATH="/node-v${NODE_VERSION}-linux-x64/bin:${PATH}"