@dr.pogodin/react-utils 1.47.0-alpha.2 → 1.47.0-alpha.3

package/build/web/shared/utils/webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","names":["IS_CLIENT_SIDE","requireWeak","modulePath","basePathOrOptions","basePath","ops","req","eval","resolve","path","module","default","def","named","res","Object","entries","forEach","name","value","assigned","Error","resolveWeak"],"sources":["../../../../src/shared/utils/webpack.ts"],"sourcesContent":["import type PathNS from 'node:path';\n\nimport { IS_CLIENT_SIDE } from './isomorphy';\n\ntype RequireWeakOptionsT = {\n  basePath?: string;\n};\n\ntype RequireWeakResT<T> = T extends { default: infer D }\n  ? (D extends null | undefined ? T : D & Omit<T, 'default'>)\n  : T;\n\n/**\n * Requires the specified module without including it into the bundle during\n * Webpack build.\n * @param modulePath\n * @param [basePath]\n * @return Required module.\n */\nexport function requireWeak<T extends object>(\n  modulePath: string,\n\n  // TODO: For now `basePath` can be provided directly as a string here,\n  // for backward compatibility. Deprecate it in future, if any other\n  // breaking changes are done for requireWeak().\n  basePathOrOptions?: string | RequireWeakOptionsT,\n): RequireWeakResT<T> | null {\n  if (IS_CLIENT_SIDE) return null;\n\n  let basePath: string | undefined;\n  let ops: RequireWeakOptionsT;\n  if (typeof basePathOrOptions === 'string') {\n    basePath = basePathOrOptions;\n  } else {\n    ops = basePathOrOptions ?? {};\n    ({ basePath } = ops);\n  }\n\n  // eslint-disable-next-line no-eval\n  const req = eval('require') as (path: string) => unknown;\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  const { resolve } = req('path') as typeof PathNS;\n\n  const path = basePath ? resolve(basePath, modulePath) : modulePath;\n  const module = req(path) as T;\n\n  if (!('default' in module) || !module.default) return module as RequireWeakResT<T>;\n\n  const { default: def, ...named } = module;\n\n  const res = def as RequireWeakResT<T>;\n\n  Object.entries(named).forEach(([name, value]) => {\n    const assigned = res[name as keyof RequireWeakResT<T>];\n    if (assigned) (res[name as keyof RequireWeakResT<T>] as unknown) = value;\n    else if (assigned !== value) {\n      throw Error('Conflict between default and named exports');\n    }\n  });\n  return res;\n}\n\n/**\n * Resolves specified module path with help of Babel's module resolver.\n * Yes, the function itself just returns its argument to the caller, but Babel\n * is configured to resolve the first argument of resolveWeak(..) function, thus\n * the result will be the resolved path.\n * @param {string} modulePath\n * @return {string} Absolute or relative path to the module.\n */\nexport function resolveWeak(modulePath: string): string {\n  return modulePath;\n}\n"],"mappings":"AAEA,SAASA,cAAc;AAUvB;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CACzBC,UAAkB;AAElB;AACA;AACA;AACAC,iBAAgD,EACrB;EAC3B,IAAIH,cAAc,EAAE,OAAO,IAAI;EAE/B,IAAII,QAA4B;EAChC,IAAIC,GAAwB;EAC5B,IAAI,OAAOF,iBAAiB,KAAK,QAAQ,EAAE;IACzCC,QAAQ,GAAGD,iBAAiB;EAC9B,CAAC,MAAM;IACLE,GAAG,GAAGF,iBAAiB,IAAI,CAAC,CAAC;IAC7B,CAAC;MAAEC;IAAS,CAAC,GAAGC,GAAG;EACrB;;EAEA;EACA,MAAMC,GAAG,GAAGC,IAAI,CAAC,SAAS,CAA8B;;EAExD;EACA,MAAM;IAAEC;EAAQ,CAAC,GAAGF,GAAG,CAAC,MAAM,CAAkB;EAEhD,MAAMG,IAAI,GAAGL,QAAQ,GAAGI,OAAO,CAACJ,QAAQ,EAAEF,UAAU,CAAC,GAAGA,UAAU;EAClE,MAAMQ,MAAM,GAAGJ,GAAG,CAACG,IAAI,CAAM;EAE7B,IAAI,EAAE,SAAS,IAAIC,MAAM,CAAC,IAAI,CAACA,MAAM,CAACC,OAAO,EAAE,OAAOD,MAAM;EAE5D,MAAM;IAAEC,OAAO,EAAEC,GAAG;IAAE,GAAGC;EAAM,CAAC,GAAGH,MAAM;EAEzC,MAAMI,GAAG,GAAGF,GAAyB;EAErCG,MAAM,CAACC,OAAO,CAACH,KAAK,CAAC,CAACI,OAAO,CAAC,CAAC,CAACC,IAAI,EAAEC,KAAK,CAAC,KAAK;IAC/C,MAAMC,QAAQ,GAAGN,GAAG,CAACI,IAAI,CAA6B;IACtD,IAAIE,QAAQ,EAAGN,GAAG,CAACI,IAAI,CAA6B,GAAeC,KAAK,CAAC,KACpE,IAAIC,QAAQ,KAAKD,KAAK,EAAE;MAC3B,MAAME,KAAK,CAAC,4CAA4C,CAAC;IAC3D;EACF,CAAC,CAAC;EACF,OAAOP,GAAG;AACZ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASQ,WAAWA,CAACpB,UAAkB,EAAU;EACtD,OAAOA,UAAU;AACnB","ignoreList":[]}
+{"version":3,"file":"webpack.js","names":["createRequire","IS_CLIENT_SIDE","IS_SERVER_SIDE","require","import","meta","url","requireWeak","modulePath","basePathOrOptions","basePath","ops","resolve","path","module","default","def","named","res","Object","entries","forEach","name","value","assigned","undefined","Error","resolveWeak"],"sources":["../../../../src/shared/utils/webpack.ts"],"sourcesContent":["import type PathNS from 'node:path';\n\n// eslint-disable-next-line import/enforce-node-protocol-usage\nimport { createRequire } from 'module';\n\nimport { IS_CLIENT_SIDE, IS_SERVER_SIDE } from './isomorphy';\n\ntype RequireWeakOptionsT = {\n  basePath?: string;\n};\n\ntype RequireWeakResT<T> = T extends { default: infer D }\n  ? (D extends null | undefined ? T : D & Omit<T, 'default'>)\n  : T;\n\nlet require: ((url: string) => unknown) | undefined;\n\nif (IS_SERVER_SIDE) require = createRequire(import.meta.url);\n\n/**\n * Requires the specified module without including it into the bundle during\n * Webpack build.\n * @param modulePath\n * @param [basePath]\n * @return Required module.\n */\nexport function requireWeak<T extends object>(\n  modulePath: string,\n\n  // TODO: For now `basePath` can be provided directly as a string here,\n  // for backward compatibility. Deprecate it in future, if any other\n  // breaking changes are done for requireWeak().\n  basePathOrOptions?: string | RequireWeakOptionsT,\n): RequireWeakResT<T> | null {\n  if (IS_CLIENT_SIDE) return null;\n\n  let basePath: string | undefined;\n  let ops: RequireWeakOptionsT;\n  if (typeof basePathOrOptions === 'string') {\n    basePath = basePathOrOptions;\n  } else {\n    ops = basePathOrOptions ?? {};\n    ({ basePath } = ops);\n  }\n\n  // eslint-disable-next-line @typescript-eslint/unbound-method\n  const { resolve } = require!('node:path') as typeof PathNS;\n\n  const path = basePath ? resolve(basePath, modulePath) : modulePath;\n\n  const module = require!(path) as T;\n\n  if (!('default' in module) || !module.default) return module as RequireWeakResT<T>;\n\n  const { default: def, ...named } = module;\n\n  const res = def as RequireWeakResT<T>;\n\n  Object.entries(named).forEach(([name, value]) => {\n    const assigned = res[name as keyof RequireWeakResT<T>];\n    if (assigned === undefined) {\n      (res[name as keyof RequireWeakResT<T>] as unknown) = value;\n    } else if (assigned !== value) {\n      throw Error('Conflict between default and named exports');\n    }\n  });\n  return res;\n}\n\n/**\n * Resolves specified module path with help of Babel's module resolver.\n * Yes, the function itself just returns its argument to the caller, but Babel\n * is configured to resolve the first argument of resolveWeak(..) function, thus\n * the result will be the resolved path.\n * @param {string} modulePath\n * @return {string} Absolute or relative path to the module.\n */\nexport function resolveWeak(modulePath: string): string {\n  return modulePath;\n}\n"],"mappings":"AAEA;AACA,SAASA,aAAa,QAAQ,QAAQ;AAEtC,SAASC,cAAc,EAAEC,cAAc;AAUvC,IAAIC,OAA+C;AAEnD,IAAID,cAAc,EAAEC,OAAO,GAAGH,aAAa,CAACI,MAAM,CAACC,IAAI,CAACC,GAAG,CAAC;;AAE5D;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,WAAWA,CACzBC,UAAkB;AAElB;AACA;AACA;AACAC,iBAAgD,EACrB;EAC3B,IAAIR,cAAc,EAAE,OAAO,IAAI;EAE/B,IAAIS,QAA4B;EAChC,IAAIC,GAAwB;EAC5B,IAAI,OAAOF,iBAAiB,KAAK,QAAQ,EAAE;IACzCC,QAAQ,GAAGD,iBAAiB;EAC9B,CAAC,MAAM;IACLE,GAAG,GAAGF,iBAAiB,IAAI,CAAC,CAAC;IAC7B,CAAC;MAAEC;IAAS,CAAC,GAAGC,GAAG;EACrB;;EAEA;EACA,MAAM;IAAEC;EAAQ,CAAC,GAAGT,OAAO,CAAE,WAAW,CAAkB;EAE1D,MAAMU,IAAI,GAAGH,QAAQ,GAAGE,OAAO,CAACF,QAAQ,EAAEF,UAAU,CAAC,GAAGA,UAAU;EAElE,MAAMM,MAAM,GAAGX,OAAO,CAAEU,IAAI,CAAM;EAElC,IAAI,EAAE,SAAS,IAAIC,MAAM,CAAC,IAAI,CAACA,MAAM,CAACC,OAAO,EAAE,OAAOD,MAAM;EAE5D,MAAM;IAAEC,OAAO,EAAEC,GAAG;IAAE,GAAGC;EAAM,CAAC,GAAGH,MAAM;EAEzC,MAAMI,GAAG,GAAGF,GAAyB;EAErCG,MAAM,CAACC,OAAO,CAACH,KAAK,CAAC,CAACI,OAAO,CAAC,CAAC,CAACC,IAAI,EAAEC,KAAK,CAAC,KAAK;IAC/C,MAAMC,QAAQ,GAAGN,GAAG,CAACI,IAAI,CAA6B;IACtD,IAAIE,QAAQ,KAAKC,SAAS,EAAE;MACzBP,GAAG,CAACI,IAAI,CAA6B,GAAeC,KAAK;IAC5D,CAAC,MAAM,IAAIC,QAAQ,KAAKD,KAAK,EAAE;MAC7B,MAAMG,KAAK,CAAC,4CAA4C,CAAC;IAC3D;EACF,CAAC,CAAC;EACF,OAAOR,GAAG;AACZ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASS,WAAWA,CAACnB,UAAkB,EAAU;EACtD,OAAOA,UAAU;AACnB","ignoreList":[]}

package/config/babel/node-ssr.js

@@ -32,12 +32,9 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getConfig;
-const pull_1 = __importDefault(require("lodash/pull"));
+const lodash_es_1 = require("lodash-es");
 const webpack_1 = __importStar(require("./webpack"));
 /**
  * Creates a new base config.
@@ -57,6 +54,9 @@ function newBase(babel, options = {}) {
             extensions: ['gif', 'jpeg', 'jpg', 'png'],
             name: `${baseAssetsOutputPath}/images/[md4:hash:20].[ext]`,
         }]);
+    if (options.modules === false) {
+        config.plugins.push('babel-plugin-add-import-extension');
+    }
     const moduleResolverPluginOps = config.plugins.find((x) => Array.isArray(x) && x[0] === 'module-resolver')[1];
     moduleResolverPluginOps.transformFunctions = [
         'requireWeak',
@@ -65,7 +65,7 @@ function newBase(babel, options = {}) {
         'webpack.resolveWeak',
     ];
     if (babel.env() === webpack_1.ENVIRONMENTS.DEV) {
-        (0, pull_1.default)(config.plugins, 'react-refresh/babel');
+        (0, lodash_es_1.pull)(config.plugins, 'react-refresh/babel');
     }
     return config;
 }

package/config/jest/default.js

@@ -8,6 +8,7 @@ const globalLibDir = path.resolve(process.execPath, '../../lib/node_modules');
 const modulesToTransform = [
   '@dr.pogodin/react-global-state',
   '@dr.pogodin/react-utils',
+  'lodash-es',
   'uuid',
 ];
 

package/config/webpack/app-base.js

@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = configFactory;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const sitemap_1 = __importDefault(require("sitemap"));
-const clone_1 = __importDefault(require("lodash/clone"));
-const defaults_1 = __importDefault(require("lodash/defaults"));
-const isFunction_1 = __importDefault(require("lodash/isFunction"));
-const isObject_1 = __importDefault(require("lodash/isObject"));
+const sitemap_1 = require("sitemap");
+const clone_js_1 = __importDefault(require("lodash/clone.js"));
+const defaults_js_1 = __importDefault(require("lodash/defaults.js"));
+const isFunction_js_1 = __importDefault(require("lodash/isFunction.js"));
+const isObject_js_1 = __importDefault(require("lodash/isObject.js"));
 const autoprefixer_1 = __importDefault(require("autoprefixer"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const node_forge_1 = __importDefault(require("node-forge"));
@@ -129,7 +129,7 @@ const utils_1 = require("@dr.pogodin/babel-plugin-react-css-modules/utils");
  */
 function configFactory(ops) {
     var _a, _b;
-    const o = (0, defaults_1.default)((0, clone_1.default)(ops), {
+    const o = (0, defaults_js_1.default)((0, clone_js_1.default)(ops), {
         babelLoaderOptions: {},
         cssLocalIdent: '[hash:base64:6]',
         outputPath: 'build/web-public',
@@ -144,12 +144,12 @@ function configFactory(ops) {
         const sitemapUrl = node_path_1.default.resolve(o.context, o.sitemap);
         // eslint-disable-next-line import/no-dynamic-require, @typescript-eslint/no-require-imports
         let source = require(sitemapUrl);
-        if ((0, isFunction_1.default)(source))
+        if ((0, isFunction_js_1.default)(source))
             source = source();
-        const sm = new sitemap_1.default.SitemapStream();
+        const sm = new sitemap_1.SitemapStream();
         source.forEach((item) => sm.write(item));
         sm.end();
-        void sitemap_1.default.streamToPromise(sm).then((sitemap) => {
+        void (0, sitemap_1.streamToPromise)(sm).then((sitemap) => {
             const outUrl = node_path_1.default.resolve(o.context, o.outputPath);
             if (!fs.existsSync(outUrl))
                 fs.mkdirSync(outUrl);
@@ -210,7 +210,7 @@ function configFactory(ops) {
         plugins.push(new webpack_1.ProgressPlugin());
     /* Adds InjectManifest plugin from WorkBox, if opted to. */
     if (o.workbox) {
-        if (!(0, isObject_1.default)(o.workbox))
+        if (!(0, isObject_js_1.default)(o.workbox))
             o.workbox = {};
         plugins.push(new workbox_webpack_plugin_1.default.InjectManifest(Object.assign(Object.assign({ swSrc: node_path_1.default.resolve(__dirname, '../workbox/default.js') }, o.workbox), { swDest: '__service-worker.js' })));
     }
@@ -323,6 +323,7 @@ function configFactory(ops) {
                 '.json',
                 '.scss',
             ],
+            fallback: { module: false },
             symlinks: false,
         },
     };

package/config/webpack/app-development.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = configFactory;
-const clone_1 = __importDefault(require("lodash/clone"));
-const defaults_1 = __importDefault(require("lodash/defaults"));
+const clone_js_1 = __importDefault(require("lodash/clone.js"));
+const defaults_js_1 = __importDefault(require("lodash/defaults.js"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const react_refresh_webpack_plugin_1 = __importDefault(require("@pmmmwh/react-refresh-webpack-plugin"));
 const webpack_1 = __importDefault(require("webpack"));
@@ -18,7 +18,7 @@ const app_base_1 = __importDefault(require("./app-base"));
  * @param [ops.dontUseHmr]
  */
 function configFactory(ops) {
-    const o = (0, defaults_1.default)((0, clone_1.default)(ops), {
+    const o = (0, defaults_js_1.default)((0, clone_js_1.default)(ops), {
         cssLocalIdent: '[package]___[path][name]___[local]___[hash:base64:6]',
     });
     const entry = ['@dr.pogodin/react-utils/build/development/client/init'];

package/config/webpack/lib-base.js

@@ -42,7 +42,7 @@ function configFactory(ops) {
             'axios',
             'cookie',
             'dayjs',
-            'lodash',
+            'lodash-es',
             /node-forge/,
             'qs',
             'react',

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.47.0-alpha.2",
+  "version": "1.47.0-alpha.3",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -12,7 +12,7 @@
     "@dr.pogodin/babel-plugin-react-css-modules": "^6.13.8",
     "@dr.pogodin/csurf": "^1.16.6",
     "@dr.pogodin/js-utils": "^0.1.4",
-    "@dr.pogodin/react-global-state": "^0.21.0",
+    "@dr.pogodin/react-global-state": "^0.21.1",
     "@dr.pogodin/react-helmet": "^3.0.4",
     "@dr.pogodin/react-themes": "^1.9.3",
     "@jest/environment": "^30.2.0",
@@ -27,7 +27,7 @@
     "express": "^5.1.0",
     "helmet": "^8.1.0",
     "http-status-codes": "^2.3.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "morgan": "^1.10.1",
     "node-forge": "^1.3.1",
     "qs": "^6.14.0",
@@ -69,6 +69,7 @@
     "@types/express": "^5.0.5",
     "@types/jest": "^30.0.0",
     "@types/lodash": "^4.17.20",
+    "@types/lodash-es": "^4.17.12",
     "@types/morgan": "^1.9.10",
     "@types/node-forge": "^1.3.14",
     "@types/pretty": "^2.0.3",
@@ -83,6 +84,7 @@
     "autoprefixer": "^10.4.21",
     "babel-jest": "^30.2.0",
     "babel-loader": "^10.0.0",
+    "babel-plugin-add-import-extension": "^1.6.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-plugin-transform-import-meta": "^2.3.3",
     "core-js": "^3.46.0",
@@ -104,7 +106,7 @@
     "resolve-url-loader": "^5.0.0",
     "sass": "^1.93.3",
     "sass-loader": "^16.0.6",
-    "sitemap": "^8.0.2",
+    "sitemap": "^9.0.0",
     "source-map-loader": "^5.0.0",
     "stylelint": "^16.25.0",
     "stylelint-config-standard-scss": "^16.0.0",
@@ -177,8 +179,8 @@
   "scripts": {
     "build": "rimraf build && npm run build:configs && npm run build:types-scss && npm run build:types-code && npm run build:web && npm run build:dev && npm run build:prod",
     "build:configs": "tsc --project tsconfig.configs.json",
-    "build:dev": "node bin/build -i build/web -t development --lib --webpack-config webpack.config.ts --no-webpack",
-    "build:prod": "node bin/build -i build/web -t production --lib --webpack-config webpack.config.ts --no-webpack",
+    "build:dev": "node bin/build -i build/web -t development --lib --babel-config babel.module.config.js --webpack-config webpack.config.ts --no-webpack",
+    "build:prod": "node bin/build -i build/web -t production --lib --babel-config babel.module.config.js --webpack-config webpack.config.ts --no-webpack",
     "build:types-code": "rimraf build/types-code && tsc --project tsconfig.types.json && tsc-alias -p tsconfig.types.json",
     "build:types-scss": "rimraf build/types-scss && typed-scss-modules .",
     "build:web": "rimraf build/web && babel ./src --config-file ./babel.libweb.config.js --out-dir build/web -x .js,.jsx,.ts,.tsx --source-maps --copy-files",

package/src/client/getInj.ts

@@ -4,10 +4,10 @@
 
 // Note: this way, only required part of "node-forge": AES, and some utils,
 // is bundled into client-side code.
-import forge from 'node-forge/lib/forge';
+import forge from 'node-forge/lib/forge.js';
 
 // eslint-disable-next-line import/no-unassigned-import
-import 'node-forge/lib/aes';
+import 'node-forge/lib/aes.js';
 
 import type { InjT } from 'utils/globalState';
 

package/src/server/index.ts

@@ -1,20 +1,15 @@
 // eslint-disable-next-line import/no-unassigned-import
-import 'source-map-support/register';
+import 'source-map-support/register.js';
 
 import http from 'node:http';
 import https from 'node:https';
 
-import cloneDeep from 'lodash/cloneDeep';
-import defaults from 'lodash/defaults';
-import isFinite from 'lodash/isFinite';
-import isNumber from 'lodash/isNumber';
-import isString from 'lodash/isString';
-import toNumber from 'lodash/toNumber';
+import { cloneDeep, defaults } from 'lodash-es';
 
 // Polyfill required by ReactJS.
 // TODO: Double-check, if it is still required by React v19?
 // eslint-disable-next-line import/no-unassigned-import
-import 'raf/polyfill';
+import 'raf/polyfill.js';
 
 import type { Configuration } from 'webpack';
 
@@ -41,13 +36,12 @@ export { errors, getDefaultCspSettings, type ServerT };
  * Normalizes a port into a number, string, or false.
  * TODO: Drop this function?
  * @param value Port name or number.
- * @return Port number (Number), name (String), or false.
+ * @return Port number (Number), name (String).
  */
 function normalizePort(value: number | string) {
-  const port = toNumber(value);
-  if (isFinite(port)) return port; /* port number */
-  if (!isNumber(port)) return value; /* named pipe */
-  return false;
+  const port = typeof value === 'string' ? parseInt(value) : value;
+  if (Number.isFinite(port)) return port; /* port number */
+  return value; /* named pipe */
 }
 
 type OptionsT = ServerOptionsT & {
@@ -212,7 +206,7 @@ export default async function launchServer(
   /* Sets error handler for HTTP(S) server. */
   httpServer.on('error', (error: Error) => {
     if ((error as { syscall?: string }).syscall !== 'listen') throw error;
-    const bind = isString(ops.port) ? `Pipe ${ops.port}` : `Port ${ops.port}`;
+    const bind = typeof ops.port === 'string' ? `Pipe ${ops.port}` : `Port ${ops.port}`;
 
     /* Human-readable message for some specific listen errors. */
     switch ((error as { code?: string }).code) {
@@ -231,7 +225,7 @@ export default async function launchServer(
   /* Listening event handler for HTTP(S) server. */
   httpServer.on('listening', () => {
     const addr = httpServer.address()!;
-    const bind = isString(addr) ? `pipe ${addr}` : `port ${addr.port}`;
+    const bind = typeof addr === 'string' ? `pipe ${addr}` : `port ${addr.port}`;
     ops.logger!.info(`Server listening on ${bind} in ${
       process.env.NODE_ENV} mode`);
   });

package/src/server/renderer.tsx

@@ -15,13 +15,12 @@ import winston from 'winston';
 import { GlobalStateProvider, SsrContext } from '@dr.pogodin/react-global-state';
 import { timer } from '@dr.pogodin/js-utils';
 
-import clone from 'lodash/clone';
-import cloneDeep from 'lodash/cloneDeep';
-import defaults from 'lodash/defaults';
-import get from 'lodash/get';
-import isString from 'lodash/isString';
-import mapValues from 'lodash/mapValues';
-import omit from 'lodash/omit';
+import {
+  cloneDeep,
+  defaults,
+  get,
+  mapValues,
+} from 'lodash-es';
 
 import config from 'config';
 import forge from 'node-forge';
@@ -36,7 +35,9 @@ import type { ChunkGroupsT, SsrContextT } from 'utils/globalState';
 
 import Cache from './Cache';
 
-const sanitizedConfig = omit(config, 'SECRET');
+// @ts-expect-error "Property 'SECRET' does not exist on type 'IConfig'."
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { SECRET, ...sanitizedConfig } = config;
 
 // Note: These type definitions for logger are copied from Winston logger,
 // then simplified to make it easier to fit an alternative logger into this
@@ -196,7 +197,7 @@ function groupExtraScripts(scripts: Array<string | ScriptT> = []) {
     [SCRIPT_LOCATIONS.HEAD_OPEN]: '',
   };
   for (const script of scripts) {
-    if (isString(script)) {
+    if (typeof script === 'string') {
       if (script) res[SCRIPT_LOCATIONS.DEFAULT] += script;
     } else if (script.code) {
       if (script.location in res) res[script.location] += script.code;
@@ -312,7 +313,7 @@ export default function factory(
   webpackConfig: Configuration,
   options: OptionsT,
 ): RequestHandler {
-  const ops: OptionsT = defaults(clone(options), {
+  const ops: OptionsT = defaults({ ...options }, {
     beforeRender: async () => Promise.resolve({}),
     maxSsrRounds: 10,
     ssrTimeout: 1000,

package/src/server/server.ts

@@ -5,9 +5,7 @@
 import { sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
-import cloneDeep from 'lodash/cloneDeep';
-import mapValues from 'lodash/mapValues';
-import pick from 'lodash/pick';
+import { cloneDeep, mapValues, pick } from 'lodash-es';
 
 import compression from 'compression';
 import cookieParser from 'cookie-parser';
@@ -250,7 +248,7 @@ export default async function factory(
       } as Location;
     }
 
-    const { webpack } = await import(/* webpackChunkName: "server-side-code" */ 'webpack');
+    const { default: webpack } = await import(/* webpackChunkName: "server-side-code" */ 'webpack');
 
     const { default: webpackDevMiddleware } = await import(
       /* webpackChunkName: "server-side-code" */ 'webpack-dev-middleware'

package/src/shared/utils/jest/E2eSsrEnv.ts

@@ -20,8 +20,7 @@ import path from 'node:path';
 
 import type { Request, Response } from 'express';
 
-import defaults from 'lodash/defaults';
-import set from 'lodash/set';
+import { defaults, set } from 'lodash-es';
 
 import type { ReactNode } from 'react';
 

package/src/shared/utils/webpack.ts

@@ -1,6 +1,9 @@
 import type PathNS from 'node:path';
 
-import { IS_CLIENT_SIDE } from './isomorphy';
+// eslint-disable-next-line import/enforce-node-protocol-usage
+import { createRequire } from 'module';
+
+import { IS_CLIENT_SIDE, IS_SERVER_SIDE } from './isomorphy';
 
 type RequireWeakOptionsT = {
   basePath?: string;
@@ -10,6 +13,10 @@ type RequireWeakResT<T> = T extends { default: infer D }
   ? (D extends null | undefined ? T : D & Omit<T, 'default'>)
   : T;
 
+let require: ((url: string) => unknown) | undefined;
+
+if (IS_SERVER_SIDE) require = createRequire(import.meta.url);
+
 /**
  * Requires the specified module without including it into the bundle during
  * Webpack build.
@@ -36,14 +43,12 @@ export function requireWeak<T extends object>(
     ({ basePath } = ops);
   }
 
-  // eslint-disable-next-line no-eval
-  const req = eval('require') as (path: string) => unknown;
-
   // eslint-disable-next-line @typescript-eslint/unbound-method
-  const { resolve } = req('path') as typeof PathNS;
+  const { resolve } = require!('node:path') as typeof PathNS;
 
   const path = basePath ? resolve(basePath, modulePath) : modulePath;
-  const module = req(path) as T;
+
+  const module = require!(path) as T;
 
   if (!('default' in module) || !module.default) return module as RequireWeakResT<T>;
 
@@ -53,8 +58,9 @@ export function requireWeak<T extends object>(
 
   Object.entries(named).forEach(([name, value]) => {
     const assigned = res[name as keyof RequireWeakResT<T>];
-    if (assigned) (res[name as keyof RequireWeakResT<T>] as unknown) = value;
-    else if (assigned !== value) {
+    if (assigned === undefined) {
+      (res[name as keyof RequireWeakResT<T>] as unknown) = value;
+    } else if (assigned !== value) {
       throw Error('Conflict between default and named exports');
     }
   });

package/types.d.ts

@@ -19,7 +19,7 @@ declare module '@babel/register/experimental-worker' {
   export default register;
 }
 
-declare module 'node-forge/lib/forge' {
+declare module 'node-forge/lib/forge.js' {
   import F from 'node-forge';
 
   export default F;