Skip to content

Commit ec5206f

Browse files
ignatiusmbignatiusmb
committed
merge master -> web-ext + debug
2 parents cfb820d + 4621c54 commit ec5206f

File tree

13 files changed

+271
-213
lines changed

13 files changed

+271
-213
lines changed

‎.github/workflows/release.yaml

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,20 @@ on:
66
pull_request:
77

88
jobs:
9+
manifest:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
version: ${{ steps.extract.outputs.version }}
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
- id: extract
17+
working-directory: ./workspace/extension/static
18+
run: echo "version=$(jq -r '.version' manifest.json)" >> $GITHUB_OUTPUT
19+
920
bundle:
1021
runs-on: ubuntu-latest
22+
needs: manifest
1123

1224
steps:
1325
- uses: actions/checkout@v4
@@ -26,27 +38,37 @@ jobs:
2638
name: extension-${{ github.sha }}
2739
path: workspace/extension/build/svelte-devtools.zip
2840

29-
# TODO: upload zip to GitHub releases
30-
3141
sign:
3242
runs-on: ubuntu-latest
33-
needs: bundle
34-
# TODO: web-ext sign fails if version already exists, find another way to check
35-
if: success() && startsWith(github.event.head_commit.message, '~ v')
43+
needs: [manifest, bundle]
44+
env:
45+
GH_TOKEN: ${{ github.token }}
46+
47+
# if: |
48+
# github.repository == 'sveltejs/svelte-devtools' &&
49+
# github.event_name == 'push' && github.ref == 'refs/heads/master' &&
50+
# startsWith(github.event.head_commit.message, format('~ v{0}', needs.manifest.outputs.version))
3651

3752
steps:
3853
- uses: pnpm/action-setup@v4
3954
- uses: actions/download-artifact@v4
40-
with:
41-
name: extension-${{ github.sha }}
42-
43-
- run: pnpm dlx web-ext sign --channel unlisted --api-key ${{ secrets.WEB_EXT_API_KEY }} --api-secret ${{ secrets.WEB_EXT_API_SECRET }}
55+
- run: ls -al
4456

45-
- uses: actions/upload-artifact@v4
46-
with:
47-
name: extension-${{ github.sha }}
57+
# - run: |
58+
# pnpm dlx web-ext sign \
59+
# --channel unlisted \
60+
# --api-key ${{ secrets.WEB_EXT_API_KEY }} \
61+
# --api-secret ${{ secrets.WEB_EXT_API_SECRET }} \
4862

49-
# TODO: upload signed extension to GitHub releases
63+
# - run: | # https://cli.github.com/manual/gh_release_create
64+
# gh release create v${{ needs.manifest.outputs.version }} \
65+
# workspace/extension/build/svelte-devtools.zip \
66+
# --title ${{ needs.manifest.outputs.version }} \
67+
# --draft --generate-notes --notes '
68+
# Built from ${{ github.event.head_commit.id }} at https://github.com/sveltejs/svelte-devtools/actions/runs/${{ github.run_id }}
69+
# - Chrome Web Store: https://chrome.google.com/webstore/detail/svelte-devtools/kfidecgcdjjfpeckbblhmfkhmlgecoff
70+
# - Firefox Signed Add-on: https://github.com/sveltejs/svelte-devtools/releases/download/v${{ needs.manifest.outputs.version }}/svelte-devtools.xpi
71+
# ---'
5072

5173
# TODO: publish to Chrome Web Store
5274
# publish:

‎workspace/extension/src/lib/components/Button.svelte

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,58 +26,58 @@
2626
border-radius: 0.2rem;
2727
outline: none;
2828
29-
background-color: transparent;
29+
background: transparent;
3030
color: rgb(12, 12, 13);
3131
line-height: 0;
32-
}
33-
button.active {
34-
color: rgb(0, 96, 223);
35-
}
36-
button:hover {
37-
background: rgb(237, 237, 240);
38-
}
3932
40-
button:active:hover {
41-
color: inherit;
42-
}
33+
&:active {
34+
color: rgba(12, 12, 13, 0.8);
35+
}
4336
44-
button:active {
45-
color: rgba(12, 12, 13, 0.8);
46-
}
37+
&:hover {
38+
background: rgb(237, 237, 240);
4739
48-
button:disabled {
49-
color: rgba(12, 12, 13, 0.2);
50-
}
40+
&:active {
41+
color: inherit;
42+
}
43+
}
5144
52-
:global(.dark) button {
53-
color: rgba(249, 249, 250, 0.7);
54-
}
45+
&:disabled {
46+
cursor: default;
47+
background: transparent;
48+
color: rgba(12, 12, 13, 0.2);
49+
}
5550
56-
:global(.dark) button.active {
57-
color: rgb(117, 186, 255);
58-
}
51+
&.active {
52+
color: rgb(0, 96, 223);
53+
}
5954
60-
:global(.dark) button:hover {
61-
background-color: rgb(37, 37, 38);
55+
& :global(svg) {
56+
width: 1.25rem;
57+
height: 1.25rem;
58+
fill: currentColor;
59+
}
6260
}
6361
64-
:global(.dark) button:active {
65-
color: rgba(249, 249, 250, 0.8);
66-
}
62+
:global(.dark) button {
63+
color: rgba(249, 249, 250, 0.7);
6764
68-
:global(.dark) button:disabled {
69-
color: rgba(249, 249, 250, 0.2);
70-
}
65+
&:active {
66+
color: rgba(249, 249, 250, 0.8);
67+
}
7168
72-
:global(.dark) button:disabled,
73-
button:disabled {
74-
background-color: transparent;
75-
cursor: default;
76-
}
69+
&:hover {
70+
background-color: rgb(37, 37, 38);
71+
}
72+
73+
&:disabled {
74+
cursor: default;
75+
background: transparent;
76+
color: rgba(249, 249, 250, 0.2);
77+
}
7778
78-
button :global(svg) {
79-
width: 1.25rem;
80-
height: 1.25rem;
81-
fill: currentColor;
79+
&.active {
80+
color: rgb(117, 186, 255);
81+
}
8282
}
8383
</style>

‎workspace/extension/src/lib/components/Resizable.svelte

Lines changed: 50 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -30,54 +30,64 @@
3030
position: relative;
3131
display: grid;
3232
color: rgb(57, 63, 76);
33-
}
34-
aside.x {
35-
grid-template-columns: auto 1fr;
36-
}
37-
aside.y {
38-
grid-template-rows: auto 1fr;
33+
34+
&.x {
35+
grid-template-columns: auto 1fr;
36+
}
37+
&.y {
38+
grid-template-rows: auto 1fr;
39+
}
3940
}
4041
4142
.resize {
4243
top: 0;
4344
left: 0;
4445
width: 0.25rem;
4546
background: rgb(224, 224, 226);
46-
}
47-
.resize:hover {
48-
background: rgb(177, 177, 179);
49-
}
50-
.resize.x {
51-
cursor: ew-resize;
52-
bottom: 0;
53-
width: 0.2rem;
54-
}
55-
.resize.y {
56-
cursor: ns-resize;
57-
right: 0;
58-
height: 0.2rem;
59-
}
60-
.resize + div {
61-
display: grid;
62-
gap: 0.625rem;
63-
align-content: flex-start;
64-
padding-top: 1rem;
65-
}
66-
.resize.x + div {
67-
overflow-x: hidden;
68-
}
69-
.resize.y + div {
70-
overflow-y: hidden;
71-
}
7247
73-
:global(.dark) aside {
74-
background: rgb(36, 36, 36);
75-
color: rgb(177, 177, 179);
76-
}
77-
:global(.dark) .resize {
78-
background: rgb(60, 60, 61);
48+
&:hover {
49+
background: rgb(177, 177, 179);
50+
}
51+
52+
&.x {
53+
cursor: ew-resize;
54+
bottom: 0;
55+
width: 0.2rem;
56+
57+
& + div {
58+
overflow-x: hidden;
59+
}
60+
}
61+
&.y {
62+
cursor: ns-resize;
63+
right: 0;
64+
height: 0.2rem;
65+
66+
& + div {
67+
overflow-y: hidden;
68+
}
69+
}
70+
71+
& + div {
72+
display: grid;
73+
gap: 0.625rem;
74+
align-content: flex-start;
75+
padding-top: 1rem;
76+
}
7977
}
80-
:global(.dark) .resize:hover {
81-
background: rgb(107, 107, 108);
78+
79+
:global(.dark) {
80+
aside {
81+
background: rgb(36, 36, 36);
82+
color: rgb(177, 177, 179);
83+
}
84+
85+
.resize {
86+
background: rgb(60, 60, 61);
87+
88+
&:hover {
89+
background: rgb(107, 107, 108);
90+
}
91+
}
8292
}
8393
</style>

‎workspace/extension/src/lib/nodes/Ellipsis.svelte

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
background: var(--background);
1919
color: var(--color);
2020
font-size: 0.5rem;
21-
}
22-
button:hover {
23-
background: rgba(255, 255, 255, 0.1);
21+
22+
&:hover {
23+
background: rgba(255, 255, 255, 0.1);
24+
}
2425
}
2526
</style>

‎workspace/extension/src/lib/nodes/Node.svelte

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -93,48 +93,56 @@
9393
align-items: center;
9494
line-height: 1.5;
9595
font-size: 0.75rem;
96-
}
97-
ul {
98-
width: 100%;
99-
position: relative;
100-
}
10196
102-
li :global(div) {
103-
width: 100%;
104-
display: flex;
105-
flex-wrap: wrap;
106-
padding-left: calc(var(--indent) + 6px);
107-
}
108-
li[data-hovered] > :global(div) {
109-
background: #f0f9fe;
110-
}
111-
li[data-current] > ul::before {
112-
content: '';
113-
z-index: 1;
114-
width: 0.125rem;
115-
position: absolute;
116-
top: 0.2rem;
117-
bottom: 0.15rem;
118-
left: calc(var(--indent) - 0.75rem);
119-
background: #e0e0e2;
120-
}
97+
ul {
98+
width: 100%;
99+
position: relative;
100+
}
121101
122-
li[data-current] > :global(div:first-child),
123-
li[data-current][data-hovered] > :global(div) {
124-
background: rgba(0, 116, 232, 0.2);
125-
}
126-
li[data-current] > :global(div:first-child:after) {
127-
content: '== $n';
128-
margin-left: 0.5rem;
129-
}
102+
&[data-hovered] > :global(div) {
103+
background: #f0f9fe;
104+
}
105+
106+
&[data-current] {
107+
& > ul::before {
108+
content: '';
109+
z-index: 1;
110+
width: 0.125rem;
111+
position: absolute;
112+
top: 0.2rem;
113+
bottom: 0.15rem;
114+
left: calc(var(--indent) - 0.75rem);
115+
background: #e0e0e2;
116+
}
117+
118+
& > :global(div:first-child),
119+
&[data-hovered] > :global(div) {
120+
background: rgb(0, 116, 232);
121+
}
122+
123+
& > :global(div:first-child:after) {
124+
content: '== $n';
125+
margin-left: 0.5rem;
126+
}
127+
}
130128
131-
:global(.dark) li[data-hovered] > :global(div) {
132-
background: rgb(53, 59, 72);
129+
& :global(div) {
130+
width: 100%;
131+
display: flex;
132+
flex-wrap: wrap;
133+
padding-left: calc(var(--indent) + 6px);
134+
}
133135
}
134136
135-
:global(.dark) li[data-current] > :global(div:first-child),
136-
:global(.dark) li[data-current][data-hovered] > :global(div) {
137-
background: rgb(32, 78, 138);
137+
:global(.dark) {
138+
li[data-hovered] > :global(div) {
139+
background: rgb(53, 59, 72);
140+
}
141+
142+
li[data-current] > :global(div:first-child),
143+
li[data-current][data-hovered] > :global(div) {
144+
background: rgb(32, 78, 138);
145+
}
138146
}
139147
140148
/* flash animation for updates */

0 commit comments

Comments
 (0)