Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/code-export-csharp-commons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-csharp-commons",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Commons for exporting Selenium IDE project contents to C#",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -18,9 +18,9 @@
"watch": "tsc --watch"
},
"dependencies": {
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
}
}
4 changes: 2 additions & 2 deletions packages/code-export-csharp-nunit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-csharp-nunit",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to C# NUnit",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -19,7 +19,7 @@
"types": "dist/index.d.ts",
"dependencies": {
"@seleniumhq/code-export-csharp-commons": "^4.0.1",
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
6 changes: 3 additions & 3 deletions packages/code-export-csharp-xunit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-csharp-xunit",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to C# XUnit",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -19,10 +19,10 @@
"types": "dist/index.d.ts",
"dependencies": {
"@seleniumhq/code-export-csharp-commons": "^4.0.1",
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
6 changes: 3 additions & 3 deletions packages/code-export-java-junit/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-java-junit",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to Java JUnit",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -17,10 +17,10 @@
},
"main": "dist/index.js",
"dependencies": {
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
6 changes: 3 additions & 3 deletions packages/code-export-javascript-mocha/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-javascript-mocha",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to JavaScript Mocha",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -17,10 +17,10 @@
},
"main": "dist/index.js",
"dependencies": {
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
6 changes: 3 additions & 3 deletions packages/code-export-python-pytest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-python-pytest",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to Python pytest",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -17,10 +17,10 @@
},
"main": "dist/index.js",
"dependencies": {
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
6 changes: 3 additions & 3 deletions packages/code-export-ruby-rspec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/code-export-ruby-rspec",
"version": "4.0.3",
"version": "4.0.4",
"private": false,
"description": "Export Selenium IDE project contents to Ruby RSpec",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -17,10 +17,10 @@
},
"main": "dist/index.js",
"dependencies": {
"side-code-export": "^4.0.4"
"side-code-export": "^4.0.5"
},
"devDependencies": {
"@seleniumhq/side-model": "^4.0.1"
"@seleniumhq/side-model": "^4.0.2"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
}
5 changes: 2 additions & 3 deletions packages/get-driver/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/get-driver",
"version": "4.0.1",
"version": "4.0.2",
"private": false,
"description": "Download browser drivers",
"author": "Tomer <tomer@corevo.io>",
Expand All @@ -26,13 +26,12 @@
"dependencies": {
"fs-extra": "^8.1.0",
"node-fetch": "^2.6.0",
"tar": "^5.0.5",
"tar": "^7.1.0",
"unzipper": "^0.10.5"
},
"devDependencies": {
"@types/fs-extra": "^8.0.0",
"@types/node-fetch": "^2.5.2",
"@types/tar": "^4.0.3",
"@types/unzipper": "^0.10.0",
"nock": "^11.6.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/get-driver/src/download-driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import * as fs from 'fs-extra'
import * as stream from 'stream'
import fetch from 'node-fetch'
import * as unzipper from 'unzipper'
import tar from 'tar'
import * as tar from 'tar'
import {
resolveDriverUrl,
resolveDriverName,
Expand Down
28 changes: 14 additions & 14 deletions packages/selenium-ide/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "selenium-ide",
"version": "4.0.1-beta.9",
"version": "4.0.1-beta.10",
"private": false,
"description": "Selenium IDE electron app",
"author": "Todd <tarsitodd@gmail.com>",
Expand Down Expand Up @@ -117,17 +117,17 @@
"@fontsource/roboto": "^5.0.8",
"@mui/icons-material": "^5.15.13",
"@mui/material": "^5.15.13",
"@seleniumhq/code-export-csharp-nunit": "^4.0.3",
"@seleniumhq/code-export-csharp-xunit": "^4.0.3",
"@seleniumhq/code-export-java-junit": "^4.0.3",
"@seleniumhq/code-export-javascript-mocha": "^4.0.3",
"@seleniumhq/code-export-python-pytest": "^4.0.3",
"@seleniumhq/code-export-ruby-rspec": "^4.0.3",
"@seleniumhq/get-driver": "^4.0.1",
"@seleniumhq/side-api": "^4.0.7",
"@seleniumhq/code-export-csharp-nunit": "^4.0.4",
"@seleniumhq/code-export-csharp-xunit": "^4.0.4",
"@seleniumhq/code-export-java-junit": "^4.0.4",
"@seleniumhq/code-export-javascript-mocha": "^4.0.4",
"@seleniumhq/code-export-python-pytest": "^4.0.4",
"@seleniumhq/code-export-ruby-rspec": "^4.0.4",
"@seleniumhq/get-driver": "^4.0.2",
"@seleniumhq/side-api": "^4.0.8",
"@seleniumhq/side-commons": "^4.0.1",
"@seleniumhq/side-model": "^4.0.1",
"@seleniumhq/side-runtime": "^4.0.6",
"@seleniumhq/side-model": "^4.0.2",
"@seleniumhq/side-runtime": "^4.0.7",
"dnd-core": "^16.0.1",
"electron-chromedriver": "^28.0.0",
"electron-log": "^5.1.0",
Expand All @@ -143,8 +143,8 @@
"react-intl": "^6.6.5",
"react-resizable-panels": "^1.0.8",
"scroll-into-view-if-needed": "^3.0.10",
"selenium-webdriver": "^4.16.0",
"side-code-export": "^4.0.4",
"selenium-webdriver": "^4.20.0",
"side-code-export": "^4.0.5",
"v8-compile-cache": "^2.3.0"
},
"devDependencies": {
Expand All @@ -156,7 +156,7 @@
"@types/lodash": "^4.14.199",
"@types/react": "^18.2.15",
"@types/react-dom": "^18.2.7",
"@types/selenium-webdriver": "^4.1.21",
"@types/selenium-webdriver": "^4.1.22",
"@types/webpack-env": "^1.16.0",
"copy-webpack-plugin": "^10.2.4",
"css-loader": "^6.8.1",
Expand Down
38 changes: 21 additions & 17 deletions packages/selenium-ide/src/main/session/controllers/System/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import langFileEn, {LanguageMap} from 'browser/I18N/en'
import langFileEn, { LanguageMap } from 'browser/I18N/en'
import { dialog, ipcMain } from 'electron'
import { autoUpdater } from 'electron-updater'
import { writeFile } from 'fs/promises'
Expand Down Expand Up @@ -82,28 +82,32 @@ export default class SystemController extends BaseController {
if (!isAutomated) {
// Just don't do this until we have CSC unfortunately
// this.checkForUpdates()
const startupError = await this.session.driver.startProcess(
const browser = this.session.store.get('browserInfo')
let startupError = await this.session.driver.startProcess(
this.session.store.get('browserInfo')
)
if (startupError) {
console.warn(`
Failed to locate non-electron driver on startup,
Resetting to electron driver.
`)
await this.session.store.set('browserInfo', {
browser: 'electron',
useBidi: false,
version: '',
})
const fallbackStartupError = await this.session.driver.startProcess(
this.session.store.get('browserInfo')
)
if (fallbackStartupError) {
await this.crash(
`Unable to startup due to chromedriver error: ${fallbackStartupError}`
const isElectronBrowser = browser.browser === 'electron'
if (!isElectronBrowser) {
console.warn(`
Failed to locate non-electron driver on startup,
Resetting to electron driver.
`)
await this.session.store.set('browserInfo', {
browser: 'electron',
useBidi: false,
version: '',
})
startupError = await this.session.driver.startProcess(
this.session.store.get('browserInfo')
)
}
}
if (startupError) {
await this.crash(
`Unable to startup due to chromedriver error: ${startupError}`
)
}
}
await this.session.projects.select(firstTime)
await this.session.api.system.onLog.addListener(this.writeToLog)
Expand Down
8 changes: 4 additions & 4 deletions packages/side-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/side-api",
"version": "4.0.7",
"version": "4.0.8",
"private": false,
"description": "Selenium IDE API command shapes and such.",
"author": "Todd Tarsi <tarsitodd@gmail.com>",
Expand All @@ -21,9 +21,9 @@
],
"dependencies": {
"@seleniumhq/browser-info": "^4.0.1",
"@seleniumhq/get-driver": "^4.0.1",
"@seleniumhq/side-model": "^4.0.1",
"@seleniumhq/side-runtime": "^4.0.6",
"@seleniumhq/get-driver": "^4.0.2",
"@seleniumhq/side-model": "^4.0.2",
"@seleniumhq/side-runtime": "^4.0.7",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/side-code-export/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "side-code-export",
"version": "4.0.4",
"version": "4.0.5",
"description": "Utils for code export from Selenium IDE",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
"keywords": [
Expand All @@ -20,8 +20,8 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"dependencies": {
"@seleniumhq/side-model": "^4.0.1",
"@seleniumhq/side-runtime": "^4.0.6",
"@seleniumhq/side-model": "^4.0.2",
"@seleniumhq/side-runtime": "^4.0.7",
"commander": "^9.4.0"
},
"gitHead": "f58e327e7616e23a3e926e4b80cf9952164e5744"
Expand Down
6 changes: 3 additions & 3 deletions packages/side-example-suite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/side-example-suite",
"version": "4.0.4",
"version": "4.0.5",
"private": true,
"description": "Selenium IDE example suite, with tests, plugin, and export format",
"author": "Todd <tarsitodd@gmail.com>",
Expand All @@ -17,11 +17,11 @@
"watch": "tsc --watch"
},
"dependencies": {
"side-code-export": "^4.0.4",
"side-code-export": "^4.0.5",
"@seleniumhq/code-export-python-pytest": "^4.0.1"
},
"devDependencies": {
"@seleniumhq/side-api": "^4.0.7"
"@seleniumhq/side-api": "^4.0.8"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/side-model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@seleniumhq/side-model",
"version": "4.0.1",
"version": "4.0.2",
"private": false,
"description": "Selenium IDE shared models",
"author": "Tomer <tomer@corevo.io>",
Expand Down
6 changes: 3 additions & 3 deletions packages/side-runner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "selenium-side-runner",
"version": "4.0.5",
"version": "4.0.6",
"private": false,
"description": "Run Selenium IDE projects in cli",
"repository": "https://github.com/SeleniumHQ/selenium-ide",
Expand All @@ -23,8 +23,8 @@
],
"license": "Apache-2.0",
"dependencies": {
"@seleniumhq/side-model": "^4.0.1",
"@seleniumhq/side-runtime": "^4.0.6",
"@seleniumhq/side-model": "^4.0.2",
"@seleniumhq/side-runtime": "^4.0.7",
"commander": "^11.0.0",
"glob": "^10.3.1",
"jest": "^29.6.0",
Expand Down
Loading