Skip to content

fix(react-conformance): update paths generated in defaultErrorMessages #20580

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

Merged
layershifter merged 5 commits into from
Nov 12, 2021
Merged

fix(react-conformance): update paths generated in defaultErrorMessages #20580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0b172b
fix
layershifter Nov 11, 2021
0225f7f
Merge branch 'master' of https://github.com/microsoft/fluentui into f…
layershifter Nov 11, 2021
c1f4815
fix paths
layershifter Nov 11, 2021
8c47bf2
Change files
layershifter Nov 11, 2021
8b36c45
Update change/@fluentui-react-conformance-90ba2958-fc3c-4b00-9180-740…
layershifter Nov 12, 2021
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-conformance-90ba2958-fc3c-4b00-9180-740ecb0fb58e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix paths generated in defaultErrorMessages",
"packageName": "@fluentui/react-conformance",
"email": "olfedias@microsoft.com",
"dependentChangeType": "patch"
}
11 changes: 4 additions & 7 deletions packages/react-conformance/src/defaultErrorMessages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { EOL } from 'os';
import * as path from 'path';

import { errorMessageColors, formatArray, getErrorMessage, formatErrors } from './utils/errorMessages';
import { getPackagePath } from './defaultTests';

/* eslint-disable @typescript-eslint/naming-convention */

Expand Down Expand Up @@ -362,8 +363,7 @@ export const defaultErrorMessages = {
'exported-top-level': (testInfo: IsConformantOptions, error: Error) => {
const { displayName, componentPath } = testInfo;
const { testErrorPath, resolveInfo } = errorMessageColors;
const rootPath = componentPath.replace(/[\\/]src[\\/].*/, '');
const indexFile = path.join(rootPath, 'src', 'index');
const indexFile = path.join(getPackagePath(componentPath), 'src', 'index');

const exportInfo = testInfo.useDefaultExport
? `export { default as ${displayName} } from './${displayName};`
Expand Down Expand Up @@ -391,8 +391,7 @@ export const defaultErrorMessages = {
'has-top-level-file': (testInfo: IsConformantOptions, error: Error) => {
const { displayName, componentPath } = testInfo;
const { testErrorPath, resolveInfo } = errorMessageColors;
const rootPath = componentPath.replace(/[\\/]src[\\/].*/, '');
const topLevelFile = path.join(rootPath, 'src', displayName);
const topLevelFile = path.join(getPackagePath(componentPath), 'src', displayName);

// Message Description: Handles scenario where the displayName doesn't match the component's filename.
//
Expand Down Expand Up @@ -614,9 +613,7 @@ export const defaultErrorMessages = {
) => {
const { componentPath, displayName } = testInfo;
const { testErrorInfo, resolveInfo, testErrorPath } = errorMessageColors;

const rootPath = componentPath.replace(/[\\/]src[\\/].*/, '');
const indexFile = path.join(rootPath, 'src', 'index.ts');
const indexFile = path.join(getPackagePath(componentPath), 'src', 'index.ts');

const constantValue = `export const ${exportName} = "${componentClassName}";`;

Expand Down
2 changes: 1 addition & 1 deletion packages/react-conformance/src/defaultTests.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ export const defaultTests: TestObject = {
},
};

function getPackagePath(componentPath: string) {
export function getPackagePath(componentPath: string) {
// Use lastIndexOf in case anyone has all their repos under a folder called "src" (it happens)
const srcIndex = componentPath.replace(/\\/g, '/').lastIndexOf('/src/');
return componentPath.slice(0, srcIndex);
Expand Down