solid-js 1.6.3 → 1.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dev.cjs +7 -4
- package/dist/dev.js +7 -4
- package/dist/server.cjs +3 -1
- package/dist/server.js +3 -1
- package/dist/solid.cjs +7 -4
- package/dist/solid.js +7 -4
- package/package.json +1 -1
package/dist/dev.cjs
CHANGED
|
@@ -1266,7 +1266,13 @@ function resolveSource(s) {
|
|
|
1266
1266
|
return !(s = typeof s === "function" ? s() : s) ? {} : s;
|
|
1267
1267
|
}
|
|
1268
1268
|
function mergeProps(...sources) {
|
|
1269
|
-
|
|
1269
|
+
let proxy = false;
|
|
1270
|
+
for (let i = 0; i < sources.length; i++) {
|
|
1271
|
+
const s = sources[i];
|
|
1272
|
+
proxy ||= !!s && $PROXY in s;
|
|
1273
|
+
sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
|
|
1274
|
+
}
|
|
1275
|
+
if (proxy) {
|
|
1270
1276
|
return new Proxy({
|
|
1271
1277
|
get(property) {
|
|
1272
1278
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
@@ -1360,9 +1366,6 @@ function lazy(fn) {
|
|
|
1360
1366
|
} else if (!comp) {
|
|
1361
1367
|
const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
|
|
1362
1368
|
comp = s;
|
|
1363
|
-
} else {
|
|
1364
|
-
const c = comp();
|
|
1365
|
-
if (c) return c(props);
|
|
1366
1369
|
}
|
|
1367
1370
|
let Comp;
|
|
1368
1371
|
return createMemo(() => (Comp = comp()) && untrack(() => {
|
package/dist/dev.js
CHANGED
|
@@ -1262,7 +1262,13 @@ function resolveSource(s) {
|
|
|
1262
1262
|
return !(s = typeof s === "function" ? s() : s) ? {} : s;
|
|
1263
1263
|
}
|
|
1264
1264
|
function mergeProps(...sources) {
|
|
1265
|
-
|
|
1265
|
+
let proxy = false;
|
|
1266
|
+
for (let i = 0; i < sources.length; i++) {
|
|
1267
|
+
const s = sources[i];
|
|
1268
|
+
proxy ||= !!s && $PROXY in s;
|
|
1269
|
+
sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
|
|
1270
|
+
}
|
|
1271
|
+
if (proxy) {
|
|
1266
1272
|
return new Proxy({
|
|
1267
1273
|
get(property) {
|
|
1268
1274
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
@@ -1356,9 +1362,6 @@ function lazy(fn) {
|
|
|
1356
1362
|
} else if (!comp) {
|
|
1357
1363
|
const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
|
|
1358
1364
|
comp = s;
|
|
1359
|
-
} else {
|
|
1360
|
-
const c = comp();
|
|
1361
|
-
if (c) return c(props);
|
|
1362
1365
|
}
|
|
1363
1366
|
let Comp;
|
|
1364
1367
|
return createMemo(() => (Comp = comp()) && untrack(() => {
|
package/dist/server.cjs
CHANGED
|
@@ -299,7 +299,9 @@ function mergeProps(...sources) {
|
|
|
299
299
|
enumerable: true,
|
|
300
300
|
get() {
|
|
301
301
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
302
|
-
|
|
302
|
+
let s = sources[i] || {};
|
|
303
|
+
if (typeof s === "function") s = s();
|
|
304
|
+
const v = s[key];
|
|
303
305
|
if (v !== undefined) return v;
|
|
304
306
|
}
|
|
305
307
|
}
|
package/dist/server.js
CHANGED
|
@@ -295,7 +295,9 @@ function mergeProps(...sources) {
|
|
|
295
295
|
enumerable: true,
|
|
296
296
|
get() {
|
|
297
297
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
298
|
-
|
|
298
|
+
let s = sources[i] || {};
|
|
299
|
+
if (typeof s === "function") s = s();
|
|
300
|
+
const v = s[key];
|
|
299
301
|
if (v !== undefined) return v;
|
|
300
302
|
}
|
|
301
303
|
}
|
package/dist/solid.cjs
CHANGED
|
@@ -1174,7 +1174,13 @@ function resolveSource(s) {
|
|
|
1174
1174
|
return !(s = typeof s === "function" ? s() : s) ? {} : s;
|
|
1175
1175
|
}
|
|
1176
1176
|
function mergeProps(...sources) {
|
|
1177
|
-
|
|
1177
|
+
let proxy = false;
|
|
1178
|
+
for (let i = 0; i < sources.length; i++) {
|
|
1179
|
+
const s = sources[i];
|
|
1180
|
+
proxy ||= !!s && $PROXY in s;
|
|
1181
|
+
sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
|
|
1182
|
+
}
|
|
1183
|
+
if (proxy) {
|
|
1178
1184
|
return new Proxy({
|
|
1179
1185
|
get(property) {
|
|
1180
1186
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
@@ -1268,9 +1274,6 @@ function lazy(fn) {
|
|
|
1268
1274
|
} else if (!comp) {
|
|
1269
1275
|
const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
|
|
1270
1276
|
comp = s;
|
|
1271
|
-
} else {
|
|
1272
|
-
const c = comp();
|
|
1273
|
-
if (c) return c(props);
|
|
1274
1277
|
}
|
|
1275
1278
|
let Comp;
|
|
1276
1279
|
return createMemo(() => (Comp = comp()) && untrack(() => {
|
package/dist/solid.js
CHANGED
|
@@ -1170,7 +1170,13 @@ function resolveSource(s) {
|
|
|
1170
1170
|
return !(s = typeof s === "function" ? s() : s) ? {} : s;
|
|
1171
1171
|
}
|
|
1172
1172
|
function mergeProps(...sources) {
|
|
1173
|
-
|
|
1173
|
+
let proxy = false;
|
|
1174
|
+
for (let i = 0; i < sources.length; i++) {
|
|
1175
|
+
const s = sources[i];
|
|
1176
|
+
proxy ||= !!s && $PROXY in s;
|
|
1177
|
+
sources[i] = typeof s === "function" ? (proxy = true, createMemo(s)) : s;
|
|
1178
|
+
}
|
|
1179
|
+
if (proxy) {
|
|
1174
1180
|
return new Proxy({
|
|
1175
1181
|
get(property) {
|
|
1176
1182
|
for (let i = sources.length - 1; i >= 0; i--) {
|
|
@@ -1264,9 +1270,6 @@ function lazy(fn) {
|
|
|
1264
1270
|
} else if (!comp) {
|
|
1265
1271
|
const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
|
|
1266
1272
|
comp = s;
|
|
1267
|
-
} else {
|
|
1268
|
-
const c = comp();
|
|
1269
|
-
if (c) return c(props);
|
|
1270
1273
|
}
|
|
1271
1274
|
let Comp;
|
|
1272
1275
|
return createMemo(() => (Comp = comp()) && untrack(() => {
|