@strapi/strapi 4.2.0-beta.3 → 4.3.0-beta.1

package/bin/strapi.js

@@ -101,7 +101,7 @@ program
 
 // `$ strapi start`
 program
-  .command('start [dir]')
+  .command('start')
   .description('Start your Strapi application')
   .action(getLocalScript('start'));
 

package/lib/Strapi.js

@@ -24,6 +24,7 @@ const createTelemetry = require('./services/metrics');
 const createAuth = require('./services/auth');
 const createUpdateNotifier = require('./utils/update-notifier');
 const createStartupLogger = require('./utils/startup-logger');
+const { LIFECYCLES } = require('./utils/lifecycles');
 const ee = require('./utils/ee');
 const contentTypesRegistry = require('./core/registries/content-types');
 const servicesRegistry = require('./core/registries/services');
@@ -43,16 +44,6 @@ 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.
  *

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,8 @@ 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).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,8 @@ 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).load();
 
   await app.admin.services.user.resetPasswordByEmail(email, password);
 

package/lib/commands/build.js

@@ -1,30 +1,18 @@
 'use strict';
 
-const tsUtils = require('@strapi/typescript-utils');
-const { buildAdmin, buildTypeScript } = require('./builders');
+const strapi = require('../');
+const { buildAdmin } = require('./builders');
 
 /**
  * `$ strapi build`
  */
 module.exports = async ({ optimization, forceBuild = true }) => {
-  let buildDestDir = process.cwd();
-  const srcDir = process.cwd();
-
-  const useTypeScriptServer = await tsUtils.isUsingTypeScript(srcDir);
-  const outDir = await tsUtils.resolveOutDir(srcDir);
-
-  // Typescript
-  if (useTypeScriptServer) {
-    await buildTypeScript({ srcDir, watch: false });
-
-    // Update the dir path for the next steps
-    buildDestDir = outDir;
-  }
+  const { appDir, distDir } = await strapi.compile();
 
   await buildAdmin({
-    buildDestDir,
     forceBuild,
     optimization,
-    srcDir,
+    buildDestDir: distDir,
+    srcDir: appDir,
   });
 };

package/lib/commands/builders/admin.js

@@ -28,12 +28,9 @@ module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir
   console.log(`Building your admin UI with ${green(env)} configuration...`);
 
   // Always remove the .cache and build folders
-  // FIXME the BE should remove the build dir and the admin should only
-  // be responsible of removing the .cache dir.
   await strapiAdmin.clean({ appDir: srcDir, buildDestDir });
 
-  // @convly shouldn't we use the app dir here?
-  ee({ dir: buildDestDir });
+  ee({ dir: srcDir });
 
   return strapiAdmin
     .build({

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,8 @@ 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).load();
 
   const count = await app.query('strapi::core-store').count();
 

package/lib/commands/configurationRestore.js

@@ -2,7 +2,6 @@
 
 const fs = require('fs');
 const _ = require('lodash');
-const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../index');
 
@@ -14,20 +13,8 @@ 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).load();
 
   let dataToImport;
   try {

package/lib/commands/console.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const REPL = require('repl');
-const tsUtils = require('@strapi/typescript-utils');
 
 const strapi = require('../index');
 
@@ -9,20 +8,8 @@ const strapi = require('../index');
  * `$ strapi console`
  */
 module.exports = async () => {
-  // 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).load();
 
   app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template

package/lib/commands/content-types/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('content-types').keys();
 

package/lib/commands/controllers/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('controllers').keys();
 

package/lib/commands/develop.js

@@ -149,7 +149,6 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
     }
   };
 
-  // @soupette should we keep watching the dist dir (for the watch admin?)
   const watcher = chokidar.watch(appDir, {
     ignoreInitial: true,
     usePolling: polling,
@@ -158,8 +157,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/**',

package/lib/commands/hooks/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('hooks').keys();
 

package/lib/commands/middlewares/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('middlewares').keys();
 

package/lib/commands/policies/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('policies').keys();
 

package/lib/commands/routes/list.js

@@ -3,25 +3,12 @@
 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 appContext = await strapi.compile();
+  const app = await strapi(appContext).load();
 
   const list = app.server.listRoutes();
 

package/lib/commands/services/list.js

@@ -6,7 +6,8 @@ const chalk = require('chalk');
 const strapi = require('../../index');
 
 module.exports = async function() {
-  const app = await strapi().register();
+  const appContext = await strapi.compile();
+  const app = await strapi(appContext).register();
 
   const list = app.container.get('services').keys();
 

package/lib/commands/start.js

@@ -6,13 +6,19 @@ const strapi = require('../index');
 /**
  * `$ strapi start`
  */
-module.exports = async specifiedDir => {
+module.exports = async () => {
   const appDir = process.cwd();
+
   const isTSProject = await tsUtils.isUsingTypeScript(appDir);
+
   const outDir = await tsUtils.resolveOutDir(appDir);
+  const distDir = isTSProject ? outDir : 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;
+  if (isTSProject && !buildDirExists)
+    throw new Error(
+      `${outDir} directory not found. Please run the build command before starting your application`
+    );
 
-  strapi({ distDir }).start();
+  return strapi({ appDir, distDir }).start();
 };

package/lib/commands/watchAdmin.js

@@ -1,7 +1,6 @@
 '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');
@@ -9,14 +8,10 @@ const addSlash = require('../utils/addSlash');
 const strapi = require('../index');
 
 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 appContext = await strapi.compile();
 
   const strapiInstance = strapi({
-    distDir: buildDestDir,
+    ...appContext,
     autoReload: true,
     serveAdminPanel: false,
   });
@@ -31,8 +26,8 @@ module.exports = async function({ browser }) {
   const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
 
   strapiAdmin.watchAdmin({
-    appDir: currentDirectory,
-    buildDestDir,
+    appDir: appContext.appDir,
+    buildDestDir: appContext.distDir,
     plugins,
     port: adminPort,
     host: adminHost,

package/lib/compile.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const tsUtils = require('@strapi/typescript-utils');
+
+module.exports = async dir => {
+  const appDir = dir || 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;
+
+  return { appDir, distDir };
+};

package/lib/core/app-configuration/load-config-file.js

@@ -4,11 +4,11 @@ const path = require('path');
 const fs = require('fs');
 const { templateConfiguration, env } = require('@strapi/utils');
 
-const __importDefault = require('../../utils/import-default');
+const importDefault = require('../../utils/import-default');
 
 const loadJsFile = file => {
   try {
-    const jsModule = __importDefault(require(file)).default;
+    const jsModule = importDefault(file);
 
     // call if function
     if (typeof jsModule === 'function') {

package/lib/core/loaders/apis.js

@@ -155,7 +155,7 @@ const loadFile = file => {
 
   switch (ext) {
     case '.js':
-      return importDefault(require(file)).default;
+      return importDefault(file);
     case '.json':
       return fse.readJSON(file);
     default:

package/lib/core/loaders/middlewares.js

@@ -8,7 +8,7 @@ const { importDefault } = require('../../utils');
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadMiddlewares(strapi) {
   const localMiddlewares = await loadLocalMiddlewares(strapi);
-  const internalMiddlewares = importDefault(require('../../middlewares')).default;
+  const internalMiddlewares = require('../../middlewares');
 
   strapi.container.get('middlewares').add(`global::`, localMiddlewares);
   strapi.container.get('middlewares').add(`strapi::`, internalMiddlewares);
@@ -30,7 +30,7 @@ const loadLocalMiddlewares = async strapi => {
 
     if (fd.isFile() && extname(name) === '.js') {
       const key = basename(name, '.js');
-      middlewares[key] = importDefault(require(fullPath)).default;
+      middlewares[key] = importDefault(fullPath);
     }
   }
 

package/lib/core/loaders/policies.js

@@ -22,7 +22,7 @@ module.exports = async function loadPolicies(strapi) {
 
     if (fd.isFile() && extname(name) === '.js') {
       const key = basename(name, '.js');
-      policies[key] = importDefault(require(fullPath)).default;
+      policies[key] = importDefault(fullPath);
     }
   }
 

package/lib/core/loaders/src-index.js

@@ -29,7 +29,7 @@ module.exports = strapi => {
     return {};
   }
 
-  const srcIndex = importDefault(require(pathToSrcIndex)).default;
+  const srcIndex = importDefault(pathToSrcIndex);
 
   try {
     validateSrcIndex(srcIndex);

package/lib/core-api/controller/index.d.ts

@@ -1,30 +1,27 @@
-import { Context } from 'koa';
+import { Context, Next } from 'koa';
 
-type ControllerResponse <T=unknown> = T | Promise<T>;
+type ControllerResponse<T = unknown> = T | Promise<T> | undefined;
 
-interface BaseController {
+interface Controller {
   transformResponse(data: object, meta: object): object;
   sanitizeOutput(data: object, ctx: Context): Promise<object>;
   sanitizeInput(data: object, ctx: Context): Promise<object>;
 }
 
-export interface SingleTypeController extends BaseController {
-  find(ctx: Context): ControllerResponse;
-  update(ctx: Context): ControllerResponse;
-  delete(ctx: Context): ControllerResponse;
+export interface SingleTypeController extends Controller {
+  find?(ctx: Context, next: Next): ControllerResponse;
+  update?(ctx: Context, next: Next): ControllerResponse;
+  delete?(ctx: Context, next: Next): ControllerResponse;
 }
 
-export interface CollectionTypeController extends BaseController {
-  find(ctx: Context): ControllerResponse;
-  findOne(ctx: Context): ControllerResponse
-  create(ctx: Context): ControllerResponse;
-  update(ctx: Context): ControllerResponse;
-  delete(ctx: Context): ControllerResponse;
+export interface CollectionTypeController extends Controller {
+  find?(ctx: Context, next: Next): ControllerResponse;
+  findOne?(ctx: Context, next: Next): ControllerResponse;
+  create?(ctx: Context, next: Next): ControllerResponse;
+  update?(ctx: Context, next: Next): ControllerResponse;
+  delete?(ctx: Context, next: Next): ControllerResponse;
 }
 
-export type Controller = SingleTypeController | CollectionTypeController;
-
 export type GenericController = Partial<Controller> & {
-  [method: string | number | symbol]: (ctx: Context) => unknown
-}
-​
+  [method: string | number | symbol]: (ctx: Context) => unknown;
+};

package/lib/index.js

@@ -3,5 +3,6 @@
 const Strapi = require('./Strapi');
 
 Strapi.factories = require('./factories');
+Strapi.compile = require('./compile');
 
 module.exports = Strapi;

package/lib/load/load-files.js

@@ -21,7 +21,7 @@ const filePathToPath = require('./filepath-to-prop-path');
 const loadFiles = async (
   dir,
   pattern,
-  { requireFn = require, shouldUseFileNameAsKey = () => true, globArgs = {} } = {}
+  { requireFn = importDefault, shouldUseFileNameAsKey = () => true, globArgs = {} } = {}
 ) => {
   const root = {};
   const files = await glob(pattern, { cwd: dir, ...globArgs });
@@ -36,7 +36,7 @@ const loadFiles = async (
     if (path.extname(absolutePath) === '.json') {
       mod = await fse.readJson(absolutePath);
     } else {
-      mod = importDefault(requireFn(absolutePath)).default;
+      mod = requireFn(absolutePath);
     }
 
     Object.defineProperty(mod, '__filename__', {

package/lib/middlewares/public/index.js

@@ -71,7 +71,6 @@ module.exports = (config, { strapi }) => {
       {
         method: 'GET',
         path: '/assets/images/(.*)',
-        // Why do we use the __dirname and not strapi.dirs here? @alexandrebodin
         handler: serveStatic(path.resolve(__dirname, 'assets/images'), {
           maxage: maxAge,
           defer: true,

package/lib/services/entity-service/index.d.ts

@@ -6,6 +6,7 @@ type ID = number | string;
 type EntityServiceAction =
   | 'findMany'
   | 'findPage'
+  | 'findWithRelationCountsPage'
   | 'findWithRelationCounts'
   | 'findOne'
   | 'count'
@@ -54,7 +55,7 @@ export interface EntityService {
     pagination: PaginationInfo;
   }>;
 
-  findWithRelationCounts<K extends keyof AllTypes, T extends AllTypes[K]>(
+  findWithRelationCountsPage<K extends keyof AllTypes, T extends AllTypes[K]>(
     uid: K,
     params: Params<T>
   ): Promise<{
@@ -62,6 +63,11 @@ export interface EntityService {
     pagination: PaginationInfo;
   }>;
 
+  findWithRelationCounts<K extends keyof AllTypes, T extends AllTypes[K]>(
+    uid: K,
+    params: Params<T>
+  ): Promise<T[]>;
+
   findOne<K extends keyof AllTypes, T extends AllTypes[K]>(
     uid: K,
     entityId: ID,

package/lib/services/entity-service/index.js

@@ -125,7 +125,7 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
   },
 
   // TODO: streamline the logic based on the populate option
-  async findWithRelationCounts(uid, opts) {
+  async findWithRelationCountsPage(uid, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: 'findWithRelationCounts' });
 
     const query = transformParamsToQuery(uid, wrappedParams);
@@ -138,6 +138,16 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
     };
   },
 
+  async findWithRelationCounts(uid, opts) {
+    const wrappedParams = await this.wrapParams(opts, { uid, action: 'findWithRelationCounts' });
+
+    const query = transformParamsToQuery(uid, wrappedParams);
+
+    const results = await db.query(uid).findMany(query);
+
+    return results;
+  },
+
   async findOne(uid, entityId, opts) {
     const wrappedParams = await this.wrapParams(opts, { uid, action: 'findOne' });
 

package/lib/services/utils/upload-files.js

@@ -3,7 +3,7 @@
 const _ = require('lodash');
 
 /**
- * Upload files and like them to an entity
+ * Upload files and link them to an entity
  * @param {string} uid model uid
  * @param {object} entity entity created
  * @param {object} files files to upload

package/lib/types/strapi.d.ts

@@ -1,10 +1,7 @@
 import type Koa from 'koa';
 
 import type { StringMap } from './utils';
-
-type Controller = {
-  [methodName: string | number | symbol]: (context: Koa.Context) => unknown;
-}
+import type { GenericController } from '../core-api/controller'
 
 /**
  * The Strapi interface implemented by the main Strapi class.
@@ -47,12 +44,12 @@ export interface Strapi {
    *
    * It returns all the registered controllers
    */
-  readonly controllers: StringMap<Controller>;
+  readonly controllers: StringMap<GenericController>;
 
   /**
    * Find a controller using its unique identifier
    */
-  controller(uid: string): Controller | undefined;
+  controller(uid: string): GenericController | undefined;
 
   /**
    * Getter for the Strapi content types container
@@ -282,6 +279,62 @@ export interface Strapi {
    * Binds database queries for a specific model based on its unique identifier.
    */
   query(uid: string): any;
+
+  /**
+   * Main Strapi container holding all the registries and providers (config, content-types, services, policies, etc...)
+   */
+  container: any;
+
+  /**
+   * References to all the directories handled by Strapi 
+   */
+  dirs: StrapiDirectories;
+
+  /**
+   * Internal flag used to check if the application has been loaded
+   */
+  isLoaded: boolean;
+
+  /**
+   * Fully reload the application
+   */
+  reload(): void;
+
+  /**
+   * Holds a reference to the Koa application and the http server used by Strapi
+   */
+  server: any;
+
+  /**
+   * Strapi util used to manage application files
+   */
+  fs: any;
+
+  /**
+   * Event hub used to send and receive events from anywhere in the application
+   */
+  eventHub: any;
+
+  /**
+   * Internal util used to log stats and messages on application Startup
+   */
+  startupLogger: any;
+
+  /**
+   * Strapi logger used to send errors, warning or information messages 
+   */
+  log: any;
+
+
+  /**
+   * Used to manage cron within Strapi
+   */
+  cron: any;
+
+  /**
+   * Telemetry util used to collect anonymous data on the application usage
+   */
+  telemetry: any;
 }
 
 export interface Lifecycles {
@@ -289,3 +342,29 @@ export interface Lifecycles {
   BOOTSTRAP: 'bootstrap';
   DESTROY: 'destroy';
 }
+
+export interface StrapiDirectories {
+  static: {
+    public: string;
+  };
+  app: {
+    root: string;
+    src: string;
+    api: string;
+    components: string;
+    extensions: string;
+    policies: string;
+    middlewares: string;
+    config: string;
+  };
+  dist: {
+    root: string;
+    src: string;
+    api: string;
+    components: string;
+    extensions: string;
+    policies: string;
+    middlewares: string;
+    config: string;
+  };
+}

package/lib/utils/import-default.js

@@ -1,9 +1,10 @@
 'use strict';
 
-const __importDefault =
-  (this && this.__importDefault) ||
-  function(mod) {
-    return mod && mod.__esModule ? mod : { default: mod };
+const importDefault =
+  (this && this.importDefault) ||
+  function(modName) {
+    const mod = require(modName);
+    return mod && mod.__esModule ? mod.default : mod;
   };
 
-module.exports = __importDefault;
+module.exports = importDefault;

package/lib/utils/lifecycles.js

@@ -0,0 +1,15 @@
+'use strict';
+
+/**
+ * A map of all the available Strapi lifecycles
+ * @type {import('@strapi/strapi').Core.Lifecycles}
+ */
+const LIFECYCLES = {
+  REGISTER: 'register',
+  BOOTSTRAP: 'bootstrap',
+  DESTROY: 'destroy',
+};
+
+module.exports = {
+  LIFECYCLES,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.2.0-beta.3",
+  "version": "4.3.0-beta.1",
   "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,17 +80,17 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.2.0-beta.3",
-    "@strapi/database": "4.2.0-beta.3",
-    "@strapi/generate-new": "4.2.0-beta.3",
-    "@strapi/generators": "4.2.0-beta.3",
-    "@strapi/logger": "4.2.0-beta.3",
-    "@strapi/plugin-content-manager": "4.2.0-beta.3",
-    "@strapi/plugin-content-type-builder": "4.2.0-beta.3",
-    "@strapi/plugin-email": "4.2.0-beta.3",
-    "@strapi/plugin-upload": "4.2.0-beta.3",
-    "@strapi/typescript-utils": "4.2.0-beta.3",
-    "@strapi/utils": "4.2.0-beta.3",
+    "@strapi/admin": "4.3.0-beta.1",
+    "@strapi/database": "4.3.0-beta.1",
+    "@strapi/generate-new": "4.3.0-beta.1",
+    "@strapi/generators": "4.3.0-beta.1",
+    "@strapi/logger": "4.3.0-beta.1",
+    "@strapi/plugin-content-manager": "4.3.0-beta.1",
+    "@strapi/plugin-content-type-builder": "4.3.0-beta.1",
+    "@strapi/plugin-email": "4.3.0-beta.1",
+    "@strapi/plugin-upload": "4.3.0-beta.1",
+    "@strapi/typescript-utils": "4.3.0-beta.1",
+    "@strapi/utils": "4.3.0-beta.1",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -136,8 +136,8 @@
     "typescript": "4.6.2"
   },
   "engines": {
-    "node": ">=12.22.0 <=16.x.x",
+    "node": ">=14.19.1 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "c4addbad6ecbc8ef7633bbba3806f3b0a2ae5f49"
+  "gitHead": "9d6555398960c39159d66bb4eea3bcb0362e37e3"
 }