From 9a12e6da833077a20dc6e333dc8aa59dff7cfaa4 Mon Sep 17 00:00:00 2001 From: Siolto Date: Wed, 28 Aug 2024 13:01:31 +0200 Subject: [PATCH] fix: import merge correctly --- .../test/e2e/authentication/wdio-base.conf.ts | 2 +- .../wdio-basic-auth-authentication.conf.ts | 6 +++--- .../wdio-btp-authentication-multiremote.conf.ts | 10 +++++----- .../e2e/authentication/wdio-btp-authentication.conf.ts | 6 +++--- .../authentication/wdio-custom-authentication.conf.ts | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts index 75b74df8..e9acc754 100644 --- a/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts +++ b/examples/ui5-ts-app/test/e2e/authentication/wdio-base.conf.ts @@ -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 diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts index 51992310..0e60715e 100644 --- a/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts +++ b/examples/ui5-ts-app/test/e2e/authentication/wdio-basic-auth-authentication.conf.ts @@ -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 = { @@ -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 } diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts index d8660a16..aeb87c4b 100644 --- a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts +++ b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication-multiremote.conf.ts @@ -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" @@ -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 } @@ -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 } diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts index 95c9c737..0454883a 100644 --- a/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts +++ b/examples/ui5-ts-app/test/e2e/authentication/wdio-btp-authentication.conf.ts @@ -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 = { @@ -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 } diff --git a/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts b/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts index d8e9427e..e2c4b8f4 100644 --- a/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts +++ b/examples/ui5-ts-app/test/e2e/authentication/wdio-custom-authentication.conf.ts @@ -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" @@ -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 }