chore: upgrade to strapi.beta.18.4

ly525 · Jan 12, 2020 · 4353d3d · 4353d3d
1 parent 131e802
commit 4353d3d
Show file tree

Hide file tree

Showing 7 changed files with 2,515 additions and 3,114 deletions.
diff --git a/back-end/h5-api/config/environments/development/database.json b/back-end/h5-api/config/environments/development/database.json
@@ -2,7 +2,7 @@
   "defaultConnection": "default",
   "connections": {
     "default": {
-      "connector": "strapi-hook-bookshelf",
+      "connector": "bookshelf",
       "settings": {
         "client": "sqlite",
         "filename": ".tmp/data.db"

diff --git a/back-end/h5-api/config/environments/production/database.heroku.json b/back-end/h5-api/config/environments/production/database.heroku.json
@@ -2,7 +2,7 @@
   "defaultConnection": "default",
   "connections": {
     "default": {
-      "connector": "strapi-hook-bookshelf",
+      "connector": "bookshelf",
       "settings": {
         "client": "postgres",
         "host": "${process.env.DATABASE_HOST}",

diff --git a/back-end/h5-api/config/environments/production/database.json b/back-end/h5-api/config/environments/production/database.json
@@ -2,7 +2,7 @@
   "defaultConnection": "default",
   "connections": {
     "default": {
-      "connector": "strapi-hook-bookshelf",
+      "connector": "bookshelf",
       "settings": {
         "client": "mysql",
         "host": "${process.env.DATABASE_HOST || 'localhost'}",

diff --git a/back-end/h5-api/config/environments/production/security.json b/back-end/h5-api/config/environments/production/security.json
@@ -6,11 +6,7 @@
   },
   "csp": {
     "enabled": true,
-    "policy": [{
-        "img-src": "'self' http:"
-      },
-      "block-all-mixed-content"
-    ]
+    "policy": ["block-all-mixed-content"]
   },
   "p3p": {
     "enabled": true,

diff --git a/back-end/h5-api/config/environments/staging/security.json b/back-end/h5-api/config/environments/staging/security.json
@@ -6,11 +6,7 @@
   },
   "csp": {
     "enabled": true,
-    "policy": [{
-        "img-src": "'self' http:"
-      },
-      "block-all-mixed-content"
-    ]
+    "policy": ["block-all-mixed-content"]
   },
   "p3p": {
     "enabled": true,

diff --git a/back-end/h5-api/package.json b/back-end/h5-api/package.json
@@ -24,18 +24,17 @@
     "mysql": "latest",
     "psd": "^3.2.0",
     "sqlite3": "latest",
-    "strapi": "3.0.0-beta.17.8",
-    "strapi-admin": "3.0.0-beta.17.8",
-    "strapi-hook-bookshelf": "3.0.0-beta.17.8",
     "strapi-hook-ejs": "3.0.0-beta.17.8",
-    "strapi-hook-knex": "3.0.0-beta.17.8",
-    "strapi-plugin-content-manager": "3.0.0-beta.17.8",
-    "strapi-plugin-content-type-builder": "3.0.0-beta.17.8",
-    "strapi-plugin-documentation": "3.0.0-beta.17.8",
-    "strapi-plugin-email": "3.0.0-beta.17.8",
-    "strapi-plugin-upload": "3.0.0-beta.17.8",
-    "strapi-plugin-users-permissions": "3.0.0-beta.17.8",
-    "strapi-utils": "3.0.0-beta.17.8"
+    "strapi": "3.0.0-beta.18.4",
+    "strapi-admin": "3.0.0-beta.18.4",
+    "strapi-connector-bookshelf": "3.0.0-beta.18.4",
+    "strapi-plugin-content-manager": "3.0.0-beta.18.4",
+    "strapi-plugin-content-type-builder": "3.0.0-beta.18.4",
+    "strapi-plugin-email": "3.0.0-beta.18.4",
+    "strapi-plugin-graphql": "3.0.0-beta.18.4",
+    "strapi-plugin-upload": "3.0.0-beta.18.4",
+    "strapi-plugin-users-permissions": "3.0.0-beta.18.4",
+    "strapi-utils": "3.0.0-beta.18.4"
   },
   "author": {
     "name": "A Strapi developer"

diff --git a/back-end/h5-api/yarn.lock b/back-end/h5-api/yarn.lock