From 31291ce851f86c8afdcc8bdff214389ab428ce4c Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Fri, 30 Jul 2021 11:14:19 +0200 Subject: [PATCH 1/3] fix peer dep targetting a new package --- packages/providers/upload-cloudinary/package.json | 2 +- packages/providers/upload-local/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index ade9a0f84e..096170135a 100644 --- a/packages/providers/upload-cloudinary/package.json +++ b/packages/providers/upload-cloudinary/package.json @@ -17,7 +17,7 @@ "into-stream": "^5.1.0" }, "peerDependencies": { - "@strapi/plugin-upload": "^3.1.6" + "@strapi/plugin-upload": "^4.0.0" }, "strapi": { "isProvider": true diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index 762827d6fd..c8f33e761f 100644 --- a/packages/providers/upload-local/package.json +++ b/packages/providers/upload-local/package.json @@ -31,7 +31,7 @@ "url": "git://github.com/strapi/strapi.git" }, "peerDependencies": { - "@strapi/plugin-upload": "^3.1.6" + "@strapi/plugin-upload": "^4.0.0" }, "bugs": { "url": "https://github.com/strapi/strapi/issues" From 74449b75e5e9c3f02ed85caf301f5d76e58fc541 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Fri, 30 Jul 2021 11:35:36 +0200 Subject: [PATCH 2/3] Ignore build folder in admin package --- packages/core/strapi/lib/core/load-admin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/strapi/lib/core/load-admin.js b/packages/core/strapi/lib/core/load-admin.js index 9944a7b56c..0a9b5234dc 100644 --- a/packages/core/strapi/lib/core/load-admin.js +++ b/packages/core/strapi/lib/core/load-admin.js @@ -12,7 +12,7 @@ const mergeRoutes = (a, b, key) => module.exports = async strapi => { const adminPath = findPackagePath('@strapi/admin'); const [files, config] = await Promise.all([ - loadFiles(adminPath, '!(config|node_modules|tests|ee|scripts)/*.*(js|json)'), + loadFiles(adminPath, '!(config|node_modules|tests|ee|build|scripts)/*.*(js|json)'), loadConfig(adminPath), ]); From 46c94940a71d744b724c5d1a8101601270abb923 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Fri, 30 Jul 2021 11:37:35 +0200 Subject: [PATCH 3/3] make connector non publishable and tag them as .old --- .../{bookshelf => bookshelf.old}/.gitignore | 0 .../{bookshelf => bookshelf.old}/.npmignore | 0 .../{bookshelf => bookshelf.old}/.snyk | 0 .../{bookshelf => bookshelf.old}/LICENSE | 0 .../{bookshelf => bookshelf.old}/README.md | 0 .../lib/build-database-schema.js | 0 .../lib/buildQuery.js | 0 .../lib/formatter.js | 0 .../lib/generate-component-relations.js | 0 .../lib/get-query-params.js | 0 .../{bookshelf => bookshelf.old}/lib/index.js | 0 .../{bookshelf => bookshelf.old}/lib/knex.js | 0 .../lib/migrations/draft-publish.js | 0 .../lib/migrations/index.js | 0 .../lib/models.js | 0 .../lib/mount-models.js | 0 .../lib/parser.js | 0 .../lib/populate.js | 0 .../lib/queries.js | 0 .../lib/relations.js | 0 .../lib/utils/associations.js | 0 .../lib/utils/attributes.js | 0 .../lib/utils/connectivity.js | 0 .../lib/utils/errors.js | 0 .../lib/utils/populate-queries.js | 0 .../lib/utils/store-definition.js | 0 packages/connectors/bookshelf/package.json | 64 ------------------- 27 files changed, 64 deletions(-) rename packages/connectors/{bookshelf => bookshelf.old}/.gitignore (100%) rename packages/connectors/{bookshelf => bookshelf.old}/.npmignore (100%) rename packages/connectors/{bookshelf => bookshelf.old}/.snyk (100%) rename packages/connectors/{bookshelf => bookshelf.old}/LICENSE (100%) rename packages/connectors/{bookshelf => bookshelf.old}/README.md (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/build-database-schema.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/buildQuery.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/formatter.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/generate-component-relations.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/get-query-params.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/index.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/knex.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/migrations/draft-publish.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/migrations/index.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/models.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/mount-models.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/parser.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/populate.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/queries.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/relations.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/associations.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/attributes.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/connectivity.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/errors.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/populate-queries.js (100%) rename packages/connectors/{bookshelf => bookshelf.old}/lib/utils/store-definition.js (100%) delete mode 100644 packages/connectors/bookshelf/package.json diff --git a/packages/connectors/bookshelf/.gitignore b/packages/connectors/bookshelf.old/.gitignore similarity index 100% rename from packages/connectors/bookshelf/.gitignore rename to packages/connectors/bookshelf.old/.gitignore diff --git a/packages/connectors/bookshelf/.npmignore b/packages/connectors/bookshelf.old/.npmignore similarity index 100% rename from packages/connectors/bookshelf/.npmignore rename to packages/connectors/bookshelf.old/.npmignore diff --git a/packages/connectors/bookshelf/.snyk b/packages/connectors/bookshelf.old/.snyk similarity index 100% rename from packages/connectors/bookshelf/.snyk rename to packages/connectors/bookshelf.old/.snyk diff --git a/packages/connectors/bookshelf/LICENSE b/packages/connectors/bookshelf.old/LICENSE similarity index 100% rename from packages/connectors/bookshelf/LICENSE rename to packages/connectors/bookshelf.old/LICENSE diff --git a/packages/connectors/bookshelf/README.md b/packages/connectors/bookshelf.old/README.md similarity index 100% rename from packages/connectors/bookshelf/README.md rename to packages/connectors/bookshelf.old/README.md diff --git a/packages/connectors/bookshelf/lib/build-database-schema.js b/packages/connectors/bookshelf.old/lib/build-database-schema.js similarity index 100% rename from packages/connectors/bookshelf/lib/build-database-schema.js rename to packages/connectors/bookshelf.old/lib/build-database-schema.js diff --git a/packages/connectors/bookshelf/lib/buildQuery.js b/packages/connectors/bookshelf.old/lib/buildQuery.js similarity index 100% rename from packages/connectors/bookshelf/lib/buildQuery.js rename to packages/connectors/bookshelf.old/lib/buildQuery.js diff --git a/packages/connectors/bookshelf/lib/formatter.js b/packages/connectors/bookshelf.old/lib/formatter.js similarity index 100% rename from packages/connectors/bookshelf/lib/formatter.js rename to packages/connectors/bookshelf.old/lib/formatter.js diff --git a/packages/connectors/bookshelf/lib/generate-component-relations.js b/packages/connectors/bookshelf.old/lib/generate-component-relations.js similarity index 100% rename from packages/connectors/bookshelf/lib/generate-component-relations.js rename to packages/connectors/bookshelf.old/lib/generate-component-relations.js diff --git a/packages/connectors/bookshelf/lib/get-query-params.js b/packages/connectors/bookshelf.old/lib/get-query-params.js similarity index 100% rename from packages/connectors/bookshelf/lib/get-query-params.js rename to packages/connectors/bookshelf.old/lib/get-query-params.js diff --git a/packages/connectors/bookshelf/lib/index.js b/packages/connectors/bookshelf.old/lib/index.js similarity index 100% rename from packages/connectors/bookshelf/lib/index.js rename to packages/connectors/bookshelf.old/lib/index.js diff --git a/packages/connectors/bookshelf/lib/knex.js b/packages/connectors/bookshelf.old/lib/knex.js similarity index 100% rename from packages/connectors/bookshelf/lib/knex.js rename to packages/connectors/bookshelf.old/lib/knex.js diff --git a/packages/connectors/bookshelf/lib/migrations/draft-publish.js b/packages/connectors/bookshelf.old/lib/migrations/draft-publish.js similarity index 100% rename from packages/connectors/bookshelf/lib/migrations/draft-publish.js rename to packages/connectors/bookshelf.old/lib/migrations/draft-publish.js diff --git a/packages/connectors/bookshelf/lib/migrations/index.js b/packages/connectors/bookshelf.old/lib/migrations/index.js similarity index 100% rename from packages/connectors/bookshelf/lib/migrations/index.js rename to packages/connectors/bookshelf.old/lib/migrations/index.js diff --git a/packages/connectors/bookshelf/lib/models.js b/packages/connectors/bookshelf.old/lib/models.js similarity index 100% rename from packages/connectors/bookshelf/lib/models.js rename to packages/connectors/bookshelf.old/lib/models.js diff --git a/packages/connectors/bookshelf/lib/mount-models.js b/packages/connectors/bookshelf.old/lib/mount-models.js similarity index 100% rename from packages/connectors/bookshelf/lib/mount-models.js rename to packages/connectors/bookshelf.old/lib/mount-models.js diff --git a/packages/connectors/bookshelf/lib/parser.js b/packages/connectors/bookshelf.old/lib/parser.js similarity index 100% rename from packages/connectors/bookshelf/lib/parser.js rename to packages/connectors/bookshelf.old/lib/parser.js diff --git a/packages/connectors/bookshelf/lib/populate.js b/packages/connectors/bookshelf.old/lib/populate.js similarity index 100% rename from packages/connectors/bookshelf/lib/populate.js rename to packages/connectors/bookshelf.old/lib/populate.js diff --git a/packages/connectors/bookshelf/lib/queries.js b/packages/connectors/bookshelf.old/lib/queries.js similarity index 100% rename from packages/connectors/bookshelf/lib/queries.js rename to packages/connectors/bookshelf.old/lib/queries.js diff --git a/packages/connectors/bookshelf/lib/relations.js b/packages/connectors/bookshelf.old/lib/relations.js similarity index 100% rename from packages/connectors/bookshelf/lib/relations.js rename to packages/connectors/bookshelf.old/lib/relations.js diff --git a/packages/connectors/bookshelf/lib/utils/associations.js b/packages/connectors/bookshelf.old/lib/utils/associations.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/associations.js rename to packages/connectors/bookshelf.old/lib/utils/associations.js diff --git a/packages/connectors/bookshelf/lib/utils/attributes.js b/packages/connectors/bookshelf.old/lib/utils/attributes.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/attributes.js rename to packages/connectors/bookshelf.old/lib/utils/attributes.js diff --git a/packages/connectors/bookshelf/lib/utils/connectivity.js b/packages/connectors/bookshelf.old/lib/utils/connectivity.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/connectivity.js rename to packages/connectors/bookshelf.old/lib/utils/connectivity.js diff --git a/packages/connectors/bookshelf/lib/utils/errors.js b/packages/connectors/bookshelf.old/lib/utils/errors.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/errors.js rename to packages/connectors/bookshelf.old/lib/utils/errors.js diff --git a/packages/connectors/bookshelf/lib/utils/populate-queries.js b/packages/connectors/bookshelf.old/lib/utils/populate-queries.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/populate-queries.js rename to packages/connectors/bookshelf.old/lib/utils/populate-queries.js diff --git a/packages/connectors/bookshelf/lib/utils/store-definition.js b/packages/connectors/bookshelf.old/lib/utils/store-definition.js similarity index 100% rename from packages/connectors/bookshelf/lib/utils/store-definition.js rename to packages/connectors/bookshelf.old/lib/utils/store-definition.js diff --git a/packages/connectors/bookshelf/package.json b/packages/connectors/bookshelf/package.json deleted file mode 100644 index 79471a7a50..0000000000 --- a/packages/connectors/bookshelf/package.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "@strapi/connector-bookshelf", - "version": "3.6.5", - "description": "Bookshelf hook for the Strapi framework", - "homepage": "https://strapi.io", - "keywords": [ - "bookshelf", - "hook", - "migrations", - "orm", - "sql", - "strapi" - ], - "directories": { - "lib": "./lib" - }, - "main": "./lib", - "dependencies": { - "bookshelf": "^1.0.1", - "date-fns": "^2.19.0", - "inquirer": "^6.3.1", - "lodash": "4.17.21", - "p-map": "4.0.0", - "pluralize": "^8.0.0", - "rimraf": "3.0.2", - "@strapi/utils": "3.6.5" - }, - "peerDependencies": { - "knex": "0.21.18" - }, - "strapi": { - "dependencies": [ - "knex" - ] - }, - "scripts": { - "test": "echo not tests yet" - }, - "author": { - "email": "hi@strapi.io", - "name": "Strapi team", - "url": "https://strapi.io" - }, - "maintainers": [ - { - "name": "Strapi team", - "email": "hi@strapi.io", - "url": "https://strapi.io" - } - ], - "repository": { - "type": "git", - "url": "git://github.com/strapi/strapi.git" - }, - "bugs": { - "url": "https://github.com/strapi/strapi/issues" - }, - "engines": { - "node": ">=12.x.x <=16.x.x", - "npm": ">=6.0.0" - }, - "license": "SEE LICENSE IN LICENSE", - "gitHead": "231263a3535658bab1e9492c6aaaed8692d62a53" -}