Skip to content

Commit 5780bf8

Browse files
HintonHinton
authored
Add support for migrated jslib (#2826)
1 parent 71e076b commit 5780bf8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+128
-43182
lines changed

Diff for: ‎.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ root = true
77
[*]
88
end_of_line = lf
99
insert_final_newline = true
10+
trim_trailing_whitespace = true
1011

1112
# Set default charset
1213
[*.{js,ts,scss,html}]

Diff for: ‎.eslintignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
**/build
22
**/dist
3-
**/jslib
43

54
**/node_modules
65

Diff for: ‎.git-blame-ignore-revs

+5
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@
1717
56477eb39cfd8a73c9920577d24d75fed36e2cf5
1818
# Web: Monorepository https://github.com/bitwarden/clients/commit/02fe7159034b04d763a61fcf0200869e3209fa33
1919
02fe7159034b04d763a61fcf0200869e3209fa33
20+
21+
# Jslib: Apply Prettier https://github.com/bitwarden/jslib/pull/581
22+
193434461dbd9c48fe5dcbad95693470aec422ac
23+
# Jslib: Monorepository https://github.com/bitwarden/clients/pull/2824/commits/d7492e3cf320410e74ebd0e0675ab994e64bd01a
24+
d7492e3cf320410e74ebd0e0675ab994e64bd01a

Diff for: ‎.gitmodules

-18
This file was deleted.

Diff for: ‎.prettierignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
**/dist
44
**/coverage
55

6-
**/jslib
7-
86
# External libraries / auto synced locales
97
apps/browser/src/_locales
108
apps/browser/src/scripts/duo.js
@@ -24,4 +22,4 @@ apps/web/src/404/bootstrap.min.css
2422
apps/web/src/locales
2523

2624
# Github Workflows
27-
.github/workflows
25+
.github/workflows

Diff for: ‎README.md

+21
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,24 @@ git merge clients/master
111111
112112
# Push to clients or your own fork
113113
```
114+
115+
### Jslib
116+
117+
```
118+
# Merge master
119+
git merge master
120+
121+
# Merge branch mono-repo
122+
git merge d7492e3cf320410e74ebd0e0675ab994e64bd01a
123+
124+
# Verify files are placed in libs
125+
126+
# Add remote
127+
git remote add clients [email protected]:bitwarden/clients.git
128+
129+
# Merge against clients master
130+
git fetch clients
131+
git merge clients/master
132+
133+
# Push to clients or your own fork
134+
```

Diff for: ‎apps/browser/jest.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,4 @@ module.exports = {
1010
moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
1111
prefix: "<rootDir>/",
1212
}),
13-
modulePathIgnorePatterns: ["jslib"],
1413
};

Diff for: ‎apps/browser/jslib

-1
This file was deleted.

Diff for: ‎apps/browser/src/popup/scss/popup.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$icomoon-font-path: "../../../jslib/angular/src/scss/bwicons/fonts/";
2-
$card-icons-base: "../../../jslib/angular/src/images/cards/";
1+
$icomoon-font-path: "../../../../../libs/angular/src/scss/bwicons/fonts/";
2+
$card-icons-base: "../../../../../libs/angular/src/images/cards/";
33

4-
@import "../../../jslib/angular/src/scss/webfonts.css";
5-
@import "../../../jslib/angular/src/scss/bwicons/styles/style.scss";
4+
@import "../../../../../libs/angular/src/scss/webfonts.css";
5+
@import "../../../../../libs/angular/src/scss/bwicons/styles/style.scss";
66
@import "variables.scss";
7-
@import "../../../jslib/angular/src/scss/icons.scss";
7+
@import "../../../../../libs/angular/src/scss/icons.scss";
88
@import "base.scss";
99
@import "grid.scss";
1010
@import "box.scss";

Diff for: ‎apps/browser/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"sourceMap": true,
1111
"baseUrl": ".",
1212
"paths": {
13-
"jslib-common/*": ["jslib/common/src/*"],
14-
"jslib-angular/*": ["jslib/angular/src/*"]
13+
"jslib-common/*": ["../../libs/common/src/*"],
14+
"jslib-angular/*": ["../../libs/angular/src/*"]
1515
}
1616
},
1717
"angularCompilerOptions": {

Diff for: ‎apps/cli/jest.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ module.exports = {
1212
moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
1313
prefix: "<rootDir>/",
1414
}),
15-
modulePathIgnorePatterns: ["jslib"],
1615
};

Diff for: ‎apps/cli/jslib

-1
This file was deleted.

Diff for: ‎apps/cli/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"sourceMap": true,
1313
"baseUrl": ".",
1414
"paths": {
15-
"jslib-common/*": ["jslib/common/src/*"],
16-
"jslib-node/*": ["jslib/node/src/*"]
15+
"jslib-common/*": ["../../libs/common/src/*"],
16+
"jslib-node/*": ["../../libs/node/src/*"]
1717
}
1818
},
1919
"include": ["src"]

Diff for: ‎apps/desktop/jslib

-1
This file was deleted.

Diff for: ‎apps/desktop/src/scss/styles.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$icomoon-font-path: "../../jslib/angular/src/scss/bwicons/fonts/";
2-
$card-icons-base: "../../jslib/angular/src/images/cards/";
1+
$icomoon-font-path: "../../../../libs/angular/src/scss/bwicons/fonts/";
2+
$card-icons-base: "../../../../libs/angular/src/images/cards/";
33

4-
@import "../../jslib/angular/src/scss/webfonts.css";
5-
@import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
4+
@import "../../../../libs/angular/src/scss/webfonts.css";
5+
@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
66
@import "~@angular/cdk/overlay-prebuilt.css";
77
@import "variables.scss";
88
@import "base.scss";
@@ -19,4 +19,4 @@ $card-icons-base: "../../jslib/angular/src/images/cards/";
1919
@import "header.scss";
2020
@import "left-nav.scss";
2121
@import "loading.scss";
22-
@import "../../jslib/angular/src/scss/icons.scss";
22+
@import "../../../../libs/angular/src/scss/icons.scss";

Diff for: ‎apps/desktop/tsconfig.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"types": [],
1111
"baseUrl": ".",
1212
"paths": {
13-
"tldjs": ["jslib/common/src/misc/tldjs.noop"],
14-
"jslib-common/*": ["jslib/common/src/*"],
15-
"jslib-angular/*": ["jslib/angular/src/*"],
16-
"jslib-electron/*": ["jslib/electron/src/*"]
13+
"tldjs": ["../../libs/common/src/misc/tldjs.noop"],
14+
"jslib-common/*": ["../../libs/common/src/*"],
15+
"jslib-angular/*": ["../../libs/angular/src/*"],
16+
"jslib-electron/*": ["../../libs/electron/src/*"]
1717
}
1818
},
1919
"angularCompilerOptions": {

Diff for: ‎apps/desktop/tsconfig.renderer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"extends": "./tsconfig.json",
3-
"exclude": ["src/entry.ts", "src/main.ts", "src/main", "src/proxy", "jslib/**/*.main.ts"]
3+
"exclude": ["src/entry.ts", "src/main.ts", "src/main", "src/proxy"]
44
}

Diff for: ‎apps/desktop/webpack.renderer.js

-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ const common = {
2828
plugins: [],
2929
resolve: {
3030
extensions: [".tsx", ".ts", ".js"],
31-
alias: {
32-
jslib: path.join(__dirname, "jslib/src"),
33-
},
3431
symlinks: false,
3532
modules: [path.resolve("../../node_modules")],
3633
},

Diff for: ‎apps/web/jslib

-1
This file was deleted.

Diff for: ‎apps/web/src/scss/styles.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$icomoon-font-path: "../../jslib/angular/src/scss/bwicons/fonts/";
2-
$card-icons-base: "../../jslib/angular/src/images/cards/";
1+
$icomoon-font-path: "../../../../libs/angular/src/scss/bwicons/fonts/";
2+
$card-icons-base: "../../../../libs/angular/src/images/cards/";
33

4-
@import "../../jslib/angular/src/scss/webfonts.css";
4+
@import "../../../../libs/angular/src/scss/webfonts.css";
55
@import "./variables";
6-
@import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
7-
@import "../../jslib/angular/src/scss/icons.scss";
6+
@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
7+
@import "../../../../libs/angular/src/scss/icons.scss";
88
@import "@angular/cdk/overlay-prebuilt.css";
99

1010
//@import "~bootstrap/scss/bootstrap";

Diff for: ‎apps/web/src/scss/tailwind.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
@tailwind components;
33
@tailwind utilities;
44

5-
@import "../../jslib/components/src/tw-theme.css";
5+
@import "../../../../libs/components/src/tw-theme.css";

Diff for: ‎apps/web/tailwind.config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* eslint-disable no-undef, @typescript-eslint/no-var-requires */
2-
const config = require("./jslib/components/tailwind.config.base");
2+
const config = require("../../libs/components/tailwind.config.base");
33

44
module.exports = config;

Diff for: ‎apps/web/tsconfig.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"extends": "./jslib/shared/tsconfig",
2+
"extends": "../../libs/shared/tsconfig",
33
"compilerOptions": {
44
"baseUrl": ".",
55
"paths": {
6-
"tldjs": ["jslib/common/src/misc/tldjs.noop"],
7-
"jslib-common/*": ["jslib/common/src/*"],
8-
"jslib-angular/*": ["jslib/angular/src/*"],
9-
"@bitwarden/components": ["jslib/components/src"],
6+
"tldjs": ["../../libs/common/src/misc/tldjs.noop"],
7+
"jslib-common/*": ["../../libs/common/src/*"],
8+
"jslib-angular/*": ["../../libs/angular/src/*"],
9+
"@bitwarden/components": ["../../libs/components/src"],
1010
"src/*": ["src/*"]
1111
}
1212
},

Diff for: ‎libs/.editorconfig

-16
This file was deleted.

Diff for: ‎libs/.eslintignore

-4
This file was deleted.

Diff for: ‎libs/.eslintrc.json

-23
This file was deleted.

Diff for: ‎libs/.git-blame-ignore-revs

-1
This file was deleted.

Diff for: ‎libs/.gitattributes

-1
This file was deleted.

Diff for: ‎libs/.github/PULL_REQUEST_TEMPLATE.md

-25
This file was deleted.

Diff for: ‎libs/.github/workflows/enforce-labels.yml

-16
This file was deleted.

Diff for: ‎libs/.husky/.gitignore

-1
This file was deleted.

Diff for: ‎libs/.husky/pre-commit

-4
This file was deleted.

Diff for: ‎libs/.prettierignore

-7
This file was deleted.

Diff for: ‎libs/.prettierrc.json

-3
This file was deleted.

Diff for: ‎libs/.vscode/launch.json

-16
This file was deleted.

Diff for: ‎libs/.vscode/tasks.json

-12
This file was deleted.

0 commit comments

Comments
 (0)