Rename pagesDir -> routesDir

Author: marvinhagemeister

examples/demo/wmr.config.ts

@@ -3,6 +3,6 @@ export default function () {
 		alias: {
 			'src/*': 'src'
 		},
-		pagesDir: 'public/pages2'
+		routesDir: 'public/pages2'
 	};
 }

packages/wmr/src/cli.js

@@ -16,7 +16,7 @@ function bool(v) {
 // global options
 prog
 	.option('--cwd', 'The working directory - equivalent to "(cd FOO && wmr)"')
-	.option('--pagesDir', 'Directory for filesystem-based routes(default: <cwd>/pages)')
+	.option('--routesDir', 'Directory for filesystem-based routes(default: <cwd>/routes)')
 	// Setting env variables isn't common knowledege for many windows users. Much
 	// easier to pass a flag to our binary instead.
 	.option('--debug', 'Print internal debugging messages to the console. Same as setting DEBUG=true');
@@ -30,7 +30,6 @@ prog
 	.option('--visualize', 'Launch interactive bundle visualizer')
 	.action(opts => {
 		opts.minify = opts.minify !== false && !/false|0/.test(opts.minify);
-		console.log(opts);
 		run(build(opts));
 	});
 
@@ -56,7 +55,6 @@ prog
 	.option('--profile', 'Generate build statistics')
 	.option('--reload', 'Switch off hmr and reload on file saves')
 	.action(opts => {
-		console.log(opts);
 		opts.optimize = !/false|0/.test(opts.compress);
 		opts.compress = bool(opts.compress);
 		if (/true/.test(process.env.PROFILE || '')) opts.profile = true;

packages/wmr/src/lib/normalize-options.js

@@ -28,7 +28,7 @@ export async function normalizeOptions(options, mode, configWatchFiles = []) {
 	options.middleware = [];
 	options.features = { preact: true };
 	options.alias = options.alias || options.aliases || {};
-	options.pagesDir = join(options.cwd, options.pagesDir || 'pages');
+	options.routesDir = join(options.cwd, options.routesDir || 'pages');
 
 	// `wmr` / `wmr start` is a development command.
 	// `wmr build` / `wmr serve` are production commands.

packages/wmr/src/lib/plugins.js

@@ -46,7 +46,7 @@ export function getPlugins(options) {
 		jsonPlugin({ cwd }),
 		bundlePlugin({ inline: !production, cwd }),
 		aliasPlugin({ alias, cwd: root }),
-		fsRoutesPlugin({ pagesDir: options.pagesDir, cwd, root, publicPath: options.publicPath }),
+		fsRoutesPlugin({ routesDir: options.routesDir, cwd, root, publicPath: options.publicPath }),
 		fsRoutesPreactPlugin(),
 		sucrasePlugin({
 			typescript: true,

packages/wmr/src/plugins/fs-routes-plugin.js

@@ -38,13 +38,13 @@ async function readRecursive(root, dir = root) {
 /**
  * Convert JSX to HTM
  * @param {object} options
- * @param {string} options.pagesDir Controls whether files are processed to transform JSX.
+ * @param {string} options.routesDir Controls whether files are processed to transform JSX.
  * @param {string} options.cwd
  * @param {string} options.root
  * @param {string} options.publicPath
  * @returns {import('wmr').Plugin}
  */
-export default function fsRoutesPlugin({ pagesDir, publicPath, root, cwd }) {
+export default function fsRoutesPlugin({ routesDir, publicPath, root, cwd }) {
 	const PUBLIC = 'wmr:fs-routes';
 	const INTERNAL = '\0wmr:fs-routes';
 	return {
@@ -57,8 +57,8 @@ export default function fsRoutesPlugin({ pagesDir, publicPath, root, cwd }) {
 		async load(id) {
 			if (id !== INTERNAL) return;
 
-			const routes = await readRecursive(pagesDir);
-			const base = toPosix(path.relative(cwd, path.join(root, pagesDir)));
+			const routes = await readRecursive(routesDir);
+			const base = toPosix(path.relative(cwd, path.join(root, routesDir)));
 
 			const routesStr = routes
 				.map(route => {

packages/wmr/types.d.ts

@@ -35,7 +35,7 @@ declare module 'wmr' {
 		host: string;
 		port: number;
 		root: string;
-		pagesDir: string;
+		routesDir: string;
 		out: string;
 		overlayDir: string;
 		sourcemap: boolean;