@gravity-ui/app-builder 0.14.0-beta.4 → 0.14.1

package/dist/commands/dev/index.js

@@ -49,6 +49,10 @@ async function default_1(config) {
     const startNodemon = () => {
         if (needToStartNodemon && serverCompiled && clientCompiled) {
             logger_1.default.message('Starting application at', serverPath);
+            const nodeArgs = ['--enable-source-maps'];
+            if (inspect || inspectBrk) {
+                nodeArgs.push(`--${inspect ? 'inspect' : 'inspect-brk'}=:::${inspect || inspectBrk}`);
+            }
             const serverWatch = config.server.watch ?? [];
             const delay = config.server.watchThrottle;
             const nodemonInstance = (0, nodemon_1.default)({
@@ -58,9 +62,7 @@ async function default_1(config) {
                 env: {
                     ...(config.server.port ? { APP_PORT: `${config.server.port}` } : undefined),
                 },
-                nodeArgs: inspect || inspectBrk
-                    ? [`--${inspect ? 'inspect' : 'inspect-brk'}=:::${inspect || inspectBrk}`]
-                    : undefined,
+                nodeArgs,
                 watch: [serverPath, ...serverWatch],
                 delay,
             });

package/dist/common/babel/index.js

@@ -10,7 +10,7 @@ function babelPreset(config) {
                 bugfixes: true,
                 targets: config.isSsr ? { node: 'current' } : undefined,
             },
-            runtime: { version: '^7.13.10' },
+            runtime: { version: '^7.26.0' },
             typescript: true,
             react: {
                 runtime: config.newJsxTransform ? 'automatic' : 'classic',

package/dist/common/babel/ui-preset.js

@@ -16,20 +16,6 @@ module.exports = function (_context, options = {}) {
     const isTypeScriptEnabled = getOption(options.typescript, false);
     const reactOptions = getOption(options.react, {});
     const presets = [
-        [
-            () => ({
-                /**
-                 * Safari 15 has a buggy implementation of class properties,
-                 * but @babel/compat-data marks it as stable.
-                 * Can be removed once the issue is fixed and released.
-                 * @see https://github.com/babel/babel/issues/14289
-                 */
-                plugins: [
-                    require.resolve('@babel/plugin-transform-private-methods'),
-                    require.resolve('@babel/plugin-transform-class-properties'),
-                ],
-            }),
-        ],
         // Latest stable ECMAScript features
         (isEnvDevelopment || isEnvProduction) && [require.resolve('@babel/preset-env'), envOptions],
         // ES features necessary for current Node version

package/dist/common/webpack/config.js

@@ -44,7 +44,6 @@ const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-re
 const moment_timezone_data_webpack_plugin_1 = __importDefault(require("moment-timezone-data-webpack-plugin"));
 const webpack_plugin_1 = __importDefault(require("@statoscope/webpack-plugin"));
 const circular_dependency_plugin_1 = __importDefault(require("circular-dependency-plugin"));
-const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
 const paths_1 = __importDefault(require("../paths"));
 const babel_1 = require("../babel");
 const progress_plugin_1 = require("./progress-plugin");
@@ -52,6 +51,7 @@ const utils_1 = require("./utils");
 const s3_upload_1 = require("../s3-upload");
 const log_config_1 = require("../logger/log-config");
 const utils_2 = require("../typescript/utils");
+const node_externals_1 = require("./node-externals");
 const imagesSizeLimit = 2048;
 const fontSizeLimit = 8192;
 async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false } = {}) {
@@ -72,9 +72,9 @@ async function webpackConfigFactory(webpackMode, config, { logger, isSsr = false
         externals =
             config.ssr?.noExternal === true
                 ? undefined
-                : (0, webpack_node_externals_1.default)({
-                    allowlist: config.ssr?.noExternal,
-                    importType: config.ssr?.moduleType === 'esm' ? 'module' : 'commonjs',
+                : (0, node_externals_1.nodeExternals)({
+                    noExternal: config.ssr?.noExternal,
+                    module: config.ssr?.moduleType === 'esm',
                 });
     }
     let webpackConfig = {

package/dist/common/webpack/node-externals.d.ts

@@ -0,0 +1,8 @@
+import type * as webpack from 'webpack';
+type Pattern = RegExp | ((v: string) => boolean) | string;
+export interface NodeExternalsOptions {
+    noExternal?: Pattern | Pattern[];
+    module?: boolean;
+}
+export declare function nodeExternals({ noExternal, module }: NodeExternalsOptions): (data: webpack.ExternalItemFunctionData) => Promise<string | undefined>;
+export {};

package/dist/common/webpack/node-externals.js

@@ -0,0 +1,114 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nodeExternals = nodeExternals;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const paths_1 = __importDefault(require("../paths"));
+const webpackInternal = /^webpack\/container\/reference\//;
+function nodeExternals({ noExternal = [], module }) {
+    const noExternals = Array().concat(webpackInternal).concat(noExternal);
+    const nodeModules = readPackagesNames(paths_1.default.appNodeModules);
+    return async (data) => {
+        const { request } = data;
+        if (!request) {
+            return undefined;
+        }
+        const moduleName = getModuleName(request);
+        if (!request ||
+            !containsPattern(nodeModules, moduleName) ||
+            containsPattern(noExternals, request)) {
+            return undefined;
+        }
+        if (!module) {
+            return `commonjs ${data.request}`;
+        }
+        if (data.dependencyType === 'commonjs' ||
+            // lodash/something without extension can't be imported so always require it
+            (moduleName === 'lodash' && request.match(/^lodash\/[\w_]+($|\/[\w_]+$)/))) {
+            return `node-commonjs ${data.request}`;
+        }
+        return `module-import ${data.request}`;
+    };
+}
+function readPackagesNames(dirName) {
+    if (!fs.existsSync(dirName)) {
+        return [];
+    }
+    try {
+        return fs
+            .readdirSync(dirName)
+            .map((module) => {
+            if (module.startsWith('.') ||
+                !fs.statSync(path.join(dirName, module)).isDirectory()) {
+                return undefined;
+            }
+            if (module.startsWith('@')) {
+                try {
+                    return fs.readdirSync(path.join(dirName, module)).map(function (scopedMod) {
+                        return module + '/' + scopedMod;
+                    });
+                }
+                catch (e) {
+                    return [module];
+                }
+            }
+            return module;
+        })
+            .flat()
+            .filter((v) => v !== undefined);
+    }
+    catch (e) {
+        return [];
+    }
+}
+function containsPattern(patterns, value) {
+    return patterns.some((pattern) => {
+        if (pattern instanceof RegExp) {
+            return pattern.test(value);
+        }
+        else if (typeof pattern === 'function') {
+            return pattern(value);
+        }
+        else {
+            return pattern === value;
+        }
+    });
+}
+function getModuleName(request) {
+    const req = request;
+    const delimiter = '/';
+    // check if scoped module
+    if (req.startsWith('@')) {
+        const parts = req.split(delimiter, 2);
+        if (parts.length === 2) {
+            return parts.join(delimiter);
+        }
+    }
+    return req.split(delimiter, 1)[0] || '';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/app-builder",
-  "version": "0.14.0-beta.4",
+  "version": "0.14.1",
   "description": "Develop and build your React client-server projects, powered by typescript and webpack",
   "license": "MIT",
   "type": "commonjs",
@@ -51,6 +51,7 @@
     "prettier": "prettier '**/*.{md,yaml,yml,json}'",
     "typecheck": "tsc --noEmit",
     "test": "jest",
+    "watch": "tsc -p tsconfig.production.json --watch",
     "build": "npm run build:clean && npm run build:compile",
     "build:compile": "tsc -p tsconfig.production.json",
     "build:clean": "rimraf dist",
@@ -58,17 +59,15 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.353.0",
-    "@babel/core": "^7.25.0",
-    "@babel/helper-plugin-utils": "^7.25.0",
-    "@babel/plugin-transform-class-properties": "^7.25.0",
+    "@babel/core": "^7.26.0",
+    "@babel/helper-plugin-utils": "^7.26.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-modules-commonjs": "^7.26.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",
+    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-react": "^7.26.0",
+    "@babel/preset-typescript": "^7.26.0",
+    "@babel/runtime": "^7.26.0",
     "@okikio/sharedworker": "^1.0.7",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
     "@statoscope/webpack-plugin": "^5.28.2",
@@ -129,7 +128,6 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^5.1.0",
     "webpack-manifest-plugin": "^5.0.0",
-    "webpack-node-externals": "^3.0.0",
     "worker-loader": "^3.0.8",
     "yargs": "^17.7.2"
   },