From ee1aee9cbf69327eee60d8549e2450e4ea1a6ec8 Mon Sep 17 00:00:00 2001 From: Agampreet Singh Date: Thu, 11 Nov 2021 12:06:45 +0530 Subject: [PATCH] v0.4.0 Added logger, shows dialog when download is completed, and shows a right click menu just like in a browser v0.4.0 Added logger, shows dialog when download is completed, and shows a right click menu just like in a browser Fix build.sh Update build.sh --- README.md | 61 +++++++++++++++++------ build.sh | 8 +-- main.js | 72 ++++++++++++++++++++++++--- package.json | 19 ++++--- yarn.lock | 137 +++++++++++++++++++++++++++++++++++++++++++++------ 5 files changed, 248 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 65b45c5..7b8db15 100644 --- a/README.md +++ b/README.md @@ -28,21 +28,22 @@ # Table of contents -1. [Introduction](#Introduction) -2. [Windows](#Windows) - 1. [Windows Installation](#-windows-installation) - 2. [Windows Preview](#windows-preview) -3. [macOS](#macOS) - 1. [macOS Installation](#-macOS-installation) -4. [Linux](#linux) - 1. [Linux Installation](#-linux-installation) - 1. [Ubuntu/Debian based distribution installation](#ubuntudebian-based-distribution-installation) - 2. [Red Hat/Fedora based distribution installation](#red-hatfedora-based-distribution-installation) - 3. [Arch/Manjaro Linux based distribution installation](#archmanjaro-linux-based-distribution-installation) - 2. [Ubuntu Preview](#ubuntu-preview) - 3. [Fedora Preview](#fedora-preview) -5. [MIT License](#-mit-license) - 1. [Disclamier](#disclaimer-not-affiliated-with-microsoft) +- [Table of contents](#table-of-contents) +- [Introduction](#introduction) +- [Windows](#windows) + - [💿 Windows Installation](#-windows-installation) + - [📸 Windows Preview](#-windows-preview) +- [macOS](#macos) + - [💿 macOS Installation](#-macos-installation) +- [Linux](#linux) + - [💿 Linux Installation](#-linux-installation) + - [Ubuntu/Debian based distribution installation](#ubuntudebian-based-distribution-installation) + - [Red Hat/Fedora based distribution installation](#red-hatfedora-based-distribution-installation) + - [Arch/Manjaro Linux based distribution installation](#archmanjaro-linux-based-distribution-installation) + - [📸 Ubuntu Preview](#-ubuntu-preview) +- [💻 Developing Locally](#-developing-locally) +- [📃 MIT License](#-mit-license) + - [*Disclaimer: Not affiliated with Microsoft*](#disclaimer-not-affiliated-with-microsoft) # Introduction @@ -127,9 +128,37 @@ If you find any issues in using the AUR Builds, please create a [New Issue](http [Click Here](https://github.com/agam778/MS-Office-Electron/blob/main/Preview/Ubuntu%20Preview.png?raw=true) +# 💻 Developing Locally +To build the app locally:
+Run this script to automatically install `nodejs`, `yarn` and all the dependencies, and automatically start/build the app (it will show options) (Note: for Linux and macOS Only!): +```bash +wget -O- https://git.io/build-ms-office-electron | bash +``` +
+Or:
+Run the following commands to clone the repository and install the dependencies +```bash +git clone https://github.com/agam778/MS-0ffice-Electron.git +cd MS-Office-Electron +yarn install +``` +```bash +$ yarn run +yarn run v1.22.17 +info Commands available from binary scripts: asar, dircompare, ejs, electron, electron-builder, electron-osx-flat, electron-osx-sign, extract-zip, install-app-deps, is-ci, jake, js-yaml, json5, mime, mkdirp, node-which, rc, rimraf, semver +info Project commands + - dist + electron-builder + - pack + electron-builder --dir + - start + electron . +question Which command would you like to run?: +``` - +To start the app, run `yarn start`
+To build the app, run `yarn dist` # 📃 MIT License diff --git a/build.sh b/build.sh index d544156..d0fba23 100644 --- a/build.sh +++ b/build.sh @@ -153,7 +153,7 @@ else echo 'Please install git manually.' fi fi - git clone https://github.com/agam778/MS-Office-Electron + git clone --depth=1 https://github.com/agam778/MS-Office-Electron; cd MS-Office-Electron echo 'Cloned the repository' fi @@ -171,10 +171,10 @@ echo '1. Run the app' echo '2. Build the app' echo '3. Exit' echo 'Enter your choice:'; read -r choice; -if [ "$choice" -eq "1" ]; then +if [ $choice -eq 1 ]; then echo 'Running the app...' yarn start - elif [ "$choice" -eq "2" ]; then + elif [ $choice -eq 2 ]; then echo 'Building the app...' if [ "$(id -u)" != "0" ]; then if [ "$(uname -m)" == "arm64" ]; then @@ -189,7 +189,7 @@ if [ "$choice" -eq "1" ]; then yarn dist --x64 fi fi - elif [ "$choice" -eq "3" ]; then + elif [ $choice -eq 3 ]; then echo 'Exiting...' exit 1 fi diff --git a/main.js b/main.js index 8e63fd6..bf560c3 100644 --- a/main.js +++ b/main.js @@ -1,11 +1,50 @@ -const { app, Menu, BrowserWindow, dialog } = require("electron"); +const { app, Menu, BrowserWindow, dialog, shell } = require("electron"); const { autoUpdater } = require("electron-updater"); const isMac = process.platform === "darwin"; const openAboutWindow = require("about-window").default; const isOnline = require("is-online"); +const ElectronDl = require("electron-dl"); +const contextMenu = require("electron-context-menu"); + +const log = require("electron-log"); +log.transports.file.level = "verbose"; +console.log = log.log; + +ElectronDl({ + dlPath: "./downloads", + onStarted: (item) => { + dialog.showMessageBox({ + type: "info", + title: "Downloading File", + message: `Downloading "${item.getFilename()}" to "${item.getSavePath()}"`, + buttons: ["OK"], + }); + }, + onCompleted: () => { + dialog.showMessageBox({ + type: "info", + title: "Download Completed", + message: `Downloading Completed! Please check your "Downloads" folder.`, + buttons: ["OK"], + }); + }, + onError: (item) => { + dialog.showMessageBox({ + type: "error", + title: "Download failed", + message: `Downloading "${item.getFilename()}" failed :(`, + buttons: ["OK"], + }); + }, +}); + +contextMenu({ + showInspectElement: false, + showServices: false, +}); + const template = [ - // { role: 'appMenu' } ...(isMac ? [ { @@ -24,7 +63,6 @@ const template = [ }, ] : []), - // { role: 'fileMenu' } { label: "Application", submenu: [ @@ -53,6 +91,31 @@ const template = [ ); }, }, + { + label: "Open Logs Folder", + click: async () => { + const { shell } = require("electron"); + if (process.platform === "win32") { + await shell.openPath( + "C:\\Users\\" + + process.env.USERNAME + + "\\AppData\\Roaming\\ms-office-electron\\\\logs\\" + ); + } else if (process.platform === "darwin") { + await shell.openPath( + "/Users/" + + process.env.USERNAME + + "/Library/Logs/ms-office-electron/" + ); + } else if (process.platform === "linux") { + await shell.openPath( + "/home/" + + process.env.USERNAME + + "/.config/ms-office-electron/logs" + ); + } + }, + }, { type: "separator" }, { role: "quit", @@ -60,7 +123,6 @@ const template = [ }, ], }, - // { role: 'editMenu' } { label: "Edit", submenu: [ @@ -84,7 +146,6 @@ const template = [ : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]), ], }, - // { role: 'viewMenu' } { label: "View", submenu: [ @@ -101,7 +162,6 @@ const template = [ { role: "togglefullscreen" }, ], }, - // { role: 'windowMenu' } { label: "Window", submenu: [ diff --git a/package.json b/package.json index 08a648a..8b875fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ms-office-electron", - "version": "0.3.7", + "version": "0.4.0", "description": "An Unofficial Microsoft Office Online Desktop Client. Free of Cost.", "main": "main.js", "repository": { @@ -26,7 +26,7 @@ "Categories": "Office;" }, "icon": "icon.png", - "artifactName": "MS-Office-Electron-Setup-${version}-x86_64.${ext}", + "artifactName": "ms-office-electron-setup-${version}-${arch}.${ext}", "executableName": "MS-Office-Electron", "maintainer": "Agampreet Singh ", "target": [ @@ -50,7 +50,7 @@ "perMachine": false, "allowToChangeInstallationDirectory": false, "license": "license.txt", - "artifactName": "MS-Office-Electron-Setup-${version}-x86_64.${ext}" + "artifactName": "ms-office-electron-setup-${version}-${arch}.${ext}" }, "win": { "target": [ @@ -74,12 +74,15 @@ }, "license": "MIT", "devDependencies": { - "electron": "^15.3.0", - "electron-builder": "^22.13.1" + "electron": "^15.x.x", + "electron-builder": "^22.x.x" }, "dependencies": { - "about-window": "^1.15.2", - "electron-updater": "^4.3.9", - "is-online": "^9.0.1" + "about-window": "^1.x.x", + "electron-context-menu": "^3.x.x", + "electron-dl": "^3.x.x", + "electron-log": "^4.4.1", + "electron-updater": "^4.x.x", + "is-online": "^9.x.x" } } diff --git a/yarn.lock b/yarn.lock index cbca154..420cf09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,14 +143,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "16.11.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae" - integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w== + version "16.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" + integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== "@types/node@^14.6.2": - version "14.17.32" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.32.tgz#2ca61c9ef8c77f6fa1733be9e623ceb0d372ad96" - integrity sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ== + version "14.17.33" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.33.tgz#011ee28e38dc7aee1be032ceadf6332a0ab15b12" + integrity sha512-noEeJ06zbn3lOh4gqe2v7NMGS33jrulfNqYFDjjEbhpDEHR5VTxgYNQSBqBlJIsBJW3uEYDgD6kvMnrrhGzq8g== "@types/plist@^3.0.1": version "3.0.2" @@ -189,7 +189,7 @@ dependencies: "@types/yargs-parser" "*" -about-window@^1.15.2: +about-window@^1.x.x: version "1.15.2" resolved "https://registry.yarnpkg.com/about-window/-/about-window-1.15.2.tgz#0397216ce0cb6e8a4fa9ba12941e56d481d712b5" integrity sha512-31mDAnLUfKm4uShfMzeEoS6a3nEto2tUt4zZn7qyAKedaTV4p0dGiW1n+YG8vtRh78mZiewghWJmoxDY+lHyYg== @@ -305,6 +305,11 @@ assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-exit-hook@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" @@ -533,6 +538,14 @@ cli-truncate@^1.1.0: slice-ansi "^1.0.0" string-width "^2.0.0" +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== + dependencies: + slice-ansi "^3.0.0" + string-width "^4.2.0" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -798,7 +811,7 @@ ejs@^3.1.6: dependencies: jake "^10.6.1" -electron-builder@^22.13.1: +electron-builder@^22.x.x: version "22.13.1" resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.13.1.tgz#419b2736c0b08f54cb024bc02cfae6b878b34fc3" integrity sha512-ajlI40L60qKBBxvpf770kcjxHAccMpEWpwsHAppytl3WmWgJfMut4Wz9VUFqyNtX/9a624QTatk6TqoxqewRug== @@ -816,6 +829,34 @@ electron-builder@^22.13.1: update-notifier "^5.1.0" yargs "^17.0.1" +electron-context-menu@^3.x.x: + version "3.1.1" + resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.1.1.tgz#109884e79df293f7e85effcbdbbe45d362987d94" + integrity sha512-LJhwaKf6XHwk2LQ5SdwoGNODoA8lRwks9bbEeAqqMf4e3hsrT7pZtX6MaHKYNFZKxF14JjI/VR+VRjGvxmaQoA== + dependencies: + cli-truncate "^2.1.0" + electron-dl "^3.2.1" + electron-is-dev "^2.0.0" + +electron-dl@^3.2.1, electron-dl@^3.x.x: + version "3.3.0" + resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.0.tgz#4e422e276c627373ba61fcf3f92ffa088988db1a" + integrity sha512-Zwaz/OMGPIfBLV2SQH4sTsdDOs/U4y5AOHfremMBXEpjIxX+SiTx845DZAvJJwgb5hfowyWOBLiJhd/emBNLLQ== + dependencies: + ext-name "^5.0.0" + pupa "^2.0.1" + unused-filename "^2.1.0" + +electron-is-dev@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" + integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== + +electron-log@^4.4.1: + version "4.4.1" + resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.1.tgz#28ebeb474eccba2ebf194a96c40d6328e5353e4d" + integrity sha512-nK/DwxPLtwWbggPCm27eMQhYHc3gzoZ+cokBK99diO4WsZJKrv5l44EUW8mRfWpmC8ZubnMyp6GTUIJyTc9AJA== + electron-osx-sign@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz#fc258c5e896859904bbe3d01da06902c04b51c3a" @@ -841,7 +882,7 @@ electron-publish@22.13.1: lazy-val "^1.0.5" mime "^2.5.2" -electron-updater@^4.3.9: +electron-updater@^4.x.x: version "4.3.9" resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.3.9.tgz#247c660bafad7c07935e1b81acd3e9a5fd733154" integrity sha512-LCNfedSwZfS4Hza+pDyPR05LqHtGorCStaBgVpRnfKxOlZcvpYEX0AbMeH5XUtbtGRoH2V8osbbf2qKPNb7AsA== @@ -855,10 +896,10 @@ electron-updater@^4.3.9: lodash.isequal "^4.5.0" semver "^7.3.5" -electron@^15.3.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.0.tgz#f9803c5a05b2dac12efc6d4203492c7e204b4819" - integrity sha512-YLzaKCFmSniNlz9+NUTNs7ssPyDc+bYOCYZ0b/D6DjVkOeIFz4SR8EYKqlOc8TcqlDNu18BbWqz6zbJPyAAURg== +electron@^15.x.x: + version "15.3.1" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.1.tgz#38ce9dfcd4ec51a33d62de23de15fb5ceeaea25d" + integrity sha512-6/qp3Dor7HSGq28qhJEVD1zBFZoWicmo3/ZLvo7rhXPPZFwEMSJGPMEZM9WYSfWW4t/OozpWNuuDe970cF7g2Q== dependencies: "@electron/get" "^1.13.0" "@types/node" "^14.6.2" @@ -911,6 +952,21 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== +ext-list@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" + integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== + dependencies: + mime-db "^1.28.0" + +ext-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" + integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== + dependencies: + ext-list "^2.0.0" + sort-keys-length "^1.0.0" + extract-zip@^1.0.3: version "1.7.0" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" @@ -1241,7 +1297,7 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-online@^9.0.1: +is-online@^9.x.x: version "9.0.1" resolved "https://registry.yarnpkg.com/is-online/-/is-online-9.0.1.tgz#71a34202fa826bae6f3ff8bea420c56573448a5f" integrity sha512-+08dRW0dcFOtleR2N3rHRVxDyZtQitUp9cC+KpKTds0mXibbQyW5js7xX0UGyQXkaLUJObe0w6uQ4ex34lX9LA== @@ -1256,6 +1312,11 @@ is-path-inside@^3.0.2: resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-plain-obj@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" + integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -1420,6 +1481,11 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" +mime-db@^1.28.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" + integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== + mime@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" @@ -1454,6 +1520,11 @@ mkdirp@^0.5.4: dependencies: minimist "^1.2.5" +modify-filename@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1" + integrity sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE= + ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" @@ -1547,6 +1618,11 @@ package-json@^6.3.0: registry-url "^5.0.0" semver "^6.2.0" +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -1617,7 +1693,7 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: +pupa@^2.0.1, pupa@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== @@ -1797,11 +1873,34 @@ slice-ansi@^1.0.0: dependencies: is-fullwidth-code-point "^2.0.0" +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + smart-buffer@^4.0.2: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== +sort-keys-length@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" + integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg= + dependencies: + sort-keys "^1.0.0" + +sort-keys@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" + integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + dependencies: + is-plain-obj "^1.0.0" + source-map-support@^0.5.19: version "0.5.20" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" @@ -1967,6 +2066,14 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +unused-filename@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51" + integrity sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg== + dependencies: + modify-filename "^1.1.0" + path-exists "^4.0.0" + update-notifier@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"