@lipemat/js-boilerplate 9.4.0 → 9.4.2

package/config/jest.config.js

@@ -28,8 +28,12 @@ let jestConfig = {
 		'^.+\\.[tj]sx?$': [ 'babel-jest', babelConfig ],
 	},
 	setupFilesAfterEnv: [
+		// @todo Remove old "tests" directory on next major release.
 		path.resolve( packageConfig.workingDirectory, 'tests/setup.js' ),
 		path.resolve( packageConfig.workingDirectory, 'tests/setup.ts' ),
+
+		// New location.
+		path.resolve( packageConfig.workingDirectory, 'jest/setup.ts' ),
 	].filter( fs.existsSync ),
 };
 

package/config/webpack.dist.js

@@ -85,7 +85,7 @@ module.exports = {
 		new ForkTsCheckerWebpackPlugin( {
 			formatter: 'basic',
 			typescript: {
-				configFile: getTsConfigFile(),
+				configFile: config.workingDirectory + '/tsconfig.json',
 			},
 		} ),
 		new SubresourceIntegrityPlugin( {

package/package.json

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

package/scripts/test.js

@@ -1,12 +1,27 @@
-/**
- * Runs `jest` with any arguments passed via the terminal or yarn.
- *
- * @notice you must add `/templates/jest.config.js` to the `jsPath` of your project.
- *
- * @example `lipemat-js-boilerplate test`
- */
-
-const packageConfig = require( '../helpers/package-config' );
-process.argv.push( '--config', packageConfig.workingDirectory + '/jest.config.js' );
+const {resolve: pathResolve} = require( 'path' );
+const {existsSync} = require( 'fs' );
+
+const {getPackageConfig} = require( '../helpers/package-config' );
+
+const packageConfig = getPackageConfig();
+
+const possibleConfig = [
+	// @todo Remove pulling from the root on next major release.
+	pathResolve( packageConfig.workingDirectory + '/jest.config.ts' ),
+	pathResolve( packageConfig.workingDirectory + '/jest.config.js' ),
+
+	// New location.
+	pathResolve( packageConfig.workingDirectory + '/jest/jest.config.ts' ),
+	pathResolve( packageConfig.workingDirectory + '/jest/jest.config.js' ),
+].filter( existsSync );
+
+if ( possibleConfig.length < 1 ) {
+	throw new Error( 'You must have a `jest.config.[tj]s` file in the root of your project or in the `jest` folder.' );
+} else {
+	const file = possibleConfig.shift();
+	if ( undefined !== file ) {
+		process.argv.push( '--config', file );
+	}
+}
 
 require( 'jest-cli/bin/jest' );