chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thymikee merged 1 commit into from
Mar 17, 2023
Merged

chore: Update cli-plugin-metro to use external Metro types #1874

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
6 changes: 5 additions & 1 deletion packages/cli-plugin-metro/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
"readline": "^1.3.0"
},
"devDependencies": {
"@react-native-community/cli-types": "^11.0.0-alpha.2"
"@react-native-community/cli-types": "^11.0.0-alpha.2",
"@types/metro": "^0.76.0",
"@types/metro-config": "^0.76.1",
"@types/metro-core": "^0.76.0",
"@types/metro-resolver": "^0.76.1"
},
"files": [
"build",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
const files = fs
Expand Down
29 changes: 7 additions & 22 deletions packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
*
*/

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
default as loadMetroConfig,
MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
dev: boolean;
minify: boolean;
platform: string | undefined;
unstable_transformProfile: string | undefined;
unstable_transformProfile: BundleOptions['unstable_transformProfile'];
generateStaticViewConfigs: boolean;
}

export interface AssetData {
__packager_asset: boolean;
fileSystemLocation: string;
hash: string;
height: number | null;
httpServerLocation: string;
name: string;
scales: number[];
type: string;
width: number | null;
files: string[];
}

async function buildBundle(
args: CommandLineArgs,
ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
*/
export async function buildBundleWithConfig(
args: CommandLineArgs,
config: MetroConfig,
config: ConfigT,
output: typeof outputBundle = outputBundle,
) {
if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
dev: args.dev,
minify: args.minify !== undefined ? args.minify : !args.dev,
platform: args.platform,
unstable_transformProfile: args.unstableTransformProfile,
unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
generateStaticViewConfigs: args.generateStaticViewConfigs,
};
const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
await output.save(bundle, args, logger.info);

// Save the assets of the bundle
const outputAssets: AssetData[] = await server.getAssets({
const outputAssets = await server.getAssets({
...Server.DEFAULT_BUNDLE_OPTIONS,
...requestOpts,
bundleType: 'todo',
Expand Down
3 changes: 2 additions & 1 deletion packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
sourcemapSourcesRoot?: string;
sourcemapUseAbsolutePath: boolean;
verbose: boolean;
unstableTransformProfile?: string;
unstableTransformProfile: string;
generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
name: '--unstable-transform-profile <string>',
description:
'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
default: 'default',
Comment thread
thymikee marked this conversation as resolved.
},
{
name: '--asset-catalog-dest [string]',
Expand Down
4 changes: 2 additions & 2 deletions packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
cleanAssetCatalog,
getImageSet,
isCatalogAsset,
writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
assets: AssetData[],
assets: ReadonlyArray<AssetData>,
platform: string,
assetsDest: string | undefined,
assetCatalogDest: string | undefined,
Expand Down
10 changes: 7 additions & 3 deletions packages/cli-plugin-metro/src/commands/start/runServer.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
});

if (args.assetPlugins) {
// @ts-ignore - assigning to readonly property
metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
require.resolve(plugin),
);
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
middleware.use(indexPageMiddleware);

const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
// @ts-ignore - assigning to readonly property
metroConfig.server.enhanceMiddleware = (
metroMiddleware: any,
server: unknown,
metroMiddleware: Middleware,
server: Server,
) => {
if (customEnhanceMiddleware) {
metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
secureCert: args.cert,
secureKey: args.key,
hmrEnabled: true,
// @ts-ignore - ws.Server types are incompatible
websocketEndpoints,
});

Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-metro/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
Config,
ConfigLoadingContext,
MetroConfig,
getDefaultConfig,
default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down
2 changes: 1 addition & 1 deletion packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
platforms: {},
});

expect(config.transformer.allowOptionalDependencies).toBe(true);
expect(config.transformer?.allowOptionalDependencies).toBe(true);
});
});
45 changes: 5 additions & 40 deletions packages/cli-plugin-metro/src/tools/loadMetroConfig.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
* Configuration file of Metro.
*/
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
resolver: {
resolveRequest?: (
context: any,
realModuleName: string,
platform: string,
moduleName: string,
) => any;
resolverMainFields: string[];
platforms: string[];
unstable_conditionNames: string[];
};
serializer: {
getModulesRunBeforeMainModule: () => string[];
getPolyfills: () => any;
};
server: {
port: number;
enhanceMiddleware?: Function;
};
symbolicator: {
customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
};
transformer: {
allowOptionalDependencies?: boolean;
babelTransformerPath: string;
assetRegistryPath: string;
assetPlugins?: Array<string>;
asyncRequireModulePath?: string;
};
watchFolders: ReadonlyArray<string>;
reporter?: any;
}

/**
* Default configuration
*/
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
(platform) => ctx.platforms[platform].npmPackageName,
);
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
port: Number(process.env.RCT_METRO_PORT) || 8081,
},
symbolicator: {
customizeFrame: (frame: {file: string | null}) => {
customizeFrame: (frame) => {
const collapse = Boolean(
frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
);
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
ctx: ConfigLoadingContext,
options?: ConfigOptionsT,
): Promise<MetroConfig> {
const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
const defaultConfig = {...getDefaultConfig(ctx)};
if (options && options.reporter) {
defaultConfig.reporter = options.reporter;
}
Expand Down
8 changes: 5 additions & 3 deletions packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
* }
*/

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
[platform: string]: string;
}) {
return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
return (context, moduleName, platform) => {
let modifiedModuleName = moduleName;
if (platformImplementations[platform]) {
if (platform != null && platformImplementations[platform]) {
if (moduleName === 'react-native') {
modifiedModuleName = platformImplementations[platform];
} else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

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

Skip to content
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} 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
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading

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

Skip to content
chore: Update cli-plugin-metro to use external Metro types#1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

thymikee
merged 1 commit into

from

Mar 17, 2023
 Merged


chore: Update cli-plugin-metro to use external Metro types
#1874
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


6 changes: 5 additions & 1 deletion
packages/cli-plugin-metro/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,11 @@
 "readline": "^1.3.0"
 },
 "devDependencies": {
 "@react-native-community/cli-types": "^11.0.0-alpha.2"
 "@react-native-community/cli-types": "^11.0.0-alpha.2",
 "@types/metro": "^0.76.0",
 "@types/metro-config": "^0.76.1",
 "@types/metro-core": "^0.76.0",
 "@types/metro-resolver": "^0.76.1"
 },
 "files": [
 "build",
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/assetCatalogIOS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,8 +8,8 @@

import path from 'path';
import fs from 'fs-extra';
import type {AssetData} from 'metro';
import assetPathUtils from './assetPathUtils';
import {AssetData} from './buildBundle';

export function cleanAssetCatalog(catalogDir: string): void {
 const files = fs
Expand Down

29 changes: 7 additions & 22 deletions
packages/cli-plugin-metro/src/commands/bundle/buildBundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,19 +6,17 @@
 *
 */

// @ts-ignore - no typed definition for the package
import Server from 'metro/src/Server';
// @ts-ignore - no typed definition for the package
const outputBundle = require('metro/src/shared/output/bundle');
import type {BundleOptions} from 'metro/shared/types';
import type {ConfigT} from 'metro-config';
import path from 'path';
import chalk from 'chalk';
import {CommandLineArgs} from './bundleCommandLineArgs';
import type {Config} from '@react-native-community/cli-types';
import saveAssets from './saveAssets';
import {
 default as loadMetroConfig,
 MetroConfig,
} from '../../tools/loadMetroConfig';
import {default as loadMetroConfig} from '../../tools/loadMetroConfig';
import {logger} from '@react-native-community/cli-tools';

interface RequestOptions {
Expand All@@ -27,23 +25,10 @@ interface RequestOptions {
 dev: boolean;
 minify: boolean;
 platform: string | undefined;
 unstable_transformProfile: string | undefined;
 unstable_transformProfile: BundleOptions['unstable_transformProfile'];
 generateStaticViewConfigs: boolean;
}

export interface AssetData {
 __packager_asset: boolean;
 fileSystemLocation: string;
 hash: string;
 height: number | null;
 httpServerLocation: string;
 name: string;
 scales: number[];
 type: string;
 width: number | null;
 files: string[];
}

async function buildBundle(
 args: CommandLineArgs,
 ctx: Config,
Expand All@@ -65,7 +50,7 @@ async function buildBundle(
 */
export async function buildBundleWithConfig(
 args: CommandLineArgs,
 config: MetroConfig,
 config: ConfigT,
 output: typeof outputBundle = outputBundle,
) {
 if (config.resolver.platforms.indexOf(args.platform) === -1) {
Expand DownExpand Up@@ -101,7 +86,7 @@ export async function buildBundleWithConfig(
 dev: args.dev,
 minify: args.minify !== undefined ? args.minify : !args.dev,
 platform: args.platform,
 unstable_transformProfile: args.unstableTransformProfile,
 unstable_transformProfile: args.unstableTransformProfile as BundleOptions['unstable_transformProfile'],
 generateStaticViewConfigs: args.generateStaticViewConfigs,
 };
 const server = new Server(config);
Expand All@@ -112,7 +97,7 @@ export async function buildBundleWithConfig(
 await output.save(bundle, args, logger.info);

 // Save the assets of the bundle
 const outputAssets: AssetData[] = await server.getAssets({
 const outputAssets = await server.getAssets({
 ...Server.DEFAULT_BUNDLE_OPTIONS,
 ...requestOpts,
 bundleType: 'todo',
Expand Down

3 changes: 2 additions & 1 deletion
packages/cli-plugin-metro/src/commands/bundle/bundleCommandLineArgs.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ export interface CommandLineArgs {
 sourcemapSourcesRoot?: string;
 sourcemapUseAbsolutePath: boolean;
 verbose: boolean;
 unstableTransformProfile?: string;
 unstableTransformProfile: string;
 generateStaticViewConfigs: boolean;
}

Expand DownExpand Up@@ -102,6 +102,7 @@ export default [
 name: '--unstable-transform-profile <string>',
 description:
 'Experimental, transform JS for a specific JS engine. Currently supported: hermes, hermes-canary, default',
 default: 'default',
Comment thread
thymikee marked this conversation as resolved.

 },
 {
 name: '--asset-catalog-dest [string]',
Expand Down

4 changes: 2 additions & 2 deletions
packages/cli-plugin-metro/src/commands/bundle/saveAssets.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,14 +8,14 @@

import {logger} from '@react-native-community/cli-tools';
import fs from 'fs';
import type {AssetData} from 'metro';
import path from 'path';
import {
 cleanAssetCatalog,
 getImageSet,
 isCatalogAsset,
 writeImageSet,
} from './assetCatalogIOS';
import {AssetData} from './buildBundle';
import filterPlatformAssetScales from './filterPlatformAssetScales';
import getAssetDestPathAndroid from './getAssetDestPathAndroid';
import getAssetDestPathIOS from './getAssetDestPathIOS';
Expand All@@ -25,7 +25,7 @@ interface CopiedFiles {
}

function saveAssets(
 assets: AssetData[],
 assets: ReadonlyArray<AssetData>,
 platform: string,
 assetsDest: string | undefined,
 assetCatalogDest: string | undefined,
Expand Down

10 changes: 7 additions & 3 deletions
packages/cli-plugin-metro/src/commands/start/runServer.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,8 @@

// @ts-ignore untyped metro
import Metro from 'metro';
// @ts-ignore untyped metro
import type {Server} from 'metro';
import type {Middleware} from 'metro-config';
import {Terminal} from 'metro-core';
import path from 'path';
import {
Expand DownExpand Up@@ -65,6 +66,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 });

 if (args.assetPlugins) {
 // @ts-ignore - assigning to readonly property
 metroConfig.transformer.assetPlugins = args.assetPlugins.map((plugin) =>
 require.resolve(plugin),
 );
Expand All@@ -83,9 +85,10 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 middleware.use(indexPageMiddleware);

 const customEnhanceMiddleware = metroConfig.server.enhanceMiddleware;
 // @ts-ignore - assigning to readonly property
 metroConfig.server.enhanceMiddleware = (
 metroMiddleware: any,
 server: unknown,
 metroMiddleware: Middleware,
 server: Server,
 ) => {
 if (customEnhanceMiddleware) {
 metroMiddleware = customEnhanceMiddleware(metroMiddleware, server);
Expand All@@ -99,6 +102,7 @@ async function runServer(_argv: Array<string>, ctx: Config, args: Args) {
 secureCert: args.cert,
 secureKey: args.key,
 hmrEnabled: true,
 // @ts-ignore - ws.Server types are incompatible
 websocketEndpoints,
 });

Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
export type {MetroConfig} from 'metro-config';
export {
 Config,
 ConfigLoadingContext,
 MetroConfig,
 getDefaultConfig,
 default as loadMetroConfig,
} from './tools/loadMetroConfig';
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli-plugin-metro/src/tools/__tests__/loadMetroConfig-test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,6 @@ describe('getDefaultConfig', () => {
 platforms: {},
 });

 expect(config.transformer.allowOptionalDependencies).toBe(true);
 expect(config.transformer?.allowOptionalDependencies).toBe(true);
 });
});

45 changes: 5 additions & 40 deletions
packages/cli-plugin-metro/src/tools/loadMetroConfig.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,7 @@
 * Configuration file of Metro.
 */
import path from 'path';
// @ts-ignore - no typed definition for the package
import {loadConfig} from 'metro-config';
import {ConfigT, InputConfigT, loadConfig} from 'metro-config';
import type {Config} from '@react-native-community/cli-types';
import {reactNativePlatformResolver} from './metroPlatformResolver';

Expand DownExpand Up@@ -34,44 +33,10 @@ export type ConfigLoadingContext = Pick<
 'root' | 'reactNativePath' | 'platforms'
>;

export interface MetroConfig {
 resolver: {
 resolveRequest?: (
 context: any,
 realModuleName: string,
 platform: string,
 moduleName: string,
 ) => any;
 resolverMainFields: string[];
 platforms: string[];
 unstable_conditionNames: string[];
 };
 serializer: {
 getModulesRunBeforeMainModule: () => string[];
 getPolyfills: () => any;
 };
 server: {
 port: number;
 enhanceMiddleware?: Function;
 };
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {collapse: boolean};
 };
 transformer: {
 allowOptionalDependencies?: boolean;
 babelTransformerPath: string;
 assetRegistryPath: string;
 assetPlugins?: Array<string>;
 asyncRequireModulePath?: string;
 };
 watchFolders: ReadonlyArray<string>;
 reporter?: any;
}

/**
 * Default configuration
 */
export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
export const getDefaultConfig = (ctx: ConfigLoadingContext): InputConfigT => {
 const outOfTreePlatforms = Object.keys(ctx.platforms).filter(
 (platform) => ctx.platforms[platform].npmPackageName,
 );
Expand DownExpand Up@@ -115,7 +80,7 @@ export const getDefaultConfig = (ctx: ConfigLoadingContext): MetroConfig => {
 port: Number(process.env.RCT_METRO_PORT) || 8081,
 },
 symbolicator: {
 customizeFrame: (frame: {file: string | null}) => {
 customizeFrame: (frame) => {
 const collapse = Boolean(
 frame.file && INTERNAL_CALLSITES_REGEX.test(frame.file),
 );
Expand DownExpand Up@@ -155,8 +120,8 @@ export interface ConfigOptionsT {
export default function loadMetroConfig(
 ctx: ConfigLoadingContext,
 options?: ConfigOptionsT,
): Promise<MetroConfig> {
 const defaultConfig = getDefaultConfig(ctx);
): Promise<ConfigT> {
 const defaultConfig = {...getDefaultConfig(ctx)};
 if (options && options.reporter) {
 defaultConfig.reporter = options.reporter;
 }
Expand Down

8 changes: 5 additions & 3 deletions
packages/cli-plugin-metro/src/tools/metroPlatformResolver.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,12 +13,14 @@
 * }
 */

import type {CustomResolver} from 'metro-resolver';

export function reactNativePlatformResolver(platformImplementations: {
 [platform: string]: string;
}) {
 return (context: any, moduleName: string, platform: string) => {
}): CustomResolver {
 return (context, moduleName, platform) => {
 let modifiedModuleName = moduleName;
 if (platformImplementations[platform]) {
 if (platform != null && platformImplementations[platform]) {
 if (moduleName === 'react-native') {
 modifiedModuleName = platformImplementations[platform];
 } else if (moduleName.startsWith('react-native/')) {
Expand Down
Loading