@devvit/build-pack 0.12.2-next-2025-11-06-18-52-53-c25515acb.0 → 0.12.2-next-2025-11-07-16-59-24-21fb6917e.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esbuild/ESBuildPack.d.ts.map +1 -1
- package/esbuild/ESBuildPack.js +38 -4
- package/package.json +12 -12
|
@@ -1 +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,EAIf,MAAM,+CAA+C,CAAC;AAGvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAIjG,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAI5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAc1D,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,cAAc,CAAC;CACtB,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;
|
|
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,EAIf,MAAM,+CAA+C,CAAC;AAGvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAIjG,OAAO,EAAmB,UAAU,EAAW,MAAM,MAAM,CAAC;AAI5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAc1D,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IACvB,IAAI,EAAE,SAAS,CAAC;IAChB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,cAAc,CAAC;CACtB,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;AAoBF,qBAAa,OAAO;;IAyBlB;;;OAGG;gBAED,MAAM,EAAE,QAAQ,CAAC,SAAS,CAAC,GAAG,SAAS,EACvC,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;CAgH/B;AAED,KAAK,kBAAkB,GAAG;IACxB,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC1D,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,MAAM,EACN,MAAM,EACN,IAAI,EACJ,eAAe,EACf,IAAI,GACL,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC;IA2DrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,aAAa,GAAG,UAAU,CAAC,eAAe,CAAC;CAkB1E;AAsVD,gBAAgB;AAChB,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhE;AAED,sDAAsD;AACtD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,QAAQ,CAAC,eAAe,CAAC,GAAG,SAAS,GAC5C,IAAI,CAKN;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAMrF"}
|
package/esbuild/ESBuildPack.js
CHANGED
|
@@ -29,6 +29,10 @@ import { externalizeDevvitProtos } from './plugins/externalizeDevvitProtos.js';
|
|
|
29
29
|
import { postProcessServerStubCode, serverClientCodeSplit, } from './plugins/serverClientCodeSplit.js';
|
|
30
30
|
import { templatize } from './templatizer/templatizer.js';
|
|
31
31
|
import { prefixBuildResultLogs } from './utils.js';
|
|
32
|
+
const SERVER_ENTRY_WAIT_TIMEOUT_MS = 10_000;
|
|
33
|
+
const SERVER_ENTRY_INITIAL_DELAY_MS = 100;
|
|
34
|
+
const SERVER_ENTRY_MAX_DELAY_MS = 2_000;
|
|
35
|
+
const SERVER_ENTRY_WARN_THRESHOLD_MS = 5_000;
|
|
32
36
|
const FAKE_FACTORY = {
|
|
33
37
|
// TODO: remove use of any below
|
|
34
38
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -242,6 +246,33 @@ export class ESBuildPack {
|
|
|
242
246
|
}
|
|
243
247
|
}
|
|
244
248
|
_ESBuildPack_bundleWatchers = new WeakMap(), _ESBuildPack_namespace = new WeakMap(), _ESBuildPack_disableExternDevvitProtos = new WeakMap();
|
|
249
|
+
async function waitForServerEntry(root, server) {
|
|
250
|
+
if (!server)
|
|
251
|
+
return true;
|
|
252
|
+
const entryPath = path.resolve(root, path.join(server.dir, server.entry));
|
|
253
|
+
if (fs.existsSync(entryPath))
|
|
254
|
+
return true;
|
|
255
|
+
const start = Date.now();
|
|
256
|
+
const deadline = start + SERVER_ENTRY_WAIT_TIMEOUT_MS;
|
|
257
|
+
const warnAt = start + SERVER_ENTRY_WARN_THRESHOLD_MS;
|
|
258
|
+
let warned = false;
|
|
259
|
+
let delay = SERVER_ENTRY_INITIAL_DELAY_MS;
|
|
260
|
+
while (Date.now() < deadline) {
|
|
261
|
+
const remaining = deadline - Date.now();
|
|
262
|
+
if (remaining <= 0)
|
|
263
|
+
break;
|
|
264
|
+
const waitMs = Math.min(delay, remaining);
|
|
265
|
+
await new Promise((resolve) => setTimeout(resolve, waitMs));
|
|
266
|
+
if (fs.existsSync(entryPath))
|
|
267
|
+
return true;
|
|
268
|
+
if (!warned && Date.now() >= warnAt) {
|
|
269
|
+
warned = true;
|
|
270
|
+
console.warn(`Waiting for \`config.server.entry\` file (${path.relative(root, entryPath)}) to be generated...`);
|
|
271
|
+
}
|
|
272
|
+
delay = Math.min(delay * 2, SERVER_ENTRY_MAX_DELAY_MS);
|
|
273
|
+
}
|
|
274
|
+
return fs.existsSync(entryPath);
|
|
275
|
+
}
|
|
245
276
|
async function newCompileResponse(config, namespace, actorSpec, buildResults, root, includeMetafile = false) {
|
|
246
277
|
const errors = [];
|
|
247
278
|
const warnings = [];
|
|
@@ -301,14 +332,17 @@ async function newCompileResponse(config, namespace, actorSpec, buildResults, ro
|
|
|
301
332
|
metafile,
|
|
302
333
|
});
|
|
303
334
|
}
|
|
335
|
+
const serverEntry = config?.server
|
|
336
|
+
? path.join(config.server.dir, config.server.entry)
|
|
337
|
+
: undefined;
|
|
338
|
+
if (!(await waitForServerEntry(root, config?.server))) {
|
|
339
|
+
return unknownToErrorCompileResponse('Evaluation', `Cannot read \`config.server.entry\` file (${serverEntry}). Make sure the \`server.entry\` value in devvit.json is correct and that your project is built.`);
|
|
340
|
+
}
|
|
304
341
|
try {
|
|
305
342
|
updateBundleServer(bundles, root, config?.server);
|
|
306
343
|
}
|
|
307
344
|
catch {
|
|
308
|
-
|
|
309
|
-
? path.join(config.server.dir, config.server.entry)
|
|
310
|
-
: undefined;
|
|
311
|
-
return unknownToErrorCompileResponse('Evaluation', `Cannot read \`config.server.entry\` file (${serverEntry}).`);
|
|
345
|
+
return unknownToErrorCompileResponse('Evaluation', `Cannot read \`config.server.entry\` file (${serverEntry}). Make sure the \`server.entry\` value in devvit.json is correct and that your project is built.`);
|
|
312
346
|
}
|
|
313
347
|
return { bundles, errors, warnings };
|
|
314
348
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@devvit/build-pack",
|
|
3
|
-
"version": "0.12.2-next-2025-11-
|
|
3
|
+
"version": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
4
4
|
"license": "BSD-3-Clause",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
},
|
|
32
32
|
"types": "./dist/index.d.ts",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@devvit/payments": "0.12.2-next-2025-11-
|
|
35
|
-
"@devvit/protos": "0.12.2-next-2025-11-
|
|
36
|
-
"@devvit/shared-types": "0.12.2-next-2025-11-
|
|
37
|
-
"@devvit/splash": "0.12.2-next-2025-11-
|
|
34
|
+
"@devvit/payments": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
35
|
+
"@devvit/protos": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
36
|
+
"@devvit/shared-types": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
37
|
+
"@devvit/splash": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
38
38
|
"esbuild": "0.25.9",
|
|
39
39
|
"rxjs": "7.8.1",
|
|
40
40
|
"tsv": "0.2.0",
|
|
@@ -45,16 +45,16 @@
|
|
|
45
45
|
"@devvit/shared": "*"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@devvit/public-api": "0.12.2-next-2025-11-
|
|
49
|
-
"@devvit/repo-tools": "0.12.2-next-2025-11-
|
|
50
|
-
"@devvit/scheduler": "0.12.2-next-2025-11-
|
|
51
|
-
"@devvit/server": "0.12.2-next-2025-11-
|
|
52
|
-
"@devvit/shared": "0.12.2-next-2025-11-
|
|
53
|
-
"@devvit/tsconfig": "0.12.2-next-2025-11-
|
|
48
|
+
"@devvit/public-api": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
49
|
+
"@devvit/repo-tools": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
50
|
+
"@devvit/scheduler": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
51
|
+
"@devvit/server": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
52
|
+
"@devvit/shared": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
53
|
+
"@devvit/tsconfig": "0.12.2-next-2025-11-07-16-59-24-21fb6917e.0",
|
|
54
54
|
"@types/tsv": "0.2.1",
|
|
55
55
|
"eslint": "9.11.1",
|
|
56
56
|
"vitest": "1.6.1"
|
|
57
57
|
},
|
|
58
58
|
"source": "./src/index.ts",
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "e607dd7723c39fb1b4cac9f5a292db911f587a38"
|
|
60
60
|
}
|