@lipemat/js-boilerplate 10.2.0 → 10.2.1

package/config/webpack.dev.js

@@ -4,7 +4,7 @@ const path = require( 'path' );
 const ForkTsCheckerWebpackPlugin = require( 'fork-ts-checker-webpack-plugin' );
 const config = require( '../helpers/package-config' );
 const {getEntries} = require( '../helpers/entries' );
-const {getConfig, hasLocalOverride} = require( '../helpers/config' );
+const {getConfig, getTsConfigFile} = require( '../helpers/config' );
 
 const postcssOptions = getConfig( 'postcss.config.js' );
 const babelOptions = getConfig( 'babel.config.js' );
@@ -24,14 +24,14 @@ const plugins = [
 	new ReactRefreshWebpackPlugin(),
 ];
 
-// Loads a thread, which verifies any TypeScripts on changes.
-// Only use this if the project has a tsconfig.json file.
-if ( hasLocalOverride( 'tsconfig.json', true ) ) {
+// Loads a thread, which verifies any TypeScripts on changes if the
+// project has a "tsconfig.json" file.
+if ( '' !== getTsConfigFile() ) {
 	plugins.push( new ForkTsCheckerWebpackPlugin( {
 		devServer: false,
 		formatter: 'basic',
 		typescript: {
-			configFile: config.workingDirectory + '/tsconfig.json',
+			configFile: getTsConfigFile(),
 		},
 	} ) );
 }

package/helpers/config.js

@@ -2,6 +2,8 @@ const packageConfig = require( './package-config' );
 const path = require( 'path' );
 const once = require( 'lodash/once' );
 const browserslist = require( 'browserslist' );
+const fs = require( 'fs' );
+const config = require( './package-config' );
 
 const extensions = [
 	...Object.keys( packageConfig.dependencies ?? {} ).filter( name => name.includes( 'js-boilerplate-' ) ),
@@ -16,7 +18,7 @@ const extensions = [
  *
  * @return {boolean}
  */
-function hasLocalOverride( fileName, inWorkingDirectory = false ) {
+function hasLocalOverride( fileName, inWorkingDirectory = false, ) {
 	let hasLocal = false;
 	try {
 		if ( inWorkingDirectory ) {
@@ -61,18 +63,18 @@ function hasLocalOverride( fileName, inWorkingDirectory = false ) {
  * @return {Object}
  */
 function getConfig( fileName ) {
-	let config = require( '../config/' + fileName );
-	config = {...config, ...getExtensionsConfig( fileName, config )};
+	let mergedConfig = require( '../config/' + fileName );
+	mergedConfig = {...mergedConfig, ...getExtensionsConfig( fileName, mergedConfig )};
 	try {
 		const localConfig = require( path.resolve( packageConfig.packageDirectory + '/config', fileName ) );
 		if ( 'function' === typeof localConfig ) {
-			config = {...config, ...localConfig( config )};
+			mergedConfig = {...mergedConfig, ...localConfig( mergedConfig )};
 		} else {
-			config = {...config, ...localConfig};
+			mergedConfig = {...mergedConfig, ...localConfig};
 		}
 	} catch ( e ) {
 	}
-	return config;
+	return mergedConfig;
 }
 
 /**
@@ -88,22 +90,49 @@ function getConfig( fileName ) {
  * @return {Object}
  */
 function getExtensionsConfig( fileName, defaultConfig ) {
-	let config = {};
+	let mergedConfig = {};
 	extensions.forEach( extension => {
 		try {
 			const extensionConfig = require( extension + '/config/' + fileName );
 			if ( 'function' === typeof extensionConfig ) {
-				config = {...config, ...extensionConfig( {...defaultConfig, ...config} )};
+				mergedConfig = {...mergedConfig, ...extensionConfig( {...defaultConfig, ...mergedConfig} )};
 			} else {
-				config = {...config, ...extensionConfig};
+				mergedConfig = {...mergedConfig, ...extensionConfig};
 			}
 		} catch ( e ) {
 		}
 	} );
 
-	return config;
+	return mergedConfig;
 }
 
+/**
+ * Get the path to the "tsconfig.json" file if it exists.
+ *
+ * 1. The working directory.
+ * 2. The package directory.
+ *
+ * The package directory takes priority over the working directory.
+ *
+ *
+ * @return {string}
+ */
+function getTsConfigFile() {
+	const possibles = [
+		// Backward compatible for before @lipemat/eslint-config version 3.
+		path.resolve( config.workingDirectory + '/tsconfig.json' ),
+		path.resolve( config.packageDirectory + '/tsconfig.json' ),
+	];
+	let tsConfig = '';
+	possibles.forEach( filePath => {
+		if ( fs.existsSync( filePath ) ) {
+			tsConfig = filePath;
+		}
+	} );
+	return tsConfig;
+}
+
+
 /**
  * If browserslist is not specified, we fall back to WordPress defaults
  * except for > 1% we don't support by default.
@@ -134,5 +163,6 @@ module.exports = {
 	getConfig,
 	getDefaultBrowsersList,
 	getExtensionsConfig,
+	getTsConfigFile,
 	hasLocalOverride,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lipemat/js-boilerplate",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "description": "Dependencies and scripts for a no config JavaScript app",
   "author": "Mat Lipe",
   "license": "MIT",