@atlassian/i18n-properties-loader 2.0.0 → 2.0.1-8db0611

package/CHANGELOG.md

@@ -3,20 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.0.0](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@2.0.0..@atlassian/i18n-properties-loader@1.1.7) (2026-04-29)
+## [2.0.1](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@2.0.1..@atlassian/i18n-properties-loader@2.0.0) (2026-05-12)
 
+**Note:** Version bump only for package @atlassian/i18n-properties-loader
 
-### ⚠ BREAKING CHANGES
 
-* drop webpack 4 support
 
-### Miscellaneous Chores
 
-* drop Webpack 4 support mention ([3c2c394](https://bitbucket.org/atlassianlabs/fe-server/commits/3c2c394d2f4be0c95d20c27e107a6b1d8f3e5ac4))
 
+## [2.0.0](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@2.0.0..@atlassian/i18n-properties-loader@1.1.7) (2026-04-29)
 
 
-## <small>1.1.7 (2026-04-09)</small>
+### ⚠ BREAKING CHANGES
+
+* drop webpack 4 support
+
+### [1.1.7](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@1.1.7..@atlassian/i18n-properties-loader@1.1.6) (2026-04-09)
 
 * [Renovate] Update frontend - webpack ([b693f8c](https://bitbucket.org/atlassianlabs/fe-server/commits/b693f8c))
 
@@ -24,7 +26,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## <small>1.1.6 (2026-02-23)</small>
+### [1.1.6](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@1.1.6..@atlassian/i18n-properties-loader@1.1.5) (2026-02-23)
 
 **Note:** Version bump only for package @atlassian/i18n-properties-loader
 
@@ -32,7 +34,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## <small>1.1.5 (2026-02-21)</small>
+### [1.1.5](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@1.1.5..@atlassian/i18n-properties-loader@1.1.4) (2026-02-21)
 
 **Note:** Version bump only for package @atlassian/i18n-properties-loader
 
@@ -40,7 +42,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## <small>1.1.4 (2026-02-20)</small>
+### [1.1.4](https://bitbucket.org/atlassianlabs/fe-server/branches/compare/@atlassian/i18n-properties-loader@1.1.4..@atlassian/i18n-properties-loader@1.1.3) (2026-02-20)
 
 **Note:** Version bump only for package @atlassian/i18n-properties-loader
 

package/index.js

@@ -97,6 +97,29 @@ const clearCacheWhenIdle = debounce(() => {
   i18nCache = new Map();
 }, accessThreshold);
 
+// Returns the quote character (' or ") enclosing `offset` in `source`, or null if not in a string literal.
+function getEnclosingStringQuote(source, offset) {
+  let openQuote = null; // currently open string delimiter, or null
+  let escaped = false;
+  for (let i = 0; i < offset; i++) {
+    const ch = source[i];
+    if (escaped) {
+      escaped = false;
+    } else if (ch === '\\') {
+      escaped = true;
+    } else if (openQuote) {
+      if (ch === openQuote) openQuote = null;
+    } else if (ch === "'" || ch === '"') {
+      openQuote = ch;
+    }
+  }
+  return openQuote;
+}
+
+function escapeForStringLiteral(value, quote) {
+  return value.split(quote).join('\\' + quote);
+}
+
 function processI18nFiles(i18nFiles) {
   clearCacheWhenIdle();
 
@@ -152,8 +175,18 @@ module.exports = function (source, map) {
 
     // Replace "I18n.getText('some.translation.key', [param1], [paramN])" with the real translation string
     const properties = processI18nFiles(i18nFiles);
-    const newSource = source.replace(i18nRegExp, (...args) => {
-      const { namespace, key, endParam } = args.pop();
+    const newSource = source.replace(i18nRegExp, (match, ...args) => {
+      // replace() callback: (match, ...captures, offset, source, groups)
+      const groups = args[args.length - 1];
+      const matchSource = args[args.length - 2];
+      const offset = args[args.length - 3];
+
+      // Escape substitutions inside string literals (e.g. babel-plugin-istanbul's
+      // embedded inputSourceMap.sourcesContent) to avoid breaking the surrounding
+      // literal with unescaped quotes from JSON.stringify(message). See: DCA11Y-3344
+      const enclosingQuote = getEnclosingStringQuote(matchSource, offset);
+
+      const { namespace, key, endParam } = groups;
       const escapedKey = key.replace(/\s/g, '\\ ');
 
       let message = properties.get(escapedKey);
@@ -171,12 +204,10 @@ module.exports = function (source, map) {
       // Output string
       const escapedMessage = JSON.stringify(message);
 
-      if (endParam === ',') {
-        // We don't need to unquote the string since the WRM.format function has all the logic to do that
-        return `${formatFunctionCall}(${escapedMessage},`;
-      }
+      // For endParam === ',' we don't unquote — WRM.format handles unquoting
+      const result = endParam === ',' ? `${formatFunctionCall}(${escapedMessage},` : unquoteMessage(escapedMessage);
 
-      return unquoteMessage(escapedMessage);
+      return enclosingQuote ? escapeForStringLiteral(result, enclosingQuote) : result;
     });
 
     callback(null, newSource, map);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlassian/i18n-properties-loader",
-  "version": "2.0.0",
+  "version": "2.0.1-8db0611",
   "description": "A webpack loader for i18n *.properties files that can be used in Atlassian Server products",
   "main": "index.js",
   "repository": {
@@ -46,12 +46,12 @@
     "webpack": "^5.0.0"
   },
   "devDependencies": {
-    "@atlassian/webresource-webpack-plugin": "^7.1.7",
+    "@atlassian/webresource-webpack-plugin": "^7.1.8",
     "jest": "30.2.0",
     "webpack": "5.105.4"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "256c4a629fc4768ee9f47f313961738d41640a06"
+  "gitHead": "ddd662a8e9aa2d54c2c3bc086f1a32874e325594"
 }