fix: Misc fixes related to older Node releases (#1070)

mjameswh · web-flow · commit 496b044c6a07 · 2023-03-07T15:22:32.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/activity/src/index.ts b/packages/activity/src/index.ts
@@ -69,8 +69,8 @@
  * @module
  */
 
-import { AsyncLocalStorage } from 'async_hooks';
-import { AbortSignal } from 'abort-controller';
+import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-import
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { msToNumber } from '@temporalio/common/lib/time';
 
 export {
diff --git a/packages/client/src/base-client.ts b/packages/client/src/base-client.ts
@@ -1,4 +1,4 @@
-import os from 'os';
+import os from 'node:os';
 import { DataConverter, LoadedDataConverter } from '@temporalio/common';
 import { isLoadedDataConverter, loadDataConverter } from '@temporalio/common/lib/internal-non-workflow';
 import { Connection } from './connection';
diff --git a/packages/client/src/connection.ts b/packages/client/src/connection.ts
@@ -1,4 +1,4 @@
-import { AsyncLocalStorage } from 'async_hooks';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import * as grpc from '@grpc/grpc-js';
 import type { RPCImpl } from 'protobufjs';
 import { filterNullAndUndefined, normalizeTlsConfig, TLSConfig } from '@temporalio/common/lib/internal-non-workflow';
diff --git a/packages/client/src/iterators-utils.ts b/packages/client/src/iterators-utils.ts
@@ -1,5 +1,5 @@
+import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-import
 import { EventEmitter, on, once } from 'node:events';
-import { AbortController } from 'abort-controller';
 
 export interface MapAsyncOptions {
   /**
diff --git a/packages/create-project/src/create-project.ts b/packages/create-project/src/create-project.ts
@@ -1,6 +1,6 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/create-app.ts
-import path from 'path';
-import { access, rm, readFile } from 'fs/promises';
+import path from 'node:path';
+import { access, rm, readFile } from 'node:fs/promises';
 import retry from 'async-retry';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
diff --git a/packages/create-project/src/helpers/git.ts b/packages/create-project/src/helpers/git.ts
@@ -1,8 +1,8 @@
 /* eslint-disable no-empty */
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/git.ts
-import { execSync } from 'child_process';
-import { rm } from 'fs/promises';
-import path from 'path';
+import { execSync } from 'node:child_process';
+import { rm } from 'node:fs/promises';
+import path from 'node:path';
 // eslint-disable-next-line import/no-named-as-default
 import prompts from 'prompts';
 
diff --git a/packages/create-project/src/helpers/install.test.ts b/packages/create-project/src/helpers/install.test.ts
@@ -1,6 +1,6 @@
-import { readFile, rm, writeFile } from 'fs/promises';
-import os from 'os';
-import path from 'path';
+import { readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 import dedent from 'dedent';
 import test from 'ava';
diff --git a/packages/create-project/src/helpers/install.ts b/packages/create-project/src/helpers/install.ts
@@ -1,5 +1,5 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/install.ts
-import { readFile, writeFile } from 'fs/promises';
+import { readFile, writeFile } from 'node:fs/promises';
 
 import { spawn } from './subprocess.js';
 import { isUrlOk } from './samples.js';
diff --git a/packages/create-project/src/helpers/is-online.ts b/packages/create-project/src/helpers/is-online.ts
@@ -1,7 +1,7 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/is-online.ts
-import { execSync } from 'child_process';
-import dns from 'dns';
-import { URL } from 'url';
+import { execSync } from 'node:child_process';
+import dns from 'node:dns';
+import { URL } from 'node:url';
 
 // Look for any proxy the user might have configured on their machine
 function getProxy(): string | undefined {
diff --git a/packages/create-project/src/helpers/is-writeable.ts b/packages/create-project/src/helpers/is-writeable.ts
@@ -1,5 +1,5 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/is-writeable.ts
-import fs from 'fs';
+import fs from 'node:fs';
 
 import { getErrorCode } from './get-error-code.js';
 
diff --git a/packages/create-project/src/helpers/make-dir.ts b/packages/create-project/src/helpers/make-dir.ts
@@ -1,5 +1,5 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/make-dir.ts
-import fs from 'fs';
+import fs from 'node:fs';
 
 export async function makeDir(root: string, options = { recursive: true }): Promise<void> {
   await fs.promises.mkdir(root, options);
diff --git a/packages/create-project/src/helpers/samples.ts b/packages/create-project/src/helpers/samples.ts
@@ -1,8 +1,8 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/helpers/examples.ts
-import { Stream } from 'stream';
-import { promisify } from 'util';
-import { rm, readdir } from 'fs/promises';
-import path from 'path';
+import { Stream } from 'node:stream';
+import { promisify } from 'node:util';
+import { rm, readdir } from 'node:fs/promises';
+import path from 'node:path';
 import * as tar from 'tar';
 import got from 'got';
 import chalk from 'chalk';
diff --git a/packages/create-project/src/helpers/strip-snip-comments.ts b/packages/create-project/src/helpers/strip-snip-comments.ts
@@ -1,5 +1,5 @@
-import path from 'path';
-import { readFile, writeFile } from 'fs/promises';
+import path from 'node:path';
+import { readFile, writeFile } from 'node:fs/promises';
 import glob from 'glob'; // eslint-disable-line import/no-named-as-default
 
 export async function stripSnipComments(root: string): Promise<void> {
diff --git a/packages/create-project/src/index.ts b/packages/create-project/src/index.ts
@@ -1,5 +1,5 @@
 // Modified from: https://github.com/vercel/next.js/blob/2425f4703c4c6164cecfdb6aa8f80046213f0cc6/packages/create-next-app/index.ts
-import path from 'path';
+import path from 'node:path';
 import chalk from 'chalk';
 import dedent from 'dedent';
 import { Command } from 'commander';
@@ -20,7 +20,7 @@ const program = new Command(packageJson.name)
     '-s, --sample <name|github-url>',
     dedent`
   Which sample to bootstrap the project with. You can use the name of a sample
-  from https://github.com/temporalio/samples-typescript or use a GitHub URL. 
+  from https://github.com/temporalio/samples-typescript or use a GitHub URL.
   The URL can have a branch and/or subdirectory—for example:
   https://github.com/temporalio/samples-typescript/tree/next/hello-world
 `
diff --git a/packages/create-project/src/pkg.ts b/packages/create-project/src/pkg.ts
@@ -1,5 +1,5 @@
-import { readFile } from 'fs/promises';
-import { URL } from 'url';
+import { readFile } from 'node:fs/promises';
+import { URL } from 'node:url';
 
 const pkg = JSON.parse(await readFile(new URL('../package.json', import.meta.url), 'utf8'));
 
diff --git a/packages/meta/package.json b/packages/meta/package.json
@@ -31,7 +31,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=14.18.0"
   },
   "files": [
     "src",
diff --git a/packages/nyc-test-coverage/src/index.ts b/packages/nyc-test-coverage/src/index.ts
@@ -1,4 +1,4 @@
-import path from 'path';
+import path from 'node:path';
 import * as libCoverage from 'istanbul-lib-coverage';
 import { InjectedSinks, BundleOptions, WorkerOptions } from '@temporalio/worker';
 import { CoverageSinks } from './sinks';
diff --git a/packages/test/src/activities/cancellable-fetch.ts b/packages/test/src/activities/cancellable-fetch.ts
@@ -1,8 +1,9 @@
 import fetch from 'node-fetch';
+import type { AbortSignal as FetchAbortSignal } from 'node-fetch/externals';
 import { Context } from '@temporalio/activity';
 
 export async function cancellableFetch(url: string): Promise<Uint8Array> {
-  const response = await fetch(url, { signal: Context.current().cancellationSignal });
+  const response = await fetch(url, { signal: Context.current().cancellationSignal as FetchAbortSignal });
   const contentLengthHeader = response.headers.get('Content-Length');
   if (contentLengthHeader === null) {
     throw new Error('expected Content-Length header to be set');
diff --git a/packages/test/src/integration-tests.ts b/packages/test/src/integration-tests.ts
@@ -1,6 +1,6 @@
 /* eslint @typescript-eslint/no-non-null-assertion: 0 */
 import path from 'node:path';
-import v8 from 'v8';
+import v8 from 'node:v8';
 import { readFileSync } from 'node:fs';
 import * as grpc from '@grpc/grpc-js';
 import asyncRetry from 'async-retry';
diff --git a/packages/test/src/load/all-in-one.ts b/packages/test/src/load/all-in-one.ts
@@ -1,5 +1,5 @@
-import path from 'path';
-import { ChildProcess, spawn } from 'child_process';
+import path from 'node:path';
+import { ChildProcess, spawn } from 'node:child_process';
 import arg from 'arg';
 import { waitOnChild, shell, ChildProcessError, killIfExists } from './child-process';
 import { setupArgSpec, starterArgSpec, workerArgSpec, allInOneArgSpec } from './args';
diff --git a/packages/test/src/load/child-process.ts b/packages/test/src/load/child-process.ts
@@ -1,5 +1,5 @@
 // TODO: this code is duplicated in the scripts directory, consider moving to external dependency
-import { ChildProcess } from 'child_process';
+import { ChildProcess } from 'node:child_process';
 
 export class ChildProcessError extends Error {
   public readonly name = 'ChildProcessError';
diff --git a/packages/test/src/load/starter.ts b/packages/test/src/load/starter.ts
@@ -1,5 +1,5 @@
-import os from 'os';
-import fs from 'fs';
+import os from 'node:os';
+import fs from 'node:fs';
 import arg from 'arg';
 import pidusage from 'pidusage';
 import * as grpc from '@grpc/grpc-js';
diff --git a/packages/test/src/load/worker.ts b/packages/test/src/load/worker.ts
@@ -1,6 +1,6 @@
-import fs from 'fs';
-import http from 'http';
-import { inspect } from 'util';
+import fs from 'node:fs';
+import http from 'node:http';
+import { inspect } from 'node:util';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
 import * as opentelemetry from '@opentelemetry/sdk-node';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
diff --git a/packages/test/src/mocks/workflows-with-node-dependencies/example/client.ts b/packages/test/src/mocks/workflows-with-node-dependencies/example/client.ts
@@ -1,4 +1,4 @@
-import dns from 'dns';
+import dns from 'dns'; // DO NOT ADD node: prefix on this import
 
 export function exampleHeavyweightFunction(): void {
   dns.resolve('localhost', () => {
diff --git a/packages/test/src/test-bundler.ts b/packages/test/src/test-bundler.ts
@@ -2,9 +2,9 @@
  * Test the various states of a Worker.
  * Most tests use a mocked core, some tests run serially because they emit signals to the process
  */
-import { unlink, writeFile } from 'fs/promises';
-import os from 'os';
-import { join as pathJoin } from 'path';
+import { unlink, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import { join as pathJoin } from 'node:path';
 import test from 'ava';
 import { v4 as uuid4 } from 'uuid';
 import { moduleMatches } from '@temporalio/worker/lib/workflow/bundler';
diff --git a/packages/test/src/test-client-connection.ts b/packages/test/src/test-client-connection.ts
@@ -1,5 +1,5 @@
-import util from 'util';
-import path from 'path';
+import util from 'node:util';
+import path from 'node:path';
 import test from 'ava';
 import * as grpc from '@grpc/grpc-js';
 import * as protoLoader from '@grpc/proto-loader';
diff --git a/packages/test/src/test-native-connection-headers.ts b/packages/test/src/test-native-connection-headers.ts
@@ -1,5 +1,5 @@
-import util from 'util';
-import path from 'path';
+import util from 'node:util';
+import path from 'node:path';
 import test from 'ava';
 import { Subject, firstValueFrom } from 'rxjs';
 import * as grpc from '@grpc/grpc-js';
diff --git a/packages/test/src/test-proto-utils.ts b/packages/test/src/test-proto-utils.ts
@@ -1,5 +1,5 @@
-import * as fs from 'fs';
-import path from 'path';
+import * as fs from 'node:fs';
+import path from 'node:path';
 import test from 'ava';
 import Long from 'long'; // eslint-disable-line import/no-named-as-default
 import { historyFromJSON } from '@temporalio/common/lib/proto-utils';
diff --git a/packages/test/src/test-replay.ts b/packages/test/src/test-replay.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import * as fs from 'fs';
-import path from 'path';
+import * as fs from 'node:fs';
+import path from 'node:path';
 import anyTest, { TestFn } from 'ava';
 import { temporal } from '@temporalio/proto';
 import { bundleWorkflowCode, ReplayError, WorkflowBundle } from '@temporalio/worker';
diff --git a/packages/test/src/test-schedules.ts b/packages/test/src/test-schedules.ts
@@ -1,4 +1,4 @@
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 import anyTest, { TestFn } from 'ava';
 import asyncRetry from 'async-retry';
 import {
diff --git a/packages/test/src/test-workflows.ts b/packages/test/src/test-workflows.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
-import path from 'path';
-import vm from 'vm';
+import path from 'node:path';
+import vm from 'node:vm';
 import anyTest, { ExecutionContext, TestFn } from 'ava';
 import dedent from 'dedent';
 import Long from 'long'; // eslint-disable-line import/no-named-as-default
diff --git a/packages/test/src/zeroes-http-server.ts b/packages/test/src/zeroes-http-server.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import http from 'http';
+import http from 'node:http';
 import { sleep } from './helpers';
 
 /**
diff --git a/packages/testing/src/index.ts b/packages/testing/src/index.ts
@@ -8,9 +8,9 @@
  * @module
  */
 
-import path from 'path';
-import events from 'events';
-import { AbortController } from 'abort-controller';
+import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-import
+import path from 'node:path';
+import events from 'node:events';
 import ms from 'ms';
 import * as activity from '@temporalio/activity';
 import {
diff --git a/packages/worker/package.json b/packages/worker/package.json
@@ -27,7 +27,6 @@
     "memfs": "^3.4.6",
     "ms": "^2.1.3",
     "rxjs": "^7.5.5",
-    "semver": "^7.3.7",
     "source-map": "^0.7.4",
     "source-map-loader": "^4.0.0",
     "swc-loader": "^0.2.3",
@@ -41,11 +40,11 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
-    "@types/semver": "^7.3.10"
-  },
   "files": [
     "src",
     "lib"
-  ]
+  ],
+  "engines": {
+    "node": ">= 14.18.0"
+  }
 }
diff --git a/packages/worker/src/activity.ts b/packages/worker/src/activity.ts
@@ -1,4 +1,4 @@
-import { AbortController } from 'abort-controller';
+import 'abort-controller/polyfill'; // eslint-disable-line import/no-unassigned-import
 import { asyncLocalStorage, Context, Info } from '@temporalio/activity';
 import {
   ActivityFunction,
diff --git a/packages/worker/src/connection.ts b/packages/worker/src/connection.ts
@@ -1,4 +1,4 @@
-import util from 'util';
+import util from 'node:util';
 import { IllegalStateError } from '@temporalio/common';
 import { Client, Worker, clientUpdateHeaders, TransportError } from '@temporalio/core-bridge';
 import { NativeConnectionOptions } from './connection-options';
diff --git a/packages/worker/src/logger.ts b/packages/worker/src/logger.ts
diff --git a/packages/worker/src/runtime.ts b/packages/worker/src/runtime.ts
diff --git a/packages/worker/src/worker-options.ts b/packages/worker/src/worker-options.ts
diff --git a/packages/worker/src/worker.ts b/packages/worker/src/worker.ts
diff --git a/packages/worker/src/workflow/bundler.ts b/packages/worker/src/workflow/bundler.ts
diff --git a/packages/worker/src/workflow/reusable-vm.ts b/packages/worker/src/workflow/reusable-vm.ts
diff --git a/packages/worker/src/workflow/threaded-vm.ts b/packages/worker/src/workflow/threaded-vm.ts
diff --git a/packages/worker/src/workflow/vm-shared.ts b/packages/worker/src/workflow/vm-shared.ts
diff --git a/packages/worker/src/workflow/vm.ts b/packages/worker/src/workflow/vm.ts
diff --git a/packages/worker/src/workflow/workflow-worker-thread.ts b/packages/worker/src/workflow/workflow-worker-thread.ts
diff --git a/packages/workflow/src/cancellation-scope.ts b/packages/workflow/src/cancellation-scope.ts
diff --git a/packages/workflow/src/worker-interface.ts b/packages/workflow/src/worker-interface.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import os from 'os';`
	`1`	`+import os from 'node:os';`
`2`	`2`	`import { DataConverter, LoadedDataConverter } from '@temporalio/common';`
`3`	`3`	`import { isLoadedDataConverter, loadDataConverter } from '@temporalio/common/lib/internal-non-workflow';`
`4`	`4`	`import { Connection } from './connection';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { AsyncLocalStorage } from 'async_hooks';`
	`1`	`+import { AsyncLocalStorage } from 'node:async_hooks';`
`2`	`2`	`import * as grpc from '@grpc/grpc-js';`
`3`	`3`	`import type { RPCImpl } from 'protobufjs';`
`4`	`4`	`import { filterNullAndUndefined, normalizeTlsConfig, TLSConfig } from '@temporalio/common/lib/internal-non-workflow';`