docstring_tokens
stringlengths
18
16.9k
code_tokens
stringlengths
75
1.81M
html_url
stringlengths
74
116
file_name
stringlengths
3
311
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> @Override <mask> public void onResponse(Call call, Response response) throws IOException { <mask> if (response.isSuccessful()) { <mask> callback.onCachedResponse(call, response, false); <mask> logEventWithUri(Analytics.HTTP_USED_CACHE_RESPONSE, uri); <mask> } else { <mask> tryHardCodedResponse(uri, call, callback, initialResponse, initialException); <mask> } <mask> } </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove callback.onResponse(call, response); </s> add callback.onResponse(new ExpoResponse(response)); </s> remove public void onResponse(Call call, Response response) { </s> add public void onResponse(ExpoResponse response) { </s> remove public void onResponse(Call call, Response response) { callback.onResponse(call, response); </s> add public void onResponse(ExpoResponse response) { callback.onResponse(response); </s> remove callback.onResponse(call, response); </s> add callback.onResponse(new ExpoResponse(response)); </s> remove callback.onFailure(call, e); </s> add callback.onFailure(e); </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) {
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/exponent/network/ExponentHttpClient.java
keep keep keep keep replace keep keep keep keep keep
<mask> .code(200) <mask> .message("OK") <mask> .body(responseBodyForFile(embeddedResponse.responseFilePath, MediaType.parse(embeddedResponse.mediaType))) <mask> .build(); <mask> callback.onCachedResponse(call, response, true); <mask> logEventWithUri(Analytics.HTTP_USED_EMBEDDED_RESPONSE, uri); <mask> return; <mask> } <mask> } <mask> } catch (Throwable e) { </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove callback.onCachedResponse(call, response, false); </s> add callback.onCachedResponse(new ExpoResponse(response), false); </s> remove public void onResponse(Call call, Response response) { </s> add public void onResponse(ExpoResponse response) { </s> remove public void onCachedResponse(Call call, Response response, boolean isEmbedded) { </s> add public void onCachedResponse(ExpoResponse response, boolean isEmbedded) { </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onResponse(Call call, Response response) { callback.onResponse(call, response); </s> add public void onResponse(ExpoResponse response) { callback.onResponse(response);
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/exponent/network/ExponentHttpClient.java
keep keep keep replace keep replace keep keep
<mask> } <mask> <mask> if (initialResponse != null) { <mask> callback.onResponse(call, initialResponse); <mask> } else if (initialException != null) { <mask> callback.onFailure(call, initialException); <mask> } else { <mask> callback.onFailure(call, new IOException("No hard coded response found")); </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove callback.onFailure(call, new IOException("No hard coded response found")); </s> add callback.onFailure(new IOException("No hard coded response found")); </s> remove callback.onCachedResponse(call, response, false); </s> add callback.onCachedResponse(new ExpoResponse(response), false); </s> remove callback.onResponse(call, response); </s> add callback.onResponse(new ExpoResponse(response)); </s> remove callback.onFailure(call, e); </s> add callback.onFailure(e); </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) {
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/exponent/network/ExponentHttpClient.java
keep keep keep keep replace keep keep keep keep keep
<mask> callback.onResponse(call, initialResponse); <mask> } else if (initialException != null) { <mask> callback.onFailure(call, initialException); <mask> } else { <mask> callback.onFailure(call, new IOException("No hard coded response found")); <mask> } <mask> } <mask> <mask> private ResponseBody responseBodyForFile(final String assetsPath, final MediaType contentType) { <mask> try { </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove callback.onFailure(call, initialException); </s> add callback.onFailure(initialException); </s> remove callback.onResponse(call, initialResponse); </s> add callback.onResponse(new ExpoResponse(initialResponse)); </s> remove private void fetchManifestStep2(final String manifestUrl, final String manifestString, final Headers headers, final ManifestListener listener, final boolean isEmbedded, boolean isCached) throws JSONException { </s> add private void fetchManifestStep2(final String manifestUrl, final String manifestString, final ExpoResponse.ExpoHeaders headers, final ManifestListener listener, final boolean isEmbedded, boolean isCached) throws JSONException { </s> remove callback.onCachedResponse(call, response, false); </s> add callback.onCachedResponse(new ExpoResponse(response), false); </s> remove private void handleResponse(Response response, boolean isCached) { </s> add private void handleResponse(ExpoResponse response, boolean isCached) { </s> remove callback.onResponse(call, response); </s> add callback.onResponse(new ExpoResponse(response));
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/exponent/network/ExponentHttpClient.java
keep keep add keep keep keep keep keep keep
<mask> import host.exp.exponent.kernel.ExperienceId; <mask> import host.exp.exponent.kernel.ExponentUrls; <mask> import host.exp.exponent.kernel.KernelConstants; <mask> import host.exp.exponent.network.ExponentHttpClient; <mask> import host.exp.exponent.network.ExponentNetwork; <mask> import host.exp.exponent.storage.ExponentSharedPreferences; <mask> import host.exp.exponent.utils.PermissionsHelper; <mask> <mask> public class Exponent { </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> add import host.exp.exponent.network.ExpoResponse; </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove callback.onFailure(call, e); </s> add callback.onFailure(e); </s> remove public void onResponse(Call call, Response response) { </s> add public void onResponse(ExpoResponse response) {
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/expoview/Exponent.java
keep replace keep keep keep keep replace keep
<mask> @Override <mask> public void onFailure(Call call, IOException e) { <mask> bundleListener.onError(e); <mask> } <mask> <mask> @Override <mask> public void onResponse(Call call, Response response) { <mask> if (!response.isSuccessful()) { </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove callback.onFailure(call, e); </s> add callback.onFailure(e); </s> remove public void onFailure(Call call, IOException e) { </s> add public void onFailure(IOException e) { </s> remove public void onResponse(Call call, Response response) { </s> add public void onResponse(ExpoResponse response) {
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/expoview/Exponent.java
keep keep replace keep keep keep keep keep keep keep keep replace keep
<mask> <mask> @Override <mask> public void onCachedResponse(Call call, Response response, boolean isEmbedded) { <mask> EXL.d(TAG, "Using cached or embedded response."); <mask> onResponse(call, response); <mask> } <mask> }; <mask> <mask> @Override <mask> public void onCachedResponse(Call call, Response response, boolean isEmbedded) { <mask> EXL.d(TAG, "Using cached or embedded response."); <mask> onResponse(call, response); <mask> } </s> Make ExponentHttpClient mockable fbshipit-source-id: dd66794 </s> remove public void onResponse(Call call, Response response) { callback.onResponse(call, response); </s> add public void onResponse(ExpoResponse response) { callback.onResponse(response); </s> remove public void onResponse(Call call, Response response) { </s> add public void onResponse(ExpoResponse response) { </s> remove public void onCachedResponse(Call call, Response response, boolean isEmbedded) { callback.onCachedResponse(call, response, isEmbedded); </s> add public void onCachedResponse(ExpoResponse response, boolean isEmbedded) { callback.onCachedResponse(response, isEmbedded); </s> remove public void onCachedResponse(Call call, Response response, boolean isEmbedded) { </s> add public void onCachedResponse(ExpoResponse response, boolean isEmbedded) { </s> remove public void onCachedResponse(Call call, Response response, boolean isEmbedded) { </s> add public void onCachedResponse(ExpoResponse response, boolean isEmbedded) {
https://github.com/expo/expo/commit/b875c60e41432949567390bb8a7aa6f77f8d1a87
android/expoview/src/main/java/host/exp/expoview/Exponent.java
keep keep add keep keep keep keep keep
<mask> const app_plugin_2 = __importDefault(require("expo-dev-menu/app.plugin")); <mask> const fs_1 = __importDefault(require("fs")); <mask> const path_1 = __importDefault(require("path")); <mask> const withGeneratedAndroidScheme_1 = __importDefault(require("./withGeneratedAndroidScheme")); <mask> const withGeneratedIosScheme_1 = __importDefault(require("./withGeneratedIosScheme")); <mask> const pkg = require('expo-dev-client/package.json'); <mask> const REACT_NATIVE_CONFIG_JS = `// File created by expo-dev-client/app.plugin.js <mask> </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants';
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-client/plugin/build/withDevClient.js
keep keep keep keep replace keep keep keep keep keep
<mask> const filename = path_1.default.join(config.modRequest.projectRoot, 'react-native.config.js'); <mask> try { <mask> const config = fs_1.default.readFileSync(filename, 'utf8'); <mask> if (!config.includes('expo-dev-client/dependencies')) { <mask> throw new Error(`Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually.`); <mask> } <mask> } <mask> catch (error) { <mask> if (error.code === 'ENOENT') { <mask> // The file doesn't exist, so we create it. </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove `Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually.` </s> add `Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-client/plugin/build/withDevClient.js
keep keep keep add keep keep keep keep keep keep
<mask> import withDevMenu from 'expo-dev-menu/app.plugin'; <mask> import fs from 'fs'; <mask> import path from 'path'; <mask> <mask> import withGeneratedAndroidScheme from './withGeneratedAndroidScheme'; <mask> import withGeneratedIosScheme from './withGeneratedIosScheme'; <mask> <mask> const pkg = require('expo-dev-client/package.json'); <mask> <mask> const REACT_NATIVE_CONFIG_JS = `// File created by expo-dev-client/app.plugin.js </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants");
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-client/plugin/src/withDevClient.ts
keep keep keep keep replace keep keep keep keep keep
<mask> try { <mask> const config = fs.readFileSync(filename, 'utf8'); <mask> if (!config.includes('expo-dev-client/dependencies')) { <mask> throw new Error( <mask> `Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually.` <mask> ); <mask> } <mask> } catch (error) { <mask> if (error.code === 'ENOENT') { <mask> // The file doesn't exist, so we create it. </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove throw new Error(`Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually.`); </s> add throw new Error(`Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}`
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-client/plugin/src/withDevClient.ts
keep add keep keep keep keep keep
<mask> const path_1 = __importDefault(require("path")); <mask> const semver_1 = __importDefault(require("semver")); <mask> const resolveExpoUpdatesVersion_1 = require("./resolveExpoUpdatesVersion"); <mask> const withDevLauncherAppDelegate_1 = require("./withDevLauncherAppDelegate"); <mask> const pkg = require('expo-dev-launcher/package.json'); <mask> const DEV_LAUNCHER_ANDROID_IMPORT = 'expo.modules.devlauncher.DevLauncherController'; <mask> const DEV_LAUNCHER_UPDATES_ANDROID_IMPORT = 'expo.modules.updates.UpdatesDevLauncherController'; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants';
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncher.js
keep keep keep keep replace keep keep keep keep keep
<mask> const mainApplication = action(await readFileAsync(mainApplicationPath)); <mask> return await saveFileAsync(mainApplicationPath, mainApplication); <mask> } <mask> catch (e) { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`); <mask> } <mask> } <mask> async function editPodfile(config, action) { <mask> const podfilePath = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile'); <mask> try { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid( </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove `Couldn't modify MainApplication.java - ${e}.` </s> add `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${InstallationPage}` </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` );
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncher.js
keep keep keep keep replace keep keep keep keep keep
<mask> const podfile = action(await readFileAsync(podfilePath)); <mask> return await saveFileAsync(podfilePath, podfile); <mask> } <mask> catch (e) { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); <mask> } <mask> } <mask> async function editIndex(config, action) { <mask> const indexPath = path_1.default.join(config.modRequest.projectRoot, 'index.js'); <mask> try { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` );
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncher.js
keep keep keep keep replace keep keep keep keep keep
<mask> const index = action(await readFileAsync(indexPath)); <mask> return await saveFileAsync(indexPath, index); <mask> } <mask> catch (e) { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); <mask> } <mask> } <mask> const withDevLauncherApplication = (config) => { <mask> return config_plugins_1.withDangerousMod(config, [ <mask> 'android', </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` );
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncher.js
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> config.modResults.contents = content; <mask> } <mask> else { <mask> config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); <mask> } <mask> return config; <mask> }); <mask> }; <mask> const withDevLauncherPodfile = (config) => { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}`
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncher.js
keep keep add keep keep keep keep keep keep
<mask> exports.withDevLauncherAppDelegate = exports.modifyAppDelegate = void 0; <mask> const config_plugins_1 = require("@expo/config-plugins"); <mask> const semver_1 = __importDefault(require("semver")); <mask> const resolveExpoUpdatesVersion_1 = require("./resolveExpoUpdatesVersion"); <mask> const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = ` #if defined(EX_DEV_LAUNCHER_ENABLED) <mask> return [[EXDevLauncherController sharedInstance] sourceUrl]; <mask> #else <mask> return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; <mask> #endif`; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants");
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncherAppDelegate.js
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> config.modResults.contents = modifyAppDelegate(config.modResults.contents, expoUpdatesVersion); <mask> } <mask> else { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); <mask> } <mask> return config; <mask> }); <mask> }; <mask> exports.withDevLauncherAppDelegate = withDevLauncherAppDelegate; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}`
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/build/withDevLauncherAppDelegate.js
keep keep keep add keep keep keep keep keep
<mask> import fs from 'fs'; <mask> import path from 'path'; <mask> import semver from 'semver'; <mask> <mask> import { resolveExpoUpdatesVersion } from './resolveExpoUpdatesVersion'; <mask> import { withDevLauncherAppDelegate } from './withDevLauncherAppDelegate'; <mask> <mask> const pkg = require('expo-dev-launcher/package.json'); <mask> </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid(
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
keep keep keep replace keep replace keep keep
<mask> const mainApplication = action(await readFileAsync(mainApplicationPath)); <mask> return await saveFileAsync(mainApplicationPath, mainApplication); <mask> } catch (e) { <mask> WarningAggregator.addWarningIOS( <mask> 'expo-dev-launcher', <mask> `Couldn't modify MainApplication.java - ${e}.` <mask> ); <mask> } </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
keep keep keep keep replace keep keep keep keep keep
<mask> try { <mask> const podfile = action(await readFileAsync(podfilePath)); <mask> return await saveFileAsync(podfilePath, podfile); <mask> } catch (e) { <mask> WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); <mask> } <mask> } <mask> <mask> async function editIndex(config: ExportedConfigWithProps, action: (index: string) => string) { <mask> const indexPath = path.join(config.modRequest.projectRoot, 'index.js'); </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove `Couldn't modify MainApplication.java - ${e}.` </s> add `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${InstallationPage}` </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Couldn't modify MainApplication.java - ${e}. See the expo-dev-client installation instructions to modify your MainApplication.java manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` );
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
keep keep keep keep replace keep keep keep keep keep
<mask> try { <mask> const index = action(await readFileAsync(indexPath)); <mask> return await saveFileAsync(indexPath, index); <mask> } catch (e) { <mask> WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); <mask> } <mask> } <mask> <mask> const withDevLauncherApplication: ConfigPlugin = (config) => { <mask> return withDangerousMod(config, [ </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid( </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
keep keep keep keep replace keep keep keep keep keep
<mask> config.modResults.contents = content; <mask> } else { <mask> WarningAggregator.addWarningAndroid( <mask> 'expo-dev-launcher', <mask> `Cannot automatically configure MainActivity if it's not java` <mask> ); <mask> } <mask> <mask> return config; <mask> }); </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid(
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncher.ts
keep keep add keep keep keep keep keep
<mask> import { ConfigPlugin, WarningAggregator, withAppDelegate } from '@expo/config-plugins'; <mask> import semver from 'semver'; <mask> <mask> import { resolveExpoUpdatesVersion } from './resolveExpoUpdatesVersion'; <mask> <mask> const DEV_LAUNCHER_APP_DELEGATE_SOURCE_FOR_URL = ` #if defined(EX_DEV_LAUNCHER_ENABLED) <mask> return [[EXDevLauncherController sharedInstance] sourceUrl]; <mask> #else </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants");
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncherAppDelegate.ts
keep keep keep keep replace keep keep keep keep keep
<mask> ); <mask> } else { <mask> WarningAggregator.addWarningIOS( <mask> 'expo-dev-launcher', <mask> 'Swift AppDelegate files are not supported yet.' <mask> ); <mask> } <mask> return config; <mask> }); <mask> }; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid( </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-launcher/plugin/src/withDevLauncherAppDelegate.ts
keep keep add keep keep keep keep
<mask> const config_plugins_1 = require("@expo/config-plugins"); <mask> const fs_1 = __importDefault(require("fs")); <mask> const path_1 = __importDefault(require("path")); <mask> const withDevMenuAppDelegate_1 = require("./withDevMenuAppDelegate"); <mask> const pkg = require('expo-dev-menu/package.json'); <mask> const DEV_MENU_ANDROID_IMPORT = 'expo.modules.devmenu.react.DevMenuAwareReactActivity'; <mask> const DEV_MENU_ACTIVITY_CLASS = 'public class MainActivity extends DevMenuAwareReactActivity {'; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants"); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/build/withDevMenu.js
keep keep keep keep replace keep keep keep keep keep
<mask> const podfile = action(await readFileAsync(podfilePath)); <mask> return await saveFileAsync(podfilePath, podfile); <mask> } <mask> catch (e) { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); <mask> } <mask> } <mask> const withDevMenuActivity = (config) => { <mask> return config_plugins_1.withMainActivity(config, (config) => { <mask> if (config.modResults.language === 'java') { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` ); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/build/withDevMenu.js
keep keep keep keep replace keep keep keep keep keep
<mask> content = content.replace('public class MainActivity extends ReactActivity {', DEV_MENU_ACTIVITY_CLASS); <mask> config.modResults.contents = content; <mask> } <mask> else { <mask> config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); <mask> } <mask> return config; <mask> }); <mask> }; <mask> const withDevMenuPodfile = (config) => { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> add import { InstallationPage } from './constants'; </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/build/withDevMenu.js
keep add keep keep keep keep keep
<mask> exports.withDevMenuAppDelegate = exports.modifyAppDelegate = void 0; <mask> const config_plugins_1 = require("@expo/config-plugins"); <mask> const DEV_MENU_IOS_IMPORT = ` <mask> #if defined(EX_DEV_MENU_ENABLED) <mask> @import EXDevMenu; <mask> #endif`; <mask> const DEV_MENU_IOS_INIT = ` </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add const constants_1 = require("./constants");
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/build/withDevMenuAppDelegate.js
keep keep keep keep replace keep keep keep keep keep
<mask> if (config.modResults.language === 'objc') { <mask> config.modResults.contents = modifyAppDelegate(config.modResults.contents); <mask> } <mask> else { <mask> config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); <mask> } <mask> return config; <mask> }); <mask> }; <mask> exports.withDevMenuAppDelegate = withDevMenuAppDelegate; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/build/withDevMenuAppDelegate.js
keep keep keep add keep keep keep keep keep keep
<mask> import { ExpoConfig } from '@expo/config-types'; <mask> import fs from 'fs'; <mask> import path from 'path'; <mask> <mask> import { withDevMenuAppDelegate } from './withDevMenuAppDelegate'; <mask> <mask> const pkg = require('expo-dev-menu/package.json'); <mask> <mask> const DEV_MENU_ANDROID_IMPORT = 'expo.modules.devmenu.react.DevMenuAwareReactActivity'; <mask> const DEV_MENU_ACTIVITY_CLASS = 'public class MainActivity extends DevMenuAwareReactActivity {'; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/src/withDevMenu.ts
keep keep keep keep replace keep keep keep keep keep
<mask> const podfile = action(await readFileAsync(podfilePath)); <mask> <mask> return await saveFileAsync(podfilePath, podfile); <mask> } catch (e) { <mask> WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); <mask> } <mask> } <mask> <mask> const withDevMenuActivity: ConfigPlugin = (config) => { <mask> return withMainActivity(config, (config) => { </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Couldn't modified AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify AppDelegate.m - ${e}. See the expo-dev-client installation instructions to modify your AppDelegate.m manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add WarningAggregator.addWarningIOS( 'expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${InstallationPage}` ); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}.`); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Couldn't modify index.js - ${e}. See the expo-dev-client installation instructions to modify your index.js manually: ${constants_1.InstallationPage}`); </s> remove WarningAggregator.addWarningIOS( </s> add WarningAggregator.addWarningAndroid(
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/src/withDevMenu.ts
keep keep keep keep replace keep keep keep keep keep
<mask> config.modResults.contents = content; <mask> } else { <mask> WarningAggregator.addWarningAndroid( <mask> 'expo-dev-menu', <mask> `Cannot automatically configure MainActivity if it's not java` <mask> ); <mask> } <mask> <mask> return config; <mask> }); </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/src/withDevMenu.ts
keep add keep keep keep keep
<mask> import { ConfigPlugin, WarningAggregator, withAppDelegate } from '@expo/config-plugins'; <mask> <mask> const DEV_MENU_IOS_IMPORT = ` <mask> #if defined(EX_DEV_MENU_ENABLED) <mask> @import EXDevMenu; <mask> #endif`; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants"); </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add import { InstallationPage } from './constants'; </s> add const constants_1 = require("./constants");
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/src/withDevMenuAppDelegate.ts
keep keep keep keep replace keep keep keep keep keep
<mask> config.modResults.contents = modifyAppDelegate(config.modResults.contents); <mask> } else { <mask> WarningAggregator.addWarningIOS( <mask> 'expo-dev-menu', <mask> 'Swift AppDelegate files are not supported yet.' <mask> ); <mask> } <mask> return config; <mask> }); <mask> }; </s> [dev-client][plugins] Link to installation instructions in config plugin error messages (#14307) # Why Closes ENG-1839. # How Add a link to the installation instructions in the error message. </s> remove 'Swift AppDelegate files are not supported yet.' </s> add `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-menu', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', 'Swift AppDelegate files are not supported yet.'); </s> add config_plugins_1.WarningAggregator.addWarningIOS('expo-dev-launcher', `Swift AppDelegate files are not supported yet. See the expo-dev-client installation instructions to modify your AppDelegate manually: ${constants_1.InstallationPage}`); </s> remove `Cannot automatically configure MainActivity if it's not java` </s> add `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${InstallationPage}` </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-launcher', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`); </s> remove config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java`); </s> add config_plugins_1.WarningAggregator.addWarningAndroid('expo-dev-menu', `Cannot automatically configure MainActivity if it's not java. See the expo-dev-client installation instructions to modify your MainActivity manually: ${constants_1.InstallationPage}`);
https://github.com/expo/expo/commit/b96f6724b2a065d23db5417ce97d2677383e1567
packages/expo-dev-menu/plugin/src/withDevMenuAppDelegate.ts
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> <mask> // some files are absent on turtle builders and we don't want log errors there <mask> const isTurtle = !!process.env.TURTLE_WORKING_DIR_PATH; <mask> <mask> let isInUniverse = true; <mask> try { <mask> let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); <mask> if (universePkgJson.name !== 'universe') { <mask> isInUniverse = false; <mask> } <mask> } catch (e) { <mask> isInUniverse = false; <mask> } <mask> <mask> let useLegacyWorkflow = false; <mask> if (isInUniverse) { <mask> // determine workflow <mask> if (!fs.existsSync('../../.pt-state')) { <mask> useLegacyWorkflow = true; <mask> } <mask> } <mask> <mask> async function getSavedDevHomeUrlAsync(platform) { <mask> let devHomeConfig = await new JsonFile( <mask> path.join(EXPONENT_DIR, 'dev-home-config.json') <mask> ).readAsync(); <mask> return devHomeConfig.url; </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove } else if (isInUniverse) { </s> add } else { </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add </s> remove } else { return ''; </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/generate-dynamic-macros.js
keep keep keep keep replace keep keep keep keep keep
<mask> const macrosFuncs = { <mask> async TEST_APP_URI() { <mask> if (process.env.TEST_SUITE_URI) { <mask> return process.env.TEST_SUITE_URI; <mask> } else if (isInUniverse) { <mask> try { <mask> let testSuitePath = path.join(__dirname, '..', 'apps', 'test-suite'); <mask> let status = await Project.currentStatus(testSuitePath); <mask> if (status === 'running') { <mask> return await UrlUtils.constructManifestUrlAsync(testSuitePath); </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove } else { return ''; </s> add </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/generate-dynamic-macros.js
keep keep keep keep replace replace keep keep keep keep keep
<mask> } <mask> } catch (e) { <mask> return ''; <mask> } <mask> } else { <mask> return ''; <mask> } <mask> }, <mask> <mask> async TEST_CONFIG() { <mask> if (process.env.TEST_CONFIG) { </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove } else if (isInUniverse) { </s> add } else { </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/generate-dynamic-macros.js
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> <mask> async TEST_SERVER_URL() { <mask> let url = 'TODO'; <mask> <mask> if (isInUniverse) { <mask> try { <mask> let lanAddress = ip.address(); <mask> let localServerUrl = `http://${lanAddress}:3013`; <mask> let result = await request.get({ <mask> url: `${localServerUrl}/expo-test-server-status`, <mask> timeout: 500, // ms <mask> }); <mask> if (result.body === 'running!') { <mask> url = localServerUrl; <mask> } <mask> } catch (e) {} <mask> } <mask> <mask> return url; <mask> }, <mask> <mask> async TEST_RUN_ID() { </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove } else if (isInUniverse) { </s> add } else { </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add </s> remove } else { return ''; </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/generate-dynamic-macros.js
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep
<mask> if (process.env.SHELL_APP_BUILDER) { <mask> return ''; <mask> } <mask> <mask> let projectRoot; <mask> if (isInUniverse && useLegacyWorkflow) { <mask> projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); <mask> } else { <mask> projectRoot = path.join(EXPONENT_DIR, 'home'); <mask> } <mask> <mask> let manifest; <mask> try { <mask> let url = await UrlUtils.constructManifestUrlAsync(projectRoot); <mask> console.log( <mask> `Generating local kernel manifest from project root ${projectRoot} and url ${url}...` </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove } else if (isInUniverse) { </s> add } else { </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove } else { return ''; </s> add </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/generate-dynamic-macros.js
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> const fs = require('fs'); <mask> <mask> exports.startReactNativeServer = function startReactNativeServer(callback) { <mask> let rootPath = path.join(__dirname, '..'); <mask> let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); <mask> let isInUniverse = true; <mask> try { <mask> if (!fs.statSync(reactNativePath).isDirectory()) { <mask> isInUniverse = false; <mask> } <mask> } catch (e) { <mask> isInUniverse = false; <mask> } <mask> <mask> if (!isInUniverse) { <mask> reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); <mask> } <mask> <mask> let cliPath = path.join(reactNativePath, 'local-cli/cli.js'); <mask> <mask> let exponentPath = rootPath; <mask> let exponentReactPath = path.join(exponentPath, 'home'); <mask> let exponentAssetsPath = path.join(exponentPath, 'ios/Exponent/Images.xcassets'); </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> add let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove } else if (isInUniverse) { </s> add } else { </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/react-native-tasks.js
keep keep add keep keep keep keep keep keep
<mask> let exponentReactPath = path.join(exponentPath, 'home'); <mask> let exponentAssetsPath = path.join(exponentPath, 'ios/Exponent/Images.xcassets'); <mask> let exponentConfigPath = path.join(exponentReactPath, 'rn-cli.config.js'); <mask> <mask> let serverArgs = [ <mask> 'start', <mask> // '--root', exponentReactPath, <mask> // '--assetRoots', exponentAssetsPath, <mask> '--config', </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> add '--transformer', exponentTransformerPath, </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home'); </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/react-native-tasks.js
keep keep keep add keep keep keep keep
<mask> // '--assetRoots', exponentAssetsPath, <mask> '--config', <mask> exponentConfigPath, <mask> // '--reset-cache', <mask> ]; <mask> <mask> let serverOptions = { <mask> stdio: 'inherit', </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> remove if (isInUniverse) { let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); serverArgs.push('--transformer', exponentTransformerPath); } </s> add </s> add let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove let projectRoot; if (isInUniverse && useLegacyWorkflow) { projectRoot = path.join(EXPONENT_DIR, 'home', '__internal__'); } else { projectRoot = path.join(EXPONENT_DIR, 'home'); } </s> add let projectRoot = path.join(EXPONENT_DIR, 'home');
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/react-native-tasks.js
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> '--config', <mask> exponentConfigPath, <mask> // '--reset-cache', <mask> ]; <mask> if (isInUniverse) { <mask> let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); <mask> serverArgs.push('--transformer', exponentTransformerPath); <mask> } <mask> <mask> let serverOptions = { <mask> stdio: 'inherit', <mask> cwd: reactNativePath, <mask> }; </s> Make generate-dynamic-macros always take the "in Universe" code paths Closes expo/expo#2230 fbshipit-source-id: 1807cb8 </s> add '--transformer', exponentTransformerPath, </s> add let exponentTransformerPath = path.join(rootPath, 'react-native-lab/transformer.js'); </s> remove let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/'); let isInUniverse = true; try { if (!fs.statSync(reactNativePath).isDirectory()) { isInUniverse = false; } } catch (e) { isInUniverse = false; } if (!isInUniverse) { reactNativePath = path.join(rootPath, 'home/node_modules/react-native/'); } </s> add let reactNativePath = path.join(rootPath, 'react-native-lab/react-native/');isIn </s> remove if (isInUniverse) { try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} } </s> add try { let lanAddress = ip.address(); let localServerUrl = `http://${lanAddress}:3013`; let result = await request.get({ url: `${localServerUrl}/expo-test-server-status`, timeout: 500, // ms }); if (result.body === 'running!') { url = localServerUrl; } } catch (e) {} </s> remove let isInUniverse = true; try { let universePkgJson = require(process.env.UNIVERSE_PKG_JSON || '../../package.json'); if (universePkgJson.name !== 'universe') { isInUniverse = false; } } catch (e) { isInUniverse = false; } let useLegacyWorkflow = false; if (isInUniverse) { // determine workflow if (!fs.existsSync('../../.pt-state')) { useLegacyWorkflow = true; } } </s> add </s> remove } else if (isInUniverse) { </s> add } else {
https://github.com/expo/expo/commit/ba2bf82298f3421a9e87e3a374d7c6fac79b1d79
tools-public/react-native-tasks.js
replace replace keep keep keep keep keep
<mask> import styled, { keyframes, css } from 'react-emotion'; <mask> <mask> import Router from 'next/router'; <mask> <mask> import * as React from 'react'; <mask> import * as Constants from '~/common/constants'; <mask> import * as Utilities from '~/common/utilities'; </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> add import { css } from 'react-emotion'; </s> add state = { isFocused: false, }; </s> add position: relative; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove height: 32px; </s> add height: 36px; </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div>
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep add keep keep keep keep
<mask> import Router from 'next/router'; <mask> import * as React from 'react'; <mask> import * as Constants from '~/common/constants'; <mask> import * as Utilities from '~/common/utilities'; <mask> import { LATEST_VERSION } from '~/common/versions'; <mask> </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> remove import styled, { keyframes, css } from 'react-emotion'; </s> add </s> add state = { isFocused: false, }; </s> add position: relative; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove height: 32px; </s> add height: 36px; </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div>
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep add keep keep keep keep keep keep
<mask> <mask> const STYLES_INPUT = css` <mask> display: flex; <mask> align-items: flex-end; <mask> <mask> .searchbox { <mask> width: auto; <mask> } <mask> </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> add state = { isFocused: false, }; </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div> </s> remove height: 32px; </s> add height: 36px; </s> remove padding: 2px 36px 0 8px; </s> add padding: 2px 36px 0 14px; </s> add import { css } from 'react-emotion'; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); }
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep replace keep replace keep keep keep keep
<mask> font-size: 14px; <mask> padding: 2px 36px 0 8px; <mask> border-radius: 5px; <mask> height: 32px; <mask> outline: 0; <mask> border: 1px solid ${Constants.colors.border}; <mask> box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); <mask> </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div> </s> remove placeholder={`Search ${Utilities.getUserFacingVersionString(this.props.version)} docs`} </s> add placeholder="Search Expo Documentation" </s> add onFocus={() => this.setState({ isFocused: true })} onBlur={() => this.setState({ isFocused: false })} </s> add state = { isFocused: false, };
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep keep keep replace keep keep keep keep keep
<mask> border-radius: 5px; <mask> height: 32px; <mask> outline: 0; <mask> border: 1px solid ${Constants.colors.border}; <mask> box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); <mask> <mask> :focus { <mask> border: 1px solid ${Constants.colors.expo}; <mask> outline: 0; <mask> } </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> remove height: 32px; </s> add height: 36px; </s> remove padding: 2px 36px 0 8px; </s> add padding: 2px 36px 0 14px; </s> add state = { isFocused: false, }; </s> add import { css } from 'react-emotion'; </s> add position: relative; </s> remove import styled, { keyframes, css } from 'react-emotion'; </s> add
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep add keep keep keep keep
<mask> <mask> // TODO(jim): Not particularly happy with how this component chunks in while loading. <mask> class AlgoliaSearch extends React.Component { <mask> processUrl(url) { <mask> // Update URLs for new doc URLs <mask> var routes = url.split('/'); <mask> routes[routes.length - 1] = routes[routes.length - 1].replace('.html', ''); </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> add position: relative; </s> add import { css } from 'react-emotion'; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove import styled, { keyframes, css } from 'react-emotion'; </s> add </s> remove height: 32px; </s> add height: 36px; </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div>
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep add keep keep keep keep keep keep
<mask> return ( <mask> <div className={STYLES_INPUT} style={this.props.style}> <mask> <input <mask> id="algolia-search-box" <mask> type="text" <mask> placeholder="Search Expo Documentation" <mask> autoComplete="off" <mask> spellCheck="false" <mask> dir="auto" </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> remove placeholder={`Search ${Utilities.getUserFacingVersionString(this.props.version)} docs`} </s> add placeholder="Search Expo Documentation" </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div> </s> add state = { isFocused: false, }; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove height: 32px; </s> add height: 36px; </s> remove padding: 2px 36px 0 8px; </s> add padding: 2px 36px 0 14px;
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep keep keep replace keep keep keep keep keep
<mask> <div className={STYLES_INPUT} style={this.props.style}> <mask> <input <mask> id="algolia-search-box" <mask> type="text" <mask> placeholder={`Search ${Utilities.getUserFacingVersionString(this.props.version)} docs`} <mask> autoComplete="off" <mask> spellCheck="false" <mask> dir="auto" <mask> /> <mask> </div> </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> add onFocus={() => this.setState({ isFocused: true })} onBlur={() => this.setState({ isFocused: false })} </s> add <div className="shortcut-hint" style={{ display: this.state.isFocused ? 'none' : 'flex' }}> / </div> </s> add state = { isFocused: false, }; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove height: 32px; </s> add height: 36px; </s> remove padding: 2px 36px 0 8px; </s> add padding: 2px 36px 0 14px;
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep add keep keep keep keep keep keep
<mask> dir="auto" <mask> /> <mask> </div> <mask> ); <mask> } <mask> } <mask> <mask> export default AlgoliaSearch; </s> [docs] Add Apollo-docs style / shortcut indicator in search box </s> remove placeholder={`Search ${Utilities.getUserFacingVersionString(this.props.version)} docs`} </s> add placeholder="Search Expo Documentation" </s> add onFocus={() => this.setState({ isFocused: true })} onBlur={() => this.setState({ isFocused: false })} </s> add state = { isFocused: false, }; </s> remove box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.04); </s> add box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.08); :hover { border-color: rgba(0, 0, 0, 0.4); box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.4); } </s> remove height: 32px; </s> add height: 36px; </s> remove padding: 2px 36px 0 8px; </s> add padding: 2px 36px 0 14px;
https://github.com/expo/expo/commit/ba6250e5188c14188167aba8f21f201ccb403711
docs/components/plugins/AlgoliaSearch.js
keep keep add keep keep keep keep keep keep
<mask> 'expo-dev-menu-interface': { <mask> root: resolve('expo-dev-menu-interface'), <mask> }, <mask> }; <mask> <mask> function resolve(name) { <mask> return path.dirname( <mask> require.resolve(name + '/package.json', { <mask> paths: [__dirname], </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove "expo-dev-menu-interface": "~0.3.1" </s> add "expo-dev-menu-interface": "~0.3.1", "expo-updates-interface": "^0.0.1" </s> remove '(\\#[-a-z\\d_]*)?$', // fragment locator </s> add '(\\#[-a-z\\d_]*)?$', // fragment locator </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url)
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-client/dependencies.js
keep keep keep keep replace keep keep keep keep keep
<mask> "dependencies": { <mask> "@expo/config-plugins": "^2.0.0", <mask> "expo-dev-launcher": "~0.3.4", <mask> "expo-dev-menu": "~0.5.2", <mask> "expo-dev-menu-interface": "~0.3.1" <mask> }, <mask> "devDependencies": { <mask> "expo-module-scripts": "^2.0.0" <mask> }, <mask> "jest": { </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add 'expo-updates-interface': { root: resolve('expo-updates-interface'), }, </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-client/package.json
keep keep keep add keep keep keep keep
<mask> } <mask> <mask> dependencies { <mask> implementation project(":expo-dev-menu-interface") <mask> <mask> //noinspection GradleDynamicVersion <mask> implementation 'com.facebook.react:react-native:+' // From node_modules <mask> </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove '(\\#[-a-z\\d_]*)?$', // fragment locator </s> add '(\\#[-a-z\\d_]*)?$', // fragment locator </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) {
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/build.gradle
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
<mask> import com.facebook.react.ReactNativeHost <mask> import com.facebook.react.ReactPackage <mask> import com.facebook.react.bridge.ReactContext <mask> import expo.interfaces.devmenu.DevMenuManagerProviderInterface <mask> import expo.modules.devlauncher.helpers.changeUrlScheme <mask> import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl <mask> import expo.modules.devlauncher.helpers.getFieldInClassHierarchy <mask> import expo.modules.devlauncher.helpers.isDevLauncherUrl <mask> import expo.modules.devlauncher.helpers.runBlockingOnMainThread <mask> import expo.modules.devlauncher.launcher.DevLauncherActivity <mask> import expo.modules.devlauncher.launcher.DevLauncherClientHost <mask> import expo.modules.devlauncher.launcher.DevLauncherIntentRegistry <mask> import expo.modules.devlauncher.launcher.DevLauncherLifecycle <mask> import expo.modules.devlauncher.launcher.DevLauncherReactActivityDelegateSupplier </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> add import com.facebook.react.bridge.JSBundleLoader </s> add import android.net.Uri </s> remove import android.net.Uri </s> add </s> add import expo.modules.updatesinterface.UpdatesInterface
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep keep replace keep keep keep keep keep
<mask> import expo.modules.devlauncher.launcher.DevLauncherIntentRegistry <mask> import expo.modules.devlauncher.launcher.DevLauncherLifecycle <mask> import expo.modules.devlauncher.launcher.DevLauncherReactActivityDelegateSupplier <mask> import expo.modules.devlauncher.launcher.DevLauncherRecentlyOpenedAppsRegistry <mask> import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader <mask> import expo.modules.devlauncher.launcher.loaders.DevLauncherReactNativeAppLoader <mask> import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest <mask> import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser <mask> import expo.modules.devlauncher.launcher.menu.DevLauncherMenuDelegate <mask> import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityNOPDelegate </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> add import expo.modules.updatesinterface.UpdatesInterface </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> add import android.net.Uri </s> remove import android.net.Uri </s> add </s> add import com.facebook.react.bridge.JSBundleLoader
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep add keep keep keep keep
<mask> import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityNOPDelegate <mask> import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityRedirectDelegate <mask> import kotlinx.coroutines.GlobalScope <mask> import kotlinx.coroutines.launch <mask> import okhttp3.OkHttpClient <mask> </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> add import android.net.Uri </s> remove import android.net.Uri </s> add </s> add import com.facebook.react.bridge.JSBundleLoader
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep add keep keep keep keep keep keep
<mask> private val lifecycle = DevLauncherLifecycle() <mask> private val recentlyOpedAppsRegistry = DevLauncherRecentlyOpenedAppsRegistry(context) <mask> var manifest: DevLauncherManifest? = null <mask> private set <mask> val pendingIntentRegistry = DevLauncherIntentRegistry() <mask> var latestLoadedApp: Uri? = null <mask> var useDeveloperSupport = true <mask> <mask> internal enum class Mode { <mask> LAUNCHER, APP </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add var useDeveloperSupport = true </s> add // set useDeveloperSupport to true in case it was previously set to false from loading a published app val mUseDeveloperSupportField = instanceManager.javaClass.getDeclaredField("mUseDeveloperSupport") mUseDeveloperSupportField.isAccessible = true mUseDeveloperSupportField[instanceManager] = true </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> add fun isUsingDeveloperTool(): Boolean { return developer?.tool != null } </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep add keep keep keep keep keep
<mask> private set <mask> var updatesInterface: UpdatesInterface? = null <mask> val pendingIntentRegistry = DevLauncherIntentRegistry() <mask> var latestLoadedApp: Uri? = null <mask> <mask> internal enum class Mode { <mask> LAUNCHER, APP <mask> } <mask> </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add var updatesInterface: UpdatesInterface? = null </s> add fun isUsingDeveloperTool(): Boolean { return developer?.tool != null } </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> add // set useDeveloperSupport to true in case it was previously set to false from loading a published app val mUseDeveloperSupportField = instanceManager.javaClass.getDeclaredField("mUseDeveloperSupport") mUseDeveloperSupportField.isAccessible = true mUseDeveloperSupportField[instanceManager] = true </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader(
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep keep replace replace replace keep keep keep keep keep
<mask> <mask> suspend fun loadApp(url: Uri, mainActivity: ReactActivity? = null) { <mask> ensureHostWasCleared(appHost, activityToBeInvalidated = mainActivity) <mask> <mask> val parsedUrl = changeUrlScheme(url, "http") <mask> <mask> val manifestParser = DevLauncherManifestParser(httpClient, parsedUrl) <mask> val appIntent = createAppIntent() <mask> <mask> val appLoader = if (!manifestParser.isManifestUrl()) { <mask> // It's (maybe) a raw React Native bundle <mask> DevLauncherReactNativeAppLoader(url, appHost, context) </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep keep replace replace keep keep keep keep keep
<mask> val appLoader = if (!manifestParser.isManifestUrl()) { <mask> // It's (maybe) a raw React Native bundle <mask> DevLauncherReactNativeAppLoader(url, appHost, context) <mask> } else { <mask> manifest = manifestParser.parseManifest() <mask> DevLauncherExpoAppLoader(manifest!!, appHost, context) <mask> } <mask> <mask> val appLoaderListener = appLoader.createOnDelegateWillBeCreatedListener() <mask> lifecycle.addListener(appLoaderListener) <mask> mode = Mode.APP </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove val parsedUrl = changeUrlScheme(url, "http") val manifestParser = DevLauncherManifestParser(httpClient, parsedUrl) </s> add val manifestParser = DevLauncherManifestParser(httpClient, url) </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) {
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt
keep keep keep keep replace keep keep keep keep keep
<mask> package expo.modules.devlauncher.launcher.loaders <mask> <mask> import android.content.Context <mask> import android.content.Intent <mask> import android.net.Uri <mask> import androidx.lifecycle.Lifecycle <mask> import androidx.lifecycle.LifecycleObserver <mask> import androidx.lifecycle.OnLifecycleEvent <mask> import com.facebook.react.ReactActivity <mask> import com.facebook.react.ReactInstanceManager </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add import android.net.Uri </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader </s> add import expo.modules.updatesinterface.UpdatesInterface
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt
keep keep keep keep replace keep keep keep keep keep
<mask> import com.facebook.react.ReactInstanceManager <mask> import com.facebook.react.ReactNativeHost <mask> import com.facebook.react.bridge.ReactContext <mask> import expo.modules.devlauncher.DevLauncherController <mask> import expo.modules.devlauncher.helpers.injectReactInterceptor <mask> import kotlin.coroutines.Continuation <mask> import kotlin.coroutines.resume <mask> import kotlin.coroutines.suspendCoroutine <mask> <mask> /** </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> remove import android.net.Uri </s> add </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add import com.facebook.react.bridge.JSBundleLoader </s> add import android.net.Uri </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt
keep keep keep keep replace keep keep keep keep keep
<mask> } <mask> <mask> open suspend fun launch(intent: Intent): Boolean { <mask> return suspendCoroutine { callback -> <mask> if (injectReactInterceptor(getBundleUrl())) { <mask> continuation = callback <mask> launchIntent(intent) <mask> return@suspendCoroutine <mask> } <mask> callback.resume(false) </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove abstract fun getBundleUrl(): Uri </s> add </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> remove val parsedUrl = changeUrlScheme(url, "http") val manifestParser = DevLauncherManifestParser(httpClient, parsedUrl) </s> add val manifestParser = DevLauncherManifestParser(httpClient, url)
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt
keep keep keep keep replace replace keep keep keep keep keep
<mask> callback.resume(false) <mask> } <mask> } <mask> <mask> abstract fun getBundleUrl(): Uri <mask> <mask> protected open fun onDelegateWillBeCreated(activity: ReactActivity) = Unit <mask> protected open fun onCreate(activity: ReactActivity) = Unit <mask> protected open fun onReactContext(context: ReactContext) = Unit <mask> <mask> open fun getAppName(): String? { </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
<mask> open fun getAppName(): String? { <mask> return null <mask> } <mask> <mask> private fun injectReactInterceptor(url: Uri): Boolean { <mask> val debugServerHost = url.host + ":" + url.port <mask> // We need to remove "/" which is added to begin of the path by the Uri <mask> // and the bundle type <mask> val bundleName = if (url.path.isNullOrEmpty()) { <mask> "index" <mask> } else { <mask> url.path <mask> ?.substring(1) <mask> ?.replace(".bundle", "") <mask> ?: "index" <mask> } <mask> <mask> return injectReactInterceptor( <mask> context, <mask> appHost, <mask> debugServerHost, <mask> bundleName <mask> ) <mask> } <mask> <mask> private fun launchIntent(intent: Intent) { <mask> context.applicationContext.startActivity(intent) <mask> } <mask> } </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> add fun isUsingDeveloperTool(): Boolean { return developer?.tool != null } </s> remove abstract fun getBundleUrl(): Uri </s> add </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url)
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoader.kt
keep keep keep keep replace keep keep keep keep keep
<mask> import expo.modules.devlauncher.launcher.configurators.DevLauncherExpoActivityConfigurator <mask> import expo.modules.devlauncher.launcher.manifest.DevLauncherUserInterface <mask> import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest <mask> <mask> class DevLauncherExpoAppLoader( <mask> private val manifest: DevLauncherManifest, <mask> appHost: ReactNativeHost, <mask> context: Context, <mask> private val activityConfigurator: DevLauncherExpoActivityConfigurator = <mask> DevLauncherExpoActivityConfigurator(manifest, context) </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> add var updatesInterface: UpdatesInterface? = null
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherExpoAppLoader.kt
keep keep keep keep replace replace replace replace keep keep keep keep keep
<mask> context: Context, <mask> private val activityConfigurator: DevLauncherExpoActivityConfigurator = <mask> DevLauncherExpoActivityConfigurator(manifest, context) <mask> ) : DevLauncherAppLoader(appHost, context) { <mask> override fun getBundleUrl(): Uri { <mask> return Uri.parse(manifest.bundleUrl) <mask> } <mask> <mask> override fun onCreate(activity: ReactActivity) = with(activityConfigurator) { <mask> applyOrientation(activity) <mask> applyStatusBarConfiguration(activity) <mask> applyTaskDescription(activity) <mask> } </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> remove abstract fun getBundleUrl(): Uri </s> add </s> remove debugServerHost: String, appBundleName: String </s> add url: Uri </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherExpoAppLoader.kt
keep keep add keep keep keep keep keep
<mask> import android.content.Context <mask> import android.net.Uri <mask> import com.facebook.react.ReactNativeHost <mask> <mask> class DevLauncherReactNativeAppLoader( <mask> private val url: Uri, <mask> private val appHost: ReactNativeHost, <mask> private val context: Context </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> add import android.net.Uri </s> remove import android.net.Uri </s> add </s> add import com.facebook.react.bridge.JSBundleLoader
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherReactNativeAppLoader.kt
keep keep keep replace replace keep replace replace
<mask> <mask> class DevLauncherReactNativeAppLoader( <mask> private val url: Uri, <mask> appHost: ReactNativeHost, <mask> context: Context <mask> ) : DevLauncherAppLoader(appHost, context) { <mask> override fun getBundleUrl(): Uri { <mask> return url </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> remove debugServerHost: String, appBundleName: String </s> add url: Uri </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/debug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherReactNativeAppLoader.kt
keep keep add keep keep keep keep keep keep
<mask> package expo.modules.devlauncher.helpers <mask> <mask> import android.content.Context <mask> import android.util.Log <mask> import com.facebook.react.ReactNativeHost <mask> import com.facebook.react.ReactPackage <mask> import com.facebook.react.bridge.JSBundleLoader <mask> import expo.interfaces.devmenu.annotations.ContainsDevMenuExtension <mask> import expo.modules.devlauncher.react.DevLauncherDevSupportManagerSwapper </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add import com.facebook.react.bridge.JSBundleLoader </s> remove import android.net.Uri </s> add </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt
keep add keep keep keep keep
<mask> import com.facebook.react.ReactNativeHost <mask> import com.facebook.react.ReactPackage <mask> import expo.interfaces.devmenu.annotations.ContainsDevMenuExtension <mask> import expo.modules.devlauncher.react.DevLauncherDevSupportManagerSwapper <mask> import expo.modules.devlauncher.react.DevLauncherInternalSettings <mask> </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add import android.net.Uri </s> remove import expo.modules.devlauncher.helpers.changeUrlScheme import expo.modules.devlauncher.helpers.getAppUrlFromDevLauncherUrl import expo.modules.devlauncher.helpers.getFieldInClassHierarchy import expo.modules.devlauncher.helpers.isDevLauncherUrl import expo.modules.devlauncher.helpers.runBlockingOnMainThread </s> add import expo.modules.devlauncher.helpers.* </s> remove import expo.modules.devlauncher.helpers.injectReactInterceptor </s> add </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor </s> remove import expo.modules.devlauncher.launcher.loaders.DevLauncherExpoAppLoader </s> add import expo.modules.devlauncher.launcher.loaders.DevLauncherLocalAppLoader import expo.modules.devlauncher.launcher.loaders.DevLauncherPublishedAppLoader </s> remove import android.net.Uri </s> add
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> fun injectReactInterceptor( <mask> context: Context, <mask> reactNativeHost: ReactNativeHost, <mask> debugServerHost: String, <mask> appBundleName: String <mask> ): Boolean { <mask> injectDevSupportManager(reactNativeHost) <mask> <mask> return injectDebugServerHost( <mask> context, </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader(
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt
keep keep keep add keep keep keep keep keep
<mask> context: Context, <mask> reactNativeHost: ReactNativeHost, <mask> url: Uri <mask> ): Boolean { <mask> injectDevSupportManager(reactNativeHost) <mask> <mask> return injectDebugServerHost( <mask> context, <mask> reactNativeHost, </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove debugServerHost: String, appBundleName: String </s> add url: Uri </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt
keep add keep keep keep keep
<mask> mSettingsField.isAccessible = true <mask> mSettingsField[devServerHelper] = settings <mask> true <mask> } catch (e: Exception) { <mask> Log.e("DevLauncher", "Unable to inject debug server host settings.", e) <mask> false </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add var useDeveloperSupport = true </s> add var updatesInterface: UpdatesInterface? = null </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } } </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt
keep keep add keep keep keep keep
<mask> val translucent: Boolean? <mask> ) <mask> <mask> data class DevLauncherManifest( <mask> val name: String, <mask> val slug: String, <mask> val bundleUrl: String, </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove debugServerHost: String, appBundleName: String </s> add url: Uri </s> add fun isUsingDeveloperTool(): Boolean { return developer?.tool != null } </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove class DevLauncherExpoAppLoader( </s> add abstract class DevLauncherExpoAppLoader( </s> add val developer: DevLauncherManifestDeveloperSection?, </s> add import expo.modules.devlauncher.helpers.injectReactInterceptor
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifest.kt
keep keep add keep keep keep keep keep keep
<mask> <mask> val android: DevLauncherAndroidManifestSection?, <mask> <mask> val userInterfaceStyle: DevLauncherUserInterface?, <mask> val backgroundColor: String?, <mask> val primaryColor: String?, <mask> <mask> val androidStatusBar: DevLauncherStatusBarSection? <mask> ) { </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> add data class DevLauncherManifestDeveloperSection( val tool: String? ) </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifest.kt
keep add keep keep keep keep
<mask> private set <mask> <mask> /** <mask> * Class which contains all fields that the user can override in the android section. <mask> */ <mask> private data class DevLauncherOverriddenProperties( </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> add data class DevLauncherManifestDeveloperSection( val tool: String? ) </s> remove require(response.isSuccessful) { "Make sure that the metro bundler is running." } return response.header("Exponent-Server", null) != null </s> add // published projects should respond unsuccessfully to HEAD requests sent with no headers return !response.isSuccessful || response.header("Exponent-Server", null) != null </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> add var updatesInterface: UpdatesInterface? = null
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifest.kt
keep keep keep keep replace replace keep keep keep keep keep
<mask> private val url: Uri <mask> ) { <mask> suspend fun isManifestUrl(): Boolean { <mask> val response = fetch(url, "HEAD").await(httpClient) <mask> require(response.isSuccessful) { "Make sure that the metro bundler is running." } <mask> return response.header("Exponent-Server", null) != null <mask> } <mask> <mask> private suspend fun downloadManifest(): Reader { <mask> val response = fetch(url, "GET").await(httpClient) <mask> require(response.isSuccessful) </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add fun isUsingDeveloperTool(): Boolean { return developer?.tool != null } </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove appHost: ReactNativeHost, context: Context </s> add private val appHost: ReactNativeHost, private val context: Context </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifestParser.kt
keep keep keep replace keep replace keep keep keep keep
<mask> '^((\\w+)?:\\/\\/)?' + // protocol <mask> '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.?)+([a-z]{2,})?|' + // domain name <mask> '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address <mask> '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path <mask> '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string <mask> '(\\#[-a-z\\d_]*)?$', // fragment locator <mask> 'i' <mask> ); <mask> <mask> function validateURL(str: string): boolean { </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val appBundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } </s> remove private fun injectReactInterceptor(url: Uri): Boolean { val debugServerHost = url.host + ":" + url.port // We need to remove "/" which is added to begin of the path by the Uri // and the bundle type val bundleName = if (url.path.isNullOrEmpty()) { "index" } else { url.path ?.substring(1) ?.replace(".bundle", "") ?: "index" } return injectReactInterceptor( context, appHost, debugServerHost, bundleName ) } </s> add abstract fun injectBundleLoader(): Boolean </s> add 'expo-updates-interface': { root: resolve('expo-updates-interface'), }, </s> add implementation project(":expo-updates-interface") </s> remove val parsedUrl = changeUrlScheme(url, "http") val manifestParser = DevLauncherManifestParser(httpClient, parsedUrl) </s> add val manifestParser = DevLauncherManifestParser(httpClient, url)
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/bundle/components/UrlInput.tsx
keep add keep keep keep keep
<mask> placeholder="exp://192..." <mask> placeholderTextColor="#b0b0ba" <mask> autoCorrect={false} <mask> autoCompleteType="off" <mask> defaultValue={textInputUrl} <mask> onChangeText={text => { </s> [expo-dev-launcher][android] add ability to load published projects via expo-updates (#13031) </s> add 'expo-updates-interface': { root: resolve('expo-updates-interface'), }, </s> remove if (injectReactInterceptor(getBundleUrl())) { </s> add if (injectBundleLoader()) { </s> remove "expo-dev-menu-interface": "~0.3.1" </s> add "expo-dev-menu-interface": "~0.3.1", "expo-updates-interface": "^0.0.1" </s> remove override fun getBundleUrl(): Uri { return url </s> add override fun injectBundleLoader(): Boolean { return injectReactInterceptor(context, appHost, url) </s> remove override fun getBundleUrl(): Uri { return Uri.parse(manifest.bundleUrl) } </s> add </s> remove manifest = manifestParser.parseManifest() DevLauncherExpoAppLoader(manifest!!, appHost, context) </s> add if (updatesInterface == null) { manifest = manifestParser.parseManifest() if (!manifest!!.isUsingDeveloperTool()) { throw Exception("expo-updates is not properly installed or integrated. In order to load published projects with this development client, follow all installation and setup instructions for both the expo-dev-client and expo-updates packages.") } DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { val configuration = createUpdatesConfigurationWithUrl(url) val update = updatesInterface!!.loadUpdate(configuration, context) { manifest = DevLauncherManifest.fromJson(it.toString().reader()) return@loadUpdate !manifest!!.isUsingDeveloperTool() } if (manifest!!.isUsingDeveloperTool()) { DevLauncherLocalAppLoader(manifest!!, appHost, context) } else { useDeveloperSupport = false val localBundlePath = update.launchAssetPath DevLauncherPublishedAppLoader(manifest!!, localBundlePath, appHost, context) } }
https://github.com/expo/expo/commit/bab33af8854605d451f4e5e4d3b7b6ccf8d1d9bd
packages/expo-dev-launcher/bundle/components/UrlInput.tsx
keep keep keep keep replace keep keep keep keep keep
<mask> apply plugin: 'com.android.library' <mask> apply plugin: 'maven' <mask> <mask> group = 'org.unimodules' <mask> version = '2.0.0' <mask> <mask> def safeExtGet(prop, fallback) { <mask> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0' </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0' </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0' </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0' </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0' </s> remove version = '2.0.0' </s> add version = '3.0.0-rc.0'
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/core/android/build.gradle
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> defaultConfig { <mask> minSdkVersion safeExtGet("minSdkVersion", 21) <mask> targetSdkVersion safeExtGet("targetSdkVersion", 28) <mask> versionCode 5 <mask> versionName "2.0.0" <mask> } <mask> lintOptions { <mask> abortOnError false <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0" </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0" </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0" </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0" </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0" </s> remove versionCode 4 versionName "2.0.0" </s> add versionCode 5 versionName "3.0.0-rc.0"
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/core/android/build.gradle
keep keep replace keep keep keep keep keep
<mask> { <mask> "name": "@unimodules/core", <mask> "version": "2.0.0", <mask> "description": "Universal modules core", <mask> "main": "build/index.js", <mask> "types": "build/index.d.ts", <mask> "sideEffects": false, <mask> "scripts": { </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "version": "2.0.0", </s> add "version": "3.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0",
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/core/package.json
keep keep keep keep replace replace
<mask> }, <mask> "devDependencies": { <mask> "expo-module-scripts": "^1.0.0" <mask> }, <mask> "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" <mask> } </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" }
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/core/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> apply plugin: 'com.android.library' <mask> apply plugin: 'maven' <mask> <mask> group = 'org.unimodules' <mask> version = '2.0.0' <mask> <mask> def safeExtGet(prop, fallback) { <mask> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/react-native-adapter/android/build.gradle
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> defaultConfig { <mask> minSdkVersion safeExtGet("minSdkVersion", 21) <mask> targetSdkVersion safeExtGet("targetSdkVersion", 28) <mask> versionCode 7 <mask> versionName "2.0.0" <mask> } <mask> lintOptions { <mask> abortOnError false <mask> } <mask> } </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove versionCode 6 versionName "5.0.0" </s> add versionCode 7 versionName "6.0.0-rc.0" </s> remove versionCode 6 versionName "5.0.1" </s> add versionCode 7 versionName "6.0.0-rc.0" </s> remove versionCode 7 versionName "5.0.0" </s> add versionCode 8 versionName "6.0.0-rc.0" </s> remove versionCode 7 versionName "5.0.1" </s> add versionCode 8 versionName "6.0.0-rc.0" </s> remove versionCode 14 versionName "2.0.0" </s> add versionCode 15 versionName "3.0.0-rc.0" </s> remove versionCode 15 versionName "2.0.0" </s> add versionCode 16 versionName "3.0.0-rc.0"
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/react-native-adapter/android/build.gradle
keep keep replace keep keep keep keep keep
<mask> { <mask> "name": "@unimodules/react-native-adapter", <mask> "version": "2.0.0", <mask> "description": "The adapter to use universal modules with the React Native bridge", <mask> "main": "build/index.js", <mask> "types": "build/index.d.ts", <mask> "sideEffects": false, <mask> "scripts": { </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "version": "2.0.0", </s> add "version": "3.0.0-rc.0", </s> remove "version": "6.0.0-alpha.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0",
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/react-native-adapter/package.json
keep keep keep keep replace replace
<mask> "babel-preset-expo": "^5.0.0", <mask> "@unimodules/core": "^2.0.0-alpha.0", <mask> "expo-module-scripts": "^1.0.0" <mask> }, <mask> "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" <mask> } </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc" } </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc" } </s> remove "gitHead": "9119d190fbbf9f6a7a9c116e068d240e60e441fc", </s> add "gitHead": "6334f82adccb529e9347e348c874bd8f6a92cacc",
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/@unimodules/react-native-adapter/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> apply plugin: 'com.android.library' <mask> apply plugin: 'maven' <mask> <mask> group = 'host.exp.exponent' <mask> version = '5.0.0' <mask> <mask> def safeExtGet(prop, fallback) { <mask> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0' </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0' </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0' </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0' </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0' </s> remove version = '5.0.0' </s> add version = '6.0.0-rc.0'
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-admob/android/build.gradle
keep keep keep keep replace replace keep keep keep keep keep
<mask> <mask> defaultConfig { <mask> minSdkVersion safeExtGet("minSdkVersion", 21) <mask> targetSdkVersion safeExtGet("targetSdkVersion", 28) <mask> versionCode 15 <mask> versionName "5.0.0" <mask> } <mask> lintOptions { <mask> abortOnError false <mask> } <mask> } </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove versionCode 15 versionName "5.0.0" </s> add versionCode 16 versionName "6.0.0-rc.0" </s> remove versionCode 15 versionName "5.0.0" </s> add versionCode 16 versionName "6.0.0-rc.0" </s> remove versionCode 15 versionName "5.0.0" </s> add versionCode 16 versionName "6.0.0-rc.0" </s> remove versionCode 14 versionName "5.0.0" </s> add versionCode 15 versionName "6.0.0-rc.0" </s> remove versionCode 15 versionName "5.0.0" </s> add versionCode 16 versionName "6.0.0-rc.0" </s> remove versionCode 15 versionName "5.0.0" </s> add versionCode 16 versionName "6.0.0-rc.0"
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-admob/android/build.gradle
keep keep replace keep keep keep keep keep
<mask> { <mask> "name": "expo-ads-admob", <mask> "version": "5.0.0", <mask> "description": "Provides support for the Google AdMob SDK (https://www.google.com/admob/) for mobile advertising. This module is largely based of the react-native-admob (https://github.com/sbugert/react-native-admob) module, as the documentation and questions surrounding that module may prove helpful. A simple example implementing AdMob SDK can be found at https://github.com/deadcoder0904/expo-google-admob", <mask> "main": "build/index.js", <mask> "types": "build/index.d.ts", <mask> "sideEffects": false, <mask> "scripts": { </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0",
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-admob/package.json
keep keep keep keep replace replace
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-admob/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> apply plugin: 'com.android.library' <mask> apply plugin: 'maven' <mask> <mask> group = 'host.exp.exponent' <mask> version = '5.0.0' <mask> <mask> def safeExtGet(prop, fallback) { <mask> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-facebook/android/build.gradle
keep keep keep keep replace keep keep keep keep keep
<mask> <mask> defaultConfig { <mask> minSdkVersion safeExtGet("minSdkVersion", 21) <mask> targetSdkVersion safeExtGet("targetSdkVersion", 28) <mask> versionCode 5 <mask> versionName '1.0.0' <mask> } <mask> lintOptions { <mask> abortOnError false <mask> } </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove versionCode 4 </s> add versionCode 5 </s> remove versionCode 4 </s> add versionCode 5 </s> remove versionCode 5 </s> add versionCode 6 </s> remove versionCode 4 </s> add versionCode 5 </s> remove versionCode 4 </s> add versionCode 5 </s> remove versionCode 5 </s> add versionCode 6
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-facebook/android/build.gradle
keep keep replace keep keep keep keep keep
<mask> { <mask> "name": "expo-ads-facebook", <mask> "version": "5.0.0", <mask> "description": "Facebook Audience SDK integration", <mask> "main": "build/index.js", <mask> "types": "build/index.d.ts", <mask> "sideEffects": false, <mask> "scripts": { </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] </s> remove "version": "2.0.0", </s> add "version": "3.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "5.0.0", </s> add "version": "6.0.0-rc.0", </s> remove "version": "2.0.0", </s> add "version": "3.0.0-rc.0",
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-facebook/package.json
keep keep keep keep replace replace
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-ads-facebook/package.json
keep keep keep keep replace keep keep keep keep keep
<mask> apply plugin: 'com.android.library' <mask> apply plugin: 'maven' <mask> <mask> group = 'host.exp.exponent' <mask> version = '5.0.0' <mask> <mask> def safeExtGet(prop, fallback) { <mask> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback <mask> } <mask> </s> Publish prerelease packages @unimodules/[email protected] @unimodules/[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
https://github.com/expo/expo/commit/bf4f6f47acca99907a895a840aa1b1c626b375b1
packages/expo-analytics-amplitude/android/build.gradle