autifyhq · mtsmfm · Apr 12, 2023 · Apr 12, 2023 · Apr 12, 2023 · Apr 12, 2023
diff --git a/.eslintrc b/.eslintrc
@@ -2,6 +2,7 @@
   "extends": ["oclif", "oclif-typescript", "prettier"],
   "rules": {
     "no-useless-constructor": "off",
-    "@typescript-eslint/no-useless-constructor": "error"
+    "@typescript-eslint/no-useless-constructor": "error",
+    "node/no-missing-import": ["off"]
   }
 }
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -7,6 +7,9 @@ permissions:
   id-token: write
   contents: read
 
+env:
+  NODE_OPTIONS: --experimental-vm-modules
+
 jobs:
   tarball:
     strategy:

diff --git a/bin/dev b/bin/dev
diff --git a/bin/dev.cmd b/bin/dev.cmd
@@ -14,4 +14,4 @@ IF EXIST "%dp0%\node.exe" (
   SET PATHEXT=%PATHEXT:;.JS;=;%
 )
 
-endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\dev" %*
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\dev.js" %*
diff --git a/bin/dev.js b/bin/dev.js
@@ -0,0 +1,36 @@
+#!/usr/bin/env ts-node
+
+import { settings, Errors, flush, run } from "@oclif/core";
+import path from "node:path";
+import url from "node:url";
+import { register } from "ts-node";
+
+const project = path.join(
+  path.dirname(url.fileURLToPath(import.meta.url)),
+  "..",
+  "tsconfig.json"
+);
+
+// In dev mode -> use ts-node and dev plugins
+// When `bin/dev.js` is invoked in integration-test it'll be "test"
+process.env.NODE_ENV ||= "development";
+
+register({ project });
+
+// In dev mode, always show stack traces
+// In test mode, stack traces shouldn't appeared in snapshot
+if (process.env.NODE_ENV === "development") {
+  settings.debug = true;
+}
+
+// Start the CLI
+run(process.argv.slice(2), import.meta.url)
+  .then(flush)
+  .catch((error) => {
+    const oclifHandler = Errors.handle;
+    if (error.response?.data)
+      error.message = `${error.message}: ${JSON.stringify(
+        error.response.data
+      )}`;
+    return oclifHandler(error);
+  });
diff --git a/bin/run → bin/run.js b/bin/run → bin/run.js
@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 
-const oclif = require("@oclif/core");
+import { run, Errors, flush } from "@oclif/core";
 
-oclif
-  .run()
-  .then(require("@oclif/core/flush"))
+run(process.argv.slice(2), import.meta.url)
+  .then(flush)
   .catch((error) => {
-    const oclifHandler = require("@oclif/core/handle");
+    const oclifHandler = Errors.handle;
     if (error.response?.data)
       error.message = `${error.message}: ${JSON.stringify(
         error.response.data

diff --git a/integration-test/bin/autify-cli-integration-test.js b/integration-test/bin/autify-cli-integration-test.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../dist/bin/autify-cli-integration-test.js");
+import "../dist/bin/autify-cli-integration-test.js";
diff --git a/integration-test/bin/autify-mobile-generate-fake-app.js b/integration-test/bin/autify-mobile-generate-fake-app.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../dist/bin/autify-mobile-generate-fake-app.js");
+import "../dist/bin/autify-mobile-generate-fake-app.js";
diff --git a/integration-test/bin/autify-with-proxy.js b/integration-test/bin/autify-with-proxy.js
@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 
-require("../dist/bin/autify-with-proxy.js");
+import "../dist/bin/autify-with-proxy.js";
diff --git a/integration-test/package.json b/integration-test/package.json
@@ -8,6 +8,7 @@
     "autify-mobile-generate-fake-app": "bin/autify-mobile-generate-fake-app.js",
     "autify-with-proxy": "bin/autify-with-proxy.js"
   },
+  "type": "module",
   "homepage": "https://github.com/autifyhq/autify-cli",
   "license": "MIT",
   "repository": {

diff --git a/integration-test/src/bin/autify-cli-integration-test.ts b/integration-test/src/bin/autify-cli-integration-test.ts
@@ -1,9 +1,9 @@
 import { execSync } from "node:child_process";
 import path from "node:path";
 import { argv, env } from "node:process";
+import { fileURLToPath } from "node:url";
 
-// eslint-disable-next-line unicorn/prefer-module
-const scriptDir = __dirname;
+const scriptDir = fileURLToPath(new URL(".", import.meta.url));
 const rootDir = path.join(scriptDir, "..", "..");
 const isRecord = Boolean(env.AUTIFY_CLI_INTEGRATION_TEST_RECORD);
 const command = isRecord ? "test:record" : "test";

diff --git a/integration-test/src/bin/autify-mobile-generate-fake-app.ts b/integration-test/src/bin/autify-mobile-generate-fake-app.ts
@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { androidBuildPath, iosBuildPath } from "../commands";
+import { androidBuildPath, iosBuildPath } from "../commands.js";
 
 // https://commons.wikimedia.org/wiki/File:Transparent.gif
 const tinyBinary = Buffer.from(

diff --git a/integration-test/src/bin/autify-with-proxy.ts b/integration-test/src/bin/autify-with-proxy.ts
@@ -10,7 +10,8 @@ import path from "node:path";
 import { argv, env, exit } from "node:process";
 import { existsSync } from "node:fs";
 import which from "which";
-import { normalizeCommand } from "../commands";
+import { normalizeCommand } from "../commands.js";
+import { fileURLToPath } from "node:url";
 
 Polly.register(NodeHttpAdapter);
 Polly.register(FSPersister);
@@ -71,8 +72,7 @@ const filterRecording = ({ request, response }: HarEntry) => {
 
 const createPolly = async (args: string[]) => {
   const mode = getPollyMode();
-  // eslint-disable-next-line unicorn/prefer-module
-  const scriptDir = __dirname;
+  const scriptDir = fileURLToPath(new URL(".", import.meta.url));
   const recordingsDir = path.join(
     scriptDir,
     "..",

diff --git a/integration-test/src/test/golden/mobileBuildUpload.test.ts b/integration-test/src/test/golden/mobileBuildUpload.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile build upload /path/to/app-debug.apk --workspace-id AAA"

diff --git a/integration-test/src/test/golden/mobileBuildUploadIos.test.ts b/integration-test/src/test/golden/mobileBuildUploadIos.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile build upload /path/to/ios.app --workspace-id AAA"

diff --git a/integration-test/src/test/golden/mobileBuildUploadJson.test.ts b/integration-test/src/test/golden/mobileBuildUploadJson.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile build upload /path/to/app-debug.apk --workspace-id AAA --json"

diff --git a/integration-test/src/test/golden/mobileTestRun.test.ts b/integration-test/src/test/golden/mobileTestRun.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-id CCC"

diff --git a/integration-test/src/test/golden/mobileTestRunAndroid.test.ts b/integration-test/src/test/golden/mobileTestRunAndroid.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-path /path/to/app-debug.apk"

diff --git a/integration-test/src/test/golden/mobileTestRunAndroidWait.test.ts b/integration-test/src/test/golden/mobileTestRunAndroidWait.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-path /path/to/app-debug.apk --wait"

diff --git a/integration-test/src/test/golden/mobileTestRunIos.test.ts b/integration-test/src/test/golden/mobileTestRunIos.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-path /path/to/MyApp.app"

diff --git a/integration-test/src/test/golden/mobileTestRunIosWait.test.ts b/integration-test/src/test/golden/mobileTestRunIosWait.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-path /path/to/MyApp.app --wait"

diff --git a/integration-test/src/test/golden/mobileTestRunWait.test.ts b/integration-test/src/test/golden/mobileTestRunWait.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "mobile test run https://mobile-app.autify.com/projects/AAA/test_plans/BBB --build-id CCC --wait"

diff --git a/integration-test/src/test/golden/webTestRun.test.ts b/integration-test/src/test/golden/webTestRun.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/scenarios/0000"

diff --git a/integration-test/src/test/golden/webTestRunAutifyConnectClient.test.ts b/integration-test/src/test/golden/webTestRunAutifyConnectClient.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/scenarios/0000 --wait --autify-connect-client"

diff --git a/integration-test/src/test/golden/webTestRunTestPlan.test.ts b/integration-test/src/test/golden/webTestRunTestPlan.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/test_plans/0000"

diff --git a/integration-test/src/test/golden/webTestRunTestPlanAutifyConnectClient.test.ts b/integration-test/src/test/golden/webTestRunTestPlanAutifyConnectClient.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/test_plans/0000 --wait --autify-connect-client"

diff --git a/integration-test/src/test/golden/webTestRunTestPlanWait.test.ts b/integration-test/src/test/golden/webTestRunTestPlanWait.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/test_plans/0000 --wait"

diff --git a/integration-test/src/test/golden/webTestRunUrlReplacements.test.ts b/integration-test/src/test/golden/webTestRunUrlReplacements.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   'web test run https://app.autify.com/projects/0000/scenarios/0000 -r "https://example.com https://example.net?foo=bar"'

diff --git a/integration-test/src/test/golden/webTestRunUrlReplacementsDeprecated.test.ts b/integration-test/src/test/golden/webTestRunUrlReplacementsDeprecated.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   'web test run https://app.autify.com/projects/0000/scenarios/0000 -r "https://example.com=https://example.net?foo=bar"'

diff --git a/integration-test/src/test/golden/webTestRunWait.test.ts b/integration-test/src/test/golden/webTestRunWait.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot";
+import { testAutifyCliSnapshot } from "../helpers/testAutifyCliSnapshot.js";
 
 testAutifyCliSnapshot(
   "web test run https://app.autify.com/projects/0000/scenarios/0000 --wait"

diff --git a/integration-test/src/test/helpers/testAutifyCliSnapshot.ts b/integration-test/src/test/helpers/testAutifyCliSnapshot.ts
@@ -1,5 +1,5 @@
 /* eslint-disable unicorn/filename-case */
-import { execAutifyCli } from "../helpers/execAutifyCli";
+import { execAutifyCli } from "../helpers/execAutifyCli.js";
 
 export const testAutifyCliSnapshot = (command: string): void => {
   test(`autify ${command}`, async () => {

diff --git a/integration-test/tsconfig.json b/integration-test/tsconfig.json
@@ -2,13 +2,17 @@
   "compilerOptions": {
     "declaration": true,
     "importHelpers": true,
-    "module": "commonjs",
+    "module": "ESNext",
+    "moduleResolution": "node",
     "outDir": "dist",
     "rootDir": "src",
     "strict": true,
     "target": "es2019",
     "esModuleInterop": true,
     "types": ["express", "jest", "node", "which"]
   },
-  "include": ["src/**/*"]
+  "include": ["src/**/*"],
+  "ts-node": {
+    "esm": true
+  }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,8 +4,9 @@
   "description": "Autify Command Line Interface (CLI)",
   "author": "Autify",
   "bin": {
-    "autify": "./bin/run"
+    "autify": "./bin/run.js"
   },
+  "type": "module",
   "homepage": "https://github.com/autifyhq/autify-cli",
   "license": "MIT",
   "main": "dist/index.js",
@@ -152,13 +153,13 @@
     "prepack": "npm run build && oclif manifest && oclif readme",
     "release": "ts-node ./scripts/release.ts",
     "test:integration": "npm run build -w integration-test && autify-cli-integration-test",
-    "test:integration:dev": "npm run build -w integration-test && cross-env AUTIFY_CLI_PATH=../bin/dev autify-cli-integration-test",
+    "test:integration:dev": "npm run build -w integration-test && cross-env AUTIFY_CLI_PATH=../bin/dev.js autify-cli-integration-test",
     "test:integration:record": "npm run build -w integration-test && cross-env AUTIFY_CLI_INTEGRATION_TEST_RECORD=1 AUTIFY_CONNECT_CLIENT_MODE=real autify-cli-integration-test",
-    "test:integration:dev:record": "npm run build -w integration-test && cross-env AUTIFY_CLI_PATH=../bin/dev AUTIFY_CLI_INTEGRATION_TEST_RECORD=1 AUTIFY_CONNECT_CLIENT_MODE=real autify-cli-integration-test",
+    "test:integration:dev:record": "npm run build -w integration-test && cross-env AUTIFY_CLI_PATH=../bin/dev.js AUTIFY_CLI_INTEGRATION_TEST_RECORD=1 AUTIFY_CONNECT_CLIENT_MODE=real autify-cli-integration-test",
     "test:integration:connect": "AUTIFY_CONNECT_CLIENT_MODE=fake autify connect client install && npm run test:integration AutifyConnectClient",
-    "test:integration:connect:dev": "AUTIFY_CONNECT_CLIENT_MODE=fake ./bin/dev connect client install && npm run test:integration:dev AutifyConnectClient",
+    "test:integration:connect:dev": "AUTIFY_CONNECT_CLIENT_MODE=fake ./bin/dev.js connect client install && npm run test:integration:dev AutifyConnectClient",
     "test:integration:connect:record": "autify connect client install && npm run test:integration:record AutifyConnectClient",
-    "test:integration:connect:dev:record": "./bin/dev connect client install && npm run test:integration:dev:record AutifyConnectClient",
+    "test:integration:connect:dev:record": "./bin/dev.js connect client install && npm run test:integration:dev:record AutifyConnectClient",
     "version": "oclif readme && git add README.md",
     "prepare": "per-env || true",
     "prepare:development": "husky install",

diff --git a/scripts/release.ts b/scripts/release.ts
@@ -8,7 +8,7 @@ import {
 } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { join } from "node:path";
-import pkg from "../package.json";
+import pkg from "../package.json" assert { type: "json" };
 
 const { version, oclif: oclifConfig } = pkg;
 

diff --git a/src/autify/connect/accessPointConfig.ts b/src/autify/connect/accessPointConfig.ts
@@ -1,7 +1,7 @@
 /* eslint-disable unicorn/filename-case */
 import { CLIError } from "@oclif/errors";
 import inquirer from "inquirer";
-import { get, set } from "../../config";
+import { get, set } from "../../config.js";
 
 export const confirmOverwriteAccessPoint = async (
   configDir: string