Browse Source

style: standardize prettier config and 2-space json policy

master
Daniel Gibbs 1 month ago
parent
commit
fe8979140e
  1. 56
      .devcontainer/devcontainer.json
  2. 4
      .editorconfig
  3. 3
      .prettierignore
  4. 3
      .prettierrc
  5. 2
      .prettierrc.json
  6. 20
      .vscode/extensions.json
  7. 1408
      package-lock.json
  8. 50
      package.json

56
.devcontainer/devcontainer.json

@ -1,30 +1,30 @@
{ {
"name": "BASH Dev Container", "name": "BASH Dev Container",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu", "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"features": { "features": {
"ghcr.io/devcontainers-community/npm-features/prettier:1": { "ghcr.io/devcontainers-community/npm-features/prettier:1": {
"plugins": "prettier-plugin-sh" "plugins": "prettier-plugin-sh"
}, },
"ghcr.io/devcontainers-extra/features/actionlint:1": {}, "ghcr.io/devcontainers-extra/features/actionlint:1": {},
"ghcr.io/devcontainers-extra/features/checkov:1": {}, "ghcr.io/devcontainers-extra/features/checkov:1": {},
"ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {}, "ghcr.io/devcontainers-extra/features/markdownlint-cli:1": {},
"ghcr.io/devcontainers-extra/features/shellcheck:1": {}, "ghcr.io/devcontainers-extra/features/shellcheck:1": {},
"ghcr.io/devcontainers-extra/features/yamllint:2": {}, "ghcr.io/devcontainers-extra/features/yamllint:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {} "ghcr.io/devcontainers/features/github-cli:1": {}
}, },
"customizations": { "customizations": {
"vscode": { "vscode": {
"extensions": [ "extensions": [
"DavidAnson.vscode-markdownlint", "DavidAnson.vscode-markdownlint",
"editorconfig.editorconfig", "editorconfig.editorconfig",
"esbenp.prettier-vscode", "esbenp.prettier-vscode",
"github.vscode-github-actions", "github.vscode-github-actions",
"GitHub.vscode-pull-request-github", "GitHub.vscode-pull-request-github",
"redhat.vscode-yaml", "redhat.vscode-yaml",
"timonwong.shellcheck", "timonwong.shellcheck",
"yzhang.markdown-all-in-one" "yzhang.markdown-all-in-one"
] ]
} }
}, },
"postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template && sudo apt-get update && sudo apt-get install -y ripgrep" "postCreateCommand": "npm init -y >/dev/null 2>&1 || true && npm install --no-save prettier prettier-plugin-sh prettier-plugin-jinja-template && sudo apt-get update && sudo apt-get install -y ripgrep"
} }

4
.editorconfig

@ -16,9 +16,9 @@ trim_trailing_whitespace = true
indent_size = 4 indent_size = 4
indent_style = tab indent_style = tab
# JSON Files (Biome formatting) # JSON Files
[*.json] [*.json]
indent_style = tab indent_style = space
indent_size = 2 indent_size = 2
# Steam appmanifest files (Valve ACF format) # Steam appmanifest files (Valve ACF format)

3
.prettierignore

@ -1,3 +0,0 @@
# Prettier auto-commit runs with GITHUB_TOKEN (GitHub App).
# GitHub blocks that token from creating/updating anything under .github/workflows.
.github/workflows/**

3
.prettierrc

@ -1,3 +0,0 @@
{
"plugins": ["prettier-plugin-sh"]
}

2
.prettierrc.json

@ -1,3 +1,3 @@
{ {
"plugins": ["prettier-plugin-sh"] "plugins": ["prettier-plugin-sh", "prettier-plugin-jinja-template"]
} }

20
.vscode/extensions.json

@ -1,12 +1,12 @@
{ {
"recommendations": [ "recommendations": [
"DavidAnson.vscode-markdownlint", "DavidAnson.vscode-markdownlint",
"editorconfig.editorconfig", "editorconfig.editorconfig",
"esbenp.prettier-vscode", "esbenp.prettier-vscode",
"github.vscode-github-actions", "github.vscode-github-actions",
"GitHub.vscode-pull-request-github", "GitHub.vscode-pull-request-github",
"redhat.vscode-yaml", "redhat.vscode-yaml",
"timonwong.shellcheck", "timonwong.shellcheck",
"yzhang.markdown-all-in-one" "yzhang.markdown-all-in-one"
] ]
} }

1408
package-lock.json

File diff suppressed because it is too large

50
package.json

@ -1,27 +1,27 @@
{ {
"name": "linuxgsm", "name": "linuxgsm",
"description": "<h1 align=\"center\"> <br> <a href=\"https://linuxgsm.com\"><img src=\"https://i.imgur.com/Eoh1jsi.jpg\" alt=\"LinuxGSM\"></a> </h1>", "description": "<h1 align=\"center\"> <br> <a href=\"https://linuxgsm.com\"><img src=\"https://i.imgur.com/Eoh1jsi.jpg\" alt=\"LinuxGSM\"></a> </h1>",
"directories": { "directories": {
"test": "tests" "test": "tests"
}, },
"devDependencies": { "devDependencies": {
"prettier": "^3.4.2", "prettier": "^3.4.2",
"prettier-plugin-sh": "^0.14.0" "prettier-plugin-sh": "^0.14.0"
}, },
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/GameServerManagers/LinuxGSM.git" "url": "git+https://github.com/GameServerManagers/LinuxGSM.git"
}, },
"author": "", "author": "",
"license": "MIT", "license": "MIT",
"bugs": { "bugs": {
"url": "https://github.com/GameServerManagers/LinuxGSM/issues" "url": "https://github.com/GameServerManagers/LinuxGSM/issues"
}, },
"homepage": "https://github.com/GameServerManagers/LinuxGSM#readme", "homepage": "https://github.com/GameServerManagers/LinuxGSM#readme",
"dependencies": { "dependencies": {
"gamedig": "^5.1.4" "gamedig": "^5.1.4"
} }
} }

Loading…
Cancel
Save