Upgrade to strapi v4 (render-examples#13)

shidil · crcastle · web-flow · commit 4beaa3c85a53 · 2022-03-25T11:47:09.000-07:00
* 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 &gt; v4.0.6

* Re-add setting server.url in production

Co-authored-by: Chris Castle &lt;chris@render.com&gt;
diff --git a/.env.example b/.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=
diff --git a/config/admin.js b/config/admin.js
@@ -0,0 +1,5 @@
+module.exports = ({ env }) => ({
+  auth: {
+    secret: env('ADMIN_JWT_SECRET'),
+  },
+});
diff --git a/config/api.js b/config/api.js
@@ -0,0 +1,7 @@
+module.exports = {
+  rest: {
+    defaultLimit: 25,
+    maxLimit: 100,
+    withCount: true,
+  },
+};
diff --git a/config/database.js b/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,
   },
 });
diff --git a/config/env/production/cron-tasks.js b/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.).
+  // },
+};
diff --git a/config/env/production/database.js b/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,
     },
   };
 };
diff --git a/config/env/production/logger.js b/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",
+    }),
+  ],
+};
diff --git a/config/env/production/middleware.js b/config/env/production/middleware.js
diff --git a/config/env/production/middlewares.js b/config/env/production/middlewares.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",
+];
diff --git a/config/env/production/plugins.js b/config/env/production/plugins.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"),
+      },
     },
   },
 });
diff --git a/config/env/production/server.js b/config/env/production/server.js
@@ -1,9 +1,3 @@
 module.exports = ({ env }) => ({
-  host: "0.0.0.0",
   url: env("RENDER_EXTERNAL_URL"),
-  admin: {
-    auth: {
-      secret: env("ADMIN_JWT_SECRET"),
-    },
-  },
-});
+});
diff --git a/config/functions/bootstrap.js b/config/functions/bootstrap.js
diff --git a/config/functions/cron.js b/config/functions/cron.js
diff --git a/config/functions/responses/404.js b/config/functions/responses/404.js
diff --git a/config/middlewares.js b/config/middlewares.js
@@ -0,0 +1,12 @@
+module.exports = [
+  "strapi::errors",
+  "strapi::security",
+  "strapi::cors",
+  "strapi::poweredBy",
+  "strapi::logger",
+  "strapi::query",
+  "strapi::body",
+  'strapi::session',
+  "strapi::favicon",
+  "strapi::public",
+];
diff --git a/config/server.js b/config/server.js
@@ -1,9 +1,7 @@
 module.exports = ({ env }) => ({
   host: env('HOST', '0.0.0.0'),
   port: env.int('PORT', 1337),
-  admin: {
-    auth: {
-      secret: env('ADMIN_JWT_SECRET', 'ea9a418022c8044305a8ab471025ee7b'),
-    },
+  app: {
+    keys: env.array('APP_KEYS')
   },
 });
diff --git a/package.json b/package.json
@@ -11,20 +11,13 @@
   },
   "devDependencies": {},
   "dependencies": {
-    "knex": "<0.20.0",
-    "pg": "^8.3.3",
-    "pg-connection-string": "^2.4.0",
-    "sqlite3": "latest",
-    "strapi": "3.4.5",
-    "strapi-admin": "3.4.5",
-    "strapi-connector-bookshelf": "3.4.5",
-    "strapi-plugin-content-manager": "3.4.5",
-    "strapi-plugin-content-type-builder": "3.4.5",
-    "strapi-plugin-email": "3.4.5",
-    "strapi-plugin-upload": "3.4.5",
-    "strapi-plugin-users-permissions": "3.4.5",
-    "strapi-provider-upload-cloudinary": "3.4.5",
-    "strapi-utils": "3.4.5"
+    "@strapi/strapi": "4.1.3",
+    "@strapi/plugin-users-permissions": "4.1.3",
+    "@strapi/plugin-i18n": "4.1.3",
+    "@strapi/provider-upload-cloudinary": "4.1.3",
+    "pg": "^8.7.0",
+    "pg-connection-string": "^2.5.0",
+    "sqlite3": "latest"
   },
   "author": {
     "name": "A Strapi developer"
diff --git a/render.yaml b/render.yaml
@@ -8,7 +8,7 @@ services:
     healthCheckPath: /_health
     envVars:
       - key: NODE_VERSION
-        value: 12.18.4
+        value: ~16.13.0
       - key: NODE_ENV
         value: production
       - key: CLOUDINARY_NAME
@@ -25,6 +25,8 @@ services:
         generateValue: true
       - key: ADMIN_JWT_SECRET
         generateValue: true
+      - key: APP_KEYS
+        generateValue: true
 
 databases:
   - name: strapi
diff --git a/src/admin/app.example.js b/src/admin/app.example.js
@@ -0,0 +1,35 @@
+export default {
+  config: {
+    locales: [
+      // 'ar',
+      // 'fr',
+      // 'cs',
+      // 'de',
+      // 'dk',
+      // 'es',
+      // 'he',
+      // 'id',
+      // 'it',
+      // 'ja',
+      // 'ko',
+      // 'ms',
+      // 'nl',
+      // 'no',
+      // 'pl',
+      // 'pt-BR',
+      // 'pt',
+      // 'ru',
+      // 'sk',
+      // 'sv',
+      // 'th',
+      // 'tr',
+      // 'uk',
+      // 'vi',
+      // 'zh-Hans',
+      // 'zh',
+    ],
+  },
+  bootstrap(app) {
+    console.log(app);
+  },
+};
diff --git a/src/admin/webpack.config.example.js b/src/admin/webpack.config.example.js
@@ -0,0 +1,9 @@
+'use strict';
+
+/* eslint-disable no-unused-vars */
+module.exports = (config, webpack) => {
+  // Note: we provide webpack above so you should not `require` it
+  // Perform customizations to webpack config
+  // Important: return the modified config
+  return config;
+};
diff --git a/src/api/.gitkeep b/src/api/.gitkeep
diff --git a/src/extensions/.gitkeep b/src/extensions/.gitkeep
diff --git a/src/extensions/users-permissions/config/jwt.js b/src/extensions/users-permissions/config/jwt.js
diff --git a/src/index.js b/src/index.js
@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = {
+  /**
+   * An asynchronous register function that runs before
+   * your application is initialized.
+   *
+   * This gives you an opportunity to extend code.
+   */
+  register(/*{ strapi }*/) {},
+
+  /**
+   * An asynchronous bootstrap function that runs before
+   * your application gets started.
+   *
+   * This gives you an opportunity to set up your data model,
+   * run jobs, or perform some special logic.
+   */
+  bootstrap(/*{ strapi }*/) {},
+};
diff --git a/yarn.lock b/yarn.lock
