Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14, 16, 18]
node-version: [16, 18]
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
[
require.resolve('@babel/preset-env'),
{
targets: {node: '14'},
targets: {node: '16'},
useBuiltIns: 'entry',
corejs: '2.x',
},
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@react-native-community/eslint-config": "^2.0.0",
"@types/glob": "^7.1.1",
"@types/jest": "^26.0.15",
"@types/node": "^14.0.0",
"@types/node": "^16.0.0",
"@types/node-fetch": "^2.3.7",
"@types/rimraf": "^3.0.2",
"@types/readable-stream": "^2.3.0",
Expand All @@ -55,10 +55,10 @@
"rimraf": "^3.0.2",
"slash": "^3.0.0",
"string-length": "^2.0.0",
"typescript": "^3.8.0"
"typescript": "^4.9.5"
},
"resolutions": {
"@types/node": "^14.0.0"
"@types/node": "^16.0.0"
},
"lint-staged": {
"./packages/**/*.{ts}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@react-native-community/cli-tools": "^10.1.1",
"chalk": "^4.1.2",
"cosmiconfig": "^5.1.0",
"deepmerge": "^3.2.0",
"deepmerge": "^4.3.0",

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this turned out to be unnecessary, but checking the release notes the only breaking change is umd -> cjs, which is fine for us

"glob": "^7.1.3",
"joi": "^17.2.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-config/src/merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import deepmerge from 'deepmerge';
* `deepmerge` concatenates arrays by default instead of overwriting them.
* We define custom merging function for arrays to change that behaviour
*/
export default function merge<X, Y>(x: X, y: Y) {
export default function merge<X, Y>(x: Partial<X>, y: Partial<Y>) {
return deepmerge(x, y, {
arrayMerge: (_destinationArray: any[], sourceArray: any[]): any[] =>
sourceArray,
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/brewInstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ async function brewInstall({
logError({
healthcheck: label || pkg,
loader,
error,
error: error as any,
command: `brew install ${pkg}`,
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/healthchecks/cocoaPods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default {
logError({
healthcheck: label,
loader,
error,
error: error as any,
command: 'sudo gem install cocoapods',
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/healthchecks/iosDeploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const installLibrary = async ({
logError({
healthcheck: label,
loader,
error,
error: error as Error,
command: installationCommand,
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/healthchecks/jdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default {
'JDK installed successfully. Please restart your shell to see the changes',
);
} catch (e) {
loader.fail(e);
loader.fail(e as any);
}
},
runAutomaticFix: async ({logManualInstallation, loader}) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/healthchecks/xcodeEnv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default {
});
loader.succeed('.xcode.env file have been created!');
} catch (e) {
loader.fail(e);
loader.fail(e as any);
}
},
} as HealthCheckInterface;
6 changes: 3 additions & 3 deletions packages/cli-doctor/src/tools/installPods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ async function runPodInstall(
await execa('bundle', ['exec', 'pod', 'install']);
} catch (error) {
// "pod" command outputs errors to stdout (at least some of them)
const stderr = error.stderr || error.stdout;
const stderr = (error as any).stderr || (error as any).stdout;

/**
* If CocoaPods failed due to repo being out of date, it will
Expand Down Expand Up @@ -61,7 +61,7 @@ async function runPodUpdate(loader: Loader) {
await execa('pod', ['repo', 'update']);
} catch (error) {
// "pod" command outputs errors to stdout (at least some of them)
logger.log(error.stderr || error.stdout);
logger.log((error as any).stderr || (error as any).stdout);
loader.fail();

throw new Error(
Expand Down Expand Up @@ -142,7 +142,7 @@ async function installCocoaPods(loader: Loader) {
return loader.succeed();
} catch (error) {
loader.fail();
logger.error(error.stderr);
logger.error((error as any).stderr);

throw new Error(
`An error occured while trying to install CocoaPods, which is required by this template.\nPlease try again manually: sudo gem install cocoapods.\nCocoaPods documentation: ${chalk.dim.underline(
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/runBundleInstall.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ async function runBundleInstall(loader: Loader) {
await execa('bundle', ['install']);
} catch (error) {
loader.fail();
logger.error(error.stderr || error.stdout);
logger.error((error as any).stderr || (error as any).stdout);

throw new Error(
'Looks like your iOS environment is not properly set. Please go to https://reactnative.dev/docs/next/environment-setup and follow the React Native CLI QuickStart guide for macOS and iOS.',
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-doctor/src/tools/unzip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const unzip = async (source: string, destination: string) => {
return reject(err);
}

resolve();
resolve(undefined);
});
});
});
Expand Down
6 changes: 3 additions & 3 deletions packages/cli-doctor/src/tools/windows/androidWinHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const installComponent = (component: string, androidSdkRoot: string) => {

child.on('close', (exitStatus) => {
if (exitStatus === 0) {
done();
done(undefined);
} else {
error({stderr});
}
Expand Down Expand Up @@ -161,7 +161,7 @@ const getEmulatorAccelOutputInformation = async (androidSDKRoot: string) => {

return stdout;
} catch (e) {
const {stdout} = e;
const {stdout} = e as any;

return stdout;
}
Expand Down Expand Up @@ -205,7 +205,7 @@ export const createAVD = async (

return stdout;
} catch (e) {
const {stderr} = e;
const {stderr} = e as any;

return stderr;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-hermes/src/profileHermes/downloadProfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function getLatestFile(packageNameWithSuffix: string): string {
`);
return file.toString().trim();
} catch (e) {
throw new Error(e);
throw e;
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/cli-hermes/src/profileHermes/sourcemapUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ function writeJsonSync(targetPath: string, data: any) {
} catch (e) {
throw new CLIError(
`Failed to serialize data to json before writing to ${targetPath}`,
e,
e as Error,
);
}

try {
fs.writeFileSync(targetPath, json, 'utf-8');
} catch (e) {
throw new CLIError(`Failed to write json to ${targetPath}`, e);
throw new CLIError(`Failed to write json to ${targetPath}`, e as Error);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,11 @@ export async function runPackager(args: BuildFlags, config: Config) {
try {
startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
} catch (error) {
logger.warn(
`Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
);
if (error instanceof Error) {
logger.warn(
`Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
);
}
}
}
}
Expand Down Expand Up @@ -126,7 +128,7 @@ export function build(gradleArgs: string[], sourceDir: string) {
});
} catch (error) {
printRunDoctorTip();
throw new CLIError('Failed to build the app.', error);
throw new CLIError('Failed to build the app.', error as Error);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ async function runOnAllDevices(
}
} catch (error) {
printRunDoctorTip();
throw createInstallError(error);
throw createInstallError(error as any);
}

(devices.length > 0 ? devices : [undefined]).forEach(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ function tryInstallAppOnDevice(
);
execa.sync(adbPath, adbArgs, {stdio: 'inherit'});
} catch (error) {
throw new CLIError('Failed to install the app on the device.', error);
throw new CLIError(
'Failed to install the app on the device.',
error as any,
);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function tryLaunchAppOnDevice(
logger.debug(`Running command "${adbPath} ${adbArgs.join(' ')}"`);
execa.sync(adbPath, adbArgs, {stdio: 'inherit'});
} catch (error) {
throw new CLIError('Failed to start the app.', error);
throw new CLIError('Failed to start the app.', error as any);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default async function tryLaunchEmulator(
await launchEmulator(emulatorName ?? emulators[0], adbPath, port);
return {success: true};
} catch (error) {
return {success: false, error: error?.message};
return {success: false, error: (error as any)?.message};
}
}
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ function tryRunAdbReverse(
execFileSync(adbPath, adbArgs, {stdio: 'inherit'});
} catch (e) {
logger.warn(
`Failed to connect to development server using "adb reverse": ${e.message}`,
`Failed to connect to development server using "adb reverse": ${
(e as any).message
}`,
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-platform-ios/src/commands/runIOS/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const getSimulators = () => {
} catch (error) {
throw new CLIError(
'Could not get the simulator list from Xcode. Please open Xcode and try running project directly from there to resolve the remaining issues.',
error,
error as Error,
);
}
return simulators;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function getDestinationSimulator(
} catch (error) {
throw new CLIError(
'Could not get the simulator list from Xcode. Please open Xcode and try running project directly from there to resolve the remaining issues.',
error,
error as Error,
);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/cli-platform-ios/src/tools/getProjectInfo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ export function getProjectInfo(): IosProjectInfo {

return project;
} catch (error) {
throw new CLIError(error);
throw new CLIError(error as any);
}
}
6 changes: 3 additions & 3 deletions packages/cli-server-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"@react-native-community/cli-tools": "^10.1.1",
"compression": "^1.7.1",
"connect": "^3.6.5",
"errorhandler": "^1.5.0",
"errorhandler": "^1.5.1",
"nocache": "^3.0.1",
"pretty-format": "^26.6.2",
"serve-static": "^1.13.1",
"ws": "^7.5.1"
},
"devDependencies": {
"@types/compression": "^1.0.1",
"@types/compression": "^1.7.2",
"@types/connect": "^3.4.33",
"@types/errorhandler": "^0.0.32",
"@types/errorhandler": "^1.5.0",
"@types/ws": "^7.4.7"
},
"files": [
Expand Down
2 changes: 2 additions & 0 deletions packages/cli-server-api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,13 @@ export function createDevServerMiddleware(options: MiddlewareOptions) {
.use('/open-url', openURLMiddleware)
.use('/status', statusPageMiddleware)
.use('/symbolicate', rawBodyMiddleware)
// @ts-ignore mismatch
.use('/systrace', systraceProfileMiddleware)
.use('/reload', (_req: http.IncomingMessage, res: http.ServerResponse) => {
broadcast('reload');
res.end('OK');
})
// @ts-ignore mismatch
.use(errorhandler());

options.watchFolders.forEach((folder) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function createDebuggerProxyEndpoint(): {
try {
dest.send(message);
} catch (e) {
logger.warn(e);
logger.warn(e as any);
// Sometimes this call throws 'not opened'
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function createEventsSocketEndpoint(
ws.send(serialized);
} catch (e) {
logger.error(
`Failed to send broadcast to client due to:\n ${e.toString()}`,
`Failed to send broadcast to client due to:\n ${(e as any).toString()}`,
);
}
}
Expand Down Expand Up @@ -178,7 +178,7 @@ export default function createEventsSocketEndpoint(
*/
broadcast(message.command, message.params);
} catch (e) {
logger.error('Failed to forward message to clients: ', e);
logger.error('Failed to forward message to clients: ', e as any);
}
} else {
logger.error('Unknown message type: ', message.type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default function createMessageSocketEndpoint(): {
} catch (e) {
logger.error(
`Failed to send broadcast to client: '${otherId}' ` +
`due to:\n ${e.toString()}`,
`due to:\n ${(e as any).toString()}`,
);
}
}
Expand Down Expand Up @@ -147,7 +147,7 @@ export default function createMessageSocketEndpoint(): {
logger.error(
`Failed to reply to ${clientId} with error:\n${error}` +
`\nmessage:\n${JSON.stringify(errorMessage)}` +
`\ndue to error: ${e.toString()}`,
`\ndue to error: ${(e as any).toString()}`,
);
}
}
Expand Down Expand Up @@ -237,7 +237,7 @@ export default function createMessageSocketEndpoint(): {
throw new Error('Invalid message, did not match the protocol');
}
} catch (e) {
handleCaughtError(message, e.toString());
handleCaughtError(message, (e as any).toString());
}
};
});
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@react-native-community/cli-types": "^10.0.0",
"@types/lodash": "^4.14.149",
"@types/mime": "^2.0.1",
"@types/node": "^14.0.0",
"@types/node": "^16.0.0",
"@types/node-fetch": "^2.5.5",
"@types/shell-quote": "^1.7.1"
},
Expand Down
Loading