Update all dependencies

Author: neurolag

package-lock.json

@@ -58,6 +58,7 @@
     "@types/markdown-it": "^12.2.3",
     "cheerio": "^1.0.0-rc.12",
     "dedent": "^0.7.0",
+    "dependency-package-path": "^1.0.0",
     "es6-template-string": "^1.2.0",
     "front-matter": "^4.0.2",
     "fs-extra": "^10.1.0",

package.json

@@ -1,4 +1,6 @@
+import { dependencyPath } from "dependency-package-path";
 import pkgUp = require("pkg-up");
+import puppeteer, { PuppeteerNode } from "puppeteer-core";
 import { dirname } from "upath";
 
 /**
@@ -11,6 +13,11 @@ export class Constants
      */
     private static packageDirectory: string = null;
 
+    /**
+     * A puppeteer instance.
+     */
+    private static puppeteer: PuppeteerNode = null;
+
     /**
      * Gets the path to the root of this package.
      */
@@ -23,4 +30,22 @@ export class Constants
 
         return this.packageDirectory;
     }
+
+    /**
+     * Gets a puppeteer instance.
+     */
+    public static get Puppeteer(): PuppeteerNode
+    {
+        if (this.puppeteer === null)
+        {
+            let puppeteerConstructor: any = puppeteer.constructor;
+
+            this.puppeteer = new puppeteerConstructor(
+                {
+                    projectRoot: dependencyPath("puppeteer-core", __dirname)
+                });
+        }
+
+        return this.puppeteer;
+    }
 }

src/Constants.ts

@@ -7,12 +7,13 @@ import { ensureDir, move, pathExists, remove, writeFile } from "fs-extra";
 import getPort = require("get-port");
 import { glob } from "glob";
 import MarkdownIt = require("markdown-it");
-import * as puppeteer from "puppeteer-core";
+import { Browser, LaunchOptions, PDFOptions, ScreenshotOptions } from "puppeteer-core";
 import serveHandler = require("serve-handler");
 import { transliterate } from "transliteration";
 import { basename, dirname, join, relative } from "upath";
 import { CancellationToken, Progress } from "vscode";
 import websiteScraper = require("website-scraper");
+import { Constants } from "../Constants";
 import { Resources } from "../Properties/Resources";
 import { InsertionType } from "../System/Documents/Assets/InsertionType";
 import { StyleSheet } from "../System/Documents/Assets/StyleSheet";
@@ -61,7 +62,7 @@ export class Converter
     /**
      * The browser which is used to perform the conversion.
      */
-    private browser: puppeteer.Browser;
+    private browser: Browser;
 
     /**
      * A value indicating whether the converter has been initialized.
@@ -192,7 +193,7 @@ export class Converter
     /**
      * Gets the options for launching the browser.
      */
-    public get BrowserOptions(): puppeteer.LaunchOptions
+    public get BrowserOptions(): LaunchOptions
     {
         return {
             ...(
@@ -207,7 +208,7 @@ export class Converter
     /**
      * Gets the browser which is used to perform the conversion.
      */
-    protected get Browser(): puppeteer.Browser
+    protected get Browser(): Browser
     {
         return this.Initialized ? this.browser : null;
     }
@@ -306,7 +307,7 @@ export class Converter
 
             try
             {
-                this.browser = await puppeteer.launch(
+                this.browser = await Constants.Puppeteer.launch(
                     {
                         ...this.BrowserOptions,
                         args: [
@@ -316,7 +317,7 @@ export class Converter
             }
             catch
             {
-                this.browser = await puppeteer.launch(
+                this.browser = await Constants.Puppeteer.launch(
                     {
                         ...this.BrowserOptions,
                         args: [
@@ -454,7 +455,7 @@ export class Converter
                                         }
                                     </style>`;
 
-                                let pdfOptions: puppeteer.PDFOptions = {
+                                let pdfOptions: PDFOptions = {
                                     margin: {
                                         top: this.Document.Paper.Margin.Top,
                                         right: this.Document.Paper.Margin.Right,
@@ -482,7 +483,7 @@ export class Converter
                                 await page.pdf(pdfOptions);
                                 break;
                             default:
-                                let screenshotOptions: puppeteer.ScreenshotOptions = {
+                                let screenshotOptions: ScreenshotOptions = {
                                     fullPage: true,
                                     path
                                 };

src/Conversion/Converter.ts

@@ -1,6 +1,7 @@
-import * as puppeteer from "puppeteer-core";
+import { Browser } from "puppeteer-core";
 import { join, parse } from "upath";
 import { encode } from "utf8";
+import { Constants } from "../Constants";
 import { Converter } from "./Converter";
 
 /**
@@ -57,7 +58,7 @@ export class ConverterPlugin
      */
     public apply(registerAction: (name: string, callback: (options: any) => any) => void): void
     {
-        let browser: puppeteer.Browser;
+        let browser: Browser;
         let occupiedFilenames: string[];
         let subdirectories: { [extension: string]: string };
         let defaultFilename: string;
@@ -72,14 +73,14 @@ export class ConverterPlugin
 
                 try
                 {
-                    browser = await puppeteer.launch({
+                    browser = await Constants.Puppeteer.launch({
                         ...this.Converter.BrowserOptions,
                         args: browserArguments
                     });
                 }
                 catch
                 {
-                    browser = await puppeteer.launch({
+                    browser = await Constants.Puppeteer.launch({
                         ...this.Converter.BrowserOptions,
                         args: [
                             ...browserArguments,

src/Conversion/ConverterPlugin.ts

@@ -1,8 +1,7 @@
 import { exec } from "child_process";
 import { Package } from "@manuth/package-json-editor";
 import { mkdirp, pathExists } from "fs-extra";
-import * as puppeteer from "puppeteer-core";
-import { PUPPETEER_REVISIONS } from "puppeteer-core/lib/cjs/puppeteer/revisions";
+import { PUPPETEER_REVISIONS } from "puppeteer-core/lib/cjs/puppeteer/revisions.js";
 import format = require("string-template");
 import { join, resolve } from "upath";
 import { commands, ExtensionContext, Progress, ProgressLocation, window } from "vscode";
@@ -222,7 +221,7 @@ export class MarkdownConverterExtension extends Extension
                             }));
                     }
                     while (
-                        !await pathExists((puppeteer as unknown as puppeteer.PuppeteerNode).executablePath()) &&
+                        !await pathExists(Constants.Puppeteer.executablePath()) &&
                         !success &&
                         await (window.showWarningMessage(
                             Resources.Resources.Get("UpdateFailed"),
@@ -254,7 +253,7 @@ export class MarkdownConverterExtension extends Extension
     protected async DownloadUpdate(reporter: Progress<IProgressState>): Promise<void>
     {
         let progress = 0;
-        let browserFetcher = (puppeteer as unknown as puppeteer.PuppeteerNode).createBrowserFetcher({});
+        let browserFetcher = Constants.Puppeteer.createBrowserFetcher({});
 
         await browserFetcher.download(
             this.ChromiumRevision,