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

fix(core): fix "migrate-to-inputs" migration (#16145)

Browse Source
This commit is contained in:
Miroslav Jonaš 2023-04-06 16:35:30 +02:00 committed by GitHub
parent 5afb5fc8fd
commit aaa1113ab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 134 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.spec.ts
View File

@ -283,6 +283,130 @@ describe('15.0.0 migration (migrate-to-inputs)', () => {
const updatedWorkspace = readNxJson(tree);
expect(updatedWorkspace.namedInputs).not.toBeDefined();
});
it('should not override production inputs when migrating "implicitDependencies"', async () => {
updateNxJson(tree, {
namedInputs: {
default: ['{projectRoot}/**/*', 'sharedGlobals'],
production: [
'default',
'!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
'!{projectRoot}/tsconfig.spec.json',
'!{projectRoot}/jest.config.[jt]s',
'!{projectRoot}/.eslintrc.json',
],
sharedGlobals: ['{workspaceRoot}/nx.json'],
},
implicitDependencies: {
'.eslintrc.json': '*',
},
});
await migrateToInputs(tree);
const updated = readNxJson(tree);
expect(updated.implicitDependencies).toBeUndefined();
expect(updated).toMatchInlineSnapshot(`
Object {
"namedInputs": Object {
"default": Array [
"{projectRoot}/**/*",
"sharedGlobals",
],
"production": Array [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.eslintrc.json",
],
"sharedGlobals": Array [
"{workspaceRoot}/nx.json",
],
},
}
`);
});
it('should only preppend "default" to production inputs if missing when migrating "implicitDependencies"', async () => {
updateNxJson(tree, {
namedInputs: {
default: ['{projectRoot}/**/*', 'sharedGlobals'],
production: [
'!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
'!{projectRoot}/tsconfig.spec.json',
'!{projectRoot}/jest.config.[jt]s',
'!{projectRoot}/.eslintrc.json',
],
sharedGlobals: ['{workspaceRoot}/nx.json'],
},
implicitDependencies: {
'.eslintrc.json': '*',
},
});
await migrateToInputs(tree);
const updated = readNxJson(tree);
expect(updated.implicitDependencies).toBeUndefined();
expect(updated).toMatchInlineSnapshot(`
Object {
"namedInputs": Object {
"default": Array [
"{projectRoot}/**/*",
"sharedGlobals",
],
"production": Array [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.eslintrc.json",
],
"sharedGlobals": Array [
"{workspaceRoot}/nx.json",
],
},
}
`);
});
it('should not modify production inputs if "default" is missing when migrating "implicitDependencies"', async () => {
updateNxJson(tree, {
namedInputs: {
production: [
'!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
'!{projectRoot}/tsconfig.spec.json',
'!{projectRoot}/jest.config.[jt]s',
'!{projectRoot}/.eslintrc.json',
],
sharedGlobals: ['{workspaceRoot}/nx.json'],
},
implicitDependencies: {
'.eslintrc.json': '*',
},
});
await migrateToInputs(tree);
const updated = readNxJson(tree);
expect(updated.implicitDependencies).toBeUndefined();
expect(updated).toMatchInlineSnapshot(`
Object {
"namedInputs": Object {
"production": Array [
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/jest.config.[jt]s",
"!{projectRoot}/.eslintrc.json",
],
"sharedGlobals": Array [
"{workspaceRoot}/nx.json",
],
},
}
`);
});
});
describe('15.0.0 migration (migrate-to-inputs) (v1)', () => {

11
packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.ts
View File

@ -39,7 +39,16 @@ export default async function (tree: Tree) {
sharedGlobals: [],
production: ['default'],
};
nxJson.namedInputs.production = ['default'];
if (nxJson.namedInputs.default) {
if (!nxJson.namedInputs.production) {
nxJson.namedInputs.production = ['default'];
} else if (!nxJson.namedInputs.production.includes('default')) {
nxJson.namedInputs.production = [
'default',
...nxJson.namedInputs.production,
];
}
}
if (isBuildATarget(tree)) {
nxJson.targetDefaults ??= {};