1
0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-14 10:41:52 +00:00

Merge branch 'master' into dengr1065/formatting-update

This commit is contained in:
Даниїл Григор'єв 2024-06-20 15:16:46 +03:00 committed by GitHub
commit 25614e2d7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions

View File

@ -41,9 +41,8 @@ const runtimeConfig = tseslint.config(...baseConfig, {
}, },
}, },
rules: { rules: {
// Mostly caused by JSDoc imports, so don't annoy with errors but keep // Mostly caused by JSDoc imports, disable for now
// a reminder! "@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-unused-vars": "warn",
// FIXME: enforce when we're ready to // FIXME: enforce when we're ready to
"prefer-const": "warn", "prefer-const": "warn",
}, },
@ -56,11 +55,11 @@ export default [
}, },
...nodeConfig.map(config => ({ ...nodeConfig.map(config => ({
...config, ...config,
files: ["*.(ts|js)", "(gulp|electron)/**/*.(ts|js)"], files: ["*.{ts,js}", "{gulp,electron}/**/*.{ts,js}"],
ignores: ["gulp/preloader/*.js"], ignores: ["gulp/preloader/*.js"],
})), })),
...runtimeConfig.map(config => ({ ...runtimeConfig.map(config => ({
...config, ...config,
files: ["src/**/*.(ts|js)x?"], files: ["src/**/*.{ts,js,tsx,jsx}"],
})), })),
]; ];

View File

@ -9,7 +9,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"gulp": "gulp --cwd gulp", "gulp": "gulp --cwd gulp",
"lint": "(eslint . && tsc && tsc -p src) || (tsc && tsc -p src) || tsc -p src", "lint": "eslint .",
"prettier-all": "prettier --write .", "prettier-all": "prettier --write .",
"buildTypes": "tsc src/js/application.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --out types.js", "buildTypes": "tsc src/js/application.js --declaration --allowJs --emitDeclarationOnly --skipLibCheck --out types.js",
"package-win32-x64": "gulp --cwd gulp package.standalone.win32-x64", "package-win32-x64": "gulp --cwd gulp package.standalone.win32-x64",