one 1.10.3 → 1.10.5
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/devtools/source-inspector.mjs +4 -2
- package/dist/cjs/router/getRoutes.cjs +8 -1
- package/dist/cjs/router/getRoutes.js +12 -1
- package/dist/cjs/router/getRoutes.js.map +1 -1
- package/dist/cjs/router/getRoutes.native.js +40 -1
- package/dist/cjs/router/getRoutes.native.js.map +1 -1
- package/dist/cjs/router/getRoutes.test.cjs +58 -0
- package/dist/cjs/router/getRoutes.test.js +46 -0
- package/dist/cjs/router/getRoutes.test.js.map +6 -0
- package/dist/cjs/router/getRoutes.test.native.js +105 -0
- package/dist/cjs/router/getRoutes.test.native.js.map +1 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.cjs +5 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.js +6 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.js.map +1 -1
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.native.js +5 -0
- package/dist/cjs/vite/plugins/sourceInspectorPlugin.native.js.map +1 -1
- package/dist/esm/router/getRoutes.js +12 -1
- package/dist/esm/router/getRoutes.js.map +1 -1
- package/dist/esm/router/getRoutes.mjs +8 -1
- package/dist/esm/router/getRoutes.mjs.map +1 -1
- package/dist/esm/router/getRoutes.native.js +40 -1
- package/dist/esm/router/getRoutes.native.js.map +1 -1
- package/dist/esm/router/getRoutes.test.js +47 -0
- package/dist/esm/router/getRoutes.test.js.map +6 -0
- package/dist/esm/router/getRoutes.test.mjs +59 -0
- package/dist/esm/router/getRoutes.test.mjs.map +1 -0
- package/dist/esm/router/getRoutes.test.native.js +103 -0
- package/dist/esm/router/getRoutes.test.native.js.map +1 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.js +6 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.js.map +1 -1
- package/dist/esm/vite/plugins/sourceInspectorPlugin.mjs +5 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.mjs.map +1 -1
- package/dist/esm/vite/plugins/sourceInspectorPlugin.native.js +5 -0
- package/dist/esm/vite/plugins/sourceInspectorPlugin.native.js.map +1 -1
- package/package.json +9 -9
- package/src/router/getRoutes.test.ts +74 -0
- package/src/router/getRoutes.ts +18 -1
- package/src/vite/plugins/sourceInspectorPlugin.ts +10 -0
- package/types/router/getRoutes.test.d.ts +2 -0
- package/types/router/getRoutes.test.d.ts.map +1 -0
- package/types/vite/plugins/sourceInspectorPlugin.d.ts.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","parse","normalizePath","findJsxElements","code","filename","result","errors","length","locations","getJsxName","node","type","name","obj","object","property","getLocation","offset","lines","slice","split","line","column","walk","tagName","endsWith","attributes","some","attr","nameEnd","end","loc","start","push","insertOffset","key","Object","keys","value","Array","isArray","child","program","sort","a","b","injectSourceToJsx","id","filePath","location","replace","process","cwd","includes","jsxLocations","jsx","sourceAttr","map","openInEditor","
|
|
1
|
+
{"version":3,"names":["path","parse","normalizePath","findJsxElements","code","filename","result","errors","length","locations","getJsxName","node","type","name","obj","object","property","getLocation","offset","lines","slice","split","line","column","walk","tagName","endsWith","attributes","some","attr","nameEnd","end","loc","start","push","insertOffset","key","Object","keys","value","Array","isArray","child","program","sort","a","b","injectSourceToJsx","id","filePath","location","replace","process","cwd","includes","jsxLocations","jsx","sourceAttr","map","openInEditor","platform","m","editorInfo","default","launch","join","errorMessage","console","warn","err","vscodeClients","Set","sourceInspectorPlugin","cache","Map","enforce","apply","transform","envName","environment","has","get","out","set","size","clear","configureServer","server","wss","then","WebSocketServer","noServer","httpServer","on","req","socket","head","url","handleUpgrade","ws","add","data","message","JSON","toString","hot","send","file","delete","middlewares","use","res","next","startsWith","source","URL","searchParams","statusCode","parts","pop","error"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.ts"],"sourcesContent":[null],"mappings":"AAAA,OAAOA,IAAA,MAAU;AACjB,SAASC,KAAA,QAAa;AAEtB,SAASC,aAAA,QAAqB;AAe9B,eAAeC,gBAAgBC,IAAA,EAAcC,QAAA,EAA0C;EACrF,MAAMC,MAAA,GAAS,MAAML,KAAA,CAAMI,QAAA,EAAUD,IAAI;EAEzC,IAAIE,MAAA,CAAOC,MAAA,CAAOC,MAAA,GAAS,GACzB,OAAO,EAAC;EAGV,MAAMC,SAAA,GAA2B,EAAC;EAElC,SAASC,WAAWC,IAAA,EAA0B;IAC5C,IAAI,CAACA,IAAA,EAAM,OAAO;IAClB,IAAIA,IAAA,CAAKC,IAAA,KAAS,iBAAiB,OAAOD,IAAA,CAAKE,IAAA;IAC/C,IAAIF,IAAA,CAAKC,IAAA,KAAS,uBAAuB;MACvC,MAAME,GAAA,GAAMJ,UAAA,CAAWC,IAAA,CAAKI,MAAM;MAClC,OAAOD,GAAA,GAAM,GAAGA,GAAG,IAAIH,IAAA,CAAKK,QAAA,EAAUH,IAAI,KAAK;IACjD;IACA,OAAO;EACT;EAEA,SAASI,YAAYC,MAAA,EAAkD;IAErE,MAAMC,KAAA,GADSf,IAAA,CAAKgB,KAAA,CAAM,GAAGF,MAAM,EACdG,KAAA,CAAM;AAAA,CAAI;IAC/B,OAAO;MACLC,IAAA,EAAMH,KAAA,CAAMX,MAAA;MACZe,MAAA,EAAQJ,KAAA,CAAMA,KAAA,CAAMX,MAAA,GAAS,CAAC,EAAGA,MAAA,GAAS;IAC5C;EACF;EAEA,SAASgB,KAAKb,IAAA,EAAiB;IAC7B,IAAI,GAACA,IAAA,IAAQ,OAAOA,IAAA,IAAS,WAE7B;MAAA,IAAIA,IAAA,CAAKC,IAAA,KAAS,uBAAuBD,IAAA,CAAKE,IAAA,EAAM;QAClD,MAAMY,OAAA,GAAUf,UAAA,CAAWC,IAAA,CAAKE,IAAI;QAGpC,IAAIY,OAAA,IAAWA,OAAA,KAAY,cAAc,CAACA,OAAA,CAAQC,QAAA,CAAS,WAAW,KAMhE,CALkBf,IAAA,CAAKgB,UAAA,EAAYC,IAAA,CACpCC,IAAA,IACCA,IAAA,CAAKjB,IAAA,KAAS,kBAAkBiB,IAAA,CAAKhB,IAAA,EAAMA,IAAA,KAAS,iBACxD,GAEoB;UAClB,MAAMiB,OAAA,GAAUnB,IAAA,CAAKE,IAAA,CAAKkB,GAAA;YACpBC,GAAA,GAAMf,WAAA,CAAYN,IAAA,CAAKsB,KAAK;UAElCxB,SAAA,CAAUyB,IAAA,CAAK;YACbC,YAAA,EAAcL,OAAA;YACdR,IAAA,EAAMU,GAAA,CAAIV,IAAA;YACVC,MAAA,EAAQS,GAAA,CAAIT;UACd,CAAC;QACH;MAEJ;MAEA,WAAWa,GAAA,IAAOC,MAAA,CAAOC,IAAA,CAAK3B,IAAI,GAAG;QACnC,IAAIyB,GAAA,KAAQ,UAAU;QACtB,MAAMG,KAAA,GAAQ5B,IAAA,CAAKyB,GAAG;QACtB,IAAII,KAAA,CAAMC,OAAA,CAAQF,KAAK,GACrB,WAAWG,KAAA,IAASH,KAAA,EAClBf,IAAA,CAAKkB,KAAK,OAEHH,KAAA,IAAS,OAAOA,KAAA,IAAU,YACnCf,IAAA,CAAKe,KAAK;MAEd;IAAA;EACF;EAEA,OAAAf,IAAA,CAAKlB,MAAA,CAAOqC,OAAO,GAEZlC,SAAA,CAAUmC,IAAA,CAAK,CAACC,CAAA,EAAGC,CAAA,KAAMA,CAAA,CAAEX,YAAA,GAAeU,CAAA,CAAEV,YAAY;AACjE;AAOA,eAAeY,kBAAkB3C,IAAA,EAAc4C,EAAA,EAAmC;EAChF,MAAM,CAACC,QAAQ,IAAID,EAAA,CAAG3B,KAAA,CAAM,GAAG;EAC/B,IAAI,CAAC4B,QAAA,EAAU;EAEf,MAAMC,QAAA,GAAWD,QAAA,CAASE,OAAA,CAAQjD,aAAA,CAAckD,OAAA,CAAQC,GAAA,CAAI,CAAC,GAAG,EAAE;EAGlE,IAAI,CAACjD,IAAA,CAAKkD,QAAA,CAAS,GAAG,KAAK,CAAClD,IAAA,CAAKkD,QAAA,CAAS,GAAG,GAC3C;EAGF,MAAMC,YAAA,GAAe,MAAMpD,eAAA,CAAgBC,IAAA,EAAM6C,QAAQ;EAEzD,IAAIM,YAAA,CAAa/C,MAAA,KAAW,GAC1B;EAGF,IAAIF,MAAA,GAASF,IAAA;EAGb,WAAWoD,GAAA,IAAOD,YAAA,EAAc;IAC9B,MAAME,UAAA,GAAa,qBAAqBP,QAAQ,IAAIM,GAAA,CAAIlC,IAAI,IAAIkC,GAAA,CAAIjC,MAAM;IAC1EjB,MAAA,GACEA,MAAA,CAAOc,KAAA,CAAM,GAAGoC,GAAA,CAAIrB,YAAY,IAAIsB,UAAA,GAAanD,MAAA,CAAOc,KAAA,CAAMoC,GAAA,CAAIrB,YAAY;EAClF;EAEA,OAAO;IAAE/B,IAAA,EAAME,MAAA;IAAQoD,GAAA,EAAK;EAAK;AACnC;AAEA,eAAeC,aACbV,QAAA,EACA3B,IAAA,EACAC,MAAA,EACe;EACf,IAAI;IAGF,IAAI6B,OAAA,CAAQQ,QAAA,KAAa,UACvB,IAAI;MACF,MAAMC,CAAA,GAAI,MAAM,OAAO,oCAAoC;QACrDC,UAAA,GAAaD,CAAA,CAAEE,OAAA,IAAWF,CAAA;MAChCC,UAAA,CAAW,0DAA0D,IAAI;IAC3E,QAAQ,CAAC;IAGX,MAAME,MAAA,IAAU,MAAM,OAAO,eAAe,GAAGD,OAAA;MAEzCb,QAAA,GAAW,GADAlD,IAAA,CAAKiE,IAAA,CAAKb,OAAA,CAAQC,GAAA,CAAI,GAAGJ,QAAQ,CACtB,GAAG3B,IAAA,GAAO,IAAIA,IAAI,KAAK,EAAE,GAAGC,MAAA,GAAS,IAAIA,MAAM,KAAK,EAAE;IAElFyC,MAAA,CAAOd,QAAA,EAAU,QAAW,CAAC7C,QAAA,EAAkB6D,YAAA,KAAgC;MACzEA,YAAA,IACFC,OAAA,CAAQC,IAAA,CACN,yCAAyC/D,QAAQ,eACjD6D,YACF;IAEJ,CAAC;EACH,SAASG,GAAA,EAAK;IACZF,OAAA,CAAQC,IAAA,CAAK,mDAAmDC,GAAG;EACrE;AACF;AAGA,MAAMC,aAAA,GAAgB,mBAAIC,GAAA,CAAe;AAElC,SAASC,sBAAA,EAAkC;EAChD,MAAMC,KAAA,GAAQ,mBAAIC,GAAA,CAA0B;EAE5C,OAAO;EAAA;EAEL;IACE7D,IAAA,EAAM;IACN8D,OAAA,EAAS;IACTC,KAAA,EAAO;IAEP,MAAMC,UAAUzE,IAAA,EAAM4C,EAAA,EAAI;MACxB,MAAM8B,OAAA,GAAU,KAAKC,WAAA,EAAalE,IAAA;MAalC,IAXIiE,OAAA,KAAY,SAASA,OAAA,KAAY,aAGnC9B,EAAA,CAAGM,QAAA,CAAS,cAAc,KAC1BN,EAAA,CAAGM,QAAA,CAAS,MAAM,KAClBN,EAAA,CAAGM,QAAA,CAAS,MAAM,KAClBN,EAAA,CAAGM,QAAA,CAAS,OAAO,KAKjB,CAACN,EAAA,CAAGtB,QAAA,CAAS,MAAM,KAAK,CAACsB,EAAA,CAAGtB,QAAA,CAAS,MAAM,GAAG;MAElD,IAAI+C,KAAA,CAAMO,GAAA,CAAI5E,IAAI,GAChB,OAAOqE,KAAA,CAAMQ,GAAA,CAAI7E,IAAI;MAGvB,MAAM8E,GAAA,GAAM,MAAMnC,iBAAA,CAAkB3C,IAAA,EAAM4C,EAAE;MAC5C,OAAAyB,KAAA,CAAMU,GAAA,CAAI/E,IAAA,EAAM8E,GAAG,GAEfT,KAAA,CAAMW,IAAA,GAAO,OACfX,KAAA,CAAMY,KAAA,CAAM,GAGPH,GAAA;IACT;EACF;EAAA;EAAA;EAKA;IACErE,IAAA,EAAM;IACN+D,KAAA,EAAO;IAEPU,gBAAgBC,MAAA,EAAuB;MAErC,IAAIC,GAAA,GAAgE;MAEpE,OAAO,IAAI,EAAEC,IAAA,CAAK,CAAC;QAAEC;MAAgB,MAAM;QACzCF,GAAA,GAAM,IAAIE,eAAA,CAAgB;UAAEC,QAAA,EAAU;QAAK,CAAC,GAE5CJ,MAAA,CAAOK,UAAA,EAAYC,EAAA,CAAG,WAAW,CAACC,GAAA,EAAKC,MAAA,EAAQC,IAAA,KAAS;UAClDF,GAAA,CAAIG,GAAA,KAAQ,mBAEhBT,GAAA,CAAKU,aAAA,CAAcJ,GAAA,EAAKC,MAAA,EAAQC,IAAA,EAAOG,EAAA,IAAO;YAC5C7B,aAAA,CAAc8B,GAAA,CAAID,EAAE,GAEpBA,EAAA,CAAGN,EAAA,CAAG,WAAYQ,IAAA,IAAS;cACzB,IAAI;gBACF,MAAMC,OAAA,GAAUC,IAAA,CAAKtG,KAAA,CAAMoG,IAAA,CAAKG,QAAA,CAAS,CAAC;gBAGtCF,OAAA,CAAQ1F,IAAA,KAAS,oBACnB2E,MAAA,CAAOkB,GAAA,CAAIC,IAAA,CAAK,wBAAwB;kBACtCC,IAAA,EAAML,OAAA,CAAQK,IAAA;kBACdrF,IAAA,EAAMgF,OAAA,CAAQhF,IAAA;kBACdC,MAAA,EAAQ+E,OAAA,CAAQ/E;gBAClB,CAAC,IACQ+E,OAAA,CAAQ1F,IAAA,KAAS,kBAC1B2E,MAAA,CAAOkB,GAAA,CAAIC,IAAA,CAAK,wBAAwB;kBAAErB,KAAA,EAAO;gBAAK,CAAC;cAE3D,QAAQ,CAER;YACF,CAAC,GAEDc,EAAA,CAAGN,EAAA,CAAG,SAAS,MAAM;cACnBvB,aAAA,CAAcsC,MAAA,CAAOT,EAAE,GAEvBZ,MAAA,CAAOkB,GAAA,CAAIC,IAAA,CAAK,wBAAwB;gBAAErB,KAAA,EAAO;cAAK,CAAC;YACzD,CAAC;UACH,CAAC;QACH,CAAC;MACH,CAAC,GAEDE,MAAA,CAAOsB,WAAA,CAAYC,GAAA,CAAI,OAAOhB,GAAA,EAAKiB,GAAA,EAAKC,IAAA,KAAS;QAC/C,IAAI,CAAClB,GAAA,CAAIG,GAAA,EAAKgB,UAAA,CAAW,oBAAoB,GAC3C,OAAOD,IAAA,CAAK;QAGd,IAAI;UAEF,MAAME,MAAA,GADM,IAAIC,GAAA,CAAIrB,GAAA,CAAIG,GAAA,EAAK,kBAAkB,EAC5BmB,YAAA,CAAanC,GAAA,CAAI,QAAQ;UAE5C,IAAI,CAACiC,MAAA,EAAQ;YACXH,GAAA,CAAIM,UAAA,GAAa,KACjBN,GAAA,CAAIhF,GAAA,CAAI,0BAA0B;YAClC;UACF;UAGA,MAAMuF,KAAA,GAAQJ,MAAA,CAAO7F,KAAA,CAAM,GAAG;YACxBE,MAAA,GAAS+F,KAAA,CAAMC,GAAA,CAAI;YACnBjG,IAAA,GAAOgG,KAAA,CAAMC,GAAA,CAAI;YACjBtE,QAAA,GAAWqE,KAAA,CAAMrD,IAAA,CAAK,GAAG;UAE/B,MAAMN,YAAA,CAAaV,QAAA,EAAU3B,IAAA,EAAMC,MAAM,GAEzCwF,GAAA,CAAIM,UAAA,GAAa,KACjBN,GAAA,CAAIhF,GAAA,CAAI,IAAI;QACd,SAASsC,GAAA,EAAK;UACZF,OAAA,CAAQqD,KAAA,CAAM,iCAAiCnD,GAAG,GAClD0C,GAAA,CAAIM,UAAA,GAAa,KACjBN,GAAA,CAAIhF,GAAA,CAAI,uBAAuB;QACjC;MACF,CAAC;IACH;EACF,EACF;AACF","ignoreList":[]}
|
|
@@ -130,6 +130,11 @@ async function injectSourceToJsx(code, id) {
|
|
|
130
130
|
}
|
|
131
131
|
async function openInEditor(filePath, line, column) {
|
|
132
132
|
try {
|
|
133
|
+
if (process.platform === "darwin") try {
|
|
134
|
+
var m = await import("launch-editor/editor-info/macos.js"),
|
|
135
|
+
editorInfo = m.default || m;
|
|
136
|
+
editorInfo["/Applications/Visual Studio Code.app/Contents/MacOS/Code"] = "code";
|
|
137
|
+
} catch {}
|
|
133
138
|
var launch = (await import("launch-editor")).default,
|
|
134
139
|
fullPath = path.join(process.cwd(), filePath),
|
|
135
140
|
location = `${fullPath}${line ? `:${line}` : ""}${column ? `:${column}` : ""}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["path","parse","normalizePath","_type_of","obj","Symbol","constructor","findJsxElements","code","filename","result","errors","length","locations","getJsxName","node","type","name","_node_property","object","property","getLocation","offset","before","slice","lines","split","line","column","walk","tagName","endsWith","_node_attributes","hasSourceAttr","attributes","some","attr","_attr_name","nameEnd","end","loc","start","push","insertOffset","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","iterator","_step","next","done","key","value","Array","isArray","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","child","err","return","program","sort","a","b","injectSourceToJsx","id","filePath","location","replace","process","cwd","includes","jsxLocations","jsx","sourceAttr","map","openInEditor","
|
|
1
|
+
{"version":3,"names":["path","parse","normalizePath","_type_of","obj","Symbol","constructor","findJsxElements","code","filename","result","errors","length","locations","getJsxName","node","type","name","_node_property","object","property","getLocation","offset","before","slice","lines","split","line","column","walk","tagName","endsWith","_node_attributes","hasSourceAttr","attributes","some","attr","_attr_name","nameEnd","end","loc","start","push","insertOffset","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Object","keys","iterator","_step","next","done","key","value","Array","isArray","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","_step1","child","err","return","program","sort","a","b","injectSourceToJsx","id","filePath","location","replace","process","cwd","includes","jsxLocations","jsx","sourceAttr","map","openInEditor","platform","m","editorInfo","default","launch","fullPath","join","errorMessage","console","warn","vscodeClients","Set","sourceInspectorPlugin","cache","Map","enforce","apply","transform","_this_environment","envName","environment"],"sources":["../../../../src/vite/plugins/sourceInspectorPlugin.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.10.
|
|
3
|
+
"version": "1.10.5",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"sideEffects": [
|
|
6
6
|
"setup.mjs",
|
|
@@ -154,17 +154,17 @@
|
|
|
154
154
|
"@react-navigation/routers": "~7.5.1",
|
|
155
155
|
"@swc/core": "^1.14.0",
|
|
156
156
|
"@ungap/structured-clone": "^1.2.0",
|
|
157
|
-
"@vxrn/color-scheme": "1.10.
|
|
158
|
-
"@vxrn/compiler": "1.10.
|
|
159
|
-
"@vxrn/resolve": "1.10.
|
|
160
|
-
"@vxrn/tslib-lite": "1.10.
|
|
161
|
-
"@vxrn/use-isomorphic-layout-effect": "1.10.
|
|
162
|
-
"@vxrn/vite-plugin-metro": "1.10.
|
|
157
|
+
"@vxrn/color-scheme": "1.10.5",
|
|
158
|
+
"@vxrn/compiler": "1.10.5",
|
|
159
|
+
"@vxrn/resolve": "1.10.5",
|
|
160
|
+
"@vxrn/tslib-lite": "1.10.5",
|
|
161
|
+
"@vxrn/use-isomorphic-layout-effect": "1.10.5",
|
|
162
|
+
"@vxrn/vite-plugin-metro": "1.10.5",
|
|
163
163
|
"babel-dead-code-elimination": "1.0.10",
|
|
164
164
|
"babel-plugin-module-resolver": "^5.0.2",
|
|
165
165
|
"citty": "^0.1.6",
|
|
166
166
|
"core-js": "^3.38.1",
|
|
167
|
-
"create-vxrn": "1.10.
|
|
167
|
+
"create-vxrn": "1.10.5",
|
|
168
168
|
"escape-string-regexp": "^5.0.0",
|
|
169
169
|
"expo-linking": "~8.0.8",
|
|
170
170
|
"expo-modules-core": "~3.0.24",
|
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
"use-latest-callback": "^0.2.3",
|
|
190
190
|
"vite": "^7.1.12",
|
|
191
191
|
"vite-tsconfig-paths": "^6.0.5",
|
|
192
|
-
"vxrn": "1.10.
|
|
192
|
+
"vxrn": "1.10.5",
|
|
193
193
|
"ws": "^8.18.0",
|
|
194
194
|
"xxhashjs": "^0.2.2"
|
|
195
195
|
},
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest'
|
|
2
|
+
import { getRoutes } from './getRoutes'
|
|
3
|
+
import type { One } from '../vite/types'
|
|
4
|
+
|
|
5
|
+
function createMockContext(files: Record<string, any>): One.RouteContext {
|
|
6
|
+
const keys = Object.keys(files)
|
|
7
|
+
const ctx = function (id: string) {
|
|
8
|
+
return files[id] || {}
|
|
9
|
+
} as One.RouteContext
|
|
10
|
+
ctx.keys = () => keys
|
|
11
|
+
ctx.resolve = (id: string) => id
|
|
12
|
+
ctx.id = 'test'
|
|
13
|
+
return ctx
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function collectRoutes(node: any, routes: any[] = []): any[] {
|
|
17
|
+
if (node.children?.length === 0 && node.route) {
|
|
18
|
+
routes.push(node)
|
|
19
|
+
}
|
|
20
|
+
for (const child of node.children || []) {
|
|
21
|
+
collectRoutes(child, routes)
|
|
22
|
+
}
|
|
23
|
+
return routes
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
describe('getRoutes', () => {
|
|
27
|
+
it('should not create duplicate +not-found when one exists in a group subdirectory', () => {
|
|
28
|
+
const ctx = createMockContext({
|
|
29
|
+
'./_layout.tsx': { default: () => null },
|
|
30
|
+
'./(site)/_layout.tsx': { default: () => null },
|
|
31
|
+
'./(site)/index.tsx': { default: () => null },
|
|
32
|
+
'./(site)/+not-found.tsx': { default: () => null },
|
|
33
|
+
})
|
|
34
|
+
|
|
35
|
+
const root = getRoutes(ctx, {
|
|
36
|
+
ignoreEntryPoints: true,
|
|
37
|
+
ignoreRequireErrors: true,
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
expect(root).not.toBeNull()
|
|
41
|
+
|
|
42
|
+
const allRoutes = collectRoutes(root!)
|
|
43
|
+
const notFoundRoutes = allRoutes.filter(
|
|
44
|
+
(r) => r.route === '+not-found' || r.route?.endsWith('+not-found')
|
|
45
|
+
)
|
|
46
|
+
|
|
47
|
+
// should only have the user's +not-found, not a generated duplicate
|
|
48
|
+
expect(notFoundRoutes).toHaveLength(1)
|
|
49
|
+
expect(notFoundRoutes[0].contextKey).toBe('./(site)/+not-found.tsx')
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
it('should still append generated +not-found when none exists in any group', () => {
|
|
53
|
+
const ctx = createMockContext({
|
|
54
|
+
'./_layout.tsx': { default: () => null },
|
|
55
|
+
'./(site)/_layout.tsx': { default: () => null },
|
|
56
|
+
'./(site)/index.tsx': { default: () => null },
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
const root = getRoutes(ctx, {
|
|
60
|
+
ignoreEntryPoints: true,
|
|
61
|
+
ignoreRequireErrors: true,
|
|
62
|
+
})
|
|
63
|
+
|
|
64
|
+
expect(root).not.toBeNull()
|
|
65
|
+
|
|
66
|
+
const allRoutes = collectRoutes(root!)
|
|
67
|
+
const notFoundRoutes = allRoutes.filter(
|
|
68
|
+
(r) => r.route === '+not-found' || r.route?.endsWith('+not-found')
|
|
69
|
+
)
|
|
70
|
+
|
|
71
|
+
expect(notFoundRoutes).toHaveLength(1)
|
|
72
|
+
expect(notFoundRoutes[0].generated).toBe(true)
|
|
73
|
+
})
|
|
74
|
+
})
|
package/src/router/getRoutes.ts
CHANGED
|
@@ -755,8 +755,25 @@ function appendSitemapRoute(directory: DirectoryNode) {
|
|
|
755
755
|
}
|
|
756
756
|
}
|
|
757
757
|
|
|
758
|
+
function hasNotFoundInGroupSubdirs(directory: DirectoryNode): boolean {
|
|
759
|
+
for (const [dirName, subDir] of directory.subdirectories) {
|
|
760
|
+
if (!matchGroupName(dirName)) continue
|
|
761
|
+
for (const fileKey of subDir.files.keys()) {
|
|
762
|
+
if (fileKey.endsWith('+not-found')) {
|
|
763
|
+
return true
|
|
764
|
+
}
|
|
765
|
+
}
|
|
766
|
+
if (hasNotFoundInGroupSubdirs(subDir)) {
|
|
767
|
+
return true
|
|
768
|
+
}
|
|
769
|
+
}
|
|
770
|
+
return false
|
|
771
|
+
}
|
|
772
|
+
|
|
758
773
|
function appendNotFoundRoute(directory: DirectoryNode) {
|
|
759
|
-
|
|
774
|
+
// also check group subdirectories since groups are transparent in routing
|
|
775
|
+
// e.g. (site)/+not-found.tsx resolves to the same path as root +not-found
|
|
776
|
+
if (!directory.files.has('+not-found') && !hasNotFoundInGroupSubdirs(directory)) {
|
|
760
777
|
directory.files.set('+not-found', [
|
|
761
778
|
{
|
|
762
779
|
loadRoute() {
|
|
@@ -128,6 +128,16 @@ async function openInEditor(
|
|
|
128
128
|
column?: string
|
|
129
129
|
): Promise<void> {
|
|
130
130
|
try {
|
|
131
|
+
// patch launch-editor's macos detection map for editors that renamed their binaries
|
|
132
|
+
// (VS Code renamed binary from Electron to Code)
|
|
133
|
+
if (process.platform === 'darwin') {
|
|
134
|
+
try {
|
|
135
|
+
const m = await import('launch-editor/editor-info/macos.js')
|
|
136
|
+
const editorInfo = m.default || m
|
|
137
|
+
editorInfo['/Applications/Visual Studio Code.app/Contents/MacOS/Code'] = 'code'
|
|
138
|
+
} catch {}
|
|
139
|
+
}
|
|
140
|
+
|
|
131
141
|
const launch = (await import('launch-editor')).default
|
|
132
142
|
const fullPath = path.join(process.cwd(), filePath)
|
|
133
143
|
const location = `${fullPath}${line ? `:${line}` : ''}${column ? `:${column}` : ''}`
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getRoutes.test.d.ts","sourceRoot":"","sources":["../../src/router/getRoutes.test.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceInspectorPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/sourceInspectorPlugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"sourceInspectorPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/sourceInspectorPlugin.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAA;AA8JjD,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CA2HhD"}
|