[AC-1743] pt. 1: Unpackage-ify jslib (#374)

* Unpackage-ify jslib * Adjust .tsconfig path for root and apply to jslib * Rebuild package-lock.json * Disable husky in CI * Revert an incorrect find/replace * Add jslib/shared/.eslintrc rules to root eslintrc * Revert package.json change to ignore spec files when linting * Ensure custom matcher gets imported in jslib tests * Fix small workflow bugs from merging * Try and get CI builds moving again * Always sign and notorize builds in CI * Revert erroneous verion bump
2026-01-06 02:23:35 +00:00 · 2023-12-20 10:33:33 -06:00
parent 9126d4ae59
commit c259962279
186 changed files with 2955 additions and 19570 deletions
--- a/jslib/electron/package-lock.json
+++ b/jslib/electron/package-lock.json
@@ -1,29 +0,0 @@
-{
-  "name": "@bitwarden/jslib-electron",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@bitwarden/jslib-electron",
-      "version": "0.0.0",
-      "license": "GPL-3.0",
-      "dependencies": {
-        "@bitwarden/jslib-common": "file:../common"
-      }
-    },
-    "../common": {
-      "version": "0.0.0",
-      "license": "GPL-3.0"
-    },
-    "node_modules/@bitwarden/jslib-common": {
-      "resolved": "../common",
-      "link": true
-    }
-  },
-  "dependencies": {
-    "@bitwarden/jslib-common": {
-      "version": "file:../common"
-    }
-  }
-}
--- a/jslib/electron/package.json
+++ b/jslib/electron/package.json
@@ -1,23 +0,0 @@
-{
-  "name": "@bitwarden/jslib-electron",
-  "version": "0.0.0",
-  "description": "Common code used across Bitwarden JavaScript projects.",
-  "keywords": [
-    "bitwarden"
-  ],
-  "author": "Bitwarden Inc.",
-  "homepage": "https://bitwarden.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bitwarden/jslib"
-  },
-  "license": "GPL-3.0",
-  "scripts": {
-    "clean": "rimraf dist/**/*",
-    "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
-  },
-  "dependencies": {
-    "@bitwarden/jslib-common": "file:../common"
-  }
-}
--- a/jslib/electron/spec/services/electronLog.service.spec.ts
+++ b/jslib/electron/spec/services/electronLog.service.spec.ts
@@ -1,4 +1,4 @@
-import { ElectronLogService } from "jslib-electron/services/electronLog.service";
+import { ElectronLogService } from "@/jslib/electron/src/services/electronLog.service";

 describe("ElectronLogService", () => {
  it("sets dev based on electron method", () => {
--- a/jslib/electron/spec/utils.spec.ts
+++ b/jslib/electron/spec/utils.spec.ts
@@ -1,4 +1,4 @@
-import { cleanUserAgent } from "jslib-electron/utils";
+import { cleanUserAgent } from "@/jslib/electron/src/utils";

 const expectedUserAgent = `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome} Safari/537.36`;

--- a/jslib/electron/src/baseMenu.ts
+++ b/jslib/electron/src/baseMenu.ts
@@ -1,6 +1,6 @@
 import { Menu, MenuItemConstructorOptions } from "electron";

-import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";

 import { WindowMain } from "./window.main";

--- a/jslib/electron/src/services/electronCrypto.service.ts
+++ b/jslib/electron/src/services/electronCrypto.service.ts
@@ -1,10 +1,10 @@
-import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
-import { LogService } from "jslib-common/abstractions/log.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
-import { CryptoService } from "jslib-common/services/crypto.service";
+import { CryptoFunctionService } from "@/jslib/common/src/abstractions/cryptoFunction.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { KeySuffixOptions } from "@/jslib/common/src/enums/keySuffixOptions";
+import { SymmetricCryptoKey } from "@/jslib/common/src/models/domain/symmetricCryptoKey";
+import { CryptoService } from "@/jslib/common/src/services/crypto.service";

 export class ElectronCryptoService extends CryptoService {
  constructor(
--- a/jslib/electron/src/services/electronLog.service.ts
+++ b/jslib/electron/src/services/electronLog.service.ts
@@ -2,8 +2,8 @@ import * as path from "path";

 import log from "electron-log";

-import { LogLevelType } from "jslib-common/enums/logLevelType";
-import { ConsoleLogService as BaseLogService } from "jslib-common/services/consoleLog.service";
+import { LogLevelType } from "@/jslib/common/src/enums/logLevelType";
+import { ConsoleLogService as BaseLogService } from "@/jslib/common/src/services/consoleLog.service";

 import { isDev } from "../utils";

--- a/jslib/electron/src/services/electronMainMessaging.service.ts
+++ b/jslib/electron/src/services/electronMainMessaging.service.ts
@@ -1,7 +1,7 @@
 import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme } from "electron";

-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { ThemeType } from "jslib-common/enums/themeType";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { ThemeType } from "@/jslib/common/src/enums/themeType";

 import { RendererMenuItem } from "../utils";
 import { WindowMain } from "../window.main";
--- a/jslib/electron/src/services/electronPlatformUtils.service.ts
+++ b/jslib/electron/src/services/electronPlatformUtils.service.ts
@@ -1,12 +1,12 @@
 import { clipboard, ipcRenderer, shell } from "electron";

-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { ClientType } from "jslib-common/enums/clientType";
-import { DeviceType } from "jslib-common/enums/deviceType";
-import { ThemeType } from "jslib-common/enums/themeType";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
+import { PlatformUtilsService } from "@/jslib/common/src/abstractions/platformUtils.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";
+import { ClientType } from "@/jslib/common/src/enums/clientType";
+import { DeviceType } from "@/jslib/common/src/enums/deviceType";
+import { ThemeType } from "@/jslib/common/src/enums/themeType";

 import { isDev, isMacAppStore } from "../utils";

--- a/jslib/electron/src/services/electronRendererMessaging.service.ts
+++ b/jslib/electron/src/services/electronRendererMessaging.service.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from "electron";

-import { BroadcasterService } from "jslib-common/abstractions/broadcaster.service";
-import { MessagingService } from "jslib-common/abstractions/messaging.service";
+import { BroadcasterService } from "@/jslib/common/src/abstractions/broadcaster.service";
+import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";

 export class ElectronRendererMessagingService implements MessagingService {
  constructor(private broadcasterService: BroadcasterService) {
--- a/jslib/electron/src/services/electronRendererSecureStorage.service.ts
+++ b/jslib/electron/src/services/electronRendererSecureStorage.service.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from "electron";

-import { StorageService } from "jslib-common/abstractions/storage.service";
-import { StorageOptions } from "jslib-common/models/domain/storageOptions";
+import { StorageService } from "@/jslib/common/src/abstractions/storage.service";
+import { StorageOptions } from "@/jslib/common/src/models/domain/storageOptions";

 export class ElectronRendererSecureStorageService implements StorageService {
  async get<T>(key: string, options?: StorageOptions): Promise<T> {
--- a/jslib/electron/src/services/electronRendererStorage.service.ts
+++ b/jslib/electron/src/services/electronRendererStorage.service.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from "electron";

-import { StorageService } from "jslib-common/abstractions/storage.service";
+import { StorageService } from "@/jslib/common/src/abstractions/storage.service";

 export class ElectronRendererStorageService implements StorageService {
  get<T>(key: string): Promise<T> {
--- a/jslib/electron/src/services/electronStorage.service.ts
+++ b/jslib/electron/src/services/electronStorage.service.ts
@@ -2,8 +2,8 @@ import * as fs from "fs";

 import { ipcMain } from "electron";

-import { StorageService } from "jslib-common/abstractions/storage.service";
-import { NodeUtils } from "jslib-common/misc/nodeUtils";
+import { StorageService } from "@/jslib/common/src/abstractions/storage.service";
+import { NodeUtils } from "@/jslib/common/src/misc/nodeUtils";

 // eslint-disable-next-line
 const Store = require("electron-store");
--- a/jslib/electron/src/tray.main.ts
+++ b/jslib/electron/src/tray.main.ts
@@ -2,8 +2,8 @@ import * as path from "path";

 import { app, BrowserWindow, Menu, MenuItemConstructorOptions, nativeImage, Tray } from "electron";

-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { StateService } from "jslib-common/abstractions/state.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";

 import { WindowMain } from "./window.main";

--- a/jslib/electron/src/updater.main.ts
+++ b/jslib/electron/src/updater.main.ts
@@ -2,7 +2,7 @@ import { dialog, shell } from "electron";
 import log from "electron-log";
 import { autoUpdater } from "electron-updater";

-import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { I18nService } from "@/jslib/common/src/abstractions/i18n.service";

 import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "./utils";
 import { WindowMain } from "./window.main";
--- a/jslib/electron/src/window.main.ts
+++ b/jslib/electron/src/window.main.ts
@@ -3,8 +3,8 @@ import * as url from "url";

 import { app, BrowserWindow, screen } from "electron";

-import { LogService } from "jslib-common/abstractions/log.service";
-import { StateService } from "jslib-common/abstractions/state.service";
+import { LogService } from "@/jslib/common/src/abstractions/log.service";
+import { StateService } from "@/jslib/common/src/abstractions/state.service";

 import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "./utils";

--- a/jslib/electron/tsconfig.json
+++ b/jslib/electron/tsconfig.json
@@ -1,11 +0,0 @@
-{
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "jslib-common/*": ["../common/src/*"],
-      "jslib-electron/*": ["./src/*"]
-    }
-  },
-  "include": ["src", "spec"],
-  "exclude": ["node_modules", "dist"]
-}
--- a/jslib/electron/tsconfig.spec.json
+++ b/jslib/electron/tsconfig.spec.json
@@ -1,3 +0,0 @@
-{
-  "extends": "./tsconfig.json"
-}