@gravity-ui/app-builder 0.15.1-beta.6 → 0.15.1-beta.7

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

@@ -207,11 +207,6 @@ export interface ClientConfig {
         moduleType?: 'commonjs' | 'esm';
     };
     bundler?: Bundler;
-    /**
-     * Code loader. `babel` is default.
-     * `swc` is experimental and supported only in `rspack` bundler
-     */
-    codeLoader?: 'babel' | 'swc';
 }
 export interface CdnUploadConfig {
     bucket: string;

package/dist/common/webpack/config.js

@@ -146,7 +146,7 @@ async function rspackConfigFactory(options) {
         output: configureOutput(helperOptions),
         resolve: configureRspackResolve(helperOptions),
         module: {
-            rules: (0, rspack_1.prepareRspackRules)(configureModuleRules(helperOptions)),
+            rules: configureModuleRules(helperOptions),
         },
         plugins: configureRspackPlugins(helperOptions),
         optimization: configureRspackOptimization(helperOptions),
@@ -370,61 +370,6 @@ function configureOutput(options) {
     };
 }
 function createJavaScriptLoader({ isEnvProduction, isEnvDevelopment, configType, config, isSsr, }) {
-    if (config.codeLoader === 'swc') {
-        if (config.bundler !== 'rspack') {
-            throw new Error('SWC is supported only with rspack bundler');
-        }
-        const browserslist = require('browserslist');
-        return {
-            loader: 'builtin:swc-loader',
-            options: {
-                sourceMaps: !config.disableSourceMapGeneration,
-                env: {
-                    loose: true,
-                    bugfixes: true,
-                    targets: browserslist(),
-                },
-                module: {
-                    type: 'es6',
-                    noInterop: true,
-                },
-                assumptions: {
-                    setPublicClassFields: true,
-                    privateFieldsAsProperties: true,
-                },
-                jsc: {
-                    parser: {
-                        syntax: 'typescript',
-                        tsx: true,
-                        decorators: true,
-                        dynamicImport: true,
-                    },
-                    transform: {
-                        react: {
-                            runtime: config.newJsxTransform ? 'automatic' : 'classic',
-                            development: isEnvDevelopment,
-                            refresh: !isSsr && isEnvDevelopment && config.reactRefresh !== false,
-                            useBuiltIns: true,
-                        },
-                    },
-                    experimental: {
-                        plugins: !isSsr && isEnvProduction
-                            ? [
-                                [
-                                    '@swc/plugin-transform-imports',
-                                    {
-                                        lodash: {
-                                            transform: 'lodash/{{member}}',
-                                        },
-                                    },
-                                ],
-                            ]
-                            : [],
-                    },
-                },
-            },
-        };
-    }
     const plugins = [];
     if (!isSsr) {
         if (isEnvDevelopment && config.reactRefresh !== false) {
@@ -525,7 +470,7 @@ function createSassStylesRule(options) {
             options: {
                 sourceMap: true, // must be always true for work with resolve-url-loader
                 sassOptions: {
-                    loadPaths: [paths_1.default.appClient],
+                    loadPaths: [paths_1.default.app, paths_1.default.appClient],
                 },
             },
         },
@@ -827,7 +772,7 @@ const commonBundlerPlugins = {
         rspack: rspack_manifest_plugin_1.RspackManifestPlugin,
         webpack: webpack_manifest_plugin_1.WebpackManifestPlugin,
     },
-    TsCheckerRspackPlugin: {
+    TsCheckerPlugin: {
         rspack: ts_checker_rspack_plugin_1.TsCheckerRspackPlugin,
         webpack: fork_ts_checker_webpack_plugin_1.default,
     },
@@ -859,7 +804,7 @@ function configureCommonPlugins(options) {
             ? [new commonBundlerPlugins['ProgressPlugin'][bundler]({ logger: options.logger })]
             : []),
         ...(forkTsCheckerOptions
-            ? [new commonBundlerPlugins['TsCheckerRspackPlugin'][bundler](forkTsCheckerOptions)]
+            ? [new commonBundlerPlugins['TsCheckerPlugin'][bundler](forkTsCheckerOptions)]
             : []),
     ];
     if (config.detectCircularDependencies) {

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

@@ -1,7 +1,5 @@
 import { ManifestPluginOptions } from 'rspack-manifest-plugin';
-import type { RuleSetRule as WebpackRuleSetRule } from 'webpack';
-import type { Configuration, RuleSetRule as RspackRuleSetRule } from '@rspack/core';
+import type { Configuration } from '@rspack/core';
 import type { Logger } from '../logger';
 export declare function clearCacheDirectory(config: Configuration, logger: Logger): void;
 export declare const generateAssetsManifest: ManifestPluginOptions['generate'];
-export declare function prepareRspackRules(webpackRules: (undefined | null | false | '' | 0 | WebpackRuleSetRule | '...')[]): (RspackRuleSetRule | '...')[];

package/dist/common/webpack/rspack.js

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAssetsManifest = void 0;
 exports.clearCacheDirectory = clearCacheDirectory;
-exports.prepareRspackRules = prepareRspackRules;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const paths_1 = __importDefault(require("../../common/paths"));
@@ -69,43 +68,3 @@ const generateAssetsManifest = (seed, files, entries) => {
     };
 };
 exports.generateAssetsManifest = generateAssetsManifest;
-function prepareRspackUse(webpackUse) {
-    if (typeof webpackUse === 'string') {
-        if (webpackUse === 'swc-loader') {
-            return 'builtin:swc-loader';
-        }
-        return webpackUse;
-    }
-    if (Array.isArray(webpackUse)) {
-        for (const item of webpackUse) {
-            if (item) {
-                prepareRspackUse(item);
-            }
-        }
-    }
-    return webpackUse;
-}
-function prepareRspackRules(webpackRules) {
-    const rspackRules = [];
-    for (const webpackRule of webpackRules) {
-        if (!webpackRule) {
-            continue;
-        }
-        if (typeof webpackRule === 'string') {
-            rspackRules.push(webpackRule);
-            continue;
-        }
-        const rspackRule = webpackRule;
-        if (webpackRule.oneOf) {
-            rspackRule.oneOf = prepareRspackRules(webpackRule.oneOf);
-        }
-        if (webpackRule.rules) {
-            rspackRule.rules = prepareRspackRules(webpackRule.rules);
-        }
-        if (webpackRule.use) {
-            rspackRule.use = prepareRspackUse(webpackRule.use);
-        }
-        rspackRules.push(rspackRule);
-    }
-    return rspackRules;
-}

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

@@ -11,7 +11,7 @@ export declare function configureWebpackConfigForStorybook(mode: Mode, userConfi
     resolve: Webpack.ResolveOptions;
     plugins: (false | "" | 0 | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | Webpack.WebpackPluginInstance | null | undefined)[];
     optimization: {
-        minimizer: (false | "" | 0 | "..." | Webpack.WebpackPluginInstance | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | null | undefined)[] | undefined;
+        minimizer: (false | "" | 0 | Webpack.WebpackPluginInstance | "..." | ((this: Webpack.Compiler, compiler: Webpack.Compiler) => void) | null | undefined)[] | undefined;
     };
 }>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.15.1-beta.6",
+  "version": "0.15.1-beta.7",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -79,7 +79,6 @@
     "@svgr/core": "^8.1.0",
     "@svgr/plugin-jsx": "^8.1.0",
     "@svgr/webpack": "^8.1.0",
-    "@swc/plugin-transform-imports": "^6.1.0",
     "babel-loader": "^9.2.1",
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-inline-react-svg": "^2.0.2",