Skip to content

feat(core): apply parent env to atomized target #33013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+364 −55
Open

feat(core): apply parent env to atomized target #33013

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
828919c
feat(core): apply parent env to atomized target
meeroslav Oct 8, 2025
c7f06b3
feat(core): use graph to find atomized parent
meeroslav Oct 8, 2025
494624e
Merge branch 'master' into feat/add-env-file-support-for-atomized-tar…
meeroslav Oct 9, 2025
05a8fe9
feat(core): refactor the existing get env functionality
meeroslav Nov 5, 2025
ca2af8c
chore(core): add unit tests
meeroslav Nov 5, 2025
b906ccb
feat(core): extract path logic to separate file
meeroslav Nov 5, 2025
bac9af2
feat(core): cleanup the task env paths
meeroslav Nov 5, 2025
aa3aa56
chore(core): fix typo
meeroslav Nov 5, 2025
48283e6
chore(core): fix graphits dumm fix
meeroslav Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 35 additions & 20 deletions packages/nx/src/tasks-runner/task-env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { config as loadDotEnvFile } from 'dotenv';
import { expand } from 'dotenv-expand';
import { workspaceRoot } from '../utils/workspace-root';
import { join } from 'node:path';
import { ProjectGraph } from '../config/project-graph';

export function getEnvVariablesForBatchProcess(
skipNxCache: boolean,
Expand All @@ -20,11 +21,11 @@ export function getEnvVariablesForBatchProcess(
};
}

export function getTaskSpecificEnv(task: Task) {
export function getTaskSpecificEnv(task: Task, graph: ProjectGraph) {
// Unload any dot env files at the root of the workspace that were loaded on init of Nx.
const taskEnv = unloadDotEnvFiles({ ...process.env });
return process.env.NX_LOAD_DOT_ENV_FILES === 'true'
? loadDotEnvFilesForTask(task, taskEnv)
? loadDotEnvFilesForTask(task, graph, taskEnv)
: // If not loading dot env files, ensure env vars created by system are still loaded
taskEnv;
}
Expand Down Expand Up @@ -165,51 +166,64 @@ export function unloadDotEnvFile(
});
}

function getEnvFilesForTask(task: Task): string[] {
function getOwnerTargetForTask(task: Task, graph: ProjectGraph): string {
const project = graph.nodes[task.target.project];
if (project.data.metadata?.targetGroups) {
for (const targets of Object.values(project.data.metadata.targetGroups)) {
if (targets.includes(task.target.target)) {
return targets[0];
}
}
}
return task.target.target;
}

function getEnvFilesForTask(task: Task, graph: ProjectGraph): string[] {
const target = getOwnerTargetForTask(task, graph);
// Collect dot env files that may pertain to a task
return [
// Load DotEnv Files for a configuration in the project root
...(task.target.configuration
? [
`${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}.local`,
`${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}`,
`${task.projectRoot}/.env.${target}.${task.target.configuration}.local`,
`${task.projectRoot}/.env.${target}.${task.target.configuration}`,
`${task.projectRoot}/.env.${task.target.configuration}.local`,
`${task.projectRoot}/.env.${task.target.configuration}`,
`${task.projectRoot}/.${task.target.target}.${task.target.configuration}.local.env`,
`${task.projectRoot}/.${task.target.target}.${task.target.configuration}.env`,
`${task.projectRoot}/.${target}.${task.target.configuration}.local.env`,
`${task.projectRoot}/.${target}.${task.target.configuration}.env`,
`${task.projectRoot}/.${task.target.configuration}.local.env`,
`${task.projectRoot}/.${task.target.configuration}.env`,
]
: []),

// Load DotEnv Files for a target in the project root
`${task.projectRoot}/.env.${task.target.target}.local`,
`${task.projectRoot}/.env.${task.target.target}`,
`${task.projectRoot}/.${task.target.target}.local.env`,
`${task.projectRoot}/.${task.target.target}.env`,
`${task.projectRoot}/.env.${target}.local`,
`${task.projectRoot}/.env.${target}`,
`${task.projectRoot}/.${target}.local.env`,
`${task.projectRoot}/.${target}.env`,
`${task.projectRoot}/.env.local`,
`${task.projectRoot}/.local.env`,
`${task.projectRoot}/.env`,

// Load DotEnv Files for a configuration in the workspace root
...(task.target.configuration
? [
`.env.${task.target.target}.${task.target.configuration}.local`,
`.env.${task.target.target}.${task.target.configuration}`,
`.env.${target}.${task.target.configuration}.local`,
`.env.${target}.${task.target.configuration}`,
`.env.${task.target.configuration}.local`,
`.env.${task.target.configuration}`,
`.${task.target.target}.${task.target.configuration}.local.env`,
`.${task.target.target}.${task.target.configuration}.env`,
`.${target}.${task.target.configuration}.local.env`,
`.${target}.${task.target.configuration}.env`,
`.${task.target.configuration}.local.env`,
`.${task.target.configuration}.env`,
]
: []),

// Load DotEnv Files for a target in the workspace root
`.env.${task.target.target}.local`,
`.env.${task.target.target}`,
`.${task.target.target}.local.env`,
`.${task.target.target}.env`,
`.env.${target}.local`,
`.env.${target}`,
`.${target}.local.env`,
`.${target}.env`,

// Load base DotEnv Files at workspace root
`.local.env`,
Expand All @@ -220,9 +234,10 @@ function getEnvFilesForTask(task: Task): string[] {

function loadDotEnvFilesForTask(
task: Task,
graph: ProjectGraph,
environmentVariables: NodeJS.ProcessEnv
) {
const dotEnvFiles = getEnvFilesForTask(task);
const dotEnvFiles = getEnvFilesForTask(task, graph);
for (const file of dotEnvFiles) {
loadAndExpandDotEnvFile(join(workspaceRoot, file), environmentVariables);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/nx/src/tasks-runner/task-orchestrator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export class TaskOrchestrator {
// region Processing Scheduled Tasks
private async processTask(taskId: string): Promise<NodeJS.ProcessEnv> {
const task = this.taskGraph.tasks[taskId];
const taskSpecificEnv = getTaskSpecificEnv(task);
const taskSpecificEnv = getTaskSpecificEnv(task, this.projectGraph);

if (!task.hash) {
await hashTask(
Expand Down
Loading