@gravity-ui/app-builder 0.2.2 → 0.3.0

package/dist/common/library/index.js

@@ -33,7 +33,7 @@ const fs_1 = __importDefault(require("fs"));
 const child_process_1 = __importDefault(require("child_process"));
 const babel = __importStar(require("@babel/core"));
 const fast_glob_1 = __importDefault(require("fast-glob"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const sass_1 = __importDefault(require("sass"));
 const postcss_1 = __importDefault(require("postcss"));
 const postcss_preset_env_1 = __importDefault(require("postcss-preset-env"));
@@ -83,14 +83,13 @@ function compileToCjs(code, file, inputSourceMap, sourceDir = paths_1.default.sr
         sourceMaps: true,
         inputSourceMap,
     }, (err, transformedCjs) => {
-        var _a;
         if (err) {
             logger_1.default.error(`Source compilation errors for ${sourceFile}`);
             logger_1.default.error(err.toString());
             throw err;
         }
         else if (transformedCjs) {
-            let cjsCode = (_a = transformedCjs.code) !== null && _a !== void 0 ? _a : '';
+            let cjsCode = transformedCjs.code ?? '';
             cjsCode += (cjsCode.length ? '\n' : '') + sourcemapCjsUrl;
             fs_1.default.writeFile(compiledCjsFile, cjsCode, errorHandlerFactory(`Source compilation has failed on writing ${compiledCjsFile}`));
             if (transformedCjs.map) {
@@ -121,7 +120,6 @@ function compileStyles(inputDir, outputDir, onFinish, additionalGlobs = []) {
             : ['**/*.{sass,scss,css}'];
         const stylesStream = fast_glob_1.default.stream(globs, { cwd: outputDir });
         stylesStream.on('data', async (file) => {
-            var _a;
             const origScssFile = getFilePath(file, { dir: inputDir });
             const scssFile = getFilePath(file, { dir: outputDir });
             const cssFile = getFilePath(file, { dir: outputDir, ext: 'css' });
@@ -139,12 +137,12 @@ function compileStyles(inputDir, outputDir, onFinish, additionalGlobs = []) {
                         return new Error(`Unrecognized import ${url} in ${origScssFile}`);
                     },
                 });
-                if (sassTransformed === null || sassTransformed === void 0 ? void 0 : sassTransformed.css) {
+                if (sassTransformed?.css) {
                     const postcssTransformed = await (0, postcss_1.default)([
                         (0, postcss_preset_env_1.default)({ enableClientSidePolyfills: false }),
                     ]).process(sassTransformed.css, {
                         to: cssFile.split('/').pop(),
-                        map: { prev: (_a = sassTransformed.map) === null || _a === void 0 ? void 0 : _a.toString(), inline: false },
+                        map: { prev: sassTransformed.map?.toString(), inline: false },
                     });
                     fs_1.default.writeFileSync(cssFile, postcssTransformed.css);
                     if (postcssTransformed.map) {
@@ -167,9 +165,8 @@ const svgoPreset = {
     params: { overrides: { removeViewBox: false } },
 };
 function buildLibrary(config) {
-    var _a, _b, _c;
-    const internalGlobs = (_c = (_b = (_a = config.lib) === null || _a === void 0 ? void 0 : _a.internalDirs) === null || _b === void 0 ? void 0 : _b.map((dir) => `!${dir}/**/*`)) !== null && _c !== void 0 ? _c : [];
-    rimraf_1.default.sync(paths_1.default.libBuild);
+    const internalGlobs = config.lib?.internalDirs?.map((dir) => `!${dir}/**/*`) ?? [];
+    rimraf_1.rimraf.sync(paths_1.default.libBuild);
     // sources compilation
     const sourceStream = fast_glob_1.default.stream(['**/*.{js,jsx,ts,tsx}', '!**/*.d.ts', ...internalGlobs], {
         cwd: paths_1.default.src,
@@ -184,7 +181,7 @@ function buildLibrary(config) {
         fs_1.default.mkdirSync(compiledDir, { recursive: true });
         babel.transform(source, {
             filename: sourceFile,
-            presets: [(0, babel_1.babelPreset)(config)],
+            presets: [(0, babel_1.babelPreset)(config.lib)],
             plugins: [
                 [
                     require.resolve('babel-plugin-inline-react-svg'),
@@ -199,14 +196,17 @@ function buildLibrary(config) {
             ],
             sourceMaps: true,
         }, (err, transformed) => {
-            var _a, _b, _c, _d, _e;
             if (err) {
                 logger_1.default.error(`Source compilation errors for ${sourceFile}`);
                 logger_1.default.error(err.toString());
                 throw err;
             }
             else if (transformed) {
-                let code = (_e = (_d = (_c = (_b = (_a = transformed.code) === null || _a === void 0 ? void 0 : _a.replace(/import '\.(.*)\.scss';/g, "import '.$1.css';")) === null || _b === void 0 ? void 0 : _b.replace(/import (\w*) from '\.\.\/(.*)\/assets\/(.*)\.svg';/g, "import $1 from '$2/assets/$3';")) === null || _c === void 0 ? void 0 : _c.replace(/export { *default as (\w*) *} from '\.\.\/(.*)\/assets\/(.*)\.svg';/g, "export { default as $1 } from '$2/assets/$3';")) === null || _d === void 0 ? void 0 : _d.replace(/import\('\.\.\/(.*)\/assets\/(.*)\.svg'\)/g, "import('$1/assets/$2')")) !== null && _e !== void 0 ? _e : '';
+                let code = transformed.code
+                    ?.replace(/import '\.(.*)\.scss';/g, "import '.$1.css';")
+                    ?.replace(/import (\w*) from '\.\.\/(.*)\/assets\/(.*)\.svg';/g, "import $1 from '$2/assets/$3';")
+                    ?.replace(/export { *default as (\w*) *} from '\.\.\/(.*)\/assets\/(.*)\.svg';/g, "export { default as $1 } from '$2/assets/$3';")
+                    ?.replace(/import\('\.\.\/(.*)\/assets\/(.*)\.svg'\)/g, "import('$1/assets/$2')") ?? '';
                 code += (code.length ? '\n' : '') + sourcemapUrl;
                 fs_1.default.writeFile(compiledFile, code, errorHandlerFactory(`Source compilation has failed on writing ${compiledFile}`));
                 if (transformed.map) {
@@ -260,7 +260,7 @@ function buildLibrary(config) {
                 const component = await (0, core_1.transform)(fs_1.default.readFileSync(iconFile, 'utf-8'));
                 babel.transform(component, {
                     filename: iconFile,
-                    presets: [(0, babel_1.babelPreset)(config)],
+                    presets: [(0, babel_1.babelPreset)(config.lib)],
                     sourceMaps: true,
                 }, (err, transformed) => {
                     if (err) {

package/dist/common/links/unlink.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unlinkPackage = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const rimraf_1 = __importDefault(require("rimraf"));
+const rimraf_1 = require("rimraf");
 const path_1 = __importDefault(require("path"));
 const logger_1 = __importDefault(require("../logger"));
 const tempData_1 = __importDefault(require("../tempData"));
@@ -21,7 +21,7 @@ function unlinkPackage(linkedPackage) {
     }
     const packNodeModulesDir = path_1.default.resolve(linkedPackage.location, 'node_modules');
     const hiddenNodeModuleDir = path_1.default.resolve(linkedPackage.location, '.node_modules');
-    rimraf_1.default.sync(packNodeModulesDir);
+    rimraf_1.rimraf.sync(packNodeModulesDir);
     fs_extra_1.default.moveSync(hiddenNodeModuleDir, packNodeModulesDir);
     const { linkedPackages } = tempData_1.default.getSettings();
     if (linkedPackages) {

package/dist/common/logger/index.js

@@ -16,7 +16,6 @@ const allColors = [
     colors_1.colors.grey.bold,
 ];
 function selectColor(namespace) {
-    var _a;
     let hash = 0;
     for (let i = 0; i < namespace.length; i++) {
         /* eslint-disable no-bitwise */
@@ -24,7 +23,7 @@ function selectColor(namespace) {
         hash |= 0; // Convert to 32bit integer
         /* eslint-enable no-bitwise */
     }
-    return (_a = allColors[Math.abs(hash) % allColors.length]) !== null && _a !== void 0 ? _a : colors_1.colors.green.bold;
+    return allColors[Math.abs(hash) % allColors.length] ?? colors_1.colors.green.bold;
 }
 class Logger {
     constructor(namespace = '', verbose = false) {

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

@@ -5,6 +5,7 @@ import type { Options as MomentTzOptions } from 'moment-timezone-data-webpack-pl
 import type { Configuration, ResolveOptions, DefinePlugin } from 'webpack';
 import type { ServerConfiguration } from 'webpack-dev-server';
 import type { Options as CircularDependenciesOptions } from 'circular-dependency-plugin';
+import type { Config as SvgrConfig } from '@svgr/core';
 export interface Entities<T> {
     data: Record<string, T>;
     keys: string[];
@@ -34,13 +35,13 @@ interface ContextReplacement {
     locale?: string[];
 }
 export interface LibraryConfig {
-    lib?: {
+    lib: {
         internalDirs?: string[];
+        /**
+         * Use new JSX Transform
+         */
+        newJsxTransform?: boolean;
     };
-    /**
-     * Use new JSX Transform
-     */
-    newJsxTransform?: boolean;
     verbose?: boolean;
 }
 export interface ClientConfig {
@@ -54,7 +55,7 @@ export interface ClientConfig {
      */
     includes?: string[];
     /**
-     * Additional paths fro images
+     * Additional paths for images
      */
     images?: string[];
     /**
@@ -111,7 +112,7 @@ export interface ClientConfig {
     /**
      * svgr plugin options.
      */
-    svgr?: Object;
+    svgr?: SvgrConfig;
     entryFilter?: string[];
     excludeFromClean?: string[];
     analyzeBundle?: 'true' | 'statoscope';
@@ -162,7 +163,7 @@ export interface ServiceConfig {
     target?: 'client' | 'server';
     client?: ClientConfig;
     server?: ServerConfig;
-    link?: string;
+    lib?: never;
     verbose?: boolean;
 }
 export type NormalizedClientConfig = Omit<ClientConfig, 'publicPathPrefix' | 'hiddenSourceMap' | 'svgr' | 'lazyCompilation' | 'devServer'> & {
@@ -188,7 +189,8 @@ export type NormalizedServiceConfig = Omit<ServiceConfig, 'client' | 'server'> &
 };
 export type ProjectConfig = {} & (ServiceConfig | LibraryConfig);
 export type AppBuilderConfigPackage = (options?: unknown) => ProjectConfig;
-export type ProjectFileConfig = ProjectConfig | ((mode: 'dev' | 'build', env?: Record<string, any>) => ProjectConfig);
+export type ProjectFileConfig = ProjectConfig | ((mode: 'dev' | 'build', env?: Record<string, any>) => ProjectConfig | Promise<ProjectConfig>);
 export declare function isServiceConfig(config: ProjectConfig): config is ServiceConfig;
 export declare function isLibraryConfig(config: ProjectConfig): config is LibraryConfig;
+export declare function defineConfig(config: ProjectFileConfig): ProjectFileConfig;
 export {};

package/dist/common/models/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLibraryConfig = exports.isServiceConfig = void 0;
+exports.defineConfig = exports.isLibraryConfig = exports.isServiceConfig = void 0;
 function isServiceConfig(config) {
     return !('lib' in config);
 }
@@ -9,3 +9,7 @@ function isLibraryConfig(config) {
     return 'lib' in config;
 }
 exports.isLibraryConfig = isLibraryConfig;
+function defineConfig(config) {
+    return config;
+}
+exports.defineConfig = defineConfig;

package/dist/common/package.js

@@ -13,7 +13,10 @@ function readPackage(location) {
     }
     try {
         const packageJson = fs_1.default.readFileSync(packageJsonLocation, 'utf-8');
-        return Object.assign(Object.assign({}, JSON.parse(packageJson)), { location });
+        return {
+            ...JSON.parse(packageJson),
+            location,
+        };
     }
     catch (e) {
         throw new Error(`Couldn't read package.json at ${location}`);
@@ -32,7 +35,7 @@ function readNodeModules(location) {
             }
             else {
                 const { data, keys } = readNodeModules(nodeModulePath);
-                acc.data = Object.assign(Object.assign({}, acc.data), data);
+                acc.data = { ...acc.data, ...data };
                 acc.keys = [...acc.keys, ...keys];
             }
         }

package/dist/common/s3-upload/s3-client.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { S3ClientConfig, PutObjectCommandInput } from '@aws-sdk/client-s3';
 export type S3ClientOptions = S3ClientConfig;
 export declare function getS3Client(options: S3ClientOptions): {

package/dist/common/s3-upload/s3-client.js

@@ -22,17 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -73,12 +62,11 @@ function getS3Client(options) {
                 ContentType: contentType,
             };
             if (expires) {
-                params.Metadata = Object.assign(Object.assign({}, params.Metadata), { Expires: expires.toString() });
+                params.Metadata = { ...params.Metadata, Expires: expires.toString() };
             }
             return s3Client.send(new client_s3_1.PutObjectCommand(params));
         },
-        uploadDir(bucket, dirPath, keyPrefix = '', _a = {}) {
-            var { concurrency = 512 } = _a, opts = __rest(_a, ["concurrency"]);
+        uploadDir(bucket, dirPath, keyPrefix = '', { concurrency = 512, ...opts } = {}) {
             const files = fast_glob_1.default.sync('**', { cwd: dirPath });
             return (0, p_map_1.default)(files, (filePath) => {
                 const sourcePath = path.join(dirPath, filePath);

package/dist/common/s3-upload/upload.d.ts

@@ -1,4 +1,4 @@
-import { S3ClientOptions } from './s3-client.js';
+import type { S3ClientOptions } from './s3-client.js';
 export interface UploadOptions {
     bucket: string;
     sourcePath: string;

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

@@ -32,10 +32,9 @@ const p_queue_1 = __importDefault(require("p-queue"));
 const s3_client_js_1 = require("./s3-client.js");
 const compress_js_1 = require("./compress.js");
 function uploadFiles(files, config) {
-    var _a;
     const s3Client = (0, s3_client_js_1.getS3Client)(config.s3);
     const queue = new p_queue_1.default({
-        concurrency: (_a = config.concurrency) !== null && _a !== void 0 ? _a : 512,
+        concurrency: config.concurrency ?? 512,
     });
     const processFile = fileProcessor(config.options);
     return Promise.all(files.flatMap((filePath) => {

package/dist/common/s3-upload/webpack-plugin.d.ts

@@ -1,5 +1,5 @@
-import { UploadOptions } from './upload.js';
 import type { Compiler } from 'webpack';
+import type { UploadOptions } from './upload.js';
 import type { S3ClientOptions } from './s3-client.js';
 interface S3UploadPluginOptions {
     include?: Rule | Rule[];

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

@@ -13,7 +13,6 @@ class S3UploadPlugin {
     }
     apply(compiler) {
         compiler.hooks.done.tapPromise('S3UploadPlugin', async ({ compilation }) => {
-            var _a;
             let fileNames = Object.keys(compilation.assets);
             if (this.options.additionalPattern) {
                 const additionallFiles = fast_glob_1.default.sync(this.options.additionalPattern, {
@@ -29,7 +28,10 @@ class S3UploadPlugin {
                 await (0, upload_js_1.uploadFiles)(fileNames, {
                     s3: this.options.s3ClientOptions,
                     compress: this.options.compress,
-                    options: Object.assign(Object.assign({}, this.options.s3UploadOptions), { sourcePath: (_a = compilation.outputOptions.path) !== null && _a !== void 0 ? _a : '' }),
+                    options: {
+                        ...this.options.s3UploadOptions,
+                        sourcePath: compilation.outputOptions.path ?? '',
+                    },
                 });
             }
             catch (e) {

package/dist/common/tempData.js

@@ -19,7 +19,7 @@ class TempDataUtils {
         }
     }
     saveSettings(newSettings = {}) {
-        this.state = Object.assign(Object.assign({}, this.state), newSettings);
+        this.state = { ...this.state, ...newSettings };
         if (fs_1.default.existsSync(tempDataPath)) {
             fs_1.default.unlinkSync(tempDataPath);
         }

package/dist/common/typescript/diagnostic.js

@@ -10,7 +10,7 @@ function formatDiagnosticBrief(ts, diagnostic, host) {
     let output = '';
     if (diagnostic.file) {
         const { file, start } = diagnostic;
-        output += formatLocation(file, start !== null && start !== void 0 ? start : 0);
+        output += formatLocation(file, start ?? 0);
         output += ' - ';
     }
     output += categoryColor(diagnostic.category)(ts.DiagnosticCategory[diagnostic.category]);

package/dist/common/typescript/transformers.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTransformPathsToLocalModules = void 0;
 const path = __importStar(require("path"));
+const semver = __importStar(require("semver"));
 function createTransformPathsToLocalModules(ts) {
     function resolveModule(module, sourceFileName, options) {
         if (module.startsWith('.')) {
@@ -71,14 +72,14 @@ function createTransformPathsToLocalModules(ts) {
                 const resolvedPath = resolveModule(modulePath, sourceFile.fileName, options);
                 if (resolvedPath) {
                     if (ts.isImportDeclaration(node)) {
-                        const newStatement = context.factory.updateImportDeclaration(node, node.decorators, node.modifiers, node.importClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
-                        ts.setSourceMapRange(newStatement, ts.getSourceMapRange(node));
-                        return newStatement;
+                        const newNode = updateImportDeclaration(ts, node, context, resolvedPath);
+                        ts.setSourceMapRange(newNode, ts.getSourceMapRange(node));
+                        return newNode;
                     }
                     if (ts.isExportDeclaration(node)) {
-                        const newStatement = context.factory.updateExportDeclaration(node, node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
-                        ts.setSourceMapRange(newStatement, ts.getSourceMapRange(node));
-                        return newStatement;
+                        const newNode = updateExportDeclaration(ts, node, context, resolvedPath);
+                        ts.setSourceMapRange(newNode, ts.getSourceMapRange(node));
+                        return newNode;
                     }
                     if (isDynamicImport(node) || isRequire(node)) {
                         const newStatement = context.factory.updateCallExpression(node, node.expression, node.typeArguments, context.factory.createNodeArray([
@@ -88,7 +89,7 @@ function createTransformPathsToLocalModules(ts) {
                         return newStatement;
                     }
                     if (ts.isImportTypeNode(node)) {
-                        const newNode = context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), node.qualifier, node.typeArguments, node.isTypeOf);
+                        const newNode = updateImportTypeNode(ts, node, context, resolvedPath);
                         ts.setSourceMapRange(newNode, ts.getSourceMapRange(node));
                         return newNode;
                     }
@@ -112,3 +113,34 @@ function createTransformPathsToLocalModules(ts) {
     };
 }
 exports.createTransformPathsToLocalModules = createTransformPathsToLocalModules;
+function updateImportDeclaration(ts, node, context, resolvedPath) {
+    if (semver.lt(ts.version, '5.0')) {
+        // for versions before 5.0
+        return context.factory.updateImportDeclaration(node, 
+        // @ts-expect-error
+        node.decorators, node.modifiers, node.importClause, context.factory.createStringLiteral(resolvedPath), 
+        // @ts-expect-error
+        node.assertClause);
+    }
+    return context.factory.updateImportDeclaration(node, node.modifiers, node.importClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
+}
+function updateExportDeclaration(ts, node, context, resolvedPath) {
+    if (semver.lt(ts.version, '5.0')) {
+        // for versions before 5.0
+        return context.factory.updateExportDeclaration(node, 
+        // @ts-expect-error
+        node.decorators, node.modifiers, node.isTypeOnly, node.exportClause, context.factory.createStringLiteral(resolvedPath), 
+        // @ts-expect-error
+        node.assertClause);
+    }
+    return context.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
+}
+function updateImportTypeNode(ts, node, context, resolvedPath) {
+    if (semver.lt(ts.version, '5.0')) {
+        // for versions before 5.0
+        return context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), 
+        // @ts-expect-error
+        node.qualifier, node.typeArguments, node.isTypeOf);
+    }
+    return context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), node.assertions, node.qualifier, node.typeArguments, node.isTypeOf);
+}

package/dist/common/typescript/watch.js

@@ -14,7 +14,12 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
         getCurrentDirectory: ts.sys.getCurrentDirectory,
         getNewLine: () => ts.sys.newLine,
     };
-    const host = ts.createWatchCompilerHost(configPath, Object.assign({ noEmitOnError: false, inlineSourceMap: enableSourceMap, inlineSources: enableSourceMap }, (enableSourceMap ? { sourceMap: false } : undefined)), ts.sys, createProgram, reportDiagnostic, reportWatchStatusChanged);
+    const host = ts.createWatchCompilerHost(configPath, {
+        noEmitOnError: false,
+        inlineSourceMap: enableSourceMap,
+        inlineSources: enableSourceMap,
+        ...(enableSourceMap ? { sourceMap: false } : undefined),
+    }, ts.sys, createProgram, reportDiagnostic, reportWatchStatusChanged);
     host.readFile = (0, utils_1.displayFilename)(host.readFile, 'Reading', logger);
     (0, utils_1.onHostEvent)(host, 'createProgram', () => {
         logger.verbose("We're about to create the program");
@@ -34,7 +39,7 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
         });
         logger.verbose('Emit completed!');
     }, () => {
-        onAfterFilesEmitted === null || onAfterFilesEmitted === void 0 ? void 0 : onAfterFilesEmitted();
+        onAfterFilesEmitted?.();
     });
     // `createWatchProgram` creates an initial program, watches files, and updates
     // the program over time.