summaryrefslogtreecommitdiffstats
path: root/resources/resource_transformers/babel
diff options
context:
space:
mode:
authorAndreas Richter <richtera@users.noreply.github.com>2021-01-18 04:38:09 -0500
committerGitHub <noreply@github.com>2021-01-18 10:38:09 +0100
commit2c8b5d9165011c4b24b494e661ae60dfc7bb7d1b (patch)
tree1fccfe098c0ad5a85a030ba918914ea4191c658c /resources/resource_transformers/babel
parent0004a733c85cee991a8a170e93cd69c326cc8f2f (diff)
pipes: Add external source map support to js.Build and Babel
Fixes #8132
Diffstat (limited to 'resources/resource_transformers/babel')
-rw-r--r--resources/resource_transformers/babel/babel.go51
1 files changed, 50 insertions, 1 deletions
diff --git a/resources/resource_transformers/babel/babel.go b/resources/resource_transformers/babel/babel.go
index 204153705..e291b210b 100644
--- a/resources/resource_transformers/babel/babel.go
+++ b/resources/resource_transformers/babel/babel.go
@@ -16,7 +16,11 @@ package babel
import (
"bytes"
"io"
+ "io/ioutil"
+ "os"
+ "path"
"path/filepath"
+ "regexp"
"strconv"
"github.com/cli/safeexec"
@@ -43,8 +47,10 @@ type Options struct {
Compact *bool
Verbose bool
NoBabelrc bool
+ SourceMap string
}
+// DecodeOptions decodes options to and generates command flags
func DecodeOptions(m map[string]interface{}) (opts Options, err error) {
if m == nil {
return
@@ -56,6 +62,14 @@ func DecodeOptions(m map[string]interface{}) (opts Options, err error) {
func (opts Options) toArgs() []string {
var args []string
+ // external is not a known constant on the babel command line
+ // .sourceMaps must be a boolean, "inline", "both", or undefined
+ switch opts.SourceMap {
+ case "external":
+ args = append(args, "--source-maps")
+ case "inline":
+ args = append(args, "--source-maps=inline")
+ }
if opts.Minified {
args = append(args, "--minified")
}
@@ -141,6 +155,8 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
}
}
+ ctx.ReplaceOutPathExtension(".js")
+
var cmdArgs []string
if configFile != "" {
@@ -153,13 +169,24 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
}
cmdArgs = append(cmdArgs, "--filename="+ctx.SourcePath)
+ // Create compile into a real temp file:
+ // 1. separate stdout/stderr messages from babel (https://github.com/gohugoio/hugo/issues/8136)
+ // 2. allow generation and retrieval of external source map.
+ compileOutput, err := ioutil.TempFile("", "compileOut-*.js")
+ if err != nil {
+ return err
+ }
+
+ cmdArgs = append(cmdArgs, "--out-file="+compileOutput.Name())
+ defer os.Remove(compileOutput.Name())
+
cmd, err := hexec.SafeCommand(binary, cmdArgs...)
if err != nil {
return err
}
- cmd.Stdout = ctx.To
cmd.Stderr = io.MultiWriter(infoW, &errBuf)
+ cmd.Stdout = cmd.Stderr
cmd.Env = hugo.GetExecEnviron(t.rs.WorkingDir, t.rs.Cfg, t.rs.BaseFs.Assets.Fs)
stdin, err := cmd.StdinPipe()
@@ -177,6 +204,28 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx
return errors.Wrap(err, errBuf.String())
}
+ content, err := ioutil.ReadAll(compileOutput)
+ if err != nil {
+ return err
+ }
+
+ mapFile := compileOutput.Name() + ".map"
+ if _, err := os.Stat(mapFile); err == nil {
+ defer os.Remove(mapFile)
+ sourceMap, err := ioutil.ReadFile(mapFile)
+ if err != nil {
+ return err
+ }
+ if err = ctx.PublishSourceMap(string(sourceMap)); err != nil {
+ return err
+ }
+ targetPath := path.Base(ctx.OutPath) + ".map"
+ re := regexp.MustCompile(`//# sourceMappingURL=.*\n?`)
+ content = []byte(re.ReplaceAllString(string(content), "//# sourceMappingURL="+targetPath+"\n"))
+ }
+
+ ctx.To.Write(content)
+
return nil
}