Prepare to release v0.12.0

.github/workflows/tests.yml

@@ -28,6 +28,12 @@ jobs:
             os: macos-12
           - node: 19
             os: windows-2022
+          - node: 20
+            os: ubuntu-22.04
+          - node: 20
+            os: macos-12
+          - node: 20
+            os: windows-2022
 
       # Allow all matrix configurations to complete, instead of cancelling as
       # soon as one fails. Useful because we often have different kinds of

CHANGELOG.md

@@ -8,7 +8,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- ## [Unreleased] -->
 
-## [Unreleased]
+<!-- ## [Unreleased] -->
+
+## [0.12.0] - 2023-09-01
 
 ## Added
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wireit",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Upgrade your npm scripts to make them smarter and more efficient",
   "author": "Google LLC",
   "license": "Apache-2.0",
@@ -429,7 +429,7 @@
     "vscode-languageclient": "^8.0.1",
     "vscode-languageserver": "^8.0.1",
     "vscode-languageserver-textdocument": "^1.0.4",
-    "wireit": "^0.11.0",
+    "wireit": "^0.10.0",
     "yarn": "^1.22.18"
   },
   "prettier": {

src/caching/github-actions-cache.ts

@@ -11,6 +11,8 @@ import * as https from 'https';
 import {createHash} from 'crypto';
 import {scriptReferenceToString} from '../config.js';
 import {getScriptDataDir} from '../util/script-data-dir.js';
+import '../util/dispose.js';
+import {fileBudget} from '../util/fs.js';
 import {execFile} from 'child_process';
 
 import type * as http from 'http';
@@ -20,7 +22,6 @@ import type {Fingerprint} from '../fingerprint.js';
 import type {Logger} from '../logging/logger.js';
 import type {AbsoluteEntry} from '../util/glob.js';
 import type {Result} from '../error.js';
-import {fileBudget} from '../util/fs.js';
 
 /**
  * Caches script output to the GitHub Actions caching service.
@@ -119,7 +120,8 @@ export class GitHubActionsCache implements Cache {
     url.searchParams.set('keys', key);
     url.searchParams.set('version', version);
 
-    const {req, resPromise} = this._request(url);
+    using requestResult = this._request(url);
+    const {req, resPromise} = requestResult;
     req.end();
     const result = await resPromise;
     if (!this._maybeHandleServiceDown(result, script)) {
@@ -261,7 +263,8 @@ export class GitHubActionsCache implements Cache {
             'content-range': `bytes ${start}-${end}/*`,
           },
         };
-        const {req, resPromise} = this._request(url, opts);
+        using requestResult = this._request(url, opts);
+        const {req, resPromise} = requestResult;
         tarballChunkStream.pipe(req);
         tarballChunkStream.on('close', () => {
           req.end();
@@ -306,12 +309,13 @@ export class GitHubActionsCache implements Cache {
     const reqBody = JSON.stringify({
       size: tarballBytes,
     });
-    const {req, resPromise} = this._request(url, {
+    using requestResult = this._request(url, {
       method: 'POST',
       headers: {
         'content-type': 'application/json',
       },
     });
+    const {req, resPromise} = requestResult;
     req.end(reqBody);
 
     const result = await resPromise;
@@ -337,7 +341,7 @@ export class GitHubActionsCache implements Cache {
   ): {
     req: http.ClientRequest;
     resPromise: Promise<Result<http.IncomingMessage, Error>>;
-  } {
+  } & Disposable {
     return request(url, {
       ...options,
       headers: {
@@ -511,12 +515,13 @@ export class GitHubActionsCache implements Cache {
       version,
       cacheSize,
     });
-    const {req, resPromise} = this._request(url, {
+    using requestResult = this._request(url, {
       method: 'POST',
       headers: {
         'content-type': 'application/json',
       },
     });
+    const {req, resPromise} = requestResult;
     req.end(reqBody);
 
     const result = await resPromise;
@@ -571,7 +576,8 @@ class GitHubActionsCacheHit implements CacheHit {
   }
 
   private async _download(tarballPath: string): Promise<void> {
-    const {req, resPromise} = request(this._url);
+    using requestResult = request(this._url);
+    const {req, resPromise} = requestResult;
     req.end();
     const result = await resPromise;
     if (!result.ok) {
@@ -617,7 +623,7 @@ function request(
 ): {
   req: http.ClientRequest;
   resPromise: Promise<Result<http.IncomingMessage, Error>>;
-} {
+} & Disposable {
   const opts = {
     ...options,
     headers: {
@@ -647,7 +653,14 @@ function request(
       });
     },
   );
-  return {req, resPromise};
+  return {
+    req,
+    resPromise,
+    [Symbol.dispose]() {
+      req.destroy();
+      req.socket?.destroy();
+    },
+  };
 }
 
 function isOk(res: http.IncomingMessage): boolean {

src/logging/quiet/writeover-line.ts

@@ -5,14 +5,7 @@
  */
 
 import {DEBUG} from '../logger.js';
-
-// Quick Symbol.dispose polyfill.
-if (!Symbol.dispose) {
-  type Writeable<T> = {-readonly [P in keyof T]: T[P]};
-  (Symbol as Writeable<typeof Symbol>).dispose = Symbol(
-    'dispose',
-  ) as typeof Symbol.dispose;
-}
+import '../../util/dispose.js';
 
 export interface StatusLineWriter {
   clearAndStopRendering(): void;

src/test/util/check-script-output.ts

@@ -38,7 +38,6 @@ export function checkScriptOutput(
       }
     }
   }
-  console.log(actual);
   const assertOutputEqualish =
     NODE_MAJOR_VERSION < 16 ? assert.match : assert.equal;
   assertOutputEqualish(actual, expected, message);

src/util/dispose.ts

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright 2023 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// Quick Symbol.dispose polyfill.
+if (!Symbol.dispose) {
+  type Writeable<T> = {-readonly [P in keyof T]: T[P]};
+  (Symbol as Writeable<typeof Symbol>).dispose = Symbol(
+    'dispose',
+  ) as typeof Symbol.dispose;
+}
+
+export {};

src/util/fs.ts

@@ -14,6 +14,7 @@ import {
   createWriteStream as rawCreateWriteStream,
 } from 'fs';
 import {Deferred} from './deferred.js';
+import './dispose.js';
 export {constants} from 'fs';
 
 declare global {
@@ -22,16 +23,6 @@ declare global {
   }
 }
 
-// The interface for https://github.com/tc39/proposal-explicit-resource-management
-// Once we're on TS 5.2 we can write a lot of this with `using` syntax.
-interface Disposable {
-  [Symbol.dispose](): void;
-}
-
-// Polyfill Symbol.dispose.
-// eslint-disable-next-line
-(Symbol as any).dispose ??= Symbol('Symbol.dispose');
-
 export class Semaphore {
   #remaining: number;
   readonly #waiting: Deferred<void>[] = [];