Skip to content

Commit 4fa8167

Browse files
committed
vweb: remove entirely; it has been replaced by veb
1 parent 245d025 commit 4fa8167

138 files changed

Lines changed: 540 additions & 7075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ Only the following `$`-prefixed functions are supported:
406406
* `$embed_file('path')` - embed a file's contents into the binary.
407407
Paths can be absolute, relative to the source file, or use pseudo
408408
variables like `@VEXEROOT` or `@VMODROOT`.
409-
* `$tmpl('path')` - compile a V template file (used by vweb/veb).
409+
* `$tmpl('path')` - compile a V template file (used by veb).
410410
* `$env('VAR')` - read an environment variable at compile time.
411411
* `$d('ident', default)` - read a `-d ident=value` compile-time
412412
define, with a default fallback.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ a copy of the compiler rather than replacing it with `v self`.
323323
| `debug_codegen` | Prints automatically generated V code during the scanning phase |
324324
| `debug_interface_table` | Prints generated interfaces during C generation |
325325
| `debug_interface_type_implements` | Prints debug information when checking that a type implements in interface |
326-
| `print_vweb_template_expansions` | Prints vweb compiled HTML files |
326+
| `print_vweb_template_expansions` | Prints veb compiled HTML files |
327327
| `time_checking` | Prints the time spent checking files and other related information |
328328
| `time_parsing` | Prints the time spent parsing files and other related information |
329329
| | |

ROADMAP.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ For a list of all features and fixes, check out the changelog.
3030
- [x] Handle function pointers safely, remove `if function == 0 {`
3131
- [x] Bundle an SSL library (mbedtls) like GC
3232
- [x] Anonymous structs
33-
- [x] Improve vweb: allow separation of logic via "controllers", lots of other fixes
33+
- [x] Improve veb: allow separation of logic via "controllers", lots of other fixes
3434
- [x] New VPM site
3535

3636
## [Version 0.5]
3737

3838
- [x] Parallel C compilation via `-parallel-cc`
3939
- [x] Parallel parser (not integrated yet)
4040
- [x] Parallel checker (not integrated yet)
41-
- [x] Improved vweb => veb framework. Separation of global and context (request local) fields.
41+
- [x] Improved veb framework. Separation of global and context (request local) fields.
4242
Performance and stability. Based on picoev.
4343
- [x] -skip-unused on by default
4444
- [x] Lambdas: `a.sort(|a, b| a > b)`

cmd/tools/changelog_helper.v

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,7 @@ fn is_parser(text string) bool {
521521
}
522522

523523
const web_strings = [
524-
'vweb',
525524
'veb',
526-
'x.vweb',
527525
'websocket:',
528526
'pico',
529527
'x.sessions',

cmd/tools/gen_vc.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub fn (mut ws WebhookServer) index() {
158158
// gen webhook
159159
pub fn (mut ws WebhookServer) genhook() veb.Result {
160160
// request data
161-
// println(ws.vweb.req.data)
161+
// println(ws.req.data)
162162
// TODO: parse request. json or urlencoded
163163
// json.decode or net.urllib.parse
164164
ws.gen_vc.generate()

cmd/tools/vbuild-examples.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ const vroot = os.dir(os.real_path(os.getenv_opt('VEXE') or { @VEXE }))
88
// build as a project folder
99
const efolders = [
1010
'examples/viewer',
11-
'examples/vweb_orm_jwt',
12-
'examples/vweb_fullstack',
1311
'examples/fasthttp',
12+
'examples/veb_orm_jwt/src',
13+
'examples/veb_fullstack/src',
1414
]
1515

1616
pub fn normalised_vroot_path(path string) string {

cmd/tools/vcreate/vcreate_web_test.v

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ fn test_web_template_uses_veb() {
2929
c.write_vmod()
3030
main_v := os.read_file(os.join_path(project_path, 'main.v'))!
3131
assert main_v.contains('import veb')
32-
assert !main_v.contains('import vweb')
3332
assert main_v.contains('\$veb.html()')
3433
template_html := os.read_file(os.join_path(project_path, 'templates', 'index.html'))!
3534
assert template_html.contains('veb starter')

cmd/tools/vtest-self.v

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,8 @@ const skip_with_fsanitize_memory = [
150150
'vlib/v/tests/orm_create_several_tables_test.v',
151151
'vlib/v/tests/orm_update_test.v',
152152
'vlib/v/tests/orm_or_test.v',
153-
'vlib/vweb/tests/vweb_test.v',
154-
'vlib/vweb/csrf/csrf_test.v',
155153
'vlib/net/http/request_test.v',
156154
'vlib/net/http/response_test.v',
157-
'vlib/vweb/route_test.v',
158155
'vlib/net/websocket/websocket_test.v',
159156
'vlib/net/smtp/smtp_test.v',
160157
'vlib/v/tests/websocket_logger_interface_should_compile_test.v',
@@ -241,9 +238,6 @@ const skip_on_ubuntu_musl = [
241238
'vlib/v/tests/websocket_logger_interface_should_compile_test.v',
242239
'vlib/v/tests/fns/fn_literal_type_test.v',
243240
'vlib/clipboard/clipboard_test.v',
244-
'vlib/vweb/tests/vweb_test.v',
245-
'vlib/vweb/csrf/csrf_test.v',
246-
'vlib/vweb/route_test.v',
247241
'vlib/net/http/request_test.v',
248242
'vlib/net/websocket/websocket_test.v',
249243
'vlib/net/http/header_test.v',

cmd/tools/vwatch.v

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mut:
9797
ignore_exts []string // extensions of files that will be ignored, even if they change (useful for sqlite.db files for example)
9898
cmd_before_run string // a command to run before each re-run
9999
cmd_after_run string // a command to run after each re-run
100-
only_watch []string // If not empty, *all* files that trigger updates, should match *at least one* of these s.match_glob() patterns. This is also triggered for vweb apps, to monitor for just *.v,*.js,*.css,*.html in vweb projects.
100+
only_watch []string // If not empty, *all* files that trigger updates, should match *at least one* of these s.match_glob() patterns. This is also triggered for veb apps, to monitor for just *.v,*.js,*.css,*.html in veb projects.
101101
}
102102

103103
struct ParsedWatchOptions {
@@ -176,23 +176,23 @@ fn (mut context Context) get_stats_for_affected_vfiles() []VFileStat {
176176
}
177177
paths << reported_used_files
178178
}
179-
mut is_vweb_found := false
179+
mut is_veb_found := false
180180
for vf in paths {
181181
apaths[os.real_path(os.dir(vf))] = true
182-
if vf.contains('vweb.v') {
183-
is_vweb_found = true
182+
if vf.contains('veb.v') {
183+
is_veb_found = true
184184
}
185185
}
186186

187-
if is_vweb_found {
187+
if is_veb_found {
188188
if !os.args.any(it.starts_with('--only-watch')) {
189189
context.only_watch = default_veb_suffixes.split_any(',')
190-
// vweb is often used with SQLite .db or .sqlite3 files right next to the executable/source,
191-
// that are updated by the vweb app, causing a restart of the app, which in turn causes the
190+
// veb is often used with SQLite .db or .sqlite3 files right next to the executable/source,
191+
// that are updated by the veb app, causing a restart of the app, which in turn causes the
192192
// browser to reload the current page, that probably triggered the update in the first place.
193193
// Note that the problem is not specific to SQLite, any database that stores its files in the
194194
// current (project) folder, will also cause this.
195-
println('`v watch` detected that you are compiling a vweb project.')
195+
println('`v watch` detected that you are compiling a veb project.')
196196
println(' Because of that, the `--only-watch=${default_veb_suffixes}` flag was also implied.')
197197
println(' In result, `v watch` will ignore changes to other files.')
198198
println(' Add your own --only-watch filter, if you wish to override that choice.')

doc/docs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ by using any of the following commands in a terminal:
8484
* `v new abc` → creates a new project in the new folder `abc`, by default a "hello world" project.
8585
* `v new --web abcd` → creates a new project in the new folder `abcd`, using the veb template.
8686

87-
The `v new --web` template uses `veb`, V's current web framework. `vweb` is deprecated.
87+
The `v new --web` template uses `veb`, V's web framework.
8888

8989
## Table of Contents
9090

0 commit comments

Comments
 (0)