Skip to content

Commit 606960e

Browse files
christian-byrnechristian-byrne
authored
Merge branch 'main' into feat/oss-assets-validation
2 parents 487101e + 7feaefd commit 606960e

File tree

495 files changed

+27493
-5076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

495 files changed

+27493
-5076
lines changed

‎.github/workflows/ci-lint-format.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v6
2222
with:
2323
ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || github.ref }}
24-
token: ${{ secrets.PR_GH_TOKEN }}
24+
token: ${{ !github.event.pull_request.head.repo.fork && secrets.PR_GH_TOKEN || github.token }}
2525

2626
- name: Setup frontend
2727
uses: ./.github/actions/setup-frontend

‎.storybook/main.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ const config: StorybookConfig = {
100100
rolldownOptions: {
101101
treeshake: false,
102102
output: {
103-
keepNames: true,
104-
strictExecutionOrder: true
103+
keepNames: true
105104
},
106105
onwarn: (warning, warn) => {
107106
// Suppress specific warnings

‎.stylelintrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
"reference",
5353
"plugin",
5454
"custom-variant",
55-
"utility"
55+
"utility",
56+
"source"
5657
]
5758
}
5859
],

‎browser_tests/assets/missing/deprecated_nodes_complex.json‎

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,205 @@
1+
{
2+
"last_node_id": 7,
3+
"last_link_id": 5,
4+
"nodes": [
5+
{
6+
"id": 1,
7+
"type": "T2IAdapterLoader",
8+
"pos": [100, 100],
9+
"size": [300, 80],
10+
"flags": {},
11+
"order": 0,
12+
"mode": 0,
13+
"inputs": [],
14+
"outputs": [
15+
{
16+
"name": "CONTROL_NET",
17+
"type": "CONTROL_NET",
18+
"links": [],
19+
"slot_index": 0
20+
}
21+
],
22+
"properties": {
23+
"Node name for S&R": "T2IAdapterLoader"
24+
},
25+
"widgets_values": ["t2iadapter_model.safetensors"]
26+
},
27+
{
28+
"id": 2,
29+
"type": "CheckpointLoaderSimple",
30+
"pos": [100, 300],
31+
"size": [315, 98],
32+
"flags": {},
33+
"order": 1,
34+
"mode": 0,
35+
"outputs": [
36+
{
37+
"name": "MODEL",
38+
"type": "MODEL",
39+
"links": [],
40+
"slot_index": 0
41+
},
42+
{
43+
"name": "CLIP",
44+
"type": "CLIP",
45+
"links": [],
46+
"slot_index": 1
47+
},
48+
{
49+
"name": "VAE",
50+
"type": "VAE",
51+
"links": [],
52+
"slot_index": 2
53+
}
54+
],
55+
"properties": {
56+
"Node name for S&R": "CheckpointLoaderSimple"
57+
},
58+
"widgets_values": ["v1-5-pruned-emaonly-fp16.safetensors"]
59+
},
60+
{
61+
"id": 3,
62+
"type": "ResizeImagesByLongerEdge",
63+
"pos": [500, 100],
64+
"size": [300, 80],
65+
"flags": {},
66+
"order": 2,
67+
"mode": 0,
68+
"inputs": [
69+
{
70+
"name": "images",
71+
"type": "IMAGE",
72+
"link": null
73+
}
74+
],
75+
"outputs": [
76+
{
77+
"name": "IMAGE",
78+
"type": "IMAGE",
79+
"links": [1],
80+
"slot_index": 0
81+
}
82+
],
83+
"properties": {
84+
"Node name for S&R": "ResizeImagesByLongerEdge"
85+
},
86+
"widgets_values": [1024]
87+
},
88+
{
89+
"id": 4,
90+
"type": "ImageScaleBy",
91+
"pos": [500, 280],
92+
"size": [300, 80],
93+
"flags": {},
94+
"order": 3,
95+
"mode": 0,
96+
"inputs": [
97+
{
98+
"name": "image",
99+
"type": "IMAGE",
100+
"link": 1
101+
}
102+
],
103+
"outputs": [
104+
{
105+
"name": "IMAGE",
106+
"type": "IMAGE",
107+
"links": [2, 3],
108+
"slot_index": 0
109+
}
110+
],
111+
"properties": {
112+
"Node name for S&R": "ImageScaleBy"
113+
},
114+
"widgets_values": ["lanczos", 1.5]
115+
},
116+
{
117+
"id": 5,
118+
"type": "ImageBatch",
119+
"pos": [900, 100],
120+
"size": [300, 80],
121+
"flags": {},
122+
"order": 4,
123+
"mode": 0,
124+
"inputs": [
125+
{
126+
"name": "image1",
127+
"type": "IMAGE",
128+
"link": 2
129+
},
130+
{
131+
"name": "image2",
132+
"type": "IMAGE",
133+
"link": null
134+
}
135+
],
136+
"outputs": [
137+
{
138+
"name": "IMAGE",
139+
"type": "IMAGE",
140+
"links": [4],
141+
"slot_index": 0
142+
}
143+
],
144+
"properties": {
145+
"Node name for S&R": "ImageBatch"
146+
},
147+
"widgets_values": []
148+
},
149+
{
150+
"id": 6,
151+
"type": "SaveImage",
152+
"pos": [900, 300],
153+
"size": [300, 80],
154+
"flags": {},
155+
"order": 5,
156+
"mode": 0,
157+
"inputs": [
158+
{
159+
"name": "images",
160+
"type": "IMAGE",
161+
"link": 3
162+
}
163+
],
164+
"properties": {
165+
"Node name for S&R": "SaveImage"
166+
},
167+
"widgets_values": ["ComfyUI"]
168+
},
169+
{
170+
"id": 7,
171+
"type": "PreviewImage",
172+
"pos": [1250, 100],
173+
"size": [300, 250],
174+
"flags": {},
175+
"order": 6,
176+
"mode": 0,
177+
"inputs": [
178+
{
179+
"name": "images",
180+
"type": "IMAGE",
181+
"link": 4
182+
}
183+
],
184+
"properties": {
185+
"Node name for S&R": "PreviewImage"
186+
},
187+
"widgets_values": []
188+
}
189+
],
190+
"links": [
191+
[1, 3, 0, 4, 0, "IMAGE"],
192+
[2, 4, 0, 5, 0, "IMAGE"],
193+
[3, 4, 0, 6, 0, "IMAGE"],
194+
[4, 5, 0, 7, 0, "IMAGE"]
195+
],
196+
"groups": [],
197+
"config": {},
198+
"extra": {
199+
"ds": {
200+
"scale": 1,
201+
"offset": [0, 0]
202+
}
203+
},
204+
"version": 0.4
205+
}

0 commit comments

Comments
 (0)