Skip to content

Commit

Permalink
[AC-1614] Updated webpack config (#352)
Browse files Browse the repository at this point in the history
* [AC-1614] Updated webpack config

* [AC-1614] Ran prettier

* [AC-1614] Fix build
  • Loading branch information
r-tome authored Sep 26, 2023
1 parent 4dba787 commit 26e4930
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 10 deletions.
6 changes: 3 additions & 3 deletions jslib/angular/src/components/callout.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ <h3 class="callout-heading" *ngIf="title">
{{ 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 }}
Expand All @@ -27,7 +27,7 @@ <h3 class="callout-heading" *ngIf="title">
{{ "policyInEffectNumbers" | i18n }}
</li>
<li *ngIf="enforcedPolicyOptions?.requireSpecial">
{{ "policyInEffectSpecial" | i18n: "!@#$%^&*" }}
{{ "policyInEffectSpecial" | i18n : "!@#$%^&*" }}
</li>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions jslib/common/src/enums/importOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"];
4 changes: 2 additions & 2 deletions src/app/tabs/dashboard.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ <h3 class="card-header">{{ "sync" | i18n }}</h3>
<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 }}:
Expand Down
2 changes: 1 addition & 1 deletion src/app/tabs/more.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h3 class="card-header">{{ "about" | i18n }}</h3>
<p>
{{ "bitwardenDirectoryConnector" | i18n }}
<br />
{{ "version" | i18n: version }} <br />
{{ "version" | i18n : version }} <br />
&copy; Bitwarden Inc. LLC 2015-{{ year }}
</p>
<button
Expand Down
5 changes: 4 additions & 1 deletion webpack.main.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ const main = {
],
}),
],
externals: [nodeExternals()],
externals: {
"electron-reload": "commonjs2 electron-reload",
keytar: "commonjs2 keytar",
},
};

module.exports = merge(common, main);
14 changes: 13 additions & 1 deletion webpack.renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
{
Expand Down

0 comments on commit 26e4930

Please sign in to comment.