@atlaskit/feedback-collector 16.6.1 → 16.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/feedback-collector
 
+## 16.6.2
+
+### Patch Changes
+
+- [`38d753092aa79`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/38d753092aa79) -
+  Fix feedback collector translations failing to load. The locale messages loader now resolves
+  bundles through an explicit per-locale loader map instead of a free-form dynamic import that
+  generated non-existent async chunk URLs in some builds (causing the dialog to silently fall back
+  to English). The fix is behind the `fun-2388_fix_feedback_collector_i18n` gate; when the gate is
+  off the previous loading behaviour is preserved.
+- Updated dependencies
+
 ## 16.6.1
 
 ### Patch Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -164,7 +164,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "16.6.0" || 'Unknown, at least 11.0.0';
+      return "16.6.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",

package/dist/cjs/utils/i18n-get-messages-for-locale.js

@@ -1,35 +1,219 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getMessagesForLocale = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t && /^\.\.?\//.test(t) ? t.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+)?)\.([cm]?)ts$/i, function (t, s, r, n, o) { return s ? e ? ".jsx" : ".js" : !r || n && o ? r + n + "." + o.toLowerCase() + "js" : t; }) : t; }
-/**
- * Tries to get the most specific messages bundle for a given locale.
- *
- * Strategy:
- * 1. Try to find messages with the exact string (i.e. 'fr_FR')
- * 2. If that doesn't work, try to find messages for the country locale (i.e. 'fr')
- * 3. If that doesn't work, return english messages as a fallback.
- *
- * @param locale string specifying the locale like 'en_GB', or 'fr'.
- */
-
-var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function () {
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t4 in e) "default" !== _t4 && {}.hasOwnProperty.call(e, _t4) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t4)) && (i.get || i.set) ? o(f, _t4, i) : f[_t4] = e[_t4]); return f; })(e, t); }
+var isNestedMessagesModule = function isNestedMessagesModule(value) {
+  return 'default' in value && (0, _typeof2.default)(value.default) === 'object' && value.default !== null;
+};
+var unwrapMessages = function unwrapMessages(messages) {
+  var defaultExport = messages.default;
+  return isNestedMessagesModule(defaultExport) ? defaultExport.default : defaultExport;
+};
+var messagesLoaders = {
+  cs: function cs() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-cs" */'../i18n/cs'));
+    });
+  },
+  da: function da() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-da" */'../i18n/da'));
+    });
+  },
+  de: function de() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-de" */'../i18n/de'));
+    });
+  },
+  en: function en() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en" */'../i18n/en'));
+    });
+  },
+  en_GB: function en_GB() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_GB" */'../i18n/en_GB'));
+    });
+  },
+  en_ZZ: function en_ZZ() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_ZZ" */'../i18n/en_ZZ'));
+    });
+  },
+  es: function es() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-es" */'../i18n/es'));
+    });
+  },
+  fi: function fi() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fi" */'../i18n/fi'));
+    });
+  },
+  fr: function fr() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fr" */'../i18n/fr'));
+    });
+  },
+  hr: function hr() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hr" */'../i18n/hr'));
+    });
+  },
+  hu: function hu() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hu" */'../i18n/hu'));
+    });
+  },
+  it: function it() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-it" */'../i18n/it'));
+    });
+  },
+  ja: function ja() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ja" */'../i18n/ja'));
+    });
+  },
+  ko: function ko() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ko" */'../i18n/ko'));
+    });
+  },
+  nb: function nb() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nb" */'../i18n/nb'));
+    });
+  },
+  nl: function nl() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nl" */'../i18n/nl'));
+    });
+  },
+  pl: function pl() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pl" */'../i18n/pl'));
+    });
+  },
+  pt_BR: function pt_BR() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pt_BR" */'../i18n/pt_BR'));
+    });
+  },
+  ru: function ru() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ru" */'../i18n/ru'));
+    });
+  },
+  sl: function sl() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sl" */'../i18n/sl'));
+    });
+  },
+  sr_RS: function sr_RS() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_RS" */'../i18n/sr_RS'));
+    });
+  },
+  sr_YR: function sr_YR() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_YR" */'../i18n/sr_YR'));
+    });
+  },
+  sv: function sv() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sv" */'../i18n/sv'));
+    });
+  },
+  th: function th() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-th" */'../i18n/th'));
+    });
+  },
+  tr: function tr() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-tr" */'../i18n/tr'));
+    });
+  },
+  uk: function uk() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-uk" */'../i18n/uk'));
+    });
+  },
+  vi: function vi() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-vi" */'../i18n/vi'));
+    });
+  },
+  zh: function zh() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh" */'../i18n/zh'));
+    });
+  },
+  zh_TW: function zh_TW() {
+    return Promise.resolve().then(function () {
+      return _interopRequireWildcard(require( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh_TW" */'../i18n/zh_TW'));
+    });
+  }
+};
+var getMessages = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(locale) {
-    var messages, parentLocale, _messages, _t, _t2;
+    var loadMessages, messages, _t;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          locale = locale.replace('-', '_');
+          loadMessages = messagesLoaders[locale];
+          if (loadMessages) {
+            _context.next = 1;
+            break;
+          }
+          return _context.abrupt("return", undefined);
+        case 1:
           _context.prev = 1;
           _context.next = 2;
+          return loadMessages();
+        case 2:
+          messages = _context.sent;
+          return _context.abrupt("return", unwrapMessages(messages));
+        case 3:
+          _context.prev = 3;
+          _t = _context["catch"](1);
+          return _context.abrupt("return", undefined);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 3]]);
+  }));
+  return function getMessages(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Legacy loader preserved for the `fun-2388_fix_feedback_collector_i18n` gate-off
+ * path. It uses a free-form dynamic import which, in some builds (e.g. Jira),
+ * generates non-existent async chunk URLs and silently fails to localize.
+ */
+var getMessagesForLocaleLegacy = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(locale) {
+    var messages, parentLocale, _messages, _t2, _t3;
+    return _regenerator.default.wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          locale = locale.replace('-', '_');
+          _context2.prev = 1;
+          _context2.next = 2;
           return function (specifier) {
             return new Promise(function (r) {
               return r("".concat(specifier));
@@ -38,14 +222,14 @@ var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function
             });
           }( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions("../i18n/".concat(locale)));
         case 2:
-          messages = _context.sent;
-          return _context.abrupt("return", messages.default);
+          messages = _context2.sent;
+          return _context2.abrupt("return", messages.default);
         case 3:
-          _context.prev = 3;
-          _t = _context["catch"](1);
-          _context.prev = 4;
+          _context2.prev = 3;
+          _t2 = _context2["catch"](1);
+          _context2.prev = 4;
           parentLocale = locale.split(/[-_]/)[0];
-          _context.next = 5;
+          _context2.next = 5;
           return function (specifier) {
             return new Promise(function (r) {
               return r("".concat(specifier));
@@ -54,18 +238,57 @@ var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function
             });
           }( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions("../i18n/".concat(parentLocale)));
         case 5:
-          _messages = _context.sent;
-          return _context.abrupt("return", _messages.default);
+          _messages = _context2.sent;
+          return _context2.abrupt("return", _messages.default);
         case 6:
-          _context.prev = 6;
-          _t2 = _context["catch"](4);
+          _context2.prev = 6;
+          _t3 = _context2["catch"](4);
         case 7:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[1, 3], [4, 6]]);
+    }, _callee2, null, [[1, 3], [4, 6]]);
   }));
-  return function getMessagesForLocale(_x) {
-    return _ref.apply(this, arguments);
+  return function getMessagesForLocaleLegacy(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/**
+ * Tries to get the most specific messages bundle for a given locale.
+ *
+ * Strategy:
+ * 1. Try to find messages with the exact string (i.e. 'fr_FR')
+ * 2. If that doesn't work, try to find messages for the language locale (i.e. 'fr')
+ * 3. If that doesn't work, return undefined so react-intl uses english default messages.
+ *
+ * @param locale string specifying the locale like 'en_GB', or 'fr'.
+ */
+var getMessagesForLocale = exports.getMessagesForLocale = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(locale) {
+    var localeKey, messages;
+    return _regenerator.default.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if ((0, _platformFeatureFlags.fg)('fun-2388_fix_feedback_collector_i18n')) {
+            _context3.next = 1;
+            break;
+          }
+          return _context3.abrupt("return", getMessagesForLocaleLegacy(locale));
+        case 1:
+          localeKey = locale.replace('-', '_');
+          _context3.next = 2;
+          return getMessages(localeKey);
+        case 2:
+          messages = _context3.sent;
+          return _context3.abrupt("return", messages !== null && messages !== void 0 ? messages : getMessages(localeKey.split(/[-_]/)[0]));
+        case 3:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getMessagesForLocale(_x3) {
+    return _ref3.apply(this, arguments);
   };
 }();

package/dist/es2019/components/FeedbackCollector.js

@@ -92,7 +92,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "16.6.0" || 'Unknown, at least 11.0.0';
+    return "16.6.1" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;

package/dist/es2019/utils/i18n-get-messages-for-locale.js

@@ -1,16 +1,60 @@
 function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t && /^\.\.?\//.test(t) ? t.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+)?)\.([cm]?)ts$/i, function (t, s, r, n, o) { return s ? e ? ".jsx" : ".js" : !r || n && o ? r + n + "." + o.toLowerCase() + "js" : t; }) : t; }
+import { fg } from '@atlaskit/platform-feature-flags';
+const isNestedMessagesModule = value => 'default' in value && typeof value.default === 'object' && value.default !== null;
+const unwrapMessages = messages => {
+  const defaultExport = messages.default;
+  return isNestedMessagesModule(defaultExport) ? defaultExport.default : defaultExport;
+};
+const messagesLoaders = {
+  cs: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-cs" */'../i18n/cs'),
+  da: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-da" */'../i18n/da'),
+  de: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-de" */'../i18n/de'),
+  en: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en" */'../i18n/en'),
+  en_GB: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_GB" */'../i18n/en_GB'),
+  en_ZZ: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_ZZ" */'../i18n/en_ZZ'),
+  es: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-es" */'../i18n/es'),
+  fi: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fi" */'../i18n/fi'),
+  fr: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fr" */'../i18n/fr'),
+  hr: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hr" */'../i18n/hr'),
+  hu: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hu" */'../i18n/hu'),
+  it: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-it" */'../i18n/it'),
+  ja: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ja" */'../i18n/ja'),
+  ko: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ko" */'../i18n/ko'),
+  nb: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nb" */'../i18n/nb'),
+  nl: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nl" */'../i18n/nl'),
+  pl: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pl" */'../i18n/pl'),
+  pt_BR: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pt_BR" */'../i18n/pt_BR'),
+  ru: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ru" */'../i18n/ru'),
+  sl: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sl" */'../i18n/sl'),
+  sr_RS: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_RS" */'../i18n/sr_RS'),
+  sr_YR: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_YR" */'../i18n/sr_YR'),
+  sv: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sv" */'../i18n/sv'),
+  th: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-th" */'../i18n/th'),
+  tr: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-tr" */'../i18n/tr'),
+  uk: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-uk" */'../i18n/uk'),
+  vi: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-vi" */'../i18n/vi'),
+  zh: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh" */'../i18n/zh'),
+  zh_TW: () => import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh_TW" */'../i18n/zh_TW')
+};
+const getMessages = async locale => {
+  const loadMessages = messagesLoaders[locale];
+  if (!loadMessages) {
+    return undefined;
+  }
+  try {
+    const messages = await loadMessages();
+    return unwrapMessages(messages);
+  } catch {
+    return undefined;
+  }
+};
+
 /**
- * Tries to get the most specific messages bundle for a given locale.
- *
- * Strategy:
- * 1. Try to find messages with the exact string (i.e. 'fr_FR')
- * 2. If that doesn't work, try to find messages for the country locale (i.e. 'fr')
- * 3. If that doesn't work, return english messages as a fallback.
- *
- * @param locale string specifying the locale like 'en_GB', or 'fr'.
+ * Legacy loader preserved for the `fun-2388_fix_feedback_collector_i18n` gate-off
+ * path. It uses a free-form dynamic import which, in some builds (e.g. Jira),
+ * generates non-existent async chunk URLs and silently fails to localize.
  */
-
-export const getMessagesForLocale = async locale => {
+const getMessagesForLocaleLegacy = async locale => {
   locale = locale.replace('-', '_');
   try {
     const messages = await import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(`../i18n/${locale}`));
@@ -25,4 +69,23 @@ export const getMessagesForLocale = async locale => {
   } catch (e) {
     // ignore
   }
+};
+
+/**
+ * Tries to get the most specific messages bundle for a given locale.
+ *
+ * Strategy:
+ * 1. Try to find messages with the exact string (i.e. 'fr_FR')
+ * 2. If that doesn't work, try to find messages for the language locale (i.e. 'fr')
+ * 3. If that doesn't work, return undefined so react-intl uses english default messages.
+ *
+ * @param locale string specifying the locale like 'en_GB', or 'fr'.
+ */
+export const getMessagesForLocale = async locale => {
+  if (!fg('fun-2388_fix_feedback_collector_i18n')) {
+    return getMessagesForLocaleLegacy(locale);
+  }
+  const localeKey = locale.replace('-', '_');
+  const messages = await getMessages(localeKey);
+  return messages !== null && messages !== void 0 ? messages : getMessages(localeKey.split(/[-_]/)[0]);
 };

package/dist/esm/components/FeedbackCollector.js

@@ -155,7 +155,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "16.6.0" || 'Unknown, at least 11.0.0';
+      return "16.6.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",

package/dist/esm/utils/i18n-get-messages-for-locale.js

@@ -1,50 +1,215 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _typeof from "@babel/runtime/helpers/typeof";
 function _tsRewriteRelativeImportExtensions(t, e) { return "string" == typeof t && /^\.\.?\//.test(t) ? t.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+)?)\.([cm]?)ts$/i, function (t, s, r, n, o) { return s ? e ? ".jsx" : ".js" : !r || n && o ? r + n + "." + o.toLowerCase() + "js" : t; }) : t; }
-/**
- * Tries to get the most specific messages bundle for a given locale.
- *
- * Strategy:
- * 1. Try to find messages with the exact string (i.e. 'fr_FR')
- * 2. If that doesn't work, try to find messages for the country locale (i.e. 'fr')
- * 3. If that doesn't work, return english messages as a fallback.
- *
- * @param locale string specifying the locale like 'en_GB', or 'fr'.
- */
-
-export var getMessagesForLocale = /*#__PURE__*/function () {
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { fg } from '@atlaskit/platform-feature-flags';
+var isNestedMessagesModule = function isNestedMessagesModule(value) {
+  return 'default' in value && _typeof(value.default) === 'object' && value.default !== null;
+};
+var unwrapMessages = function unwrapMessages(messages) {
+  var defaultExport = messages.default;
+  return isNestedMessagesModule(defaultExport) ? defaultExport.default : defaultExport;
+};
+var messagesLoaders = {
+  cs: function cs() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-cs" */'../i18n/cs');
+  },
+  da: function da() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-da" */'../i18n/da');
+  },
+  de: function de() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-de" */'../i18n/de');
+  },
+  en: function en() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en" */'../i18n/en');
+  },
+  en_GB: function en_GB() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_GB" */'../i18n/en_GB');
+  },
+  en_ZZ: function en_ZZ() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-en_ZZ" */'../i18n/en_ZZ');
+  },
+  es: function es() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-es" */'../i18n/es');
+  },
+  fi: function fi() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fi" */'../i18n/fi');
+  },
+  fr: function fr() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-fr" */'../i18n/fr');
+  },
+  hr: function hr() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hr" */'../i18n/hr');
+  },
+  hu: function hu() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-hu" */'../i18n/hu');
+  },
+  it: function it() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-it" */'../i18n/it');
+  },
+  ja: function ja() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ja" */'../i18n/ja');
+  },
+  ko: function ko() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ko" */'../i18n/ko');
+  },
+  nb: function nb() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nb" */'../i18n/nb');
+  },
+  nl: function nl() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-nl" */'../i18n/nl');
+  },
+  pl: function pl() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pl" */'../i18n/pl');
+  },
+  pt_BR: function pt_BR() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-pt_BR" */'../i18n/pt_BR');
+  },
+  ru: function ru() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-ru" */'../i18n/ru');
+  },
+  sl: function sl() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sl" */'../i18n/sl');
+  },
+  sr_RS: function sr_RS() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_RS" */'../i18n/sr_RS');
+  },
+  sr_YR: function sr_YR() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sr_YR" */'../i18n/sr_YR');
+  },
+  sv: function sv() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-sv" */'../i18n/sv');
+  },
+  th: function th() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-th" */'../i18n/th');
+  },
+  tr: function tr() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-tr" */'../i18n/tr');
+  },
+  uk: function uk() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-uk" */'../i18n/uk');
+  },
+  vi: function vi() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-vi" */'../i18n/vi');
+  },
+  zh: function zh() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh" */'../i18n/zh');
+  },
+  zh_TW: function zh_TW() {
+    return import( /* webpackChunkName: "@atlaskit-internal_@atlassian/feedback-collector-i18n-zh_TW" */'../i18n/zh_TW');
+  }
+};
+var getMessages = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(locale) {
-    var messages, parentLocale, _messages, _t, _t2;
+    var loadMessages, messages, _t;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          locale = locale.replace('-', '_');
+          loadMessages = messagesLoaders[locale];
+          if (loadMessages) {
+            _context.next = 1;
+            break;
+          }
+          return _context.abrupt("return", undefined);
+        case 1:
           _context.prev = 1;
           _context.next = 2;
-          return import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(_tsRewriteRelativeImportExtensions("../i18n/".concat(locale))));
+          return loadMessages();
         case 2:
           messages = _context.sent;
-          return _context.abrupt("return", messages.default);
+          return _context.abrupt("return", unwrapMessages(messages));
         case 3:
           _context.prev = 3;
           _t = _context["catch"](1);
-          _context.prev = 4;
+          return _context.abrupt("return", undefined);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 3]]);
+  }));
+  return function getMessages(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * Legacy loader preserved for the `fun-2388_fix_feedback_collector_i18n` gate-off
+ * path. It uses a free-form dynamic import which, in some builds (e.g. Jira),
+ * generates non-existent async chunk URLs and silently fails to localize.
+ */
+var getMessagesForLocaleLegacy = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(locale) {
+    var messages, parentLocale, _messages, _t2, _t3;
+    return _regeneratorRuntime.wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          locale = locale.replace('-', '_');
+          _context2.prev = 1;
+          _context2.next = 2;
+          return import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(_tsRewriteRelativeImportExtensions("../i18n/".concat(locale))));
+        case 2:
+          messages = _context2.sent;
+          return _context2.abrupt("return", messages.default);
+        case 3:
+          _context2.prev = 3;
+          _t2 = _context2["catch"](1);
+          _context2.prev = 4;
           parentLocale = locale.split(/[-_]/)[0];
-          _context.next = 5;
+          _context2.next = 5;
           return import( /* webpackChunkName: "@atlaskit-internal_feedback-collector/i18n-tranlations" */_tsRewriteRelativeImportExtensions(_tsRewriteRelativeImportExtensions("../i18n/".concat(parentLocale))));
         case 5:
-          _messages = _context.sent;
-          return _context.abrupt("return", _messages.default);
+          _messages = _context2.sent;
+          return _context2.abrupt("return", _messages.default);
         case 6:
-          _context.prev = 6;
-          _t2 = _context["catch"](4);
+          _context2.prev = 6;
+          _t3 = _context2["catch"](4);
         case 7:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[1, 3], [4, 6]]);
+    }, _callee2, null, [[1, 3], [4, 6]]);
   }));
-  return function getMessagesForLocale(_x) {
-    return _ref.apply(this, arguments);
+  return function getMessagesForLocaleLegacy(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+
+/**
+ * Tries to get the most specific messages bundle for a given locale.
+ *
+ * Strategy:
+ * 1. Try to find messages with the exact string (i.e. 'fr_FR')
+ * 2. If that doesn't work, try to find messages for the language locale (i.e. 'fr')
+ * 3. If that doesn't work, return undefined so react-intl uses english default messages.
+ *
+ * @param locale string specifying the locale like 'en_GB', or 'fr'.
+ */
+export var getMessagesForLocale = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(locale) {
+    var localeKey, messages;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          if (fg('fun-2388_fix_feedback_collector_i18n')) {
+            _context3.next = 1;
+            break;
+          }
+          return _context3.abrupt("return", getMessagesForLocaleLegacy(locale));
+        case 1:
+          localeKey = locale.replace('-', '_');
+          _context3.next = 2;
+          return getMessages(localeKey);
+        case 2:
+          messages = _context3.sent;
+          return _context3.abrupt("return", messages !== null && messages !== void 0 ? messages : getMessages(localeKey.split(/[-_]/)[0]));
+        case 3:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function getMessagesForLocale(_x3) {
+    return _ref3.apply(this, arguments);
   };
 }();

package/dist/types/utils/i18n-get-messages-for-locale.d.ts

@@ -1,11 +1,13 @@
+type Messages = Record<string, string>;
 /**
  * Tries to get the most specific messages bundle for a given locale.
  *
  * Strategy:
  * 1. Try to find messages with the exact string (i.e. 'fr_FR')
- * 2. If that doesn't work, try to find messages for the country locale (i.e. 'fr')
- * 3. If that doesn't work, return english messages as a fallback.
+ * 2. If that doesn't work, try to find messages for the language locale (i.e. 'fr')
+ * 3. If that doesn't work, return undefined so react-intl uses english default messages.
  *
  * @param locale string specifying the locale like 'en_GB', or 'fr'.
  */
-export declare const getMessagesForLocale: (locale: string) => Promise<any>;
+export declare const getMessagesForLocale: (locale: string) => Promise<Messages | undefined>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "16.6.1",
+	"version": "16.6.2",
 	"description": "A component that collects feedback across Atlassian products.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -32,11 +32,11 @@
 		"@atlaskit/icon": "^37.1.0",
 		"@atlaskit/link": "^4.3.0",
 		"@atlaskit/modal-dialog": "^16.1.0",
-		"@atlaskit/platform-feature-flags": "^2.0.0",
+		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/section-message": "^9.2.0",
 		"@atlaskit/select": "^22.5.0",
 		"@atlaskit/textarea": "^9.1.0",
-		"@atlaskit/tokens": "^16.1.0",
+		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/visually-hidden": "^4.2.0",
 		"@babel/runtime": "^7.0.0"
 	},
@@ -92,6 +92,9 @@
 		},
 		"ak_feedback_collector_select_escape": {
 			"type": "boolean"
+		},
+		"fun-2388_fix_feedback_collector_i18n": {
+			"type": "boolean"
 		}
 	}
 }