@tanstack/react-router 0.0.1-beta.71 → 0.0.1-beta.74

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.
Files changed (7) hide show
  1. package/build/stats-html.html +1 -1
  2. package/build/stats-react.json +55 -55
  3. package/build/umd/index.development.js +33 -16
  4. package/build/umd/index.development.js.map +1 -1
  5. package/build/umd/index.production.js +2 -2
  6. package/build/umd/index.production.js.map +1 -1
  7. package/package.json +2 -2
package/build/stats-html.html CHANGED
@@ -4024,7 +4024,7 @@ var drawChart = (function (exports) {
4024
4024
  </script>
4025
4025
  <script>
4026
4026
  /*<!--*/
4027
- const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"48bd-93","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"node_modules/.pnpm","children":[{"name":"tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","uid":"48bd-95"},{"name":"tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js","uid":"48bd-97"}]},{"name":"packages","children":[{"name":"store/build/esm/index.js","uid":"48bd-99"},{"name":"router/build/esm/index.js","uid":"48bd-101"},{"name":"react-store/build/esm/index.js","uid":"48bd-103"},{"name":"react-router/src/index.tsx","uid":"48bd-105"}]}]}],"isRoot":true},"nodeParts":{"48bd-93":{"renderedLength":429,"gzipLength":238,"brotliLength":0,"mainUid":"48bd-92"},"48bd-95":{"renderedLength":181,"gzipLength":129,"brotliLength":0,"mainUid":"48bd-94"},"48bd-97":{"renderedLength":44,"gzipLength":62,"brotliLength":0,"mainUid":"48bd-96"},"48bd-99":{"renderedLength":1288,"gzipLength":497,"brotliLength":0,"mainUid":"48bd-98"},"48bd-101":{"renderedLength":46374,"gzipLength":11002,"brotliLength":0,"mainUid":"48bd-100"},"48bd-103":{"renderedLength":1571,"gzipLength":594,"brotliLength":0,"mainUid":"48bd-102"},"48bd-105":{"renderedLength":12514,"gzipLength":3242,"brotliLength":0,"mainUid":"48bd-104"}},"nodeMetas":{"48bd-92":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"48bd-93"},"imported":[],"importedBy":[{"uid":"48bd-104"}]},"48bd-94":{"id":"/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","moduleParts":{"index.production.js":"48bd-95"},"imported":[],"importedBy":[{"uid":"48bd-100"}]},"48bd-96":{"id":"/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js","moduleParts":{"index.production.js":"48bd-97"},"imported":[],"importedBy":[{"uid":"48bd-100"}]},"48bd-98":{"id":"/packages/store/build/esm/index.js","moduleParts":{"index.production.js":"48bd-99"},"imported":[],"importedBy":[{"uid":"48bd-100"}]},"48bd-100":{"id":"/packages/router/build/esm/index.js","moduleParts":{"index.production.js":"48bd-101"},"imported":[{"uid":"48bd-94"},{"uid":"48bd-96"},{"uid":"48bd-98"}],"importedBy":[{"uid":"48bd-104"}]},"48bd-102":{"id":"/packages/react-store/build/esm/index.js","moduleParts":{"index.production.js":"48bd-103"},"imported":[{"uid":"48bd-107"}],"importedBy":[{"uid":"48bd-104"}]},"48bd-104":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"48bd-105"},"imported":[{"uid":"48bd-92"},{"uid":"48bd-106"},{"uid":"48bd-100"},{"uid":"48bd-102"}],"importedBy":[],"isEntry":true},"48bd-106":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"48bd-104"}],"isExternal":true},"48bd-107":{"id":"use-sync-external-store/shim/with-selector","moduleParts":{},"imported":[],"importedBy":[{"uid":"48bd-102"}],"isExternal":true}},"env":{"rollup":"2.79.1"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
4027
+ const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"ef61-93","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"node_modules/.pnpm","children":[{"name":"tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","uid":"ef61-95"},{"name":"tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js","uid":"ef61-97"}]},{"name":"packages","children":[{"name":"store/build/esm/index.js","uid":"ef61-99"},{"name":"router/build/esm/index.js","uid":"ef61-101"},{"name":"react-store/build/esm/index.js","uid":"ef61-103"},{"name":"react-router/src/index.tsx","uid":"ef61-105"}]}]}],"isRoot":true},"nodeParts":{"ef61-93":{"renderedLength":429,"gzipLength":238,"brotliLength":0,"mainUid":"ef61-92"},"ef61-95":{"renderedLength":181,"gzipLength":129,"brotliLength":0,"mainUid":"ef61-94"},"ef61-97":{"renderedLength":44,"gzipLength":62,"brotliLength":0,"mainUid":"ef61-96"},"ef61-99":{"renderedLength":1288,"gzipLength":497,"brotliLength":0,"mainUid":"ef61-98"},"ef61-101":{"renderedLength":46875,"gzipLength":11092,"brotliLength":0,"mainUid":"ef61-100"},"ef61-103":{"renderedLength":1571,"gzipLength":594,"brotliLength":0,"mainUid":"ef61-102"},"ef61-105":{"renderedLength":12514,"gzipLength":3242,"brotliLength":0,"mainUid":"ef61-104"}},"nodeMetas":{"ef61-92":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"ef61-93"},"imported":[],"importedBy":[{"uid":"ef61-104"}]},"ef61-94":{"id":"/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js","moduleParts":{"index.production.js":"ef61-95"},"imported":[],"importedBy":[{"uid":"ef61-100"}]},"ef61-96":{"id":"/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js","moduleParts":{"index.production.js":"ef61-97"},"imported":[],"importedBy":[{"uid":"ef61-100"}]},"ef61-98":{"id":"/packages/store/build/esm/index.js","moduleParts":{"index.production.js":"ef61-99"},"imported":[],"importedBy":[{"uid":"ef61-100"}]},"ef61-100":{"id":"/packages/router/build/esm/index.js","moduleParts":{"index.production.js":"ef61-101"},"imported":[{"uid":"ef61-94"},{"uid":"ef61-96"},{"uid":"ef61-98"}],"importedBy":[{"uid":"ef61-104"}]},"ef61-102":{"id":"/packages/react-store/build/esm/index.js","moduleParts":{"index.production.js":"ef61-103"},"imported":[{"uid":"ef61-107"}],"importedBy":[{"uid":"ef61-104"}]},"ef61-104":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"ef61-105"},"imported":[{"uid":"ef61-92"},{"uid":"ef61-106"},{"uid":"ef61-100"},{"uid":"ef61-102"}],"importedBy":[],"isEntry":true},"ef61-106":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"ef61-104"}],"isExternal":true},"ef61-107":{"id":"use-sync-external-store/shim/with-selector","moduleParts":{},"imported":[],"importedBy":[{"uid":"ef61-102"}],"isExternal":true}},"env":{"rollup":"2.79.1"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
4028
4028
 
4029
4029
  const run = () => {
4030
4030
  const width = window.innerWidth;
package/build/stats-react.json CHANGED
@@ -7,7 +7,7 @@
7
7
  "name": "index.production.js",
8
8
  "children": [
9
9
  {
10
- "uid": "48bd-109",
10
+ "uid": "ef61-109",
11
11
  "name": "\u0000rollupPluginBabelHelpers.js"
12
12
  },
13
13
  {
@@ -15,11 +15,11 @@
15
15
  "children": [
16
16
  {
17
17
  "name": "tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
18
- "uid": "48bd-111"
18
+ "uid": "ef61-111"
19
19
  },
20
20
  {
21
21
  "name": "tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
22
- "uid": "48bd-113"
22
+ "uid": "ef61-113"
23
23
  }
24
24
  ]
25
25
  },
@@ -28,19 +28,19 @@
28
28
  "children": [
29
29
  {
30
30
  "name": "store/build/esm/index.js",
31
- "uid": "48bd-115"
31
+ "uid": "ef61-115"
32
32
  },
33
33
  {
34
34
  "name": "router/build/esm/index.js",
35
- "uid": "48bd-117"
35
+ "uid": "ef61-117"
36
36
  },
37
37
  {
38
38
  "name": "react-store/build/esm/index.js",
39
- "uid": "48bd-119"
39
+ "uid": "ef61-119"
40
40
  },
41
41
  {
42
42
  "name": "react-router/src/index.tsx",
43
- "uid": "48bd-121"
43
+ "uid": "ef61-121"
44
44
  }
45
45
  ]
46
46
  }
@@ -50,176 +50,176 @@
50
50
  "isRoot": true
51
51
  },
52
52
  "nodeParts": {
53
- "48bd-109": {
53
+ "ef61-109": {
54
54
  "renderedLength": 429,
55
55
  "gzipLength": 238,
56
56
  "brotliLength": 0,
57
- "mainUid": "48bd-108"
57
+ "mainUid": "ef61-108"
58
58
  },
59
- "48bd-111": {
59
+ "ef61-111": {
60
60
  "renderedLength": 181,
61
61
  "gzipLength": 129,
62
62
  "brotliLength": 0,
63
- "mainUid": "48bd-110"
63
+ "mainUid": "ef61-110"
64
64
  },
65
- "48bd-113": {
65
+ "ef61-113": {
66
66
  "renderedLength": 44,
67
67
  "gzipLength": 62,
68
68
  "brotliLength": 0,
69
- "mainUid": "48bd-112"
69
+ "mainUid": "ef61-112"
70
70
  },
71
- "48bd-115": {
71
+ "ef61-115": {
72
72
  "renderedLength": 1288,
73
73
  "gzipLength": 497,
74
74
  "brotliLength": 0,
75
- "mainUid": "48bd-114"
75
+ "mainUid": "ef61-114"
76
76
  },
77
- "48bd-117": {
78
- "renderedLength": 46374,
79
- "gzipLength": 11002,
77
+ "ef61-117": {
78
+ "renderedLength": 46875,
79
+ "gzipLength": 11092,
80
80
  "brotliLength": 0,
81
- "mainUid": "48bd-116"
81
+ "mainUid": "ef61-116"
82
82
  },
83
- "48bd-119": {
83
+ "ef61-119": {
84
84
  "renderedLength": 1571,
85
85
  "gzipLength": 594,
86
86
  "brotliLength": 0,
87
- "mainUid": "48bd-118"
87
+ "mainUid": "ef61-118"
88
88
  },
89
- "48bd-121": {
89
+ "ef61-121": {
90
90
  "renderedLength": 12514,
91
91
  "gzipLength": 3242,
92
92
  "brotliLength": 0,
93
- "mainUid": "48bd-120"
93
+ "mainUid": "ef61-120"
94
94
  }
95
95
  },
96
96
  "nodeMetas": {
97
- "48bd-108": {
97
+ "ef61-108": {
98
98
  "id": "\u0000rollupPluginBabelHelpers.js",
99
99
  "moduleParts": {
100
- "index.production.js": "48bd-109"
100
+ "index.production.js": "ef61-109"
101
101
  },
102
102
  "imported": [],
103
103
  "importedBy": [
104
104
  {
105
- "uid": "48bd-120"
105
+ "uid": "ef61-120"
106
106
  }
107
107
  ]
108
108
  },
109
- "48bd-110": {
109
+ "ef61-110": {
110
110
  "id": "/node_modules/.pnpm/tiny-invariant@1.3.1/node_modules/tiny-invariant/dist/esm/tiny-invariant.js",
111
111
  "moduleParts": {
112
- "index.production.js": "48bd-111"
112
+ "index.production.js": "ef61-111"
113
113
  },
114
114
  "imported": [],
115
115
  "importedBy": [
116
116
  {
117
- "uid": "48bd-116"
117
+ "uid": "ef61-116"
118
118
  }
119
119
  ]
120
120
  },
121
- "48bd-112": {
121
+ "ef61-112": {
122
122
  "id": "/node_modules/.pnpm/tiny-warning@1.0.3/node_modules/tiny-warning/dist/tiny-warning.esm.js",
123
123
  "moduleParts": {
124
- "index.production.js": "48bd-113"
124
+ "index.production.js": "ef61-113"
125
125
  },
126
126
  "imported": [],
127
127
  "importedBy": [
128
128
  {
129
- "uid": "48bd-116"
129
+ "uid": "ef61-116"
130
130
  }
131
131
  ]
132
132
  },
133
- "48bd-114": {
133
+ "ef61-114": {
134
134
  "id": "/packages/store/build/esm/index.js",
135
135
  "moduleParts": {
136
- "index.production.js": "48bd-115"
136
+ "index.production.js": "ef61-115"
137
137
  },
138
138
  "imported": [],
139
139
  "importedBy": [
140
140
  {
141
- "uid": "48bd-116"
141
+ "uid": "ef61-116"
142
142
  }
143
143
  ]
144
144
  },
145
- "48bd-116": {
145
+ "ef61-116": {
146
146
  "id": "/packages/router/build/esm/index.js",
147
147
  "moduleParts": {
148
- "index.production.js": "48bd-117"
148
+ "index.production.js": "ef61-117"
149
149
  },
150
150
  "imported": [
151
151
  {
152
- "uid": "48bd-110"
152
+ "uid": "ef61-110"
153
153
  },
154
154
  {
155
- "uid": "48bd-112"
155
+ "uid": "ef61-112"
156
156
  },
157
157
  {
158
- "uid": "48bd-114"
158
+ "uid": "ef61-114"
159
159
  }
160
160
  ],
161
161
  "importedBy": [
162
162
  {
163
- "uid": "48bd-120"
163
+ "uid": "ef61-120"
164
164
  }
165
165
  ]
166
166
  },
167
- "48bd-118": {
167
+ "ef61-118": {
168
168
  "id": "/packages/react-store/build/esm/index.js",
169
169
  "moduleParts": {
170
- "index.production.js": "48bd-119"
170
+ "index.production.js": "ef61-119"
171
171
  },
172
172
  "imported": [
173
173
  {
174
- "uid": "48bd-123"
174
+ "uid": "ef61-123"
175
175
  }
176
176
  ],
177
177
  "importedBy": [
178
178
  {
179
- "uid": "48bd-120"
179
+ "uid": "ef61-120"
180
180
  }
181
181
  ]
182
182
  },
183
- "48bd-120": {
183
+ "ef61-120": {
184
184
  "id": "/packages/react-router/src/index.tsx",
185
185
  "moduleParts": {
186
- "index.production.js": "48bd-121"
186
+ "index.production.js": "ef61-121"
187
187
  },
188
188
  "imported": [
189
189
  {
190
- "uid": "48bd-108"
190
+ "uid": "ef61-108"
191
191
  },
192
192
  {
193
- "uid": "48bd-122"
193
+ "uid": "ef61-122"
194
194
  },
195
195
  {
196
- "uid": "48bd-116"
196
+ "uid": "ef61-116"
197
197
  },
198
198
  {
199
- "uid": "48bd-118"
199
+ "uid": "ef61-118"
200
200
  }
201
201
  ],
202
202
  "importedBy": [],
203
203
  "isEntry": true
204
204
  },
205
- "48bd-122": {
205
+ "ef61-122": {
206
206
  "id": "react",
207
207
  "moduleParts": {},
208
208
  "imported": [],
209
209
  "importedBy": [
210
210
  {
211
- "uid": "48bd-120"
211
+ "uid": "ef61-120"
212
212
  }
213
213
  ],
214
214
  "isExternal": true
215
215
  },
216
- "48bd-123": {
216
+ "ef61-123": {
217
217
  "id": "use-sync-external-store/shim/with-selector",
218
218
  "moduleParts": {},
219
219
  "imported": [],
220
220
  "importedBy": [
221
221
  {
222
- "uid": "48bd-118"
222
+ "uid": "ef61-118"
223
223
  }
224
224
  ],
225
225
  "isExternal": true
package/build/umd/index.development.js CHANGED
@@ -185,7 +185,8 @@
185
185
  forward: () => {
186
186
  opts.forward();
187
187
  onUpdate();
188
- }
188
+ },
189
+ createHref: str => opts.createHref(str)
189
190
  };
190
191
  }
191
192
  function createBrowserHistory(opts) {
@@ -214,7 +215,8 @@
214
215
  },
215
216
  back: () => window.history.back(),
216
217
  forward: () => window.history.forward(),
217
- go: n => window.history.go(n)
218
+ go: n => window.history.go(n),
219
+ createHref: path => createHref(path)
218
220
  });
219
221
  }
220
222
  function createHashHistory() {
@@ -256,7 +258,8 @@
256
258
  forward: () => {
257
259
  index = Math.min(index + 1, entries.length - 1);
258
260
  },
259
- go: n => window.history.go(n)
261
+ go: n => window.history.go(n),
262
+ createHref: path => path
260
263
  });
261
264
  }
262
265
  function parseLocation(href, state) {
@@ -791,6 +794,18 @@
791
794
 
792
795
  // Allow frameworks to hook into the router creation
793
796
  this.options.Router?.(this);
797
+ const next = this.buildNext({
798
+ hash: true,
799
+ fromCurrent: true,
800
+ search: true,
801
+ state: true
802
+ });
803
+ if (this.state.latestLocation.href !== next.href) {
804
+ this.#commitLocation({
805
+ ...next,
806
+ replace: true
807
+ });
808
+ }
794
809
  }
795
810
  reset = () => {
796
811
  this.store.setState(s => Object.assign(s, getInitialRouterState()));
@@ -837,13 +852,10 @@
837
852
  };
838
853
  buildNext = opts => {
839
854
  const next = this.#buildLocation(opts);
840
- const matches = this.matchRoutes(next.pathname);
841
- const __preSearchFilters = matches.map(match => match.route.options.preSearchFilters ?? []).flat().filter(Boolean);
842
- const __postSearchFilters = matches.map(match => match.route.options.postSearchFilters ?? []).flat().filter(Boolean);
855
+ const __matches = this.matchRoutes(next.pathname);
843
856
  return this.#buildLocation({
844
857
  ...opts,
845
- __preSearchFilters,
846
- __postSearchFilters
858
+ __matches
847
859
  });
848
860
  };
849
861
  cancelMatches = () => {
@@ -1358,40 +1370,45 @@
1358
1370
  const fromMatches = this.matchRoutes(this.state.latestLocation.pathname, {
1359
1371
  strictParseParams: true
1360
1372
  });
1361
- const toMatches = this.matchRoutes(pathname);
1362
1373
  const prevParams = {
1363
1374
  ...last(fromMatches)?.params
1364
1375
  };
1365
1376
  let nextParams = (dest.params ?? true) === true ? prevParams : functionalUpdate(dest.params, prevParams);
1366
1377
  if (nextParams) {
1367
- toMatches.map(d => d.route.options.stringifyParams).filter(Boolean).forEach(fn => {
1368
- Object.assign({}, nextParams, fn(nextParams));
1378
+ dest.__matches?.map(d => d.route.options.stringifyParams).filter(Boolean).forEach(fn => {
1379
+ nextParams = {
1380
+ ...nextParams,
1381
+ ...fn(nextParams)
1382
+ };
1369
1383
  });
1370
1384
  }
1371
1385
  pathname = interpolatePath(pathname, nextParams ?? {});
1386
+ const preSearchFilters = dest.__matches?.map(match => match.route.options.preSearchFilters ?? []).flat().filter(Boolean) ?? [];
1387
+ const postSearchFilters = dest.__matches?.map(match => match.route.options.postSearchFilters ?? []).flat().filter(Boolean) ?? [];
1372
1388
 
1373
1389
  // Pre filters first
1374
- const preFilteredSearch = dest.__preSearchFilters?.length ? dest.__preSearchFilters?.reduce((prev, next) => next(prev), this.state.latestLocation.search) : this.state.latestLocation.search;
1390
+ const preFilteredSearch = preSearchFilters?.length ? preSearchFilters?.reduce((prev, next) => next(prev), this.state.latestLocation.search) : this.state.latestLocation.search;
1375
1391
 
1376
1392
  // Then the link/navigate function
1377
1393
  const destSearch = dest.search === true ? preFilteredSearch // Preserve resolvedFrom true
1378
1394
  : dest.search ? functionalUpdate(dest.search, preFilteredSearch) ?? {} // Updater
1379
- : dest.__preSearchFilters?.length ? preFilteredSearch // Preserve resolvedFrom filters
1395
+ : preSearchFilters?.length ? preFilteredSearch // Preserve resolvedFrom filters
1380
1396
  : {};
1381
1397
 
1382
1398
  // Then post filters
1383
- const postFilteredSearch = dest.__postSearchFilters?.length ? dest.__postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
1399
+ const postFilteredSearch = postSearchFilters?.length ? postSearchFilters.reduce((prev, next) => next(prev), destSearch) : destSearch;
1384
1400
  const search = replaceEqualDeep(this.state.latestLocation.search, postFilteredSearch);
1385
1401
  const searchStr = this.options.stringifySearch(search);
1386
1402
  let hash = dest.hash === true ? this.state.latestLocation.hash : functionalUpdate(dest.hash, this.state.latestLocation.hash);
1387
1403
  hash = hash ? `#${hash}` : '';
1404
+ const nextState = dest.state === true ? this.state.latestLocation.state : functionalUpdate(dest.state, this.state.latestLocation.state);
1388
1405
  return {
1389
1406
  pathname,
1390
1407
  search,
1391
1408
  searchStr,
1392
- state: this.state.latestLocation.state,
1409
+ state: nextState,
1393
1410
  hash,
1394
- href: `${pathname}${searchStr}${hash}`,
1411
+ href: this.history.createHref(`${pathname}${searchStr}${hash}`),
1395
1412
  key: dest.key
1396
1413
  };
1397
1414
  };