@strapi/strapi 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/node/webpack/watch.mjs

@@ -0,0 +1,92 @@
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
+import webpackDevMiddleware from "webpack-dev-middleware";
+import webpackHotMiddleware from "webpack-hot-middleware";
+import { webpack } from "webpack";
+import { resolveDevelopmentConfig, mergeConfigWithUserConfig } from "./config.mjs";
+const watch = async (ctx) => {
+  const config = await resolveDevelopmentConfig(ctx);
+  const finalConfig = await mergeConfigWithUserConfig(config, ctx);
+  ctx.logger.debug("Final webpack config:", os.EOL, finalConfig);
+  return new Promise((res) => {
+    const compiler = webpack(finalConfig);
+    const devMiddleware = webpackDevMiddleware(compiler);
+    const hotMiddleware = webpackHotMiddleware(compiler, {
+      log: false,
+      path: "/__webpack_hmr"
+    });
+    ctx.strapi.server.app.use((ctx2, next) => {
+      return new Promise((resolve, reject) => {
+        hotMiddleware(ctx2.req, ctx2.res, (err) => {
+          if (err)
+            reject(err);
+          else
+            resolve(next());
+        });
+      });
+    });
+    ctx.strapi.server.app.use((context, next) => {
+      const ready = new Promise((resolve) => {
+        devMiddleware.waitUntilValid(() => {
+          resolve(true);
+        });
+      });
+      const init = new Promise((resolve) => {
+        devMiddleware(
+          context.req,
+          {
+            // @ts-expect-error ignored
+            end(content) {
+              context.body = content;
+              resolve(true);
+            },
+            getHeader: context.get.bind(context),
+            // @ts-expect-error ignored
+            setHeader: context.set.bind(context),
+            locals: context.state
+          },
+          () => resolve(next())
+        );
+      });
+      return Promise.all([ready, init]);
+    });
+    const serveAdmin = async (ctx2, next) => {
+      await next();
+      if (devMiddleware.context.outputFileSystem.createReadStream) {
+        if (ctx2.method !== "HEAD" && ctx2.method !== "GET") {
+          return;
+        }
+        if (ctx2.body != null || ctx2.status !== 404) {
+          return;
+        }
+        const filename = path.resolve(finalConfig.output?.path, "index.html");
+        ctx2.type = "html";
+        ctx2.body = devMiddleware.context.outputFileSystem.createReadStream(filename);
+      }
+    };
+    ctx.strapi.server.routes([
+      {
+        method: "GET",
+        path: `${ctx.basePath}:path*`,
+        handler: serveAdmin,
+        config: { auth: false }
+      }
+    ]);
+    devMiddleware.waitUntilValid(() => {
+      res({
+        async close() {
+          await Promise.all([
+            promisify(devMiddleware.close.bind(devMiddleware))(),
+            hotMiddleware.close(),
+            promisify(compiler.close.bind(compiler))()
+          ]);
+        }
+      });
+    });
+  });
+};
+export {
+  watch
+};
+//# sourceMappingURL=watch.mjs.map

package/dist/node/webpack/watch.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"watch.mjs","sources":["../../../src/node/webpack/watch.ts"],"sourcesContent":["import os from 'node:os';\nimport path from 'node:path';\nimport { promisify } from 'node:util';\nimport webpackDevMiddleware from 'webpack-dev-middleware';\nimport webpackHotMiddleware from 'webpack-hot-middleware';\nimport { webpack } from 'webpack';\nimport { Core } from '@strapi/types';\nimport type { BuildContext } from '../create-build-context';\nimport { mergeConfigWithUserConfig, resolveDevelopmentConfig } from './config';\n\ninterface WebpackWatcher {\n  close(): Promise<void>;\n}\n\nconst watch = async (ctx: BuildContext): Promise<WebpackWatcher> => {\n  const config = await resolveDevelopmentConfig(ctx);\n  const finalConfig = await mergeConfigWithUserConfig(config, ctx);\n\n  ctx.logger.debug('Final webpack config:', os.EOL, finalConfig);\n\n  return new Promise<WebpackWatcher>((res) => {\n    const compiler = webpack(finalConfig);\n\n    const devMiddleware = webpackDevMiddleware(compiler);\n\n    // @ts-expect-error incompatible types between hotMiddleware and webpack\n    const hotMiddleware = webpackHotMiddleware(compiler, {\n      log: false,\n      path: '/__webpack_hmr',\n    });\n\n    ctx.strapi.server.app.use((ctx, next) => {\n      return new Promise((resolve, reject) => {\n        hotMiddleware(ctx.req, ctx.res, (err) => {\n          if (err) reject(err);\n          else resolve(next());\n        });\n      });\n    });\n\n    ctx.strapi.server.app.use((context, next) => {\n      // wait for webpack-dev-middleware to signal that the build is ready\n      const ready = new Promise((resolve) => {\n        devMiddleware.waitUntilValid(() => {\n          resolve(true);\n        });\n      });\n      // tell webpack-dev-middleware to handle the request\n      const init = new Promise((resolve) => {\n        devMiddleware(\n          context.req,\n          {\n            // @ts-expect-error ignored\n            end(content) {\n              // eslint-disable-next-line no-param-reassign\n              context.body = content;\n              resolve(true);\n            },\n            getHeader: context.get.bind(context),\n            // @ts-expect-error ignored\n            setHeader: context.set.bind(context),\n            locals: context.state,\n          },\n          () => resolve(next())\n        );\n      });\n\n      return Promise.all([ready, init]);\n    });\n\n    const serveAdmin: Core.MiddlewareHandler = async (ctx, next) => {\n      await next();\n\n      if (devMiddleware.context.outputFileSystem.createReadStream) {\n        if (ctx.method !== 'HEAD' && ctx.method !== 'GET') {\n          return;\n        }\n\n        if (ctx.body != null || ctx.status !== 404) {\n          return;\n        }\n\n        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain\n        const filename = path.resolve(finalConfig.output?.path!, 'index.html');\n        ctx.type = 'html';\n        ctx.body = devMiddleware.context.outputFileSystem.createReadStream(filename);\n      }\n    };\n\n    ctx.strapi.server.routes([\n      {\n        method: 'GET',\n        path: `${ctx.basePath}:path*`,\n        handler: serveAdmin,\n        config: { auth: false },\n      },\n    ]);\n\n    devMiddleware.waitUntilValid(() => {\n      res({\n        async close() {\n          await Promise.all([\n            promisify(devMiddleware.close.bind(devMiddleware))(),\n            hotMiddleware.close(),\n            promisify(compiler.close.bind(compiler))(),\n          ]);\n        },\n      });\n    });\n  });\n};\n\nexport { watch };\nexport type { WebpackWatcher };\n"],"names":["ctx"],"mappings":";;;;;;;AAcM,MAAA,QAAQ,OAAO,QAA+C;AAC5D,QAAA,SAAS,MAAM,yBAAyB,GAAG;AACjD,QAAM,cAAc,MAAM,0BAA0B,QAAQ,GAAG;AAE/D,MAAI,OAAO,MAAM,yBAAyB,GAAG,KAAK,WAAW;AAEtD,SAAA,IAAI,QAAwB,CAAC,QAAQ;AACpC,UAAA,WAAW,QAAQ,WAAW;AAE9B,UAAA,gBAAgB,qBAAqB,QAAQ;AAG7C,UAAA,gBAAgB,qBAAqB,UAAU;AAAA,MACnD,KAAK;AAAA,MACL,MAAM;AAAA,IAAA,CACP;AAED,QAAI,OAAO,OAAO,IAAI,IAAI,CAACA,MAAK,SAAS;AACvC,aAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,sBAAcA,KAAI,KAAKA,KAAI,KAAK,CAAC,QAAQ;AACnC,cAAA;AAAK,mBAAO,GAAG;AAAA;AACd,oBAAQ,MAAM;AAAA,QAAA,CACpB;AAAA,MAAA,CACF;AAAA,IAAA,CACF;AAED,QAAI,OAAO,OAAO,IAAI,IAAI,CAAC,SAAS,SAAS;AAE3C,YAAM,QAAQ,IAAI,QAAQ,CAAC,YAAY;AACrC,sBAAc,eAAe,MAAM;AACjC,kBAAQ,IAAI;AAAA,QAAA,CACb;AAAA,MAAA,CACF;AAED,YAAM,OAAO,IAAI,QAAQ,CAAC,YAAY;AACpC;AAAA,UACE,QAAQ;AAAA,UACR;AAAA;AAAA,YAEE,IAAI,SAAS;AAEX,sBAAQ,OAAO;AACf,sBAAQ,IAAI;AAAA,YACd;AAAA,YACA,WAAW,QAAQ,IAAI,KAAK,OAAO;AAAA;AAAA,YAEnC,WAAW,QAAQ,IAAI,KAAK,OAAO;AAAA,YACnC,QAAQ,QAAQ;AAAA,UAClB;AAAA,UACA,MAAM,QAAQ,MAAM;AAAA,QAAA;AAAA,MACtB,CACD;AAED,aAAO,QAAQ,IAAI,CAAC,OAAO,IAAI,CAAC;AAAA,IAAA,CACjC;AAEK,UAAA,aAAqC,OAAOA,MAAK,SAAS;AAC9D,YAAM,KAAK;AAEP,UAAA,cAAc,QAAQ,iBAAiB,kBAAkB;AAC3D,YAAIA,KAAI,WAAW,UAAUA,KAAI,WAAW,OAAO;AACjD;AAAA,QACF;AAEA,YAAIA,KAAI,QAAQ,QAAQA,KAAI,WAAW,KAAK;AAC1C;AAAA,QACF;AAGA,cAAM,WAAW,KAAK,QAAQ,YAAY,QAAQ,MAAO,YAAY;AACrEA,aAAI,OAAO;AACXA,aAAI,OAAO,cAAc,QAAQ,iBAAiB,iBAAiB,QAAQ;AAAA,MAC7E;AAAA,IAAA;AAGE,QAAA,OAAO,OAAO,OAAO;AAAA,MACvB;AAAA,QACE,QAAQ;AAAA,QACR,MAAM,GAAG,IAAI,QAAQ;AAAA,QACrB,SAAS;AAAA,QACT,QAAQ,EAAE,MAAM,MAAM;AAAA,MACxB;AAAA,IAAA,CACD;AAED,kBAAc,eAAe,MAAM;AAC7B,UAAA;AAAA,QACF,MAAM,QAAQ;AACZ,gBAAM,QAAQ,IAAI;AAAA,YAChB,UAAU,cAAc,MAAM,KAAK,aAAa,CAAC,EAAE;AAAA,YACnD,cAAc,MAAM;AAAA,YACpB,UAAU,SAAS,MAAM,KAAK,QAAQ,CAAC,EAAE;AAAA,UAAA,CAC1C;AAAA,QACH;AAAA,MAAA,CACD;AAAA,IAAA,CACF;AAAA,EAAA,CACF;AACH;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "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",
@@ -17,7 +17,6 @@
     "json",
     "koa",
     "koajs",
-    "helmet",
     "mvc",
     "oauth",
     "oauth2",
@@ -110,24 +109,25 @@
   },
   "dependencies": {
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
-    "@strapi/admin": "5.0.0-beta.1",
-    "@strapi/content-releases": "5.0.0-beta.1",
-    "@strapi/core": "5.0.0-beta.1",
-    "@strapi/data-transfer": "5.0.0-beta.1",
-    "@strapi/database": "5.0.0-beta.1",
-    "@strapi/generate-new": "5.0.0-beta.1",
-    "@strapi/generators": "5.0.0-beta.1",
-    "@strapi/logger": "5.0.0-beta.1",
-    "@strapi/pack-up": "5.0.0-beta.1",
-    "@strapi/permissions": "5.0.0-beta.1",
-    "@strapi/plugin-content-manager": "5.0.0-beta.1",
-    "@strapi/plugin-content-type-builder": "5.0.0-beta.1",
-    "@strapi/plugin-email": "5.0.0-beta.1",
-    "@strapi/plugin-i18n": "5.0.0-beta.1",
-    "@strapi/plugin-upload": "5.0.0-beta.1",
-    "@strapi/types": "5.0.0-beta.1",
-    "@strapi/typescript-utils": "5.0.0-beta.1",
-    "@strapi/utils": "5.0.0-beta.1",
+    "@strapi/admin": "5.0.0-beta.3",
+    "@strapi/content-releases": "5.0.0-beta.3",
+    "@strapi/core": "5.0.0-beta.3",
+    "@strapi/data-transfer": "5.0.0-beta.3",
+    "@strapi/database": "5.0.0-beta.3",
+    "@strapi/generate-new": "5.0.0-beta.3",
+    "@strapi/generators": "5.0.0-beta.3",
+    "@strapi/logger": "5.0.0-beta.3",
+    "@strapi/pack-up": "5.0.0-beta.3",
+    "@strapi/permissions": "5.0.0-beta.3",
+    "@strapi/plugin-content-manager": "5.0.0-beta.3",
+    "@strapi/plugin-content-type-builder": "5.0.0-beta.3",
+    "@strapi/plugin-email": "5.0.0-beta.3",
+    "@strapi/plugin-i18n": "5.0.0-beta.3",
+    "@strapi/plugin-upload": "5.0.0-beta.3",
+    "@strapi/review-workflows": "5.0.0-beta.3",
+    "@strapi/types": "5.0.0-beta.3",
+    "@strapi/typescript-utils": "5.0.0-beta.3",
+    "@strapi/utils": "5.0.0-beta.3",
     "@types/nodemon": "1.19.6",
     "@vitejs/plugin-react-swc": "3.6.0",
     "boxen": "5.1.2",
@@ -162,7 +162,7 @@
     "outdent": "0.8.0",
     "package-json": "7.0.0",
     "pkg-up": "3.1.0",
-    "prettier": "2.8.4",
+    "prettier": "3.2.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-refresh": "0.14.0",
@@ -187,10 +187,10 @@
     "@types/node": "18.19.24",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
-    "eslint-config-custom": "5.0.0-beta.1",
+    "eslint-config-custom": "5.0.0-beta.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "tsconfig": "5.0.0-beta.1"
+    "tsconfig": "5.0.0-beta.3"
   },
   "peerDependencies": {
     "react": "^17.0.0 || ^18.0.0",
@@ -202,5 +202,5 @@
     "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "ae773621dfcbc67c49dc6fa52ac41ea5de676ecb"
+  "gitHead": "cff608ed925db31db7f6cb84aac4a0576f54e90c"
 }