update deps: CM 5.59.3, webAuth 0.1.1

This commit is contained in:
tophf 2021-02-21 09:17:03 +03:00
parent a674874861
commit 76ee0992e7
8 changed files with 274 additions and 163 deletions

258
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.5.15", "version": "1.5.15",
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"dependencies": { "dependencies": {
"codemirror": "5.59.2", "codemirror": "5.59.3",
"db-to-cloud": "^0.6.0", "db-to-cloud": "^0.6.0",
"jsonlint": "^1.6.3", "jsonlint": "^1.6.3",
"less-bundle": "github:openstyles/less-bundle#v0.1.0", "less-bundle": "github:openstyles/less-bundle#v0.1.0",
@ -18,17 +18,17 @@
"stylelint-bundle": "^13.8.0", "stylelint-bundle": "^13.8.0",
"stylus-lang-bundle": "github:openstyles/stylus-lang-bundle#v0.54.7", "stylus-lang-bundle": "github:openstyles/stylus-lang-bundle#v0.54.7",
"usercss-meta": "^0.10.0", "usercss-meta": "^0.10.0",
"webext-launch-web-auth-flow": "^0.1.0" "webext-launch-web-auth-flow": "^0.1.1"
}, },
"devDependencies": { "devDependencies": {
"archiver": "^4.0.1", "archiver": "^4.0.1",
"endent": "^1.4.0", "endent": "^1.4.0",
"eslint": "^7.16.0", "eslint": "^7.20.0",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"make-fetch-happen": "^8.0.7", "make-fetch-happen": "^8.0.7",
"sync-version": "^1.0.1", "sync-version": "^1.0.1",
"tiny-glob": "^0.2.6", "tiny-glob": "^0.2.6",
"web-ext": "^5.4.1", "web-ext": "^5.5.0",
"webext-tx-fix": "^0.3.3" "webext-tx-fix": "^0.3.3"
}, },
"engines": { "engines": {
@ -645,6 +645,7 @@
"espree": "7.3.0", "espree": "7.3.0",
"esprima": "4.0.1", "esprima": "4.0.1",
"fluent-syntax": "0.13.0", "fluent-syntax": "0.13.0",
"fsevents": "2.2.1",
"glob": "7.1.6", "glob": "7.1.6",
"is-mergeable-object": "1.1.1", "is-mergeable-object": "1.1.1",
"jed": "1.1.1", "jed": "1.1.1",
@ -1566,9 +1567,9 @@
} }
}, },
"node_modules/binary-extensions": { "node_modules/binary-extensions": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"engines": { "engines": {
@ -1854,6 +1855,12 @@
"engines": [ "engines": [
"node >=0.10.0" "node >=0.10.0"
], ],
"dependencies": {
"dtrace-provider": "~0.8",
"moment": "^2.19.3",
"mv": "~2",
"safe-json-stringify": "~1"
},
"bin": { "bin": {
"bunyan": "bin/bunyan" "bunyan": "bin/bunyan"
}, },
@ -2129,14 +2136,15 @@
} }
}, },
"node_modules/chokidar": { "node_modules/chokidar": {
"version": "3.4.3", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"dependencies": { "dependencies": {
"anymatch": "~3.1.1", "anymatch": "~3.1.1",
"braces": "~3.0.2", "braces": "~3.0.2",
"fsevents": "~2.3.1",
"glob-parent": "~5.1.0", "glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0", "is-binary-path": "~2.1.0",
"is-glob": "~4.0.1", "is-glob": "~4.0.1",
@ -2147,14 +2155,13 @@
"node": ">= 8.10.0" "node": ">= 8.10.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"fsevents": "~2.1.2" "fsevents": "~2.3.1"
} }
}, },
"node_modules/chokidar/node_modules/fsevents": { "node_modules/chokidar/node_modules/fsevents": {
"version": "2.1.3", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"deprecated": "Please update to v 2.2.x",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"optional": true, "optional": true,
@ -2356,9 +2363,9 @@
} }
}, },
"node_modules/codemirror": { "node_modules/codemirror": {
"version": "5.59.2", "version": "5.59.3",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.2.tgz", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.3.tgz",
"integrity": "sha512-/D5PcsKyzthtSy2NNKCyJi3b+htRkoKv3idswR/tR6UAvMNKA7SrmyZy6fOONJxSRs1JlUWEDAbxqfdArbK8iA==" "integrity": "sha512-p1d4BjmBBssgnEGtQeWvE5PdiDffqZjiJ77h2FZ2J2BpW9qdOzf6v7IQscyE+TgyKBQS3PpsYimfEDNgcNRZGQ=="
}, },
"node_modules/collection-visit": { "node_modules/collection-visit": {
"version": "1.0.0", "version": "1.0.0",
@ -3646,13 +3653,13 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "7.16.0", "version": "7.20.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.16.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz",
"integrity": "sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==", "integrity": "sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.2.2", "@eslint/eslintrc": "^0.3.0",
"ajv": "^6.10.0", "ajv": "^6.10.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
"cross-spawn": "^7.0.2", "cross-spawn": "^7.0.2",
@ -3663,7 +3670,7 @@
"eslint-utils": "^2.1.0", "eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0", "eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1", "espree": "^7.3.1",
"esquery": "^1.2.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"file-entry-cache": "^6.0.0", "file-entry-cache": "^6.0.0",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
@ -3676,7 +3683,7 @@
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1", "json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1", "levn": "^0.4.1",
"lodash": "^4.17.19", "lodash": "^4.17.20",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
@ -3745,6 +3752,27 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/eslint/node_modules/@eslint/eslintrc": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
"integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
"espree": "^7.3.0",
"globals": "^12.1.0",
"ignore": "^4.0.6",
"import-fresh": "^3.2.1",
"js-yaml": "^3.13.1",
"lodash": "^4.17.20",
"minimatch": "^3.0.4",
"strip-json-comments": "^3.1.1"
},
"engines": {
"node": "^10.12.0 || >=12.0.0"
}
},
"node_modules/eslint/node_modules/eslint-visitor-keys": { "node_modules/eslint/node_modules/eslint-visitor-keys": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
@ -3781,12 +3809,15 @@
"dev": true "dev": true
}, },
"node_modules/esquery": { "node_modules/esquery": {
"version": "1.3.1", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
"integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"estraverse": "^5.1.0" "estraverse": "^5.1.0"
},
"engines": {
"node": ">=0.10"
} }
}, },
"node_modules/esquery/node_modules/estraverse": { "node_modules/esquery/node_modules/estraverse": {
@ -4554,6 +4585,9 @@
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true, "dev": true,
"dependencies": {
"graceful-fs": "^4.1.6"
},
"optionalDependencies": { "optionalDependencies": {
"graceful-fs": "^4.1.6" "graceful-fs": "^4.1.6"
} }
@ -5410,12 +5444,18 @@
"dev": true "dev": true
}, },
"node_modules/import-fresh": { "node_modules/import-fresh": {
"version": "3.2.1", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
"dependencies": { "dependencies": {
"parent-module": "^1.0.0", "parent-module": "^1.0.0",
"resolve-from": "^4.0.0" "resolve-from": "^4.0.0"
},
"engines": {
"node": ">=6"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
} }
}, },
"node_modules/import-lazy": { "node_modules/import-lazy": {
@ -6987,6 +7027,7 @@
"integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==", "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"encoding": "^0.1.12",
"minipass": "^3.1.0", "minipass": "^3.1.0",
"minipass-pipeline": "^1.2.2", "minipass-pipeline": "^1.2.2",
"minipass-sized": "^1.0.3", "minipass-sized": "^1.0.3",
@ -7259,9 +7300,9 @@
} }
}, },
"node_modules/node-notifier": { "node_modules/node-notifier": {
"version": "8.0.0", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
"integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==", "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"growly": "^1.3.0", "growly": "^1.3.0",
@ -11270,17 +11311,19 @@
} }
}, },
"node_modules/watchpack": { "node_modules/watchpack": {
"version": "1.7.4", "version": "1.7.5",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
"integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"chokidar": "^3.4.1",
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"neo-async": "^2.5.0" "neo-async": "^2.5.0",
"watchpack-chokidar2": "^2.0.1"
}, },
"optionalDependencies": { "optionalDependencies": {
"chokidar": "^3.4.1", "chokidar": "^3.4.1",
"watchpack-chokidar2": "^2.0.0" "watchpack-chokidar2": "^2.0.1"
} }
}, },
"node_modules/watchpack-chokidar2": { "node_modules/watchpack-chokidar2": {
@ -11360,6 +11403,7 @@
"anymatch": "^2.0.0", "anymatch": "^2.0.0",
"async-each": "^1.0.1", "async-each": "^1.0.1",
"braces": "^2.3.2", "braces": "^2.3.2",
"fsevents": "^1.2.7",
"glob-parent": "^3.1.0", "glob-parent": "^3.1.0",
"inherits": "^2.0.3", "inherits": "^2.0.3",
"is-binary-path": "^1.0.0", "is-binary-path": "^1.0.0",
@ -11560,9 +11604,9 @@
} }
}, },
"node_modules/web-ext": { "node_modules/web-ext": {
"version": "5.4.1", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz", "resolved": "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz",
"integrity": "sha512-AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw==", "integrity": "sha512-f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@babel/polyfill": "7.12.1", "@babel/polyfill": "7.12.1",
@ -11581,11 +11625,11 @@
"firefox-profile": "4.0.0", "firefox-profile": "4.0.0",
"fs-extra": "9.0.1", "fs-extra": "9.0.1",
"fx-runner": "1.0.13", "fx-runner": "1.0.13",
"import-fresh": "3.2.1", "import-fresh": "3.3.0",
"mkdirp": "1.0.4", "mkdirp": "1.0.4",
"multimatch": "4.0.0", "multimatch": "4.0.0",
"mz": "2.7.0", "mz": "2.7.0",
"node-notifier": "8.0.0", "node-notifier": "8.0.1",
"open": "7.3.0", "open": "7.3.0",
"parse-json": "5.0.1", "parse-json": "5.0.1",
"sign-addon": "3.1.0", "sign-addon": "3.1.0",
@ -11594,8 +11638,8 @@
"strip-json-comments": "3.1.1", "strip-json-comments": "3.1.1",
"tmp": "0.2.1", "tmp": "0.2.1",
"update-notifier": "5.0.0", "update-notifier": "5.0.0",
"watchpack": "1.7.4", "watchpack": "1.7.5",
"ws": "7.3.1", "ws": "7.4.2",
"yargs": "15.4.1", "yargs": "15.4.1",
"zip-dir": "1.0.2" "zip-dir": "1.0.2"
}, },
@ -11635,9 +11679,9 @@
} }
}, },
"node_modules/webext-launch-web-auth-flow": { "node_modules/webext-launch-web-auth-flow": {
"version": "0.1.0", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/webext-launch-web-auth-flow/-/webext-launch-web-auth-flow-0.1.0.tgz", "resolved": "https://registry.npmjs.org/webext-launch-web-auth-flow/-/webext-launch-web-auth-flow-0.1.1.tgz",
"integrity": "sha512-3W8ANT9/6uL6NX5SiaKQee439dfiS1NT8wSc+vmjly/2MmH7FBqGFBXLfBFw296w8OOqHNPnEdNcBkDGJQkDgg==" "integrity": "sha512-e8G0W+Js6P1i/aD0XoSkWfodhdTf01fiqDQk+wcSkVPkzmqDxhzKkBpJ1Y2dz3pR4Ocve7z/yx+mMI8jsRAiPg=="
}, },
"node_modules/webext-tx-fix": { "node_modules/webext-tx-fix": {
"version": "0.3.3", "version": "0.3.3",
@ -11794,9 +11838,9 @@
} }
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "7.3.1", "version": "7.4.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
"integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=8.3.0" "node": ">=8.3.0"
@ -13286,9 +13330,9 @@
} }
}, },
"binary-extensions": { "binary-extensions": {
"version": "2.1.0", "version": "2.2.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
@ -13760,15 +13804,15 @@
} }
}, },
"chokidar": { "chokidar": {
"version": "3.4.3", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
"anymatch": "~3.1.1", "anymatch": "~3.1.1",
"braces": "~3.0.2", "braces": "~3.0.2",
"fsevents": "~2.1.2", "fsevents": "~2.3.1",
"glob-parent": "~5.1.0", "glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0", "is-binary-path": "~2.1.0",
"is-glob": "~4.0.1", "is-glob": "~4.0.1",
@ -13777,9 +13821,9 @@
}, },
"dependencies": { "dependencies": {
"fsevents": { "fsevents": {
"version": "2.1.3", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"dev": true, "dev": true,
"optional": true "optional": true
} }
@ -13946,9 +13990,9 @@
} }
}, },
"codemirror": { "codemirror": {
"version": "5.59.2", "version": "5.59.3",
"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.2.tgz", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.3.tgz",
"integrity": "sha512-/D5PcsKyzthtSy2NNKCyJi3b+htRkoKv3idswR/tR6UAvMNKA7SrmyZy6fOONJxSRs1JlUWEDAbxqfdArbK8iA==" "integrity": "sha512-p1d4BjmBBssgnEGtQeWvE5PdiDffqZjiJ77h2FZ2J2BpW9qdOzf6v7IQscyE+TgyKBQS3PpsYimfEDNgcNRZGQ=="
}, },
"collection-visit": { "collection-visit": {
"version": "1.0.0", "version": "1.0.0",
@ -15033,13 +15077,13 @@
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
}, },
"eslint": { "eslint": {
"version": "7.16.0", "version": "7.20.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-7.16.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.20.0.tgz",
"integrity": "sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw==", "integrity": "sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "7.12.11",
"@eslint/eslintrc": "^0.2.2", "@eslint/eslintrc": "^0.3.0",
"ajv": "^6.10.0", "ajv": "^6.10.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
"cross-spawn": "^7.0.2", "cross-spawn": "^7.0.2",
@ -15050,7 +15094,7 @@
"eslint-utils": "^2.1.0", "eslint-utils": "^2.1.0",
"eslint-visitor-keys": "^2.0.0", "eslint-visitor-keys": "^2.0.0",
"espree": "^7.3.1", "espree": "^7.3.1",
"esquery": "^1.2.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"file-entry-cache": "^6.0.0", "file-entry-cache": "^6.0.0",
"functional-red-black-tree": "^1.0.1", "functional-red-black-tree": "^1.0.1",
@ -15063,7 +15107,7 @@
"js-yaml": "^3.13.1", "js-yaml": "^3.13.1",
"json-stable-stringify-without-jsonify": "^1.0.1", "json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1", "levn": "^0.4.1",
"lodash": "^4.17.19", "lodash": "^4.17.20",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
@ -15077,6 +15121,24 @@
"v8-compile-cache": "^2.0.3" "v8-compile-cache": "^2.0.3"
}, },
"dependencies": { "dependencies": {
"@eslint/eslintrc": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.3.0.tgz",
"integrity": "sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg==",
"dev": true,
"requires": {
"ajv": "^6.12.4",
"debug": "^4.1.1",
"espree": "^7.3.0",
"globals": "^12.1.0",
"ignore": "^4.0.6",
"import-fresh": "^3.2.1",
"js-yaml": "^3.13.1",
"lodash": "^4.17.20",
"minimatch": "^3.0.4",
"strip-json-comments": "^3.1.1"
}
},
"eslint-visitor-keys": { "eslint-visitor-keys": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
@ -15141,9 +15203,9 @@
"dev": true "dev": true
}, },
"esquery": { "esquery": {
"version": "1.3.1", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
"integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
"dev": true, "dev": true,
"requires": { "requires": {
"estraverse": "^5.1.0" "estraverse": "^5.1.0"
@ -16508,9 +16570,9 @@
"dev": true "dev": true
}, },
"import-fresh": { "import-fresh": {
"version": "3.2.1", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
"requires": { "requires": {
"parent-module": "^1.0.0", "parent-module": "^1.0.0",
"resolve-from": "^4.0.0" "resolve-from": "^4.0.0"
@ -18025,9 +18087,9 @@
"dev": true "dev": true
}, },
"node-notifier": { "node-notifier": {
"version": "8.0.0", "version": "8.0.1",
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.1.tgz",
"integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==", "integrity": "sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA==",
"dev": true, "dev": true,
"requires": { "requires": {
"growly": "^1.3.0", "growly": "^1.3.0",
@ -21273,15 +21335,15 @@
} }
}, },
"watchpack": { "watchpack": {
"version": "1.7.4", "version": "1.7.5",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
"integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"chokidar": "^3.4.1", "chokidar": "^3.4.1",
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"neo-async": "^2.5.0", "neo-async": "^2.5.0",
"watchpack-chokidar2": "^2.0.0" "watchpack-chokidar2": "^2.0.1"
} }
}, },
"watchpack-chokidar2": { "watchpack-chokidar2": {
@ -21516,9 +21578,9 @@
} }
}, },
"web-ext": { "web-ext": {
"version": "5.4.1", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/web-ext/-/web-ext-5.4.1.tgz", "resolved": "https://registry.npmjs.org/web-ext/-/web-ext-5.5.0.tgz",
"integrity": "sha512-AnTjSFtvidZfmVYzvceM/XixsigiWU3l66UzcxgXxXhOoEQU5ZHlXFGVJdHEYfkI5SnEyDG+WlhsdTUHNLOXJw==", "integrity": "sha512-f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/polyfill": "7.12.1", "@babel/polyfill": "7.12.1",
@ -21537,11 +21599,11 @@
"firefox-profile": "4.0.0", "firefox-profile": "4.0.0",
"fs-extra": "9.0.1", "fs-extra": "9.0.1",
"fx-runner": "1.0.13", "fx-runner": "1.0.13",
"import-fresh": "3.2.1", "import-fresh": "3.3.0",
"mkdirp": "1.0.4", "mkdirp": "1.0.4",
"multimatch": "4.0.0", "multimatch": "4.0.0",
"mz": "2.7.0", "mz": "2.7.0",
"node-notifier": "8.0.0", "node-notifier": "8.0.1",
"open": "7.3.0", "open": "7.3.0",
"parse-json": "5.0.1", "parse-json": "5.0.1",
"sign-addon": "3.1.0", "sign-addon": "3.1.0",
@ -21550,8 +21612,8 @@
"strip-json-comments": "3.1.1", "strip-json-comments": "3.1.1",
"tmp": "0.2.1", "tmp": "0.2.1",
"update-notifier": "5.0.0", "update-notifier": "5.0.0",
"watchpack": "1.7.4", "watchpack": "1.7.5",
"ws": "7.3.1", "ws": "7.4.2",
"yargs": "15.4.1", "yargs": "15.4.1",
"zip-dir": "1.0.2" "zip-dir": "1.0.2"
}, },
@ -21577,9 +21639,9 @@
} }
}, },
"webext-launch-web-auth-flow": { "webext-launch-web-auth-flow": {
"version": "0.1.0", "version": "0.1.1",
"resolved": "https://registry.npmjs.org/webext-launch-web-auth-flow/-/webext-launch-web-auth-flow-0.1.0.tgz", "resolved": "https://registry.npmjs.org/webext-launch-web-auth-flow/-/webext-launch-web-auth-flow-0.1.1.tgz",
"integrity": "sha512-3W8ANT9/6uL6NX5SiaKQee439dfiS1NT8wSc+vmjly/2MmH7FBqGFBXLfBFw296w8OOqHNPnEdNcBkDGJQkDgg==" "integrity": "sha512-e8G0W+Js6P1i/aD0XoSkWfodhdTf01fiqDQk+wcSkVPkzmqDxhzKkBpJ1Y2dz3pR4Ocve7z/yx+mMI8jsRAiPg=="
}, },
"webext-tx-fix": { "webext-tx-fix": {
"version": "0.3.3", "version": "0.3.3",
@ -21714,9 +21776,9 @@
} }
}, },
"ws": { "ws": {
"version": "7.3.1", "version": "7.4.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
"integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==",
"dev": true, "dev": true,
"requires": {} "requires": {}
}, },

View File

@ -6,7 +6,7 @@
"repository": "openstyles/stylus", "repository": "openstyles/stylus",
"author": "Stylus Team", "author": "Stylus Team",
"dependencies": { "dependencies": {
"codemirror": "5.59.2", "codemirror": "5.59.3",
"db-to-cloud": "^0.6.0", "db-to-cloud": "^0.6.0",
"jsonlint": "^1.6.3", "jsonlint": "^1.6.3",
"less-bundle": "github:openstyles/less-bundle#v0.1.0", "less-bundle": "github:openstyles/less-bundle#v0.1.0",
@ -15,17 +15,17 @@
"stylelint-bundle": "^13.8.0", "stylelint-bundle": "^13.8.0",
"stylus-lang-bundle": "github:openstyles/stylus-lang-bundle#v0.54.7", "stylus-lang-bundle": "github:openstyles/stylus-lang-bundle#v0.54.7",
"usercss-meta": "^0.10.0", "usercss-meta": "^0.10.0",
"webext-launch-web-auth-flow": "^0.1.0" "webext-launch-web-auth-flow": "^0.1.1"
}, },
"devDependencies": { "devDependencies": {
"archiver": "^4.0.1", "archiver": "^4.0.1",
"endent": "^1.4.0", "endent": "^1.4.0",
"eslint": "^7.16.0", "eslint": "^7.20.0",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"make-fetch-happen": "^8.0.7", "make-fetch-happen": "^8.0.7",
"sync-version": "^1.0.1", "sync-version": "^1.0.1",
"tiny-glob": "^0.2.6", "tiny-glob": "^0.2.6",
"web-ext": "^5.4.1", "web-ext": "^5.5.0",
"webext-tx-fix": "^0.3.3" "webext-tx-fix": "^0.3.3"
}, },
"scripts": { "scripts": {

View File

@ -1,4 +1,4 @@
## codemirror v5.59.2 ## codemirror v5.59.3
Following files are copied from npm (node_modules): Following files are copied from npm (node_modules):

View File

@ -233,9 +233,19 @@
cm.setCursor(cm.getCursor()); cm.setCursor(cm.getCursor());
} }
function makePrompt(msg) {
var fragment = document.createDocumentFragment();
var input = document.createElement("input");
input.setAttribute("type", "text");
input.style.width = "10em";
fragment.appendChild(document.createTextNode(msg + ": "));
fragment.appendChild(input);
return fragment;
}
function getInput(cm, msg, f) { function getInput(cm, msg, f) {
if (cm.openDialog) if (cm.openDialog)
cm.openDialog(msg + ": <input type=\"text\" style=\"width: 10em\"/>", f, {bottom: true}); cm.openDialog(makePrompt(msg), f, {bottom: true});
else else
f(prompt(msg, "")); f(prompt(msg, ""));
} }

View File

@ -244,6 +244,7 @@
{ name: 'yank', shortName: 'y' }, { name: 'yank', shortName: 'y' },
{ name: 'delmarks', shortName: 'delm' }, { name: 'delmarks', shortName: 'delm' },
{ name: 'registers', shortName: 'reg', excludeFromCommandHistory: true }, { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
{ name: 'vglobal', shortName: 'v' },
{ name: 'global', shortName: 'g' } { name: 'global', shortName: 'g' }
]; ];
@ -353,7 +354,7 @@
return cmd; return cmd;
} }
var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'}; var modifiers = {Shift:'S',Ctrl:'C',Alt:'A',Cmd:'D',Mod:'A',CapsLock:''};
var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'}; var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
function cmKeyToVimKey(key) { function cmKeyToVimKey(key) {
if (key.charAt(0) == '\'') { if (key.charAt(0) == '\'') {
@ -1450,7 +1451,7 @@
showPrompt(cm, { showPrompt(cm, {
onClose: onPromptClose, onClose: onPromptClose,
prefix: promptPrefix, prefix: promptPrefix,
desc: searchPromptDesc, desc: '(JavaScript regexp)',
onKeyUp: onPromptKeyUp, onKeyUp: onPromptKeyUp,
onKeyDown: onPromptKeyDown onKeyDown: onPromptKeyDown
}); });
@ -4110,16 +4111,6 @@
var vim = cm.state.vim; var vim = cm.state.vim;
return vim.searchState_ || (vim.searchState_ = new SearchState()); return vim.searchState_ || (vim.searchState_ = new SearchState());
} }
function dialog(cm, template, shortText, onClose, options) {
if (cm.openDialog) {
cm.openDialog(template, onClose, { bottom: true, value: options.value,
onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
selectValueOnOpen: false});
}
else {
onClose(prompt(shortText, ''));
}
}
function splitBySlash(argString) { function splitBySlash(argString) {
return splitBySeparator(argString, '/'); return splitBySeparator(argString, '/');
} }
@ -4306,28 +4297,64 @@
(ignoreCase || forceIgnoreCase) ? 'i' : undefined); (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
return regexp; return regexp;
} }
function showConfirm(cm, text) {
/**
* dom - Document Object Manipulator
* Usage:
* dom('<tag>'|<node>[, ...{<attributes>|<$styles>}|<child-node>|'<text>'])
* Examples:
* dom('div', {id:'xyz'}, dom('p', 'CM rocks!', {$color:'red'}))
* dom(document.head, dom('script', 'alert("hello!")'))
* Not supported:
* dom('p', ['arrays are objects'], Error('objects specify attributes'))
*/
function dom(n) {
if (typeof n === 'string') n = document.createElement(n);
for (var a, i = 1; i < arguments.length; i++) {
if (!(a = arguments[i])) continue;
if (typeof a !== 'object') a = document.createTextNode(a);
if (a.nodeType) n.appendChild(a);
else for (var key in a) {
if (!Object.prototype.hasOwnProperty.call(a, key)) continue;
if (key[0] === '$') n.style[key.slice(1)] = a[key];
else n.setAttribute(key, a[key]);
}
}
return n;
}
function showConfirm(cm, template) {
var pre = dom('pre', {$color: 'red'}, template);
if (cm.openNotification) { if (cm.openNotification) {
cm.openNotification('<span style="color: red">' + text + '</span>', cm.openNotification(pre, {bottom: true, duration: 5000});
{bottom: true, duration: 5000});
} else { } else {
alert(text); alert(pre.innerText);
} }
} }
function makePrompt(prefix, desc) { function makePrompt(prefix, desc) {
var raw = '<span style="font-family: monospace; white-space: pre">' + return dom(document.createDocumentFragment(),
(prefix || "") + '<input type="text" autocorrect="off" ' + dom('span', {$fontFamily: 'monospace', $whiteSpace: 'pre'},
'autocapitalize="off" spellcheck="false"></span>'; prefix,
if (desc) dom('input', {type: 'text', autocorrect: 'off',
raw += ' <span style="color: #888">' + desc + '</span>'; autocapitalize: 'off', spellcheck: 'false'})),
return raw; desc && dom('span', {$color: '#888'}, desc));
} }
var searchPromptDesc = '(JavaScript regexp)';
function showPrompt(cm, options) { function showPrompt(cm, options) {
var shortText = (options.prefix || '') + ' ' + (options.desc || ''); var shortText = (options.prefix || '') + ' ' + (options.desc || '');
var prompt = makePrompt(options.prefix, options.desc); var template = makePrompt(options.prefix, options.desc);
dialog(cm, prompt, shortText, options.onClose, options); if (cm.openDialog) {
cm.openDialog(template, options.onClose, {
onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
bottom: true, selectValueOnOpen: false, value: options.value
});
}
else {
options.onClose(prompt(shortText, ''));
}
} }
function regexEqual(r1, r2) { function regexEqual(r1, r2) {
if (r1 instanceof RegExp && r2 instanceof RegExp) { if (r1 instanceof RegExp && r2 instanceof RegExp) {
var props = ['global', 'multiline', 'ignoreCase', 'source']; var props = ['global', 'multiline', 'ignoreCase', 'source'];
@ -4501,7 +4528,7 @@
if (start instanceof Array) { if (start instanceof Array) {
return inArray(pos, start); return inArray(pos, start);
} else { } else {
if (end) { if (typeof end == 'number') {
return (pos >= start && pos <= end); return (pos >= start && pos <= end);
} else { } else {
return pos == start; return pos == start;
@ -4564,7 +4591,7 @@
try { try {
this.parseInput_(cm, inputStream, params); this.parseInput_(cm, inputStream, params);
} catch(e) { } catch(e) {
showConfirm(cm, e); showConfirm(cm, e.toString());
throw e; throw e;
} }
var command; var command;
@ -4608,7 +4635,7 @@
params.callback(); params.callback();
} }
} catch(e) { } catch(e) {
showConfirm(cm, e); showConfirm(cm, e.toString());
throw e; throw e;
} }
}, },
@ -4880,12 +4907,12 @@
registers: function(cm, params) { registers: function(cm, params) {
var regArgs = params.args; var regArgs = params.args;
var registers = vimGlobalState.registerController.registers; var registers = vimGlobalState.registerController.registers;
var regInfo = '----------Registers----------<br><br>'; var regInfo = '----------Registers----------\n\n';
if (!regArgs) { if (!regArgs) {
for (var registerName in registers) { for (var registerName in registers) {
var text = registers[registerName].toString(); var text = registers[registerName].toString();
if (text.length) { if (text.length) {
regInfo += '"' + registerName + ' ' + text + '<br>'; regInfo += '"' + registerName + ' ' + text + '\n'
} }
} }
} else { } else {
@ -4897,7 +4924,7 @@
continue; continue;
} }
var register = registers[registerName] || new Register(); var register = registers[registerName] || new Register();
regInfo += '"' + registerName + ' ' + register.toString() + '<br>'; regInfo += '"' + registerName + ' ' + register.toString() + '\n'
} }
} }
showConfirm(cm, regInfo); showConfirm(cm, regInfo);
@ -4992,6 +5019,10 @@
} }
cm.replaceRange(text.join('\n'), curStart, curEnd); cm.replaceRange(text.join('\n'), curStart, curEnd);
}, },
vglobal: function(cm, params) {
// global inspects params.commandName
this.global(cm, params);
},
global: function(cm, params) { global: function(cm, params) {
// a global command is of the form // a global command is of the form
// :[range]g/pattern/[cmd] // :[range]g/pattern/[cmd]
@ -5001,6 +5032,7 @@
showConfirm(cm, 'Regular Expression missing from global'); showConfirm(cm, 'Regular Expression missing from global');
return; return;
} }
var inverted = params.commandName[0] === 'v';
// range is specified here // range is specified here
var lineStart = (params.line !== undefined) ? params.line : cm.firstLine(); var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
var lineEnd = params.lineEnd || params.line || cm.lastLine(); var lineEnd = params.lineEnd || params.line || cm.lastLine();
@ -5025,28 +5057,33 @@
// now that we have the regexPart, search for regex matches in the // now that we have the regexPart, search for regex matches in the
// specified range of lines // specified range of lines
var query = getSearchState(cm).getQuery(); var query = getSearchState(cm).getQuery();
var matchedLines = [], content = ''; var matchedLines = [];
for (var i = lineStart; i <= lineEnd; i++) { for (var i = lineStart; i <= lineEnd; i++) {
var matched = query.test(cm.getLine(i)); var line = cm.getLineHandle(i);
if (matched) { var matched = query.test(line.text);
matchedLines.push(i+1); if (matched !== inverted) {
content+= cm.getLine(i) + '<br>'; matchedLines.push(cmd ? line : line.text);
} }
} }
// if there is no [cmd], just display the list of matched lines // if there is no [cmd], just display the list of matched lines
if (!cmd) { if (!cmd) {
showConfirm(cm, content); showConfirm(cm, matchedLines.join('\n'));
return; return;
} }
var index = 0; var index = 0;
var nextCommand = function() { var nextCommand = function() {
if (index < matchedLines.length) { if (index < matchedLines.length) {
var command = matchedLines[index] + cmd; var line = matchedLines[index++];
var lineNum = cm.getLineNumber(line);
if (lineNum == null) {
nextCommand();
return;
}
var command = (lineNum + 1) + cmd;
exCommandDispatcher.processCommand(cm, command, { exCommandDispatcher.processCommand(cm, command, {
callback: nextCommand callback: nextCommand
}); });
} }
index++;
}; };
nextCommand(); nextCommand();
}, },
@ -5066,9 +5103,11 @@
regexPart = new RegExp(regexPart).source; //normalize not escaped characters regexPart = new RegExp(regexPart).source; //normalize not escaped characters
} }
replacePart = tokens[1]; replacePart = tokens[1];
if (regexPart && regexPart[regexPart.length - 1] === '$') { // If the pattern ends with $ (line boundary assertion), change $ to \n.
regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n'; // Caveat: this workaround cannot match on the last line of the document.
replacePart = replacePart ? replacePart + '\n' : '\n'; if (/(^|[^\\])(\\\\)*\$$/.test(regexPart)) {
regexPart = regexPart.slice(0, -1) + '\\n';
replacePart = (replacePart || '') + '\n';
} }
if (replacePart !== undefined) { if (replacePart !== undefined) {
if (getOption('pcre')) { if (getOption('pcre')) {
@ -5097,11 +5136,9 @@
if (flagsPart) { if (flagsPart) {
if (flagsPart.indexOf('c') != -1) { if (flagsPart.indexOf('c') != -1) {
confirm = true; confirm = true;
flagsPart.replace('c', '');
} }
if (flagsPart.indexOf('g') != -1) { if (flagsPart.indexOf('g') != -1) {
global = true; global = true;
flagsPart.replace('g', '');
} }
if (getOption('pcre')) { if (getOption('pcre')) {
regexPart = regexPart + '/' + flagsPart; regexPart = regexPart + '/' + flagsPart;
@ -5242,7 +5279,7 @@
// Set up all the functions. // Set up all the functions.
cm.state.vim.exMode = true; cm.state.vim.exMode = true;
var done = false; var done = false;
var lastPos = searchCursor.from(); var lastPos, modifiedLineNumber, joined;
function replaceAll() { function replaceAll() {
cm.operation(function() { cm.operation(function() {
while (!done) { while (!done) {
@ -5255,14 +5292,18 @@
function replace() { function replace() {
var text = cm.getRange(searchCursor.from(), searchCursor.to()); var text = cm.getRange(searchCursor.from(), searchCursor.to());
var newText = text.replace(query, replaceWith); var newText = text.replace(query, replaceWith);
var unmodifiedLineNumber = searchCursor.to().line;
searchCursor.replace(newText); searchCursor.replace(newText);
modifiedLineNumber = searchCursor.to().line;
lineEnd += modifiedLineNumber - unmodifiedLineNumber;
joined = modifiedLineNumber < unmodifiedLineNumber;
} }
function next() { function next() {
// The below only loops to skip over multiple occurrences on the same // The below only loops to skip over multiple occurrences on the same
// line when 'global' is not true. // line when 'global' is not true.
while(searchCursor.findNext() && while(searchCursor.findNext() &&
isInRange(searchCursor.from(), lineStart, lineEnd)) { isInRange(searchCursor.from(), lineStart, lineEnd)) {
if (!global && lastPos && searchCursor.from().line == lastPos.line) { if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
continue; continue;
} }
cm.scrollIntoView(searchCursor.from(), 30); cm.scrollIntoView(searchCursor.from(), 30);
@ -5327,7 +5368,7 @@
return; return;
} }
showPrompt(cm, { showPrompt(cm, {
prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)', prefix: dom('span', 'replace with ', dom('strong', replaceWith), ' (y/n/a/q/l)'),
onKeyDown: onPromptKeyDown onKeyDown: onPromptKeyDown
}); });
} }
@ -5535,9 +5576,7 @@
clearFakeCursor(vim); clearFakeCursor(vim);
// In visual mode, the cursor may be positioned over EOL. // In visual mode, the cursor may be positioned over EOL.
if (from.ch == cm.getLine(from.line).length) { if (from.ch == cm.getLine(from.line).length) {
var widget = document.createElement("span"); var widget = dom('span', { 'class': className }, '\u00a0');
widget.textContent = "\u00a0";
widget.className = className;
vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget}); vim.fakeCursorBookmark = cm.setBookmark(from, {widget: widget});
} else { } else {
vim.fakeCursor = cm.markText(from, to, {className: className}); vim.fakeCursor = cm.markText(from, to, {className: className});

View File

@ -4798,19 +4798,19 @@
}); });
} }
function History(startGen) { function History(prev) {
// Arrays of change events and selections. Doing something adds an // Arrays of change events and selections. Doing something adds an
// event to done and clears undo. Undoing moves events from done // event to done and clears undo. Undoing moves events from done
// to undone, redoing moves them in the other direction. // to undone, redoing moves them in the other direction.
this.done = []; this.undone = []; this.done = []; this.undone = [];
this.undoDepth = Infinity; this.undoDepth = prev ? prev.undoDepth : Infinity;
// Used to track when changes can be merged into a single undo // Used to track when changes can be merged into a single undo
// event // event
this.lastModTime = this.lastSelTime = 0; this.lastModTime = this.lastSelTime = 0;
this.lastOp = this.lastSelOp = null; this.lastOp = this.lastSelOp = null;
this.lastOrigin = this.lastSelOrigin = null; this.lastOrigin = this.lastSelOrigin = null;
// Used by the isClean() method // Used by the isClean() method
this.generation = this.maxGeneration = startGen || 1; this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1;
} }
// Create a history change event from an updateDoc-style change // Create a history change event from an updateDoc-style change
@ -6244,7 +6244,7 @@
clearHistory: function() { clearHistory: function() {
var this$1 = this; var this$1 = this;
this.history = new History(this.history.maxGeneration); this.history = new History(this.history);
linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true); linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true);
}, },
@ -6265,7 +6265,7 @@
undone: copyHistoryArray(this.history.undone)} undone: copyHistoryArray(this.history.undone)}
}, },
setHistory: function(histData) { setHistory: function(histData) {
var hist = this.history = new History(this.history.maxGeneration); var hist = this.history = new History(this.history);
hist.done = copyHistoryArray(histData.done.slice(0), null, true); hist.done = copyHistoryArray(histData.done.slice(0), null, true);
hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
}, },
@ -7708,7 +7708,7 @@
for (var i = newBreaks.length - 1; i >= 0; i--) for (var i = newBreaks.length - 1; i >= 0; i--)
{ replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); } { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); }
}); });
option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) {
cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
if (old != Init) { cm.refresh(); } if (old != Init) { cm.refresh(); }
}); });
@ -9793,7 +9793,7 @@
addLegacyProps(CodeMirror); addLegacyProps(CodeMirror);
CodeMirror.version = "5.59.2"; CodeMirror.version = "5.59.3";
return CodeMirror; return CodeMirror;

View File

@ -1,4 +1,4 @@
## webext-launch-web-auth-flow v0.1.0 ## webext-launch-web-auth-flow v0.1.1
Following files are copied from npm (node_modules): Following files are copied from npm (node_modules):

View File

@ -1,2 +1,2 @@
var webextLaunchWebAuthFlow=function(){"use strict";function e(e,r,t,n,o,i,s){try{var u=e[i](s),a=u.value}catch(e){return void t(e)}u.done?r(a):Promise.resolve(a).then(n,o)}function r(r){return function(){var t=this,n=arguments;return new Promise((function(o,i){var s=r.apply(t,n);function u(r){e(s,o,i,u,a,"next",r)}function a(r){e(s,o,i,u,a,"throw",r)}u(void 0)}))}}function t(e){return n.apply(this,arguments)}function n(){return(n=r((function*(e){if(browser.windows)return yield browser.windows.create(e);const r={active:"minimized"!==e.state,url:e.url};return{tabs:[yield browser.tabs.create(r)]}}))).apply(this,arguments)}function o(e,r,t){return i.apply(this,arguments)}function i(){return(i=r((function*(e,r,t){return e?yield browser.windows.update(e,t):yield browser.tabs.update(r,{active:t.focused})}))).apply(this,arguments)}function s(e,r){return u.apply(this,arguments)}function u(){return(u=r((function*(e,r){return e?yield browser.windows.remove(e):yield browser.tabs.remove(r)}))).apply(this,arguments)}function a(){const e={};return e.promise=new Promise((r,t)=>{e.resolve=r,e.reject=t}),e}function c(){return(c=r((function*({url:e,redirect_uri:r,interactive:n=!1}){const i=yield t({type:"popup",url:e,state:"minimized"}),u=i.id,c=i.tabs[0].id,d=a(),l=d.promise,w=d.resolve,b=d.reject;browser.webRequest.onBeforeRequest.addListener(f,{urls:["*://*/*"],tabId:c,types:["main_frame"]},["blocking"]),browser.webNavigation.onDOMContentLoaded.addListener(p),browser.tabs.onRemoved.addListener(v);try{return yield l}finally{browser.webRequest.onBeforeRequest.removeListener(f),browser.webNavigation.onDOMContentLoaded.removeListener(p),browser.tabs.onRemoved.removeListener(v),s(u,c).catch(e=>console.error(e))}function f(e){if(!e.frameId&&e.tabId===c&&e.url.startsWith(r))return w(e.url),{cancel:!0}}function p(e){e.frameId||e.tabId!==c||(n?o(u,c,{focused:!0,state:"normal"}).catch(e=>console.error(e)):b(new Error("User interaction required")),browser.webNavigation.onDOMContentLoaded.removeListener(p))}function v(e){e===c&&b(new Error("Canceled by user"))}}))).apply(this,arguments)}return function(e){return c.apply(this,arguments)}}(); var webextLaunchWebAuthFlow=function(){"use strict";function e(e,r,t,n,o,i,s){try{var u=e[i](s),c=u.value}catch(e){return void t(e)}u.done?r(c):Promise.resolve(c).then(n,o)}function r(r){return function(){var t=this,n=arguments;return new Promise((function(o,i){var s=r.apply(t,n);function u(r){e(s,o,i,u,c,"next",r)}function c(r){e(s,o,i,u,c,"throw",r)}u(void 0)}))}}function t(e,r,t){return r in e?Object.defineProperty(e,r,{value:t,enumerable:!0,configurable:!0,writable:!0}):e[r]=t,e}function n(e,r){var t=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);r&&(n=n.filter((function(r){return Object.getOwnPropertyDescriptor(e,r).enumerable}))),t.push.apply(t,n)}return t}function o(e){for(var r=1;r<arguments.length;r++){var o=null!=arguments[r]?arguments[r]:{};r%2?n(Object(o),!0).forEach((function(r){t(e,r,o[r])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):n(Object(o)).forEach((function(r){Object.defineProperty(e,r,Object.getOwnPropertyDescriptor(o,r))}))}return e}function i(e,r){return s.apply(this,arguments)}function s(){return(s=r((function*(e,r){if(browser.windows&&!r)return yield browser.windows.create(e);const t={active:"minimized"!==e.state,url:e.url};return{tabs:[yield browser.tabs.create(t)]}}))).apply(this,arguments)}function u(e,r,t){return c.apply(this,arguments)}function c(){return(c=r((function*(e,r,t){return e?yield browser.windows.update(e,t):yield browser.tabs.update(r,{active:t.focused})}))).apply(this,arguments)}function a(e,r){return b.apply(this,arguments)}function b(){return(b=r((function*(e,r){return e?yield browser.windows.remove(e):yield browser.tabs.remove(r)}))).apply(this,arguments)}function l(){const e={};return e.promise=new Promise((r,t)=>{e.resolve=r,e.reject=t}),e}function d(){return(d=r((function*({url:e,redirect_uri:r,interactive:t=!1,alwaysUseTab:n=!1,windowOptions:s}){const c=yield i(o({type:"popup",url:e,state:"minimized"},s),n),b=c.id,d=c.tabs[0].id,f=l(),p=f.promise,w=f.resolve,y=f.reject;browser.webRequest.onBeforeRequest.addListener(v,{urls:["*://*/*"],tabId:d,types:["main_frame"]},["blocking"]),browser.webNavigation.onDOMContentLoaded.addListener(m),browser.tabs.onRemoved.addListener(O);try{return yield p}finally{browser.webRequest.onBeforeRequest.removeListener(v),browser.webNavigation.onDOMContentLoaded.removeListener(m),browser.tabs.onRemoved.removeListener(O),a(b,d).catch(e=>console.error(e))}function v(e){if(!e.frameId&&e.tabId===d&&e.url.startsWith(r))return w(e.url),{cancel:!0}}function m(e){e.frameId||e.tabId!==d||(t?u(b,d,{focused:!0,state:"normal"}).catch(e=>console.error(e)):y(new Error("User interaction required")),browser.webNavigation.onDOMContentLoaded.removeListener(m))}function O(e){e===d&&y(new Error("Canceled by user"))}}))).apply(this,arguments)}return function(e){return d.apply(this,arguments)}}();
//# sourceMappingURL=webext-launch-web-auth-flow.min.js.map //# sourceMappingURL=webext-launch-web-auth-flow.min.js.map