diff --git a/electron/index.js b/electron/index.js index 13832bda9..76e10fdf9 100644 --- a/electron/index.js +++ b/electron/index.js @@ -149,7 +149,7 @@ function createWindow() { //// END SECURITY - win.webContents.on("new-window", (event, pth) => { + win.webContents.on("will-navigate", (event, pth) => { event.preventDefault(); if (pth.startsWith("https://")) { diff --git a/gulp/config.js b/gulp/config.js index e54e1a0e0..bd9204a2c 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -1,5 +1,5 @@ -import path from "path/posix"; import BrowserSync from "browser-sync"; +import path from "path/posix"; export const baseDir = path.resolve(".."); export const buildFolder = path.join(baseDir, "build"); @@ -25,12 +25,6 @@ export const browserSync = BrowserSync.create(); const envVars = [ "SHAPEZ_CLI_SERVER_HOST", - "SHAPEZ_CLI_ALPHA_FTP_USER", - "SHAPEZ_CLI_ALPHA_FTP_PW", - "SHAPEZ_CLI_STAGING_FTP_USER", - "SHAPEZ_CLI_STAGING_FTP_PW", - "SHAPEZ_CLI_LIVE_FTP_USER", - "SHAPEZ_CLI_LIVE_FTP_PW", "SHAPEZ_CLI_APPLE_ID", "SHAPEZ_CLI_APPLE_CERT_NAME", "SHAPEZ_CLI_GITHUB_USER", diff --git a/gulp/ftp.js b/gulp/ftp.js deleted file mode 100644 index 1a5bc1c42..000000000 --- a/gulp/ftp.js +++ /dev/null @@ -1,99 +0,0 @@ -import path from "path/posix"; -import fs from "fs/promises"; -import gulp from "gulp"; -import { buildFolder } from "./config.js"; - -import { getRevision, getVersion } from "./buildutils.js"; - -import gulpRename from "gulp-rename"; -import gulpSftp from "gulp-sftp"; - -const commitHash = getRevision(); - -const additionalFolder = path.join("additional_build_files"); - -const additionalGlobs = [ - path.join(additionalFolder, "*"), - path.join(additionalFolder, "*.*"), - path.join(additionalFolder, ".*"), -]; - -const credentials = { - alpha: { - host: process.env.SHAPEZ_CLI_SERVER_HOST, - user: process.env.SHAPEZ_CLI_ALPHA_FTP_USER, - pass: process.env.SHAPEZ_CLI_ALPHA_FTP_PW, - }, - staging: { - host: process.env.SHAPEZ_CLI_SERVER_HOST, - user: process.env.SHAPEZ_CLI_STAGING_FTP_USER, - pass: process.env.SHAPEZ_CLI_STAGING_FTP_PW, - }, - prod: { - host: process.env.SHAPEZ_CLI_SERVER_HOST, - user: process.env.SHAPEZ_CLI_LIVE_FTP_USER, - pass: process.env.SHAPEZ_CLI_LIVE_FTP_PW, - }, -}; - -// Write the "commit.txt" file -export async function writeVersion() { - await fs.writeFile( - path.join(buildFolder, "version.json"), - JSON.stringify( - { - commit: getRevision(), - appVersion: getVersion(), - buildTime: new Date().getTime(), - }, - null, - 4 - ) - ); -} - -const gameSrcGlobs = [ - path.join(buildFolder, "**/*.*"), - path.join(buildFolder, "**/.*"), - path.join(buildFolder, "**/*"), - path.join(buildFolder, "!**/index.html"), -]; - -export const upload = Object.fromEntries( - ["alpha", "prod", "staging"].map(deployEnv => { - const deployCredentials = credentials[deployEnv]; - - function game() { - return gulp - .src(gameSrcGlobs, { base: buildFolder }) - .pipe( - gulpRename(pth => { - pth.dirname = path.join("v", commitHash, pth.dirname); - }) - ) - .pipe(gulpSftp(deployCredentials)); - } - - function indexHtml() { - return gulp - .src([path.join(buildFolder, "index.html"), path.join(buildFolder, "version.json")], { - base: buildFolder, - }) - .pipe(gulpSftp(deployCredentials)); - } - - function additionalFiles() { - return gulp.src(additionalGlobs, { base: additionalFolder }).pipe(gulpSftp(deployCredentials)); - } - - return [ - deployEnv, - { - game, - indexHtml, - additionalFiles, - all: gulp.series(writeVersion, game, indexHtml, additionalFiles), - }, - ]; - }) -); diff --git a/gulp/loader.strip_block.js b/gulp/loader.strip_block.js deleted file mode 100644 index 31ae54321..000000000 --- a/gulp/loader.strip_block.js +++ /dev/null @@ -1,21 +0,0 @@ -/*jslint node:true */ -"use strict"; - -const startComment = "typehints:start"; -const endComment = "typehints:end"; -const regexPattern = new RegExp( - "[\\t ]*\\/\\* ?" + startComment + " ?\\*\\/[\\s\\S]*?\\/\\* ?" + endComment + " ?\\*\\/[\\t ]*\\n?", - "g" -); - -function StripBlockLoader(content) { - if (content.indexOf(startComment) >= 0) { - content = content.replace(regexPattern, ""); - } - if (this.cacheable) { - this.cacheable(true); - } - return content; -} - -module.exports = StripBlockLoader; diff --git a/gulp/mod.js b/gulp/mod.js deleted file mode 100644 index ad6cd4aeb..000000000 --- a/gulp/mod.js +++ /dev/null @@ -1,39 +0,0 @@ -const oneExport = exp => { - return `${exp}=v`; // No checks needed -}; - -const twoExports = (exp1, exp2) => { - return `n=="${exp1}"?${exp1}=v:${exp2}=v`; -}; - -const multiExports = exps => { - exps = exps.map(exp => `case "${exp}":${exp}=v;break;`); - - return `switch(n){${exps.toString().replaceAll(";,", ";")} }`; -}; - -const defineFnBody = source => { - const regex = /export (?:let|class) (?\w+)/g; - let names = [...source.matchAll(regex)].map(n => n.groups.name); - switch (names.length) { - case 0: - return false; - case 1: - return oneExport(names[0]); - case 2: - return twoExports(names[0], names[1]); - default: - return multiExports(names); - } -}; -/** - * - * @param {string} source - * @param {*} map - * @returns - */ -module.exports = function (source, map) { - const body = defineFnBody(source); - if (!body) return source; - return source + `\nexport const __$S__=(n,v)=>{${body}}`; -}; diff --git a/gulp/preloader/preloader.css b/gulp/preloader/preloader.css index f6775f762..28b5b2cb5 100644 --- a/gulp/preloader/preloader.css +++ b/gulp/preloader/preloader.css @@ -36,14 +36,11 @@ body { text-decoration: none; text-size-adjust: 100%; letter-spacing: normal; - scrollbar-width: 6px; -webkit-font-smoothing: antialiased; -webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */ -webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */ - scrollbar-face-color: #888; - scrollbar-track-color: rgba(255, 255, 255, 0.1); } #ll_fp { diff --git a/gulp/tasks.js b/gulp/tasks.js index c612de017..0668cc68d 100644 --- a/gulp/tasks.js +++ b/gulp/tasks.js @@ -1,37 +1,35 @@ +import childProcess from "child_process"; +import delEmpty from "delete-empty"; import gulp from "gulp"; -import path from "path/posix"; import pathNative from "path"; -import delEmpty from "delete-empty"; -import childProcess from "child_process"; +import path from "path/posix"; import { promisify } from "util"; -const exec = promisify(childProcess.exec); import { BUILD_VARIANTS } from "./build_variants.js"; import { - baseDir, + browserSync, buildFolder, buildOutputFolder, - browserSync, - rawImageResourcesGlobs, - nonImageResourcesGlobs, imageResourcesGlobs, + nonImageResourcesGlobs, + rawImageResourcesGlobs, } from "./config.js"; +const exec = promisify(childProcess.exec); // Load other plugins import gulpClean from "gulp-clean"; import gulpWebserver from "gulp-webserver"; -import * as imgres from "./image-resources.js"; import * as css from "./css.js"; -import * as sounds from "./sounds.js"; -import * as localConfig from "./local-config.js"; -import js from "./js.js"; -import * as html from "./html.js"; -import * as ftp from "./ftp.js"; import * as docs from "./docs.js"; +import * as html from "./html.js"; +import * as imgres from "./image-resources.js"; +import js from "./js.js"; +import * as localConfig from "./local-config.js"; +import * as sounds from "./sounds.js"; import standalone from "./standalone.js"; import * as translations from "./translations.js"; -export { imgres, css, sounds, localConfig, js, html, ftp, docs, standalone, translations }; +export { css, docs, html, imgres, js, localConfig, sounds, standalone, translations }; ///////////////////// BUILD TASKS ///////////////////// @@ -272,12 +270,8 @@ for (const variant in BUILD_VARIANTS) { // Deploying! export const deploy = { - staging: gulp.series( - utils.requireCleanWorkingTree, - build["web-shapezio-beta"].full, - ftp.upload.staging.all - ), - prod: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio"].full, ftp.upload.prod.all), + staging: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio-beta"].full), + prod: gulp.series(utils.requireCleanWorkingTree, build["web-shapezio"].full), }; export const main = { diff --git a/package.json b/package.json index ccf9b258e..41e12d0ac 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "gulp-postcss": "^8.0.0", "gulp-rename": "^2.0.0", "gulp-sass-lint": "^1.4.0", - "gulp-sftp": "git+https://git@github.com/webksde/gulp-sftp", "gulp-webserver": "^0.9.1", "gulp-yaml": "^2.0.4", "imagemin-gifsicle": "^7.0.0", diff --git a/src/css/common.scss b/src/css/common.scss index b50a4aa0e..f7bcdd39b 100644 --- a/src/css/common.scss +++ b/src/css/common.scss @@ -25,9 +25,7 @@ html { // scroll-behavior: smooth; background: $mainBgColor; // Disable zooming and thus - -ms-touch-action: pan-x, pan-y; touch-action: pan-x, pan-y; - -ms-content-zooming: none; top: 0; left: 0; bottom: 0; @@ -41,8 +39,6 @@ html { body { color: #555; user-select: none; - -moz-user-select: none; - -ms-user-select: none; background: inherit !important; text-transform: none; white-space: normal; @@ -56,45 +52,11 @@ body { text-decoration: none; text-size-adjust: 100%; letter-spacing: normal; - scrollbar-width: 6px; -webkit-font-smoothing: antialiased; - // -webkit-overflow-scrolling: touch; /* stop scrolling immediately */ -webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */ - -webkit-text-size-adjust: none; - /* prevent webkit from resizing text to fit */ - // Internet explorer - scrollbar-face-color: #888; - scrollbar-track-color: rgba(255, 255, 255, 0.1); - // Firefox - scrollbar-color: #cdd0d4 rgba(#000, 0.05); overflow: hidden; @include Text; - &.externalAdOpen { - &::before { - text-transform: uppercase; - @include SuperSmallText; - content: "Loading Advertisement..."; - color: #333; - position: fixed; - top: 0; - pointer-events: all; - left: 0; - right: 0; - bottom: 0; - background: rgba(50, 60, 70, 0.8); - z-index: 999999; - display: flex; - justify-content: center; - align-items: center; - color: #fff; - @include InlineAnimation(1s ease-in-out infinite) { - 50% { - transform: scale(1.05); - } - } - } - } // For recording the bg video // filter: blur(5px); // &::after { @@ -217,11 +179,6 @@ button { /* WebKit/Blink Browsers */ } -::-moz-selection { - background: $colorGreenBright; - /* Gecko Browsers */ -} - input[type="text"], input[type="email"] { @include S(padding, 11px, 12px); @@ -292,7 +249,6 @@ i { input { user-select: text; - -moz-user-select: text; pointer-events: all; cursor: text; border-radius: 0; @@ -308,7 +264,6 @@ canvas { letter-spacing: 0 !important; transform: translateZ(0); backface-visibility: hidden; - -webkit-backface-visibility: hidden; } .fontPreload { @@ -666,7 +621,6 @@ input.rangeInput { &::-webkit-slider-thumb { appearance: none; - -webkit-appearance: none; box-shadow: inset 0 0 0 D(10px) $themeColor; border-radius: 50%; @@ -721,17 +675,3 @@ iframe { pointer-events: all; user-select: all; } - -// Steam overlay fix -#steamOverlayCanvasFix { - position: fixed; - top: 0px; - left: 0; - right: 0; - bottom: 0; - width: 100%; - height: 100%; - opacity: 0.01; - pointer-events: none; - z-index: -1; -} diff --git a/src/css/main.scss b/src/css/main.scss index 155b9b95c..a461d7e3d 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -25,7 +25,6 @@ @import "states/keybindings"; @import "states/settings"; @import "states/about"; -@import "states/mobile_warning"; @import "states/changelog"; @import "states/puzzle_menu"; @import "states/mods"; diff --git a/src/css/mixins.scss b/src/css/mixins.scss index f052a2017..3a0db944d 100644 --- a/src/css/mixins.scss +++ b/src/css/mixins.scss @@ -5,7 +5,6 @@ the performance when animated. Use only transform and opacity in animations! */ will-change: transform, opacity, filter; // transform: translateZ(0); backface-visibility: hidden; - -webkit-backface-visibility: hidden; } // Helper which includes the translateZ webkit fix, use together with Fast animation diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 916b361f8..d610910d1 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -786,78 +786,6 @@ width: 100%; } - .steamSso { - cursor: default; - pointer-events: all; - display: inline-flex; - @include S(padding, 10px); - color: #000; - flex-direction: column; - line-height: 1em; - @include S(gap, 3px); - position: relative; - background: rgba(0, 20, 40, 0.05); - width: 100%; - box-sizing: border-box; - margin-top: auto; - display: grid; - grid-template-columns: 1fr auto; - align-items: center; - - .description { - @include SuperSmallText; - color: rgba(0, 10, 20, 0.5); - @include DarkThemeOverride { - color: rgba(#fff, 0.7); - } - } - // &:hover { - // .tooltip { - // opacity: 1; - // } - // } - - a.ssoSignIn { - background: #171a23 uiResource("steam_signin.png") center center / contain no-repeat; - width: 100%; - box-sizing: border-box; - - @include S(height, 19px); - @include S(width, 110px); - - display: inline-flex; - @include S(border-radius, $globalBorderRadius * 0.5); - transition: opacity 0.12s ease-in-out; - overflow: hidden; - text-indent: -999em; - &:hover { - opacity: 0.9; - } - - box-shadow: 0 D(1.5px) D(4px) rgba(#000, 0.21); - } - - a.ssoSignOut { - width: 100%; - background: $colorRedBright; - color: #fff !important; - display: flex; - align-items: center; - box-sizing: border-box; - justify-content: center; - @include SuperSmallText; - text-transform: uppercase; - - @include S(border-radius, $globalBorderRadius * 0.5); - - box-shadow: 0 D(1.5px) D(4px) rgba(#000, 0.21); - @include S(padding, 2px, 9px); - &:hover { - opacity: 0.95; - } - } - } - .savegamesMount { width: 100%; display: flex; diff --git a/src/css/states/mobile_warning.scss b/src/css/states/mobile_warning.scss deleted file mode 100644 index d4c9a9a81..000000000 --- a/src/css/states/mobile_warning.scss +++ /dev/null @@ -1,51 +0,0 @@ -#state_MobileWarningState { - display: flex; - align-items: center; - background: #555b75 !important; - @include S(padding, 20px); - box-sizing: border-box; - justify-content: center; - flex-direction: column; - - .logo { - width: 80%; - max-width: 200px; - margin-bottom: 10px; - } - - p { - color: rgba(#fff, 0.5); - display: block; - margin-bottom: 13px; - font-size: 16px; - line-height: 20px; - max-width: 300px; - text-align: left; - a { - color: $colorBlueBright; - } - } - - .standaloneLink { - width: 200px; - height: 48px; - min-height: 40px; - & { - background: #000 uiResource("steam_link_btn/0.png") center center / contain no-repeat; - } - display: block; - text-indent: -999em; - cursor: pointer; - margin-top: 10px; - pointer-events: all; - transition: all 0.12s ease-in; - transition-property: opacity, transform; - @include S(border-radius, $globalBorderRadius); - overflow: hidden; - - &:hover { - transform: skewX(-1deg) scale(1.02); - opacity: 0.9; - } - } -} diff --git a/src/html/index.html b/src/html/index.html index da67db6d8..c0b9d40d7 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -3,17 +3,6 @@ shapez - - - - - - - - diff --git a/src/js/application.js b/src/js/application.js index 9ef2338b9..4e04e9c72 100644 --- a/src/js/application.js +++ b/src/js/application.js @@ -1,6 +1,5 @@ import { AnimationFrame } from "./core/animation_frame"; import { BackgroundResourcesLoader } from "./core/background_resources_loader"; -import { IS_MOBILE } from "./core/config"; import { GameState } from "./core/game_state"; import { GLOBAL_APP, setGlobalApp } from "./core/globals"; import { InputDistributor } from "./core/input_distributor"; @@ -10,6 +9,9 @@ import { StateManager } from "./core/state_manager"; import { TrackedState } from "./core/tracked_state"; import { getPlatformName, waitNextFrame } from "./core/utils"; import { Vector } from "./core/vector"; +import { MOD_SIGNALS } from "./mods/mod_signals"; +import { MODS } from "./mods/modloader"; +import { ClientAPI } from "./platform/api"; import { NoAchievementProvider } from "./platform/no_achievement_provider"; import { Sound } from "./platform/sound"; import { Storage } from "./platform/storage"; @@ -20,16 +22,12 @@ import { AboutState } from "./states/about"; import { ChangelogState } from "./states/changelog"; import { InGameState } from "./states/ingame"; import { KeybindingsState } from "./states/keybindings"; +import { LoginState } from "./states/login"; import { MainMenuState } from "./states/main_menu"; -import { MobileWarningState } from "./states/mobile_warning"; +import { ModsState } from "./states/mods"; import { PreloadState } from "./states/preload"; -import { SettingsState } from "./states/settings"; import { PuzzleMenuState } from "./states/puzzle_menu"; -import { ClientAPI } from "./platform/api"; -import { LoginState } from "./states/login"; -import { MODS } from "./mods/modloader"; -import { MOD_SIGNALS } from "./mods/mod_signals"; -import { ModsState } from "./states/mods"; +import { SettingsState } from "./states/settings"; /** * @typedef {import("./platform/achievement_provider").AchievementProviderInterface} AchievementProviderInterface @@ -125,12 +123,7 @@ export class Application { Loader.linkAppAfterBoot(this); - // Check for mobile - if (IS_MOBILE) { - this.stateMgr.moveToState("MobileWarningState"); - } else { - this.stateMgr.moveToState("PreloadState"); - } + this.stateMgr.moveToState("PreloadState"); // Starting rendering this.ticker.frameEmitted.add(this.onFrameEmitted, this); @@ -149,7 +142,6 @@ export class Application { /** @type {Array} */ const states = [ PreloadState, - MobileWarningState, MainMenuState, InGameState, SettingsState, diff --git a/src/js/core/config.js b/src/js/core/config.js index 5ded60cbb..5fb7e2e1b 100644 --- a/src/js/core/config.js +++ b/src/js/core/config.js @@ -1,7 +1,3 @@ -/* typehints:start */ -import { Application } from "../application"; -/* typehints:end */ - import debug from "./config.local"; export const IS_DEBUG = @@ -25,8 +21,6 @@ export const THIRDPARTY_URLS = { patreon: "https://www.patreon.com/tobsprgames", privacyPolicy: "https://tobspr.io/privacy.html", - puzzleDlcStorePage: "https://get.shapez.io/mm_puzzle_dlc?target=dlc", - levelTutorialVideos: { 21: "https://www.youtube.com/watch?v=0nUfRLMCcgo&", 25: "https://www.youtube.com/watch?v=7OCV1g40Iew&", diff --git a/src/js/platform/wrapper.js b/src/js/platform/wrapper.js index 02b3e9976..92b64b84d 100644 --- a/src/js/platform/wrapper.js +++ b/src/js/platform/wrapper.js @@ -3,9 +3,9 @@ import { Application } from "../application"; /* typehints:end */ import { IS_MOBILE } from "../core/config"; -import { NoAchievementProvider } from "./no_achievement_provider"; import { createLogger } from "../core/logging"; import { clamp } from "../core/utils"; +import { NoAchievementProvider } from "./no_achievement_provider"; const logger = createLogger("electron-wrapper"); @@ -16,30 +16,10 @@ export class PlatformWrapperImplElectron { } initialize() { - this.dlcs = { - puzzle: false, - }; - - this.steamOverlayCanvasFix = document.createElement("canvas"); - this.steamOverlayCanvasFix.width = 1; - this.steamOverlayCanvasFix.height = 1; - this.steamOverlayCanvasFix.id = "steamOverlayCanvasFix"; - - this.steamOverlayContextFix = this.steamOverlayCanvasFix.getContext("2d"); - document.documentElement.appendChild(this.steamOverlayCanvasFix); - - this.app.ticker.frameEmitted.add(this.steamOverlayFixRedrawCanvas, this); - - return this.initializeAchievementProvider() - .then(() => this.initializeDlcStatus()) - .then(() => { - document.documentElement.classList.add("p-" + this.getId()); - return Promise.resolve(); - }); - } - - steamOverlayFixRedrawCanvas() { - this.steamOverlayContextFix.clearRect(0, 0, 1, 1); + return this.initializeAchievementProvider().then(() => { + document.documentElement.classList.add("p-" + this.getId()); + return Promise.resolve(); + }); } getId() { @@ -56,7 +36,7 @@ export class PlatformWrapperImplElectron { */ openExternalLink(url) { logger.log(this, "Opening external:", url); - window.open(url, "about:blank"); + location.replace(url); } /** @@ -89,20 +69,6 @@ export class PlatformWrapperImplElectron { }); } - initializeDlcStatus() { - logger.log("Checking DLC ownership ..."); - // @todo: Don't hardcode the app id - return ipcRenderer.invoke("steam:check-app-ownership", 1625400).then( - res => { - logger.log("Got DLC ownership:", res); - this.dlcs.puzzle = Boolean(res); - }, - err => { - logger.error("Failed to get DLC ownership:", err); - } - ); - } - /** * Returns the UI scale, called on every resize * @returns {number} */ diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js index ebe713c2d..31af52e2f 100644 --- a/src/js/states/main_menu.js +++ b/src/js/states/main_menu.js @@ -255,7 +255,6 @@ export class MainMenuState extends GameState { this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.github); }, ".puzzleDlcPlayButton": this.onPuzzleModeButtonClicked, - ".puzzleDlcGetButton": this.onPuzzleWishlistButtonClicked, ".editMods": this.onModsClicked, }; @@ -333,10 +332,6 @@ export class MainMenuState extends GameState { }); } - onPuzzleWishlistButtonClicked() { - this.app.platformWrapper.openExternalLink(THIRDPARTY_URLS.puzzleDlcStorePage); - } - onBackButtonClicked() { this.renderMainMenu(); this.renderSavegames(); diff --git a/src/js/states/mobile_warning.js b/src/js/states/mobile_warning.js deleted file mode 100644 index 208f03cb0..000000000 --- a/src/js/states/mobile_warning.js +++ /dev/null @@ -1,32 +0,0 @@ -import { GameState } from "../core/game_state"; - -export class MobileWarningState extends GameState { - constructor() { - super("MobileWarningState"); - } - - getInnerHTML() { - return ` - - - -

I'm sorry, but shapez.io is not available on mobile devices yet!

-

If you have a desktop device, you can get shapez on Steam:

- - - Play on Steam! - `; - } - - getThemeMusic() { - return null; - } - - getHasFadeIn() { - return false; - } - - onLeave() { - // this.dialogs.cleanup(); - } -} diff --git a/yarn.lock b/yarn.lock index b6e69b513..97c930cfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -945,11 +945,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - integrity sha512-LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ== - array-each@^1.0.0, array-each@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f" @@ -1004,11 +999,6 @@ array-union@^2.1.0: resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-uniq@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== - array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" @@ -1037,7 +1027,7 @@ asar@^3.1.0: optionalDependencies: "@types/glob" "^7.1.1" -asn1@~0.2.0, asn1@~0.2.3: +asn1@~0.2.3: version "0.2.6" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== @@ -1242,11 +1232,6 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -beeper@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" - integrity sha512-3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -1907,20 +1892,15 @@ clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -clone-stats@^0.0.1, clone-stats@~0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - integrity sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA== - clone-stats@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag== -clone@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== +clone-stats@~0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" + integrity sha512-dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA== clone@^2.1.1, clone@^2.1.2: version "2.1.2" @@ -2472,11 +2452,6 @@ dateformat@^1.0.7-1.2.3: get-stdin "^4.0.1" meow "^3.3.0" -dateformat@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" - integrity sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw== - debounce-promise@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/debounce-promise/-/debounce-promise-3.1.2.tgz#320fb8c7d15a344455cd33cee5ab63530b6dc7c5" @@ -3539,7 +3514,7 @@ eyes@0.1.x: resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha512-GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ== -fancy-log@^1.1.0, fancy-log@^1.3.2, fancy-log@^1.3.3: +fancy-log@^1.3.2, fancy-log@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7" integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw== @@ -4624,17 +4599,6 @@ gulp-sass-lint@^1.4.0: sass-lint "^1.12.0" through2 "^2.0.2" -"gulp-sftp@git+https://git@github.com/webksde/gulp-sftp": - version "0.1.6" - resolved "git+https://git@github.com/webksde/gulp-sftp#c8dfb20e290477eeed66a867406576d0c3d4fc6b" - dependencies: - async "~0.9.0" - gulp-util "~3.0.0" - object-assign "~0.3.1" - parents "~1.0.0" - ssh2 "~0.6.1" - through2 "~0.4.2" - gulp-util@^2.2.19: version "2.2.20" resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c" @@ -4649,30 +4613,6 @@ gulp-util@^2.2.19: through2 "^0.5.0" vinyl "^0.2.1" -gulp-util@~3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" - integrity sha512-q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw== - dependencies: - array-differ "^1.0.0" - array-uniq "^1.0.2" - beeper "^1.0.0" - chalk "^1.0.0" - dateformat "^2.0.0" - fancy-log "^1.1.0" - gulplog "^1.0.0" - has-gulplog "^0.1.0" - lodash._reescape "^3.0.0" - lodash._reevaluate "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.template "^3.0.0" - minimist "^1.1.0" - multipipe "^0.1.2" - object-assign "^3.0.0" - replace-ext "0.0.1" - through2 "^2.0.0" - vinyl "^0.5.0" - gulp-webserver@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/gulp-webserver/-/gulp-webserver-0.9.1.tgz#e09992165d97c5865616d642a1601529b0367064" @@ -4767,13 +4707,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-gulplog@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" - integrity sha512-+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw== - dependencies: - sparkles "^1.0.0" - has-property-descriptors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" @@ -6053,21 +5986,6 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - integrity sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ== - -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - integrity sha512-mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA== - -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - integrity sha512-H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg== - lodash._escapehtmlchar@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._escapehtmlchar/-/lodash._escapehtmlchar-2.4.1.tgz#df67c3bb6b7e8e1e831ab48bfa0795b92afe899d" @@ -6080,21 +5998,11 @@ lodash._escapestringchar@~2.4.1: resolved "https://registry.yarnpkg.com/lodash._escapestringchar/-/lodash._escapestringchar-2.4.1.tgz#ecfe22618a2ade50bfeea43937e51df66f0edb72" integrity sha512-iZ6Os4iipaE43pr9SBks+UpZgAjJgRC+lGf7onEoByMr1+Nagr1fmR7zCM6Q4RGMB/V3a57raEN0XZl7Uub3/g== -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA== - lodash._htmlescapes@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._htmlescapes/-/lodash._htmlescapes-2.4.1.tgz#32d14bf0844b6de6f8b62a051b4f67c228b624cb" integrity sha512-g79hNmMOBVyV+4oKIHM7MWy9Awtk3yqf0Twlawr6f+CmG44nTwBh9I5XiLUnk39KTfYoDBpS66glQGgQCnFIuA== -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - integrity sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ== - lodash._isnative@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._isnative/-/lodash._isnative-2.4.1.tgz#3ea6404b784a7be836c7b57580e1cdf79b14832c" @@ -6105,26 +6013,11 @@ lodash._objecttypes@~2.4.1: resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz#7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11" integrity sha512-XpqGh1e7hhkOzftBfWE7zt+Yn9mVHFkDhicVttvKLsoCMLVVL+xTQjfjB4X4vtznauxv0QZ5ZAeqjvat0dh62Q== -lodash._reescape@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" - integrity sha512-Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ== - -lodash._reevaluate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" - integrity sha512-OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w== - lodash._reinterpolate@^2.4.1, lodash._reinterpolate@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz#4f1227aa5a8711fc632f5b07a1f4607aab8b3222" integrity sha512-QGEOOjJi7W9LIgDAMVgtGBb8Qgo8ieDlSOCoZjtG45ZNRvDJZjwVMTYlfTIWdNRUiR1I9BjIqQ3Zaf1+DYM94g== -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash._reunescapedhtml@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._reunescapedhtml/-/lodash._reunescapedhtml-2.4.1.tgz#747c4fc40103eb3bb8a0976e571f7a2659e93ba7" @@ -6133,11 +6026,6 @@ lodash._reunescapedhtml@~2.4.1: lodash._htmlescapes "~2.4.1" lodash.keys "~2.4.1" -lodash._root@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - integrity sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ== - lodash._shimkeys@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.4.1.tgz#6e9cc9666ff081f0b5a6c978b83e242e6949d203" @@ -6173,13 +6061,6 @@ lodash.defaults@~2.4.1: lodash._objecttypes "~2.4.1" lodash.keys "~2.4.1" -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - integrity sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ== - dependencies: - lodash._root "^3.0.0" - lodash.escape@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-2.4.1.tgz#2ce12c5e084db0a57dda5e5d1eeeb9f5d175a3b4" @@ -6194,16 +6075,6 @@ lodash.get@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ== - lodash.isfinite@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" @@ -6221,15 +6092,6 @@ lodash.kebabcase@^4.0.0: resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ== - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.keys@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.4.1.tgz#48dea46df8ff7632b10d706b8acb26591e2b3727" @@ -6249,11 +6111,6 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw== - lodash.some@^4.2.2: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" @@ -6277,29 +6134,6 @@ lodash.template@^2.4.1: lodash.templatesettings "~2.4.1" lodash.values "~2.4.1" -lodash.template@^3.0.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - integrity sha512-0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ== - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - integrity sha512-TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.templatesettings@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz#ea76c75d11eb86d4dbe89a83893bb861929ac699" @@ -6624,7 +6458,7 @@ minimist@^0.2.0: resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.2.tgz#2592640f29a3e60863175b95b48c9e51f5050afe" integrity sha512-g92kDfAOAszDRtHNagjZPPI/9lfOFaRBL/Ud6Z0RKZua/x+49awTydZLh5Gkhb80Xy5hmcvZNLGzscW5n5yd0g== -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.6: version "1.2.7" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== @@ -6678,7 +6512,7 @@ ms@2.1.3, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multipipe@^0.1.0, multipipe@^0.1.2: +multipipe@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" integrity sha512-7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q== @@ -6871,21 +6705,11 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - integrity sha512-jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ== - object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-assign@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-0.3.1.tgz#060e2a2a27d7c0d77ec77b78f11aa47fd88008d2" - integrity sha512-4gWmwoU6o9UImLLzq+8R+kzWT0ABYdKXuvSp08JpYzhibFvdUirMfE9nE5yYHcG1k9ClcVueR4TolZpRvwg5og== - object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" @@ -6905,11 +6729,6 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-keys@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" - integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -7227,13 +7046,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parents@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" - integrity sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg== - dependencies: - path-platform "~0.11.15" - parse-author@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/parse-author/-/parse-author-2.0.0.tgz#d3460bf1ddd0dfaeed42da754242e65fb684a81f" @@ -7337,11 +7149,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-platform@~0.11.15: - version "0.11.15" - resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" - integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg== - path-root-regex@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" @@ -8562,11 +8369,6 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - integrity sha512-AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ== - replace-ext@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" @@ -8912,7 +8714,7 @@ semver-truncate@^1.1.2: dependencies: semver "^5.3.0" -"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -9298,22 +9100,6 @@ squeak@^1.0.0: console-stream "^0.1.1" lpad-align "^1.0.1" -ssh2-streams@~0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ssh2-streams/-/ssh2-streams-0.2.1.tgz#9c9c9964be60e9644575af328677f64b1e5cbd79" - integrity sha512-3zCOsmunh1JWgPshfhKmBCL3lUtHPoh+a/cyQ49Ft0Q0aF7xgN06b76L+oKtFi0fgO57FLjFztb1GlJcEZ4a3Q== - dependencies: - asn1 "~0.2.0" - semver "^5.1.0" - streamsearch "~0.1.2" - -ssh2@~0.6.1: - version "0.6.2" - resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-0.6.2.tgz#b065d6e2133a2d4b557447d613b3511cb15e3a2e" - integrity sha512-DJ+dOhXEEsmNpcQTI0x69FS++JH6qqL/ltEHf01pI1SSLMAcmD+hL4jRwvHjPwynPsmSUbHJ/WIZYzROfqZWjA== - dependencies: - ssh2-streams "~0.2.0" - sshpk@^1.7.0: version "1.17.0" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" @@ -9390,11 +9176,6 @@ stream-throttle@^0.1.3: commander "^2.2.0" limiter "^1.0.5" -streamsearch@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha512-jos8u++JKm0ARcSUTAZXOVC0mSox7Bhn6sBgty73P1f3JGf7yG2clTbBNHUdde/kdvP2FESam+vM6l8jBrNxHA== - streamx@^2.12.5: version "2.12.5" resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.12.5.tgz#485d6b6bf74df6f94bc1cc262e67392ed6862dc0" @@ -9808,14 +9589,6 @@ through2@^3.0.0, through2@^3.0.1: inherits "^2.0.4" readable-stream "2 || 3" -through2@~0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b" - integrity sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ== - dependencies: - readable-stream "~1.0.17" - xtend "~2.1.1" - through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -10345,15 +10118,6 @@ vinyl@^0.2.1: dependencies: clone-stats "~0.0.1" -vinyl@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" - integrity sha512-P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA== - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.0, vinyl@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" @@ -10617,13 +10381,6 @@ xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xtend@~2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" - integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ== - dependencies: - object-keys "~0.4.0" - xtend@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"