@lipemat/js-boilerplate 9.4.3 → 9.4.5

package/config/webpack.dev.js

@@ -1,4 +1,4 @@
-const {getConfig, hasLocalOverride} = require( '../helpers/config' );
+const {getConfig, getTsConfigFile} = require( '../helpers/config' );
 const webpack = require( 'webpack' );
 const path = require( 'path' );
 const ForkTsCheckerWebpackPlugin = require( 'fork-ts-checker-webpack-plugin' );
@@ -22,12 +22,12 @@ const plugins = [
 
 // 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 ) ) {
+if ( '' !== getTsConfigFile() ) {
 	plugins.push( new ForkTsCheckerWebpackPlugin( {
 		devServer: false,
 		formatter: 'basic',
 		typescript: {
-			configFile: config.workingDirectory + '/tsconfig.json',
+			configFile: getTsConfigFile(),
 		},
 	} ) );
 }

package/config/webpack.dist.js

@@ -22,6 +22,36 @@ const ManifestPlugin = new WebpackAssetsManifest( {
 	output: 'manifest.json',
 } );
 
+const plugins = [
+	new webpack.ProvidePlugin( {
+		jQuery: 'jquery',
+		$: 'jquery',
+	} ),
+	new MiniCssExtractPlugin( {
+		filename: '[name].css',
+		chunkFilename: '[name].[contenthash].css',
+	} ),
+	new CleanWebpackPlugin( {
+		// Remove all files except the `.running` file created by "Start".
+		cleanOnceBeforeBuildPatterns: [ '**/*', '!.running' ],
+	} ),
+	new SubresourceIntegrityPlugin( {
+		hashFuncNames: [ 'sha384' ],
+	} ),
+	new WebpackAssetsHash( ManifestPlugin ),
+	ManifestPlugin,
+];
+
+if ( '' !== getTsConfigFile() ) {
+	plugins.push( new ForkTsCheckerWebpackPlugin( {
+		formatter: 'basic',
+		typescript: {
+			configFile: getTsConfigFile(),
+		},
+	} ) );
+}
+
+
 module.exports = {
 	devtool: false,
 	entry: getEntries(),
@@ -69,31 +99,7 @@ module.exports = {
 			'node_modules',
 		],
 	},
-	plugins: [
-		new webpack.ProvidePlugin( {
-			jQuery: 'jquery',
-			$: 'jquery',
-		} ),
-		new MiniCssExtractPlugin( {
-			filename: '[name].css',
-			chunkFilename: '[name].[contenthash].css',
-		} ),
-		new CleanWebpackPlugin( {
-			// Remove all files except the `.running` file created by "Start".
-			cleanOnceBeforeBuildPatterns: [ '**/*', '!.running' ],
-		} ),
-		new ForkTsCheckerWebpackPlugin( {
-			formatter: 'basic',
-			typescript: {
-				configFile: config.workingDirectory + '/tsconfig.json',
-			},
-		} ),
-		new SubresourceIntegrityPlugin( {
-			hashFuncNames: [ 'sha384' ],
-		} ),
-		new WebpackAssetsHash( ManifestPlugin ),
-		ManifestPlugin,
-	],
+	plugins,
 	module: {
 		rules: [
 			{

package/helpers/WebpackAssetsHash.js

@@ -51,7 +51,7 @@ class WebpackAssetsHash {
 	 */
 	storeContentHash( compilation ) {
 		for ( const asset of compilation.getAssets() ) {
-			this.assets[ asset.name ] = crypto.createHash( 'md4' )
+			this.assets[ asset.name ] = crypto.createHash( 'md5' )
 				.update( asset.source.source() )
 				.digest( 'hex' )
 				.substring( 0, 20 );

package/helpers/config.js

@@ -1,5 +1,6 @@
 const packageConfig = require( './package-config' );
 const path = require( 'path' );
+const fs = require( 'fs' );
 const once = require( 'lodash/once' );
 const browserslist = require( 'browserslist' );
 
@@ -104,6 +105,32 @@ function getExtensionsConfig( fileName, defaultConfig ) {
 	return config;
 }
 
+/**
+ * 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( packageConfig.workingDirectory + '/tsconfig.json' ),
+		path.resolve( packageConfig.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.
@@ -135,4 +162,5 @@ module.exports = {
 	getDefaultBrowsersList,
 	getExtensionsConfig,
 	hasLocalOverride,
+	getTsConfigFile,
 };

package/package.json

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