@gravity-ui/app-builder 0.12.0 → 0.12.1

package/dist/commands/dev/client.d.ts

@@ -1,3 +1,3 @@
 import WebpackDevServer from 'webpack-dev-server';
 import type { NormalizedServiceConfig } from '../../common/models';
-export declare function watchClientCompilation(config: NormalizedServiceConfig, onCompilationEnd: () => void): Promise<WebpackDevServer>;
+export declare function watchClientCompilation(config: NormalizedServiceConfig, onManifestReady: () => void): Promise<WebpackDevServer>;

package/dist/commands/dev/client.js

@@ -32,13 +32,18 @@ const fs = __importStar(require("node:fs"));
 const webpack_1 = __importDefault(require("webpack"));
 const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const webpack_manifest_plugin_1 = require("webpack-manifest-plugin");
+const webpack_assets_manifest_1 = __importDefault(require("webpack-assets-manifest"));
+const utils_1 = require("../../common/utils");
 const paths_1 = __importDefault(require("../../common/paths"));
 const logger_1 = require("../../common/logger");
 const config_1 = require("../../common/webpack/config");
-async function watchClientCompilation(config, onCompilationEnd) {
+async function watchClientCompilation(config, onManifestReady) {
     const clientCompilation = await buildWebpackServer(config);
-    const { afterEmit } = (0, webpack_manifest_plugin_1.getCompilerHooks)(clientCompilation.compiler);
-    afterEmit.tap('app-builder: afterEmit', onCompilationEnd);
+    const compiler = clientCompilation.compiler;
+    if ('compilers' in compiler) {
+        throw new Error('Unexpected multi compiler');
+    }
+    subscribeToManifestReadyEvent(compiler, onManifestReady);
     return clientCompilation;
 }
 async function buildWebpackServer(config) {
@@ -124,3 +129,17 @@ async function buildWebpackServer(config) {
     }
     return server;
 }
+function subscribeToManifestReadyEvent(compiler, onManifestReady) {
+    const promises = [];
+    const assetsManifestPlugin = compiler.options.plugins.find((plugin) => plugin instanceof webpack_assets_manifest_1.default);
+    if (assetsManifestPlugin) {
+        const assetsManifestReady = (0, utils_1.deferredPromise)();
+        promises.push(assetsManifestReady.promise);
+        assetsManifestPlugin.hooks.done.tap('app-builder', assetsManifestReady.resolve);
+    }
+    const manifestReady = (0, utils_1.deferredPromise)();
+    promises.push(manifestReady.promise);
+    const { afterEmit } = (0, webpack_manifest_plugin_1.getCompilerHooks)(compiler);
+    afterEmit.tap('app-builder', manifestReady.resolve);
+    Promise.all(promises).then(() => onManifestReady());
+}

package/dist/common/utils.d.ts

@@ -4,3 +4,8 @@ export declare function getCacheDir(): Promise<string>;
 export declare function getPort({ port }: {
     port: number;
 }): Promise<number>;
+export declare function deferredPromise<T>(): {
+    promise: Promise<T | undefined>;
+    resolve: (value?: T) => void;
+    reject: (reason?: unknown) => void;
+};

package/dist/common/utils.js

@@ -7,6 +7,7 @@ exports.createRunFolder = createRunFolder;
 exports.shouldCompileTarget = shouldCompileTarget;
 exports.getCacheDir = getCacheDir;
 exports.getPort = getPort;
+exports.deferredPromise = deferredPromise;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_os_1 = __importDefault(require("node:os"));
 const paths_1 = __importDefault(require("./paths"));
@@ -27,3 +28,13 @@ async function getPort({ port }) {
     const { default: getPortDefault, portNumbers } = await import('get-port');
     return getPortDefault({ port: portNumbers(port, port + 100) });
 }
+function deferredPromise() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    // @ts-expect-error Promise callback executes synchronously, so resolve and reject are initialized here
+    return { promise, resolve, reject };
+}

package/dist/common/webpack/config.js

@@ -517,6 +517,7 @@ function createMomentTimezoneDataPlugin(options = {}) {
 function configurePlugins(options) {
     const { isEnvDevelopment, isEnvProduction, config } = options;
     const excludeFromClean = config.excludeFromClean || [];
+    const manifestFile = 'assets-manifest.json';
     const plugins = [
         new clean_webpack_plugin_1.CleanWebpackPlugin({
             verbose: config.verbose,
@@ -530,6 +531,16 @@ function configurePlugins(options) {
             writeToFileEmit: true,
             publicPath: '',
         }),
+        new webpack_assets_manifest_1.default(isEnvProduction
+            ? {
+                entrypoints: true,
+                output: manifestFile,
+            }
+            : {
+                entrypoints: true,
+                writeToDisk: true,
+                output: path.resolve(paths_1.default.appBuild, manifestFile),
+            }),
         createMomentTimezoneDataPlugin(config.momentTz),
         new webpack.DefinePlugin({
             'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV),
@@ -628,17 +639,6 @@ function configurePlugins(options) {
             }));
         }
     }
-    const manifestFile = 'assets-manifest.json';
-    plugins.push(new webpack_assets_manifest_1.default(isEnvProduction
-        ? {
-            entrypoints: true,
-            output: manifestFile,
-        }
-        : {
-            entrypoints: true,
-            writeToDisk: true,
-            output: path.resolve(paths_1.default.appBuild, manifestFile),
-        }));
     if (config.cdn) {
         let credentialsGlobal;
         if (process.env.FRONTEND_S3_ACCESS_KEY_ID && process.env.FRONTEND_S3_SECRET_ACCESS_KEY) {

package/package.json

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