bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-03 17:13:47 +00:00
Code Issues Releases Wiki Activity

Add support for migrated jslib (#2826)

Browse Source
This commit is contained in:
Oscar Hinton
2022-06-03 18:01:07 +02:00
committed by GitHub
parent 71e076b305
commit 5780bf85e7
58 changed files with 103 additions and 43157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/jslib

Submodule apps/desktop/jslib deleted from 1ea2824c24

10
apps/desktop/src/scss/styles.scss
View File

@@ -1,8 +1,8 @@
$icomoon-font-path: "../../jslib/angular/src/scss/bwicons/fonts/";
$card-icons-base: "../../jslib/angular/src/images/cards/";
$icomoon-font-path: "../../../../libs/angular/src/scss/bwicons/fonts/";
$card-icons-base: "../../../../libs/angular/src/images/cards/";
@import "../../jslib/angular/src/scss/webfonts.css";
@import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
@import "../../../../libs/angular/src/scss/webfonts.css";
@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
@import "~@angular/cdk/overlay-prebuilt.css";
@import "variables.scss";
@import "base.scss";
@@ -19,4 +19,4 @@ $card-icons-base: "../../jslib/angular/src/images/cards/";
@import "header.scss";
@import "left-nav.scss";
@import "loading.scss";
@import "../../jslib/angular/src/scss/icons.scss";
@import "../../../../libs/angular/src/scss/icons.scss";

8
apps/desktop/tsconfig.json
View File

@@ -10,10 +10,10 @@
"types": [],
"baseUrl": ".",
"paths": {
"tldjs": ["jslib/common/src/misc/tldjs.noop"],
"jslib-common/*": ["jslib/common/src/*"],
"jslib-angular/*": ["jslib/angular/src/*"],
"jslib-electron/*": ["jslib/electron/src/*"]
"tldjs": ["../../libs/common/src/misc/tldjs.noop"],
"jslib-common/*": ["../../libs/common/src/*"],
"jslib-angular/*": ["../../libs/angular/src/*"],
"jslib-electron/*": ["../../libs/electron/src/*"]
}
},
"angularCompilerOptions": {

2
apps/desktop/tsconfig.renderer.json
View File

@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"exclude": ["src/entry.ts", "src/main.ts", "src/main", "src/proxy", "jslib/**/*.main.ts"]
"exclude": ["src/entry.ts", "src/main.ts", "src/main", "src/proxy"]
}

3
apps/desktop/webpack.renderer.js
View File

@@ -28,9 +28,6 @@ const common = {
plugins: [],
resolve: {
extensions: [".tsx", ".ts", ".js"],
alias: {
jslib: path.join(__dirname, "jslib/src"),
},
symlinks: false,
modules: [path.resolve("../../node_modules")],
},