From 26e4930a9e2481df231c8092b11c64593b96203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:07:39 +0100
Subject: [PATCH] =?UTF-8?q?[AC-1614]=C2=A0Updated=20webpack=20config=20(#3?=
 =?UTF-8?q?52)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [AC-1614] Updated webpack config

* [AC-1614] Ran prettier

* [AC-1614] Fix build
---
 .../angular/src/components/callout.component.html  |  6 +++---
 jslib/common/src/enums/importOptions.ts            |  4 ++--
 src/app/tabs/dashboard.component.html              |  4 ++--
 src/app/tabs/more.component.html                   |  2 +-
 webpack.main.js                                    |  5 ++++-
 webpack.renderer.js                                | 14 +++++++++++++-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/jslib/angular/src/components/callout.component.html b/jslib/angular/src/components/callout.component.html
index a049d5cb..55e9510c 100644
--- a/jslib/angular/src/components/callout.component.html
+++ b/jslib/angular/src/components/callout.component.html
@@ -12,10 +12,10 @@
     {{ enforcedPolicyMessage }}
     <ul>
       <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
-        {{ "policyInEffectMinComplexity" | i18n: getPasswordScoreAlertDisplay() }}
+        {{ "policyInEffectMinComplexity" | i18n : getPasswordScoreAlertDisplay() }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.minLength > 0">
-        {{ "policyInEffectMinLength" | i18n: enforcedPolicyOptions?.minLength.toString() }}
+        {{ "policyInEffectMinLength" | i18n : enforcedPolicyOptions?.minLength.toString() }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.requireUpper">
         {{ "policyInEffectUppercase" | i18n }}
@@ -27,7 +27,7 @@
         {{ "policyInEffectNumbers" | i18n }}
       </li>
       <li *ngIf="enforcedPolicyOptions?.requireSpecial">
-        {{ "policyInEffectSpecial" | i18n: "!@#$%^&*" }}
+        {{ "policyInEffectSpecial" | i18n : "!@#$%^&*" }}
       </li>
     </ul>
   </div>
diff --git a/jslib/common/src/enums/importOptions.ts b/jslib/common/src/enums/importOptions.ts
index 6535b133..28181db4 100644
--- a/jslib/common/src/enums/importOptions.ts
+++ b/jslib/common/src/enums/importOptions.ts
@@ -70,5 +70,5 @@ export const regularImportOptions = [
 ] as const;
 
 export type ImportType =
-  | typeof featuredImportOptions[number]["id"]
-  | typeof regularImportOptions[number]["id"];
+  | (typeof featuredImportOptions)[number]["id"]
+  | (typeof regularImportOptions)[number]["id"];
diff --git a/src/app/tabs/dashboard.component.html b/src/app/tabs/dashboard.component.html
index 362acbef..a08a6176 100644
--- a/src/app/tabs/dashboard.component.html
+++ b/src/app/tabs/dashboard.component.html
@@ -4,11 +4,11 @@
     <p>
       {{ "lastGroupSync" | i18n }}:
       <span *ngIf="!lastGroupSync">-</span>
-      {{ lastGroupSync | date: "medium" }}
+      {{ lastGroupSync | date : "medium" }}
       <br />
       {{ "lastUserSync" | i18n }}:
       <span *ngIf="!lastUserSync">-</span>
-      {{ lastUserSync | date: "medium" }}
+      {{ lastUserSync | date : "medium" }}
     </p>
     <p>
       {{ "syncStatus" | i18n }}:
diff --git a/src/app/tabs/more.component.html b/src/app/tabs/more.component.html
index a1d80ed2..b99fb4f8 100644
--- a/src/app/tabs/more.component.html
+++ b/src/app/tabs/more.component.html
@@ -6,7 +6,7 @@
         <p>
           {{ "bitwardenDirectoryConnector" | i18n }}
           <br />
-          {{ "version" | i18n: version }} <br />
+          {{ "version" | i18n : version }} <br />
           &copy; Bitwarden Inc. LLC 2015-{{ year }}
         </p>
         <button
diff --git a/webpack.main.js b/webpack.main.js
index 13e6a920..a797eecc 100644
--- a/webpack.main.js
+++ b/webpack.main.js
@@ -57,7 +57,10 @@ const main = {
       ],
     }),
   ],
-  externals: [nodeExternals()],
+  externals: {
+    "electron-reload": "commonjs2 electron-reload",
+    keytar: "commonjs2 keytar",
+  },
 };
 
 module.exports = merge(common, main);
diff --git a/webpack.renderer.js b/webpack.renderer.js
index 4478724b..7ecbfddd 100644
--- a/webpack.renderer.js
+++ b/webpack.renderer.js
@@ -10,7 +10,19 @@ const common = {
   module: {
     rules: [
       {
-        test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
+        test: /\.[cm]?js$/,
+        use: [
+          {
+            loader: "babel-loader",
+            options: {
+              configFile: false,
+              plugins: ["@angular/compiler-cli/linker/babel"],
+            },
+          },
+        ],
+      },
+      {
+        test: /\.[jt]sx?$/,
         loader: "@ngtools/webpack",
       },
       {