From 02a374ff4eda00b3de63065a8465ddd9aba4c414 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Fri, 22 Dec 2023 20:32:58 +0100 Subject: [PATCH] chore: simplify dependencies --- packages/core/content-type-builder/package.json | 2 -- packages/core/core/package.json | 5 ----- packages/core/data-transfer/package.json | 6 +----- .../data-transfer/src/commands/data-transfer.ts | 2 +- packages/core/upload/package.json | 2 -- yarn.lock | 13 +------------ 6 files changed, 3 insertions(+), 27 deletions(-) diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index e29501175a..dab0c362d2 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -77,7 +77,6 @@ }, "devDependencies": { "@strapi/pack-up": "4.15.5", - "@strapi/strapi": "4.15.5", "@strapi/types": "4.15.5", "@testing-library/react": "14.0.0", "@testing-library/react-hooks": "8.0.1", @@ -91,7 +90,6 @@ "styled-components": "5.3.3" }, "peerDependencies": { - "@strapi/strapi": "^4.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", "react-router-dom": "^5.2.0", diff --git a/packages/core/core/package.json b/packages/core/core/package.json index 845fda1e9f..d658464548 100644 --- a/packages/core/core/package.json +++ b/packages/core/core/package.json @@ -56,17 +56,12 @@ "@koa/router": "10.1.1", "@paralleldrive/cuid2": "2.2.2", "@strapi/admin": "4.15.5", - "@strapi/data-transfer": "4.15.5", "@strapi/database": "4.15.5", "@strapi/generate-new": "4.15.5", "@strapi/generators": "4.15.5", "@strapi/logger": "4.15.5", "@strapi/pack-up": "4.15.5", "@strapi/permissions": "4.15.5", - "@strapi/plugin-content-manager": "4.15.5", - "@strapi/plugin-content-type-builder": "4.15.5", - "@strapi/plugin-email": "4.15.5", - "@strapi/plugin-upload": "4.15.5", "@strapi/types": "4.15.5", "@strapi/typescript-utils": "4.15.5", "@strapi/utils": "4.15.5", diff --git a/packages/core/data-transfer/package.json b/packages/core/data-transfer/package.json index c9d1294a56..96a429fd4e 100644 --- a/packages/core/data-transfer/package.json +++ b/packages/core/data-transfer/package.json @@ -40,8 +40,8 @@ "watch": "pack-up watch" }, "dependencies": { + "@strapi/core": "4.15.5", "@strapi/logger": "4.15.5", - "@strapi/strapi": "4.15.5", "@strapi/types": "4.15.5", "@strapi/utils": "4.15.5", "chalk": "4.1.2", @@ -61,7 +61,6 @@ }, "devDependencies": { "@strapi/pack-up": "4.15.5", - "@strapi/strapi": "4.15.5", "@types/fs-extra": "9.0.13", "@types/jest": "29.5.2", "@types/koa": "2.13.4", @@ -78,9 +77,6 @@ "rimraf": "3.0.2", "typescript": "5.3.2" }, - "peerDependencies": { - "@strapi/strapi": "^4.14.4" - }, "engines": { "node": ">=18.0.0 <=20.x.x", "npm": ">=6.0.0" diff --git a/packages/core/data-transfer/src/commands/data-transfer.ts b/packages/core/data-transfer/src/commands/data-transfer.ts index acc19f34c4..62a705af88 100644 --- a/packages/core/data-transfer/src/commands/data-transfer.ts +++ b/packages/core/data-transfer/src/commands/data-transfer.ts @@ -2,7 +2,7 @@ import chalk from 'chalk'; import Table from 'cli-table3'; import { Command, Option } from 'commander'; import { configs, createLogger } from '@strapi/logger'; -import { strapiFactory } from '@strapi/strapi'; +import { strapiFactory } from '@strapi/core'; import ora from 'ora'; import { merge } from 'lodash/fp'; import type { LoadedStrapi, Strapi } from '@strapi/types'; diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index 266eee4ac3..5a30ac8028 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -71,7 +71,6 @@ }, "devDependencies": { "@strapi/pack-up": "4.15.5", - "@strapi/strapi": "4.15.5", "@testing-library/dom": "9.2.0", "@testing-library/react": "14.0.0", "@testing-library/user-event": "14.4.3", @@ -82,7 +81,6 @@ "styled-components": "5.3.3" }, "peerDependencies": { - "@strapi/strapi": "^4.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0", "react-router-dom": "^5.2.0", diff --git a/yarn.lock b/yarn.lock index cf000e8926..0f6b986653 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9032,17 +9032,12 @@ __metadata: "@koa/router": "npm:10.1.1" "@paralleldrive/cuid2": "npm:2.2.2" "@strapi/admin": "npm:4.15.5" - "@strapi/data-transfer": "npm:4.15.5" "@strapi/database": "npm:4.15.5" "@strapi/generate-new": "npm:4.15.5" "@strapi/generators": "npm:4.15.5" "@strapi/logger": "npm:4.15.5" "@strapi/pack-up": "workspace:*" "@strapi/permissions": "npm:4.15.5" - "@strapi/plugin-content-manager": "npm:4.15.5" - "@strapi/plugin-content-type-builder": "npm:4.15.5" - "@strapi/plugin-email": "npm:4.15.5" - "@strapi/plugin-upload": "npm:4.15.5" "@strapi/ts-zen": "npm:^0.2.0" "@strapi/types": "npm:4.15.5" "@strapi/typescript-utils": "npm:4.15.5" @@ -9110,9 +9105,9 @@ __metadata: version: 0.0.0-use.local resolution: "@strapi/data-transfer@workspace:packages/core/data-transfer" dependencies: + "@strapi/core": "npm:4.15.5" "@strapi/logger": "npm:4.15.5" "@strapi/pack-up": "npm:4.15.5" - "@strapi/strapi": "npm:4.15.5" "@strapi/types": "npm:4.15.5" "@strapi/utils": "npm:4.15.5" "@types/fs-extra": "npm:9.0.13" @@ -9144,8 +9139,6 @@ __metadata: tar-stream: "npm:2.2.0" typescript: "npm:5.3.2" ws: "npm:8.13.0" - peerDependencies: - "@strapi/strapi": ^4.14.4 languageName: unknown linkType: soft @@ -9472,7 +9465,6 @@ __metadata: "@strapi/helper-plugin": "npm:4.15.5" "@strapi/icons": "npm:1.13.2" "@strapi/pack-up": "npm:4.15.5" - "@strapi/strapi": "npm:4.15.5" "@strapi/types": "npm:4.15.5" "@strapi/utils": "npm:4.15.5" "@testing-library/react": "npm:14.0.0" @@ -9497,7 +9489,6 @@ __metadata: styled-components: "npm:5.3.3" yup: "npm:0.32.9" peerDependencies: - "@strapi/strapi": ^4.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 react-router-dom: ^5.2.0 @@ -9693,7 +9684,6 @@ __metadata: "@strapi/icons": "npm:1.13.2" "@strapi/pack-up": "npm:4.15.5" "@strapi/provider-upload-local": "npm:4.15.5" - "@strapi/strapi": "npm:4.15.5" "@strapi/utils": "npm:4.15.5" "@testing-library/dom": "npm:9.2.0" "@testing-library/react": "npm:14.0.0" @@ -9725,7 +9715,6 @@ __metadata: styled-components: "npm:5.3.3" yup: "npm:0.32.9" peerDependencies: - "@strapi/strapi": ^4.0.0 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 react-router-dom: ^5.2.0