Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

55 changes: 0 additions & 55 deletions .eslintrc.yml

This file was deleted.

69 changes: 69 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import eslintPluginJs from "@eslint/js";
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
import eslintPluginPrettierDoc from "eslint-plugin-prettier-doc";
import eslintPluginImport from "eslint-plugin-import";
import globals from "globals";

export default [
eslintPluginJs.configs.recommended,
eslintPluginPrettierDoc.configs.recommended,
{
languageOptions: {
globals: {
...globals.builtin,
...globals.node,
...globals.jest,
},
},
plugins: {
import: eslintPluginImport,
},
rules: {
eqeqeq: "error",
curly: "error",
"no-else-return": "error",
"no-inner-declarations": "error",
"no-useless-return": "error",
"no-var": "error",
"one-var": ["error", "never"],
"object-shorthand": "error",
"prefer-arrow-callback": "error",
"prefer-const": "error",
"prefer-destructuring": "error",
"prefer-template": "error",
strict: "error",
"symbol-description": "error",
yoda: [
"error",
"never",
{
exceptRange: true,
},
],
"import/extensions": ["error", "ignorePackages"],
"import/no-extraneous-dependencies": [
"error",
{
devDependencies: [
"tests*/**",
"scripts/**",
"build/**",
"eslint.config.mjs",
],
},
],
},
},
eslintPluginPrettierRecommended,
{
files: ["tests/**/*.mjs"],
languageOptions: {
globals: {
run_spec: "readonly",
},
},
},
{
ignores: ["standalone.js"],
},
];
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
},
"devDependencies": {
"@babel/preset-env": "^7.29.7",
"@eslint/js": "^10.0.1",
"@rollup/plugin-alias": "^6.0.0",
"@rollup/plugin-babel": "^7.1.0",
"@rollup/plugin-commonjs": "^29.0.3",
Expand All @@ -41,12 +42,12 @@
"@rollup/plugin-terser": "^1.0.0",
"c8": "^12.0.0",
"cross-env": "^10.1.0",
"eslint": "8.57.1",
"eslint": "10.13.0",
"eslint-config-prettier": "10.1.8",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-jest": "29.17.0",
"eslint-plugin-prettier": "5.5.7",
"eslint-plugin-prettier-doc": "^1.1.0",
"eslint-plugin-prettier-doc": "2.0.0",
"globals": "^17.13.0",
"jest": "30.5.2",
"jest-environment-jsdom": "30.5.2",
"jest-light-runner": "0.8.2",
Expand Down
6 changes: 3 additions & 3 deletions src/options.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ function getComposerPhpVersion() {

if (versionMatch) {
return parseFloat(`${versionMatch[1]}.${versionMatch[2]}`);
} else {
getComposerError = `Could not decode PHP version (${composerJson.require.php}})`;
return null;
}

getComposerError = `Could not decode PHP version (${composerJson.require.php}})`;
return null;
}
} catch (e) {
getComposerError = `Error reading composer.json: ${e.message}`;
Expand Down
1 change: 0 additions & 1 deletion tests/syntax-error/jsfmt.spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ test("Syntax errors have the expected structure", async () => {
codeFrame: stripAnsi(err.codeFrame),
});

// eslint-disable-next-line jest/no-conditional-expect
expect(errObject).toMatchSnapshot();
}
});
1 change: 0 additions & 1 deletion tests_config/run_spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ global.run_spec = (importMeta, parsers, options) => {
visualizedOutput = visualizeEndOfLine(output);
});

// eslint-disable-next-line jest/valid-title
test(basename, async () => {
expect(visualizedOutput).toEqual(
visualizeEndOfLine(consistentEndOfLine(output))
Expand Down
Loading
Loading