@strapi/strapi 4.2.0-beta.4 → 4.2.0

package/bin/strapi.js

@@ -95,13 +95,12 @@ program
   .option('--dbssl <dbssl>', 'Database SSL')
   .option('--dbfile <dbfile>', 'Database file path for sqlite')
   .option('--dbforce', 'Allow overwriting existing database content')
-  .option('-ts, --typescript', 'Create a typescript project')
   .description('Create a new application')
   .action(require('../lib/commands/new'));
 
 // `$ strapi start`
 program
-  .command('start [dir]')
+  .command('start')
   .description('Start your Strapi application')
   .action(getLocalScript('start'));
 

package/lib/Strapi.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const _ = require('lodash');
 const { isFunction } = require('lodash/fp');
 const { createLogger } = require('@strapi/logger');
@@ -43,50 +42,18 @@ const sanitizersRegistry = require('./core/registries/sanitizers');
 // TODO: move somewhere else
 const draftAndPublishSync = require('./migrations/draft-publish');
 
-/**
- * A map of all the available Strapi lifecycles
- * @type {import('@strapi/strapi').Core.Lifecycles}
- */
 const LIFECYCLES = {
   REGISTER: 'register',
   BOOTSTRAP: 'bootstrap',
   DESTROY: 'destroy',
 };
 
-/**
- * Resolve the working directories based on the instance options.
- *
- * Behavior:
- * - `appDir` is the directory where Strapi will write every file (schemas, generated APIs, controllers or services)
- * - `distDir` is the directory where Strapi will read configurations, schemas and any compiled code
- *
- * Default values:
- * - If `appDir` is `undefined`, it'll be set to `process.cwd()`
- * - If `distDir` is `undefined`, it'll be set to `appDir`
- */
-const resolveWorkingDirectories = opts => {
-  const cwd = process.cwd();
-
-  const appDir = opts.appDir ? path.resolve(cwd, opts.appDir) : cwd;
-  const distDir = opts.distDir ? path.resolve(cwd, opts.distDir) : appDir;
-
-  return { app: appDir, dist: distDir };
-};
-
-/** @implements {import('@strapi/strapi').Strapi} */
 class Strapi {
   constructor(opts = {}) {
     destroyOnSignal(this);
-
-    const rootDirs = resolveWorkingDirectories(opts);
-
-    // Load the app configuration from the dist directory
-    const appConfig = loadConfiguration({ appDir: rootDirs.app, distDir: rootDirs.dist }, opts);
-
-    // Instanciate the Strapi container
+    const rootDir = opts.dir || process.cwd();
+    const appConfig = loadConfiguration(rootDir, opts);
     this.container = createContainer(this);
-
-    // Register every Strapi registry in the container
     this.container.register('config', createConfigProvider(appConfig));
     this.container.register('content-types', contentTypesRegistry(this));
     this.container.register('services', servicesRegistry(this));
@@ -100,17 +67,12 @@ class Strapi {
     this.container.register('auth', createAuth(this));
     this.container.register('sanitizers', sanitizersRegistry(this));
 
-    // Create a mapping of every useful directory (for the app, dist and static directories)
-    this.dirs = utils.getDirs(rootDirs, { strapi: this });
+    this.dirs = utils.getDirs(rootDir, { strapi: this });
 
-    // Strapi state management variables
     this.isLoaded = false;
     this.reload = this.reload();
-
-    // Instanciate the Koa app & the HTTP server
     this.server = createServer(this);
 
-    // Strapi utils instanciation
     this.fs = createStrapiFs(this);
     this.eventHub = createEventHub();
     this.startupLogger = createStartupLogger(this);
@@ -126,7 +88,7 @@ class Strapi {
   }
 
   get EE() {
-    return ee({ dir: this.dirs.dist.root, logger: this.log });
+    return ee({ dir: this.dirs.root, logger: this.log });
   }
 
   get services() {

package/lib/commands/admin-create.js

@@ -3,7 +3,6 @@
 const { yup } = require('@strapi/utils');
 const _ = require('lodash');
 const inquirer = require('inquirer');
-const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const emailValidator = yup
@@ -91,20 +90,7 @@ module.exports = async function(cmdOptions = {}) {
 };
 
 async function createAdmin({ email, password, firstname, lastname }) {
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = await strapi().load();
 
   const user = await app.admin.services.user.exists({ email });
 

package/lib/commands/admin-reset.js

@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const inquirer = require('inquirer');
-const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const promptQuestions = [
@@ -43,20 +42,7 @@ module.exports = async function(cmdOptions = {}) {
 };
 
 async function changePassword({ email, password }) {
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = await strapi().load();
 
   await app.admin.services.user.resetPasswordByEmail(email, password);
 

package/lib/commands/build.js

@@ -1,30 +1,56 @@
 'use strict';
+const { green } = require('chalk');
 
-const tsUtils = require('@strapi/typescript-utils');
-const { buildAdmin, buildTypeScript } = require('./builders');
+const strapiAdmin = require('@strapi/admin');
+const { getConfigUrls } = require('@strapi/utils');
+
+const ee = require('../utils/ee');
+const addSlash = require('../utils/addSlash');
+const strapi = require('../index');
+const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
 
 /**
  * `$ strapi build`
  */
 module.exports = async ({ optimization, forceBuild = true }) => {
-  let buildDestDir = process.cwd();
-  const srcDir = process.cwd();
+  const dir = process.cwd();
 
-  const useTypeScriptServer = await tsUtils.isUsingTypeScript(srcDir);
-  const outDir = await tsUtils.resolveOutDir(srcDir);
+  const strapiInstance = strapi({
+    dir,
+    autoReload: true,
+    serveAdminPanel: false,
+  });
 
-  // Typescript
-  if (useTypeScriptServer) {
-    await buildTypeScript({ srcDir, watch: false });
+  const plugins = await getEnabledPlugins(strapiInstance);
 
-    // Update the dir path for the next steps
-    buildDestDir = outDir;
-  }
+  const env = strapiInstance.config.get('environment');
+  const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config, true);
 
-  await buildAdmin({
-    buildDestDir,
-    forceBuild,
-    optimization,
-    srcDir,
-  });
+  console.log(`Building your admin UI with ${green(env)} configuration ...`);
+
+  // Always remove the .cache and build folders
+  await strapiAdmin.clean({ dir });
+
+  ee({ dir });
+
+  return strapiAdmin
+    .build({
+      forceBuild,
+      dir,
+      plugins,
+      // front end build env is always production for now
+      env: 'production',
+      optimize: optimization,
+      options: {
+        backend: serverUrl,
+        adminPath: addSlash(adminPath),
+      },
+    })
+    .then(() => {
+      console.log('Admin UI built successfully');
+    })
+    .catch(err => {
+      console.error(err);
+      process.exit(1);
+    });
 };

package/lib/commands/configurationDump.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const fs = require('fs');
-const tsUtils = require('@strapi/typescript-utils');
 const strapi = require('../index');
 
 const CHUNK_SIZE = 100;
@@ -13,19 +12,7 @@ const CHUNK_SIZE = 100;
 module.exports = async function({ file: filePath, pretty }) {
   const output = filePath ? fs.createWriteStream(filePath) : process.stdout;
 
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = await strapi().load();
 
   const count = await app.query('strapi::core-store').count();
 

package/lib/commands/configurationRestore.js

@@ -2,8 +2,6 @@
 
 const fs = require('fs');
 const _ = require('lodash');
-const tsUtils = require('@strapi/typescript-utils');
-
 const strapi = require('../index');
 
 /**
@@ -14,20 +12,7 @@ const strapi = require('../index');
 module.exports = async function({ file: filePath, strategy = 'replace' }) {
   const input = filePath ? fs.readFileSync(filePath) : await readStdin(process.stdin);
 
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = await strapi().load();
 
   let dataToImport;
   try {

package/lib/commands/console.js

@@ -1,28 +1,14 @@
 'use strict';
 
 const REPL = require('repl');
-const tsUtils = require('@strapi/typescript-utils');
-
 const strapi = require('../index');
 
 /**
  * `$ strapi console`
  */
-module.exports = async () => {
+module.exports = () => {
   // Now load up the Strapi framework for real.
-  const appDir = process.cwd();
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = strapi();
 
   app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template

package/lib/commands/develop.js

@@ -6,151 +6,115 @@ const fs = require('fs-extra');
 const chokidar = require('chokidar');
 const execa = require('execa');
 const { getOr } = require('lodash/fp');
-const { joinBy } = require('@strapi/utils');
-const tsUtils = require('@strapi/typescript-utils');
 
+const { createLogger } = require('@strapi/logger');
+const { joinBy } = require('@strapi/utils');
 const loadConfiguration = require('../core/app-configuration');
 const strapi = require('../index');
-const { buildTypeScript, buildAdmin } = require('./builders');
+const buildAdmin = require('./build');
 
 /**
  * `$ strapi develop`
  *
  */
-
 module.exports = async function({ build, watchAdmin, polling, browser }) {
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-  const distDir = isTSProject ? outDir : appDir;
+  const dir = process.cwd();
+  const config = loadConfiguration(dir);
+  const logger = createLogger(config.logger, {});
 
   try {
     if (cluster.isMaster || cluster.isPrimary) {
-      return primaryProcess({
-        distDir,
-        appDir,
-        build,
-        browser,
-        isTSProject,
-        watchAdmin,
+      const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
+
+      const buildExists = fs.existsSync(path.join(dir, 'build'));
+      // Don't run the build process if the admin is in watch mode
+      if (build && !watchAdmin && serveAdminPanel && !buildExists) {
+        try {
+          await buildAdmin({ optimization: false, forceBuild: false });
+        } catch (err) {
+          process.exit(1);
+        }
+      }
+
+      if (watchAdmin) {
+        try {
+          execa('npm', ['run', '-s', 'strapi', 'watch-admin', '--', '--browser', browser], {
+            stdio: 'inherit',
+          });
+        } catch (err) {
+          process.exit(1);
+        }
+      }
+
+      cluster.on('message', (worker, message) => {
+        switch (message) {
+          case 'reload':
+            logger.info('The server is restarting\n');
+            worker.send('kill');
+            break;
+          case 'killed':
+            cluster.fork();
+            break;
+          case 'stop':
+            process.exit(1);
+          default:
+            return;
+        }
       });
-    }
 
-    if (cluster.isWorker) {
-      return workerProcess({ appDir, distDir, watchAdmin, polling, isTSProject });
+      cluster.fork();
     }
-  } catch (e) {
-    console.error(e);
-    process.exit(1);
-  }
-};
-
-const primaryProcess = async ({ distDir, appDir, build, isTSProject, watchAdmin, browser }) => {
-  if (isTSProject) {
-    await buildTypeScript({ srcDir: appDir, distDir, watch: false });
-  }
 
-  const config = loadConfiguration({ appDir, distDir });
-  const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
-
-  const buildExists = fs.existsSync(path.join(distDir, 'build'));
-
-  // Don't run the build process if the admin is in watch mode
-  if (build && !watchAdmin && serveAdminPanel && !buildExists) {
-    try {
-      await buildAdmin({
-        buildDestDir: distDir,
-        forceBuild: false,
-        optimization: false,
-        srcDir: appDir,
+    if (cluster.isWorker) {
+      const strapiInstance = strapi({
+        dir,
+        autoReload: true,
+        serveAdminPanel: watchAdmin ? false : true,
       });
-    } catch (err) {
-      process.exit(1);
-    }
-  }
 
-  if (watchAdmin) {
-    try {
-      execa('npm', ['run', '-s', 'strapi', 'watch-admin', '--', '--browser', browser], {
-        stdio: 'inherit',
+      const adminWatchIgnoreFiles = getOr([], 'admin.watchIgnoreFiles')(config);
+      watchFileChanges({
+        dir,
+        strapiInstance,
+        watchIgnoreFiles: adminWatchIgnoreFiles,
+        polling,
       });
-    } catch (err) {
-      process.exit(1);
-    }
-  }
 
-  cluster.on('message', async (worker, message) => {
-    switch (message) {
-      case 'reload':
-        if (isTSProject) {
-          await buildTypeScript({ srcDir: appDir, distDir, watch: false });
+      process.on('message', async message => {
+        switch (message) {
+          case 'kill':
+            await strapiInstance.destroy();
+            process.send('killed');
+            process.exit();
+          default:
+          // Do nothing.
         }
+      });
 
-        console.info('The server is restarting\n');
-
-        worker.send('kill');
-        break;
-      case 'killed':
-        cluster.fork();
-        break;
-      case 'stop':
-        process.exit(1);
-      default:
-        return;
-    }
-  });
-
-  cluster.fork();
-};
-
-const workerProcess = ({ appDir, distDir, watchAdmin, polling, isTSProject }) => {
-  const strapiInstance = strapi({
-    distDir,
-    autoReload: true,
-    serveAdminPanel: watchAdmin ? false : true,
-  });
-
-  const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
-  watchFileChanges({
-    appDir,
-    strapiInstance,
-    watchIgnoreFiles: adminWatchIgnoreFiles,
-    polling,
-    isTSProject,
-  });
-
-  process.on('message', async message => {
-    switch (message) {
-      case 'kill':
-        await strapiInstance.destroy();
-        process.send('killed');
-        process.exit();
-      default:
-      // Do nothing.
+      return strapiInstance.start();
     }
-  });
-
-  return strapiInstance.start();
+  } catch (e) {
+    logger.error(e);
+    process.exit(1);
+  }
 };
 
 /**
  * Init file watching to auto restart strapi app
  * @param {Object} options - Options object
- * @param {string} options.appDir - This is the path where the app is located, the watcher will watch the files under this folder
+ * @param {string} options.dir - This is the path where the app is located, the watcher will watch the files under this folder
  * @param {Strapi} options.strapi - Strapi instance
  * @param {array} options.watchIgnoreFiles - Array of custom file paths that should not be watched
  */
-function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling }) {
-  const restart = async () => {
+function watchFileChanges({ dir, strapiInstance, watchIgnoreFiles, polling }) {
+  const restart = () => {
     if (strapiInstance.reload.isWatching && !strapiInstance.reload.isReloading) {
       strapiInstance.reload.isReloading = true;
       strapiInstance.reload();
     }
   };
 
-  // @soupette should we keep watching the dist dir (for the watch admin?)
-  const watcher = chokidar.watch(appDir, {
+  const watcher = chokidar.watch(dir, {
     ignoreInitial: true,
     usePolling: polling,
     ignored: [
@@ -158,9 +122,6 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
       /tmp/,
       '**/src/admin/**',
       '**/src/plugins/**/admin/**',
-      // FIXME pass the plugin path to the strapiAdmin.build and strapiAdmin.watch in order to stop copying
-      // the FE files when using TS
-      '**/dist/src/plugins/test/admin/**',
       '**/documentation',
       '**/documentation/**',
       '**/node_modules',
@@ -171,11 +132,10 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
       '**/index.html',
       '**/public',
       '**/public/**',
-      strapiInstance.dirs.static.public,
-      joinBy('/', strapiInstance.dirs.static.public, '**'),
+      strapiInstance.dirs.public,
+      joinBy('/', strapiInstance.dirs.public, '**'),
       '**/*.db*',
       '**/exports/**',
-      '**/dist/**',
       ...watchIgnoreFiles,
     ],
   });

package/lib/commands/routes/list.js

@@ -3,25 +3,11 @@
 const CLITable = require('cli-table3');
 const chalk = require('chalk');
 const { toUpper } = require('lodash/fp');
-const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const appDir = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-
-  if (isTSProject)
-    await tsUtils.compile(appDir, {
-      watch: false,
-      configOptions: { options: { incremental: true } },
-    });
-
-  const distDir = isTSProject ? outDir : appDir;
-
-  const app = await strapi({ appDir, distDir }).load();
+  const app = await strapi().load();
 
   const list = app.server.listRoutes();
 

package/lib/commands/start.js

@@ -1,18 +1,8 @@
 'use strict';
-const fs = require('fs');
-const tsUtils = require('@strapi/typescript-utils');
+
 const strapi = require('../index');
 
 /**
  * `$ strapi start`
  */
-module.exports = async specifiedDir => {
-  const appDir = process.cwd();
-  const isTSProject = await tsUtils.isUsingTypeScript(appDir);
-  const outDir = await tsUtils.resolveOutDir(appDir);
-  const buildDirExists = fs.existsSync(outDir);
-  if (isTSProject && !buildDirExists) throw new Error(`${outDir} directory not found. Please run the build command before starting your application`);
-  const distDir = isTSProject && !specifiedDir ? outDir : specifiedDir;
-
-  strapi({ distDir }).start();
-};
+module.exports = () => strapi().start();

package/lib/commands/watchAdmin.js

@@ -1,22 +1,18 @@
 'use strict';
 
 const strapiAdmin = require('@strapi/admin');
-const tsUtils = require('@strapi/typescript-utils');
 const { getConfigUrls, getAbsoluteServerUrl } = require('@strapi/utils');
 
-const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
+const ee = require('../utils/ee');
 const addSlash = require('../utils/addSlash');
 const strapi = require('../index');
+const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
 
 module.exports = async function({ browser }) {
-  const currentDirectory = process.cwd();
-
-  const isTSProject = await tsUtils.isUsingTypeScript(currentDirectory);
-  const outDir = await tsUtils.resolveOutDir(currentDirectory);
-  const buildDestDir = isTSProject ? outDir : currentDirectory;
+  const dir = process.cwd();
 
   const strapiInstance = strapi({
-    distDir: buildDestDir,
+    dir,
     autoReload: true,
     serveAdminPanel: false,
   });
@@ -27,12 +23,14 @@ module.exports = async function({ browser }) {
 
   const adminPort = strapiInstance.config.get('admin.port', 8000);
   const adminHost = strapiInstance.config.get('admin.host', 'localhost');
+  const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
 
   const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
 
+  ee({ dir });
+
   strapiAdmin.watchAdmin({
-    appDir: currentDirectory,
-    buildDestDir,
+    dir,
     plugins,
     port: adminPort,
     host: adminHost,
@@ -40,6 +38,8 @@ module.exports = async function({ browser }) {
     options: {
       backend: backendURL,
       adminPath: addSlash(adminPath),
+      watchIgnoreFiles: adminWatchIgnoreFiles,
+      features: ee.isEE ? ee.features.getEnabled() : [],
     },
   });
 };