Skip to content

Commit

Permalink
Merge pull request #411 from kaizhu256/branch-v2022.6.21
Browse files Browse the repository at this point in the history
# v2022.7.20
  • Loading branch information
kaizhu256 committed Jul 21, 2022
2 parents 05dc02d + 9a63e65 commit 906526b
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .ci.sh
Expand Up @@ -434,7 +434,7 @@ import moduleFs from "fs";
"type": "git",
"url": "https://github.com/jslint-org/jslint.git"
},
"version": "2022.7.2"
"version": "2022.7.20"
}, undefined, 4)
}
].map(async function ({
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -13,7 +13,7 @@
- jslint - add new warning "Expected Object.create(null) instead of {}"
- node - after node-v14 is deprecated, remove shell-code `export "NODE_OPTIONS=--unhandled-rejections=strict"`.

# v2022.7.2-beta
# v2022.7.20
- bugfix - warnings that should be ignored sometimes suppress legitimate warnings
- doc - document jslint directives
- vscode - add extra contextmenu commands "JSLint - Do Not Lint Selected Region", "JSLint - Ignore Current Line"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@ Douglas Crockford <douglas@crockford.com>


# Status
| Branch | [master<br>(v2022.6.21)](https://github.com/jslint-org/jslint/tree/master) | [beta<br>(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha<br>(Development)](https://github.com/jslint-org/jslint/tree/alpha) |
| Branch | [master<br>(v2022.7.20)](https://github.com/jslint-org/jslint/tree/master) | [beta<br>(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha<br>(Development)](https://github.com/jslint-org/jslint/tree/alpha) |
|--:|:--:|:--:|:--:|
| CI | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jslint-org/jslint/actions?query=branch%3Amaster) | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/jslint-org/jslint/actions?query=branch%3Abeta) | [![ci](https://github.com/jslint-org/jslint/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/jslint-org/jslint/actions?query=branch%3Aalpha) |
| Coverage | [![coverage](https://jslint-org.github.io/jslint/branch-master/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-master/.artifact/coverage/index.html) | [![coverage](https://jslint-org.github.io/jslint/branch-beta/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-beta/.artifact/coverage/index.html) | [![coverage](https://jslint-org.github.io/jslint/branch-alpha/.artifact/coverage/coverage_badge.svg)](https://jslint-org.github.io/jslint/branch-alpha/.artifact/coverage/index.html) |
Expand Down
44 changes: 6 additions & 38 deletions index.html
Expand Up @@ -23,14 +23,10 @@
{
"fetchList": [
{
"comment": true,
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/LICENSE"
"url": "https://github.com/codemirror/CodeMirror5/blob/5.65.5/lib/codemirror.css"
},
{
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/lib/codemirror.css"
},
{
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/addon/lint/lint.css"
"url": "https://github.com/codemirror/CodeMirror5/blob/5.65.5/addon/lint/lint.css"
}
],
"replaceList": []
Expand All @@ -39,41 +35,13 @@


/*
repo https://github.com/codemirror/CodeMirror/tree/5.65.3
committed 2022-04-20T09:49:25Z
*/


/*
file https://github.com/codemirror/CodeMirror/blob/5.65.3/LICENSE
*/
/*
MIT License

Copyright (C) 2017 by Marijn Haverbeke <marijnh@gmail.com> and others

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
repo https://github.com/codemirror/CodeMirror5/tree/5.65.5
committed 2022-05-30T09:58:15Z
*/


/*
file https://github.com/codemirror/CodeMirror/blob/5.65.3/lib/codemirror.css
file https://github.com/codemirror/CodeMirror5/blob/5.65.5/lib/codemirror.css
*/
/* BASICS */

Expand Down Expand Up @@ -422,7 +390,7 @@


/*
file https://github.com/codemirror/CodeMirror/blob/5.65.3/addon/lint/lint.css
file https://github.com/codemirror/CodeMirror5/blob/5.65.5/addon/lint/lint.css
*/
/* The lint marker gutter */
.CodeMirror-lint-markers {
Expand Down
2 changes: 1 addition & 1 deletion jslint.mjs
Expand Up @@ -165,7 +165,7 @@ let jslint_charset_ascii = (
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+ "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
);
let jslint_edition = "v2022.7.2-beta";
let jslint_edition = "v2022.7.20";
let jslint_export; // The jslint object to be exported.
let jslint_fudge = 1; // Fudge starting line and starting
// ... column to 1.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -33,5 +33,5 @@
"test2": "sh jslint_ci.sh shCiBase"
},
"type": "module",
"version": "2022.7.2-beta"
"version": "2022.7.20"
}

0 comments on commit 906526b

Please sign in to comment.