@devvit/build-pack 0.11.16-next-2025-05-27-a5c17aa82.0 → 0.11.16

package/esbuild/ESBuildPack.d.ts

@@ -1,32 +1,9 @@
-import { Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
+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 { Namespace } from '@devvit/shared-types/Namespace.js';
 import { Observable } from 'rxjs';
-import type { ProjectRootDir } from '../lib/BuildPack.js';
-export type CompileParams = {
-    filename: string;
-    minify: 'None' | 'All';
-    info: ActorSpec;
-    includeMetafile: boolean;
-};
-export type CompileResponse = {
-    bundles: Bundle[];
-    errors: CompileLog[];
-    warnings: CompileLog[];
-};
-export type CompileLog = {
-    detail?: CompileLogLineDetail;
-    text: string;
-};
-export type CompileLogLineDetail = {
-    /** 0-based.*/
-    column: number;
-    filename: string;
-    /** 1-based. */
-    line: number;
-    suggestion: string;
-    text: string;
-};
+import type { BuildPack, ProjectRootDir } from '../lib/BuildPack.js';
 export declare class Watcher {
     #private;
     /**
@@ -43,16 +20,16 @@ type ESBuildPackOptions = {
     readonly disableTypeCheckerWarning?: boolean | undefined;
     readonly targetRuntimes?: TargetRuntime[] | undefined;
 };
-export declare class ESBuildPack {
+export declare class ESBuildPack implements BuildPack {
     #private;
     /**
      * The default behavior is to externalize @devvit/protos. Set
      * disableExternDevvitProtos to bundle this large dependency.
      */
     constructor(namespace: Readonly<Namespace>, options?: Readonly<ESBuildPackOptions>);
-    compile({ filename, minify, info, includeMetafile, }: CompileParams): Promise<CompileResponse>;
+    Compile({ filename, minify, info, includeMetafile }: CompileParams, _metadata: Metadata | undefined): Promise<CompileResponse>;
     dispose(): Promise<void>;
-    watch({ filename, info }: CompileParams): Observable<CompileResponse>;
+    Watch({ filename, info }: CompileParams, _metadata: Metadata | undefined): Observable<CompileResponse>;
 }
 export {};
 //# sourceMappingURL=ESBuildPack.d.ts.map

package/esbuild/ESBuildPack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ESBuildPack.d.ts","sourceRoot":"","sources":["../../src/esbuild/ESBuildPack.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,kEAAkE,CAAC;AAC1F,OAAO,EACL,KAAK,SAAS,EAEd,aAAa,EACd,MAAM,+CAA+C,CAAC;AAGvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAKnE,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAG5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAY1D,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,UAAU,EAAE,CAAC;IACrB,QAAQ,EAAE,UAAU,EAAE,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,CAAC,EAAE,oBAAoB,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAeF,qBAAa,OAAO;;IAyBlB;;;OAGG;gBAED,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IA2BxC,aAAa,IAAI,UAAU,CAAC,eAAe,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAoG/B;AAED,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzD,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,WAAW;;IAWtB;;;OAGG;gBACS,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAK5E,OAAO,CAAC,EACZ,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,eAAe,GAChB,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IAsDrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,aAAa,GAAG,UAAU,CAAC,eAAe,CAAC;CAWtE"}
+{"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;AAGvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAKnE,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAG5D,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAyBrE,qBAAa,OAAO;;IAyBlB;;;OAGG;gBAED,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAC9B,IAAI,EAAE,cAAc,EACpB,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IA2BxC,aAAa,IAAI,UAAU,CAAC,eAAe,CAAC;IAItC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAoG/B;AAED,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACzD,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;;IAW3C;;;OAGG;gBACS,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,kBAAkB,CAAC;IAK5E,OAAO,CACX,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,aAAa,EAC1D,SAAS,EAAE,QAAQ,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IAwDrB,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;CAc/B"}

package/esbuild/ESBuildPack.js

@@ -12,10 +12,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _Watcher_instances, _Watcher_disableExternDevvitProtos, _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;
 import crypto from 'node:crypto';
 import fs from 'node:fs';
-import { Bundle } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
+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 { ConfigImpl as Config } from '@devvit/shared-types/ConfigImpl.js';
-import { NonNull } from '@devvit/shared-types/NonNull.js';
+import { assertNonNull, NonNull } from '@devvit/shared-types/NonNull.js';
 import { StringUtil } from '@devvit/shared-types/StringUtil.js';
 import esbuild, {} from 'esbuild';
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
@@ -168,12 +168,13 @@ export class ESBuildPack {
         __classPrivateFieldSet(this, _ESBuildPack_namespace, namespace, "f");
         __classPrivateFieldSet(this, _ESBuildPack_disableExternDevvitProtos, options?.disableExternDevvitProtos ?? false, "f");
     }
-    async compile({ filename, minify, info, includeMetafile, }) {
+    async Compile({ filename, minify, info, includeMetafile }, _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) {
@@ -186,7 +187,7 @@ export class ESBuildPack {
                     sourcemap: 'external',
                     plugins: [excludeNodeModulesFromSourceMapsPlugin(), ...(cfg.plugins || [])],
                     sourcesContent: false,
-                    minify: minify === 'All',
+                    minify: minify === Minify.ALL,
                     outfile: 'main.js',
                     treeShaking: true,
                 });
@@ -207,7 +208,9 @@ export class ESBuildPack {
     async dispose() {
         await Promise.all(Array.from(__classPrivateFieldGet(this, _ESBuildPack_bundleWatchers, "f").values()).map((watcher) => watcher.dispose()));
     }
-    watch({ filename, info }) {
+    Watch({ filename, info }, _metadata) {
+        assertNonNull(filename, "Expected 'filename' of CompileParams to be non-null");
+        assertNonNull(info, "Expected 'info' of CompileParams to be non-null");
         if (!__classPrivateFieldGet(this, _ESBuildPack_bundleWatchers, "f").has(filename)) {
             const watcher = new Watcher(__classPrivateFieldGet(this, _ESBuildPack_namespace, "f"), filename, info, {
                 disableExternDevvitProtos: __classPrivateFieldGet(this, _ESBuildPack_disableExternDevvitProtos, "f"),
@@ -222,6 +225,7 @@ _ESBuildPack_bundleWatchers = new WeakMap(), _ESBuildPack_namespace = new WeakMa
 // 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, includeMetafile = false) {
+    assertNonNull(actorSpec, 'Expected actorSpec to be non-null');
     const errors = [];
     const warnings = [];
     const bundles = [];

package/esbuild/utils.d.ts

@@ -1,3 +1,5 @@
+import { CompileResponse } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
 import type { BuildResult } from 'esbuild';
 export declare function prefixBuildResultLogs(buildResult: BuildResult, prefix: 'esbuild'): BuildResult;
+export declare function mergeCompileRes(...compileRes: CompileResponse[]): CompileResponse;
 //# sourceMappingURL=utils.d.ts.map

package/esbuild/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/esbuild/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAG,WAAW,CAQ9F"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/esbuild/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,eAAe,EAChB,MAAM,kEAAkE,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,GAAG,WAAW,CAQ9F;AAED,wBAAgB,eAAe,CAAC,GAAG,UAAU,EAAE,eAAe,EAAE,GAAG,eAAe,CAkBjF"}

package/esbuild/utils.js

@@ -1,3 +1,4 @@
+import { CompileResponse, } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
 export function prefixBuildResultLogs(buildResult, prefix) {
     buildResult.errors.forEach((err) => {
         err.text = `[${prefix}] ${err.text}`;
@@ -7,3 +8,23 @@ export function prefixBuildResultLogs(buildResult, prefix) {
     });
     return buildResult;
 }
+export function mergeCompileRes(...compileRes) {
+    const mergedCompileRes = { bundles: [], errors: [], warnings: [] };
+    let bundles = 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');
+            }
+            else {
+                bundles = res.bundles;
+            }
+        }
+        mergedCompileRes.errors.push(...res.errors);
+        mergedCompileRes.warnings.push(...res.warnings);
+    }
+    if (bundles != null) {
+        mergedCompileRes.bundles = bundles;
+    }
+    return mergedCompileRes;
+}

package/lib/BuildPack.d.ts

@@ -1,9 +1,19 @@
-import type { CompileLog } from '../esbuild/ESBuildPack.js';
+import type * as protos from '@devvit/protos';
+import type { BuildPack as BuildPackService } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack.js';
+import type { CompileLog, CompileParams, CompileResponse } from '@devvit/protos/types/devvit/plugin/buildpack/buildpack_common.js';
+import type { Observable } from 'rxjs';
 /**
  * Project root directory (eg, . or src for single file projects). See
  * CompileParams.repository.filename.
  */
 export type ProjectRootDir = string;
+export declare abstract class BuildPack implements BuildPackService {
+    /** TypeScript entrypoint. Consider .tsx as well. */
+    static DevvitModuleEntryPoint: string;
+    abstract Compile(request: CompileParams, _metadata: protos.Metadata | undefined): Promise<CompileResponse>;
+    abstract Watch(request: CompileParams, _metadata: protos.Metadata | undefined): Observable<CompileResponse>;
+    abstract dispose(): Promise<void>;
+}
 export declare function formatLogs(logs: readonly Readonly<CompileLog>[]): string;
 export declare function formatLog(log: Readonly<CompileLog>): string;
 /** Returns path to source input. Eg, src/main.tsx or main.ts. */

package/lib/BuildPack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BuildPack.d.ts","sourceRoot":"","sources":["../../src/lib/BuildPack.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,MAAM,CAExE;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM,CAO3D;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAsChE"}
+{"version":3,"file":"BuildPack.d.ts","sourceRoot":"","sources":["../../src/lib/BuildPack.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,IAAI,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAC/G,OAAO,KAAK,EACV,UAAU,EACV,aAAa,EACb,eAAe,EAChB,MAAM,kEAAkE,CAAC;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAEvC;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC;AAEpC,8BAAsB,SAAU,YAAW,gBAAgB;IACzD,oDAAoD;IACpD,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAa;IAElD,QAAQ,CAAC,OAAO,CACd,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,GACrC,OAAO,CAAC,eAAe,CAAC;IAE3B,QAAQ,CAAC,KAAK,CACZ,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,GACrC,UAAU,CAAC,eAAe,CAAC;IAE9B,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAClC;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,MAAM,CAExE;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM,CAO3D;AAED,iEAAiE;AACjE,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAsChE"}

package/lib/BuildPack.js

@@ -1,6 +1,10 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { ACTOR_SRC_DIR } from '@devvit/shared-types/constants.js';
+export class BuildPack {
+}
+/** TypeScript entrypoint. Consider .tsx as well. */
+BuildPack.DevvitModuleEntryPoint = 'main.ts';
 export function formatLogs(logs) {
     return logs.map(formatLog).join('\n');
 }
@@ -17,7 +21,7 @@ export function formatLog(log) {
 export function getModuleEntrypoint(root) {
     const srcDir = path.join(root, ACTOR_SRC_DIR);
     const srcDevvitDir = path.join(srcDir, 'devvit');
-    const entrypointBase = 'main.ts';
+    const entrypointBase = BuildPack.DevvitModuleEntryPoint; // e.g., 'main.ts'
     const entrypointBaseNoExt = entrypointBase.replace(/\.(ts|js)$/, ''); // e.g., 'main'
     const tsxEntrypoint = `${entrypointBaseNoExt}.tsx`;
     const tsEntrypoint = `${entrypointBaseNoExt}.ts`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/build-pack",
-  "version": "0.11.16-next-2025-05-27-a5c17aa82.0",
+  "version": "0.11.16",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -23,17 +23,17 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.11.16-next-2025-05-27-a5c17aa82.0",
-    "@devvit/shared-types": "0.11.16-next-2025-05-27-a5c17aa82.0",
+    "@devvit/protos": "0.11.16",
+    "@devvit/shared-types": "0.11.16",
     "esbuild": "0.23.0",
     "rxjs": "7.8.1",
     "tsv": "0.2.0",
     "typescript": "5.8.3"
   },
   "devDependencies": {
-    "@devvit/public-api": "0.11.16-next-2025-05-27-a5c17aa82.0",
-    "@devvit/repo-tools": "0.11.16-next-2025-05-27-a5c17aa82.0",
-    "@devvit/tsconfig": "0.11.16-next-2025-05-27-a5c17aa82.0",
+    "@devvit/public-api": "0.11.16",
+    "@devvit/repo-tools": "0.11.16",
+    "@devvit/tsconfig": "0.11.16",
     "@types/tsv": "0.2.1",
     "eslint": "9.11.1",
     "vitest": "1.6.1"
@@ -42,5 +42,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "a5be7b0d04ad94e81aabab43d6677d45ee3b302a"
+  "gitHead": "1b0cb12682134d945f6b57deac6650807fce57aa"
 }