Skip to content

Upgrade CLI and Metro, update status check refs#38988

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

Closed
huntie wants to merge 1 commit into from
Closed

Upgrade CLI and Metro, update status check refs #38988

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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
"jest": "^29.2.1",
"jest-junit": "^10.0.0",
"jscodeshift": "^0.14.0",
"metro-babel-register": "0.77.0",
"metro-memory-fs": "0.77.0",
"metro-babel-register": "0.78.0",
"metro-memory-fs": "0.78.0",
"micromatch": "^4.0.4",
"mkdirp": "^0.5.1",
"mock-fs": "^5.1.4",
Expand Down
14 changes: 8 additions & 6 deletions packages/community-cli-plugin/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
"launchPackager.command"
],
"dependencies": {
"@react-native-community/cli-server-api": "12.0.0-alpha.7",
"@react-native-community/cli-tools": "12.0.0-alpha.7",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
"@react-native/metro-babel-transformer": "^0.73.11",
"chalk": "^4.0.0",
"execa": "^5.1.1",
"metro": "0.77.0",
"metro-config": "0.77.0",
"metro-core": "0.77.0",
"metro-resolver": "0.77.0",
"metro": "0.78.0",
"metro-config": "0.78.0",
"metro-core": "0.78.0",
"readline": "^1.3.0"
},
"devDependencies": {
"metro-resolver": "0.78.0"
},
"engines": {
"node": ">=18"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/metro-config/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
"dependencies": {
"@react-native/metro-babel-transformer": "^0.73.11",
"@react-native/js-polyfills": "^0.73.0",
"metro-config": "0.77.0",
"metro-runtime": "0.77.0"
"metro-config": "0.78.0",
"metro-runtime": "0.78.0"
}
}
7 changes: 7 additions & 0 deletions packages/react-native/React/Base/RCTBundleURLProvider.mm
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

// TODO(huntie): Temporary string match in JSON response. We will revert this
// endpoint back to "packager-status:running" in the next CLI alpha.
if ([status containsString:@"\"status\":\"running\""]) {
return true;
}

return [status isEqualToString:@"packager-status:running"];
}

Expand Down
9 changes: 9 additions & 0 deletions ...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
String bodyString =
body.string(); // cannot call body.string() twice, stored it into variable.
// https://github.com/square/okhttp/issues/1240#issuecomment-68142603

// TODO(huntie): Temporary string match in JSON response. We
// will revert this endpoint back to "packager-status:running"
// in the next CLI alpha.
if (bodyString.contains("\"status\":\"running\"")) {
callback.onPackagerStatusFetched(true);
return;
}

if (!PACKAGER_OK_STATUS.equals(bodyString)) {
FLog.e(
ReactConstants.TAG,
Expand Down
10 changes: 5 additions & 5 deletions packages/react-native/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
},
"dependencies": {
"@jest/create-cache-key-function": "^29.2.1",
"@react-native-community/cli": "12.0.0-alpha.7",
"@react-native-community/cli-platform-android": "12.0.0-alpha.7",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
"@react-native-community/cli": "12.0.0-alpha.9",
"@react-native-community/cli-platform-android": "12.0.0-alpha.9",
"@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
"@react-native/assets-registry": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
"jest-environment-node": "^29.2.1",
"jsc-android": "^250231.0.0",
"memoize-one": "^5.0.0",
"metro-runtime": "0.76.7",
"metro-source-map": "0.76.7",
"metro-runtime": "0.78.0",
"metro-source-map": "0.78.0",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand Down
22 changes: 21 additions & 1 deletion scripts/objc-test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
local -i max_attempts=60
local -i attempt_num=1

# TODO(huntie): Temporary string match in JSON response. We will revert
# this endpoint back to "packager-status:running" in the next CLI alpha.
until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
if (( attempt_num == max_attempts )); then
echo "Packager did not respond in time. No more attempts left."
exit 1
else
(( attempt_num++ ))
echo "Packager did not respond. Retrying for attempt number $attempt_num..."
sleep 1
fi
done

echo "Packager is ready!"
}

runTests() {
# shellcheck disable=SC1091
source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

# Start the packager
yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
preloadBundlesRNTester
preloadBundlesRNIntegrationTests

Expand Down
6 changes: 6 additions & 0 deletions scripts/testing-utils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
silent: true,
}).stdout;

// TODO(huntie): Temporary string match in JSON response. We will revert
// this endpoint back to "packager-status:running" in the next CLI alpha.
if (status.includes('"status":"running"')) {
return 'running';
}

return status === 'packager-status:running' ? 'running' : 'unrecognized';
} catch (_error) {
return 'not_running';
Expand Down
Loading
, '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" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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('^' + ".*" + '
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading

, '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); }
})();
})();
Upgrade CLI and Metro, update status check refs by huntie · Pull Request #38988 · react/react-native · GitHub
Skip to content
Upgrade CLI and Metro, update status check refs#38988

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

 Closed

huntie
wants to merge
1
commit into

from

 Closed


Upgrade CLI and Metro, update status check refs
#38988
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


4 changes: 2 additions & 2 deletions
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -90,8 +90,8 @@
 "jest": "^29.2.1",
 "jest-junit": "^10.0.0",
 "jscodeshift": "^0.14.0",
 "metro-babel-register": "0.77.0",
 "metro-memory-fs": "0.77.0",
 "metro-babel-register": "0.78.0",
 "metro-memory-fs": "0.78.0",
 "micromatch": "^4.0.4",
 "mkdirp": "^0.5.1",
 "mock-fs": "^5.1.4",
Expand Down

14 changes: 8 additions & 6 deletions
packages/community-cli-plugin/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,17 +24,19 @@
 "launchPackager.command"
 ],
 "dependencies": {
 "@react-native-community/cli-server-api": "12.0.0-alpha.7",
 "@react-native-community/cli-tools": "12.0.0-alpha.7",
 "@react-native-community/cli-server-api": "12.0.0-alpha.9",
 "@react-native-community/cli-tools": "12.0.0-alpha.9",
 "@react-native/metro-babel-transformer": "^0.73.11",
 "chalk": "^4.0.0",
 "execa": "^5.1.1",
 "metro": "0.77.0",
 "metro-config": "0.77.0",
 "metro-core": "0.77.0",
 "metro-resolver": "0.77.0",
 "metro": "0.78.0",
 "metro-config": "0.78.0",
 "metro-core": "0.78.0",
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "metro-resolver": "0.78.0"
 },
 "engines": {
 "node": ">=18"
 }
Expand Down

4 changes: 2 additions & 2 deletions
packages/metro-config/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@
 "dependencies": {
 "@react-native/metro-babel-transformer": "^0.73.11",
 "@react-native/js-polyfills": "^0.73.0",
 "metro-config": "0.77.0",
 "metro-runtime": "0.77.0"
 "metro-config": "0.78.0",
 "metro-runtime": "0.78.0"
 }
}

7 changes: 7 additions & 0 deletions
packages/react-native/React/Base/RCTBundleURLProvider.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -107,6 +107,13 @@ + (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
 dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);

 NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];

 // TODO(huntie): Temporary string match in JSON response. We will revert this
 // endpoint back to "packager-status:running" in the next CLI alpha.
 if ([status containsString:@"\"status\":\"running\""]) {
 return true;
 }

 return [status isEqualToString:@"packager-status:running"];
}

Expand Down

9 changes: 9 additions & 0 deletions
...-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PackagerStatusCheck.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,15 @@ public void onResponse(Call call, Response response) throws IOException {
 String bodyString =
 body.string(); // cannot call body.string() twice, stored it into variable.
 // https://github.com/square/okhttp/issues/1240#issuecomment-68142603

 // TODO(huntie): Temporary string match in JSON response. We
 // will revert this endpoint back to "packager-status:running"
 // in the next CLI alpha.
 if (bodyString.contains("\"status\":\"running\"")) {
 callback.onPackagerStatusFetched(true);
 return;
 }

 if (!PACKAGER_OK_STATUS.equals(bodyString)) {
 FLog.e(
 ReactConstants.TAG,
Expand Down

10 changes: 5 additions & 5 deletions
packages/react-native/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,9 +92,9 @@
 },
 "dependencies": {
 "@jest/create-cache-key-function": "^29.2.1",
 "@react-native-community/cli": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.7",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.7",
 "@react-native-community/cli": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-android": "12.0.0-alpha.9",
 "@react-native-community/cli-platform-ios": "12.0.0-alpha.9",
 "@react-native/assets-registry": "^0.73.0",
 "@react-native/codegen": "^0.73.0",
 "@react-native/gradle-plugin": "^0.73.0",
Expand All@@ -112,8 +112,8 @@
 "jest-environment-node": "^29.2.1",
 "jsc-android": "^250231.0.0",
 "memoize-one": "^5.0.0",
 "metro-runtime": "0.76.7",
 "metro-source-map": "0.76.7",
 "metro-runtime": "0.78.0",
 "metro-source-map": "0.78.0",
 "mkdirp": "^0.5.1",
 "nullthrows": "^1.1.1",
 "pretty-format": "^26.5.2",
Expand Down

22 changes: 21 additions & 1 deletion
scripts/objc-test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -73,6 +73,26 @@ waitForWebSocketServer() {
 echo "WebSocket Server is ready!"
}

waitForPackagerAlt() {
 local -i max_attempts=60
 local -i attempt_num=1

 # TODO(huntie): Temporary string match in JSON response. We will revert
 # this endpoint back to "packager-status:running" in the next CLI alpha.
 until curl -s http://localhost:8081/status | grep "\"status\":\"running\"" -q; do
 if (( attempt_num == max_attempts )); then
 echo "Packager did not respond in time. No more attempts left."
 exit 1
 else
 (( attempt_num++ ))
 echo "Packager did not respond. Retrying for attempt number $attempt_num..."
 sleep 1
 fi
 done

 echo "Packager is ready!"
}

runTests() {
 # shellcheck disable=SC1091
 source "$ROOT/scripts/.tests.env"
Expand DownExpand Up@@ -131,7 +151,7 @@ main() {

 # Start the packager
 yarn start --max-workers=1 || echo "Can't start packager automatically" &
waitForPackager
waitForPackagerAlt
 preloadBundlesRNTester
 preloadBundlesRNIntegrationTests

Expand Down

6 changes: 6 additions & 0 deletions
scripts/testing-utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -117,6 +117,12 @@ function isPackagerRunning(
 silent: true,
 }).stdout;

 // TODO(huntie): Temporary string match in JSON response. We will revert
 // this endpoint back to "packager-status:running" in the next CLI alpha.
 if (status.includes('"status":"running"')) {
 return 'running';
 }

 return status === 'packager-status:running' ? 'running' : 'unrecognized';
 } catch (_error) {
 return 'not_running';
Expand Down
Loading