Skip to content

fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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
thymikee merged 11 commits into from
Mar 23, 2023
Merged

fix: Replace calling internal React Native scripts for launching Metro with CLI's script #1812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2f4c060
fix: change way calling metro
szymonrybczak Jan 31, 2023
8ccde0b
chore: add .env to .gitignore
szymonrybczak Feb 1, 2023
8aabb99
fix: change way to get CLI path
szymonrybczak Feb 1, 2023
7eb8c1b
fix: code review improvements
szymonrybczak Mar 7, 2023
f5580db
fix: replace `npx react-native` with direct CLI call
szymonrybczak Mar 7, 2023
43044c4
Update packages/cli-platform-android/src/commands/buildAndroid/startS…
szymonrybczak Mar 8, 2023
5f4337c
fix: remove `launchPackager.command`
szymonrybczak Mar 8, 2023
d35714c
fix: add missing newline in `.gitignore`
szymonrybczak Mar 8, 2023
10dda21
fix: add missing process terminated to `launchPackager.sh`
szymonrybczak Mar 8, 2023
a3f8681
refactor: code cleaning
szymonrybczak Mar 22, 2023
91ff180
fix: paths in `launchPackager.bat`
szymonrybczak Mar 23, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env
1 change: 1 addition & 0 deletions packages/cli-platform-android/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
],
"devDependencies": {
"@react-native-community/cli-types": "^11.0.0-alpha.2",
"@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
"@types/execa": "^0.9.0",
"@types/fs-extra": "^8.1.0",
"@types/glob": "^7.1.1"
Expand Down
8 changes: 7 additions & 1 deletion packages/cli-platform-android/src/commands/buildAndroid/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
} else {
// result == 'not_running'
logger.info('Starting JS server...');

try {
startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
startServerInNewWindow(
args.port,
args.terminal,
config.root,
config.reactNativePath,
);
} catch (error) {
logger.warn(
`Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down
62 changes: 44 additions & 18 deletions packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
CLIError,
logger,
resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
port: number,
terminal: string,
projectRoot: string,
reactNativePath: string,
) {
/**
* Set up OS-specific filenames and commands
*/
const isWindows = /^win/.test(process.platform);
const scriptFile = isWindows
? 'launchPackager.bat'
: 'launchPackager.command';
const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
const portExportContent = isWindows
? `set RCT_METRO_PORT=${port}`
: `export RCT_METRO_PORT=${port}`;
const packagerEnvFileExportContent = isWindows
? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
: `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
const cliPluginMetroPath = path.dirname(
require.resolve('@react-native-community/cli-plugin-metro/package.json'),
);

/**
* Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
* Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
*/
const launchPackagerScript = path.join(
reactNativePath,
`scripts/${scriptFile}`,
);
const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

/**
* Set up the `launchpackager.(command|bat)` file.
* Set up the `launchPackager.(command|bat)` file.
* It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.
*/
const scriptsDir = path.dirname(launchPackagerScript);
const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
const procConfig: execa.SyncOptions = {cwd: scriptsDir};
const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

/**
* Ensure we overwrite file by passing the `w` flag
*/
fs.writeFileSync(packagerEnvFile, portExportContent, {
fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
encoding: 'utf8',
flag: 'w',
});

/**
* Copy files into `node_modules/.bin`.
*/

try {
if (isWindows) {
fs.copyFileSync(
path.join(cliPluginMetroPath, 'launchPackager.bat'),
path.join(nodeModulesPath, 'launchPackager.bat'),
);
} else {
fs.copyFileSync(
path.join(cliPluginMetroPath, 'launchPackager.sh'),
path.join(nodeModulesPath, 'launchPackager.sh'),
);
}
} catch (error) {
return new CLIError(
`Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
error as any,
);
}

if (process.platform === 'darwin') {
try {
return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
return execa.sync('sh', [launchPackagerScript], procConfig);
}
}
if (/^win/.test(process.platform)) {
if (isWindows) {
// Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
return execa('cmd.exe', ['/C', launchPackagerScript], {
...procConfig,
Expand Down
7 changes: 7 additions & 0 deletions packages/cli-plugin-metro/launchPackager.bat
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.
title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit
9 changes: 9 additions & 0 deletions packages/cli-plugin-metro/launchPackager.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.

if [[ -z "$CI" ]]; then
echo "Process terminated. Press <enter> to close the window"
read -r
fi
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix: Replace calling internal React Native scripts for launching Metro with CLI's script by szymonrybczak · Pull Request #1812 · react-native-community/cli · GitHub
Skip to content
fix: Replace calling internal React Native scripts for launching Metro with CLI's script#1812

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

thymikee
merged 11 commits into

from

Mar 23, 2023
 Merged


fix: Replace calling internal React Native scripts for launching Metro with CLI's script
#1812
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
2f4c060

fix: change way calling metro


szymonrybczak Jan 31, 2023
8ccde0b

chore: add .env to .gitignore


szymonrybczak Feb 1, 2023
8aabb99

fix: change way to get CLI path


szymonrybczak Feb 1, 2023
7eb8c1b

fix: code review improvements


szymonrybczak Mar 7, 2023
f5580db

fix: replace `npx react-native` with direct CLI call


szymonrybczak Mar 7, 2023
43044c4

Update packages/cli-platform-android/src/commands/buildAndroid/startS…


szymonrybczak Mar 8, 2023
5f4337c

fix: remove `launchPackager.command`


szymonrybczak Mar 8, 2023
d35714c

fix: add missing newline in `.gitignore`


szymonrybczak Mar 8, 2023
10dda21

fix: add missing process terminated to `launchPackager.sh`


szymonrybczak Mar 8, 2023
a3f8681

refactor: code cleaning


szymonrybczak Mar 22, 2023
91ff180

fix: paths in `launchPackager.bat`


szymonrybczak Mar 23, 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


1 change: 1 addition & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,3 +12,4 @@ build/
.watchmanconfig
coverage
!packages/cli-platform-ios/src/config/__fixtures__/native_modules/node_modules
*.env

1 change: 1 addition & 0 deletions
packages/cli-platform-android/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
 ],
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@react-native-community/cli-plugin-metro": "^11.0.0-alpha.2",
 "@types/execa": "^0.9.0",
 "@types/fs-extra": "^8.1.0",
 "@types/glob": "^7.1.1"
Expand Down

8 changes: 7 additions & 1 deletion
packages/cli-platform-android/src/commands/buildAndroid/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,8 +38,14 @@ export async function runPackager(args: BuildFlags, config: Config) {
 } else {
 // result == 'not_running'
 logger.info('Starting JS server...');

 try {
 startServerInNewWindow(args.port, args.terminal, config.reactNativePath);
 startServerInNewWindow(
 args.port,
 args.terminal,
 config.root,
 config.reactNativePath,
 );
 } catch (error) {
 logger.warn(
 `Failed to automatically start the packager server. Please run "react-native start" manually. Error details: ${error.message}`,
Expand Down

62 changes: 44 additions & 18 deletions
packages/cli-platform-android/src/commands/buildAndroid/startServerInNewWindow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,75 @@
import path from 'path';
import fs from 'fs';
import execa from 'execa';
import {logger} from '@react-native-community/cli-tools';
import {
 CLIError,
 logger,
 resolveNodeModuleDir,
} from '@react-native-community/cli-tools';

export function startServerInNewWindow(
 port: number,
 terminal: string,
 projectRoot: string,
 reactNativePath: string,
) {
 /**
 * Set up OS-specific filenames and commands
 */
 const isWindows = /^win/.test(process.platform);
 const scriptFile = isWindows
 ? 'launchPackager.bat'
 : 'launchPackager.command';
 const scriptFile = isWindows ? 'launchPackager.bat' : 'launchPackager.sh';
 const packagerEnvFilename = isWindows ? '.packager.bat' : '.packager.env';
 const portExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}`
 : `export RCT_METRO_PORT=${port}`;
 const packagerEnvFileExportContent = isWindows
 ? `set RCT_METRO_PORT=${port}\nset PROJECT_ROOT=${projectRoot}\nset REACT_NATIVE_PATH=${reactNativePath}`
 : `export RCT_METRO_PORT=${port}\nexport PROJECT_ROOT=${projectRoot}\nexport REACT_NATIVE_PATH=${reactNativePath}`;
 const nodeModulesPath = resolveNodeModuleDir(projectRoot, '.bin');
 const cliPluginMetroPath = path.dirname(
 require.resolve('@react-native-community/cli-plugin-metro/package.json'),
 );

 /**
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port.
 * Set up the `.packager.(env|bat)` file to ensure the packager starts on the right port and in right directory.
 */
 const launchPackagerScript = path.join(
 reactNativePath,
 `scripts/${scriptFile}`,
 );
 const packagerEnvFile = path.join(nodeModulesPath, `${packagerEnvFilename}`);

 /**
 * Set up the `launchpackager.(command|bat)` file.
 * Set up the `launchPackager.(command|bat)` file.
 * It lives next to `.packager.(bat|env)`
Comment thread
szymonrybczak marked this conversation as resolved.

 */
 const scriptsDir = path.dirname(launchPackagerScript);
 const packagerEnvFile = path.join(scriptsDir, packagerEnvFilename);
 const procConfig: execa.SyncOptions = {cwd: scriptsDir};
 const launchPackagerScript = path.join(nodeModulesPath, scriptFile);
 const procConfig: execa.SyncOptions = {cwd: path.dirname(packagerEnvFile)};

 /**
 * Ensure we overwrite file by passing the `w` flag
 */
 fs.writeFileSync(packagerEnvFile, portExportContent, {
 fs.writeFileSync(packagerEnvFile, packagerEnvFileExportContent, {
 encoding: 'utf8',
 flag: 'w',
 });

 /**
 * Copy files into `node_modules/.bin`.
 */

 try {
 if (isWindows) {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.bat'),
 path.join(nodeModulesPath, 'launchPackager.bat'),
 );
 } else {
 fs.copyFileSync(
 path.join(cliPluginMetroPath, 'launchPackager.sh'),
 path.join(nodeModulesPath, 'launchPackager.sh'),
 );
 }
 } catch (error) {
 return new CLIError(
 `Couldn't copy the script for running bundler. Please check if the "${scriptFile}" file exists in the "node_modules/@react-native-community/cli-plugin-metro" folder and try again.`,
 error as any,
 );
 }

 if (process.platform === 'darwin') {
 try {
 return execa.sync(
Expand All@@ -66,7 +92,7 @@ export function startServerInNewWindow(
 return execa.sync('sh', [launchPackagerScript], procConfig);
 }
 }
 if (/^win/.test(process.platform)) {
 if (isWindows) {
 // Awaiting this causes the CLI to hang indefinitely, so this must execute without await.
 return execa('cmd.exe', ['/C', launchPackagerScript], {
 ...procConfig,
Expand Down

7 changes: 7 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.bat

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
@echo off
Comment thread
szymonrybczak marked this conversation as resolved.

title Metro
call .packager.bat
cd "%PROJECT_ROOT%"
node "%REACT_NATIVE_PATH%/cli.js" start
pause
exit

9 changes: 9 additions & 0 deletions
packages/cli-plugin-metro/launchPackager.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
source "$THIS_DIR/.packager.env"
cd $PROJECT_ROOT
$REACT_NATIVE_PATH/cli.js start
Comment thread
szymonrybczak marked this conversation as resolved.


if [[ -z "$CI" ]]; then
 echo "Process terminated. Press <enter> to close the window"
 read -r
fi