@gravity-ui/app-builder 0.35.0 → 0.35.2-beta.0

package/README.md

@@ -523,6 +523,7 @@ Module Federation is a Webpack 5 feature that enables micro-frontend architectur
     - Enables loading different versions of the same remote in different environments
     - Works with both `remotes` and `originalRemotes` configurations
 
+  - `isolateAssets` (`boolean`) - put all assets to a folder with the name of Module Federation app name
   - `isolateStyles` (`object`) — CSS style isolation settings to prevent conflicts between micro-frontends.
     - `getPrefix` (`(entryName: string) => string`) — function to generate CSS class prefix.
     - `prefixSelector` (`(prefix: string, selector: string, prefixedSelector: string, filePath: string) => string`) — function to add prefix to CSS selectors.

package/dist/common/config.d.ts

@@ -2,6 +2,6 @@ import type { LibraryConfig, NormalizedServiceConfig, ServiceConfig } from './mo
 import type { CliArgs } from '../create-cli';
 export declare function getProjectConfig(command: string, { env, storybook, ...argv }: Partial<CliArgs> & {
     storybook?: boolean;
-}): Promise<LibraryConfig | NormalizedServiceConfig>;
+}): Promise<NormalizedServiceConfig | LibraryConfig>;
 export declare function normalizeConfig(userConfig: ServiceConfig, mode?: 'dev' | 'build' | string): Promise<NormalizedServiceConfig>;
 export declare function normalizeConfig(userConfig: LibraryConfig, mode?: 'dev' | 'build' | string): Promise<LibraryConfig>;

package/dist/common/config.js

@@ -195,7 +195,7 @@ async function normalizeClientConfig(client, mode) {
     const cdnConfig = Array.isArray(client.cdn) ? client.cdn[0] : client.cdn;
     let publicPath = client.publicPath || path.normalize(`${client.publicPathPrefix || ''}/build/`);
     let browserPublicPath = (mode !== 'dev' && cdnConfig?.publicPath) || publicPath;
-    if (client.moduleFederation) {
+    if ((0, utils_1.hasMFAssetsIsolation)(client.moduleFederation)) {
         publicPath = `${publicPath}${client.moduleFederation.name}/`;
         browserPublicPath = `${browserPublicPath}${client.moduleFederation.name}/`;
     }

package/dist/common/models/index.d.ts

@@ -118,6 +118,12 @@ export type ModuleFederationConfig = Omit<moduleFederationPlugin.ModuleFederatio
          */
         prefixSelector: (prefix: string, selector: string, prefixedSelector: string, filePath: string) => string;
     };
+    /**
+     * Put all assets to a folder with the name of Module Federation app name
+     *
+     * @default true
+     */
+    isolateAssets?: boolean;
 };
 export type WebWorkerHandle = 'loader' | 'cdn-compat' | 'none';
 export interface ClientConfig {

package/dist/common/s3-upload/create-plugin.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createS3UploadPlugins = createS3UploadPlugins;
 const path = __importStar(require("node:path"));
 const webpack_plugin_1 = require("./webpack-plugin");
+const utils_1 = require("../utils");
 function createS3UploadPlugins(config, logger) {
     const plugins = [];
     let credentialsGlobal;
@@ -51,7 +52,7 @@ function createS3UploadPlugins(config, logger) {
             };
         }
         let targetPath = cdn.prefix;
-        if (config.moduleFederation && targetPath !== undefined) {
+        if ((0, utils_1.hasMFAssetsIsolation)(config.moduleFederation) && targetPath !== undefined) {
             targetPath = path.join(targetPath, config.moduleFederation.name);
         }
         plugins.push(new webpack_plugin_1.S3UploadPlugin({

package/dist/common/utils.d.ts

@@ -1,4 +1,5 @@
-import type { NormalizedServiceConfig } from './models';
+import type { ModuleFederationConfig, NormalizedServiceConfig } from './models';
+export declare function hasMFAssetsIsolation(mfConfig: ModuleFederationConfig | undefined): mfConfig is ModuleFederationConfig;
 export declare function getAppRunPath(config: NormalizedServiceConfig): string;
 export declare function createRunFolder(config: NormalizedServiceConfig): void;
 export declare function shouldCompileTarget(target: 'client' | 'server' | undefined, targetName: string): boolean;

package/dist/common/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasMFAssetsIsolation = hasMFAssetsIsolation;
 exports.getAppRunPath = getAppRunPath;
 exports.createRunFolder = createRunFolder;
 exports.shouldCompileTarget = shouldCompileTarget;
@@ -13,8 +14,13 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 const paths_1 = __importDefault(require("./paths"));
+function hasMFAssetsIsolation(mfConfig) {
+    return mfConfig?.name ? mfConfig.isolateAssets !== false : false;
+}
 function getAppRunPath(config) {
-    return node_path_1.default.resolve(paths_1.default.appRun, config.client.moduleFederation?.name || '');
+    return node_path_1.default.resolve(paths_1.default.appRun, hasMFAssetsIsolation(config.client.moduleFederation)
+        ? config.client.moduleFederation?.name
+        : '');
 }
 function createRunFolder(config) {
     const appRunPath = getAppRunPath(config);

package/dist/common/webpack/config.js

@@ -57,13 +57,14 @@ const s3_upload_1 = require("../s3-upload");
 const log_config_1 = require("../logger/log-config");
 const utils_2 = require("../typescript/utils");
 const node_externals_1 = require("./node-externals");
+const utils_3 = require("../utils");
 const imagesSizeLimit = 2048;
 const fontSizeLimit = 8192;
 function getHelperOptions({ webpackMode, config, logger, isSsr = false, configPath, }) {
     const isEnvDevelopment = webpackMode === "development" /* WebpackMode.Dev */;
     const isEnvProduction = webpackMode === "production" /* WebpackMode.Prod */;
     let buildDirectory = config.outputPath || (isSsr ? paths_1.default.appSsrBuild : paths_1.default.appBuild);
-    if (config.moduleFederation) {
+    if ((0, utils_3.hasMFAssetsIsolation)(config.moduleFederation)) {
         buildDirectory = path.resolve(buildDirectory, config.moduleFederation.name);
     }
     return {

package/dist/common/webpack/rspack.js

@@ -11,7 +11,7 @@ const generateAssetsManifest = (seed, files, entries) => {
             ...previous,
             [name]: {
                 assets: {
-                    js: entries[name].filter((file) => file.endsWith('.js')),
+                    js: entries[name].filter((file) => file.endsWith('.js') && !file.endsWith('.hot-update.js')),
                     css: entries[name].filter((file) => file.endsWith('.css')),
                 },
             },

package/dist/create-cli.d.ts

@@ -3,8 +3,8 @@ export declare function createCli(argv: string[]): {
     [x: string]: unknown;
     verbose: boolean | undefined;
     cdn: string | undefined;
-    env: string[] | undefined;
     target: "client" | "server" | undefined;
+    env: string[] | undefined;
     c: unknown;
     inspect: number | undefined;
     inspectBrk: number | undefined;
@@ -33,8 +33,8 @@ export declare function createCli(argv: string[]): {
     [x: string]: unknown;
     verbose: boolean | undefined;
     cdn: string | undefined;
-    env: string[] | undefined;
     target: "client" | "server" | undefined;
+    env: string[] | undefined;
     c: unknown;
     inspect: number | undefined;
     inspectBrk: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.35.0",
+  "version": "0.35.2-beta.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",