@dr.pogodin/react-utils 1.39.6 → 1.40.1

package/config/babel/node-ssr.js

@@ -29,18 +29,16 @@ const lodash_1 = require("lodash");
 const webpack_1 = __importStar(require("./webpack"));
 /**
  * Creates a new base config.
- * @param {object} babel Babel compiler.
- * @param {object} [options] It supports all options of
- *  {@link module:babel/webpack.getPreset babel/webpack's getPreset()},
- *  but it overrides `targets` option with `current node` value, and further
+ * @param babel Babel compiler.
+ * @param [options] It supports all options of our Babel config for Webpack,
+ *  but it overrides `targets` option with "current node" value, and further
  *  accepts the following:
- * @param {string} [options.baseAssetsOutputPath] Path prefix for emitted
+ * @param [options.baseAssetsOutputPath] Path prefix for emitted
  *  image assets.
- * @return {object} Created config object.
- * @ignore
+ * @return Created config object.
  */
 function newBase(babel, options = {}) {
-    const config = (0, webpack_1.default)(babel, Object.assign(Object.assign({}, options), { targets: 'current node' }));
+    const config = (0, webpack_1.default)(babel, Object.assign({ modules: 'cjs', targets: 'current node' }, options));
     const baseAssetsOutputPath = options.baseAssetsOutputPath || '';
     config.plugins.push(['@dr.pogodin/transform-assets', {
             extensions: ['gif', 'jpeg', 'jpg', 'png'],

package/config/babel/webpack.d.ts

@@ -16,7 +16,9 @@ export type ConfigT = {
     presets: PresetOrPluginT[];
     plugins: PresetOrPluginT[];
 };
+type ModuleT = 'amd' | 'auto' | 'cjs' | 'commonjs' | 'systemjs' | 'umd' | false;
 export type OptionsT = {
+    modules?: ModuleT;
     noRR?: boolean;
     noStyling?: boolean;
     targets?: string | string[] | {

package/config/babel/webpack.js

@@ -20,10 +20,15 @@ var ENVIRONMENTS;
  * @return Generated config.
  */
 function newBaseConfig(options) {
+    var _a;
     return {
         presets: [
-            // Chrome 69 is the browser for Android API 28.
-            ['@babel/env', { targets: options.targets || 'defaults or chrome >= 69' }],
+            ['@babel/env', {
+                    // Leaves it to the Webpack to deal with modules.
+                    modules: (_a = options.modules) !== null && _a !== void 0 ? _a : false,
+                    // Chrome 69 is the browser/WebView for Android 9 (API level 28).
+                    targets: options.targets || 'defaults or chrome >= 69',
+                }],
             // TODO: Starting from Babel 8, "automatic" will be the default runtime,
             // thus once upgraded to Babel 8, runtime should be removed from
             // @babel/react options below.

package/config/webpack/app-base.d.ts

@@ -5,7 +5,7 @@
  * Base [Webpack](https://webpack.js.org/) configuration for apps.
  */
 import nodeFs from 'fs';
-import { type Configuration } from 'webpack';
+import { type Configuration, type RuleSetRule } from 'webpack';
 export type BuildInfoT = {
     key: string;
     publicPath: string;
@@ -14,6 +14,7 @@ export type BuildInfoT = {
 };
 export type OptionsT = {
     babelEnv: string;
+    babelLoaderExclude?: RuleSetRule['exclude'];
     babelLoaderOptions?: object;
     context: string;
     cssLocalIdent?: string;
@@ -37,6 +38,8 @@ export type OptionsT = {
  * directly with the created config object.
  * @param {string} ops.babelEnv Babel environment to use for the Babel
  * compilation step.
+ * @param [ops.babelLoaderExclude] Overrides the default value of `exclude`
+ *  option of babel-loader, which is [/node_modules/].
  * @param {object} [ops.babelLoaderOptions] Overrides for default Babel options
  * of JSX and SVG files loader.
  * @param ops.context Base URL for resolution of relative config paths.

package/config/webpack/app-base.js

@@ -28,6 +28,8 @@ const utils_1 = require("@dr.pogodin/babel-plugin-react-css-modules/utils");
  * directly with the created config object.
  * @param {string} ops.babelEnv Babel environment to use for the Babel
  * compilation step.
+ * @param [ops.babelLoaderExclude] Overrides the default value of `exclude`
+ *  option of babel-loader, which is [/node_modules/].
  * @param {object} [ops.babelLoaderOptions] Overrides for default Babel options
  * of JSX and SVG files loader.
  * @param ops.context Base URL for resolution of relative config paths.
@@ -128,6 +130,7 @@ const utils_1 = require("@dr.pogodin/babel-plugin-react-css-modules/utils");
  *   - **`timestamp`** — The value set for `BUILD_TIMESTAMP`.
  */
 function configFactory(ops) {
+    var _a;
     const o = (0, lodash_1.defaults)((0, lodash_1.clone)(ops), {
         babelLoaderOptions: {},
         cssLocalIdent: '[hash:base64:6]',
@@ -264,13 +267,14 @@ function configFactory(ops) {
                     enforce: 'pre',
                     use: ['source-map-loader'],
                 }, {
-                    /* Loads JS and JSX moudles, and inlines SVG assets. */
-                    test: ops.typescript ? /\.((j|t)sx?|svg)$/ : /\.(jsx?|svg)$/,
-                    exclude: [/node_modules/],
+                    // Loads JS modules (.cjs, .js, .jsx); TS modules (.ts, .tsx);
+                    // and SVG assets (.svg).
+                    test: ops.typescript ? /\.(cjs|(j|t)sx?|svg)$/ : /\.(cjs|jsx?|svg)$/,
+                    exclude: (_a = ops.babelLoaderExclude) !== null && _a !== void 0 ? _a : [/node_modules/],
                     loader: 'babel-loader',
                     options: Object.assign({ babelrc: false, configFile: false, envName: o.babelEnv, presets: [['@dr.pogodin/react-utils/config/babel/webpack', {
                                     typescript: ops.typescript,
-                                }]] }, o.babelLoaderOptions),
+                                }]], sourceType: 'unambiguous' }, o.babelLoaderOptions),
                 }, {
                     /* Loads image assets. */
                     test: /\.(gif|jpe?g|png)$/,

package/config/webpack/app-production.js

@@ -25,7 +25,7 @@ function configFactory(ops) {
         '@dr.pogodin/react-utils/build/production/client/init',
         ...Array.isArray(ops.entry) ? ops.entry : [ops.entry],
     ];
-    const res = (0, webpack_merge_1.merge)((0, app_base_1.default)(Object.assign(Object.assign({}, ops), { babelEnv: 'production', entry, mode: 'production' })), {
+    const res = (0, webpack_merge_1.merge)((0, app_base_1.default)(Object.assign(Object.assign({ babelLoaderExclude: [] }, ops), { babelEnv: 'production', babelLoaderOptions: Object.assign({ compact: true }, ops.babelLoaderOptions), entry, mode: 'production' })), {
         optimization: {
             minimizer: [
                 '...',

package/config/webpack/lib-base.js

@@ -32,6 +32,7 @@ function configFactory(ops) {
             '@dr.pogodin/react-themes',
             '@dr.pogodin/react-utils',
             'axios',
+            'cookie',
             'dayjs',
             'lodash',
             /node-forge/,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.39.6",
+  "version": "1.40.1",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -15,7 +15,7 @@
     "@dr.pogodin/react-global-state": "^0.16.1",
     "@dr.pogodin/react-themes": "^1.7.0",
     "@jest/environment": "^29.7.0",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "commander": "^12.1.0",
     "compression": "^1.7.4",
     "config": "^3.3.12",
@@ -30,12 +30,12 @@
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
     "node-forge": "^1.3.1",
-    "qs": "^6.12.3",
+    "qs": "^6.13.0",
     "raf": "^3.4.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-helmet": "^6.1.0",
-    "react-router-dom": "^6.25.1",
+    "react-router-dom": "^6.26.0",
     "request-ip": "^3.3.0",
     "rimraf": "^6.0.0",
     "serialize-javascript": "^6.0.2",
@@ -83,11 +83,11 @@
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^10.0.0",
     "@types/webpack": "^5.28.5",
-    "autoprefixer": "^10.4.19",
+    "autoprefixer": "^10.4.20",
     "babel-jest": "^29.7.0",
     "babel-loader": "^9.1.3",
     "babel-plugin-module-resolver": "^5.0.2",
-    "core-js": "^3.37.1",
+    "core-js": "^3.38.0",
     "css-loader": "^7.1.2",
     "css-minimizer-webpack-plugin": "^7.0.0",
     "eslint": "^8.57.0",
@@ -95,7 +95,7 @@
     "eslint-config-airbnb-typescript": "^18.0.0",
     "eslint-import-resolver-babel-module": "^5.3.2",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^28.6.0",
+    "eslint-plugin-jest": "^28.7.0",
     "eslint-plugin-jsx-a11y": "^6.9.0",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^4.6.2",