@strapi/strapi 4.1.6-alpha.0 → 4.1.7

package/lib/Strapi.js

@@ -50,8 +50,8 @@ const LIFECYCLES = {
 class Strapi {
   constructor(opts = {}) {
     destroyOnSignal(this);
-    this.dirs = utils.getDirs(opts.dir || process.cwd());
-    const appConfig = loadConfiguration(this.dirs.root, opts);
+    const rootDir = opts.dir || process.cwd();
+    const appConfig = loadConfiguration(rootDir, opts);
     this.container = createContainer(this);
     this.container.register('config', createConfigProvider(appConfig));
     this.container.register('content-types', contentTypesRegistry(this));
@@ -65,6 +65,8 @@ class Strapi {
     this.container.register('apis', apisRegistry(this));
     this.container.register('auth', createAuth(this));
 
+    this.dirs = utils.getDirs(rootDir, { strapi: this });
+
     this.isLoaded = false;
     this.reload = this.reload();
     this.server = createServer(this);

package/lib/commands/develop.js

@@ -8,6 +8,7 @@ const execa = require('execa');
 const { getOr } = require('lodash/fp');
 
 const { createLogger } = require('@strapi/logger');
+const { joinBy } = require('@strapi/utils');
 const loadConfiguration = require('../core/app-configuration');
 const strapi = require('../index');
 const buildAdmin = require('./build');
@@ -131,6 +132,8 @@ function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
       '**/index.html',
       '**/public',
       '**/public/**',
+      strapiInstance.dirs.public,
+      joinBy('/', strapiInstance.dirs.public, '**'),
       '**/*.db*',
       '**/exports/**',
       ...watchIgnoreFiles,

package/lib/core/app-configuration/index.js

@@ -21,6 +21,7 @@ const defaultConfig = {
     proxy: false,
     cron: { enabled: false },
     admin: { autoOpen: false },
+    dirs: { public: './public' },
   },
   admin: {},
   api: {

package/lib/core/bootstrap.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const { getConfigUrls } = require('@strapi/utils');
+const fse = require('fs-extra');
 
-module.exports = function({ strapi }) {
+module.exports = async function({ strapi }) {
   strapi.config.port = strapi.config.get('server.port') || strapi.config.port;
   strapi.config.host = strapi.config.get('server.host') || strapi.config.host;
 
@@ -22,4 +23,11 @@ module.exports = function({ strapi }) {
   if (!shouldServeAdmin) {
     strapi.config.serveAdminPanel = false;
   }
+
+  // ensure public repository exists
+  if (!(await fse.pathExists(strapi.dirs.public))) {
+    throw new Error(
+      `The public folder (${strapi.dirs.public}) doesn't exist or is not accessible. Please make sure it exists.`
+    );
+  }
 };

package/lib/middlewares/session.js

@@ -19,7 +19,9 @@ const defaultConfig = {
 module.exports = (userConfig, { strapi }) => {
   const keys = strapi.server.app.keys;
   if (!isArray(keys) || isEmpty(keys) || keys.some(isEmpty)) {
-    throw new Error(`App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`);
+    throw new Error(
+      `App keys are required. Please set app.keys in config/server.js (ex: keys: ['myKeyA', 'myKeyB'])`
+    );
   }
 
   const config = defaultsDeep(defaultConfig, userConfig);

package/lib/services/server/index.js

@@ -30,7 +30,7 @@ const healthCheck = async ctx => {
 const createServer = strapi => {
   const app = createKoaApp({
     proxy: strapi.config.get('server.proxy'),
-    keys:  strapi.config.get('server.app.keys'),
+    keys: strapi.config.get('server.app.keys'),
   });
 
   const router = new Router();

package/lib/utils/get-dirs.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const { join } = require('path');
+const { join, resolve } = require('path');
 
-const getDirs = root => ({
+const getDirs = (root, { strapi }) => ({
   root,
   src: join(root, 'src'),
   api: join(root, 'src', 'api'),
@@ -11,7 +11,7 @@ const getDirs = root => ({
   policies: join(root, 'src', 'policies'),
   middlewares: join(root, 'src', 'middlewares'),
   config: join(root, 'config'),
-  public: join(root, 'public'),
+  public: resolve(root, strapi.config.get('server.dirs.public')),
 });
 
 module.exports = getDirs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.1.6-alpha.0",
+  "version": "4.1.7",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -80,16 +80,16 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.1.6-alpha.0",
-    "@strapi/database": "4.1.6-alpha.0",
-    "@strapi/generate-new": "4.1.6-alpha.0",
-    "@strapi/generators": "4.1.6-alpha.0",
-    "@strapi/logger": "4.1.6-alpha.0",
-    "@strapi/plugin-content-manager": "4.1.6-alpha.0",
-    "@strapi/plugin-content-type-builder": "4.1.6-alpha.0",
-    "@strapi/plugin-email": "4.1.6-alpha.0",
-    "@strapi/plugin-upload": "4.1.6-alpha.0",
-    "@strapi/utils": "4.1.6-alpha.0",
+    "@strapi/admin": "4.1.7",
+    "@strapi/database": "4.1.7",
+    "@strapi/generate-new": "4.1.7",
+    "@strapi/generators": "4.1.7",
+    "@strapi/logger": "4.1.7",
+    "@strapi/plugin-content-manager": "4.1.7",
+    "@strapi/plugin-content-type-builder": "4.1.7",
+    "@strapi/plugin-email": "4.1.7",
+    "@strapi/plugin-upload": "4.1.7",
+    "@strapi/utils": "4.1.7",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,5 +136,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "c52f42c80df62e95876235db368f84a7eda09c97"
+  "gitHead": "1699aac1515f439ed69d0b68a43555c1d497554f"
 }