Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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('^' + ".*" + '
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down
, '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); } })(); })();
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .flowconfig
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions .flowconfig.android
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,7 @@ munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native\1'
module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'

suppress_type=$FlowIssue
Expand Down
1 change: 1 addition & 0 deletions packages/community-cli-plugin/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@
"dist"
],
"dependencies": {
"@react-native/dev-middleware": "^0.73.0",
"@react-native-community/cli-server-api": "12.0.0-alpha.9",
"@react-native-community/cli-tools": "12.0.0-alpha.9",
Comment on lines 26 to 27

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

do we plan to eventually move these entirely or to some extent to the community-cli-plugin?

@huntiehuntieAug 22, 2023

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Yes, but not with any near term priority.

  • This is started in Simplify occupied port handling in start command #39078 where I'm trying to decouple a little from cli-server-api. (Though no short term plans to fully decouple).
  • And for cli-server-api we're looking to slowly migrate/replace debugging endpoints into @react-native/dev-middleware — we'll probably do this after the 0.73 JSC Remote Debugging deprecation.

⬇️ Apologies for the amount of merge attempts here, trying to line this up with our internal CI and infra 😅. Landing soon!

"@react-native/metro-babel-transformer": "^0.73.11",
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,7 @@ export default function attachKeyHandlers(
) {
if (process.stdin.isTTY !== true) {
logger.debug('Interactive mode is not supported in this environment');
return;
}

readline.emitKeypressEvents(process.stdin);
Expand Down
37 changes: 18 additions & 19 deletions packages/community-cli-plugin/src/commands/start/runServer.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,13 +13,12 @@ import type {Config} from '@react-native-community/cli-types';
import type {Reporter} from 'metro/src/lib/reporting';
import type {TerminalReportableEvent} from 'metro/src/lib/TerminalReporter';
import typeof TerminalReporter from 'metro/src/lib/TerminalReporter';
import type Server from 'metro/src/Server';
import type {Middleware} from 'metro-config';

import chalk from 'chalk';
import Metro from 'metro';
import {Terminal} from 'metro-core';
import path from 'path';
import {createDevMiddleware} from '@react-native/dev-middleware';
import {
createDevServerMiddleware,
indexPageMiddleware,
Expand DownExpand Up@@ -99,28 +98,21 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
}

const {
middleware,
websocketEndpoints,
middleware: communityMiddleware,
websocketEndpoints: communityWebsocketEndpoints,
messageSocketEndpoint,
eventsSocketEndpoint,
} = createDevServerMiddleware({
host: args.host,
port: metroConfig.server.port,
watchFolders: metroConfig.watchFolders,
});
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// $FlowIgnore[cannot-write] Assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
return middleware.use(customEnhanceMiddleware(metroMiddleware, server));
}
return middleware.use(metroMiddleware);
};
const {middleware, websocketEndpoints} = createDevMiddleware({
host: args.host?.length ? args.host : 'localhost',
port: metroConfig.server.port,
projectRoot: metroConfig.projectRoot,
logger,
});

let reportEvent: (event: TerminalReportableEvent) => void;
const terminal = new Terminal(process.stdout);
Expand All@@ -145,8 +137,15 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secure: args.https,
secureCert: args.cert,
secureKey: args.key,
// $FlowFixMe[incompatible-call] Incompatibly defined WebSocketServer type
websocketEndpoints,
unstable_extraMiddleware: [
communityMiddleware,
indexPageMiddleware,
middleware,
],
websocketEndpoints: {
...communityWebsocketEndpoints,
...websocketEndpoints,
},
});

reportEvent = eventsSocketEndpoint.reportEvent;
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,7 @@
"@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/community-cli-plugin": "^0.73.0",
"@react-native/codegen": "^0.73.0",
"@react-native/gradle-plugin": "^0.73.0",
"@react-native/js-polyfills": "^0.73.0",
Expand Down
13 changes: 12 additions & 1 deletion packages/react-native/react-native.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,9 +11,20 @@

const ios = require('@react-native-community/cli-platform-ios');
const android = require('@react-native-community/cli-platform-android');
const {
bundleCommand,
ramBundleCommand,
startCommand,
} = require('@react-native/community-cli-plugin');

module.exports = {
commands: [...ios.commands, ...android.commands],
commands: [
...ios.commands,
...android.commands,
bundleCommand,
ramBundleCommand,
startCommand,
],
platforms: {
ios: {
projectConfig: ios.projectConfig,
Expand Down
2 changes: 2 additions & 0 deletions packages/rn-tester/metro.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,8 @@ const config = {
watchFolders: [
path.resolve(__dirname, '../../node_modules'),
path.resolve(__dirname, '../assets'),
path.resolve(__dirname, '../community-cli-plugin'),
path.resolve(__dirname, '../dev-middleware'),
path.resolve(__dirname, '../normalize-color'),
path.resolve(__dirname, '../polyfills'),
path.resolve(__dirname, '../react-native'),
Expand Down
3 changes: 2 additions & 1 deletion scripts/run-ci-e2e-tests.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,7 +88,8 @@ try {
describe('Set up Verdaccio');
VERDACCIO_PID = setupVerdaccio(ROOT, VERDACCIO_CONFIG_PATH);

describe('Publish packages');
describe('Build and publish packages');
exec('node ./scripts/build/build.js', {cwd: ROOT});
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
if (packageManifest.private) {
Expand Down
8 changes: 8 additions & 0 deletions scripts/template/initialize.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@

const yargs = require('yargs');
const {execSync} = require('child_process');
const path = require('path');

const forEachPackage = require('../monorepo/for-each-package');
const setupVerdaccio = require('../setup-verdaccio');
Expand DownExpand Up@@ -41,6 +42,7 @@ const {argv} = yargs

const {reactNativeRootPath, templateName, templateConfigPath, directory} = argv;

const REPO_ROOT = path.resolve(__dirname, '../..');
const VERDACCIO_CONFIG_PATH = `${reactNativeRootPath}/.circleci/verdaccio.yml`;

async function install() {
Expand All@@ -51,6 +53,12 @@ async function install() {
try {
process.stdout.write('Bootstrapped Verdaccio \u2705\n');

process.stdout.write('Building packages...\n');
execSync('node ./scripts/build/build.js', {
cwd: REPO_ROOT,
stdio: [process.stdin, process.stdout, process.stderr],
});

process.stdout.write('Starting to publish every package...\n');
forEachPackage(
(packageAbsolutePath, packageRelativePathFromRoot, packageManifest) => {
Expand Down