@strapi/strapi 4.7.0-beta.0 → 4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d

package/lib/commands/transfer/export.js

@@ -18,9 +18,9 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   formatDiagnostic,
+  loadersFactory,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
-
 /**
  * @typedef ExportCommandOptions Options given to the CLI import command
  *
@@ -80,6 +80,20 @@ module.exports = async (opts) => {
 
   const progress = engine.progress.stream;
 
+  const { updateLoader } = loadersFactory();
+
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
+
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
   const getTelemetryPayload = (/* payload */) => {
     return {
       eventProperties: {

package/lib/commands/transfer/import.js

@@ -19,6 +19,7 @@ const {
   DEFAULT_IGNORED_CONTENT_TYPES,
   createStrapiInstance,
   formatDiagnostic,
+  loadersFactory,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -88,6 +89,21 @@ module.exports = async (opts) => {
   engine.diagnostics.onDiagnostic(formatDiagnostic('import'));
 
   const progress = engine.progress.stream;
+
+  const { updateLoader } = loadersFactory();
+
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
+
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
   const getTelemetryPayload = () => {
     return {
       eventProperties: {

package/lib/commands/transfer/transfer.js

@@ -16,6 +16,7 @@ const {
   createStrapiInstance,
   DEFAULT_IGNORED_CONTENT_TYPES,
   formatDiagnostic,
+  loadersFactory,
 } = require('./utils');
 const { exitWith } = require('../utils/helpers');
 
@@ -116,6 +117,22 @@ module.exports = async (opts) => {
 
   engine.diagnostics.onDiagnostic(formatDiagnostic('transfer'));
 
+  const progress = engine.progress.stream;
+
+  const { updateLoader } = loadersFactory();
+
+  progress.on(`stage::start`, ({ stage, data }) => {
+    updateLoader(stage, data).start();
+  });
+
+  progress.on('stage::finish', ({ stage, data }) => {
+    updateLoader(stage, data).succeed();
+  });
+
+  progress.on('stage::progress', ({ stage, data }) => {
+    updateLoader(stage, data);
+  });
+
   let results;
   try {
     console.log(`Starting transfer...`);

package/lib/commands/transfer/utils.js

@@ -9,6 +9,7 @@ const {
   configs: { createOutputFileConfiguration },
   createLogger,
 } = require('@strapi/logger');
+const ora = require('ora');
 const { readableBytes, exitWith } = require('../utils/helpers');
 const strapi = require('../../index');
 const { getParseListWithChoices } = require('../utils/commander');
@@ -171,7 +172,46 @@ const formatDiagnostic =
     }
   };
 
+const loadersFactory = (defaultLoaders = {}) => {
+  const loaders = defaultLoaders;
+  const updateLoader = (stage, data) => {
+    if (!(stage in loaders)) {
+      createLoader(stage);
+    }
+    const stageData = data[stage];
+    const elapsedTime = stageData?.startTime
+      ? (stageData?.endTime || Date.now()) - stageData.startTime
+      : 0;
+    const size = `size: ${readableBytes(stageData?.bytes ?? 0)}`;
+    const elapsed = `elapsed: ${elapsedTime} ms`;
+    const speed =
+      elapsedTime > 0 ? `(${readableBytes(((stageData?.bytes ?? 0) * 1000) / elapsedTime)}/s)` : '';
+
+    loaders[stage].text = `${stage}: ${stageData?.count ?? 0} transfered (${size}) (${elapsed}) ${
+      !stageData?.endTime ? speed : ''
+    }`;
+
+    return loaders[stage];
+  };
+
+  const createLoader = (stage) => {
+    Object.assign(loaders, { [stage]: ora() });
+    return loaders[stage];
+  };
+
+  const getLoader = (stage) => {
+    return loaders[stage];
+  };
+
+  return {
+    updateLoader,
+    createLoader,
+    getLoader,
+  };
+};
+
 module.exports = {
+  loadersFactory,
   buildTransferTable,
   getDefaultExportName,
   DEFAULT_IGNORED_CONTENT_TYPES,

package/lib/core/registries/hooks.d.ts

@@ -1,4 +1,3 @@
-
 type Handler = (context: any) => any;
 
 type AsyncHook = {
@@ -8,7 +7,6 @@ type AsyncHook = {
   call(): Promise<void>;
 };
 
-
 type SyncHook = {
   get handlers(): Handler[];
   register(handler: Handler): this;
@@ -16,5 +14,4 @@ type SyncHook = {
   call(): void;
 };
 
-
-export type Hook = AsyncHook|SyncHook
+export type Hook = AsyncHook | SyncHook;

package/lib/core/registries/policies.d.ts

@@ -6,4 +6,8 @@ interface PolicyContext extends BaseContext {
   is(name): boolean;
 }
 
-export type Policy<T=unknown> = (ctx: PolicyContext,cfg:T, { strapi: Strapi }) => boolean | undefined;
+export type Policy<T = unknown> = (
+  ctx: PolicyContext,
+  cfg: T,
+  { strapi: Strapi }
+) => boolean | undefined;

package/lib/global.d.ts

@@ -1,5 +1,10 @@
 import type { Strapi as StrapiInterface } from './types/core';
-import type { CollectionTypeSchema, SingleTypeSchema, ComponentSchema, ContentTypeSchema } from './types/core/schemas';
+import type {
+  CollectionTypeSchema,
+  SingleTypeSchema,
+  ComponentSchema,
+  ContentTypeSchema,
+} from './types/core/schemas';
 import type { KeysBy } from './types/utils';
 
 declare global {
@@ -7,7 +12,7 @@ declare global {
     /**
      * Map of UID / schemas used as a schemas database for other types.
      * It must be extended by the user application or plugins.
-     * 
+     *
      * @example
      * ```ts
      * declare global {
@@ -39,12 +44,12 @@ declare global {
     /**
      * Literal union type of every component registered in Strapi.Schemas
      */
-     type ComponentUIDs = KeysBy<Schemas, ComponentSchema>;
+    type ComponentUIDs = KeysBy<Schemas, ComponentSchema>;
 
-     /**
-      * Global shorthand to access the `StrapiInterface` type
-      */
-     type Strapi = StrapiInterface;
+    /**
+     * Global shorthand to access the `StrapiInterface` type
+     */
+    type Strapi = StrapiInterface;
   }
 
   /**

package/lib/index.d.ts

@@ -2,4 +2,4 @@ import './global';
 
 export * from './types';
 
-export default function(opts): Strapi;
+export default function (opts): Strapi;

package/lib/middlewares/cors.js

@@ -19,6 +19,14 @@ module.exports = (config) => {
   const { origin, expose, maxAge, credentials, methods, headers, keepHeadersOnError } =
     defaultsDeep(defaults, config);
 
+  if (config.enabled !== undefined) {
+    strapi.log.warn(
+      'The strapi::cors middleware no longer supports the `enabled` option. Using it' +
+        ' to conditionally enable CORS might cause an insecure default. To disable strapi::cors, remove it from' +
+        ' the exported array in config/middleware.js'
+    );
+  }
+
   return cors({
     async origin(ctx) {
       let originList;

package/lib/middlewares/public/index.js

@@ -77,9 +77,10 @@ module.exports = (config, { strapi }) => {
         }),
         config: { auth: false },
       },
+      // All other public GET-routes except /uploads/(.*) which is handled in upload middleware
       {
         method: 'GET',
-        path: '/(.*)',
+        path: '/((?!uploads/).+)',
         handler: koaStatic(strapi.dirs.static.public, {
           maxage: maxAge,
           defer: true,

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

@@ -88,7 +88,7 @@ export interface EntityService {
   ): Promise<any>;
 }
 
-export default function(opts: {
+export default function (opts: {
   strapi: Strapi;
   db: Database;
   // TODO: define types

package/lib/types/core/attributes/component.d.ts

@@ -25,13 +25,10 @@ export type ComponentAttribute<
   PrivateOption &
   RequiredOption;
 
-export type ComponentValue<T extends Strapi.ComponentUIDs, R extends boolean> = GetAttributesValues<
-  T
-> extends infer V
-  ? R extends true
-    ? V[]
-    : V
-  : never;
+export type ComponentValue<
+  T extends Strapi.ComponentUIDs,
+  R extends boolean
+> = GetAttributesValues<T> extends infer V ? (R extends true ? V[] : V) : never;
 
 export type GetComponentAttributeValue<T extends Attribute> = T extends ComponentAttribute<
   infer U,

package/lib/types/core/attributes/utils.d.ts

@@ -83,11 +83,10 @@ export type GetAttributeValueByKey<
 export type GetAttributesValues<T extends SchemaUID> = {
   // Handle required attributes
   [key in GetAttributesRequiredKeys<T>]-?: GetAttributeValueByKey<T, key>;
-} &
-  {
-    // Handle optional attributes
-    [key in GetAttributesOptionalKeys<T>]?: GetAttributeValueByKey<T, key>;
-  };
+} & {
+  // Handle optional attributes
+  [key in GetAttributesOptionalKeys<T>]?: GetAttributeValueByKey<T, key>;
+};
 
 export type GetAttributesRequiredKeys<T extends SchemaUID> = KeysBy<
   GetAttributes<T>,

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

@@ -1,3 +1,3 @@
 export * from './attributes';
-export * from  './schemas';
-export * from './strapi'
+export * from './schemas';
+export * from './strapi';

package/lib/types/index.d.ts

@@ -1,4 +1,4 @@
 export * from './core';
 
-export * as utils from './utils'
-export * as factories from './factories';
+export * as utils from './utils';
+export * as factories from './factories';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.7.0-beta.0",
+  "version": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
   "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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.7.0-beta.0",
-    "@strapi/data-transfer": "4.7.0-beta.0",
-    "@strapi/database": "4.7.0-beta.0",
-    "@strapi/generate-new": "4.7.0-beta.0",
-    "@strapi/generators": "4.7.0-beta.0",
-    "@strapi/logger": "4.7.0-beta.0",
-    "@strapi/permissions": "4.7.0-beta.0",
-    "@strapi/plugin-content-manager": "4.7.0-beta.0",
-    "@strapi/plugin-content-type-builder": "4.7.0-beta.0",
-    "@strapi/plugin-email": "4.7.0-beta.0",
-    "@strapi/plugin-upload": "4.7.0-beta.0",
-    "@strapi/typescript-utils": "4.7.0-beta.0",
-    "@strapi/utils": "4.7.0-beta.0",
+    "@strapi/admin": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/data-transfer": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/database": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/generate-new": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/generators": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/logger": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/permissions": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-content-manager": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-content-type-builder": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-email": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/plugin-upload": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/typescript-utils": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
+    "@strapi/utils": "4.7.0-exp.117579f4c13806c2cd518e7d7d2f9d0c8a20107d",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -118,11 +118,11 @@
     "koa-favicon": "2.1.0",
     "koa-helmet": "6.1.0",
     "koa-ip": "^2.1.2",
-    "koa-session": "6.2.0",
+    "koa-session": "6.4.0",
     "koa-static": "5.0.0",
     "lodash": "4.17.21",
     "mime-types": "2.1.35",
-    "node-fetch": "2.6.7",
+    "node-fetch": "2.6.9",
     "node-machine-id": "1.1.12",
     "node-schedule": "2.1.0",
     "open": "8.4.0",
@@ -135,12 +135,12 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "supertest": "6.2.4",
+    "supertest": "6.3.3",
     "typescript": "4.6.2"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "880ba7af867ad43c4cc45b47467b76a9b5606b6e"
+  "gitHead": "117579f4c13806c2cd518e7d7d2f9d0c8a20107d"
 }