@dr.pogodin/react-utils 1.46.1 → 1.47.0-alpha.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.46.1",
+  "version": "1.47.0-alpha.1",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -11,13 +11,13 @@
     "@babel/runtime": "^7.28.4",
     "@dr.pogodin/babel-plugin-react-css-modules": "^6.13.8",
     "@dr.pogodin/csurf": "^1.16.6",
-    "@dr.pogodin/js-utils": "^0.1.3",
-    "@dr.pogodin/react-global-state": "^0.20.0",
+    "@dr.pogodin/js-utils": "^0.1.4",
+    "@dr.pogodin/react-global-state": "^0.20.1",
     "@dr.pogodin/react-helmet": "^3.0.4",
     "@dr.pogodin/react-themes": "^1.9.3",
     "@jest/environment": "^30.2.0",
-    "axios": "^1.12.2",
-    "commander": "^14.0.1",
+    "axios": "^1.13.1",
+    "commander": "^14.0.2",
     "compression": "^1.8.1",
     "config": "^4.1.1",
     "cookie": "^1.0.2",
@@ -34,7 +34,7 @@
     "raf": "^3.4.1",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
-    "react-router": "^7.9.4",
+    "react-router": "^7.9.5",
     "request-ip": "^3.3.0",
     "rimraf": "^6.0.0",
     "serialize-javascript": "^7.0.0",
@@ -46,27 +46,27 @@
   "description": "Collection of generic ReactJS components and utils",
   "devDependencies": {
     "@babel/cli": "^7.28.3",
-    "@babel/core": "^7.28.4",
+    "@babel/core": "^7.28.5",
     "@babel/node": "^7.28.0",
-    "@babel/plugin-transform-runtime": "^7.28.3",
-    "@babel/preset-env": "^7.28.3",
-    "@babel/preset-react": "^7.27.1",
-    "@babel/preset-typescript": "^7.27.1",
+    "@babel/plugin-transform-runtime": "^7.28.5",
+    "@babel/preset-env": "^7.28.5",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
     "@babel/register": "^7.28.3",
     "@dr.pogodin/babel-plugin-transform-assets": "^1.2.5",
     "@dr.pogodin/babel-preset-svgr": "^1.9.2",
-    "@dr.pogodin/eslint-configs": "^0.1.0",
+    "@dr.pogodin/eslint-configs": "^0.1.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.6.1",
     "@standard-schema/spec": "^1.0.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
-    "@tsconfig/recommended": "^1.0.10",
+    "@tsconfig/recommended": "^1.0.11",
     "@types/compression": "^1.8.1",
     "@types/config": "^3.3.5",
     "@types/cookie": "^0.6.0",
-    "@types/cookie-parser": "^1.4.9",
-    "@types/express": "^5.0.3",
+    "@types/cookie-parser": "^1.4.10",
+    "@types/express": "^5.0.5",
     "@types/jest": "^30.0.0",
     "@types/lodash": "^4.17.20",
     "@types/morgan": "^1.9.10",
@@ -79,18 +79,19 @@
     "@types/serve-favicon": "^2.5.7",
     "@types/supertest": "^6.0.3",
     "@types/webpack": "^5.28.5",
-    "@types/webpack-hot-middleware": "^2.25.11",
+    "@types/webpack-hot-middleware": "^2.25.12",
     "autoprefixer": "^10.4.21",
     "babel-jest": "^30.2.0",
     "babel-loader": "^10.0.0",
     "babel-plugin-module-resolver": "^5.0.2",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "core-js": "^3.46.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^30.2.0",
     "jest-environment-jsdom": "^30.2.0",
-    "memfs": "^4.49.0",
+    "memfs": "^4.50.0",
     "mini-css-extract-plugin": "^2.9.4",
     "mockdate": "^3.0.5",
     "nodelist-foreach-polyfill": "^1.2.0",
@@ -102,14 +103,14 @@
     "regenerator-runtime": "^0.14.1",
     "resolve-url-loader": "^5.0.0",
     "sass": "^1.93.2",
-    "sass-loader": "^16.0.5",
-    "sitemap": "^8.0.1",
+    "sass-loader": "^16.0.6",
+    "sitemap": "^8.0.2",
     "source-map-loader": "^5.0.0",
     "stylelint": "^16.25.0",
     "stylelint-config-standard-scss": "^16.0.0",
     "supertest": "^7.1.4",
     "tsc-alias": "1.8.16",
-    "tstyche": "^4.3.0",
+    "tstyche": "^5.0.0",
     "typed-scss-modules": "^8.1.1",
     "typescript": "^5.9.3",
     "webpack": "^5.102.1",
@@ -129,13 +130,9 @@
   "types": "./build/types-code/index.d.ts",
   "exports": {
     ".": {
-      "browser": {
-        "development": "./build/development/web.bundle.js",
-        "production": "./build/production/web.bundle.js",
-        "default": "./build/production/web.bundle.js"
-      },
+      "browser": "./build/web/index.js",
       "node": {
-        "webpack": "./build/production/web.bundle.js",
+        "webpack": "./build/web/index.js",
         "default": "./node-entry.js"
       },
       "react-native": {
@@ -146,18 +143,9 @@
     "./config/*": "./config/*.js",
     "./config/eslint/*": "./config/eslint/*.mjs",
     "./config/*.json": "./config/*.json",
+    "./global-styles": "./build/web/styles/global.scss",
     "./jest": "./build/production/shared/utils/jest/index.js",
-    "./mixins": "./src/styles/mixins.scss",
-    "./dev-styles": {
-      "node": "./null.js",
-      "browser": "./build/development/style.css"
-    },
-    "./dev-styles-forced": "./build/development/style.css",
-    "./prod-styles": {
-      "node": "./null.js",
-      "browser": "./build/production/style.css"
-    },
-    "./prod-styles-forced": "./build/production/style.css",
+    "./mixins": "./build/web/styles/mixins.scss",
     "./build/development/client/init": "./build/development/client/init.js",
     "./build/production/client/init": "./build/production/client/init.js",
     "./jest-e2e-ssr-env": "./build/production/shared/utils/jest/E2eSsrEnv.js"
@@ -186,12 +174,13 @@
     "url": "git+https://github.com/birdofpreyru/react-utils.git"
   },
   "scripts": {
-    "build": "rimraf build && npm run build:configs && npm run build:types-scss && npm run build:types-code && npm run build:dev && npm run build:prod",
+    "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 -t development --lib --webpack-config webpack.config.ts",
-    "build:prod": "node bin/build -t production --lib --webpack-config webpack.config.ts",
+    "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: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",
     "jest:1": "NODE_CONFIG_ENV=test jest --no-cache -w 1 --config config/jest/default.js --shard=1/2",
     "jest:2": "NODE_CONFIG_ENV=test jest --no-cache -w 1 --config config/jest/default.js --shard=2/2",
     "jest:types": "tstyche",

package/src/index.ts

@@ -13,7 +13,13 @@ if (global.REACT_UTILS_LIBRARY_LOADED) {
   throw Error('React utils library is already loaded');
 } else global.REACT_UTILS_LIBRARY_LOADED = true;
 
-const server = webpack.requireWeak<typeof ServerFactoryM>('./server', __dirname);
+// TODO: This is a rapid workaround to get rid of __dirname. I guess, later
+// we'll re-implement requireWeak() to accept import.meta.url directly, and
+// this workaround won't be needed.
+let dirname = import.meta.url;
+dirname = dirname.slice(5, dirname.lastIndexOf('/'));
+
+const server = webpack.requireWeak<typeof ServerFactoryM>('./server', dirname);
 
 const client = server
   ? undefined

package/src/server/index.ts

@@ -4,14 +4,12 @@ import 'source-map-support/register';
 import http from 'node:http';
 import https from 'node:https';
 
-import {
-  cloneDeep,
-  defaults,
-  isFinite,
-  isNumber,
-  isString,
-  toNumber,
-} from 'lodash';
+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';
 
 // Polyfill required by ReactJS.
 // TODO: Double-check, if it is still required by React v19?

package/src/server/renderer.tsx

@@ -15,15 +15,13 @@ import winston from 'winston';
 import { GlobalStateProvider, SsrContext } from '@dr.pogodin/react-global-state';
 import { timer } from '@dr.pogodin/js-utils';
 
-import {
-  clone,
-  cloneDeep,
-  defaults,
-  get,
-  isString,
-  mapValues,
-  omit,
-} from 'lodash';
+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 config from 'config';
 import forge from 'node-forge';

package/src/server/server.ts

@@ -5,11 +5,9 @@
 import { sep } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
-import {
-  cloneDeep,
-  mapValues,
-  pick,
-} from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import mapValues from 'lodash/mapValues';
+import pick from 'lodash/pick';
 
 import compression from 'compression';
 import cookieParser from 'cookie-parser';

package/src/shared/components/Modal/base-theme.scss

@@ -1,4 +1,4 @@
-@use "styles/mixins" as *;
+@use "../../../styles/mixins" as *;
 
 *,
 .context,

package/src/shared/components/PageLayout/base-theme.scss

@@ -5,7 +5,7 @@
  * columns on left and right.
  */
 
-@use "styles/mixins" as *;
+@use "../../../styles/mixins" as *;
 
 *,
 .context,

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

@@ -19,7 +19,10 @@
 import path from 'node:path';
 
 import type { Request, Response } from 'express';
-import { defaults, noop, set } from 'lodash';
+
+import defaults from 'lodash/defaults';
+import set from 'lodash/set';
+
 import type { ReactNode } from 'react';
 
 // As this environment is a part of the Jest testing utils,
@@ -41,6 +44,10 @@ import ssrFactory from 'server/renderer';
 
 import { setBuildInfo } from '../isomorphy/buildInfo';
 
+function noop() {
+  // NOOP
+}
+
 export default class E2eSsrEnv extends JsdomEnv {
   pragmas: Record<string, string | string[]>;
 

package/tstyche.config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://tstyche.org/schemas/config.json",
+  "checkDeclarationFiles": true,
   "checkSuppressedErrors": true,
-  "checkSourceFiles": false,
   "testFileMatch": ["__tests__/**/*.{ts,tsx}"]
 }

package/build/development/__chunk_groups__.json

@@ -1,6 +0,0 @@
-{
-  "main": [
-    "style.css",
-    "web.bundle.js"
-  ]
-}