Commit2760026

authored

fix(core): project inference plugins should be ran when reading project configuration (#18630)

1 parent11249e9 commit2760026Copy full SHA for 2760026

File tree

-7

lines changed

-7

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import{dirname,join}from'path';`
`2`	`2`	`import{workspaceRoot}from'../utils/workspace-root';`
`3`	`3`	`import{readJsonFile}from'../utils/fileutils';`
	`4`	`+import{getNxRequirePaths}from'../utils/installation-directory';`
`4`	`5`	`import{loadNxPlugins,loadNxPluginsSync}from'../utils/nx-plugin';`
`5`	`6`
`6`	`7`	`importtype{NxJsonConfiguration}from'./nx-json';`
`@@ -43,7 +44,11 @@ export class Workspaces {`
`43`	`44`	`buildProjectsConfigurationsFromProjectPathsAndPlugins(`
`44`	`45`	`nxJson,`
`45`	`46`	`projectPaths,`
`46`		`-loadNxPluginsSync(),`
	`47`	`+loadNxPluginsSync(`
	`48`	`+nxJson.plugins,`
	`49`	`+getNxRequirePaths(this.root),`
	`50`	`+this.root`
	`51`	`+),`
`47`	`52`	`this.root`
`48`	`53`	`).projects;`
`49`	`54`	`if(`
`@@ -59,10 +64,7 @@ export class Workspaces {`
`59`	`64`	`}`
`60`	`65`	`this.cachedProjectsConfig={`
`61`	`66`	`version:2,`
`62`		`-projects:this.mergeTargetDefaultsIntoProjectDescriptions(`
`63`		`-projectsConfigurations,`
`64`		`-nxJson`
`65`		`-),`
	`67`	`+projects:projectsConfigurations,`
`66`	`68`	`};`
`67`	`69`	`returnthis.cachedProjectsConfig;`
`68`	`70`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ function loadNxPluginSync(moduleName: string, paths: string[], root: string) {`
`209`	`209`	`*@deprecated Use loadNxPlugins instead.`
`210`	`210`	`*/`
`211`	`211`	`exportfunctionloadNxPluginsSync(`
`212`		`-plugins?:string[],`
	`212`	`+plugins:string[],`
`213`	`213`	`paths=getNxRequirePaths(),`
`214`	`214`	`root=workspaceRoot`
`215`	`215`	`):(NxPluginV2&Pick<NxPluginV1,'processProjectGraph'>)[]{`
`@@ -240,7 +240,7 @@ export function loadNxPluginsSync(`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`exportasyncfunctionloadNxPlugins(`
`243`		`-plugins?:string[],`
	`243`	`+plugins:string[],`
`244`	`244`	`paths=getNxRequirePaths(),`
`245`	`245`	`root=workspaceRoot`
`246`	`246`	`):Promise<(NxPluginV2&Pick<NxPluginV1,'processProjectGraph'>)[]>{`

Comments

(0)