Add support for migrated jslib (bitwarden#2826)

freeman4747 · Jun 3, 2022 · 5780bf8 · 5780bf8
1 parent 71e076b
commit 5780bf8
Show file tree

Hide file tree

Showing 58 changed files with 128 additions and 43,182 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -7,6 +7,7 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 # Set default charset
 [*.{js,ts,scss,html}]

diff --git a/.eslintignore b/.eslintignore
@@ -1,6 +1,5 @@
 **/build
 **/dist
-**/jslib
 
 **/node_modules
 

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -17,3 +17,8 @@
 56477eb39cfd8a73c9920577d24d75fed36e2cf5
 # Web: Monorepository https://github.com/bitwarden/clients/commit/02fe7159034b04d763a61fcf0200869e3209fa33
 02fe7159034b04d763a61fcf0200869e3209fa33
+
+# Jslib: Apply Prettier https://github.com/bitwarden/jslib/pull/581
+193434461dbd9c48fe5dcbad95693470aec422ac
+# Jslib: Monorepository https://github.com/bitwarden/clients/pull/2824/commits/d7492e3cf320410e74ebd0e0675ab994e64bd01a
+d7492e3cf320410e74ebd0e0675ab994e64bd01a
diff --git a/.gitmodules b/.gitmodules
diff --git a/.prettierignore b/.prettierignore
@@ -3,8 +3,6 @@
 **/dist
 **/coverage
 
-**/jslib
-
 # External libraries / auto synced locales
 apps/browser/src/_locales
 apps/browser/src/scripts/duo.js
@@ -24,4 +22,4 @@ apps/web/src/404/bootstrap.min.css
 apps/web/src/locales
 
 # Github Workflows
-.github/workflows 
+.github/workflows
diff --git a/README.md b/README.md
@@ -111,3 +111,24 @@ git merge clients/master
 
 # Push to clients or your own fork
 ```
+
+### Jslib
+
+```
+# Merge master
+git merge master
+
+# Merge branch mono-repo
+git merge d7492e3cf320410e74ebd0e0675ab994e64bd01a
+
+# Verify files are placed in libs
+
+# Add remote
+git remote add clients git@github.com:bitwarden/clients.git
+
+# Merge against clients master
+git fetch clients
+git merge clients/master
+
+# Push to clients or your own fork
+```
diff --git a/apps/browser/jest.config.js b/apps/browser/jest.config.js
@@ -10,5 +10,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };
diff --git a/apps/browser/jslib b/apps/browser/jslib
diff --git a/apps/browser/src/popup/scss/popup.scss b/apps/browser/src/popup/scss/popup.scss
@@ -1,10 +1,10 @@
-$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 "variables.scss";
-@import "../../../jslib/angular/src/scss/icons.scss";
+@import "../../../../../libs/angular/src/scss/icons.scss";
 @import "base.scss";
 @import "grid.scss";
 @import "box.scss";

diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
@@ -10,8 +10,8 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
-      "jslib-common/*": ["jslib/common/src/*"],
-      "jslib-angular/*": ["jslib/angular/src/*"]
+      "jslib-common/*": ["../../libs/common/src/*"],
+      "jslib-angular/*": ["../../libs/angular/src/*"]
     }
   },
   "angularCompilerOptions": {

diff --git a/apps/cli/jest.config.js b/apps/cli/jest.config.js
@@ -12,5 +12,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };
diff --git a/apps/cli/jslib b/apps/cli/jslib
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
@@ -12,8 +12,8 @@
     "sourceMap": true,
     "baseUrl": ".",
     "paths": {
-      "jslib-common/*": ["jslib/common/src/*"],
-      "jslib-node/*": ["jslib/node/src/*"]
+      "jslib-common/*": ["../../libs/common/src/*"],
+      "jslib-node/*": ["../../libs/node/src/*"]
     }
   },
   "include": ["src"]

diff --git a/apps/desktop/jslib b/apps/desktop/jslib
diff --git a/apps/desktop/src/scss/styles.scss b/apps/desktop/src/scss/styles.scss
@@ -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";
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
@@ -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": {

diff --git a/apps/desktop/tsconfig.renderer.json b/apps/desktop/tsconfig.renderer.json
@@ -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"]
 }
diff --git a/apps/desktop/webpack.renderer.js b/apps/desktop/webpack.renderer.js
@@ -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")],
   },

diff --git a/apps/web/jslib b/apps/web/jslib
diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss
@@ -1,10 +1,10 @@
-$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 "../../../../libs/angular/src/scss/webfonts.css";
 @import "./variables";
-@import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
-@import "../../jslib/angular/src/scss/icons.scss";
+@import "../../../../libs/angular/src/scss/bwicons/styles/style.scss";
+@import "../../../../libs/angular/src/scss/icons.scss";
 @import "@angular/cdk/overlay-prebuilt.css";
 
 //@import "~bootstrap/scss/bootstrap";

diff --git a/apps/web/src/scss/tailwind.css b/apps/web/src/scss/tailwind.css
@@ -2,4 +2,4 @@
 @tailwind components;
 @tailwind utilities;
 
-@import "../../jslib/components/src/tw-theme.css";
+@import "../../../../libs/components/src/tw-theme.css";
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
@@ -1,4 +1,4 @@
 /* eslint-disable no-undef, @typescript-eslint/no-var-requires */
-const config = require("./jslib/components/tailwind.config.base");
+const config = require("../../libs/components/tailwind.config.base");
 
 module.exports = config;
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
@@ -1,12 +1,12 @@
 {
-  "extends": "./jslib/shared/tsconfig",
+  "extends": "../../libs/shared/tsconfig",
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "tldjs": ["jslib/common/src/misc/tldjs.noop"],
-      "jslib-common/*": ["jslib/common/src/*"],
-      "jslib-angular/*": ["jslib/angular/src/*"],
-      "@bitwarden/components": ["jslib/components/src"],
+      "tldjs": ["../../libs/common/src/misc/tldjs.noop"],
+      "jslib-common/*": ["../../libs/common/src/*"],
+      "jslib-angular/*": ["../../libs/angular/src/*"],
+      "@bitwarden/components": ["../../libs/components/src"],
       "src/*": ["src/*"]
     }
   },

diff --git a/libs/.editorconfig b/libs/.editorconfig
diff --git a/libs/.eslintignore b/libs/.eslintignore
diff --git a/libs/.eslintrc.json b/libs/.eslintrc.json
diff --git a/libs/.git-blame-ignore-revs b/libs/.git-blame-ignore-revs
diff --git a/libs/.gitattributes b/libs/.gitattributes
diff --git a/libs/.github/PULL_REQUEST_TEMPLATE.md b/libs/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/libs/.github/workflows/enforce-labels.yml b/libs/.github/workflows/enforce-labels.yml
diff --git a/libs/.husky/.gitignore b/libs/.husky/.gitignore
diff --git a/libs/.husky/pre-commit b/libs/.husky/pre-commit
diff --git a/libs/.prettierignore b/libs/.prettierignore
diff --git a/libs/.prettierrc.json b/libs/.prettierrc.json
diff --git a/libs/.vscode/launch.json b/libs/.vscode/launch.json
diff --git a/libs/.vscode/tasks.json b/libs/.vscode/tasks.json