@gravity-ui/app-builder 0.14.2-beta.0 → 0.15.0

package/dist/common/webpack/utils.d.ts

@@ -1,6 +1,6 @@
-import type webpack from 'webpack';
+import type * as Webpack from 'webpack';
 import type { Logger } from '../logger';
-export declare function webpackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: webpack.MultiStats) => Promise<void>;
+export declare function webpackCompilerHandlerFactory(logger: Logger, onCompilationEnd?: () => void): (err?: Error | null, stats?: Webpack.MultiStats) => Promise<void>;
 export declare function resolveTsConfigPathsToAlias(projectPath: string, filename?: string): {
     aliases?: undefined;
     modules?: undefined;

package/dist/common/webpack/utils.js

@@ -53,11 +53,13 @@ function webpackCompilerHandlerFactory(logger, onCompilationEnd) {
         }
         const [clientStats, ssrStats] = stats?.stats ?? [];
         if (clientStats) {
-            const time = clientStats.endTime - clientStats.startTime;
+            const { startTime = 0, endTime = 0 } = clientStats;
+            const time = endTime - startTime;
             logger.success(`Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
         }
         if (ssrStats) {
-            const time = ssrStats.endTime - ssrStats.startTime;
+            const { startTime = 0, endTime = 0 } = ssrStats;
+            const time = endTime - startTime;
             logger.success(`SSR: Client was successfully compiled in ${(0, pretty_time_1.prettyTime)(BigInt(time) * BigInt(1_000_000))}`);
         }
         if (!clientStats && !ssrStats) {

package/dist/common/webpack/worker/worker-loader.d.ts

@@ -1,2 +1,2 @@
-import webpack from 'webpack';
-export declare const pitch: webpack.PitchLoaderDefinitionFunction;
+import type * as Webpack from 'webpack';
+export declare const pitch: Webpack.PitchLoaderDefinitionFunction;

package/dist/common/webpack/worker/worker-loader.js

@@ -28,11 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pitch = void 0;
 const path = __importStar(require("node:path"));
-const webpack_1 = __importDefault(require("webpack"));
-const NodeTargetPlugin_1 = __importDefault(require("webpack/lib/node/NodeTargetPlugin"));
-const WebWorkerTemplatePlugin_1 = __importDefault(require("webpack/lib/webworker/WebWorkerTemplatePlugin"));
-const FetchCompileWasmPlugin_1 = __importDefault(require("webpack/lib/web/FetchCompileWasmPlugin"));
-const FetchCompileAsyncWasmPlugin_1 = __importDefault(require("webpack/lib/web/FetchCompileAsyncWasmPlugin"));
 const paths_1 = __importDefault(require("../../paths"));
 const pluginId = 'APP_BUILDER_WORKER_LOADER';
 const publicPath = path.resolve(__dirname, 'public-path.worker.js');
@@ -41,7 +36,7 @@ const pitch = function (request) {
     if (!this._compiler || !this._compilation) {
         throw new Error('Something went wrong');
     }
-    const compilerOptions = this._compiler.options;
+    const { options: compilerOptions, webpack } = this._compiler;
     const logger = this.getLogger(pluginId);
     if (compilerOptions.output.globalObject === 'window') {
         logger.warn('Warning (app-builder-worker-loader): output.globalObject is set to "window". It should be set to "self" or "this" to support HMR in Workers.');
@@ -59,17 +54,22 @@ const pitch = function (request) {
         devtoolNamespace: path.resolve('/', path.relative(paths_1.default.app, this.resource)),
     };
     const workerCompiler = this._compilation.createChildCompiler(`worker ${request}`, workerOptions);
-    new WebWorkerTemplatePlugin_1.default().apply(workerCompiler);
+    const { EntryPlugin, node: { NodeTargetPlugin }, web: { FetchCompileWasmPlugin, FetchCompileAsyncWasmPlugin }, webworker: { WebWorkerTemplatePlugin }, } = webpack;
+    new WebWorkerTemplatePlugin().apply(workerCompiler);
     if (this.target !== 'webworker' && this.target !== 'web') {
-        new NodeTargetPlugin_1.default().apply(workerCompiler);
+        new NodeTargetPlugin().apply(workerCompiler);
+    }
+    if (FetchCompileWasmPlugin) {
+        new FetchCompileWasmPlugin({
+            mangleImports: this._compiler.options.optimization.mangleWasmImports,
+        }).apply(workerCompiler);
+    }
+    if (FetchCompileAsyncWasmPlugin) {
+        new FetchCompileAsyncWasmPlugin().apply(workerCompiler);
     }
-    new FetchCompileWasmPlugin_1.default({
-        mangleImports: this._compiler.options.optimization.mangleWasmImports,
-    }).apply(workerCompiler);
-    new FetchCompileAsyncWasmPlugin_1.default().apply(workerCompiler);
     const bundleName = path.parse(this.resourcePath).name;
-    new webpack_1.default.EntryPlugin(this.context, `!!${publicPath}`, bundleName).apply(workerCompiler);
-    new webpack_1.default.EntryPlugin(this.context, `!!${request}`, bundleName).apply(workerCompiler);
+    new EntryPlugin(this.context, `!!${publicPath}`, bundleName).apply(workerCompiler);
+    new EntryPlugin(this.context, `!!${request}`, bundleName).apply(workerCompiler);
     configureSourceMap(workerCompiler);
     const cb = this.async();
     workerCompiler.compile((err, compilation) => {
@@ -130,10 +130,10 @@ const pitch = function (request) {
                     if ([filename, mapFile, licenseFile].includes(assetName)) {
                         continue;
                     }
-                    if (parentCompilation.assetsInfo.has(assetName)) {
+                    if (parentCompilation.getAsset(assetName)) {
                         continue;
                     }
-                    parentCompilation.emitAsset(assetName, asset, compilation.assetsInfo.get(assetName));
+                    parentCompilation.emitAsset(assetName, asset, compilation.getAsset(assetName)?.info);
                 }
             }
             return cache.store(cacheIdent, cacheETag, { content, map: map?.toString() }, (storeCacheError) => {
@@ -163,7 +163,7 @@ function configureSourceMap(compiler) {
             const inline = devtool.includes('inline');
             const cheap = devtool.includes('cheap');
             const moduleMaps = devtool.includes('module');
-            new webpack_1.default.SourceMapDevToolPlugin({
+            new compiler.webpack.SourceMapDevToolPlugin({
                 filename: inline ? null : compiler.options.output.sourceMapFilename,
                 moduleFilenameTemplate: compiler.options.output.devtoolModuleFilenameTemplate,
                 fallbackModuleFilenameTemplate: compiler.options.output.devtoolFallbackModuleFilenameTemplate,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.14.2-beta.0",
+  "version": "0.15.0",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -70,9 +70,6 @@
     "@babel/runtime": "^7.26.0",
     "@okikio/sharedworker": "^1.0.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
-    "@rspack/core": "^1.2.2",
-    "@rspack/dev-server": "^1.0.10",
-    "@rspack/plugin-react-refresh": "^1.0.0",
     "@statoscope/webpack-plugin": "^5.28.2",
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
@@ -98,7 +95,6 @@
     "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.1",
     "moment-timezone-data-webpack-plugin": "^1.5.1",
@@ -114,7 +110,6 @@
     "react-refresh": "^0.14.2",
     "resolve-url-loader": "^5.0.0",
     "rimraf": "^5.0.7",
-    "rspack-manifest-plugin": "^5.0.1",
     "sass": "^1.79.0",
     "sass-loader": "^16.0.0",
     "semver": "^7.6.3",
@@ -124,7 +119,6 @@
     "style-loader": "^4.0.0",
     "svgo": "^3.3.2",
     "terser-webpack-plugin": "5.3.10",
-    "ts-checker-rspack-plugin": "^1.1.1",
     "ts-node": "10.9.2",
     "tslib": "^2.6.2",
     "typescript": "~5.6.0",
@@ -134,7 +128,6 @@
     "webpack-dev-server": "^5.1.0",
     "webpack-manifest-plugin": "^5.0.0",
     "worker-loader": "^3.0.8",
-    "worker-rspack-loader": "^3.1.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -149,7 +142,6 @@
     "@types/common-tags": "^1.8.4",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.2",
-    "@types/lodash": "^4.17.10",
     "@types/mime-types": "^2.1.4",
     "@types/node": "^18",
     "@types/nodemon": "^1.19.6",

package/dist/common/rspack/compile.d.ts

@@ -1,2 +0,0 @@
-import type { NormalizedClientConfig } from '../models';
-export declare function rspackCompile(config: NormalizedClientConfig): Promise<void>;

package/dist/common/rspack/compile.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rspackCompile = rspackCompile;
-const core_1 = require("@rspack/core");
-const logger_1 = require("../logger");
-const config_1 = require("./config");
-const utils_1 = require("./utils");
-async function rspackCompile(config) {
-    const logger = new logger_1.Logger('rspack', config.verbose);
-    const rspackConfigs = [await (0, config_1.rspackConfigFactory)("production" /* RspackMode.Prod */, config, { logger })];
-    logger.verbose('Config created');
-    return new Promise((resolve) => {
-        const compiler = (0, core_1.rspack)(rspackConfigs, (0, utils_1.rspackCompilerHandlerFactory)(logger, async () => {
-            resolve();
-        }));
-        process.on('SIGINT', async () => {
-            compiler?.close(() => {
-                process.exit(1);
-            });
-        });
-        process.on('SIGTERM', async () => {
-            compiler?.close(() => {
-                process.exit(1);
-            });
-        });
-    });
-}

package/dist/common/rspack/config.d.ts

@@ -1,24 +0,0 @@
-import { Configuration, ResolveOptions, RuleSetRule } from '@rspack/core';
-import { ManifestPluginOptions } from 'rspack-manifest-plugin';
-import type { NormalizedClientConfig } from '../models';
-import type { Logger } from '../logger';
-export declare const generateManifest: ManifestPluginOptions['generate'];
-export interface HelperOptions {
-    config: NormalizedClientConfig;
-    logger?: Logger;
-    isEnvDevelopment: boolean;
-    isEnvProduction: boolean;
-    configType: `${RspackMode}`;
-}
-export declare const enum RspackMode {
-    Prod = "production",
-    Dev = "development"
-}
-export declare function rspackConfigFactory(rspackMode: RspackMode, config: NormalizedClientConfig, { logger }?: {
-    logger?: Logger;
-}): Promise<Configuration>;
-export declare function configureModuleRules(helperOptions: HelperOptions, additionalRules?: NonNullable<RuleSetRule['oneOf']>): RuleSetRule[];
-export declare function configureResolve({ isEnvProduction, config }: HelperOptions): ResolveOptions;
-type Optimization = NonNullable<Configuration['optimization']>;
-export declare function configureOptimization({ config }: HelperOptions): Optimization;
-export {};