Skip to content

Commit

Permalink
fix(core): use absolute paths when resolving package.json files
Browse files Browse the repository at this point in the history
  • Loading branch information
vsavkin committed May 16, 2022
1 parent 454782f commit 8198b78
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions packages/nx/src/command-line/run-one.ts
Expand Up @@ -98,6 +98,11 @@ function parseRunOneOptions(
[project, target, configuration] = splitTarget(
parsedArgs['project:target:configuration']
);
// this is to account for "nx npmsript:dev"
if (project && !target && defaultProjectName) {
project = defaultProjectName;
target = project;
}
} else {
target = parsedArgs['project:target:configuration'];
}
Expand Down
6 changes: 4 additions & 2 deletions packages/nx/src/tasks-runner/utils.ts
Expand Up @@ -12,6 +12,7 @@ import { Task, TaskGraph } from '../config/task-graph';
import { getPackageManagerCommand } from '../utils/package-manager';
import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
import { TargetDependencyConfig } from '../config/workspace-json-project-json';
import { workspaceRoot } from '../utils/app-root';

export function getCommandAsString(task: Task) {
const execCommand = getPackageManagerCommand().exec;
Expand Down Expand Up @@ -168,8 +169,9 @@ export function getExecutorNameForTask(task: Task, workspace: Workspaces) {
const workspaceConfiguration = workspace.readWorkspaceConfiguration();
const project = workspaceConfiguration.projects[task.target.project];

if (existsSync(join(project.root, 'package.json'))) {
project.targets = mergeNpmScriptsWithTargets(project.root, project.targets);
const projectRoot = join(workspaceRoot, project.root);
if (existsSync(join(projectRoot, 'package.json'))) {
project.targets = mergeNpmScriptsWithTargets(projectRoot, project.targets);
}
project.targets = mergePluginTargetsWithNxTargets(
project.root,
Expand Down

1 comment on commit 8198b78

@vercel
Copy link

@vercel vercel bot commented on 8198b78 May 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-dev-nrwl.vercel.app
nx-five.vercel.app
nx.dev

Please sign in to comment.