js: Fix potential path issue on Windows
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Mon, 1 Feb 2021 11:49:08 +0000 (12:49 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Tue, 16 Feb 2021 15:10:46 +0000 (16:10 +0100)
resources/resource_transformers/js/build.go
resources/resource_transformers/js/options.go

index bd126efdabf04f4d5496fc32cb32bc976c473745..bd74c98edbbad358cc87c7352e1d7f581f0ea8e2 100644 (file)
@@ -81,8 +81,8 @@ func (t *buildTransformation) Transform(ctx *resources.ResourceTransformationCtx
                return err
        }
 
-       opts.sourcefile = ctx.SourcePath
-       opts.resolveDir = t.c.rs.WorkingDir
+       opts.sourceDir = filepath.FromSlash(path.Dir(ctx.SourcePath))
+       opts.resolveDir = t.c.rs.WorkingDir // where node_modules gets resolved
        opts.contents = string(src)
        opts.mediaType = ctx.InMediaType
 
index 02d8c959cb1a7f5b042a3ba81d8a59153bfab189..a199b2c14e938883fb40b07de05542f94379c34d 100644 (file)
@@ -102,7 +102,7 @@ type Options struct {
        mediaType  media.Type
        outDir     string
        contents   string
-       sourcefile string
+       sourceDir  string
        resolveDir string
        tsConfig   string
 }
@@ -201,7 +201,7 @@ func createBuildPlugins(c *Client, opts Options) ([]api.Plugin, error) {
                        }
                        relDir = filepath.Dir(rel)
                } else {
-                       relDir = filepath.Dir(opts.sourcefile)
+                       relDir = opts.sourceDir
                }
 
                // Imports not starting with a "." is assumed to live relative to /assets.