@dr.pogodin/react-utils 1.33.1 → 1.33.3

package/build/types-code/server/index.d.ts

@@ -4,9 +4,9 @@ import 'source-map-support/register';
 import http from 'http';
 import 'raf/polyfill';
 import { type Configuration } from 'webpack';
-import { type OptionsT as ServerOptionsT } from './server';
-export { getDefaultCspSettings, } from './server';
-export { errors } from './utils';
+import { type OptionsT as ServerOptionsT, getDefaultCspSettings } from './server';
+import { errors } from './utils';
+export { errors, getDefaultCspSettings };
 type OptionsT = ServerOptionsT & {
     https?: {
         cert: string;
@@ -141,5 +141,7 @@ declare function launchServer(webpackConfig: Configuration, options: OptionsT):
 }>;
 declare namespace launchServer {
     var SCRIPT_LOCATIONS: typeof import("./renderer").SCRIPT_LOCATIONS;
+    var getDefaultCspSettings: typeof import("./server").getDefaultCspSettings;
+    var errors: typeof import("./utils/errors");
 }
 export default launchServer;

package/build/types-code/shared/components/selectors/Switch/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { type Theme } from '@dr.pogodin/react-themes';
 import { type OptionsT } from '../common';
-declare const validThemeKeys: readonly ["container", "label", "option", "selected", "switch"];
+declare const validThemeKeys: readonly ["container", "label", "option", "options", "selected"];
 type PropsT = {
     label?: React.ReactNode;
     onChange?: (value: string) => void;

package/build/types-scss/src/shared/components/selectors/Switch/theme.scss.d.ts

@@ -3,4 +3,5 @@ export declare const container: string;
 export declare const context: string;
 export declare const hoc: string;
 export declare const option: string;
+export declare const options: string;
 export declare const selected: string;

package/config/webpack/app-base.js

@@ -282,14 +282,11 @@ function configFactory(ops) {
                                 modules: {
                                     getLocalIdent: utils_1.getLocalIdent,
                                     localIdentName: o.cssLocalIdent,
-                                    // TODO: This flag defaults `true` for ES module builds since
-                                    // css-loader@7.0.0:
+                                    // This flag defaults `true` for ES module builds since css-loader@7.0.0:
                                     // https://github.com/webpack-contrib/css-loader/releases/tag/v7.0.0
-                                    // For now we'll keep it `false` to avoid a breaking change for
-                                    // host projects, and also because babel-plugin-react-css-modules
-                                    // we rely upon is pending an upgrade to support named style
-                                    // imports:
-                                    // https://github.com/birdofpreyru/babel-plugin-react-css-modules/issues/44
+                                    // We'll keep it `false` to avoid a breaking change for dependant
+                                    // projects, and I am also not sure what are the benefits of
+                                    // named CSS exports anyway.
                                     namedExport: false,
                                 },
                             },

package/config/webpack/lib-base.js

@@ -103,14 +103,11 @@ function configFactory(ops) {
                                 modules: {
                                     getLocalIdent: utils_1.getLocalIdent,
                                     localIdentName: ops.cssLocalIdent,
-                                    // TODO: This flag defaults `true` for ES module builds since
-                                    // css-loader@7.0.0:
+                                    // This flag defaults `true` for ES module builds since css-loader@7.0.0:
                                     // https://github.com/webpack-contrib/css-loader/releases/tag/v7.0.0
-                                    // For now we'll keep it `false` to avoid a breaking change for
-                                    // host projects, and also because babel-plugin-react-css-modules
-                                    // we rely upon is pending an upgrade to support named style
-                                    // imports:
-                                    // https://github.com/birdofpreyru/babel-plugin-react-css-modules/issues/44
+                                    // We'll keep it `false` to avoid a breaking change for dependant
+                                    // projects, and I am also not sure what are the benefits of
+                                    // named CSS exports anyway.
                                     namedExport: false,
                                 },
                             },

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.33.1",
+  "version": "1.33.3",
   "bin": {
     "react-utils-build": "bin/build.js",
     "react-utils-setup": "bin/setup.js"
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.24.4",
-    "@dr.pogodin/babel-plugin-react-css-modules": "^6.13.0",
+    "@dr.pogodin/babel-plugin-react-css-modules": "^6.13.1",
     "@dr.pogodin/csurf": "^1.13.0",
     "@dr.pogodin/js-utils": "^0.0.9",
     "@dr.pogodin/react-global-state": "^0.14.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.0.0",
+    "eslint-plugin-jest": "^28.2.0",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-react-hooks": "^4.6.0",

package/src/server/index.ts

@@ -17,14 +17,16 @@ import 'raf/polyfill';
 
 import { type Configuration } from 'webpack';
 
-import serverFactory, { type OptionsT as ServerOptionsT } from './server';
-import { SCRIPT_LOCATIONS, newDefaultLogger } from './renderer';
-
-export {
+import serverFactory, {
+  type OptionsT as ServerOptionsT,
   getDefaultCspSettings,
 } from './server';
 
-export { errors } from './utils';
+import { SCRIPT_LOCATIONS, newDefaultLogger } from './renderer';
+
+import { errors } from './utils';
+
+export { errors, getDefaultCspSettings };
 
 /**
  * Normalizes a port into a number, string, or false.
@@ -228,3 +230,5 @@ export default async function launchServer(webpackConfig: Configuration, options
 }
 
 launchServer.SCRIPT_LOCATIONS = SCRIPT_LOCATIONS;
+launchServer.getDefaultCspSettings = getDefaultCspSettings;
+launchServer.errors = errors;

package/src/shared/components/Checkbox/index.tsx

@@ -25,6 +25,7 @@ const Checkbox: React.FunctionComponent<PropT> = ({
       checked={checked}
       className={theme.checkbox}
       onChange={onChange}
+      onClick={(e) => e.stopPropagation()}
       type="checkbox"
     />
   </div>

package/src/shared/components/selectors/Switch/index.tsx

@@ -9,8 +9,8 @@ const validThemeKeys = [
   'container',
   'label',
   'option',
+  'options',
   'selected',
-  'switch',
 ] as const;
 
 type PropsT = {
@@ -62,7 +62,7 @@ const BaseSwitch: React.FunctionComponent<PropsT> = ({
   return (
     <div className={theme.container}>
       {label ? <div className={theme.label}>{label}</div> : null}
-      <div className={theme.switch}>
+      <div className={theme.options}>
         {optionNodes}
       </div>
     </div>

package/src/shared/components/selectors/Switch/theme.scss

@@ -26,7 +26,7 @@
     cursor: default;
   }
 
-  &.switch {
+  &.options {
     align-items: center;
     background: whitesmoke;
     border: 1px solid gray;

package/src/shared/utils/webpack.ts

@@ -23,8 +23,11 @@ export function requireWeak(
     if (!def) return named;
 
     Object.entries(named).forEach(([key, value]) => {
-      if (def[key]) throw Error('Conflict between default and named exports');
-      def[key] = value;
+      if (def[key]) {
+        if (def[key] !== value) {
+          throw Error('Conflict between default and named exports');
+        }
+      } else def[key] = value;
     });
     return def;
   } catch {