miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

fix(core): fix cache recalculation (#16468)

Browse Source
This commit is contained in:
Jason Jean 2023-04-21 15:56:00 -04:00 committed by GitHub
parent dbce22a499
commit a10b6b1290
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nx/src/project-graph/nx-deps-cache.spec.ts
View File

@ -7,6 +7,7 @@ import {
import { ProjectGraph } from '../config/project-graph'; import { ProjectGraph } from '../config/project-graph';
import { ProjectsConfigurations } from '../config/workspace-json-project-json'; import { ProjectsConfigurations } from '../config/workspace-json-project-json';
import { NxJsonConfiguration } from '../config/nx-json'; import { NxJsonConfiguration } from '../config/nx-json';
import { nxVersion } from '../utils/versions';
describe('nx deps utils', () => { describe('nx deps utils', () => {
describe('shouldRecomputeWholeGraph', () => { describe('shouldRecomputeWholeGraph', () => {
@ -34,14 +35,11 @@ describe('nx deps utils', () => {
).toEqual(true); ).toEqual(true);
}); });
it('should be true when version of nrwl/workspace changes', () => { it('should be true when version of nx changes', () => {
expect( expect(
shouldRecomputeWholeGraph( shouldRecomputeWholeGraph(
createCache({ createCache({
deps: { nxVersion: '12.0.1',
'@nx/workspace': '12.0.1',
plugin: '1.0.0',
},
}), }),
createPackageJsonDeps({}), createPackageJsonDeps({}),
createProjectsConfiguration({}), createProjectsConfiguration({}),
@ -317,10 +315,8 @@ describe('nx deps utils', () => {
function createCache(p: Partial<ProjectGraphCache>): ProjectGraphCache { function createCache(p: Partial<ProjectGraphCache>): ProjectGraphCache {
const defaults: ProjectGraphCache = { const defaults: ProjectGraphCache = {
version: '5.1', version: '5.1',
deps: { nxVersion: nxVersion,
'@nx/workspace': '12.0.0', deps: {},
plugin: '1.0.0',
},
pathMappings: { pathMappings: {
mylib: ['libs/mylib/index.ts'], mylib: ['libs/mylib/index.ts'],
}, },

13
packages/nx/src/project-graph/nx-deps-cache.ts
View File

@ -19,9 +19,11 @@ import {
readJsonFile, readJsonFile,
writeJsonFile, writeJsonFile,
} from '../utils/fileutils'; } from '../utils/fileutils';
import { nxVersion } from '../utils/versions';
export interface ProjectGraphCache { export interface ProjectGraphCache {
version: string; version: string;
nxVersion: string;
deps: Record<string, string>; deps: Record<string, string>;
pathMappings: Record<string, any>; pathMappings: Record<string, any>;
nxJsonPlugins: { name: string; version: string }[]; nxJsonPlugins: { name: string; version: string }[];
@ -93,7 +95,8 @@ export function createCache(
})); }));
const newValue: ProjectGraphCache = { const newValue: ProjectGraphCache = {
version: projectGraph.version || '5.1', version: projectGraph.version || '5.1',
deps: packageJsonDeps, nxVersion: nxVersion,
deps: packageJsonDeps, // TODO(v18): We can remove this in favor of nxVersion
// compilerOptions may not exist, especially for package-based repos // compilerOptions may not exist, especially for package-based repos
pathMappings: tsConfig?.compilerOptions?.paths || {}, pathMappings: tsConfig?.compilerOptions?.paths || {},
nxJsonPlugins, nxJsonPlugins,
@ -149,13 +152,7 @@ export function shouldRecomputeWholeGraph(
if (cache.version !== '5.1') { if (cache.version !== '5.1') {
return true; return true;
} }
if ( if (cache.nxVersion !== nxVersion) {
cache.deps['@nx/workspace'] !== packageJsonDeps['@nx/workspace'] ||
cache.deps['@nrwl/workspace'] !== packageJsonDeps['@nrwl/workspace']
) {
return true;
}
if (cache.deps['nx'] !== packageJsonDeps['nx']) {
return true; return true;
} }