@gravity-ui/app-builder 0.8.3 → 0.8.4

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { ExecException } from 'child_process';
 export interface BaseLogger {
     message: (msg: string) => void;

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

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import type { EditorLanguage } from 'monaco-editor-webpack-plugin/out/languages';
 import type { EditorFeature } from 'monaco-editor-webpack-plugin/out/features';
 import type { IFeatureDefinition } from 'monaco-editor-webpack-plugin/out/types';

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

@@ -1,3 +1,4 @@
+import type { Logger } from '../logger/index.js';
 import type { S3ClientOptions } from './s3-client.js';
 export interface UploadOptions {
     bucket: string;
@@ -10,5 +11,6 @@ export interface UploadFilesOptions {
     concurrency?: number;
     compress?: boolean;
     options: UploadOptions;
+    logger?: Logger;
 }
 export declare function uploadFiles(files: string[], config: UploadFilesOptions): Promise<string[]>;

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

@@ -29,10 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadFiles = void 0;
 const path = __importStar(require("node:path"));
 const p_queue_1 = __importDefault(require("p-queue"));
+const index_js_1 = __importDefault(require("../logger/index.js"));
 const s3_client_js_1 = require("./s3-client.js");
 const compress_js_1 = require("./compress.js");
 function uploadFiles(files, config) {
     const s3Client = (0, s3_client_js_1.getS3Client)(config.s3);
+    const log = config.logger ?? index_js_1.default;
     const queue = new p_queue_1.default({
         concurrency: config.concurrency ?? 512,
     });
@@ -56,32 +58,32 @@ function uploadFiles(files, config) {
         return async (relativeFilePath) => {
             const sourceFilePath = path.join(options.sourcePath, relativeFilePath);
             const targetFilePath = path.join(options.targetPath || '', relativeFilePath);
-            console.info(`Uploading file ${relativeFilePath} ...`);
+            log.verbose(`Uploading file ${relativeFilePath} ...`);
             const exists = await doesExist(options.bucket, targetFilePath);
             if (exists) {
                 switch (options.existsBehavior) {
                     case 'overwrite': {
-                        console.info(`File ${targetFilePath} will be overwritten.`);
+                        log.verbose(`File ${targetFilePath} will be overwritten.`);
                         break;
                     }
                     case 'throw': {
                         throw new Error(`File ${targetFilePath} already exists in ${options.bucket}`);
                     }
                     default: {
-                        console.info(`Nothing todo with '${relativeFilePath}'`);
+                        log.message(`Nothing to do with '${relativeFilePath}' because '${targetFilePath}' already exists in '${options.bucket}'`);
                         return Promise.resolve(relativeFilePath);
                     }
                 }
             }
             return uploadFile(options.bucket, sourceFilePath, targetFilePath)
                 .then(() => {
-                console.info(`  ${relativeFilePath} => ${targetFilePath}`);
+                log.message(`Uploaded ${relativeFilePath} => ${targetFilePath}`);
                 return relativeFilePath;
             })
                 .catch((error) => {
-                console.error(`Failed to upload file ${relativeFilePath}`);
+                log.error(`Failed to upload file ${relativeFilePath}`);
                 if (error instanceof Error) {
-                    console.error(`msg: ${error.message}`);
+                    log.error(`msg: ${error.message}`);
                 }
                 throw error;
             });

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

@@ -1,4 +1,5 @@
 import type { Compiler } from 'webpack';
+import type { Logger } from '../logger/index.js';
 import type { UploadOptions } from './upload.js';
 import type { S3ClientOptions } from './s3-client.js';
 interface S3UploadPluginOptions {
@@ -8,6 +9,7 @@ interface S3UploadPluginOptions {
     s3ClientOptions: S3ClientOptions;
     s3UploadOptions: Pick<UploadOptions, 'bucket' | 'targetPath' | 'existsBehavior'>;
     additionalPattern?: string | string[];
+    logger?: Logger;
 }
 export declare class S3UploadPlugin {
     private options;

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

@@ -10,16 +10,20 @@ class S3UploadPlugin {
         this.options = options;
     }
     apply(compiler) {
-        compiler.hooks.done.tapPromise('S3UploadPlugin', async ({ compilation }) => {
-            let fileNames = Object.keys(compilation.assets);
+        compiler.hooks.done.tapPromise('s3-upload-plugin', async (stats) => {
+            if (stats.hasErrors()) {
+                stats.compilation.warnings.push(new webpack_1.WebpackError('s3-upload-plugin: skipped upload to s3 due to compilation errors'));
+                return;
+            }
+            let fileNames = Object.keys(stats.compilation.assets);
             if (this.options.additionalPattern) {
                 const additionalFiles = (0, fast_glob_1.globSync)(this.options.additionalPattern, {
-                    cwd: compilation.outputOptions.path,
+                    cwd: stats.compilation.outputOptions.path,
                 });
                 fileNames = fileNames.concat(additionalFiles);
             }
             fileNames = fileNames.filter((name) => {
-                const fullPath = compilation.outputOptions.path + '/' + name;
+                const fullPath = stats.compilation.outputOptions.path + '/' + name;
                 return this.isIncludeAndNotExclude(fullPath);
             });
             try {
@@ -28,13 +32,15 @@ class S3UploadPlugin {
                     compress: this.options.compress,
                     options: {
                         ...this.options.s3UploadOptions,
-                        sourcePath: compilation.outputOptions.path ?? '',
+                        sourcePath: stats.compilation.outputOptions.path ?? '',
                     },
+                    logger: this.options.logger,
                 });
+                this.options.logger?.success(`Files successfully uploaded to bucket ${this.options.s3UploadOptions.bucket}`);
             }
             catch (e) {
-                const error = new webpack_1.WebpackError(`${e instanceof Error ? e.message : e}`);
-                compilation.errors.push(error);
+                const error = new webpack_1.WebpackError(`s3-upload-plugin: ${e instanceof Error ? e.message : e}`);
+                stats.compilation.errors.push(error);
             }
         });
     }

package/dist/common/typescript/compile.js

@@ -32,10 +32,10 @@ function compile(ts, { projectPath, configFileName = 'tsconfig.json', optionsToE
     logger.verbose("We're about to create the program");
     const compilerHost = ts.createCompilerHost(parsedConfig.options);
     compilerHost.readFile = (0, utils_1.displayFilename)(compilerHost.readFile, 'Reading', logger);
-    // @ts-ignore
+    // @ts-expect-error
     compilerHost.readFile.enableDisplay();
     const program = ts.createProgram(parsedConfig.fileNames, parsedConfig.options, compilerHost);
-    // @ts-ignore
+    // @ts-expect-error
     const filesCount = compilerHost.readFile.disableDisplay();
     const allDiagnostics = ts.getPreEmitDiagnostics(program).slice();
     logger.verbose(`Program created, read ${filesCount} files`);

package/dist/common/typescript/transformers.js

@@ -122,7 +122,7 @@ function updateImportDeclaration(ts, node, context, resolvedPath) {
         // @ts-expect-error
         node.assertClause);
     }
-    return context.factory.updateImportDeclaration(node, node.modifiers, node.importClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
+    return context.factory.updateImportDeclaration(node, node.modifiers, node.importClause, context.factory.createStringLiteral(resolvedPath), node.attributes || node.assertClause);
 }
 function updateExportDeclaration(ts, node, context, resolvedPath) {
     if (semver.lt(ts.version, '5.0.0')) {
@@ -133,7 +133,7 @@ function updateExportDeclaration(ts, node, context, resolvedPath) {
         // @ts-expect-error
         node.assertClause);
     }
-    return context.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, context.factory.createStringLiteral(resolvedPath), node.assertClause);
+    return context.factory.updateExportDeclaration(node, node.modifiers, node.isTypeOnly, node.exportClause, context.factory.createStringLiteral(resolvedPath), node.attributes || node.assertClause);
 }
 function updateImportTypeNode(ts, node, context, resolvedPath) {
     if (semver.lt(ts.version, '5.0.0')) {
@@ -142,5 +142,5 @@ function updateImportTypeNode(ts, node, context, 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);
+    return context.factory.updateImportTypeNode(node, context.factory.createLiteralTypeNode(context.factory.createStringLiteral(resolvedPath)), node.attributes || node.assertions, node.qualifier, node.typeArguments, node.isTypeOf);
 }

package/dist/common/typescript/watch.js

@@ -23,10 +23,10 @@ function watch(ts, projectPath, { logger, onAfterFilesEmitted, enableSourceMap,
     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");
-        // @ts-ignore
+        // @ts-expect-error
         host.readFile.enableDisplay();
     }, () => {
-        // @ts-ignore
+        // @ts-expect-error
         const count = host.readFile.disableDisplay();
         logger.verbose(`Program created, read ${count} files`);
     });

package/dist/common/webpack/config.js

@@ -111,7 +111,7 @@ function configureModuleRules(helperOptions) {
                 createJavaScriptRule(helperOptions, jsLoader),
                 createStylesRule(helperOptions),
                 createSassStylesRule(helperOptions),
-                createIconsRule(helperOptions),
+                createIconsRule(helperOptions), // workaround for https://github.com/webpack/webpack/issues/9309
                 createIconsRule(helperOptions, jsLoader),
                 ...createAssetsRules(helperOptions),
                 ...createFallbackRules(helperOptions),
@@ -357,7 +357,7 @@ function createSassStylesRule(options) {
     loaders.push({
         loader: require.resolve('sass-loader'),
         options: {
-            sourceMap: true,
+            sourceMap: true, // must be always true for work with resolve-url-loader
             sassOptions: {
                 includePaths: [paths_1.default.appClient],
             },
@@ -711,6 +711,7 @@ function configurePlugins(options) {
                     targetPath: cdn.prefix,
                 },
                 additionalPattern: cdn.additionalPattern,
+                logger: options.logger,
             }));
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -125,7 +125,7 @@
     "terser-webpack-plugin": "5.3.9",
     "ts-node": "10.9.1",
     "tslib": "^2.6.2",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "webpack": "^5.88.2",
     "webpack-assets-manifest": "^5.1.0",
     "webpack-bundle-analyzer": "^4.9.1",