one 1.1.455 → 1.1.457
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/cjs/link/Redirect.cjs +1 -1
- package/dist/cjs/link/Redirect.js +1 -1
- package/dist/cjs/link/Redirect.js.map +1 -1
- package/dist/cjs/link/Redirect.native.js +3 -1
- package/dist/cjs/link/Redirect.native.js.map +1 -1
- package/dist/cjs/useFocusEffect.cjs +11 -30
- package/dist/cjs/useFocusEffect.js +9 -25
- package/dist/cjs/useFocusEffect.js.map +1 -1
- package/dist/cjs/useFocusEffect.native.js +13 -33
- package/dist/cjs/useFocusEffect.native.js.map +2 -2
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.cjs +13 -7
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js +21 -14
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js +13 -8
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map +2 -2
- package/dist/esm/link/Redirect.js +1 -1
- package/dist/esm/link/Redirect.js.map +1 -1
- package/dist/esm/link/Redirect.mjs +1 -1
- package/dist/esm/link/Redirect.mjs.map +1 -1
- package/dist/esm/link/Redirect.native.js +1 -1
- package/dist/esm/link/Redirect.native.js.map +1 -1
- package/dist/esm/useFocusEffect.js +7 -15
- package/dist/esm/useFocusEffect.js.map +1 -1
- package/dist/esm/useFocusEffect.mjs +7 -15
- package/dist/esm/useFocusEffect.mjs.map +1 -1
- package/dist/esm/useFocusEffect.native.js +10 -22
- package/dist/esm/useFocusEffect.native.js.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js +21 -14
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs +13 -7
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js +13 -7
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
- package/package.json +8 -8
- package/src/link/Redirect.tsx +4 -1
- package/src/useFocusEffect.ts +8 -35
- package/src/vercel/build/buildVercelOutputDirectory.ts +25 -19
- package/types/link/Redirect.d.ts.map +1 -1
- package/types/useFocusEffect.d.ts +1 -2
- package/types/useFocusEffect.d.ts.map +1 -1
- package/types/vercel/build/buildVercelOutputDirectory.d.ts.map +1 -1
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/link/Redirect.tsx"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0B,qBAE1B,wBAA+B;
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,mBAA0B,qBAE1B,wBAA+B;AAIxB,SAAS,SAAS,EAAE,KAAK,GAA6B;AAC3D,QAAM,aAAS,wBAAU;AAEzB,mDAAe,MAAM;AACnB,QAAI;AACF,aAAO,QAAQ,IAAI;AAAA,IACrB,SAAS,OAAO;AACd,cAAQ,MAAM,KAAK;AAAA,IACrB;AAAA,EACF,GAAG,CAAC,IAAI,CAAC,GAEF;AACT;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/link/Users/n8/one/packages/one/src/link/Redirect.tsx"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;mBAA0B,qBAE1B,wBAA+B;
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;mBAA0B,qBAE1B,wBAA+B;AAIxB,SAASA,SAAS,OAAkC;MAAlC,EAAEC,KAAI,IAAN,OACjBC,aAASC,wBAAAA;AAEfC,mDAAe,WAAA;AACb,QAAI;AACFF,aAAOG,QAAQJ,IAAAA;IACjB,SAASK,OAAO;AACdC,cAAQD,MAAMA,KAAAA;IAChB;EACF,GAAG;IAACL;GAAK,GAEF;AACT;",
|
5
5
|
"names": ["Redirect", "href", "router", "useRouter", "useFocusEffect", "replace", "error", "console"]
|
6
6
|
}
|
@@ -1,9 +1,7 @@
|
|
1
|
-
var __create = Object.create;
|
2
1
|
var __defProp = Object.defineProperty;
|
3
2
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
4
3
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
5
|
-
var
|
6
|
-
__hasOwnProp = Object.prototype.hasOwnProperty;
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
7
5
|
var __export = (target, all) => {
|
8
6
|
for (var name in all) __defProp(target, name, {
|
9
7
|
get: all[name],
|
@@ -17,36 +15,19 @@ var __export = (target, all) => {
|
|
17
15
|
});
|
18
16
|
return to;
|
19
17
|
};
|
20
|
-
var
|
21
|
-
|
22
|
-
|
23
|
-
// compatible transform (i.e. "__esModule" has not been set), then set
|
24
|
-
// "default" to the CommonJS "module.exports" for node compatibility.
|
25
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
|
26
|
-
value: mod,
|
27
|
-
enumerable: !0
|
28
|
-
}) : target, mod)),
|
29
|
-
__toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
30
|
-
value: !0
|
31
|
-
}), mod);
|
18
|
+
var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
19
|
+
value: !0
|
20
|
+
}), mod);
|
32
21
|
var useFocusEffect_exports = {};
|
33
22
|
__export(useFocusEffect_exports, {
|
34
23
|
useFocusEffect: () => useFocusEffect
|
35
24
|
});
|
36
25
|
module.exports = __toCommonJS(useFocusEffect_exports);
|
37
|
-
var
|
26
|
+
var import_react = require("react"),
|
38
27
|
import_useLoadedNavigation = require("./link/useLoadedNavigation.cjs");
|
39
|
-
function useFocusEffect(effect,
|
28
|
+
function useFocusEffect(effect, args) {
|
40
29
|
const navigation = (0, import_useLoadedNavigation.useOptionalNavigation)();
|
41
|
-
|
42
|
-
|
43
|
-
useFocusEffect(
|
44
|
-
React.useCallback(() => {
|
45
|
-
// Your code here
|
46
|
-
}, [depA, depB])
|
47
|
-
);
|
48
|
-
|
49
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`), React.useEffect(() => {
|
30
|
+
(0, import_react.useEffect)(() => {
|
50
31
|
if (!navigation) return;
|
51
32
|
let isFocused = !1,
|
52
33
|
cleanup;
|
@@ -76,13 +57,13 @@ See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message +=
|
|
76
57
|
};
|
77
58
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
78
59
|
const unsubscribeFocus = navigation.addListener("focus", () => {
|
79
|
-
isFocused || (cleanup
|
60
|
+
isFocused || (cleanup?.(), cleanup = callback(), isFocused = !0);
|
80
61
|
}),
|
81
62
|
unsubscribeBlur = navigation.addListener("blur", () => {
|
82
|
-
cleanup
|
63
|
+
cleanup?.(), cleanup = void 0, isFocused = !1;
|
83
64
|
});
|
84
65
|
return () => {
|
85
|
-
cleanup
|
66
|
+
cleanup?.(), unsubscribeFocus(), unsubscribeBlur();
|
86
67
|
};
|
87
|
-
}, [
|
68
|
+
}, [navigation, ...args]);
|
88
69
|
}
|
@@ -1,8 +1,7 @@
|
|
1
|
-
var __create = Object.create;
|
2
1
|
var __defProp = Object.defineProperty;
|
3
2
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
4
3
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
5
|
-
var
|
4
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
6
5
|
var __export = (target, all) => {
|
7
6
|
for (var name in all)
|
8
7
|
__defProp(target, name, { get: all[name], enumerable: !0 });
|
@@ -12,31 +11,16 @@ var __export = (target, all) => {
|
|
12
11
|
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
13
12
|
return to;
|
14
13
|
};
|
15
|
-
var
|
16
|
-
// If the importer is in node compatibility mode or this is not an ESM
|
17
|
-
// file that has been converted to a CommonJS file using a Babel-
|
18
|
-
// compatible transform (i.e. "__esModule" has not been set), then set
|
19
|
-
// "default" to the CommonJS "module.exports" for node compatibility.
|
20
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
|
21
|
-
mod
|
22
|
-
)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
14
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
23
15
|
var useFocusEffect_exports = {};
|
24
16
|
__export(useFocusEffect_exports, {
|
25
17
|
useFocusEffect: () => useFocusEffect
|
26
18
|
});
|
27
19
|
module.exports = __toCommonJS(useFocusEffect_exports);
|
28
|
-
var
|
29
|
-
function useFocusEffect(effect,
|
20
|
+
var import_react = require("react"), import_useLoadedNavigation = require("./link/useLoadedNavigation");
|
21
|
+
function useFocusEffect(effect, args) {
|
30
22
|
const navigation = (0, import_useLoadedNavigation.useOptionalNavigation)();
|
31
|
-
|
32
|
-
|
33
|
-
useFocusEffect(
|
34
|
-
React.useCallback(() => {
|
35
|
-
// Your code here
|
36
|
-
}, [depA, depB])
|
37
|
-
);
|
38
|
-
|
39
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`), React.useEffect(() => {
|
23
|
+
(0, import_react.useEffect)(() => {
|
40
24
|
if (!navigation)
|
41
25
|
return;
|
42
26
|
let isFocused = !1, cleanup;
|
@@ -67,13 +51,13 @@ See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message +=
|
|
67
51
|
};
|
68
52
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
69
53
|
const unsubscribeFocus = navigation.addListener("focus", () => {
|
70
|
-
isFocused || (cleanup
|
54
|
+
isFocused || (cleanup?.(), cleanup = callback(), isFocused = !0);
|
71
55
|
}), unsubscribeBlur = navigation.addListener("blur", () => {
|
72
|
-
cleanup
|
56
|
+
cleanup?.(), cleanup = void 0, isFocused = !1;
|
73
57
|
});
|
74
58
|
return () => {
|
75
|
-
cleanup
|
59
|
+
cleanup?.(), unsubscribeFocus(), unsubscribeBlur();
|
76
60
|
};
|
77
|
-
}, [
|
61
|
+
}, [navigation, ...args]);
|
78
62
|
}
|
79
63
|
//# sourceMappingURL=useFocusEffect.js.map
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/useFocusEffect.ts"],
|
4
|
-
"mappings": "
|
4
|
+
"mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,mBAA0B,kBAC1B,6BAAsC;AAU/B,SAAS,eAAe,QAAwB,MAAa;AAClE,QAAM,iBAAa,kDAAsB;AAEzC,8BAAU,MAAM;AACd,QAAI,CAAC;AACH;AAGF,QAAI,YAAY,IACZ;AAEJ,UAAM,WAAW,MAAM;AACrB,YAAM,UAAU,OAAO;AAEvB,UAAI,YAAY,UAAa,OAAO,WAAY;AAC9C,eAAO;AAGT,UAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,YAAI,UACF;AAEF,QAAI,YAAY,OACd,WACE,qGACO,OAAQ,QAAgB,QAAS,aAC1C,WACE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sEAeF,WAAW,kBAAkB,KAAK,UAAU,OAAO,CAAC,MAGtD,QAAQ,MAAM,OAAO;AAAA,MACvB;AAAA,IACF;AAGA,IAAI,WAAW,UAAU,MACvB,UAAU,SAAS,GACnB,YAAY;AAGd,UAAM,mBAAmB,WAAW,YAAY,SAAS,MAAM;AAG7D,MAAI,cACJ,UAAU,GACV,UAAU,SAAS,GACnB,YAAY;AAAA,IACd,CAAC,GAEK,kBAAkB,WAAW,YAAY,QAAQ,MAAM;AAC3D,gBAAU,GACV,UAAU,QACV,YAAY;AAAA,IACd,CAAC;AAED,WAAO,MAAM;AACX,gBAAU,GACV,iBAAiB,GACjB,gBAAgB;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;AAC1B;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1,9 +1,8 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __create = Object.create;
|
3
2
|
var __defProp = Object.defineProperty;
|
4
3
|
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
5
4
|
var __getOwnPropNames = Object.getOwnPropertyNames;
|
6
|
-
var
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
7
6
|
var __export = (target, all) => {
|
8
7
|
for (var name in all)
|
9
8
|
__defProp(target, name, { get: all[name], enumerable: !0 });
|
@@ -13,43 +12,24 @@ var __export = (target, all) => {
|
|
13
12
|
!__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
14
13
|
return to;
|
15
14
|
};
|
16
|
-
var
|
17
|
-
// If the importer is in node compatibility mode or this is not an ESM
|
18
|
-
// file that has been converted to a CommonJS file using a Babel-
|
19
|
-
// compatible transform (i.e. "__esModule" has not been set), then set
|
20
|
-
// "default" to the CommonJS "module.exports" for node compatibility.
|
21
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: !0 }) : target,
|
22
|
-
mod
|
23
|
-
)), __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
15
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
24
16
|
var useFocusEffect_exports = {};
|
25
17
|
__export(useFocusEffect_exports, {
|
26
18
|
useFocusEffect: () => useFocusEffect
|
27
19
|
});
|
28
20
|
module.exports = __toCommonJS(useFocusEffect_exports);
|
29
|
-
var
|
30
|
-
function useFocusEffect(effect,
|
21
|
+
var import_react = require("react"), import_useLoadedNavigation = require("./link/useLoadedNavigation");
|
22
|
+
function useFocusEffect(effect, args) {
|
31
23
|
var navigation = (0, import_useLoadedNavigation.useOptionalNavigation)();
|
32
|
-
|
33
|
-
var message = `You passed a second argument to 'useFocusEffect', but it only accepts one argument. If you want to pass a dependency array, you can use 'React.useCallback':
|
34
|
-
|
35
|
-
useFocusEffect(
|
36
|
-
React.useCallback(() => {
|
37
|
-
// Your code here
|
38
|
-
}, [depA, depB])
|
39
|
-
);
|
40
|
-
|
41
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`;
|
42
|
-
console.error(message);
|
43
|
-
}
|
44
|
-
React.useEffect(function() {
|
24
|
+
(0, import_react.useEffect)(function() {
|
45
25
|
if (navigation) {
|
46
26
|
var isFocused = !1, cleanup, callback = function() {
|
47
27
|
var destroy = effect();
|
48
28
|
if (destroy === void 0 || typeof destroy == "function")
|
49
29
|
return destroy;
|
50
30
|
if (process.env.NODE_ENV !== "production") {
|
51
|
-
var
|
52
|
-
destroy === null ?
|
31
|
+
var message = "An effect function must not return anything besides a function, which is used for clean-up.";
|
32
|
+
destroy === null ? message += " You returned 'null'. If your effect does not require clean-up, return 'undefined' (or nothing)." : typeof destroy.then == "function" ? message += `
|
53
33
|
|
54
34
|
It looks like you wrote 'useFocusEffect(async () => ...)' or returned a Promise. Instead, write the async function inside your effect and call it immediately:
|
55
35
|
|
@@ -65,22 +45,22 @@ useFocusEffect(
|
|
65
45
|
}, [someId])
|
66
46
|
);
|
67
47
|
|
68
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect` :
|
48
|
+
See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message += ` You returned '${JSON.stringify(destroy)}'.`, console.error(message);
|
69
49
|
}
|
70
50
|
};
|
71
51
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
72
52
|
var unsubscribeFocus = navigation.addListener("focus", function() {
|
73
|
-
isFocused || (cleanup
|
53
|
+
isFocused || (cleanup == null || cleanup(), cleanup = callback(), isFocused = !0);
|
74
54
|
}), unsubscribeBlur = navigation.addListener("blur", function() {
|
75
|
-
cleanup
|
55
|
+
cleanup == null || cleanup(), cleanup = void 0, isFocused = !1;
|
76
56
|
});
|
77
57
|
return function() {
|
78
|
-
cleanup
|
58
|
+
cleanup == null || cleanup(), unsubscribeFocus(), unsubscribeBlur();
|
79
59
|
};
|
80
60
|
}
|
81
61
|
}, [
|
82
|
-
|
83
|
-
|
62
|
+
navigation,
|
63
|
+
...args
|
84
64
|
]);
|
85
65
|
}
|
86
66
|
// Annotate the CommonJS export names for ESM import in node:
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/Users/n8/one/packages/one/src/useFocusEffect.ts"],
|
4
|
-
"mappings": "
|
5
|
-
"names": ["useFocusEffect", "effect", "
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAGA,mBAA0B,kBAC1B,6BAAsC;AAU/B,SAASA,eAAeC,QAAwBC,MAAW;AAChE,MAAMC,iBAAaC,kDAAAA;AAEnBC,8BAAU,WAAA;AACR,QAAKF,YAIL;UAAIG,YAAY,IACZC,SAEEC,WAAW,WAAA;AACf,YAAMC,UAAUR,OAAAA;AAEhB,YAAIQ,YAAYC,UAAa,OAAOD,WAAY;AAC9C,iBAAOA;AAGT,YAAIE,QAAQC,IAAIC,aAAa,cAAc;AACzC,cAAIC,UACF;AAEF,UAAIL,YAAY,OACdK,WACE,qGACO,OAAQL,QAAgBM,QAAS,aAC1CD,WACE;;;;;;;;;;;;;;;;sEAeFA,WAAW,kBAAkBE,KAAKC,UAAUR,OAAAA,CAAAA,MAG9CS,QAAQC,MAAML,OAAAA;QAChB;MACF;AAGA,MAAIX,WAAWG,UAAS,MACtBC,UAAUC,SAAAA,GACVF,YAAY;AAGd,UAAMc,mBAAmBjB,WAAWkB,YAAY,SAAS,WAAA;AAGvD,QAAIf,cACJC,WAAAA,QAAAA,QAAAA,GACAA,UAAUC,SAAAA,GACVF,YAAY;MACd,CAAA,GAEMgB,kBAAkBnB,WAAWkB,YAAY,QAAQ,WAAA;AACrDd,mBAAAA,QAAAA,QAAAA,GACAA,UAAUG,QACVJ,YAAY;MACd,CAAA;AAEA,aAAO,WAAA;AACLC,mBAAAA,QAAAA,QAAAA,GACAa,iBAAAA,GACAE,gBAAAA;MACF;;EACF,GAAG;IAACnB;OAAeD;GAAK;AAC1B;",
|
5
|
+
"names": ["useFocusEffect", "effect", "args", "navigation", "useOptionalNavigation", "useEffect", "isFocused", "cleanup", "callback", "destroy", "undefined", "process", "env", "NODE_ENV", "message", "then", "JSON", "stringify", "console", "error", "unsubscribeFocus", "addListener", "unsubscribeBlur"]
|
6
6
|
}
|
@@ -45,6 +45,7 @@ var import_node_path = require("node:path"),
|
|
45
45
|
const {
|
46
46
|
copy,
|
47
47
|
ensureDir,
|
48
|
+
existsSync,
|
48
49
|
writeJSON
|
49
50
|
} = import_fs_extra.default;
|
50
51
|
async function moveAllFiles(src, dest) {
|
@@ -89,13 +90,18 @@ const buildVercelOutputDirectory = async ({
|
|
89
90
|
default:
|
90
91
|
break;
|
91
92
|
}
|
92
|
-
const
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
93
|
+
const distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
|
94
|
+
if (existsSync(distMiddlewareDir)) {
|
95
|
+
const vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware"));
|
96
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
97
|
+
const vercelMiddlewarePackageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, "index.js"));
|
98
|
+
postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
|
99
|
+
const middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
|
100
|
+
postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
|
101
|
+
...import_vc_config_base.serverlessVercelNodeJsConfig,
|
102
|
+
handler: "_middleware.js"
|
103
|
+
});
|
104
|
+
}
|
99
105
|
const vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/static"));
|
100
106
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
101
107
|
const vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output", "config.json"));
|
@@ -26,7 +26,7 @@ __export(buildVercelOutputDirectory_exports, {
|
|
26
26
|
});
|
27
27
|
module.exports = __toCommonJS(buildVercelOutputDirectory_exports);
|
28
28
|
var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_config_base = require("./config/vc-config-base"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base");
|
29
|
-
const { copy, ensureDir, writeJSON } = import_fs_extra.default;
|
29
|
+
const { copy, ensureDir, existsSync, writeJSON } = import_fs_extra.default;
|
30
30
|
async function moveAllFiles(src, dest) {
|
31
31
|
try {
|
32
32
|
await copy(src, dest, { overwrite: !0, errorOnExist: !1 });
|
@@ -77,19 +77,26 @@ const buildVercelOutputDirectory = async ({
|
|
77
77
|
default:
|
78
78
|
break;
|
79
79
|
}
|
80
|
-
const
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
80
|
+
const distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
|
81
|
+
if (existsSync(distMiddlewareDir)) {
|
82
|
+
const vercelMiddlewareDir = (0, import_node_path.resolve)(
|
83
|
+
(0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware")
|
84
|
+
);
|
85
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(
|
86
|
+
`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
|
87
|
+
), await moveAllFiles((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
88
|
+
const vercelMiddlewarePackageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, "index.js"));
|
89
|
+
postBuildLogs.push(
|
90
|
+
`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
|
91
|
+
), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
|
92
|
+
const middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
|
93
|
+
postBuildLogs.push(
|
94
|
+
`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
|
95
|
+
), await writeJSON(middlewareVercelConfigFilePath, {
|
96
|
+
...import_vc_config_base.serverlessVercelNodeJsConfig,
|
97
|
+
handler: "_middleware.js"
|
98
|
+
});
|
99
|
+
}
|
93
100
|
const vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/static"));
|
94
101
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(
|
95
102
|
`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAE9B,kBAAoB,iCAEpB,oBAA8B,uBAE9B,qCAA4C,mDAC5C,qCAA4C,mDAC5C,wBAA6C,oCAC7C,yBAA4C,qCAC5C,qCAAwC;AAIxC,MAAM,EAAE,MAAM,WAAW,UAAU,IAAI,gBAAAA;
|
4
|
+
"mappings": "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",
|
5
5
|
"names": ["FSExtra"]
|
6
6
|
}
|
@@ -26,7 +26,7 @@ __export(buildVercelOutputDirectory_exports, {
|
|
26
26
|
buildVercelOutputDirectory: () => buildVercelOutputDirectory
|
27
27
|
});
|
28
28
|
module.exports = __toCommonJS(buildVercelOutputDirectory_exports);
|
29
|
-
var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_config_base = require("./config/vc-config-base"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base"), { copy, ensureDir, writeJSON } = import_fs_extra.default;
|
29
|
+
var import_node_path = require("node:path"), import_fs_extra = __toESM(require("fs-extra"), 1), import_ts_pattern = require("ts-pattern"), import_createApiServerlessFunction = require("./generate/createApiServerlessFunction"), import_createSsrServerlessFunction = require("./generate/createSsrServerlessFunction"), import_vc_config_base = require("./config/vc-config-base"), import_vc_package_base = require("./config/vc-package-base"), import_vc_build_output_config_base = require("./config/vc-build-output-config-base"), { copy, ensureDir, existsSync, writeJSON } = import_fs_extra.default;
|
30
30
|
async function moveAllFiles(src, dest) {
|
31
31
|
try {
|
32
32
|
await copy(src, dest, {
|
@@ -92,13 +92,18 @@ var buildVercelOutputDirectory = async function(param) {
|
|
92
92
|
throw _iteratorError1;
|
93
93
|
}
|
94
94
|
}
|
95
|
-
var
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
95
|
+
var distMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares"));
|
96
|
+
if (existsSync(distMiddlewareDir)) {
|
97
|
+
var vercelMiddlewareDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware"));
|
98
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles((0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
99
|
+
var vercelMiddlewarePackageJsonFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, "index.js"));
|
100
|
+
postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, import_vc_package_base.serverlessVercelPackageJson);
|
101
|
+
var middlewareVercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(vercelMiddlewareDir, ".vc-config.json"));
|
102
|
+
postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
|
103
|
+
...import_vc_config_base.serverlessVercelNodeJsConfig,
|
104
|
+
handler: "_middleware.js"
|
105
|
+
});
|
106
|
+
}
|
102
107
|
var vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output/static"));
|
103
108
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
104
109
|
var vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, "dist", ".vercel/output", "config.json"));
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vercel/build/Users/n8/one/packages/one/src/vercel/build/buildVercelOutputDirectory.ts"],
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;uBAA8B,sBAE9B,kBAAoB,iCAEpB,oBAA8B,uBAE9B,qCAA4C,mDAC5C,qCAA4C,mDAC5C,wBAA6C,oCAC7C,yBAA4C,qCAC5C,qCAAwC,iDAIlC,EAAEA,MAAMC,WAAWC,UAAS,IAAKC,gBAAAA;
|
5
|
-
"names": ["copy", "ensureDir", "writeJSON", "FSExtra", "moveAllFiles", "src", "dest", "overwrite", "errorOnExist", "err", "console", "error", "buildVercelOutputDirectory", "apiOutput", "buildInfoForWriting", "clientDir", "oneOptionsRoot", "postBuildLogs", "routeToBuildInfo", "compiltedApiRoutes", "output", "filter", "o", "isMatching", "code", "P", "string", "facadeModuleId", "route", "compiledRoute", "find", "compiled", "flag", "includes", "file", "replace", "push", "page", "createApiServerlessFunction", "warn", "manifest", "apiRoutes", "vercelOutputFunctionsDir", "join", "pageRoutes", "type", "builtPageRoute", "createSsrServerlessFunction", "
|
4
|
+
"mappings": "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",
|
5
|
+
"names": ["copy", "ensureDir", "existsSync", "writeJSON", "FSExtra", "moveAllFiles", "src", "dest", "overwrite", "errorOnExist", "err", "console", "error", "buildVercelOutputDirectory", "apiOutput", "buildInfoForWriting", "clientDir", "oneOptionsRoot", "postBuildLogs", "routeToBuildInfo", "compiltedApiRoutes", "output", "filter", "o", "isMatching", "code", "P", "string", "facadeModuleId", "route", "compiledRoute", "find", "compiled", "flag", "includes", "file", "replace", "push", "page", "createApiServerlessFunction", "warn", "manifest", "apiRoutes", "vercelOutputFunctionsDir", "join", "pageRoutes", "type", "builtPageRoute", "createSsrServerlessFunction", "distMiddlewareDir", "resolve", "vercelMiddlewareDir", "vercelMiddlewarePackageJsonFilePath", "serverlessVercelPackageJson", "middlewareVercelConfigFilePath", "serverlessVercelNodeJsConfig", "handler", "vercelOutputStaticDir", "vercelConfigFilePath", "vercelBuildOutputConfig"]
|
6
6
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../src/link/Redirect.tsx"],
|
4
|
-
"mappings": "AAAA,SAAS,iBAAiB;AAE1B,SAAS,sBAAsB;
|
4
|
+
"mappings": "AAAA,SAAS,iBAAiB;AAE1B,SAAS,sBAAsB;AAIxB,SAAS,SAAS,EAAE,KAAK,GAA6B;AAC3D,QAAM,SAAS,UAAU;AAEzB,wBAAe,MAAM;AACnB,QAAI;AACF,aAAO,QAAQ,IAAI;AAAA,IACrB,SAAS,OAAO;AACd,cAAQ,MAAM,KAAK;AAAA,IACrB;AAAA,EACF,GAAG,CAAC,IAAI,CAAC,GAEF;AACT;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["useRouter","useFocusEffect","Redirect","href","router","replace","error","console"],"sources":["../../../src/link/Redirect.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,SAASC,cAAA,QAAsB;
|
1
|
+
{"version":3,"names":["useRouter","useFocusEffect","Redirect","href","router","replace","error","console"],"sources":["../../../src/link/Redirect.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,SAASC,cAAA,QAAsB;AAIxB,SAASC,SAAS;EAAEC;AAAK,GAA6B;EAC3D,MAAMC,MAAA,GAASJ,SAAA,CAAU;EAEzB,OAAAC,cAAA,CAAe,MAAM;IACnB,IAAI;MACFG,MAAA,CAAOC,OAAA,CAAQF,IAAI;IACrB,SAASG,KAAA,EAAO;MACdC,OAAA,CAAQD,KAAA,CAAMA,KAAK;IACrB;EACF,GAAG,CAACH,IAAI,CAAC,GAEF;AACT","ignoreList":[]}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["useRouter","useFocusEffect","Redirect","param","href","router","replace","error","console"],"sources":["../../../src/link/Redirect.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,SAASC,cAAA,QAAsB;
|
1
|
+
{"version":3,"names":["useRouter","useFocusEffect","Redirect","param","href","router","replace","error","console"],"sources":["../../../src/link/Redirect.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAE1B,SAASC,cAAA,QAAsB;AAIxB,SAASC,SAASC,KAAE,EAAK;EAC9B;MAAMC;IAAA,IAASD,KAAA;IAAAE,MAAU,GAAAL,SAAA;EAEzB,OAAAC,cAAA,CAAe,YAAM;IACnB,IAAI;MACFI,MAAA,CAAOC,OAAA,CAAQF,IAAI;IACrB,SAASG,KAAA,EAAO;MACdC,OAAA,CAAQD,KAAA,CAAMA,KAAK;IACrB;EACF,GAAG,CAGLH,IAAA,C","ignoreList":[]}
|
@@ -1,16 +1,8 @@
|
|
1
|
-
import
|
1
|
+
import { useEffect } from "react";
|
2
2
|
import { useOptionalNavigation } from "./link/useLoadedNavigation";
|
3
|
-
function useFocusEffect(effect,
|
3
|
+
function useFocusEffect(effect, args) {
|
4
4
|
const navigation = useOptionalNavigation();
|
5
|
-
|
6
|
-
|
7
|
-
useFocusEffect(
|
8
|
-
React.useCallback(() => {
|
9
|
-
// Your code here
|
10
|
-
}, [depA, depB])
|
11
|
-
);
|
12
|
-
|
13
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`), React.useEffect(() => {
|
5
|
+
useEffect(() => {
|
14
6
|
if (!navigation)
|
15
7
|
return;
|
16
8
|
let isFocused = !1, cleanup;
|
@@ -41,14 +33,14 @@ See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message +=
|
|
41
33
|
};
|
42
34
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
43
35
|
const unsubscribeFocus = navigation.addListener("focus", () => {
|
44
|
-
isFocused || (cleanup
|
36
|
+
isFocused || (cleanup?.(), cleanup = callback(), isFocused = !0);
|
45
37
|
}), unsubscribeBlur = navigation.addListener("blur", () => {
|
46
|
-
cleanup
|
38
|
+
cleanup?.(), cleanup = void 0, isFocused = !1;
|
47
39
|
});
|
48
40
|
return () => {
|
49
|
-
cleanup
|
41
|
+
cleanup?.(), unsubscribeFocus(), unsubscribeBlur();
|
50
42
|
};
|
51
|
-
}, [
|
43
|
+
}, [navigation, ...args]);
|
52
44
|
}
|
53
45
|
export {
|
54
46
|
useFocusEffect
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../src/useFocusEffect.ts"],
|
4
|
-
"mappings": "
|
4
|
+
"mappings": "AAGA,SAAS,iBAAiB;AAC1B,SAAS,6BAA6B;AAU/B,SAAS,eAAe,QAAwB,MAAa;AAClE,QAAM,aAAa,sBAAsB;AAEzC,YAAU,MAAM;AACd,QAAI,CAAC;AACH;AAGF,QAAI,YAAY,IACZ;AAEJ,UAAM,WAAW,MAAM;AACrB,YAAM,UAAU,OAAO;AAEvB,UAAI,YAAY,UAAa,OAAO,WAAY;AAC9C,eAAO;AAGT,UAAI,QAAQ,IAAI,aAAa,cAAc;AACzC,YAAI,UACF;AAEF,QAAI,YAAY,OACd,WACE,qGACO,OAAQ,QAAgB,QAAS,aAC1C,WACE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sEAeF,WAAW,kBAAkB,KAAK,UAAU,OAAO,CAAC,MAGtD,QAAQ,MAAM,OAAO;AAAA,MACvB;AAAA,IACF;AAGA,IAAI,WAAW,UAAU,MACvB,UAAU,SAAS,GACnB,YAAY;AAGd,UAAM,mBAAmB,WAAW,YAAY,SAAS,MAAM;AAG7D,MAAI,cACJ,UAAU,GACV,UAAU,SAAS,GACnB,YAAY;AAAA,IACd,CAAC,GAEK,kBAAkB,WAAW,YAAY,QAAQ,MAAM;AAC3D,gBAAU,GACV,UAAU,QACV,YAAY;AAAA,IACd,CAAC;AAED,WAAO,MAAM;AACX,gBAAU,GACV,iBAAiB,GACjB,gBAAgB;AAAA,IAClB;AAAA,EACF,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;AAC1B;",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -1,16 +1,8 @@
|
|
1
|
-
import
|
1
|
+
import { useEffect } from "react";
|
2
2
|
import { useOptionalNavigation } from "./link/useLoadedNavigation.mjs";
|
3
|
-
function useFocusEffect(effect,
|
3
|
+
function useFocusEffect(effect, args) {
|
4
4
|
const navigation = useOptionalNavigation();
|
5
|
-
|
6
|
-
|
7
|
-
useFocusEffect(
|
8
|
-
React.useCallback(() => {
|
9
|
-
// Your code here
|
10
|
-
}, [depA, depB])
|
11
|
-
);
|
12
|
-
|
13
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`), React.useEffect(() => {
|
5
|
+
useEffect(() => {
|
14
6
|
if (!navigation) return;
|
15
7
|
let isFocused = !1,
|
16
8
|
cleanup;
|
@@ -40,15 +32,15 @@ See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message +=
|
|
40
32
|
};
|
41
33
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
42
34
|
const unsubscribeFocus = navigation.addListener("focus", () => {
|
43
|
-
isFocused || (cleanup
|
35
|
+
isFocused || (cleanup?.(), cleanup = callback(), isFocused = !0);
|
44
36
|
}),
|
45
37
|
unsubscribeBlur = navigation.addListener("blur", () => {
|
46
|
-
cleanup
|
38
|
+
cleanup?.(), cleanup = void 0, isFocused = !1;
|
47
39
|
});
|
48
40
|
return () => {
|
49
|
-
cleanup
|
41
|
+
cleanup?.(), unsubscribeFocus(), unsubscribeBlur();
|
50
42
|
};
|
51
|
-
}, [
|
43
|
+
}, [navigation, ...args]);
|
52
44
|
}
|
53
45
|
export { useFocusEffect };
|
54
46
|
//# sourceMappingURL=useFocusEffect.mjs.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["
|
1
|
+
{"version":3,"names":["useEffect","useOptionalNavigation","useFocusEffect","effect","args","navigation","isFocused","cleanup","callback","destroy","process","env","NODE_ENV","message","then","JSON","stringify","console","error","unsubscribeFocus","addListener","unsubscribeBlur"],"sources":["../../src/useFocusEffect.ts"],"sourcesContent":[null],"mappings":"AAGA,SAASA,SAAA,QAAiB;AAC1B,SAASC,qBAAA,QAA6B;AAU/B,SAASC,eAAeC,MAAA,EAAwBC,IAAA,EAAa;EAClE,MAAMC,UAAA,GAAaJ,qBAAA,CAAsB;EAEzCD,SAAA,CAAU,MAAM;IACd,IAAI,CAACK,UAAA,EACH;IAGF,IAAIC,SAAA,GAAY;MACZC,OAAA;IAEJ,MAAMC,QAAA,GAAWA,CAAA,KAAM;MACrB,MAAMC,OAAA,GAAUN,MAAA,CAAO;MAEvB,IAAIM,OAAA,KAAY,UAAa,OAAOA,OAAA,IAAY,YAC9C,OAAOA,OAAA;MAGT,IAAIC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,cAAc;QACzC,IAAIC,OAAA,GACF;QAEEJ,OAAA,KAAY,OACdI,OAAA,IACE,qGACO,OAAQJ,OAAA,CAAgBK,IAAA,IAAS,aAC1CD,OAAA,IACE;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sEAeFA,OAAA,IAAW,kBAAkBE,IAAA,CAAKC,SAAA,CAAUP,OAAO,CAAC,MAGtDQ,OAAA,CAAQC,KAAA,CAAML,OAAO;MACvB;IACF;IAGIR,UAAA,CAAWC,SAAA,CAAU,MACvBC,OAAA,GAAUC,QAAA,CAAS,GACnBF,SAAA,GAAY;IAGd,MAAMa,gBAAA,GAAmBd,UAAA,CAAWe,WAAA,CAAY,SAAS,MAAM;QAGzDd,SAAA,KACJC,OAAA,GAAU,GACVA,OAAA,GAAUC,QAAA,CAAS,GACnBF,SAAA,GAAY;MACd,CAAC;MAEKe,eAAA,GAAkBhB,UAAA,CAAWe,WAAA,CAAY,QAAQ,MAAM;QAC3Db,OAAA,GAAU,GACVA,OAAA,GAAU,QACVD,SAAA,GAAY;MACd,CAAC;IAED,OAAO,MAAM;MACXC,OAAA,GAAU,GACVY,gBAAA,CAAiB,GACjBE,eAAA,CAAgB;IAClB;EACF,GAAG,CAAChB,UAAA,EAAY,GAAGD,IAAI,CAAC;AAC1B","ignoreList":[]}
|
@@ -1,20 +1,8 @@
|
|
1
|
-
import
|
1
|
+
import { useEffect } from "react";
|
2
2
|
import { useOptionalNavigation } from "./link/useLoadedNavigation.native.js";
|
3
|
-
function useFocusEffect(effect,
|
3
|
+
function useFocusEffect(effect, args) {
|
4
4
|
var navigation = useOptionalNavigation();
|
5
|
-
|
6
|
-
var message = `You passed a second argument to 'useFocusEffect', but it only accepts one argument. If you want to pass a dependency array, you can use 'React.useCallback':
|
7
|
-
|
8
|
-
useFocusEffect(
|
9
|
-
React.useCallback(() => {
|
10
|
-
// Your code here
|
11
|
-
}, [depA, depB])
|
12
|
-
);
|
13
|
-
|
14
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect`;
|
15
|
-
console.error(message);
|
16
|
-
}
|
17
|
-
React.useEffect(function () {
|
5
|
+
useEffect(function () {
|
18
6
|
if (navigation) {
|
19
7
|
var isFocused = !1,
|
20
8
|
cleanup,
|
@@ -22,8 +10,8 @@ See usage guide: https://reactnavigation.org/docs/use-focus-effect`;
|
|
22
10
|
var destroy = effect();
|
23
11
|
if (destroy === void 0 || typeof destroy == "function") return destroy;
|
24
12
|
if (process.env.NODE_ENV !== "production") {
|
25
|
-
var
|
26
|
-
destroy === null ?
|
13
|
+
var message = "An effect function must not return anything besides a function, which is used for clean-up.";
|
14
|
+
destroy === null ? message += " You returned 'null'. If your effect does not require clean-up, return 'undefined' (or nothing)." : typeof destroy.then == "function" ? message += `
|
27
15
|
|
28
16
|
It looks like you wrote 'useFocusEffect(async () => ...)' or returned a Promise. Instead, write the async function inside your effect and call it immediately:
|
29
17
|
|
@@ -39,21 +27,21 @@ useFocusEffect(
|
|
39
27
|
}, [someId])
|
40
28
|
);
|
41
29
|
|
42
|
-
See usage guide: https://reactnavigation.org/docs/use-focus-effect` :
|
30
|
+
See usage guide: https://reactnavigation.org/docs/use-focus-effect` : message += ` You returned '${JSON.stringify(destroy)}'.`, console.error(message);
|
43
31
|
}
|
44
32
|
};
|
45
33
|
navigation.isFocused() && (cleanup = callback(), isFocused = !0);
|
46
34
|
var unsubscribeFocus = navigation.addListener("focus", function () {
|
47
|
-
isFocused || (cleanup
|
35
|
+
isFocused || (cleanup?.(), cleanup = callback(), isFocused = !0);
|
48
36
|
}),
|
49
37
|
unsubscribeBlur = navigation.addListener("blur", function () {
|
50
|
-
cleanup
|
38
|
+
cleanup?.(), cleanup = void 0, isFocused = !1;
|
51
39
|
});
|
52
40
|
return function () {
|
53
|
-
cleanup
|
41
|
+
cleanup?.(), unsubscribeFocus(), unsubscribeBlur();
|
54
42
|
};
|
55
43
|
}
|
56
|
-
}, [
|
44
|
+
}, [navigation, ...args]);
|
57
45
|
}
|
58
46
|
export { useFocusEffect };
|
59
47
|
//# sourceMappingURL=useFocusEffect.native.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["
|
1
|
+
{"version":3,"names":["useEffect","useOptionalNavigation","useFocusEffect","effect","args","navigation","isFocused","cleanup","callback","destroy","process","env","NODE_ENV","message","then","JSON","stringify","console","error","unsubscribeFocus","addListener","unsubscribeBlur"],"sources":["../../src/useFocusEffect.ts"],"sourcesContent":[null],"mappings":"AAGA,SAASA,SAAA,QAAiB;AAC1B,SAASC,qBAAA,QAA6B;AAU/B,SAASC,eAAeC,MAAA,EAAwBC,IAAA,EAAa;EAClE,IAAAC,UAAM,GAAAJ,qBAAa;EAEnBD,SAAA,CAAU,YAAM;IACd,IAAIK,UAAC;MACH,IAAAC,SAAA;QAAAC,OAAA;QAAAC,QAAA,YAAAA,CAAA;UAGE,IAAAC,OAAA,GAAYN,MACZ;UAEJ,IAAMM,OAAA,KAAW,KAAM,YAAAA,OAAA,gBACrB,OAAMA,OAAU;UAEhB,IAAIC,OAAA,CAAAC,GAAY,CAAAC,QAAa,iBAAO,EAAY;YAC9C,IAAAC,OAAO;YAGLJ,OAAA,KAAY,OAAAI,OAAa,sGAAc,UAAAJ,OAAA,CAAAK,IAAA,iBAAAD,OAAA;AACzC;AAGA;AAKI;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sEAAAA,OAAA,sBAAAE,IAAA,CAAAC,SAAA,CAAAP,OAAA,OAAAQ,OAAA,CAAAC,KAAA,CAAAL,OAAA;UAAA;QAAA;MAmBNR,UAAA,CAAAC,SAAA,OAAAC,OAAA,GAAAC,QAAA,IAAAF,SAAA;MACF,IAAAa,gBAAA,GAAAd,UAAA,CAAAe,WAAA;UAGId,SAAW,KAAAC,OAAU,GACvB,GAAAA,OAAU,GAAAC,QACV,IAAAF,SAAY;QAGd;QAAMe,eAAA,GAAAhB,UAAmB,CAAAe,WAAW,OAAY,cAAe;UAGzDb,OAAA,MACJA,OAAA,GAAU,KACV,GAAAD,SAAU,IAAS;QAEpB,EAEK;MACJ,mBACA;QAEDC,OAAA,MAAAY,gBAAA,IAAAE,eAAA;MAED;IACE;EAEgB,GAClB,CACFhB,UAAI,EACN,GAAAD,IAAA,C","ignoreList":[]}
|
@@ -6,7 +6,7 @@ import { createSsrServerlessFunction } from "./generate/createSsrServerlessFunct
|
|
6
6
|
import { serverlessVercelNodeJsConfig } from "./config/vc-config-base";
|
7
7
|
import { serverlessVercelPackageJson } from "./config/vc-package-base";
|
8
8
|
import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base";
|
9
|
-
const { copy, ensureDir, writeJSON } = FSExtra;
|
9
|
+
const { copy, ensureDir, existsSync, writeJSON } = FSExtra;
|
10
10
|
async function moveAllFiles(src, dest) {
|
11
11
|
try {
|
12
12
|
await copy(src, dest, { overwrite: !0, errorOnExist: !1 });
|
@@ -57,19 +57,26 @@ const buildVercelOutputDirectory = async ({
|
|
57
57
|
default:
|
58
58
|
break;
|
59
59
|
}
|
60
|
-
const
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
60
|
+
const distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
|
61
|
+
if (existsSync(distMiddlewareDir)) {
|
62
|
+
const vercelMiddlewareDir = resolve(
|
63
|
+
join(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware")
|
64
|
+
);
|
65
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(
|
66
|
+
`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
|
67
|
+
), await moveAllFiles(resolve(join(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
68
|
+
const vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, "index.js"));
|
69
|
+
postBuildLogs.push(
|
70
|
+
`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
|
71
|
+
), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
|
72
|
+
const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
|
73
|
+
postBuildLogs.push(
|
74
|
+
`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
|
75
|
+
), await writeJSON(middlewareVercelConfigFilePath, {
|
76
|
+
...serverlessVercelNodeJsConfig,
|
77
|
+
handler: "_middleware.js"
|
78
|
+
});
|
79
|
+
}
|
73
80
|
const vercelOutputStaticDir = resolve(join(oneOptionsRoot, "dist", ".vercel/output/static"));
|
74
81
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(
|
75
82
|
`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"version": 3,
|
3
3
|
"sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
|
4
|
-
"mappings": "AAAA,SAAS,MAAM,eAAe;AAE9B,OAAO,aAAa;AAEpB,SAAS,YAAY,SAAS;AAE9B,SAAS,mCAAmC;AAC5C,SAAS,mCAAmC;AAC5C,SAAS,oCAAoC;AAC7C,SAAS,mCAAmC;AAC5C,SAAS,+BAA+B;AAIxC,MAAM,EAAE,MAAM,WAAW,UAAU,IAAI;
|
4
|
+
"mappings": "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",
|
5
5
|
"names": []
|
6
6
|
}
|
@@ -9,6 +9,7 @@ import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base.mj
|
|
9
9
|
const {
|
10
10
|
copy,
|
11
11
|
ensureDir,
|
12
|
+
existsSync,
|
12
13
|
writeJSON
|
13
14
|
} = FSExtra;
|
14
15
|
async function moveAllFiles(src, dest) {
|
@@ -53,13 +54,18 @@ const buildVercelOutputDirectory = async ({
|
|
53
54
|
default:
|
54
55
|
break;
|
55
56
|
}
|
56
|
-
const
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
57
|
+
const distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
|
58
|
+
if (existsSync(distMiddlewareDir)) {
|
59
|
+
const vercelMiddlewareDir = resolve(join(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware"));
|
60
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles(resolve(join(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
61
|
+
const vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, "index.js"));
|
62
|
+
postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
|
63
|
+
const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
|
64
|
+
postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
|
65
|
+
...serverlessVercelNodeJsConfig,
|
66
|
+
handler: "_middleware.js"
|
67
|
+
});
|
68
|
+
}
|
63
69
|
const vercelOutputStaticDir = resolve(join(oneOptionsRoot, "dist", ".vercel/output/static"));
|
64
70
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
65
71
|
const vercelConfigFilePath = resolve(join(oneOptionsRoot, "dist", ".vercel/output", "config.json"));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","route","manifest","apiRoutes","compiledRoute","find","compiled","includes","file","replace","push","page","warn","vercelOutputFunctionsDir","pageRoutes","type","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","handler","vercelOutputStaticDir","vercelConfigFilePath"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,OAAA,MAAa;AAEpB,SAASC,UAAA,EAAYC,CAAA,QAAS;AAE9B,SAASC,2BAAA,QAAmC;AAC5C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,uBAAA,QAA+B;AAIxC,MAAM;EAAEC,IAAA;EAAMC,SAAA;EAAWC;AAAU,
|
1
|
+
{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","route","manifest","apiRoutes","compiledRoute","find","compiled","includes","file","replace","push","page","warn","vercelOutputFunctionsDir","pageRoutes","type","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","middlewareVercelConfigFilePath","handler","vercelOutputStaticDir","vercelConfigFilePath"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,OAAA,MAAa;AAEpB,SAASC,UAAA,EAAYC,CAAA,QAAS;AAE9B,SAASC,2BAAA,QAAmC;AAC5C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,uBAAA,QAA+B;AAIxC,MAAM;EAAEC,IAAA;EAAMC,SAAA;EAAWC,UAAA;EAAYC;AAAU,IAAIX,OAAA;AAEnD,eAAeY,aAAaC,GAAA,EAAaC,IAAA,EAAc;EACrD,IAAI;IACF,MAAMN,IAAA,CAAKK,GAAA,EAAKC,IAAA,EAAM;MAAEC,SAAA,EAAW;MAAMC,YAAA,EAAc;IAAM,CAAC;EAChE,SAASC,GAAA,EAAK;IACZC,OAAA,CAAQC,KAAA,CAAM,uBAAuBF,GAAG;EAC1C;AACF;AAEO,MAAMG,0BAAA,GAA6B,MAAAA,CAAO;EAC/CC,SAAA;EACAC,mBAAA;EACAC,SAAA;EACAC,cAAA;EACAC;AACF,MAMM;EACJ,MAAM;IAAEC;EAAiB,IAAIJ,mBAAA;EAC7B,IAAID,SAAA,EAAW;IACb,MAAMM,kBAAA,IAAsBN,SAAA,EAAWO,MAAA,IAAU,EAAC,EAAGC,MAAA,CAAQC,CAAA,IAC3D7B,UAAA,CAAW;MAAE8B,IAAA,EAAM7B,CAAA,CAAE8B,MAAA;MAAQC,cAAA,EAAgB/B,CAAA,CAAE8B;IAAO,GAAGF,CAAC,CAC5D;IACA,WAAWI,KAAA,IAASZ,mBAAA,CAAoBa,QAAA,CAASC,SAAA,EAAW;MAC1D,MAAMC,aAAA,GAAgBV,kBAAA,CAAmBW,IAAA,CAAMC,QAAA,IAChCA,QAAA,CAASN,cAAA,CAAeO,QAAA,CAASN,KAAA,CAAMO,IAAA,CAAKC,OAAA,CAAQ,MAAM,EAAE,CAAC,CAE3E;MACGL,aAAA,IACFZ,aAAA,CAAckB,IAAA,CACZ,mEAAmET,KAAA,CAAMU,IAAI,EAC/E,GACA,MAAMzC,2BAAA,CACJ+B,KAAA,CAAMU,IAAA,EACNP,aAAA,CAAcN,IAAA,EACdP,cAAA,EACAC,aACF,KAEAP,OAAA,CAAQ2B,IAAA,CAAK;AAAA,sEAAkEX,KAAA,CAAMO,IAAI;IAE7F;EACF;EAEA,MAAMK,wBAAA,GAA2BhD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,0BAA0B;EACxF,MAAMf,SAAA,CAAUqC,wBAAwB;EAExC,WAAWZ,KAAA,IAASZ,mBAAA,CAAoBa,QAAA,CAASY,UAAA,EAC/C,QAAQb,KAAA,CAAMc,IAAA;IACZ,KAAK;MAAO;QAEatB,gBAAA,CAAiBQ,KAAA,CAAMO,IAAI,MAEhDhB,aAAA,CAAckB,IAAA,CACZ,wDAAwDT,KAAA,CAAMU,IAAI,SAASV,KAAA,CAAMc,IAAI,EACvF,GACA,MAAM5C,2BAAA,CACJ8B,KAAA,CAAMU,IAAA,EACNtB,mBAAA,EACAE,cAAA,EACAC,aACF;QAEF;MACF;IACA;MAGE;EACJ;EAGF,MAAMwB,iBAAA,GAAoBlD,OAAA,CAAQD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,aAAa,CAAC;EAC7E,IAAId,UAAA,CAAWuC,iBAAiB,GAAG;IACjC,MAAMC,mBAAA,GAAsBnD,OAAA,CAC1BD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,sCAAsC,CACrE;IACA,MAAMf,SAAA,CAAUyC,mBAAmB,GACnCzB,aAAA,CAAckB,IAAA,CACZ,gDAAgDM,iBAAiB,OAAOC,mBAAmB,EAC7F,GACA,MAAMtC,YAAA,CAAab,OAAA,CAAQD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,aAAa,CAAC,GAAG0B,mBAAmB;IAC5F,MAAMC,mCAAA,GAAsCpD,OAAA,CAAQD,IAAA,CAAKoD,mBAAA,EAAqB,UAAU,CAAC;IACzFzB,aAAA,CAAckB,IAAA,CACZ,+CAA+CQ,mCAAmC,EACpF,GACA,MAAMxC,SAAA,CAAUwC,mCAAA,EAAqC7C,2BAA2B;IAChF,MAAM8C,8BAAA,GAAiCrD,OAAA,CAAQD,IAAA,CAAKoD,mBAAA,EAAqB,iBAAiB,CAAC;IAC3FzB,aAAA,CAAckB,IAAA,CACZ,kDAAkDS,8BAA8B,EAClF,GACA,MAAMzC,SAAA,CAAUyC,8BAAA,EAAgC;MAC9C,GAAG/C,4BAAA;MACHgD,OAAA,EAAS;IACX,CAAC;EACH;EAEA,MAAMC,qBAAA,GAAwBvD,OAAA,CAAQD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,uBAAuB,CAAC;EAC3F,MAAMf,SAAA,CAAU6C,qBAAqB,GAErC7B,aAAA,CAAckB,IAAA,CACZ,iDAAiDpB,SAAS,OAAO+B,qBAAqB,EACxF,GACA,MAAM1C,YAAA,CAAaW,SAAA,EAAW+B,qBAAqB;EAInD,MAAMC,oBAAA,GAAuBxD,OAAA,CAC3BD,IAAA,CAAK0B,cAAA,EAAgB,QAAQ,kBAAkB,aAAa,CAC9D;EACA,MAAMb,SAAA,CAAU4C,oBAAA,EAAsBhD,uBAAuB,GAC7DkB,aAAA,CAAckB,IAAA,CAAK,uCAAuCY,oBAAoB,EAAE;AAClF","ignoreList":[]}
|
@@ -9,6 +9,7 @@ import { vercelBuildOutputConfig } from "./config/vc-build-output-config-base.na
|
|
9
9
|
var {
|
10
10
|
copy,
|
11
11
|
ensureDir,
|
12
|
+
existsSync,
|
12
13
|
writeJSON
|
13
14
|
} = FSExtra;
|
14
15
|
async function moveAllFiles(src, dest) {
|
@@ -91,13 +92,18 @@ var buildVercelOutputDirectory = async function (param) {
|
|
91
92
|
if (_didIteratorError1) throw _iteratorError1;
|
92
93
|
}
|
93
94
|
}
|
94
|
-
var
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
95
|
+
var distMiddlewareDir = resolve(join(oneOptionsRoot, "dist", "middlewares"));
|
96
|
+
if (existsSync(distMiddlewareDir)) {
|
97
|
+
var vercelMiddlewareDir = resolve(join(oneOptionsRoot, "dist", ".vercel/output/functions/_middleware"));
|
98
|
+
await ensureDir(vercelMiddlewareDir), postBuildLogs.push(`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`), await moveAllFiles(resolve(join(oneOptionsRoot, "dist", "middlewares")), vercelMiddlewareDir);
|
99
|
+
var vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, "index.js"));
|
100
|
+
postBuildLogs.push(`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`), await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson);
|
101
|
+
var middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, ".vc-config.json"));
|
102
|
+
postBuildLogs.push(`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`), await writeJSON(middlewareVercelConfigFilePath, {
|
103
|
+
...serverlessVercelNodeJsConfig,
|
104
|
+
handler: "_middleware.js"
|
105
|
+
});
|
106
|
+
}
|
101
107
|
var vercelOutputStaticDir = resolve(join(oneOptionsRoot, "dist", ".vercel/output/static"));
|
102
108
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
103
109
|
var vercelConfigFilePath = resolve(join(oneOptionsRoot, "dist", ".vercel/output", "config.json"));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","param","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","value","compiledRoute","find","compiled","flag","includes","file","replace","push","page","warn","_iterator","manifest","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","handler"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,OAAA,MAAa;AAEpB,SAASC,UAAA,EAAYC,CAAA,QAAS;AAE9B,SAASC,2BAAA,QAAmC;AAC5C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,uBAAA,QAA+B;AAIxC;EAAMC,IAAE;EAAAC,SAAM;EAAAC;
|
1
|
+
{"version":3,"names":["join","resolve","FSExtra","isMatching","P","createApiServerlessFunction","createSsrServerlessFunction","serverlessVercelNodeJsConfig","serverlessVercelPackageJson","vercelBuildOutputConfig","copy","ensureDir","existsSync","writeJSON","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","buildVercelOutputDirectory","param","apiOutput","buildInfoForWriting","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","filter","o","code","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","value","compiledRoute","find","compiled","flag","includes","file","replace","push","page","warn","_iterator","manifest","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","distMiddlewareDir","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","middlewareVercelConfigFilePath","handler","vercelOutputStaticDir"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,IAAA,EAAMC,OAAA,QAAe;AAE9B,OAAOC,OAAA,MAAa;AAEpB,SAASC,UAAA,EAAYC,CAAA,QAAS;AAE9B,SAASC,2BAAA,QAAmC;AAC5C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,4BAAA,QAAoC;AAC7C,SAASC,2BAAA,QAAmC;AAC5C,SAASC,uBAAA,QAA+B;AAIxC;EAAMC,IAAE;EAAAC,SAAM;EAAAC,UAAW;EAAAC;AAAY,IAAUX,OAAI;AAEnD,eAAeY,aAAaC,GAAA,EAAaC,IAAA,EAAc;EACrD,IAAI;IACF,MAAMN,IAAA,CAAKK,GAAA,EAAKC,IAAA,EAAM;MACxBC,SAAS,EAAK;MACZC,YAAc;IAChB;EACF,SAAAC,GAAA;IAEOC,OAAM,CAAAC,KAAA,sBAA6B,EAAAF,GAAO;EAC/C;AAAA;AACA,IACAG,0BAAA,kBAAAA,CAAAC,KAAA;EACA;MAAAC,SAAA;MAAAC,mBAAA;MAAAC,SAAA;MAAAC,cAAA;MAAAC;IAAA,IAAAL,KAAA;IAAA;MAAAM;IAAA,IAAAJ,mBAAA;EACA,IAAAD,SAAA;IACF,IAMMM,iBAAA;MAAAC,kBAAA,KAAAD,iBAAA,GAAAN,SAAA,EAAAQ,MAAA,cAAAF,iBAAA,cAAAA,iBAAA,OAAAG,MAAA,WAAAC,CAAA;QACJ,OAAQ/B,UAAA;UACJgC,IAAA,EAAA/B,CAAA,CAAAgC,MAAW;UACbC,cAAM,EAAAjC,CAAA,CAAAgC;QAAsD,CAAC,EAAAF,CAAA;MAE7D;MAAAI,yBAAA;MAAAC,iBAAA;MAAAC,cAAA;IACA;MACE,SAAMC,KAAA,kBAAAA,CAAA,EAAgB;UAIlB,IAAAC,MAAA,GAAAC,KACF,CAAAC,KAAA;YAAAC,aAAc,GAAAd,kBAAA,CAAAe,IAAA,WAAAC,QAAA;cACZ,IAAAC,IAAA,GAAAD,QAAA,CAAAV,cAAA,CAAAY,QAAA,CAAAP,MAAA,CAAAQ,IAAA,CAAAC,OAAA,KAAmE,IAAM;cAE3E,OAAMH,IAAA;YACJ;UACAH,aAAA,IAAcjB,aAAA,CAAAwB,IAAA,oEAAAV,MAAA,CAAAW,IAAA,WAAAhD,2BAAA,CAAAqC,MAAA,CAAAW,IAAA,EAAAR,aAAA,CAAAV,IAAA,EAAAR,cAAA,EAAAC,aAAA,KAAAR,OAAA,CAAAkC,IAAA;AAAA,oEACd,EAAAZ,MAAA,CAAAQ,IAAA;QAAA,GACAK,SAAA,GAAA9B,mBAAA,CAAA+B,QAAA,CAAAC,SAAA,CAAAC,MAAA,CAAAC,QAAA,KAAAhB,KAAA,IAAAL,yBAAA,IAAAK,KAAA,GAAAY,SAAA,CAAAK,IAAA,IAAAC,IAAA,GAAAvB,yBAAA,aAAAG,KAAA;IAAA,EACF,OAEAtB,GAAA;MAAaoB,iBAAA,OAAAC,cAAA,GAAArB,GAAA;IAEjB;MACF;QAEM,CAAAmB,yBAAA,IAA2BiB,SAAK,CAAAO,MAAA,IAAgB,QAAQP,SAAA,CAAAO,MAAA;MAC9D,UAAM;QAEN,IAAAvB,iBAAoB,EAClB,MAAQC,cAAY;MAClB;IAGE;EACgB;EACyE,IAAAuB,wBAEjF,GAAA/D,IAAA,CAAA2B,cAAA;EAAA,MAAAhB,SACE,CAAAoD,wBAAA;EAAA,IAAAC,0BACN;IAAAC,kBAAA;IAAAC,eAAA;EAAA;IACA,SACAC,UAAA,GAAA1C,mBAAA,CAAA+B,QAAA,CAAAY,UAAA,CAAAV,MAAA,CAAAC,QAAA,KAAAU,MAAA,IAAAL,0BAAA,IAAAK,MAAA,GAAAF,UAAA,CAAAP,IAAA,IAAAC,IAAA,GAAAG,0BAAA;MAAA,IACFM,KAAA,GAAAD,MAAA,CAAAzB,KAAA;MAEF,QAAA0B,KAAA,CAAAC,IAAA;QACF;UAAA;YACA,IAAAC,cAAA,GAAA3C,gBAAA,CAAAyC,KAAA,CAAApB,IAAA;YAGEsB,cAAA,KAAA5C,aAAA,CAAAwB,IAAA,yDAAAkB,KAAA,CAAAjB,IAAA,SAAAiB,KAAA,CAAAC,IAAA,WAAAjE,2BAAA,CAAAgE,KAAA,CAAAjB,IAAA,EAAA5B,mBAAA,EAAAE,cAAA,EAAAC,aAAA;YACJ;UAGI;QACF;UACI;MACJ;IACF;EACA,SAAMT,GAAA;IACQ8C,kBACZ,OAAAC,eAAA,GAAA/C,GAAA;EAA2F,UAE7F;IACA;MACA,CAAA6C,0BAAc,IAAAG,UAAA,CAAAL,MAAA,YAAAK,UAAA,CAAAL,MAAA;IAAA,UACZ;MACF,IACAG,kBAAgB,EAChB,MAAMC,eAAA;IACN;EAAc;EACoE,IAClFO,iBACgB,GAAAxE,OAAA,CAAAD,IAAA,CAAA2B,cAAA,EAAgC;EAAA,IAC9Cf,UAAG,CAAA6D,iBAAA;IAAA,IACHC,mBAAS,GAAAzE,OAAA,CAAAD,IAAA,CAAA2B,cAAA;IACX,MAAChB,SAAA,CAAA+D,mBAAA,GAAA9C,aAAA,CAAAwB,IAAA,iDAAAqB,iBAAA,OAAAC,mBAAA,WAAA5D,YAAA,CAAAb,OAAA,CAAAD,IAAA,CAAA2B,cAAA,2BAAA+C,mBAAA;IACH,IAAAC,mCAAA,GAAA1E,OAAA,CAAAD,IAAA,CAAA0E,mBAAA;IAEA9C,aAAM,CAAAwB,IAAA,gDAA6DuB,mCAAwB,WAAA9D,SAAA,CAAA8D,mCAAA,EAAAnE,2BAAA;IAC3F,IAAMoE,8BAAU,GAAqB3E,OAErC,CAAAD,IAAA,CAAA0E,mBAAc;IACZ9C,aAAA,CAAAwB,IAAA,mDAAiEwB,8BAAqB,WAAA/D,SAAA,CAAA+D,8BAAA;MAExF,GAAArE,4BAA8B;MAI9BsE,OAAM;IACJ;EACF;EACA,IAAAC,qBAAgB,GAAA7E,OAAA,CAAAD,IAAsB,CAAA2B,cAAA,QAAuB,EAC7D,uBAAmB;EACrB,MAAAhB,SAAA,CAAAmE,qBAAA,GAAAlD,aAAA,CAAAwB,IAAA,kDAAA1B,SAAA,OAAAoD,qBAAA,WAAAhE,YAAA,CAAAY,SAAA,EAAAoD,qBAAA","ignoreList":[]}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "one",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.457",
|
4
4
|
"license": "BSD-3-Clause",
|
5
5
|
"sideEffects": [
|
6
6
|
"setup.mjs",
|
@@ -94,15 +94,15 @@
|
|
94
94
|
"@react-navigation/routers": "~7",
|
95
95
|
"@swc/core": "^1.10.4",
|
96
96
|
"@ungap/structured-clone": "^1.2.0",
|
97
|
-
"@vxrn/compiler": "1.1.
|
98
|
-
"@vxrn/resolve": "1.1.
|
99
|
-
"@vxrn/tslib-lite": "1.1.
|
100
|
-
"@vxrn/universal-color-scheme": "1.1.
|
101
|
-
"@vxrn/use-isomorphic-layout-effect": "1.1.
|
97
|
+
"@vxrn/compiler": "1.1.457",
|
98
|
+
"@vxrn/resolve": "1.1.457",
|
99
|
+
"@vxrn/tslib-lite": "1.1.457",
|
100
|
+
"@vxrn/universal-color-scheme": "1.1.457",
|
101
|
+
"@vxrn/use-isomorphic-layout-effect": "1.1.457",
|
102
102
|
"babel-dead-code-elimination": "^1.0.9",
|
103
103
|
"citty": "^0.1.6",
|
104
104
|
"core-js": "^3.38.1",
|
105
|
-
"create-vxrn": "1.1.
|
105
|
+
"create-vxrn": "1.1.457",
|
106
106
|
"escape-string-regexp": "^5.0.0",
|
107
107
|
"expo-linking": "~6.3.1",
|
108
108
|
"expo-modules-core": "2.1.2",
|
@@ -129,7 +129,7 @@
|
|
129
129
|
"vite": "^6.1.0",
|
130
130
|
"vite-plugin-barrel": "^0.4.1",
|
131
131
|
"vite-tsconfig-paths": "^5.0.1",
|
132
|
-
"vxrn": "1.1.
|
132
|
+
"vxrn": "1.1.457",
|
133
133
|
"ws": "^8.18.0",
|
134
134
|
"xxhashjs": "^0.2.2"
|
135
135
|
},
|
package/src/link/Redirect.tsx
CHANGED
@@ -3,14 +3,17 @@ import type { OneRouter } from '../interfaces/router'
|
|
3
3
|
import { useFocusEffect } from '../useFocusEffect'
|
4
4
|
|
5
5
|
/** Redirects to the href as soon as the component is mounted. */
|
6
|
+
|
6
7
|
export function Redirect({ href }: { href: OneRouter.Href }) {
|
7
8
|
const router = useRouter()
|
9
|
+
|
8
10
|
useFocusEffect(() => {
|
9
11
|
try {
|
10
12
|
router.replace(href)
|
11
13
|
} catch (error) {
|
12
14
|
console.error(error)
|
13
15
|
}
|
14
|
-
})
|
16
|
+
}, [href])
|
17
|
+
|
15
18
|
return null
|
16
19
|
}
|
package/src/useFocusEffect.ts
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
// A fork of `useFocusEffect` that waits for the navigation state to load before
|
2
2
|
// running the effect. This is especially useful for native redirects.
|
3
|
-
import * as React from 'react'
|
4
3
|
|
4
|
+
import { useEffect } from 'react'
|
5
5
|
import { useOptionalNavigation } from './link/useLoadedNavigation'
|
6
6
|
|
7
7
|
type EffectCallback = () => undefined | void | (() => void)
|
@@ -9,28 +9,13 @@ type EffectCallback = () => undefined | void | (() => void)
|
|
9
9
|
/**
|
10
10
|
* Hook to run an effect in a focused screen, similar to `React.useEffect`.
|
11
11
|
* This can be used to perform side-effects such as fetching data or subscribing to events.
|
12
|
-
* The passed callback should be wrapped in `React.useCallback` to avoid running the effect too often.
|
13
12
|
*
|
14
13
|
* @param callback Memoized callback containing the effect, should optionally return a cleanup function.
|
15
14
|
*/
|
16
|
-
export function useFocusEffect(effect: EffectCallback,
|
15
|
+
export function useFocusEffect(effect: EffectCallback, args: any[]) {
|
17
16
|
const navigation = useOptionalNavigation()
|
18
17
|
|
19
|
-
|
20
|
-
const message =
|
21
|
-
"You passed a second argument to 'useFocusEffect', but it only accepts one argument. " +
|
22
|
-
"If you want to pass a dependency array, you can use 'React.useCallback':\n\n" +
|
23
|
-
'useFocusEffect(\n' +
|
24
|
-
' React.useCallback(() => {\n' +
|
25
|
-
' // Your code here\n' +
|
26
|
-
' }, [depA, depB])\n' +
|
27
|
-
');\n\n' +
|
28
|
-
'See usage guide: https://reactnavigation.org/docs/use-focus-effect'
|
29
|
-
|
30
|
-
console.error(message)
|
31
|
-
}
|
32
|
-
|
33
|
-
React.useEffect(() => {
|
18
|
+
useEffect(() => {
|
34
19
|
if (!navigation) {
|
35
20
|
return
|
36
21
|
}
|
@@ -85,34 +70,22 @@ export function useFocusEffect(effect: EffectCallback, do_not_pass_a_second_prop
|
|
85
70
|
const unsubscribeFocus = navigation.addListener('focus', () => {
|
86
71
|
// If callback was already called for focus, avoid calling it again
|
87
72
|
// The focus event may also fire on intial render, so we guard against runing the effect twice
|
88
|
-
if (isFocused)
|
89
|
-
|
90
|
-
}
|
91
|
-
|
92
|
-
if (cleanup !== undefined) {
|
93
|
-
cleanup()
|
94
|
-
}
|
95
|
-
|
73
|
+
if (isFocused) return
|
74
|
+
cleanup?.()
|
96
75
|
cleanup = callback()
|
97
76
|
isFocused = true
|
98
77
|
})
|
99
78
|
|
100
79
|
const unsubscribeBlur = navigation.addListener('blur', () => {
|
101
|
-
|
102
|
-
cleanup()
|
103
|
-
}
|
104
|
-
|
80
|
+
cleanup?.()
|
105
81
|
cleanup = undefined
|
106
82
|
isFocused = false
|
107
83
|
})
|
108
84
|
|
109
85
|
return () => {
|
110
|
-
|
111
|
-
cleanup()
|
112
|
-
}
|
113
|
-
|
86
|
+
cleanup?.()
|
114
87
|
unsubscribeFocus()
|
115
88
|
unsubscribeBlur()
|
116
89
|
}
|
117
|
-
}, [
|
90
|
+
}, [navigation, ...args])
|
118
91
|
}
|
@@ -12,7 +12,7 @@ import { vercelBuildOutputConfig } from './config/vc-build-output-config-base'
|
|
12
12
|
|
13
13
|
import type { One } from '../../vite/types'
|
14
14
|
|
15
|
-
const { copy, ensureDir, writeJSON } = FSExtra
|
15
|
+
const { copy, ensureDir, existsSync, writeJSON } = FSExtra
|
16
16
|
|
17
17
|
async function moveAllFiles(src: string, dest: string) {
|
18
18
|
try {
|
@@ -89,24 +89,30 @@ export const buildVercelOutputDirectory = async ({
|
|
89
89
|
}
|
90
90
|
}
|
91
91
|
|
92
|
-
const
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
92
|
+
const distMiddlewareDir = resolve(join(oneOptionsRoot, 'dist', 'middlewares'))
|
93
|
+
if (existsSync(distMiddlewareDir)) {
|
94
|
+
const vercelMiddlewareDir = resolve(
|
95
|
+
join(oneOptionsRoot, 'dist', '.vercel/output/functions/_middleware')
|
96
|
+
)
|
97
|
+
await ensureDir(vercelMiddlewareDir)
|
98
|
+
postBuildLogs.push(
|
99
|
+
`[one.build][vercel] copying middlewares from ${distMiddlewareDir} to ${vercelMiddlewareDir}`
|
100
|
+
)
|
101
|
+
await moveAllFiles(resolve(join(oneOptionsRoot, 'dist', 'middlewares')), vercelMiddlewareDir)
|
102
|
+
const vercelMiddlewarePackageJsonFilePath = resolve(join(vercelMiddlewareDir, 'index.js'))
|
103
|
+
postBuildLogs.push(
|
104
|
+
`[one.build][vercel] writing package.json to ${vercelMiddlewarePackageJsonFilePath}`
|
105
|
+
)
|
106
|
+
await writeJSON(vercelMiddlewarePackageJsonFilePath, serverlessVercelPackageJson)
|
107
|
+
const middlewareVercelConfigFilePath = resolve(join(vercelMiddlewareDir, '.vc-config.json'))
|
108
|
+
postBuildLogs.push(
|
109
|
+
`[one.build][vercel] writing .vc-config.json to ${middlewareVercelConfigFilePath}`
|
110
|
+
)
|
111
|
+
await writeJSON(middlewareVercelConfigFilePath, {
|
112
|
+
...serverlessVercelNodeJsConfig,
|
113
|
+
handler: '_middleware.js',
|
114
|
+
})
|
115
|
+
}
|
110
116
|
|
111
117
|
const vercelOutputStaticDir = resolve(join(oneOptionsRoot, 'dist', '.vercel/output/static'))
|
112
118
|
await ensureDir(vercelOutputStaticDir)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Redirect.d.ts","sourceRoot":"","sources":["../../src/link/Redirect.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAGrD,iEAAiE;
|
1
|
+
{"version":3,"file":"Redirect.d.ts","sourceRoot":"","sources":["../../src/link/Redirect.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAGrD,iEAAiE;AAEjE,wBAAgB,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAA;CAAE,QAY1D"}
|
@@ -2,10 +2,9 @@ type EffectCallback = () => undefined | void | (() => void);
|
|
2
2
|
/**
|
3
3
|
* Hook to run an effect in a focused screen, similar to `React.useEffect`.
|
4
4
|
* This can be used to perform side-effects such as fetching data or subscribing to events.
|
5
|
-
* The passed callback should be wrapped in `React.useCallback` to avoid running the effect too often.
|
6
5
|
*
|
7
6
|
* @param callback Memoized callback containing the effect, should optionally return a cleanup function.
|
8
7
|
*/
|
9
|
-
export declare function useFocusEffect(effect: EffectCallback,
|
8
|
+
export declare function useFocusEffect(effect: EffectCallback, args: any[]): void;
|
10
9
|
export {};
|
11
10
|
//# sourceMappingURL=useFocusEffect.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useFocusEffect.d.ts","sourceRoot":"","sources":["../src/useFocusEffect.ts"],"names":[],"mappings":"AAMA,KAAK,cAAc,GAAG,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAA;AAE3D
|
1
|
+
{"version":3,"file":"useFocusEffect.d.ts","sourceRoot":"","sources":["../src/useFocusEffect.ts"],"names":[],"mappings":"AAMA,KAAK,cAAc,GAAG,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,CAAA;AAE3D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,EAAE,QA4EjE"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAY3C,eAAO,MAAM,0BAA0B,kFAMpC;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,
|
1
|
+
{"version":3,"file":"buildVercelOutputDirectory.d.ts","sourceRoot":"","sources":["../../../src/vercel/build/buildVercelOutputDirectory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAS1C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAY3C,eAAO,MAAM,0BAA0B,kFAMpC;IACD,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;IAC9B,mBAAmB,EAAE,GAAG,CAAC,SAAS,CAAA;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,EAAE,CAAA;CACxB,kBA+FA,CAAA"}
|