@gravity-ui/app-builder 0.12.0 → 0.13.0

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<import("express").Application, import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;

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/config.js

@@ -186,7 +186,7 @@ async function normalizeClientConfig(client, mode) {
         forkTsChecker: client.disableForkTsChecker ? false : client.forkTsChecker,
         reactRefresh: client.disableReactRefresh
             ? false
-            : client.reactRefresh ?? ((options) => options),
+            : (client.reactRefresh ?? ((options) => options)),
         newJsxTransform: client.newJsxTransform ?? true,
         publicPathPrefix: client.publicPathPrefix || '',
         modules: client.modules && remapPaths(client.modules),

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

@@ -127,8 +127,8 @@ function configureDevTool({ isEnvProduction, config }) {
 function configureWatchOptions({ config }) {
     const watchOptions = {
         ...config.watchOptions,
-        followSymlinks: config.watchOptions?.followSymlinks ??
-            (!config.symlinks && config.watchOptions?.watchPackages)
+        followSymlinks: (config.watchOptions?.followSymlinks ??
+            (!config.symlinks && config.watchOptions?.watchPackages))
             ? true
             : undefined,
     };
@@ -320,7 +320,7 @@ function createSassStylesRule(options) {
         options: {
             sourceMap: true, // must be always true for work with resolve-url-loader
             sassOptions: {
-                includePaths: [paths_1.default.appClient],
+                loadPaths: [paths_1.default.appClient],
             },
         },
     });
@@ -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.13.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -58,28 +58,28 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.353.0",
-    "@babel/core": "^7.24.0",
-    "@babel/helper-plugin-utils": "^7.24.0",
-    "@babel/plugin-transform-class-properties": "^7.24.0",
-    "@babel/plugin-transform-dynamic-import": "^7.24.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.24.0",
-    "@babel/plugin-transform-private-methods": "^7.24.0",
-    "@babel/plugin-transform-runtime": "^7.24.0",
-    "@babel/preset-env": "^7.24.0",
-    "@babel/preset-react": "^7.24.0",
-    "@babel/preset-typescript": "^7.24.0",
-    "@babel/runtime": "^7.24.0",
+    "@babel/core": "^7.25.0",
+    "@babel/helper-plugin-utils": "^7.25.0",
+    "@babel/plugin-transform-class-properties": "^7.25.0",
+    "@babel/plugin-transform-dynamic-import": "^7.25.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.25.0",
+    "@babel/plugin-transform-private-methods": "^7.25.0",
+    "@babel/plugin-transform-runtime": "^7.25.0",
+    "@babel/preset-env": "^7.25.0",
+    "@babel/preset-react": "^7.25.0",
+    "@babel/preset-typescript": "^7.25.0",
+    "@babel/runtime": "^7.25.0",
     "@okikio/sharedworker": "^1.0.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@statoscope/webpack-plugin": "^5.28.2",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
-    "babel-loader": "^9.1.3",
+    "babel-loader": "^9.2.1",
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-inline-react-svg": "^2.0.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "browserslist": "^4.23.0",
+    "browserslist": "^4.24.0",
     "chalk": "^4.1.2",
     "circular-dependency-plugin": "^5.2.2",
     "clean-webpack-plugin": "^4.0.0",
@@ -91,20 +91,20 @@
     "dotenv": "^16.4.5",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
-    "file-type": "^19.0.0",
+    "file-type": "^19.5.0",
     "find-cache-dir": "^5.0.0",
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "fs-extra": "^11.2.0",
     "get-port": "^7.1.0",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
-    "mini-css-extract-plugin": "^2.9.0",
+    "mini-css-extract-plugin": "^2.9.1",
     "moment-timezone-data-webpack-plugin": "^1.5.1",
     "nodemon": "^3.1.0",
     "p-map": "^7.0.2",
     "p-queue": "^8.0.1",
     "pino-pretty": "^11.2.0",
-    "postcss": "^8.4.38",
+    "postcss": "^8.4.47",
     "postcss-loader": "^8.1.1",
     "postcss-preset-env": "^9.1.3",
     "react": "^18.3.1",
@@ -112,9 +112,9 @@
     "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
     "rimraf": "^5.0.7",
-    "sass": "^1.77.5",
-    "sass-loader": "^14.2.1",
-    "semver": "^7.6.2",
+    "sass": "^1.79.0",
+    "sass-loader": "^16.0.0",
+    "semver": "^7.6.3",
     "signal-exit": "^4.1.0",
     "source-map-loader": "^5.0.0",
     "strip-ansi": "^6.0.1",
@@ -123,18 +123,18 @@
     "terser-webpack-plugin": "5.3.10",
     "ts-node": "10.9.2",
     "tslib": "^2.6.2",
-    "typescript": "~5.5.2",
-    "webpack": "^5.92.0",
+    "typescript": "~5.6.0",
+    "webpack": "^5.95.0",
     "webpack-assets-manifest": "^5.2.1",
     "webpack-bundle-analyzer": "^4.10.2",
-    "webpack-dev-server": "^5.0.4",
+    "webpack-dev-server": "^5.1.0",
     "webpack-manifest-plugin": "^5.0.0",
     "worker-loader": "^3.0.8",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.3.0",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@gravity-ui/eslint-config": "^3.2.0",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/tsconfig": "^1.0.0",
@@ -144,7 +144,7 @@
     "@types/common-tags": "^1.8.4",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.2",
-    "@types/lodash": "^4.17.6",
+    "@types/lodash": "^4.17.10",
     "@types/mime-types": "^2.1.4",
     "@types/node": "^18",
     "@types/nodemon": "^1.19.6",
@@ -155,13 +155,13 @@
     "@types/yargs": "17.0.11",
     "babel-plugin-tester": "^11.0.4",
     "eslint": "^8.57.0",
-    "husky": "^9.0.11",
+    "husky": "^9.1.6",
     "jest": "^29.5.0",
-    "lightningcss": "^1.21.5",
+    "lightningcss": "^1.27.0",
     "monaco-editor-webpack-plugin": "^6.0.0",
     "nano-staged": "^0.8.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "3.3.2",
+    "prettier": "3.3.3",
     "ts-jest": "^29.1.2"
   },
   "peerDependencies": {