Skip to content

Commit

Permalink
Merge pull request #566 from hildjj/update-eslint
Browse files Browse the repository at this point in the history
Update all dependencies, including `@peggyjs/eslint-config`.
  • Loading branch information
hildjj authored Oct 11, 2024
2 parents 74791f2 + 2359ca8 commit a17f8ce
Show file tree
Hide file tree
Showing 13 changed files with 1,089 additions and 753 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ Released: 2023-02-21
the list of JavaScript reserved words. This will break existing grammars
that use any of the new words in their rule or label names. from @hildjj

Important information for plug-in authors: PR [#291] added 4 new opcodes to the bytecode:
Important information for plug-in authors: PR #291 added 4 new opcodes to the bytecode:
- `IF_LT`
- `IF_GE`
- `IF_LT_DYNAMIC`
Expand Down
2 changes: 2 additions & 0 deletions docs/.eleventy.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ module.exports = function (eleventyConfig) {
eleventyConfig.addPassthroughCopy("development/favicon.ico");
eleventyConfig.addPassthroughCopy("CNAME");

eleventyConfig.ignores.add("README.md");

eleventyConfig.setServerOptions({
// Opt-out of the live reload snippet
enabled: true,
Expand Down
1 change: 1 addition & 0 deletions docs/_includes/base-layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
name="description"
content="Peggy is a parser generator for JavaScript based on the parsing expression grammar formalism."
/>
<meta name="generator" content="{{ eleventy.generator }}">
<title>{% if title %}{{ title }} &raquo; {% endif %}Peggy &ndash; Parser Generator for JavaScript</title>
<link rel="stylesheet" href="{{ "/css/common.css" | url }}" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@11ty/eleventy": "^2.0.1"
"@11ty/eleventy": "^3.0.0"
},
"browserslist": [
"defaults, maintained node versions, not op_mini all"
Expand Down
63 changes: 0 additions & 63 deletions eslint.config.js

This file was deleted.

43 changes: 43 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import commonjs from "@peggyjs/eslint-config/commonjs.js";
import compat from "eslint-plugin-compat";
import mocha from "@peggyjs/eslint-config/mocha.js";
import { modern } from "@peggyjs/eslint-config/modern.js";
import ts from "@peggyjs/eslint-config/ts.js";

export default [
{
ignores: [
"benchmark/**",
"build/**",
"examples/*.js", // Testing examples
"test/cli/fixtures/bad.js", // Intentionally-invalid
"test/cli/fixtures/imports_peggy.js", // Generated
"test/cli/fixtures/lib.js", // Generated
"test/cli/fixtures/useFrags/fs.js", // Generated
"test/cli/fixtures/useFrags/identifier.js", // Generated
"lib/parser.js", // Generated
"bin/generated_template.d.ts", // Generated
],
},
...commonjs,
...mocha,
...ts,
{
...modern,
// All of these can use modern JS and node constructs
files: ["bin/*.js", "tools/**", "web-test/**", "src/*.mjs"],
},
{
// Check these files for broad browser compatibility.
files: [
"**/*.min.js",
"lib/parser.js",
],
plugins: {
compat,
},
rules: {
"compat/compat": "error",
},
},
];
9 changes: 5 additions & 4 deletions lib/peg.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,11 @@ export interface Dependencies {
}

export interface BuildOptionsBase {
/**
* Plugins and Peggy compiler rules can take any config items they want.
*/
[pluginConfig: string]: any;

/** Rules the parser will be allowed to start parsing from (default: the first rule in the grammar) */
allowedStartRules?: string[];

Expand Down Expand Up @@ -1313,10 +1318,6 @@ export interface BuildOptionsBase {
* Override parser's reserved words. Defaults to RESERVED_WORDS.
*/
reservedWords?: string[];
/**
* Plugins and Peggy compiler rules can take any config items they want.
*/
[pluginConfig: string]: any;
}

export interface ParserBuildOptions extends BuildOptionsBase {
Expand Down
2 changes: 1 addition & 1 deletion lib/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"extends": "../tsconfig-base.json",
"include": ["**/*.ts", "**/*.js"],
"compilerOptions": {
"types": [],
"types": []
}
}
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@
"version": "npm run set_version && npm run parser && npm run parser && npm run test && npm run examples && git add lib/version.js lib/parser.js docs/index.html test/cli/fixtures/imports_peggy.js test/cli/fixtures/lib.js docs/js/examples.js"
},
"devDependencies": {
"@peggyjs/eslint-config": "^4.0.4",
"@peggyjs/eslint-config": "^5.0.0",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-multi-entry": "^6.0.1",
"@rollup/plugin-node-resolve": "^15.3.0",
"@rollup/plugin-typescript": "^12.1.0",
"@types/chai": "^4.3.11",
"@types/jest": "^29.5.13",
"@types/node": "^22.7.4",
"@types/node": "^22.7.5",
"chai": "^4.3.11",
"chai-like": "^1.1.3",
"copyfiles": "^2.4.1",
"eslint": "^9.11.1",
"eslint": "^9.12.0",
"eslint-plugin-compat": "6.0.1",
"eslint-plugin-mocha": "10.5.0",
"express": "4.21.0",
"express": "4.21.1",
"glob": "^11.0.0",
"jest": "^29.7.0",
"package-extract": "2.3.0",
Expand All @@ -83,10 +83,10 @@
"ts-jest": "^29.2.5",
"tslib": "^2.7.0",
"typescript": "5.5.4",
"typescript-eslint": "8.8.0"
"typescript-eslint": "8.8.1"
},
"dependencies": {
"@peggyjs/from-mem": "1.3.4",
"@peggyjs/from-mem": "1.3.5",
"commander": "^12.1.0",
"source-map-generator": "0.8.0"
},
Expand All @@ -98,7 +98,7 @@
"browserslist": [
"defaults, maintained node versions, not op_mini all"
],
"packageManager": "[email protected].0",
"packageManager": "[email protected].1",
"engines": {
"node": ">=18"
}
Expand Down
Loading

0 comments on commit a17f8ce

Please sign in to comment.