Upgrade deno (#3491)

This temporarily disables some features which currently depend on puppeteer, which doesn't work on Deno 1.28.2 because of a separate bundling bug.

We'll have a fix for this before 1.3 becomes stable.

Author: cscheid

configuration

@@ -8,7 +8,7 @@
 # deno_dom should match release at https://github.com/b-fuze/deno-dom/releases
 
 # Binary dependencies
-export DENO=v1.26.1
+export DENO=v1.28.2
 export DENO_DOM=v0.1.23-alpha-artifacts
 export PANDOC=2.19.2
 export DARTSASS=1.32.8

package/src/common/configure.ts

@@ -5,7 +5,8 @@
 *
 */
 import { dirname, join, SEP } from "path/mod.ts";
-import { ensureDirSync, existsSync } from "fs/mod.ts";
+import { existsSync } from "node/fs.ts";
+import { ensureDirSync } from "fs/mod.ts";
 import { info, warning } from "log/mod.ts";
 
 import { expandPath } from "../../../src/core/path.ts";

src/command/convert/cmd.ts

@@ -5,7 +5,7 @@
 *
 */
 
-import { exists } from "fs/exists.ts";
+import { existsSync } from "node/fs.ts";
 import { join } from "path/mod.ts";
 import { info } from "log/mod.ts";
 
@@ -51,7 +51,7 @@ export const convertCommand = new Command()
   .action(async (options: any, input: string) => {
     await initYamlIntelligenceResourcesFromFilesystem();
 
-    if (!await exists(input)) {
+    if (!existsSync(input)) {
       throw new Error(`File not found: '${input}'`);
     }
 

src/command/install/cmd.ts

@@ -43,10 +43,11 @@ export const installCommand = new Command()
     "Install TinyTeX",
     "quarto install tool tinytex",
   )
-  .example(
-    "Install Chromium",
-    "quarto install tool chromium",
-  )
+  // temporarily disabled until we get things in order in 1.28.*
+  // .example(
+  //   "Install Chromium",
+  //   "quarto install tool chromium",
+  // )
   .example(
     "Choose tool to install",
     "quarto install tool",

src/command/update/cmd.ts

@@ -48,10 +48,11 @@ export const updateCommand = new Command()
     "Update TinyTeX",
     "quarto update tool tinytex",
   )
-  .example(
-    "Update Chromium",
-    "quarto update tool chromium",
-  )
+  // temporarily disabled until we get things in order in 1.28.*
+  // .example(
+  //   "Update Chromium",
+  //   "quarto update tool chromium",
+  // )
   .example(
     "Choose tool to update",
     "quarto update tool",

src/config/metadata.ts

@@ -7,7 +7,7 @@
 
 import * as ld from "../core/lodash.ts";
 
-import { exists } from "fs/exists.ts";
+import { existsSync } from "node/fs.ts";
 import { join } from "path/mod.ts";
 import { error } from "log/mod.ts";
 
@@ -64,7 +64,7 @@ export async function includedMetadata(
 
   // Read the yaml
   const filesMetadata = await Promise.all(yamlFiles.map(async (yamlFile) => {
-    if (await exists(yamlFile)) {
+    if (existsSync(yamlFile)) {
       try {
         const yaml = await readAndValidateYamlFromFile(
           yamlFile,

src/core/cri/cri.ts

@@ -8,7 +8,7 @@
 
 import { decode } from "encoding/base64.ts";
 import cdp from "./deno-cri/index.js";
-import { getBrowserExecutablePath } from "../puppeteer.ts";
+// import { getBrowserExecutablePath } from "../puppeteer.ts";
 import { Semaphore } from "../lib/semaphore.ts";
 import { findOpenPort } from "../port.ts";
 import { getNamedLifetime, ObjectWithLifetime } from "../lifetimes.ts";
@@ -74,7 +74,10 @@ export async function criClient(appPath?: string, port?: number) {
     port = findOpenPort(9222);
   }
   if (appPath === undefined) {
-    appPath = await getBrowserExecutablePath();
+    throw new Error(
+      "appPath is temporarily required while deno 1.28.* lacks support for puppeteer and browser discovery",
+    );
+    // appPath = await getBrowserExecutablePath();
   }
 
   const cmd = [

src/core/file.ts

@@ -5,23 +5,23 @@
 *
 */
 
-import { TextProtoReader } from "textproto/mod.ts";
-import { BufReader } from "io/mod.ts";
-import { exists } from "fs/mod.ts";
+import { existsSync } from "node/fs.ts";
 import { execProcess } from "./process.ts";
+import { TextLineStream } from "streams/mod.ts";
 
 export async function visitLines(
   path: string,
   visitor: (line: string | null, count: number) => boolean,
 ) {
-  if (await exists(path)) {
+  if (existsSync(path)) {
     const file = await Deno.open(path, { read: true });
     try {
-      const reader = new TextProtoReader(BufReader.create(file));
+      const stream = file.readable
+        .pipeThrough(new TextDecoderStream())
+        .pipeThrough(new TextLineStream());
 
       let count = 0;
-      while (true) {
-        const line = await reader.readLine();
+      for await (const line of stream) {
         if (line !== null) {
           if (!visitor(line, count)) {
             break;

src/core/handlers/base.ts

@@ -73,11 +73,6 @@ import { ensureDirSync } from "fs/mod.ts";
 import { mappedStringFromFile } from "../mapped-text.ts";
 import { error } from "log/mod.ts";
 import { withCriClient } from "../cri/cri.ts";
-/* import {
-  extractHtmlFromElements,
-  extractImagesFromElements,
-} from "../puppeteer.ts";
- */
 const handlers: Record<string, LanguageHandler> = {};
 
 let globalFigureCounter: Record<string, number> = {};
@@ -114,33 +109,19 @@ function makeHandlerContext(
       return options.state![options.name];
     },
 
-    async extractHtml(opts: {
+    //deno-lint-ignore require-await
+    async extractHtml(_opts: {
       html: string;
       selector: string;
       resources?: [string, string][];
     }): Promise<string[]> {
-      const {
-        html: content,
-        selector,
-      } = opts;
-      const nonEmptyHtmlResources: [string, string][] = opts.resources ||
-        [];
-      const dirName = context.options.temp.createDir();
-      // create temporary resources
-      for (const [name, content] of nonEmptyHtmlResources) {
-        Deno.writeTextFileSync(join(dirName, name), content);
-      }
-      const fileName = join(dirName, "index.html");
-      Deno.writeTextFileSync(fileName, content);
-      const url = `file://${fileName}`;
-
-      return await withCriClient(async (client) => {
-        await client.open(url);
-        return await client.contents(selector);
-      });
+      throw new Error(
+        "Internal error: temporarily disabled until deno 1.28.* gets puppeteer support",
+      );
     },
 
-    async createPngsFromHtml(opts: {
+    //deno-lint-ignore require-await
+    async createPngsFromHtml(_opts: {
       prefix: string;
       html: string;
       deviceScaleFactor: number;
@@ -150,51 +131,9 @@ function makeHandlerContext(
       filenames: string[];
       elements: string[];
     }> {
-      const {
-        prefix,
-        html: content,
-        deviceScaleFactor,
-        selector,
-      } = opts;
-      const nonEmptyHtmlResources: [string, string][] = opts.resources ||
-        [];
-      const dirName = context.options.temp.createDir();
-
-      // create temporary resources
-      for (const [name, content] of nonEmptyHtmlResources) {
-        Deno.writeTextFileSync(join(dirName, name), content);
-      }
-      const fileName = join(dirName, "index.html");
-      Deno.writeTextFileSync(fileName, content);
-      const url = `file://${fileName}`;
-
-      const { elements, images } = await withCriClient(async (client) => {
-        await client.open(url);
-        const elements = await client.contents(selector);
-        const screenshots = await client.screenshots(
-          selector,
-          deviceScaleFactor,
-        );
-        return {
-          elements,
-          images: screenshots.map((x) => x.data),
-        };
-      });
-
-      // write figures to disk
-      const sourceNames: string[] = [];
-
-      for (let i = 0; i < images.length; ++i) {
-        const { sourceName, fullName } = context
-          .uniqueFigureName(prefix, ".png");
-        sourceNames.push(sourceName);
-        Deno.writeFileSync(fullName, images[i]);
-      }
-
-      return {
-        filenames: sourceNames,
-        elements,
-      };
+      throw new Error(
+        "Internal error: temporarily disabled until deno 1.28.* gets puppeteer support",
+      );
     },
 
     cellContent(cell: QuartoMdCell): MappedString {

src/core/lib/yaml-intelligence/parsing.ts

@@ -57,7 +57,7 @@ export async function getTreeSitter(): Promise<any> {
   const treeSitterYamlJson = (await import(
     "../../../resources/editor/tools/yaml/tree-sitter-yaml.json",
     { assert: { type: "json" } }
-  )) as { data: number[] };
+  )).default as { data: number[] };
 
   const YAML = await Parser.Language.load(
     new Uint8Array(treeSitterYamlJson.data),