Merge pull request #2824 from bitwarden/jslib

apps/browser/jest.config.js

@@ -10,5 +10,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };

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";

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": {

apps/cli/jest.config.js

@@ -12,5 +12,4 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
     prefix: "<rootDir>/",
   }),
-  modulePathIgnorePatterns: ["jslib"],
 };

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"]

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";

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": {

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"]
 }

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")],
   },

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";

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";

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;

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/*"]
     }
   },