zuby 1.0.83 → 1.0.85

package/config.js

@@ -153,6 +153,7 @@ export const mergeDefaultConfig = async (config) => {
     }
     // Set default values
     config.srcDir = config.srcDir ?? './';
+    config.srcPagesDir = config.srcPagesDir ?? `${config.srcDir}/pages`.replace(/\/+/g, '/');
     config.publicDir = config.publicDir ?? 'public';
     config.outDir = config.outDir ?? '.zuby';
     config.cacheDir = config.cacheDir ?? '.zuby-cache';

package/package.json

@@ -1,9 +1,8 @@
 {
     "name": "zuby",
-    "version": "1.0.83",
+    "version": "1.0.85",
     "description": "Zuby.js is a framework for building modern apps using Preact or React.",
     "type": "module",
-    "main": "index.js",
     "scripts": {
         "release": "cd ./dist && npm publish --access public && cd ..",
         "build": "rm -rf dist/ && tsc && cp -rf package.json LICENSE.md README.md src/examples src/tsconfigs dist/ && npm run bundle-server",
@@ -36,13 +35,13 @@
         "zubyjs": "./commands/index.js"
     },
     "bugs": {
-        "url": "https://gitlab.com/futrou/zuby.js/-/issues",
-        "email": "zuby@futrou.com"
+        "url": "https://github.com/futrou/zuby.js/issues",
+        "email": "zubyjs@futrou.com"
     },
     "license": "MIT",
     "repository": {
         "type": "git",
-        "url": "git+https://gitlab.com/futrou/zuby.js.git"
+        "url": "git+https://github.com/futrou/zuby.js.git"
     },
     "homepage": "https://zubyjs.com",
     "keywords": [

package/templates/index.js

@@ -1,6 +1,6 @@
 import { BASE_TEMPLATES, PATH_TYPES, TEMPLATES } from './types.js';
 import { getZubyInternalConfig } from '../config.js';
-import { basename, join, resolve } from 'path';
+import { basename, resolve } from 'path';
 import { glob } from 'glob';
 import { normalizePath } from '../utils/pathUtils.js';
 import { pathToRegexp, toPath } from './pathUtils.js';
@@ -141,8 +141,8 @@ export async function getTemplates(cache = true) {
  * and returns them as an array of TemplateFile objects.
  */
 export async function getTemplateFiles() {
-    const { srcDir, templateExtensions, templateFiles } = await getZubyInternalConfig();
-    const pagesDir = normalizePath(join(srcDir, 'pages'));
+    const { srcPagesDir, templateExtensions, templateFiles } = await getZubyInternalConfig();
+    const pagesDir = normalizePath(srcPagesDir);
     const files = await glob(`${pagesDir}/**/*.{${templateExtensions.join(',')}}`);
     const configTemplateFiles = templateFiles.map(({ templateType, filename, path }) => {
         return {

package/types.d.ts

@@ -18,6 +18,12 @@ export interface ZubyConfig {
      * @default ./
      */
     srcDir?: string;
+    /**
+     * The relative path to the directory where the pages are located
+     * inside the src directory.
+     * @default ./pages
+     */
+    srcPagesDir?: string;
     /**
      * The relative path the folder with the static files.
      * These files are copied to the output directory.