Merge branch 'v4/backend' into pluginAPI/loadPlugin

2025-11-03 11:25:17 +00:00 · 2021-07-30 11:54:01 +02:00 · 2021-07-30 11:54:01 +02:00 · 4fa9ed2bcc
commit 4fa9ed2bcc
parent 32ebfce85a 46c94940a7
30 changed files with 3 additions and 67 deletions
--- a/packages/connectors/bookshelf.old/.gitignore
+++ b/packages/connectors/bookshelf.old/.gitignore
--- a/packages/connectors/bookshelf.old/.npmignore
+++ b/packages/connectors/bookshelf.old/.npmignore
--- a/packages/connectors/bookshelf.old/.snyk
+++ b/packages/connectors/bookshelf.old/.snyk
--- a/packages/connectors/bookshelf.old/LICENSE
+++ b/packages/connectors/bookshelf.old/LICENSE
--- a/packages/connectors/bookshelf.old/README.md
+++ b/packages/connectors/bookshelf.old/README.md
--- a/packages/connectors/bookshelf.old/lib/build-database-schema.js
+++ b/packages/connectors/bookshelf.old/lib/build-database-schema.js
--- a/packages/connectors/bookshelf.old/lib/buildQuery.js
+++ b/packages/connectors/bookshelf.old/lib/buildQuery.js
--- a/packages/connectors/bookshelf.old/lib/formatter.js
+++ b/packages/connectors/bookshelf.old/lib/formatter.js
--- a/packages/connectors/bookshelf.old/lib/generate-component-relations.js
+++ b/packages/connectors/bookshelf.old/lib/generate-component-relations.js
--- a/packages/connectors/bookshelf.old/lib/get-query-params.js
+++ b/packages/connectors/bookshelf.old/lib/get-query-params.js
--- a/packages/connectors/bookshelf.old/lib/index.js
+++ b/packages/connectors/bookshelf.old/lib/index.js
--- a/packages/connectors/bookshelf.old/lib/knex.js
+++ b/packages/connectors/bookshelf.old/lib/knex.js
--- a/packages/connectors/bookshelf.old/lib/migrations/draft-publish.js
+++ b/packages/connectors/bookshelf.old/lib/migrations/draft-publish.js
--- a/packages/connectors/bookshelf.old/lib/migrations/index.js
+++ b/packages/connectors/bookshelf.old/lib/migrations/index.js
--- a/packages/connectors/bookshelf.old/lib/models.js
+++ b/packages/connectors/bookshelf.old/lib/models.js
--- a/packages/connectors/bookshelf.old/lib/mount-models.js
+++ b/packages/connectors/bookshelf.old/lib/mount-models.js
--- a/packages/connectors/bookshelf.old/lib/parser.js
+++ b/packages/connectors/bookshelf.old/lib/parser.js
--- a/packages/connectors/bookshelf.old/lib/populate.js
+++ b/packages/connectors/bookshelf.old/lib/populate.js
--- a/packages/connectors/bookshelf.old/lib/queries.js
+++ b/packages/connectors/bookshelf.old/lib/queries.js
--- a/packages/connectors/bookshelf.old/lib/relations.js
+++ b/packages/connectors/bookshelf.old/lib/relations.js
--- a/packages/connectors/bookshelf.old/lib/utils/associations.js
+++ b/packages/connectors/bookshelf.old/lib/utils/associations.js
--- a/packages/connectors/bookshelf.old/lib/utils/attributes.js
+++ b/packages/connectors/bookshelf.old/lib/utils/attributes.js
--- a/packages/connectors/bookshelf.old/lib/utils/connectivity.js
+++ b/packages/connectors/bookshelf.old/lib/utils/connectivity.js
--- a/packages/connectors/bookshelf.old/lib/utils/errors.js
+++ b/packages/connectors/bookshelf.old/lib/utils/errors.js
--- a/packages/connectors/bookshelf.old/lib/utils/populate-queries.js
+++ b/packages/connectors/bookshelf.old/lib/utils/populate-queries.js
--- a/packages/connectors/bookshelf.old/lib/utils/store-definition.js
+++ b/packages/connectors/bookshelf.old/lib/utils/store-definition.js
--- a/packages/connectors/bookshelf/package.json
+++ b/packages/connectors/bookshelf/package.json
@ -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"
-}
--- a/packages/core/strapi/lib/core/loaders/load-admin.js
+++ b/packages/core/strapi/lib/core/loaders/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),
  ]);

--- 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
--- 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"