@devvit/build-pack 0.11.1-next-2024-10-21-dbc4313a2.0 → 0.11.1

package/esbuild/ESBuildPack.d.ts

@@ -1,6 +1,6 @@
 import type { Metadata } from '@devvit/protos';
 import { type CompileParams, CompileResponse } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
-import { type ActorSpec, TargetRuntime } from '@devvit/protos/types/devvit/runtime/bundle.js';
+import type { ActorSpec } from '@devvit/protos/types/devvit/runtime/bundle.js';
 import type { Namespace } from '@devvit/shared-types/Namespace.js';
 import { Observable } from 'rxjs';
 import type { BuildPack, ProjectRootDir } from '../lib/BuildPack.js';
@@ -21,7 +21,6 @@ type ESBuildPackOptions = {
     readonly typeChecker?: TypeChecker | undefined;
     /** @deprecated use the type checker where possible. */
     readonly disableTypeCheckerWarning?: boolean | undefined;
-    readonly targetRuntimes?: TargetRuntime[] | undefined;
 };
 export declare class ESBuildPack implements BuildPack {
     #private;

package/esbuild/ESBuildPack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ESBuildPack.d.ts","sourceRoot":"","sources":["../../src/esbuild/ESBuildPack.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAGL,KAAK,aAAa,EAClB,eAAe,EAEhB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,EACL,KAAK,SAAS,EAEd,aAAa,EACd,MAAM,+CAA+C,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAKnE,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAI5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAgB5D,MAAM,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEhD,qBAAa,OAAO;;IA0BlB;;;OAGG;gBAED,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC;IAwBpC,aAAa,IAAI,UAAU,CAAC,eAAe,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA2G/B;AAED,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/C,uDAAuD;IACvD,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC;CACvD,CAAC;AAEF,qBAAa,WAAY,YAAW,SAAS;;IAiB3C;;;OAGG;gBACS,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAO5E,OAAO,CACX,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,aAAa,EACzC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IA8DrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,KAAK,CACH,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,aAAa,EACjC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAC9B,UAAU,CAAC,eAAe,CAAC;CAe/B"}
+{"version":3,"file":"ESBuildPack.d.ts","sourceRoot":"","sources":["../../src/esbuild/ESBuildPack.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAEL,KAAK,aAAa,EAClB,eAAe,EAEhB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAkB,MAAM,+CAA+C,CAAC;AAG/F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAKnE,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAI5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAS5D,MAAM,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAEhD,qBAAa,OAAO;;IAqBlB;;;OAGG;gBAED,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,QAAQ,CAAC,cAAc,CAAC;IAuBpC,aAAa,IAAI,UAAU,CAAC,eAAe,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA2E/B;AAED,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAC/C,uDAAuD;IACvD,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC1D,CAAC;AAEF,qBAAa,WAAY,YAAW,SAAS;;IAiB3C;;;OAGG;gBACS,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAO5E,OAAO,CACX,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,aAAa,EACzC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IAoDrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,KAAK,CACH,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,aAAa,EACjC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAC9B,UAAU,CAAC,eAAe,CAAC;CAe/B"}

package/esbuild/ESBuildPack.js

@@ -9,12 +9,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Watcher_instances, _Watcher_disableExternDevvitProtos, _Watcher_typeChecker, _Watcher_targetRuntimes, _Watcher_root, _Watcher_observable, _Watcher_disposedNotifier, _Watcher_disposeWatcher, _Watcher_namespace, _Watcher_buildTargets, _Watcher_ready, _Watcher_init, _Watcher_makeEsbuildContext, _Watcher_onBuildEnd, _ESBuildPack_bundleWatchers, _ESBuildPack_namespace, _ESBuildPack_disableExternDevvitProtos, _ESBuildPack_typeChecker, _ESBuildPack_disableTypeCheckerWarning;
-import crypto from 'node:crypto';
+var _Watcher_instances, _Watcher_disableExternDevvitProtos, _Watcher_typeChecker, _Watcher_root, _Watcher_observable, _Watcher_disposedNotifier, _Watcher_disposeWatcher, _Watcher_namespace, _Watcher_init, _Watcher_onBuildEnd, _ESBuildPack_bundleWatchers, _ESBuildPack_namespace, _ESBuildPack_disableExternDevvitProtos, _ESBuildPack_typeChecker, _ESBuildPack_disableTypeCheckerWarning;
 import fs from 'node:fs';
-import { Bundle, CompileLog, CompileResponse, Minify, } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
-import { TargetRuntime, } from '@devvit/protos/types/devvit/runtime/bundle.js';
-import { CircuitBreak } from '@devvit/shared-types/CircuitBreaker.js';
+import { CompileLog, CompileResponse, Minify, } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
 import { ConfigImpl as Config } from '@devvit/shared-types/ConfigImpl.js';
 import { assertNonNull, NonNull } from '@devvit/shared-types/NonNull.js';
 import { StringUtil } from '@devvit/shared-types/StringUtil.js';
@@ -31,7 +28,6 @@ const FAKE_FACTORY = {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     Build() { },
 };
-const BUILD_TARGETS = [TargetRuntime.UNIVERSAL, TargetRuntime.CLIENT];
 export class Watcher {
     /**
      * The default behavior is to externalize @devvit/protos. Set
@@ -41,7 +37,6 @@ export class Watcher {
         _Watcher_instances.add(this);
         _Watcher_disableExternDevvitProtos.set(this, void 0);
         _Watcher_typeChecker.set(this, void 0);
-        _Watcher_targetRuntimes.set(this, void 0);
         _Watcher_root.set(this, void 0);
         /**
          * the actual emitter of updates
@@ -56,13 +51,10 @@ export class Watcher {
          */
         _Watcher_disposeWatcher.set(this, void 0);
         _Watcher_namespace.set(this, void 0);
-        _Watcher_buildTargets.set(this, new Map());
-        _Watcher_ready.set(this, void 0);
         __classPrivateFieldSet(this, _Watcher_namespace, namespace, "f");
         __classPrivateFieldSet(this, _Watcher_root, root, "f");
         __classPrivateFieldSet(this, _Watcher_disableExternDevvitProtos, options?.disableExternDevvitProtos ?? false, "f");
         __classPrivateFieldSet(this, _Watcher_typeChecker, options?.typeChecker, "f");
-        __classPrivateFieldSet(this, _Watcher_targetRuntimes, options?.targetRuntimes ?? BUILD_TARGETS, "f");
         //  observers of this will be subscribed until this.disposedNotifier emits a value
         const sourceObservable = new Observable().pipe(takeUntil(__classPrivateFieldGet(this, _Watcher_disposedNotifier, "f")));
         // our observable is a BehaviorSubject used to multicast the source observer
@@ -70,7 +62,7 @@ export class Watcher {
         // multi-casts (shares) here
         sourceObservable.subscribe(__classPrivateFieldGet(this, _Watcher_observable, "f"));
         // #init handles errors.
-        __classPrivateFieldSet(this, _Watcher_ready, __classPrivateFieldGet(this, _Watcher_instances, "m", _Watcher_init).call(this, actorSpec), "f");
+        void __classPrivateFieldGet(this, _Watcher_instances, "m", _Watcher_init).call(this, actorSpec);
     }
     getObservable() {
         return __classPrivateFieldGet(this, _Watcher_observable, "f");
@@ -83,44 +75,22 @@ export class Watcher {
         __classPrivateFieldGet(this, _Watcher_disposedNotifier, "f").complete();
     }
 }
-_Watcher_disableExternDevvitProtos = new WeakMap(), _Watcher_typeChecker = new WeakMap(), _Watcher_targetRuntimes = new WeakMap(), _Watcher_root = new WeakMap(), _Watcher_observable = new WeakMap(), _Watcher_disposedNotifier = new WeakMap(), _Watcher_disposeWatcher = new WeakMap(), _Watcher_namespace = new WeakMap(), _Watcher_buildTargets = new WeakMap(), _Watcher_ready = new WeakMap(), _Watcher_instances = new WeakSet(), _Watcher_init = async function _Watcher_init(actorSpec) {
-    // Building for Universal and Client targets. May include Server in the future.
-    for (const target of __classPrivateFieldGet(this, _Watcher_targetRuntimes, "f")) {
-        __classPrivateFieldGet(this, _Watcher_buildTargets, "f").set(target, {
-            ctx: await __classPrivateFieldGet(this, _Watcher_instances, "m", _Watcher_makeEsbuildContext).call(this, actorSpec, target),
-        });
-    }
-    __classPrivateFieldSet(this, _Watcher_disposeWatcher, async () => {
-        for (const [_, target] of __classPrivateFieldGet(this, _Watcher_buildTargets, "f")) {
-            await target.ctx.dispose();
-        }
-    }, "f");
-    if (__classPrivateFieldGet(this, _Watcher_observable, "f").isStopped) {
-        // Disposed while await-ing and prior to setting disposeWatcher.
-        await __classPrivateFieldGet(this, _Watcher_disposeWatcher, "f").call(this);
-        return;
-    }
-    const watchers = [];
-    for (const [_, target] of __classPrivateFieldGet(this, _Watcher_buildTargets, "f")) {
-        watchers.push(target.ctx.watch());
-    }
-    await Promise.all(watchers);
-}, _Watcher_makeEsbuildContext = async function _Watcher_makeEsbuildContext(actorSpec, targetRuntime) {
+_Watcher_disableExternDevvitProtos = new WeakMap(), _Watcher_typeChecker = new WeakMap(), _Watcher_root = new WeakMap(), _Watcher_observable = new WeakMap(), _Watcher_disposedNotifier = new WeakMap(), _Watcher_disposeWatcher = new WeakMap(), _Watcher_namespace = new WeakMap(), _Watcher_instances = new WeakSet(), _Watcher_init = async function _Watcher_init(actorSpec) {
     const entryPoint = getModuleEntrypoint(__classPrivateFieldGet(this, _Watcher_root, "f"));
-    const cfg = esbuildConfig(__classPrivateFieldGet(this, _Watcher_disableExternDevvitProtos, "f"), targetRuntime);
-    return await esbuild.context({
+    const cfg = esbuildConfig(__classPrivateFieldGet(this, _Watcher_disableExternDevvitProtos, "f"));
+    const esbuildCtx = await esbuild.context({
         ...cfg,
         entryPoints: [entryPoint],
         minify: false,
-        sourcemap: 'external',
         outfile: 'main.js',
+        sourcemap: 'external',
         // esbuild now supports hooks through the onEnd callback in the build API.
         plugins: [
             {
                 name: 'optionally-type-check-and-publish-compile-result-on-build-end',
                 setup: (build) => {
                     build.onEnd(async (result) => {
-                        await __classPrivateFieldGet(this, _Watcher_instances, "m", _Watcher_onBuildEnd).call(this, actorSpec, result, entryPoint, targetRuntime);
+                        await __classPrivateFieldGet(this, _Watcher_instances, "m", _Watcher_onBuildEnd).call(this, actorSpec, result, entryPoint);
                     });
                 },
             },
@@ -128,21 +98,21 @@ _Watcher_disableExternDevvitProtos = new WeakMap(), _Watcher_typeChecker = new W
             ...(cfg.plugins || []),
         ],
     });
+    if (__classPrivateFieldGet(this, _Watcher_observable, "f").isStopped) {
+        // Disposed while await-ing and prior to setting disposeWatcher.
+        await esbuildCtx.dispose();
+        return;
+    }
+    __classPrivateFieldSet(this, _Watcher_disposeWatcher, async () => {
+        await esbuildCtx.dispose();
+    }, "f");
+    await esbuildCtx.watch();
 }, _Watcher_onBuildEnd = 
 /**
  * @description The callback function for esbuild's onEnd hook. This is called after esbuild has finished building.
  */
-async function _Watcher_onBuildEnd(actorSpec, esbuildResult, entryPoint, targetRuntime) {
-    await __classPrivateFieldGet(this, _Watcher_ready, "f");
-    __classPrivateFieldGet(this, _Watcher_buildTargets, "f").get(targetRuntime).result = esbuildResult;
-    const results = new Map();
-    // bail early if any builds are incomplete
-    for (const [targetRuntime, target] of __classPrivateFieldGet(this, _Watcher_buildTargets, "f")) {
-        if (!target.result)
-            return;
-        results.set(targetRuntime, target.result);
-    }
-    const esbuildCompileRes = await newCompileResponse(__classPrivateFieldGet(this, _Watcher_namespace, "f"), actorSpec, results, entryPoint);
+async function _Watcher_onBuildEnd(actorSpec, esbuildResult, entryPoint) {
+    const esbuildCompileRes = await newCompileResponse(__classPrivateFieldGet(this, _Watcher_namespace, "f"), actorSpec, esbuildResult, entryPoint);
     // to-do: why is type-checking disabled for projects with tsx files (nearly
     //        all projects).
     if (!__classPrivateFieldGet(this, _Watcher_typeChecker, "f") || (await hasTsxFiles(__classPrivateFieldGet(this, _Watcher_root, "f")))) {
@@ -179,39 +149,35 @@ export class ESBuildPack {
         __classPrivateFieldSet(this, _ESBuildPack_disableTypeCheckerWarning, options?.disableTypeCheckerWarning ?? false, "f");
     }
     async Compile({ filename, minify, info }, _metadata) {
-        // TODO: add flag to conditionally compile stripped bundle
         if (filename == null) {
             // TODO: implement virtualFileSystem
             throw new Error('Bundling virtual file system not implemented yet');
         }
         assertNonNull(info, "Expected 'info' of CompileParams to be non-null");
         const entrypoint = getModuleEntrypoint(filename);
-        const buildResults = new Map();
-        for (const targetRuntime of BUILD_TARGETS) {
-            const cfg = esbuildConfig(__classPrivateFieldGet(this, _ESBuildPack_disableExternDevvitProtos, "f"), targetRuntime);
-            try {
-                const buildResult = await esbuild.build({
-                    ...cfg,
-                    entryPoints: [entrypoint],
-                    metafile: true,
-                    sourcemap: 'external',
-                    plugins: [excludeNodeModulesFromSourceMapsPlugin(), ...(cfg.plugins || [])],
-                    sourcesContent: false,
-                    minify: minify === Minify.ALL,
-                    outfile: 'main.js',
-                    treeShaking: true,
-                });
-                buildResults.set(targetRuntime, buildResult);
-            }
-            catch (err) {
-                return isEsbuildResult(err)
-                    ? await newCompileResponse(__classPrivateFieldGet(this, _ESBuildPack_namespace, "f"), info, new Map([[targetRuntime, err]]), entrypoint)
-                    : unknownToErrorCompileResponse('Compilation', err);
-            }
+        let bundleResult;
+        try {
+            const cfg = esbuildConfig(__classPrivateFieldGet(this, _ESBuildPack_disableExternDevvitProtos, "f"));
+            bundleResult = await esbuild.build({
+                ...cfg,
+                entryPoints: [entrypoint],
+                metafile: true,
+                sourcemap: 'external',
+                outfile: 'main.js',
+                plugins: [excludeNodeModulesFromSourceMapsPlugin(), ...(cfg.plugins || [])],
+                sourcesContent: false,
+                minify: minify === Minify.ALL,
+                treeShaking: true,
+            });
+        }
+        catch (err) {
+            return isEsbuildResult(err)
+                ? await newCompileResponse(__classPrivateFieldGet(this, _ESBuildPack_namespace, "f"), info, err, entrypoint)
+                : unknownToErrorCompileResponse('Compilation', err);
         }
-        const esbuildCompileResult = await newCompileResponse(__classPrivateFieldGet(this, _ESBuildPack_namespace, "f"), info, buildResults, entrypoint);
-        if (esbuildCompileResult.bundles.length === 0) {
-            throw new Error(esbuildCompileResult.errors?.[0]?.text ?? 'Missing bundle');
+        const esbuildCompileResult = await newCompileResponse(__classPrivateFieldGet(this, _ESBuildPack_namespace, "f"), info, bundleResult, entrypoint);
+        if (esbuildCompileResult.bundle == null) {
+            throw new Error(esbuildCompileResult.errors?.[0].text ?? 'Missing bundle');
         }
         // to-do: why is type-checking disabled for projects with tsx files (nearly
         //        all projects).
@@ -243,77 +209,47 @@ export class ESBuildPack {
 _ESBuildPack_bundleWatchers = new WeakMap(), _ESBuildPack_namespace = new WeakMap(), _ESBuildPack_disableExternDevvitProtos = new WeakMap(), _ESBuildPack_typeChecker = new WeakMap(), _ESBuildPack_disableTypeCheckerWarning = new WeakMap();
 // TODO: Complete way to determine dependencies from module's config.ts or config.yaml. See DX-61
 // TODO: Owner should come from project root's config file
-async function newCompileResponse(namespace, actorSpec, buildResults, entryPoint) {
+async function newCompileResponse(namespace, actorSpec, buildResult, entryPoint) {
+    prefixBuildResultLogs(buildResult, 'esbuild');
     assertNonNull(actorSpec, 'Expected actorSpec to be non-null');
-    const errors = [];
-    const warnings = [];
-    const bundles = [];
-    for (const [targetRuntime, buildResult] of buildResults) {
-        if (!buildResult)
-            continue;
-        prefixBuildResultLogs(buildResult, 'esbuild');
-        errors.push(...buildResult.errors.map(esbuildMessageToBuildLog));
-        warnings.push(...buildResult.warnings.map(esbuildMessageToBuildLog));
-        let code = '';
-        let sourceMap = '';
-        for (const outputFile of buildResult.outputFiles || []) {
-            if (outputFile.path?.endsWith('.js')) {
-                if (code) {
-                    throw new Error('There should only be one bundle after build');
-                }
-                code = outputFile.text;
-            }
-            else if (outputFile.path?.endsWith('.js.map')) {
-                sourceMap = outputFile.text;
-            }
-            else {
-                throw new Error('Unexpected output file: ' + outputFile.path);
+    const errors = buildResult.errors.map(esbuildMessageToBuildLog);
+    const warnings = buildResult.warnings.map(esbuildMessageToBuildLog);
+    let code = '';
+    let sourceMap = '';
+    for (const outputFile of buildResult.outputFiles || []) {
+        if (outputFile.path?.endsWith('.js')) {
+            if (code) {
+                throw new Error('There should only be one bundle after build');
             }
+            code = outputFile.text;
         }
-        if (!code) {
-            const errors = buildResult.errors.map(esbuildMessageToBuildLog);
-            const warnings = buildResult.warnings.map(esbuildMessageToBuildLog);
-            return CompileResponse.fromPartial({
-                errors,
-                warnings,
-            });
+        else if (outputFile.path?.endsWith('.js.map')) {
+            sourceMap = outputFile.text;
         }
-        let dependencies;
-        try {
-            const ActorClass = await dangerouslyGetBundleActor(code);
-            dependencies = await makeDependencySpec(namespace, actorSpec, ActorClass);
+        else {
+            throw new Error('Unexpected output file: ' + outputFile.path);
         }
-        catch (err) {
-            return unknownToErrorCompileResponse('Evaluation', err);
-        }
-        bundles.push(Bundle.fromPartial({
+    }
+    if (!code)
+        return CompileResponse.fromPartial({ errors, warnings });
+    let dependencies;
+    try {
+        const ActorClass = await dangerouslyGetBundleActor(code);
+        dependencies = await makeDependencySpec(namespace, actorSpec, ActorClass);
+    }
+    catch (err) {
+        return unknownToErrorCompileResponse('Evaluation', err);
+    }
+    return CompileResponse.fromPartial({
+        bundle: {
             code,
             sourceMap,
             dependencies,
             buildInfo: {
                 created: new Date(),
                 dependencies: newBuildInfoDependencies(entryPoint),
-                targetRuntime,
             },
-        }));
-    }
-    // remove duplicate bundles
-    const filteredBundles = [];
-    const bundleHashes = new Set();
-    bundles.forEach((bundle) => {
-        const algo = crypto.createHash('sha256');
-        algo.update(bundle.code);
-        const hash = algo.digest('hex');
-        if (!bundleHashes.has(hash)) {
-            bundleHashes.add(hash);
-            filteredBundles.push(bundle);
-        }
-    });
-    if (filteredBundles.length === 1) {
-        filteredBundles[0].buildInfo.targetRuntime = TargetRuntime.UNIVERSAL;
-    }
-    return CompileResponse.fromPartial({
-        bundles: filteredBundles,
+        },
         errors,
         warnings,
     });
@@ -354,16 +290,13 @@ function esbuildMessageToBuildLog(msg) {
 function isEsbuildResult(err) {
     return err instanceof Object && 'errors' in err && 'warnings' in err;
 }
-function esbuildConfig(disableExternDevvitProtos, targetRuntime) {
+function esbuildConfig(disableExternDevvitProtos) {
     return {
         // Recursively inline any imported dependencies.
         bundle: true,
         // Split the @devvit/protos from the LinkedBundle. This means apps assume
         // @devvit/protos is available for import at execution time.
-        plugins: [
-            externalizeDevvitProtosPlugin(disableExternDevvitProtos),
-            ...getTargetPlugins(targetRuntime),
-        ],
+        plugins: [externalizeDevvitProtosPlugin(disableExternDevvitProtos)],
         // to-do: uncomment once runtime is split aware and deployed everywhere.
         // external: ['@devvit/protos'],
         // Both format and target are intended to align to
@@ -407,38 +340,6 @@ function externalizeDevvitProtosPlugin(disableExternDevvitProtos) {
         },
     };
 }
-function getTargetPlugins(targetRuntime) {
-    if (targetRuntime === TargetRuntime.CLIENT) {
-        return clientBundlePlugins();
-    }
-    return [];
-}
-function clientBundlePlugins() {
-    return [
-        {
-            name: 'removeServerCode',
-            setup(build) {
-                build.onResolve({ filter: /(\/server\/)|(\.server\.(js|ts)x?$)/ }, () => {
-                    return {
-                        path: 'server-stub.js',
-                        namespace: 'server-only',
-                    };
-                });
-                build.onLoad({ filter: /.*/, namespace: 'server-only' }, async () => {
-                    const contents = `
-            ${CircuitBreak}
-            module.exports = new Proxy({}, {
-              has: () => true,
-              get: () => { throw CircuitBreak() },
-              apply: () => { throw CircuitBreak() },
-            });
-          `;
-                    return { contents, loader: 'js' };
-                });
-            },
-        },
-    ];
-}
 /**
  * Plugin for excluding code from inclusion in the source map by filename. This helps keep bundle size manageable.
  * @arg {RegExp} config.filter - A filter for what paths to exclude, if they match.

package/esbuild/type-checkers/TscTypeChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TscTypeChecker.d.ts","sourceRoot":"","sources":["../../../src/esbuild/type-checkers/TscTypeChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,GAAG,MAAM,YAAY,CAAC;AAI7B,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqC/D;;;;GAIG;AACH,qBAAa,cAAe,YAAW,WAAW;IAC1C,KAAK,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;CAehE;AAMD,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,GAAG,eAAe,CA0C/F"}
+{"version":3,"file":"TscTypeChecker.d.ts","sourceRoot":"","sources":["../../../src/esbuild/type-checkers/TscTypeChecker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,GAAG,MAAM,YAAY,CAAC;AAI7B,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqC/D;;;;GAIG;AACH,qBAAa,cAAe,YAAW,WAAW;IAC1C,KAAK,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;CAehE;AAMD,wBAAgB,mCAAmC,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,GAAG,eAAe,CAyC/F"}

package/esbuild/type-checkers/TscTypeChecker.js

@@ -84,7 +84,6 @@ export function tscTypeCheckResultToCompileResponse(emitResult) {
         }
     });
     return prefixBuildResultLogs({
-        bundles: [],
         errors,
         warnings,
     }, 'tsc');

package/esbuild/utils.js

@@ -10,21 +10,21 @@ export function prefixBuildResultLogs(buildResult, prefix) {
 }
 export function mergeCompileRes(...compileRes) {
     const mergedCompileRes = CompileResponse.fromPartial({});
-    let bundles = null;
+    let bundle = null;
     for (const res of compileRes) {
-        if (res.bundles.length > 0) {
-            if (bundles != null) {
-                throw new Error('Cannot merge two compile responses both with bundles');
+        if (res.bundle != null) {
+            if (bundle != null) {
+                throw new Error('Cannot merge two compile responses both with a bundle');
             }
             else {
-                bundles = res.bundles;
+                bundle = res.bundle;
             }
         }
         mergedCompileRes.errors.push(...res.errors);
         mergedCompileRes.warnings.push(...res.warnings);
     }
-    if (bundles != null) {
-        mergedCompileRes.bundles = bundles;
+    if (bundle != null) {
+        mergedCompileRes.bundle = bundle;
     }
     return mergedCompileRes;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/build-pack",
-  "version": "0.11.1-next-2024-10-21-dbc4313a2.0",
+  "version": "0.11.1",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -23,8 +23,8 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.11.1-next-2024-10-21-dbc4313a2.0",
-    "@devvit/shared-types": "0.11.1-next-2024-10-21-dbc4313a2.0",
+    "@devvit/protos": "0.11.1",
+    "@devvit/shared-types": "0.11.1",
     "esbuild": "0.23.0",
     "rxjs": "7.8.1",
     "tiny-glob": "0.2.9",
@@ -32,9 +32,9 @@
     "typescript": "5.3.2"
   },
   "devDependencies": {
-    "@devvit/public-api": "0.11.1-next-2024-10-21-dbc4313a2.0",
-    "@devvit/repo-tools": "0.11.1-next-2024-10-21-dbc4313a2.0",
-    "@devvit/tsconfig": "0.11.1-next-2024-10-21-dbc4313a2.0",
+    "@devvit/public-api": "0.11.1",
+    "@devvit/repo-tools": "0.11.1",
+    "@devvit/tsconfig": "0.11.1",
     "@types/tsv": "0.2.1",
     "eslint": "9.11.1",
     "typescript": "5.3.2",
@@ -44,5 +44,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "f4e70cc39e59730a7cea6db8e01e307fcab2c2cc"
+  "gitHead": "b7e0214655df6dcdd70c7944b9a14b0d752577ae"
 }