Skip to content

Commit 905e5a8

Browse files
committed
[npm publish] #### changelog 2020.11.12
- jslint - update to v2020.11.6 - update function chromeDevtoolsClient with timeout - remove file lib.puppeteer.js and replace with function chromeDevtoolsClientCreate - remove dependency on env-var \$CHROME_BIN - remove functions base64FromBuffer, base64ToUtf8, cryptoAesXxxCbcRawDecrypt, cryptoAesXxxCbcRawEncrypt, gotoNext, onErrorWithStack - jslint - fix off-by-one column in autofix-expected_a_before_b - decouple build from npm-env-variables npm_config_xxx and npm_package_xxx - update lib.utility2.sh to remove dependency on \$UTILITY2_MACRO_JS
1 parent 8ea5dbd commit 905e5a8

File tree

10 files changed

+159
-129
lines changed

10 files changed

+159
-129
lines changed

.github/workflows/node.js.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# derived from
2+
# https://github.com/actions/starter-workflows/blob/main/ci/node.js.yml
13
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
24
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
35
name: Node.js CI
@@ -25,6 +27,7 @@ jobs:
2527
uses: actions/setup-node@v1
2628
with:
2729
node-version: ${{ matrix.node-version }}
28-
- run: npm ci
29-
- run: npm run build --if-present
30-
- run: npm test
30+
# - run: npm ci
31+
# - run: npm run build --if-present
32+
# - run: npm test
33+
# - run: npm run ci-github

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ script:
3030
- npm run build-ci
3131
services:
3232
- docker
33-
- xvfb
33+
# - xvfb
3434
# http://docs.travis-ci.com/user/workers/container-based-infrastructure
3535
sudo:
3636
false

.vimrc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function! MyCommentRegion(...)
4949
" this function will comment selected-region
5050
" un-comment
5151
if a:1 == 'u'
52-
'<,'>s/^\(\s*\)\(""\|#\|%%\|--\|\/\/\)!! /\1/e
52+
'<,'>s/^\(\s*\)\(""\|#\|%%\|--\|\/\/\|::\)!! /\1/e
5353
'<,'>s/^\(\s*\)<!--!! \(.*\) -->/\1\2/e
5454
'<,'>s/^\(\s*\)\/\*!! \(.*\) \*\//\1\2/e
5555
" comment \"\"
@@ -70,6 +70,9 @@ function! MyCommentRegion(...)
7070
" comment //
7171
elseif a:1 == '/'
7272
'<,'>s/^\(\s*\)\(\S\)/\1\/\/!! \2/e
73+
" comment ::
74+
elseif a:1 == ':'
75+
'<,'>s/^\(\s*\)\(\S\)/\1::!! \2/e
7376
" comment <!--...-->
7477
elseif a:1 == '<'
7578
'<,'>s/^\(\s*\)\(\S.*\)/\1<!--!! \2 -->/e
@@ -160,9 +163,10 @@ nnoremap <silent> "\ :call MyStringifyRegion('\')<cr>
160163
nnoremap <silent> "u :call MyStringifyRegion('u')<cr>
161164
nnoremap <silent> #" :call MyCommentRegion('"')<cr>
162165
nnoremap <silent> #% :call MyCommentRegion('%')<cr>
163-
nnoremap <silent> #- :call MyCommentRegion('-')<cr>
164166
nnoremap <silent> #* :call MyCommentRegion('*')<cr>
167+
nnoremap <silent> #- :call MyCommentRegion('-')<cr>
165168
nnoremap <silent> #/ :call MyCommentRegion('/')<cr>
169+
nnoremap <silent> #: :call MyCommentRegion(':')<cr>
166170
nnoremap <silent> #<char-0x23> :call MyCommentRegion('#')<cr>
167171
nnoremap <silent> #u :call MyCommentRegion('u')<cr>
168172
" visual-mode remap
@@ -171,9 +175,10 @@ vnoremap <silent> "\ <esc>:call MyStringifyRegion('\')<cr>
171175
vnoremap <silent> "u <esc>:call MyStringifyRegion('u')<cr>
172176
vnoremap <silent> #" <esc>:call MyCommentRegion('"')<cr>
173177
vnoremap <silent> #% <esc>:call MyCommentRegion('%')<cr>
174-
vnoremap <silent> #- <esc>:call MyCommentRegion('-')<cr>
175178
vnoremap <silent> #* <esc>:call MyCommentRegion('*')<cr>
179+
vnoremap <silent> #- <esc>:call MyCommentRegion('-')<cr>
176180
vnoremap <silent> #/ <esc>:call MyCommentRegion('/')<cr>
181+
vnoremap <silent> #: <esc>:call MyCommentRegion(':')<cr>
177182
vnoremap <silent> #< <esc>:call MyCommentRegion('<')<cr>
178183
vnoremap <silent> #<char-0x23> <esc>:call MyCommentRegion('#')<cr>
179184
vnoremap <silent> #u <esc>:call MyCommentRegion('u')<cr>

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ this zero-dependency package will provide high-level functions to to build, test
5151
#### cli help
5252
![screenshot](https://kaizhu256.github.io/node-utility2/build/screenshot.npmPackageCliHelp.svg)
5353

54-
#### changelog 2020.11.3
55-
- update jslint to v2020.11.6
54+
#### changelog 2020.11.12
55+
- jslint - update to v2020.11.6
5656
- update function chromeDevtoolsClient with timeout
5757
- remove file lib.puppeteer.js and replace with function chromeDevtoolsClientCreate
5858
- remove dependency on env-var \$CHROME_BIN
@@ -63,6 +63,7 @@ this zero-dependency package will provide high-level functions to to build, test
6363
- none
6464

6565
#### todo
66+
- fix test-report bug with duplicate github and heroku tests
6667
- migrate from travis to github-actions
6768
- update function fsWriteFileWithMkdirp to write to tmpfile first
6869
- jslint - unmangle function jslintAutofixLocalFunction
@@ -1177,7 +1178,7 @@ require("http").createServer(function (req, res) {
11771178
"engines": {
11781179
"node": ">=12.0"
11791180
},
1180-
"fileCount": 28,
1181+
"fileCount": 27,
11811182
"homepage": "https://github.com/kaizhu256/node-utility2",
11821183
"keywords": [
11831184
"continuous-integration",
@@ -1209,12 +1210,12 @@ require("http").createServer(function (req, res) {
12091210
"utility2Dependents": [
12101211
"2020.06.08 apidoc-lite",
12111212
"2020.06.12 bootstrap-lite",
1212-
"2020.08.01 istanbul-lite",
12131213
"2020.08.19 sqlite3-lite",
12141214
"2020.10.27 jslint-lite",
1215-
"2020.10.27 utility2"
1215+
"2020.11.12 istanbul-lite",
1216+
"2020.11.12 utility2"
12161217
],
1217-
"version": "2020.11.3"
1218+
"version": "2020.11.12"
12181219
}
12191220
```
12201221

@@ -1258,9 +1259,9 @@ RUN (set -e; \
12581259
gnupg; \
12591260
(busybox --list | xargs -n1 /bin/sh -c \
12601261
'ln -s /bin/busybox /bin/$0 2>/dev/null' || true); \
1261-
curl -Lf https://deb.nodesource.com/setup_12.x | /bin/bash -; \
1262+
curl -Lf https://deb.nodesource.com/setup_14.x | /bin/bash -; \
12621263
apt-get install -y nodejs; \
1263-
(cd /usr/lib && npm install sqlite3@4); \
1264+
(cd /usr/lib && npm install sqlite3@5); \
12641265
)
12651266
# install google-chrome-stable
12661267
RUN (set -e; \
@@ -1299,7 +1300,7 @@ MAINTAINER kai zhu <[email protected]>
12991300
# install utility2
13001301
RUN (set -e; \
13011302
export DEBIAN_FRONTEND=noninteractive; \
1302-
npm install -g eslint puppeteer \
1303+
npm install -g eslint \
13031304
rm -f /tmp/.X99-lock && export DISPLAY=:99.0 && (Xvfb "$DISPLAY" &); \
13041305
npm install kaizhu256/node-utility2#alpha; \
13051306
cp -a node_modules /; \

lib.istanbul.js

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22
/*
3-
* lib.istanbul.js (2020.8.1)
3+
* lib.istanbul.js (2020.11.12)
44
* https://github.com/kaizhu256/node-istanbul-lite
55
* this zero-dependency package will provide browser-compatible version of istanbul coverage-tool (v0.4.5), with working web-demo
66
*
@@ -11367,17 +11367,19 @@ local.coverageMerge = function (coverage1 = {}, coverage2 = {}) {
1136711367
return coverage1;
1136811368
};
1136911369

11370-
local.coverageReportCreate = function (opt) {
11370+
local.coverageReportCreate = function ({
11371+
coverage,
11372+
coverageInclude
11373+
}) {
1137111374
/*
1137211375
* this function will
11373-
// 1. merge previous <dirCoverage>/coverage.json into <opt>.coverage
11374-
// 2. convert <opt>.coverage to <summaryDict>
11376+
// 1. merge previous <dirCoverage>/coverage.json into <coverage>
11377+
// 2. convert <coverage> to <summaryDict>
1137511378
// 3. convert <summaryDict> to <nodeRoot>
1137611379
// 4. convert <nodeRoot> to text-report <dirCoverage>/coverage.txt
1137711380
// 5. convert <nodeRoot> to html-report <dirCoverage>/\*
1137811381
// 6. return coverage-report in html-format as single document
1137911382
*/
11380-
let coverageInclude;
1138111383
let dirCoverage;
1138211384
let filePrefix;
1138311385
let htmlAll;
@@ -11388,9 +11390,6 @@ local.coverageReportCreate = function (opt) {
1138811390
let nodeRoot;
1138911391
let summaryDict;
1139011392
let tmp;
11391-
if (!(opt && opt.coverage)) {
11392-
return "";
11393-
}
1139411393
// init function
1139511394
nodeChildAdd = function (node, child) {
1139611395
/*
@@ -11516,15 +11515,15 @@ local.coverageReportCreate = function (opt) {
1151611515
);
1151711516
});
1151811517
};
11519-
// 1. merge previous <dirCoverage>/coverage.json into <opt>.coverage
11518+
// 1. merge previous <dirCoverage>/coverage.json into <coverage>
1152011519
dirCoverage = path.resolve(".tmp/build/coverage");
11521-
coverageInclude = opt.coverageInclude || globalThis.__coverageInclude__;
11520+
coverageInclude = coverageInclude || globalThis.__coverageInclude__;
1152211521
if (!local.isBrowser && process.env.npm_config_mode_coverage_merge) {
1152311522
console.error(
1152411523
"istanbul - merging file "
1152511524
+ dirCoverage + "/coverage.json to coverage"
1152611525
);
11527-
local.coverageMerge(opt.coverage, local.fsReadFileOrDefaultSync(
11526+
local.coverageMerge(coverage, local.fsReadFileOrDefaultSync(
1152811527
dirCoverage + "/coverage.json",
1152911528
"json",
1153011529
{}
@@ -11537,9 +11536,9 @@ local.coverageReportCreate = function (opt) {
1153711536
coverageInclude[file] = 1;
1153811537
});
1153911538
}
11540-
// 2. convert <opt>.coverage to <summaryDict>
11539+
// 2. convert <coverage> to <summaryDict>
1154111540
summaryDict = {};
11542-
Object.entries(opt.coverage).forEach(function ([
11541+
Object.entries(coverage).forEach(function ([
1154311542
file,
1154411543
fileCoverage
1154511544
]) {
@@ -11549,7 +11548,7 @@ local.coverageReportCreate = function (opt) {
1154911548
let summary;
1155011549
if (fileCoverage && coverageInclude.hasOwnProperty(file)) {
1155111550
// reset line-cnt
11552-
delete opt.coverage[file].l;
11551+
delete coverage[file].l;
1155311552
// init summary
1155411553
summary = {
1155511554
branches: {
@@ -11690,11 +11689,11 @@ local.coverageReportCreate = function (opt) {
1169011689
// 4. convert <nodeRoot> to text-report <dirCoverage>/coverage.txt
1169111690
reportTextWrite(nodeRoot, dirCoverage);
1169211691
// 5. convert <nodeRoot> to html-report <dirCoverage>/\*
11693-
htmlAll = reportHtmlWrite(nodeRoot, dirCoverage, opt.coverage);
11694-
// save opt.coverage to dirCoverage/coverage.json
11692+
htmlAll = reportHtmlWrite(nodeRoot, dirCoverage, coverage);
11693+
// save coverage to dirCoverage/coverage.json
1169511694
fileWrite(
1169611695
dirCoverage + "/coverage.json",
11697-
JSON.stringify(opt.coverage, undefined, 4)
11696+
JSON.stringify(coverage, undefined, 4)
1169811697
);
1169911698
// save coverageInclude to dirCoverage/coverage.include.json
1170011699
fileWrite(

lib.jslint.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16319,8 +16319,8 @@ local.jslint0 = Object.freeze(function (
1631916319
// expected_a_before_b: "Expected '{a}' before '{b}'.",
1632016320
case "expected_a_before_b":
1632116321
bb = (
16322-
aa.slice(0, warning.column) + warning.a
16323-
+ aa.slice(warning.column)
16322+
aa.slice(0, warning.column - 1) + warning.a
16323+
+ aa.slice(warning.column - 1)
1632416324
);
1632516325
break;
1632616326
// expected_identifier_a:

0 commit comments

Comments
 (0)