Skip to content

Commit

Permalink
Merge branch 'main' into fix46934
Browse files Browse the repository at this point in the history
  • Loading branch information
rbuckton committed Dec 2, 2021
2 parents e19aed3 + c792a66 commit f4b3ef2
Show file tree
Hide file tree
Showing 20 changed files with 215 additions and 146 deletions.
30 changes: 11 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -61,7 +61,7 @@
"browser-resolve": "^1.11.2",
"browserify": "latest",
"chai": "latest",
"chalk": "latest",
"chalk": "^4.1.2",
"convert-source-map": "latest",
"del": "5.1.0",
"diff": "^4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion scripts/browserIntegrationTest.js
@@ -1,4 +1,5 @@
// @ts-check
const chalk = require("chalk");
const { join } = require("path");
const { readFileSync } = require("fs");
try {
Expand All @@ -17,7 +18,6 @@ const playwright = require("playwright");
const debugging = false;

(async () => {
const chalk = (await import("chalk")).default;
for (const browserType of ["chromium", "firefox"]) {
const browser = await playwright[browserType].launch({ headless: !debugging });
const context = await browser.newContext();
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/utils.js
Expand Up @@ -8,6 +8,7 @@ const mkdirp = require("mkdirp");
const del = require("del");
const File = require("vinyl");
const ts = require("../../lib/typescript");
const chalk = require("chalk");
const which = require("which");
const { spawn } = require("child_process");
const { CancellationToken, CancelError, Deferred } = require("prex");
Expand All @@ -26,7 +27,6 @@ const { Readable, Duplex } = require("stream");
* @property {boolean} [waitForExit=true]
*/
async function exec(cmd, args, options = {}) {
const chalk = (await import("chalk")).default;
return /**@type {Promise<{exitCode: number}>}*/(new Promise((resolve, reject) => {
const { ignoreExitCode, cancelToken = CancellationToken.none, waitForExit = true } = options;
cancelToken.throwIfCancellationRequested();
Expand Down

0 comments on commit f4b3ef2

Please sign in to comment.