@gravity-ui/app-builder 0.29.3-beta.0 → 0.30.0

package/dist/commands/dev/server.js

@@ -1,37 +1,8 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.watchServerCompilation = watchServerCompilation;
-const path = __importStar(require("node:path"));
-const rimraf_1 = require("rimraf");
-const controllable_script_1 = require("../../common/child-process/controllable-script");
-const utils_1 = require("../../common/utils");
-const paths_1 = __importDefault(require("../../common/paths"));
+import * as path from 'node:path';
+import { rimraf } from 'rimraf';
+import { ControllableScript } from '../../common/child-process/controllable-script';
+import { createRunFolder } from '../../common/utils';
+import paths from '../../common/paths';
 function createTypescriptBuildScript(config) {
     return `
 let ts;
@@ -49,7 +20,7 @@ const {watch} = require(${JSON.stringify(require.resolve('../../common/typescrip
 const logger = new Logger('server', ${config.verbose});
 watch(
     ts,
-    ${JSON.stringify(paths_1.default.appServer)},
+    ${JSON.stringify(paths.appServer)},
     {
         logger,
         onAfterFilesEmitted: () => {
@@ -66,9 +37,9 @@ const {watch} = require(${JSON.stringify(require.resolve('../../common/swc/watch
 
 const logger = new Logger('server', ${config.verbose});
 watch(
-    ${JSON.stringify(paths_1.default.appServer)},
+    ${JSON.stringify(paths.appServer)},
     {
-        outputPath: ${JSON.stringify(paths_1.default.appDist)},
+        outputPath: ${JSON.stringify(paths.appDist)},
         logger,
         onAfterFilesEmitted: () => {
             process.send({type: 'Emitted'});
@@ -76,11 +47,11 @@ watch(
     }
 );`;
 }
-async function watchServerCompilation(config) {
-    const serverPath = path.resolve(paths_1.default.appDist, 'server');
-    rimraf_1.rimraf.sync(serverPath);
-    (0, utils_1.createRunFolder)();
-    const build = new controllable_script_1.ControllableScript(config.server.compiler === 'swc'
+export async function watchServerCompilation(config) {
+    const serverPath = path.resolve(paths.appDist, 'server');
+    rimraf.sync(serverPath);
+    createRunFolder(config);
+    const build = new ControllableScript(config.server.compiler === 'swc'
         ? createSWCBuildScript(config)
         : createTypescriptBuildScript(config), null);
     await build.start();

package/dist/common/babel/index.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.babelPreset = babelPreset;
-function babelPreset(config) {
+export function babelPreset(config) {
     return [
         require.resolve('./ui-preset'),
         {

package/dist/common/babel/ui-preset.d.ts

@@ -1 +1 @@
-export {};
+declare function getOption<T>(value: T, defaultValue: T): T;

package/dist/common/babel/ui-preset.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 function getOption(value, defaultValue) {
     if (typeof value === 'undefined') {
         return defaultValue;

package/dist/common/child-process/controllable-script.js

@@ -1,33 +1,7 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllableScript = void 0;
-const utils_1 = require("./utils");
-const fs = __importStar(require("fs-extra"));
-const utils_2 = require("../utils");
-class ControllableScript {
+import { tmpNameSync } from './utils';
+import * as fs from 'fs-extra';
+import { getCacheDir } from '../utils';
+export class ControllableScript {
     isRunning = false;
     process;
     script = '';
@@ -38,7 +12,7 @@ class ControllableScript {
     }
     async start() {
         const args = [];
-        const tmpFileName = (0, utils_1.tmpNameSync)(await (0, utils_2.getCacheDir)());
+        const tmpFileName = tmpNameSync(await getCacheDir());
         fs.outputFileSync(tmpFileName, this.script);
         this.isRunning = true;
         // Passing --inspect isn't necessary for the child process to launch a port, but it allows some editors to automatically attach
@@ -123,4 +97,3 @@ class ControllableScript {
         this.process.send(msg);
     }
 }
-exports.ControllableScript = ControllableScript;

package/dist/common/child-process/utils.js

@@ -1,32 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tmpNameSync = tmpNameSync;
-const crypto = __importStar(require("node:crypto"));
-const path = __importStar(require("node:path"));
-const fs = __importStar(require("fs-extra"));
+import * as crypto from 'node:crypto';
+import * as path from 'node:path';
+import * as fs from 'fs-extra';
 const RANDOM_CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 function randomChars(howMany) {
     const value = [];
@@ -48,7 +22,7 @@ function generateTmpName(tmpDir) {
     const name = ['tmp', '-', process.pid, '-', randomChars(12)].join('');
     return path.join(tmpDir, name);
 }
-function tmpNameSync(tmpDir, retries = 3) {
+export function tmpNameSync(tmpDir, retries = 3) {
     let tries = retries;
     do {
         const name = generateTmpName(tmpDir);

package/dist/common/command.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/common/config.js

@@ -1,35 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectConfig = getProjectConfig;
-exports.normalizeConfig = normalizeConfig;
-const path = __importStar(require("node:path"));
-const cosmiconfig_1 = require("cosmiconfig");
-const cosmiconfig_typescript_loader_1 = require("cosmiconfig-typescript-loader");
-const models_1 = require("./models");
-const utils_1 = require("./utils");
+import * as path from 'node:path';
+import { cosmiconfigSync } from 'cosmiconfig';
+import { TypeScriptLoader as getTsLoader } from 'cosmiconfig-typescript-loader';
+import { stripIndent } from 'common-tags';
+import { isLibraryConfig, isServiceConfig } from './models';
+import { getPort } from './utils';
+import logger from './logger';
 function splitPaths(paths) {
     return (Array.isArray(paths) ? paths : [paths]).flatMap((p) => p.split(','));
 }
@@ -47,7 +22,7 @@ function omitUndefined(obj) {
 }
 function getModuleLoader({ storybook } = {}) {
     if (!storybook) {
-        return (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)();
+        return getTsLoader();
     }
     // storybook 7 uses esbuild-register to compile ts to cjs
     // https://github.com/storybookjs/storybook/blob/c1ec290b3a74ce05b23f74250539ae571bffaa66/code/lib/core-common/src/utils/interpret-require.ts#L11
@@ -61,10 +36,10 @@ function getModuleLoader({ storybook } = {}) {
         };
     }
     else {
-        return (0, cosmiconfig_typescript_loader_1.TypeScriptLoader)();
+        return getTsLoader();
     }
 }
-async function getProjectConfig(command, { env, storybook, ...argv }) {
+export async function getProjectConfig(command, { env, storybook, ...argv }) {
     function getLoader(loader) {
         return async (pathname, content) => {
             const config = loader(pathname, content);
@@ -76,7 +51,7 @@ async function getProjectConfig(command, { env, storybook, ...argv }) {
     }
     const tsLoader = getLoader(getModuleLoader({ storybook }));
     const moduleName = 'app-builder';
-    const explorer = (0, cosmiconfig_1.cosmiconfigSync)(moduleName, {
+    const explorer = cosmiconfigSync(moduleName, {
         cache: false,
         stopDir: process.cwd(),
         searchPlaces: [
@@ -106,7 +81,7 @@ async function getProjectConfig(command, { env, storybook, ...argv }) {
         cfg = explorer.search();
     }
     const config = { verbose: false, ...(await cfg?.config) };
-    if ((0, models_1.isLibraryConfig)(config)) {
+    if (isLibraryConfig(config)) {
         return normalizeConfig({
             ...config,
             ...omitUndefined({ verbose: argv.verbose }),
@@ -141,8 +116,8 @@ async function getProjectConfig(command, { env, storybook, ...argv }) {
     };
     return normalizeConfig(projectConfig, command);
 }
-async function normalizeConfig(userConfig, mode) {
-    if ((0, models_1.isServiceConfig)(userConfig)) {
+export async function normalizeConfig(userConfig, mode) {
+    if (isServiceConfig(userConfig)) {
         const clientConfig = typeof userConfig.client === 'object' ? userConfig.client : {};
         const client = await normalizeClientConfig(clientConfig, mode);
         client.verbose = userConfig.verbose;
@@ -158,7 +133,7 @@ async function normalizeConfig(userConfig, mode) {
         };
         if (mode === 'dev') {
             if (serverConfig.port === true) {
-                server.port = await (0, utils_1.getPort)({ port: 3000 });
+                server.port = await getPort({ port: 3000 });
             }
             else {
                 server.port = serverConfig.port;
@@ -183,6 +158,18 @@ async function normalizeConfig(userConfig, mode) {
     return config;
 }
 async function normalizeClientConfig(client, mode) {
+    let publicPath = client.publicPath || path.normalize(`${client.publicPathPrefix || ''}/build/`);
+    if (client.moduleFederation) {
+        publicPath = path.normalize(`${publicPath}${client.moduleFederation.name}/`);
+    }
+    let transformCssWithLightningCss = Boolean(client.transformCssWithLightningCss);
+    if (client.moduleFederation?.isolateStyles && transformCssWithLightningCss) {
+        transformCssWithLightningCss = false;
+        logger.warning(stripIndent `
+                transformCssWithLightningCss option is disabled because moduleFederation.isolateStyles is enabled.
+                postcss loader will be used instead.
+            `);
+    }
     const normalizedConfig = {
         ...client,
         forkTsChecker: client.disableForkTsChecker ? false : client.forkTsChecker,
@@ -190,14 +177,18 @@ async function normalizeClientConfig(client, mode) {
             ? false
             : (client.reactRefresh ?? ((options) => options)),
         newJsxTransform: client.newJsxTransform ?? true,
-        publicPath: client.publicPath || path.normalize(`${client.publicPathPrefix || ''}/build/`),
-        assetsManifestFile: client.assetsManifestFile || 'assets-manifest.json',
+        publicPath,
+        assetsManifestFile: client.assetsManifestFile ||
+            (client.moduleFederation?.version
+                ? `assets-manifest-${client.moduleFederation.version}.json`
+                : 'assets-manifest.json'),
         modules: client.modules && remapPaths(client.modules),
         includes: client.includes && remapPaths(client.includes),
         images: client.images && remapPaths(client.images),
         hiddenSourceMap: client.hiddenSourceMap ?? true,
         svgr: client.svgr ?? {},
         entryFilter: client.entryFilter && splitPaths(client.entryFilter),
+        transformCssWithLightningCss,
         webpack: typeof client.webpack === 'function' ? client.webpack : (config) => config,
         rspack: typeof client.rspack === 'function' ? client.rspack : (config) => config,
         babel: typeof client.babel === 'function' ? client.babel : (config) => config,
@@ -211,20 +202,20 @@ async function normalizeClientConfig(client, mode) {
         if (client.lazyCompilation) {
             if (client.lazyCompilation === true) {
                 normalizedConfig.lazyCompilation = {
-                    port: await (0, utils_1.getPort)({ port: 6000 }),
+                    port: await getPort({ port: 6000 }),
                 };
             }
             else {
                 normalizedConfig.lazyCompilation = client.lazyCompilation;
             }
             if (!normalizedConfig.lazyCompilation.port) {
-                normalizedConfig.lazyCompilation.port = await (0, utils_1.getPort)({ port: 6000 });
+                normalizedConfig.lazyCompilation.port = await getPort({ port: 6000 });
             }
         }
         const devServer = client.devServer?.port
             ? {
                 port: client.devServer.port === true
-                    ? await (0, utils_1.getPort)({ port: 8000 })
+                    ? await getPort({ port: 8000 })
                     : client.devServer.port,
                 ipc: undefined,
             }

package/dist/common/env.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_path_1 = require("node:path");
-const dotenv_1 = require("dotenv");
-(0, dotenv_1.config)({ path: (0, node_path_1.resolve)(process.cwd(), '.env') });
+import { resolve } from 'node:path';
+import { config } from 'dotenv';
+config({ path: resolve(process.cwd(), '.env') });

package/dist/common/library/babel-plugin-replace-paths.js

@@ -1,9 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-param-reassign */
-const helper_plugin_utils_1 = require("@babel/helper-plugin-utils");
+import { declare } from '@babel/helper-plugin-utils';
 const svgPathRe = /^\.\.\/(.*)\/assets\/(.*)\.svg$/;
-exports.default = (0, helper_plugin_utils_1.declare)(function (api) {
+export default declare(function (api) {
     return {
         visitor: {
             ImportDeclaration(path) {