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.

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

config/lint #946

Merged
merged 6 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
25 changes: 20 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -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"
]
]
}
}
},
Expand All @@ -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",
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/annotate-pr.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/combine-dependabot-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,7 +29,6 @@ on:
description: Exclude PRs with this label
required: true
default: nocombine
# trunk-ignore-end(checkov)

jobs:
combine-prs:
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/trunk-check.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.0
v18.18.0
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ package-lock.json
yarn.lock
package.json
coverage
.trunk/
public/
db/
3 changes: 1 addition & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
"semi": true,
"singleQuote": false,
"arrowParens": "avoid",
"endOfLine": "auto",
"plugins": ["prettier-plugin-tailwindcss"]
"endOfLine": "auto"
}
3 changes: 2 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,6 +26,7 @@ AllCops:
- "**/bin/**/*"
- "**/config/**/*"
- "**/db/**/*"
- "**/sorbet/rbi/**/*"
- Gemfile
- Rakefile
- config.ru
Expand Down
8 changes: 0 additions & 8 deletions .trunk/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions .trunk/configs/.hadolint.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions .trunk/configs/.markdownlint.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions .trunk/configs/.shellcheckrc

This file was deleted.

10 changes: 0 additions & 10 deletions .trunk/configs/.yamllint.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions .trunk/configs/svgo.config.js

This file was deleted.

80 changes: 0 additions & 80 deletions .trunk/trunk.yaml

This file was deleted.

45 changes: 45 additions & 0 deletions .vscode/settings.shared.json
Original file line number Diff line number Diff line change
@@ -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,
}
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down Expand Up @@ -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}"

Expand Down
Loading