Skip to content

Commit 906526b

Browse files
authored
Merge pull request #411 from kaizhu256/branch-v2022.6.21
# v2022.7.20
2 parents 05dc02d + 9a63e65 commit 906526b

File tree

6 files changed

+11
-43
lines changed

6 files changed

+11
-43
lines changed

.ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ import moduleFs from "fs";
434434
"type": "git",
435435
"url": "https://github.com/jslint-org/jslint.git"
436436
},
437-
"version": "2022.7.2"
437+
"version": "2022.7.20"
438438
}, undefined, 4)
439439
}
440440
].map(async function ({

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- jslint - add new warning "Expected Object.create(null) instead of {}"
1414
- node - after node-v14 is deprecated, remove shell-code `export "NODE_OPTIONS=--unhandled-rejections=strict"`.
1515

16-
# v2022.7.2-beta
16+
# v2022.7.20
1717
- bugfix - warnings that should be ignored sometimes suppress legitimate warnings
1818
- doc - document jslint directives
1919
- vscode - add extra contextmenu commands "JSLint - Do Not Lint Selected Region", "JSLint - Ignore Current Line"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Douglas Crockford <[email protected]>
33

44

55
# Status
6-
| 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) |
6+
| 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) |
77
|--:|:--:|:--:|:--:|
88
| 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) |
99
| 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) |

index.html

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@
2323
{
2424
"fetchList": [
2525
{
26-
"comment": true,
27-
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/LICENSE"
26+
"url": "https://github.com/codemirror/CodeMirror5/blob/5.65.5/lib/codemirror.css"
2827
},
2928
{
30-
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/lib/codemirror.css"
31-
},
32-
{
33-
"url": "https://github.com/codemirror/CodeMirror/blob/5.65.3/addon/lint/lint.css"
29+
"url": "https://github.com/codemirror/CodeMirror5/blob/5.65.5/addon/lint/lint.css"
3430
}
3531
],
3632
"replaceList": []
@@ -39,41 +35,13 @@
3935

4036

4137
/*
42-
repo https://github.com/codemirror/CodeMirror/tree/5.65.3
43-
committed 2022-04-20T09:49:25Z
44-
*/
45-
46-
47-
/*
48-
file https://github.com/codemirror/CodeMirror/blob/5.65.3/LICENSE
49-
*/
50-
/*
51-
MIT License
52-
53-
Copyright (C) 2017 by Marijn Haverbeke <[email protected]> and others
54-
55-
Permission is hereby granted, free of charge, to any person obtaining a copy
56-
of this software and associated documentation files (the "Software"), to deal
57-
in the Software without restriction, including without limitation the rights
58-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
59-
copies of the Software, and to permit persons to whom the Software is
60-
furnished to do so, subject to the following conditions:
61-
62-
The above copyright notice and this permission notice shall be included in
63-
all copies or substantial portions of the Software.
64-
65-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
66-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
67-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
68-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
69-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
70-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
71-
THE SOFTWARE.
38+
repo https://github.com/codemirror/CodeMirror5/tree/5.65.5
39+
committed 2022-05-30T09:58:15Z
7240
*/
7341

7442

7543
/*
76-
file https://github.com/codemirror/CodeMirror/blob/5.65.3/lib/codemirror.css
44+
file https://github.com/codemirror/CodeMirror5/blob/5.65.5/lib/codemirror.css
7745
*/
7846
/* BASICS */
7947

@@ -422,7 +390,7 @@
422390

423391

424392
/*
425-
file https://github.com/codemirror/CodeMirror/blob/5.65.3/addon/lint/lint.css
393+
file https://github.com/codemirror/CodeMirror5/blob/5.65.5/addon/lint/lint.css
426394
*/
427395
/* The lint marker gutter */
428396
.CodeMirror-lint-markers {

jslint.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ let jslint_charset_ascii = (
165165
+ "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
166166
+ "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
167167
);
168-
let jslint_edition = "v2022.7.2-beta";
168+
let jslint_edition = "v2022.7.20";
169169
let jslint_export; // The jslint object to be exported.
170170
let jslint_fudge = 1; // Fudge starting line and starting
171171
// ... column to 1.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@
3333
"test2": "sh jslint_ci.sh shCiBase"
3434
},
3535
"type": "module",
36-
"version": "2022.7.2-beta"
36+
"version": "2022.7.20"
3737
}

0 commit comments

Comments
 (0)