@mrpelz/boilerplate-preact 9.2.5 → 9.2.6

package/eslint.config.js

@@ -5,6 +5,7 @@ import {
 } from '@mrpelz/boilerplate-dom/eslint.config.js';
 // @ts-ignore
 import pluginReactHooks from 'eslint-plugin-react-hooks';
+import { merge } from 'ts-deepmerge';
 
 export { configMeta };
 
@@ -14,16 +15,25 @@ const reactHooksRecommendedRules =
   );
 
 /** @type {import('eslint').Linter.FlatConfig} */
-export const config = {
-  ...configUpstream,
-  files: ['src/**/*.{js,jsx,ts,tsx}'],
+export const configDownstream = {
+  files: ['src/**/*.{jsx,tsx}'],
   plugins: {
-    ...configUpstream.plugins,
     // @ts-ignore
     'react-hooks': pluginReactHooks,
   },
-  rules: { ...configUpstream.rules, ...reactHooksRecommendedRules },
+  rules: reactHooksRecommendedRules,
+  settings: {
+    'import/resolver': {
+      typescript: {
+        extensionAlias: {
+          '.js': ['.tsx'],
+        },
+      },
+    },
+  },
 };
 
+const config = merge(configUpstream, configDownstream);
+
 /** @type {import('eslint').Linter.FlatConfig[]} */
 export default [configMeta, config];

package/jest.config.js

@@ -1,13 +1,15 @@
 // @ts-ignore
 import configUpstream from '@mrpelz/boilerplate-dom/jest.config.js';
+import { merge } from 'ts-deepmerge';
 
 /** @type {import('ts-jest').JestConfigWithTsJest} */
-const config = {
-  ...configUpstream,
+const configDownstream = {
   moduleNameMapper: {
     '^(\\./.+)\\.m?jsx?$': '$1',
   },
 };
 
+const config = merge(configUpstream, configDownstream);
+
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 export default config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrpelz/boilerplate-preact",
-  "version": "9.2.5",
+  "version": "9.2.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/mrpelz/boilerplate.git",

package/webpack.config.js

@@ -1,33 +1,42 @@
 import { resolve } from 'node:path';
 
-import config, {
+import configUpstream, {
   dirBase,
   dirSrc,
   // @ts-ignore
 } from '@mrpelz/boilerplate-dom/webpack.config.js';
+import { merge } from 'ts-deepmerge';
 
-const { entry } = config;
-if (entry) entry[0] = resolve(dirSrc, 'main.tsx');
-
-config.resolve = {
-  extensionAlias: {
-    '.js': ['.ts', '.tsx', '.js'],
-    '.mjs': ['.mts', '.mjs'],
+// @ts-ignore
+/** @type {import('@mrpelz/boilerplate-dom/webpack.config.js').ConfigurationExtended} */
+const configDownstream = {
+  module: {
+    rules: [
+      {
+        exclude: /node_modules/,
+        test: /\.tsx$/i,
+        use: [
+          {
+            loader: 'ts-loader',
+            options: {
+              configFile: resolve(dirBase, 'tsconfig.build.json'),
+            },
+          },
+        ],
+      },
+    ],
+  },
+  resolve: {
+    extensionAlias: {
+      '.js': ['.tsx'],
+    },
   },
 };
 
-config.module?.rules?.push({
-  exclude: /node_modules/,
-  test: /\.tsx$/i,
-  use: [
-    {
-      loader: 'ts-loader',
-      options: {
-        configFile: resolve(dirBase, 'tsconfig.build.json'),
-      },
-    },
-  ],
-});
+const config = merge(configUpstream, configDownstream);
+
+const { entry } = config;
+if (entry && Array.isArray(entry)) entry[0] = resolve(dirSrc, 'main.tsx');
 
 // @ts-ignore
 /** @type {import('@mrpelz/boilerplate-dom/webpack.config.js').ConfigurationExtended} */