From 5d04efad2a3a503c92aa64a435ad2248d7b4596e Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Thu, 20 Feb 2025 15:04:39 +0100 Subject: [PATCH] [PM-18363] Remove internal dependencies from package.json (#13448) * Remove internal dependencies from package.json * Update lockfile * Change workspace to include nested libs --- libs/auth/package.json | 5 - libs/importer/package.json | 5 - libs/node/package.json | 3 - libs/tools/card/package.json | 4 - .../vault-export-core/package.json | 4 - .../vault-export/vault-export-ui/package.json | 7 -- libs/tools/generator/components/package.json | 4 - libs/tools/generator/core/package.json | 3 - .../generator/extensions/history/package.json | 4 - .../generator/extensions/legacy/package.json | 6 - .../extensions/navigation/package.json | 4 - libs/tools/send/send-ui/package.json | 4 - package-lock.json | 104 +++++++++++++----- package.json | 2 +- 14 files changed, 78 insertions(+), 81 deletions(-) diff --git a/libs/auth/package.json b/libs/auth/package.json index 3a915d727b..52c1be63f8 100644 --- a/libs/auth/package.json +++ b/libs/auth/package.json @@ -16,10 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/angular": "file:../angular", - "@bitwarden/common": "file:../common", - "@bitwarden/components": "file:../components" } } diff --git a/libs/importer/package.json b/libs/importer/package.json index 85adcadeee..eb2588b634 100644 --- a/libs/importer/package.json +++ b/libs/importer/package.json @@ -16,10 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../common", - "@bitwarden/vault-export-core": "file:../tools/export/vault-export/vault-export-core", - "@bitwarden/admin-console-common": "file:../admin-console/src/common" } } diff --git a/libs/node/package.json b/libs/node/package.json index cbc7ec2c05..823913c997 100644 --- a/libs/node/package.json +++ b/libs/node/package.json @@ -16,8 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../common" } } diff --git a/libs/tools/card/package.json b/libs/tools/card/package.json index 904429ba74..06351f1b46 100644 --- a/libs/tools/card/package.json +++ b/libs/tools/card/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/components": "file:../../../components" } } diff --git a/libs/tools/export/vault-export/vault-export-core/package.json b/libs/tools/export/vault-export/vault-export-core/package.json index 07289ae223..c7fcd26d88 100644 --- a/libs/tools/export/vault-export/vault-export-core/package.json +++ b/libs/tools/export/vault-export/vault-export-core/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../../common", - "@bitwarden/admin-console-common": "file:../../../../admin-console/src/common" } } diff --git a/libs/tools/export/vault-export/vault-export-ui/package.json b/libs/tools/export/vault-export/vault-export-ui/package.json index 62df08c527..4dc5e32512 100644 --- a/libs/tools/export/vault-export/vault-export-ui/package.json +++ b/libs/tools/export/vault-export/vault-export-ui/package.json @@ -16,12 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../../common", - "@bitwarden/angular": "file:../../../../angular", - "@bitwarden/auth": "file:../../../../auth", - "@bitwarden/vault-export-core": "file:../vault-export-core", - "@bitwarden/admin-console-common": "file:../../../../admin-console/src/common" } } diff --git a/libs/tools/generator/components/package.json b/libs/tools/generator/components/package.json index e900b317a9..be4bbbe4ae 100644 --- a/libs/tools/generator/components/package.json +++ b/libs/tools/generator/components/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/generator-core": "file:../core" } } diff --git a/libs/tools/generator/core/package.json b/libs/tools/generator/core/package.json index 020adab189..23ef352f9a 100644 --- a/libs/tools/generator/core/package.json +++ b/libs/tools/generator/core/package.json @@ -16,8 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common" } } diff --git a/libs/tools/generator/extensions/history/package.json b/libs/tools/generator/extensions/history/package.json index 00342fe435..5941d67553 100644 --- a/libs/tools/generator/extensions/history/package.json +++ b/libs/tools/generator/extensions/history/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/generator-core": "file:../../core" } } diff --git a/libs/tools/generator/extensions/legacy/package.json b/libs/tools/generator/extensions/legacy/package.json index 0a257c67a4..151f48d5ab 100644 --- a/libs/tools/generator/extensions/legacy/package.json +++ b/libs/tools/generator/extensions/legacy/package.json @@ -16,11 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/generator-core": "file:../../core", - "@bitwarden/generator-history": "file:../history", - "@bitwarden/generator-navigation": "file:../navigation" } } diff --git a/libs/tools/generator/extensions/navigation/package.json b/libs/tools/generator/extensions/navigation/package.json index c929f46ed0..61b6d2b8da 100644 --- a/libs/tools/generator/extensions/navigation/package.json +++ b/libs/tools/generator/extensions/navigation/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/generator-core": "file:../../core" } } diff --git a/libs/tools/send/send-ui/package.json b/libs/tools/send/send-ui/package.json index 4ffa4db0bd..98f7e0ca27 100644 --- a/libs/tools/send/send-ui/package.json +++ b/libs/tools/send/send-ui/package.json @@ -16,9 +16,5 @@ "clean": "rimraf dist", "build": "npm run clean && tsc", "build:watch": "npm run clean && tsc -watch" - }, - "dependencies": { - "@bitwarden/common": "file:../../../common", - "@bitwarden/components": "file:../../../components" } } diff --git a/package-lock.json b/package-lock.json index 46bf3d2302..901289817b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "workspaces": [ "apps/*", "apps/desktop/desktop_native/napi", - "libs/*" + "libs/**/*" ], "dependencies": { "@angular/animations": "18.2.13", @@ -253,7 +253,6 @@ "version": "0.0.0", "license": "GPL-3.0" }, - "libs/admin-console/src/common": {}, "libs/angular": { "name": "@bitwarden/angular", "version": "0.0.0", @@ -262,12 +261,7 @@ "libs/auth": { "name": "@bitwarden/auth", "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/angular": "file:../angular", - "@bitwarden/common": "file:../common", - "@bitwarden/components": "file:../components" - } + "license": "GPL-3.0" }, "libs/billing": { "name": "@bitwarden/billing", @@ -286,12 +280,7 @@ "libs/importer": { "name": "@bitwarden/importer", "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/admin-console-common": "file:../admin-console/src/common", - "@bitwarden/common": "file:../common", - "@bitwarden/vault-export-core": "file:../tools/export/vault-export/vault-export-core" - } + "license": "GPL-3.0" }, "libs/key-management": { "name": "@bitwarden/key-management", @@ -306,24 +295,53 @@ "libs/node": { "name": "@bitwarden/node", "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/common": "file:../common" - } + "license": "GPL-3.0" }, "libs/platform": { "name": "@bitwarden/platform", "version": "0.0.0", "license": "GPL-3.0" }, + "libs/tools/card": { + "version": "0.0.0", + "license": "GPL-3.0" + }, "libs/tools/export/vault-export/vault-export-core": { "name": "@bitwarden/vault-export-core", "version": "0.0.0", - "license": "GPL-3.0", - "dependencies": { - "@bitwarden/admin-console-common": "file:../../../../admin-console/src/common", - "@bitwarden/common": "file:../../../../common" - } + "license": "GPL-3.0" + }, + "libs/tools/export/vault-export/vault-export-ui": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/generator/components": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/generator/core": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/generator/extensions/history": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/generator/extensions/legacy": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/generator/extensions/navigation": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/tools/send/send-ui": { + "version": "0.0.0", + "license": "GPL-3.0" + }, + "libs/ui/common": { + "version": "0.0.0", + "license": "GPL-3.0" }, "libs/vault": { "name": "@bitwarden/vault", @@ -4410,10 +4428,6 @@ "resolved": "libs/admin-console", "link": true }, - "node_modules/@bitwarden/admin-console-common": { - "resolved": "libs/admin-console/src/common", - "link": true - }, "node_modules/@bitwarden/angular": { "resolved": "libs/angular", "link": true @@ -4450,6 +4464,26 @@ "resolved": "apps/desktop/desktop_native/napi", "link": true }, + "node_modules/@bitwarden/generator-components": { + "resolved": "libs/tools/generator/components", + "link": true + }, + "node_modules/@bitwarden/generator-core": { + "resolved": "libs/tools/generator/core", + "link": true + }, + "node_modules/@bitwarden/generator-history": { + "resolved": "libs/tools/generator/extensions/history", + "link": true + }, + "node_modules/@bitwarden/generator-legacy": { + "resolved": "libs/tools/generator/extensions/legacy", + "link": true + }, + "node_modules/@bitwarden/generator-navigation": { + "resolved": "libs/tools/generator/extensions/navigation", + "link": true + }, "node_modules/@bitwarden/importer": { "resolved": "libs/importer", "link": true @@ -4476,6 +4510,18 @@ "integrity": "sha512-MaQFJbuKTCbN9oZC/+opYVeegaNNJpiUv9/zx+gu8KxWmX0hyEkNPtHKxBjDt3kLLz69CudDtUxEgqOfcDsYAw==", "license": "GPL-3.0" }, + "node_modules/@bitwarden/send-ui": { + "resolved": "libs/tools/send/send-ui", + "link": true + }, + "node_modules/@bitwarden/tools-card": { + "resolved": "libs/tools/card", + "link": true + }, + "node_modules/@bitwarden/ui-common": { + "resolved": "libs/ui/common", + "link": true + }, "node_modules/@bitwarden/vault": { "resolved": "libs/vault", "link": true @@ -4484,6 +4530,10 @@ "resolved": "libs/tools/export/vault-export/vault-export-core", "link": true }, + "node_modules/@bitwarden/vault-export-ui": { + "resolved": "libs/tools/export/vault-export/vault-export-ui", + "link": true + }, "node_modules/@bitwarden/web-vault": { "resolved": "apps/web", "link": true diff --git a/package.json b/package.json index 831e99089a..c07b8ff902 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "workspaces": [ "apps/*", "apps/desktop/desktop_native/napi", - "libs/*" + "libs/**/*" ], "devDependencies": { "@angular-devkit/build-angular": "18.2.12",