@dr.pogodin/react-utils 1.46.2 → 1.47.0-alpha.11

package/config/webpack/app-base.js

@@ -5,16 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = configFactory;
+const node_crypto_1 = require("node:crypto");
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
-const sitemap_1 = __importDefault(require("sitemap"));
-const lodash_1 = require("lodash");
+const sitemap_1 = require("sitemap");
+const lodash_es_1 = require("lodash-es");
 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"));
 const webpack_1 = require("webpack");
 const workbox_webpack_plugin_1 = __importDefault(require("workbox-webpack-plugin"));
 const utils_1 = require("@dr.pogodin/babel-plugin-react-css-modules/utils");
+const COREJS_REGEX = /\/core-js/;
 /**
  * Creates a new Webpack config object, and performs some auxiliary operations
  * on the way.
@@ -125,8 +126,8 @@ const utils_1 = require("@dr.pogodin/babel-plugin-react-css-modules/utils");
  *   - **`timestamp`** — The value set for `BUILD_TIMESTAMP`.
  */
 function configFactory(ops) {
-    var _a, _b, _c;
-    const o = (0, lodash_1.defaults)((0, lodash_1.clone)(ops), {
+    var _a, _b;
+    const o = (0, lodash_es_1.defaults)((0, lodash_es_1.clone)(ops), {
         babelLoaderOptions: {},
         cssLocalIdent: '[hash:base64:6]',
         outputPath: 'build/web-public',
@@ -141,12 +142,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, lodash_1.isFunction)(source))
+        if ((0, lodash_es_1.isFunction)(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);
@@ -176,7 +177,7 @@ function configFactory(ops) {
     // build info object in case nothing could be loaded.
     buildInfo !== null && buildInfo !== void 0 ? buildInfo : (buildInfo = Object.freeze({
         /* A random 32-bit key, that can be used for encryption. */
-        key: node_forge_1.default.random.getBytesSync(32),
+        key: (0, node_crypto_1.randomBytes)(32).toString('base64'),
         /* Public path used during build. */
         publicPath: o.publicPath,
         /* `true` if client-side code should setup a service worker. */
@@ -195,8 +196,6 @@ function configFactory(ops) {
     }
     /* Entry points normalization. */
     const entry = [
-        'core-js/stable',
-        'regenerator-runtime/runtime',
         'nodelist-foreach-polyfill',
         ...Array.isArray(o.entry) ? o.entry : [o.entry],
     ];
@@ -207,10 +206,21 @@ function configFactory(ops) {
         plugins.push(new webpack_1.ProgressPlugin());
     /* Adds InjectManifest plugin from WorkBox, if opted to. */
     if (o.workbox) {
-        if (!(0, lodash_1.isObject)(o.workbox))
+        if (!(0, lodash_es_1.isObject)(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' })));
     }
+    let { babelLoaderExclude } = ops;
+    if (babelLoaderExclude) {
+        if (!Array.isArray(babelLoaderExclude))
+            throw Error('Not supported');
+        // BEWARE: This ensures Babel loader does not process CoreJS library,
+        // which would break it creating circular references in its code.
+        babelLoaderExclude = [...babelLoaderExclude, COREJS_REGEX];
+    }
+    else {
+        babelLoaderExclude = [COREJS_REGEX];
+    }
     const res = {
         context: o.context,
         entry,
@@ -232,7 +242,7 @@ function configFactory(ops) {
                     // Loads JS modules (.cjs, .js, .jsx, .mjs); TS modules (.ts, .tsx);
                     // and SVG assets (.svg).
                     test: /\.(cjs|js|jsx|mjs|svg|ts|tsx)$/,
-                    exclude: (_b = ops.babelLoaderExclude) !== null && _b !== void 0 ? _b : [/node_modules/],
+                    exclude: babelLoaderExclude,
                     loader: 'babel-loader',
                     options: Object.assign({ babelrc: false, configFile: false, envName: o.babelEnv, presets: [['@dr.pogodin/react-utils/config/babel/webpack', {
                                     typescript: ops.typescript,
@@ -320,6 +330,7 @@ function configFactory(ops) {
                 '.json',
                 '.scss',
             ],
+            fallback: { module: false },
             symlinks: false,
         },
     };
@@ -338,7 +349,7 @@ function configFactory(ops) {
     // @babel/runtime/helpers/esm/interopRequireDefault, which has
     // the hepler function attached to "default" export).
     if (process.env.NODE_ENV !== 'test') {
-        const aliases = (_c = res.resolve) === null || _c === void 0 ? void 0 : _c.alias;
+        const aliases = (_b = res.resolve) === null || _b === void 0 ? void 0 : _b.alias;
         aliases['@babel/runtime/helpers/defineProperty']
             = node_path_1.default.resolve(o.context, 'node_modules/@babel/runtime/helpers/defineProperty');
         aliases['@babel/runtime/helpers/interopRequireDefault']

package/config/webpack/app-development.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = configFactory;
-const lodash_1 = require("lodash");
+const lodash_es_1 = require("lodash-es");
 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"));
@@ -17,7 +17,7 @@ const app_base_1 = __importDefault(require("./app-base"));
  * @param [ops.dontUseHmr]
  */
 function configFactory(ops) {
-    const o = (0, lodash_1.defaults)((0, lodash_1.clone)(ops), {
+    const o = (0, lodash_es_1.defaults)((0, lodash_es_1.clone)(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,8 +42,7 @@ function configFactory(ops) {
             'axios',
             'cookie',
             'dayjs',
-            'lodash',
-            /node-forge/,
+            'lodash-es',
             'qs',
             'react',
             /react-dom/,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.46.2",
+  "version": "1.47.0-alpha.11",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -12,31 +12,30 @@
     "@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.20.1",
+    "@dr.pogodin/react-global-state": "^0.21.1",
     "@dr.pogodin/react-helmet": "^3.0.4",
-    "@dr.pogodin/react-themes": "^1.9.3",
+    "@dr.pogodin/react-themes": "^1.9.4",
     "@jest/environment": "^30.2.0",
-    "axios": "^1.12.2",
+    "axios": "^1.13.2",
     "commander": "^14.0.2",
     "compression": "^1.8.1",
     "config": "^4.1.1",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
     "cross-env": "^10.1.0",
-    "dayjs": "^1.11.18",
+    "dayjs": "^1.11.19",
     "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",
     "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",
+    "rimraf": "^6.1.0",
     "serialize-javascript": "^7.0.0",
     "serve-favicon": "^2.5.1",
     "source-map-support": "^0.5.21",
@@ -61,16 +60,16 @@
     "@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.10",
-    "@types/express": "^5.0.4",
+    "@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",
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
@@ -83,14 +82,15 @@
     "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",
-    "core-js": "^3.46.0",
+    "babel-plugin-transform-import-meta": "^2.3.3",
     "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",
@@ -99,11 +99,10 @@
     "postcss-scss": "^4.0.9",
     "pretty": "^2.0.0",
     "react-refresh": "^0.18.0",
-    "regenerator-runtime": "^0.14.1",
     "resolve-url-loader": "^5.0.0",
-    "sass": "^1.93.2",
+    "sass": "^1.93.3",
     "sass-loader": "^16.0.6",
-    "sitemap": "^8.0.1",
+    "sitemap": "^9.0.0",
     "source-map-loader": "^5.0.0",
     "stylelint": "^16.25.0",
     "stylelint-config-standard-scss": "^16.0.0",
@@ -121,43 +120,42 @@
     "workbox-webpack-plugin": "^7.3.0"
   },
   "engines": {
-    "node": ">=20",
-    "npm": ">=10"
+    "node": ">=22.21",
+    "npm": ">=10.9"
   },
-  "main": "./node-entry.js",
-  "source": "./src/index.ts",
+  "main": "./build/production/index.js",
   "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"
-      },
+      "types": "./build/types-code/index.d.ts",
+      "webpack": "./build/web/index.js",
       "node": {
-        "webpack": "./build/production/web.bundle.js",
-        "default": "./node-entry.js"
+        "development": "./build/development/index.js",
+        "default": "./build/production/index.js"
       },
       "react-native": {
-        "default": "./node-entry.js",
+        "default": "./build/production/index.js",
         "types": "./build/types-code/index.d.ts"
       }
     },
+    "./client": {
+      "types": "./build/types-code/client/index.d.ts",
+      "default": "./build/web/client/index.js"
+    },
     "./config/*": "./config/*.js",
     "./config/eslint/*": "./config/eslint/*.mjs",
     "./config/*.json": "./config/*.json",
-    "./jest": "./build/production/shared/utils/jest/index.js",
-    "./mixins": "./src/styles/mixins.scss",
-    "./dev-styles": {
-      "node": "./null.js",
-      "browser": "./build/development/style.css"
+    "./global-styles.scss": "./build/web/styles/global.scss",
+    "./jest": {
+      "types": "./build/types-code/shared/utils/jest/index.d.ts",
+      "default": "./build/production/shared/utils/jest/index.js"
     },
-    "./dev-styles-forced": "./build/development/style.css",
-    "./prod-styles": {
-      "node": "./null.js",
-      "browser": "./build/production/style.css"
+    "./mixins": "./build/web/styles/mixins.scss",
+    "./server": {
+      "types": "./build/types-code/server/index.d.ts",
+      "development": "./build/development/server/index.js",
+      "default": "./build/production/server/index.js"
     },
-    "./prod-styles-forced": "./build/production/style.css",
     "./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 +184,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 --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",
     "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/types.d.ts

@@ -4,6 +4,7 @@ declare var IS_REACT_ACT_ENVIRONMENT: boolean | undefined;
 declare var REACT_UTILS_WEBPACK_BUNDLE: boolean | undefined;
 declare var REACT_UTILS_LIBRARY_LOADED: boolean | undefined;
 declare var REACT_UTILS_FORCE_CLIENT_SIDE: boolean | undefined;
+declare var SCENE_INIT_PROMISE: Promise<void> | undefined;
 /* eslint-enable no-var */
 
 declare module '@babel/register/experimental-worker' {
@@ -19,12 +20,6 @@ declare module '@babel/register/experimental-worker' {
   export default register;
 }
 
-declare module 'node-forge/lib/forge' {
-  import F from 'node-forge';
-
-  export default F;
-}
-
 declare module '*.png' {
   const path: string;
   export default path;

package/build/development/__chunk_groups__.json

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