@expo/cli 56.1.5 → 56.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/build/bin/cli +1 -1
  2. package/build/src/events/index.js +1 -1
  3. package/build/src/export/embed/exportEmbedAsync.js +1 -1
  4. package/build/src/export/embed/exportEmbedAsync.js.map +1 -1
  5. package/build/src/export/embed/exportServer.js +1 -1
  6. package/build/src/export/embed/exportServer.js.map +1 -1
  7. package/build/src/export/exportApp.js +1 -1
  8. package/build/src/export/exportApp.js.map +1 -1
  9. package/build/src/export/publicFolder.js +19 -1
  10. package/build/src/export/publicFolder.js.map +1 -1
  11. package/build/src/login/index.js +25 -5
  12. package/build/src/login/index.js.map +1 -1
  13. package/build/src/run/android/resolveLaunchProps.js +4 -1
  14. package/build/src/run/android/resolveLaunchProps.js.map +1 -1
  15. package/build/src/start/doctor/dependencies/reactNativeTv.js +149 -0
  16. package/build/src/start/doctor/dependencies/reactNativeTv.js.map +1 -0
  17. package/build/src/start/doctor/dependencies/validateDependenciesVersions.js +28 -3
  18. package/build/src/start/doctor/dependencies/validateDependenciesVersions.js.map +1 -1
  19. package/build/src/start/server/DevToolsPlugin.js +26 -1
  20. package/build/src/start/server/DevToolsPlugin.js.map +1 -1
  21. package/build/src/start/server/DevToolsPluginCliExtensionExecutor.js +57 -22
  22. package/build/src/start/server/DevToolsPluginCliExtensionExecutor.js.map +1 -1
  23. package/build/src/start/server/DevToolsPluginCliExtensionResults.js +29 -0
  24. package/build/src/start/server/DevToolsPluginCliExtensionResults.js.map +1 -1
  25. package/build/src/start/server/MCPDevToolsPluginCLIExtensions.js +15 -5
  26. package/build/src/start/server/MCPDevToolsPluginCLIExtensions.js.map +1 -1
  27. package/build/src/start/server/UrlCreator.js +4 -0
  28. package/build/src/start/server/UrlCreator.js.map +1 -1
  29. package/build/src/start/server/createMCPDevToolsExtensionSchema.js +13 -1
  30. package/build/src/start/server/createMCPDevToolsExtensionSchema.js.map +1 -1
  31. package/build/src/start/server/metro/MetroBundlerDevServer.js +44 -0
  32. package/build/src/start/server/metro/MetroBundlerDevServer.js.map +1 -1
  33. package/build/src/start/server/metro/createServerComponentsMiddleware.js +13 -13
  34. package/build/src/start/server/metro/createServerComponentsMiddleware.js.map +1 -1
  35. package/build/src/start/server/metro/dev-server/createMessageSocket.js +13 -2
  36. package/build/src/start/server/metro/dev-server/createMessageSocket.js.map +1 -1
  37. package/build/src/start/server/metro/dev-server/createMetroMiddleware.js +2 -1
  38. package/build/src/start/server/metro/dev-server/createMetroMiddleware.js.map +1 -1
  39. package/build/src/start/server/metro/instantiateMetro.js +5 -4
  40. package/build/src/start/server/metro/instantiateMetro.js.map +1 -1
  41. package/build/src/start/server/metro/router.js +10 -1
  42. package/build/src/start/server/metro/router.js.map +1 -1
  43. package/build/src/start/server/middleware/OpenMiddleware.js +150 -0
  44. package/build/src/start/server/middleware/OpenMiddleware.js.map +1 -0
  45. package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js +13 -4
  46. package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js.map +1 -1
  47. package/build/src/start/server/middleware/ServeStaticMiddleware.js +2 -9
  48. package/build/src/start/server/middleware/ServeStaticMiddleware.js.map +1 -1
  49. package/build/src/start/server/middleware/openHandlers.js +157 -0
  50. package/build/src/start/server/middleware/openHandlers.js.map +1 -0
  51. package/build/src/start/server/webTemplate.js +3 -5
  52. package/build/src/start/server/webTemplate.js.map +1 -1
  53. package/build/src/utils/net.js +7 -1
  54. package/build/src/utils/net.js.map +1 -1
  55. package/build/src/utils/tar.js +2 -2
  56. package/build/src/utils/tar.js.map +1 -1
  57. package/build/src/utils/telemetry/clients/FetchClient.js +1 -1
  58. package/build/src/utils/telemetry/utils/context.js +1 -1
  59. package/package.json +14 -14
@@ -17,6 +17,9 @@ function _configplugins() {
17
17
  }
18
18
  const _AndroidAppIdResolver = require("../../start/platforms/android/AndroidAppIdResolver");
19
19
  const _errors = require("../../utils/errors");
20
+ function resolveCustomLaunchActivity(packageName, mainActivity) {
21
+ return mainActivity.startsWith('.') ? `${packageName}${mainActivity}` : mainActivity;
22
+ }
20
23
  async function getMainActivityAsync(projectRoot) {
21
24
  const filePath = await _configplugins().AndroidConfig.Paths.getAndroidManifestAsync(projectRoot);
22
25
  const androidManifest = await _configplugins().AndroidConfig.Manifest.readAndroidManifestAsync(filePath);
@@ -34,7 +37,7 @@ async function resolveLaunchPropsAsync(projectRoot, options) {
34
37
  const mainActivity = await getMainActivityAsync(projectRoot);
35
38
  const packageName = await new _AndroidAppIdResolver.AndroidAppIdResolver(projectRoot).getAppIdFromNativeAsync();
36
39
  const customAppId = options.appId;
37
- const launchActivity = customAppId && customAppId !== packageName ? `${customAppId}/${packageName}${mainActivity}` : `${packageName}/${mainActivity}`;
40
+ const launchActivity = customAppId && customAppId !== packageName ? `${customAppId}/${resolveCustomLaunchActivity(packageName, mainActivity)}` : `${packageName}/${mainActivity}`;
38
41
  return {
39
42
  mainActivity,
40
43
  launchActivity,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/run/android/resolveLaunchProps.ts"],"sourcesContent":["import { AndroidConfig } from '@expo/config-plugins';\n\nimport { AndroidAppIdResolver } from '../../start/platforms/android/AndroidAppIdResolver';\nimport { CommandError } from '../../utils/errors';\n\nexport interface LaunchProps {\n /**\n * The \"common\" Android package name, configured through the app manifest.\n * @see https://source.android.com/docs/core/architecture/hidl/code-style#package-names\n */\n packageName: string;\n /**\n * Optional customized application ID, used in product flavors.\n * @see https://developer.android.com/build/build-variants#change-app-id\n */\n customAppId?: string;\n /**\n * The main activity to launch, by default this is `.MainActivity`.\n * @see https://github.com/expo/expo/blob/c0aec226a43c0f186258a063a6145c3e52246f8a/templates/expo-template-bare-minimum/android/app/src/main/AndroidManifest.xml#L22\n */\n mainActivity: string;\n /**\n * The full launch activity reference used in the app intent to launch the app with `adb am start -n <launchActivity>`.\n * Usually, this is structured as `<package-name>/.<activity-name>`.\n * For product flavors, this is structured as `<custom-app-id>/<package-name>.<activity-name>`.\n * @see https://developer.android.com/studio/command-line/adb#IntentSpec\n */\n launchActivity: string;\n}\n\nasync function getMainActivityAsync(projectRoot: string): Promise<string> {\n const filePath = await AndroidConfig.Paths.getAndroidManifestAsync(projectRoot);\n const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(filePath);\n const runnableActivity = AndroidConfig.Manifest.getRunnableActivity(androidManifest);\n if (runnableActivity) {\n return runnableActivity.$['android:name'];\n }\n const mainActivity = AndroidConfig.Manifest.getMainActivity(androidManifest);\n if (!mainActivity) {\n throw new CommandError(\n 'ANDROID_MALFORMED',\n `${filePath} is missing a runnable activity element.`\n );\n }\n return mainActivity.$['android:name'];\n}\n\nexport async function resolveLaunchPropsAsync(\n projectRoot: string,\n options: { appId?: string }\n): Promise<LaunchProps> {\n const mainActivity = await getMainActivityAsync(projectRoot);\n const packageName = await new AndroidAppIdResolver(projectRoot).getAppIdFromNativeAsync();\n const customAppId = options.appId;\n\n const launchActivity =\n customAppId && customAppId !== packageName\n ? `${customAppId}/${packageName}${mainActivity}`\n : `${packageName}/${mainActivity}`;\n\n return {\n mainActivity,\n launchActivity,\n packageName,\n customAppId,\n };\n}\n"],"names":["resolveLaunchPropsAsync","getMainActivityAsync","projectRoot","filePath","AndroidConfig","Paths","getAndroidManifestAsync","androidManifest","Manifest","readAndroidManifestAsync","runnableActivity","getRunnableActivity","$","mainActivity","getMainActivity","CommandError","options","packageName","AndroidAppIdResolver","getAppIdFromNativeAsync","customAppId","appId","launchActivity"],"mappings":";;;;+BA+CsBA;;;eAAAA;;;;yBA/CQ;;;;;;sCAEO;wBACR;AA2B7B,eAAeC,qBAAqBC,WAAmB;IACrD,MAAMC,WAAW,MAAMC,8BAAa,CAACC,KAAK,CAACC,uBAAuB,CAACJ;IACnE,MAAMK,kBAAkB,MAAMH,8BAAa,CAACI,QAAQ,CAACC,wBAAwB,CAACN;IAC9E,MAAMO,mBAAmBN,8BAAa,CAACI,QAAQ,CAACG,mBAAmB,CAACJ;IACpE,IAAIG,kBAAkB;QACpB,OAAOA,iBAAiBE,CAAC,CAAC,eAAe;IAC3C;IACA,MAAMC,eAAeT,8BAAa,CAACI,QAAQ,CAACM,eAAe,CAACP;IAC5D,IAAI,CAACM,cAAc;QACjB,MAAM,IAAIE,oBAAY,CACpB,qBACA,GAAGZ,SAAS,wCAAwC,CAAC;IAEzD;IACA,OAAOU,aAAaD,CAAC,CAAC,eAAe;AACvC;AAEO,eAAeZ,wBACpBE,WAAmB,EACnBc,OAA2B;IAE3B,MAAMH,eAAe,MAAMZ,qBAAqBC;IAChD,MAAMe,cAAc,MAAM,IAAIC,0CAAoB,CAAChB,aAAaiB,uBAAuB;IACvF,MAAMC,cAAcJ,QAAQK,KAAK;IAEjC,MAAMC,iBACJF,eAAeA,gBAAgBH,cAC3B,GAAGG,YAAY,CAAC,EAAEH,cAAcJ,cAAc,GAC9C,GAAGI,YAAY,CAAC,EAAEJ,cAAc;IAEtC,OAAO;QACLA;QACAS;QACAL;QACAG;IACF;AACF"}
1
+ {"version":3,"sources":["../../../../src/run/android/resolveLaunchProps.ts"],"sourcesContent":["import { AndroidConfig } from '@expo/config-plugins';\n\nimport { AndroidAppIdResolver } from '../../start/platforms/android/AndroidAppIdResolver';\nimport { CommandError } from '../../utils/errors';\n\nexport interface LaunchProps {\n /**\n * The \"common\" Android package name, configured through the app manifest.\n * @see https://source.android.com/docs/core/architecture/hidl/code-style#package-names\n */\n packageName: string;\n /**\n * Optional customized application ID, used in product flavors.\n * @see https://developer.android.com/build/build-variants#change-app-id\n */\n customAppId?: string;\n /**\n * The main activity to launch, by default this is `.MainActivity`.\n * @see https://github.com/expo/expo/blob/c0aec226a43c0f186258a063a6145c3e52246f8a/templates/expo-template-bare-minimum/android/app/src/main/AndroidManifest.xml#L22\n */\n mainActivity: string;\n /**\n * The full launch activity reference used in the app intent to launch the app with `adb am start -n <launchActivity>`.\n * Usually, this is structured as `<package-name>/.<activity-name>`.\n * For product flavors, this is structured as `<custom-app-id>/<package-name>.<activity-name>`.\n * @see https://developer.android.com/studio/command-line/adb#IntentSpec\n */\n launchActivity: string;\n}\n\nfunction resolveCustomLaunchActivity(packageName: string, mainActivity: string): string {\n return mainActivity.startsWith('.') ? `${packageName}${mainActivity}` : mainActivity;\n}\n\nasync function getMainActivityAsync(projectRoot: string): Promise<string> {\n const filePath = await AndroidConfig.Paths.getAndroidManifestAsync(projectRoot);\n const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(filePath);\n const runnableActivity = AndroidConfig.Manifest.getRunnableActivity(androidManifest);\n if (runnableActivity) {\n return runnableActivity.$['android:name'];\n }\n const mainActivity = AndroidConfig.Manifest.getMainActivity(androidManifest);\n if (!mainActivity) {\n throw new CommandError(\n 'ANDROID_MALFORMED',\n `${filePath} is missing a runnable activity element.`\n );\n }\n return mainActivity.$['android:name'];\n}\n\nexport async function resolveLaunchPropsAsync(\n projectRoot: string,\n options: { appId?: string }\n): Promise<LaunchProps> {\n const mainActivity = await getMainActivityAsync(projectRoot);\n const packageName = await new AndroidAppIdResolver(projectRoot).getAppIdFromNativeAsync();\n const customAppId = options.appId;\n\n const launchActivity =\n customAppId && customAppId !== packageName\n ? `${customAppId}/${resolveCustomLaunchActivity(packageName, mainActivity)}`\n : `${packageName}/${mainActivity}`;\n\n return {\n mainActivity,\n launchActivity,\n packageName,\n customAppId,\n };\n}\n"],"names":["resolveLaunchPropsAsync","resolveCustomLaunchActivity","packageName","mainActivity","startsWith","getMainActivityAsync","projectRoot","filePath","AndroidConfig","Paths","getAndroidManifestAsync","androidManifest","Manifest","readAndroidManifestAsync","runnableActivity","getRunnableActivity","$","getMainActivity","CommandError","options","AndroidAppIdResolver","getAppIdFromNativeAsync","customAppId","appId","launchActivity"],"mappings":";;;;+BAmDsBA;;;eAAAA;;;;yBAnDQ;;;;;;sCAEO;wBACR;AA2B7B,SAASC,4BAA4BC,WAAmB,EAAEC,YAAoB;IAC5E,OAAOA,aAAaC,UAAU,CAAC,OAAO,GAAGF,cAAcC,cAAc,GAAGA;AAC1E;AAEA,eAAeE,qBAAqBC,WAAmB;IACrD,MAAMC,WAAW,MAAMC,8BAAa,CAACC,KAAK,CAACC,uBAAuB,CAACJ;IACnE,MAAMK,kBAAkB,MAAMH,8BAAa,CAACI,QAAQ,CAACC,wBAAwB,CAACN;IAC9E,MAAMO,mBAAmBN,8BAAa,CAACI,QAAQ,CAACG,mBAAmB,CAACJ;IACpE,IAAIG,kBAAkB;QACpB,OAAOA,iBAAiBE,CAAC,CAAC,eAAe;IAC3C;IACA,MAAMb,eAAeK,8BAAa,CAACI,QAAQ,CAACK,eAAe,CAACN;IAC5D,IAAI,CAACR,cAAc;QACjB,MAAM,IAAIe,oBAAY,CACpB,qBACA,GAAGX,SAAS,wCAAwC,CAAC;IAEzD;IACA,OAAOJ,aAAaa,CAAC,CAAC,eAAe;AACvC;AAEO,eAAehB,wBACpBM,WAAmB,EACnBa,OAA2B;IAE3B,MAAMhB,eAAe,MAAME,qBAAqBC;IAChD,MAAMJ,cAAc,MAAM,IAAIkB,0CAAoB,CAACd,aAAae,uBAAuB;IACvF,MAAMC,cAAcH,QAAQI,KAAK;IAEjC,MAAMC,iBACJF,eAAeA,gBAAgBpB,cAC3B,GAAGoB,YAAY,CAAC,EAAErB,4BAA4BC,aAAaC,eAAe,GAC1E,GAAGD,YAAY,CAAC,EAAEC,cAAc;IAEtC,OAAO;QACLA;QACAqB;QACAtB;QACAoB;IACF;AACF"}
@@ -0,0 +1,149 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ function _export(target, all) {
6
+ for(var name in all)Object.defineProperty(target, name, {
7
+ enumerable: true,
8
+ get: Object.getOwnPropertyDescriptor(all, name).get
9
+ });
10
+ }
11
+ _export(exports, {
12
+ get REACT_NATIVE_TVOS_PACKAGE_NAME () {
13
+ return REACT_NATIVE_TVOS_PACKAGE_NAME;
14
+ },
15
+ get correctReactNativeTvVersion () {
16
+ return correctReactNativeTvVersion;
17
+ },
18
+ get isReactNativeTvProjectAsync () {
19
+ return isReactNativeTvProjectAsync;
20
+ },
21
+ get reactNativeTvVersionMatchesBundled () {
22
+ return reactNativeTvVersionMatchesBundled;
23
+ }
24
+ });
25
+ function _jsonfile() {
26
+ const data = /*#__PURE__*/ _interop_require_default(require("@expo/json-file"));
27
+ _jsonfile = function() {
28
+ return data;
29
+ };
30
+ return data;
31
+ }
32
+ function _requireutils() {
33
+ const data = require("@expo/require-utils");
34
+ _requireutils = function() {
35
+ return data;
36
+ };
37
+ return data;
38
+ }
39
+ function _semver() {
40
+ const data = /*#__PURE__*/ _interop_require_default(require("semver"));
41
+ _semver = function() {
42
+ return data;
43
+ };
44
+ return data;
45
+ }
46
+ const _env = require("../../../utils/env");
47
+ const _fetch = require("../../../utils/fetch");
48
+ function _interop_require_default(obj) {
49
+ return obj && obj.__esModule ? obj : {
50
+ default: obj
51
+ };
52
+ }
53
+ const REACT_NATIVE_TVOS_PACKAGE_NAME = 'react-native-tvos';
54
+ const debug = require('debug')('expo:doctor:reactNativeTv');
55
+ const NPM_DIST_TAGS_URL = `https://registry.npmjs.org/-/package/${REACT_NATIVE_TVOS_PACKAGE_NAME}/dist-tags`;
56
+ const LATEST_FALLBACK_SPEC = `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@latest`;
57
+ async function isReactNativeTvProjectAsync(projectRoot) {
58
+ const reactNativePackageJsonPath = (0, _requireutils().resolveFrom)(projectRoot, 'react-native/package.json');
59
+ if (!reactNativePackageJsonPath) {
60
+ return false;
61
+ }
62
+ try {
63
+ const installedPkg = await _jsonfile().default.readAsync(reactNativePackageJsonPath);
64
+ return installedPkg.name === REACT_NATIVE_TVOS_PACKAGE_NAME;
65
+ } catch {
66
+ return false;
67
+ }
68
+ }
69
+ async function correctReactNativeTvVersion(bundledReactNativeVersion) {
70
+ const derivedTag = deriveDistTag(bundledReactNativeVersion);
71
+ if (!derivedTag) {
72
+ debug(`Could not derive a react-native-tvos dist-tag from "${bundledReactNativeVersion}"; falling back to @latest`);
73
+ return LATEST_FALLBACK_SPEC;
74
+ }
75
+ // In offline mode skip the npm dist-tags lookup and trust the derived tag —
76
+ // any other CLI code path that needs a network request also bails on
77
+ // `EXPO_OFFLINE` (see `validateDependenciesVersionsAsync`).
78
+ if (_env.env.EXPO_OFFLINE) {
79
+ debug(`EXPO_OFFLINE is set; skipping npm dist-tags lookup for react-native-tvos`);
80
+ return `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@${derivedTag}`;
81
+ }
82
+ const publishedTags = await fetchReactNativeTvDistTagsAsync();
83
+ if (publishedTags.has(derivedTag)) {
84
+ return `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@${derivedTag}`;
85
+ }
86
+ debug(`Derived react-native-tvos dist-tag "${derivedTag}" is not published; falling back to @latest`);
87
+ return LATEST_FALLBACK_SPEC;
88
+ }
89
+ function reactNativeTvVersionMatchesBundled(actualVersion, bundledReactNativeVersion) {
90
+ const actual = _semver().default.coerce(actualVersion);
91
+ const bundled = _semver().default.coerce(bundledReactNativeVersion);
92
+ if (!actual || !bundled) {
93
+ return false;
94
+ }
95
+ return actual.major === bundled.major && actual.minor === bundled.minor;
96
+ }
97
+ function deriveDistTag(reactNativeVersion) {
98
+ if (!reactNativeVersion) {
99
+ return undefined;
100
+ }
101
+ let minVersion = null;
102
+ try {
103
+ minVersion = _semver().default.minVersion(reactNativeVersion);
104
+ } catch {
105
+ minVersion = null;
106
+ }
107
+ if (!minVersion) {
108
+ return undefined;
109
+ }
110
+ if (minVersion.prerelease.length > 0) {
111
+ return 'next';
112
+ }
113
+ return `${minVersion.major}.${minVersion.minor}-stable`;
114
+ }
115
+ async function fetchReactNativeTvDistTagsAsync() {
116
+ let response;
117
+ try {
118
+ response = await (0, _fetch.fetch)(NPM_DIST_TAGS_URL);
119
+ } catch (error) {
120
+ debug(`npm dist-tags lookup threw: ${(error == null ? void 0 : error.message) ?? error}`);
121
+ return new Set();
122
+ }
123
+ // Always read the body to release the underlying stream — even on a non-2xx —
124
+ // before deciding what to do with it. Parse JSON manually so a malformed
125
+ // body never escapes as a rejected promise.
126
+ let body = '';
127
+ try {
128
+ body = await response.text();
129
+ } catch (error) {
130
+ debug(`npm dist-tags body read threw: ${(error == null ? void 0 : error.message) ?? error}`);
131
+ return new Set();
132
+ }
133
+ if (!response.ok) {
134
+ debug(`npm dist-tags lookup failed with status ${response.status}`);
135
+ return new Set();
136
+ }
137
+ let json;
138
+ try {
139
+ json = JSON.parse(body);
140
+ } catch {
141
+ return new Set();
142
+ }
143
+ if (!json || typeof json !== 'object') {
144
+ return new Set();
145
+ }
146
+ return new Set(Object.keys(json));
147
+ }
148
+
149
+ //# sourceMappingURL=reactNativeTv.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../../../src/start/doctor/dependencies/reactNativeTv.ts"],"sourcesContent":["import JsonFile from '@expo/json-file';\nimport { resolveFrom } from '@expo/require-utils';\nimport semver from 'semver';\n\nimport { env } from '../../../utils/env';\nimport { fetch } from '../../../utils/fetch';\n\nexport const REACT_NATIVE_TVOS_PACKAGE_NAME = 'react-native-tvos';\n\nconst debug = require('debug')('expo:doctor:reactNativeTv') as typeof console.log;\n\nconst NPM_DIST_TAGS_URL = `https://registry.npmjs.org/-/package/${REACT_NATIVE_TVOS_PACKAGE_NAME}/dist-tags`;\n\nconst LATEST_FALLBACK_SPEC = `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@latest`;\n\n/**\n * Detects whether this is a TV project by inspecting the installed\n * `react-native` package's `name` field. When the project's `package.json`\n * aliases `react-native` to `react-native-tvos` (e.g.\n * `\"react-native\": \"npm:react-native-tvos@0.83.0-0\"`), the installed package\n * at `node_modules/react-native/package.json` is the upstream\n * `react-native-tvos` manifest, whose `name` is `\"react-native-tvos\"`.\n *\n * Reading the installed manifest is more reliable than reading the project's\n * `package.json` spec string, which can vary across package managers and\n * lockfile rewrites.\n */\nexport async function isReactNativeTvProjectAsync(projectRoot: string): Promise<boolean> {\n const reactNativePackageJsonPath = resolveFrom(projectRoot, 'react-native/package.json');\n if (!reactNativePackageJsonPath) {\n return false;\n }\n try {\n const installedPkg = await JsonFile.readAsync<{ name?: string }>(reactNativePackageJsonPath);\n return installedPkg.name === REACT_NATIVE_TVOS_PACKAGE_NAME;\n } catch {\n return false;\n }\n}\n\n/**\n * Returns the install spec to use for `react-native-tvos` given the bundled\n * `react-native` version.\n *\n * `react-native-tvos` ships a dist-tag per minor line in the form\n * `<major>.<minor>-stable` and a rolling `next` tag for prereleases. We derive\n * the expected tag from the bundled `react-native` version (stable → `-stable`,\n * prerelease → `next`) and then verify the tag is actually published by\n * fetching the package's `dist-tags` from the npm registry. If the derived tag\n * isn't published (or the registry can't be reached), we fall back to\n * `npm:react-native-tvos@latest` so the install still resolves to something\n * usable.\n */\nexport async function correctReactNativeTvVersion(\n bundledReactNativeVersion: string\n): Promise<string> {\n const derivedTag = deriveDistTag(bundledReactNativeVersion);\n if (!derivedTag) {\n debug(\n `Could not derive a react-native-tvos dist-tag from \"${bundledReactNativeVersion}\"; falling back to @latest`\n );\n return LATEST_FALLBACK_SPEC;\n }\n // In offline mode skip the npm dist-tags lookup and trust the derived tag —\n // any other CLI code path that needs a network request also bails on\n // `EXPO_OFFLINE` (see `validateDependenciesVersionsAsync`).\n if (env.EXPO_OFFLINE) {\n debug(`EXPO_OFFLINE is set; skipping npm dist-tags lookup for react-native-tvos`);\n return `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@${derivedTag}`;\n }\n const publishedTags = await fetchReactNativeTvDistTagsAsync();\n if (publishedTags.has(derivedTag)) {\n return `npm:${REACT_NATIVE_TVOS_PACKAGE_NAME}@${derivedTag}`;\n }\n debug(\n `Derived react-native-tvos dist-tag \"${derivedTag}\" is not published; falling back to @latest`\n );\n return LATEST_FALLBACK_SPEC;\n}\n\n/**\n * Returns true when an installed `react-native` (aliased to `react-native-tvos`)\n * version's `major.minor` lines up with the expected bundled `react-native`\n * version. `react-native-tvos` releases follow the upstream minor versions, so a\n * matching `major.minor` means the TV variant is already current.\n */\nexport function reactNativeTvVersionMatchesBundled(\n actualVersion: string,\n bundledReactNativeVersion: string\n): boolean {\n const actual = semver.coerce(actualVersion);\n const bundled = semver.coerce(bundledReactNativeVersion);\n if (!actual || !bundled) {\n return false;\n }\n return actual.major === bundled.major && actual.minor === bundled.minor;\n}\n\nfunction deriveDistTag(reactNativeVersion: string): string | undefined {\n if (!reactNativeVersion) {\n return undefined;\n }\n let minVersion: semver.SemVer | null = null;\n try {\n minVersion = semver.minVersion(reactNativeVersion);\n } catch {\n minVersion = null;\n }\n if (!minVersion) {\n return undefined;\n }\n if (minVersion.prerelease.length > 0) {\n return 'next';\n }\n return `${minVersion.major}.${minVersion.minor}-stable`;\n}\n\nasync function fetchReactNativeTvDistTagsAsync(): Promise<Set<string>> {\n let response;\n try {\n response = await fetch(NPM_DIST_TAGS_URL);\n } catch (error: any) {\n debug(`npm dist-tags lookup threw: ${error?.message ?? error}`);\n return new Set();\n }\n // Always read the body to release the underlying stream — even on a non-2xx —\n // before deciding what to do with it. Parse JSON manually so a malformed\n // body never escapes as a rejected promise.\n let body = '';\n try {\n body = await response.text();\n } catch (error: any) {\n debug(`npm dist-tags body read threw: ${error?.message ?? error}`);\n return new Set();\n }\n if (!response.ok) {\n debug(`npm dist-tags lookup failed with status ${response.status}`);\n return new Set();\n }\n let json: unknown;\n try {\n json = JSON.parse(body);\n } catch {\n return new Set();\n }\n if (!json || typeof json !== 'object') {\n return new Set();\n }\n return new Set(Object.keys(json as Record<string, unknown>));\n}\n"],"names":["REACT_NATIVE_TVOS_PACKAGE_NAME","correctReactNativeTvVersion","isReactNativeTvProjectAsync","reactNativeTvVersionMatchesBundled","debug","require","NPM_DIST_TAGS_URL","LATEST_FALLBACK_SPEC","projectRoot","reactNativePackageJsonPath","resolveFrom","installedPkg","JsonFile","readAsync","name","bundledReactNativeVersion","derivedTag","deriveDistTag","env","EXPO_OFFLINE","publishedTags","fetchReactNativeTvDistTagsAsync","has","actualVersion","actual","semver","coerce","bundled","major","minor","reactNativeVersion","undefined","minVersion","prerelease","length","response","fetch","error","message","Set","body","text","ok","status","json","JSON","parse","Object","keys"],"mappings":"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"}
@@ -58,6 +58,7 @@ function _subset() {
58
58
  return data;
59
59
  }
60
60
  const _getVersionedPackages = require("./getVersionedPackages");
61
+ const _reactNativeTv = require("./reactNativeTv");
61
62
  const _resolvePackages = require("./resolvePackages");
62
63
  const _log = /*#__PURE__*/ _interop_require_wildcard(require("../../../log"));
63
64
  const _env = require("../../../utils/env");
@@ -157,8 +158,12 @@ async function getVersionedDependenciesAsync(projectRoot, exp, pkg, packagesToCh
157
158
  // read package versions from the file system (node_modules)
158
159
  const packageVersions = await (0, _resolvePackages.resolveAllPackageVersionsAsync)(projectRoot, resolvedPackagesToCheck);
159
160
  debug(`Package versions: %O`, packageVersions);
161
+ // Detect TV projects via the installed `react-native` package's `name`, since
162
+ // `pkg.dependencies['react-native']` can vary across package managers.
163
+ const isReactNativeTvProject = await (0, _reactNativeTv.isReactNativeTvProjectAsync)(projectRoot);
164
+ debug(`react-native-tvos project: %O`, isReactNativeTvProject);
160
165
  // find incorrect dependencies by comparing the actual package versions with the bundled native module version ranges
161
- let incorrectDeps = findIncorrectDependencies(pkg, packageVersions, combinedKnownPackages);
166
+ let incorrectDeps = await findIncorrectDependencies(pkg, packageVersions, combinedKnownPackages, isReactNativeTvProject);
162
167
  debug(`Incorrect dependencies: %O`, incorrectDeps);
163
168
  if (pkg == null ? void 0 : (_pkg_expo = pkg.expo) == null ? void 0 : (_pkg_expo_install = _pkg_expo.install) == null ? void 0 : _pkg_expo_install.exclude) {
164
169
  const packagesToExclude = pkg.expo.install.exclude;
@@ -221,12 +226,32 @@ function getPackagesToCheck(bundledNativeModules, dependencies) {
221
226
  unknown
222
227
  };
223
228
  }
224
- function findIncorrectDependencies(pkg, packageVersions, bundledNativeModules) {
229
+ async function findIncorrectDependencies(pkg, packageVersions, bundledNativeModules, isReactNativeTvProject) {
230
+ // For TV projects, compare the installed `major.minor` against the bundled
231
+ // `react-native` `major.minor` — `react-native-tvos` follows the upstream
232
+ // minor lines via a `<major>.<minor>-stable` dist-tag, so a matching minor
233
+ // means the TV variant is up to date.
234
+ //
235
+ // Resolve the install spec for the TV variant once up front so the inner
236
+ // loop stays synchronous and we don't hit the npm registry per dependency.
237
+ const bundledReactNativeVersion = bundledNativeModules['react-native'];
238
+ const reactNativeTvExpectedVersionOrRange = isReactNativeTvProject && bundledReactNativeVersion ? await (0, _reactNativeTv.correctReactNativeTvVersion)(bundledReactNativeVersion) : undefined;
225
239
  const packages = Object.keys(packageVersions);
226
240
  const incorrectDeps = [];
227
241
  for (const packageName of packages){
228
- const expectedVersionOrRange = bundledNativeModules[packageName];
229
242
  const actualVersion = packageVersions[packageName];
243
+ if (isReactNativeTvProject && packageName === 'react-native') {
244
+ if (bundledReactNativeVersion && reactNativeTvExpectedVersionOrRange && !(0, _reactNativeTv.reactNativeTvVersionMatchesBundled)(actualVersion, bundledReactNativeVersion)) {
245
+ incorrectDeps.push({
246
+ packageName,
247
+ packageType: findDependencyType(pkg, packageName),
248
+ expectedVersionOrRange: reactNativeTvExpectedVersionOrRange,
249
+ actualVersion
250
+ });
251
+ }
252
+ continue;
253
+ }
254
+ const expectedVersionOrRange = bundledNativeModules[packageName];
230
255
  if (isDependencyVersionIncorrect(packageName, actualVersion, expectedVersionOrRange)) {
231
256
  incorrectDeps.push({
232
257
  packageName,
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../src/start/doctor/dependencies/validateDependenciesVersions.ts"],"sourcesContent":["import type { ExpoConfig, PackageJSONConfig } from '@expo/config';\nimport assert from 'assert';\nimport chalk from 'chalk';\nimport npmPackageArg from 'npm-package-arg';\nimport semver from 'semver';\nimport semverRangeSubset from 'semver/ranges/subset';\n\nimport type { BundledNativeModules } from './bundledNativeModules';\nimport { getCombinedKnownVersionsAsync } from './getVersionedPackages';\nimport { resolveAllPackageVersionsAsync } from './resolvePackages';\nimport * as Log from '../../../log';\nimport { env } from '../../../utils/env';\n\nconst debug = require('debug')('expo:doctor:dependencies:validate') as typeof console.log;\n\ntype IncorrectDependency = {\n packageName: string;\n packageType: 'dependencies' | 'devDependencies';\n expectedVersionOrRange: string;\n actualVersion: string;\n};\n\ntype DependenciesToCheck = { known: string[]; unknown: string[] };\n\n/**\n * Print a list of incorrect dependency versions.\n * This only checks dependencies when not running in offline mode.\n *\n * @param projectRoot Expo project root.\n * @param exp Expo project config.\n * @param pkg Project's `package.json`.\n * @param packagesToCheck A list of packages to check, if undefined or empty, all will be checked.\n * @returns `true` if there are no incorrect dependencies.\n */\nexport async function validateDependenciesVersionsAsync(\n projectRoot: string,\n exp: Pick<ExpoConfig, 'sdkVersion'>,\n pkg: PackageJSONConfig,\n packagesToCheck?: string[]\n): Promise<boolean | null> {\n if (env.EXPO_OFFLINE) {\n Log.warn('Skipping dependency validation in offline mode');\n return null;\n } else if (env.EXPO_NO_DEPENDENCY_VALIDATION) {\n debug('Dependency validation is disabled through EXPO_NO_DEPENDENCY_VALIDATION=1');\n return null;\n }\n\n const incorrectDeps = await getVersionedDependenciesAsync(projectRoot, exp, pkg, packagesToCheck);\n return logIncorrectDependencies(incorrectDeps);\n}\n\nfunction logInvalidDependency({\n packageName,\n expectedVersionOrRange,\n actualVersion,\n}: IncorrectDependency) {\n Log.warn(\n chalk` {bold ${packageName}}{cyan @}{red ${actualVersion}} - expected version: {green ${expectedVersionOrRange}}`\n );\n}\n\nexport function logIncorrectDependencies(incorrectDeps: IncorrectDependency[]) {\n if (!incorrectDeps.length) {\n return true;\n }\n\n Log.warn(\n chalk`The following packages should be updated for best compatibility with the installed {bold expo} version:`\n );\n incorrectDeps.forEach((dep) => logInvalidDependency(dep));\n\n Log.warn(\n 'Your project may not work correctly until you install the expected versions of the packages.'\n );\n\n return false;\n}\n\n/**\n * Return a list of versioned dependencies for the project SDK version.\n *\n * @param projectRoot Expo project root.\n * @param exp Expo project config.\n * @param pkg Project's `package.json`.\n * @param packagesToCheck A list of packages to check, if undefined or empty, all will be checked.\n * @returns A list of incorrect dependencies.\n */\nexport async function getVersionedDependenciesAsync(\n projectRoot: string,\n exp: Pick<ExpoConfig, 'sdkVersion'>,\n pkg: PackageJSONConfig,\n packagesToCheck?: string[]\n): Promise<IncorrectDependency[]> {\n // This should never happen under normal circumstances since\n // the CLI is versioned in the `expo` package.\n assert(exp.sdkVersion, 'SDK Version is missing');\n\n // Get from both endpoints and combine the known package versions.\n const combinedKnownPackages = await getCombinedKnownVersionsAsync({\n projectRoot,\n sdkVersion: exp.sdkVersion,\n });\n // debug(`Known dependencies: %O`, combinedKnownPackages);\n\n const resolvedDependencies = packagesToCheck?.length\n ? // Diff the provided packages to ensure we only check against installed packages.\n getFilteredObject(packagesToCheck, { ...pkg.dependencies, ...pkg.devDependencies })\n : // If no packages are provided, check against the `package.json` `dependencies` + `devDependencies` object.\n { ...pkg.dependencies, ...pkg.devDependencies };\n debug(`Checking dependencies for ${exp.sdkVersion}: %O`, resolvedDependencies);\n\n // intersection of packages from package.json and bundled native modules\n const { known: resolvedPackagesToCheck, unknown } = getPackagesToCheck(\n combinedKnownPackages,\n resolvedDependencies\n );\n debug(`Comparing known versions: %O`, resolvedPackagesToCheck);\n debug(`Skipping packages that cannot be versioned automatically: %O`, unknown);\n // read package versions from the file system (node_modules)\n const packageVersions = await resolveAllPackageVersionsAsync(\n projectRoot,\n resolvedPackagesToCheck\n );\n debug(`Package versions: %O`, packageVersions);\n // find incorrect dependencies by comparing the actual package versions with the bundled native module version ranges\n let incorrectDeps = findIncorrectDependencies(pkg, packageVersions, combinedKnownPackages);\n debug(`Incorrect dependencies: %O`, incorrectDeps);\n\n if (pkg?.expo?.install?.exclude) {\n const packagesToExclude = pkg.expo.install.exclude;\n\n // Parse the exclude list to ensure we can factor in any specified version ranges\n const parsedPackagesToExclude = packagesToExclude.reduce(\n (acc: Record<string, npmPackageArg.Result>, packageName: string) => {\n const npaResult = npmPackageArg(packageName);\n if (typeof npaResult.name === 'string') {\n acc[npaResult.name] = npaResult;\n } else {\n acc[packageName] = npaResult;\n }\n return acc;\n },\n {}\n );\n\n const incorrectAndExcludedDeps = incorrectDeps\n .filter((dep) => {\n if (parsedPackagesToExclude[dep.packageName]) {\n const { name, raw, rawSpec, type } = parsedPackagesToExclude[dep.packageName];\n const suggestedRange = combinedKnownPackages[name]!;\n\n // If only the package name itself is specified, then we keep it in the exclude list\n if (name === raw) {\n return true;\n } else if (type === 'version') {\n return suggestedRange === rawSpec;\n } else if (type === 'range') {\n // Fall through exclusions if the suggested range is invalid\n if (!semver.validRange(suggestedRange)) {\n debug(\n `Invalid semver range in combined known packages for package ${name} in expo.install.exclude: %O`,\n suggestedRange\n );\n return false;\n }\n\n return semverRangeSubset(suggestedRange, rawSpec);\n } else {\n debug(\n `Unsupported npm package argument type for package ${name} in expo.install.exclude: %O`,\n type\n );\n }\n }\n\n return false;\n })\n .map((dep) => dep.packageName);\n\n debug(\n `Incorrect dependency warnings filtered out by expo.install.exclude: %O`,\n incorrectAndExcludedDeps\n );\n incorrectDeps = incorrectDeps.filter(\n (dep) => !incorrectAndExcludedDeps.includes(dep.packageName)\n );\n }\n\n return incorrectDeps;\n}\n\nfunction getFilteredObject(keys: string[], object: Record<string, string>) {\n return keys.reduce<Record<string, string>>((acc, key) => {\n acc[key] = object[key]!;\n return acc;\n }, {});\n}\n\nfunction getPackagesToCheck(\n bundledNativeModules: BundledNativeModules,\n dependencies?: Record<string, string> | null\n): DependenciesToCheck {\n const dependencyNames = Object.keys(dependencies ?? {});\n const known: string[] = [];\n const unknown: string[] = [];\n for (const dependencyName of dependencyNames) {\n if (dependencyName in bundledNativeModules) {\n known.push(dependencyName);\n } else {\n unknown.push(dependencyName);\n }\n }\n return { known, unknown };\n}\n\nfunction findIncorrectDependencies(\n pkg: PackageJSONConfig,\n packageVersions: Record<string, string>,\n bundledNativeModules: BundledNativeModules\n): IncorrectDependency[] {\n const packages = Object.keys(packageVersions);\n const incorrectDeps: IncorrectDependency[] = [];\n for (const packageName of packages) {\n const expectedVersionOrRange = bundledNativeModules[packageName]!;\n const actualVersion = packageVersions[packageName]!;\n if (isDependencyVersionIncorrect(packageName, actualVersion, expectedVersionOrRange)) {\n incorrectDeps.push({\n packageName,\n packageType: findDependencyType(pkg, packageName),\n expectedVersionOrRange,\n actualVersion,\n });\n }\n }\n return incorrectDeps;\n}\n\nexport function isDependencyVersionIncorrect(\n packageName: string,\n actualVersion: string,\n expectedVersionOrRange?: string\n) {\n if (!expectedVersionOrRange) {\n return false;\n }\n\n // we never want to go backwards with the expo patch version\n if (packageName === 'expo') {\n return semver.ltr(actualVersion, expectedVersionOrRange);\n }\n\n // For all other packages, check if the actual version satisfies the expected range\n const satisfies = semver.satisfies(actualVersion, expectedVersionOrRange, {\n includePrerelease: true,\n });\n\n return !satisfies;\n}\n\nfunction findDependencyType(\n pkg: PackageJSONConfig,\n packageName: string\n): IncorrectDependency['packageType'] {\n if (pkg.devDependencies && packageName in pkg.devDependencies) {\n return 'devDependencies';\n }\n\n return 'dependencies';\n}\n"],"names":["getVersionedDependenciesAsync","isDependencyVersionIncorrect","logIncorrectDependencies","validateDependenciesVersionsAsync","debug","require","projectRoot","exp","pkg","packagesToCheck","env","EXPO_OFFLINE","Log","warn","EXPO_NO_DEPENDENCY_VALIDATION","incorrectDeps","logInvalidDependency","packageName","expectedVersionOrRange","actualVersion","chalk","length","forEach","dep","assert","sdkVersion","combinedKnownPackages","getCombinedKnownVersionsAsync","resolvedDependencies","getFilteredObject","dependencies","devDependencies","known","resolvedPackagesToCheck","unknown","getPackagesToCheck","packageVersions","resolveAllPackageVersionsAsync","findIncorrectDependencies","expo","install","exclude","packagesToExclude","parsedPackagesToExclude","reduce","acc","npaResult","npmPackageArg","name","incorrectAndExcludedDeps","filter","raw","rawSpec","type","suggestedRange","semver","validRange","semverRangeSubset","map","includes","keys","object","key","bundledNativeModules","dependencyNames","Object","dependencyName","push","packages","packageType","findDependencyType","ltr","satisfies","includePrerelease"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../../../src/start/doctor/dependencies/validateDependenciesVersions.ts"],"sourcesContent":["import type { ExpoConfig, PackageJSONConfig } from '@expo/config';\nimport assert from 'assert';\nimport chalk from 'chalk';\nimport npmPackageArg from 'npm-package-arg';\nimport semver from 'semver';\nimport semverRangeSubset from 'semver/ranges/subset';\n\nimport type { BundledNativeModules } from './bundledNativeModules';\nimport { getCombinedKnownVersionsAsync } from './getVersionedPackages';\nimport {\n correctReactNativeTvVersion,\n isReactNativeTvProjectAsync,\n reactNativeTvVersionMatchesBundled,\n} from './reactNativeTv';\nimport { resolveAllPackageVersionsAsync } from './resolvePackages';\nimport * as Log from '../../../log';\nimport { env } from '../../../utils/env';\n\nconst debug = require('debug')('expo:doctor:dependencies:validate') as typeof console.log;\n\nexport type IncorrectDependency = {\n packageName: string;\n packageType: 'dependencies' | 'devDependencies';\n expectedVersionOrRange: string;\n actualVersion: string;\n};\n\ntype DependenciesToCheck = { known: string[]; unknown: string[] };\n\n/**\n * Print a list of incorrect dependency versions.\n * This only checks dependencies when not running in offline mode.\n *\n * @param projectRoot Expo project root.\n * @param exp Expo project config.\n * @param pkg Project's `package.json`.\n * @param packagesToCheck A list of packages to check, if undefined or empty, all will be checked.\n * @returns `true` if there are no incorrect dependencies.\n */\nexport async function validateDependenciesVersionsAsync(\n projectRoot: string,\n exp: Pick<ExpoConfig, 'sdkVersion'>,\n pkg: PackageJSONConfig,\n packagesToCheck?: string[]\n): Promise<boolean | null> {\n if (env.EXPO_OFFLINE) {\n Log.warn('Skipping dependency validation in offline mode');\n return null;\n } else if (env.EXPO_NO_DEPENDENCY_VALIDATION) {\n debug('Dependency validation is disabled through EXPO_NO_DEPENDENCY_VALIDATION=1');\n return null;\n }\n\n const incorrectDeps = await getVersionedDependenciesAsync(projectRoot, exp, pkg, packagesToCheck);\n return logIncorrectDependencies(incorrectDeps);\n}\n\nfunction logInvalidDependency({\n packageName,\n expectedVersionOrRange,\n actualVersion,\n}: IncorrectDependency) {\n Log.warn(\n chalk` {bold ${packageName}}{cyan @}{red ${actualVersion}} - expected version: {green ${expectedVersionOrRange}}`\n );\n}\n\nexport function logIncorrectDependencies(incorrectDeps: IncorrectDependency[]) {\n if (!incorrectDeps.length) {\n return true;\n }\n\n Log.warn(\n chalk`The following packages should be updated for best compatibility with the installed {bold expo} version:`\n );\n incorrectDeps.forEach((dep) => logInvalidDependency(dep));\n\n Log.warn(\n 'Your project may not work correctly until you install the expected versions of the packages.'\n );\n\n return false;\n}\n\n/**\n * Return a list of versioned dependencies for the project SDK version.\n *\n * @param projectRoot Expo project root.\n * @param exp Expo project config.\n * @param pkg Project's `package.json`.\n * @param packagesToCheck A list of packages to check, if undefined or empty, all will be checked.\n * @returns A list of incorrect dependencies.\n */\nexport async function getVersionedDependenciesAsync(\n projectRoot: string,\n exp: Pick<ExpoConfig, 'sdkVersion'>,\n pkg: PackageJSONConfig,\n packagesToCheck?: string[]\n): Promise<IncorrectDependency[]> {\n // This should never happen under normal circumstances since\n // the CLI is versioned in the `expo` package.\n assert(exp.sdkVersion, 'SDK Version is missing');\n\n // Get from both endpoints and combine the known package versions.\n const combinedKnownPackages = await getCombinedKnownVersionsAsync({\n projectRoot,\n sdkVersion: exp.sdkVersion,\n });\n // debug(`Known dependencies: %O`, combinedKnownPackages);\n\n const resolvedDependencies = packagesToCheck?.length\n ? // Diff the provided packages to ensure we only check against installed packages.\n getFilteredObject(packagesToCheck, { ...pkg.dependencies, ...pkg.devDependencies })\n : // If no packages are provided, check against the `package.json` `dependencies` + `devDependencies` object.\n { ...pkg.dependencies, ...pkg.devDependencies };\n debug(`Checking dependencies for ${exp.sdkVersion}: %O`, resolvedDependencies);\n\n // intersection of packages from package.json and bundled native modules\n const { known: resolvedPackagesToCheck, unknown } = getPackagesToCheck(\n combinedKnownPackages,\n resolvedDependencies\n );\n debug(`Comparing known versions: %O`, resolvedPackagesToCheck);\n debug(`Skipping packages that cannot be versioned automatically: %O`, unknown);\n // read package versions from the file system (node_modules)\n const packageVersions = await resolveAllPackageVersionsAsync(\n projectRoot,\n resolvedPackagesToCheck\n );\n debug(`Package versions: %O`, packageVersions);\n // Detect TV projects via the installed `react-native` package's `name`, since\n // `pkg.dependencies['react-native']` can vary across package managers.\n const isReactNativeTvProject = await isReactNativeTvProjectAsync(projectRoot);\n debug(`react-native-tvos project: %O`, isReactNativeTvProject);\n // find incorrect dependencies by comparing the actual package versions with the bundled native module version ranges\n let incorrectDeps = await findIncorrectDependencies(\n pkg,\n packageVersions,\n combinedKnownPackages,\n isReactNativeTvProject\n );\n debug(`Incorrect dependencies: %O`, incorrectDeps);\n\n if (pkg?.expo?.install?.exclude) {\n const packagesToExclude = pkg.expo.install.exclude;\n\n // Parse the exclude list to ensure we can factor in any specified version ranges\n const parsedPackagesToExclude = packagesToExclude.reduce(\n (acc: Record<string, npmPackageArg.Result>, packageName: string) => {\n const npaResult = npmPackageArg(packageName);\n if (typeof npaResult.name === 'string') {\n acc[npaResult.name] = npaResult;\n } else {\n acc[packageName] = npaResult;\n }\n return acc;\n },\n {}\n );\n\n const incorrectAndExcludedDeps = incorrectDeps\n .filter((dep) => {\n if (parsedPackagesToExclude[dep.packageName]) {\n const { name, raw, rawSpec, type } = parsedPackagesToExclude[dep.packageName];\n const suggestedRange = combinedKnownPackages[name]!;\n\n // If only the package name itself is specified, then we keep it in the exclude list\n if (name === raw) {\n return true;\n } else if (type === 'version') {\n return suggestedRange === rawSpec;\n } else if (type === 'range') {\n // Fall through exclusions if the suggested range is invalid\n if (!semver.validRange(suggestedRange)) {\n debug(\n `Invalid semver range in combined known packages for package ${name} in expo.install.exclude: %O`,\n suggestedRange\n );\n return false;\n }\n\n return semverRangeSubset(suggestedRange, rawSpec);\n } else {\n debug(\n `Unsupported npm package argument type for package ${name} in expo.install.exclude: %O`,\n type\n );\n }\n }\n\n return false;\n })\n .map((dep) => dep.packageName);\n\n debug(\n `Incorrect dependency warnings filtered out by expo.install.exclude: %O`,\n incorrectAndExcludedDeps\n );\n incorrectDeps = incorrectDeps.filter(\n (dep) => !incorrectAndExcludedDeps.includes(dep.packageName)\n );\n }\n\n return incorrectDeps;\n}\n\nfunction getFilteredObject(keys: string[], object: Record<string, string>) {\n return keys.reduce<Record<string, string>>((acc, key) => {\n acc[key] = object[key]!;\n return acc;\n }, {});\n}\n\nfunction getPackagesToCheck(\n bundledNativeModules: BundledNativeModules,\n dependencies?: Record<string, string> | null\n): DependenciesToCheck {\n const dependencyNames = Object.keys(dependencies ?? {});\n const known: string[] = [];\n const unknown: string[] = [];\n for (const dependencyName of dependencyNames) {\n if (dependencyName in bundledNativeModules) {\n known.push(dependencyName);\n } else {\n unknown.push(dependencyName);\n }\n }\n return { known, unknown };\n}\n\nasync function findIncorrectDependencies(\n pkg: PackageJSONConfig,\n packageVersions: Record<string, string>,\n bundledNativeModules: BundledNativeModules,\n isReactNativeTvProject: boolean\n): Promise<IncorrectDependency[]> {\n // For TV projects, compare the installed `major.minor` against the bundled\n // `react-native` `major.minor` — `react-native-tvos` follows the upstream\n // minor lines via a `<major>.<minor>-stable` dist-tag, so a matching minor\n // means the TV variant is up to date.\n //\n // Resolve the install spec for the TV variant once up front so the inner\n // loop stays synchronous and we don't hit the npm registry per dependency.\n const bundledReactNativeVersion = bundledNativeModules['react-native'];\n const reactNativeTvExpectedVersionOrRange =\n isReactNativeTvProject && bundledReactNativeVersion\n ? await correctReactNativeTvVersion(bundledReactNativeVersion)\n : undefined;\n\n const packages = Object.keys(packageVersions);\n const incorrectDeps: IncorrectDependency[] = [];\n for (const packageName of packages) {\n const actualVersion = packageVersions[packageName]!;\n\n if (isReactNativeTvProject && packageName === 'react-native') {\n if (\n bundledReactNativeVersion &&\n reactNativeTvExpectedVersionOrRange &&\n !reactNativeTvVersionMatchesBundled(actualVersion, bundledReactNativeVersion)\n ) {\n incorrectDeps.push({\n packageName,\n packageType: findDependencyType(pkg, packageName),\n expectedVersionOrRange: reactNativeTvExpectedVersionOrRange,\n actualVersion,\n });\n }\n continue;\n }\n\n const expectedVersionOrRange = bundledNativeModules[packageName]!;\n if (isDependencyVersionIncorrect(packageName, actualVersion, expectedVersionOrRange)) {\n incorrectDeps.push({\n packageName,\n packageType: findDependencyType(pkg, packageName),\n expectedVersionOrRange,\n actualVersion,\n });\n }\n }\n return incorrectDeps;\n}\n\nexport function isDependencyVersionIncorrect(\n packageName: string,\n actualVersion: string,\n expectedVersionOrRange?: string\n) {\n if (!expectedVersionOrRange) {\n return false;\n }\n\n // we never want to go backwards with the expo patch version\n if (packageName === 'expo') {\n return semver.ltr(actualVersion, expectedVersionOrRange);\n }\n\n // For all other packages, check if the actual version satisfies the expected range\n const satisfies = semver.satisfies(actualVersion, expectedVersionOrRange, {\n includePrerelease: true,\n });\n\n return !satisfies;\n}\n\nfunction findDependencyType(\n pkg: PackageJSONConfig,\n packageName: string\n): IncorrectDependency['packageType'] {\n if (pkg.devDependencies && packageName in pkg.devDependencies) {\n return 'devDependencies';\n }\n\n return 'dependencies';\n}\n"],"names":["getVersionedDependenciesAsync","isDependencyVersionIncorrect","logIncorrectDependencies","validateDependenciesVersionsAsync","debug","require","projectRoot","exp","pkg","packagesToCheck","env","EXPO_OFFLINE","Log","warn","EXPO_NO_DEPENDENCY_VALIDATION","incorrectDeps","logInvalidDependency","packageName","expectedVersionOrRange","actualVersion","chalk","length","forEach","dep","assert","sdkVersion","combinedKnownPackages","getCombinedKnownVersionsAsync","resolvedDependencies","getFilteredObject","dependencies","devDependencies","known","resolvedPackagesToCheck","unknown","getPackagesToCheck","packageVersions","resolveAllPackageVersionsAsync","isReactNativeTvProject","isReactNativeTvProjectAsync","findIncorrectDependencies","expo","install","exclude","packagesToExclude","parsedPackagesToExclude","reduce","acc","npaResult","npmPackageArg","name","incorrectAndExcludedDeps","filter","raw","rawSpec","type","suggestedRange","semver","validRange","semverRangeSubset","map","includes","keys","object","key","bundledNativeModules","dependencyNames","Object","dependencyName","push","bundledReactNativeVersion","reactNativeTvExpectedVersionOrRange","correctReactNativeTvVersion","undefined","packages","reactNativeTvVersionMatchesBundled","packageType","findDependencyType","ltr","satisfies","includePrerelease"],"mappings":"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"}
@@ -8,21 +8,46 @@ Object.defineProperty(exports, "DevToolsPlugin", {
8
8
  return DevToolsPlugin;
9
9
  }
10
10
  });
11
+ function _nodefs() {
12
+ const data = /*#__PURE__*/ _interop_require_default(require("node:fs"));
13
+ _nodefs = function() {
14
+ return data;
15
+ };
16
+ return data;
17
+ }
11
18
  const _DevToolsPluginschema = require("./DevToolsPlugin.schema");
12
19
  const _DevToolsPluginCliExtensionExecutor = require("./DevToolsPluginCliExtensionExecutor");
13
20
  const _DevToolsPluginManager = require("./DevToolsPluginManager");
21
+ const _dir = require("../../utils/dir");
22
+ function _interop_require_default(obj) {
23
+ return obj && obj.__esModule ? obj : {
24
+ default: obj
25
+ };
26
+ }
27
+ const maybeRealpath = (target)=>{
28
+ try {
29
+ return _nodefs().default.realpathSync(target);
30
+ } catch {
31
+ return target;
32
+ }
33
+ };
14
34
  class DevToolsPlugin {
15
35
  constructor(plugin, projectRoot){
16
36
  this.plugin = plugin;
17
37
  this.projectRoot = projectRoot;
18
38
  this._executor = undefined;
19
- // Validate configuration schema
20
39
  const result = _DevToolsPluginschema.PluginSchema.safeParse(plugin);
21
40
  if (!result.success) {
22
41
  throw new Error(`Invalid plugin configuration: ${result.error.message}`, {
23
42
  cause: result.error
24
43
  });
25
44
  }
45
+ if (plugin.webpageRoot != null) {
46
+ const webpageRoot = maybeRealpath(plugin.webpageRoot);
47
+ if (!(0, _dir.isPathInside)(webpageRoot, plugin.packageRoot)) {
48
+ throw new Error(`webpageRoot (${plugin.webpageRoot}) is not inside packageRoot (${plugin.packageRoot}).`);
49
+ }
50
+ }
26
51
  }
27
52
  get packageName() {
28
53
  return this.plugin.packageName;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/start/server/DevToolsPlugin.ts"],"sourcesContent":["import type { DevToolsPluginInfo } from './DevToolsPlugin.schema';\nimport { PluginSchema } from './DevToolsPlugin.schema';\nimport { DevToolsPluginCliExtensionExecutor } from './DevToolsPluginCliExtensionExecutor';\nimport { DevToolsPluginEndpoint } from './DevToolsPluginManager';\n\n/**\n * Class that represents a DevTools plugin with CLI and/or web extensions\n *\n * Responsibilities:\n * - Validates plugin configuration against schema\n * - Provides access to plugin metadata (name, description\n * , endpoints)\n * - Manages CLI command execution via DevToolsPluginExecutor\n * - Lazily initializes executor when needed\n * - Constructs web endpoint URLs based on server configuration\n */\nexport class DevToolsPlugin {\n constructor(\n private plugin: DevToolsPluginInfo,\n public readonly projectRoot: string\n ) {\n // Validate configuration schema\n const result = PluginSchema.safeParse(plugin);\n if (!result.success) {\n throw new Error(`Invalid plugin configuration: ${result.error.message}`, {\n cause: result.error,\n });\n }\n }\n\n private _executor: DevToolsPluginCliExtensionExecutor | undefined = undefined;\n\n get packageName(): string {\n return this.plugin.packageName;\n }\n\n get packageRoot(): string {\n return this.plugin.packageRoot;\n }\n\n get webpageEndpoint(): string | undefined {\n return this.plugin?.webpageRoot\n ? `${DevToolsPluginEndpoint}/${this.plugin?.packageName}`\n : undefined;\n }\n\n get webpageRoot(): string | undefined {\n return this.plugin?.webpageRoot;\n }\n\n get description(): string {\n return this.plugin.cliExtensions?.description ?? '';\n }\n\n get cliExtensions(): DevToolsPluginInfo['cliExtensions'] {\n return this.plugin.cliExtensions;\n }\n\n get executor(): DevToolsPluginCliExtensionExecutor | undefined {\n if (!this.plugin.cliExtensions?.entryPoint) {\n return undefined;\n }\n\n if (!this._executor) {\n this._executor = new DevToolsPluginCliExtensionExecutor(this.plugin, this.projectRoot);\n }\n\n return this._executor;\n }\n}\n"],"names":["DevToolsPlugin","plugin","projectRoot","_executor","undefined","result","PluginSchema","safeParse","success","Error","error","message","cause","packageName","packageRoot","webpageEndpoint","webpageRoot","DevToolsPluginEndpoint","description","cliExtensions","executor","entryPoint","DevToolsPluginCliExtensionExecutor"],"mappings":";;;;+BAgBaA;;;eAAAA;;;sCAfgB;oDACsB;uCACZ;AAahC,MAAMA;IACX,YACE,AAAQC,MAA0B,EAClC,AAAgBC,WAAmB,CACnC;aAFQD,SAAAA;aACQC,cAAAA;aAWVC,YAA4DC;QATlE,gCAAgC;QAChC,MAAMC,SAASC,kCAAY,CAACC,SAAS,CAACN;QACtC,IAAI,CAACI,OAAOG,OAAO,EAAE;YACnB,MAAM,IAAIC,MAAM,CAAC,8BAA8B,EAAEJ,OAAOK,KAAK,CAACC,OAAO,EAAE,EAAE;gBACvEC,OAAOP,OAAOK,KAAK;YACrB;QACF;IACF;IAIA,IAAIG,cAAsB;QACxB,OAAO,IAAI,CAACZ,MAAM,CAACY,WAAW;IAChC;IAEA,IAAIC,cAAsB;QACxB,OAAO,IAAI,CAACb,MAAM,CAACa,WAAW;IAChC;IAEA,IAAIC,kBAAsC;YACjC,cAC0B;QADjC,OAAO,EAAA,eAAA,IAAI,CAACd,MAAM,qBAAX,aAAae,WAAW,IAC3B,GAAGC,6CAAsB,CAAC,CAAC,GAAE,gBAAA,IAAI,CAAChB,MAAM,qBAAX,cAAaY,WAAW,EAAE,GACvDT;IACN;IAEA,IAAIY,cAAkC;YAC7B;QAAP,QAAO,eAAA,IAAI,CAACf,MAAM,qBAAX,aAAae,WAAW;IACjC;IAEA,IAAIE,cAAsB;YACjB;QAAP,OAAO,EAAA,6BAAA,IAAI,CAACjB,MAAM,CAACkB,aAAa,qBAAzB,2BAA2BD,WAAW,KAAI;IACnD;IAEA,IAAIC,gBAAqD;QACvD,OAAO,IAAI,CAAClB,MAAM,CAACkB,aAAa;IAClC;IAEA,IAAIC,WAA2D;YACxD;QAAL,IAAI,GAAC,6BAAA,IAAI,CAACnB,MAAM,CAACkB,aAAa,qBAAzB,2BAA2BE,UAAU,GAAE;YAC1C,OAAOjB;QACT;QAEA,IAAI,CAAC,IAAI,CAACD,SAAS,EAAE;YACnB,IAAI,CAACA,SAAS,GAAG,IAAImB,sEAAkC,CAAC,IAAI,CAACrB,MAAM,EAAE,IAAI,CAACC,WAAW;QACvF;QAEA,OAAO,IAAI,CAACC,SAAS;IACvB;AACF"}
1
+ {"version":3,"sources":["../../../../src/start/server/DevToolsPlugin.ts"],"sourcesContent":["import fs from 'node:fs';\n\nimport type { DevToolsPluginInfo } from './DevToolsPlugin.schema';\nimport { PluginSchema } from './DevToolsPlugin.schema';\nimport { DevToolsPluginCliExtensionExecutor } from './DevToolsPluginCliExtensionExecutor';\nimport { DevToolsPluginEndpoint } from './DevToolsPluginManager';\nimport { isPathInside } from '../../utils/dir';\n\nconst maybeRealpath = (target: string): string => {\n try {\n return fs.realpathSync(target);\n } catch {\n return target;\n }\n};\n\n/**\n * Class that represents a DevTools plugin with CLI and/or web extensions\n *\n * Responsibilities:\n * - Validates plugin configuration against schema\n * - Provides access to plugin metadata (name, description\n * , endpoints)\n * - Manages CLI command execution via DevToolsPluginExecutor\n * - Lazily initializes executor when needed\n * - Constructs web endpoint URLs based on server configuration\n */\nexport class DevToolsPlugin {\n constructor(\n private plugin: DevToolsPluginInfo,\n public readonly projectRoot: string\n ) {\n const result = PluginSchema.safeParse(plugin);\n if (!result.success) {\n throw new Error(`Invalid plugin configuration: ${result.error.message}`, {\n cause: result.error,\n });\n }\n\n if (plugin.webpageRoot != null) {\n const webpageRoot = maybeRealpath(plugin.webpageRoot);\n if (!isPathInside(webpageRoot, plugin.packageRoot)) {\n throw new Error(\n `webpageRoot (${plugin.webpageRoot}) is not inside packageRoot (${plugin.packageRoot}).`\n );\n }\n }\n }\n\n private _executor: DevToolsPluginCliExtensionExecutor | undefined = undefined;\n\n get packageName(): string {\n return this.plugin.packageName;\n }\n\n get packageRoot(): string {\n return this.plugin.packageRoot;\n }\n\n get webpageEndpoint(): string | undefined {\n return this.plugin?.webpageRoot\n ? `${DevToolsPluginEndpoint}/${this.plugin?.packageName}`\n : undefined;\n }\n\n get webpageRoot(): string | undefined {\n return this.plugin?.webpageRoot;\n }\n\n get description(): string {\n return this.plugin.cliExtensions?.description ?? '';\n }\n\n get cliExtensions(): DevToolsPluginInfo['cliExtensions'] {\n return this.plugin.cliExtensions;\n }\n\n get executor(): DevToolsPluginCliExtensionExecutor | undefined {\n if (!this.plugin.cliExtensions?.entryPoint) {\n return undefined;\n }\n\n if (!this._executor) {\n this._executor = new DevToolsPluginCliExtensionExecutor(this.plugin, this.projectRoot);\n }\n\n return this._executor;\n }\n}\n"],"names":["DevToolsPlugin","maybeRealpath","target","fs","realpathSync","plugin","projectRoot","_executor","undefined","result","PluginSchema","safeParse","success","Error","error","message","cause","webpageRoot","isPathInside","packageRoot","packageName","webpageEndpoint","DevToolsPluginEndpoint","description","cliExtensions","executor","entryPoint","DevToolsPluginCliExtensionExecutor"],"mappings":";;;;+BA2BaA;;;eAAAA;;;;gEA3BE;;;;;;sCAGc;oDACsB;uCACZ;qBACV;;;;;;AAE7B,MAAMC,gBAAgB,CAACC;IACrB,IAAI;QACF,OAAOC,iBAAE,CAACC,YAAY,CAACF;IACzB,EAAE,OAAM;QACN,OAAOA;IACT;AACF;AAaO,MAAMF;IACX,YACE,AAAQK,MAA0B,EAClC,AAAgBC,WAAmB,CACnC;aAFQD,SAAAA;aACQC,cAAAA;aAmBVC,YAA4DC;QAjBlE,MAAMC,SAASC,kCAAY,CAACC,SAAS,CAACN;QACtC,IAAI,CAACI,OAAOG,OAAO,EAAE;YACnB,MAAM,IAAIC,MAAM,CAAC,8BAA8B,EAAEJ,OAAOK,KAAK,CAACC,OAAO,EAAE,EAAE;gBACvEC,OAAOP,OAAOK,KAAK;YACrB;QACF;QAEA,IAAIT,OAAOY,WAAW,IAAI,MAAM;YAC9B,MAAMA,cAAchB,cAAcI,OAAOY,WAAW;YACpD,IAAI,CAACC,IAAAA,iBAAY,EAACD,aAAaZ,OAAOc,WAAW,GAAG;gBAClD,MAAM,IAAIN,MACR,CAAC,aAAa,EAAER,OAAOY,WAAW,CAAC,6BAA6B,EAAEZ,OAAOc,WAAW,CAAC,EAAE,CAAC;YAE5F;QACF;IACF;IAIA,IAAIC,cAAsB;QACxB,OAAO,IAAI,CAACf,MAAM,CAACe,WAAW;IAChC;IAEA,IAAID,cAAsB;QACxB,OAAO,IAAI,CAACd,MAAM,CAACc,WAAW;IAChC;IAEA,IAAIE,kBAAsC;YACjC,cAC0B;QADjC,OAAO,EAAA,eAAA,IAAI,CAAChB,MAAM,qBAAX,aAAaY,WAAW,IAC3B,GAAGK,6CAAsB,CAAC,CAAC,GAAE,gBAAA,IAAI,CAACjB,MAAM,qBAAX,cAAae,WAAW,EAAE,GACvDZ;IACN;IAEA,IAAIS,cAAkC;YAC7B;QAAP,QAAO,eAAA,IAAI,CAACZ,MAAM,qBAAX,aAAaY,WAAW;IACjC;IAEA,IAAIM,cAAsB;YACjB;QAAP,OAAO,EAAA,6BAAA,IAAI,CAAClB,MAAM,CAACmB,aAAa,qBAAzB,2BAA2BD,WAAW,KAAI;IACnD;IAEA,IAAIC,gBAAqD;QACvD,OAAO,IAAI,CAACnB,MAAM,CAACmB,aAAa;IAClC;IAEA,IAAIC,WAA2D;YACxD;QAAL,IAAI,GAAC,6BAAA,IAAI,CAACpB,MAAM,CAACmB,aAAa,qBAAzB,2BAA2BE,UAAU,GAAE;YAC1C,OAAOlB;QACT;QAEA,IAAI,CAAC,IAAI,CAACD,SAAS,EAAE;YACnB,IAAI,CAACA,SAAS,GAAG,IAAIoB,sEAAkC,CAAC,IAAI,CAACtB,MAAM,EAAE,IAAI,CAACC,WAAW;QACvF;QAEA,OAAO,IAAI,CAACC,SAAS;IACvB;AACF"}
@@ -23,6 +23,7 @@ function _path() {
23
23
  return data;
24
24
  }
25
25
  const _DevToolsPluginCliExtensionResults = require("./DevToolsPluginCliExtensionResults");
26
+ const _dir = require("../../utils/dir");
26
27
  function _interop_require_default(obj) {
27
28
  return obj && obj.__esModule ? obj : {
28
29
  default: obj
@@ -45,27 +46,50 @@ class DevToolsPluginCliExtensionExecutor {
45
46
  command,
46
47
  args
47
48
  });
48
- return new Promise(async (resolve)=>{
49
- // Set up the command and its arguments
50
- const tool = _path().default.join(this.plugin.packageRoot, this.plugin.cliExtensions.entryPoint);
51
- const child = this.spawnFunc('node', [
52
- tool,
53
- command,
54
- `${JSON.stringify(args)}`,
55
- `${metroServerOrigin}`
56
- ], {
57
- cwd: this.projectRoot,
58
- env: {
59
- ...process.env
60
- }
61
- });
49
+ return new Promise((resolve)=>{
62
50
  let finished = false;
51
+ let timeout;
63
52
  const pluginResults = new _DevToolsPluginCliExtensionResults.DevToolsPluginCliExtensionResults(onOutput);
53
+ // process.execPath instead of 'node' so the child can't be redirected by a PATH shim.
54
+ let child;
55
+ try {
56
+ child = this.spawnFunc(process.execPath, [
57
+ this.resolvedEntryPoint,
58
+ command,
59
+ `${JSON.stringify(args)}`,
60
+ `${metroServerOrigin}`
61
+ ], {
62
+ cwd: this.projectRoot,
63
+ env: {
64
+ ...process.env
65
+ }
66
+ });
67
+ } catch (err) {
68
+ var _err_toString;
69
+ // spawn can throw synchronously; resolve with an error result instead of hanging.
70
+ pluginResults.append((err == null ? void 0 : (_err_toString = err.toString) == null ? void 0 : _err_toString.call(err)) ?? String(err), 'error');
71
+ resolve(pluginResults.getOutput());
72
+ return;
73
+ }
74
+ const finishOnTruncation = ()=>{
75
+ if (pluginResults.isTruncated() && !finished) {
76
+ finished = true;
77
+ if (timeout) clearTimeout(timeout);
78
+ child.kill('SIGKILL');
79
+ resolve(pluginResults.getOutput());
80
+ }
81
+ };
64
82
  // Collect output/error data
65
- child.stdout.on('data', (data)=>pluginResults.append(data.toString()));
66
- child.stderr.on('data', (data)=>pluginResults.append(data.toString(), 'error'));
83
+ child.stdout.on('data', (data)=>{
84
+ pluginResults.append(data.toString());
85
+ finishOnTruncation();
86
+ });
87
+ child.stderr.on('data', (data)=>{
88
+ pluginResults.append(data.toString(), 'error');
89
+ finishOnTruncation();
90
+ });
67
91
  // Setup timeout
68
- const timeout = setTimeout(()=>{
92
+ timeout = setTimeout(()=>{
69
93
  if (!finished) {
70
94
  finished = true;
71
95
  child.kill('SIGKILL');
@@ -75,14 +99,14 @@ class DevToolsPluginCliExtensionExecutor {
75
99
  }, this.timeoutMs);
76
100
  child.on('close', (code)=>{
77
101
  if (finished) return;
78
- clearTimeout(timeout);
102
+ if (timeout) clearTimeout(timeout);
79
103
  finished = true;
80
104
  pluginResults.exit(code);
81
105
  resolve(pluginResults.getOutput());
82
106
  });
83
107
  child.on('error', (err)=>{
84
108
  if (finished) return;
85
- clearTimeout(timeout);
109
+ if (timeout) clearTimeout(timeout);
86
110
  finished = true;
87
111
  pluginResults.append(err.toString(), 'error');
88
112
  resolve(pluginResults.getOutput());
@@ -93,6 +117,12 @@ class DevToolsPluginCliExtensionExecutor {
93
117
  if (!((_this_plugin_cliExtensions = this.plugin.cliExtensions) == null ? void 0 : _this_plugin_cliExtensions.entryPoint)) {
94
118
  throw new Error(`Plugin ${this.plugin.packageName} has no CLI extensions`);
95
119
  }
120
+ // Reject entryPoints that escape packageRoot (e.g. "../../other-pkg/dist/cli.js").
121
+ const resolved = _path().default.resolve(this.plugin.packageRoot, this.plugin.cliExtensions.entryPoint);
122
+ if (!(0, _dir.isPathInside)(resolved, this.plugin.packageRoot)) {
123
+ throw new Error(`Plugin ${this.plugin.packageName} entryPoint "${this.plugin.cliExtensions.entryPoint}" ` + `escapes packageRoot (${this.plugin.packageRoot}); must be a relative path inside the package.`);
124
+ }
125
+ this.resolvedEntryPoint = resolved;
96
126
  }
97
127
  validate({ command, args }) {
98
128
  var _this_plugin_cliExtensions, _commandElement_parameters;
@@ -106,12 +136,17 @@ class DevToolsPluginCliExtensionExecutor {
106
136
  // Quick check to see if the lengths match
107
137
  throw new Error(`Expected ${paramLength} parameter(s), but got ${argsLength} argument(s) for the command "${command}".`);
108
138
  }
109
- const argsKeys = Object.keys(args ?? {});
139
+ const argsObj = args ?? {};
110
140
  for (const param of commandElement.parameters ?? []){
111
- const found = argsKeys.find((key)=>key === param.name);
112
- if (!found) {
141
+ if (!Object.prototype.hasOwnProperty.call(argsObj, param.name)) {
113
142
  throw new Error(`Parameter "${param.name}" not found in command "${command}" of plugin ${this.plugin.packageName}`);
114
143
  }
144
+ // Enforce declared parameter type; don't rely on upstream Zod validation alone.
145
+ const expected = param.type === 'confirm' ? 'boolean' : param.type === 'number' ? 'number' : 'string';
146
+ const actual = typeof argsObj[param.name];
147
+ if (actual !== expected) {
148
+ throw new Error(`Parameter "${param.name}" of "${command}" expected ${expected} (declared "${param.type}"), got ${actual}.`);
149
+ }
115
150
  }
116
151
  }
117
152
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/start/server/DevToolsPluginCliExtensionExecutor.ts"],"sourcesContent":["import { spawn } from 'child_process';\nimport path from 'path';\n\nimport type {\n DevToolsPluginExecutorArguments,\n DevToolsPluginInfo,\n DevToolsPluginOutput,\n} from './DevToolsPlugin.schema';\nimport { DevToolsPluginCliExtensionResults } from './DevToolsPluginCliExtensionResults';\n\nconst DEFAULT_TIMEOUT_MS = 10_000; // 10 seconds\n\n/**\n * Class that executes CLI Extension commands for a given plugin\n *\n * ## Responsibilities:\n * - Verifies that requested commands exist and have correct parameters\n * - Validates that provided arguments match expected parameter schema\n * - Spawns and manages child processes for command execution\n * - Captures and streams stdout/stderr data from executed commands\n * - Manages process errors, timeouts, and unexpected failures\n * - Enforces execution time limits to prevent hanging processes\n * - Configures proper execution environment with color support\n * - Ensures proper cleanup of processes and timeouts\n * - Provides structured output with exit codes and error states\n */\nexport class DevToolsPluginCliExtensionExecutor {\n constructor(\n private plugin: DevToolsPluginInfo,\n private projectRoot: string,\n private spawnFunc: typeof spawn = spawn, // Used for injection when testing,\n private timeoutMs = DEFAULT_TIMEOUT_MS // Timeout for command execution\n ) {\n // Validate that this is a plugin with cli extensions\n if (!this.plugin.cliExtensions?.entryPoint) {\n throw new Error(`Plugin ${this.plugin.packageName} has no CLI extensions`);\n }\n }\n\n public validate({ command, args }: Omit<DevToolsPluginExecutorArguments, 'metroServerOrigin'>) {\n const commandElement = this.plugin.cliExtensions?.commands.find((c) => c.name === command);\n if (!commandElement) {\n throw new Error(`Command \"${command}\" not found in plugin ${this.plugin.packageName}`);\n }\n\n const paramLength = commandElement.parameters?.length ?? 0;\n const argsLength = Object.keys(args ?? {}).length;\n if (paramLength !== argsLength) {\n // Quick check to see if the lengths match\n throw new Error(\n `Expected ${paramLength} parameter(s), but got ${argsLength} argument(s) for the command \"${command}\".`\n );\n }\n\n const argsKeys = Object.keys(args ?? {});\n for (const param of commandElement.parameters ?? []) {\n const found = argsKeys.find((key) => key === param.name);\n if (!found) {\n throw new Error(\n `Parameter \"${param.name}\" not found in command \"${command}\" of plugin ${this.plugin.packageName}`\n );\n }\n }\n }\n\n /** this function is used for testing and showing the command in UI */\n public getCommandString = ({\n command,\n args,\n }: Omit<DevToolsPluginExecutorArguments, 'metroServerOrigin'>) => {\n return `node ${this.plugin.cliExtensions!.entryPoint} ${command}${Object.keys(args ?? {}).length > 0 ? ' ' + JSON.stringify(args) : ''}`;\n };\n\n public execute = async ({\n command,\n args,\n metroServerOrigin,\n onOutput,\n }: DevToolsPluginExecutorArguments): Promise<DevToolsPluginOutput> => {\n this.validate({ command, args });\n return new Promise<DevToolsPluginOutput>(async (resolve) => {\n // Set up the command and its arguments\n const tool = path.join(this.plugin.packageRoot, this.plugin.cliExtensions!.entryPoint);\n const child = this.spawnFunc(\n 'node',\n [tool, command, `${JSON.stringify(args)}`, `${metroServerOrigin}`],\n {\n cwd: this.projectRoot,\n env: { ...process.env },\n }\n );\n\n let finished = false;\n const pluginResults = new DevToolsPluginCliExtensionResults(onOutput);\n\n // Collect output/error data\n child.stdout.on('data', (data) => pluginResults.append(data.toString()));\n child.stderr.on('data', (data) => pluginResults.append(data.toString(), 'error'));\n\n // Setup timeout\n const timeout = setTimeout(() => {\n if (!finished) {\n finished = true;\n child.kill('SIGKILL');\n pluginResults.append('Command timed out', 'error');\n resolve(pluginResults.getOutput());\n }\n }, this.timeoutMs);\n\n child.on('close', (code: number) => {\n if (finished) return;\n clearTimeout(timeout);\n finished = true;\n pluginResults.exit(code);\n resolve(pluginResults.getOutput());\n });\n\n child.on('error', (err: Error) => {\n if (finished) return;\n clearTimeout(timeout);\n finished = true;\n pluginResults.append(err.toString(), 'error');\n resolve(pluginResults.getOutput());\n });\n });\n };\n}\n"],"names":["DevToolsPluginCliExtensionExecutor","DEFAULT_TIMEOUT_MS","plugin","projectRoot","spawnFunc","spawn","timeoutMs","getCommandString","command","args","cliExtensions","entryPoint","Object","keys","length","JSON","stringify","execute","metroServerOrigin","onOutput","validate","Promise","resolve","tool","path","join","packageRoot","child","cwd","env","process","finished","pluginResults","DevToolsPluginCliExtensionResults","stdout","on","data","append","toString","stderr","timeout","setTimeout","kill","getOutput","code","clearTimeout","exit","err","Error","packageName","commandElement","commands","find","c","name","paramLength","parameters","argsLength","argsKeys","param","found","key"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../../src/start/server/DevToolsPluginCliExtensionExecutor.ts"],"sourcesContent":["import { spawn, type ChildProcessWithoutNullStreams } from 'child_process';\nimport path from 'path';\n\nimport type {\n DevToolsPluginExecutorArguments,\n DevToolsPluginInfo,\n DevToolsPluginOutput,\n} from './DevToolsPlugin.schema';\nimport { DevToolsPluginCliExtensionResults } from './DevToolsPluginCliExtensionResults';\nimport { isPathInside } from '../../utils/dir';\n\nconst DEFAULT_TIMEOUT_MS = 10_000; // 10 seconds\n\n/**\n * Class that executes CLI Extension commands for a given plugin\n *\n * ## Responsibilities:\n * - Verifies that requested commands exist and have correct parameters\n * - Validates that provided arguments match expected parameter schema\n * - Spawns and manages child processes for command execution\n * - Captures and streams stdout/stderr data from executed commands\n * - Manages process errors, timeouts, and unexpected failures\n * - Enforces execution time limits to prevent hanging processes\n * - Configures proper execution environment with color support\n * - Ensures proper cleanup of processes and timeouts\n * - Provides structured output with exit codes and error states\n */\nexport class DevToolsPluginCliExtensionExecutor {\n private readonly resolvedEntryPoint: string;\n\n constructor(\n private plugin: DevToolsPluginInfo,\n private projectRoot: string,\n private spawnFunc: typeof spawn = spawn, // Used for injection when testing,\n private timeoutMs = DEFAULT_TIMEOUT_MS // Timeout for command execution\n ) {\n // Validate that this is a plugin with cli extensions\n if (!this.plugin.cliExtensions?.entryPoint) {\n throw new Error(`Plugin ${this.plugin.packageName} has no CLI extensions`);\n }\n // Reject entryPoints that escape packageRoot (e.g. \"../../other-pkg/dist/cli.js\").\n const resolved = path.resolve(this.plugin.packageRoot, this.plugin.cliExtensions.entryPoint);\n if (!isPathInside(resolved, this.plugin.packageRoot)) {\n throw new Error(\n `Plugin ${this.plugin.packageName} entryPoint \"${this.plugin.cliExtensions.entryPoint}\" ` +\n `escapes packageRoot (${this.plugin.packageRoot}); must be a relative path inside the package.`\n );\n }\n this.resolvedEntryPoint = resolved;\n }\n\n public validate({ command, args }: Omit<DevToolsPluginExecutorArguments, 'metroServerOrigin'>) {\n const commandElement = this.plugin.cliExtensions?.commands.find((c) => c.name === command);\n if (!commandElement) {\n throw new Error(`Command \"${command}\" not found in plugin ${this.plugin.packageName}`);\n }\n\n const paramLength = commandElement.parameters?.length ?? 0;\n const argsLength = Object.keys(args ?? {}).length;\n if (paramLength !== argsLength) {\n // Quick check to see if the lengths match\n throw new Error(\n `Expected ${paramLength} parameter(s), but got ${argsLength} argument(s) for the command \"${command}\".`\n );\n }\n\n const argsObj = (args ?? {}) as Record<string, unknown>;\n for (const param of commandElement.parameters ?? []) {\n if (!Object.prototype.hasOwnProperty.call(argsObj, param.name)) {\n throw new Error(\n `Parameter \"${param.name}\" not found in command \"${command}\" of plugin ${this.plugin.packageName}`\n );\n }\n // Enforce declared parameter type; don't rely on upstream Zod validation alone.\n const expected =\n param.type === 'confirm' ? 'boolean' : param.type === 'number' ? 'number' : 'string';\n const actual = typeof argsObj[param.name];\n if (actual !== expected) {\n throw new Error(\n `Parameter \"${param.name}\" of \"${command}\" expected ${expected} (declared \"${param.type}\"), got ${actual}.`\n );\n }\n }\n }\n\n /** this function is used for testing and showing the command in UI */\n public getCommandString = ({\n command,\n args,\n }: Omit<DevToolsPluginExecutorArguments, 'metroServerOrigin'>) => {\n return `node ${this.plugin.cliExtensions!.entryPoint} ${command}${Object.keys(args ?? {}).length > 0 ? ' ' + JSON.stringify(args) : ''}`;\n };\n\n public execute = async ({\n command,\n args,\n metroServerOrigin,\n onOutput,\n }: DevToolsPluginExecutorArguments): Promise<DevToolsPluginOutput> => {\n this.validate({ command, args });\n return new Promise<DevToolsPluginOutput>((resolve) => {\n let finished = false;\n let timeout: ReturnType<typeof setTimeout> | undefined;\n const pluginResults = new DevToolsPluginCliExtensionResults(onOutput);\n\n // process.execPath instead of 'node' so the child can't be redirected by a PATH shim.\n let child: ChildProcessWithoutNullStreams;\n try {\n child = this.spawnFunc(\n process.execPath,\n [this.resolvedEntryPoint, command, `${JSON.stringify(args)}`, `${metroServerOrigin}`],\n {\n cwd: this.projectRoot,\n env: { ...process.env },\n }\n );\n } catch (err: any) {\n // spawn can throw synchronously; resolve with an error result instead of hanging.\n pluginResults.append(err?.toString?.() ?? String(err), 'error');\n resolve(pluginResults.getOutput());\n return;\n }\n\n const finishOnTruncation = () => {\n if (pluginResults.isTruncated() && !finished) {\n finished = true;\n if (timeout) clearTimeout(timeout);\n child.kill('SIGKILL');\n resolve(pluginResults.getOutput());\n }\n };\n\n // Collect output/error data\n child.stdout.on('data', (data) => {\n pluginResults.append(data.toString());\n finishOnTruncation();\n });\n child.stderr.on('data', (data) => {\n pluginResults.append(data.toString(), 'error');\n finishOnTruncation();\n });\n\n // Setup timeout\n timeout = setTimeout(() => {\n if (!finished) {\n finished = true;\n child.kill('SIGKILL');\n pluginResults.append('Command timed out', 'error');\n resolve(pluginResults.getOutput());\n }\n }, this.timeoutMs);\n\n child.on('close', (code: number) => {\n if (finished) return;\n if (timeout) clearTimeout(timeout);\n finished = true;\n pluginResults.exit(code);\n resolve(pluginResults.getOutput());\n });\n\n child.on('error', (err: Error) => {\n if (finished) return;\n if (timeout) clearTimeout(timeout);\n finished = true;\n pluginResults.append(err.toString(), 'error');\n resolve(pluginResults.getOutput());\n });\n });\n };\n}\n"],"names":["DevToolsPluginCliExtensionExecutor","DEFAULT_TIMEOUT_MS","plugin","projectRoot","spawnFunc","spawn","timeoutMs","getCommandString","command","args","cliExtensions","entryPoint","Object","keys","length","JSON","stringify","execute","metroServerOrigin","onOutput","validate","Promise","resolve","finished","timeout","pluginResults","DevToolsPluginCliExtensionResults","child","process","execPath","resolvedEntryPoint","cwd","env","err","append","toString","String","getOutput","finishOnTruncation","isTruncated","clearTimeout","kill","stdout","on","data","stderr","setTimeout","code","exit","Error","packageName","resolved","path","packageRoot","isPathInside","commandElement","commands","find","c","name","paramLength","parameters","argsLength","argsObj","param","prototype","hasOwnProperty","call","expected","type","actual"],"mappings":"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"}