@lipemat/js-boilerplate 8.2.1 → 8.4.0

package/config/babel.config.js

@@ -9,10 +9,7 @@ const presetEnv = {
 };
 
 /**
- * If browserslist is not specified, we fallback to WordPress defaults
- * except for IE11 which we don't support by default.
- *
- * @link https://babeljs.io/docs/en/babel-preset-env#targets
+ * Use shared browserslist configurations.
  */
 if ( getDefaultBrowsersList() ) {
 	presetEnv.targets = getDefaultBrowsersList();
@@ -30,4 +27,3 @@ module.exports = {
 		'react-hot-loader/babel',
 	],
 };
-

package/helpers/config.js

@@ -8,7 +8,7 @@ const extensions = Object.keys( packageConfig.dependencies ).filter( name => nam
 /**
  * Check to see if a local config file exists.
  *
- * @param {string} fileName
+ * @param {string}  fileName
  * @param {boolean} inWorkingDirectory - Look in working directory instead of their /config directory
  *
  * @return {boolean}
@@ -37,6 +37,22 @@ function hasLocalOverride( fileName, inWorkingDirectory = false ) {
  * we will merge the contents with our config/babel.config.js in favor of whatever
  * is specified with the project's file.
  *
+ * If the `module.exports` are a function, the existing configuration will be passed
+ * as the only argument. Otherwise, standard `module.exports` are also supported.
+ *
+ * @example ```ts
+ * // standard
+ * module.export = {
+ *     externals: {extra: 'Extra'}
+ * }
+ * // function
+ * module.exports = function( config ) {
+ *     return {
+ *         externals: {...config.externals, extra: 'Extra'}
+ *     }
+ * }
+ * ```
+ *
  * @param {string} $fileName
  *
  * @return {Object}
@@ -45,7 +61,11 @@ function getConfig( $fileName ) {
 	let config = {...require( '../config/' + $fileName ), ...getExtensionsConfig( $fileName )};
 	try {
 		const localConfig = require( path.resolve( packageConfig.packageDirectory + '/config', $fileName ) );
-		config = {...config, ...localConfig};
+		if ( 'function' === typeof localConfig ) {
+			config = {...config, ...localConfig( config )};
+		} else {
+			config = {...config, ...localConfig};
+		}
 	} catch ( e ) {
 	}
 	return config;
@@ -55,6 +75,8 @@ function getConfig( $fileName ) {
  * Get a config from any existing extension's /config directories
  * merged into one.
  *
+ * @see getConfig
+ *
  * @param {string} $fileName
  *
  * @return {Object}
@@ -64,7 +86,11 @@ function getExtensionsConfig( $fileName ) {
 	extensions.forEach( extension => {
 		try {
 			const extensionConfig = require( extension + '/config/' + $fileName );
-			config = {...config, ...extensionConfig};
+			if ( 'function' === typeof extensionConfig ) {
+				config = {...config, ...extensionConfig( config )};
+			} else {
+				config = {...config, ...extensionConfig};
+			}
 		} catch ( e ) {
 		}
 	} );
@@ -73,8 +99,8 @@ function getExtensionsConfig( $fileName ) {
 }
 
 /**
- * If browserslist is not specified, we fallback to WordPress defaults
- * except for IE11 which we don't support by default.
+ * If browserslist is not specified, we fall back to WordPress defaults
+ * except for > 1% we don't support by default.
  *
  * Return false if a browserslist is specified in the current project.
  *
@@ -89,7 +115,10 @@ const getDefaultBrowsersList = once( () => {
 	}
 
 	if ( browserslist( browserslist.defaults ) === browserslist() ) {
-		return require( '@wordpress/browserslist-config' );
+		return require( '@wordpress/browserslist-config' ).map( range => {
+			// Swap out "> 1%" for "> 2%".
+			return '> 1%' === range ? '> 2%' : range;
+		} );
 	}
 	return false;
 } );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lipemat/js-boilerplate",
-  "version": "8.2.1",
+  "version": "8.4.0",
   "description": "Dependencies and scripts for a no config JavaScript app",
   "engines": {
     "node": ">=14.17.6"
@@ -41,7 +41,7 @@
     "@lipemat/postcss-loader": "^3.1.2",
     "@lipemat/webpack-cleanup-plugin": "^1.0.0",
     "@types/lipemat__js-boilerplate": "lipemat/types-js-boilerplate#semver:^1.3.0",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "@wordpress/browserslist-config": "^4.1.0",
     "are-you-es5": "^2.1.1",
     "babel-jest": "^24.7.1",
@@ -67,14 +67,13 @@
     "postcss-nested": "^4.1.2",
     "postcss-preset-env": "^6.6.0",
     "postcss-scss": "^2.0.0",
-    "prop-types": "^15.7.2",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-hot-loader": "^4.8.3",
     "react-test-renderer": "^17.0.2",
     "react-transition-group": "^4.4.1",
     "style-loader": "^3.2.1",
-    "typescript": "~4.5.5",
+    "typescript": "^4.2.4",
     "update-notifier": "^4.1.3",
     "webpack": "^5.65.0",
     "webpack-assets-manifest": "^5.0.6",
@@ -86,5 +85,5 @@
     "url": "https://github.com/lipemat/js-boilerplate/issues"
   },
   "homepage": "https://github.com/lipemat/js-boilerplate#readme",
-  "packageManager": "yarn@3.1.1"
+  "packageManager": "yarn@3.2.0"
 }