diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue index bd9e346..994d7e6 100644 --- a/bbcode/Editor.vue +++ b/bbcode/Editor.vue @@ -1,37 +1,9 @@ @@ -193,7 +165,7 @@ this.$once('insert', (startText: string, endText: string) => this.applyText(startText, endText)); // noinspection TypeScriptValidateTypes if(button.handler !== undefined) - return button.handler.call(this, this); + return button.handler.call(this as any, this); if(button.startText === undefined) button.startText = `[${button.tag}]`; if(button.endText === undefined) diff --git a/bbcode/editor.ts b/bbcode/editor.ts index 279ce55..ae3a54f 100644 --- a/bbcode/editor.ts +++ b/bbcode/editor.ts @@ -95,4 +95,4 @@ export let defaultButtons: ReadonlyArray = [ icon: 'fa-ban', key: Keys.KeyN } -]; \ No newline at end of file +]; diff --git a/chat/AdView.vue b/chat/AdView.vue index 4b5db58..6f9f508 100644 --- a/chat/AdView.vue +++ b/chat/AdView.vue @@ -57,7 +57,7 @@ export default class AdView extends CustomDialog { const cache = core.cache.adCache.get(this.character.name); - this.messages = (cache) ? _.takeRight(cache.posts, 10).reverse() : []; + this.messages = ((cache) ? _.takeRight(cache.posts, 10).reverse() : []) as AdCachedPosting[]; } diff --git a/chat/ImagePreview.vue b/chat/ImagePreview.vue index aa705e5..0befc8f 100644 --- a/chat/ImagePreview.vue +++ b/chat/ImagePreview.vue @@ -5,14 +5,15 @@ + - +
@@ -72,8 +73,11 @@ import {domain} from '../bbcode/core'; import {ImagePreviewMutator} from './image-preview-mutator'; import {ImageUrlMutator} from './image-url-mutator'; - import {Point, screen, WebviewTag} from 'electron'; + import {Point, WebviewTag, remote} from 'electron'; import Timer = NodeJS.Timer; + import IpcMessageEvent = Electron.IpcMessageEvent; + + const screen = remote.screen; interface DidFailLoadEvent extends Event { @@ -93,11 +97,16 @@ protected parent: ImagePreview; protected debug: boolean; - abstract show(url: string): Promise; + abstract show(url: string): void; abstract hide(): void; abstract match(domainName: string): boolean; + abstract renderStyle(): any; constructor(parent: ImagePreview) { + if (!parent) { + throw new Error('Empty parent!'); + } + this.parent = parent; this.debug = parent.debug; } @@ -123,7 +132,7 @@ } - async show(url: string): Promise { + show(url: string): void { this.visible = true; this.url = url; } @@ -132,6 +141,13 @@ match(domainName: string): boolean { return ((domainName === 'f-list.net') || (domainName === 'static.f-list.net')); } + + + renderStyle(): any { + return this.isVisible() + ? { backgroundImage: `url(${this.getUrl()})`, display: 'block' } + : { display: 'none' } + } } @@ -142,6 +158,7 @@ protected urlMutator = new ImageUrlMutator(this.parent.debug); + protected ratio: number | null = null; hide(): void { const wasVisible = this.visible; @@ -163,6 +180,11 @@ } + setRatio(ratio: number) { + this.ratio = ratio; + } + + setDebug(debug: boolean): void { this.debug = debug; @@ -170,11 +192,26 @@ } - async show(url: string): Promise { + show(url: string): void { const webview = this.parent.getWebview(); + if (!this.parent) { + throw new Error('Empty parent v2'); + } + + if (!webview) { + throw new Error('Empty webview!'); + } + + // const oldUrl = this.url; + const oldLastExternalUrl = this.lastExternalUrl; + + this.url = url; + this.lastExternalUrl = url; + this.visible = true; + try { - if ((this.allowCachedUrl) && ((webview.getURL() === url) || (url === this.lastExternalUrl))) { + if ((this.allowCachedUrl) && ((webview.getURL() === url) || (url === oldLastExternalUrl))) { if (this.debug) console.log('ImagePreview: exec re-show mutator'); @@ -183,21 +220,63 @@ if (this.debug) console.log('ImagePreview: must load; skip re-show because urls don\'t match', this.url, webview.getURL()); - webview.loadURL(await this.urlMutator.resolve(url)); + this.ratio = null; + + // Broken promise chain on purpose + this.urlMutator.resolve(url) + .then((finalUrl: string) => webview.loadURL(finalUrl)); } } catch (err) { console.error('ImagePreview: Webview reuse error', err); } - - this.url = url; - this.lastExternalUrl = url; - this.visible = true; } + match(domainName: string): boolean { return !((domainName === 'f-list.net') || (domainName === 'static.f-list.net')); } + + + determineScalingRatio(): any { + // ratio = width / height + const ratio = this.ratio; + + if (!ratio) { + return {}; + } + + const ww = window.innerWidth; + const wh = window.innerHeight; + + const maxWidth = Math.round(ww * 0.5); + const maxHeight = Math.round(wh * 0.7); + + if (ratio >= 1) { + const presumedWidth = maxWidth; + const presumedHeight = presumedWidth / ratio; + + + return { + width: `${presumedWidth}px`, + height: `${presumedHeight}px` + } + } + + const presumedHeight = maxHeight; + const presumedWidth = presumedHeight * ratio; + + return { + width: `${presumedWidth}px`, + height: `${presumedHeight}px` + } + } + + renderStyle(): any { + return this.isVisible() + ? _.merge({ display: 'flex' }, this.determineScalingRatio()) + : { display: 'none' }; + } } @@ -219,6 +298,10 @@ jsMutator = new ImagePreviewMutator(this.debug); + externalPreviewStyle = {}; + localPreviewStyle = {}; + + private interval: Timer | null = null; private exitInterval: Timer | null = null; @@ -339,6 +422,19 @@ ); + webview.addEventListener( + 'ipc-message', + (event: IpcMessageEvent) => { + if (this.debug) + console.log('ImagePreview ipc-message', event); + + if (event.channel === 'webview.img') { + this.updatePreviewSize(event.args[0], event.args[1]); + } + } + ); + + /* webview.getWebContents().session.on( 'will-download', (e: Event) => { @@ -348,7 +444,7 @@ _.each( - ['did-start-loading', 'load-commit', 'dom-ready', 'will-navigate', 'did-navigate', 'did-navigate-in-page', 'update-target-url'], + ['did-start-loading', 'load-commit', 'dom-ready', 'will-navigate', 'did-navigate', 'did-navigate-in-page', 'update-target-url', 'ipc-message'], (en: string) => { webview.addEventListener( en, @@ -378,6 +474,33 @@ ); } + + reRenderStyles(): void { + this.externalPreviewStyle = this.externalPreviewHelper.renderStyle(); + this.localPreviewStyle = this.localPreviewHelper.renderStyle(); + + if (this.debug) { + console.log('ImagePreview: reRenderStyles', 'external', JSON.parse(JSON.stringify(this.externalPreviewStyle)), 'local', JSON.parse(JSON.stringify(this.localPreviewStyle))); + } + } + + + updatePreviewSize(width: number, height: number): void { + if (!this.externalPreviewHelper.isVisible()) { + return; + } + + if ((width) && (height)) { + if (this.debug) { + console.log('ImagePreview: updatePreviewSize', width, height, width / height); + } + + this.externalPreviewHelper.setRatio(width / height); + this.reRenderStyles(); + } + } + + hide(): void { if (this.debug) console.log('ImagePreview: hide', this.externalPreviewHelper.isVisible(), this.localPreviewHelper.isVisible()); @@ -396,6 +519,8 @@ this.shouldDismiss = false; this.sticky = false; + + this.reRenderStyles(); } dismiss(initialUrl: string, force: boolean = false): void { @@ -452,15 +577,17 @@ // console.log('SHOW'); if ((this.visible) && (!this.exitInterval) && (!this.hasMouseMovedSince())) { - if (this.debug) { - console.log('ImagePreview: show cancel: visible & not moved'); + if (!this.sticky) { + if (this.debug) { + console.log('ImagePreview: show cancel: visible & not moved'); + } + return; } - return; } if ((this.url === url) && ((this.visible) || (this.interval))) { if (this.debug) { - console.log('ImagePreview: same url'); + console.log('ImagePreview: same url', url, this.url); } return; @@ -489,7 +616,7 @@ // -- you actually have to pause on it // tslint:disable-next-line no-unnecessary-type-assertion this.interval = setTimeout( - () => { + async () => { if (this.debug) console.log('ImagePreview: show.timeout', this.url); @@ -505,6 +632,8 @@ this.visibleSince = Date.now(); this.initialCursorPosition = screen.getCursorScreenPoint(); + + this.reRenderStyles(); }, due ) as Timer; @@ -591,6 +720,31 @@ getWebview(): WebviewTag { return this.$refs.imagePreviewExt as WebviewTag; } + + reset() { + this.externalPreviewHelper = new ExternalImagePreviewHelper(this); + this.localPreviewHelper = new LocalImagePreviewHelper(this); + + this.url = null; + this.domain = undefined; + + this.sticky = false; + this.runJs = true; + this.debug = false; + + this.jsMutator = new ImagePreviewMutator(this.debug); + + this.cancelExitTimer(); + this.cancelTimer(); + + this.exitUrl = null; + + this.initialCursorPosition = null; + this.shouldDismiss = false; + this.visibleSince = 0; + + this.reRenderStyles(); + } } @@ -609,6 +763,7 @@ width: 50%; height: 70%; pointer-events: none; + overflow: hidden; &.visible { display: block; diff --git a/chat/image-preview-mutator.ts b/chat/image-preview-mutator.ts index f7ae5af..45847ea 100644 --- a/chat/image-preview-mutator.ts +++ b/chat/image-preview-mutator.ts @@ -143,7 +143,7 @@ export class ImagePreviewMutator { ${this.injectHtmlJs('
')} const imageCountEl = document.getElementById('imageCountInner'); - + if (imageCountEl) { imageCountEl.innerHTML = '+' + (imageCount - 1); } @@ -196,7 +196,8 @@ export class ImagePreviewMutator { } getBaseJsMutatorScript(elSelector: string[], skipElementRemove: boolean = false): string { - return `const body = document.querySelector('body'); + return `const { ipcRenderer } = require('electron'); + const body = document.querySelector('body'); const html = document.querySelector('html'); const selectors = ${JSON.stringify(elSelector)}; @@ -216,6 +217,8 @@ export class ImagePreviewMutator { if (!img) { return; } + ipcRenderer.sendToHost('webview.img', img.width || img.naturalWidth || img.videoWidth, img.height || img.naturalHeight || img.videoHeight); + const el = document.createElement('div'); el.id = 'flistWrapper'; @@ -254,7 +257,6 @@ export class ImagePreviewMutator { img.class = ''; el.class = ''; - html.class = ''; html.style = 'border: 0 !important; padding: 0 !important; margin: 0 !important; overflow: hidden !important;' @@ -285,26 +287,30 @@ export class ImagePreviewMutator { document.addEventListener('DOMContentLoaded', (event) => { ${this.debug ? "console.log('on DOMContentLoaded');" : ''} + ipcRenderer.sendToHost('webview.img', img.width || img.naturalWidth, img.height || img.naturalHeight); + if ( (img.play) && ((!img.paused) && (!img.ended) && (!(img.currentTime > 0))) ) - { img.muted = true; img.play(); } + { img.muted = true; img.loop = true; img.play(); } }); document.addEventListener('load', (event) => { ${this.debug ? "console.log('on load');" : ''} + ipcRenderer.sendToHost('webview.img', img.width || img.naturalWidth, img.height || img.naturalHeight); + if ( (img.play) && ((!img.paused) && (!img.ended) && (!(img.currentTime > 0))) ) - { img.muted = true; img.play(); } + { img.muted = true; img.loop = true; img.play(); } }); try { - if (img.play) { img.muted = true; img.play(); } + if (img.play) { img.muted = true; img.loop = true; img.play(); } } catch (err) { console.error('Failed img.play()', err); } diff --git a/components/simple_pager.vue b/components/simple_pager.vue index cf77d4a..bbfb1e2 100644 --- a/components/simple_pager.vue +++ b/components/simple_pager.vue @@ -66,7 +66,7 @@ get prevRoute(): RouteParams { if(this.route.params !== undefined && this.route.params[this.paramName] !== undefined) { const newPage = this.route.params[this.paramName]! - 1; - const clone = cloneDeep(this.route); + const clone = cloneDeep(this.route) as RouteParams; clone.params![this.paramName] = newPage; return clone; } @@ -76,11 +76,11 @@ get nextRoute(): RouteParams { if(this.route.params !== undefined && this.route.params[this.paramName] !== undefined) { const newPage = this.route.params[this.paramName]! + 1; - const clone = cloneDeep(this.route); + const clone = cloneDeep(this.route) as RouteParams; clone.params![this.paramName] = newPage; return clone; } return {}; } } - \ No newline at end of file + diff --git a/electron/Window.vue b/electron/Window.vue index ccca0cc..f03514e 100644 --- a/electron/Window.vue +++ b/electron/Window.vue @@ -199,7 +199,7 @@ const view = new electron.remote.BrowserView({webPreferences: {webviewTag: true, nodeIntegration: true}}); // tab devtools - view.webContents.openDevTools(); + // view.webContents.openDevTools(); view.setAutoResize({width: true, height: true}); electron.ipcRenderer.send('tab-added', view.webContents.id); diff --git a/learn/matcher.ts b/learn/matcher.ts index a56aacf..b91ac14 100644 --- a/learn/matcher.ts +++ b/learn/matcher.ts @@ -540,8 +540,8 @@ export class Matcher { return new Score( score, theyAreAnthro - ? 'Would prefer humans, ok with anthros' - : 'Would prefer anthros, ok with humans' + ? 'Prefers humans, ok with anthros' + : 'Prefers anthros, ok with humans' ); return this.formatScoring(score, theyAreAnthro ? 'furry pairings' : theyAreHuman ? 'human pairings' : ''); diff --git a/package.json b/package.json index e5cfb6e..563ac97 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "F-List Exported", "license": "MIT", "devDependencies": { - "@f-list/fork-ts-checker-webpack-plugin": "^1.3.7", + "@f-list/fork-ts-checker-webpack-plugin": "3.1.1", "@f-list/vue-ts": "^1.0.3", "@fortawesome/fontawesome-free": "^5.9.0", "@types/lodash": "^4.14.134", diff --git a/readme.md b/readme.md index 11c5054..2c0bced 100644 --- a/readme.md +++ b/readme.md @@ -76,6 +76,10 @@ This repository contains a heavily customized version of the mainline F-Chat 3.0 * Save character's status messages * Conversation bot API * Filter unmatching ads is not channel specific -- it's either on everywhere or nowhere +* Fix e621 URLs +* AD UI Cleanup / hide to popovers +* Reset preview mode +* Better image fitting & loading animation # F-List Exported @@ -132,4 +136,4 @@ Note: Adding *and upgrading* dependencies should only be done with prior conside That's why `yarn.lock` exists and is version controlled. -To upgrade NPM dependencies, run `yarn upgrade` locally. Run `yarn outdated` to see pending upgrades. \ No newline at end of file +To upgrade NPM dependencies, run `yarn upgrade` locally. Run `yarn outdated` to see pending upgrades. diff --git a/site/character_page/character_page.vue b/site/character_page/character_page.vue index a72ae24..e84825a 100644 --- a/site/character_page/character_page.vue +++ b/site/character_page/character_page.vue @@ -582,6 +582,7 @@ .guestbook-message { margin-top: 10px; + display: block; } .guestbook-reply { diff --git a/site/character_page/infotag.vue b/site/character_page/infotag.vue index 100971e..3b392a0 100644 --- a/site/character_page/infotag.vue +++ b/site/character_page/infotag.vue @@ -34,14 +34,18 @@ infotag: true }; - // console.log(`Infotag ${this.infotag.id}: ${this.label}`); - const id = this.infotag.id; + // console.log(`Infotag ${this.infotag.id}: ${this.infotag.name}`, core.state.settings.risingAdScore, this.characterMatch); + const id = parseInt(this.infotag.id as any, 10); if ((core.state.settings.risingAdScore) && (this.characterMatch)) { + console.log('MATCH'); + const scores = this.theirInterestIsRelevant(id) ? this.characterMatch.them.scores : (this.yourInterestIsRelevant(id) ? this.characterMatch.you.scores : null); + console.log('SCORES', scores); + if (scores) { const score = scores[id]; diff --git a/yarn.lock b/yarn.lock index a3b5f8c..1904751 100644 --- a/yarn.lock +++ b/yarn.lock @@ -41,14 +41,14 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@f-list/fork-ts-checker-webpack-plugin@^1.3.7": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@f-list/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.1.tgz#d88b8b957858f54bfce93ea62d6680dbd2c92bc5" - integrity sha512-gZB1X9O5q9KZjG1yh2tiUlIR/Y8mJZFO7nqHA3bY4VM++zfcwcW3Kvx2z07GEqTEpxy/iVLqqTKViloJm0HTmg== +"@f-list/fork-ts-checker-webpack-plugin@3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@f-list/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz#fcec5499d0b0c860e363b2f610b7134d87a4c30d" + integrity sha512-wN2AA6UOvaoPai0cBMtjhFpegCRCGZnBj7SNQ0bgMtdpAk4c5H0ynMIZkAJ7e+qvSg9OXsvez0PwTM8IVorV8A== dependencies: babel-code-frame "^6.22.0" chalk "^2.4.1" - chokidar "^2.0.4" + chokidar "^3.3.0" micromatch "^3.1.10" minimatch "^3.0.4" semver "^5.6.0" @@ -409,6 +409,14 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" +anymatch@~3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + appdmg@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/appdmg/-/appdmg-0.6.0.tgz#81b3beab624ab458e6104d87c5cfa4b172203821" @@ -685,6 +693,11 @@ binary-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== +binary-extensions@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c" + integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow== + bindings@^1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -784,7 +797,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1: +braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -1057,7 +1070,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chokidar@^2.0.2, chokidar@^2.0.4: +chokidar@^2.0.2: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== @@ -1076,6 +1089,21 @@ chokidar@^2.0.2, chokidar@^2.0.4: optionalDependencies: fsevents "^1.2.7" +chokidar@^3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz#c84e5b3d18d9a4d77558fef466b1bf16bbeb3450" + integrity sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.3.0" + optionalDependencies: + fsevents "~2.1.2" + chownr@^1.0.1, chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -1653,7 +1681,7 @@ debug@=3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -1758,7 +1786,7 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -2560,6 +2588,11 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" +fsevents@~2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" + integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== + fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" @@ -2683,6 +2716,13 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" +glob-parent@~5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" + integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + dependencies: + is-glob "^4.0.1" + glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" @@ -2942,7 +2982,7 @@ https-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= -iconv-lite@0.4.24, iconv-lite@^0.4.4: +iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -2966,13 +3006,6 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" - integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== - dependencies: - minimatch "^3.0.4" - image-size@^0.7.4: version "0.7.5" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.5.tgz#269f357cf5797cb44683dfa99790e54c705ead04" @@ -3102,6 +3135,13 @@ is-binary-path@^1.0.0: dependencies: binary-extensions "^1.0.0" +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -3207,7 +3247,7 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -3946,15 +3986,6 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== -needle@^2.2.1: - version "2.3.3" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117" - integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -4041,22 +4072,6 @@ node-libs-browser@^2.2.1: util "^0.11.0" vm-browserify "^1.0.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.50: version "1.1.52" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9" @@ -4124,7 +4139,7 @@ normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -4139,13 +4154,6 @@ normalize-url@^4.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== -npm-bundled@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" - integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - dependencies: - npm-normalize-package-bin "^1.0.1" - npm-conf@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" @@ -4154,20 +4162,6 @@ npm-conf@^1.1.3: config-chain "^1.1.11" pify "^3.0.0" -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -4175,7 +4169,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: +"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -4573,7 +4567,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.5: +picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7: version "2.2.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== @@ -5253,6 +5247,13 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" +readdirp@~3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz#984458d13a1e42e2e9f5841b129e162f369aff17" + integrity sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ== + dependencies: + picomatch "^2.0.7" + redent@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" @@ -5389,7 +5390,7 @@ rgba-regex@^1.0.0: resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: +rimraf@2, rimraf@^2.5.4, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -5494,7 +5495,7 @@ sass-loader@^7.1.0: pify "^4.0.1" semver "^6.3.0" -sax@^1.2.4, sax@~1.2.4: +sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -6177,7 +6178,7 @@ tar@^2.0.0: fstream "^1.0.12" inherits "2" -tar@^4.4.12, tar@^4.4.2: +tar@^4.4.12: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==