Skip to content
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.

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

fix(core): fix no plugins found for nx init without packge.json #22434

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
2 changes: 1 addition & 1 deletion packages/nx/src/command-line/add/add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ async function installPackage(pkgName: string, version: string): Promise<void> {
writeJsonFile('nx.json', nxJson);

try {
await runNxAsync('--help');
await runNxAsync('--help', { silent: true });
} catch (e) {
// revert adding the plugin to nx.json
nxJson.installation.plugins[pkgName] = undefined;
Expand Down
34 changes: 21 additions & 13 deletions packages/nx/src/command-line/init/init-v2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ export async function initHandler(options: InitArgs): Promise<void> {

output.log({ title: '🧐 Checking dependencies' });

const detectPluginsResponse = await detectPlugins();
const { plugins, updatePackageScripts } = await detectPlugins();

if (!detectPluginsResponse?.plugins.length) {
if (!plugins.length) {
// If no plugins are detected/chosen, guide users to setup
// their targetDefaults correctly so their package scripts will work.
const packageJson: PackageJson = readJsonFile('package.json');
Expand All @@ -96,19 +96,17 @@ export async function initHandler(options: InitArgs): Promise<void> {
createNxJsonFile(repoRoot, [], [], {});
updateGitIgnore(repoRoot);

addDepsToPackageJson(repoRoot, detectPluginsResponse.plugins);
addDepsToPackageJson(repoRoot, plugins);

output.log({ title: '📦 Installing Nx' });

runInstall(repoRoot, pmc);

output.log({ title: '🔨 Configuring plugins' });
for (const plugin of detectPluginsResponse.plugins) {
for (const plugin of plugins) {
execSync(
`${pmc.exec} nx g ${plugin}:init --keepExistingVersions ${
detectPluginsResponse.updatePackageScripts
? '--updatePackageScripts'
: ''
updatePackageScripts ? '--updatePackageScripts' : ''
} --no-interactive`,
{
stdio: [0, 1, 2],
Expand All @@ -117,7 +115,7 @@ export async function initHandler(options: InitArgs): Promise<void> {
);
}

if (!detectPluginsResponse.updatePackageScripts) {
if (!updatePackageScripts) {
const rootPackageJsonPath = join(repoRoot, 'package.json');
const json = readJsonFile<PackageJson>(rootPackageJsonPath);
json.nx = { includedScripts: [] };
Expand Down Expand Up @@ -167,9 +165,10 @@ const npmPackageToPluginMap: Record<string, string> = {
'@remix-run/dev': '@nx/remix',
};

async function detectPlugins(): Promise<
undefined | { plugins: string[]; updatePackageScripts: boolean }
> {
async function detectPlugins(): Promise<{
plugins: string[];
updatePackageScripts: boolean;
}> {
let files = ['package.json'].concat(
globWithWorkspaceContext(process.cwd(), ['**/*/package.json'])
);
Expand Down Expand Up @@ -203,7 +202,12 @@ async function detectPlugins(): Promise<

const plugins = Array.from(detectedPlugins);

if (plugins.length === 0) return undefined;
if (plugins.length === 0) {
return {
plugins: [],
updatePackageScripts: false,
};
}

output.log({
title: `Recommended Plugins:`,
Expand All @@ -222,7 +226,11 @@ async function detectPlugins(): Promise<
},
]).then((r) => r.plugins);

if (pluginsToInstall?.length === 0) return undefined;
if (pluginsToInstall?.length === 0)
return {
plugins: [],
updatePackageScripts: false,
};

const updatePackageScripts =
existsSync('package.json') &&
Expand Down