@strapi/strapi 4.0.0-next.6 → 4.0.0

package/package.json

@@ -1,100 +1,7 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.0.0-next.6",
+  "version": "4.0.0",
   "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",
-  "homepage": "https://strapi.io",
-  "directories": {
-    "lib": "./lib",
-    "bin": "./bin"
-  },
-  "main": "./lib",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
-  "dependencies": {
-    "@koa/cors": "^3.0.0",
-    "@strapi/admin": "4.0.0-next.6",
-    "@strapi/database": "4.0.0-next.6",
-    "@strapi/generate": "4.0.0-next.6",
-    "@strapi/generate-api": "4.0.0-next.6",
-    "@strapi/generate-controller": "4.0.0-next.6",
-    "@strapi/generate-model": "4.0.0-next.6",
-    "@strapi/generate-new": "4.0.0-next.6",
-    "@strapi/generate-plugin": "4.0.0-next.6",
-    "@strapi/generate-policy": "4.0.0-next.6",
-    "@strapi/generate-service": "4.0.0-next.6",
-    "@strapi/logger": "4.0.0-next.6",
-    "@strapi/utils": "4.0.0-next.6",
-    "async": "^2.1.2",
-    "boom": "^7.3.0",
-    "boxen": "4.2.0",
-    "chalk": "^4.1.1",
-    "chokidar": "3.5.1",
-    "ci-info": "3.1.1",
-    "cli-table3": "^0.6.0",
-    "commander": "6.1.0",
-    "configstore": "5.0.1",
-    "cross-spawn": "^7.0.3",
-    "debug": "^4.1.1",
-    "delegates": "^1.0.0",
-    "dotenv": "8.2.0",
-    "execa": "^1.0.0",
-    "fs-extra": "^9.1.0",
-    "glob": "^7.1.2",
-    "inquirer": "^6.2.1",
-    "is-docker": "2.2.1",
-    "koa": "^2.13.1",
-    "koa-body": "^4.2.0",
-    "koa-compose": "^4.1.0",
-    "koa-compress": "^5.0.1",
-    "koa-convert": "^2.0.0",
-    "koa-favicon": "^2.0.0",
-    "koa-helmet": "6.1.0",
-    "koa-i18n": "^2.1.0",
-    "koa-ip": "^2.0.0",
-    "koa-locale": "~1.3.0",
-    "koa-router": "^7.4.0",
-    "koa-session": "^6.2.0",
-    "koa-static": "^5.0.0",
-    "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
-    "node-machine-id": "1.1.12",
-    "node-schedule": "1.3.2",
-    "open": "8.2.1",
-    "ora": "^5.4.0",
-    "package-json": "6.5.0",
-    "qs": "^6.10.1",
-    "resolve-cwd": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "semver": "7.3.5"
-  },
-  "scripts": {
-    "postinstall": "node lib/utils/success.js"
-  },
-  "author": {
-    "email": "hi@strapi.io",
-    "name": "Strapi team",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
-  "bugs": {
-    "url": "https://github.com/strapi/strapi/issues"
-  },
-  "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
-  },
-  "license": "SEE LICENSE IN LICENSE",
   "keywords": [
     "strapi",
     "cms",
@@ -131,11 +38,101 @@
     "backend",
     "open source",
     "self hosted",
-    "javascript",
     "lerna",
     "lernajs",
     "react",
     "reactjs"
   ],
-  "gitHead": "f528a865cb9c4234f2cda4f0df5b40e7c427ff9a"
+  "homepage": "https://strapi.io",
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
+  "main": "./lib",
+  "types": "./lib/index.d.ts",
+  "bin": {
+    "strapi": "./bin/strapi.js"
+  },
+  "directories": {
+    "lib": "./lib",
+    "bin": "./bin"
+  },
+  "scripts": {
+    "postinstall": "node lib/utils/success.js"
+  },
+  "dependencies": {
+    "@koa/cors": "3.1.0",
+    "@koa/router": "10.1.1",
+    "@strapi/admin": "4.0.0",
+    "@strapi/database": "4.0.0",
+    "@strapi/generate-new": "4.0.0",
+    "@strapi/generators": "4.0.0",
+    "@strapi/logger": "4.0.0",
+    "@strapi/plugin-content-manager": "4.0.0",
+    "@strapi/plugin-content-type-builder": "4.0.0",
+    "@strapi/plugin-email": "4.0.0",
+    "@strapi/plugin-upload": "4.0.0",
+    "@strapi/utils": "4.0.0",
+    "bcryptjs": "2.4.3",
+    "boxen": "5.1.2",
+    "chalk": "4.1.2",
+    "chokidar": "3.5.2",
+    "ci-info": "3.2.0",
+    "cli-table3": "0.6.0",
+    "commander": "8.2.0",
+    "configstore": "5.0.1",
+    "debug": "4.3.2",
+    "delegates": "1.0.0",
+    "dotenv": "10.0.0",
+    "execa": "5.1.1",
+    "fs-extra": "10.0.0",
+    "glob": "7.2.0",
+    "http-errors": "1.8.0",
+    "inquirer": "8.2.0",
+    "is-docker": "2.2.1",
+    "koa": "2.13.3",
+    "koa-body": "4.2.0",
+    "koa-compose": "4.1.0",
+    "koa-compress": "5.1.0",
+    "koa-favicon": "2.1.0",
+    "koa-helmet": "6.1.0",
+    "koa-ip": "2.1.0",
+    "koa-session": "6.2.0",
+    "koa-static": "5.0.0",
+    "lodash": "4.17.21",
+    "node-fetch": "2.6.5",
+    "node-machine-id": "1.1.12",
+    "node-schedule": "2.0.0",
+    "open": "8.2.1",
+    "ora": "5.4.1",
+    "package-json": "7.0.0",
+    "qs": "6.10.1",
+    "resolve-cwd": "3.0.0",
+    "semver": "7.3.5",
+    "statuses": "2.0.1"
+  },
+  "devDependencies": {
+    "supertest": "^6.1.6"
+  },
+  "engines": {
+    "node": ">=12.x.x <=16.x.x",
+    "npm": ">=6.0.0"
+  },
+  "gitHead": "b181702f0202b2c6d645d42b195a831f25cd0b03"
 }

package/lib/commands/generate.js

@@ -1,76 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-// FIXME
-/* eslint-disable import/extensions */
-
-// Node.js core.
-const path = require('path');
-
-// Master of ceremonies for generators.
-const generate = require('@strapi/generate');
-
-// Logger.
-const { createLogger } = require('@strapi/logger');
-
-// Configuration
-const loadConfiguration = require('../core/app-configuration');
-
-// Local Strapi dependencies.
-const packageJSON = require('../../package.json');
-
-/**
- * `$ strapi generate`
- *
- * Scaffolding for the application in our working directory.
- */
-
-module.exports = function(id, cliArguments) {
-  const dir = process.cwd();
-  const config = loadConfiguration(dir);
-  const logger = createLogger(config.get('logger', {}));
-
-  // Build initial scope.
-  const scope = {
-    rootPath: process.cwd(),
-    strapiRoot: path.resolve(__dirname, '..'),
-    id: id,
-    args: cliArguments,
-    strapiPackageJSON: packageJSON,
-  };
-
-  scope.generatorType = process.argv[2].split(':')[1];
-
-  // Show usage if no generator type is defined.
-  if (!scope.generatorType) {
-    return logger.error('Write `$ strapi generate:something` instead.');
-  }
-
-  return generate(scope, {
-    // Log and exit the REPL in case there is an error
-    // while we were trying to generate the requested generator.
-    error(msg) {
-      logger.error(msg);
-      process.exit(1);
-    },
-
-    // Log and exit the REPL in case of success
-    // but first make sure we have all the info we need.
-    success() {
-      if (!scope.outputPath && scope.filename && scope.destDir) {
-        scope.outputPath = scope.destDir + scope.filename;
-      }
-
-      if (scope.generatorType !== 'new') {
-        logger.info(
-          `Generated a new ${scope.generatorType} \`${scope.name}\` at \`${scope.filePath}\`.`
-        );
-      }
-
-      process.exit(0);
-    },
-  });
-};

package/lib/core/index.js

@@ -1,17 +0,0 @@
-'use strict';
-
-const loadApis = require('./load-apis');
-const loadPlugins = require('./load-plugins');
-const loadMiddlewares = require('./load-middlewares');
-const loadExtensions = require('./load-extensions');
-const bootstrap = require('./bootstrap');
-const loadComponents = require('./load-components');
-
-module.exports = {
-  loadApis,
-  loadPlugins,
-  loadMiddlewares,
-  loadExtensions,
-  loadComponents,
-  bootstrap,
-};

package/lib/core/load-apis.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const { existsSync } = require('fs-extra');
-const _ = require('lodash');
-const loadFiles = require('../load/load-files');
-const loadConfig = require('../load/load-config-files');
-
-module.exports = async ({ dir }) => {
-  const apiDir = join(dir, 'api');
-
-  if (!existsSync(apiDir)) {
-    throw new Error(`Missing api folder. Please create one in your app root directory`);
-  }
-
-  const apis = await loadFiles(apiDir, '*/!(config)/**/*.*(js|json)');
-  const apiConfigs = await loadConfig(apiDir, '*/config/**/*.*(js|json)');
-
-  return _.merge(apis, apiConfigs);
-};

package/lib/core/load-extensions.js

@@ -1,71 +0,0 @@
-'use strict';
-
-const path = require('path');
-const { existsSync } = require('fs-extra');
-const fse = require('fs-extra');
-const _ = require('lodash');
-const loadConfig = require('../load/load-config-files');
-const loadFiles = require('../load/load-files');
-const glob = require('../load/glob');
-const filePathToPath = require('../load/filepath-to-prop-path');
-
-/**
- * Loads the extensions folder
- */
-module.exports = async function({ appPath }) {
-  const extensionsDir = path.resolve(appPath, 'extensions');
-
-  if (!existsSync(extensionsDir)) {
-    throw new Error(`Missing extensions folder. Please create one in your app root directory`);
-  }
-
-  const configs = await loadConfig(extensionsDir, '*/config/**/*.+(js|json)');
-  const controllersAndServices = await loadFiles(
-    extensionsDir,
-    '*/{controllers,services}/*.+(js|json)'
-  );
-
-  const overwrites = await loadOverwrites(extensionsDir);
-
-  return {
-    overwrites,
-    merges: _.merge({}, configs, controllersAndServices),
-  };
-};
-
-const OVERWRITABLE_FOLDERS_GLOB = 'models';
-// returns a list of path and module to overwrite
-const loadOverwrites = async extensionsDir => {
-  const files = await glob(`*/${OVERWRITABLE_FOLDERS_GLOB}/*.*(js|json)`, {
-    cwd: extensionsDir,
-  });
-
-  const overwrites = {};
-  files.forEach(file => {
-    const absolutePath = path.resolve(extensionsDir, file);
-
-    // load module
-    delete require.cache[absolutePath];
-    let mod;
-
-    if (path.extname(absolutePath) === '.json') {
-      mod = fse.readJsonSync(absolutePath);
-    } else {
-      mod = require(absolutePath);
-    }
-
-    const propPath = filePathToPath(file);
-    const strPath = propPath.join('.');
-
-    if (overwrites[strPath]) {
-      _.merge(overwrites[strPath], mod);
-    } else {
-      overwrites[strPath] = mod;
-    }
-  });
-
-  return Object.keys(overwrites).map(strPath => ({
-    path: strPath.split('.'),
-    mod: overwrites[strPath],
-  }));
-};

package/lib/core/load-functions.js

@@ -1,21 +0,0 @@
-'use strict';
-
-const fse = require('fs-extra');
-
-const walk = require('./walk');
-
-const loadFunctions = dir => {
-  if (!fse.existsSync(dir)) return {};
-
-  return walk(dir, { loader: loadFunction });
-};
-
-const loadFunction = file => {
-  try {
-    return require(file);
-  } catch (error) {
-    throw `Could not load function ${file}: ${error.message}`;
-  }
-};
-
-module.exports = loadFunctions;

package/lib/core/load-middlewares.js

@@ -1,130 +0,0 @@
-'use strict';
-
-// Dependencies.
-const path = require('path');
-const fs = require('fs-extra');
-const _ = require('lodash');
-const glob = require('../load/glob');
-const findPackagePath = require('../load/package-path');
-
-/**
- * Load middlewares
- */
-module.exports = async function(strapi) {
-  const { installedMiddlewares, installedPlugins, appPath } = strapi.config;
-
-  let middlewares = {};
-
-  const loaders = createLoaders(strapi);
-
-  await loaders.loadMiddlewareDependencies(installedMiddlewares, middlewares);
-  // internal middlewares
-  await loaders.loadInternalMiddlewares(middlewares);
-  // local middleware
-  await loaders.loadLocalMiddlewares(appPath, middlewares);
-  // plugins middlewares
-  await loaders.loadPluginsMiddlewares(installedPlugins, middlewares);
-  // local plugin middlewares
-  await loaders.loadLocalPluginsMiddlewares(appPath, middlewares);
-  // load admin middlwares
-  await loaders.loadAdminMiddlewares(middlewares);
-
-  return middlewares;
-};
-
-/**
- * Build loader functions
- * @param {*} strapi - strapi instance
- */
-const createLoaders = strapi => {
-  const loadMiddlewaresInDir = async (dir, middlewares) => {
-    const files = await glob('*/*(index|defaults).*(js|json)', {
-      cwd: dir,
-    });
-
-    files.forEach(f => {
-      const name = f.split('/')[0];
-      mountMiddleware(name, [path.resolve(dir, f)], middlewares);
-    });
-  };
-
-  const loadInternalMiddlewares = middlewares =>
-    loadMiddlewaresInDir(path.resolve(__dirname, '..', 'middlewares'), middlewares);
-
-  const loadLocalMiddlewares = (appPath, middlewares) =>
-    loadMiddlewaresInDir(path.resolve(appPath, 'middlewares'), middlewares);
-
-  const loadPluginsMiddlewares = async (plugins, middlewares) => {
-    for (let pluginName of plugins) {
-      const dir = path.resolve(findPackagePath(`@strapi/plugin-${pluginName}`), 'middlewares');
-      await loadMiddlewaresInDir(dir, middlewares);
-    }
-  };
-
-  const loadLocalPluginsMiddlewares = async (appPath, middlewares) => {
-    const pluginsDir = path.resolve(appPath, 'plugins');
-    if (!fs.existsSync(pluginsDir)) return;
-
-    const pluginsNames = await fs.readdir(pluginsDir);
-
-    for (let pluginFolder of pluginsNames) {
-      // ignore files
-      const stat = await fs.stat(path.resolve(pluginsDir, pluginFolder));
-      if (!stat.isDirectory()) continue;
-
-      const dir = path.resolve(pluginsDir, pluginFolder, 'middlewares');
-      await loadMiddlewaresInDir(dir, middlewares);
-    }
-  };
-
-  const loadAdminMiddlewares = async middlewares => {
-    const middlewaresDir = 'middlewares';
-    const dir = path.resolve(findPackagePath(`@strapi/admin`), middlewaresDir);
-    await loadMiddlewaresInDir(dir, middlewares);
-
-    // load ee admin middlewares if they exist
-    if (process.env.STRAPI_DISABLE_EE !== 'true' && strapi.EE) {
-      await loadMiddlewaresInDir(`${dir}/../ee/${middlewaresDir}`, middlewares);
-    }
-  };
-
-  const loadMiddlewareDependencies = async (packages, middlewares) => {
-    for (let packageName of packages) {
-      const baseDir = path.dirname(require.resolve(`@strapi/middleware-${packageName}`));
-      const files = await glob('*(index|defaults).*(js|json)', {
-        cwd: baseDir,
-        absolute: true,
-      });
-
-      mountMiddleware(packageName, files, middlewares);
-    }
-  };
-
-  const mountMiddleware = (name, files, middlewares) => {
-    files.forEach(file => {
-      middlewares[name] = middlewares[name] || { loaded: false };
-
-      if (_.endsWith(file, 'index.js') && !middlewares[name].load) {
-        return Object.defineProperty(middlewares[name], 'load', {
-          configurable: false,
-          enumerable: true,
-          get: () => require(file)(strapi),
-        });
-      }
-
-      if (_.endsWith(file, 'defaults.json')) {
-        middlewares[name].defaults = require(file);
-        return;
-      }
-    });
-  };
-
-  return {
-    loadInternalMiddlewares,
-    loadLocalMiddlewares,
-    loadPluginsMiddlewares,
-    loadLocalPluginsMiddlewares,
-    loadMiddlewareDependencies,
-    loadAdminMiddlewares,
-  };
-};

package/lib/core/load-modules.js

@@ -1,55 +0,0 @@
-/**
- * Load Modules is the root module loader.
- * This is where all the strapi enviornment is laoded
- * - APIs
- * - Plugins
- * - Hooks
- * - Middlewres
- * - Components
- * - ContentTypes
- */
-'use strict';
-
-const _ = require('lodash');
-
-const loadApis = require('./load-apis');
-const loadPlugins = require('./load-plugins');
-const loadMiddlewares = require('./load-middlewares');
-const loadExtensions = require('./load-extensions');
-const loadComponents = require('./load-components');
-
-module.exports = async strapi => {
-  const [api, plugins, middlewares, extensions, components] = await Promise.all([
-    loadApis(strapi),
-    loadPlugins(strapi),
-    loadMiddlewares(strapi),
-    loadExtensions(strapi.config),
-    loadComponents(strapi),
-  ]);
-
-  // TODO: move this into the appropriate loaders
-
-  /**
-   * Handle plugin extensions
-   */
-  // merge extensions config folders
-  _.mergeWith(plugins, extensions.merges, (objValue, srcValue, key) => {
-    // concat routes
-    if (_.isArray(srcValue) && _.isArray(objValue) && key === 'routes') {
-      return srcValue.concat(objValue);
-    }
-  });
-
-  // overwrite plugins with extensions overwrites
-  extensions.overwrites.forEach(({ path, mod }) => {
-    _.assign(_.get(plugins, path), mod);
-  });
-
-  return {
-    api,
-    plugins,
-    middlewares,
-    extensions,
-    components,
-  };
-};

package/lib/core/load-plugins.js

@@ -1,68 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const { existsSync } = require('fs-extra');
-const _ = require('lodash');
-const findPackagePath = require('../load/package-path');
-const loadFiles = require('../load/load-files');
-const loadConfig = require('../load/load-config-files');
-
-module.exports = async ({ dir, config }) => {
-  const localPlugins = await loadLocalPlugins({ dir, config });
-  const plugins = await loadPlugins({
-    installedPlugins: config.installedPlugins,
-    config,
-  });
-
-  const pluginsIntersection = _.intersection(Object.keys(localPlugins), Object.keys(plugins));
-
-  if (pluginsIntersection.length > 0) {
-    throw new Error(
-      `You have some local plugins with the same name as npm installed plugins:\n${pluginsIntersection
-        .map(p => `- ${p}`)
-        .join('\n')}`
-    );
-  }
-
-  // check for conflicts
-  return _.merge(plugins, localPlugins);
-};
-
-const loadLocalPlugins = async ({ dir, config }) => {
-  const pluginsDir = join(dir, 'plugins');
-
-  if (!existsSync(pluginsDir)) return {};
-
-  const [files, configs] = await Promise.all([
-    loadFiles(pluginsDir, '{*/!(config)/*.*(js|json),*/package.json}'),
-    loadConfig(pluginsDir, '*/config/**/*.+(js|json)'),
-  ]);
-  const userConfigs = Object.keys(files).reduce((acc, plugin) => {
-    acc[plugin] = { config: config.get(['plugins', plugin], {}) };
-    return acc;
-  }, {});
-  return _.merge(files, configs, userConfigs);
-};
-
-const loadPlugins = async ({ installedPlugins, config }) => {
-  let plugins = {};
-
-  for (let plugin of installedPlugins) {
-    const pluginPath = findPackagePath(`@strapi/plugin-${plugin}`);
-
-    const files = await loadFiles(
-      pluginPath,
-      '{!(config|node_modules|tests)/*.*(js|json),package.json}'
-    );
-
-    const { config: pluginConfig } = await loadConfig(pluginPath);
-
-    const userConfig = config.get(['plugins', plugin], {});
-
-    const mergedConfig = _.merge(pluginConfig, userConfig);
-
-    _.set(plugins, plugin, _.assign({}, files, { config: mergedConfig }));
-  }
-
-  return plugins;
-};