From e495329fa6d67078eece1dcad62519f8ffee42bb Mon Sep 17 00:00:00 2001 From: Anton Platonov Date: Wed, 4 Sep 2024 12:43:47 +0300 Subject: [PATCH] fix(TypeScript): npm peer dependency install conflicts in user applications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As pointed out in https://github.com/npm/cli/issues/7719, npm struggles with resolving peer dependencies when running `npm install` and applying new peer dependency requirements that do not align with previously installed versions. In many cases it produces an unexpected error for the user instead of updating installed peer dependency packages. As a (temporary?) workaround, let us avoid using strict peer dependency requirements for our packages. This changes the `package.json` to use regular dependency version spec even though the expectation is that the install is “flat”, i. e., the packages are is installed on the top-level of `node_modules/` in the user application. --- packages/ts/generator-cli/package.json | 4 +--- packages/ts/generator-plugin-backbone/package.json | 6 ++---- packages/ts/generator-plugin-barrel/package.json | 6 ++---- packages/ts/generator-plugin-client/package.json | 4 +--- packages/ts/generator-plugin-model/package.json | 6 ++---- packages/ts/generator-plugin-push/package.json | 6 ++---- packages/ts/generator-plugin-signals/package.json | 4 +--- packages/ts/generator-plugin-subtypes/package.json | 6 ++---- 8 files changed, 13 insertions(+), 29 deletions(-) diff --git a/packages/ts/generator-cli/package.json b/packages/ts/generator-cli/package.json index 65a5cf3b8f..b459c30a3c 100644 --- a/packages/ts/generator-cli/package.json +++ b/packages/ts/generator-cli/package.json @@ -44,10 +44,8 @@ "bin": { "tsgen": "bin/index.js" }, - "peerDependencies": { - "@vaadin/hilla-generator-core": "24.5.0-alpha12" - }, "dependencies": { + "@vaadin/hilla-generator-core": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "get-stdin": "^9.0.0", "meow": "^12.1.1" diff --git a/packages/ts/generator-plugin-backbone/package.json b/packages/ts/generator-plugin-backbone/package.json index b2949d0613..c19ad6f2a9 100644 --- a/packages/ts/generator-plugin-backbone/package.json +++ b/packages/ts/generator-plugin-backbone/package.json @@ -50,11 +50,9 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { - "@vaadin/hilla-generator-core": "24.5.0-alpha12", - "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12" - }, "dependencies": { + "@vaadin/hilla-generator-core": "24.5.0-alpha12", + "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "fast-deep-equal": "^3.1.3", "openapi-types": "^12.1.3", diff --git a/packages/ts/generator-plugin-barrel/package.json b/packages/ts/generator-plugin-barrel/package.json index 0c050f34e4..d4baf3442a 100644 --- a/packages/ts/generator-plugin-barrel/package.json +++ b/packages/ts/generator-plugin-barrel/package.json @@ -50,11 +50,9 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { - "@vaadin/hilla-generator-core": "24.5.0-alpha12", - "@vaadin/hilla-generator-plugin-backbone": "24.5.0-alpha12" - }, "dependencies": { + "@vaadin/hilla-generator-core": "24.5.0-alpha12", + "@vaadin/hilla-generator-plugin-backbone": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "typescript": "5.5.2" }, diff --git a/packages/ts/generator-plugin-client/package.json b/packages/ts/generator-plugin-client/package.json index b07f890c10..89ebd11ca4 100644 --- a/packages/ts/generator-plugin-client/package.json +++ b/packages/ts/generator-plugin-client/package.json @@ -50,10 +50,8 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { - "@vaadin/hilla-generator-core": "24.5.0-alpha12" - }, "dependencies": { + "@vaadin/hilla-generator-core": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "typescript": "5.5.2" }, diff --git a/packages/ts/generator-plugin-model/package.json b/packages/ts/generator-plugin-model/package.json index 31737c0c64..348a413c4c 100644 --- a/packages/ts/generator-plugin-model/package.json +++ b/packages/ts/generator-plugin-model/package.json @@ -50,13 +50,11 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { + "dependencies": { "@vaadin/hilla-generator-core": "24.5.0-alpha12", "@vaadin/hilla-generator-plugin-backbone": "24.5.0-alpha12", - "@vaadin/hilla-lit-form": "24.5.0-alpha12" - }, - "dependencies": { "@vaadin/hilla-generator-utils": "24.5.0-alpha12", + "@vaadin/hilla-lit-form": "24.5.0-alpha12", "fast-deep-equal": "^3.1.3", "openapi-types": "^12.1.3", "typescript": "5.5.2" diff --git a/packages/ts/generator-plugin-push/package.json b/packages/ts/generator-plugin-push/package.json index fe3d71a898..cb73cb351a 100644 --- a/packages/ts/generator-plugin-push/package.json +++ b/packages/ts/generator-plugin-push/package.json @@ -50,11 +50,9 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { - "@vaadin/hilla-generator-core": "24.5.0-alpha12", - "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12" - }, "dependencies": { + "@vaadin/hilla-generator-core": "24.5.0-alpha12", + "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "fast-deep-equal": "^3.1.3", "openapi-types": "^12.1.3", diff --git a/packages/ts/generator-plugin-signals/package.json b/packages/ts/generator-plugin-signals/package.json index 332c20ffb5..bf5bf8804b 100644 --- a/packages/ts/generator-plugin-signals/package.json +++ b/packages/ts/generator-plugin-signals/package.json @@ -50,12 +50,10 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { - "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12" - }, "dependencies": { "@vaadin/hilla-generator-core": "24.5.0-alpha12", "@vaadin/hilla-generator-plugin-backbone": "24.5.0-alpha12", + "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "fast-deep-equal": "^3.1.3", "iterator-helpers-polyfill": "^3.0.1", diff --git a/packages/ts/generator-plugin-subtypes/package.json b/packages/ts/generator-plugin-subtypes/package.json index 4884bacf88..6134ba875d 100644 --- a/packages/ts/generator-plugin-subtypes/package.json +++ b/packages/ts/generator-plugin-subtypes/package.json @@ -49,12 +49,10 @@ "publishConfig": { "access": "public" }, - "peerDependencies": { + "dependencies": { "@vaadin/hilla-generator-core": "24.5.0-alpha12", "@vaadin/hilla-generator-plugin-client": "24.5.0-alpha12", - "@vaadin/hilla-generator-plugin-model": "24.5.0-alpha12" - }, - "dependencies": { + "@vaadin/hilla-generator-plugin-model": "24.5.0-alpha12", "@vaadin/hilla-generator-utils": "24.5.0-alpha12", "fast-deep-equal": "^3.1.3", "openapi-types": "^12.1.3",