test: Adds test suite for config files

packages/cli/jest.config.js

@@ -31,4 +31,5 @@ module.exports = {
 
 	// This option allows use of a custom test runner
 	// testRunner: "jest-circus/runner",
+	testEnvironment: "node"
 };

packages/cli/lib/lib/webpack/transform-config.js

@@ -98,21 +98,20 @@ module.exports = async function (env, webpackConfig, isServer = false) {
 	env.config = configFile;
 	let myConfig = resolve(env.cwd, env.config);
 
+	let m;
 	try {
-		await stat(myConfig);
-	} catch (e) {
-		if (isDefault) return;
-		throw new Error(
-			`preact-cli config could not be loaded!\nFile ${env.config} not found.`
-		);
-	}
-
-	let m = esmImport(myConfig);
-
-	// The line above results in an empty object w/ Jest,
-	// so we need to do the following in order to load it:
-	if (Object.keys(m).length === 0) {
-		m = require(myConfig);
+		m = esmImport(myConfig);
+	} catch (err) {
+		const notFound = err.message.includes('Cannot find module');
+		if (notFound && isDefault) return;
+		if (notFound) {
+			throw new Error(
+				`Failed to load preact-cli config!\nFile ${env.config} not found.\n`
+			);
+		}
+		throw new Error(`Failed to load preact-cli config!\n${
+			env.verbose ? err.stack : err.message
+		}\n`);
 	}
 
 	const transformers = parseConfig((m && m.default) || m);

packages/cli/package.json

@@ -34,9 +34,9 @@
   "homepage": "https://github.com/preactjs/preact-cli",
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.0",
+    "@types/jest": "^24.9.1",
     "html-looks-like": "^1.0.2",
-    "jest": "^27.0.1",
+    "jest": "^24.9.0",
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
     "ncp": "^2.0.0",

packages/cli/tests/config.test.js

@@ -0,0 +1,84 @@
+const { build } = require('./lib/cli');
+const { subject } = require('./lib/output');
+
+const formats = ['cjs', 'esm'];
+
+const prerenderUrlFiles = [
+	'array.js',
+	'stringified-array.js',
+	'function-returning-array.js',
+	'function-returning-stringified-array.js',
+];
+
+const preactConfigFiles = [
+	'function.js',
+	'object.js'
+];
+
+describe('config files', () => {
+	describe('prerender-urls', () => {
+		it(`should load the 'prerender-urls.json' file`, async () => {
+			let dir = await subject('multiple-config-files');
+
+			const logSpy = jest.spyOn(process.stdout, 'write');
+
+			await build(dir);
+
+			expect(logSpy).not.toHaveBeenCalledWith(
+				expect.stringContaining('Failed to load prerenderUrls file, using default!')
+			);
+		});
+
+		formats.forEach(moduleFormat => {
+			prerenderUrlFiles.forEach(dataFormat => {
+				it(`should load the '${dataFormat}' file in ${moduleFormat}`, async () => {
+					let dir = await subject('multiple-config-files');
+
+					const logSpy = jest.spyOn(process.stdout, 'write');
+
+					await build(dir, { prerenderUrls: `prerender/${moduleFormat}/${dataFormat}` });
+
+					expect(logSpy).not.toHaveBeenCalledWith(
+						expect.stringContaining('Failed to load prerenderUrls file, using default!')
+					);
+				});
+			});
+		});
+
+		formats.forEach(moduleFormat => {
+			it(`should fail to load malformed prerender-urls data in ${moduleFormat}`, async () => {
+				let dir = await subject('multiple-config-files');
+
+				const logSpy = jest.spyOn(process.stdout, 'write');
+
+				await build(dir, { prerenderUrls: `prerender/${moduleFormat}/returns-bad-json.js` });
+
+				expect(logSpy).toHaveBeenCalledWith(
+					expect.stringContaining('Failed to load prerenderUrls file, using default!')
+				);
+			});
+		});
+	});
+
+	describe('preact.config', () => {
+		formats.forEach(moduleFormat => {
+			preactConfigFiles.forEach(dataFormat => {
+				it(`should load the '${dataFormat}' file in ${moduleFormat}`, async () => {
+					let dir = await subject('multiple-config-files');
+
+					await expect(
+						build(dir, { config: `preactConfig/${moduleFormat}/${dataFormat}` })
+					).resolves.not.toThrow();
+				});
+			});
+
+			it(`should fail to load malformed config data in ${moduleFormat}`, async () => {
+				let dir = await subject('multiple-config-files');
+
+				await expect(build(dir, { config: `preactConfig/${moduleFormat}/returns-bad-config.js` }))
+					.rejects
+					.toThrow('Failed to load preact-cli config!');
+			});
+		});
+	});
+});

packages/cli/tests/setup.js

@@ -1,4 +1,4 @@
-jest.setTimeout(240 * 1000);
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 240 * 1000;
 
 if (!process.env.LISTENING_TO_UNHANDLED_REJECTION) {
 	process.on('unhandledRejection', err => {

packages/cli/tests/subjects/multiple-config-files/index.js

@@ -0,0 +1,19 @@
+import { h, Component } from 'preact';
+import { Router } from 'preact-router';
+import Home from './routes/home';
+
+export default class App extends Component {
+	handleRoute = e => {
+		this.currentUrl = e.url;
+	};
+
+	render(props) {
+		return (
+			<div id="app">
+				<Router url={props.url} onChange={this.handleRoute} {...props}>
+					<Home path="/" />
+				</Router>
+			</div>
+		);
+	}
+}

packages/cli/tests/subjects/multiple-config-files/package.json

@@ -0,0 +1,4 @@
+{
+  "private": true,
+  "name": "preact-config"
+}

packages/cli/tests/subjects/multiple-config-files/preactConfig/cjs/function.js

@@ -0,0 +1,3 @@
+module.exports = function (config, env, helpers) {
+
+};

packages/cli/tests/subjects/multiple-config-files/preactConfig/cjs/object.js

@@ -0,0 +1,3 @@
+module.exports = {
+	webpack(config, env, helpers) {}
+};

packages/cli/tests/subjects/multiple-config-files/preactConfig/cjs/returns-bad-config.js

@@ -0,0 +1,2 @@
+module.exports = {
+	webpack(config, env, helpers) {}

packages/cli/tests/subjects/multiple-config-files/preactConfig/esm/function.js

@@ -0,0 +1,3 @@
+export default function (config, env, helpers) {
+
+};

packages/cli/tests/subjects/multiple-config-files/preactConfig/esm/object.js

@@ -0,0 +1,3 @@
+export default {
+	webpack (config, env, helpers) {}
+};

packages/cli/tests/subjects/multiple-config-files/preactConfig/esm/returns-bad-config.js

@@ -0,0 +1,2 @@
+export default {
+	webpack (config, env, helpers) {}

packages/cli/tests/subjects/multiple-config-files/prerender-urls.json

@@ -0,0 +1,8 @@
+[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+]

packages/cli/tests/subjects/multiple-config-files/prerender/cjs/array.js

@@ -0,0 +1,8 @@
+module.exports = [
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+];

packages/cli/tests/subjects/multiple-config-files/prerender/cjs/function-returning-array.js

@@ -0,0 +1,8 @@
+module.exports = () => [
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+];

packages/cli/tests/subjects/multiple-config-files/prerender/cjs/function-returning-stringified-array.js

@@ -0,0 +1,8 @@
+module.exports = () => `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+]`;

packages/cli/tests/subjects/multiple-config-files/prerender/cjs/returns-bad-json.js

@@ -0,0 +1,8 @@
+module.exports = () => `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+`;

packages/cli/tests/subjects/multiple-config-files/prerender/cjs/stringified-array.js

@@ -0,0 +1,8 @@
+module.exports = `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+]`;

packages/cli/tests/subjects/multiple-config-files/prerender/esm/array.js

@@ -0,0 +1,8 @@
+export default [
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+];

packages/cli/tests/subjects/multiple-config-files/prerender/esm/function-returning-array.js

@@ -0,0 +1,8 @@
+export default () => [
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+];

packages/cli/tests/subjects/multiple-config-files/prerender/esm/function-returning-stringified-array.js

@@ -0,0 +1,8 @@
+export default () => `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+]`;

packages/cli/tests/subjects/multiple-config-files/prerender/esm/returns-bad-json.js

@@ -0,0 +1,8 @@
+export default () => `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+`;

packages/cli/tests/subjects/multiple-config-files/prerender/esm/stringified-array.js

@@ -0,0 +1,8 @@
+export default `[
+	{
+		"url": "/"
+	},
+	{
+		"url": "/custom"
+	}
+]`;

packages/cli/tests/subjects/multiple-config-files/routes/home.css

@@ -0,0 +1,3 @@
+.home {
+	background: red;
+}

packages/cli/tests/subjects/multiple-config-files/routes/home.js

@@ -0,0 +1,3 @@
+import './home.css';
+
+export default () => <div>Home</div>;