react-native-windows 0.0.0 → 0.0.1-0

package/.flowconfig

@@ -1,9 +1,8 @@
 [ignore]
 ; We fork some components by platform - ignore all platforms except windows
-.*/*[.]android.js
+.*/!(ProgressBarAndroid)[.]android.js
 .*/*[.]ios.js
 .*/*[.]macos.js
-.*/*[.]windesktop.js
 
 ; These modules have base components and Windows versions.
 ; Ideally we'd delete the base versions of files that had .windows overrides as part of the
@@ -11,27 +10,33 @@
 <PROJECT_ROOT>/index.js
 <PROJECT_ROOT>/Libraries/Alert/Alert.js
 <PROJECT_ROOT>/Libraries/Components/Button.js
-<PROJECT_ROOT>/Libraries/Components/Picker/Picker.js
 <PROJECT_ROOT>/Libraries/Components/Picker/RCTPickerNativeComponent.js
 <PROJECT_ROOT>/Libraries/Components/RefreshControl/RefreshControl.js
-<PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js
 <PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js
+<PROJECT_ROOT>/Libraries/Components/Touchable/Touchable.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableBounce.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableHighlight.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableOpacity.js
 <PROJECT_ROOT>/Libraries/Components/Touchable/TouchableWithoutFeedback.js
-<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewViewConfig.js
+<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewAttributes.js
 <PROJECT_ROOT>/Libraries/Components/View/ViewAccessibility.js
 <PROJECT_ROOT>/Libraries/Components/View/ViewPropTypes.js
 <PROJECT_ROOT>/Libraries/Components/View/View.js
 <PROJECT_ROOT>/Libraries/DeprecatedPropTypes/DeprecatedViewAccessibility.js
 <PROJECT_ROOT>/Libraries/Image/Image.js
+<PROJECT_ROOT>/Libraries/Image/resolveAssetSource.js
 <PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/DebugInstructions.js
 <PROJECT_ROOT>/Libraries/NewAppScreen/components/ReloadInstructions.js
 <PROJECT_ROOT>/Libraries/Pressability/Pressability.js
+<PROJECT_ROOT>/Libraries/Text/TextProps.js
 <PROJECT_ROOT>/Libraries/Types/CoreEventTypes.js
+<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js
+<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxInspectorHeader.js
+<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js
+<PROJECT_ROOT>/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js
+<PROJECT_ROOT>/Libraries/Utilities/Platform.flow.js
 
 ; Ignore react-native files in node_modules since they are copied into project root
 .*/node_modules/react-native/.*
@@ -45,26 +50,33 @@
 
 ; These files dont need to be checked and just increase the build time
 .*/node_modules/e2etest/.*
-.*/node_modules/microsoft-reactnative-sampleapps/.*
+.*/node_modules/sample-apps/.*
 .*/node_modules/playground/.*
 
 ; Ignore templates for 'react-native init'
-<PROJECT_ROOT>/template/.*
+<PROJECT_ROOT>/packages/react-native/template/.*
 
 ; Ignore the Dangerfile
-<PROJECT_ROOT>/bots/dangerfile.js
+<PROJECT_ROOT>/packages/react-native-bots/dangerfile.js
 
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
-; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
-.*/vnext/src/.*
+; Ignore the src-win folder - flow files are combined with ones from react-native into the root Libraries folder
+.*/vnext/src-win/.*
 
-; Ignore RN copies, which cause duplicate violations to be shown
-.*/vnext/ReactCopies/.*
+; Ignore the private __tests__ (until this is fixed: https://github.com/facebook/react-native/issues/43242)
+.*/vnext/src/private/.*/__tests__/.*
+
+.*/node_modules/resolve/test/resolver/malformed_package_json/package\.json$
+
+; Checked-in build output
+<PROJECT_ROOT>/packages/debugger-frontend/dist/
+
+; Generated build output
+<PROJECT_ROOT>/packages/.*/dist
 
 [untyped]
-<PROJECT_ROOT>/Libraries/DeprecatedPropTypes/.*
 .*/node_modules/@react-native-community/cli/.*/.*
 
 [include]
@@ -74,22 +86,35 @@
 [libs]
 interface.js
 flow/
+../node_modules/.flow/flow-typed/
 
 [options]
+experimental.global_find_ref=true
+enums=true
+casting_syntax=both
+
 emoji=true
 
 exact_by_default=true
 
+format.bracket_spacing=false
+
 module.file_ext=.js
 module.file_ext=.json
 module.file_ext=.windows.js
 
+;[Windows]
+;experimental.multi_platform=true
+;experimental.multi_platform.extensions=.ios
+;experimental.multi_platform.extensions=.android
+
 munge_underscores=true
 
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.windows.js'
 module.name_mapper='^react-native-windows$' -> '<PROJECT_ROOT>/index.windows.js'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
 module.name_mapper='^react-native-windows/\(.*\)$' -> '<PROJECT_ROOT>/\1'
+module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/\1'
 module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
 
 suppress_type=$FlowIssue
@@ -98,7 +123,7 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-experimental.abstract_locations=true
+sharedmemory.hash_table_pow=21
 
 [lints]
 sketchy-null-number=warn
@@ -106,10 +131,10 @@ sketchy-null-mixed=warn
 sketchy-number=warn
 untyped-type-import=warn
 nonstrict-import=warn
-deprecated-type=warn
+deprecated-type=error
 unsafe-getters-setters=warn
 unnecessary-invariant=warn
-signature-verification-failure=warn
+unused-promise=error
 
 [strict]
 deprecated-type
@@ -121,4 +146,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.138.0
+^0.229.2

package/Chakra/Chakra.vcxitems

@@ -13,9 +13,7 @@
   <ItemGroup>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraExecutor.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraHelpers.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraNativeModules.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraPlatform.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraTracing.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraUtils.cpp" />
@@ -23,11 +21,8 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)Utf8DebugExtensions.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraCoreDebugger.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraExecutor.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraHelpers.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraInstanceArgs.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraNativeModules.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraPlatform.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraTracing.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraUtils.h" />

package/Chakra/Chakra.vcxitems.filters

@@ -1,15 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraExecutor.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraHelpers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)ChakraNativeModules.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)ChakraPlatform.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -27,21 +21,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraCoreDebugger.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraExecutor.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraHelpers.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraInstanceArgs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)ChakraNativeModules.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="$(MSBuildThisFileDirectory)ChakraPlatform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -66,4 +51,4 @@
       <UniqueIdentifier>{0dfeba50-d70d-48b9-aae9-cc2583d59b72}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

package/Chakra/ChakraHelpers.cpp

@@ -31,197 +31,6 @@
 namespace facebook {
 namespace react {
 
-#if !defined(USE_EDGEMODE_JSRT)
-namespace {
-
-template <class T>
-size_t fwrite(T *p, size_t count, FILE *file) noexcept {
-  static_assert(std::is_trivially_copyable<T>::value, "T must be trivially copyable to be serialized into a file");
-  return fwrite(p, sizeof(*p), count, file);
-}
-
-template <class T>
-bool fwrite(const T &val, FILE *file) noexcept {
-  return fwrite(&val, 1, file) == 1;
-}
-
-#if !defined(CHAKRACORE_UWP)
-struct FileVersionInfoResource {
-  uint16_t len;
-  uint16_t valLen;
-  uint16_t type;
-  wchar_t key[_countof(L"VS_VERSION_INFO")];
-  uint16_t padding1;
-  VS_FIXEDFILEINFO fixedFileInfo;
-  uint32_t padding2;
-};
-#endif
-class ChakraVersionInfo {
- public:
-  ChakraVersionInfo() noexcept : m_fileVersionMS{0}, m_fileVersionLS{0}, m_productVersionMS{0}, m_productVersionLS{0} {}
-
-  bool initialize() noexcept {
-#if !defined(CHAKRACORE_UWP)
-    // This code is win32 only at the moment. We will need to change this
-    // line if we want to support UWP.
-    constexpr wchar_t chakraDllName[] = L"ChakraCore.dll";
-
-    auto freeLibraryWrapper = [](void *p) { FreeLibrary((HMODULE)p); };
-    HMODULE moduleHandle;
-    if (!GetModuleHandleExW(0, chakraDllName, &moduleHandle)) {
-      return false;
-    }
-    std::unique_ptr<void, decltype(freeLibraryWrapper)> moduleHandleWrapper(
-        moduleHandle, std::move(freeLibraryWrapper));
-
-    HRSRC versionResourceHandle = FindResourceW(moduleHandle, MAKEINTRESOURCE(VS_VERSION_INFO), RT_VERSION);
-    if (!versionResourceHandle ||
-        SizeofResource(static_cast<HMODULE>(moduleHandleWrapper.get()), versionResourceHandle) <
-            sizeof(FileVersionInfoResource)) {
-      return false;
-    }
-
-    HGLOBAL versionResourcePtrHandle = LoadResource(moduleHandle, versionResourceHandle);
-    if (!versionResourcePtrHandle) {
-      return false;
-    }
-
-    FileVersionInfoResource *chakraVersionInfo =
-        static_cast<FileVersionInfoResource *>(LockResource(versionResourcePtrHandle));
-    if (!chakraVersionInfo) {
-      return false;
-    }
-
-    m_fileVersionMS = chakraVersionInfo->fixedFileInfo.dwFileVersionMS;
-    m_fileVersionLS = chakraVersionInfo->fixedFileInfo.dwFileVersionLS;
-    m_productVersionMS = chakraVersionInfo->fixedFileInfo.dwProductVersionMS;
-    m_productVersionLS = chakraVersionInfo->fixedFileInfo.dwProductVersionLS;
-#endif
-    return true;
-  }
-
-  bool operator==(const ChakraVersionInfo &rhs) const noexcept {
-    return (m_fileVersionMS == rhs.m_fileVersionMS) && (m_fileVersionLS == rhs.m_fileVersionLS) &&
-        (m_productVersionMS == rhs.m_productVersionMS) && (m_productVersionLS == rhs.m_productVersionLS);
-  }
-
-  bool operator!=(const ChakraVersionInfo &rhs) const noexcept {
-    return !(*this == rhs);
-  }
-
- private:
-  uint32_t m_fileVersionMS;
-  uint32_t m_fileVersionLS;
-  uint32_t m_productVersionMS;
-  uint32_t m_productVersionLS;
-};
-
-class BytecodePrefix {
- public:
-  static std::pair<bool, BytecodePrefix> getBytecodePrefix(uint64_t bundleVersion) noexcept {
-    std::pair<bool, BytecodePrefix> result{false, BytecodePrefix{bundleVersion}};
-    result.first = result.second.m_chakraVersionInfo.initialize();
-    return result;
-  }
-
-  bool operator==(const BytecodePrefix &rhs) const noexcept {
-    return (m_bytecodeFileFormatVersion == rhs.m_bytecodeFileFormatVersion) &&
-        (m_bundleVersion == rhs.m_bundleVersion) && (m_chakraVersionInfo == rhs.m_chakraVersionInfo);
-  }
-
-  bool operator!=(const BytecodePrefix &rhs) const noexcept {
-    return !(*this == rhs);
-  }
-
- private:
-  uint64_t m_bytecodeFileFormatVersion;
-  uint64_t m_bundleVersion;
-  ChakraVersionInfo m_chakraVersionInfo;
-
-  static constexpr uint32_t s_bytecodeFileFormatVersion = 2;
-
-  BytecodePrefix(uint64_t bundleVersion) noexcept
-      : m_bytecodeFileFormatVersion{s_bytecodeFileFormatVersion},
-        m_bundleVersion{bundleVersion},
-        m_chakraVersionInfo{} {}
-};
-
-void serializeBytecodeToFileCore(
-    const std::shared_ptr<const JSBigString> &script,
-    const BytecodePrefix &bytecodePrefix,
-    const std::string &bytecodeFileName) {
-  FILE *bytecodeFilePtr;
-  // bytecode is a binary representation, so we need to pass in the "b" flag to
-  // fopen_s
-  if (_wfopen_s(&bytecodeFilePtr, Microsoft::Common::Unicode::Utf8ToUtf16(bytecodeFileName).c_str(), L"wb")) {
-    return;
-  }
-  std::unique_ptr<FILE, decltype(&fclose)> bytecodeFilePtrWrapper(bytecodeFilePtr, fclose);
-
-  const std::wstring scriptUTF16 = Microsoft::Common::Unicode::Utf8ToUtf16(script->c_str(), script->size());
-
-  unsigned int bytecodeSize = 0;
-  if (JsSerializeScript(scriptUTF16.c_str(), nullptr, &bytecodeSize) != JsNoError) {
-    return;
-  }
-
-  std::unique_ptr<uint8_t[]> bytecode(std::make_unique<uint8_t[]>(bytecodeSize));
-  if (JsSerializeScript(scriptUTF16.c_str(), bytecode.get(), &bytecodeSize) != JsNoError) {
-    return;
-  }
-
-  constexpr size_t bytecodePrefixSize = sizeof(bytecodePrefix);
-  uint8_t zeroArray[sizeof(bytecodePrefix)]{};
-
-  if (fwrite(zeroArray, bytecodePrefixSize, bytecodeFilePtrWrapper.get()) != bytecodePrefixSize ||
-      fwrite(bytecode.get(), bytecodeSize, bytecodeFilePtrWrapper.get()) != bytecodeSize ||
-      fflush(bytecodeFilePtrWrapper.get())) {
-    return;
-  }
-
-  fseek(bytecodeFilePtrWrapper.get(), 0, SEEK_SET);
-  if (!fwrite(bytecodePrefix, bytecodeFilePtrWrapper.get()) || fflush(bytecodeFilePtrWrapper.get())) {
-    return;
-  }
-}
-
-std::unique_ptr<JSBigString> tryGetBytecode(const BytecodePrefix &bytecodePrefix, const std::string &bytecodeFileName) {
-  auto bytecodeBigStringPtr =
-      std::make_unique<FileMappingBigString>(bytecodeFileName, static_cast<uint32_t>(sizeof(BytecodePrefix)));
-
-  if (!bytecodeBigStringPtr->file_data() || bytecodeBigStringPtr->file_size() < sizeof(bytecodePrefix) ||
-      *reinterpret_cast<const BytecodePrefix *>(bytecodeBigStringPtr->file_data()) != bytecodePrefix) {
-    return nullptr;
-  }
-
-  return bytecodeBigStringPtr;
-}
-
-void serializeBytecodeToFile(
-    const std::shared_ptr<const JSBigString> &script,
-    const BytecodePrefix &bytecodePrefix,
-    std::string &&bytecodeFileName,
-    bool async) {
-  std::future<void> bytecodeSerializationFuture = std::async(
-      std::launch::async,
-      [](const std::shared_ptr<const JSBigString> &script,
-         const BytecodePrefix &bytecodePrefix,
-         const std::string &bytecodeFileName) {
-        MinimalChakraRuntime chakraRuntime(false /* multithreaded */);
-        serializeBytecodeToFileCore(script, bytecodePrefix, bytecodeFileName);
-      },
-      script,
-      bytecodePrefix,
-      std::move(bytecodeFileName));
-
-  if (!async) {
-    bytecodeSerializationFuture.wait();
-  }
-}
-
-} // namespace
-#endif
-
 MinimalChakraRuntime::MinimalChakraRuntime(bool multithreaded)
     : runtime{new JsRuntimeHandle,
               [](JsRuntimeHandle *h) {
@@ -353,7 +162,6 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
   JsValueRef exn = nullptr;
   JsValueRef value = nullptr;
 
-#if defined(USE_EDGEMODE_JSRT)
   const wchar_t *scriptRaw;
   size_t scriptRawLength;
   JsStringToPointer(script, &scriptRaw, &scriptRawLength);
@@ -363,11 +171,6 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
   JsStringToPointer(source, &sourceRaw, &sourceRawLength);
 
   auto result = JsRunScript(scriptRaw, JS_SOURCE_CONTEXT_NONE /*sourceContext*/, sourceRaw, &value);
-#else
-  JsSourceContext sourceContext = getNextSourceContext();
-  auto result = JsRun(script, sourceContext, source, JsParseScriptAttributeNone, &value);
-#endif
-
   bool hasException = false;
   if (result == JsErrorInExceptionState || (JsHasException(&hasException), hasException)) {
     JsGetAndClearException(&exn);
@@ -383,18 +186,10 @@ JsValueRef evaluateScript(JsValueRef script, JsValueRef source) {
 
 JsValueRef evaluateScript(std::unique_ptr<const JSBigString> &&script, JsValueRef sourceURL) {
   ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-#if defined(USE_EDGEMODE_JSRT)
   JsValueRef jsScript = jsStringFromBigString(*script.get());
-#else
-  JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(std::move(script));
-#endif
   ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
 
-#if defined(USE_EDGEMODE_JSRT)
   return evaluateScript(jsScript, sourceURL);
-#else
-  return evaluateScript(jsScript.get(), sourceURL);
-#endif
 }
 
 JsValueRef evaluateScriptWithBytecode(
@@ -403,72 +198,11 @@ JsValueRef evaluateScriptWithBytecode(
     JsValueRef scriptFileName,
     [[maybe_unused]] std::string &&bytecodeFileName,
     [[maybe_unused]] bool asyncBytecodeGeneration) {
-#if defined(WINRT)
   // TODO:
   // ChakraRT does not support the JsRunSerialized() API.
   // Hence for UWP implementation, we fall back to using the original source
   // code right now.
   return evaluateScript(std::move(script), scriptFileName);
-#else
-  auto bytecodePrefixOptional = BytecodePrefix::getBytecodePrefix(scriptVersion);
-  if (!bytecodePrefixOptional.first) {
-    return evaluateScript(std::move(script), scriptFileName);
-  }
-
-  auto &bytecodePrefix = bytecodePrefixOptional.second;
-  std::unique_ptr<const JSBigString> bytecode = tryGetBytecode(bytecodePrefix, bytecodeFileName);
-  if (!bytecode) {
-    std::shared_ptr<const JSBigString> sharedScript(script.release());
-    serializeBytecodeToFile(sharedScript, bytecodePrefix, std::move(bytecodeFileName), asyncBytecodeGeneration);
-    ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-    JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(sharedScript);
-    ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
-    return evaluateScript(jsScript.get(), scriptFileName);
-  }
-
-  ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_START);
-  JsValueRefUniquePtr jsScript = jsArrayBufferFromBigString(std::move(script));
-  ReactMarker::logMarker(ReactMarker::JS_BUNDLE_STRING_CONVERT_STOP);
-  JsValueRef exn = nullptr;
-  JsValueRef value = nullptr;
-  JsErrorCode result = JsRunSerialized(
-      jsArrayBufferFromBigString(std::move(bytecode)).get(),
-      [](JsSourceContext sourceContext, JsValueRef *value, JsParseScriptAttributes *parseAttributes) {
-        *value = reinterpret_cast<JsValueRef>(sourceContext);
-        *parseAttributes = JsParseScriptAttributeNone;
-        return true;
-      },
-      reinterpret_cast<JsSourceContext>(jsScript.get()),
-      scriptFileName,
-      &value);
-
-  // Currently, when the existing bundle.bytecode is incompatible with the
-  // ChakraCore.dll used, we do not update it. This is because we memory mapped
-  // bundle.bytecode into a JsExternalArrayBuffer, whose lifetime is controlled
-  // by the JS engine. Hence we cannot remove/rename/modify bytecode.bundle
-  // until the JS garbage collector deletes the corresponding
-  // JsExternalArrayBuffer.
-  if (result == JsErrorBadSerializedScript) {
-    JsGetAndClearException(&exn);
-    return evaluateScript(jsScript.get(), scriptFileName);
-  }
-
-  // This code is duplicated from evaluateScript.
-  // TODO (task 1977635) get rid of this duplicated code.
-  bool hasException = false;
-  if (result == JsErrorInExceptionState || (JsHasException(&hasException), hasException)) {
-    JsGetAndClearException(&exn);
-    std::string exceptionDescription = "JavaScriptException in " + ChakraValue(scriptFileName).toString().str();
-
-    throw ChakraJSException(exn, exceptionDescription.c_str());
-  }
-
-  if (value == nullptr) {
-    formatAndThrowJSException(exn, scriptFileName);
-  }
-
-  return value;
-#endif
 }
 
 void formatAndThrowJSException(JsValueRef exn, JsValueRef source) {
@@ -718,14 +452,14 @@ JsValueRef JSValueToStringCopy(JsValueRef obj, JsValueRef *exception) {
   JsValueRef value;
   auto result = JsConvertValueToString(obj, &value);
   if (JsNoError == result)
-    JsAddRef(value, nullptr); // TODO is this the right lifetime symantics?
+    JsAddRef(value, nullptr); // TODO is this the right lifetime semantics?
   else if (result == JsErrorScriptException)
     JsGetAndClearException(exception);
   return value;
 }
 
 JsValueRef ValueMakeUndefined() {
-  JsValueRef value;
+  JsValueRef value = nullptr;
   JsGetUndefinedValue(&value);
   return value;
 }

package/Chakra/ChakraInstanceArgs.h

@@ -3,12 +3,7 @@
 
 #pragma once
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#endif
-
 #include "DevSettings.h"
 
 namespace facebook {
@@ -25,14 +20,6 @@ struct ChakraInstanceArgs {
    */
   JsRuntimeAttributes RuntimeAttributes = JsRuntimeAttributeNone;
 
-  /**
-   * @brief Memory limit set on the newly created Chakra runtime.
-   *
-   * @remarks The value 0 means that no memory limit is being set on the
-   * runtime.
-   */
-  size_t RuntimeMemoryLimit{0};
-
   NativeLoggingHook LoggingCallback{};
 
   /**
@@ -50,11 +37,6 @@ struct ChakraInstanceArgs {
    */
   bool EnableNativePerformanceNow{true};
 
-  /**
-   * @brief Whether to enable ChakraCore console redirection to debugger.
-   */
-  bool DebuggerConsoleRedirection{false};
-
   /**
    * @brief Port number to use when debugging.
    */
@@ -64,17 +46,6 @@ struct ChakraInstanceArgs {
    * @brief Name to associate with runtime instance when debugging.
    */
   std::string DebuggerRuntimeName;
-
-  /**
-   * @brief Dispatcher for notifications about JS engine memory consumption.
-   */
-  std::shared_ptr<MemoryTracker> MemoryTracker;
-
-  /**
-   * @brief Maps bundle URL to metadata needed for bytecode caching. Should be
-   * removed once we're on the JSI stack and using PreparedScriptStore (#3603).
-   */
-  ChakraBundleUrlMetadataMap BundleUrlMetadataMap;
 };
 
 } // namespace react

package/Chakra/ChakraPlatform.cpp

@@ -27,7 +27,7 @@ JsValueRef __stdcall nowHookJNF(
     void * /*callbackState*/) {
   assert(argumentCount == 1);
   double now = nowHook != nullptr ? nowHook() : 0;
-  JsValueRef value;
+  JsValueRef value = nullptr;
   CHAKRA_ASSERTDO(JsDoubleToNumber(now, &value));
   return value;
 }

package/Chakra/ChakraPlatform.h

@@ -13,11 +13,7 @@
 
 #include "Logging.h"
 
-#if defined(USE_EDGEMODE_JSRT)
 #include <jsrt.h>
-#else
-#include <ChakraCore.h>
-#endif
 
 #define CHAKRA_FAILED(jsErrorCode) ((jsErrorCode) != ::JsErrorCode::JsNoError)
 

package/Chakra/ChakraTracing.cpp

@@ -50,15 +50,6 @@ static JsValueRef __stdcall nativeTraceBeginSectionJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
       profileName.resize(profileNameLength);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[2],
-          const_cast<char *>(profileName.data()),
-          profileNameLength + 1 /* length */,
-          nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {
@@ -73,12 +64,6 @@ static JsValueRef __stdcall nativeTraceBeginSectionJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[3], &argsLength));
       argsStr.resize(argsLength + 1);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[3], const_cast<char *>(argsStr.data()), argsLength + 1 /* length */, nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {
@@ -149,15 +134,6 @@ static void beginOrEndAsync(bool isEnd, JsValueRef arguments[], unsigned short a
   if (argumentType == JsValueType::JsString) {
     CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
     profileName.resize(profileNameLength);
-
-    // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-    CHAKRA_ASSERTDO(JsCopyString(
-        arguments[2],
-        const_cast<char *>(profileName.data()),
-        profileNameLength + 1 /* length */,
-        nullptr /* written */));
-#endif
   }
 #ifndef NDEBUG
   else {
@@ -240,15 +216,6 @@ static JsValueRef __stdcall nativeTraceCounterJNF(
     if (argumentType == JsValueType::JsString) {
       CHAKRA_ASSERTDO(JsGetStringLength(arguments[2], &profileNameLength));
       profileName.resize(profileNameLength);
-
-      // TODO: CharkaRT doesn't have JsCopyString, implement alternative.
-#if !defined(USE_EDGEMODE_JSRT)
-      CHAKRA_ASSERTDO(JsCopyString(
-          arguments[2],
-          const_cast<char *>(profileName.data()),
-          profileNameLength + 1 /* length */,
-          nullptr /* written */));
-#endif
     }
 #ifndef NDEBUG
     else {