From 931066eee9a064180bd37643c29706419085329f Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 27 Apr 2026 00:51:52 +0100 Subject: [PATCH] Improved linting --- components/framework/index.js | 2 +- eslint.config.js | 15 +++++++++++++-- package.json | 12 ++++++------ src/utils/fs/fileExists.js | 2 +- src/utils/fs/fileExistsSync.js | 2 +- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/components/framework/index.js b/components/framework/index.js index 66dc8bc..a17dac6 100644 --- a/components/framework/index.js +++ b/components/framework/index.js @@ -328,7 +328,7 @@ class ServerlessFramework { const { stdout: infoOutput } = await this.exec('serverless', ['info', '--verbose']); try { return YAML.load(infoOutput.toString())['Stack Outputs']; - } catch (e) { + } catch { if (infoOutput.toString()) { // Try to extract the section with `Stack Outputs` and parse it // The regex below matches everything indented with 2 spaces below "Stack Outputs:" diff --git a/eslint.config.js b/eslint.config.js index ccb19a6..d8348e7 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -29,7 +29,7 @@ module.exports = [ importX.flatConfigs.recommended, eslintConfigPrettier, { - files: ['**/*.{cjs,js,mjs}'], + files: ['**/*.{cjs,js,mjs}', 'bin/serverless-compose'], languageOptions: { ecmaVersion: 2023, sourceType: 'commonjs', @@ -46,7 +46,12 @@ module.exports = [ }, ], 'import-x/no-unresolved': ['error', { commonjs: true }], - 'no-unused-vars': ['error', { caughtErrors: 'none' }], + 'no-unused-vars': [ + 'error', + { + caughtErrors: 'all', + }, + ], 'n/no-unsupported-features/node-builtins': ['error', { allowExperimental: true }], 'n/no-extraneous-require': 'off', 'n/no-unpublished-require': 'off', @@ -56,6 +61,12 @@ module.exports = [ 'n/hashbang': 'off', }, }, + { + files: ['bin/serverless-compose', 'components/**/*.js', 'src/**/*.js'], + rules: { + 'n/no-unpublished-require': 'error', + }, + }, { files: ['**/*.mjs'], languageOptions: { diff --git a/package.json b/package.json index dfac392..79e4c6b 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,12 @@ "oslsc": "bin/serverless-compose" }, "scripts": { - "lint": "eslint .", - "lint:updated": "pipe-git-updated --ext=cjs --ext=js --ext=mjs --base=main -- eslint", - "prettier-check": "prettier -c \"**/*.{cjs,css,html,js,json,md,mjs,yaml,yml}\"", - "prettier-check:updated": "pipe-git-updated --ext=cjs --ext=css --ext=html --ext=js --ext=json --ext=md --ext=mjs --ext=yaml --ext=yml --base=main -- prettier -c", - "prettify": "prettier --write \"**/*.{cjs,css,html,js,json,md,mjs,yaml,yml}\"", - "prettify:updated": "pipe-git-updated --ext=cjs --ext=css --ext=html --ext=js --ext=json --ext=md --ext=mjs --ext=yaml --ext=yml --base=main -- prettier --write", + "lint": "eslint . bin/serverless-compose", + "lint:updated": "pipe-git-updated --ext=cjs --ext=js --ext=mjs --base=main -- eslint && pipe-git-updated --base=main bin -- eslint", + "prettier-check": "prettier -c \"**/*.{cjs,css,html,js,json,md,mjs,yaml,yml}\" && prettier -c --parser babel bin/serverless-compose", + "prettier-check:updated": "pipe-git-updated --ext=cjs --ext=css --ext=html --ext=js --ext=json --ext=md --ext=mjs --ext=yaml --ext=yml --base=main -- prettier -c && pipe-git-updated --base=main bin -- prettier -c --parser=babel", + "prettify": "prettier --write \"**/*.{cjs,css,html,js,json,md,mjs,yaml,yml}\" && prettier --write --parser babel bin/serverless-compose", + "prettify:updated": "pipe-git-updated --ext=cjs --ext=css --ext=html --ext=js --ext=json --ext=md --ext=mjs --ext=yaml --ext=yml --base=main -- prettier --write && pipe-git-updated --base=main bin -- prettier --write --parser=babel", "test": "mocha --config test/mocha/unit.cjs" }, "license": "MIT", diff --git a/src/utils/fs/fileExists.js b/src/utils/fs/fileExists.js index e1a20bd..5f973dd 100644 --- a/src/utils/fs/fileExists.js +++ b/src/utils/fs/fileExists.js @@ -7,7 +7,7 @@ const fileExists = curry(async (filePath) => { try { const stats = await fse.lstat(filePath); return stats.isFile(); - } catch (error) { + } catch { return false; } }); diff --git a/src/utils/fs/fileExistsSync.js b/src/utils/fs/fileExistsSync.js index a107ab0..5724754 100644 --- a/src/utils/fs/fileExistsSync.js +++ b/src/utils/fs/fileExistsSync.js @@ -6,7 +6,7 @@ const fileExistsSync = (filePath) => { try { const stats = fse.lstatSync(filePath); return stats.isFile(); - } catch (e) { + } catch { return false; } };