Skip to content

Commit ef9ea9e

Browse files
authored
Merge branch 'master' into update-node-test-environment
2 parents 69dd37b + c8e532e commit ef9ea9e

18 files changed

Lines changed: 29 additions & 39 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ jobs:
266266
- name: First retry
267267
id: retry
268268
if: steps.test.outcome == 'failure'
269-
run: ${{ matrix.cmd }}
269+
run: git reset --hard && ${{ matrix.cmd }}
270270
continue-on-error: true
271271
- name: Second retry
272272
if: steps.retry.outcome == 'failure'
273-
run: ${{ matrix.cmd }}
273+
run: git reset --hard && ${{ matrix.cmd }}

bin/test-browser.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ function startTest() {
230230
} else {
231231
console.log('Testing on:', userAgent);
232232

233-
/* jshint evil: true */
234233
var interval = setInterval(function () {
235234
seleniumClient.eval('window.testEvents()', function (err, events) {
236235
if (err) {

bin/test-webpack.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
# Webpack and Browserify to justify it.
77
#
88

9+
# If this script is run _after_ bin/update-package-json-for-publish.js is run,
10+
# `npm run build` may fail with:
11+
#
12+
# > Error: 'default' is not exported by node_modules/inherits/inherits.js
13+
#
14+
# To avoid this, fail if this script is run in a non-clean git repo:
15+
git_diff="$(git diff -- package.json packages/node_modules/*/package.json)"
16+
if [[ "$git_diff" != "" ]]; then
17+
git status --untracked-files=no -- package.json packages/node_modules/*/package.json
18+
echo "!!!"
19+
echo "!!! Your git working directory has changes to package.json file(s) !!!"
20+
echo "!!! Please revert/stage/commit changes, and re-run the command !!!"
21+
echo "!!!"
22+
exit 1
23+
fi
24+
925
npm run build
1026
npm i webpack@5.66.0 webpack-cli@4.9.2 # do this on-demand to avoid slow installs
1127
node bin/update-package-json-for-publish.js

docs/static/js/code.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* jshint jquery: true */
2-
31
function codeWrap(){
42
"use strict";
53

packages/node_modules/pouchdb-errors/src/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ function createError(error, reason) {
4747
function CustomPouchError(reason) {
4848
// inherit error properties from our parent error manually
4949
// so as to allow proper JSON parsing.
50-
/* jshint ignore:start */
5150
var names = Object.getOwnPropertyNames(error);
5251
for (var i = 0, len = names.length; i < len; i++) {
5352
if (typeof error[names[i]] !== 'function') {
@@ -59,7 +58,6 @@ function createError(error, reason) {
5958
this.stack = (new Error()).stack;
6059
}
6160

62-
/* jshint ignore:end */
6361
if (reason !== undefined) {
6462
this.reason = reason;
6563
}

packages/node_modules/pouchdb-replication/src/replicateWrapper.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ function replicateWrapper(src, target, opts, callback) {
3131
opts = clone(opts);
3232
opts.continuous = opts.continuous || opts.live;
3333
opts.retry = ('retry' in opts) ? opts.retry : false;
34-
/*jshint validthis:true */
3534
opts.PouchConstructor = opts.PouchConstructor || this;
3635
var replicateRet = new Replication(opts);
3736
var srcPouch = toPouch(src, opts);

packages/node_modules/pouchdb-replication/src/sync.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ function sync(src, target, opts, callback) {
1616
opts = {};
1717
}
1818
opts = clone(opts);
19-
/*jshint validthis:true */
2019
opts.PouchConstructor = opts.PouchConstructor || this;
2120
src = toPouch(src, opts);
2221
target = toPouch(target, opts);

tests/integration/browser.worker.js

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
'use strict';
22

3-
var sourceFile = window.location.search.match(/[?&]sourceFile=([^&]+)/);
4-
5-
if (!sourceFile) {
6-
sourceFile = '../../packages/node_modules/pouchdb/dist/pouchdb.js';
7-
} else {
8-
sourceFile = '../../packages/node_modules/pouchdb/dist/' + sourceFile[1];
9-
}
10-
113
// only running in Chrome and Firefox due to various bugs.
124
// IE: https://connect.microsoft.com/IE/feedback/details/866495
135
// Safari: doesn't have IndexedDB or WebSQL in a WW
@@ -16,9 +8,9 @@ if (!sourceFile) {
168
var isNodeWebkit = typeof window !== 'undefined' &&
179
typeof process !== 'undefined';
1810

19-
if (typeof window.Worker === 'function' &&
11+
if ((window && typeof window.Worker === 'function') &&
2012
!isNodeWebkit && !testUtils.isIE() &&
21-
(window.chrome || /Firefox/.test(navigator.userAgent))) {
13+
((window && window.chrome) || (navigator && /Firefox/.test(navigator.userAgent)))) {
2214
runTests();
2315
}
2416

@@ -28,6 +20,15 @@ function runTests() {
2820

2921
before(function () {
3022
worker = new Worker('worker.js');
23+
24+
var sourceFile = window && window.location.search.match(/[?&]sourceFile=([^&]+)/);
25+
26+
if (!sourceFile) {
27+
sourceFile = '../../packages/node_modules/pouchdb/dist/pouchdb.js';
28+
} else {
29+
sourceFile = '../../packages/node_modules/pouchdb/dist/' + sourceFile[1];
30+
}
31+
3132
worker.postMessage(['source', sourceFile]);
3233
});
3334

tests/integration/test.attachments.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ var repl_adapters = [
88
['local', 'local']
99
];
1010

11-
/* jshint maxlen:false */
1211
var icons = [
1312
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAC8klEQVQ4y6WTS2hcZQCFv//eO++ZpDMZZjKdZB7kNSUpeWjANikoWiMUtEigBdOFipS6Ercu3bpTKF23uGkWBUGsoBg1KRHapjU0U81rpp3ESdNMZu6dx70zc38XdSFYVz1wNmdxzuKcAy8I8RxNDfs705ne5FmX0+mXUtK0mka2kLvxRC9vAe3nGmRiCQ6reux4auDi6ZenL0wOjaa6uoKK2+kgv1O0l1dvby/8/tvVe1t/XAn6ArvZ3fyzNIBjsQS5YiH6/ul3v/z0/AcfTx8fC24+zgvV4SXccYTtYlGM9MSDMydee1W27OQPd5d+Hujure4bZRQVeLCTY2p44tJ7M2/Pjg1lOLQkXy2scP3OQ1b3Snzx3SK/PCoxOphh7q13ZqeGJy492MmhAkoyHMUlRN8b4yfnBnqSWLqJItzkXZPoWhzF4WZdjGJ6+7H0OoPxFG9OnppzCtGXCEdRZ16axu1yffjRmfPnYqEw7WIdj1OlO6wx1e0g7hckO1ReH4wSrkgUVcEfDITub6w9Gus7tqS4NAcOVfMpCFq2jdrjwxv2cG48SejPFe59/gmnyuuMHA0ien0oR1x0BgJ4XG5fwO9Hk802sm3TbFiYVhNNU1FUBYCBsRNEmiad469gYyNUgRDPipNIQKKVajo1s1F9WjqgVjZQELg9Ek3TUFNHCaXnEEiQEvkPDw4PqTfMalk3UKt1g81ioRgLRc6MxPtDbdtGKgIhBdgSKW2kLWm327SaLayGxfzCzY2vf/zms0pVLyn7lQOadbmxuHb7WrawhW220J+WKZXK6EaNsl7F0GsYep1q3eTW6grfLv90zZRyI7dfRDNtSPdE+av05PL8re+HgdlMPI2wJXrDRAACgdVusfZ4k+uLN+eXs/cvp7oitP895UQogt6oxYZiiYsnMxMXpjPjqaC/QwEoGRX71+yd7aXs3asPd/NXAm7vbv5g7//P1OHxpvsj8bMep8sPULdMY32vcKNSr/3nTC+MvwEdhUhhkKTyPgAAAEJ0RVh0Y29tbWVudABGaWxlIHNvdXJjZTogaHR0cDovL3d3dy5zc2J3aWtpLmNvbS9GaWxlOktpcmJ5SGVhZFNTQkIucG5nSbA1rwAAACV0RVh0Y3JlYXRlLWRhdGUAMjAxMC0xMi0xNFQxNjozNDoxMCswMDowMDpPBjcAAAAldEVYdG1vZGlmeS1kYXRlADIwMTAtMTAtMDdUMjA6NTA6MzYrMDA6MDCjC6s7AAAAAElFTkSuQmCC",
1413
"iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAC3ElEQVQ4jX2SX2xTdRzFP/d3f5d7u7ZbGes6LyAFWSiNmbMuSqb4wgxGVMiYT/BkNPMNfV1MDAFfNDHxwWSJU4wsMsKLEhI3gmE0JHO6FTBzMrZlS3V3Qun+sG70tvePD4ZlI8BJvi/fc/LN9+QceAIanm1oa2xo7HuSRn0c0dUq5fbd2teerLRHxqzuhzjDEs+0VYSrT4vHHbAW1ZrWg9aeYweurdv3vCsTL7Yy+GmHfcb3/Qn5T49MCYMW85Dz2Vphdl6jWPLJjmAOfSN/QsFY+ZdfNic5tuUFzLEfZjOLi1Xt5C7J44VJ6V/9Up546M0NFz/Xhp070l8789elf65DH3wvFYoACK2KNiMMz79Nx9ojEZOWP/Lx1NCv/7v8fTDK0fe34QF/ZsS5rkxhAUC4ZZJeGfQgovFNPu4+KtsAYsWad+rjM1TqHvcsqNmUY59pow/HqI07b62msEtqwijzku4inXmorqXllWpxybgb3f/akVLi7lAJ60KA+gMOTTcSWKc1rgZyi1f+8joB1PPDbn85W/GzYxOL1XgJaRDoTW9ID8ysnKyK24dSh/3auoSGUuGQFxb2UzlERL19Nu12AkiArkwhA6HDT29yLi+j1s3Oih/royUZjXihYg5W7txH5EGrhI17wMy6yWRUT47m7NHVHmypcirnl8SO6pBnNiWdr4q6+kZksxI3oiDCsLwE9/LARlguIm/lXbmuif3TTjG4Ejj724RbDuleezimbHv1dW/rrTQE62ByRLC8AJ4C2SkIIiauTbsD65rYlSlYp9LlTy5muBkx/WYZgMQ++HtcsGunR33S5+Y4NKcgHFQAeGSV09PsnZtRuu05uD8LZsDDXgDXhubd0DfAaM9l7/t1FtbC871Sbk5MbdX5oHwbOs+ovVPj9C7N0VhyUfv61Q/7x0qDqyk8CnURZcdkzufbC0p7bVn77otModRkGqdefs79qOj7xgPdf3d0KpBuuY7dAAAAAElFTkSuQmCC",

tests/integration/test.basics.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ adapters.forEach(function (adapter) {
1717
});
1818

1919
it('Create a pouch without new keyword', function () {
20-
/* jshint newcap:false */
2120
var db = PouchDB(dbs.name);
2221
db.should.be.an.instanceof(PouchDB);
2322
});
@@ -1048,7 +1047,6 @@ adapters.forEach(function (adapter) {
10481047

10491048
it('3968, keeps all object fields', function () {
10501049
var db = new PouchDB(dbs.name);
1051-
/* jshint -W001 */
10521050
var doc = {
10531051
_id: "x",
10541052
type: "testdoc",

0 commit comments

Comments
 (0)