Merge branch 'v5/main' of github.com:strapi/strapi into v5/main

strapi · Jan 10, 2024 · 55ed5ff · 55ed5ff
2 parents f324494 + b7a015e
commit 55ed5ff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/core/strapi/src/node/create-build-context.ts b/packages/core/strapi/src/node/create-build-context.ts
@@ -13,6 +13,12 @@ import { PluginMeta, getEnabledPlugins, getMapOfPluginsWithAdmin } from './core/
 import { AppFile, loadUserAppFile } from './core/admin-customisations';
 import type { BaseContext } from './types';
 
+interface BaseOptions {
+  stats?: boolean;
+  minify?: boolean;
+  sourcemaps?: boolean;
+}
+
 interface BuildContext<TOptions = unknown> extends BaseContext {
   /**
    * The customisations defined by the user in their app.js file
@@ -25,7 +31,7 @@ interface BuildContext<TOptions = unknown> extends BaseContext {
   /**
    * The build options
    */
-  options: TOptions;
+  options: BaseOptions & TOptions;
   /**
    * The plugins to be included in the JS bundle
    * incl. internal plugins, third party plugins & local plugins
@@ -134,7 +140,7 @@ const createBuildContext = async <TOptions>({
     env,
     features,
     logger,
-    options,
+    options: options as BaseOptions & TOptions,
     plugins: pluginsWithFront,
     runtimeDir,
     strapi: strapiInstance,

diff --git a/packages/core/strapi/tsconfig.json b/packages/core/strapi/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "tsconfig/base.json",
   "compilerOptions": {
     "noEmit": true,
-    "rootDir": "./src"
+    "rootDir": "./src",
+    "module": "ESNext",
+    "moduleResolution": "Bundler"
   },
   "include": ["src"],
   "exclude": ["node_modules"]