@dr.pogodin/react-utils 1.45.0 → 1.46.1

package/build/types-code/shared/utils/webpack.d.ts

@@ -1,6 +1,5 @@
 type RequireWeakOptionsT = {
     basePath?: string;
-    throwOnError?: boolean;
 };
 type RequireWeakResT<T> = T extends {
     default: infer D;

package/config/webpack/lib-base.js

@@ -24,6 +24,11 @@ function configFactory(ops) {
     ];
     if (!ops.dontUseProgressPlugin)
         plugins.push(new webpack_1.ProgressPlugin());
+    plugins.push(new webpack_1.DefinePlugin({
+        // TODO: This is a hotfix - when Webpack build of the library is loaded
+        // it should consider itself running at the client side.
+        REACT_UTILS_WEBPACK_BUNDLE: 'true',
+    }));
     return {
         context: ops.context,
         entry: ops.entry,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.45.0",
+  "version": "1.46.1",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -73,7 +73,7 @@
     "@types/node-forge": "^1.3.14",
     "@types/pretty": "^2.0.3",
     "@types/react": "^19.2.2",
-    "@types/react-dom": "^19.2.1",
+    "@types/react-dom": "^19.2.2",
     "@types/request-ip": "^0.0.41",
     "@types/serialize-javascript": "^5.0.4",
     "@types/serve-favicon": "^2.5.7",
@@ -103,7 +103,7 @@
     "resolve-url-loader": "^5.0.0",
     "sass": "^1.93.2",
     "sass-loader": "^16.0.5",
-    "sitemap": "^8.0.0",
+    "sitemap": "^8.0.1",
     "source-map-loader": "^5.0.0",
     "stylelint": "^16.25.0",
     "stylelint-config-standard-scss": "^16.0.0",

package/src/shared/utils/isomorphy/environment-check.ts

@@ -9,7 +9,8 @@ export const IS_CLIENT_SIDE: boolean = typeof process !== 'object'
   // object, but without `versions` sub-object inside it.
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   || !process.versions?.node
-  || !!global.REACT_UTILS_FORCE_CLIENT_SIDE;
+  || !!global.REACT_UTILS_FORCE_CLIENT_SIDE
+  || typeof REACT_UTILS_WEBPACK_BUNDLE !== 'undefined';
 
 /**
  * `true` within the server-side environment (node), `false` at client-side.

package/src/shared/utils/webpack.ts

@@ -4,7 +4,6 @@ import { IS_CLIENT_SIDE } from './isomorphy';
 
 type RequireWeakOptionsT = {
   basePath?: string;
-  throwOnError?: boolean;
 };
 
 type RequireWeakResT<T> = T extends { default: infer D }
@@ -32,46 +31,34 @@ export function requireWeak<T extends object>(
   let ops: RequireWeakOptionsT;
   if (typeof basePathOrOptions === 'string') {
     basePath = basePathOrOptions;
-    ops = {};
   } else {
     ops = basePathOrOptions ?? {};
     ({ basePath } = ops);
   }
 
-  // TODO: On one hand, this try/catch wrap silencing errors is bad, as it may
-  // hide legit errors, in a way difficult to notice and understand; but on the
-  // other hand it fails for some (unclear, but legit?) reasons in some
-  // environments,
-  // like during the static code generation for docs. Perhaps, something should
-  // be implemented differently here.
-  try {
-    // eslint-disable-next-line no-eval
-    const req = eval('require') as (path: string) => unknown;
+  // 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;
+  // eslint-disable-next-line @typescript-eslint/unbound-method
+  const { resolve } = req('path') as typeof PathNS;
 
-    const path = basePath ? resolve(basePath, modulePath) : modulePath;
-    const module = req(path) as T;
+  const path = basePath ? resolve(basePath, modulePath) : modulePath;
+  const module = req(path) as T;
 
-    if (!('default' in module) || !module.default) return module as RequireWeakResT<T>;
+  if (!('default' in module) || !module.default) return module as RequireWeakResT<T>;
 
-    const { default: def, ...named } = module;
+  const { default: def, ...named } = module;
 
-    const res = def as RequireWeakResT<T>;
+  const res = def as RequireWeakResT<T>;
 
-    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) {
-        throw Error('Conflict between default and named exports');
-      }
-    });
-    return res;
-  } catch (error) {
-    if (ops.throwOnError) throw error;
-    return null;
-  }
+  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) {
+      throw Error('Conflict between default and named exports');
+    }
+  });
+  return res;
 }
 
 /**

package/types.d.ts

@@ -1,6 +1,7 @@
 // TODO: Double-check that let does not work?
 /* eslint-disable no-var */
 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;
 /* eslint-enable no-var */