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.

Sign up for GitHub

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(linter): ensure tslint converter works with pnp #18323

Merged
merged 2 commits into from
Jul 28, 2023
Merged

fix(linter): ensure tslint converter works with pnp #18323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd9404f
fix(linter): ensure tslint converter works with pnp
meeroslav Jul 26, 2023
1fb000d
fix(linter): fix two broken test suites
meeroslav Jul 27, 2023
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
12 changes: 11 additions & 1 deletion packages/angular/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,17 @@ import { conversionGenerator } from './convert-tslint-to-eslint';
/**
* Don't run actual child_process implementation of installPackagesTask()
*/
jest.mock('child_process');
jest.mock('child_process', () => {
return {
...jest.requireActual<any>('child_process'),
execSync: jest.fn((command: string) => {
if (command.includes('pnpm --version')) {
return '8.2.0';
}
return;
}),
};
});

const appProjectName = 'angular-app-1';
const appProjectRoot = `apps/${appProjectName}`;
Expand Down
12 changes: 11 additions & 1 deletion packages/cypress/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ import { conversionGenerator } from './convert-tslint-to-eslint';
/**
* Don't run actual child_process implementation of installPackagesTask()
*/
jest.mock('child_process');
jest.mock('child_process', () => {
return {
...jest.requireActual<any>('child_process'),
execSync: jest.fn((command: string) => {
if (command.includes('pnpm --version')) {
return '8.2.0';
}
return;
}),
};
});

const projectName = 'e2e-app-1';
const projectRoot = `apps/${projectName}`;
Expand Down
6 changes: 3 additions & 3 deletions packages/linter/src/utils/convert-tslint-to-eslint/convert-to-eslint-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,9 @@ export async function convertToESLintConfig(
*/
writeJsonFile(pathToTslintJson, updatedTSLintJson);
}
const pm = getPackageManagerCommand();
const reportedConfiguration = await findReportedConfiguration(
'npx tslint --print-config',
`${pm.exec} tslint --print-config`,
pathToTslintJson
);

Expand All @@ -121,8 +122,7 @@ export async function convertToESLintConfig(
* This error could occur if, for example, the user does not have a TSLint plugin installed correctly that they
* reference in their config.
*/
const printConfigFailureMessageStart =
'Command failed: npx tslint --print-config "tslint.json"';
const printConfigFailureMessageStart = `Command failed: ${pm.exec} tslint --print-config "tslint.json"`;
if (
reportedConfiguration.message.startsWith(printConfigFailureMessageStart)
) {
Expand Down