Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:USTakAssociation/playtak-api into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
invaderb committed Dec 6, 2024
2 parents c85599b + 7e8657f commit 16721da
Show file tree
Hide file tree
Showing 13 changed files with 4,014 additions and 11,866 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
environment: Beta
strategy:
matrix:
node-version: [16.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
environment: Prod
strategy:
matrix:
node-version: [16.x]
node-version: [22.x]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -82,5 +82,5 @@ jobs:
cp playtak-api-tmp/previous.txt /var/apps/playtak-api-prod/previous.txt
rm -rf playtak-api-tmp
rm artifact.tar.gz
pm2 restart playtak-api-prod --update-env
pm2 restart playtak-api-prod --update-env --interpreter=/home/ubuntu/.nvm/versions/node/v22.11.0/bin/node
'
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v22.11.0
79 changes: 79 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import typescriptEslintEslintPlugin from "@typescript-eslint/eslint-plugin";
import globals from "globals";
import tsParser from "@typescript-eslint/parser";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default [{
ignores: ["**/.eslintrc.js"],
}, ...compat.extends("plugin:@typescript-eslint/recommended"), {
plugins: {
"@typescript-eslint": typescriptEslintEslintPlugin,
},

languageOptions: {
globals: {
...globals.node,
...globals.jest,
},

parser: tsParser,
ecmaVersion: 5,
sourceType: "module",

parserOptions: {
project: "tsconfig.json",
tsconfigRootDir: "./",
},
},

rules: {
"@typescript-eslint/interface-name-prefix": "off",
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-expressions": "off",
"eol-last": "off",
"brace-style": "off",
"comma-dangle": "off",
"comma-spacing": "off",
eqeqeq: "off",
indent: "off",
"key-spacing": "off",
"keyword-spacing": "off",
"max-len": "off",
"no-ex-assign": "off",
"no-extra-boolean-cast": "off",
"no-floating-decimal": "off",
"no-multi-spaces": "off",
"no-throw-literal": "off",
"no-unreachable": "off",
radix: "off",
"quote-props": "off",
quotes: "off",
"space-before-function-paren": "off",
"space-in-parens": "off",
"space-infix-ops": "off",
"space-unary-ops": "off",
"spaced-comment": "off",
indent: ["warn", "tab", {
SwitchCase: 1,

ignoredNodes: [
"FunctionExpression > .params[decorators.length > 0]",
"FunctionExpression > .params > :matches(Decorator, :not(:first-child))",
"ClassBody.body > PropertyDefinition[decorators.length > 0] > .key",
],
}],
},
}];
Loading

0 comments on commit 16721da

Please sign in to comment.