Skip to content

Commit 9a7f6a7

Browse files
committed
Bump major package and tailwind v4 bump fixes
1 parent 2754f55 commit 9a7f6a7

15 files changed

Lines changed: 266 additions & 425 deletions

File tree

example/wdio.conf.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,14 @@ export const config: Options.Testrunner = {
6363
capabilities: [
6464
{
6565
browserName: 'chrome',
66+
browserVersion: '143.0.7499.169', // specify chromium browser version for testing
6667
'goog:chromeOptions': {
67-
args: ['--headless', '--disable-gpu', '--window-size=1280,800']
68+
args: [
69+
'--headless',
70+
'--disable-gpu',
71+
'--remote-allow-origins=*',
72+
'--window-size=1280,800'
73+
]
6874
}
6975
// }, {
7076
// browserName: 'firefox',

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"test": "pnpm --parallel test",
1010
"watch": "pnpm build --watch"
1111
},
12+
"pnpm": {
13+
"overrides": {
14+
"vite": "^7.3.0"
15+
}
16+
},
1217
"devDependencies": {
1318
"@types/node": "^25.0.3",
1419
"@typescript-eslint/eslint-plugin": "^8.40.0",
@@ -30,7 +35,7 @@
3035
"tsx": "^4.20.4",
3136
"typescript": "^5.9.2",
3237
"unplugin-icons": "^22.2.0",
33-
"vite": "^7.1.3",
38+
"vite": "^7.3.0",
3439
"vitest": "^4.0.16",
3540
"webdriverio": "^9.19.1"
3641
},

packages/app/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@
3232
"author": "Christian Bromann <[email protected]>",
3333
"license": "MIT",
3434
"devDependencies": {
35-
"@tailwindcss/postcss": "^4.1.12",
35+
"@tailwindcss/postcss": "^4.1.18",
3636
"@wdio/reporter": "9.18.0",
3737
"autoprefixer": "^10.4.21",
3838
"postcss": "^8.5.6",
39+
"postcss-import": "^16.1.1",
3940
"rollup": "^4.47.0",
4041
"stylelint": "^16.24.0",
4142
"stylelint-config-recommended": "^17.0.0",

packages/app/postcss.config.cjs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module.exports = {
22
plugins: {
3-
tailwindcss: {},
3+
'postcss-import': {},
4+
'@tailwindcss/postcss': {},
45
autoprefixer: {}
56
}
67
}

packages/app/src/app.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import './tailwind.css'
12
import { css, html, nothing } from 'lit'
23
import { customElement, query } from 'lit/decorators.js'
34
import { TraceType, type TraceLog } from '@wdio/devtools-service/types'

packages/app/src/components/browser/snapshot.ts

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,10 @@ export class DevtoolsBrowser extends Element {
5858
width: 100%;
5959
height: 100%;
6060
display: flex;
61-
padding: 2rem;
61+
padding: 2rem !important;
6262
align-items: center;
6363
justify-content: center;
64+
box-sizing: border-box !important;
6465
}
6566
6667
section {
@@ -70,6 +71,9 @@ export class DevtoolsBrowser extends Element {
7071
display: flex;
7172
flex-direction: column;
7273
overflow: hidden;
74+
background: var(--vscode-sideBar-background);
75+
padding: 0.5rem;
76+
gap: 0;
7377
}
7478
7579
.frame-dot {
@@ -79,6 +83,35 @@ export class DevtoolsBrowser extends Element {
7983
margin: 1em 0.25em;
8084
flex-shrink: 0;
8185
}
86+
87+
.frame-dot:nth-child(1) {
88+
background-color: var(
89+
--vscode-notificationsErrorIcon-foreground,
90+
#e51400
91+
);
92+
}
93+
94+
.frame-dot:nth-child(2) {
95+
background-color: var(
96+
--vscode-notificationsWarningIcon-foreground,
97+
#bf8803
98+
);
99+
}
100+
101+
.frame-dot:nth-child(3) {
102+
background-color: var(
103+
--vscode-ports-iconRunningProcessForeground,
104+
#369432
105+
);
106+
}
107+
108+
iframe {
109+
background-color: white;
110+
flex: 1;
111+
border: none;
112+
border-radius: 0 0 0.5rem 0.5rem;
113+
min-height: 0;
114+
}
82115
`
83116
]
84117

@@ -367,21 +400,25 @@ export class DevtoolsBrowser extends Element {
367400

368401
return html`
369402
<section
370-
class="w-full h-full bg-sideBarBackground rounded-t-md shadow-md"
403+
class="w-full h-full bg-sideBarBackground rounded-lg border-2 border-panelBorder shadow-xl"
371404
>
372-
<header class="flex block mx-2">
405+
<header
406+
class="flex items-center mx-2 bg-sideBarBackground rounded-t-lg"
407+
>
373408
<div class="frame-dot bg-notificationsErrorIconForeground"></div>
374409
<div class="frame-dot bg-notificationsWarningIconForeground"></div>
375410
<div class="frame-dot bg-portsIconRunningProcessForeground"></div>
376411
<div
377-
class="flex mx-4 my-2 pr-2 bg-inputBackground text-inputForeground border border-transparent rounded leading-7 w-full"
412+
class="flex items-center mx-4 my-2 pr-2 bg-input-background text-inputForeground border border-editorSuggestWidgetBorder rounded leading-7 flex-1 min-w-0 overflow-hidden"
378413
>
379-
<icon-mdi-world class="w-[20px] h-[20px] m-1 mr-2"></icon-mdi-world>
380-
${this.#activeUrl}
414+
<icon-mdi-world
415+
class="w-[20px] h-[20px] m-1 mr-2 flex-shrink-0"
416+
></icon-mdi-world>
417+
<span class="truncate">${this.#activeUrl}</span>
381418
</div>
382419
</header>
383420
${this.mutations && this.mutations.length
384-
? html`<iframe class="origin-top-left h-full w-full"></iframe>`
421+
? html`<iframe class="origin-top-left"></iframe>`
385422
: html`<wdio-devtools-placeholder
386423
style="height: 100%"
387424
></wdio-devtools-placeholder>`}

packages/app/src/components/sidebar/filter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class DevtoolsSidebarFilter extends Element {
2424
display: flex;
2525
align-items: top;
2626
font-size: 0.8em;
27-
padding-right: 1em;
27+
padding-right: 1em !important;
2828
}
2929
3030
label {

packages/app/src/components/workbench.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class DevtoolsWorkbench extends Element {
5050
minPosition: MIN_WORKBENCH_HEIGHT,
5151
maxPosition: window.innerHeight * 0.7,
5252
initialPosition: window.innerHeight * 0.7, // initial height of browser window is 70% of window
53-
getContainerEl: () => this.getShadowRootAsync() as any as Element,
53+
getContainerEl: () => this as unknown as Element,
5454
direction: Direction.vertical
5555
})
5656

@@ -199,9 +199,11 @@ export class DevtoolsWorkbench extends Element {
199199
<nav class="ml-auto" slot="actions">
200200
<button
201201
@click="${() => this.#toggle('toolbar')}"
202-
class="flex h-10 w-10 items-center justify-center pointer ml-auto hover:bg-toolbarHoverBackground"
202+
class="flex h-10 w-10 items-center justify-center pointer ml-auto hover:bg-toolbarHoverBackground group"
203203
>
204-
<icon-mdi-arrow-collapse-down></icon-mdi-arrow-collapse-down>
204+
<icon-mdi-arrow-collapse-down
205+
class="group-hover:text-chartsBlue"
206+
></icon-mdi-arrow-collapse-down>
205207
</button>
206208
</nav>
207209
</wdio-devtools-tabs>
@@ -210,9 +212,11 @@ export class DevtoolsWorkbench extends Element {
210212
<button
211213
@click="${() => this.#toggle('toolbar')}"
212214
class="fixed z-[9999] right-2 bottom-2 bg-sideBarBackground flex h-10 w-10 items-center justify-center cursor-pointer rounded-md shadow
213-
hover:bg-toolbarHoverBackground border border-panelBorder"
215+
hover:bg-toolbarHoverBackground border border-panelBorder group"
214216
>
215-
<icon-mdi-arrow-collapse-up></icon-mdi-arrow-collapse-up>
217+
<icon-mdi-arrow-collapse-up
218+
class="group-hover:text-chartsBlue"
219+
></icon-mdi-arrow-collapse-up>
216220
</button>
217221
`
218222
: nothing}

packages/app/src/core/core.css

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
@import url('./colors.css');
1+
@import url('./shadow-styles.css');
22

3-
@tailwind base;
4-
@tailwind components;
5-
@tailwind utilities;
6-
7-
/**
8-
* general styles applied to all elements
9-
*/
103
@layer base {
114
:host {
125
line-height: 1.5;
@@ -20,6 +13,15 @@
2013
text-rendering: optimizeLegibility;
2114
-webkit-font-smoothing: antialiased;
2215
-moz-osx-font-smoothing: grayscale;
16+
}
17+
}
18+
19+
:host {
20+
--spacing: 0.25rem;
21+
}
22+
23+
@layer base {
24+
:host {
2325
-webkit-text-size-adjust: 100%;
2426
}
2527

packages/app/src/core/element.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { LitElement, unsafeCSS } from 'lit'
22

33
import coreStyles from './core.css?inline'
4+
import tailwindStyles from '../tailwind.css?inline'
45

56
export class Element extends LitElement {
6-
static styles = [unsafeCSS(coreStyles)]
7+
static styles = [unsafeCSS(tailwindStyles), unsafeCSS(coreStyles)]
78

89
/**
910
* get shadow root of element as promise which gets resolved once the element

0 commit comments

Comments
 (0)