@expo/cli 0.22.25 → 0.22.26
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.
- package/build/bin/cli +91 -93
- package/build/bin/cli.map +1 -1
- package/build/metro-require/require.js +52 -53
- package/build/src/api/endpoint.js +2 -6
- package/build/src/api/endpoint.js.map +1 -1
- package/build/src/api/getExpoGoIntermediateCertificate.js +3 -5
- package/build/src/api/getExpoGoIntermediateCertificate.js.map +1 -1
- package/build/src/api/getExpoSchema.js +12 -16
- package/build/src/api/getExpoSchema.js.map +1 -1
- package/build/src/api/getNativeModuleVersions.js +4 -6
- package/build/src/api/getNativeModuleVersions.js.map +1 -1
- package/build/src/api/getProjectDevelopmentCertificate.js +3 -5
- package/build/src/api/getProjectDevelopmentCertificate.js.map +1 -1
- package/build/src/api/getVersions.js +5 -7
- package/build/src/api/getVersions.js.map +1 -1
- package/build/src/api/graphql/client.js +26 -32
- package/build/src/api/graphql/client.js.map +1 -1
- package/build/src/api/graphql/queries/AppQuery.js +4 -6
- package/build/src/api/graphql/queries/AppQuery.js.map +1 -1
- package/build/src/api/graphql/queries/UserQuery.js +3 -5
- package/build/src/api/graphql/queries/UserQuery.js.map +1 -1
- package/build/src/api/graphql/types/App.js +1 -3
- package/build/src/api/graphql/types/App.js.map +1 -1
- package/build/src/api/rest/cache/FileSystemResponseCache.js +8 -10
- package/build/src/api/rest/cache/FileSystemResponseCache.js.map +1 -1
- package/build/src/api/rest/cache/ResponseCache.js +12 -20
- package/build/src/api/rest/cache/ResponseCache.js.map +1 -1
- package/build/src/api/rest/cache/wrapFetchWithCache.js +11 -13
- package/build/src/api/rest/cache/wrapFetchWithCache.js.map +1 -1
- package/build/src/api/rest/client.js +35 -53
- package/build/src/api/rest/client.js.map +1 -1
- package/build/src/api/rest/client.types.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithBaseUrl.js +3 -5
- package/build/src/api/rest/wrapFetchWithBaseUrl.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithOffline.js +3 -5
- package/build/src/api/rest/wrapFetchWithOffline.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithProgress.js +7 -11
- package/build/src/api/rest/wrapFetchWithProgress.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithProxy.js +3 -5
- package/build/src/api/rest/wrapFetchWithProxy.js.map +1 -1
- package/build/src/api/rest/wrapFetchWithUserAgent.js +6 -8
- package/build/src/api/rest/wrapFetchWithUserAgent.js.map +1 -1
- package/build/src/api/settings.js +5 -7
- package/build/src/api/settings.js.map +1 -1
- package/build/src/api/updateDevelopmentSession.js +17 -23
- package/build/src/api/updateDevelopmentSession.js.map +1 -1
- package/build/src/api/user/UserSettings.js +21 -39
- package/build/src/api/user/UserSettings.js.map +1 -1
- package/build/src/api/user/actions.js +21 -27
- package/build/src/api/user/actions.js.map +1 -1
- package/build/src/api/user/expoSsoLauncher.js +26 -30
- package/build/src/api/user/expoSsoLauncher.js.map +1 -1
- package/build/src/api/user/otp.js +29 -35
- package/build/src/api/user/otp.js.map +1 -1
- package/build/src/api/user/user.js +30 -44
- package/build/src/api/user/user.js.map +1 -1
- package/build/src/config/configAsync.js +23 -29
- package/build/src/config/configAsync.js.map +1 -1
- package/build/src/config/index.js +21 -25
- package/build/src/config/index.js.map +1 -1
- package/build/src/customize/customizeAsync.js +6 -8
- package/build/src/customize/customizeAsync.js.map +1 -1
- package/build/src/customize/generate.js +16 -20
- package/build/src/customize/generate.js.map +1 -1
- package/build/src/customize/index.js +12 -14
- package/build/src/customize/index.js.map +1 -1
- package/build/src/customize/resolveOptions.js +2 -4
- package/build/src/customize/resolveOptions.js.map +1 -1
- package/build/src/customize/templates.js +54 -58
- package/build/src/customize/templates.js.map +1 -1
- package/build/src/customize/typescript.js +7 -11
- package/build/src/customize/typescript.js.map +1 -1
- package/build/src/export/createMetadataJson.js +9 -11
- package/build/src/export/createMetadataJson.js.map +1 -1
- package/build/src/export/embed/exportEager.js +6 -8
- package/build/src/export/embed/exportEager.js.map +1 -1
- package/build/src/export/embed/exportEmbedAsync.js +61 -71
- package/build/src/export/embed/exportEmbedAsync.js.map +1 -1
- package/build/src/export/embed/exportServer.js +55 -57
- package/build/src/export/embed/exportServer.js.map +1 -1
- package/build/src/export/embed/index.js +40 -44
- package/build/src/export/embed/index.js.map +1 -1
- package/build/src/export/embed/resolveOptions.js +36 -44
- package/build/src/export/embed/resolveOptions.js.map +1 -1
- package/build/src/export/embed/xcodeCompilerLogger.js +27 -39
- package/build/src/export/embed/xcodeCompilerLogger.js.map +1 -1
- package/build/src/export/exportApp.js +63 -67
- package/build/src/export/exportApp.js.map +1 -1
- package/build/src/export/exportAssets.js +27 -35
- package/build/src/export/exportAssets.js.map +1 -1
- package/build/src/export/exportAsync.js +9 -13
- package/build/src/export/exportAsync.js.map +1 -1
- package/build/src/export/exportDomComponents.js +45 -53
- package/build/src/export/exportDomComponents.js.map +1 -1
- package/build/src/export/exportHermes.js +63 -85
- package/build/src/export/exportHermes.js.map +1 -1
- package/build/src/export/exportStaticAsync.js +62 -72
- package/build/src/export/exportStaticAsync.js.map +1 -1
- package/build/src/export/favicon.js +27 -33
- package/build/src/export/favicon.js.map +1 -1
- package/build/src/export/getPublicExpoManifest.js +5 -7
- package/build/src/export/getPublicExpoManifest.js.map +1 -1
- package/build/src/export/getResolvedLocales.js +9 -11
- package/build/src/export/getResolvedLocales.js.map +1 -1
- package/build/src/export/html.js +6 -10
- package/build/src/export/html.js.map +1 -1
- package/build/src/export/index.js +28 -32
- package/build/src/export/index.js.map +1 -1
- package/build/src/export/metroAssetLocalPath.js +30 -36
- package/build/src/export/metroAssetLocalPath.js.map +1 -1
- package/build/src/export/persistMetroAssets.js +34 -42
- package/build/src/export/persistMetroAssets.js.map +1 -1
- package/build/src/export/publicFolder.js +6 -10
- package/build/src/export/publicFolder.js.map +1 -1
- package/build/src/export/resolveOptions.js +24 -28
- package/build/src/export/resolveOptions.js.map +1 -1
- package/build/src/export/saveAssets.js +46 -50
- package/build/src/export/saveAssets.js.map +1 -1
- package/build/src/export/web/exportWebAsync.js +11 -13
- package/build/src/export/web/exportWebAsync.js.map +1 -1
- package/build/src/export/web/index.js +15 -19
- package/build/src/export/web/index.js.map +1 -1
- package/build/src/export/web/resolveOptions.js +3 -5
- package/build/src/export/web/resolveOptions.js.map +1 -1
- package/build/src/export/writeContents.js +2 -4
- package/build/src/export/writeContents.js.map +1 -1
- package/build/src/graphql/generated.js +274 -400
- package/build/src/graphql/generated.js.map +1 -1
- package/build/src/install/applyPlugins.js +7 -11
- package/build/src/install/applyPlugins.js.map +1 -1
- package/build/src/install/checkPackages.js +22 -26
- package/build/src/install/checkPackages.js.map +1 -1
- package/build/src/install/fixPackages.js +12 -16
- package/build/src/install/fixPackages.js.map +1 -1
- package/build/src/install/index.js +16 -18
- package/build/src/install/index.js.map +1 -1
- package/build/src/install/installAsync.js +26 -32
- package/build/src/install/installAsync.js.map +1 -1
- package/build/src/install/installExpoPackage.js +18 -22
- package/build/src/install/installExpoPackage.js.map +1 -1
- package/build/src/install/resolveOptions.js +19 -21
- package/build/src/install/resolveOptions.js.map +1 -1
- package/build/src/install/utils/autoAddConfigPlugins.js +14 -18
- package/build/src/install/utils/autoAddConfigPlugins.js.map +1 -1
- package/build/src/install/utils/checkPackagesCompatibility.js +11 -13
- package/build/src/install/utils/checkPackagesCompatibility.js.map +1 -1
- package/build/src/lint/ESlintPrerequisite.js +44 -50
- package/build/src/lint/ESlintPrerequisite.js.map +1 -1
- package/build/src/lint/index.js +8 -12
- package/build/src/lint/index.js.map +1 -1
- package/build/src/lint/lintAsync.js +8 -10
- package/build/src/lint/lintAsync.js.map +1 -1
- package/build/src/log.js +16 -36
- package/build/src/log.js.map +1 -1
- package/build/src/login/index.js +20 -24
- package/build/src/login/index.js.map +1 -1
- package/build/src/logout/index.js +7 -11
- package/build/src/logout/index.js.map +1 -1
- package/build/src/prebuild/clearNativeFolder.js +26 -38
- package/build/src/prebuild/clearNativeFolder.js.map +1 -1
- package/build/src/prebuild/configureProjectAsync.js +14 -18
- package/build/src/prebuild/configureProjectAsync.js.map +1 -1
- package/build/src/prebuild/copyTemplateFiles.js +13 -17
- package/build/src/prebuild/copyTemplateFiles.js.map +1 -1
- package/build/src/prebuild/ensureConfigAsync.js +4 -6
- package/build/src/prebuild/ensureConfigAsync.js.map +1 -1
- package/build/src/prebuild/index.js +32 -36
- package/build/src/prebuild/index.js.map +1 -1
- package/build/src/prebuild/prebuildAsync.js +25 -29
- package/build/src/prebuild/prebuildAsync.js.map +1 -1
- package/build/src/prebuild/renameTemplateAppName.js +40 -46
- package/build/src/prebuild/renameTemplateAppName.js.map +1 -1
- package/build/src/prebuild/resolveOptions.js +52 -66
- package/build/src/prebuild/resolveOptions.js.map +1 -1
- package/build/src/prebuild/resolveTemplate.js +32 -36
- package/build/src/prebuild/resolveTemplate.js.map +1 -1
- package/build/src/prebuild/updateFromTemplate.js +13 -19
- package/build/src/prebuild/updateFromTemplate.js.map +1 -1
- package/build/src/prebuild/updatePackageJson.js +39 -53
- package/build/src/prebuild/updatePackageJson.js.map +1 -1
- package/build/src/prebuild/validateTemplatePlatforms.js +8 -12
- package/build/src/prebuild/validateTemplatePlatforms.js.map +1 -1
- package/build/src/register/index.js +7 -11
- package/build/src/register/index.js.map +1 -1
- package/build/src/register/registerAsync.js +3 -5
- package/build/src/register/registerAsync.js.map +1 -1
- package/build/src/run/android/index.js +32 -36
- package/build/src/run/android/index.js.map +1 -1
- package/build/src/run/android/resolveDevice.js +8 -10
- package/build/src/run/android/resolveDevice.js.map +1 -1
- package/build/src/run/android/resolveGradlePropsAsync.js +16 -18
- package/build/src/run/android/resolveGradlePropsAsync.js.map +1 -1
- package/build/src/run/android/resolveInstallApkName.js +15 -17
- package/build/src/run/android/resolveInstallApkName.js.map +1 -1
- package/build/src/run/android/resolveLaunchProps.js +10 -12
- package/build/src/run/android/resolveLaunchProps.js.map +1 -1
- package/build/src/run/android/resolveOptions.js +2 -4
- package/build/src/run/android/resolveOptions.js.map +1 -1
- package/build/src/run/android/runAndroidAsync.js +21 -23
- package/build/src/run/android/runAndroidAsync.js.map +1 -1
- package/build/src/run/ensureNativeProject.js +5 -7
- package/build/src/run/ensureNativeProject.js.map +1 -1
- package/build/src/run/hints.js +7 -13
- package/build/src/run/hints.js.map +1 -1
- package/build/src/run/index.js +23 -27
- package/build/src/run/index.js.map +1 -1
- package/build/src/run/ios/XcodeBuild.js +56 -74
- package/build/src/run/ios/XcodeBuild.js.map +1 -1
- package/build/src/run/ios/XcodeBuild.types.js.map +1 -1
- package/build/src/run/ios/appleDevice/AppleDevice.js +63 -69
- package/build/src/run/ios/appleDevice/AppleDevice.js.map +1 -1
- package/build/src/run/ios/appleDevice/ClientManager.js +26 -29
- package/build/src/run/ios/appleDevice/ClientManager.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/AFCClient.js +25 -28
- package/build/src/run/ios/appleDevice/client/AFCClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/DebugserverClient.js +26 -29
- package/build/src/run/ios/appleDevice/client/DebugserverClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/InstallationProxyClient.js +21 -22
- package/build/src/run/ios/appleDevice/client/InstallationProxyClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/LockdowndClient.js +29 -32
- package/build/src/run/ios/appleDevice/client/LockdowndClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/MobileImageMounterClient.js +24 -28
- package/build/src/run/ios/appleDevice/client/MobileImageMounterClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/ServiceClient.js +4 -7
- package/build/src/run/ios/appleDevice/client/ServiceClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/client/UsbmuxdClient.js +27 -28
- package/build/src/run/ios/appleDevice/client/UsbmuxdClient.js.map +1 -1
- package/build/src/run/ios/appleDevice/installOnDeviceAsync.js +17 -23
- package/build/src/run/ios/appleDevice/installOnDeviceAsync.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/AFCProtocol.js +132 -146
- package/build/src/run/ios/appleDevice/protocol/AFCProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/AbstractProtocol.js +21 -29
- package/build/src/run/ios/appleDevice/protocol/AbstractProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/GDBProtocol.js +21 -29
- package/build/src/run/ios/appleDevice/protocol/GDBProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/LockdownProtocol.js +22 -34
- package/build/src/run/ios/appleDevice/protocol/LockdownProtocol.js.map +1 -1
- package/build/src/run/ios/appleDevice/protocol/UsbmuxProtocol.js +17 -27
- package/build/src/run/ios/appleDevice/protocol/UsbmuxProtocol.js.map +1 -1
- package/build/src/run/ios/codeSigning/Security.js +39 -53
- package/build/src/run/ios/codeSigning/Security.js.map +1 -1
- package/build/src/run/ios/codeSigning/configureCodeSigning.js +9 -13
- package/build/src/run/ios/codeSigning/configureCodeSigning.js.map +1 -1
- package/build/src/run/ios/codeSigning/resolveCertificateSigningIdentity.js +19 -27
- package/build/src/run/ios/codeSigning/resolveCertificateSigningIdentity.js.map +1 -1
- package/build/src/run/ios/codeSigning/settings.js +5 -9
- package/build/src/run/ios/codeSigning/settings.js.map +1 -1
- package/build/src/run/ios/codeSigning/simulatorCodeSigning.js +12 -14
- package/build/src/run/ios/codeSigning/simulatorCodeSigning.js.map +1 -1
- package/build/src/run/ios/codeSigning/xcodeCodeSigning.js +21 -27
- package/build/src/run/ios/codeSigning/xcodeCodeSigning.js.map +1 -1
- package/build/src/run/ios/index.js +36 -40
- package/build/src/run/ios/index.js.map +1 -1
- package/build/src/run/ios/launchApp.js +17 -23
- package/build/src/run/ios/launchApp.js.map +1 -1
- package/build/src/run/ios/options/appleDestinations.js +36 -38
- package/build/src/run/ios/options/appleDestinations.js.map +1 -1
- package/build/src/run/ios/options/promptDevice.js +16 -20
- package/build/src/run/ios/options/promptDevice.js.map +1 -1
- package/build/src/run/ios/options/resolveDevice.js +24 -30
- package/build/src/run/ios/options/resolveDevice.js.map +1 -1
- package/build/src/run/ios/options/resolveNativeScheme.js +23 -31
- package/build/src/run/ios/options/resolveNativeScheme.js.map +1 -1
- package/build/src/run/ios/options/resolveOptions.js +5 -7
- package/build/src/run/ios/options/resolveOptions.js.map +1 -1
- package/build/src/run/ios/options/resolveXcodeProject.js +5 -7
- package/build/src/run/ios/options/resolveXcodeProject.js.map +1 -1
- package/build/src/run/ios/runIosAsync.js +44 -48
- package/build/src/run/ios/runIosAsync.js.map +1 -1
- package/build/src/run/ios/validateExternalBinary.js +22 -24
- package/build/src/run/ios/validateExternalBinary.js.map +1 -1
- package/build/src/run/resolveBundlerProps.js +2 -4
- package/build/src/run/resolveBundlerProps.js.map +1 -1
- package/build/src/run/startBundler.js +12 -16
- package/build/src/run/startBundler.js.map +1 -1
- package/build/src/serve/index.js +16 -20
- package/build/src/serve/index.js.map +1 -1
- package/build/src/serve/serveAsync.js +32 -36
- package/build/src/serve/serveAsync.js.map +1 -1
- package/build/src/start/detectDevClient.js +9 -13
- package/build/src/start/detectDevClient.js.map +1 -1
- package/build/src/start/doctor/Prerequisite.js +7 -12
- package/build/src/start/doctor/Prerequisite.js.map +1 -1
- package/build/src/start/doctor/SecurityBinPrerequisite.js +11 -13
- package/build/src/start/doctor/SecurityBinPrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/SimulatorAppPrerequisite.js +19 -23
- package/build/src/start/doctor/apple/SimulatorAppPrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcodeDeveloperDiskImagePrerequisite.js +19 -23
- package/build/src/start/doctor/apple/XcodeDeveloperDiskImagePrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcodePrerequisite.js +45 -51
- package/build/src/start/doctor/apple/XcodePrerequisite.js.map +1 -1
- package/build/src/start/doctor/apple/XcrunPrerequisite.js +16 -18
- package/build/src/start/doctor/apple/XcrunPrerequisite.js.map +1 -1
- package/build/src/start/doctor/dependencies/bundledNativeModules.js +19 -23
- package/build/src/start/doctor/dependencies/bundledNativeModules.js.map +1 -1
- package/build/src/start/doctor/dependencies/ensureDependenciesAsync.js +25 -31
- package/build/src/start/doctor/dependencies/ensureDependenciesAsync.js.map +1 -1
- package/build/src/start/doctor/dependencies/getMissingPackages.js +17 -25
- package/build/src/start/doctor/dependencies/getMissingPackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/getVersionedPackages.js +32 -40
- package/build/src/start/doctor/dependencies/getVersionedPackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/resolvePackages.js +26 -32
- package/build/src/start/doctor/dependencies/resolvePackages.js.map +1 -1
- package/build/src/start/doctor/dependencies/validateDependenciesVersions.js +31 -41
- package/build/src/start/doctor/dependencies/validateDependenciesVersions.js.map +1 -1
- package/build/src/start/doctor/ngrok/ExternalModule.js +29 -34
- package/build/src/start/doctor/ngrok/ExternalModule.js.map +1 -1
- package/build/src/start/doctor/ngrok/NgrokResolver.js +8 -12
- package/build/src/start/doctor/ngrok/NgrokResolver.js.map +1 -1
- package/build/src/start/doctor/typescript/TypeScriptProjectPrerequisite.js +28 -32
- package/build/src/start/doctor/typescript/TypeScriptProjectPrerequisite.js.map +1 -1
- package/build/src/start/doctor/typescript/updateTSConfig.js +17 -23
- package/build/src/start/doctor/typescript/updateTSConfig.js.map +1 -1
- package/build/src/start/doctor/web/WebSupportProjectPrerequisite.js +27 -33
- package/build/src/start/doctor/web/WebSupportProjectPrerequisite.js.map +1 -1
- package/build/src/start/index.js +42 -46
- package/build/src/start/index.js.map +1 -1
- package/build/src/start/interface/KeyPressHandler.js +14 -18
- package/build/src/start/interface/KeyPressHandler.js.map +1 -1
- package/build/src/start/interface/commandsTable.js +80 -94
- package/build/src/start/interface/commandsTable.js.map +1 -1
- package/build/src/start/interface/interactiveActions.js +40 -44
- package/build/src/start/interface/interactiveActions.js.map +1 -1
- package/build/src/start/interface/startInterface.js +61 -65
- package/build/src/start/interface/startInterface.js.map +1 -1
- package/build/src/start/platforms/AppIdResolver.js +4 -6
- package/build/src/start/platforms/AppIdResolver.js.map +1 -1
- package/build/src/start/platforms/DeviceManager.js +6 -10
- package/build/src/start/platforms/DeviceManager.js.map +1 -1
- package/build/src/start/platforms/ExpoGoInstaller.js +20 -25
- package/build/src/start/platforms/ExpoGoInstaller.js.map +1 -1
- package/build/src/start/platforms/PlatformManager.js +15 -17
- package/build/src/start/platforms/PlatformManager.js.map +1 -1
- package/build/src/start/platforms/android/ADBServer.js +35 -39
- package/build/src/start/platforms/android/ADBServer.js.map +1 -1
- package/build/src/start/platforms/android/AndroidAppIdResolver.js +16 -18
- package/build/src/start/platforms/android/AndroidAppIdResolver.js.map +1 -1
- package/build/src/start/platforms/android/AndroidDeviceManager.js +20 -24
- package/build/src/start/platforms/android/AndroidDeviceManager.js.map +1 -1
- package/build/src/start/platforms/android/AndroidPlatformManager.js +17 -17
- package/build/src/start/platforms/android/AndroidPlatformManager.js.map +1 -1
- package/build/src/start/platforms/android/AndroidSdk.js +9 -11
- package/build/src/start/platforms/android/AndroidSdk.js.map +1 -1
- package/build/src/start/platforms/android/activateWindow.js +22 -26
- package/build/src/start/platforms/android/activateWindow.js.map +1 -1
- package/build/src/start/platforms/android/adb.js +83 -121
- package/build/src/start/platforms/android/adb.js.map +1 -1
- package/build/src/start/platforms/android/adbReverse.js +12 -20
- package/build/src/start/platforms/android/adbReverse.js.map +1 -1
- package/build/src/start/platforms/android/emulator.js +26 -36
- package/build/src/start/platforms/android/emulator.js.map +1 -1
- package/build/src/start/platforms/android/getDevices.js +5 -7
- package/build/src/start/platforms/android/getDevices.js.map +1 -1
- package/build/src/start/platforms/android/gradle.js +28 -36
- package/build/src/start/platforms/android/gradle.js.map +1 -1
- package/build/src/start/platforms/android/promptAndroidDevice.js +15 -19
- package/build/src/start/platforms/android/promptAndroidDevice.js.map +1 -1
- package/build/src/start/platforms/ios/AppleAppIdResolver.js +19 -21
- package/build/src/start/platforms/ios/AppleAppIdResolver.js.map +1 -1
- package/build/src/start/platforms/ios/AppleDeviceManager.js +31 -37
- package/build/src/start/platforms/ios/AppleDeviceManager.js.map +1 -1
- package/build/src/start/platforms/ios/ApplePlatformManager.js +12 -12
- package/build/src/start/platforms/ios/ApplePlatformManager.js.map +1 -1
- package/build/src/start/platforms/ios/assertSystemRequirements.js +7 -9
- package/build/src/start/platforms/ios/assertSystemRequirements.js.map +1 -1
- package/build/src/start/platforms/ios/devicectl.js +73 -87
- package/build/src/start/platforms/ios/devicectl.js.map +1 -1
- package/build/src/start/platforms/ios/ensureSimulatorAppRunning.js +18 -22
- package/build/src/start/platforms/ios/ensureSimulatorAppRunning.js.map +1 -1
- package/build/src/start/platforms/ios/getBestSimulator.js +19 -29
- package/build/src/start/platforms/ios/getBestSimulator.js.map +1 -1
- package/build/src/start/platforms/ios/promptAppleDevice.js +10 -14
- package/build/src/start/platforms/ios/promptAppleDevice.js.map +1 -1
- package/build/src/start/platforms/ios/simctl.js +74 -102
- package/build/src/start/platforms/ios/simctl.js.map +1 -1
- package/build/src/start/platforms/ios/simctlLogging.js +52 -57
- package/build/src/start/platforms/ios/simctlLogging.js.map +1 -1
- package/build/src/start/platforms/ios/xcrun.js +18 -22
- package/build/src/start/platforms/ios/xcrun.js.map +1 -1
- package/build/src/start/project/devices.js +9 -19
- package/build/src/start/project/devices.js.map +1 -1
- package/build/src/start/project/dotExpo.js +11 -15
- package/build/src/start/project/dotExpo.js.map +1 -1
- package/build/src/start/project/settings.js +2 -4
- package/build/src/start/project/settings.js.map +1 -1
- package/build/src/start/resolveOptions.js +40 -48
- package/build/src/start/resolveOptions.js.map +1 -1
- package/build/src/start/server/AsyncNgrok.js +51 -55
- package/build/src/start/server/AsyncNgrok.js.map +1 -1
- package/build/src/start/server/AsyncWsTunnel.js +36 -40
- package/build/src/start/server/AsyncWsTunnel.js.map +1 -1
- package/build/src/start/server/BundlerDevServer.js +79 -81
- package/build/src/start/server/BundlerDevServer.js.map +1 -1
- package/build/src/start/server/DevServerManager.js +38 -42
- package/build/src/start/server/DevServerManager.js.map +1 -1
- package/build/src/start/server/DevToolsPluginManager.js +14 -18
- package/build/src/start/server/DevToolsPluginManager.js.map +1 -1
- package/build/src/start/server/DevelopmentSession.js +14 -18
- package/build/src/start/server/DevelopmentSession.js.map +1 -1
- package/build/src/start/server/ReactDevToolsProxy.js +10 -16
- package/build/src/start/server/ReactDevToolsProxy.js.map +1 -1
- package/build/src/start/server/UrlCreator.js +33 -36
- package/build/src/start/server/UrlCreator.js.map +1 -1
- package/build/src/start/server/getStaticRenderFunctions.js +21 -29
- package/build/src/start/server/getStaticRenderFunctions.js.map +1 -1
- package/build/src/start/server/metro/DevToolsPluginWebsocketEndpoint.js +4 -6
- package/build/src/start/server/metro/DevToolsPluginWebsocketEndpoint.js.map +1 -1
- package/build/src/start/server/metro/MetroBundlerDevServer.js +271 -269
- package/build/src/start/server/metro/MetroBundlerDevServer.js.map +1 -1
- package/build/src/start/server/metro/MetroTerminalReporter.js +56 -63
- package/build/src/start/server/metro/MetroTerminalReporter.js.map +1 -1
- package/build/src/start/server/metro/TerminalReporter.js +33 -39
- package/build/src/start/server/metro/TerminalReporter.js.map +1 -1
- package/build/src/start/server/metro/TerminalReporter.types.js.map +1 -1
- package/build/src/start/server/metro/createExpoMetroResolver.js +40 -46
- package/build/src/start/server/metro/createExpoMetroResolver.js.map +1 -1
- package/build/src/start/server/metro/createJResolver.js +28 -32
- package/build/src/start/server/metro/createJResolver.js.map +1 -1
- package/build/src/start/server/metro/createServerComponentsMiddleware.js +92 -96
- package/build/src/start/server/metro/createServerComponentsMiddleware.js.map +1 -1
- package/build/src/start/server/metro/createServerRouteMiddleware.js +30 -32
- package/build/src/start/server/metro/createServerRouteMiddleware.js.map +1 -1
- package/build/src/start/server/metro/debugging/AtlasPrerequisite.js +11 -13
- package/build/src/start/server/metro/debugging/AtlasPrerequisite.js.map +1 -1
- package/build/src/start/server/metro/debugging/MessageHandler.js +1 -3
- package/build/src/start/server/metro/debugging/MessageHandler.js.map +1 -1
- package/build/src/start/server/metro/debugging/attachAtlas.js +22 -26
- package/build/src/start/server/metro/debugging/attachAtlas.js.map +1 -1
- package/build/src/start/server/metro/debugging/createDebugMiddleware.js +17 -19
- package/build/src/start/server/metro/debugging/createDebugMiddleware.js.map +1 -1
- package/build/src/start/server/metro/debugging/createHandlersFactory.js +31 -25
- package/build/src/start/server/metro/debugging/createHandlersFactory.js.map +1 -1
- package/build/src/start/server/metro/debugging/getDebuggerType.js +4 -6
- package/build/src/start/server/metro/debugging/getDebuggerType.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/NetworkResponse.js +8 -14
- package/build/src/start/server/metro/debugging/messageHandlers/NetworkResponse.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerGetPossibleBreakpoints.js +5 -7
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerGetPossibleBreakpoints.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerSetBreakpointByUrl.js +6 -8
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeDebuggerSetBreakpointByUrl.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeCallFunctionOn.js +5 -7
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeCallFunctionOn.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeEvaluate.js +12 -14
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeEvaluate.js.map +1 -1
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeGetProperties.js +10 -14
- package/build/src/start/server/metro/debugging/messageHandlers/VscodeRuntimeGetProperties.js.map +1 -1
- package/build/src/start/server/metro/debugging/pageIsSupported.js +4 -6
- package/build/src/start/server/metro/debugging/pageIsSupported.js.map +1 -1
- package/build/src/start/server/metro/debugging/types.js.map +1 -1
- package/build/src/start/server/metro/dev-server/createEventSocket.js +16 -18
- package/build/src/start/server/metro/dev-server/createEventSocket.js.map +1 -1
- package/build/src/start/server/metro/dev-server/createMessageSocket.js +21 -23
- package/build/src/start/server/metro/dev-server/createMessageSocket.js.map +1 -1
- package/build/src/start/server/metro/dev-server/createMetroMiddleware.js +21 -23
- package/build/src/start/server/metro/dev-server/createMetroMiddleware.js.map +1 -1
- package/build/src/start/server/metro/dev-server/utils/createSocketBroadcaster.js +2 -4
- package/build/src/start/server/metro/dev-server/utils/createSocketBroadcaster.js.map +1 -1
- package/build/src/start/server/metro/dev-server/utils/createSocketMap.js +2 -4
- package/build/src/start/server/metro/dev-server/utils/createSocketMap.js.map +1 -1
- package/build/src/start/server/metro/dev-server/utils/socketMessages.js +4 -8
- package/build/src/start/server/metro/dev-server/utils/socketMessages.js.map +1 -1
- package/build/src/start/server/metro/externals.js +25 -33
- package/build/src/start/server/metro/externals.js.map +1 -1
- package/build/src/start/server/metro/fetchRouterManifest.js +12 -16
- package/build/src/start/server/metro/fetchRouterManifest.js.map +1 -1
- package/build/src/start/server/metro/formatFileCandidates.js +9 -11
- package/build/src/start/server/metro/formatFileCandidates.js.map +1 -1
- package/build/src/start/server/metro/getCssModulesFromBundler.js +18 -22
- package/build/src/start/server/metro/getCssModulesFromBundler.js.map +1 -1
- package/build/src/start/server/metro/instantiateMetro.js +79 -85
- package/build/src/start/server/metro/instantiateMetro.js.map +1 -1
- package/build/src/start/server/metro/log-box/LogBoxLog.js +36 -40
- package/build/src/start/server/metro/log-box/LogBoxLog.js.map +1 -1
- package/build/src/start/server/metro/log-box/LogBoxSymbolication.js +14 -20
- package/build/src/start/server/metro/log-box/LogBoxSymbolication.js.map +1 -1
- package/build/src/start/server/metro/log-box/formatProjectFilePath.js +6 -10
- package/build/src/start/server/metro/log-box/formatProjectFilePath.js.map +1 -1
- package/build/src/start/server/metro/metroErrorInterface.js +78 -88
- package/build/src/start/server/metro/metroErrorInterface.js.map +1 -1
- package/build/src/start/server/metro/metroErrors.js +4 -8
- package/build/src/start/server/metro/metroErrors.js.map +1 -1
- package/build/src/start/server/metro/metroPrivateServer.js +7 -9
- package/build/src/start/server/metro/metroPrivateServer.js.map +1 -1
- package/build/src/start/server/metro/metroVirtualModules.js +8 -10
- package/build/src/start/server/metro/metroVirtualModules.js.map +1 -1
- package/build/src/start/server/metro/metroWatchTypeScriptFiles.js +22 -24
- package/build/src/start/server/metro/metroWatchTypeScriptFiles.js.map +1 -1
- package/build/src/start/server/metro/router.js +32 -48
- package/build/src/start/server/metro/router.js.map +1 -1
- package/build/src/start/server/metro/runServer-fork.js +22 -24
- package/build/src/start/server/metro/runServer-fork.js.map +1 -1
- package/build/src/start/server/metro/serializeHtml.js +22 -24
- package/build/src/start/server/metro/serializeHtml.js.map +1 -1
- package/build/src/start/server/metro/symbolicate.js.map +1 -1
- package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js +29 -35
- package/build/src/start/server/metro/waitForMetroToObserveTypeScriptFile.js.map +1 -1
- package/build/src/start/server/metro/withMetroMultiPlatform.js +139 -149
- package/build/src/start/server/metro/withMetroMultiPlatform.js.map +1 -1
- package/build/src/start/server/metro/withMetroResolvers.js +39 -49
- package/build/src/start/server/metro/withMetroResolvers.js.map +1 -1
- package/build/src/start/server/middleware/ContextModuleSourceMapsMiddleware.js +6 -8
- package/build/src/start/server/middleware/ContextModuleSourceMapsMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/CorsMiddleware.js +15 -17
- package/build/src/start/server/middleware/CorsMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/CreateFileMiddleware.js +31 -32
- package/build/src/start/server/middleware/CreateFileMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/DevToolsPluginMiddleware.js +19 -22
- package/build/src/start/server/middleware/DevToolsPluginMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/DomComponentsMiddleware.js +27 -33
- package/build/src/start/server/middleware/DomComponentsMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js +60 -64
- package/build/src/start/server/middleware/ExpoGoManifestHandlerMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ExpoMiddleware.js +9 -15
- package/build/src/start/server/middleware/ExpoMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/FaviconMiddleware.js +14 -15
- package/build/src/start/server/middleware/FaviconMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/HistoryFallbackMiddleware.js +2 -4
- package/build/src/start/server/middleware/HistoryFallbackMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/InterstitialPageMiddleware.js +31 -34
- package/build/src/start/server/middleware/InterstitialPageMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ManifestMiddleware.js +56 -64
- package/build/src/start/server/middleware/ManifestMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ReactDevToolsPageMiddleware.js +19 -23
- package/build/src/start/server/middleware/ReactDevToolsPageMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js +19 -20
- package/build/src/start/server/middleware/RuntimeRedirectMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/ServeStaticMiddleware.js +9 -11
- package/build/src/start/server/middleware/ServeStaticMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/createBuiltinAPIRequestHandler.js +11 -17
- package/build/src/start/server/middleware/createBuiltinAPIRequestHandler.js.map +1 -1
- package/build/src/start/server/middleware/inspector/CdpClient.js +10 -12
- package/build/src/start/server/middleware/inspector/CdpClient.js.map +1 -1
- package/build/src/start/server/middleware/inspector/JsInspector.js +27 -35
- package/build/src/start/server/middleware/inspector/JsInspector.js.map +1 -1
- package/build/src/start/server/middleware/inspector/createJsInspectorMiddleware.js +19 -21
- package/build/src/start/server/middleware/inspector/createJsInspectorMiddleware.js.map +1 -1
- package/build/src/start/server/middleware/inspector/middlwareMutations.js +2 -6
- package/build/src/start/server/middleware/inspector/middlwareMutations.js.map +1 -1
- package/build/src/start/server/middleware/metroOptions.js +96 -120
- package/build/src/start/server/middleware/metroOptions.js.map +1 -1
- package/build/src/start/server/middleware/mutations.js +3 -7
- package/build/src/start/server/middleware/mutations.js.map +1 -1
- package/build/src/start/server/middleware/resolveAssets.js +18 -26
- package/build/src/start/server/middleware/resolveAssets.js.map +1 -1
- package/build/src/start/server/middleware/resolvePlatform.js +15 -23
- package/build/src/start/server/middleware/resolvePlatform.js.map +1 -1
- package/build/src/start/server/middleware/resolveRuntimeVersionWithExpoUpdatesAsync.js +9 -11
- package/build/src/start/server/middleware/resolveRuntimeVersionWithExpoUpdatesAsync.js.map +1 -1
- package/build/src/start/server/middleware/server.types.js.map +1 -1
- package/build/src/start/server/openPlatforms.js +8 -10
- package/build/src/start/server/openPlatforms.js.map +1 -1
- package/build/src/start/server/platformBundlers.js +11 -13
- package/build/src/start/server/platformBundlers.js.map +1 -1
- package/build/src/start/server/serverLogLikeMetro.js +50 -58
- package/build/src/start/server/serverLogLikeMetro.js.map +1 -1
- package/build/src/start/server/type-generation/expo-env.js +7 -11
- package/build/src/start/server/type-generation/expo-env.js.map +1 -1
- package/build/src/start/server/type-generation/routes.js +54 -76
- package/build/src/start/server/type-generation/routes.js.map +1 -1
- package/build/src/start/server/type-generation/startTypescriptTypeGeneration.js +19 -21
- package/build/src/start/server/type-generation/startTypescriptTypeGeneration.js.map +1 -1
- package/build/src/start/server/type-generation/tsconfig.js +28 -36
- package/build/src/start/server/type-generation/tsconfig.js.map +1 -1
- package/build/src/start/server/webTemplate.js +24 -28
- package/build/src/start/server/webTemplate.js.map +1 -1
- package/build/src/start/server/webpack/WebpackBundlerDevServer.js +46 -52
- package/build/src/start/server/webpack/WebpackBundlerDevServer.js.map +1 -1
- package/build/src/start/server/webpack/compile.js +11 -15
- package/build/src/start/server/webpack/compile.js.map +1 -1
- package/build/src/start/server/webpack/formatWebpackMessages.js +26 -28
- package/build/src/start/server/webpack/formatWebpackMessages.js.map +1 -1
- package/build/src/start/server/webpack/resolveFromProject.js +12 -18
- package/build/src/start/server/webpack/resolveFromProject.js.map +1 -1
- package/build/src/start/server/webpack/tls.js +12 -18
- package/build/src/start/server/webpack/tls.js.map +1 -1
- package/build/src/start/startAsync.js +27 -31
- package/build/src/start/startAsync.js.map +1 -1
- package/build/src/utils/FileNotifier.js +17 -20
- package/build/src/utils/FileNotifier.js.map +1 -1
- package/build/src/utils/ansi.js +5 -7
- package/build/src/utils/ansi.js.map +1 -1
- package/build/src/utils/args.js +14 -24
- package/build/src/utils/args.js.map +1 -1
- package/build/src/utils/array.js +6 -18
- package/build/src/utils/array.js.map +1 -1
- package/build/src/utils/cocoapods.js +46 -54
- package/build/src/utils/cocoapods.js.map +1 -1
- package/build/src/utils/codesigning.js +68 -78
- package/build/src/utils/codesigning.js.map +1 -1
- package/build/src/utils/createFileTransform.js +12 -16
- package/build/src/utils/createFileTransform.js.map +1 -1
- package/build/src/utils/createTempPath.js +13 -17
- package/build/src/utils/createTempPath.js.map +1 -1
- package/build/src/utils/delay.js +6 -12
- package/build/src/utils/delay.js.map +1 -1
- package/build/src/utils/dir.js +28 -46
- package/build/src/utils/dir.js.map +1 -1
- package/build/src/utils/downloadAppAsync.js +8 -10
- package/build/src/utils/downloadAppAsync.js.map +1 -1
- package/build/src/utils/downloadExpoGoAsync.js +21 -25
- package/build/src/utils/downloadExpoGoAsync.js.map +1 -1
- package/build/src/utils/editor.js +35 -41
- package/build/src/utils/editor.js.map +1 -1
- package/build/src/utils/env.js +59 -63
- package/build/src/utils/env.js.map +1 -1
- package/build/src/utils/errors.js +30 -37
- package/build/src/utils/errors.js.map +1 -1
- package/build/src/utils/exit.js +31 -35
- package/build/src/utils/exit.js.map +1 -1
- package/build/src/utils/expoUpdatesCli.js +22 -32
- package/build/src/utils/expoUpdatesCli.js.map +1 -1
- package/build/src/utils/fetch.js +4 -8
- package/build/src/utils/fetch.js.map +1 -1
- package/build/src/utils/filePath.js +6 -10
- package/build/src/utils/filePath.js.map +1 -1
- package/build/src/utils/findUp.js +9 -13
- package/build/src/utils/findUp.js.map +1 -1
- package/build/src/utils/fn.js +2 -6
- package/build/src/utils/fn.js.map +1 -1
- package/build/src/utils/getOrPromptApplicationId.js +26 -32
- package/build/src/utils/getOrPromptApplicationId.js.map +1 -1
- package/build/src/utils/getRunningProcess.js +21 -29
- package/build/src/utils/getRunningProcess.js.map +1 -1
- package/build/src/utils/git.js +20 -26
- package/build/src/utils/git.js.map +1 -1
- package/build/src/utils/glob.js +4 -8
- package/build/src/utils/glob.js.map +1 -1
- package/build/src/utils/interactive.js +1 -3
- package/build/src/utils/interactive.js.map +1 -1
- package/build/src/utils/ip.js +19 -21
- package/build/src/utils/ip.js.map +1 -1
- package/build/src/utils/isModuleSymlinked.js +9 -11
- package/build/src/utils/isModuleSymlinked.js.map +1 -1
- package/build/src/utils/jsonSchemaDeref.js +18 -20
- package/build/src/utils/jsonSchemaDeref.js.map +1 -1
- package/build/src/utils/link.js +13 -17
- package/build/src/utils/link.js.map +1 -1
- package/build/src/utils/mergeGitIgnorePaths.js +28 -46
- package/build/src/utils/mergeGitIgnorePaths.js.map +1 -1
- package/build/src/utils/modifyConfigAsync.js +10 -16
- package/build/src/utils/modifyConfigAsync.js.map +1 -1
- package/build/src/utils/modifyConfigPlugins.js +6 -10
- package/build/src/utils/modifyConfigPlugins.js.map +1 -1
- package/build/src/utils/nodeEnv.js +6 -12
- package/build/src/utils/nodeEnv.js.map +1 -1
- package/build/src/utils/nodeModules.js +8 -10
- package/build/src/utils/nodeModules.js.map +1 -1
- package/build/src/utils/npm.js +36 -50
- package/build/src/utils/npm.js.map +1 -1
- package/build/src/utils/obj.js +5 -11
- package/build/src/utils/obj.js.map +1 -1
- package/build/src/utils/open.js +8 -10
- package/build/src/utils/open.js.map +1 -1
- package/build/src/utils/ora.js +7 -13
- package/build/src/utils/ora.js.map +1 -1
- package/build/src/utils/plist.js +15 -21
- package/build/src/utils/plist.js.map +1 -1
- package/build/src/utils/port.js +33 -43
- package/build/src/utils/port.js.map +1 -1
- package/build/src/utils/profile.js +7 -11
- package/build/src/utils/profile.js.map +1 -1
- package/build/src/utils/progress.js +5 -11
- package/build/src/utils/progress.js.map +1 -1
- package/build/src/utils/prompts.js +29 -47
- package/build/src/utils/prompts.js.map +1 -1
- package/build/src/utils/resolveArgs.js +24 -36
- package/build/src/utils/resolveArgs.js.map +1 -1
- package/build/src/utils/scheme.js +32 -40
- package/build/src/utils/scheme.js.map +1 -1
- package/build/src/utils/stream.js +3 -5
- package/build/src/utils/stream.js.map +1 -1
- package/build/src/utils/strings.js +4 -6
- package/build/src/utils/strings.js.map +1 -1
- package/build/src/utils/tar.js +15 -19
- package/build/src/utils/tar.js.map +1 -1
- package/build/src/utils/telemetry/Telemetry.js +27 -29
- package/build/src/utils/telemetry/Telemetry.js.map +1 -1
- package/build/src/utils/telemetry/clients/FetchClient.js +13 -15
- package/build/src/utils/telemetry/clients/FetchClient.js.map +1 -1
- package/build/src/utils/telemetry/clients/FetchDetachedClient.js +22 -26
- package/build/src/utils/telemetry/clients/FetchDetachedClient.js.map +1 -1
- package/build/src/utils/telemetry/clients/RudderClient.js +8 -10
- package/build/src/utils/telemetry/clients/RudderClient.js.map +1 -1
- package/build/src/utils/telemetry/clients/RudderDetachedClient.js +22 -26
- package/build/src/utils/telemetry/clients/RudderDetachedClient.js.map +1 -1
- package/build/src/utils/telemetry/clients/flushFetchDetached.js +10 -10
- package/build/src/utils/telemetry/clients/flushFetchDetached.js.map +1 -1
- package/build/src/utils/telemetry/clients/flushRudderDetached.js +10 -10
- package/build/src/utils/telemetry/clients/flushRudderDetached.js.map +1 -1
- package/build/src/utils/telemetry/events.js +2 -4
- package/build/src/utils/telemetry/events.js.map +1 -1
- package/build/src/utils/telemetry/flushDetached.js.map +1 -1
- package/build/src/utils/telemetry/index.js +29 -25
- package/build/src/utils/telemetry/index.js.map +1 -1
- package/build/src/utils/telemetry/types.js.map +1 -1
- package/build/src/utils/telemetry/utils/constants.js +4 -8
- package/build/src/utils/telemetry/utils/constants.js.map +1 -1
- package/build/src/utils/telemetry/utils/context.js +14 -18
- package/build/src/utils/telemetry/utils/context.js.map +1 -1
- package/build/src/utils/template.js +4 -6
- package/build/src/utils/template.js.map +1 -1
- package/build/src/utils/terminal.js +2 -4
- package/build/src/utils/terminal.js.map +1 -1
- package/build/src/utils/tsconfig/evaluateTsConfig.js +17 -21
- package/build/src/utils/tsconfig/evaluateTsConfig.js.map +1 -1
- package/build/src/utils/tsconfig/loadTsConfigPaths.js +14 -18
- package/build/src/utils/tsconfig/loadTsConfigPaths.js.map +1 -1
- package/build/src/utils/tsconfig/matchTsConfigPathAlias.js +5 -7
- package/build/src/utils/tsconfig/matchTsConfigPathAlias.js.map +1 -1
- package/build/src/utils/tsconfig/resolveWithTsConfigPaths.js +12 -14
- package/build/src/utils/tsconfig/resolveWithTsConfigPaths.js.map +1 -1
- package/build/src/utils/url.js +13 -23
- package/build/src/utils/url.js.map +1 -1
- package/build/src/utils/validateApplicationId.js +86 -108
- package/build/src/utils/validateApplicationId.js.map +1 -1
- package/build/src/utils/variadic.js +16 -22
- package/build/src/utils/variadic.js.map +1 -1
- package/build/src/whoami/index.js +7 -11
- package/build/src/whoami/index.js.map +1 -1
- package/build/src/whoami/whoamiAsync.js +7 -11
- package/build/src/whoami/whoamiAsync.js.map +1 -1
- package/package.json +3 -3
|
@@ -4,36 +4,34 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
});
|
|
5
5
|
Object.defineProperty(exports, "resolveDestinationsAsync", {
|
|
6
6
|
enumerable: true,
|
|
7
|
-
get:
|
|
8
|
-
return resolveDestinationsAsync;
|
|
9
|
-
}
|
|
7
|
+
get: ()=>resolveDestinationsAsync
|
|
10
8
|
});
|
|
11
|
-
function
|
|
12
|
-
const data = /*#__PURE__*/
|
|
13
|
-
|
|
9
|
+
function _spawnAsync() {
|
|
10
|
+
const data = /*#__PURE__*/ _interopRequireDefault(require("@expo/spawn-async"));
|
|
11
|
+
_spawnAsync = function() {
|
|
14
12
|
return data;
|
|
15
13
|
};
|
|
16
14
|
return data;
|
|
17
15
|
}
|
|
18
16
|
const _log = require("../../../log");
|
|
19
|
-
function
|
|
17
|
+
function _interopRequireDefault(obj) {
|
|
20
18
|
return obj && obj.__esModule ? obj : {
|
|
21
19
|
default: obj
|
|
22
20
|
};
|
|
23
21
|
}
|
|
24
|
-
const debug = require(
|
|
22
|
+
const debug = require("debug")("expo:apple-destination");
|
|
25
23
|
function coerceDestinationPlatformToOsType(platform) {
|
|
26
24
|
// The only two devices I have to test against...
|
|
27
25
|
switch(platform){
|
|
28
|
-
case
|
|
29
|
-
return
|
|
30
|
-
case
|
|
31
|
-
case
|
|
32
|
-
return
|
|
33
|
-
case
|
|
34
|
-
return
|
|
26
|
+
case "iOS":
|
|
27
|
+
return "iOS";
|
|
28
|
+
case "xrOS":
|
|
29
|
+
case "visionOS":
|
|
30
|
+
return "xrOS";
|
|
31
|
+
case "macOS":
|
|
32
|
+
return "macOS";
|
|
35
33
|
default:
|
|
36
|
-
debug(
|
|
34
|
+
debug("Unknown destination platform (needs to be added to Expo CLI):", platform);
|
|
37
35
|
return platform;
|
|
38
36
|
}
|
|
39
37
|
}
|
|
@@ -42,26 +40,26 @@ function filterBoolean(array) {
|
|
|
42
40
|
return array.filter(Boolean);
|
|
43
41
|
}
|
|
44
42
|
function warnDestinationObject(obj) {
|
|
45
|
-
if (!obj || typeof obj !==
|
|
43
|
+
if (!obj || typeof obj !== "object") {
|
|
46
44
|
return null;
|
|
47
45
|
}
|
|
48
|
-
if (
|
|
46
|
+
if ("platform" in obj && "id" in obj && "name" in obj) {
|
|
49
47
|
return obj;
|
|
50
48
|
}
|
|
51
|
-
_log.Log.warn(
|
|
49
|
+
_log.Log.warn("Unexpected xcode destination object:", obj);
|
|
52
50
|
return null;
|
|
53
51
|
}
|
|
54
52
|
function parseXcodeDestinationString(str) {
|
|
55
|
-
const parsedLines = filterBoolean(str.trim().split(
|
|
53
|
+
const parsedLines = filterBoolean(str.trim().split("\n").map((line)=>{
|
|
56
54
|
line = line.trim();
|
|
57
|
-
return line.startsWith(
|
|
55
|
+
return line.startsWith("{") ? line : null;
|
|
58
56
|
})).map((line)=>{
|
|
59
|
-
var
|
|
60
|
-
const inner = (
|
|
57
|
+
var ref;
|
|
58
|
+
const inner = (ref = line.match(/{(.*)}/)) == null ? void 0 : ref[1];
|
|
61
59
|
if (!inner) return null;
|
|
62
|
-
return Object.fromEntries(filterBoolean(inner.trim().split(
|
|
63
|
-
var
|
|
64
|
-
return (
|
|
60
|
+
return Object.fromEntries(filterBoolean(inner.trim().split(", ").map((item)=>{
|
|
61
|
+
var ref;
|
|
62
|
+
return (ref = item.trim().match(/(?<key>[^:]+):(?<value>.+)/)) == null ? void 0 : ref.groups;
|
|
65
63
|
})).map((item)=>[
|
|
66
64
|
item.key,
|
|
67
65
|
item.value
|
|
@@ -75,21 +73,21 @@ function coercePhysicalDevice(device) {
|
|
|
75
73
|
/** @example `00008101-001964A22629003A` */ udid: device.id,
|
|
76
74
|
/** @example `Evan's phone` */ name: device.name,
|
|
77
75
|
/** @example `iPhone13,4` */ // model: 'UNKNOWN',
|
|
78
|
-
/** @example `device` */ deviceType:
|
|
76
|
+
/** @example `device` */ deviceType: "device",
|
|
79
77
|
osType: coerceDestinationPlatformToOsType(device.platform),
|
|
80
|
-
osVersion:
|
|
78
|
+
osVersion: ""
|
|
81
79
|
};
|
|
82
80
|
}
|
|
83
81
|
function coerceSimulatorDevice(device) {
|
|
84
82
|
// simulator
|
|
85
83
|
return {
|
|
86
84
|
/** '00E55DC0-0364-49DF-9EC6-77BE587137D4' */ udid: device.id,
|
|
87
|
-
/** 'com.apple.CoreSimulator.SimRuntime.iOS-15-1' */ runtime:
|
|
85
|
+
/** 'com.apple.CoreSimulator.SimRuntime.iOS-15-1' */ runtime: "",
|
|
88
86
|
/** If the device is "available" which generally means that the OS files haven't been deleted (this can happen when Xcode updates). */ isAvailable: true,
|
|
89
|
-
deviceTypeIdentifier:
|
|
90
|
-
state:
|
|
87
|
+
deviceTypeIdentifier: "",
|
|
88
|
+
state: "Shutdown",
|
|
91
89
|
/** 'iPhone 13 Pro' */ name: device.name,
|
|
92
|
-
/** Type of OS the device uses. */ osType: device.platform ===
|
|
90
|
+
/** Type of OS the device uses. */ osType: device.platform === "visionOS Simulator" ? "xrOS" : "iOS",
|
|
93
91
|
/** '15.1' */ osVersion: device.OS,
|
|
94
92
|
/** 'iPhone 13 Pro (15.1)' */ windowName: `${device.name} (${device.OS})`
|
|
95
93
|
};
|
|
@@ -108,15 +106,15 @@ function coerceDestinationObjectToKnownDeviceType(device) {
|
|
|
108
106
|
}
|
|
109
107
|
async function resolveDestinationsAsync(props) {
|
|
110
108
|
// xcodebuild -workspace /Users/evanbacon/Documents/GitHub/lab/apr23/ios/apr23.xcworkspace -configuration Debug -scheme apr23 -showdestinations -json
|
|
111
|
-
const { stdout
|
|
112
|
-
props.xcodeProject.isWorkspace ?
|
|
109
|
+
const { stdout } = await (0, _spawnAsync().default)("xcodebuild", [
|
|
110
|
+
props.xcodeProject.isWorkspace ? "-workspace" : "-project",
|
|
113
111
|
props.xcodeProject.name,
|
|
114
|
-
|
|
112
|
+
"-configuration",
|
|
115
113
|
props.configuration,
|
|
116
|
-
|
|
114
|
+
"-scheme",
|
|
117
115
|
props.scheme,
|
|
118
|
-
|
|
119
|
-
|
|
116
|
+
"-showdestinations",
|
|
117
|
+
"-quiet",
|
|
120
118
|
]);
|
|
121
119
|
// console.log(JSON.stringify(stdout, null, 2));
|
|
122
120
|
const destinationObjects = parseXcodeDestinationString(stdout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/options/appleDestinations.ts"],"sourcesContent":["import spawnAsync from '@expo/spawn-async';\n\nimport { Log } from '../../../log';\nimport { OSType } from '../../../start/platforms/ios/simctl';\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport { BuildProps } from '../XcodeBuild.types';\nimport * as AppleDevice from '../appleDevice/AppleDevice';\n\nconst debug = require('debug')('expo:apple-destination') as typeof console.log;\n\ninterface Destination {\n // 'visionOS'\n platform: string;\n // 'arm64'\n arch?: string;\n // 'Designed for [iPad,iPhone]'\n variant?: string;\n // '00008112-001A20EC1E78A01E'\n id: string;\n // 'Apple Vision Pro'\n name: string;\n // Available in simulators\n OS?: string;\n}\n\nfunction coerceDestinationPlatformToOsType(platform: string): OSType {\n // The only two devices I have to test against...\n switch (platform) {\n case 'iOS':\n return 'iOS';\n case 'xrOS':\n case 'visionOS':\n return 'xrOS';\n case 'macOS':\n return 'macOS';\n default:\n debug('Unknown destination platform (needs to be added to Expo CLI):', platform);\n return platform as OSType;\n }\n}\n\n// Runs `.filter(Boolean)` on the array with correct types.\nfunction filterBoolean<T>(array: (T | null | undefined)[]): T[] {\n return array.filter(Boolean) as T[];\n}\n\nfunction warnDestinationObject(obj: any): Destination | null {\n if (!obj || typeof obj !== 'object') {\n return null;\n }\n\n if ('platform' in obj && 'id' in obj && 'name' in obj) {\n return obj;\n }\n Log.warn('Unexpected xcode destination object:', obj);\n return null;\n}\n\nfunction parseXcodeDestinationString(str: string): Destination[] {\n const parsedLines = filterBoolean(\n str\n .trim()\n .split('\\n')\n .map((line: string) => {\n line = line.trim();\n return line.startsWith('{') ? line : null;\n })\n ).map((line) => {\n const inner = line.match(/{(.*)}/)?.[1];\n\n if (!inner) return null;\n\n return Object.fromEntries(\n filterBoolean(\n inner\n .trim()\n .split(', ')\n .map((item) => item.trim().match(/(?<key>[^:]+):(?<value>.+)/)?.groups)\n ).map((item) => [item!.key, item!.value])\n );\n });\n\n return filterBoolean(parsedLines.map(warnDestinationObject));\n}\n\nfunction coercePhysicalDevice(\n device: Destination\n): Pick<AppleDevice.ConnectedDevice, 'udid' | 'name' | 'osType' | 'deviceType' | 'osVersion'> {\n // physical device\n return {\n /** @example `00008101-001964A22629003A` */\n udid: device.id,\n /** @example `Evan's phone` */\n name: device.name,\n /** @example `iPhone13,4` */\n // model: 'UNKNOWN',\n /** @example `device` */\n deviceType: 'device',\n osType: coerceDestinationPlatformToOsType(device.platform),\n\n osVersion: '',\n };\n}\n\nfunction coerceSimulatorDevice(\n device: Destination\n): Pick<\n SimControl.Device,\n | 'udid'\n | 'name'\n | 'osType'\n | 'osVersion'\n | 'runtime'\n | 'isAvailable'\n | 'deviceTypeIdentifier'\n | 'state'\n | 'windowName'\n> {\n // simulator\n return {\n /** '00E55DC0-0364-49DF-9EC6-77BE587137D4' */\n udid: device.id,\n /** 'com.apple.CoreSimulator.SimRuntime.iOS-15-1' */\n runtime: '',\n /** If the device is \"available\" which generally means that the OS files haven't been deleted (this can happen when Xcode updates). */\n isAvailable: true,\n\n deviceTypeIdentifier: '',\n\n state: 'Shutdown',\n /** 'iPhone 13 Pro' */\n name: device.name,\n /** Type of OS the device uses. */\n osType: device.platform === 'visionOS Simulator' ? 'xrOS' : 'iOS',\n /** '15.1' */\n osVersion: device.OS!,\n /** 'iPhone 13 Pro (15.1)' */\n windowName: `${device.name} (${device.OS})`,\n };\n}\n\nfunction coerceDestinationObjectToKnownDeviceType(device: Destination) {\n if (device.arch) {\n // physical device\n return coercePhysicalDevice(device);\n } else if (device.OS) {\n // simulator\n return coerceSimulatorDevice(device);\n } else {\n // \"Any device\"\n return null;\n }\n}\n\nexport async function resolveDestinationsAsync(\n props: Pick<BuildProps, 'configuration' | 'scheme' | 'xcodeProject'>\n): Promise<{ name: string; osType: OSType; osVersion: string; udid: string }[]> {\n // xcodebuild -workspace /Users/evanbacon/Documents/GitHub/lab/apr23/ios/apr23.xcworkspace -configuration Debug -scheme apr23 -showdestinations -json\n\n const { stdout } = await spawnAsync('xcodebuild', [\n props.xcodeProject.isWorkspace ? '-workspace' : '-project',\n props.xcodeProject.name,\n '-configuration',\n props.configuration,\n '-scheme',\n props.scheme,\n '-showdestinations',\n '-quiet',\n ]);\n\n // console.log(JSON.stringify(stdout, null, 2));\n\n const destinationObjects = parseXcodeDestinationString(stdout);\n\n return filterBoolean(destinationObjects.map(coerceDestinationObjectToKnownDeviceType));\n}\n"],"names":["resolveDestinationsAsync","debug","require","coerceDestinationPlatformToOsType","platform","filterBoolean","array","filter","Boolean","warnDestinationObject","obj","Log","warn","parseXcodeDestinationString","str","parsedLines","trim","split","map","line","startsWith","inner","match","Object","fromEntries","item","groups","key","value","coercePhysicalDevice","device","udid","id","name","deviceType","osType","osVersion","coerceSimulatorDevice","runtime","isAvailable","deviceTypeIdentifier","state","OS","windowName","coerceDestinationObjectToKnownDeviceType","arch","props","stdout","spawnAsync","xcodeProject","isWorkspace","configuration","scheme","destinationObjects"],"mappings":";;;;+BA0JsBA;;;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/options/appleDestinations.ts"],"sourcesContent":["import spawnAsync from '@expo/spawn-async';\n\nimport { Log } from '../../../log';\nimport { OSType } from '../../../start/platforms/ios/simctl';\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport { BuildProps } from '../XcodeBuild.types';\nimport * as AppleDevice from '../appleDevice/AppleDevice';\n\nconst debug = require('debug')('expo:apple-destination') as typeof console.log;\n\ninterface Destination {\n // 'visionOS'\n platform: string;\n // 'arm64'\n arch?: string;\n // 'Designed for [iPad,iPhone]'\n variant?: string;\n // '00008112-001A20EC1E78A01E'\n id: string;\n // 'Apple Vision Pro'\n name: string;\n // Available in simulators\n OS?: string;\n}\n\nfunction coerceDestinationPlatformToOsType(platform: string): OSType {\n // The only two devices I have to test against...\n switch (platform) {\n case 'iOS':\n return 'iOS';\n case 'xrOS':\n case 'visionOS':\n return 'xrOS';\n case 'macOS':\n return 'macOS';\n default:\n debug('Unknown destination platform (needs to be added to Expo CLI):', platform);\n return platform as OSType;\n }\n}\n\n// Runs `.filter(Boolean)` on the array with correct types.\nfunction filterBoolean<T>(array: (T | null | undefined)[]): T[] {\n return array.filter(Boolean) as T[];\n}\n\nfunction warnDestinationObject(obj: any): Destination | null {\n if (!obj || typeof obj !== 'object') {\n return null;\n }\n\n if ('platform' in obj && 'id' in obj && 'name' in obj) {\n return obj;\n }\n Log.warn('Unexpected xcode destination object:', obj);\n return null;\n}\n\nfunction parseXcodeDestinationString(str: string): Destination[] {\n const parsedLines = filterBoolean(\n str\n .trim()\n .split('\\n')\n .map((line: string) => {\n line = line.trim();\n return line.startsWith('{') ? line : null;\n })\n ).map((line) => {\n const inner = line.match(/{(.*)}/)?.[1];\n\n if (!inner) return null;\n\n return Object.fromEntries(\n filterBoolean(\n inner\n .trim()\n .split(', ')\n .map((item) => item.trim().match(/(?<key>[^:]+):(?<value>.+)/)?.groups)\n ).map((item) => [item!.key, item!.value])\n );\n });\n\n return filterBoolean(parsedLines.map(warnDestinationObject));\n}\n\nfunction coercePhysicalDevice(\n device: Destination\n): Pick<AppleDevice.ConnectedDevice, 'udid' | 'name' | 'osType' | 'deviceType' | 'osVersion'> {\n // physical device\n return {\n /** @example `00008101-001964A22629003A` */\n udid: device.id,\n /** @example `Evan's phone` */\n name: device.name,\n /** @example `iPhone13,4` */\n // model: 'UNKNOWN',\n /** @example `device` */\n deviceType: 'device',\n osType: coerceDestinationPlatformToOsType(device.platform),\n\n osVersion: '',\n };\n}\n\nfunction coerceSimulatorDevice(\n device: Destination\n): Pick<\n SimControl.Device,\n | 'udid'\n | 'name'\n | 'osType'\n | 'osVersion'\n | 'runtime'\n | 'isAvailable'\n | 'deviceTypeIdentifier'\n | 'state'\n | 'windowName'\n> {\n // simulator\n return {\n /** '00E55DC0-0364-49DF-9EC6-77BE587137D4' */\n udid: device.id,\n /** 'com.apple.CoreSimulator.SimRuntime.iOS-15-1' */\n runtime: '',\n /** If the device is \"available\" which generally means that the OS files haven't been deleted (this can happen when Xcode updates). */\n isAvailable: true,\n\n deviceTypeIdentifier: '',\n\n state: 'Shutdown',\n /** 'iPhone 13 Pro' */\n name: device.name,\n /** Type of OS the device uses. */\n osType: device.platform === 'visionOS Simulator' ? 'xrOS' : 'iOS',\n /** '15.1' */\n osVersion: device.OS!,\n /** 'iPhone 13 Pro (15.1)' */\n windowName: `${device.name} (${device.OS})`,\n };\n}\n\nfunction coerceDestinationObjectToKnownDeviceType(device: Destination) {\n if (device.arch) {\n // physical device\n return coercePhysicalDevice(device);\n } else if (device.OS) {\n // simulator\n return coerceSimulatorDevice(device);\n } else {\n // \"Any device\"\n return null;\n }\n}\n\nexport async function resolveDestinationsAsync(\n props: Pick<BuildProps, 'configuration' | 'scheme' | 'xcodeProject'>\n): Promise<{ name: string; osType: OSType; osVersion: string; udid: string }[]> {\n // xcodebuild -workspace /Users/evanbacon/Documents/GitHub/lab/apr23/ios/apr23.xcworkspace -configuration Debug -scheme apr23 -showdestinations -json\n\n const { stdout } = await spawnAsync('xcodebuild', [\n props.xcodeProject.isWorkspace ? '-workspace' : '-project',\n props.xcodeProject.name,\n '-configuration',\n props.configuration,\n '-scheme',\n props.scheme,\n '-showdestinations',\n '-quiet',\n ]);\n\n // console.log(JSON.stringify(stdout, null, 2));\n\n const destinationObjects = parseXcodeDestinationString(stdout);\n\n return filterBoolean(destinationObjects.map(coerceDestinationObjectToKnownDeviceType));\n}\n"],"names":["resolveDestinationsAsync","debug","require","coerceDestinationPlatformToOsType","platform","filterBoolean","array","filter","Boolean","warnDestinationObject","obj","Log","warn","parseXcodeDestinationString","str","parsedLines","trim","split","map","line","startsWith","inner","match","Object","fromEntries","item","groups","key","value","coercePhysicalDevice","device","udid","id","name","deviceType","osType","osVersion","coerceSimulatorDevice","runtime","isAvailable","deviceTypeIdentifier","state","OS","windowName","coerceDestinationObjectToKnownDeviceType","arch","props","stdout","spawnAsync","xcodeProject","isWorkspace","configuration","scheme","destinationObjects"],"mappings":"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"}
|
|
@@ -9,52 +9,48 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
formatDeviceChoice:
|
|
13
|
-
|
|
14
|
-
},
|
|
15
|
-
promptDeviceAsync: function() {
|
|
16
|
-
return promptDeviceAsync;
|
|
17
|
-
}
|
|
12
|
+
formatDeviceChoice: ()=>formatDeviceChoice,
|
|
13
|
+
promptDeviceAsync: ()=>promptDeviceAsync
|
|
18
14
|
});
|
|
19
15
|
function _chalk() {
|
|
20
|
-
const data = /*#__PURE__*/
|
|
16
|
+
const data = /*#__PURE__*/ _interopRequireDefault(require("chalk"));
|
|
21
17
|
_chalk = function() {
|
|
22
18
|
return data;
|
|
23
19
|
};
|
|
24
20
|
return data;
|
|
25
21
|
}
|
|
26
|
-
const _prompts = /*#__PURE__*/
|
|
27
|
-
function
|
|
22
|
+
const _prompts = /*#__PURE__*/ _interopRequireDefault(require("../../../utils/prompts"));
|
|
23
|
+
function _interopRequireDefault(obj) {
|
|
28
24
|
return obj && obj.__esModule ? obj : {
|
|
29
25
|
default: obj
|
|
30
26
|
};
|
|
31
27
|
}
|
|
32
28
|
function isConnectedDevice(item) {
|
|
33
|
-
return
|
|
29
|
+
return "deviceType" in item;
|
|
34
30
|
}
|
|
35
31
|
function isSimControlDevice(item) {
|
|
36
|
-
return
|
|
32
|
+
return "state" in item;
|
|
37
33
|
}
|
|
38
34
|
function formatDeviceChoice(item) {
|
|
39
|
-
const isConnected = isConnectedDevice(item) && item.deviceType ===
|
|
40
|
-
const isActive = isSimControlDevice(item) && item.state ===
|
|
41
|
-
const symbol = item.osType ===
|
|
35
|
+
const isConnected = isConnectedDevice(item) && item.deviceType === "device";
|
|
36
|
+
const isActive = isSimControlDevice(item) && item.state === "Booted";
|
|
37
|
+
const symbol = item.osType === "macOS" ? "\uD83D\uDDA5️ " : isConnected ? item.connectionType === "Network" ? "\uD83C\uDF10 " : "\uD83D\uDD0C " : "";
|
|
42
38
|
const format = isActive ? _chalk().default.bold : (text)=>text;
|
|
43
39
|
return {
|
|
44
|
-
title: `${symbol}${format(item.name)}${item.osVersion ? _chalk().default.dim(` (${item.osVersion})`) :
|
|
40
|
+
title: `${symbol}${format(item.name)}${item.osVersion ? _chalk().default.dim(` (${item.osVersion})`) : ""}`,
|
|
45
41
|
value: item.udid
|
|
46
42
|
};
|
|
47
43
|
}
|
|
48
44
|
async function promptDeviceAsync(devices) {
|
|
49
45
|
// --device with no props after
|
|
50
|
-
const { value
|
|
51
|
-
type:
|
|
52
|
-
name:
|
|
46
|
+
const { value } = await (0, _prompts.default)({
|
|
47
|
+
type: "autocomplete",
|
|
48
|
+
name: "value",
|
|
53
49
|
limit: 11,
|
|
54
|
-
message:
|
|
50
|
+
message: "Select a device",
|
|
55
51
|
choices: devices.map((item)=>formatDeviceChoice(item)),
|
|
56
52
|
suggest: (input, choices)=>{
|
|
57
|
-
const regex = new RegExp(input,
|
|
53
|
+
const regex = new RegExp(input, "i");
|
|
58
54
|
return choices.filter((choice)=>regex.test(choice.title));
|
|
59
55
|
}
|
|
60
56
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/options/promptDevice.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport prompt from '../../../utils/prompts';\nimport { ConnectedDevice } from '../appleDevice/AppleDevice';\n\ntype AnyDevice = SimControl.Device | ConnectedDevice;\n\nfunction isConnectedDevice(item: AnyDevice): item is ConnectedDevice {\n return 'deviceType' in item;\n}\n\nfunction isSimControlDevice(item: AnyDevice): item is SimControl.Device {\n return 'state' in item;\n}\n\n/** Format a device for the prompt list. Exposed for testing. */\nexport function formatDeviceChoice(item: AnyDevice): { title: string; value: string } {\n const isConnected = isConnectedDevice(item) && item.deviceType === 'device';\n const isActive = isSimControlDevice(item) && item.state === 'Booted';\n const symbol =\n item.osType === 'macOS'\n ? '🖥️ '\n : isConnected\n ? item.connectionType === 'Network'\n ? '🌐 '\n : '🔌 '\n : '';\n const format = isActive ? chalk.bold : (text: string) => text;\n return {\n title: `${symbol}${format(item.name)}${\n item.osVersion ? chalk.dim(` (${item.osVersion})`) : ''\n }`,\n value: item.udid,\n };\n}\n\n/** Prompt to select a device from a searchable list of devices. */\nexport async function promptDeviceAsync(devices: AnyDevice[]): Promise<AnyDevice> {\n // --device with no props after\n const { value } = await prompt({\n type: 'autocomplete',\n name: 'value',\n limit: 11,\n message: 'Select a device',\n choices: devices.map((item) => formatDeviceChoice(item)),\n suggest: (input: any, choices: any) => {\n const regex = new RegExp(input, 'i');\n return choices.filter((choice: any) => regex.test(choice.title));\n },\n });\n return devices.find((device) => device.udid === value)!;\n}\n"],"names":["formatDeviceChoice","promptDeviceAsync","isConnectedDevice","item","isSimControlDevice","isConnected","deviceType","isActive","state","symbol","osType","connectionType","format","chalk","bold","text","title","name","osVersion","dim","value","udid","devices","prompt","type","limit","message","choices","map","suggest","input","regex","RegExp","filter","choice","test","find","device"],"mappings":";;;;;;;;;;;IAiBgBA,kBAAkB;
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/options/promptDevice.ts"],"sourcesContent":["import chalk from 'chalk';\n\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport prompt from '../../../utils/prompts';\nimport { ConnectedDevice } from '../appleDevice/AppleDevice';\n\ntype AnyDevice = SimControl.Device | ConnectedDevice;\n\nfunction isConnectedDevice(item: AnyDevice): item is ConnectedDevice {\n return 'deviceType' in item;\n}\n\nfunction isSimControlDevice(item: AnyDevice): item is SimControl.Device {\n return 'state' in item;\n}\n\n/** Format a device for the prompt list. Exposed for testing. */\nexport function formatDeviceChoice(item: AnyDevice): { title: string; value: string } {\n const isConnected = isConnectedDevice(item) && item.deviceType === 'device';\n const isActive = isSimControlDevice(item) && item.state === 'Booted';\n const symbol =\n item.osType === 'macOS'\n ? '🖥️ '\n : isConnected\n ? item.connectionType === 'Network'\n ? '🌐 '\n : '🔌 '\n : '';\n const format = isActive ? chalk.bold : (text: string) => text;\n return {\n title: `${symbol}${format(item.name)}${\n item.osVersion ? chalk.dim(` (${item.osVersion})`) : ''\n }`,\n value: item.udid,\n };\n}\n\n/** Prompt to select a device from a searchable list of devices. */\nexport async function promptDeviceAsync(devices: AnyDevice[]): Promise<AnyDevice> {\n // --device with no props after\n const { value } = await prompt({\n type: 'autocomplete',\n name: 'value',\n limit: 11,\n message: 'Select a device',\n choices: devices.map((item) => formatDeviceChoice(item)),\n suggest: (input: any, choices: any) => {\n const regex = new RegExp(input, 'i');\n return choices.filter((choice: any) => regex.test(choice.title));\n },\n });\n return devices.find((device) => device.udid === value)!;\n}\n"],"names":["formatDeviceChoice","promptDeviceAsync","isConnectedDevice","item","isSimControlDevice","isConnected","deviceType","isActive","state","symbol","osType","connectionType","format","chalk","bold","text","title","name","osVersion","dim","value","udid","devices","prompt","type","limit","message","choices","map","suggest","input","regex","RegExp","filter","choice","test","find","device"],"mappings":"AAAA;;;;;;;;;;;IAiBgBA,kBAAkB,MAAlBA,kBAAkB;IAqBZC,iBAAiB,MAAjBA,iBAAiB;;;8DAtCrB,OAAO;;;;;;8DAGN,wBAAwB;;;;;;AAK3C,SAASC,iBAAiB,CAACC,IAAe,EAA2B;IACnE,OAAO,YAAY,IAAIA,IAAI,CAAC;AAC9B,CAAC;AAED,SAASC,kBAAkB,CAACD,IAAe,EAA6B;IACtE,OAAO,OAAO,IAAIA,IAAI,CAAC;AACzB,CAAC;AAGM,SAASH,kBAAkB,CAACG,IAAe,EAAoC;IACpF,MAAME,WAAW,GAAGH,iBAAiB,CAACC,IAAI,CAAC,IAAIA,IAAI,CAACG,UAAU,KAAK,QAAQ,AAAC;IAC5E,MAAMC,QAAQ,GAAGH,kBAAkB,CAACD,IAAI,CAAC,IAAIA,IAAI,CAACK,KAAK,KAAK,QAAQ,AAAC;IACrE,MAAMC,MAAM,GACVN,IAAI,CAACO,MAAM,KAAK,OAAO,GACnB,iBAAM,GACNL,WAAW,GACTF,IAAI,CAACQ,cAAc,KAAK,SAAS,GAC/B,eAAI,GACJ,eAAI,GACN,EAAE,AAAC;IACX,MAAMC,MAAM,GAAGL,QAAQ,GAAGM,MAAK,EAAA,QAAA,CAACC,IAAI,GAAG,CAACC,IAAY,GAAKA,IAAI,AAAC;IAC9D,OAAO;QACLC,KAAK,EAAE,CAAC,EAAEP,MAAM,CAAC,EAAEG,MAAM,CAACT,IAAI,CAACc,IAAI,CAAC,CAAC,EACnCd,IAAI,CAACe,SAAS,GAAGL,MAAK,EAAA,QAAA,CAACM,GAAG,CAAC,CAAC,EAAE,EAAEhB,IAAI,CAACe,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CACxD,CAAC;QACFE,KAAK,EAAEjB,IAAI,CAACkB,IAAI;KACjB,CAAC;AACJ,CAAC;AAGM,eAAepB,iBAAiB,CAACqB,OAAoB,EAAsB;IAChF,+BAA+B;IAC/B,MAAM,EAAEF,KAAK,CAAA,EAAE,GAAG,MAAMG,IAAAA,QAAM,QAAA,EAAC;QAC7BC,IAAI,EAAE,cAAc;QACpBP,IAAI,EAAE,OAAO;QACbQ,KAAK,EAAE,EAAE;QACTC,OAAO,EAAE,iBAAiB;QAC1BC,OAAO,EAAEL,OAAO,CAACM,GAAG,CAAC,CAACzB,IAAI,GAAKH,kBAAkB,CAACG,IAAI,CAAC,CAAC;QACxD0B,OAAO,EAAE,CAACC,KAAU,EAAEH,OAAY,GAAK;YACrC,MAAMI,KAAK,GAAG,IAAIC,MAAM,CAACF,KAAK,EAAE,GAAG,CAAC,AAAC;YACrC,OAAOH,OAAO,CAACM,MAAM,CAAC,CAACC,MAAW,GAAKH,KAAK,CAACI,IAAI,CAACD,MAAM,CAAClB,KAAK,CAAC,CAAC,CAAC;QACnE,CAAC;KACF,CAAC,AAAC;IACH,OAAOM,OAAO,CAACc,IAAI,CAAC,CAACC,MAAM,GAAKA,MAAM,CAAChB,IAAI,KAAKD,KAAK,CAAC,CAAE;AAC1D,CAAC"}
|
|
@@ -10,23 +10,19 @@ function _export(target, all) {
|
|
|
10
10
|
});
|
|
11
11
|
}
|
|
12
12
|
_export(exports, {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
},
|
|
16
|
-
resolveDeviceAsync: function() {
|
|
17
|
-
return resolveDeviceAsync;
|
|
18
|
-
}
|
|
13
|
+
resolveDeviceAsync: ()=>resolveDeviceAsync,
|
|
14
|
+
isSimulatorDevice: ()=>isSimulatorDevice
|
|
19
15
|
});
|
|
20
16
|
const _promptDevice = require("./promptDevice");
|
|
21
|
-
const _log = /*#__PURE__*/
|
|
22
|
-
const
|
|
17
|
+
const _log = /*#__PURE__*/ _interopRequireWildcard(require("../../../log"));
|
|
18
|
+
const _appleDeviceManager = require("../../../start/platforms/ios/AppleDeviceManager");
|
|
23
19
|
const _promptAppleDevice = require("../../../start/platforms/ios/promptAppleDevice");
|
|
24
|
-
const _simctl = /*#__PURE__*/
|
|
20
|
+
const _simctl = /*#__PURE__*/ _interopRequireWildcard(require("../../../start/platforms/ios/simctl"));
|
|
25
21
|
const _array = require("../../../utils/array");
|
|
26
22
|
const _errors = require("../../../utils/errors");
|
|
27
23
|
const _profile = require("../../../utils/profile");
|
|
28
24
|
const _hints = require("../../hints");
|
|
29
|
-
const
|
|
25
|
+
const _appleDevice = /*#__PURE__*/ _interopRequireWildcard(require("../appleDevice/AppleDevice"));
|
|
30
26
|
function _getRequireWildcardCache(nodeInterop) {
|
|
31
27
|
if (typeof WeakMap !== "function") return null;
|
|
32
28
|
var cacheBabelInterop = new WeakMap();
|
|
@@ -35,7 +31,7 @@ function _getRequireWildcardCache(nodeInterop) {
|
|
|
35
31
|
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
36
32
|
})(nodeInterop);
|
|
37
33
|
}
|
|
38
|
-
function
|
|
34
|
+
function _interopRequireWildcard(obj, nodeInterop) {
|
|
39
35
|
if (!nodeInterop && obj && obj.__esModule) {
|
|
40
36
|
return obj;
|
|
41
37
|
}
|
|
@@ -48,9 +44,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
48
44
|
if (cache && cache.has(obj)) {
|
|
49
45
|
return cache.get(obj);
|
|
50
46
|
}
|
|
51
|
-
var newObj = {
|
|
52
|
-
__proto__: null
|
|
53
|
-
};
|
|
47
|
+
var newObj = {};
|
|
54
48
|
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
55
49
|
for(var key in obj){
|
|
56
50
|
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
@@ -69,22 +63,22 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
69
63
|
return newObj;
|
|
70
64
|
}
|
|
71
65
|
// type AnyDevice = SimControl.Device | AppleDevice.ConnectedDevice;
|
|
72
|
-
/** Get a list of devices (called destinations) that are connected to the host machine. Filter by `osType` if defined. */ async function getDevicesAsync({ osType
|
|
66
|
+
/** Get a list of devices (called destinations) that are connected to the host machine. Filter by `osType` if defined. */ async function getDevicesAsync({ osType }) {
|
|
73
67
|
const devices = await (0, _promptAppleDevice.sortDefaultDeviceToBeginningAsync)((0, _array.uniqBy)((await Promise.all([
|
|
74
|
-
|
|
75
|
-
await (0, _profile.profile)(_simctl.getDevicesAsync)()
|
|
68
|
+
_appleDevice.getConnectedDevicesAsync(),
|
|
69
|
+
await (0, _profile.profile)(_simctl.getDevicesAsync)(),
|
|
76
70
|
])).flat(), (item)=>item.udid), osType);
|
|
77
71
|
// Sort devices to top of front of the list
|
|
78
72
|
const physical = [];
|
|
79
73
|
const simulators = devices.filter((device)=>{
|
|
80
|
-
if (
|
|
74
|
+
if ("isAvailable" in device) {
|
|
81
75
|
return true;
|
|
82
76
|
} else {
|
|
83
77
|
physical.push(device);
|
|
84
78
|
return false;
|
|
85
79
|
}
|
|
86
80
|
});
|
|
87
|
-
const isPhone = (a)=>a.osType ===
|
|
81
|
+
const isPhone = (a)=>a.osType === "iOS";
|
|
88
82
|
const sorted = [
|
|
89
83
|
...physical.sort((a, b)=>{
|
|
90
84
|
const aPhone = isPhone(a);
|
|
@@ -93,7 +87,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
93
87
|
if (!aPhone && bPhone) return 1;
|
|
94
88
|
return 0;
|
|
95
89
|
}),
|
|
96
|
-
...simulators
|
|
90
|
+
...simulators,
|
|
97
91
|
];
|
|
98
92
|
// If osType is defined, then filter out ineligible simulators.
|
|
99
93
|
// Only do this inside of the device selection so users who pass the entire device udid can attempt to select any simulator (even if it's invalid).
|
|
@@ -101,21 +95,21 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
101
95
|
}
|
|
102
96
|
/** @returns a list of devices, filtered by the provided `osType`. */ function filterDevicesForOsType(devices, osType) {
|
|
103
97
|
return devices.filter((device)=>{
|
|
104
|
-
if (osType ===
|
|
98
|
+
if (osType === "iOS") {
|
|
105
99
|
// Compatible devices for iOS builds
|
|
106
100
|
return [
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
101
|
+
"iOS",
|
|
102
|
+
"macOS",
|
|
103
|
+
"xrOS"
|
|
110
104
|
].includes(device.osType);
|
|
111
105
|
}
|
|
112
106
|
return device.osType === osType;
|
|
113
107
|
});
|
|
114
108
|
}
|
|
115
109
|
async function resolveDeviceAsync(device, buildProps) {
|
|
116
|
-
await
|
|
110
|
+
await _appleDeviceManager.AppleDeviceManager.assertSystemRequirementsAsync();
|
|
117
111
|
if (!device) {
|
|
118
|
-
/** Finds the first possible device and returns in a booted state. */ const manager = await
|
|
112
|
+
/** Finds the first possible device and returns in a booted state. */ const manager = await _appleDeviceManager.AppleDeviceManager.resolveAsync({
|
|
119
113
|
device: {
|
|
120
114
|
osType: buildProps.osType
|
|
121
115
|
}
|
|
@@ -129,13 +123,13 @@ async function resolveDeviceAsync(device, buildProps) {
|
|
|
129
123
|
return ensureBootedAsync(resolved);
|
|
130
124
|
}
|
|
131
125
|
function isSimulatorDevice(device) {
|
|
132
|
-
var
|
|
133
|
-
return !(
|
|
126
|
+
var ref;
|
|
127
|
+
return !("deviceType" in device) || !!((ref = device.deviceType) == null ? void 0 : ref.startsWith == null ? void 0 : ref.startsWith("com.apple.CoreSimulator.SimDeviceType."));
|
|
134
128
|
}
|
|
135
129
|
/** @returns device matching the `searchValue` against name or UDID. */ function findDeviceFromSearchValue(devices, searchValue) {
|
|
136
130
|
const device = devices.find((device)=>device.udid.toLowerCase() === searchValue || device.name.toLowerCase() === searchValue);
|
|
137
131
|
if (!device) {
|
|
138
|
-
throw new _errors.CommandError(
|
|
132
|
+
throw new _errors.CommandError("BAD_ARGS", `No device UDID or name matching "${searchValue}"`);
|
|
139
133
|
}
|
|
140
134
|
return device;
|
|
141
135
|
}
|
|
@@ -143,7 +137,7 @@ function isSimulatorDevice(device) {
|
|
|
143
137
|
// --device with no props after
|
|
144
138
|
(0, _hints.logDeviceArgument)(device.udid);
|
|
145
139
|
if (isSimulatorDevice(device)) {
|
|
146
|
-
return (0,
|
|
140
|
+
return (0, _appleDeviceManager.ensureSimulatorOpenAsync)({
|
|
147
141
|
udid: device.udid
|
|
148
142
|
});
|
|
149
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../../src/run/ios/options/resolveDevice.ts"],"sourcesContent":["// import { resolveDestinationsAsync } from './appleDestinations';\nimport { promptDeviceAsync } from './promptDevice';\nimport * as Log from '../../../log';\nimport {\n AppleDeviceManager,\n ensureSimulatorOpenAsync,\n} from '../../../start/platforms/ios/AppleDeviceManager';\nimport { sortDefaultDeviceToBeginningAsync } from '../../../start/platforms/ios/promptAppleDevice';\nimport { OSType } from '../../../start/platforms/ios/simctl';\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport { uniqBy } from '../../../utils/array';\nimport { CommandError } from '../../../utils/errors';\nimport { profile } from '../../../utils/profile';\nimport { logDeviceArgument } from '../../hints';\nimport { BuildProps } from '../XcodeBuild.types';\nimport * as AppleDevice from '../appleDevice/AppleDevice';\n\ntype AnyDevice = {\n name: string;\n osType: OSType;\n osVersion: string;\n udid: string;\n deviceType?: string;\n};\n// type AnyDevice = SimControl.Device | AppleDevice.ConnectedDevice;\n\n/** Get a list of devices (called destinations) that are connected to the host machine. Filter by `osType` if defined. */\nasync function getDevicesAsync({\n osType,\n // ...buildProps\n}: { osType?: OSType } & Pick<BuildProps, 'xcodeProject' | 'scheme' | 'configuration'>): Promise<\n AnyDevice[]\n> {\n const devices = await sortDefaultDeviceToBeginningAsync(\n uniqBy(\n (\n await Promise.all([\n AppleDevice.getConnectedDevicesAsync(),\n await profile(SimControl.getDevicesAsync)(),\n // resolveDestinationsAsync(buildProps),\n ])\n ).flat(),\n (item) => item.udid\n ),\n osType\n );\n\n // Sort devices to top of front of the list\n\n const physical: AnyDevice[] = [];\n\n const simulators = devices.filter((device) => {\n if ('isAvailable' in device) {\n return true;\n } else {\n physical.push(device);\n return false;\n }\n });\n\n const isPhone = (a: any) => a.osType === 'iOS';\n const sorted = [\n ...physical.sort((a, b) => {\n const aPhone = isPhone(a);\n const bPhone = isPhone(b);\n if (aPhone && !bPhone) return -1;\n if (!aPhone && bPhone) return 1;\n\n return 0;\n }),\n ...simulators,\n ];\n\n // If osType is defined, then filter out ineligible simulators.\n // Only do this inside of the device selection so users who pass the entire device udid can attempt to select any simulator (even if it's invalid).\n return osType ? filterDevicesForOsType(sorted, osType) : sorted;\n}\n\n/** @returns a list of devices, filtered by the provided `osType`. */\nfunction filterDevicesForOsType<TDevice extends { osType: OSType }>(\n devices: TDevice[],\n osType: OSType\n): TDevice[] {\n return devices.filter((device) => {\n if (osType === 'iOS') {\n // Compatible devices for iOS builds\n return ['iOS', 'macOS', 'xrOS'].includes(device.osType);\n }\n return device.osType === osType;\n });\n}\n\n/** Given a `device` argument from the CLI, parse and prompt our way to a usable device for building. */\nexport async function resolveDeviceAsync(\n device: string | boolean | undefined,\n buildProps: { osType?: OSType } & Pick<BuildProps, 'xcodeProject' | 'scheme' | 'configuration'>\n): Promise<AnyDevice> {\n await AppleDeviceManager.assertSystemRequirementsAsync();\n\n if (!device) {\n /** Finds the first possible device and returns in a booted state. */\n const manager = await AppleDeviceManager.resolveAsync({\n device: {\n osType: buildProps.osType,\n },\n });\n Log.debug(\n `Resolved default device (name: ${manager.device.name}, udid: ${manager.device.udid}, osType: ${buildProps.osType})`\n );\n return manager.device;\n }\n\n const devices = await getDevicesAsync(buildProps);\n\n const resolved =\n device === true\n ? // `--device` (no props after)\n // @ts-expect-error\n await promptDeviceAsync(devices)\n : // `--device <name|udid>`\n findDeviceFromSearchValue(devices, device.toLowerCase());\n\n return ensureBootedAsync(resolved);\n}\n\n/** @returns `true` if the given device is a simulator. */\nexport function isSimulatorDevice(device: AnyDevice): boolean {\n return (\n !('deviceType' in device) ||\n !!device.deviceType?.startsWith?.('com.apple.CoreSimulator.SimDeviceType.')\n );\n}\n\n/** @returns device matching the `searchValue` against name or UDID. */\nfunction findDeviceFromSearchValue(devices: AnyDevice[], searchValue: string): AnyDevice {\n const device = devices.find(\n (device) =>\n device.udid.toLowerCase() === searchValue || device.name.toLowerCase() === searchValue\n );\n if (!device) {\n throw new CommandError('BAD_ARGS', `No device UDID or name matching \"${searchValue}\"`);\n }\n return device;\n}\n\n/** Ensures the device is booted if it's a simulator. */\nasync function ensureBootedAsync(device: AnyDevice): Promise<AnyDevice> {\n // --device with no props after\n logDeviceArgument(device.udid);\n if (isSimulatorDevice(device)) {\n return ensureSimulatorOpenAsync({ udid: device.udid });\n }\n return device;\n}\n"],"names":["
|
|
1
|
+
{"version":3,"sources":["../../../../../src/run/ios/options/resolveDevice.ts"],"sourcesContent":["// import { resolveDestinationsAsync } from './appleDestinations';\nimport { promptDeviceAsync } from './promptDevice';\nimport * as Log from '../../../log';\nimport {\n AppleDeviceManager,\n ensureSimulatorOpenAsync,\n} from '../../../start/platforms/ios/AppleDeviceManager';\nimport { sortDefaultDeviceToBeginningAsync } from '../../../start/platforms/ios/promptAppleDevice';\nimport { OSType } from '../../../start/platforms/ios/simctl';\nimport * as SimControl from '../../../start/platforms/ios/simctl';\nimport { uniqBy } from '../../../utils/array';\nimport { CommandError } from '../../../utils/errors';\nimport { profile } from '../../../utils/profile';\nimport { logDeviceArgument } from '../../hints';\nimport { BuildProps } from '../XcodeBuild.types';\nimport * as AppleDevice from '../appleDevice/AppleDevice';\n\ntype AnyDevice = {\n name: string;\n osType: OSType;\n osVersion: string;\n udid: string;\n deviceType?: string;\n};\n// type AnyDevice = SimControl.Device | AppleDevice.ConnectedDevice;\n\n/** Get a list of devices (called destinations) that are connected to the host machine. Filter by `osType` if defined. */\nasync function getDevicesAsync({\n osType,\n // ...buildProps\n}: { osType?: OSType } & Pick<BuildProps, 'xcodeProject' | 'scheme' | 'configuration'>): Promise<\n AnyDevice[]\n> {\n const devices = await sortDefaultDeviceToBeginningAsync(\n uniqBy(\n (\n await Promise.all([\n AppleDevice.getConnectedDevicesAsync(),\n await profile(SimControl.getDevicesAsync)(),\n // resolveDestinationsAsync(buildProps),\n ])\n ).flat(),\n (item) => item.udid\n ),\n osType\n );\n\n // Sort devices to top of front of the list\n\n const physical: AnyDevice[] = [];\n\n const simulators = devices.filter((device) => {\n if ('isAvailable' in device) {\n return true;\n } else {\n physical.push(device);\n return false;\n }\n });\n\n const isPhone = (a: any) => a.osType === 'iOS';\n const sorted = [\n ...physical.sort((a, b) => {\n const aPhone = isPhone(a);\n const bPhone = isPhone(b);\n if (aPhone && !bPhone) return -1;\n if (!aPhone && bPhone) return 1;\n\n return 0;\n }),\n ...simulators,\n ];\n\n // If osType is defined, then filter out ineligible simulators.\n // Only do this inside of the device selection so users who pass the entire device udid can attempt to select any simulator (even if it's invalid).\n return osType ? filterDevicesForOsType(sorted, osType) : sorted;\n}\n\n/** @returns a list of devices, filtered by the provided `osType`. */\nfunction filterDevicesForOsType<TDevice extends { osType: OSType }>(\n devices: TDevice[],\n osType: OSType\n): TDevice[] {\n return devices.filter((device) => {\n if (osType === 'iOS') {\n // Compatible devices for iOS builds\n return ['iOS', 'macOS', 'xrOS'].includes(device.osType);\n }\n return device.osType === osType;\n });\n}\n\n/** Given a `device` argument from the CLI, parse and prompt our way to a usable device for building. */\nexport async function resolveDeviceAsync(\n device: string | boolean | undefined,\n buildProps: { osType?: OSType } & Pick<BuildProps, 'xcodeProject' | 'scheme' | 'configuration'>\n): Promise<AnyDevice> {\n await AppleDeviceManager.assertSystemRequirementsAsync();\n\n if (!device) {\n /** Finds the first possible device and returns in a booted state. */\n const manager = await AppleDeviceManager.resolveAsync({\n device: {\n osType: buildProps.osType,\n },\n });\n Log.debug(\n `Resolved default device (name: ${manager.device.name}, udid: ${manager.device.udid}, osType: ${buildProps.osType})`\n );\n return manager.device;\n }\n\n const devices = await getDevicesAsync(buildProps);\n\n const resolved =\n device === true\n ? // `--device` (no props after)\n // @ts-expect-error\n await promptDeviceAsync(devices)\n : // `--device <name|udid>`\n findDeviceFromSearchValue(devices, device.toLowerCase());\n\n return ensureBootedAsync(resolved);\n}\n\n/** @returns `true` if the given device is a simulator. */\nexport function isSimulatorDevice(device: AnyDevice): boolean {\n return (\n !('deviceType' in device) ||\n !!device.deviceType?.startsWith?.('com.apple.CoreSimulator.SimDeviceType.')\n );\n}\n\n/** @returns device matching the `searchValue` against name or UDID. */\nfunction findDeviceFromSearchValue(devices: AnyDevice[], searchValue: string): AnyDevice {\n const device = devices.find(\n (device) =>\n device.udid.toLowerCase() === searchValue || device.name.toLowerCase() === searchValue\n );\n if (!device) {\n throw new CommandError('BAD_ARGS', `No device UDID or name matching \"${searchValue}\"`);\n }\n return device;\n}\n\n/** Ensures the device is booted if it's a simulator. */\nasync function ensureBootedAsync(device: AnyDevice): Promise<AnyDevice> {\n // --device with no props after\n logDeviceArgument(device.udid);\n if (isSimulatorDevice(device)) {\n return ensureSimulatorOpenAsync({ udid: device.udid });\n }\n return device;\n}\n"],"names":["resolveDeviceAsync","isSimulatorDevice","getDevicesAsync","osType","devices","sortDefaultDeviceToBeginningAsync","uniqBy","Promise","all","AppleDevice","getConnectedDevicesAsync","profile","SimControl","flat","item","udid","physical","simulators","filter","device","push","isPhone","a","sorted","sort","b","aPhone","bPhone","filterDevicesForOsType","includes","buildProps","AppleDeviceManager","assertSystemRequirementsAsync","manager","resolveAsync","Log","debug","name","resolved","promptDeviceAsync","findDeviceFromSearchValue","toLowerCase","ensureBootedAsync","deviceType","startsWith","searchValue","find","CommandError","logDeviceArgument","ensureSimulatorOpenAsync"],"mappings":"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"}
|
|
@@ -9,42 +9,36 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
promptOrQueryNativeSchemeAsync: function() {
|
|
16
|
-
return promptOrQueryNativeSchemeAsync;
|
|
17
|
-
},
|
|
18
|
-
resolveNativeSchemePropsAsync: function() {
|
|
19
|
-
return resolveNativeSchemePropsAsync;
|
|
20
|
-
}
|
|
12
|
+
resolveNativeSchemePropsAsync: ()=>resolveNativeSchemePropsAsync,
|
|
13
|
+
promptOrQueryNativeSchemeAsync: ()=>promptOrQueryNativeSchemeAsync,
|
|
14
|
+
getDefaultNativeScheme: ()=>getDefaultNativeScheme
|
|
21
15
|
});
|
|
22
|
-
function
|
|
16
|
+
function _configPlugins() {
|
|
23
17
|
const data = require("@expo/config-plugins");
|
|
24
|
-
|
|
18
|
+
_configPlugins = function() {
|
|
25
19
|
return data;
|
|
26
20
|
};
|
|
27
21
|
return data;
|
|
28
22
|
}
|
|
29
23
|
function _chalk() {
|
|
30
|
-
const data = /*#__PURE__*/
|
|
24
|
+
const data = /*#__PURE__*/ _interopRequireDefault(require("chalk"));
|
|
31
25
|
_chalk = function() {
|
|
32
26
|
return data;
|
|
33
27
|
};
|
|
34
28
|
return data;
|
|
35
29
|
}
|
|
36
30
|
function _path() {
|
|
37
|
-
const data = /*#__PURE__*/
|
|
31
|
+
const data = /*#__PURE__*/ _interopRequireDefault(require("path"));
|
|
38
32
|
_path = function() {
|
|
39
33
|
return data;
|
|
40
34
|
};
|
|
41
35
|
return data;
|
|
42
36
|
}
|
|
43
|
-
const _log = /*#__PURE__*/
|
|
37
|
+
const _log = /*#__PURE__*/ _interopRequireWildcard(require("../../../log"));
|
|
44
38
|
const _errors = require("../../../utils/errors");
|
|
45
39
|
const _profile = require("../../../utils/profile");
|
|
46
40
|
const _prompts = require("../../../utils/prompts");
|
|
47
|
-
function
|
|
41
|
+
function _interopRequireDefault(obj) {
|
|
48
42
|
return obj && obj.__esModule ? obj : {
|
|
49
43
|
default: obj
|
|
50
44
|
};
|
|
@@ -57,7 +51,7 @@ function _getRequireWildcardCache(nodeInterop) {
|
|
|
57
51
|
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
58
52
|
})(nodeInterop);
|
|
59
53
|
}
|
|
60
|
-
function
|
|
54
|
+
function _interopRequireWildcard(obj, nodeInterop) {
|
|
61
55
|
if (!nodeInterop && obj && obj.__esModule) {
|
|
62
56
|
return obj;
|
|
63
57
|
}
|
|
@@ -70,9 +64,7 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
70
64
|
if (cache && cache.has(obj)) {
|
|
71
65
|
return cache.get(obj);
|
|
72
66
|
}
|
|
73
|
-
var newObj = {
|
|
74
|
-
__proto__: null
|
|
75
|
-
};
|
|
67
|
+
var newObj = {};
|
|
76
68
|
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
77
69
|
for(var key in obj){
|
|
78
70
|
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
@@ -90,47 +82,47 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
90
82
|
}
|
|
91
83
|
return newObj;
|
|
92
84
|
}
|
|
93
|
-
const debug = require(
|
|
85
|
+
const debug = require("debug")("expo:run:ios:options:resolveNativeScheme");
|
|
94
86
|
async function resolveNativeSchemePropsAsync(projectRoot, options, xcodeProject) {
|
|
95
87
|
return await promptOrQueryNativeSchemeAsync(projectRoot, options) ?? getDefaultNativeScheme(projectRoot, options, xcodeProject);
|
|
96
88
|
}
|
|
97
|
-
async function promptOrQueryNativeSchemeAsync(projectRoot, { scheme, configuration
|
|
98
|
-
const schemes =
|
|
89
|
+
async function promptOrQueryNativeSchemeAsync(projectRoot, { scheme , configuration }) {
|
|
90
|
+
const schemes = _configPlugins().IOSConfig.BuildScheme.getRunnableSchemesFromXcodeproj(projectRoot, {
|
|
99
91
|
configuration
|
|
100
92
|
});
|
|
101
93
|
if (!schemes.length) {
|
|
102
|
-
throw new _errors.CommandError(
|
|
94
|
+
throw new _errors.CommandError("IOS_MALFORMED", "No native iOS build schemes found");
|
|
103
95
|
}
|
|
104
96
|
if (scheme === true) {
|
|
105
97
|
if (schemes.length === 1) {
|
|
106
98
|
_log.log(`Auto selecting only available scheme: ${schemes[0].name}`);
|
|
107
99
|
return schemes[0];
|
|
108
100
|
}
|
|
109
|
-
const resolvedSchemeName = await (0, _prompts.selectAsync)(
|
|
110
|
-
const isApp = value.type ===
|
|
101
|
+
const resolvedSchemeName = await (0, _prompts.selectAsync)("Select a scheme", schemes.map((value)=>{
|
|
102
|
+
const isApp = value.type === _configPlugins().IOSConfig.Target.TargetType.APPLICATION && value.osType === "iOS";
|
|
111
103
|
return {
|
|
112
104
|
value: value.name,
|
|
113
|
-
title: isApp ? _chalk().default.bold(value.name) + _chalk().default.gray(
|
|
105
|
+
title: isApp ? _chalk().default.bold(value.name) + _chalk().default.gray(" (app)") : value.name
|
|
114
106
|
};
|
|
115
107
|
}), {
|
|
116
|
-
nonInteractiveHelp: `--scheme: argument must be provided with a string in non-interactive mode. Valid choices are: ${schemes.join(
|
|
108
|
+
nonInteractiveHelp: `--scheme: argument must be provided with a string in non-interactive mode. Valid choices are: ${schemes.join(", ")}`
|
|
117
109
|
});
|
|
118
|
-
return schemes.find(({ name
|
|
110
|
+
return schemes.find(({ name })=>resolvedSchemeName === name) ?? null;
|
|
119
111
|
}
|
|
120
112
|
// Attempt to match the schemes up so we can open the correct simulator
|
|
121
|
-
return scheme ? schemes.find(({ name
|
|
113
|
+
return scheme ? schemes.find(({ name })=>name === scheme) || {
|
|
122
114
|
name: scheme
|
|
123
115
|
} : null;
|
|
124
116
|
}
|
|
125
117
|
function getDefaultNativeScheme(projectRoot, options, xcodeProject) {
|
|
126
118
|
// If the resolution failed then we should just use the first runnable scheme that
|
|
127
119
|
// matches the provided configuration.
|
|
128
|
-
const resolvedSchemes = (0, _profile.profile)(
|
|
120
|
+
const resolvedSchemes = (0, _profile.profile)(_configPlugins().IOSConfig.BuildScheme.getRunnableSchemesFromXcodeproj)(projectRoot, {
|
|
129
121
|
configuration: options.configuration
|
|
130
122
|
});
|
|
131
123
|
// If there are multiple schemes, then the default should be the application.
|
|
132
124
|
if (resolvedSchemes.length > 1) {
|
|
133
|
-
const scheme = resolvedSchemes.find(({ type
|
|
125
|
+
const scheme = resolvedSchemes.find(({ type })=>type === _configPlugins().IOSConfig.Target.TargetType.APPLICATION) ?? resolvedSchemes[0];
|
|
134
126
|
debug(`Using default scheme: ${scheme.name}`);
|
|
135
127
|
return scheme;
|
|
136
128
|
}
|