Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

Remove Config.helpUrl, use learnMore #3364

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Remove Config.helpUrl, use learnMore #3364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions packages/xdl/src/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ interface XDLConfig {
validation: {
reactNativeVersionWarnings: boolean;
};
helpUrl: string;
offline: boolean;
}

Expand Down Expand Up @@ -83,7 +82,6 @@ const config: XDLConfig = {
validation: {
reactNativeVersionWarnings: true,
},
helpUrl: 'https://docs.expo.io/',
offline: false,
};

Expand Down
13 changes: 8 additions & 5 deletions packages/xdl/src/project/Doctor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { configFilename, ExpoConfig, getConfig, PackageJSONConfig } from '@expo/config';
import Schemer, { SchemerError, ValidationError } from '@expo/schemer';
import spawnAsync from '@expo/spawn-async';
import { execSync } from 'child_process';
import getenv from 'getenv';
import isReachable from 'is-reachable';
import resolveFrom from 'resolve-from';
import semver from 'semver';

import { Config, ExpSchema, ProjectUtils, Versions, Watchman } from '../internal';
import { learnMore } from '../logs/TerminalLink';

export const NO_ISSUES = 0;
export const WARNING = 1;
Expand Down Expand Up @@ -34,8 +36,7 @@ async function _checkNpmVersionAsync(projectRoot: string) {
}
} catch (e) {}

const npmVersionResponse = await spawnAsync('npm', ['--version']);
const npmVersion = npmVersionResponse.stdout.trim();
const npmVersion = execSync('npm --version', { stdio: 'pipe' }).toString().trim();

if (
semver.lt(npmVersion, MIN_NPM_VERSION) ||
Expand Down Expand Up @@ -122,7 +123,9 @@ async function validateWithSchema(
if (e instanceof SchemerError) {
schemaErrorMessage = `Error: Problem${
e.errors.length > 1 ? 's' : ''
} validating fields in ${configName}. See https://docs.expo.io/workflow/configuration/`;
} validating fields in ${configName}. ${learnMore(
'https://docs.expo.io/workflow/configuration/'
)}`;
schemaErrorMessage += e.errors.map(formatValidationError).join('');
}
}
Expand All @@ -134,7 +137,7 @@ async function validateWithSchema(
if (e instanceof SchemerError) {
assetsErrorMessage = `Error: Problem${
e.errors.length > 1 ? '' : 's'
} validating asset fields in ${configName}. See ${Config.helpUrl}`;
} validating asset fields in ${configName}. ${learnMore('https://docs.expo.io/')}`;
assetsErrorMessage += e.errors.map(formatValidationError).join('');
}
}
Expand Down Expand Up @@ -328,7 +331,7 @@ async function _validateReactNativeVersionAsync(
ProjectUtils.logWarning(
projectRoot,
'expo',
`Warning: Not using the Expo fork of react-native. See ${Config.helpUrl}.`,
`Warning: Not using the Expo fork of react-native. ${learnMore('https://docs.expo.io/')}`,
'doctor-not-using-expo-fork'
);
return WARNING;
Expand Down