Skip to content

Commit c7ceae4

Browse files
committed
chore: fix merge side-effects/cleanup
1 parent afd6355 commit c7ceae4

File tree

4 files changed

+43
-30
lines changed

4 files changed

+43
-30
lines changed

.vitepress/theme/style.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.vitepress/theme/vitepress-theme.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9815,4 +9815,4 @@ const W4 = { key: 0 }, K4 = { key: 0 }, G4 = ["id"], J4 = { class: "columns-1 ga
98159815
});
98169816
export {
98179817
ug as default
9818-
};
9818+
};
File renamed without changes.

content/sidebar.ts

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ export default [
1818
text: 'Creating a Project',
1919
link: '/guide/creating-a-project',
2020
},
21+
{
22+
text: 'Navigation',
23+
link: '/guide/navigation/',
24+
},
2125
{
2226
text: 'Using Modals',
2327
link: '/guide/navigation/modals',
@@ -41,15 +45,15 @@ export default [
4145
},
4246
{
4347
text: 'Using Plugins',
44-
link: '/guide/development-workflow/using-packages'
48+
link: '/guide/development-workflow/using-packages',
4549
},
4650
{
4751
text: 'Debugging',
4852
link: '/guide/debugging',
4953
},
5054
{
5155
text: 'Testing',
52-
link: '/guide/testing'
56+
link: '/guide/testing',
5357
},
5458
{
5559
text: 'Publishing',
@@ -112,13 +116,21 @@ export default [
112116
link: '/project-structure/package-json',
113117
icon: 'file',
114118
},
115-
{ text: 'references.d.ts', link: '/project-structure/references-d-ts', icon: 'file' },
119+
{
120+
text: 'references.d.ts',
121+
link: '/project-structure/references-d-ts',
122+
icon: 'file',
123+
},
116124
{
117125
text: 'tsconfig.json',
118126
link: '/project-structure/tsconfig-json',
119127
icon: 'file',
120128
},
121-
{ text: 'webpack.config.js', link: '/webpack', icon: 'file' },
129+
{
130+
text: 'webpack.config.js',
131+
link: '/project-structure/webpack-config',
132+
icon: 'file',
133+
},
122134
// {
123135
// text: 'package.json',
124136
// link: '//#',
@@ -145,60 +157,60 @@ export default [
145157
},
146158
{
147159
text: 'Color',
148-
link: '/guide/core/color'
160+
link: '/guide/core/color',
149161
},
150162
{
151163
text: 'Connectivity',
152164
link: '/guide/core/connectivity',
153165
},
154-
{
166+
{
155167
text: 'Http',
156-
link: '/guide/core/http'
168+
link: '/guide/core/http',
157169
},
158170
{
159171
text: 'FPS Meter',
160-
link: '/guide/core/fps-meter'
172+
link: '/guide/core/fps-meter',
161173
},
162174
{
163175
text: 'FileSystem',
164-
link: '/guide/core/file-system'
176+
link: '/guide/core/file-system',
165177
},
166178
{
167179
text: 'Observable',
168-
link: '/guide/core/observable'
180+
link: '/guide/core/observable',
169181
},
170182
{
171183
text: 'Screen',
172-
link: '/guide/core/screen'
184+
link: '/guide/core/screen',
173185
},
174186
{
175187
text: 'Device',
176-
link: '/guide/core/device'
188+
link: '/guide/core/device',
177189
},
178190
{
179191
text: 'Trace',
180-
link: '/guide/core/tracing'
192+
link: '/guide/core/tracing',
181193
},
182194
{
183195
text: 'XmlParser',
184-
link: '/guide/core/xml-parser'
196+
link: '/guide/core/xml-parser',
185197
},
186198
{
187199
text: 'Utils',
188-
link: '/guide/core/utils'
189-
}
190-
]
200+
link: '/guide/core/utils',
201+
},
202+
{
203+
text: 'ImageCache',
204+
link: '/guide/core/image-cache',
205+
},
206+
],
191207
},
192208
{
193209
text: 'Advanced Concepts',
194210
items: [
195211
{
196212
text: 'Data Binding',
197-
link: '/guide/data-binding'
198-
},
199-
{
200-
text: 'Navigation',
201-
link: '/guide/ui/navigation',
213+
link: '/guide/data-binding',
202214
},
203215
{
204216
text: 'Multithreading',
@@ -210,28 +222,29 @@ export default [
210222
},
211223
{
212224
text: 'Metadata',
213-
link: '/guide/metadata'
225+
link: '/guide/metadata',
214226
},
215227
{
216228
text: 'Marshalling',
229+
link: '#',
217230
items: [
218231
{
219232
text: 'iOS Marshalling',
220233
link: '/guide/ios-marshalling',
221234
},
222235
{
223-
text: 'iOS',
236+
text: 'iOS Runtime Types',
224237
link: '/guide/ios-runtime-types',
225238
},
226239
{
227-
text: 'Android',
240+
text: 'Android Marshalling',
228241
link: '/guide/android-marshalling',
229-
}
230-
]
242+
},
243+
],
231244
},
232245
{
233246
text: 'Property System',
234-
link: '/guide/property-system'
247+
link: '/guide/property-system',
235248
},
236249
{
237250
text: 'Shared Element Transitions',

0 commit comments

Comments
 (0)