mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-15 20:44:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

js/esbuild: Add runners after scripts

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2024-12-14 11:56:00 +01:00
parent 4cbd4ef991
commit 7de5317aef
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/js/esbuild/batch.go
View File

@@ -476,18 +476,10 @@ func (b *batcher) doBuild(ctx context.Context) (*Package, error) {
for _, g := range b.scriptGroups.Sorted() { for _, g := range b.scriptGroups.Sorted() {
keyPath := g.id keyPath := g.id
var runners []scriptRunnerTemplateContext
for _, vv := range g.runnersOptions.ByKey() {
runnerKeyPath := keyPath + "_" + vv.Key().String()
runnerImpPath := paths.AddLeadingSlash(runnerKeyPath + "_runner" + vv.Compiled().Resource.MediaType().FirstSuffix.FullSuffix)
runners = append(runners, scriptRunnerTemplateContext{opts: vv, Import: runnerImpPath})
addResource(g.id, runnerImpPath, vv.Compiled().Resource, false)
}
t := &batchGroupTemplateContext{ t := &batchGroupTemplateContext{
keyPath: keyPath, keyPath: keyPath,
ID: g.id, ID: g.id,
Runners: runners,
} }
instances := g.instancesOptions.ByKey() instances := g.instancesOptions.ByKey()
@@ -521,6 +513,13 @@ func (b *batcher) doBuild(ctx context.Context) (*Package, error) {
t.Scripts = append(t.Scripts, bt) t.Scripts = append(t.Scripts, bt)
} }
for _, vv := range g.runnersOptions.ByKey() {
runnerKeyPath := keyPath + "_" + vv.Key().String()
runnerImpPath := paths.AddLeadingSlash(runnerKeyPath + "_runner" + vv.Compiled().Resource.MediaType().FirstSuffix.FullSuffix)
t.Runners = append(t.Runners, scriptRunnerTemplateContext{opts: vv, Import: runnerImpPath})
addResource(g.id, runnerImpPath, vv.Compiled().Resource, false)
}
r, s, err := b.client.buildBatchGroup(ctx, t) r, s, err := b.client.buildBatchGroup(ctx, t)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to build JS batch: %w", err) return nil, fmt.Errorf("failed to build JS batch: %w", err)