From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 4 Nov 2020 18:09:40 +0000 (+0100)
Subject: js: Remove external source map option
X-Git-Tag: v0.78.1~5
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=944150bafbbb5c3e807ba3688174e70764dbdc64;p=brevno-suite%2Fhugo

js: Remove external source map option

It was merged by accident and the implementation does not look correct.

Fixes #7932
---

diff --git a/resources/resource_transformers/js/build.go b/resources/resource_transformers/js/build.go
index 3a7065e0..5ff21cf0 100644
--- a/resources/resource_transformers/js/build.go
+++ b/resources/resource_transformers/js/build.go
@@ -78,8 +78,7 @@ func (t *buildTransformation) Transform(ctx *resources.ResourceTransformationCtx
 	}
 
 	opts.sourcefile = ctx.SourcePath
-	opts.workDir = t.c.rs.WorkingDir
-	opts.resolveDir = opts.workDir
+	opts.resolveDir = t.c.rs.WorkingDir
 	opts.contents = string(src)
 	opts.mediaType = ctx.InMediaType
 
diff --git a/resources/resource_transformers/js/options.go b/resources/resource_transformers/js/options.go
index 654dbbab..689efe0b 100644
--- a/resources/resource_transformers/js/options.go
+++ b/resources/resource_transformers/js/options.go
@@ -93,7 +93,6 @@ type Options struct {
 	contents   string
 	sourcefile string
 	resolveDir string
-	workDir    string
 	tsConfig   string
 }
 
@@ -365,12 +364,6 @@ func toBuildOptions(opts Options) (buildOptions api.BuildOptions, err error) {
 	switch opts.SourceMap {
 	case "inline":
 		sourceMap = api.SourceMapInline
-	case "external":
-		// When doing external sourcemaps we should specify
-		// out file and no out dir
-		sourceMap = api.SourceMapExternal
-		outFile = filepath.Join(opts.workDir, opts.TargetPath)
-		outDir = ""
 	case "":
 		sourceMap = api.SourceMapNone
 	default:
diff --git a/resources/resource_transformers/js/options_test.go b/resources/resource_transformers/js/options_test.go
index abc8091a..ef8c203c 100644
--- a/resources/resource_transformers/js/options_test.go
+++ b/resources/resource_transformers/js/options_test.go
@@ -93,7 +93,7 @@ func TestToBuildOptions(t *testing.T) {
 
 	opts, err = toBuildOptions(Options{
 		Target: "es2018", Format: "cjs", Minify: true, mediaType: media.JavascriptType,
-		SourceMap: "external"})
+		SourceMap: "inline"})
 	c.Assert(err, qt.IsNil)
 	c.Assert(opts, qt.DeepEquals, api.BuildOptions{
 		Bundle:            true,
@@ -102,7 +102,7 @@ func TestToBuildOptions(t *testing.T) {
 		MinifyIdentifiers: true,
 		MinifySyntax:      true,
 		MinifyWhitespace:  true,
-		Sourcemap:         api.SourceMapExternal,
+		Sourcemap:         api.SourceMapInline,
 		Stdin: &api.StdinOptions{
 			Loader: api.LoaderJS,
 		},