From c609242e85e1492c71b7084fb5a0d307d2d26e6a Mon Sep 17 00:00:00 2001 From: Philipp Gfeller <1659006+gfellerph@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:53:13 +0200 Subject: [PATCH] chore: remove workspace peer deps (#3009) Fixes [#2993](https://github.com/swisspost/design-system/issues/2993) --- .../projects/components/package.json | 6 ++-- packages/documentation/package.json | 14 ++------ .../intranet-header-workspace/package.json | 1 - .../intranet-header-showcase/package.json | 5 +++ .../projects/intranet-header/package.json | 4 +++ pnpm-lock.yaml | 34 ++++++++++++------- 6 files changed, 37 insertions(+), 27 deletions(-) create mode 100644 packages/intranet-header-workspace/projects/intranet-header-showcase/package.json diff --git a/packages/components-angular/projects/components/package.json b/packages/components-angular/projects/components/package.json index 9b8dae38e3..c06f942bb0 100644 --- a/packages/components-angular/projects/components/package.json +++ b/packages/components-angular/projects/components/package.json @@ -20,10 +20,12 @@ "dependencies": { "tslib": "2.6.2" }, + "devDependencies": { + "@swisspost/design-system-components": "workspace:7.0.0" + }, "peerDependencies": { "@angular/common": "^16.0.0 || ^17.0.0", - "@angular/core": "^16.0.0 || ^17.0.0", - "@swisspost/design-system-components": "workspace:7.0.0" + "@angular/core": "^16.0.0 || ^17.0.0" }, "sideEffects": false } diff --git a/packages/documentation/package.json b/packages/documentation/package.json index 627acab7d5..f55647e6b9 100644 --- a/packages/documentation/package.json +++ b/packages/documentation/package.json @@ -55,6 +55,8 @@ "@storybook/types": "8.0.5", "@storybook/web-components": "8.0.8", "@storybook/web-components-vite": "8.0.8", + "@swisspost/design-system-components-angular": "workspace:7.0.0", + "@swisspost/design-system-intranet-header": "workspace:7.0.0", "@types/css-modules": "1.0.5", "@types/mdx": "2.0.12", "@types/react": "18.2.74", @@ -73,17 +75,5 @@ "sass": "1.74.1", "storybook": "8.0.8", "typescript": "5.3.3" - }, - "peerDependencies": { - "@swisspost/design-system-components-angular": "workspace:7.0.0", - "@swisspost/design-system-intranet-header": "workspace:7.0.0" - }, - "peerDependenciesMeta": { - "@swisspost/design-system-components-angular": { - "optional": true - }, - "@swisspost/design-system-intranet-header": { - "optional": true - } } } diff --git a/packages/intranet-header-workspace/package.json b/packages/intranet-header-workspace/package.json index 1a27188aa2..b4f5e3a3b8 100644 --- a/packages/intranet-header-workspace/package.json +++ b/packages/intranet-header-workspace/package.json @@ -21,7 +21,6 @@ "@angular/router": "17.3.3", "@ng-bootstrap/ng-bootstrap": "16.0.0", "@popperjs/core": "2.11.8", - "@swisspost/design-system-intranet-header": "workspace:7.0.0", "@swisspost/design-system-styles": "workspace:7.0.0", "rxjs": "7.8.1", "tslib": "2.6.2", diff --git a/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json b/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json new file mode 100644 index 0000000000..816191ee92 --- /dev/null +++ b/packages/intranet-header-workspace/projects/intranet-header-showcase/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@swisspost/design-system-intranet-header": "workspace:7.0.0" + } +} diff --git a/packages/intranet-header-workspace/projects/intranet-header/package.json b/packages/intranet-header-workspace/projects/intranet-header/package.json index 6ef2aa8cb5..68ab5a1e8e 100644 --- a/packages/intranet-header-workspace/projects/intranet-header/package.json +++ b/packages/intranet-header-workspace/projects/intranet-header/package.json @@ -23,5 +23,9 @@ }, "devDependencies": { "@swisspost/design-system-intranet-header-workspace": "workspace:3.0.12" + }, + "peerDependencies": { + "@angular/common": "^16.0.0 || ^17.0.0", + "@angular/core": "^16.0.0 || ^17.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bbd56cf711..1fa232e37d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -240,12 +240,13 @@ importers: '@angular/core': specifier: ^16.0.0 || ^17.0.0 version: 17.2.3(rxjs@7.8.1)(zone.js@0.14.4) - '@swisspost/design-system-components': - specifier: workspace:7.0.0 - version: link:../../../components tslib: specifier: 2.6.2 version: 2.6.2 + devDependencies: + '@swisspost/design-system-components': + specifier: workspace:7.0.0 + version: link:../../../components publishDirectory: ../../dist/components packages/components-react: @@ -477,18 +478,12 @@ importers: '@swisspost/design-system-components': specifier: workspace:7.0.0 version: link:../components - '@swisspost/design-system-components-angular': - specifier: workspace:7.0.0 - version: link:../components-angular/dist/components '@swisspost/design-system-components-react': specifier: workspace:7.0.0 version: link:../components-react '@swisspost/design-system-icons': specifier: workspace:7.0.0 version: link:../icons - '@swisspost/design-system-intranet-header': - specifier: workspace:7.0.0 - version: link:../intranet-header-workspace/dist/intranet-header '@swisspost/design-system-styles': specifier: workspace:7.0.0 version: link:../styles/dist @@ -562,6 +557,12 @@ importers: '@storybook/web-components-vite': specifier: 8.0.8 version: 8.0.8(encoding@0.1.13)(lit@3.1.2)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.3.3)(vite@5.1.5(@types/node@20.11.16)(less@4.2.0)(sass@1.74.1)(terser@5.29.1)) + '@swisspost/design-system-components-angular': + specifier: workspace:7.0.0 + version: link:../components-angular/dist/components + '@swisspost/design-system-intranet-header': + specifier: workspace:7.0.0 + version: link:../intranet-header-workspace/dist/intranet-header '@types/css-modules': specifier: 1.0.5 version: 1.0.5 @@ -815,9 +816,6 @@ importers: '@popperjs/core': specifier: 2.11.8 version: 2.11.8 - '@swisspost/design-system-intranet-header': - specifier: workspace:7.0.0 - version: link:dist/intranet-header '@swisspost/design-system-styles': specifier: workspace:7.0.0 version: link:../styles/dist @@ -900,6 +898,12 @@ importers: packages/intranet-header-workspace/projects/intranet-header: dependencies: + '@angular/common': + specifier: ^16.0.0 || ^17.0.0 + version: 17.3.3(@angular/core@17.3.3(rxjs@7.8.1)(zone.js@0.14.4))(rxjs@7.8.1) + '@angular/core': + specifier: ^16.0.0 || ^17.0.0 + version: 17.3.3(rxjs@7.8.1)(zone.js@0.14.4) '@swisspost/design-system-styles': specifier: workspace:7.0.0 version: link:../../../styles/dist @@ -912,6 +916,12 @@ importers: version: link:../.. publishDirectory: ../../dist/intranet-header + packages/intranet-header-workspace/projects/intranet-header-showcase: + dependencies: + '@swisspost/design-system-intranet-header': + specifier: workspace:7.0.0 + version: link:../../dist/intranet-header + packages/migrations: dependencies: '@angular-devkit/core':