Skip to content

Commit

Permalink
fix: import merge correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
Siolto committed Aug 28, 2024
1 parent 5953dca commit 9a12e6d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { join, resolve } from "path"
import merge from "ts-deepmerge"
import { merge } from "ts-deepmerge"
import { wdi5Config } from "wdio-ui5-service"
import { config as bstackConfig, browser } from "../cloud-services/browserstack.conf.local.js"
type _wdi5Config = Omit<wdi5Config, "capabilities">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from "ts-deepmerge"
import { merge } from "ts-deepmerge"
import { config as baseConf } from "./wdio-base.conf.js"

const _config = {
Expand Down Expand Up @@ -30,8 +30,8 @@ if (process.env.BROWSERSTACK) {
process.argv.indexOf("--headless") > -1
? ["headless", "disable-gpu"]
: process.argv.indexOf("--debug") > -1
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
},
acceptInsecureCerts: true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from "ts-deepmerge"
import { merge } from "ts-deepmerge"
import { wdi5MultiRemoteCapability } from "wdio-ui5-service"
import { config as baseConf } from "./wdio-base.conf.js"
import { browser } from "../cloud-services/browserstack.conf.local.js"
Expand Down Expand Up @@ -38,8 +38,8 @@ if (process.env.BROWSERSTACK) {
process.argv.indexOf("--headless") > -1
? ["headless", "disable-gpu"]
: process.argv.indexOf("--debug") > -1
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
},
acceptInsecureCerts: true
}
Expand All @@ -55,8 +55,8 @@ if (process.env.BROWSERSTACK) {
process.argv.indexOf("--headless") > -1
? ["--headless"]
: process.argv.indexOf("--debug") > -1
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
},
acceptInsecureCerts: true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from "ts-deepmerge"
import { merge } from "ts-deepmerge"
import { config as baseConf } from "./wdio-base.conf.js"

const _config = {
Expand Down Expand Up @@ -30,8 +30,8 @@ if (process.env.BROWSERSTACK) {
process.argv.indexOf("--headless") > -1
? ["headless", "disable-gpu"]
: process.argv.indexOf("--debug") > -1
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
},
acceptInsecureCerts: true
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import merge from "ts-deepmerge"
import { merge } from "ts-deepmerge"
import { config as baseConf } from "./wdio-base.conf.js"
import { resolve } from "path"

Expand Down Expand Up @@ -41,8 +41,8 @@ if (process.env.BROWSERSTACK) {
process.argv.indexOf("--headless") > -1
? ["headless", "disable-gpu"]
: process.argv.indexOf("--debug") > -1
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
? ["window-size=1440,800", "--auto-open-devtools-for-tabs"]
: ["window-size=1440,800"]
},
acceptInsecureCerts: true
}
Expand Down

0 comments on commit 9a12e6d

Please sign in to comment.