# v2023.6.21

- doc - Update docs in README.md.
jslint-org · Jul 21, 2023 · 2778f52 · 2778f52
1 parent a286a25
commit 2778f52
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 20 deletions.
diff --git a/.ci.sh b/.ci.sh
@@ -321,7 +321,7 @@ import moduleFs from "fs";
                         "type": "extensionHost"
                     }
                 ],
-                "version": "0.2.0"
+                "version": "0.0.1"
             }, undefined, 4)
         }, {
             file: "README.md",
@@ -441,7 +441,7 @@ import moduleFs from "fs";
                     "type": "git",
                     "url": "https://github.com/jslint-org/jslint.git"
                 },
-                "version": "2023.5.23"
+                "version": "2023.6.21"
             }, undefined, 4)
         }
     ].map(async function ({

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@
 - jslint - add new warning requiring paren around plus-separated concatenations.
 - jslint - try to improve parser to be able to parse jquery.js without stopping.
 
+# v2023.6.21
+- doc - Update docs in README.md.
+
 # v2023.5.23
 - jslint - Check exported properties are ordered.
 - jslint - Add grammar for "export async function ...".

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Douglas Crockford <douglas@crockford.com>
 
 
 # Status
-| Branch | [master<br>(v2023.5.23)](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>(v2023.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) |
 |--:|:--:|:--:|:--:|
 | 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) |
@@ -813,7 +813,7 @@ Error
 
 ```js
 /*jslint unordered*/
-// Allow unordered cases, params, properties, and variables.
+// Allow unordered cases, params, properties, variables, and exports.
 
 let foo = {bb: 1, aa: 0};
 
@@ -823,6 +823,11 @@ function bar({
 }) {
     return aa + bb;
 }
+
+export {
+    foo,
+    bar
+};
 ```
 
 <br>
@@ -918,6 +923,7 @@ eval("1"); //jslint-ignore-line
 - click `New pull request`
 - click `base repository: jslint-org/jslint base:beta`
 - click `head repository: kaizhu256/jslint compare:branch-v20yy.mm.dd`
+- verify `commit into jslint-org:beta`
 - click `Create pull request`
 - verify ci-success for pull-request
     - https://github.com/jslint-org/jslint/actions/workflows/on_pull_request.yml
@@ -931,13 +937,22 @@ git diff alpha..upstream/beta
 git reset upstream/beta
 git push origin alpha -f
 git push origin alpha:beta
+shMyciUpdate
 git push upstream alpha -f
-git push origin :branch-v20yy.mm.dd -f
 ```
 - verify ci-success for origin-branch-alpha
     - https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
 - verify ci-success for upstream-branch-alpha
     - https://github.com/jslint-org/jslint/actions/workflows/ci.yml
+- click `Delete branch`
+```shell
+git push origin beta:master
+git push upstream beta:master
+```
+- verify ci-success for origin-branch-master
+    - https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
+- verify ci-success for upstream-branch-master
+    - https://github.com/jslint-org/jslint/actions/workflows/ci.yml
 
 
 <br><br>
@@ -954,6 +969,7 @@ git push origin :branch-v20yy.mm.dd -f
 - copy-paste release notes from CHANGELOG.md
 - click `Generate release notes`
 - click `Set as the latest release`
+- click `Preview` and review
 - click `Publish release`
 - verify ci-success for upstream-branch-publish
     - https://github.com/jslint-org/jslint/actions/workflows/ci.yml
@@ -964,19 +980,27 @@ git push origin :branch-v20yy.mm.dd -f
 ### pull-request merge
 - find highest issue-number at https://github.com/jslint-org/jslint/issues/, and add +1 to it for PR-xxx
 - verify `commit into jslint-org:beta`
+- click `Create pull request`
 - verify ci-success for pull-request
     - https://github.com/jslint-org/jslint/actions/workflows/on_pull_request.yml
 - click `Rebase and merge`
 - verify ci-success for upstream-branch-beta
     - https://github.com/jslint-org/jslint/actions/workflows/ci.yml
 ```shell
 git fetch upstream beta
-git diff upstream/beta
+git diff alpha..upstream/beta
+# verify no diff between alpha..upstream/beta
 git reset upstream/beta
-git push -f origin alpha alpha:beta
+git push origin alpha -f
+git push origin alpha:beta
 shMyciUpdate
-git push -f upstream alpha
+git push upstream alpha -f
 ```
+- verify ci-success for origin-branch-alpha
+    - https://github.com/kaizhu256/jslint/actions/workflows/ci.yml
+- verify ci-success for upstream-branch-alpha
+    - https://github.com/jslint-org/jslint/actions/workflows/ci.yml
+- click `Delete branch`
 
 
 <br><br>

diff --git a/index.html b/index.html
@@ -1151,7 +1151,7 @@
         <div title="Allow 'this'.">
         <label><input type="checkbox" value="this">this</label>
         </div>
-        <div title="Allow unordered cases, params, properties, and variables.">
+        <div title="Allow unordered cases, params, properties, variables, and exports.">
         <label><input type="checkbox" value="unordered">unordered</label>
         </div>
         <div title="Allow unordered const and let declarations that are not at top of function-scope.">
@@ -1619,7 +1619,7 @@
 // .... /*jslint this*/ .......... Allow 'this'.
 // .... /*jslint trace*/ ......... Include jslint stack-trace in warnings.
 // .... /*jslint unordered*/ ..... Allow unordered cases, params, properties,
-// ................................... and variables.
+// ................................... variables, and exports.
 // .... /*jslint white*/ ......... Allow messy whitespace.
 
 await (async function () {

diff --git a/jslint.mjs b/jslint.mjs
@@ -165,7 +165,7 @@ let jslint_charset_ascii = (
     + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
     + "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
 );
-let jslint_edition = "v2023.5.23";
+let jslint_edition = "v2023.6.21";
 let jslint_export;                      // The jslint object to be exported.
 let jslint_fudge = 1;                   // Fudge starting line and starting
                                         // ... column to 1.
@@ -3327,7 +3327,7 @@ function jslint_phase2_lex(state) {
         case "this":            // Allow 'this'.
         case "trace":           // Include jslint stack-trace in warnings.
         case "unordered":       // Allow unordered cases, params, properties,
-                                // ... and variables.
+                                // ... variables, and exports.
         case "variable":        // Allow unordered const and let declarations
                                 // ... that are not at top of function-scope.
         case "white":           // Allow messy whitespace.

diff --git a/jslint_ci.sh b/jslint_ci.sh
@@ -665,7 +665,6 @@ shDirHttplinkValidate() {(set -e
 import moduleAssert from "assert";
 import moduleFs from "fs";
 import moduleHttps from "https";
-import moduleUrl from "url";
 (async function () {
     let {
         GITHUB_BRANCH0,
@@ -674,7 +673,9 @@ import moduleUrl from "url";
         UPSTREAM_GITHUB_IO,
         UPSTREAM_REPOSITORY
     } = process.env;
-    let dict = {};
+    let dict = {
+        "https://unlicense.org/": true
+    };
     Array.from(
         await moduleFs.promises.readdir(".")
     ).forEach(async function (file) {
@@ -718,9 +719,7 @@ import moduleUrl from "url";
                 return "";
             }
             dict[url] = true;
-            req = moduleHttps.request(moduleUrl.parse(
-                url
-            ), function (res) {
+            req = moduleHttps.request(url, function (res) {
                 console.error(
                     "shDirHttplinkValidate " + res.statusCode + " " + url
                 );
@@ -1015,8 +1014,7 @@ shGithubCheckoutRemote() {(set -e
     rm -rf __tmp1
     git reset "origin/$GITHUB_REF_NAME" --hard
     # fetch jslint_ci.sh from trusted source
-    git branch -D __tmp1 &>/dev/null || true
-    shGitCmdWithGithubToken fetch origin alpha:__tmp1 --depth=1
+    shGitCmdWithGithubToken fetch origin alpha:__tmp1 --depth=1 -f
     for FILE in .ci.sh .ci2.sh jslint_ci.sh myci2.sh
     do
         if [ -f "$FILE" ]

diff --git a/package.json b/package.json
@@ -35,5 +35,5 @@
     "shCiArtifactUpload": 1,
     "shCiNpmPublish": 1,
     "type": "module",
-    "version": "2023.5.23"
+    "version": "2023.6.21"
 }