Skip to content

Commit

Permalink
linting tweaks and updates (drops ancient node support) (#81)
Browse files Browse the repository at this point in the history
- Linting (ESLint): Add `node_modules` and `dist` to ignore file and unignore `.eslintrc.js`;
    use "js" extension for comments; enforce `semi` rule; lint `parser.js` to catch any buggy generator issues
- Linting (package.json): Add recommended fields (contributors, bugs, homepage); update repository URL
- Refactoring: Fix broken or redundant HTML
- Maintenance: Enforce 2 sp. for JSON in `.editorconfig` (per current `package.json`)
- npm: Add build scripts (leading currently to Makefile)
- Breaking change: Bump to Node 4.0 (required by `estraverse`)
- Refactoring: remove now unneeded `Array.isArray` polyfill
- npm: Update estraverse dep. minor version and devDeps.
  • Loading branch information
brettz9 committed Mar 3, 2020
1 parent bf0ab45 commit d678dd2
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 38 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ insert_final_newline = true
trim_trailing_whitespace = true
indent_style = space
indent_size = 4

[*.json]
indent_size = 2
7 changes: 5 additions & 2 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Generated file:
/parser.js
node_modules
dist
parser.js

!.eslintrc.js
21 changes: 21 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
module.exports = {
env: {
browser: true,
commonjs: true,
es6: true,
node: true
},
extends: "eslint:recommended",
globals: {
Atomics: "readonly",
SharedArrayBuffer: "readonly",
// Remove after converting to ESM
define: "readonly"
},
parserOptions: {
ecmaVersion: 2018
},
rules: {
semi: ["error"]
}
};
18 changes: 0 additions & 18 deletions .eslintrc.json

This file was deleted.

4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.11"
- "0.12"
- "iojs"
- 4
- 6
- 8
Expand Down
4 changes: 1 addition & 3 deletions esquery.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
var estraverse = require('estraverse');
var parser = require('./parser');

var isArray = Array.isArray || function isArray(array) {
return {}.toString.call(array) === '[object Array]';
};
var isArray = Array.isArray;

var LEFT_SIDE = {};
var RIGHT_SIDE = {};
Expand Down
15 changes: 10 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"preferGlobal": false,
"version": "1.1.0",
"author": "Joel Feenstra <jrfeenst+esquery@gmail.com>",
"contributors": [],
"description": "A query library for ECMAScript AST using a CSS selector like query language.",
"main": "esquery.js",
"files": [
Expand All @@ -12,31 +13,35 @@
"README.md"
],
"scripts": {
"build-parser": "make parser",
"build-browser": "make browser",
"test": "node node_modules/jstestr/bin/jstestr.js path=tests",
"lint": "eslint ."
},
"repository": {
"type": "git",
"url": "https://github.com/jrfeenst/esquery.git"
"url": "https://github.com/estools/esquery.git"
},
"bugs": "https://github.com/estools/esquery/issues",
"homepage": "https://github.com/estools/esquery/",
"keywords": [
"ast",
"ecmascript",
"javascript",
"query"
],
"devDependencies": {
"commonjs-everywhere": "~0.9.4",
"commonjs-everywhere": "~0.9.7",
"eslint": "^6.8.0",
"esprima": "~1.1.1",
"esprima": "~4.0.1",
"jstestr": ">=0.4",
"pegjs": "~0.7.0"
},
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.6"
"node": ">=4.0"
},
"dependencies": {
"estraverse": "^4.0.0"
"estraverse": "^4.3.0"
}
}
10 changes: 4 additions & 6 deletions testRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<html>
<head>
<title>Test Runner</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

<meta charset="utf-8" />
<style>
html, body, #graphicalLogger {
padding: 0;
Expand All @@ -14,13 +13,13 @@
height: 100%;
}
</style>
<link rel="stylesheet" type="text/css" href="node_modules/jstestr/jstestr/logger/graphicalLogger.css"></link>
<link rel="stylesheet" href="node_modules/jstestr/jstestr/logger/graphicalLogger.css" />
</head>
<body>
<div id="graphicalLogger"></div>

<script src="node_modules/jstestr/requirejs/require.js"></script>
<script type="text/javascript">
<script>
require({
baseUrl: ".",
packages: [{
Expand All @@ -35,6 +34,5 @@
browserRunner();
});
</script>
</script>
</body>
</html>

0 comments on commit d678dd2

Please sign in to comment.