@devvit/build-pack 0.12.0-next-2025-04-24-137462f28.0 → 0.12.0-next-2025-04-28-dc6034d73.0

package/esbuild/ESBuildPack.js

@@ -445,6 +445,7 @@ function esbuildConfig(disableExternDevvitProtos, targetRuntime, watchMode = fal
         // Do not show any console output. Warnings and errors are reported in the
         // response.
         logLevel: 'silent',
+        platform: targetRuntime === TargetRuntime.UNIVERSAL ? 'node' : 'browser',
         target: 'es2020',
         // Write to in-memory buffers.
         write: false,

package/esbuild/plugins/serverClientCodeSplit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverClientCodeSplit.d.ts","sourceRoot":"","sources":["../../../src/esbuild/plugins/serverClientCodeSplit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKV,MAAM,EAEP,MAAM,SAAS,CAAC;AAgDjB;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAe,GAAG,MAAM,CAsGxE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9D"}
+{"version":3,"file":"serverClientCodeSplit.d.ts","sourceRoot":"","sources":["../../../src/esbuild/plugins/serverClientCodeSplit.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAKV,MAAM,EAEP,MAAM,SAAS,CAAC;AAgDjB;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,GAAE,OAAe,GAAG,MAAM,CAmFxE;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAO9D"}

package/esbuild/plugins/serverClientCodeSplit.js

@@ -52,7 +52,6 @@ export function serverClientCodeSplit(watchMode = false) {
         name: 'removeServerCode',
         setup(build) {
             let publicApiDir;
-            let projectDirs;
             // We can't call build.resolve() outside of one of the plugin callbacks
             build.onStart(async () => {
                 const { path: resolvedPath } = await build.resolve('@devvit/public-api', {
@@ -61,21 +60,6 @@ export function serverClientCodeSplit(watchMode = false) {
                     pluginData: 'removeServerCodeStart',
                 });
                 publicApiDir = path.dirname(resolvedPath);
-                projectDirs = [];
-                if (!build.initialOptions.entryPoints) {
-                    throw new Error('Invalid state: no entry points defined');
-                }
-                // Gather the list of project entrypoint directories so we can ensure we're only stubbing project code
-                let entrypoints;
-                if (Array.isArray(build.initialOptions.entryPoints)) {
-                    entrypoints = build.initialOptions.entryPoints.map((entry) => typeof entry === 'string' ? entry : entry.in);
-                }
-                else {
-                    entrypoints = Object.keys(build.initialOptions.entryPoints);
-                }
-                entrypoints.forEach((entrypoint) => {
-                    projectDirs.push(path.dirname(path.resolve(entrypoint)));
-                });
             });
             // Remove code the developer has marked as server-only by naming convention:
             build.onResolve({ filter: /(\/server\/)|(\.server\.(js|ts)x?$)/ }, async (args) => {
@@ -83,8 +67,8 @@ export function serverClientCodeSplit(watchMode = false) {
                 if (args.pluginData) {
                     return {};
                 }
-                const absPath = path.resolve(path.dirname(args.importer), args.path);
-                if (!projectDirs.some((projectDir) => absPath.startsWith(projectDir))) {
+                // Only the local project code should be stubbed
+                if (args.path.includes('node_modules')) {
                     return {};
                 }
                 if (!watchMode) {
@@ -102,7 +86,7 @@ export function serverClientCodeSplit(watchMode = false) {
                     pluginData: true,
                 });
                 // clean up the paths so we don't stamp local paths in the final output
-                resolved.path = path.relative(args.resolveDir, resolved.path);
+                resolved.path = path.relative(process.cwd(), resolved.path);
                 resolved.namespace = SERVER_ONLY_NAMESPACE;
                 return resolved;
             });

package/lib/BuildPack.d.ts.map

@@ -1 +1 @@
-{"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,CAqBhE"}
+{"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

@@ -19,22 +19,34 @@ export function formatLog(log) {
 }
 /** Returns path to source input. Eg, src/main.tsx or main.ts. */
 export function getModuleEntrypoint(root) {
-    // favor src/ if it exists. single file projects may point directly to the
-    // source directory.
-    const src = path.join(root, ACTOR_SRC_DIR);
-    // With the advent of webviews and LLMs, it's nice to have all devvit
-    // code in a single folder. This helps tsconfig.json support, LLM inference
-    // and general code hygiene!
-    const srcDevvit = path.join(src, 'devvit');
-    const dir = fs.existsSync(srcDevvit) ? srcDevvit : fs.existsSync(src) ? src : root;
-    // Support TSX files and give them priority is they exist.
-    // This is used to power UI (aka BlockKit)
-    // TS needs to have the `.tsx` extension separately because JSX has some
-    // minor syntax ambiguities with angle brackets for jsx vs type assertions
-    const ts = path.join(dir, BuildPack.DevvitModuleEntryPoint);
-    const tsx = `${ts}x`;
-    if (fs.existsSync(tsx)) {
-        return tsx;
+    const srcDir = path.join(root, ACTOR_SRC_DIR);
+    const srcDevvitDir = path.join(srcDir, 'devvit');
+    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`;
+    const potentialPaths = [];
+    // Priority 1: src/devvit directory if it exists
+    if (fs.existsSync(srcDevvitDir)) {
+        potentialPaths.push(path.join(srcDevvitDir, tsxEntrypoint));
+        potentialPaths.push(path.join(srcDevvitDir, tsEntrypoint));
     }
-    return ts;
+    // Priority 2: src directory if it exists
+    if (fs.existsSync(srcDir)) {
+        potentialPaths.push(path.join(srcDir, tsxEntrypoint));
+        potentialPaths.push(path.join(srcDir, tsEntrypoint));
+    }
+    // Priority 3: root directory
+    potentialPaths.push(path.join(root, tsxEntrypoint));
+    potentialPaths.push(path.join(root, tsEntrypoint)); // Default fallback
+    // Find the first existing path in the priority order
+    for (const p of potentialPaths) {
+        if (fs.existsSync(p)) {
+            return p;
+        }
+    }
+    // Fallback to the root main.ts path if nothing else exists.
+    // This line should technically be unreachable if root always exists,
+    // but provides a safety net.
+    return path.join(root, tsEntrypoint);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devvit/build-pack",
-  "version": "0.12.0-next-2025-04-24-137462f28.0",
+  "version": "0.12.0-next-2025-04-28-dc6034d73.0",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
@@ -23,8 +23,8 @@
   },
   "types": "./index.d.ts",
   "dependencies": {
-    "@devvit/protos": "0.12.0-next-2025-04-24-137462f28.0",
-    "@devvit/shared-types": "0.12.0-next-2025-04-24-137462f28.0",
+    "@devvit/protos": "0.12.0-next-2025-04-28-dc6034d73.0",
+    "@devvit/shared-types": "0.12.0-next-2025-04-28-dc6034d73.0",
     "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.12.0-next-2025-04-24-137462f28.0",
-    "@devvit/repo-tools": "0.12.0-next-2025-04-24-137462f28.0",
-    "@devvit/tsconfig": "0.12.0-next-2025-04-24-137462f28.0",
+    "@devvit/public-api": "0.12.0-next-2025-04-28-dc6034d73.0",
+    "@devvit/repo-tools": "0.12.0-next-2025-04-28-dc6034d73.0",
+    "@devvit/tsconfig": "0.12.0-next-2025-04-28-dc6034d73.0",
     "@types/tsv": "0.2.1",
     "eslint": "9.11.1",
     "typescript": "5.3.2",
@@ -44,5 +44,5 @@
     "directory": "dist"
   },
   "source": "./src/index.ts",
-  "gitHead": "6c680b1ce74f21ae0200dc527053c7382e75fd58"
+  "gitHead": "4083ee31c268f56b32d19f7dfefe2780b1ae1739"
 }