@strapi/strapi 4.10.0-beta.0 → 4.10.0

package/lib/middlewares/security.js

@@ -12,7 +12,7 @@ const defaults = {
     useDefaults: true,
     directives: {
       'connect-src': ["'self'", 'https:'],
-      'img-src': ["'self'", 'data:', 'blob:', 'https://dl.airtable.com'],
+      'img-src': ["'self'", 'data:', 'blob:', 'https://market-assets.strapi.io'],
       'media-src': ["'self'", 'data:', 'blob:'],
       upgradeInsecureRequests: null,
     },

package/lib/services/event-hub.js

@@ -35,7 +35,12 @@ module.exports = function createEventHub() {
     },
 
     unsubscribe(subscriber) {
-      subscribers.splice(subscribers.indexOf(subscriber), 1);
+      const subscriberIndex = subscribers.indexOf(subscriber);
+
+      // Only remove the subscriber if it exists
+      if (subscriberIndex >= 0) {
+        subscribers.splice(subscriberIndex, 1);
+      }
     },
 
     on(eventName, listener) {

package/lib/services/metrics/index.js

@@ -17,6 +17,7 @@ const LIMITED_EVENTS = [
   'didSaveMediaWithCaption',
   'didDisableResponsiveDimensions',
   'didEnableResponsiveDimensions',
+  'didInitializePluginUpload',
 ];
 
 const createTelemetryInstance = (strapi) => {

package/lib/services/metrics/sender.js

@@ -3,9 +3,7 @@
 const os = require('os');
 const path = require('path');
 const _ = require('lodash');
-const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
 const isDocker = require('is-docker');
-const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
 const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const { env } = require('@strapi/utils');
@@ -41,14 +39,6 @@ module.exports = (strapi) => {
   const serverRootPath = strapi.dirs.app.root;
   const adminRootPath = path.join(strapi.dirs.app.root, 'src', 'admin');
 
-  const getNumberOfDynamicZones = () => {
-    return pipe(
-      map('attributes'),
-      flatMap(values),
-      sumBy(propEq('type', 'dynamiczone'))
-    )(strapi.contentTypes);
-  };
-
   const anonymousUserProperties = {
     environment: strapi.config.environment,
     os: os.type(),
@@ -66,9 +56,6 @@ module.exports = (strapi) => {
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
     projectId: uuid,
     isHostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'strapi.cloud',
-    numberOfAllContentTypes: _.size(strapi.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: _.size(strapi.components),
-    numberOfDynamicZones: getNumberOfDynamicZones(),
   };
 
   addPackageJsonStrapiMetadata(anonymousGroupProperties, strapi);
@@ -94,7 +81,7 @@ module.exports = (strapi) => {
     };
 
     try {
-      const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
+      const res = await strapi.fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
       return res.ok;
     } catch (err) {
       return false;

package/lib/services/server/index.js

@@ -92,8 +92,8 @@ const createServer = (strapi) => {
       return this;
     },
 
-    async initRouting() {
-      await registerAllRoutes(strapi);
+    initRouting() {
+      registerAllRoutes(strapi);
 
       return this;
     },

package/lib/services/server/register-routes.js

@@ -69,7 +69,7 @@ const registerPluginRoutes = (strapi) => {
     } else {
       _.forEach(plugin.routes, (router) => {
         router.type = router.type || 'admin';
-        router.prefix = `/${pluginName}`;
+        router.prefix = router.prefix || `/${pluginName}`;
         router.routes.forEach((route) => {
           generateRouteScope(route);
           route.info = { pluginName };

package/lib/services/utils/dynamic-zones.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const { map, values, sumBy, pipe, flatMap, propEq } = require('lodash/fp');
+
+const getNumberOfDynamicZones = () => {
+  return pipe(
+    map('attributes'),
+    flatMap(values),
+    sumBy(propEq('type', 'dynamiczone'))
+  )(strapi.contentTypes);
+};
+
+module.exports = getNumberOfDynamicZones;

package/lib/services/webhook-runner.js

@@ -6,7 +6,6 @@
 
 const debug = require('debug')('strapi:webhook');
 const _ = require('lodash');
-const fetch = require('node-fetch');
 
 const WorkerQueue = require('./worker-queue');
 
@@ -15,12 +14,13 @@ const defaultConfiguration = {
 };
 
 class WebhookRunner {
-  constructor({ eventHub, logger, configuration = {} }) {
-    debug('Initialized webhook runer');
+  constructor({ eventHub, logger, configuration = {}, fetch }) {
+    debug('Initialized webhook runner');
     this.eventHub = eventHub;
     this.logger = logger;
     this.webhooksMap = new Map();
     this.listeners = new Map();
+    this.fetch = fetch;
 
     if (typeof configuration !== 'object') {
       throw new Error(
@@ -76,7 +76,7 @@ class WebhookRunner {
   run(webhook, event, info = {}) {
     const { url, headers } = webhook;
 
-    return fetch(url, {
+    return this.fetch(url, {
       method: 'post',
       body: JSON.stringify({
         event,

package/lib/types/core/commands/index.d.ts

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+
+export type AddCommandOptions = {
+  command: Command;
+  argv: Record<number, string>;
+};

package/lib/utils/fetch.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const nodeFetch = require('node-fetch');
+const HttpsProxyAgent = require('https-proxy-agent');
+
+function createStrapiFetch(strapi) {
+  function fetch(url, options) {
+    return nodeFetch(url, {
+      ...(fetch.agent ? { agent: fetch.agent } : {}),
+      ...options,
+    });
+  }
+
+  const { globalProxy: proxy } = strapi.config.get('server');
+
+  if (proxy) {
+    fetch.agent = new HttpsProxyAgent(proxy);
+  }
+
+  return fetch;
+}
+
+module.exports = createStrapiFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.0-beta.0",
+  "version": "4.10.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",
   "keywords": [
     "strapi",
@@ -66,9 +66,7 @@
   ],
   "main": "./lib",
   "types": "./lib/index.d.ts",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
+  "bin": "./bin/strapi.js",
   "directories": {
     "lib": "./lib",
     "bin": "./bin",
@@ -76,24 +74,26 @@
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
-    "test:unit": "jest --verbose"
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "lint": "run -T eslint ."
   },
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.10.0-beta.0",
-    "@strapi/data-transfer": "4.10.0-beta.0",
-    "@strapi/database": "4.10.0-beta.0",
-    "@strapi/generate-new": "4.10.0-beta.0",
-    "@strapi/generators": "4.10.0-beta.0",
-    "@strapi/logger": "4.10.0-beta.0",
-    "@strapi/permissions": "4.10.0-beta.0",
-    "@strapi/plugin-content-manager": "4.10.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.10.0-beta.0",
-    "@strapi/plugin-email": "4.10.0-beta.0",
-    "@strapi/plugin-upload": "4.10.0-beta.0",
-    "@strapi/typescript-utils": "4.10.0-beta.0",
-    "@strapi/utils": "4.10.0-beta.0",
+    "@strapi/admin": "4.10.0",
+    "@strapi/data-transfer": "4.10.0",
+    "@strapi/database": "4.10.0",
+    "@strapi/generate-new": "4.10.0",
+    "@strapi/generators": "4.10.0",
+    "@strapi/logger": "4.10.0",
+    "@strapi/permissions": "4.10.0",
+    "@strapi/plugin-content-manager": "4.10.0",
+    "@strapi/plugin-content-type-builder": "4.10.0",
+    "@strapi/plugin-email": "4.10.0",
+    "@strapi/plugin-upload": "4.10.0",
+    "@strapi/typescript-utils": "4.10.0",
+    "@strapi/utils": "4.10.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -109,6 +109,7 @@
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
     "http-errors": "1.8.1",
+    "https-proxy-agent": "5.0.1",
     "inquirer": "8.2.5",
     "is-docker": "2.2.1",
     "koa": "2.13.4",
@@ -128,7 +129,7 @@
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
-    "qs": "6.11.0",
+    "qs": "6.11.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.8",
     "statuses": "2.0.1",
@@ -136,11 +137,11 @@
   },
   "devDependencies": {
     "supertest": "6.3.3",
-    "typescript": "4.6.2"
+    "typescript": "5.0.4"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "1519ef0e56d27b738f24fc88223797651ad47aaf"
+  "gitHead": "9b5519778faaedfb837879f9c6f7e28fdfd6750d"
 }

package/lib/commands/build.js

@@ -1,18 +0,0 @@
-'use strict';
-
-const strapi = require('..');
-const { buildAdmin } = require('./builders');
-
-/**
- * `$ strapi build`
- */
-module.exports = async ({ optimization, forceBuild = true }) => {
-  const { appDir, distDir } = await strapi.compile();
-
-  await buildAdmin({
-    forceBuild,
-    optimization,
-    buildDestDir: distDir,
-    srcDir: appDir,
-  });
-};