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

chore(misc): update add-nx ci (#9398)

Browse Source
This commit is contained in:
Craigory Coppola 2022-03-18 15:22:09 -04:00 committed by GitHub
parent 6a601b9959
commit b3914bda90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
e2e/add-nx-to-monorepo/src/add-nx-to-monorepo.test.ts
View File

@ -4,52 +4,66 @@ import {
runCommand, runCommand,
tmpProjPath, tmpProjPath,
updateFile, updateFile,
getPackageManagerCommand,
getSelectedPackageManager,
} from '@nrwl/e2e/utils'; } from '@nrwl/e2e/utils';
import { Workspaces } from 'nx/src/shared/workspace'; import { Workspaces } from 'nx/src/shared/workspace';
describe.each(['npx', 'pnpx --yes'])('%s add-nx-to-monorepo', (command) => { describe('add-nx-to-monorepo', () => {
it('should not throw', () => { const packageManagerCommand = getPackageManagerCommand({
// Arrange packageManager: getSelectedPackageManager(),
createNonNxProjectDirectory(); }).runUninstalledPackage;
updateFile(
'packages/package-a/package.json',
JSON.stringify({
name: 'package-a',
})
);
updateFile(
'packages/package-b/package.json',
JSON.stringify({
name: 'package-b',
})
);
// Act it('should not throw', () => {
const output = runCommand(`${command} add-nx-to-monorepo --nx-cloud false`); if (packageManagerCommand) {
// Assert // Arrange
expect(output).toContain('🎉 Done!'); createNonNxProjectDirectory();
expect(readWorkspaceConfig().projects['package-a']).toBeTruthy(); updateFile(
expect(readWorkspaceConfig().projects['package-b']).toBeTruthy(); 'packages/package-a/package.json',
JSON.stringify({
name: 'package-a',
})
);
updateFile(
'packages/package-b/package.json',
JSON.stringify({
name: 'package-b',
})
);
// Act
const output = runCommand(
`${packageManagerCommand} add-nx-to-monorepo --nx-cloud false`
);
// Assert
expect(output).toContain('🎉 Done!');
expect(readWorkspaceConfig().projects['package-a']).toBeTruthy();
expect(readWorkspaceConfig().projects['package-b']).toBeTruthy();
}
}); });
it('should build', () => { it('should build', () => {
// Arrange if (packageManagerCommand) {
createNonNxProjectDirectory(); // Arrange
updateFile( createNonNxProjectDirectory();
'packages/package-a/package.json', updateFile(
JSON.stringify({ 'packages/package-a/package.json',
name: 'package-a', JSON.stringify({
scripts: { name: 'package-a',
build: 'echo "build successful"', scripts: {
}, build: 'echo "build successful"',
}) },
); })
);
// Act // Act
runCommand(`${command} add-nx-to-monorepo --nx-cloud false`); runCommand(
const output = runCLI('build package-a'); `${packageManagerCommand} add-nx-to-monorepo --nx-cloud false`
// Assert );
expect(output).toContain('build successful'); const output = runCLI('build package-a');
// Assert
expect(output).toContain('build successful');
}
}); });
}); });

4
e2e/utils/index.ts
View File

@ -731,6 +731,7 @@ export function getPackageManagerCommand({
createWorkspace: string; createWorkspace: string;
runNx: string; runNx: string;
runNxSilent: string; runNxSilent: string;
runUninstalledPackage?: string | undefined;
addDev: string; addDev: string;
list: string; list: string;
} { } {
@ -743,6 +744,7 @@ export function getPackageManagerCommand({
} create-nx-workspace@${publishedVersion}`, } create-nx-workspace@${publishedVersion}`,
runNx: `npx nx`, runNx: `npx nx`,
runNxSilent: `npx nx`, runNxSilent: `npx nx`,
runUninstalledPackage: `npx`,
addDev: `npm install --legacy-peer-deps -D`, addDev: `npm install --legacy-peer-deps -D`,
list: 'npm ls --depth 10', list: 'npm ls --depth 10',
}, },
@ -751,6 +753,7 @@ export function getPackageManagerCommand({
createWorkspace: `yarn global add create-nx-workspace@${publishedVersion} && create-nx-workspace`, createWorkspace: `yarn global add create-nx-workspace@${publishedVersion} && create-nx-workspace`,
runNx: `yarn nx`, runNx: `yarn nx`,
runNxSilent: `yarn --silent nx`, runNxSilent: `yarn --silent nx`,
runUninstalledPackage: 'npx',
addDev: `yarn add -D`, addDev: `yarn add -D`,
list: 'npm ls --depth 10', list: 'npm ls --depth 10',
}, },
@ -759,6 +762,7 @@ export function getPackageManagerCommand({
createWorkspace: `pnpx --yes create-nx-workspace@${publishedVersion}`, createWorkspace: `pnpx --yes create-nx-workspace@${publishedVersion}`,
runNx: `pnpx nx`, runNx: `pnpx nx`,
runNxSilent: `pnpx nx`, runNxSilent: `pnpx nx`,
runUninstalledPackage: 'pnpx --yes',
addDev: `pnpm add -D`, addDev: `pnpm add -D`,
list: 'npm ls --depth 10', list: 'npm ls --depth 10',
}, },