increment everything but the ide

toddtarsi · toddtarsi · commit a04da5729e62 · 2024-04-03T09:45:31.000-05:00
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "clean:deps": "rimraf packages/*/node_modules node_modules",
     "clean": "rimraf packages/*/build packages/*/dist packages/*/node_modules packages/*/tsconfig.tsbuildinfo node_modules",
     "clean:nuke": "git clean -fdx",
+    "dev": "cd packages/selenium-ide && npm run dev",
     "pretest": "cd packages/webdriver-testkit && npm run download-drivers",
     "start": "cd packages/selenium-ide && npm start",
     "test:jest:core": "jest",
@@ -23,13 +24,14 @@
     "test:side-runner": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -t 15000 ./tests/examples/*.side'",
     "test:side-runner:ci": "npm-run-bg -s 'http-server -p 8080 ./packages/side-testkit/fixtures/static::Available on::8080' 'node ./packages/side-runner/dist/bin.js -c \"goog:chromeOptions.args=[headless,no-sandbox] browserName=chrome\" -t 15000 ./tests/examples/*.side'",
     "typecheck": "tsc --noEmit --composite false",
+    "serve": "pnpm run --stream --filter selenium-ide serve",
     "watch": "run-p watch:ts watch:webpack",
     "watch:webpack": "pnpm run --stream --filter selenium-ide watch",
     "watch:js": "pnpm run --stream --filter @seleniumhq/code-export-* --loglevel verbose watch",
     "watch:ts": "tsc --build --verbose --watch"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "workspaces": [
     "packages/*"
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.1",
+  "version": "4.0.2",
   "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"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.1",
+  "version": "4.0.2",
   "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.1",
-    "side-code-export": "^4.0.0"
+    "side-code-export": "^4.0.2"
   },
   "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.1",
+  "version": "4.0.2",
   "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.1",
-    "side-code-export": "^4.0.0"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.1",
+  "version": "4.0.2",
   "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"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.1",
+  "version": "4.0.2",
   "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"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.1",
+  "version": "4.0.2",
   "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"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.1",
+  "version": "4.0.2",
   "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"
+    "side-code-export": "^4.0.2"
   },
   "devDependencies": {
     "@seleniumhq/side-model": "^4.0.1"
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.3",
+  "version": "4.0.4",
   "private": false,
   "description": "Selenium IDE API command shapes and such",
   "author": "Todd Tarsi <tarsitodd@gmail.com>",
@@ -23,7 +23,7 @@
     "@seleniumhq/browser-info": "^4.0.1",
     "@seleniumhq/get-driver": "^4.0.1",
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.2",
+    "@seleniumhq/side-runtime": "^4.0.3",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
diff --git a/packages/side-api/src/commands/state/index.ts b/packages/side-api/src/commands/state/index.ts
@@ -1,10 +1,12 @@
 import type { Shape as Get } from './get'
 import type { Shape as GetUserPrefs } from './getUserPrefs'
 import type { Shape as OnMutate } from './onMutate'
+import type { Shape as Redo } from './redo'
 import type { Shape as Set } from './set'
 import type { Shape as SetActiveCommand } from './setActiveCommand'
 import type { Shape as SetActiveSuite } from './setActiveSuite'
 import type { Shape as SetActiveTest } from './setActiveTest'
+import type { Shape as SetAll } from './setAll'
 import type { Shape as SetCopiedCommands } from './setCopiedCommands'
 import type { Shape as ToggleBreakpoint } from './toggleBreakpoint'
 import type { Shape as ToggleSuiteMode } from './toggleSuiteMode'
@@ -13,16 +15,19 @@ import type { Shape as ToggleUserPrefDisableCodeExportCompat } from './toggleUse
 import type { Shape as ToggleUserPrefIgnoreCertificateErrors } from './toggleUserPrefIgnoreCertificateErrors'
 import type { Shape as ToggleUserPrefInsert } from './toggleUserPrefInsert'
 import type { Shape as ToggleUserPrefTheme } from './toggleUserPrefTheme'
+import type { Shape as Undo } from './undo'
 import type { Shape as UpdateStepSelection } from './updateStepSelection'
 import type { Shape as UpdateTestSelection } from './updateTestSelection'
 
 import * as get from './get'
 import * as getUserPrefs from './getUserPrefs'
 import * as onMutate from './onMutate'
+import * as redo from './redo'
 import * as set from './set'
 import * as setActiveCommand from './setActiveCommand'
 import * as setActiveSuite from './setActiveSuite'
 import * as setActiveTest from './setActiveTest'
+import * as setAll from './setAll'
 import * as setCopiedCommands from './setCopiedCommands'
 import * as toggleBreakpoint from './toggleBreakpoint'
 import * as toggleSuiteMode from './toggleSuiteMode'
@@ -31,17 +36,20 @@ import * as toggleUserPrefDisableCodeExportCompat from './toggleUserPrefDisableC
 import * as toggleUserPrefIgnoreCertificateErrors from './toggleUserPrefIgnoreCertificateErrors'
 import * as toggleUserPrefInsert from './toggleUserPrefInsert'
 import * as toggleUserPrefTheme from './toggleUserPrefTheme'
+import * as undo from './undo'
 import * as updateStepSelection from './updateStepSelection'
 import * as updateTestSelection from './updateTestSelection'
 
 export const commands = {
   get,
   getUserPrefs,
   onMutate,
+  redo,
   set,
   setActiveCommand,
   setActiveSuite,
   setActiveTest,
+  setAll,
   setCopiedCommands,
   toggleBreakpoint,
   toggleSuiteMode,
@@ -50,6 +58,7 @@ export const commands = {
   toggleUserPrefIgnoreCertificateErrors,
   toggleUserPrefInsert,
   toggleUserPrefTheme,
+  undo,
   updateStepSelection,
   updateTestSelection,
 }
@@ -61,10 +70,12 @@ export type Shape = {
   get: Get
   getUserPrefs: GetUserPrefs
   onMutate: OnMutate
+  redo: Redo
   set: Set
   setActiveCommand: SetActiveCommand
   setActiveSuite: SetActiveSuite
   setActiveTest: SetActiveTest
+  setAll: SetAll
   setCopiedCommands: SetCopiedCommands
   toggleBreakpoint: ToggleBreakpoint
   toggleSuiteMode: ToggleSuiteMode
@@ -73,6 +84,7 @@ export type Shape = {
   toggleUserPrefIgnoreCertificateErrors: ToggleUserPrefIgnoreCertificateErrors
   toggleUserPrefInsert: ToggleUserPrefInsert
   toggleUserPrefTheme: ToggleUserPrefTheme
+  undo: Undo
   updateStepSelection: UpdateStepSelection
   updateTestSelection: UpdateTestSelection
 }
diff --git a/packages/side-api/src/commands/state/redo.ts b/packages/side-api/src/commands/state/redo.ts
@@ -0,0 +1,4 @@
+/**
+ * De-undo
+ */
+export type Shape = () => Promise<void>
diff --git a/packages/side-api/src/commands/state/setAll.ts b/packages/side-api/src/commands/state/setAll.ts
@@ -0,0 +1,9 @@
+import { CoreSessionData, Mutator } from '../../types/base'
+
+/**
+ * Set the whole session state
+ */
+export type Shape = (state: CoreSessionData) => Promise<void>
+
+export const mutator: Mutator<Shape> = (_session, { params: [newSession] }) =>
+  newSession
diff --git a/packages/side-api/src/commands/state/undo.ts b/packages/side-api/src/commands/state/undo.ts
@@ -0,0 +1,4 @@
+/**
+ * The OG
+ */
+export type Shape = () => Promise<void>
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.1",
+  "version": "4.0.2",
   "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.1",
-    "@seleniumhq/side-runtime": "^4.0.2",
+    "@seleniumhq/side-runtime": "^4.0.3",
     "commander": "^9.4.0"
   },
   "gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
diff --git a/packages/side-example-suite/package.json b/packages/side-example-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@seleniumhq/side-example-suite",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "private": true,
   "description": "Selenium IDE example suite, with tests, plugin, and export format",
   "author": "Todd <tarsitodd@gmail.com>",
@@ -17,11 +17,11 @@
     "watch": "tsc --watch"
   },
   "dependencies": {
-    "side-code-export": "^4.0.0",
+    "side-code-export": "^4.0.2",
     "@seleniumhq/code-export-python-pytest": "^4.0.1"
   },
   "devDependencies": {
-    "@seleniumhq/side-api": "^4.0.3"
+    "@seleniumhq/side-api": "^4.0.4"
   },
   "repository": {
     "type": "git",
diff --git a/packages/side-runner/package.json b/packages/side-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selenium-side-runner",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "private": false,
   "description": "Run Selenium IDE projects in cli",
   "repository": "https://github.com/SeleniumHQ/selenium-ide",
@@ -24,7 +24,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@seleniumhq/side-model": "^4.0.1",
-    "@seleniumhq/side-runtime": "^4.0.2",
+    "@seleniumhq/side-runtime": "^4.0.3",
     "commander": "^11.0.0",
     "glob": "^10.3.1",
     "jest": "^29.6.0",
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.2",
+  "version": "4.0.3",
   "private": false,
   "description": "Selenium IDE playback and execution",
   "author": "Tomer <tomer@corevo.io>",
diff --git a/packages/side-runtime/src/index.ts b/packages/side-runtime/src/index.ts
@@ -18,14 +18,13 @@
 export { default as Playback } from './playback'
 export { default as Variables } from './variables'
 export { default as WebDriverExecutor } from './webdriver'
-import { CommandType as _CommandType } from './playback-tree/command-node'
 import createRecorderSyncronizer from './recording-syncronizer'
 import createRecorderSyncronizerForWebdriverExecutor from './recording-syncronizer-webdriver'
 
 export * from './playback'
 export * from './plugins'
 export * from './types'
-export const CommandType = _CommandType
+export { CommandType } from './playback-tree/command-node'
 export const RecordingSyncronizers = {
   createRecorderSyncronizer,
   createRecorderSyncronizerForWebdriverExecutor,
diff --git a/packages/side-runtime/src/webdriver.ts b/packages/side-runtime/src/webdriver.ts
@@ -1521,8 +1521,12 @@ export default class WebDriverExecutor {
       this.withCancel(async () => {
         const el = await this.elementIsLocated(locator, fallback)
         if (!el) return null
-        const elText = (await el.getText()).replace(/\u00A0/g, ' ').trim()
-        return elText === text.replace(/\u00A0/g, ' ').trim()
+        try {
+          const elText = (await el.getText()).replace(/\u00A0/g, ' ').trim()
+          return elText === text.replace(/\u00A0/g, ' ').trim()
+        } catch (e) {
+          return null
+        }
       })
     )
     await this.driver.wait<boolean>(textCondition, timeout)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
