diff options
author | Oleksandr Redko <[email protected]> | 2023-02-19 00:43:26 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2023-03-01 16:28:43 +0100 |
commit | d453c12742e992d672fcf3e61b7a5ed35391c4b0 (patch) | |
tree | 1299a1f5a44bda1cf6449a8257f393350b2cc012 /resources/resource_transformers | |
parent | 97b010f521e592b5fc29daace225476b64543643 (diff) | |
download | hugo-d453c12742e992d672fcf3e61b7a5ed35391c4b0.tar.gz hugo-d453c12742e992d672fcf3e61b7a5ed35391c4b0.zip |
Replace deprecated ioutil with io and os
https://pkg.go.dev/io/ioutil is deprecated since Go 1.16.
Diffstat (limited to 'resources/resource_transformers')
-rw-r--r-- | resources/resource_transformers/babel/babel.go | 7 | ||||
-rw-r--r-- | resources/resource_transformers/js/build.go | 6 | ||||
-rw-r--r-- | resources/resource_transformers/js/options.go | 4 | ||||
-rw-r--r-- | resources/resource_transformers/postcss/postcss.go | 3 |
4 files changed, 9 insertions, 11 deletions
diff --git a/resources/resource_transformers/babel/babel.go b/resources/resource_transformers/babel/babel.go index 9a9110f62..89d74d9ed 100644 --- a/resources/resource_transformers/babel/babel.go +++ b/resources/resource_transformers/babel/babel.go @@ -17,7 +17,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "os" "path" "path/filepath" @@ -162,7 +161,7 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx // 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") + compileOutput, err := os.CreateTemp("", "compileOut-*.js") if err != nil { return err } @@ -206,7 +205,7 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx return fmt.Errorf(errBuf.String()+": %w", err) } - content, err := ioutil.ReadAll(compileOutput) + content, err := io.ReadAll(compileOutput) if err != nil { return err } @@ -214,7 +213,7 @@ func (t *babelTransformation) Transform(ctx *resources.ResourceTransformationCtx mapFile := compileOutput.Name() + ".map" if _, err := os.Stat(mapFile); err == nil { defer os.Remove(mapFile) - sourceMap, err := ioutil.ReadFile(mapFile) + sourceMap, err := os.ReadFile(mapFile) if err != nil { return err } diff --git a/resources/resource_transformers/js/build.go b/resources/resource_transformers/js/build.go index 23e28f675..34bc2cc12 100644 --- a/resources/resource_transformers/js/build.go +++ b/resources/resource_transformers/js/build.go @@ -15,7 +15,7 @@ package js import ( "fmt" - "io/ioutil" + "io" "os" "path" "path/filepath" @@ -77,7 +77,7 @@ func (t *buildTransformation) Transform(ctx *resources.ResourceTransformationCtx ctx.ReplaceOutPathExtension(".js") } - src, err := ioutil.ReadAll(ctx.From) + src, err := io.ReadAll(ctx.From) if err != nil { return err } @@ -98,7 +98,7 @@ func (t *buildTransformation) Transform(ctx *resources.ResourceTransformationCtx } if buildOptions.Sourcemap == api.SourceMapExternal && buildOptions.Outdir == "" { - buildOptions.Outdir, err = ioutil.TempDir(os.TempDir(), "compileOutput") + buildOptions.Outdir, err = os.MkdirTemp(os.TempDir(), "compileOutput") if err != nil { return err } diff --git a/resources/resource_transformers/js/options.go b/resources/resource_transformers/js/options.go index 71ae04573..ff5cca458 100644 --- a/resources/resource_transformers/js/options.go +++ b/resources/resource_transformers/js/options.go @@ -16,7 +16,7 @@ package js import ( "encoding/json" "fmt" - "io/ioutil" + "os" "path/filepath" "strings" @@ -260,7 +260,7 @@ func createBuildPlugins(c *Client, opts Options) ([]api.Plugin, error) { }) build.OnLoad(api.OnLoadOptions{Filter: `.*`, Namespace: nsImportHugo}, func(args api.OnLoadArgs) (api.OnLoadResult, error) { - b, err := ioutil.ReadFile(args.Path) + b, err := os.ReadFile(args.Path) if err != nil { return api.OnLoadResult{}, fmt.Errorf("failed to read %q: %w", args.Path, err) } diff --git a/resources/resource_transformers/postcss/postcss.go b/resources/resource_transformers/postcss/postcss.go index eab52b8c5..b4234bcf8 100644 --- a/resources/resource_transformers/postcss/postcss.go +++ b/resources/resource_transformers/postcss/postcss.go @@ -19,7 +19,6 @@ import ( "encoding/hex" "fmt" "io" - "io/ioutil" "path" "path/filepath" "regexp" @@ -365,7 +364,7 @@ func (imp *importResolver) importRecursive( func (imp *importResolver) resolve() (io.Reader, error) { const importIdentifier = "@import" - content, err := ioutil.ReadAll(imp.r) + content, err := io.ReadAll(imp.r) if err != nil { return nil, err } |