@strapi/core 0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a → 0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c

package/dist/utils/fetch.mjs

@@ -1,8 +1,8 @@
 import { ProxyAgent } from 'undici';
 
-// TODO: once core Node exposes a stable way to create a ProxyAgent we will use that instead of undici
 // Create a wrapper for Node's Fetch API that applies a global proxy
-const createStrapiFetch = (strapi)=>{
+const createStrapiFetch = (strapi, options)=>{
+    const { logs = true } = options ?? {};
     function strapiFetch(url, options) {
         const fetchOptions = {
             ...strapiFetch.dispatcher ? {
@@ -10,12 +10,16 @@ const createStrapiFetch = (strapi)=>{
             } : {},
             ...options
         };
-        strapi.log.debug(`Making request for ${url}`);
+        if (logs) {
+            strapi.log.debug(`Making request for ${url}`);
+        }
         return fetch(url, fetchOptions);
     }
     const proxy = strapi.config.get('server.proxy.fetch') || strapi.config.get('server.proxy.global');
     if (proxy) {
-        strapi.log.info(`Using proxy for Fetch requests: ${proxy}`);
+        if (logs) {
+            strapi.log.info(`Using proxy for Fetch requests: ${proxy}`);
+        }
         strapiFetch.dispatcher = new ProxyAgent(proxy);
     }
     return strapiFetch;

package/dist/utils/fetch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.mjs","sources":["../../src/utils/fetch.ts"],"sourcesContent":["import type { Core, Modules } from '@strapi/types';\nimport { ProxyAgent } from 'undici';\n\n// TODO: once core Node exposes a stable way to create a ProxyAgent we will use that instead of undici\n\n// Create a wrapper for Node's Fetch API that applies a global proxy\nexport const createStrapiFetch = (strapi: Core.Strapi): Modules.Fetch.Fetch => {\n  function strapiFetch(url: RequestInfo | URL, options?: RequestInit) {\n    const fetchOptions = {\n      ...(strapiFetch.dispatcher ? { dispatcher: strapiFetch.dispatcher } : {}),\n      ...options,\n    };\n    strapi.log.debug(`Making request for ${url}`);\n    return fetch(url, fetchOptions);\n  }\n\n  const proxy =\n    strapi.config.get<ConstructorParameters<typeof ProxyAgent>[0]>('server.proxy.fetch') ||\n    strapi.config.get<string>('server.proxy.global');\n\n  if (proxy) {\n    strapi.log.info(`Using proxy for Fetch requests: ${proxy}`);\n    strapiFetch.dispatcher = new ProxyAgent(proxy);\n  }\n\n  return strapiFetch;\n};\n\nexport type Fetch = Modules.Fetch.Fetch;\n"],"names":["createStrapiFetch","strapi","strapiFetch","url","options","fetchOptions","dispatcher","log","debug","fetch","proxy","config","get","info","ProxyAgent"],"mappings":";;AAGA;AAEA;AACO,MAAMA,oBAAoB,CAACC,MAAAA,GAAAA;IAChC,SAASC,WAAAA,CAAYC,GAAsB,EAAEC,OAAqB,EAAA;AAChE,QAAA,MAAMC,YAAe,GAAA;YACnB,GAAIH,WAAAA,CAAYI,UAAU,GAAG;AAAEA,gBAAAA,UAAAA,EAAYJ,YAAYI;AAAW,aAAA,GAAI,EAAE;AACxE,YAAA,GAAGF;AACL,SAAA;QACAH,MAAOM,CAAAA,GAAG,CAACC,KAAK,CAAC,CAAC,mBAAmB,EAAEL,IAAI,CAAC,CAAA;AAC5C,QAAA,OAAOM,MAAMN,GAAKE,EAAAA,YAAAA,CAAAA;AACpB;IAEA,MAAMK,KAAAA,GACJT,MAAOU,CAAAA,MAAM,CAACC,GAAG,CAA8C,oBAAA,CAAA,IAC/DX,MAAOU,CAAAA,MAAM,CAACC,GAAG,CAAS,qBAAA,CAAA;AAE5B,IAAA,IAAIF,KAAO,EAAA;QACTT,MAAOM,CAAAA,GAAG,CAACM,IAAI,CAAC,CAAC,gCAAgC,EAAEH,MAAM,CAAC,CAAA;QAC1DR,WAAYI,CAAAA,UAAU,GAAG,IAAIQ,UAAWJ,CAAAA,KAAAA,CAAAA;AAC1C;IAEA,OAAOR,WAAAA;AACT;;;;"}
+{"version":3,"file":"fetch.mjs","sources":["../../src/utils/fetch.ts"],"sourcesContent":["import type { Core, Modules } from '@strapi/types';\nimport { ProxyAgent } from 'undici';\n\n// TODO: once core Node exposes a stable way to create a ProxyAgent we will use that instead of undici\n\ninterface StrapiFetchOptions {\n  logs?: boolean;\n}\n\n// Create a wrapper for Node's Fetch API that applies a global proxy\nexport const createStrapiFetch = (\n  strapi: Core.Strapi,\n  options?: StrapiFetchOptions\n): Modules.Fetch.Fetch => {\n  const { logs = true } = options ?? {};\n\n  function strapiFetch(url: RequestInfo | URL, options?: RequestInit) {\n    const fetchOptions = {\n      ...(strapiFetch.dispatcher ? { dispatcher: strapiFetch.dispatcher } : {}),\n      ...options,\n    };\n\n    if (logs) {\n      strapi.log.debug(`Making request for ${url}`);\n    }\n\n    return fetch(url, fetchOptions);\n  }\n\n  const proxy =\n    strapi.config.get<ConstructorParameters<typeof ProxyAgent>[0]>('server.proxy.fetch') ||\n    strapi.config.get<string>('server.proxy.global');\n\n  if (proxy) {\n    if (logs) {\n      strapi.log.info(`Using proxy for Fetch requests: ${proxy}`);\n    }\n    strapiFetch.dispatcher = new ProxyAgent(proxy);\n  }\n\n  return strapiFetch;\n};\n\nexport type Fetch = Modules.Fetch.Fetch;\n"],"names":["createStrapiFetch","strapi","options","logs","strapiFetch","url","fetchOptions","dispatcher","log","debug","fetch","proxy","config","get","info","ProxyAgent"],"mappings":";;AASA;AACO,MAAMA,iBAAoB,GAAA,CAC/BC,MACAC,EAAAA,OAAAA,GAAAA;AAEA,IAAA,MAAM,EAAEC,IAAO,GAAA,IAAI,EAAE,GAAGD,WAAW,EAAC;IAEpC,SAASE,WAAAA,CAAYC,GAAsB,EAAEH,OAAqB,EAAA;AAChE,QAAA,MAAMI,YAAe,GAAA;YACnB,GAAIF,WAAAA,CAAYG,UAAU,GAAG;AAAEA,gBAAAA,UAAAA,EAAYH,YAAYG;AAAW,aAAA,GAAI,EAAE;AACxE,YAAA,GAAGL;AACL,SAAA;AAEA,QAAA,IAAIC,IAAM,EAAA;YACRF,MAAOO,CAAAA,GAAG,CAACC,KAAK,CAAC,CAAC,mBAAmB,EAAEJ,IAAI,CAAC,CAAA;AAC9C;AAEA,QAAA,OAAOK,MAAML,GAAKC,EAAAA,YAAAA,CAAAA;AACpB;IAEA,MAAMK,KAAAA,GACJV,MAAOW,CAAAA,MAAM,CAACC,GAAG,CAA8C,oBAAA,CAAA,IAC/DZ,MAAOW,CAAAA,MAAM,CAACC,GAAG,CAAS,qBAAA,CAAA;AAE5B,IAAA,IAAIF,KAAO,EAAA;AACT,QAAA,IAAIR,IAAM,EAAA;YACRF,MAAOO,CAAAA,GAAG,CAACM,IAAI,CAAC,CAAC,gCAAgC,EAAEH,MAAM,CAAC,CAAA;AAC5D;QACAP,WAAYG,CAAAA,UAAU,GAAG,IAAIQ,UAAWJ,CAAAA,KAAAA,CAAAA;AAC1C;IAEA,OAAOP,WAAAA;AACT;;;;"}

package/dist/utils/transform-content-types-to-models.d.ts

@@ -384,6 +384,7 @@ export declare const transformAttribute: (name: string, attribute: Schema.Attrib
     column?: Partial<Schema.Attribute.Column> | undefined;
     targetField?: string | undefined;
     options?: Schema.Attribute.UIDOptions | undefined;
+    regex?: string | undefined;
     configurable?: boolean | undefined;
     default?: string | (() => string) | undefined;
     minLength?: number | undefined;

package/dist/utils/transform-content-types-to-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-content-types-to-models.d.ts","sourceRoot":"","sources":["../../src/utils/transform-content-types-to-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,yBAAyB,mBAAoB,MAAM,eAAe,WAAW,WAKzF,CAAC;AAEF,eAAO,MAAM,kBAAkB,mBAAoB,MAAM,eAAe,WAAW,WAKlF,CAAC;AAEF,eAAO,MAAM,gCAAgC,gBAAiB,WAAW,WAKxE,CAAC;AAEF,eAAO,MAAM,iCAAiC,gBAAiB,WAAW,WAKzE,CAAC;AAEF,eAAO,MAAM,sBAAsB,gBAAiB,WAAW,WAE9D,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBAAiB,MAAM,eAAe,WAAW,WAMpF,CAAC;AAIF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,iBAAiB,GAC3D,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,KAAK,GAAG,WAAW,CAAC,CAAC,GAChF,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AAG5B,eAAO,MAAM,kBAAkB,SACvB,MAAM,aACD,OAAO,SAAS,CAAC,YAAY,eAC3B,sBAAsB,eACtB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+FzB,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBACjB,sBAAsB,eACtB,WAAW,OAazB,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBACf,sBAAsB;UACc,aAAa,GAAG,WAAW;CAI7E,CAAC;AAEF,eAAO,MAAM,gBAAgB,iBAAW,CAAC;AAgFzC,eAAO,MAAM,6BAA6B,iBAC1B,sBAAsB,EAAE,eACzB,WAAW,KACvB,KAAK,EAkEP,CAAC"}
+{"version":3,"file":"transform-content-types-to-models.d.ts","sourceRoot":"","sources":["../../src/utils/transform-content-types-to-models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,yBAAyB,mBAAoB,MAAM,eAAe,WAAW,WAKzF,CAAC;AAEF,eAAO,MAAM,kBAAkB,mBAAoB,MAAM,eAAe,WAAW,WAKlF,CAAC;AAEF,eAAO,MAAM,gCAAgC,gBAAiB,WAAW,WAKxE,CAAC;AAEF,eAAO,MAAM,iCAAiC,gBAAiB,WAAW,WAKzE,CAAC;AAEF,eAAO,MAAM,sBAAsB,gBAAiB,WAAW,WAE9D,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBAAiB,MAAM,eAAe,WAAW,WAMpF,CAAC;AAIF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,iBAAiB,GAC3D,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,GAAG,KAAK,GAAG,WAAW,CAAC,CAAC,GAChF,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;AAG5B,eAAO,MAAM,kBAAkB,SACvB,MAAM,aACD,OAAO,SAAS,CAAC,YAAY,eAC3B,sBAAsB,eACtB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+FzB,CAAC;AAEF,eAAO,MAAM,mBAAmB,gBACjB,sBAAsB,eACtB,WAAW,OAazB,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBACf,sBAAsB;UACc,aAAa,GAAG,WAAW;CAI7E,CAAC;AAEF,eAAO,MAAM,gBAAgB,iBAAW,CAAC;AAgFzC,eAAO,MAAM,6BAA6B,iBAC1B,sBAAsB,EAAE,eACzB,WAAW,KACvB,KAAK,EAkEP,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/core",
-  "version": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
+  "version": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
   "description": "Core of Strapi",
   "homepage": "https://strapi.io",
   "bugs": {
@@ -56,14 +56,14 @@
     "@koa/cors": "5.0.0",
     "@koa/router": "12.0.2",
     "@paralleldrive/cuid2": "2.2.2",
-    "@strapi/admin": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/database": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/generators": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/logger": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/permissions": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/types": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/typescript-utils": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
-    "@strapi/utils": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
+    "@strapi/admin": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/database": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/generators": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/logger": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/permissions": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/types": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/typescript-utils": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
+    "@strapi/utils": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -82,7 +82,7 @@
     "http-errors": "2.0.0",
     "inquirer": "8.2.5",
     "is-docker": "2.2.1",
-    "koa": "2.15.4",
+    "koa": "2.16.1",
     "koa-body": "6.0.1",
     "koa-compose": "4.1.0",
     "koa-compress": "5.1.1",
@@ -103,7 +103,7 @@
     "semver": "7.5.4",
     "statuses": "2.0.1",
     "typescript": "5.4.4",
-    "undici": "6.21.1",
+    "undici": "6.21.2",
     "yup": "0.32.9"
   },
   "devDependencies": {
@@ -126,9 +126,9 @@
     "@types/node": "18.19.24",
     "@types/node-schedule": "2.1.7",
     "@types/statuses": "2.0.1",
-    "eslint-config-custom": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a",
+    "eslint-config-custom": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c",
     "supertest": "6.3.3",
-    "tsconfig": "0.0.0-next.266ff4f8317121b6b17eea7fbfe2461e6171e48a"
+    "tsconfig": "0.0.0-next.26bde6ef6bf3081acd31bd0e9dac0d9357028b9c"
   },
   "engines": {
     "node": ">=18.0.0 <=22.x.x",