foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

Fix stacktraces in deno_ns

Browse source
This commit is contained in:
Kitson Kelly 2018-08-10 10:41:12 -07:00 committed by Ryan Dahl
parent c4cafcecb1
commit 2c8bdd2f5f
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BUILD.gn
View file

@ -321,6 +321,11 @@ run_node("bundle") {
} }
source_set("libdeno_nosnapshot") { source_set("libdeno_nosnapshot") {
bundle_outputs = get_target_outputs(":bundle")
bundle_location = rebase_path(bundle_outputs[0])
bundle_rel_location = rebase_path(bundle_outputs[0], root_build_dir)
bundle_map_location = rebase_path(bundle_outputs[1])
inputs = bundle_outputs
sources = [ sources = [
"src/from_filesystem.cc", "src/from_filesystem.cc",
] ]
@ -329,9 +334,11 @@ source_set("libdeno_nosnapshot") {
":deno_bindings", ":deno_bindings",
] ]
configs += [ ":deno_config" ] configs += [ ":deno_config" ]
bundle_outputs = get_target_outputs(":bundle") defines = [
bundle_location = rebase_path(bundle_outputs[0]) "BUNDLE_LOCATION=\"$bundle_location\"",
defines = [ "BUNDLE_LOCATION=\"$bundle_location\"" ] "BUNDLE_REL_LOCATION=\"$bundle_rel_location\"",
"BUNDLE_MAP_LOCATION=\"$bundle_map_location\"",
]
} }
ts_flatbuffer("msg_ts") { ts_flatbuffer("msg_ts") {

10
src/from_filesystem.cc
View file

@ -1,4 +1,5 @@
// Copyright 2018 the Deno authors. All rights reserved. MIT license. // Copyright 2018 the Deno authors. All rights reserved. MIT license.
// This file is used to load the bundle at start for deno_ns.
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -17,6 +18,9 @@ Deno* NewFromFileSystem(void* data, deno_recv_cb cb) {
std::string js_source; std::string js_source;
CHECK(deno::ReadFileToString(BUNDLE_LOCATION, &js_source)); CHECK(deno::ReadFileToString(BUNDLE_LOCATION, &js_source));
std::string js_source_map;
CHECK(deno::ReadFileToString(BUNDLE_MAP_LOCATION, &js_source_map));
Deno* d = new Deno; Deno* d = new Deno;
d->currentArgs = nullptr; d->currentArgs = nullptr;
d->cb = cb; d->cb = cb;
@ -32,7 +36,11 @@ Deno* NewFromFileSystem(void* data, deno_recv_cb cb) {
{ {
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
auto context = v8::Context::New(isolate); auto context = v8::Context::New(isolate);
InitializeContext(isolate, context, BUNDLE_LOCATION, js_source, nullptr); // BUNDLE_LOCATION is absolute so deno_ns can load the bundle independently
// of the cwd. However for source maps to work, the bundle location relative
// to the build path must be supplied: BUNDLE_REL_LOCATION.
InitializeContext(isolate, context, BUNDLE_REL_LOCATION, js_source,
&js_source_map);
d->context.Reset(d->isolate, context); d->context.Reset(d->isolate, context);
} }