Skip to content

Commit 38770a3

Browse files
committed
Fix cjs module lexer for typescript
1 parent 8b7e84e commit 38770a3

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

server/cjs_module_lexer.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,26 @@ func cjsModuleLexer(b *BuildContext, cjsEntry string) (ret cjsModuleLexerResult,
9898
cmd := exec.Command(
9999
path.Join(config.WorkDir, "bin/deno"),
100100
"run",
101+
"--allow-env",
101102
"--no-prompt",
102103
"--no-config",
103104
"--no-lock",
104105
"--quiet",
105106
js)
106-
cmd.Env = append(os.Environ(), "DENO_NO_UPDATE_CHECK=1", "DENO_NO_PACKAGE_JSON=1")
107-
data, err = cmd.Output()
107+
cmd.Env = []string{"DENO_NO_UPDATE_CHECK=1"}
108+
data, err = cmd.CombinedOutput()
108109
if err != nil {
110+
msg := err.Error()
111+
if data != nil {
112+
msg = string(data)
113+
}
114+
err = errors.New("cjsModuleLexer(fallback mode): " + msg)
109115
return
110116
}
111117
var namedExports []string
112118
err = json.Unmarshal(data, &namedExports)
113119
if err != nil {
120+
err = errors.New("cjsModuleLexer(fallback mode): " + err.Error())
114121
return
115122
}
116123
for _, name := range namedExports {

0 commit comments

Comments
 (0)