Backed out 2 changesets (bug 1554133) for package related build bustages CLOSED TREE

Backed out changeset 72ae1ac933ac (bug 1554133)
Backed out changeset c48321582c78 (bug 1554133)

devtools/client/aboutdebugging-new/aboutdebugging.js

@@ -61,10 +61,7 @@ const AboutDebugging = {
     const width = this.getRoundedViewportWidth();
     this.actions.recordTelemetryEvent("open_adbg", { width });
 
-    await l10n.init([
-      "branding/brand.ftl",
-      "devtools/aboutdebugging.ftl",
-    ]);
+    await l10n.init();
 
     this.actions.createThisFirefoxRuntime();
 

devtools/client/aboutdebugging-new/src/modules/l10n.js

@@ -4,7 +4,43 @@
 
 "use strict";
 
-const { FluentL10n } = require("devtools/client/shared/fluent-l10n/fluent-l10n");
+const Services = require("Services");
 
-// exports a singleton, which will be used across all aboutdebugging-new modules
-exports.l10n = new FluentL10n();
+const FluentReact = require("devtools/client/shared/vendor/fluent-react");
+const { L10nRegistry } = require("resource://gre/modules/L10nRegistry.jsm");
+
+class L10n {
+  async init() {
+    const locales = Services.locale.appLocalesAsBCP47;
+    const generator = L10nRegistry.generateBundles(locales, [
+      "branding/brand.ftl",
+      "devtools/aboutdebugging.ftl",
+    ]);
+
+    this._bundles = [];
+    for await (const bundle of generator) {
+      this._bundles.push(bundle);
+    }
+    this._reactLocalization = new FluentReact.ReactLocalization(this._bundles);
+  }
+
+  /**
+   * Returns the fluent bundles generated for about:debugging.
+   */
+  getBundles() {
+    return this._bundles;
+  }
+
+  /**
+   * Returns the localized string for the provided id, formatted using args.
+   */
+  getString(id, args, fallback) {
+    // Forward arguments via .apply() so that the original method can:
+    // - perform asserts based on the number of arguments
+    // - add new arguments
+    return this._reactLocalization.getString.apply(this._reactLocalization, arguments);
+  }
+}
+
+// Export a singleton that will be shared by all aboutdebugging modules.
+exports.l10n = new L10n();

devtools/client/application/initializer.js

@@ -14,7 +14,8 @@ const { createFactory } = require("devtools/client/shared/vendor/react");
 const { render, unmountComponentAtNode } = require("devtools/client/shared/vendor/react-dom");
 const Provider = createFactory(require("devtools/client/shared/vendor/react-redux").Provider);
 const { bindActionCreators } = require("devtools/client/shared/vendor/redux");
-const { l10n } = require("./src/modules/l10n");
+const { L10nRegistry } = require("resource://gre/modules/L10nRegistry.jsm");
+const Services = require("Services");
 
 const { configureStore } = require("./src/create-store");
 const actions = require("./src/actions/index");
@@ -56,17 +57,32 @@ window.Application = {
     this.updateDomain();
     await this.updateWorkers();
 
-    await l10n.init(["devtools/application.ftl"]);
+    const fluentBundles = await this.createFluentBundles();
 
     // Render the root Application component.
-    const app = App({
-      client: this.client,
-      fluentBundles: l10n.getBundles(),
-      serviceContainer,
-    });
+    const app = App({ client: this.client, fluentBundles, serviceContainer });
     render(Provider({ store: this.store }, app), this.mount);
   },
 
+  /**
+   * Retrieve message contexts for the current locales, and return them as an array of
+   * FluentBundles elements.
+   */
+  async createFluentBundles() {
+    const locales = Services.locale.appLocalesAsBCP47;
+    const generator =
+      L10nRegistry.generateBundles(locales, ["devtools/application.ftl"]);
+
+    // Return value of generateBundles is a generator and should be converted to
+    // a sync iterable before using it with React.
+    const contexts = [];
+    for await (const message of generator) {
+      contexts.push(message);
+    }
+
+    return contexts;
+  },
+
   async updateWorkers() {
     const { service } = await this.client.mainRoot.listAllWorkers();
     this.actions.updateWorkers(service);

devtools/client/application/src/modules/l10n.js

@@ -1,10 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const { FluentL10n } = require("devtools/client/shared/fluent-l10n/fluent-l10n");
-
-// exports a singleton, which will be used across all aboutdebugging-new modules
-exports.l10n = new FluentL10n();

devtools/client/application/src/modules/moz.build

@@ -1,7 +0,0 @@
-# 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/.
-
-DevToolsModules(
-    'l10n.js',
-)

devtools/client/application/src/moz.build

@@ -5,7 +5,6 @@
 DIRS += [
     'actions',
     'components',
-    'modules',
     'reducers',
 ]
 

devtools/client/shared/browser-loader.js

@@ -28,7 +28,6 @@ const BROWSER_BASED_DIRS = [
   "resource://devtools/client/inspector/markup",
   "resource://devtools/client/jsonview",
   "resource://devtools/client/netmonitor/src/utils",
-  "resource://devtools/client/shared/fluent-l10n",
   "resource://devtools/client/shared/source-map",
   "resource://devtools/client/shared/redux",
   "resource://devtools/client/shared/vendor",

devtools/client/shared/fluent-l10n/fluent-l10n.js

@@ -1,51 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const Services = require("Services");
-
-const FluentReact = require("devtools/client/shared/vendor/fluent-react");
-const { L10nRegistry } = require("resource://gre/modules/L10nRegistry.jsm");
-
-/**
- * Wrapper over FluentReact. It encapsulates instantiation of the localization
- * bundles, and offers a simpler way of accessing `getString`.
- */
-class FluentL10n {
-  /**
-   * Initializes the wrapper, generating the bundles for the given resource ids.
-   * @param {Array} resourceIds
-   */
-  async init(resourceIds) {
-    const locales = Services.locale.appLocalesAsBCP47;
-    const generator = L10nRegistry.generateBundles(locales, resourceIds);
-
-    this._bundles = [];
-    for await (const bundle of generator) {
-      this._bundles.push(bundle);
-    }
-    this._reactLocalization = new FluentReact.ReactLocalization(this._bundles);
-  }
-
-  /**
-   * Returns the fluent bundles generated.
-   */
-  getBundles() {
-    return this._bundles;
-  }
-
-  /**
-   * Returns the localized string for the provided id, formatted using args.
-   */
-  getString(id, args, fallback) {
-    // Forward arguments via .apply() so that the original method can:
-    // - perform asserts based on the number of arguments
-    // - add new arguments
-    return this._reactLocalization.getString.apply(this._reactLocalization, arguments);
-  }
-}
-
-// Export the class
-exports.FluentL10n = FluentL10n;

devtools/client/shared/fluent-l10n/moz.build

@@ -1,9 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-DevToolsModules(
-    'fluent-l10n.js',
-)

devtools/client/shared/moz.build

@@ -12,7 +12,6 @@ TEST_HARNESS_FILES.xpcshell.devtools.client.shared.test += [
 
 DIRS += [
     'components',
-    'fluent-l10n',
     'redux',
     'remote-debugging',
     'source-map',