Upgrade to strapi v4 (#13)

* Updated package.json with v4 deps

* Updated folder structure to match v4 quickstart

* Updated config files for v4

* Bump strapi to 4.1.0

* Use strapi recommended middleware config for cloudinary

* Move ADMIN_JWT_SECRET out of code to avoid leaking

* Upgrade to 4.1.3

* Remove unnecessary file

* Upgrade pg

* Upgrade node version

* Add placeholder for all env vars

* Add APP_KEYS to render.yaml

This is required for 4.0.6 and later

* Add session middleware required for > v4.0.6

* Re-add setting server.url in production

Co-authored-by: Chris Castle <chris@render.com>

Author: shidil

.env.example

@@ -1,2 +1,10 @@
 HOST=0.0.0.0
 PORT=1337
+APP_KEYS=testkey
+ADMIN_JWT_SECRET=testsecret
+API_TOKEN_SALT=testsalt
+# The following are only needed in production
+# Media is stored on the filesystem in development
+#CLOUDINARY_NAME=
+#CLOUDINARY_KEY=
+#CLOUDINARY_SECRET=

config/admin.js

@@ -0,0 +1,5 @@
+module.exports = ({ env }) => ({
+  auth: {
+    secret: env('ADMIN_JWT_SECRET'),
+  },
+});

config/api.js

@@ -0,0 +1,7 @@
+module.exports = {
+  rest: {
+    defaultLimit: 25,
+    maxLimit: 100,
+    withCount: true,
+  },
+};

config/database.js

@@ -1,15 +1,11 @@
+const path = require('path');
+
 module.exports = ({ env }) => ({
-  defaultConnection: 'default',
-  connections: {
-    default: {
-      connector: 'bookshelf',
-      settings: {
-        client: 'sqlite',
-        filename: env('DATABASE_FILENAME', '.tmp/data.db'),
-      },
-      options: {
-        useNullAsDefault: true,
-      },
+  connection: {
+    client: 'sqlite',
+    connection: {
+      filename: path.join(__dirname, '..', env('DATABASE_FILENAME', '.tmp/data.db')),
     },
+    useNullAsDefault: true,
   },
 });

config/env/production/cron-tasks.js

@@ -0,0 +1,12 @@
+// https://docs.strapi.io/developer-docs/latest/setup-deployment-guides/configurations/optional/cronjobs.html#creating-a-cron-job
+
+module.exports = {
+  /**
+   * Simple example.
+   * Every monday at 1am.
+   */
+
+  // '0 0 1 * * 1': ({ strapi }) => {
+  //   // Add your own logic here (e.g. send a queue of email, create a database backup, etc.).
+  // },
+};

config/env/production/database.js

@@ -4,19 +4,16 @@ module.exports = ({ env }) => {
   const { host, port, database, user, password } = parse(env("DATABASE_URL"));
 
   return {
-    defaultConnection: "default",
-    connections: {
-      default: {
-        connector: "bookshelf",
-        settings: {
-          client: "postgres",
-          host,
-          port,
-          database,
-          username: user,
-          password,
-        },
+    connection: {
+      client: "postgres",
+      connection: {
+        host,
+        port,
+        database,
+        user,
+        password
       },
+      debug: false,
     },
   };
 };

config/env/production/logger.js

@@ -0,0 +1,11 @@
+"use strict";
+
+const { winston } = require("@strapi/logger");
+
+module.exports = {
+  transports: [
+    new winston.transports.Console({
+      level: "error",
+    }),
+  ],
+};

config/env/production/middleware.js

@@ -0,0 +1,25 @@
+module.exports = [
+  "strapi::errors",
+  {
+    name: "strapi::security",
+    config: {
+      contentSecurityPolicy: {
+        useDefaults: true,
+        directives: {
+          "connect-src": ["'self'", "https:"],
+          "img-src": ["'self'", "data:", "blob:", "res.cloudinary.com"],
+          "media-src": ["'self'", "data:", "blob:", "res.cloudinary.com"],
+          upgradeInsecureRequests: null,
+        },
+      },
+    },
+  },
+  "strapi::cors",
+  "strapi::poweredBy",
+  "strapi::logger",
+  "strapi::query",
+  "strapi::body",
+  'strapi::session',
+  "strapi::favicon",
+  "strapi::public",
+];

config/env/production/middlewares.js

@@ -1,10 +1,12 @@
 module.exports = ({ env }) => ({
   upload: {
-    provider: "cloudinary",
-    providerOptions: {
-      cloud_name: env("CLOUDINARY_NAME"),
-      api_key: env("CLOUDINARY_KEY"),
-      api_secret: env("CLOUDINARY_SECRET"),
+    config: {
+      provider: "cloudinary",
+      providerOptions: {
+        cloud_name: env("CLOUDINARY_NAME"),
+        api_key: env("CLOUDINARY_KEY"),
+        api_secret: env("CLOUDINARY_SECRET"),
+      },
     },
   },
 });