@lipemat/js-boilerplate 11.0.0-beta.4 → 11.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -13,6 +13,8 @@ const jestConfig = {
13
13
  '\\.(pcss|less|css)$': 'identity-obj-proxy',
14
14
  'is-plain-obj': 'identity-obj-proxy',
15
15
  uuid: 'identity-obj-proxy',
16
+ // Support using `$src` to refer to the project's source directory.
17
+ '^\\$src/(.*)$': '<rootDir>/../src/$1',
16
18
  },
17
19
  roots: [
18
20
  './tests',
@@ -1 +1 @@
1
- {"version":3,"file":"jest.config.js","sourceRoot":"","sources":["jest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAC,UAAU,EAAC,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAC,gBAAgB,EAAC,MAAM,0DAA0D,CAAC;AAC1F,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,EAAC,gBAAgB,EAAE,GAAG,EAAC,GAAG,gBAAgB,EAAE,CAAC;AACnD,MAAM,WAAW,GAAG,MAAM,SAAS,CAAE,iBAAiB,CAAE,CAAC;AACzD,OAAO,WAAW,CAAC,cAAc,CAAC;AAGlC,MAAM,UAAU,GAAW;IAC1B,OAAO,EAAE;QACR,QAAQ,EAAE,IAAI;KACd;IACD,gBAAgB,EAAE;QACjB,qBAAqB,EAAE,oBAAoB;QAC3C,cAAc,EAAE,oBAAoB;QACpC,IAAI,EAAE,oBAAoB;KAC1B;IACD,KAAK,EAAE;QACN,SAAS;KACT;IACD,eAAe,EAAE,OAAO;IACxB,sBAAsB,EAAE;QACvB,GAAG;KACH;IACD,SAAS,EAAE;QACV,gBAAgB,EAAE,CAAE,YAAY,EAAE,WAAW,CAAE;KAC/C;IACD,uBAAuB,EAAE;QACxB,2BAA2B;KAC3B;IACD,kBAAkB,EAAE;QACnB,OAAO,CAAE,gBAAgB,EAAE,eAAe,CAAE;KAC5C,CAAC,MAAM,CAAE,UAAU,CAAE;CACtB,CAAC;AAEF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"jest.config.js","sourceRoot":"","sources":["jest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAC,UAAU,EAAC,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAC,gBAAgB,EAAC,MAAM,0DAA0D,CAAC;AAC1F,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,EAAC,gBAAgB,EAAE,GAAG,EAAC,GAAG,gBAAgB,EAAE,CAAC;AACnD,MAAM,WAAW,GAAG,MAAM,SAAS,CAAE,iBAAiB,CAAE,CAAC;AACzD,OAAO,WAAW,CAAC,cAAc,CAAC;AAGlC,MAAM,UAAU,GAAW;IAC1B,OAAO,EAAE;QACR,QAAQ,EAAE,IAAI;KACd;IACD,gBAAgB,EAAE;QACjB,qBAAqB,EAAE,oBAAoB;QAC3C,cAAc,EAAE,oBAAoB;QACpC,IAAI,EAAE,oBAAoB;QAC1B,mEAAmE;QACnE,eAAe,EAAE,qBAAqB;KACtC;IACD,KAAK,EAAE;QACN,SAAS;KACT;IACD,eAAe,EAAE,OAAO;IACxB,sBAAsB,EAAE;QACvB,GAAG;KACH;IACD,SAAS,EAAE;QACV,gBAAgB,EAAE,CAAE,YAAY,EAAE,WAAW,CAAE;KAC/C;IACD,uBAAuB,EAAE;QACxB,2BAA2B;KAC3B;IACD,kBAAkB,EAAE;QACnB,OAAO,CAAE,gBAAgB,EAAE,eAAe,CAAE;KAC5C,CAAC,MAAM,CAAE,UAAU,CAAE;CACtB,CAAC;AAEF,eAAe,UAAU,CAAC"}
@@ -19,6 +19,8 @@ const jestConfig: Config = {
19
19
  '\\.(pcss|less|css)$': 'identity-obj-proxy',
20
20
  'is-plain-obj': 'identity-obj-proxy',
21
21
  uuid: 'identity-obj-proxy',
22
+ // Support using `$src` to refer to the project's source directory.
23
+ '^\\$src/(.*)$': '<rootDir>/../src/$1',
22
24
  },
23
25
  roots: [
24
26
  './tests',
@@ -1,30 +1,4 @@
1
1
  {
2
- "//~": "@see ./templates/tsconfig.json to use/extend this configuration in your project",
3
- "//~~": "PHPStorm will only see changes to the file if you re-save the project root's tsconfig.json file",
4
- "$schema": "https://json.schemastore.org/tsconfig",
5
- "display": "JS Boilerplate",
6
- "compilerOptions": {
7
- "allowImportingTsExtensions": true,
8
- "allowSyntheticDefaultImports": true,
9
- "esModuleInterop": true,
10
- "forceConsistentCasingInFileNames": true,
11
- "jsx": "react-jsx",
12
- "lib": [
13
- "DOM",
14
- "ES2022"
15
- ],
16
- "module": "ESNext",
17
- "moduleResolution": "bundler",
18
- "noEmit": true,
19
- "noFallthroughCasesInSwitch": true,
20
- "noImplicitReturns": true,
21
- "noImplicitThis": true,
22
- "skipLibCheck": true,
23
- "sourceMap": true,
24
- "strict": true,
25
- "strictBindCallApply": true,
26
- "strictNullChecks": true,
27
- "target": "ES2022",
28
- "verbatimModuleSyntax": false
29
- }
2
+ "//~": "@deprecated Use @lipemat/js-boilerplate-shared/config/tsconfig.json instead.",
3
+ "extends": "@lipemat/js-boilerplate-shared/config/tsconfig.json"
30
4
  }
@@ -47,6 +47,13 @@ const config = {
47
47
  chunkFilename: '[name].js',
48
48
  },
49
49
  resolve: {
50
+ alias: {
51
+ /**
52
+ * Support using `$src` to refer to the project's source directory.
53
+ * Must include `("baseUrl": ".")` in the tsconfig.json file for the `paths` aliases to work.
54
+ */
55
+ $src: path.resolve(getPackageConfig().workingDirectory, 'src'),
56
+ },
50
57
  extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', '.pcss'],
51
58
  modules: [
52
59
  path.resolve(getPackageConfig().workingDirectory, 'src'),
@@ -1 +1 @@
1
- {"version":3,"file":"webpack.dev.js","sourceRoot":"","sources":["webpack.dev.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpack.dev.js","sourceRoot":"","sources":["webpack.dev.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import webpack, {type Configuration as WebpackConfig, type WebpackPluginInstance} from 'webpack';
1
+ import webpack, {type WebpackPluginInstance} from 'webpack';
2
2
  import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
3
3
  import path from 'path';
4
4
  import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
@@ -11,6 +11,7 @@ import {fileURLToPath} from 'node:url';
11
11
  import {getPostCSSConfig} from '@lipemat/js-boilerplate-shared/helpers/postcss-config.js';
12
12
 
13
13
  import {getBrowsersList} from '@lipemat/js-boilerplate-shared/helpers/browserslist.js';
14
+ import type {WebpackConfig} from './webpack.dist.ts';
14
15
 
15
16
  const postcssOptions = getPostCSSConfig( 'development' );
16
17
  const babelOptions: BabelConfig = await getConfig( 'babel.config.js' );
@@ -56,6 +57,13 @@ const config: WebpackConfig = {
56
57
  chunkFilename: '[name].js',
57
58
  },
58
59
  resolve: {
60
+ alias: {
61
+ /**
62
+ * Support using `$src` to refer to the project's source directory.
63
+ * Must include `("baseUrl": ".")` in the tsconfig.json file for the `paths` aliases to work.
64
+ */
65
+ $src: path.resolve( getPackageConfig().workingDirectory, 'src' ),
66
+ },
59
67
  extensions: [ '.ts', '.tsx', '.js', '.jsx', '.json', '.pcss' ],
60
68
  modules: [
61
69
  path.resolve( getPackageConfig().workingDirectory, 'src' ),
@@ -105,6 +105,13 @@ const config = {
105
105
  crossOriginLoading: 'anonymous',
106
106
  },
107
107
  resolve: {
108
+ alias: {
109
+ /**
110
+ * Support using `$src` to refer to the project's source directory.
111
+ * Must include `("baseUrl": ".")` in the tsconfig.json file for the `paths` aliases to work.
112
+ */
113
+ $src: path.resolve(getPackageConfig().workingDirectory, 'src'),
114
+ },
108
115
  extensions: ['.ts', '.tsx', '.js', '.jsx', '.json', '.pcss'],
109
116
  modules: [
110
117
  path.resolve(getPackageConfig().workingDirectory, 'src'),
@@ -1 +1 @@
1
- {"version":3,"file":"webpack.dist.js","sourceRoot":"","sources":["webpack.dist.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webpack.dist.js","sourceRoot":"","sources":["webpack.dist.ts"],"names":[],"mappings":"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"}
@@ -128,6 +128,13 @@ const config: WebpackConfig = {
128
128
  crossOriginLoading: 'anonymous',
129
129
  },
130
130
  resolve: {
131
+ alias: {
132
+ /**
133
+ * Support using `$src` to refer to the project's source directory.
134
+ * Must include `("baseUrl": ".")` in the tsconfig.json file for the `paths` aliases to work.
135
+ */
136
+ $src: path.resolve( getPackageConfig().workingDirectory, 'src' ),
137
+ },
131
138
  extensions: [ '.ts', '.tsx', '.js', '.jsx', '.json', '.pcss' ],
132
139
  modules: [
133
140
  path.resolve( getPackageConfig().workingDirectory, 'src' ),
package/helpers/config.js CHANGED
@@ -1,8 +1,7 @@
1
1
  import { existsSync } from 'fs';
2
2
  import { resolve } from 'path';
3
3
  import { getPackageConfig } from '@lipemat/js-boilerplate-shared/helpers/package-config.js';
4
- import { createRequire } from 'node:module';
5
- import { ensureJSExtension, getExtensionsConfig } from '@lipemat/js-boilerplate-shared/helpers/config.js';
4
+ import { ensureJSExtension, getExtensionsConfig, mergeWithLocalConfig } from '@lipemat/js-boilerplate-shared/helpers/config.js';
6
5
  const { workingDirectory, packageDirectory } = getPackageConfig();
7
6
  /**
8
7
  * Check to see if a local config file exists.
@@ -65,27 +64,8 @@ export async function getConfig(fileName) {
65
64
  const configModule = await import(ensureJSExtension(`../config/${fileName}`));
66
65
  const config = configModule.default;
67
66
  const extensionsConfig = getExtensionsConfig(fileName, config);
68
- let mergedConfig = { ...config, ...extensionsConfig };
69
- try {
70
- let localConfig = createRequire(import.meta.url)(resolve(packageDirectory, 'config', fileName.replace(/\.js$/, '')));
71
- if ('default' in localConfig) {
72
- localConfig = localConfig.default;
73
- }
74
- if ('function' === typeof localConfig) {
75
- mergedConfig = { ...mergedConfig, ...localConfig(mergedConfig) };
76
- }
77
- else {
78
- mergedConfig = { ...mergedConfig, ...localConfig };
79
- }
80
- }
81
- catch (e) {
82
- if (e instanceof Error) {
83
- if (!('code' in e) || ('MODULE_NOT_FOUND' !== e.code && 'ERR_MODULE_NOT_FOUND' !== e.code)) {
84
- console.error(e);
85
- }
86
- }
87
- }
88
- return mergedConfig;
67
+ const mergedConfig = { ...config, ...extensionsConfig };
68
+ return mergeWithLocalConfig(fileName, mergedConfig);
89
69
  }
90
70
  /**
91
71
  * Get the path to the "tsconfig.json" file if it exists.
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAK7B,OAAO,EAAC,gBAAgB,EAAC,MAAM,0DAA0D,CAAC;AAG1F,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,kDAAkD,CAAC;AAYxG,MAAM,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,GAAG,gBAAgB,EAAE,CAAC;AAGhE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,QAAgB,EAAE,qBAA8B,KAAK;IAC5F,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACJ,IAAK,kBAAkB,EAAG,CAAC;YAC1B,MAAM,MAAM,CAAE,OAAO,CAAE,gBAAgB,EAAE,QAAQ,CAAE,CAAE,CAAC;YACtD,QAAQ,GAAG,IAAI,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,CAAE,OAAO,CAAE,gBAAgB,GAAG,SAAS,EAAE,QAAQ,CAAE,CAAE,CAAC;YAClE,QAAQ,GAAG,IAAI,CAAC;QACjB,CAAC;IACF,CAAC;IAAC,OAAQ,CAAC,EAAG,CAAC;QACd,IAAK,CAAC,YAAY,KAAK,EAAG,CAAC;YAC1B,IAAK,CAAE,CAAE,MAAM,IAAI,CAAC,CAAE,IAAI,kBAAkB,KAAK,CAAC,CAAC,IAAI,EAAG,CAAC;gBAC1D,OAAO,CAAC,KAAK,CAAE,CAAC,CAAE,CAAC;YACpB,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC;AAGD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAA2B,QAAW;IACpE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAE,iBAAiB,CAAE,aAAa,QAAQ,EAAE,CAAE,CAAE,CAAC;IAClF,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;IAEpC,MAAM,gBAAgB,GAAG,mBAAmB,CAAc,QAAQ,EAAE,MAAM,CAAE,CAAC;IAC7E,IAAI,YAAY,GAAe,EAAC,GAAG,MAAM,EAAE,GAAG,gBAAgB,EAAC,CAAC;IAEhE,IAAI,CAAC;QACJ,IAAI,WAAW,GAAG,aAAa,CAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAE,CAAE,OAAO,CAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAE,OAAO,EAAE,EAAE,CAAE,CAAE,CAAE,CAAC;QAC7H,IAAK,SAAS,IAAI,WAAW,EAAG,CAAC;YAChC,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;QACnC,CAAC;QAED,IAAK,UAAU,KAAK,OAAO,WAAW,EAAG,CAAC;YACzC,YAAY,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,WAAW,CAAE,YAAY,CAAE,EAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACP,YAAY,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,WAAW,EAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAAC,OAAQ,CAAC,EAAG,CAAC;QACd,IAAK,CAAC,YAAY,KAAK,EAAG,CAAC;YAC1B,IAAK,CAAE,CAAE,MAAM,IAAI,CAAC,CAAE,IAAI,CAAE,kBAAkB,KAAK,CAAC,CAAC,IAAI,IAAI,sBAAsB,KAAK,CAAC,CAAC,IAAI,CAAE,EAAG,CAAC;gBACnG,OAAO,CAAC,KAAK,CAAE,CAAC,CAAE,CAAC;YACpB,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AAGD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe;IAC9B,MAAM,SAAS,GAAG;QACjB,mEAAmE;QACnE,OAAO,CAAE,gBAAgB,GAAG,gBAAgB,CAAE;QAC9C,OAAO,CAAE,gBAAgB,GAAG,gBAAgB,CAAE;KAC9C,CAAC,MAAM,CAAE,UAAU,CAAE,CAAC;IAEvB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,SAAS,CAAC,OAAO,CAAE,QAAQ,CAAC,EAAE;QAC7B,QAAQ,GAAG,QAAQ,CAAC;IACrB,CAAC,CAAE,CAAC;IACJ,OAAO,QAAQ,CAAC;AACjB,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAK7B,OAAO,EAAC,gBAAgB,EAAC,MAAM,0DAA0D,CAAC;AAG1F,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,kDAAkD,CAAC;AAY9H,MAAM,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,GAAG,gBAAgB,EAAE,CAAC;AAGhE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAE,QAAgB,EAAE,qBAA8B,KAAK;IAC5F,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACJ,IAAK,kBAAkB,EAAG,CAAC;YAC1B,MAAM,MAAM,CAAE,OAAO,CAAE,gBAAgB,EAAE,QAAQ,CAAE,CAAE,CAAC;YACtD,QAAQ,GAAG,IAAI,CAAC;QACjB,CAAC;aAAM,CAAC;YACP,MAAM,MAAM,CAAE,OAAO,CAAE,gBAAgB,GAAG,SAAS,EAAE,QAAQ,CAAE,CAAE,CAAC;YAClE,QAAQ,GAAG,IAAI,CAAC;QACjB,CAAC;IACF,CAAC;IAAC,OAAQ,CAAC,EAAG,CAAC;QACd,IAAK,CAAC,YAAY,KAAK,EAAG,CAAC;YAC1B,IAAK,CAAE,CAAE,MAAM,IAAI,CAAC,CAAE,IAAI,kBAAkB,KAAK,CAAC,CAAC,IAAI,EAAG,CAAC;gBAC1D,OAAO,CAAC,KAAK,CAAE,CAAC,CAAE,CAAC;YACpB,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC;AAGD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAA2B,QAAW;IACpE,MAAM,YAAY,GAAG,MAAM,MAAM,CAAE,iBAAiB,CAAE,aAAa,QAAQ,EAAE,CAAE,CAAE,CAAC;IAClF,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;IAEpC,MAAM,gBAAgB,GAAG,mBAAmB,CAAc,QAAQ,EAAE,MAAM,CAAE,CAAC;IAC7E,MAAM,YAAY,GAAe,EAAC,GAAG,MAAM,EAAE,GAAG,gBAAgB,EAAC,CAAC;IAElE,OAAO,oBAAoB,CAAc,QAAQ,EAAE,YAAY,CAAE,CAAC;AACnE,CAAC;AAGD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe;IAC9B,MAAM,SAAS,GAAG;QACjB,mEAAmE;QACnE,OAAO,CAAE,gBAAgB,GAAG,gBAAgB,CAAE;QAC9C,OAAO,CAAE,gBAAgB,GAAG,gBAAgB,CAAE;KAC9C,CAAC,MAAM,CAAE,UAAU,CAAE,CAAC;IAEvB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,SAAS,CAAC,OAAO,CAAE,QAAQ,CAAC,EAAE;QAC7B,QAAQ,GAAG,QAAQ,CAAC;IACrB,CAAC,CAAE,CAAC;IACJ,OAAO,QAAQ,CAAC;AACjB,CAAC"}
package/helpers/config.ts CHANGED
@@ -7,8 +7,7 @@ import type {JestConfig} from '../config/jest.config.js';
7
7
  import {getPackageConfig} from '@lipemat/js-boilerplate-shared/helpers/package-config.js';
8
8
  import type {EntriesConfig} from '../config/entries.config.js';
9
9
  import type {CssLoaderConfig} from '../config/css-loader.config.js';
10
- import {createRequire} from 'node:module';
11
- import {ensureJSExtension, getExtensionsConfig} from '@lipemat/js-boilerplate-shared/helpers/config.js';
10
+ import {ensureJSExtension, getExtensionsConfig, mergeWithLocalConfig} from '@lipemat/js-boilerplate-shared/helpers/config.js';
12
11
 
13
12
  type Configs = {
14
13
  'babel.config.js': BabelConfig;
@@ -86,27 +85,9 @@ export async function getConfig<T extends keyof Configs>( fileName: T ): Promise
86
85
  const config = configModule.default;
87
86
 
88
87
  const extensionsConfig = getExtensionsConfig<Configs[T]>( fileName, config );
89
- let mergedConfig: Configs[T] = {...config, ...extensionsConfig};
88
+ const mergedConfig: Configs[T] = {...config, ...extensionsConfig};
90
89
 
91
- try {
92
- let localConfig = createRequire( import.meta.url )( resolve( packageDirectory, 'config', fileName.replace( /\.js$/, '' ) ) );
93
- if ( 'default' in localConfig ) {
94
- localConfig = localConfig.default;
95
- }
96
-
97
- if ( 'function' === typeof localConfig ) {
98
- mergedConfig = {...mergedConfig, ...localConfig( mergedConfig )};
99
- } else {
100
- mergedConfig = {...mergedConfig, ...localConfig};
101
- }
102
- } catch ( e ) {
103
- if ( e instanceof Error ) {
104
- if ( ! ( 'code' in e ) || ( 'MODULE_NOT_FOUND' !== e.code && 'ERR_MODULE_NOT_FOUND' !== e.code ) ) {
105
- console.error( e );
106
- }
107
- }
108
- }
109
- return mergedConfig;
90
+ return mergeWithLocalConfig<Configs[T]>( fileName, mergedConfig );
110
91
  }
111
92
 
112
93
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lipemat/js-boilerplate",
3
- "version": "11.0.0-beta.4",
3
+ "version": "11.0.0",
4
4
  "description": "Dependencies and scripts for a no config JavaScript app",
5
5
  "author": "Mat Lipe",
6
6
  "license": "MIT",
@@ -48,7 +48,7 @@
48
48
  "@babel/preset-env": "^7.24.7",
49
49
  "@babel/preset-react": "^7.24.7",
50
50
  "@babel/preset-typescript": "^7.24.7",
51
- "@lipemat/js-boilerplate-shared": ">=0.0.5",
51
+ "@lipemat/js-boilerplate-shared": "^1.0.0",
52
52
  "@pmmmwh/react-refresh-webpack-plugin": "^0.6.1",
53
53
  "@statoscope/webpack-plugin": "^5.29.0",
54
54
  "@types/babel__preset-env": "^7.9.6",
@@ -89,7 +89,7 @@
89
89
  "@types/react": "^18.2.64",
90
90
  "chokidar": "^3.5.3",
91
91
  "eslint": "^9",
92
- "glob": "^11.1.0",
92
+ "glob": "^13.0.6",
93
93
  "jest": "^30.2.0",
94
94
  "memfs": "^3.5.3",
95
95
  "react": "^18.2.0",
@@ -98,5 +98,5 @@
98
98
  "resolutions": {
99
99
  "type-fest": "^4.41.0"
100
100
  },
101
- "packageManager": "yarn@4.12.0"
101
+ "packageManager": "yarn@4.13.0"
102
102
  }