Use NPM workspace (#2874)

libs/node/jest.config.js

@@ -1,6 +1,6 @@
 const { pathsToModuleNameMapper } = require("ts-jest");
 
-const { compilerOptions } = require("./tsconfig");
+const { compilerOptions } = require("../shared/tsconfig.libs");
 
 module.exports = {
   preset: "ts-jest",

libs/node/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@bitwarden/jslib-node",
+  "name": "@bitwarden/node",
   "version": "0.0.0",
   "description": "Common code used across Bitwarden JavaScript projects.",
   "keywords": [
@@ -18,6 +18,6 @@
     "build:watch": "npm run clean && tsc -watch"
   },
   "dependencies": {
-    "@bitwarden/jslib-common": "file:../common"
+    "@bitwarden/common": "file:../common"
   }
 }

libs/node/spec/cli/consoleLog.service.spec.ts

@@ -1,9 +1,9 @@
 import {
   interceptConsole,
   restoreConsole,
-} from "jslib-common/../spec/services/consolelog.service.spec";
+} from "@bitwarden/common/../spec/services/consolelog.service.spec";
 
-import { ConsoleLogService } from "jslib-node/cli/services/consoleLog.service";
+import { ConsoleLogService } from "@bitwarden/node/cli/services/consoleLog.service";
 
 let caughtMessage: any = {};
 

libs/node/spec/services/nodeCryptoFunction.service.spec.ts

@@ -1,6 +1,6 @@
-import { Utils } from "jslib-common/misc/utils";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
-import { NodeCryptoFunctionService } from "jslib-node/services/nodeCryptoFunction.service";
+import { Utils } from "@bitwarden/common/misc/utils";
+import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
+import { NodeCryptoFunctionService } from "@bitwarden/node/services/nodeCryptoFunction.service";
 
 const RsaPublicKey =
   "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0Vawl/toXzkEvB82FEtqHP" +

libs/node/src/cli/baseProgram.ts

@@ -1,6 +1,6 @@
 import * as chalk from "chalk";
 
-import { StateService } from "jslib-common/abstractions/state.service";
+import { StateService } from "@bitwarden/common/abstractions/state.service";
 
 import { Response } from "./models/response";
 import { ListResponse } from "./models/response/listResponse";

libs/node/src/cli/commands/login.command.ts

@@ -4,30 +4,30 @@ import * as program from "commander";
 import * as inquirer from "inquirer";
 import Separator from "inquirer/lib/objects/separator";
 
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { AuthService } from "jslib-common/abstractions/auth.service";
-import { CryptoService } from "jslib-common/abstractions/crypto.service";
-import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PasswordGenerationService } from "jslib-common/abstractions/passwordGeneration.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { PolicyService } from "jslib-common/abstractions/policy.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { TwoFactorService } from "jslib-common/abstractions/twoFactor.service";
-import { TwoFactorProviderType } from "jslib-common/enums/twoFactorProviderType";
-import { NodeUtils } from "jslib-common/misc/nodeUtils";
-import { Utils } from "jslib-common/misc/utils";
-import { AuthResult } from "jslib-common/models/domain/authResult";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { AuthService } from "@bitwarden/common/abstractions/auth.service";
+import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
+import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
+import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
+import { StateService } from "@bitwarden/common/abstractions/state.service";
+import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service";
+import { TwoFactorProviderType } from "@bitwarden/common/enums/twoFactorProviderType";
+import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
+import { Utils } from "@bitwarden/common/misc/utils";
+import { AuthResult } from "@bitwarden/common/models/domain/authResult";
 import {
   ApiLogInCredentials,
   PasswordLogInCredentials,
   SsoLogInCredentials,
-} from "jslib-common/models/domain/logInCredentials";
-import { TokenRequestTwoFactor } from "jslib-common/models/request/identityToken/tokenRequestTwoFactor";
-import { TwoFactorEmailRequest } from "jslib-common/models/request/twoFactorEmailRequest";
-import { UpdateTempPasswordRequest } from "jslib-common/models/request/updateTempPasswordRequest";
-import { ErrorResponse } from "jslib-common/models/response/errorResponse";
+} from "@bitwarden/common/models/domain/logInCredentials";
+import { TokenRequestTwoFactor } from "@bitwarden/common/models/request/identityToken/tokenRequestTwoFactor";
+import { TwoFactorEmailRequest } from "@bitwarden/common/models/request/twoFactorEmailRequest";
+import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/updateTempPasswordRequest";
+import { ErrorResponse } from "@bitwarden/common/models/response/errorResponse";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/messageResponse";

libs/node/src/cli/commands/logout.command.ts

@@ -1,5 +1,5 @@
-import { AuthService } from "jslib-common/abstractions/auth.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
+import { AuthService } from "@bitwarden/common/abstractions/auth.service";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/messageResponse";

libs/node/src/cli/commands/update.command.ts

@@ -1,7 +1,7 @@
 import * as fetch from "node-fetch";
 
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/messageResponse";

libs/node/src/cli/services/cliPlatformUtils.service.ts

@@ -1,9 +1,9 @@
 import * as child_process from "child_process";
 
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { ClientType } from "jslib-common/enums/clientType";
-import { DeviceType } from "jslib-common/enums/deviceType";
-import { ThemeType } from "jslib-common/enums/themeType";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { ClientType } from "@bitwarden/common/enums/clientType";
+import { DeviceType } from "@bitwarden/common/enums/deviceType";
+import { ThemeType } from "@bitwarden/common/enums/themeType";
 
 // eslint-disable-next-line
 const open = require("open");

libs/node/src/cli/services/consoleLog.service.ts

@@ -1,5 +1,5 @@
-import { LogLevelType } from "jslib-common/enums/logLevelType";
-import { ConsoleLogService as BaseConsoleLogService } from "jslib-common/services/consoleLog.service";
+import { LogLevelType } from "@bitwarden/common/enums/logLevelType";
+import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 
 export class ConsoleLogService extends BaseConsoleLogService {
   constructor(isDev: boolean, filter: (level: LogLevelType) => boolean = null) {

libs/node/src/services/lowdbStorage.service.ts

@@ -4,11 +4,11 @@ import * as path from "path";
 import * as lowdb from "lowdb";
 import * as FileSync from "lowdb/adapters/FileSync";
 
-import { LogService } from "jslib-common/abstractions/log.service";
-import { StorageService } from "jslib-common/abstractions/storage.service";
-import { NodeUtils } from "jslib-common/misc/nodeUtils";
-import { sequentialize } from "jslib-common/misc/sequentialize";
-import { Utils } from "jslib-common/misc/utils";
+import { LogService } from "@bitwarden/common/abstractions/log.service";
+import { StorageService } from "@bitwarden/common/abstractions/storage.service";
+import { NodeUtils } from "@bitwarden/common/misc/nodeUtils";
+import { sequentialize } from "@bitwarden/common/misc/sequentialize";
+import { Utils } from "@bitwarden/common/misc/utils";
 
 export class LowdbStorageService implements StorageService {
   protected dataFilePath: string;

libs/node/src/services/nodeApi.service.ts

@@ -2,11 +2,11 @@ import * as FormData from "form-data";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import * as fe from "node-fetch";
 
-import { AppIdService } from "jslib-common/abstractions/appId.service";
-import { EnvironmentService } from "jslib-common/abstractions/environment.service";
-import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
-import { TokenService } from "jslib-common/abstractions/token.service";
-import { ApiService } from "jslib-common/services/api.service";
+import { AppIdService } from "@bitwarden/common/abstractions/appId.service";
+import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
+import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
+import { TokenService } from "@bitwarden/common/abstractions/token.service";
+import { ApiService } from "@bitwarden/common/services/api.service";
 
 (global as any).fetch = fe.default;
 (global as any).Request = fe.Request;

libs/node/src/services/nodeCryptoFunction.service.ts

@@ -2,10 +2,10 @@ import * as crypto from "crypto";
 
 import * as forge from "node-forge";
 
-import { CryptoFunctionService } from "jslib-common/abstractions/cryptoFunction.service";
-import { Utils } from "jslib-common/misc/utils";
-import { DecryptParameters } from "jslib-common/models/domain/decryptParameters";
-import { SymmetricCryptoKey } from "jslib-common/models/domain/symmetricCryptoKey";
+import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
+import { Utils } from "@bitwarden/common/misc/utils";
+import { DecryptParameters } from "@bitwarden/common/models/domain/decryptParameters";
+import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetricCryptoKey";
 
 export class NodeCryptoFunctionService implements CryptoFunctionService {
   pbkdf2(

libs/node/tsconfig.json

@@ -1,11 +1,5 @@
 {
-  "extends": "../shared/tsconfig",
-  "compilerOptions": {
-    "paths": {
-      "jslib-common/*": ["../common/src/*"],
-      "jslib-node/*": ["./src/*"]
-    }
-  },
+  "extends": "../shared/tsconfig.libs",
   "include": ["src", "spec"],
   "exclude": ["node_modules", "dist"]
 }