bitwarden/directory-connector
1
0
Fork 0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-05 23:53:21 +00:00
Code Issues Releases Wiki Activity

[AC-1614] Updated webpack config (#352)

Browse Source 
* [AC-1614] Updated webpack config

* [AC-1614] Ran prettier

* [AC-1614] Fix build
This commit is contained in:
Rui Tomé
2023-09-26 10:07:39 +01:00
committed by GitHub
parent 4dba787df2
commit 26e4930a9e
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jslib/angular/src/components/callout.component.html
View File

@@ -12,10 +12,10 @@
{{ enforcedPolicyMessage }} {{ enforcedPolicyMessage }}
<ul> <ul>
<li *ngIf="enforcedPolicyOptions?.minComplexity > 0"> <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
{{ "policyInEffectMinComplexity" | i18n: getPasswordScoreAlertDisplay() }} {{ "policyInEffectMinComplexity" | i18n : getPasswordScoreAlertDisplay() }}
</li> </li>
<li *ngIf="enforcedPolicyOptions?.minLength > 0"> <li *ngIf="enforcedPolicyOptions?.minLength > 0">
{{ "policyInEffectMinLength" | i18n: enforcedPolicyOptions?.minLength.toString() }} {{ "policyInEffectMinLength" | i18n : enforcedPolicyOptions?.minLength.toString() }}
</li> </li>
<li *ngIf="enforcedPolicyOptions?.requireUpper"> <li *ngIf="enforcedPolicyOptions?.requireUpper">
{{ "policyInEffectUppercase" | i18n }} {{ "policyInEffectUppercase" | i18n }}
@@ -27,7 +27,7 @@
{{ "policyInEffectNumbers" | i18n }} {{ "policyInEffectNumbers" | i18n }}
</li> </li>
<li *ngIf="enforcedPolicyOptions?.requireSpecial"> <li *ngIf="enforcedPolicyOptions?.requireSpecial">
{{ "policyInEffectSpecial" | i18n: "!@#$%^&*" }} {{ "policyInEffectSpecial" | i18n : "!@#$%^&*" }}
</li> </li>
</ul> </ul>
</div> </div>

4
jslib/common/src/enums/importOptions.ts
View File

@@ -70,5 +70,5 @@ export const regularImportOptions = [
] as const; ] as const;
export type ImportType = export type ImportType =
| typeof featuredImportOptions[number]["id"] | (typeof featuredImportOptions)[number]["id"]
| typeof regularImportOptions[number]["id"]; | (typeof regularImportOptions)[number]["id"];

4
src/app/tabs/dashboard.component.html
View File

@@ -4,11 +4,11 @@
<p> <p>
{{ "lastGroupSync" | i18n }}: {{ "lastGroupSync" | i18n }}:
<span *ngIf="!lastGroupSync">-</span> <span *ngIf="!lastGroupSync">-</span>
{{ lastGroupSync | date: "medium" }} {{ lastGroupSync | date : "medium" }}
<br /> <br />
{{ "lastUserSync" | i18n }}: {{ "lastUserSync" | i18n }}:
<span *ngIf="!lastUserSync">-</span> <span *ngIf="!lastUserSync">-</span>
{{ lastUserSync | date: "medium" }} {{ lastUserSync | date : "medium" }}
</p> </p>
<p> <p>
{{ "syncStatus" | i18n }}: {{ "syncStatus" | i18n }}:

2
src/app/tabs/more.component.html
View File

@@ -6,7 +6,7 @@
<p> <p>
{{ "bitwardenDirectoryConnector" | i18n }} {{ "bitwardenDirectoryConnector" | i18n }}
<br /> <br />
{{ "version" | i18n: version }} <br /> {{ "version" | i18n : version }} <br />
&copy; Bitwarden Inc. LLC 2015-{{ year }} &copy; Bitwarden Inc. LLC 2015-{{ year }}
</p> </p>
<button <button

5
webpack.main.js
View File

@@ -57,7 +57,10 @@ const main = {
], ],
}), }),
], ],
externals: [nodeExternals()], externals: {
"electron-reload": "commonjs2 electron-reload",
keytar: "commonjs2 keytar",
},
}; };
module.exports = merge(common, main); module.exports = merge(common, main);

14
webpack.renderer.js
View File

@@ -10,7 +10,19 @@ const common = {
module: { module: {
rules: [ 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", loader: "@ngtools/webpack",
}, },
{ {