trigger.dev 0.0.0-v3-prerelease-20250108142426 → 0.0.0-v4-prerelease-20250916125920
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/README.md +28 -1
- package/dist/esm/apiClient.d.ts +158 -74
- package/dist/esm/apiClient.js +341 -76
- package/dist/esm/apiClient.js.map +1 -1
- package/dist/esm/build/buildWorker.d.ts +10 -6
- package/dist/esm/build/buildWorker.js +22 -38
- package/dist/esm/build/buildWorker.js.map +1 -1
- package/dist/esm/build/bundle.d.ts +18 -1
- package/dist/esm/build/bundle.js +142 -52
- package/dist/esm/build/bundle.js.map +1 -1
- package/dist/esm/build/entryPoints.d.ts +12 -0
- package/dist/esm/build/entryPoints.js +127 -0
- package/dist/esm/build/entryPoints.js.map +1 -0
- package/dist/esm/build/extensions.js +17 -0
- package/dist/esm/build/extensions.js.map +1 -1
- package/dist/esm/build/externals.js +184 -2
- package/dist/esm/build/externals.js.map +1 -1
- package/dist/esm/build/packageModules.d.ts +15 -5
- package/dist/esm/build/packageModules.js +154 -36
- package/dist/esm/build/packageModules.js.map +1 -1
- package/dist/esm/cli/common.d.ts +1 -1
- package/dist/esm/cli/common.js +38 -45
- package/dist/esm/cli/common.js.map +1 -1
- package/dist/esm/cli/index.js +19 -3
- package/dist/esm/cli/index.js.map +1 -1
- package/dist/esm/commands/analyze.d.ts +23 -0
- package/dist/esm/commands/analyze.js +122 -0
- package/dist/esm/commands/analyze.js.map +1 -0
- package/dist/esm/commands/deploy.d.ts +5 -2
- package/dist/esm/commands/deploy.js +271 -160
- package/dist/esm/commands/deploy.js.map +1 -1
- package/dist/esm/commands/dev.d.ts +36 -6
- package/dist/esm/commands/dev.js +71 -2
- package/dist/esm/commands/dev.js.map +1 -1
- package/dist/esm/commands/env.d.ts +2 -0
- package/dist/esm/commands/env.js +298 -0
- package/dist/esm/commands/env.js.map +1 -0
- package/dist/esm/commands/init.d.ts +9 -1
- package/dist/esm/commands/init.js +132 -65
- package/dist/esm/commands/init.js.map +1 -1
- package/dist/esm/commands/install-mcp.d.ts +50 -0
- package/dist/esm/commands/install-mcp.js +497 -0
- package/dist/esm/commands/install-mcp.js.map +1 -0
- package/dist/esm/commands/install-rules.d.ts +11 -0
- package/dist/esm/commands/install-rules.js +381 -0
- package/dist/esm/commands/install-rules.js.map +1 -0
- package/dist/esm/commands/list-profiles.d.ts +3 -7
- package/dist/esm/commands/list-profiles.js +7 -4
- package/dist/esm/commands/list-profiles.js.map +1 -1
- package/dist/esm/commands/login.d.ts +9 -5
- package/dist/esm/commands/login.js +40 -7
- package/dist/esm/commands/login.js.map +1 -1
- package/dist/esm/commands/logout.d.ts +1 -1
- package/dist/esm/commands/mcp.d.ts +38 -0
- package/dist/esm/commands/mcp.js +82 -0
- package/dist/esm/commands/mcp.js.map +1 -0
- package/dist/esm/commands/preview.d.ts +5 -0
- package/dist/esm/commands/preview.js +93 -0
- package/dist/esm/commands/preview.js.map +1 -0
- package/dist/esm/commands/promote.d.ts +3 -0
- package/dist/esm/commands/promote.js +86 -0
- package/dist/esm/commands/promote.js.map +1 -0
- package/dist/esm/commands/switch.d.ts +19 -0
- package/dist/esm/commands/switch.js +93 -0
- package/dist/esm/commands/switch.js.map +1 -0
- package/dist/esm/commands/trigger.d.ts +33 -0
- package/dist/esm/commands/trigger.js +88 -0
- package/dist/esm/commands/trigger.js.map +1 -0
- package/dist/esm/commands/update.d.ts +3 -2
- package/dist/esm/commands/update.js +23 -9
- package/dist/esm/commands/update.js.map +1 -1
- package/dist/esm/commands/whoami.d.ts +12 -1
- package/dist/esm/commands/whoami.js +36 -6
- package/dist/esm/commands/whoami.js.map +1 -1
- package/dist/esm/commands/workers/build.d.ts +4 -0
- package/dist/esm/commands/workers/build.js +345 -0
- package/dist/esm/commands/workers/build.js.map +1 -0
- package/dist/esm/commands/workers/create.d.ts +2 -0
- package/dist/esm/commands/workers/create.js +91 -0
- package/dist/esm/commands/workers/create.js.map +1 -0
- package/dist/esm/commands/workers/index.d.ts +2 -0
- package/dist/esm/commands/workers/index.js +13 -0
- package/dist/esm/commands/workers/index.js.map +1 -0
- package/dist/esm/commands/workers/list.d.ts +2 -0
- package/dist/esm/commands/workers/list.js +80 -0
- package/dist/esm/commands/workers/list.js.map +1 -0
- package/dist/esm/commands/workers/run.d.ts +2 -0
- package/dist/esm/commands/workers/run.js +105 -0
- package/dist/esm/commands/workers/run.js.map +1 -0
- package/dist/esm/config.d.ts +2 -1
- package/dist/esm/config.js +35 -8
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/deploy/buildImage.d.ts +12 -11
- package/dist/esm/deploy/buildImage.js +360 -115
- package/dist/esm/deploy/buildImage.js.map +1 -1
- package/dist/esm/dev/backgroundWorker.d.ts +6 -245
- package/dist/esm/dev/backgroundWorker.js +11 -320
- package/dist/esm/dev/backgroundWorker.js.map +1 -1
- package/dist/esm/dev/devOutput.js +48 -9
- package/dist/esm/dev/devOutput.js.map +1 -1
- package/dist/esm/dev/devSession.d.ts +2 -1
- package/dist/esm/dev/devSession.js +68 -65
- package/dist/esm/dev/devSession.js.map +1 -1
- package/dist/esm/dev/devSupervisor.d.ts +12 -0
- package/dist/esm/dev/devSupervisor.js +568 -0
- package/dist/esm/dev/devSupervisor.js.map +1 -0
- package/dist/esm/dev/lock.d.ts +1 -0
- package/dist/esm/dev/lock.js +80 -0
- package/dist/esm/dev/lock.js.map +1 -0
- package/dist/esm/dev/mcpServer.d.ts +10 -0
- package/dist/esm/dev/mcpServer.js +201 -0
- package/dist/esm/dev/mcpServer.js.map +1 -0
- package/dist/esm/dev/taskRunProcessPool.d.ts +39 -0
- package/dist/esm/dev/taskRunProcessPool.js +220 -0
- package/dist/esm/dev/taskRunProcessPool.js.map +1 -0
- package/dist/esm/dev/workerRuntime.d.ts +2 -2
- package/dist/esm/dev/workerRuntime.js +1 -265
- package/dist/esm/dev/workerRuntime.js.map +1 -1
- package/dist/esm/entryPoints/dev-index-worker.js +45 -8
- package/dist/esm/entryPoints/dev-index-worker.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-controller.d.ts +58 -0
- package/dist/esm/entryPoints/dev-run-controller.js +652 -0
- package/dist/esm/entryPoints/dev-run-controller.js.map +1 -0
- package/dist/esm/entryPoints/dev-run-worker.js +394 -199
- package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
- package/dist/esm/entryPoints/managed/controller.d.ts +63 -0
- package/dist/esm/entryPoints/managed/controller.js +482 -0
- package/dist/esm/entryPoints/managed/controller.js.map +1 -0
- package/dist/esm/entryPoints/managed/env.d.ts +170 -0
- package/dist/esm/entryPoints/managed/env.js +199 -0
- package/dist/esm/entryPoints/managed/env.js.map +1 -0
- package/dist/esm/entryPoints/managed/execution.d.ts +141 -0
- package/dist/esm/entryPoints/managed/execution.js +869 -0
- package/dist/esm/entryPoints/managed/execution.js.map +1 -0
- package/dist/esm/entryPoints/managed/logger.d.ts +30 -0
- package/dist/esm/entryPoints/managed/logger.js +47 -0
- package/dist/esm/entryPoints/managed/logger.js.map +1 -0
- package/dist/esm/entryPoints/managed/notifier.d.ts +30 -0
- package/dist/esm/entryPoints/managed/notifier.js +63 -0
- package/dist/esm/entryPoints/managed/notifier.js.map +1 -0
- package/dist/esm/entryPoints/managed/overrides.d.ts +18 -0
- package/dist/esm/entryPoints/managed/overrides.js +19 -0
- package/dist/esm/entryPoints/managed/overrides.js.map +1 -0
- package/dist/esm/entryPoints/managed/poller.d.ts +31 -0
- package/dist/esm/entryPoints/managed/poller.js +89 -0
- package/dist/esm/entryPoints/managed/poller.js.map +1 -0
- package/dist/esm/entryPoints/managed/snapshot.d.ts +54 -0
- package/dist/esm/entryPoints/managed/snapshot.js +293 -0
- package/dist/esm/entryPoints/managed/snapshot.js.map +1 -0
- package/dist/esm/entryPoints/managed/taskRunProcessProvider.d.ts +62 -0
- package/dist/esm/entryPoints/managed/taskRunProcessProvider.js +252 -0
- package/dist/esm/entryPoints/managed/taskRunProcessProvider.js.map +1 -0
- package/dist/esm/entryPoints/{deploy-index-controller.js → managed-index-controller.js} +27 -3
- package/dist/esm/entryPoints/managed-index-controller.js.map +1 -0
- package/dist/esm/entryPoints/{deploy-index-worker.js → managed-index-worker.js} +50 -21
- package/dist/esm/entryPoints/managed-index-worker.js.map +1 -0
- package/dist/esm/entryPoints/managed-run-controller.js +13 -0
- package/dist/esm/entryPoints/managed-run-controller.js.map +1 -0
- package/dist/esm/entryPoints/managed-run-worker.js +512 -0
- package/dist/esm/entryPoints/managed-run-worker.js.map +1 -0
- package/dist/esm/executions/taskRunProcess.d.ts +28 -82
- package/dist/esm/executions/taskRunProcess.js +130 -74
- package/dist/esm/executions/taskRunProcess.js.map +1 -1
- package/dist/esm/indexing/indexWorkerManifest.d.ts +21 -5
- package/dist/esm/indexing/indexWorkerManifest.js +4 -4
- package/dist/esm/indexing/indexWorkerManifest.js.map +1 -1
- package/dist/esm/indexing/registerResources.d.ts +5 -0
- package/dist/esm/indexing/registerResources.js +44 -0
- package/dist/esm/indexing/registerResources.js.map +1 -0
- package/dist/esm/mcp/auth.d.ts +12 -0
- package/dist/esm/mcp/auth.js +152 -0
- package/dist/esm/mcp/auth.js.map +1 -0
- package/dist/esm/mcp/capabilities.d.ts +4 -0
- package/dist/esm/mcp/capabilities.js +22 -0
- package/dist/esm/mcp/capabilities.js.map +1 -0
- package/dist/esm/mcp/config.d.ts +82 -0
- package/dist/esm/mcp/config.js +87 -0
- package/dist/esm/mcp/config.js.map +1 -0
- package/dist/esm/mcp/context.d.ts +45 -0
- package/dist/esm/mcp/context.js +129 -0
- package/dist/esm/mcp/context.js.map +1 -0
- package/dist/esm/mcp/formatters.d.ts +7 -0
- package/dist/esm/mcp/formatters.js +330 -0
- package/dist/esm/mcp/formatters.js.map +1 -0
- package/dist/esm/mcp/logger.d.ts +11 -0
- package/dist/esm/mcp/logger.js +34 -0
- package/dist/esm/mcp/logger.js.map +1 -0
- package/dist/esm/mcp/mintlifyClient.d.ts +1 -0
- package/dist/esm/mcp/mintlifyClient.js +65 -0
- package/dist/esm/mcp/mintlifyClient.js.map +1 -0
- package/dist/esm/mcp/schemas.d.ts +324 -0
- package/dist/esm/mcp/schemas.js +144 -0
- package/dist/esm/mcp/schemas.js.map +1 -0
- package/dist/esm/mcp/tools/deploys.d.ts +174 -0
- package/dist/esm/mcp/tools/deploys.js +161 -0
- package/dist/esm/mcp/tools/deploys.js.map +1 -0
- package/dist/esm/mcp/tools/docs.d.ts +77 -0
- package/dist/esm/mcp/tools/docs.js +18 -0
- package/dist/esm/mcp/tools/docs.js.map +1 -0
- package/dist/esm/mcp/tools/orgs.d.ts +172 -0
- package/dist/esm/mcp/tools/orgs.js +172 -0
- package/dist/esm/mcp/tools/orgs.js.map +1 -0
- package/dist/esm/mcp/tools/previewBranches.d.ts +78 -0
- package/dist/esm/mcp/tools/previewBranches.js +28 -0
- package/dist/esm/mcp/tools/previewBranches.js.map +1 -0
- package/dist/esm/mcp/tools/runs.d.ts +335 -0
- package/dist/esm/mcp/tools/runs.js +160 -0
- package/dist/esm/mcp/tools/runs.js.map +1 -0
- package/dist/esm/mcp/tools/tasks.d.ts +200 -0
- package/dist/esm/mcp/tools/tasks.js +117 -0
- package/dist/esm/mcp/tools/tasks.js.map +1 -0
- package/dist/esm/mcp/tools.d.ts +2 -0
- package/dist/esm/mcp/tools.js +40 -0
- package/dist/esm/mcp/tools.js.map +1 -0
- package/dist/esm/mcp/types.d.ts +6 -0
- package/dist/esm/mcp/types.js +2 -0
- package/dist/esm/mcp/types.js.map +1 -0
- package/dist/esm/mcp/utils.d.ts +89 -0
- package/dist/esm/mcp/utils.js +95 -0
- package/dist/esm/mcp/utils.js.map +1 -0
- package/dist/esm/rules/install.d.ts +1 -0
- package/dist/esm/rules/install.js +2 -0
- package/dist/esm/rules/install.js.map +1 -0
- package/dist/esm/rules/manifest.d.ts +145 -0
- package/dist/esm/rules/manifest.js +110 -0
- package/dist/esm/rules/manifest.js.map +1 -0
- package/dist/esm/rules/types.d.ts +3 -0
- package/dist/esm/rules/types.js +3 -0
- package/dist/esm/rules/types.js.map +1 -0
- package/dist/esm/utilities/accessTokens.d.ts +12 -0
- package/dist/esm/utilities/accessTokens.js +30 -0
- package/dist/esm/utilities/accessTokens.js.map +1 -0
- package/dist/esm/utilities/analyze.d.ts +13 -0
- package/dist/esm/utilities/analyze.js +463 -0
- package/dist/esm/utilities/analyze.js.map +1 -0
- package/dist/esm/utilities/cliOutput.d.ts +6 -1
- package/dist/esm/utilities/cliOutput.js +11 -2
- package/dist/esm/utilities/cliOutput.js.map +1 -1
- package/dist/esm/utilities/configFiles.d.ts +65 -15
- package/dist/esm/utilities/configFiles.js +124 -26
- package/dist/esm/utilities/configFiles.js.map +1 -1
- package/dist/esm/utilities/eventBus.d.ts +7 -3
- package/dist/esm/utilities/eventBus.js.map +1 -1
- package/dist/esm/utilities/fileSystem.d.ts +7 -1
- package/dist/esm/utilities/fileSystem.js +42 -4
- package/dist/esm/utilities/fileSystem.js.map +1 -1
- package/dist/esm/utilities/gitMeta.d.ts +2 -0
- package/dist/esm/utilities/gitMeta.js +220 -0
- package/dist/esm/utilities/gitMeta.js.map +1 -0
- package/dist/esm/utilities/githubActions.d.ts +4 -0
- package/dist/esm/utilities/githubActions.js +18 -0
- package/dist/esm/utilities/githubActions.js.map +1 -0
- package/dist/esm/utilities/initialBanner.js +18 -6
- package/dist/esm/utilities/initialBanner.js.map +1 -1
- package/dist/esm/utilities/localEnvVars.d.ts +3 -0
- package/dist/esm/utilities/localEnvVars.js +19 -0
- package/dist/esm/utilities/localEnvVars.js.map +1 -0
- package/dist/esm/utilities/sanitizeEnvVars.d.ts +16 -3
- package/dist/esm/utilities/sanitizeEnvVars.js +15 -0
- package/dist/esm/utilities/sanitizeEnvVars.js.map +1 -1
- package/dist/esm/utilities/session.d.ts +14 -0
- package/dist/esm/utilities/session.js +44 -47
- package/dist/esm/utilities/session.js.map +1 -1
- package/dist/esm/utilities/supportsHyperlinks.d.ts +15 -0
- package/dist/esm/utilities/supportsHyperlinks.js +122 -0
- package/dist/esm/utilities/supportsHyperlinks.js.map +1 -0
- package/dist/esm/utilities/tempDirectories.d.ts +1 -0
- package/dist/esm/utilities/tempDirectories.js +19 -2
- package/dist/esm/utilities/tempDirectories.js.map +1 -1
- package/dist/esm/utilities/terminalLink.d.ts +56 -0
- package/dist/esm/utilities/terminalLink.js +76 -0
- package/dist/esm/utilities/terminalLink.js.map +1 -0
- package/dist/esm/utilities/windows.js +51 -1
- package/dist/esm/utilities/windows.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +44 -25
- package/dist/esm/entryPoints/deploy-index-controller.js.map +0 -1
- package/dist/esm/entryPoints/deploy-index-worker.js.map +0 -1
- package/dist/esm/entryPoints/deploy-run-controller.js +0 -1099
- package/dist/esm/entryPoints/deploy-run-controller.js.map +0 -1
- package/dist/esm/entryPoints/deploy-run-worker.js +0 -366
- package/dist/esm/entryPoints/deploy-run-worker.js.map +0 -1
- package/dist/esm/indexing/registerTasks.d.ts +0 -2
- package/dist/esm/indexing/registerTasks.js +0 -62
- package/dist/esm/indexing/registerTasks.js.map +0 -1
- package/dist/esm/telemetry/tracing.d.ts +0 -3
- package/dist/esm/telemetry/tracing.js +0 -58
- package/dist/esm/telemetry/tracing.js.map +0 -1
- /package/dist/esm/entryPoints/{deploy-index-controller.d.ts → managed-index-controller.d.ts} +0 -0
- /package/dist/esm/entryPoints/{deploy-index-worker.d.ts → managed-index-worker.d.ts} +0 -0
- /package/dist/esm/entryPoints/{deploy-run-controller.d.ts → managed-run-controller.d.ts} +0 -0
- /package/dist/esm/entryPoints/{deploy-run-worker.d.ts → managed-run-worker.d.ts} +0 -0
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { DEFAULT_RUNTIME } from "@trigger.dev/core/v3/build";
|
|
3
|
-
import { resolveFileSources } from "../utilities/sourceFiles.js";
|
|
4
|
-
import { VERSION } from "../version.js";
|
|
5
|
-
import { bundleWorker } from "./bundle.js";
|
|
1
|
+
import { bundleWorker, createBuildManifestFromBundle } from "./bundle.js";
|
|
6
2
|
import { createBuildContext, notifyExtensionOnBuildComplete, notifyExtensionOnBuildStart, resolvePluginsForContext, } from "./extensions.js";
|
|
7
3
|
import { createExternalsBuildExtension } from "./externals.js";
|
|
8
|
-
import { deployIndexController, deployIndexWorker, deployRunController, deployRunWorker, } from "./packageModules.js";
|
|
9
4
|
import { join, relative, sep } from "node:path";
|
|
10
5
|
import { generateContainerfile } from "../deploy/buildImage.js";
|
|
11
6
|
import { writeFile } from "node:fs/promises";
|
|
@@ -22,7 +17,7 @@ export async function buildWorker(options) {
|
|
|
22
17
|
});
|
|
23
18
|
const resolvedConfig = options.resolvedConfig;
|
|
24
19
|
const externalsExtension = createExternalsBuildExtension(options.target, resolvedConfig, options.forcedExternals);
|
|
25
|
-
const buildContext = createBuildContext(
|
|
20
|
+
const buildContext = createBuildContext(options.target, resolvedConfig);
|
|
26
21
|
buildContext.prependExtension(externalsExtension);
|
|
27
22
|
await notifyExtensionOnBuildStart(buildContext);
|
|
28
23
|
const pluginsFromExtensions = resolvePluginsForContext(buildContext);
|
|
@@ -40,41 +35,26 @@ export async function buildWorker(options) {
|
|
|
40
35
|
jsxAutomatic: resolvedConfig.build.jsx.automatic,
|
|
41
36
|
});
|
|
42
37
|
options.listener?.onBundleComplete?.(bundleResult);
|
|
43
|
-
let buildManifest = {
|
|
44
|
-
|
|
45
|
-
|
|
38
|
+
let buildManifest = await createBuildManifestFromBundle({
|
|
39
|
+
bundle: bundleResult,
|
|
40
|
+
destination: options.destination,
|
|
41
|
+
resolvedConfig,
|
|
46
42
|
environment: options.environment,
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
sources: await resolveFileSources(bundleResult.files, resolvedConfig),
|
|
52
|
-
config: {
|
|
53
|
-
project: resolvedConfig.project,
|
|
54
|
-
dirs: resolvedConfig.dirs,
|
|
55
|
-
},
|
|
56
|
-
outputPath: options.destination,
|
|
57
|
-
runControllerEntryPoint: bundleResult.runControllerEntryPoint ?? deployRunController,
|
|
58
|
-
runWorkerEntryPoint: bundleResult.runWorkerEntryPoint ?? deployRunWorker,
|
|
59
|
-
indexControllerEntryPoint: bundleResult.indexControllerEntryPoint ?? deployIndexController,
|
|
60
|
-
indexWorkerEntryPoint: bundleResult.indexWorkerEntryPoint ?? deployIndexWorker,
|
|
61
|
-
loaderEntryPoint: bundleResult.loaderEntryPoint,
|
|
62
|
-
configPath: bundleResult.configPath,
|
|
63
|
-
customConditions: resolvedConfig.build.conditions ?? [],
|
|
64
|
-
deploy: {
|
|
65
|
-
env: options.envVars ? options.envVars : {},
|
|
66
|
-
},
|
|
67
|
-
build: {},
|
|
68
|
-
otelImportHook: {
|
|
69
|
-
include: resolvedConfig.instrumentedPackageNames ?? [],
|
|
70
|
-
},
|
|
71
|
-
};
|
|
43
|
+
branch: options.branch,
|
|
44
|
+
target: options.target,
|
|
45
|
+
envVars: options.envVars,
|
|
46
|
+
});
|
|
72
47
|
buildManifest = await notifyExtensionOnBuildComplete(buildContext, buildManifest);
|
|
73
|
-
if (options.target
|
|
48
|
+
if (options.target !== "dev") {
|
|
74
49
|
buildManifest = options.rewritePaths
|
|
75
50
|
? rewriteBuildManifestPaths(buildManifest, options.destination)
|
|
76
51
|
: buildManifest;
|
|
77
|
-
await writeDeployFiles(
|
|
52
|
+
await writeDeployFiles({
|
|
53
|
+
buildManifest,
|
|
54
|
+
resolvedConfig,
|
|
55
|
+
outputPath: options.destination,
|
|
56
|
+
bundleResult,
|
|
57
|
+
});
|
|
78
58
|
}
|
|
79
59
|
return buildManifest;
|
|
80
60
|
}
|
|
@@ -99,6 +79,9 @@ export function rewriteBuildManifestPaths(buildManifest, destinationDir) {
|
|
|
99
79
|
loaderEntryPoint: buildManifest.loaderEntryPoint
|
|
100
80
|
? rewriteOutputPath(destinationDir, buildManifest.loaderEntryPoint)
|
|
101
81
|
: undefined,
|
|
82
|
+
initEntryPoint: buildManifest.initEntryPoint
|
|
83
|
+
? rewriteOutputPath(destinationDir, buildManifest.initEntryPoint)
|
|
84
|
+
: undefined,
|
|
102
85
|
};
|
|
103
86
|
}
|
|
104
87
|
// Remove any query parameters from the entry path
|
|
@@ -116,7 +99,7 @@ function rewriteOutputPath(destinationDir, filePath) {
|
|
|
116
99
|
return `/app/${relative(destinationDir, filePath)}`;
|
|
117
100
|
}
|
|
118
101
|
}
|
|
119
|
-
async function writeDeployFiles(buildManifest, resolvedConfig, outputPath) {
|
|
102
|
+
async function writeDeployFiles({ buildManifest, resolvedConfig, outputPath, bundleResult, }) {
|
|
120
103
|
// Step 1. Read the package.json file
|
|
121
104
|
const packageJson = await readProjectPackageJson(resolvedConfig.packageJsonPath);
|
|
122
105
|
if (!packageJson) {
|
|
@@ -139,6 +122,7 @@ async function writeDeployFiles(buildManifest, resolvedConfig, outputPath) {
|
|
|
139
122
|
scripts: {},
|
|
140
123
|
});
|
|
141
124
|
await writeJSONFile(join(outputPath, "build.json"), buildManifestToJSON(buildManifest));
|
|
125
|
+
await writeJSONFile(join(outputPath, "metafile.json"), bundleResult.metafile);
|
|
142
126
|
await writeContainerfile(outputPath, buildManifest);
|
|
143
127
|
}
|
|
144
128
|
async function readProjectPackageJson(packageJsonPath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildWorker.js","sourceRoot":"","sources":["../../../src/build/buildWorker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buildWorker.js","sourceRoot":"","sources":["../../../src/build/buildWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ResolvedConfig } from "@trigger.dev/core/v3/build";
|
|
2
|
-
import { BuildTarget, TaskFile } from "@trigger.dev/core/v3/schemas";
|
|
2
|
+
import { BuildManifest, BuildTarget, TaskFile } from "@trigger.dev/core/v3/schemas";
|
|
3
3
|
import * as esbuild from "esbuild";
|
|
4
4
|
export interface BundleOptions {
|
|
5
5
|
target: BuildTarget;
|
|
@@ -16,13 +16,19 @@ export type BundleResult = {
|
|
|
16
16
|
contentHash: string;
|
|
17
17
|
files: TaskFile[];
|
|
18
18
|
configPath: string;
|
|
19
|
+
metafile: esbuild.Metafile;
|
|
19
20
|
loaderEntryPoint: string | undefined;
|
|
20
21
|
runWorkerEntryPoint: string | undefined;
|
|
21
22
|
runControllerEntryPoint: string | undefined;
|
|
22
23
|
indexWorkerEntryPoint: string | undefined;
|
|
23
24
|
indexControllerEntryPoint: string | undefined;
|
|
25
|
+
initEntryPoint: string | undefined;
|
|
24
26
|
stop: (() => Promise<void>) | undefined;
|
|
25
27
|
};
|
|
28
|
+
export declare class BundleError extends Error {
|
|
29
|
+
readonly issues?: esbuild.Message[] | undefined;
|
|
30
|
+
constructor(message: string, issues?: esbuild.Message[] | undefined);
|
|
31
|
+
}
|
|
26
32
|
export declare function bundleWorker(options: BundleOptions): Promise<BundleResult>;
|
|
27
33
|
export declare function getBundleResultFromBuild(target: BuildTarget, workingDir: string, resolvedConfig: ResolvedConfig, result: esbuild.BuildResult<{
|
|
28
34
|
metafile: true;
|
|
@@ -34,3 +40,14 @@ export declare function logBuildWarnings(warnings: esbuild.Message[]): void;
|
|
|
34
40
|
* style esbuild would.
|
|
35
41
|
*/
|
|
36
42
|
export declare function logBuildFailure(errors: esbuild.Message[], warnings: esbuild.Message[]): void;
|
|
43
|
+
export declare function createBuildManifestFromBundle({ bundle, destination, resolvedConfig, workerDir, environment, branch, target, envVars, sdkVersion, }: {
|
|
44
|
+
bundle: BundleResult;
|
|
45
|
+
destination: string;
|
|
46
|
+
resolvedConfig: ResolvedConfig;
|
|
47
|
+
workerDir?: string;
|
|
48
|
+
environment: string;
|
|
49
|
+
branch?: string;
|
|
50
|
+
target: BuildTarget;
|
|
51
|
+
envVars?: Record<string, string>;
|
|
52
|
+
sdkVersion?: string;
|
|
53
|
+
}): Promise<BuildManifest>;
|
package/dist/esm/build/bundle.js
CHANGED
|
@@ -1,18 +1,58 @@
|
|
|
1
|
+
import { CORE_VERSION } from "@trigger.dev/core/v3";
|
|
2
|
+
import { DEFAULT_RUNTIME } from "@trigger.dev/core/v3/build";
|
|
1
3
|
import * as esbuild from "esbuild";
|
|
2
4
|
import { createHash } from "node:crypto";
|
|
3
5
|
import { join, relative, resolve } from "node:path";
|
|
4
6
|
import { createFile } from "../utilities/fileSystem.js";
|
|
5
7
|
import { logger } from "../utilities/logger.js";
|
|
6
|
-
import {
|
|
8
|
+
import { resolveFileSources } from "../utilities/sourceFiles.js";
|
|
9
|
+
import { VERSION } from "../version.js";
|
|
10
|
+
import { createEntryPointManager } from "./entryPoints.js";
|
|
11
|
+
import { copyManifestToDir } from "./manifests.js";
|
|
12
|
+
import { getIndexControllerForTarget, getIndexWorkerForTarget, getRunControllerForTarget, getRunWorkerForTarget, isIndexControllerForTarget, isIndexWorkerForTarget, isInitEntryPoint, isLoaderEntryPoint, isRunControllerForTarget, isRunWorkerForTarget, shims, } from "./packageModules.js";
|
|
7
13
|
import { buildPlugins } from "./plugins.js";
|
|
14
|
+
import { cliLink, prettyError } from "../utilities/cliOutput.js";
|
|
15
|
+
import { SkipLoggingError } from "../cli/common.js";
|
|
16
|
+
export class BundleError extends Error {
|
|
17
|
+
issues;
|
|
18
|
+
constructor(message, issues) {
|
|
19
|
+
super(message);
|
|
20
|
+
this.issues = issues;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
8
23
|
export async function bundleWorker(options) {
|
|
9
24
|
const { resolvedConfig } = options;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
25
|
+
let currentContext;
|
|
26
|
+
const entryPointManager = await createEntryPointManager(resolvedConfig.dirs, resolvedConfig, options.target, typeof options.watch === "boolean" ? options.watch : false, async (newEntryPoints) => {
|
|
27
|
+
if (currentContext) {
|
|
28
|
+
// Rebuild with new entry points
|
|
29
|
+
await currentContext.cancel();
|
|
30
|
+
await currentContext.dispose();
|
|
31
|
+
const buildOptions = await createBuildOptions({
|
|
32
|
+
...options,
|
|
33
|
+
entryPoints: newEntryPoints,
|
|
34
|
+
});
|
|
35
|
+
logger.debug("Rebuilding worker with options", buildOptions);
|
|
36
|
+
currentContext = await esbuild.context(buildOptions);
|
|
37
|
+
await currentContext.watch();
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
if (entryPointManager.entryPoints.length === 0) {
|
|
41
|
+
const errorMessageBody = `
|
|
42
|
+
Dirs config:
|
|
43
|
+
${resolvedConfig.dirs.join("\n- ")}
|
|
44
|
+
|
|
45
|
+
Search patterns:
|
|
46
|
+
${entryPointManager.patterns.join("\n- ")}
|
|
47
|
+
|
|
48
|
+
Possible solutions:
|
|
49
|
+
1. Check if the directory paths in your config are correct
|
|
50
|
+
2. Verify that your files match the search patterns
|
|
51
|
+
3. Update the search patterns in your config
|
|
52
|
+
`.replace(/^ {6}/gm, "");
|
|
53
|
+
prettyError("No trigger files found", errorMessageBody, cliLink("View the config docs", "https://trigger.dev/docs/config/config-file"));
|
|
54
|
+
throw new SkipLoggingError();
|
|
55
|
+
}
|
|
16
56
|
let initialBuildResult;
|
|
17
57
|
const initialBuildResultPromise = new Promise((resolve) => (initialBuildResult = resolve));
|
|
18
58
|
const buildResultPlugin = {
|
|
@@ -21,22 +61,64 @@ export async function bundleWorker(options) {
|
|
|
21
61
|
build.onEnd(initialBuildResult);
|
|
22
62
|
},
|
|
23
63
|
};
|
|
64
|
+
const buildOptions = await createBuildOptions({
|
|
65
|
+
...options,
|
|
66
|
+
entryPoints: entryPointManager.entryPoints,
|
|
67
|
+
buildResultPlugin,
|
|
68
|
+
});
|
|
69
|
+
let result;
|
|
70
|
+
let stop;
|
|
71
|
+
logger.debug("Building worker with options", buildOptions);
|
|
72
|
+
if (options.watch) {
|
|
73
|
+
currentContext = await esbuild.context(buildOptions);
|
|
74
|
+
await currentContext.watch();
|
|
75
|
+
result = await initialBuildResultPromise;
|
|
76
|
+
if (result.errors.length > 0) {
|
|
77
|
+
throw new BundleError("Failed to build", result.errors);
|
|
78
|
+
}
|
|
79
|
+
stop = async function () {
|
|
80
|
+
await entryPointManager.stop();
|
|
81
|
+
await currentContext?.dispose();
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
result = await esbuild.build(buildOptions);
|
|
86
|
+
stop = async function () {
|
|
87
|
+
await entryPointManager.stop();
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
const bundleResult = await getBundleResultFromBuild(options.target, options.cwd, options.resolvedConfig, result);
|
|
91
|
+
if (!bundleResult) {
|
|
92
|
+
throw new Error("Failed to get bundle result");
|
|
93
|
+
}
|
|
94
|
+
return { ...bundleResult, stop };
|
|
95
|
+
}
|
|
96
|
+
// Helper function to create build options
|
|
97
|
+
async function createBuildOptions(options) {
|
|
24
98
|
const customConditions = options.resolvedConfig.build?.conditions ?? [];
|
|
25
99
|
const conditions = [...customConditions, "trigger.dev", "module", "node"];
|
|
26
|
-
const
|
|
27
|
-
|
|
100
|
+
const keepNames = options.resolvedConfig.build?.keepNames ??
|
|
101
|
+
options.resolvedConfig.build?.experimental_keepNames ??
|
|
102
|
+
true;
|
|
103
|
+
const minify = options.resolvedConfig.build?.minify ??
|
|
104
|
+
options.resolvedConfig.build?.experimental_minify ??
|
|
105
|
+
false;
|
|
106
|
+
const $buildPlugins = await buildPlugins(options.target, options.resolvedConfig);
|
|
107
|
+
return {
|
|
108
|
+
entryPoints: options.entryPoints,
|
|
28
109
|
outdir: options.destination,
|
|
29
110
|
absWorkingDir: options.cwd,
|
|
30
111
|
bundle: true,
|
|
31
112
|
metafile: true,
|
|
32
113
|
write: false,
|
|
33
|
-
minify
|
|
114
|
+
minify,
|
|
34
115
|
splitting: true,
|
|
35
116
|
charset: "utf8",
|
|
36
117
|
platform: "node",
|
|
37
118
|
sourcemap: true,
|
|
38
119
|
sourcesContent: options.target === "dev",
|
|
39
120
|
conditions,
|
|
121
|
+
keepNames,
|
|
40
122
|
format: "esm",
|
|
41
123
|
target: ["node20", "es2022"],
|
|
42
124
|
loader: {
|
|
@@ -49,39 +131,19 @@ export async function bundleWorker(options) {
|
|
|
49
131
|
inject: [...shims], // TODO: copy this into the working dir to work with Yarn PnP
|
|
50
132
|
jsx: options.jsxAutomatic ? "automatic" : undefined,
|
|
51
133
|
jsxDev: options.jsxAutomatic && options.target === "dev" ? true : undefined,
|
|
52
|
-
plugins: [
|
|
134
|
+
plugins: [
|
|
135
|
+
...$buildPlugins,
|
|
136
|
+
...(options.plugins ?? []),
|
|
137
|
+
...(options.buildResultPlugin ? [options.buildResultPlugin] : []),
|
|
138
|
+
],
|
|
53
139
|
...(options.jsxFactory && { jsxFactory: options.jsxFactory }),
|
|
54
140
|
...(options.jsxFragment && { jsxFragment: options.jsxFragment }),
|
|
55
141
|
logLevel: "silent",
|
|
56
142
|
logOverride: {
|
|
57
143
|
"empty-glob": "silent",
|
|
144
|
+
"package.json": "silent",
|
|
58
145
|
},
|
|
59
146
|
};
|
|
60
|
-
let result;
|
|
61
|
-
let stop;
|
|
62
|
-
logger.debug("Building worker with options", buildOptions);
|
|
63
|
-
if (options.watch) {
|
|
64
|
-
const ctx = await esbuild.context(buildOptions);
|
|
65
|
-
await ctx.watch();
|
|
66
|
-
result = await initialBuildResultPromise;
|
|
67
|
-
if (result.errors.length > 0) {
|
|
68
|
-
throw new Error("Failed to build");
|
|
69
|
-
}
|
|
70
|
-
stop = async function () {
|
|
71
|
-
await ctx.dispose();
|
|
72
|
-
};
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
result = await esbuild.build(buildOptions);
|
|
76
|
-
// Even when we're not watching, we still want some way of cleaning up the
|
|
77
|
-
// temporary directory when we don't need it anymore
|
|
78
|
-
stop = async function () { };
|
|
79
|
-
}
|
|
80
|
-
const bundleResult = await getBundleResultFromBuild(options.target, options.cwd, options.resolvedConfig, result);
|
|
81
|
-
if (!bundleResult) {
|
|
82
|
-
throw new Error("Failed to get bundle result");
|
|
83
|
-
}
|
|
84
|
-
return { ...bundleResult, stop };
|
|
85
147
|
}
|
|
86
148
|
export async function getBundleResultFromBuild(target, workingDir, resolvedConfig, result) {
|
|
87
149
|
const hasher = createHash("md5");
|
|
@@ -96,6 +158,7 @@ export async function getBundleResultFromBuild(target, workingDir, resolvedConfi
|
|
|
96
158
|
let runControllerEntryPoint;
|
|
97
159
|
let indexWorkerEntryPoint;
|
|
98
160
|
let indexControllerEntryPoint;
|
|
161
|
+
let initEntryPoint;
|
|
99
162
|
const configEntryPoint = resolvedConfig.configFile
|
|
100
163
|
? relative(resolvedConfig.workingDir, resolvedConfig.configFile)
|
|
101
164
|
: "trigger.config.ts";
|
|
@@ -123,6 +186,9 @@ export async function getBundleResultFromBuild(target, workingDir, resolvedConfi
|
|
|
123
186
|
else if (isIndexWorkerForTarget(outputMeta.entryPoint, target)) {
|
|
124
187
|
indexWorkerEntryPoint = $outputPath;
|
|
125
188
|
}
|
|
189
|
+
else if (isInitEntryPoint(outputMeta.entryPoint, resolvedConfig.dirs)) {
|
|
190
|
+
initEntryPoint = $outputPath;
|
|
191
|
+
}
|
|
126
192
|
else {
|
|
127
193
|
if (!outputMeta.entryPoint.startsWith("..") &&
|
|
128
194
|
!outputMeta.entryPoint.includes("node_modules")) {
|
|
@@ -145,25 +211,11 @@ export async function getBundleResultFromBuild(target, workingDir, resolvedConfi
|
|
|
145
211
|
runControllerEntryPoint,
|
|
146
212
|
indexWorkerEntryPoint,
|
|
147
213
|
indexControllerEntryPoint,
|
|
214
|
+
initEntryPoint,
|
|
148
215
|
contentHash: hasher.digest("hex"),
|
|
216
|
+
metafile: result.metafile,
|
|
149
217
|
};
|
|
150
218
|
}
|
|
151
|
-
async function getEntryPoints(target, config) {
|
|
152
|
-
const projectEntryPoints = config.dirs.flatMap((dir) => dirToEntryPointGlob(dir));
|
|
153
|
-
if (config.configFile) {
|
|
154
|
-
projectEntryPoints.push(config.configFile);
|
|
155
|
-
}
|
|
156
|
-
if (target === "dev") {
|
|
157
|
-
projectEntryPoints.push(...devEntryPoints);
|
|
158
|
-
}
|
|
159
|
-
else {
|
|
160
|
-
projectEntryPoints.push(...deployEntryPoints);
|
|
161
|
-
}
|
|
162
|
-
if (config.instrumentedPackageNames?.length ?? 0 > 0) {
|
|
163
|
-
projectEntryPoints.push(telemetryEntryPoint);
|
|
164
|
-
}
|
|
165
|
-
return projectEntryPoints;
|
|
166
|
-
}
|
|
167
219
|
// Converts a directory to a glob that matches all the entry points in that
|
|
168
220
|
function dirToEntryPointGlob(dir) {
|
|
169
221
|
return [
|
|
@@ -194,4 +246,42 @@ export function logBuildFailure(errors, warnings) {
|
|
|
194
246
|
}
|
|
195
247
|
logBuildWarnings(warnings);
|
|
196
248
|
}
|
|
249
|
+
export async function createBuildManifestFromBundle({ bundle, destination, resolvedConfig, workerDir, environment, branch, target, envVars, sdkVersion, }) {
|
|
250
|
+
const buildManifest = {
|
|
251
|
+
contentHash: bundle.contentHash,
|
|
252
|
+
runtime: resolvedConfig.runtime ?? DEFAULT_RUNTIME,
|
|
253
|
+
environment: environment,
|
|
254
|
+
branch,
|
|
255
|
+
packageVersion: sdkVersion ?? CORE_VERSION,
|
|
256
|
+
cliPackageVersion: VERSION,
|
|
257
|
+
target: target,
|
|
258
|
+
files: bundle.files,
|
|
259
|
+
sources: await resolveFileSources(bundle.files, resolvedConfig),
|
|
260
|
+
externals: [],
|
|
261
|
+
config: {
|
|
262
|
+
project: resolvedConfig.project,
|
|
263
|
+
dirs: resolvedConfig.dirs,
|
|
264
|
+
},
|
|
265
|
+
outputPath: destination,
|
|
266
|
+
indexControllerEntryPoint: bundle.indexControllerEntryPoint ?? getIndexControllerForTarget(target),
|
|
267
|
+
indexWorkerEntryPoint: bundle.indexWorkerEntryPoint ?? getIndexWorkerForTarget(target),
|
|
268
|
+
runControllerEntryPoint: bundle.runControllerEntryPoint ?? getRunControllerForTarget(target),
|
|
269
|
+
runWorkerEntryPoint: bundle.runWorkerEntryPoint ?? getRunWorkerForTarget(target),
|
|
270
|
+
loaderEntryPoint: bundle.loaderEntryPoint,
|
|
271
|
+
initEntryPoint: bundle.initEntryPoint,
|
|
272
|
+
configPath: bundle.configPath,
|
|
273
|
+
customConditions: resolvedConfig.build.conditions ?? [],
|
|
274
|
+
deploy: {
|
|
275
|
+
env: envVars ?? {},
|
|
276
|
+
},
|
|
277
|
+
build: {},
|
|
278
|
+
otelImportHook: {
|
|
279
|
+
include: resolvedConfig.instrumentedPackageNames ?? [],
|
|
280
|
+
},
|
|
281
|
+
};
|
|
282
|
+
if (!workerDir) {
|
|
283
|
+
return buildManifest;
|
|
284
|
+
}
|
|
285
|
+
return copyManifestToDir(buildManifest, destination, workerDir);
|
|
286
|
+
}
|
|
197
287
|
//# sourceMappingURL=bundle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/build/bundle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/build/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { BuildTarget } from "@trigger.dev/core/v3";
|
|
2
|
+
import { ResolvedConfig } from "@trigger.dev/core/v3/build";
|
|
3
|
+
import * as chokidar from "chokidar";
|
|
4
|
+
type EntryPointManager = {
|
|
5
|
+
entryPoints: string[];
|
|
6
|
+
patterns: string[];
|
|
7
|
+
ignorePatterns: string[];
|
|
8
|
+
watcher?: chokidar.FSWatcher;
|
|
9
|
+
stop: () => Promise<void>;
|
|
10
|
+
};
|
|
11
|
+
export declare function createEntryPointManager(dirs: string[], config: ResolvedConfig, target: BuildTarget, watch: boolean, onEntryPointsChange?: (entryPoints: string[]) => Promise<void>): Promise<EntryPointManager>;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import * as chokidar from "chokidar";
|
|
2
|
+
import { glob, escapePath, isDynamicPattern } from "tinyglobby";
|
|
3
|
+
import { logger } from "../utilities/logger.js";
|
|
4
|
+
import { devEntryPoints, managedEntryPoints, telemetryEntryPoint, unmanagedEntryPoints, } from "./packageModules.js";
|
|
5
|
+
const DEFAULT_IGNORE_PATTERNS = [
|
|
6
|
+
"**/*.test.ts",
|
|
7
|
+
"**/*.test.mts",
|
|
8
|
+
"**/*.test.cts",
|
|
9
|
+
"**/*.test.js",
|
|
10
|
+
"**/*.test.mjs",
|
|
11
|
+
"**/*.test.cjs",
|
|
12
|
+
"**/*.spec.ts",
|
|
13
|
+
"**/*.spec.mts",
|
|
14
|
+
"**/*.spec.cts",
|
|
15
|
+
"**/*.spec.js",
|
|
16
|
+
"**/*.spec.mjs",
|
|
17
|
+
"**/*.spec.cjs",
|
|
18
|
+
];
|
|
19
|
+
export async function createEntryPointManager(dirs, config, target, watch, onEntryPointsChange) {
|
|
20
|
+
// Patterns to match files
|
|
21
|
+
const patterns = dirs.flatMap((dir) => [
|
|
22
|
+
`${isDynamicPattern(dir)
|
|
23
|
+
? `${dir}/*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}`
|
|
24
|
+
: `${escapePath(dir)}/**/*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}`}`,
|
|
25
|
+
]);
|
|
26
|
+
// Patterns to ignore
|
|
27
|
+
let ignorePatterns = config.ignorePatterns ?? DEFAULT_IGNORE_PATTERNS;
|
|
28
|
+
ignorePatterns = ignorePatterns.concat([
|
|
29
|
+
"**/node_modules/**",
|
|
30
|
+
"**/.git/**",
|
|
31
|
+
"**/.trigger/**",
|
|
32
|
+
"**/.next/**",
|
|
33
|
+
]);
|
|
34
|
+
async function getEntryPoints() {
|
|
35
|
+
// Get initial entry points
|
|
36
|
+
const entryPoints = await glob(patterns, {
|
|
37
|
+
ignore: ignorePatterns,
|
|
38
|
+
absolute: false,
|
|
39
|
+
cwd: config.workingDir,
|
|
40
|
+
});
|
|
41
|
+
if (entryPoints.length === 0) {
|
|
42
|
+
return [];
|
|
43
|
+
}
|
|
44
|
+
// Add required entry points
|
|
45
|
+
if (config.configFile) {
|
|
46
|
+
entryPoints.push(config.configFile);
|
|
47
|
+
}
|
|
48
|
+
switch (target) {
|
|
49
|
+
case "dev": {
|
|
50
|
+
entryPoints.push(...devEntryPoints);
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
case "deploy": {
|
|
54
|
+
entryPoints.push(...managedEntryPoints);
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
case "unmanaged": {
|
|
58
|
+
entryPoints.push(...unmanagedEntryPoints);
|
|
59
|
+
break;
|
|
60
|
+
}
|
|
61
|
+
default: {
|
|
62
|
+
entryPoints.push(...managedEntryPoints);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (config.instrumentedPackageNames?.length ?? 0 > 0) {
|
|
66
|
+
entryPoints.push(telemetryEntryPoint);
|
|
67
|
+
}
|
|
68
|
+
// Sort to ensure consistent comparison
|
|
69
|
+
return entryPoints.sort();
|
|
70
|
+
}
|
|
71
|
+
const initialEntryPoints = await getEntryPoints();
|
|
72
|
+
logger.debug("Initial entry points", {
|
|
73
|
+
entryPoints: initialEntryPoints,
|
|
74
|
+
patterns,
|
|
75
|
+
cwd: config.workingDir,
|
|
76
|
+
});
|
|
77
|
+
let currentEntryPoints = initialEntryPoints;
|
|
78
|
+
// Only setup watcher if watch is true
|
|
79
|
+
let watcher;
|
|
80
|
+
if (watch && onEntryPointsChange) {
|
|
81
|
+
logger.debug("Watching entry points for changes", {
|
|
82
|
+
dirs,
|
|
83
|
+
cwd: config.workingDir,
|
|
84
|
+
patterns,
|
|
85
|
+
ignorePatterns,
|
|
86
|
+
});
|
|
87
|
+
// Watch the parent directories
|
|
88
|
+
watcher = chokidar.watch(patterns, {
|
|
89
|
+
ignored: ignorePatterns,
|
|
90
|
+
persistent: true,
|
|
91
|
+
ignoreInitial: true,
|
|
92
|
+
useFsEvents: false,
|
|
93
|
+
});
|
|
94
|
+
// Handle file changes
|
|
95
|
+
const updateEntryPoints = async (event, path) => {
|
|
96
|
+
logger.debug("Entry point change detected", { event, path });
|
|
97
|
+
const newEntryPoints = await getEntryPoints();
|
|
98
|
+
// Compare arrays to see if they're different
|
|
99
|
+
const hasChanged = newEntryPoints.length !== currentEntryPoints.length ||
|
|
100
|
+
newEntryPoints.some((entry, index) => entry !== currentEntryPoints[index]);
|
|
101
|
+
if (hasChanged) {
|
|
102
|
+
logger.debug("Entry points changed", {
|
|
103
|
+
old: currentEntryPoints,
|
|
104
|
+
new: newEntryPoints,
|
|
105
|
+
});
|
|
106
|
+
currentEntryPoints = newEntryPoints;
|
|
107
|
+
await onEntryPointsChange(newEntryPoints);
|
|
108
|
+
}
|
|
109
|
+
};
|
|
110
|
+
watcher
|
|
111
|
+
.on("add", (path) => updateEntryPoints("add", path))
|
|
112
|
+
.on("addDir", (path) => updateEntryPoints("addDir", path))
|
|
113
|
+
.on("unlink", (path) => updateEntryPoints("unlink", path))
|
|
114
|
+
.on("unlinkDir", (path) => updateEntryPoints("unlinkDir", path))
|
|
115
|
+
.on("error", (error) => logger.error("Watcher error:", error));
|
|
116
|
+
}
|
|
117
|
+
return {
|
|
118
|
+
entryPoints: initialEntryPoints,
|
|
119
|
+
watcher,
|
|
120
|
+
patterns,
|
|
121
|
+
ignorePatterns,
|
|
122
|
+
stop: async () => {
|
|
123
|
+
await watcher?.close();
|
|
124
|
+
},
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
//# sourceMappingURL=entryPoints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entryPoints.js","sourceRoot":"","sources":["../../../src/build/entryPoints.ts"],"names":[],"mappings":"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"}
|