Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions packages/nx/src/command-line/migrate/migrate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ import { output } from '../../utils/output';
import { existsSync, writeFileSync } from 'fs';
import { workspaceRoot } from '../../utils/workspace-root';
import { isCI } from '../../utils/is-ci';
import { getNxRequirePaths } from '../../utils/installation-directory';
import {
getNxInstallationPath,
getNxRequirePaths,
} from '../../utils/installation-directory';
import { readNxJson } from '../../config/configuration';
import { runNxSync } from '../../utils/child-process';
import { daemonClient } from '../../daemon/client/client';
Expand Down Expand Up @@ -1849,8 +1852,10 @@ export function nxCliPath(nxWorkspaceRoot?: string) {
},
license: 'MIT',
});
const root = nxWorkspaceRoot ?? workspaceRoot;
const isNonJs = !existsSync(join(root, 'package.json'));
copyPackageManagerConfigurationFiles(
nxWorkspaceRoot ?? workspaceRoot,
isNonJs ? getNxInstallationPath(root) : root,
tmpDir
);

Expand Down
11 changes: 10 additions & 1 deletion packages/nx/src/utils/package-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
readYamlFile,
writeJsonFile,
} from './fileutils';
import { getNxInstallationPath } from './installation-directory';
import { PackageJson, readModulePackageJson } from './package-json';
import { workspaceRoot } from './workspace-root';

Expand Down Expand Up @@ -296,6 +297,10 @@ export function findFileInPackageJsonDirectory(
directory: string = process.cwd()
): string | null {
while (!existsSync(join(directory, 'package.json'))) {
if (directory === workspaceRoot) {
// we reached the workspace root and we didn't find a package.json file
return null;
}
directory = dirname(directory);
}
const path = join(directory, file);
Expand Down Expand Up @@ -406,7 +411,11 @@ export function createTempNpmDirectory() {

// A package.json is needed for pnpm pack and for .npmrc to resolve
writeJsonFile(`${dir}/package.json`, {});
copyPackageManagerConfigurationFiles(workspaceRoot, dir);
const isNonJs = !existsSync(join(workspaceRoot, 'package.json'));
copyPackageManagerConfigurationFiles(
isNonJs ? getNxInstallationPath(workspaceRoot) : workspaceRoot,
dir
);

const cleanup = async () => {
try {
Expand Down
Loading