@strapi/core 0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95 → 0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/core",
-  "version": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
+  "version": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
   "description": "Core of Strapi",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -23,6 +23,10 @@
       "url": "https://strapi.io"
     }
   ],
+  "main": "./dist/index.js",
+  "module": "./dist/index.mjs",
+  "source": "./src/index.ts",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -33,84 +37,84 @@
     },
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs",
-  "source": "./src/index.ts",
-  "types": "./dist/index.d.ts",
   "files": [
     "dist/",
     "resources/"
   ],
   "scripts": {
-    "build": "run pack-up build && run copy-files",
+    "build": "run -T npm-run-all clean --parallel build:code build:types",
+    "build:code": "run -T  rollup -c",
+    "build:types": "run -T tsc -p tsconfig.build.json --emitDeclarationOnly",
+    "watch": "run -T rollup -c -w",
     "clean": "run -T rimraf ./dist",
-    "copy-files": "copyfiles -u 1 -a 'src/**/*.html' 'src/**/*.png'  dist",
     "lint": "run -T eslint .",
     "prepublishOnly": "yarn clean && yarn build",
     "test:unit": "run -T jest",
-    "test:unit:watch": "run -T jest --watch",
-    "watch": "pack-up watch"
+    "test:unit:watch": "run -T jest --watch"
   },
   "dependencies": {
-    "@koa/cors": "3.4.3",
-    "@koa/router": "10.1.1",
+    "@koa/cors": "5.0.0",
+    "@koa/router": "12.0.2",
     "@paralleldrive/cuid2": "2.2.2",
-    "@strapi/admin": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/database": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/generate-new": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/generators": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/logger": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/pack-up": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/permissions": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/types": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/typescript-utils": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
-    "@strapi/utils": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
+    "@strapi/admin": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/database": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/generators": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/logger": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/permissions": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/types": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/typescript-utils": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
+    "@strapi/utils": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
-    "ci-info": "3.8.0",
+    "ci-info": "4.0.0",
     "cli-table3": "0.6.2",
     "commander": "8.3.0",
     "configstore": "5.0.1",
     "copyfiles": "2.4.1",
     "debug": "4.3.4",
     "delegates": "1.0.0",
-    "dotenv": "14.2.0",
+    "dotenv": "16.4.5",
     "execa": "5.1.1",
-    "fs-extra": "10.0.0",
+    "fs-extra": "11.2.0",
     "glob": "10.3.10",
-    "http-errors": "1.8.1",
+    "global-agent": "3.0.0",
+    "http-errors": "2.0.0",
     "inquirer": "8.2.5",
     "is-docker": "2.2.1",
-    "koa": "2.13.4",
-    "koa-body": "4.2.0",
+    "koa": "2.15.4",
+    "koa-body": "6.0.1",
     "koa-compose": "4.1.0",
-    "koa-compress": "5.1.0",
+    "koa-compress": "5.1.1",
     "koa-favicon": "2.1.0",
     "koa-helmet": "7.0.2",
-    "koa-ip": "^2.1.2",
+    "koa-ip": "^2.1.3",
     "koa-session": "6.4.0",
     "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
-    "node-schedule": "2.1.0",
+    "node-schedule": "2.1.1",
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
     "pkg-up": "3.1.0",
     "qs": "6.11.1",
+    "resolve.exports": "2.0.2",
     "semver": "7.5.4",
     "statuses": "2.0.1",
-    "typescript": "5.2.2",
-    "undici": "5.27.2",
+    "typescript": "5.4.4",
+    "undici": "6.21.1",
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/pack-up": "workspace:*",
     "@strapi/ts-zen": "^0.2.0",
+    "@swc/core": "1.9.3",
     "@types/bcryptjs": "2.4.3",
     "@types/configstore": "5.0.1",
     "@types/delegates": "1.0.0",
+    "@types/fs-extra": "11.0.4",
+    "@types/global-agent": "2.1.3",
+    "@types/http-errors": "2.0.4",
     "@types/jest": "29.5.2",
     "@types/koa": "2.13.4",
     "@types/koa-compress": "4.0.3",
@@ -119,16 +123,15 @@
     "@types/koa__router": "12.0.0",
     "@types/lodash": "^4.14.191",
     "@types/mime-types": "2.1.1",
-    "@types/node": "18.18.4",
-    "@types/node-schedule": "2.1.0",
+    "@types/node": "18.19.24",
+    "@types/node-schedule": "2.1.7",
     "@types/statuses": "2.0.1",
-    "eslint-config-custom": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95",
+    "eslint-config-custom": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f",
     "supertest": "6.3.3",
-    "tsconfig": "0.0.0-experimental.e3e48deb89bd0a1b6cc69b698696566fa7854a95"
+    "tsconfig": "0.0.0-experimental.e576af447d9f97e89e24c6daa32d8f714376cd5f"
   },
   "engines": {
-    "node": ">=18.0.0 <=20.x.x",
+    "node": ">=18.0.0 <=22.x.x",
     "npm": ">=6.0.0"
-  },
-  "gitHead": "e3e48deb89bd0a1b6cc69b698696566fa7854a95"
+  }
 }

package/dist/Strapi.js

@@ -1,459 +0,0 @@
-"use strict";
-const path = require("path");
-const _ = require("lodash");
-const _$1 = require("lodash/fp");
-const logger = require("@strapi/logger");
-const database = require("@strapi/database");
-const strapiUtils = require("@strapi/utils");
-const index = require("./configuration/index.js");
-const factories = require("./factories.js");
-const compile = require("./compile.js");
-const openBrowser = require("./utils/open-browser.js");
-const isInitialized = require("./utils/is-initialized.js");
-const getDirs = require("./utils/get-dirs.js");
-const index$6 = require("./ee/index.js");
-const index$5 = require("./utils/update-notifier/index.js");
-const fetch = require("./utils/fetch.js");
-const convertCustomFieldType = require("./utils/convert-custom-field-type.js");
-const startupLogger = require("./utils/startup-logger.js");
-const transformContentTypesToModels = require("./utils/transform-content-types-to-models.js");
-const signals = require("./utils/signals.js");
-const lifecycles = require("./utils/lifecycles.js");
-const contentTypes = require("./registries/content-types.js");
-const components = require("./registries/components.js");
-const services = require("./registries/services.js");
-const policies = require("./registries/policies.js");
-const middlewares = require("./registries/middlewares.js");
-const hooks = require("./registries/hooks.js");
-const controllers = require("./registries/controllers.js");
-const modules = require("./registries/modules.js");
-const plugins = require("./registries/plugins.js");
-const customFields = require("./registries/custom-fields.js");
-const config = require("./registries/config.js");
-const apis = require("./registries/apis.js");
-const sanitizers = require("./registries/sanitizers.js");
-const validators = require("./registries/validators.js");
-const models = require("./registries/models.js");
-const index$7 = require("./loaders/index.js");
-const container = require("./container.js");
-const fs = require("./services/fs.js");
-const eventHub = require("./services/event-hub.js");
-const index$3 = require("./services/server/index.js");
-const webhookRunner = require("./services/webhook-runner.js");
-const webhookStore = require("./services/webhook-store.js");
-const coreStore = require("./services/core-store.js");
-const index$9 = require("./services/entity-service/index.js");
-const cron = require("./services/cron.js");
-const index$8 = require("./services/entity-validator/index.js");
-const index$4 = require("./services/metrics/index.js");
-const requestContext = require("./services/request-context.js");
-const index$2 = require("./services/auth/index.js");
-const customFields$1 = require("./services/custom-fields.js");
-const index$1 = require("./services/content-api/index.js");
-const dynamicZones = require("./services/utils/dynamic-zones.js");
-const features = require("./services/features.js");
-const index$a = require("./services/document-service/index.js");
-const draftPublish = require("./migrations/draft-publish.js");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const path__default = /* @__PURE__ */ _interopDefault(path);
-const ___default = /* @__PURE__ */ _interopDefault(_);
-const resolveWorkingDirectories = (opts) => {
-  const cwd = process.cwd();
-  const appDir = opts.appDir ? path__default.default.resolve(cwd, opts.appDir) : cwd;
-  const distDir = opts.distDir ? path__default.default.resolve(cwd, opts.distDir) : appDir;
-  return { app: appDir, dist: distDir };
-};
-const reloader = (strapi) => {
-  const state = {
-    shouldReload: 0,
-    isWatching: true
-  };
-  function reload() {
-    if (state.shouldReload > 0) {
-      state.shouldReload -= 1;
-      reload.isReloading = false;
-      return;
-    }
-    if (strapi.config.get("autoReload")) {
-      process.send?.("reload");
-    }
-  }
-  Object.defineProperty(reload, "isWatching", {
-    configurable: true,
-    enumerable: true,
-    set(value) {
-      if (state.isWatching === false && value === true) {
-        state.shouldReload += 1;
-      }
-      state.isWatching = value;
-    },
-    get() {
-      return state.isWatching;
-    }
-  });
-  reload.isReloading = false;
-  reload.isWatching = true;
-  return reload;
-};
-class Strapi extends container.Container {
-  server;
-  log;
-  fs;
-  eventHub;
-  startupLogger;
-  cron;
-  webhookRunner;
-  webhookStore;
-  store;
-  entityValidator;
-  /**
-   * @deprecated `strapi.entityService` will be removed in the next major version
-   */
-  entityService;
-  documents;
-  telemetry;
-  requestContext;
-  customFields;
-  fetch;
-  dirs;
-  admin;
-  isLoaded;
-  db;
-  app;
-  EE;
-  reload;
-  features;
-  // @ts-expect-error - Assigned in constructor
-  ee;
-  constructor(opts = {}) {
-    super();
-    signals.destroyOnSignal(this);
-    const rootDirs = resolveWorkingDirectories(opts);
-    const appConfig = index(rootDirs, opts);
-    this.add("config", config(appConfig, this)).add("content-types", contentTypes()).add("components", components()).add("services", services(this)).add("policies", policies()).add("middlewares", middlewares()).add("hooks", hooks()).add("controllers", controllers(this)).add("modules", modules(this)).add("plugins", plugins(this)).add("custom-fields", customFields(this)).add("apis", apis(this)).add("sanitizers", sanitizers()).add("validators", validators()).add("content-api", index$1(this)).add("auth", index$2()).add("models", models.registry());
-    this.dirs = getDirs.getDirs(rootDirs, { strapi: this });
-    this.isLoaded = false;
-    this.reload = reloader(this);
-    this.server = index$3.createServer(this);
-    this.fs = fs(this);
-    this.eventHub = eventHub();
-    this.startupLogger = startupLogger.createStartupLogger(this);
-    const logLevel = this.config.get(
-      "server.logger.config",
-      this.config.get("logger", { level: "info" })
-    );
-    this.log = logger.createLogger(logLevel);
-    this.cron = cron();
-    this.telemetry = index$4(this);
-    this.requestContext = requestContext;
-    this.customFields = customFields$1(this);
-    this.fetch = fetch.createStrapiFetch(this);
-    this.features = features.createFeaturesService(this);
-    this.db = new database.Database(
-      ___default.default.merge(this.config.get("database"), {
-        settings: {
-          migrations: {
-            dir: path__default.default.join(this.dirs.app.root, "database/migrations")
-          }
-        }
-      })
-    );
-    index$5.createUpdateNotifier(this).notify();
-    Object.defineProperty(this, "EE", {
-      get: () => {
-        index$6.init(this.dirs.app.root, this.log);
-        return index$6.isEE;
-      },
-      configurable: false
-    });
-    Object.defineProperty(this, "ee", {
-      get: () => index$6,
-      configurable: false
-    });
-  }
-  get config() {
-    return this.get("config");
-  }
-  get services() {
-    return this.get("services").getAll();
-  }
-  service(uid) {
-    return this.get("services").get(uid);
-  }
-  get controllers() {
-    return this.get("controllers").getAll();
-  }
-  controller(uid) {
-    return this.get("controllers").get(uid);
-  }
-  get contentTypes() {
-    return this.get("content-types").getAll();
-  }
-  contentType(name) {
-    return this.get("content-types").get(name);
-  }
-  get components() {
-    return this.get("components").getAll();
-  }
-  get policies() {
-    return this.get("policies").getAll();
-  }
-  policy(name) {
-    return this.get("policies").get(name);
-  }
-  get middlewares() {
-    return this.get("middlewares").getAll();
-  }
-  middleware(name) {
-    return this.get("middlewares").get(name);
-  }
-  get plugins() {
-    return this.get("plugins").getAll();
-  }
-  plugin(name) {
-    return this.get("plugins").get(name);
-  }
-  get hooks() {
-    return this.get("hooks").getAll();
-  }
-  hook(name) {
-    return this.get("hooks").get(name);
-  }
-  // api(name) {
-  //   return this.get('apis').get(name);
-  // }
-  get api() {
-    return this.get("apis").getAll();
-  }
-  get auth() {
-    return this.get("auth");
-  }
-  get contentAPI() {
-    return this.get("content-api");
-  }
-  get sanitizers() {
-    return this.get("sanitizers");
-  }
-  get validators() {
-    return this.get("validators");
-  }
-  async start() {
-    try {
-      if (!this.isLoaded) {
-        await this.load();
-      }
-      await this.listen();
-      return this;
-    } catch (error) {
-      return this.stopWithError(error);
-    }
-  }
-  async destroy() {
-    await this.server.destroy();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.DESTROY);
-    this.eventHub.destroy();
-    await this.db?.destroy();
-    this.telemetry.destroy();
-    this.cron.destroy();
-    process.removeAllListeners();
-    delete global.strapi;
-  }
-  sendStartupTelemetry() {
-    this.telemetry.send("didStartServer", {
-      groupProperties: {
-        database: this.config.get("database.connection.client"),
-        plugins: Object.keys(this.plugins),
-        numberOfAllContentTypes: ___default.default.size(this.contentTypes),
-        // TODO: V5: This event should be renamed numberOfContentTypes in V5 as the name is already taken to describe the number of content types using i18n.
-        numberOfComponents: ___default.default.size(this.components),
-        numberOfDynamicZones: dynamicZones(),
-        numberOfCustomControllers: Object.values(this.controllers).filter(
-          // TODO: Fix this at the content API loader level to prevent future types issues
-          (controller) => controller !== void 0 && factories.isCustomController(controller)
-        ).length,
-        environment: this.config.environment
-        // TODO: to add back
-        // providers: this.config.installedProviders,
-      }
-    }).catch(this.log.error);
-  }
-  async openAdmin({ isInitialized: isInitialized2 }) {
-    const shouldOpenAdmin = this.config.get("environment") === "development" && this.config.get("admin.autoOpen", true) !== false;
-    if (shouldOpenAdmin && !isInitialized2) {
-      try {
-        await openBrowser.openBrowser(this.config);
-        this.telemetry.send("didOpenTab");
-      } catch (e) {
-        this.telemetry.send("didNotOpenTab");
-      }
-    }
-  }
-  async postListen() {
-    const isInitialized$1 = await isInitialized.isInitialized(this);
-    this.startupLogger.logStartupMessage({ isInitialized: isInitialized$1 });
-    this.sendStartupTelemetry();
-    this.openAdmin({ isInitialized: isInitialized$1 });
-  }
-  /**
-   * Add behaviors to the server
-   */
-  async listen() {
-    return new Promise((resolve, reject) => {
-      const onListen = async () => {
-        try {
-          await this.postListen();
-          resolve();
-        } catch (error) {
-          reject(error);
-        }
-      };
-      const listenSocket = this.config.get("server.socket");
-      if (listenSocket) {
-        this.server.listen(listenSocket, onListen);
-      } else {
-        const { host, port } = this.config.get("server");
-        this.server.listen(port, host, onListen);
-      }
-    });
-  }
-  stopWithError(err, customMessage) {
-    this.log.debug(`⛔️ Server wasn't able to start properly.`);
-    if (customMessage) {
-      this.log.error(customMessage);
-    }
-    this.log.error(err);
-    return this.stop();
-  }
-  stop(exitCode = 1) {
-    this.destroy();
-    if (this.config.get("autoReload")) {
-      process.send?.("stop");
-    }
-    process.exit(exitCode);
-  }
-  registerInternalHooks() {
-    this.get("hooks").set("strapi::content-types.beforeSync", strapiUtils.hooks.createAsyncParallelHook());
-    this.get("hooks").set("strapi::content-types.afterSync", strapiUtils.hooks.createAsyncParallelHook());
-    this.hook("strapi::content-types.beforeSync").register(draftPublish.disable);
-    this.hook("strapi::content-types.afterSync").register(draftPublish.enable);
-  }
-  async register() {
-    await index$7.loadApplicationContext(this);
-    this.get("models").add(coreStore.coreStoreModel).add(webhookStore.webhookModel);
-    this.webhookRunner = webhookRunner({
-      eventHub: this.eventHub,
-      logger: this.log,
-      configuration: this.config.get("server.webhooks", {}),
-      fetch: this.fetch
-    });
-    this.registerInternalHooks();
-    this.telemetry.register();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.REGISTER);
-    convertCustomFieldType.convertCustomFieldType(this);
-    return this;
-  }
-  async bootstrap() {
-    const models2 = [
-      ...transformContentTypesToModels.transformContentTypesToModels([
-        ...Object.values(this.contentTypes),
-        ...Object.values(this.components)
-      ]),
-      ...this.get("models").get()
-    ];
-    await this.db.init({ models: models2 });
-    this.store = coreStore.createCoreStore({ db: this.db });
-    this.webhookStore = webhookStore.createWebhookStore({ db: this.db });
-    this.entityValidator = index$8;
-    this.entityService = index$9({
-      strapi: this,
-      db: this.db
-    });
-    this.documents = index$a.createDocumentService(this);
-    if (this.config.get("server.cron.enabled", true)) {
-      const cronTasks = this.config.get("server.cron.tasks", {});
-      this.cron.add(cronTasks);
-    }
-    this.telemetry.bootstrap();
-    let oldContentTypes;
-    if (await this.db.getSchemaConnection().hasTable(coreStore.coreStoreModel.tableName)) {
-      oldContentTypes = await this.store.get({
-        type: "strapi",
-        name: "content_types",
-        key: "schema"
-      });
-    }
-    await this.hook("strapi::content-types.beforeSync").call({
-      oldContentTypes,
-      contentTypes: this.contentTypes
-    });
-    await this.db.schema.sync();
-    if (this.EE) {
-      await index$6.checkLicense({ strapi: this });
-    }
-    await this.hook("strapi::content-types.afterSync").call({
-      oldContentTypes,
-      contentTypes: this.contentTypes
-    });
-    await this.store.set({
-      type: "strapi",
-      name: "content_types",
-      key: "schema",
-      value: this.contentTypes
-    });
-    await this.startWebhooks();
-    await this.server.initMiddlewares();
-    this.server.initRouting();
-    await this.contentAPI.permissions.registerActions();
-    await this.runLifecyclesFunctions(lifecycles.LIFECYCLES.BOOTSTRAP);
-    this.cron.start();
-    return this;
-  }
-  async load() {
-    await this.register();
-    await this.bootstrap();
-    this.isLoaded = true;
-    return this;
-  }
-  async startWebhooks() {
-    const webhooks = await this.webhookStore?.findWebhooks();
-    if (!webhooks) {
-      return;
-    }
-    for (const webhook of webhooks) {
-      this.webhookRunner?.add(webhook);
-    }
-  }
-  async runLifecyclesFunctions(lifecycleName) {
-    await this.get("modules")[lifecycleName]();
-    const adminLifecycleFunction = this.admin && this.admin[lifecycleName];
-    if (_$1.isFunction(adminLifecycleFunction)) {
-      await adminLifecycleFunction({ strapi: this });
-    }
-    const userLifecycleFunction = this.app && this.app[lifecycleName];
-    if (_$1.isFunction(userLifecycleFunction)) {
-      await userLifecycleFunction({ strapi: this });
-    }
-  }
-  getModel(uid) {
-    if (uid in this.contentTypes) {
-      return this.contentTypes[uid];
-    }
-    if (uid in this.components) {
-      return this.components[uid];
-    }
-  }
-  /**
-   * @deprecated Use `strapi.db.query` instead
-   */
-  query(uid) {
-    return this.db.query(uid);
-  }
-}
-const initFn = (options = {}) => {
-  const strapi = new Strapi(options);
-  global.strapi = strapi;
-  return strapi;
-};
-const init = Object.assign(initFn, { factories, compile });
-module.exports = init;
-//# sourceMappingURL=Strapi.js.map