MC-19247: Broken translations with advanced bundling

- Add strict type to js unit test;
- Eliminate preference for file system driver;

Author: adifucan

app/code/Magento/Translation/ViewModel/Dictionary.php

@@ -10,7 +10,6 @@
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\View\Asset\File\NotFoundException;
 use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Translation\Model\Js\Config as JsConfig;
@@ -64,26 +63,20 @@ public function __construct(
      * Get translation dictionary file content.
      *
      * @return string
+     * @throws FileSystemException
+     * @throws LocalizedException
      */
     public function getTranslationDictionary(): string
     {
         if ($this->appState->getMode() === AppState::MODE_PRODUCTION) {
-            try {
-                $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
-                $staticViewFilePath = $this->filesystem->getDirectoryRead(
-                    DirectoryList::STATIC_VIEW
-                )->getAbsolutePath();
-                $content = $this->filesystemDriver->fileGetContents($staticViewFilePath . $asset->getPath());
-            } catch (LocalizedException | FileSystemException $e) {
-                $content = '';
-            }
+            $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
+            $staticViewFilePath = $this->filesystem->getDirectoryRead(
+                DirectoryList::STATIC_VIEW
+            )->getAbsolutePath();
+            $content = $this->filesystemDriver->fileGetContents($staticViewFilePath . $asset->getPath());
         } else {
-            try {
-                $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
-                $content = $asset->getContent();
-            } catch (LocalizedException | NotFoundException $e) {
-                $content = '';
-            }
+            $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
+            $content = $asset->getContent();
         }
 
         return $content;

app/code/Magento/Translation/etc/di.xml

@@ -15,7 +15,11 @@
     <preference for="Magento\Framework\Phrase\RendererInterface" type="Magento\Framework\Phrase\Renderer\Composite" />
     <preference for="Magento\Translation\Model\Js\DataProviderInterface" type="Magento\Translation\Model\Js\DataProvider"/>
     <preference for="Magento\Framework\Translate\Js\Config" type="Magento\Translation\Model\Js\Config"/>
-    <preference for="Magento\Framework\Filesystem\DriverInterface" type="Magento\Framework\Filesystem\Driver\File"/>
+    <type name="Magento\Translation\ViewModel\Dictionary">
+        <arguments>
+            <argument name="filesystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Translate\Inline">
         <arguments>
             <argument name="templateFileName" xsi:type="string">Magento_Translation::translate_inline.phtml</argument>

dev/tests/js/jasmine/tests/lib/mage/fake-dictionary.js

@@ -4,5 +4,7 @@
  */
 // Fake dictionary for js unit tests as real dictionary is defined is template and cannot be initialized by requirejs
 define([], function () {
+    'use strict';
+
     return {};
 });