one 1.20.1 → 1.20.2
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/cli/runAndroid.cjs +4 -2
- package/dist/cjs/cli/runAndroid.native.js +7 -1
- package/dist/cjs/cli/runAndroid.native.js.map +1 -1
- package/dist/cjs/cli/runIos.cjs +4 -2
- package/dist/cjs/cli/runIos.native.js +7 -1
- package/dist/cjs/cli/runIos.native.js.map +1 -1
- package/dist/cjs/fork/useLinking.native.js +16 -1
- package/dist/cjs/fork/useLinking.native.js.map +1 -1
- package/dist/esm/cli/runAndroid.mjs +4 -2
- package/dist/esm/cli/runAndroid.mjs.map +1 -1
- package/dist/esm/cli/runAndroid.native.js +7 -1
- package/dist/esm/cli/runAndroid.native.js.map +1 -1
- package/dist/esm/cli/runIos.mjs +4 -2
- package/dist/esm/cli/runIos.mjs.map +1 -1
- package/dist/esm/cli/runIos.native.js +7 -1
- package/dist/esm/cli/runIos.native.js.map +1 -1
- package/dist/esm/fork/useLinking.native.js +16 -1
- package/dist/esm/fork/useLinking.native.js.map +1 -1
- package/package.json +9 -9
- package/src/cli/runAndroid.ts +7 -3
- package/src/cli/runIos.ts +5 -3
- package/src/fork/useLinking.native.ts +23 -1
- package/types/cli/runAndroid.d.ts.map +1 -1
- package/types/cli/runIos.d.ts.map +1 -1
- package/types/fork/useLinking.native.d.ts.map +1 -1
|
@@ -36,12 +36,14 @@ __export(runAndroid_exports, {
|
|
|
36
36
|
run: () => run
|
|
37
37
|
});
|
|
38
38
|
module.exports = __toCommonJS(runAndroid_exports);
|
|
39
|
+
var import_loadConfig = require("../vite/loadConfig.cjs");
|
|
39
40
|
async function run(args) {
|
|
40
41
|
const {
|
|
41
42
|
runAndroid
|
|
42
43
|
} = await import("vxrn");
|
|
44
|
+
const options = await (0, import_loadConfig.loadUserOneOptions)("serve", true).catch(() => null);
|
|
43
45
|
await runAndroid({
|
|
44
|
-
root: process.cwd()
|
|
45
|
-
|
|
46
|
+
root: process.cwd(),
|
|
47
|
+
port: options?.config?.config?.server?.port
|
|
46
48
|
});
|
|
47
49
|
}
|
|
@@ -38,12 +38,18 @@ __export(runAndroid_exports, {
|
|
|
38
38
|
run: () => run
|
|
39
39
|
});
|
|
40
40
|
module.exports = __toCommonJS(runAndroid_exports);
|
|
41
|
+
var import_loadConfig = require("../vite/loadConfig.native.js");
|
|
41
42
|
async function run(args) {
|
|
43
|
+
var _options_config_config_server, _options_config_config, _options_config;
|
|
42
44
|
var {
|
|
43
45
|
runAndroid
|
|
44
46
|
} = await import("vxrn");
|
|
47
|
+
var options = await (0, import_loadConfig.loadUserOneOptions)("serve", true).catch(function () {
|
|
48
|
+
return null;
|
|
49
|
+
});
|
|
45
50
|
await runAndroid({
|
|
46
|
-
root: process.cwd()
|
|
51
|
+
root: process.cwd(),
|
|
52
|
+
port: options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_config = _options_config.config) === null || _options_config_config === void 0 ? void 0 : (_options_config_config_server = _options_config_config.server) === null || _options_config_config_server === void 0 ? void 0 : _options_config_config_server.port
|
|
47
53
|
});
|
|
48
54
|
}
|
|
49
55
|
//# sourceMappingURL=runAndroid.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","runAndroid_exports","__export","run","module","exports","args","runAndroid","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","runAndroid_exports","__export","run","module","exports","import_loadConfig","require","args","_options_config_config_server","_options_config_config","_options_config","runAndroid","options","loadUserOneOptions","catch"],"sources":["../../../src/cli/runAndroid.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,kBAAA;AAAAC,QAAA,CAAAD,kBAAA;EAAAE,GAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAmC,CAAAK,kBAAA;AAEnC,IAAAK,iBAA0B,GAAAC,OAAU;AAClC,eAAQJ,IAAAK,IAAW,EAAI;EAKvB,IAAAC,6BAAsB,EAAAC,sBAAA,EAAAC,eAA4B;EAElD;IAAMC;EAAW;EAAA,IACfC,OAAM,SAAY,IAAAP,iBAAA,CAAAQ,kBAAA,iBAAAC,KAAA;IAClB,OAAM;EACR,CAAC;EACH,MAAAH,UAAA","ignoreList":[]}
|
package/dist/cjs/cli/runIos.cjs
CHANGED
|
@@ -36,12 +36,14 @@ __export(runIos_exports, {
|
|
|
36
36
|
run: () => run
|
|
37
37
|
});
|
|
38
38
|
module.exports = __toCommonJS(runIos_exports);
|
|
39
|
+
var import_loadConfig = require("../vite/loadConfig.cjs");
|
|
39
40
|
async function run(args) {
|
|
40
41
|
const {
|
|
41
42
|
runIos
|
|
42
43
|
} = await import("vxrn");
|
|
44
|
+
const options = await (0, import_loadConfig.loadUserOneOptions)("serve", true).catch(() => null);
|
|
43
45
|
await runIos({
|
|
44
|
-
root: process.cwd()
|
|
45
|
-
|
|
46
|
+
root: process.cwd(),
|
|
47
|
+
port: options?.config?.config?.server?.port
|
|
46
48
|
});
|
|
47
49
|
}
|
|
@@ -38,12 +38,18 @@ __export(runIos_exports, {
|
|
|
38
38
|
run: () => run
|
|
39
39
|
});
|
|
40
40
|
module.exports = __toCommonJS(runIos_exports);
|
|
41
|
+
var import_loadConfig = require("../vite/loadConfig.native.js");
|
|
41
42
|
async function run(args) {
|
|
43
|
+
var _options_config_config_server, _options_config_config, _options_config;
|
|
42
44
|
var {
|
|
43
45
|
runIos
|
|
44
46
|
} = await import("vxrn");
|
|
47
|
+
var options = await (0, import_loadConfig.loadUserOneOptions)("serve", true).catch(function () {
|
|
48
|
+
return null;
|
|
49
|
+
});
|
|
45
50
|
await runIos({
|
|
46
|
-
root: process.cwd()
|
|
51
|
+
root: process.cwd(),
|
|
52
|
+
port: options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_config = _options_config.config) === null || _options_config_config === void 0 ? void 0 : (_options_config_config_server = _options_config_config.server) === null || _options_config_config_server === void 0 ? void 0 : _options_config_config_server.port
|
|
47
53
|
});
|
|
48
54
|
}
|
|
49
55
|
//# sourceMappingURL=runIos.native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","runIos_exports","__export","run","module","exports","args","runIos","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","runIos_exports","__export","run","module","exports","import_loadConfig","require","args","_options_config_config_server","_options_config_config","_options_config","runIos","options","loadUserOneOptions","catch"],"sources":["../../../src/cli/runIos.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,cAAA;AAAAC,QAAA,CAAAD,cAAA;EAAAE,GAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAAmC,CAAAK,cAAA;AAEnC,IAAAK,iBAA0B,GAAAC,OAAU;AAClC,eAAQJ,GAAOA,CAAAK,IAAI;EAKnB,IAAAC,6BAAsB,EAAAC,sBAAA,EAAAC,eAA4B;EAElD;IAAMC;EAAO;EAAA,IACXC,OAAM,SAAY,IAAAP,iBAAA,CAAAQ,kBAAA,iBAAAC,KAAA;IAClB,OAAM;EACR,CAAC;EACH,MAAAH,MAAA","ignoreList":[]}
|
|
@@ -48,6 +48,21 @@ function _type_of(obj) {
|
|
|
48
48
|
return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
49
49
|
}
|
|
50
50
|
var linkingHandlers = [];
|
|
51
|
+
function stripRouteKeys(state) {
|
|
52
|
+
return {
|
|
53
|
+
...state,
|
|
54
|
+
routes: state.routes.map(function (route) {
|
|
55
|
+
var {
|
|
56
|
+
key,
|
|
57
|
+
...rest
|
|
58
|
+
} = route;
|
|
59
|
+
return rest.state ? {
|
|
60
|
+
...rest,
|
|
61
|
+
state: stripRouteKeys(rest.state)
|
|
62
|
+
} : rest;
|
|
63
|
+
})
|
|
64
|
+
};
|
|
65
|
+
}
|
|
51
66
|
function useLinking(ref, param, onUnhandledLinking) {
|
|
52
67
|
var {
|
|
53
68
|
enabled = true,
|
|
@@ -173,7 +188,7 @@ function useLinking(ref, param, onUnhandledLinking) {
|
|
|
173
188
|
})) {
|
|
174
189
|
return;
|
|
175
190
|
}
|
|
176
|
-
var action = getActionFromStateRef.current(state, configRef.current);
|
|
191
|
+
var action = getActionFromStateRef.current(stripRouteKeys(state), configRef.current);
|
|
177
192
|
if (action !== void 0) {
|
|
178
193
|
try {
|
|
179
194
|
navigation.dispatch(action);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useLinking_native_exports","__export","useLinking","module","exports","__toCommonJS","import_core","require","React","__toESM","import_react_native","import_extractPathFromURL","_type_of","obj","Symbol","constructor","linkingHandlers","ref","param","onUnhandledLinking","enabled","prefixes","filter","config","getInitialURL","Promise","race","Linking","resolve","setTimeout","subscribe","listener","_Linking_removeEventListener","callback","param2","url","subscription","addEventListener","removeEventListener","bind","remove","getStateFromPath","getActionFromState","independent","useNavigationIndependentTree","useEffect","process","env","NODE_ENV","length","Platform","OS","console","error","join","trim","handler","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","extractPathFromURL","getInitialState","
|
|
1
|
+
{"version":3,"names":["useLinking_native_exports","__export","useLinking","module","exports","__toCommonJS","import_core","require","React","__toESM","import_react_native","import_extractPathFromURL","_type_of","obj","Symbol","constructor","linkingHandlers","stripRouteKeys","state","routes","map","route","key","rest","ref","param","onUnhandledLinking","enabled","prefixes","filter","config","getInitialURL","Promise","race","Linking","resolve","setTimeout","subscribe","listener","_Linking_removeEventListener","callback","param2","url","subscription","addEventListener","removeEventListener","bind","remove","getStateFromPath","getActionFromState","independent","useNavigationIndependentTree","useEffect","process","env","NODE_ENV","length","Platform","OS","console","error","join","trim","handler","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","extractPathFromURL","getInitialState","then","url2","state2","thenable","onfulfilled","catch","navigation","rootState","getRootState","some","r","_rootState_routeNames","routeNames","includes","name","action","dispatch","e","warn","message","resetRoot"],"sources":["../../../src/fork/useLinking.native.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,yBAAA;AAUI,IAAAM,WAAA,GAA2IC,OAAA;AAE/I,IAAAC,KAAA,GAAuBC,OAAA,CAAAF,OAAA;AACvB,IAAAG,mBAAA,GAAkCH,OAAA;AAClC,IAAAI,yBAAA,GAAmCJ,OAAA;AAdnC,SAASK,SAASC,GAAA,EAAK;EACnB;;EACA,OAAOA,GAAA,IAAO,OAAOC,MAAA,KAAW,eAAeD,GAAA,CAAIE,WAAA,KAAgBD,MAAA,GAAS,WAAW,OAAOD,GAAA;AAClG;AAYA,IAAIG,eAAA,GAAkB,EAAC;AAQvB,SAASC,eAAeC,KAAA,EAAO;EAC3B,OAAO;IACH,GAAGA,KAAA;IACHC,MAAA,EAAQD,KAAA,CAAMC,MAAA,CAAOC,GAAA,CAAI,UAASC,KAAA,EAAO;MACrC,IAAI;QAAEC,GAAA;QAAK,GAAGC;MAAK,IAAIF,KAAA;MACvB,OAAOE,IAAA,CAAKL,KAAA,GAAQ;QAChB,GAAGK,IAAA;QACHL,KAAA,EAAOD,cAAA,CAAeM,IAAA,CAAKL,KAAK;MACpC,IAAIK,IAAA;IACR,CAAC;EACL;AACJ;AACO,SAASrB,WAAWsB,GAAA,EAAKC,KAAA,EAAOC,kBAAA,EAAoB;EACvD,IAAI;IAAEC,OAAA,GAAU;IAAMC,QAAA;IAAUC,MAAA;IAAQC,MAAA;IAAQC,aAAA,GAAgB,SAAAA,CAAA,EAAW;MACvE,OAAOC,OAAA,CAAQC,IAAA,CAAK,CAChBvB,mBAAA,CAAAwB,OAAA,CAAQH,aAAA,CAAc,GACtB,IAAIC,OAAA,CAAQ,UAASG,OAAA,EAAS;QAG1BC,UAAA,CAAWD,OAAA,EAAS,GAAG;MAC3B,CAAC,EACJ;IACL;IAAGE,SAAA,GAAY,SAAAA,CAASC,QAAA,EAAU;MAC9B,IAAIC,4BAAA;MACJ,IAAIC,QAAA,GAAW,SAAAA,CAASC,MAAA,EAAO;QAC3B,IAAI;UAAEC;QAAI,IAAID,MAAA;QACd,OAAOH,QAAA,CAASI,GAAG;MACvB;MACA,IAAIC,YAAA,GAAejC,mBAAA,CAAAwB,OAAA,CAAQU,gBAAA,CAAiB,OAAOJ,QAAQ;MAG3D,IAAIK,mBAAA,IAAuBN,4BAAA,GAA+B7B,mBAAA,CAAAwB,OAAA,CAAQW,mBAAA,MAAyB,QAAQN,4BAAA,KAAiC,SAAS,SAASA,4BAAA,CAA6BO,IAAA,CAAKpC,mBAAA,CAAAwB,OAAO;MAC/L,OAAO,YAAW;QAEd,IAAIS,YAAA,KAAiB,QAAQA,YAAA,KAAiB,SAAS,SAASA,YAAA,CAAaI,MAAA,EAAQ;UACjFJ,YAAA,CAAaI,MAAA,CAAO;QACxB,OAAO;UACHF,mBAAA,KAAwB,QAAQA,mBAAA,KAAwB,SAAS,SAASA,mBAAA,CAAoB,OAAOL,QAAQ;QACjH;MACJ;IACJ;IAAGQ,gBAAA,GAAmB1C,WAAA,CAAA0C,gBAAA;IAAyBC,kBAAA,GAAqB3C,WAAA,CAAA2C;EAA0B,IAAIxB,KAAA;EAClG,IAAIyB,WAAA,OAAc5C,WAAA,CAAA6C,4BAAA,EAA6B;EAC/C3C,KAAA,CAAM4C,SAAA,CAAU,YAAW;IACvB,IAAIC,OAAA,CAAQC,GAAA,CAAIC,QAAA,KAAa,cAAc;MACvC,OAAO;IACX;IACA,IAAIL,WAAA,EAAa;MACb,OAAO;IACX;IAGA,IAAIvB,OAAA,KAAY,SAASX,eAAA,CAAgBwC,MAAA,IAAU9C,mBAAA,CAAA+C,QAAA,CAASC,EAAA,KAAO,WAAW;MAC1E,IAAI1C,eAAA,CAAgBwC,MAAA,GAAS,GAAG;QAC5BG,OAAA,CAAQC,KAAA,CAAM,CACV,+KACA,yFACA,6DACJ,CAAEC,IAAA,CAAK,IAAI,EAAEC,IAAA,CAAK,CAAC;MACvB;IACJ;IAEA,IAAIC,OAAA,GAAU,eAAAjD,MAAA,CAAO;IACrB,IAAIa,OAAA,KAAY,OAAO;MACnBX,eAAA,CAAgBgD,IAAA,CAAKD,OAAO;IAChC;IACA,OAAO,YAAW;MACd,IAAIE,KAAA,GAAQjD,eAAA,CAAgBkD,OAAA,CAAQH,OAAO;MAC3C,IAAIE,KAAA,GAAQ,IAAI;QACZjD,eAAA,CAAgBmD,MAAA,CAAOF,KAAA,EAAO,CAAC;MACnC;IACJ;EACJ,GAAG,CACCtC,OAAA,EACAuB,WAAA,CACH;EAID,IAAIkB,UAAA,GAAa5D,KAAA,CAAM6D,MAAA,CAAO1C,OAAO;EACrC,IAAI2C,WAAA,GAAc9D,KAAA,CAAM6D,MAAA,CAAOzC,QAAQ;EACvC,IAAI2C,SAAA,GAAY/D,KAAA,CAAM6D,MAAA,CAAOxC,MAAM;EACnC,IAAI2C,SAAA,GAAYhE,KAAA,CAAM6D,MAAA,CAAOvC,MAAM;EACnC,IAAI2C,gBAAA,GAAmBjE,KAAA,CAAM6D,MAAA,CAAOtC,aAAa;EACjD,IAAI2C,mBAAA,GAAsBlE,KAAA,CAAM6D,MAAA,CAAOrB,gBAAgB;EACvD,IAAI2B,qBAAA,GAAwBnE,KAAA,CAAM6D,MAAA,CAAOpB,kBAAkB;EAC3DzC,KAAA,CAAM4C,SAAA,CAAU,YAAW;IACvBgB,UAAA,CAAWQ,OAAA,GAAUjD,OAAA;IACrB2C,WAAA,CAAYM,OAAA,GAAUhD,QAAA;IACtB2C,SAAA,CAAUK,OAAA,GAAU/C,MAAA;IACpB2C,SAAA,CAAUI,OAAA,GAAU9C,MAAA;IACpB2C,gBAAA,CAAiBG,OAAA,GAAU7C,aAAA;IAC3B2C,mBAAA,CAAoBE,OAAA,GAAU5B,gBAAA;IAC9B2B,qBAAA,CAAsBC,OAAA,GAAU3B,kBAAA;EACpC,CAAC;EACD,IAAI4B,eAAA,GAAkBrE,KAAA,CAAMsE,WAAA,CAAY,UAASpC,GAAA,EAAK;IAClD,IAAI,CAACA,GAAA,IAAO6B,SAAA,CAAUK,OAAA,IAAW,CAACL,SAAA,CAAUK,OAAA,CAAQlC,GAAG,GAAG;MACtD,OAAO;IACX;IACA,IAAIqC,IAAA,OAAOpE,yBAAA,CAAAqE,kBAAA,EAAmBV,WAAA,CAAYM,OAAA,EAASlC,GAAG;IACtD,OAAOqC,IAAA,KAAS,SAAYL,mBAAA,CAAoBE,OAAA,CAAQG,IAAA,EAAMP,SAAA,CAAUI,OAAO,IAAI;EACvF,GAAG,EAAE;EACL,IAAIK,eAAA,GAAkBzE,KAAA,CAAMsE,WAAA,CAAY,YAAW;IAC/C,IAAI5D,KAAA;IACJ,IAAIkD,UAAA,CAAWQ,OAAA,EAAS;MACpB,IAAIlC,GAAA,GAAM+B,gBAAA,CAAiBG,OAAA,CAAQ;MACnC,IAAIlC,GAAA,IAAO,MAAM;QACb,IAAI,OAAOA,GAAA,KAAQ,UAAU;UACzB,OAAOA,GAAA,CAAIwC,IAAA,CAAK,UAASC,IAAA,EAAK;YAC1B,IAAIC,MAAA,GAAQP,eAAA,CAAgBM,IAAG;YAC/B,IAAI,OAAOA,IAAA,KAAQ,UAAU;cAEzBzD,kBAAA,KAAmBf,yBAAA,CAAAqE,kBAAA,EAAmBpD,QAAA,EAAUuD,IAAG,CAAC;YACxD;YACA,OAAOC,MAAA;UACX,CAAC;QACL,OAAO;UACH1D,kBAAA,KAAmBf,yBAAA,CAAAqE,kBAAA,EAAmBpD,QAAA,EAAUc,GAAG,CAAC;QACxD;MACJ;MACAxB,KAAA,GAAQ2D,eAAA,CAAgBnC,GAAG;IAC/B;IACA,IAAI2C,QAAA,GAAW;MAAA;MAEXH,KAAMI,WAAA,EAAa;QACf,OAAOtD,OAAA,CAAQG,OAAA,CAAQmD,WAAA,GAAcA,WAAA,CAAYpE,KAAK,IAAIA,KAAK;MACnE;MACAqE,MAAA,EAAS;QACL,OAAOF,QAAA;MACX;IACJ;IACA,OAAOA,QAAA;EACX,GAAG,CACCR,eAAA,EACAnD,kBAAA,EACAE,QAAA,CACH;EACDpB,KAAA,CAAM4C,SAAA,CAAU,YAAW;IACvB,IAAId,QAAA,GAAW,SAAAA,CAASI,GAAA,EAAK;MACzB,IAAI,CAACf,OAAA,EAAS;QACV;MACJ;MACA,IAAI6D,UAAA,GAAahE,GAAA,CAAIoD,OAAA;MACrB,IAAI1D,KAAA,GAAQsE,UAAA,GAAaX,eAAA,CAAgBnC,GAAG,IAAI;MAChD,IAAI8C,UAAA,IAActE,KAAA,EAAO;QAErBQ,kBAAA,KAAmBf,yBAAA,CAAAqE,kBAAA,EAAmBpD,QAAA,EAAUc,GAAG,CAAC;QACpD,IAAI+C,SAAA,GAAYD,UAAA,CAAWE,YAAA,CAAa;QACxC,IAAIxE,KAAA,CAAMC,MAAA,CAAOwE,IAAA,CAAK,UAASC,CAAA,EAAG;UAC9B,IAAIC,qBAAA;UACJ,OAAO,EAAEJ,SAAA,KAAc,QAAQA,SAAA,KAAc,SAAS,UAAUI,qBAAA,GAAwBJ,SAAA,CAAUK,UAAA,MAAgB,QAAQD,qBAAA,KAA0B,SAAS,SAASA,qBAAA,CAAsBE,QAAA,CAASH,CAAA,CAAEI,IAAI;QAC/M,CAAC,GAAG;UACA;QACJ;QAEA,IAAIC,MAAA,GAAStB,qBAAA,CAAsBC,OAAA,CAAQ3D,cAAA,CAAeC,KAAK,GAAGsD,SAAA,CAAUI,OAAO;QACnF,IAAIqB,MAAA,KAAW,QAAW;UACtB,IAAI;YACAT,UAAA,CAAWU,QAAA,CAASD,MAAM;UAC9B,SAASE,CAAA,EAAG;YAGRxC,OAAA,CAAQyC,IAAA,CAAK,qDAAqD1D,GAAG,OAAO,OAAOyD,CAAA,KAAM,cAAc,cAAcvF,QAAA,CAASuF,CAAC,OAAO,YAAYA,CAAA,IAAK,QAAQ,aAAaA,CAAA,GAAIA,CAAA,CAAEE,OAAA,GAAUF,CAAC,EAAE;UACnM;QACJ,OAAO;UACHX,UAAA,CAAWc,SAAA,CAAUpF,KAAK;QAC9B;MACJ;IACJ;IACA,OAAOmB,SAAA,CAAUC,QAAQ;EAC7B,GAAG,CACCX,OAAA,EACAkD,eAAA,EACAnD,kBAAA,EACAE,QAAA,EACAJ,GAAA,EACAa,SAAA,CACH;EACD,OAAO;IACH4C;EACJ;AACJ","ignoreList":[]}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { loadUserOneOptions } from "../vite/loadConfig.mjs";
|
|
1
2
|
async function run(args) {
|
|
2
3
|
const {
|
|
3
4
|
runAndroid
|
|
4
5
|
} = await import("vxrn");
|
|
6
|
+
const options = await loadUserOneOptions("serve", true).catch(() => null);
|
|
5
7
|
await runAndroid({
|
|
6
|
-
root: process.cwd()
|
|
7
|
-
|
|
8
|
+
root: process.cwd(),
|
|
9
|
+
port: options?.config?.config?.server?.port
|
|
8
10
|
});
|
|
9
11
|
}
|
|
10
12
|
export { run };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["run","args","runAndroid","root","process","cwd"],"sources":["../../../src/cli/runAndroid.ts"],"sourcesContent":[null],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"names":["loadUserOneOptions","run","args","runAndroid","options","catch","root","process","cwd","port","config","server"],"sources":["../../../src/cli/runAndroid.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AAEnC,eAAsBC,IAAIC,IAAA,EAAU;EAClC,MAAM;IAAEC;EAAW,IAAI,MAAM,OAAO,MAAM;EAK1C,MAAMC,OAAA,GAAU,MAAMJ,kBAAA,CAAmB,SAAS,IAAI,EAAEK,KAAA,CAAM,MAAM,IAAI;EAExE,MAAMF,UAAA,CAAW;IACfG,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;IAClBC,IAAA,EAAML,OAAA,EAASM,MAAA,EAAQA,MAAA,EAAQC,MAAA,EAAQF;EACzC,CAAC;AACH","ignoreList":[]}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { loadUserOneOptions } from "../vite/loadConfig.native.js";
|
|
1
2
|
async function run(args) {
|
|
3
|
+
var _options_config_config_server, _options_config_config, _options_config;
|
|
2
4
|
var {
|
|
3
5
|
runAndroid
|
|
4
6
|
} = await import("vxrn");
|
|
7
|
+
var options = await loadUserOneOptions("serve", true).catch(function () {
|
|
8
|
+
return null;
|
|
9
|
+
});
|
|
5
10
|
await runAndroid({
|
|
6
|
-
root: process.cwd()
|
|
11
|
+
root: process.cwd(),
|
|
12
|
+
port: options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_config = _options_config.config) === null || _options_config_config === void 0 ? void 0 : (_options_config_config_server = _options_config_config.server) === null || _options_config_config_server === void 0 ? void 0 : _options_config_config_server.port
|
|
7
13
|
});
|
|
8
14
|
}
|
|
9
15
|
export { run };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["run","args","runAndroid","root","process","cwd"],"sources":["../../../src/cli/runAndroid.ts"],"sourcesContent":[null],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"names":["loadUserOneOptions","run","args","_options_config_config_server","_options_config_config","_options_config","runAndroid","options","catch","root","process","cwd"],"sources":["../../../src/cli/runAndroid.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AAEnC,eAAsBC,IAAIC,IAAA,EAAU;EAClC,IAAAC,6BAA6B,EAAAC,sBAAa,EAAAC,eAAA;EAK1C;IAAMC;EAAU,UAAM,cAAmB;EAEzC,IAAAC,OAAM,SAAWP,kBAAA,gBAAAQ,KAAA;IACf,OAAM;EAAY,EAClB;EACF,MAACF,UAAA;IACHG,IAAA,EAAAC,OAAA,CAAAC,GAAA","ignoreList":[]}
|
package/dist/esm/cli/runIos.mjs
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { loadUserOneOptions } from "../vite/loadConfig.mjs";
|
|
1
2
|
async function run(args) {
|
|
2
3
|
const {
|
|
3
4
|
runIos
|
|
4
5
|
} = await import("vxrn");
|
|
6
|
+
const options = await loadUserOneOptions("serve", true).catch(() => null);
|
|
5
7
|
await runIos({
|
|
6
|
-
root: process.cwd()
|
|
7
|
-
|
|
8
|
+
root: process.cwd(),
|
|
9
|
+
port: options?.config?.config?.server?.port
|
|
8
10
|
});
|
|
9
11
|
}
|
|
10
12
|
export { run };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["run","args","runIos","root","process","cwd"],"sources":["../../../src/cli/runIos.ts"],"sourcesContent":[null],"mappings":"
|
|
1
|
+
{"version":3,"names":["loadUserOneOptions","run","args","runIos","options","catch","root","process","cwd","port","config","server"],"sources":["../../../src/cli/runIos.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AAEnC,eAAsBC,IAAIC,IAAA,EAAU;EAClC,MAAM;IAAEC;EAAO,IAAI,MAAM,OAAO,MAAM;EAKtC,MAAMC,OAAA,GAAU,MAAMJ,kBAAA,CAAmB,SAAS,IAAI,EAAEK,KAAA,CAAM,MAAM,IAAI;EAExE,MAAMF,MAAA,CAAO;IACXG,IAAA,EAAMC,OAAA,CAAQC,GAAA,CAAI;IAClBC,IAAA,EAAML,OAAA,EAASM,MAAA,EAAQA,MAAA,EAAQC,MAAA,EAAQF;EACzC,CAAC;AACH","ignoreList":[]}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { loadUserOneOptions } from "../vite/loadConfig.native.js";
|
|
1
2
|
async function run(args) {
|
|
3
|
+
var _options_config_config_server, _options_config_config, _options_config;
|
|
2
4
|
var {
|
|
3
5
|
runIos
|
|
4
6
|
} = await import("vxrn");
|
|
7
|
+
var options = await loadUserOneOptions("serve", true).catch(function () {
|
|
8
|
+
return null;
|
|
9
|
+
});
|
|
5
10
|
await runIos({
|
|
6
|
-
root: process.cwd()
|
|
11
|
+
root: process.cwd(),
|
|
12
|
+
port: options === null || options === void 0 ? void 0 : (_options_config = options.config) === null || _options_config === void 0 ? void 0 : (_options_config_config = _options_config.config) === null || _options_config_config === void 0 ? void 0 : (_options_config_config_server = _options_config_config.server) === null || _options_config_config_server === void 0 ? void 0 : _options_config_config_server.port
|
|
7
13
|
});
|
|
8
14
|
}
|
|
9
15
|
export { run };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["run","args","runIos","root","process","cwd"],"sources":["../../../src/cli/runIos.ts"],"sourcesContent":[null],"mappings":"
|
|
1
|
+
{"version":3,"names":["loadUserOneOptions","run","args","_options_config_config_server","_options_config_config","_options_config","runIos","options","catch","root","process","cwd"],"sources":["../../../src/cli/runIos.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AAEnC,eAAsBC,IAAIC,IAAA,EAAU;EAClC,IAAAC,6BAAgC,EAAAC,sBAAM,EAAAC,eAAA;EAKtC;IAAMC;EAAA,IAAU,MAAM;EAEtB,IAAAC,OAAM,GAAO,MAAAP,kBAAA,gBAAAQ,KAAA;IACX,OAAM;EAAY,EAClB;EACF,MAACF,MAAA;IACHG,IAAA,EAAAC,OAAA,CAAAC,GAAA","ignoreList":[]}
|
|
@@ -8,6 +8,21 @@ function _type_of(obj) {
|
|
|
8
8
|
return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
|
|
9
9
|
}
|
|
10
10
|
var linkingHandlers = [];
|
|
11
|
+
function stripRouteKeys(state) {
|
|
12
|
+
return {
|
|
13
|
+
...state,
|
|
14
|
+
routes: state.routes.map(function (route) {
|
|
15
|
+
var {
|
|
16
|
+
key,
|
|
17
|
+
...rest
|
|
18
|
+
} = route;
|
|
19
|
+
return rest.state ? {
|
|
20
|
+
...rest,
|
|
21
|
+
state: stripRouteKeys(rest.state)
|
|
22
|
+
} : rest;
|
|
23
|
+
})
|
|
24
|
+
};
|
|
25
|
+
}
|
|
11
26
|
function useLinking(ref, param, onUnhandledLinking) {
|
|
12
27
|
var {
|
|
13
28
|
enabled = true,
|
|
@@ -133,7 +148,7 @@ function useLinking(ref, param, onUnhandledLinking) {
|
|
|
133
148
|
})) {
|
|
134
149
|
return;
|
|
135
150
|
}
|
|
136
|
-
var action = getActionFromStateRef.current(state, configRef.current);
|
|
151
|
+
var action = getActionFromStateRef.current(stripRouteKeys(state), configRef.current);
|
|
137
152
|
if (action !== void 0) {
|
|
138
153
|
try {
|
|
139
154
|
navigation.dispatch(action);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","extractPathFromURL","_type_of","obj","Symbol","constructor","linkingHandlers","useLinking","ref","param","onUnhandledLinking","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","_Linking_removeEventListener","callback","param2","url","subscription","addEventListener","removeEventListener","bind","remove","independent","useEffect","process","env","NODE_ENV","length","OS","console","error","join","trim","handler","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","getInitialState","
|
|
1
|
+
{"version":3,"names":["getActionFromState","getActionFromStateDefault","getStateFromPath","getStateFromPathDefault","useNavigationIndependentTree","React","Linking","Platform","extractPathFromURL","_type_of","obj","Symbol","constructor","linkingHandlers","stripRouteKeys","state","routes","map","route","key","rest","useLinking","ref","param","onUnhandledLinking","enabled","prefixes","filter","config","getInitialURL","Promise","race","resolve","setTimeout","subscribe","listener","_Linking_removeEventListener","callback","param2","url","subscription","addEventListener","removeEventListener","bind","remove","independent","useEffect","process","env","NODE_ENV","length","OS","console","error","join","trim","handler","push","index","indexOf","splice","enabledRef","useRef","prefixesRef","filterRef","configRef","getInitialURLRef","getStateFromPathRef","getActionFromStateRef","current","getStateFromURL","useCallback","path","getInitialState","then","url2","state2","thenable","onfulfilled","catch","navigation","rootState","getRootState","some","r","_rootState_routeNames","routeNames","includes","name","action","dispatch","e","warn","message","resetRoot"],"sources":["../../../src/fork/useLinking.native.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "one",
|
|
3
|
-
"version": "1.20.
|
|
3
|
+
"version": "1.20.2",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -186,18 +186,18 @@
|
|
|
186
186
|
"@cloudflare/vite-plugin": "^1.33.1",
|
|
187
187
|
"@swc/core": "^1.14.0",
|
|
188
188
|
"@ungap/structured-clone": "^1.2.0",
|
|
189
|
-
"@vxrn/color-scheme": "1.20.
|
|
190
|
-
"@vxrn/compiler": "1.20.
|
|
191
|
-
"@vxrn/resolve": "1.20.
|
|
192
|
-
"@vxrn/tslib-lite": "1.20.
|
|
193
|
-
"@vxrn/use-isomorphic-layout-effect": "1.20.
|
|
194
|
-
"@vxrn/vite-plugin-metro": "1.20.
|
|
189
|
+
"@vxrn/color-scheme": "1.20.2",
|
|
190
|
+
"@vxrn/compiler": "1.20.2",
|
|
191
|
+
"@vxrn/resolve": "1.20.2",
|
|
192
|
+
"@vxrn/tslib-lite": "1.20.2",
|
|
193
|
+
"@vxrn/use-isomorphic-layout-effect": "1.20.2",
|
|
194
|
+
"@vxrn/vite-plugin-metro": "1.20.2",
|
|
195
195
|
"babel-dead-code-elimination": "1.0.10",
|
|
196
196
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
197
197
|
"babel-preset-expo": "~55.0.0",
|
|
198
198
|
"citty": "^0.1.6",
|
|
199
199
|
"core-js": "^3.38.1",
|
|
200
|
-
"create-vxrn": "1.20.
|
|
200
|
+
"create-vxrn": "1.20.2",
|
|
201
201
|
"escape-string-regexp": "^5.0.0",
|
|
202
202
|
"expo-linking": "~55.0.7",
|
|
203
203
|
"expo-modules-core": "~55.0.16",
|
|
@@ -217,7 +217,7 @@
|
|
|
217
217
|
"tsconfig-paths": "^4",
|
|
218
218
|
"use-latest-callback": "^0.2.3",
|
|
219
219
|
"vite": "^8.0.13",
|
|
220
|
-
"vxrn": "1.20.
|
|
220
|
+
"vxrn": "1.20.2",
|
|
221
221
|
"ws": "^8.21.0",
|
|
222
222
|
"xxhashjs": "^0.2.2"
|
|
223
223
|
},
|
package/src/cli/runAndroid.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
+
import { loadUserOneOptions } from '../vite/loadConfig'
|
|
2
|
+
|
|
1
3
|
export async function run(args: {}) {
|
|
2
4
|
const { runAndroid } = await import('vxrn')
|
|
3
5
|
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
+
// resolve the app's dev server port from its vite config so the launched
|
|
7
|
+
// app points at the real dev server (vxrn passes it as expo's --port and
|
|
8
|
+
// expo reuses the already-running server for this project root)
|
|
9
|
+
const options = await loadUserOneOptions('serve', true).catch(() => null)
|
|
6
10
|
|
|
7
11
|
await runAndroid({
|
|
8
12
|
root: process.cwd(),
|
|
9
|
-
|
|
13
|
+
port: options?.config?.config?.server?.port,
|
|
10
14
|
})
|
|
11
15
|
}
|
package/src/cli/runIos.ts
CHANGED
|
@@ -3,11 +3,13 @@ import { loadUserOneOptions } from '../vite/loadConfig'
|
|
|
3
3
|
export async function run(args: {}) {
|
|
4
4
|
const { runIos } = await import('vxrn')
|
|
5
5
|
|
|
6
|
-
//
|
|
7
|
-
//
|
|
6
|
+
// resolve the app's dev server port from its vite config so the launched
|
|
7
|
+
// app points at the real dev server (vxrn passes it as expo's --port and
|
|
8
|
+
// expo reuses the already-running server for this project root)
|
|
9
|
+
const options = await loadUserOneOptions('serve', true).catch(() => null)
|
|
8
10
|
|
|
9
11
|
await runIos({
|
|
10
12
|
root: process.cwd(),
|
|
11
|
-
|
|
13
|
+
port: options?.config?.config?.server?.port,
|
|
12
14
|
})
|
|
13
15
|
}
|
|
@@ -24,6 +24,27 @@ type Options = LinkingOptions<ParamListBase>
|
|
|
24
24
|
|
|
25
25
|
const linkingHandlers: symbol[] = []
|
|
26
26
|
|
|
27
|
+
// @modified: our fork of getStateFromPath assigns deterministic route keys
|
|
28
|
+
// (SSR/hydration stability), but upstream getActionFromState only produces a
|
|
29
|
+
// nested NAVIGATE for keyless routes — keyed routes degrade to a whole-tree
|
|
30
|
+
// RESET that the One router store immediately reverts, so incoming Linking
|
|
31
|
+
// 'url' events never navigated on native. Strip the keys before deriving the
|
|
32
|
+
// action; hydration keys only matter for web SSR, never for a live native
|
|
33
|
+
// deep link.
|
|
34
|
+
type LinkingResultState = NonNullable<ResultState>
|
|
35
|
+
|
|
36
|
+
function stripRouteKeys(state: LinkingResultState): LinkingResultState {
|
|
37
|
+
return {
|
|
38
|
+
...state,
|
|
39
|
+
routes: state.routes.map((route) => {
|
|
40
|
+
const { key, ...rest } = route as typeof route & { key?: string }
|
|
41
|
+
return rest.state
|
|
42
|
+
? { ...rest, state: stripRouteKeys(rest.state as LinkingResultState) }
|
|
43
|
+
: rest
|
|
44
|
+
}),
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
27
48
|
export function useLinking(
|
|
28
49
|
ref: React.RefObject<NavigationContainerRef<ParamListBase>>,
|
|
29
50
|
{
|
|
@@ -197,7 +218,8 @@ export function useLinking(
|
|
|
197
218
|
return
|
|
198
219
|
}
|
|
199
220
|
|
|
200
|
-
|
|
221
|
+
// @modified: keys stripped so getActionFromState can produce NAVIGATE
|
|
222
|
+
const action = getActionFromStateRef.current(stripRouteKeys(state), configRef.current)
|
|
201
223
|
|
|
202
224
|
if (action !== undefined) {
|
|
203
225
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runAndroid.d.ts","sourceRoot":"","sources":["../../src/cli/runAndroid.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runAndroid.d.ts","sourceRoot":"","sources":["../../src/cli/runAndroid.ts"],"names":[],"mappings":"AAEA,wBAAsB,GAAG,CAAC,IAAI,EAAE,EAAE,iBAYjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runIos.d.ts","sourceRoot":"","sources":["../../src/cli/runIos.ts"],"names":[],"mappings":"AAEA,wBAAsB,GAAG,CAAC,IAAI,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"runIos.d.ts","sourceRoot":"","sources":["../../src/cli/runIos.ts"],"names":[],"mappings":"AAEA,wBAAsB,GAAG,CAAC,IAAI,EAAE,EAAE,iBAYjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.native.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"useLinking.native.d.ts","sourceRoot":"","sources":["../../src/fork/useLinking.native.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAGL,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAEnB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,KAAK,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,CAAA;AAyB5C,wBAAgB,UAAU,CACxB,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAC3D,EACE,OAAc,EACd,QAAQ,EACR,MAAM,EACN,MAAM,EACN,aAQI,EACJ,SAmBC,EACD,gBAA0C,EAC1C,kBAA8C,GAC/C,EAAE,OAAO,EACV,kBAAkB,EAAE,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;EAiKtE"}
|