Bug 1764698 - Move LanguageDetector.jsm and related files to toolkit.…

… r=robwu Differential Revision: https://phabricator.services.mozilla.com/D151606
dothq · Aug 23, 2022 · 24210e2 · 24210e2
1 parent 3ed8496
commit 24210e2
Show file tree

Hide file tree

Showing 75 changed files with 34 additions and 31 deletions.
diff --git a/.clang-format-ignore b/.clang-format-ignore
@@ -71,7 +71,6 @@ toolkit/components/uniffi-js/UniFFIFixtureScaffolding.cpp
 
 # Generated from ./tools/rewriting/ThirdPartyPaths.txt
 # awk '{print ""$1".*"}' ./tools/rewriting/ThirdPartyPaths.txt
-browser/components/translation/cld2/.*
 browser/extensions/mortar/ppapi/.*
 devtools/client/shared/sourceeditor/codemirror/.*
 dom/canvas/test/webgl-conf/checkout/closure-library/.*
@@ -200,6 +199,7 @@ testing/web-platform/tests/tools/third_party/.*
 third_party/.*
 toolkit/components/jsoncpp/.*
 toolkit/components/protobuf/.*
+toolkit/components/translation/cld2/.*
 toolkit/components/url-classifier/chromium/.*
 toolkit/components/url-classifier/protobuf/.*
 toolkit/crashreporter/breakpad-client/.*

diff --git a/.eslintignore b/.eslintignore
@@ -38,8 +38,6 @@ browser/components/sessionstore/test/unit/data/sessionstore_invalid.js
 # for documentation purposes (policies.json) but to be accessed by the
 # code as a .jsm (schema.jsm)
 browser/components/enterprisepolicies/schemas/schema.jsm
-# generated & special files in cld2
-browser/components/translation/cld2/
 # generated or library files in pocket
 browser/components/pocket/content/panels/js/tmpl.js
 browser/components/pocket/content/panels/js/vendor.bundle.js
@@ -213,6 +211,9 @@ toolkit/components/reader/JSDOMParser.js
 # Uses preprocessing
 toolkit/components/reader/Readerable.jsm
 
+# Generated & special files in cld2
+toolkit/components/translation/cld2/
+
 # Uses preprocessing
 toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
 toolkit/modules/AppConstants.jsm

diff --git a/browser/components/translation/TranslationChild.jsm b/browser/components/translation/TranslationChild.jsm
@@ -10,7 +10,7 @@ const lazy = {};
 ChromeUtils.defineModuleGetter(
   lazy,
   "LanguageDetector",
-  "resource:///modules/translation/LanguageDetector.jsm"
+  "resource://gre/modules/translation/LanguageDetector.jsm"
 );
 
 const STATE_OFFER = 0;

diff --git a/browser/components/translation/moz.build b/browser/components/translation/moz.build
@@ -11,16 +11,11 @@ with Files("**"):
 
 EXTRA_JS_MODULES.translation = [
     "BingTranslator.jsm",
-    "cld2/cld-worker.js",
-    "cld2/cld-worker.js.mem",
     "GoogleTranslator.jsm",
-    "LanguageDetector.jsm",
     "TranslationChild.jsm",
     "TranslationDocument.jsm",
     "TranslationParent.jsm",
     "YandexTranslator.jsm",
 ]
 
 BROWSER_CHROME_MANIFESTS += ["test/browser.ini"]
-
-XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn
@@ -113,8 +113,3 @@ browser/chrome/browser/skin/classic/browser/customize.svg
 # Bug 1718144 - De-duplicate lightbulb icon
 browser/features/[email protected]/icons/lightbulb.svg
 chrome/toolkit/skin/classic/global/icons/lightbulb.svg
-
-# Bug 1710546 - Bundle Firefox extension as a builtin addon Nighly only
-# We plan to remove this duplicity after Firefox Translations become pref'd on
-browser/chrome/browser/builtin-addons/translations/wasm/cld-worker.js.mem
-browser/modules/translation/cld-worker.js.mem
diff --git a/dom/security/nsContentSecurityUtils.cpp b/dom/security/nsContentSecurityUtils.cpp
@@ -602,7 +602,7 @@ bool nsContentSecurityUtils::IsEvalAllowed(JSContext* cx,
       "resource://testing-common/content-task.js"_ns,
 
       // Tracked by Bug 1584605
-      "resource:///modules/translation/cld-worker.js"_ns,
+      "resource://gre/modules/translation/cld-worker.js"_ns,
 
       // require.js implements a script loader for workers. It uses eval
       // to load the script; but injection is only possible in situations

diff --git a/toolkit/components/extensions/ExtensionContent.jsm b/toolkit/components/extensions/ExtensionContent.jsm
@@ -19,7 +19,7 @@ const lazy = {};
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ExtensionProcessScript: "resource://gre/modules/ExtensionProcessScript.jsm",
   ExtensionTelemetry: "resource://gre/modules/ExtensionTelemetry.jsm",
-  LanguageDetector: "resource:///modules/translation/LanguageDetector.jsm",
+  LanguageDetector: "resource://gre/modules/translation/LanguageDetector.jsm",
   Schemas: "resource://gre/modules/Schemas.jsm",
   WebNavigationFrames: "resource://gre/modules/WebNavigationFrames.jsm",
 });

diff --git a/toolkit/components/extensions/parent/ext-i18n.js b/toolkit/components/extensions/parent/ext-i18n.js
@@ -7,7 +7,7 @@
 ChromeUtils.defineModuleGetter(
   this,
   "LanguageDetector",
-  "resource:///modules/translation/LanguageDetector.jsm"
+  "resource://gre/modules/translation/LanguageDetector.jsm"
 );
 
 this.i18n = class extends ExtensionAPI {

diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_i18n.js b/toolkit/components/extensions/test/xpcshell/test_ext_i18n.js
@@ -351,7 +351,10 @@ add_task(async function test_get_accept_languages() {
   await extension.startup();
   await extension.awaitMessage("content-loaded");
 
-  let expectedLangs = ["en-US", "en"];
+  // TODO bug 1765375: ", en" is missing on Android.
+  // TODO bug 1785807: "en-us" should be "en-US" on Android
+  let expectedLangs =
+    AppConstants.platform == "android" ? ["en-us"] : ["en-US", "en"];
   extension.sendMessage(["expect-results", expectedLangs]);
   await extension.awaitMessage("background-done");
   await extension.awaitMessage("content-done");
@@ -452,11 +455,6 @@ add_task(async function test_get_ui_language() {
 });
 
 add_task(async function test_detect_language() {
-  if (AppConstants.MOZ_BUILD_APP !== "browser") {
-    // This is not supported on Android.
-    return;
-  }
-
   const af_string =
     " aam skukuza die naam beteken hy wat skoonvee of hy wat alles onderstebo keer wysig " +
     "bosveldkampe boskampe is kleiner afgeleë ruskampe wat oor min fasiliteite beskik daar is geen restaurante " +

diff --git a/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini b/toolkit/components/extensions/test/xpcshell/xpcshell-content.ini
@@ -1,5 +1,5 @@
 [test_ext_i18n.js]
-skip-if = os == "android" || (os == "win" && debug) || (os == "linux")
+skip-if = (os == "win" && debug) || (os == "linux")
 [test_ext_i18n_css.js]
 skip-if =
   os == "mac" && debug && fission # Bug 1762638

diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
@@ -72,6 +72,7 @@ DIRS += [
     "startup",
     "statusfilter",
     "telemetry",
+    "translation",
     "thumbnails",
     "timermanager",
     "tooltiptext",

diff --git a/toolkit/components/reader/ReaderMode.jsm b/toolkit/components/reader/ReaderMode.jsm
@@ -45,7 +45,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   lazy,
   "LanguageDetector",
-  "resource:///modules/translation/LanguageDetector.jsm"
+  "resource://gre/modules/translation/LanguageDetector.jsm"
 );
 ChromeUtils.defineModuleGetter(
   lazy,

diff --git a/...mponents/translation/LanguageDetector.jsm → ...mponents/translation/LanguageDetector.jsm b/...mponents/translation/LanguageDetector.jsm → ...mponents/translation/LanguageDetector.jsm
@@ -11,7 +11,7 @@ const { clearTimeout, setTimeout } = ChromeUtils.import(
   "resource://gre/modules/Timer.jsm"
 );
 
-const WORKER_URL = "resource:///modules/translation/cld-worker.js";
+const WORKER_URL = "resource://gre/modules/translation/cld-worker.js";
 
 var workerManager = {
   // Since Emscripten can handle heap growth, but not heap shrinkage, we

diff --git a/browser/components/translation/cld2/Makefile → toolkit/components/translation/cld2/Makefile b/browser/components/translation/cld2/Makefile → toolkit/components/translation/cld2/Makefile
diff --git a/...components/translation/cld2/cld-worker.js → ...components/translation/cld2/cld-worker.js b/...components/translation/cld2/cld-worker.js → ...components/translation/cld2/cld-worker.js
diff --git a/...onents/translation/cld2/cld-worker.js.mem → ...onents/translation/cld2/cld-worker.js.mem b/...onents/translation/cld2/cld-worker.js.mem → ...onents/translation/cld2/cld-worker.js.mem
diff --git a/browser/components/translation/cld2/cld.idl → toolkit/components/translation/cld2/cld.idl b/browser/components/translation/cld2/cld.idl → toolkit/components/translation/cld2/cld.idl
diff --git a/...ser/components/translation/cld2/cldapp.cc → ...kit/components/translation/cld2/cldapp.cc b/...ser/components/translation/cld2/cldapp.cc → ...kit/components/translation/cld2/cldapp.cc
diff --git a/...ponents/translation/cld2/internal/LICENSE → ...ponents/translation/cld2/internal/LICENSE b/...ponents/translation/cld2/internal/LICENSE → ...ponents/translation/cld2/internal/LICENSE
diff --git a/...slation/cld2/internal/cld2_dynamic_data.h → ...slation/cld2/internal/cld2_dynamic_data.h b/...slation/cld2/internal/cld2_dynamic_data.h → ...slation/cld2/internal/cld2_dynamic_data.h
diff --git a/.../cld2/internal/cld2_dynamic_data_loader.h → .../cld2/internal/cld2_dynamic_data_loader.h b/.../cld2/internal/cld2_dynamic_data_loader.h → .../cld2/internal/cld2_dynamic_data_loader.h
diff --git a/...internal/cld2_generated_cjk_compatible.cc → ...internal/cld2_generated_cjk_compatible.cc b/...internal/cld2_generated_cjk_compatible.cc → ...internal/cld2_generated_cjk_compatible.cc
diff --git a/...nal/cld2_generated_deltaoctachrome0122.cc → ...nal/cld2_generated_deltaoctachrome0122.cc b/...nal/cld2_generated_deltaoctachrome0122.cc → ...nal/cld2_generated_deltaoctachrome0122.cc
diff --git a/.../cld2_generated_distinctoctachrome0122.cc → .../cld2_generated_distinctoctachrome0122.cc b/.../cld2_generated_distinctoctachrome0122.cc → .../cld2_generated_distinctoctachrome0122.cc
diff --git a/...ernal/cld2_generated_quadchrome0122_16.cc → ...ernal/cld2_generated_quadchrome0122_16.cc b/...ernal/cld2_generated_quadchrome0122_16.cc → ...ernal/cld2_generated_quadchrome0122_16.cc
diff --git a/...nslation/cld2/internal/cld2tablesummary.h → ...nslation/cld2/internal/cld2tablesummary.h b/...nslation/cld2/internal/cld2tablesummary.h → ...nslation/cld2/internal/cld2tablesummary.h
diff --git a/.../internal/cld_generated_cjk_delta_bi_4.cc → .../internal/cld_generated_cjk_delta_bi_4.cc b/.../internal/cld_generated_cjk_delta_bi_4.cc → .../internal/cld_generated_cjk_delta_bi_4.cc
diff --git a/...internal/cld_generated_cjk_uni_prop_80.cc → ...internal/cld_generated_cjk_uni_prop_80.cc b/...internal/cld_generated_cjk_uni_prop_80.cc → ...internal/cld_generated_cjk_uni_prop_80.cc
diff --git a/...l/cld_generated_score_quad_octa_0122_2.cc → ...l/cld_generated_score_quad_octa_0122_2.cc b/...l/cld_generated_score_quad_octa_0122_2.cc → ...l/cld_generated_score_quad_octa_0122_2.cc
diff --git a/...ents/translation/cld2/internal/cldutil.cc → ...ents/translation/cld2/internal/cldutil.cc b/...ents/translation/cld2/internal/cldutil.cc → ...ents/translation/cld2/internal/cldutil.cc
diff --git a/...nents/translation/cld2/internal/cldutil.h → ...nents/translation/cld2/internal/cldutil.h b/...nents/translation/cld2/internal/cldutil.h → ...nents/translation/cld2/internal/cldutil.h
diff --git a/...anslation/cld2/internal/cldutil_shared.cc → ...anslation/cld2/internal/cldutil_shared.cc b/...anslation/cld2/internal/cldutil_shared.cc → ...anslation/cld2/internal/cldutil_shared.cc
diff --git a/...ranslation/cld2/internal/cldutil_shared.h → ...ranslation/cld2/internal/cldutil_shared.h b/...ranslation/cld2/internal/cldutil_shared.h → ...ranslation/cld2/internal/cldutil_shared.h
diff --git a/...slation/cld2/internal/compact_lang_det.cc → ...slation/cld2/internal/compact_lang_det.cc b/...slation/cld2/internal/compact_lang_det.cc → ...slation/cld2/internal/compact_lang_det.cc
diff --git a/...d2/internal/compact_lang_det_hint_code.cc → ...d2/internal/compact_lang_det_hint_code.cc b/...d2/internal/compact_lang_det_hint_code.cc → ...d2/internal/compact_lang_det_hint_code.cc
diff --git a/...ld2/internal/compact_lang_det_hint_code.h → ...ld2/internal/compact_lang_det_hint_code.h b/...ld2/internal/compact_lang_det_hint_code.h → ...ld2/internal/compact_lang_det_hint_code.h
diff --git a/...on/cld2/internal/compact_lang_det_impl.cc → ...on/cld2/internal/compact_lang_det_impl.cc b/...on/cld2/internal/compact_lang_det_impl.cc → ...on/cld2/internal/compact_lang_det_impl.cc
diff --git a/...ion/cld2/internal/compact_lang_det_impl.h → ...ion/cld2/internal/compact_lang_det_impl.h b/...ion/cld2/internal/compact_lang_det_impl.h → ...ion/cld2/internal/compact_lang_det_impl.h
diff --git a/...ponents/translation/cld2/internal/debug.h → ...ponents/translation/cld2/internal/debug.h b/...ponents/translation/cld2/internal/debug.h → ...ponents/translation/cld2/internal/debug.h
diff --git a/.../translation/cld2/internal/debug_empty.cc → .../translation/cld2/internal/debug_empty.cc b/.../translation/cld2/internal/debug_empty.cc → .../translation/cld2/internal/debug_empty.cc
diff --git a/...nslation/cld2/internal/fixunicodevalue.cc → ...nslation/cld2/internal/fixunicodevalue.cc b/...nslation/cld2/internal/fixunicodevalue.cc → ...nslation/cld2/internal/fixunicodevalue.cc
diff --git a/...anslation/cld2/internal/fixunicodevalue.h → ...anslation/cld2/internal/fixunicodevalue.h b/...anslation/cld2/internal/fixunicodevalue.h → ...anslation/cld2/internal/fixunicodevalue.h
diff --git a/.../cld2/internal/generated_distinct_bi_0.cc → .../cld2/internal/generated_distinct_bi_0.cc b/.../cld2/internal/generated_distinct_bi_0.cc → .../cld2/internal/generated_distinct_bi_0.cc
diff --git a/...ation/cld2/internal/generated_entities.cc → ...ation/cld2/internal/generated_entities.cc b/...ation/cld2/internal/generated_entities.cc → ...ation/cld2/internal/generated_entities.cc
diff --git a/...ation/cld2/internal/generated_language.cc → ...ation/cld2/internal/generated_language.cc b/...ation/cld2/internal/generated_language.cc → ...ation/cld2/internal/generated_language.cc
diff --git a/...lation/cld2/internal/generated_language.h → ...lation/cld2/internal/generated_language.h b/...lation/cld2/internal/generated_language.h → ...lation/cld2/internal/generated_language.h
diff --git a/...ation/cld2/internal/generated_ulscript.cc → ...ation/cld2/internal/generated_ulscript.cc b/...ation/cld2/internal/generated_ulscript.cc → ...ation/cld2/internal/generated_ulscript.cc
diff --git a/...lation/cld2/internal/generated_ulscript.h → ...lation/cld2/internal/generated_ulscript.h b/...lation/cld2/internal/generated_ulscript.h → ...lation/cld2/internal/generated_ulscript.h
diff --git a/...slation/cld2/internal/getonescriptspan.cc → ...slation/cld2/internal/getonescriptspan.cc b/...slation/cld2/internal/getonescriptspan.cc → ...slation/cld2/internal/getonescriptspan.cc
diff --git a/...nslation/cld2/internal/getonescriptspan.h → ...nslation/cld2/internal/getonescriptspan.h b/...nslation/cld2/internal/getonescriptspan.h → ...nslation/cld2/internal/getonescriptspan.h
diff --git a/...ranslation/cld2/internal/integral_types.h → ...ranslation/cld2/internal/integral_types.h b/...ranslation/cld2/internal/integral_types.h → ...ranslation/cld2/internal/integral_types.h
diff --git a/.../translation/cld2/internal/lang_script.cc → .../translation/cld2/internal/lang_script.cc b/.../translation/cld2/internal/lang_script.cc → .../translation/cld2/internal/lang_script.cc
diff --git a/...s/translation/cld2/internal/lang_script.h → ...s/translation/cld2/internal/lang_script.h b/...s/translation/cld2/internal/lang_script.h → ...s/translation/cld2/internal/lang_script.h
diff --git a/...ents/translation/cld2/internal/langspan.h → ...ents/translation/cld2/internal/langspan.h b/...ents/translation/cld2/internal/langspan.h → ...ents/translation/cld2/internal/langspan.h
diff --git a/...ts/translation/cld2/internal/offsetmap.cc → ...ts/translation/cld2/internal/offsetmap.cc b/...ts/translation/cld2/internal/offsetmap.cc → ...ts/translation/cld2/internal/offsetmap.cc
diff --git a/...nts/translation/cld2/internal/offsetmap.h → ...nts/translation/cld2/internal/offsetmap.h b/...nts/translation/cld2/internal/offsetmap.h → ...nts/translation/cld2/internal/offsetmap.h
diff --git a/...mponents/translation/cld2/internal/port.h → ...mponents/translation/cld2/internal/port.h b/...mponents/translation/cld2/internal/port.h → ...mponents/translation/cld2/internal/port.h
diff --git a/...ation/cld2/internal/scoreonescriptspan.cc → ...ation/cld2/internal/scoreonescriptspan.cc b/...ation/cld2/internal/scoreonescriptspan.cc → ...ation/cld2/internal/scoreonescriptspan.cc
diff --git a/...lation/cld2/internal/scoreonescriptspan.h → ...lation/cld2/internal/scoreonescriptspan.h b/...lation/cld2/internal/scoreonescriptspan.h → ...lation/cld2/internal/scoreonescriptspan.h
diff --git a/...s/translation/cld2/internal/stringpiece.h → ...s/translation/cld2/internal/stringpiece.h b/...s/translation/cld2/internal/stringpiece.h → ...s/translation/cld2/internal/stringpiece.h
diff --git a/...ponents/translation/cld2/internal/tote.cc → ...ponents/translation/cld2/internal/tote.cc b/...ponents/translation/cld2/internal/tote.cc → ...ponents/translation/cld2/internal/tote.cc
diff --git a/...mponents/translation/cld2/internal/tote.h → ...mponents/translation/cld2/internal/tote.h b/...mponents/translation/cld2/internal/tote.h → ...mponents/translation/cld2/internal/tote.h
diff --git a/...2/internal/utf8prop_lettermarkscriptnum.h → ...2/internal/utf8prop_lettermarkscriptnum.h b/...2/internal/utf8prop_lettermarkscriptnum.h → ...2/internal/utf8prop_lettermarkscriptnum.h
diff --git a/.../cld2/internal/utf8repl_lettermarklower.h → .../cld2/internal/utf8repl_lettermarklower.h b/.../cld2/internal/utf8repl_lettermarklower.h → .../cld2/internal/utf8repl_lettermarklower.h
diff --git a/.../internal/utf8scannot_lettermarkspecial.h → .../internal/utf8scannot_lettermarkspecial.h b/.../internal/utf8scannot_lettermarkspecial.h → .../internal/utf8scannot_lettermarkspecial.h
diff --git a/...anslation/cld2/internal/utf8statetable.cc → ...anslation/cld2/internal/utf8statetable.cc b/...anslation/cld2/internal/utf8statetable.cc → ...anslation/cld2/internal/utf8statetable.cc
diff --git a/...ranslation/cld2/internal/utf8statetable.h → ...ranslation/cld2/internal/utf8statetable.h b/...ranslation/cld2/internal/utf8statetable.h → ...ranslation/cld2/internal/utf8statetable.h
diff --git a/browser/components/translation/cld2/post.js → toolkit/components/translation/cld2/post.js b/browser/components/translation/cld2/post.js → toolkit/components/translation/cld2/post.js
diff --git a/...ranslation/cld2/public/compact_lang_det.h → ...ranslation/cld2/public/compact_lang_det.h b/...ranslation/cld2/public/compact_lang_det.h → ...ranslation/cld2/public/compact_lang_det.h
diff --git a/...nents/translation/cld2/public/encodings.h → ...nents/translation/cld2/public/encodings.h b/...nents/translation/cld2/public/encodings.h → ...nents/translation/cld2/public/encodings.h
diff --git a/toolkit/components/translation/moz.build b/toolkit/components/translation/moz.build
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox", "Translation")
+
+EXTRA_JS_MODULES.translation = [
+    "cld2/cld-worker.js",
+    "cld2/cld-worker.js.mem",
+    "LanguageDetector.jsm",
+]
+
+XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
diff --git a/...onents/translation/test/unit/test_cld2.js → ...onents/translation/test/unit/test_cld2.js b/...onents/translation/test/unit/test_cld2.js → ...onents/translation/test/unit/test_cld2.js
@@ -569,7 +569,7 @@ const kTestPairs = [
 
 const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 let { LanguageDetector, workerManager } = ChromeUtils.import(
-  "resource:///modules/translation/LanguageDetector.jsm"
+  "resource://gre/modules/translation/LanguageDetector.jsm"
 );
 
 function check_result(result, langCode, expected) {

diff --git a/...onents/translation/test/unit/xpcshell.ini → ...onents/translation/test/unit/xpcshell.ini b/...onents/translation/test/unit/xpcshell.ini → ...onents/translation/test/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = 
 firefox-appdir = browser
-skip-if = toolkit == 'android' # bug 1730213
 
 [test_cld2.js]
diff --git a/tools/esmify/map.json b/tools/esmify/map.json
@@ -792,8 +792,6 @@
     "browser/components/syncedtabs/util.js",
   "resource:///modules/translation/BingTranslator.jsm":
     "browser/components/translation/BingTranslator.jsm",
-  "resource:///modules/translation/LanguageDetector.jsm":
-    "browser/components/translation/LanguageDetector.jsm",
   "resource:///modules/translation/TranslationChild.jsm":
     "browser/components/translation/TranslationChild.jsm",
   "resource:///modules/translation/TranslationDocument.jsm":
@@ -1944,6 +1942,8 @@
     "toolkit/modules/third_party/fathom/fathom.jsm",
   "resource://gre/modules/third_party/jsesc/jsesc.js":
     "toolkit/modules/third_party/jsesc/jsesc.js",
+  "resource://gre/modules/translation/LanguageDetector.jsm":
+    "toolkit/components/translation/LanguageDetector.jsm",
   "resource://gre/modules/txEXSLTRegExFunctions.jsm":
     "dom/xslt/xslt/txEXSLTRegExFunctions.jsm",
   "resource://gre/modules/vtt.jsm": "dom/media/webvtt/vtt.jsm",

diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
@@ -1,7 +1,6 @@
 browser/components/newtab/vendor/
 browser/components/pocket/content/panels/js/vendor/
 browser/components/storybook/node_modules/
-browser/components/translation/cld2/
 browser/extensions/formautofill/content/third-party/
 browser/extensions/formautofill/test/fixtures/third_party/
 browser/extensions/screenshots/build/raven.js
@@ -171,6 +170,7 @@ toolkit/components/jsoncpp/
 toolkit/components/normandy/vendor/
 toolkit/components/passwordmgr/PasswordRulesParser.jsm
 toolkit/components/protobuf/
+toolkit/components/translation/cld2/
 toolkit/components/url-classifier/chromium/
 toolkit/components/utils/mozjexl.js
 toolkit/components/viaduct/fetch_msg_types.pb.cc