diff --git a/.ci.sh b/.ci.sh index 1909191bf..5c51d718c 100644 --- a/.ci.sh +++ b/.ci.sh @@ -441,7 +441,7 @@ import moduleFs from "fs"; "type": "git", "url": "https://github.com/jslint-org/jslint.git" }, - "version": "2024.3.1" + "version": "2024.3.21" }, undefined, 4) } ].map(async function ({ diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b24bc0cc..b860996e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ - jslint - add new warning requiring paren around plus-separated concatenations. - jslint - try to improve parser to be able to parse jquery.js without stopping. -# v2024.3.1-beta +# v2024.3.21 - jslint - Allow destructuring-assignment after function-definition. - ci - Replace npm-package used to auto-build vscode-plugin, vsce to @vscode/vsce. - test - Update test-function jstestDescribe() to wait awhile for imports to initialize before running tests. diff --git a/README.md b/README.md index b20ac8485..a6add756b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Douglas Crockford # Status -| Branch | [master
(v2023.10.24)](https://github.com/jslint-org/jslint/tree/master) | [beta
(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha
(Development)](https://github.com/jslint-org/jslint/tree/alpha) | +| Branch | [master
(v2024.3.21)](https://github.com/jslint-org/jslint/tree/master) | [beta
(Web Demo)](https://github.com/jslint-org/jslint/tree/beta) | [alpha
(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) | @@ -74,9 +74,9 @@ Douglas Crockford 12. [License](#license) 13. [Devops Instruction](#devops-instruction) + - [pull-request merge](#pull-request-merge) - [branch-master commit](#branch-master-commit) - [branch-master publish](#branch-master-publish) - - [pull-request merge](#pull-request-merge) - [vscode-jslint publish](#vscode-jslint-publish) @@ -915,17 +915,35 @@ eval("1"); //jslint-ignore-line

-### branch-master commit -- $ `shGitSquashPop '# v20yy.mm.dd\n'` - - verify correct-year `20yy` -- $ `git push origin alpha:branch-v20yy.mm.dd` -- $ `git push upstream alpha -f` +### pull-request merge +- find highest issue-number at https://github.com/jslint-org/jslint/issues/, https://github.com/jslint-org/jslint/pulls/, and add +1 to it for PR-xxx +```shell +npm run test2 +shGitSquashPop beta '' +git push origin alpha:branch_xxx +git push origin alpha -f +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 -- goto https://github.com/kaizhu256/jslint/pulls -- click `New pull request` -- click `base repository: jslint-org/jslint base:beta` -- click `head repository: kaizhu256/jslint compare:branch-v20yy.mm.dd` +- goto https://github.com/jslint-org/jslint/compare/beta...kaizhu256:jslint:alpha +- click `head repository: kaizhu256/jslint compare:` +- click `Create pull request` +- `Add a description` template: +``` +Fixes #xxx. +- + +This PR will ... + +this PR will additionally: +- +... + + +``` - verify `commit into jslint-org:beta` - click `Create pull request` - verify ci-success for pull-request @@ -948,59 +966,34 @@ git push upstream alpha -f - 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

-### branch-master publish -- $ `git push upstream beta:master` -- verify ci-success for upstream-branch-master - - https://github.com/jslint-org/jslint/actions/workflows/ci.yml -- goto https://github.com/jslint-org/jslint/releases/new -- input tag `v20yy.mm.dd` -- click `Create new tag: v20yy.mm.dd on publish` - - verify correct-year `20yy` -- click `Target: master` -- input `Release title: v20yy.mm.dd - ` -- 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 -- verify email-notification `Successfully published @jslint-org/jslint@20yy.mm.dd` - - -

-### pull-request merge -- find highest issue-number at https://github.com/jslint-org/jslint/issues/, https://github.com/jslint-org/jslint/pulls/, and add +1 to it for PR-xxx +### branch-master commit +- update CHANGELOG.md `#v20yy.mm.dd` to today's date ```shell -git push origin alpha:branch_xxx -git push upstream alpha +npm run test2 +shGitSquashPop beta ' +# v20yy.mm.dd +- +- +' +git diff origin/branch-v20yy.mm.dd +git push origin alpha:branch-v20yy.mm.dd +git push origin alpha -f +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 - goto https://github.com/jslint-org/jslint/compare/beta...kaizhu256:jslint:alpha -- select branch to merge +- click `head repository: kaizhu256/jslint compare:branch-v20yy.mm.dd` - click `Create pull request` +- `Add a title` template: `#v20yy.mm.dd` - `Add a description` template: ``` -Fixes #xxx. -- - -This PR will ... - -this PR will additionally: -- -... - - + ``` - verify `commit into jslint-org:beta` - click `Create pull request` @@ -1024,6 +1017,40 @@ git push upstream alpha -f - 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 + + +

+### branch-master publish +- $ `git push upstream beta:master` +- verify ci-success for upstream-branch-master + - https://github.com/jslint-org/jslint/actions/workflows/ci.yml +- goto https://github.com/jslint-org/jslint/releases/new +- `Choose a tag` template: `v20yy.mm.dd` +- click `Create new tag: v20yy.mm.dd on publish` + - verify correct-year `20yy` +- select `Target: master` +- select `Previous tag:auto` +- `Release title` template: `v20yy.mm.dd - ` +- `Describe this release` template: +``` +- +- +``` +- 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 +- verify email-notification `Successfully published @jslint-org/jslint@20yy.mm.dd`

diff --git a/jslint.mjs b/jslint.mjs index 5014f6788..57b35e2ad 100644 --- a/jslint.mjs +++ b/jslint.mjs @@ -163,7 +163,7 @@ let jslint_charset_ascii = ( + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_" + "`abcdefghijklmnopqrstuvwxyz{|}~\u007f" ); -let jslint_edition = "v2024.3.1-beta"; +let jslint_edition = "v2024.3.21"; let jslint_export; // The jslint object to be exported. let jslint_fudge = 1; // Fudge starting line and starting // ... column to 1. diff --git a/package.json b/package.json index 5f89221d5..9326e05a7 100644 --- a/package.json +++ b/package.json @@ -35,5 +35,5 @@ "shCiArtifactUpload": 1, "shCiPublishNpm": 1, "type": "module", - "version": "2024.3.1-beta" + "version": "2024.3.21" }