Skip to content

Commit

Permalink
Merge pull request #416 from kaizhu256/branch-v2022.11.20
Browse files Browse the repository at this point in the history
# v2022.11.20 - ci - update ci from node-v16 to node-v18
  • Loading branch information
kaizhu256 committed Nov 21, 2022
2 parents b1e27be + d4d4df2 commit 74b54ae
Show file tree
Hide file tree
Showing 14 changed files with 146 additions and 1,475 deletions.
4 changes: 2 additions & 2 deletions .ci.sh
Expand Up @@ -79,7 +79,7 @@ echo "\
), (
" 2>/dev/null || true\n"
+ "$&\n"
+ "git checkout 60a022c511a37788e652c271af23174566a80c30\n"
+ "git checkout 61194ec2aee4b56e8e17f757021434122772f145\n"
));
// printf script
script = (
Expand Down Expand Up @@ -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 ({
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Expand Up @@ -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:

Expand All @@ -26,9 +26,9 @@ jobs:
- x64
# - x86
node_version:
- 14
- 16
- 18
- 19
os:
- macos-latest
- ubuntu-latest
Expand All @@ -44,15 +44,15 @@ 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
git checkout origin/alpha .ci.sh jslint_ci.sh
# 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') }}
Expand All @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/on_pull_request.yml
Expand Up @@ -14,9 +14,9 @@ jobs:
- x64
# - x86
node_version:
- 14
- 16
- 18
- 19
os:
- macos-latest
- ubuntu-latest
Expand All @@ -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 }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/publish.yml
Expand Up @@ -17,9 +17,9 @@ jobs:
- x64
# - x86
node_version:
# - 14
- 16
# - 18
# - 16
- 18
# - 19
os:
# - macos-latest
- ubuntu-latest
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -14,6 +14,7 @@ package-lock.json
temp*
tmp
undefined

!.gitconfig
!.github
!.gitignore
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Expand Up @@ -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.
Expand All @@ -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
Expand Down
22 changes: 10 additions & 12 deletions README.md
Expand Up @@ -3,7 +3,7 @@ Douglas Crockford <douglas@crockford.com>


# Status
| Branch | [master<br>(v2022.9.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) |
| Branch | [master<br>(v2022.11.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 Expand Up @@ -274,8 +274,8 @@ import fs from "fs";
```shell <!-- shRunWithScreenshotTxt .artifact/screenshot_sh_coverage_report_spawn.svg -->
#!/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

Expand Down Expand Up @@ -323,8 +323,8 @@ node ../jslint.mjs \
```shell <!-- shRunWithScreenshotTxt .artifact/screenshot_js_coverage_report_spawn.svg -->
#!/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

Expand Down Expand Up @@ -393,11 +393,11 @@ import jslint from "../jslint.mjs";

<!-- Assets from codemirror. -->

<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.5/codemirror.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.5/addon/lint/lint.css">
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.5/codemirror.js"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.10/codemirror.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.10/addon/lint/lint.css">
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.10/codemirror.js"></script>
<script defer src="https://codemirror.net/mode/javascript/javascript.js"></script>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.5/addon/lint/lint.js"></script>
<script defer src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.65.10/addon/lint/lint.js"></script>

<!-- Assets from jslint. -->

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -893,7 +891,7 @@ eval("1"); //jslint-ignore-line
<br><br>
# 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).

<!--
Expand Down

0 comments on commit 74b54ae

Please sign in to comment.