@strapi/core 0.0.0-experimental.c5235059f5636c4549ea2118c75c43b92e2615c8 → 0.0.0-experimental.c72b48da735f44a3ccafb7a6dc9ba5213f3844db

package/dist/configuration/config-loader.mjs

@@ -1,104 +1,117 @@
-import path from "path";
-import fs from "fs";
-import { loadConfigFile } from "../utils/load-config-file.mjs";
-const VALID_EXTENSIONS = [".js", ".json"];
+import path from 'path';
+import fs from 'fs';
+import { loadConfigFile } from '../utils/load-config-file.mjs';
+
+const VALID_EXTENSIONS = [
+    '.js',
+    '.json'
+];
+// These filenames are restricted, but will also emit a warning that the filename is probably a mistake
 const MISTAKEN_FILENAMES = {
-  middleware: "middlewares",
-  plugin: "plugins"
+    middleware: 'middlewares',
+    plugin: 'plugins'
 };
+// the following are restricted to prevent conflicts with existing STRAPI_* env vars or root level config options
+// must all be lowercase to match validator
 const RESTRICTED_FILENAMES = [
-  // existing env vars
-  "uuid",
-  "hosting",
-  "license",
-  "enforce",
-  "disable",
-  "enable",
-  "telemetry",
-  // reserved for future internal use
-  "strapi",
-  "internal",
-  // root level config options
-  // TODO: it would be better to move these out of the root config and allow them to be loaded
-  "launchedAt",
-  "serveAdminPanel",
-  "autoReload",
-  "environment",
-  "packageJsonStrapi",
-  "info",
-  "autoReload",
-  "dirs",
-  // probably mistaken/typo filenames
-  ...Object.keys(MISTAKEN_FILENAMES)
+    // existing env vars
+    'uuid',
+    'hosting',
+    'license',
+    'enforce',
+    'disable',
+    'enable',
+    'telemetry',
+    // reserved for future internal use
+    'strapi',
+    'internal',
+    // root level config options
+    // TODO: it would be better to move these out of the root config and allow them to be loaded
+    'launchedAt',
+    'serveAdminPanel',
+    'autoReload',
+    'environment',
+    'packageJsonStrapi',
+    'info',
+    'autoReload',
+    'dirs',
+    // probably mistaken/typo filenames
+    ...Object.keys(MISTAKEN_FILENAMES)
 ];
+// Existing Strapi configuration files
 const STRAPI_CONFIG_FILENAMES = [
-  "admin",
-  "server",
-  "api",
-  "database",
-  "middlewares",
-  "plugins",
-  "features"
+    'admin',
+    'server',
+    'api',
+    'database',
+    'middlewares',
+    'plugins',
+    'features'
 ];
-const logWarning = (message) => {
-  console.warn(message);
-};
-const loadConfigDir = (dir) => {
-  if (!fs.existsSync(dir))
-    return {};
-  const allFiles = fs.readdirSync(dir, { withFileTypes: true });
-  const seenFilenames = /* @__PURE__ */ new Set();
-  const configFiles = allFiles.reduce((acc, file) => {
-    const baseName = path.basename(file.name, path.extname(file.name));
-    const baseNameLower = baseName.toLowerCase();
-    const extension = path.extname(file.name);
-    const extensionLower = extension.toLowerCase();
-    if (!file.isFile()) {
-      return acc;
-    }
-    if (!VALID_EXTENSIONS.includes(extensionLower)) {
-      logWarning(
-        `Config file not loaded, extension must be one of ${VALID_EXTENSIONS.join(",")}): ${file.name}`
-      );
-      return acc;
-    }
-    if (RESTRICTED_FILENAMES.includes(baseNameLower)) {
-      logWarning(`Config file not loaded, restricted filename: ${file.name}`);
-      if (baseNameLower in MISTAKEN_FILENAMES) {
-        console.log(
-          `Did you mean ${MISTAKEN_FILENAMES[baseNameLower]}]} ?`
-        );
-      }
-      return acc;
-    }
-    const restrictedPrefix = [...RESTRICTED_FILENAMES, ...STRAPI_CONFIG_FILENAMES].find(
-      (restrictedName) => restrictedName.startsWith(baseNameLower) && restrictedName !== baseNameLower
-    );
-    if (restrictedPrefix) {
-      logWarning(
-        `Config file not loaded, filename cannot start with ${restrictedPrefix}: ${file.name}`
-      );
-    }
-    if (seenFilenames.has(baseNameLower)) {
-      logWarning(
-        `Config file not loaded, case-insensitive name matches other config file: ${file.name}`
-      );
-      return acc;
-    }
-    seenFilenames.add(baseNameLower);
-    acc.push(file);
-    return acc;
-  }, []);
-  return configFiles.reduce(
-    (acc, file) => {
-      const key = path.basename(file.name, path.extname(file.name));
-      acc[key] = loadConfigFile(path.resolve(dir, file.name));
-      return acc;
-    },
-    {}
-  );
-};
-export {
-  loadConfigDir as default
+// Note: we don't have access to strapi logger at this point so we can't use it
+const logWarning = (message)=>{
+    console.warn(message);
 };
+var loadConfigDir = ((dir)=>{
+    if (!fs.existsSync(dir)) return {};
+    const allFiles = fs.readdirSync(dir, {
+        withFileTypes: true
+    });
+    const seenFilenames = new Set();
+    const configFiles = allFiles.reduce((acc, file)=>{
+        const baseName = path.basename(file.name, path.extname(file.name));
+        const baseNameLower = baseName.toLowerCase();
+        const extension = path.extname(file.name);
+        const extensionLower = extension.toLowerCase();
+        if (!file.isFile()) {
+            return acc;
+        }
+        if (!VALID_EXTENSIONS.includes(extensionLower)) {
+            logWarning(`Config file not loaded, extension must be one of ${VALID_EXTENSIONS.join(',')}): ${file.name}`);
+            return acc;
+        }
+        if (RESTRICTED_FILENAMES.includes(baseNameLower)) {
+            logWarning(`Config file not loaded, restricted filename: ${file.name}`);
+            // suggest the filename they probably meant
+            if (baseNameLower in MISTAKEN_FILENAMES) {
+                console.log(`Did you mean ${MISTAKEN_FILENAMES[baseNameLower]}]} ?`);
+            }
+            return acc;
+        }
+        // restricted names and Strapi configs are also restricted from being prefixes
+        const restrictedPrefix = [
+            ...RESTRICTED_FILENAMES,
+            ...STRAPI_CONFIG_FILENAMES
+        ].find((restrictedName)=>restrictedName.startsWith(baseNameLower) && restrictedName !== baseNameLower);
+        if (restrictedPrefix) {
+            logWarning(`Config file not loaded, filename cannot start with ${restrictedPrefix}: ${file.name}`);
+        }
+        /**
+     *  Note: If user config files contain non-alpha-numeric characters, we won't be able to auto-load env
+     * into them.
+     *
+     * For the initial feature, we will only load our internal configs, but later when we provide a method
+     * to define the shape of custom configs, we will need to warn that those filenames can't be loaded
+     * for technical limitations on env variable names
+     *  */ // if (!/^[A-Za-z0-9]+$/.test(baseName)) {
+        //   logWarning("Using a non-alphanumeric config file name prevents Strapi from auto-loading it from environment variables.")
+        // }
+        // filter filenames without case-insensitive uniqueness
+        if (seenFilenames.has(baseNameLower)) {
+            logWarning(`Config file not loaded, case-insensitive name matches other config file: ${file.name}`);
+            return acc;
+        }
+        seenFilenames.add(baseNameLower);
+        // If file passes all filters, add it to the accumulator
+        acc.push(file);
+        return acc;
+    }, []);
+    return configFiles.reduce((acc, file)=>{
+        const key = path.basename(file.name, path.extname(file.name));
+        acc[key] = loadConfigFile(path.resolve(dir, file.name));
+        return acc;
+    }, {});
+});
+
+export { loadConfigDir as default };
 //# sourceMappingURL=config-loader.mjs.map

package/dist/configuration/config-loader.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"config-loader.mjs","sources":["../../src/configuration/config-loader.ts"],"sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport { loadConfigFile } from '../utils/load-config-file';\n\nconst VALID_EXTENSIONS = ['.js', '.json'];\n\n// These filenames are restricted, but will also emit a warning that the filename is probably a mistake\nconst MISTAKEN_FILENAMES = {\n  middleware: 'middlewares',\n  plugin: 'plugins',\n};\n\n// the following are restricted to prevent conflicts with existing STRAPI_* env vars or root level config options\n// must all be lowercase to match validator\nconst RESTRICTED_FILENAMES = [\n  // existing env vars\n  'uuid',\n  'hosting',\n  'license',\n  'enforce',\n  'disable',\n  'enable',\n  'telemetry',\n\n  // reserved for future internal use\n  'strapi',\n  'internal',\n\n  // root level config options\n  // TODO: it would be better to move these out of the root config and allow them to be loaded\n  'launchedAt',\n  'serveAdminPanel',\n  'autoReload',\n  'environment',\n  'packageJsonStrapi',\n  'info',\n  'autoReload',\n  'dirs',\n\n  // probably mistaken/typo filenames\n  ...Object.keys(MISTAKEN_FILENAMES),\n];\n\n// Existing Strapi configuration files\nconst STRAPI_CONFIG_FILENAMES = [\n  'admin',\n  'server',\n  'api',\n  'database',\n  'middlewares',\n  'plugins',\n  'features',\n];\n\n// Note: we don't have access to strapi logger at this point so we can't use it\nconst logWarning = (message: string) => {\n  console.warn(message);\n};\n\nexport default (dir: string) => {\n  if (!fs.existsSync(dir)) return {};\n\n  const allFiles = fs.readdirSync(dir, { withFileTypes: true });\n  const seenFilenames = new Set<string>();\n  const configFiles = allFiles.reduce((acc, file) => {\n    const baseName = path.basename(file.name, path.extname(file.name));\n    const baseNameLower = baseName.toLowerCase();\n    const extension = path.extname(file.name);\n    const extensionLower = extension.toLowerCase();\n\n    if (!file.isFile()) {\n      return acc;\n    }\n\n    if (!VALID_EXTENSIONS.includes(extensionLower)) {\n      logWarning(\n        `Config file not loaded, extension must be one of ${VALID_EXTENSIONS.join(',')}): ${\n          file.name\n        }`\n      );\n      return acc;\n    }\n\n    if (RESTRICTED_FILENAMES.includes(baseNameLower)) {\n      logWarning(`Config file not loaded, restricted filename: ${file.name}`);\n\n      // suggest the filename they probably meant\n      if (baseNameLower in MISTAKEN_FILENAMES) {\n        console.log(\n          `Did you mean ${MISTAKEN_FILENAMES[baseNameLower as keyof typeof MISTAKEN_FILENAMES]}]} ?`\n        );\n      }\n\n      return acc;\n    }\n\n    // restricted names and Strapi configs are also restricted from being prefixes\n    const restrictedPrefix = [...RESTRICTED_FILENAMES, ...STRAPI_CONFIG_FILENAMES].find(\n      (restrictedName) =>\n        restrictedName.startsWith(baseNameLower) && restrictedName !== baseNameLower\n    );\n    if (restrictedPrefix) {\n      logWarning(\n        `Config file not loaded, filename cannot start with ${restrictedPrefix}: ${file.name}`\n      );\n    }\n\n    /**\n     *  Note: If user config files contain non-alpha-numeric characters, we won't be able to auto-load env\n     * into them.\n     *\n     * For the initial feature, we will only load our internal configs, but later when we provide a method\n     * to define the shape of custom configs, we will need to warn that those filenames can't be loaded\n     * for technical limitations on env variable names\n     *  */\n    // if (!/^[A-Za-z0-9]+$/.test(baseName)) {\n    //   logWarning(\"Using a non-alphanumeric config file name prevents Strapi from auto-loading it from environment variables.\")\n    // }\n\n    // filter filenames without case-insensitive uniqueness\n    if (seenFilenames.has(baseNameLower)) {\n      logWarning(\n        `Config file not loaded, case-insensitive name matches other config file: ${file.name}`\n      );\n      return acc;\n    }\n    seenFilenames.add(baseNameLower);\n\n    // If file passes all filters, add it to the accumulator\n    acc.push(file);\n    return acc;\n  }, [] as fs.Dirent[]);\n\n  return configFiles.reduce(\n    (acc, file) => {\n      const key = path.basename(file.name, path.extname(file.name));\n\n      acc[key] = loadConfigFile(path.resolve(dir, file.name));\n\n      return acc;\n    },\n    {} as Record<string, unknown>\n  );\n};\n"],"names":[],"mappings":";;;AAIA,MAAM,mBAAmB,CAAC,OAAO,OAAO;AAGxC,MAAM,qBAAqB;AAAA,EACzB,YAAY;AAAA,EACZ,QAAQ;AACV;AAIA,MAAM,uBAAuB;AAAA;AAAA,EAE3B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAAA,EAGA;AAAA,EACA;AAAA;AAAA;AAAA,EAIA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA;AAAA,EAGA,GAAG,OAAO,KAAK,kBAAkB;AACnC;AAGA,MAAM,0BAA0B;AAAA,EAC9B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;AAGA,MAAM,aAAa,CAAC,YAAoB;AACtC,UAAQ,KAAK,OAAO;AACtB;AAEA,MAAe,gBAAA,CAAC,QAAgB;AAC1B,MAAA,CAAC,GAAG,WAAW,GAAG;AAAG,WAAO;AAEhC,QAAM,WAAW,GAAG,YAAY,KAAK,EAAE,eAAe,MAAM;AACtD,QAAA,oCAAoB;AAC1B,QAAM,cAAc,SAAS,OAAO,CAAC,KAAK,SAAS;AAC3C,UAAA,WAAW,KAAK,SAAS,KAAK,MAAM,KAAK,QAAQ,KAAK,IAAI,CAAC;AAC3D,UAAA,gBAAgB,SAAS;AAC/B,UAAM,YAAY,KAAK,QAAQ,KAAK,IAAI;AAClC,UAAA,iBAAiB,UAAU;AAE7B,QAAA,CAAC,KAAK,UAAU;AACX,aAAA;AAAA,IACT;AAEA,QAAI,CAAC,iBAAiB,SAAS,cAAc,GAAG;AAC9C;AAAA,QACE,oDAAoD,iBAAiB,KAAK,GAAG,CAAC,MAC5E,KAAK,IACP;AAAA,MAAA;AAEK,aAAA;AAAA,IACT;AAEI,QAAA,qBAAqB,SAAS,aAAa,GAAG;AACrC,iBAAA,gDAAgD,KAAK,IAAI,EAAE;AAGtE,UAAI,iBAAiB,oBAAoB;AAC/B,gBAAA;AAAA,UACN,gBAAgB,mBAAmB,aAAgD,CAAC;AAAA,QAAA;AAAA,MAExF;AAEO,aAAA;AAAA,IACT;AAGA,UAAM,mBAAmB,CAAC,GAAG,sBAAsB,GAAG,uBAAuB,EAAE;AAAA,MAC7E,CAAC,mBACC,eAAe,WAAW,aAAa,KAAK,mBAAmB;AAAA,IAAA;AAEnE,QAAI,kBAAkB;AACpB;AAAA,QACE,sDAAsD,gBAAgB,KAAK,KAAK,IAAI;AAAA,MAAA;AAAA,IAExF;AAeI,QAAA,cAAc,IAAI,aAAa,GAAG;AACpC;AAAA,QACE,4EAA4E,KAAK,IAAI;AAAA,MAAA;AAEhF,aAAA;AAAA,IACT;AACA,kBAAc,IAAI,aAAa;AAG/B,QAAI,KAAK,IAAI;AACN,WAAA;AAAA,EACT,GAAG,CAAiB,CAAA;AAEpB,SAAO,YAAY;AAAA,IACjB,CAAC,KAAK,SAAS;AACP,YAAA,MAAM,KAAK,SAAS,KAAK,MAAM,KAAK,QAAQ,KAAK,IAAI,CAAC;AAExD,UAAA,GAAG,IAAI,eAAe,KAAK,QAAQ,KAAK,KAAK,IAAI,CAAC;AAE/C,aAAA;AAAA,IACT;AAAA,IACA,CAAC;AAAA,EAAA;AAEL;"}
+{"version":3,"file":"config-loader.mjs","sources":["../../src/configuration/config-loader.ts"],"sourcesContent":["import path from 'path';\nimport fs from 'fs';\nimport { loadConfigFile } from '../utils/load-config-file';\n\nconst VALID_EXTENSIONS = ['.js', '.json'];\n\n// These filenames are restricted, but will also emit a warning that the filename is probably a mistake\nconst MISTAKEN_FILENAMES = {\n  middleware: 'middlewares',\n  plugin: 'plugins',\n};\n\n// the following are restricted to prevent conflicts with existing STRAPI_* env vars or root level config options\n// must all be lowercase to match validator\nconst RESTRICTED_FILENAMES = [\n  // existing env vars\n  'uuid',\n  'hosting',\n  'license',\n  'enforce',\n  'disable',\n  'enable',\n  'telemetry',\n\n  // reserved for future internal use\n  'strapi',\n  'internal',\n\n  // root level config options\n  // TODO: it would be better to move these out of the root config and allow them to be loaded\n  'launchedAt',\n  'serveAdminPanel',\n  'autoReload',\n  'environment',\n  'packageJsonStrapi',\n  'info',\n  'autoReload',\n  'dirs',\n\n  // probably mistaken/typo filenames\n  ...Object.keys(MISTAKEN_FILENAMES),\n];\n\n// Existing Strapi configuration files\nconst STRAPI_CONFIG_FILENAMES = [\n  'admin',\n  'server',\n  'api',\n  'database',\n  'middlewares',\n  'plugins',\n  'features',\n];\n\n// Note: we don't have access to strapi logger at this point so we can't use it\nconst logWarning = (message: string) => {\n  console.warn(message);\n};\n\nexport default (dir: string) => {\n  if (!fs.existsSync(dir)) return {};\n\n  const allFiles = fs.readdirSync(dir, { withFileTypes: true });\n  const seenFilenames = new Set<string>();\n  const configFiles = allFiles.reduce((acc, file) => {\n    const baseName = path.basename(file.name, path.extname(file.name));\n    const baseNameLower = baseName.toLowerCase();\n    const extension = path.extname(file.name);\n    const extensionLower = extension.toLowerCase();\n\n    if (!file.isFile()) {\n      return acc;\n    }\n\n    if (!VALID_EXTENSIONS.includes(extensionLower)) {\n      logWarning(\n        `Config file not loaded, extension must be one of ${VALID_EXTENSIONS.join(',')}): ${\n          file.name\n        }`\n      );\n      return acc;\n    }\n\n    if (RESTRICTED_FILENAMES.includes(baseNameLower)) {\n      logWarning(`Config file not loaded, restricted filename: ${file.name}`);\n\n      // suggest the filename they probably meant\n      if (baseNameLower in MISTAKEN_FILENAMES) {\n        console.log(\n          `Did you mean ${MISTAKEN_FILENAMES[baseNameLower as keyof typeof MISTAKEN_FILENAMES]}]} ?`\n        );\n      }\n\n      return acc;\n    }\n\n    // restricted names and Strapi configs are also restricted from being prefixes\n    const restrictedPrefix = [...RESTRICTED_FILENAMES, ...STRAPI_CONFIG_FILENAMES].find(\n      (restrictedName) =>\n        restrictedName.startsWith(baseNameLower) && restrictedName !== baseNameLower\n    );\n    if (restrictedPrefix) {\n      logWarning(\n        `Config file not loaded, filename cannot start with ${restrictedPrefix}: ${file.name}`\n      );\n    }\n\n    /**\n     *  Note: If user config files contain non-alpha-numeric characters, we won't be able to auto-load env\n     * into them.\n     *\n     * For the initial feature, we will only load our internal configs, but later when we provide a method\n     * to define the shape of custom configs, we will need to warn that those filenames can't be loaded\n     * for technical limitations on env variable names\n     *  */\n    // if (!/^[A-Za-z0-9]+$/.test(baseName)) {\n    //   logWarning(\"Using a non-alphanumeric config file name prevents Strapi from auto-loading it from environment variables.\")\n    // }\n\n    // filter filenames without case-insensitive uniqueness\n    if (seenFilenames.has(baseNameLower)) {\n      logWarning(\n        `Config file not loaded, case-insensitive name matches other config file: ${file.name}`\n      );\n      return acc;\n    }\n    seenFilenames.add(baseNameLower);\n\n    // If file passes all filters, add it to the accumulator\n    acc.push(file);\n    return acc;\n  }, [] as fs.Dirent[]);\n\n  return configFiles.reduce(\n    (acc, file) => {\n      const key = path.basename(file.name, path.extname(file.name));\n\n      acc[key] = loadConfigFile(path.resolve(dir, file.name));\n\n      return acc;\n    },\n    {} as Record<string, unknown>\n  );\n};\n"],"names":["VALID_EXTENSIONS","MISTAKEN_FILENAMES","middleware","plugin","RESTRICTED_FILENAMES","Object","keys","STRAPI_CONFIG_FILENAMES","logWarning","message","console","warn","dir","fs","existsSync","allFiles","readdirSync","withFileTypes","seenFilenames","Set","configFiles","reduce","acc","file","baseName","path","basename","name","extname","baseNameLower","toLowerCase","extension","extensionLower","isFile","includes","join","log","restrictedPrefix","find","restrictedName","startsWith","has","add","push","key","loadConfigFile","resolve"],"mappings":"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"}

package/dist/configuration/get-dirs.js

@@ -1,31 +1,33 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const path = require("path");
-const fp = require("lodash/fp");
-const getDirs = ({ appDir, distDir }, config) => ({
-  dist: {
-    root: distDir,
-    src: path.join(distDir, "src"),
-    api: path.join(distDir, "src", "api"),
-    components: path.join(distDir, "src", "components"),
-    extensions: path.join(distDir, "src", "extensions"),
-    policies: path.join(distDir, "src", "policies"),
-    middlewares: path.join(distDir, "src", "middlewares"),
-    config: path.join(distDir, "config")
-  },
-  app: {
-    root: appDir,
-    src: path.join(appDir, "src"),
-    api: path.join(appDir, "src", "api"),
-    components: path.join(appDir, "src", "components"),
-    extensions: path.join(appDir, "src", "extensions"),
-    policies: path.join(appDir, "src", "policies"),
-    middlewares: path.join(appDir, "src", "middlewares"),
-    config: path.join(appDir, "config")
-  },
-  static: {
-    public: path.resolve(appDir, fp.get("server.dirs.public", config))
-  }
-});
+'use strict';
+
+var path = require('path');
+var fp = require('lodash/fp');
+
+const getDirs = ({ appDir, distDir }, config)=>({
+        dist: {
+            root: distDir,
+            src: path.join(distDir, 'src'),
+            api: path.join(distDir, 'src', 'api'),
+            components: path.join(distDir, 'src', 'components'),
+            extensions: path.join(distDir, 'src', 'extensions'),
+            policies: path.join(distDir, 'src', 'policies'),
+            middlewares: path.join(distDir, 'src', 'middlewares'),
+            config: path.join(distDir, 'config')
+        },
+        app: {
+            root: appDir,
+            src: path.join(appDir, 'src'),
+            api: path.join(appDir, 'src', 'api'),
+            components: path.join(appDir, 'src', 'components'),
+            extensions: path.join(appDir, 'src', 'extensions'),
+            policies: path.join(appDir, 'src', 'policies'),
+            middlewares: path.join(appDir, 'src', 'middlewares'),
+            config: path.join(appDir, 'config')
+        },
+        static: {
+            public: path.resolve(appDir, fp.get('server.dirs.public', config))
+        }
+    });
+
 exports.getDirs = getDirs;
 //# sourceMappingURL=get-dirs.js.map

package/dist/configuration/get-dirs.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-dirs.js","sources":["../../src/configuration/get-dirs.ts"],"sourcesContent":["import { join, resolve } from 'path';\nimport { get } from 'lodash/fp';\n\nimport type { Core } from '@strapi/types';\nimport type { StrapiOptions } from '../Strapi';\n\nexport type Options = {\n  app: string;\n  dist: string;\n};\n\nexport const getDirs = (\n  { appDir, distDir }: StrapiOptions,\n  config: { server: Partial<Core.Config.Server> }\n): Core.StrapiDirectories => ({\n  dist: {\n    root: distDir,\n    src: join(distDir, 'src'),\n    api: join(distDir, 'src', 'api'),\n    components: join(distDir, 'src', 'components'),\n    extensions: join(distDir, 'src', 'extensions'),\n    policies: join(distDir, 'src', 'policies'),\n    middlewares: join(distDir, 'src', 'middlewares'),\n    config: join(distDir, 'config'),\n  },\n  app: {\n    root: appDir,\n    src: join(appDir, 'src'),\n    api: join(appDir, 'src', 'api'),\n    components: join(appDir, 'src', 'components'),\n    extensions: join(appDir, 'src', 'extensions'),\n    policies: join(appDir, 'src', 'policies'),\n    middlewares: join(appDir, 'src', 'middlewares'),\n    config: join(appDir, 'config'),\n  },\n  static: {\n    public: resolve(appDir, get('server.dirs.public', config)),\n  },\n});\n"],"names":["join","resolve","get"],"mappings":";;;;AAWO,MAAM,UAAU,CACrB,EAAE,QAAQ,QAAA,GACV,YAC4B;AAAA,EAC5B,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,KAAKA,KAAAA,KAAK,SAAS,KAAK;AAAA,IACxB,KAAKA,KAAA,KAAK,SAAS,OAAO,KAAK;AAAA,IAC/B,YAAYA,KAAA,KAAK,SAAS,OAAO,YAAY;AAAA,IAC7C,YAAYA,KAAA,KAAK,SAAS,OAAO,YAAY;AAAA,IAC7C,UAAUA,KAAA,KAAK,SAAS,OAAO,UAAU;AAAA,IACzC,aAAaA,KAAA,KAAK,SAAS,OAAO,aAAa;AAAA,IAC/C,QAAQA,KAAAA,KAAK,SAAS,QAAQ;AAAA,EAChC;AAAA,EACA,KAAK;AAAA,IACH,MAAM;AAAA,IACN,KAAKA,KAAAA,KAAK,QAAQ,KAAK;AAAA,IACvB,KAAKA,KAAA,KAAK,QAAQ,OAAO,KAAK;AAAA,IAC9B,YAAYA,KAAA,KAAK,QAAQ,OAAO,YAAY;AAAA,IAC5C,YAAYA,KAAA,KAAK,QAAQ,OAAO,YAAY;AAAA,IAC5C,UAAUA,KAAA,KAAK,QAAQ,OAAO,UAAU;AAAA,IACxC,aAAaA,KAAA,KAAK,QAAQ,OAAO,aAAa;AAAA,IAC9C,QAAQA,KAAAA,KAAK,QAAQ,QAAQ;AAAA,EAC/B;AAAA,EACA,QAAQ;AAAA,IACN,QAAQC,KAAQ,QAAA,QAAQC,GAAI,IAAA,sBAAsB,MAAM,CAAC;AAAA,EAC3D;AACF;;"}
+{"version":3,"file":"get-dirs.js","sources":["../../src/configuration/get-dirs.ts"],"sourcesContent":["import { join, resolve } from 'path';\nimport { get } from 'lodash/fp';\n\nimport type { Core } from '@strapi/types';\nimport type { StrapiOptions } from '../Strapi';\n\nexport type Options = {\n  app: string;\n  dist: string;\n};\n\nexport const getDirs = (\n  { appDir, distDir }: StrapiOptions,\n  config: { server: Partial<Core.Config.Server> }\n): Core.StrapiDirectories => ({\n  dist: {\n    root: distDir,\n    src: join(distDir, 'src'),\n    api: join(distDir, 'src', 'api'),\n    components: join(distDir, 'src', 'components'),\n    extensions: join(distDir, 'src', 'extensions'),\n    policies: join(distDir, 'src', 'policies'),\n    middlewares: join(distDir, 'src', 'middlewares'),\n    config: join(distDir, 'config'),\n  },\n  app: {\n    root: appDir,\n    src: join(appDir, 'src'),\n    api: join(appDir, 'src', 'api'),\n    components: join(appDir, 'src', 'components'),\n    extensions: join(appDir, 'src', 'extensions'),\n    policies: join(appDir, 'src', 'policies'),\n    middlewares: join(appDir, 'src', 'middlewares'),\n    config: join(appDir, 'config'),\n  },\n  static: {\n    public: resolve(appDir, get('server.dirs.public', config)),\n  },\n});\n"],"names":["getDirs","appDir","distDir","config","dist","root","src","join","api","components","extensions","policies","middlewares","app","static","public","resolve","get"],"mappings":";;;;;AAWO,MAAMA,OAAU,GAAA,CACrB,EAAEC,MAAM,EAAEC,OAAO,EAAiB,EAClCC,MAAAA,IAC4B;QAC5BC,IAAM,EAAA;YACJC,IAAMH,EAAAA,OAAAA;AACNI,YAAAA,GAAAA,EAAKC,UAAKL,OAAS,EAAA,KAAA,CAAA;YACnBM,GAAKD,EAAAA,SAAAA,CAAKL,SAAS,KAAO,EAAA,KAAA,CAAA;YAC1BO,UAAYF,EAAAA,SAAAA,CAAKL,SAAS,KAAO,EAAA,YAAA,CAAA;YACjCQ,UAAYH,EAAAA,SAAAA,CAAKL,SAAS,KAAO,EAAA,YAAA,CAAA;YACjCS,QAAUJ,EAAAA,SAAAA,CAAKL,SAAS,KAAO,EAAA,UAAA,CAAA;YAC/BU,WAAaL,EAAAA,SAAAA,CAAKL,SAAS,KAAO,EAAA,aAAA,CAAA;AAClCC,YAAAA,MAAAA,EAAQI,UAAKL,OAAS,EAAA,QAAA;AACxB,SAAA;QACAW,GAAK,EAAA;YACHR,IAAMJ,EAAAA,MAAAA;AACNK,YAAAA,GAAAA,EAAKC,UAAKN,MAAQ,EAAA,KAAA,CAAA;YAClBO,GAAKD,EAAAA,SAAAA,CAAKN,QAAQ,KAAO,EAAA,KAAA,CAAA;YACzBQ,UAAYF,EAAAA,SAAAA,CAAKN,QAAQ,KAAO,EAAA,YAAA,CAAA;YAChCS,UAAYH,EAAAA,SAAAA,CAAKN,QAAQ,KAAO,EAAA,YAAA,CAAA;YAChCU,QAAUJ,EAAAA,SAAAA,CAAKN,QAAQ,KAAO,EAAA,UAAA,CAAA;YAC9BW,WAAaL,EAAAA,SAAAA,CAAKN,QAAQ,KAAO,EAAA,aAAA,CAAA;AACjCE,YAAAA,MAAAA,EAAQI,UAAKN,MAAQ,EAAA,QAAA;AACvB,SAAA;QACAa,MAAQ,EAAA;YACNC,MAAQC,EAAAA,YAAAA,CAAQf,MAAQgB,EAAAA,MAAAA,CAAI,oBAAsBd,EAAAA,MAAAA,CAAAA;AACpD;AACF,KAAA;;;;"}

package/dist/configuration/get-dirs.mjs

@@ -1,31 +1,31 @@
-import { join, resolve } from "path";
-import { get } from "lodash/fp";
-const getDirs = ({ appDir, distDir }, config) => ({
-  dist: {
-    root: distDir,
-    src: join(distDir, "src"),
-    api: join(distDir, "src", "api"),
-    components: join(distDir, "src", "components"),
-    extensions: join(distDir, "src", "extensions"),
-    policies: join(distDir, "src", "policies"),
-    middlewares: join(distDir, "src", "middlewares"),
-    config: join(distDir, "config")
-  },
-  app: {
-    root: appDir,
-    src: join(appDir, "src"),
-    api: join(appDir, "src", "api"),
-    components: join(appDir, "src", "components"),
-    extensions: join(appDir, "src", "extensions"),
-    policies: join(appDir, "src", "policies"),
-    middlewares: join(appDir, "src", "middlewares"),
-    config: join(appDir, "config")
-  },
-  static: {
-    public: resolve(appDir, get("server.dirs.public", config))
-  }
-});
-export {
-  getDirs
-};
+import { join, resolve } from 'path';
+import { get } from 'lodash/fp';
+
+const getDirs = ({ appDir, distDir }, config)=>({
+        dist: {
+            root: distDir,
+            src: join(distDir, 'src'),
+            api: join(distDir, 'src', 'api'),
+            components: join(distDir, 'src', 'components'),
+            extensions: join(distDir, 'src', 'extensions'),
+            policies: join(distDir, 'src', 'policies'),
+            middlewares: join(distDir, 'src', 'middlewares'),
+            config: join(distDir, 'config')
+        },
+        app: {
+            root: appDir,
+            src: join(appDir, 'src'),
+            api: join(appDir, 'src', 'api'),
+            components: join(appDir, 'src', 'components'),
+            extensions: join(appDir, 'src', 'extensions'),
+            policies: join(appDir, 'src', 'policies'),
+            middlewares: join(appDir, 'src', 'middlewares'),
+            config: join(appDir, 'config')
+        },
+        static: {
+            public: resolve(appDir, get('server.dirs.public', config))
+        }
+    });
+
+export { getDirs };
 //# sourceMappingURL=get-dirs.mjs.map

package/dist/configuration/get-dirs.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"get-dirs.mjs","sources":["../../src/configuration/get-dirs.ts"],"sourcesContent":["import { join, resolve } from 'path';\nimport { get } from 'lodash/fp';\n\nimport type { Core } from '@strapi/types';\nimport type { StrapiOptions } from '../Strapi';\n\nexport type Options = {\n  app: string;\n  dist: string;\n};\n\nexport const getDirs = (\n  { appDir, distDir }: StrapiOptions,\n  config: { server: Partial<Core.Config.Server> }\n): Core.StrapiDirectories => ({\n  dist: {\n    root: distDir,\n    src: join(distDir, 'src'),\n    api: join(distDir, 'src', 'api'),\n    components: join(distDir, 'src', 'components'),\n    extensions: join(distDir, 'src', 'extensions'),\n    policies: join(distDir, 'src', 'policies'),\n    middlewares: join(distDir, 'src', 'middlewares'),\n    config: join(distDir, 'config'),\n  },\n  app: {\n    root: appDir,\n    src: join(appDir, 'src'),\n    api: join(appDir, 'src', 'api'),\n    components: join(appDir, 'src', 'components'),\n    extensions: join(appDir, 'src', 'extensions'),\n    policies: join(appDir, 'src', 'policies'),\n    middlewares: join(appDir, 'src', 'middlewares'),\n    config: join(appDir, 'config'),\n  },\n  static: {\n    public: resolve(appDir, get('server.dirs.public', config)),\n  },\n});\n"],"names":[],"mappings":";;AAWO,MAAM,UAAU,CACrB,EAAE,QAAQ,QAAA,GACV,YAC4B;AAAA,EAC5B,MAAM;AAAA,IACJ,MAAM;AAAA,IACN,KAAK,KAAK,SAAS,KAAK;AAAA,IACxB,KAAK,KAAK,SAAS,OAAO,KAAK;AAAA,IAC/B,YAAY,KAAK,SAAS,OAAO,YAAY;AAAA,IAC7C,YAAY,KAAK,SAAS,OAAO,YAAY;AAAA,IAC7C,UAAU,KAAK,SAAS,OAAO,UAAU;AAAA,IACzC,aAAa,KAAK,SAAS,OAAO,aAAa;AAAA,IAC/C,QAAQ,KAAK,SAAS,QAAQ;AAAA,EAChC;AAAA,EACA,KAAK;AAAA,IACH,MAAM;AAAA,IACN,KAAK,KAAK,QAAQ,KAAK;AAAA,IACvB,KAAK,KAAK,QAAQ,OAAO,KAAK;AAAA,IAC9B,YAAY,KAAK,QAAQ,OAAO,YAAY;AAAA,IAC5C,YAAY,KAAK,QAAQ,OAAO,YAAY;AAAA,IAC5C,UAAU,KAAK,QAAQ,OAAO,UAAU;AAAA,IACxC,aAAa,KAAK,QAAQ,OAAO,aAAa;AAAA,IAC9C,QAAQ,KAAK,QAAQ,QAAQ;AAAA,EAC/B;AAAA,EACA,QAAQ;AAAA,IACN,QAAQ,QAAQ,QAAQ,IAAI,sBAAsB,MAAM,CAAC;AAAA,EAC3D;AACF;"}
+{"version":3,"file":"get-dirs.mjs","sources":["../../src/configuration/get-dirs.ts"],"sourcesContent":["import { join, resolve } from 'path';\nimport { get } from 'lodash/fp';\n\nimport type { Core } from '@strapi/types';\nimport type { StrapiOptions } from '../Strapi';\n\nexport type Options = {\n  app: string;\n  dist: string;\n};\n\nexport const getDirs = (\n  { appDir, distDir }: StrapiOptions,\n  config: { server: Partial<Core.Config.Server> }\n): Core.StrapiDirectories => ({\n  dist: {\n    root: distDir,\n    src: join(distDir, 'src'),\n    api: join(distDir, 'src', 'api'),\n    components: join(distDir, 'src', 'components'),\n    extensions: join(distDir, 'src', 'extensions'),\n    policies: join(distDir, 'src', 'policies'),\n    middlewares: join(distDir, 'src', 'middlewares'),\n    config: join(distDir, 'config'),\n  },\n  app: {\n    root: appDir,\n    src: join(appDir, 'src'),\n    api: join(appDir, 'src', 'api'),\n    components: join(appDir, 'src', 'components'),\n    extensions: join(appDir, 'src', 'extensions'),\n    policies: join(appDir, 'src', 'policies'),\n    middlewares: join(appDir, 'src', 'middlewares'),\n    config: join(appDir, 'config'),\n  },\n  static: {\n    public: resolve(appDir, get('server.dirs.public', config)),\n  },\n});\n"],"names":["getDirs","appDir","distDir","config","dist","root","src","join","api","components","extensions","policies","middlewares","app","static","public","resolve","get"],"mappings":";;;AAWO,MAAMA,OAAU,GAAA,CACrB,EAAEC,MAAM,EAAEC,OAAO,EAAiB,EAClCC,MAAAA,IAC4B;QAC5BC,IAAM,EAAA;YACJC,IAAMH,EAAAA,OAAAA;AACNI,YAAAA,GAAAA,EAAKC,KAAKL,OAAS,EAAA,KAAA,CAAA;YACnBM,GAAKD,EAAAA,IAAAA,CAAKL,SAAS,KAAO,EAAA,KAAA,CAAA;YAC1BO,UAAYF,EAAAA,IAAAA,CAAKL,SAAS,KAAO,EAAA,YAAA,CAAA;YACjCQ,UAAYH,EAAAA,IAAAA,CAAKL,SAAS,KAAO,EAAA,YAAA,CAAA;YACjCS,QAAUJ,EAAAA,IAAAA,CAAKL,SAAS,KAAO,EAAA,UAAA,CAAA;YAC/BU,WAAaL,EAAAA,IAAAA,CAAKL,SAAS,KAAO,EAAA,aAAA,CAAA;AAClCC,YAAAA,MAAAA,EAAQI,KAAKL,OAAS,EAAA,QAAA;AACxB,SAAA;QACAW,GAAK,EAAA;YACHR,IAAMJ,EAAAA,MAAAA;AACNK,YAAAA,GAAAA,EAAKC,KAAKN,MAAQ,EAAA,KAAA,CAAA;YAClBO,GAAKD,EAAAA,IAAAA,CAAKN,QAAQ,KAAO,EAAA,KAAA,CAAA;YACzBQ,UAAYF,EAAAA,IAAAA,CAAKN,QAAQ,KAAO,EAAA,YAAA,CAAA;YAChCS,UAAYH,EAAAA,IAAAA,CAAKN,QAAQ,KAAO,EAAA,YAAA,CAAA;YAChCU,QAAUJ,EAAAA,IAAAA,CAAKN,QAAQ,KAAO,EAAA,UAAA,CAAA;YAC9BW,WAAaL,EAAAA,IAAAA,CAAKN,QAAQ,KAAO,EAAA,aAAA,CAAA;AACjCE,YAAAA,MAAAA,EAAQI,KAAKN,MAAQ,EAAA,QAAA;AACvB,SAAA;QACAa,MAAQ,EAAA;YACNC,MAAQC,EAAAA,OAAAA,CAAQf,MAAQgB,EAAAA,GAAAA,CAAI,oBAAsBd,EAAAA,MAAAA,CAAAA;AACpD;AACF,KAAA;;;;"}

package/dist/configuration/index.d.ts

@@ -5,6 +5,7 @@ export declare const loadConfiguration: (opts: StrapiOptions) => {
     autoReload: boolean;
     environment: string | undefined;
     uuid: any;
+    installId: any;
     packageJsonStrapi: Pick<any, string | number | symbol>;
     info: any;
     admin: {

package/dist/configuration/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/configuration/index.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AASvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAsC/C,eAAO,MAAM,iBAAiB,SAAU,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wEAwCpD,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/configuration/index.ts"],"names":[],"mappings":"AAGA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAUvB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAqC/C,eAAO,MAAM,iBAAiB,SAAU,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wEAkDpD,CAAC"}

package/dist/configuration/index.js

@@ -1,80 +1,92 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const os = require("os");
-const path = require("path");
-const _ = require("lodash");
-const fp = require("lodash/fp");
-const dotenv = require("dotenv");
-const urls = require("./urls.js");
-const configLoader = require("./config-loader.js");
-const getDirs = require("./get-dirs.js");
-const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
-const os__default = /* @__PURE__ */ _interopDefault(os);
-const path__default = /* @__PURE__ */ _interopDefault(path);
-const ___default = /* @__PURE__ */ _interopDefault(_);
-const dotenv__default = /* @__PURE__ */ _interopDefault(dotenv);
-dotenv__default.default.config({ path: process.env.ENV_PATH });
-process.env.NODE_ENV = process.env.NODE_ENV || "development";
-const { version: strapiVersion } = require(path__default.default.join(__dirname, "../../package.json"));
+'use strict';
+
+var os = require('os');
+var path = require('path');
+var _ = require('lodash');
+var fp = require('lodash/fp');
+var dotenv = require('dotenv');
+var strapiUtils = require('@strapi/utils');
+var urls = require('./urls.js');
+var configLoader = require('./config-loader.js');
+var getDirs = require('./get-dirs.js');
+var _package = require('../package.json.js');
+
+dotenv.config({
+    path: process.env.ENV_PATH
+});
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 const defaultConfig = {
-  server: {
-    host: process.env.HOST || os__default.default.hostname() || "localhost",
-    port: Number(process.env.PORT) || 1337,
-    proxy: false,
-    cron: { enabled: false },
-    admin: { autoOpen: false },
-    dirs: { public: "./public" },
-    transfer: {
-      remote: {
-        enabled: true
-      }
+    server: {
+        host: process.env.HOST || os.hostname() || 'localhost',
+        port: Number(process.env.PORT) || 1337,
+        proxy: false,
+        cron: {
+            enabled: false
+        },
+        admin: {
+            autoOpen: false
+        },
+        dirs: {
+            public: './public'
+        },
+        transfer: {
+            remote: {
+                enabled: true
+            }
+        },
+        logger: {
+            updates: {
+                enabled: true
+            },
+            startup: {
+                enabled: true
+            }
+        }
     },
-    logger: {
-      updates: {
-        enabled: true
-      },
-      startup: {
-        enabled: true
-      }
+    admin: {},
+    api: {
+        rest: {
+            prefix: '/api'
+        }
     }
-  },
-  admin: {},
-  api: {
-    rest: {
-      prefix: "/api"
-    }
-  }
 };
-const loadConfiguration = (opts) => {
-  const { appDir, distDir, autoReload = false, serveAdminPanel = true } = opts;
-  const pkgJSON = require(path__default.default.resolve(appDir, "package.json"));
-  const configDir = path__default.default.resolve(distDir || process.cwd(), "config");
-  const rootConfig = {
-    launchedAt: Date.now(),
-    autoReload,
-    environment: process.env.NODE_ENV,
-    uuid: ___default.default.get(pkgJSON, "strapi.uuid"),
-    packageJsonStrapi: ___default.default.omit(___default.default.get(pkgJSON, "strapi", {}), "uuid"),
-    info: {
-      ...pkgJSON,
-      strapi: strapiVersion
-    },
-    admin: {
-      serveAdminPanel
-    }
-  };
-  const baseConfig = fp.omit("plugins", configLoader(configDir));
-  const envDir = path__default.default.resolve(configDir, "env", process.env.NODE_ENV);
-  const envConfig = configLoader(envDir);
-  const config = ___default.default.merge(rootConfig, defaultConfig, baseConfig, envConfig);
-  const { serverUrl, adminUrl, adminPath } = urls.getConfigUrls(config);
-  ___default.default.set(config, "server.url", serverUrl);
-  ___default.default.set(config, "server.absoluteUrl", urls.getAbsoluteServerUrl(config));
-  ___default.default.set(config, "admin.url", adminUrl);
-  ___default.default.set(config, "admin.path", adminPath);
-  ___default.default.set(config, "admin.absoluteUrl", urls.getAbsoluteAdminUrl(config));
-  ___default.default.set(config, "dirs", getDirs.getDirs(opts, config));
-  return config;
+const loadConfiguration = (opts)=>{
+    const { appDir, distDir, autoReload = false, serveAdminPanel = true } = opts;
+    const pkgJSON = require(path.resolve(appDir, 'package.json'));
+    const configDir = path.resolve(distDir || process.cwd(), 'config');
+    const rootConfig = {
+        launchedAt: Date.now(),
+        autoReload,
+        environment: process.env.NODE_ENV,
+        uuid: _.get(pkgJSON, 'strapi.uuid'),
+        installId: _.get(pkgJSON, 'strapi.installId'),
+        packageJsonStrapi: _.omit(_.get(pkgJSON, 'strapi', {}), 'uuid'),
+        info: {
+            ...pkgJSON,
+            strapi: _package.version
+        },
+        admin: {
+            serveAdminPanel
+        }
+    };
+    // See packages/core/core/src/domain/module/index.ts for plugin config loading
+    const baseConfig = fp.omit('plugins', configLoader(configDir)); // plugin config will be loaded later
+    const envDir = path.resolve(configDir, 'env', process.env.NODE_ENV);
+    const envConfig = configLoader(envDir);
+    const config = _.merge(rootConfig, defaultConfig, baseConfig, envConfig);
+    const { serverUrl, adminUrl } = urls.getConfigUrls(config);
+    const serverAbsoluteUrl = urls.getAbsoluteServerUrl(config);
+    const adminAbsoluteUrl = urls.getAbsoluteAdminUrl(config);
+    const sameOrigin = new URL(adminAbsoluteUrl).origin === new URL(serverAbsoluteUrl).origin;
+    const adminPath = sameOrigin ? adminUrl.replace(strapiUtils.strings.getCommonPath(serverUrl, adminUrl), '') : new URL(adminUrl).pathname;
+    _.set(config, 'server.url', serverUrl);
+    _.set(config, 'server.absoluteUrl', serverAbsoluteUrl);
+    _.set(config, 'admin.url', adminUrl);
+    _.set(config, 'admin.path', adminPath);
+    _.set(config, 'admin.absoluteUrl', adminAbsoluteUrl);
+    _.set(config, 'dirs', getDirs.getDirs(opts, config));
+    return config;
 };
+
 exports.loadConfiguration = loadConfiguration;
 //# sourceMappingURL=index.js.map