get everything onto one version

toddtarsi · toddtarsi · commit 681169bb6d4d · 2024-02-01T11:36:21.000-06:00
diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
     "build": "run-s build:ts build:ide",
     "build:electron": "pnpm run --stream --filter selenium-ide build:electron",
     "build:ide": "pnpm run --stream --filter selenium-ide build:webpack",
-    "build:js": "pnpm run --stream --filter @seleniumhq/code-export-* build",
     "build:ts": "tsc --build --verbose",
     "clean:deps": "rimraf packages/*/node_modules node_modules",
     "clean": "rimraf packages/*/build packages/*/dist packages/*/node_modules packages/*/tsconfig.tsbuildinfo node_modules",
diff --git a/packages/code-export-csharp-commons/package.json b/packages/code-export-csharp-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-csharp-commons",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "private": false,
   "description": "Commons for exporting Selenium IDE project contents to C#",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -18,7 +18,7 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/code-export-csharp-nunit/package.json b/packages/code-export-csharp-nunit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-csharp-nunit",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "private": false,
   "description": "Export Selenium IDE project contents to C# NUnit",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -19,7 +19,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.3",
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
 }
diff --git a/packages/code-export-csharp-xunit/package.json b/packages/code-export-csharp-xunit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-csharp-xunit",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "private": false,
   "description": "Export Selenium IDE project contents to C# XUnit",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -19,7 +19,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@seleniumhq/code-export-csharp-commons": "^4.0.0-alpha.2",
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/code-export-java-junit/package.json b/packages/code-export-java-junit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-java-junit",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "private": false,
   "description": "Export Selenium IDE project contents to Java JUnit",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,7 +17,7 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/code-export-javascript-mocha/package.json b/packages/code-export-javascript-mocha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-javascript-mocha",
-  "version": "4.0.0-alpha.5",
+  "version": "4.0.0-alpha.6",
   "private": false,
   "description": "Export Selenium IDE project contents to JavaScript Mocha",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,7 +17,7 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/code-export-python-pytest/package.json b/packages/code-export-python-pytest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-python-pytest",
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-alpha.5",
   "private": false,
   "description": "Export Selenium IDE project contents to Python pytest",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,7 +17,7 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/code-export-ruby-rspec/package.json b/packages/code-export-ruby-rspec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/code-export-ruby-rspec",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "private": false,
   "description": "Export Selenium IDE project contents to Ruby RSpec",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -17,7 +17,7 @@
   },
   "main": "dist/index.js",
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13"
+    "side-code-export": "^4.0.0-alpha.15"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5"
diff --git a/packages/selenium-ide/package.json b/packages/selenium-ide/package.json
@@ -114,12 +114,12 @@
     "@fontsource/roboto": "^5.0.8",
     "@mui/icons-material": "^5.15.0",
     "@mui/material": "^5.15.0",
-    "@seleniumhq/code-export-csharp-nunit": "^4.0.0-alpha.3",
-    "@seleniumhq/code-export-csharp-xunit": "^4.0.0-alpha.3",
-    "@seleniumhq/code-export-java-junit": "^4.0.0-alpha.3",
-    "@seleniumhq/code-export-javascript-mocha": "^4.0.0-alpha.5",
-    "@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.4",
-    "@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.3",
+    "@seleniumhq/code-export-csharp-nunit": "^4.0.0-alpha.4",
+    "@seleniumhq/code-export-csharp-xunit": "^4.0.0-alpha.4",
+    "@seleniumhq/code-export-java-junit": "^4.0.0-alpha.4",
+    "@seleniumhq/code-export-javascript-mocha": "^4.0.0-alpha.6",
+    "@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.5",
+    "@seleniumhq/code-export-ruby-rspec": "^4.0.0-alpha.4",
     "@seleniumhq/get-driver": "^4.0.0-alpha.3",
     "@seleniumhq/side-api": "^4.0.0-alpha.46",
     "@seleniumhq/side-commons": "^4.0.0-alpha.2",
@@ -140,7 +140,7 @@
     "react-resizable-panels": "^1.0.8",
     "scroll-into-view-if-needed": "^3.0.10",
     "selenium-webdriver": "^4.16.0",
-    "side-code-export": "^4.0.0-alpha.13",
+    "side-code-export": "^4.0.0-alpha.15",
     "v8-compile-cache": "^2.3.0"
   },
   "devDependencies": {
diff --git a/packages/side-api/package.json b/packages/side-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-api",
-  "version": "4.0.0-alpha.46",
+  "version": "4.0.0-alpha.47",
   "private": false,
   "description": "Selenium IDE API command shapes and such",
   "author": "Todd Tarsi <tarsitodd@gmail.com>",
@@ -20,7 +20,7 @@
     "@seleniumhq/browser-info": "^4.0.0-alpha.2",
     "@seleniumhq/get-driver": "^4.0.0-alpha.3",
     "@seleniumhq/side-model": "^4.0.0-alpha.5",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.38",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.41",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/side-cli/package.json b/packages/side-cli/package.json
@@ -23,14 +23,14 @@
     "url": "https://github.com/SeleniumHQ/selenium-ide/issues"
   },
   "devDependencies": {
-    "@types/react": "^17.0.14"
+    "@types/react": "^18.2.51"
   },
   "dependencies": {
-    "@seleniumhq/side-model": "^4.0.0-alpha.1",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.11",
-    "ink": "^3.2.0",
-    "ink-select-input": "^4.2.1",
-    "ink-spinner": "^4.0.3",
-    "react": "^17.0.2"
+    "@seleniumhq/side-model": "^4.0.0-alpha.5",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.41",
+    "ink": "^4.4.1",
+    "ink-select-input": "^5.0.0",
+    "ink-spinner": "^5.0.0",
+    "react": "^18.2.0"
   }
 }
diff --git a/packages/side-code-export/package.json b/packages/side-code-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "side-code-export",
-  "version": "4.0.0-alpha.14",
+  "version": "4.0.0-alpha.15",
   "description": "Utils for code export from Selenium IDE",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
   "keywords": [
@@ -21,7 +21,7 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.38",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.41",
     "commander": "^9.4.0"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
diff --git a/packages/side-example-suite/package.json b/packages/side-example-suite/package.json
@@ -17,11 +17,11 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "side-code-export": "^4.0.0-alpha.13",
-    "@seleniumhq/code-export-python-pytest": "4.0.0-alpha.3"
+    "side-code-export": "^4.0.0-alpha.15",
+    "@seleniumhq/code-export-python-pytest": "^4.0.0-alpha.5"
   },
   "devDependencies": {
-    "@seleniumhq/side-api": "^4.0.0-alpha.45"
+    "@seleniumhq/side-api": "^4.0.0-alpha.46"
   },
   "repository": {
     "type": "git",
diff --git a/packages/side-runner/package.json b/packages/side-runner/package.json
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.0-alpha.5",
-    "@seleniumhq/side-runtime": "^4.0.0-alpha.40",
+    "@seleniumhq/side-runtime": "^4.0.0-alpha.41",
     "commander": "^11.0.0",
     "glob": "^10.3.1",
     "jest": "^29.6.0",
diff --git a/packages/side-runner/src/bin.ts b/packages/side-runner/src/bin.ts
@@ -72,6 +72,12 @@ program
     (str) => parseInt(str),
     DEFAULT_TIMEOUT
   )
+  .option(
+    '-T, --jest-timeout [number]',
+    `The maximimum amount of time, in milliseconds, to wait for a test to finish. (default: 60000)`,
+    (str) => parseInt(str),
+    60000
+  )
   .option(
     '-x, --proxy-type [type]',
     'Type of proxy to use (one of: direct, manual, pac, socks, system)'
@@ -129,6 +135,7 @@ let configuration: Configuration = {
   runId: crypto.randomBytes(16).toString('hex'),
   path: path.join(__dirname, '../../'),
   server: '',
+  jestTimeout: options.jestTimeout,
   timeout: DEFAULT_TIMEOUT,
 }
 
diff --git a/packages/side-runner/src/main.test.ts b/packages/side-runner/src/main.test.ts
@@ -55,7 +55,7 @@ if (configuration.retries > 0) {
 }
 // Jest timeout should be really far back, otherwise it will impede people
 // When working right, we should close shop and detonate on our own much sooner
-jest.setTimeout(60 * 60 * 1000) // 60 minutes before we just cut it off
+jest.setTimeout(configuration.jestTimeout)
 
 const logger = createLogger({
   level: configuration.debug ? 'debug' : 'info',
diff --git a/packages/side-runner/src/types.ts b/packages/side-runner/src/types.ts
@@ -87,4 +87,5 @@ export type Configuration = Required<
     runId: string
     path: string
     screenshotFailureDirectory?: string
+    jestTimeout: number
   }
diff --git a/packages/side-runtime/package.json b/packages/side-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-runtime",
-  "version": "4.0.0-alpha.40",
+  "version": "4.0.0-alpha.41",
   "private": false,
   "description": "Selenium IDE playback and execution",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/side-runtime/src/playback-tree/command-node.ts b/packages/side-runtime/src/playback-tree/command-node.ts
@@ -156,6 +156,13 @@ export class CommandNode {
   ): Promise<unknown> {
     return new Promise((res, rej) => {
       const timeLimit = timeout - Date.now()
+      if (timeLimit <= 0) {
+        return rej(
+          new Error(
+            `Operation timed out running command ${this.command.command}:${this.command.target}:${this.command.value}`
+          )
+        )
+      }
       const expirationTimer = setTimeout(() => {
         rej(
           new Error(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
