From 7de5317aef7866ed559f0dbcd2f3370944b30ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 14 Dec 2024 11:56:00 +0100 Subject: [PATCH] js/esbuild: Add runners after scripts --- internal/js/esbuild/batch.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/internal/js/esbuild/batch.go b/internal/js/esbuild/batch.go index 688b58d2152..d0b6dba3337 100644 --- a/internal/js/esbuild/batch.go +++ b/internal/js/esbuild/batch.go @@ -476,18 +476,10 @@ func (b *batcher) doBuild(ctx context.Context) (*Package, error) { for _, g := range b.scriptGroups.Sorted() { 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{ keyPath: keyPath, ID: g.id, - Runners: runners, } instances := g.instancesOptions.ByKey() @@ -521,6 +513,13 @@ func (b *batcher) doBuild(ctx context.Context) (*Package, error) { 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) if err != nil { return nil, fmt.Errorf("failed to build JS batch: %w", err)