diff --git a/.ci.sh b/.ci.sh index 41a630709..88bda4aaa 100644 --- a/.ci.sh +++ b/.ci.sh @@ -79,7 +79,7 @@ echo "\ ), ( " 2>/dev/null || true\n" + "$&\n" - + "git checkout 60a022c511a37788e652c271af23174566a80c30\n" + + "git checkout 61194ec2aee4b56e8e17f757021434122772f145\n" )); // printf script script = ( @@ -434,7 +434,7 @@ import moduleFs from "fs"; "type": "git", "url": "https://github.com/jslint-org/jslint.git" }, - "version": "2022.9.20" + "version": "2022.11.20" }, undefined, 4) } ].map(async function ({ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 04ab1ae4f..5c13c16fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ on: - sandbox workflow_dispatch: env: - CI_MAIN_JOB: node.v16.x64.linux - GITHUB_ARTIFACT_UPLOAD_NODE_VERSION: v16 + CI_MAIN_JOB: node.v18.x64.linux + GITHUB_ARTIFACT_UPLOAD_NODE_VERSION: v18 # MY_GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }} jobs: @@ -26,9 +26,9 @@ jobs: - x64 # - x86 node_version: - - 14 - 16 - 18 + - 19 os: - macos-latest - ubuntu-latest @@ -44,7 +44,7 @@ jobs: # disable autocrlf in windows - run: git config --global core.autocrlf false # https://github.com/actions/checkout - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # fetch jslint_ci.sh from trusted source - run: | git fetch origin alpha @@ -52,7 +52,7 @@ jobs: # pre-run .ci.sh - run: sh jslint_ci.sh shCiPre # https://github.com/actions/cache - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: key: > ${{ hashFiles('./package.json') }} @@ -61,7 +61,7 @@ jobs: ${{ matrix.os }} path: .github_cache # https://github.com/actions/setup-node - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.architecture }} diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml index 26d09b522..d11c95fdf 100644 --- a/.github/workflows/on_pull_request.yml +++ b/.github/workflows/on_pull_request.yml @@ -14,9 +14,9 @@ jobs: - x64 # - x86 node_version: - - 14 - 16 - 18 + - 19 os: - macos-latest - ubuntu-latest @@ -26,9 +26,9 @@ jobs: # disable autocrlf in windows - run: git config --global core.autocrlf false # https://github.com/actions/checkout - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 # https://github.com/actions/setup-node - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.architecture }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0cb980c9f..5d85f286d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -17,9 +17,9 @@ jobs: - x64 # - x86 node_version: - # - 14 - - 16 - # - 18 + # - 16 + - 18 + # - 19 os: # - macos-latest - ubuntu-latest @@ -38,8 +38,8 @@ jobs: # Setup .npmrc file to publish to GitHub Packages - run: rm -f /home/runner/work/_temp/.npmrc - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.architecture }} @@ -54,8 +54,8 @@ jobs: # Setup .npmrc file to publish to npm - run: rm -f /home/runner/work/_temp/.npmrc - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 with: node-version: ${{ matrix.node_version }} architecture: ${{ matrix.architecture }} diff --git a/.gitignore b/.gitignore index c0eedaa30..e43cb0b28 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ package-lock.json temp* tmp undefined + !.gitconfig !.github !.gitignore diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d0071d13..74e5580ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,6 @@ # Todo - doc - document supported/unsupported es6+ features -- cli - remove cli-option `--mode-vim-plugin` - coverage - add macros `/*coverage-disable*/` and `/*coverage-enable*/`. - jslint - add html and css linting back into jslint. - jslint - add new warning requiring paren around plus-separated concatenations. @@ -11,7 +10,13 @@ - jslint - try to improve parser to be able to parse jquery.js without stopping. - jslint - unify analysis of variable-assignment/function-parameters into one function - jslint - add new warning "Expected Object.create(null) instead of {}" + +# v2022.11.20 +- ci - update ci from node-v16 to node-v18 +- cli - remove deprecated cli-option `--mode-vim-plugin` - node - after node-v14 is deprecated, remove shell-code `export "NODE_OPTIONS=--unhandled-rejections=strict"`. +- editor - update codemirror-editor to v5.65.10 +- remove obsolete help.html # v2022.9.20 - directive - add new directive `fart` to allow complex fat-arrow diff --git a/README.md b/README.md index e8518b7de..ffaa768c1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Douglas Crockford # Status -| Branch | [master
(v2022.9.20)](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
(v2022.11.20)](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) | @@ -274,8 +274,8 @@ import fs from "fs"; ```shell #!/bin/sh -git clone https://github.com/mapbox/node-sqlite3 node-sqlite3-sh \ - --branch=v5.0.2 \ +git clone https://github.com/tryghost/node-sqlite3 node-sqlite3-sh \ + --branch=v5.0.11 \ --depth=1 \ --single-branch @@ -323,8 +323,8 @@ node ../jslint.mjs \ ```shell #!/bin/sh -git clone https://github.com/mapbox/node-sqlite3 node-sqlite3-js \ - --branch=v5.0.2 \ +git clone https://github.com/tryghost/node-sqlite3 node-sqlite3-js \ + --branch=v5.0.11 \ --depth=1 \ --single-branch @@ -393,11 +393,11 @@ import jslint from "../jslint.mjs"; - - - + + + - + @@ -528,8 +528,6 @@ window.addEventListener("load", function () { - [index.html](index.html) runs the jslint.mjs function in a web page. -- [help.html](help.html) describes JSLint's usage. Please [read it](https://jslint-org.github.io/jslint/help.html). - JSLint can be run anywhere that JavaScript (or Java) can run. The place to express yourself in programming is in the quality of your ideas and @@ -893,7 +891,7 @@ eval("1"); //jslint-ignore-line

# License - JSLint is under [Unlicense License](LICENSE). -- CodeMirror editor is under [MIT License](https://github.com/codemirror/CodeMirror/blob/master/LICENSE). +- CodeMirror editor is under [MIT License](https://github.com/codemirror/codemirror5/blob/d0e3b2e727c41aa4fd89fbad0adfb3815339174c/LICENSE). - Function `v8CoverageListMerge` is derived from [MIT Licensed v8-coverage](https://github.com/demurgos/v8-coverage/blob/73446087dc38f61b09832c9867122a23f8577099/ts/LICENSE.md). - - - + + + - + diff --git a/package.json b/package.json index 672941f74..7f5a08c1c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "default": "./jslint_wrapper_cjs.cjs", "import": "./jslint.mjs" }, - "fileCount": 34, + "fileCount": 33, "keywords": [ "coverage-report", "javascript", @@ -33,5 +33,5 @@ "test2": "sh jslint_ci.sh shCiBase" }, "type": "module", - "version": "2022.9.20" + "version": "2022.11.20" }