svelte-sitemap 2.3.2-beta.1 → 2.4.0

package/README.md

@@ -22,30 +22,7 @@ yarn add svelte-sitemap --dev
 
 ## Usage
 
-### Config file method (recommended)
-
-Create config file `svelte-sitemap.cjs` in the root of your project:
-
-`svelte-sitemap.cjs`
-
-```js
-module.exports = {
-  domain: 'https://www.example.com'
-  // ...more options
-};
-```
-
-Add `svelte-sitemap` as your postbuild script in `package.json` file:
-
-`package.json`
-
-```json
-{
-  "postbuild": "npx svelte-sitemap"
-}
-```
-
-### CLI method (Alternative 1)
+### CLI method (recommended)
 
 Run in your project root folder to see how it works.
 
@@ -58,27 +35,27 @@ yarn svelte-sitemap --domain https://example.com
 
 It scans your routes in `build/` folder and generates `build/sitemap.xml` file
 
-### TypeScript or JavaScript method (Alternative 2)
+### TypeScript or JavaScript method (optional)
 
 Sometimes it can be useful to call the script directly from JavaScript or TypeScript. Of course there is also this option, but in most cases you will need the [CLI method](#cli-method-recommended) as a postbuild hook.
 
 ```typescript
 import { createSitemap } from 'svelte-sitemap/src/index.js';
 
-createSitemap({ domain: 'https://example.com', debug: true });
+createSitemap('https://example.com', { debug: true });
 ```
 
 And now you can run your script like this: `node my-script.js`
 
 ## Example
 
-Highly recommended to use as `postbuild` hook in your `package.json` with config file `svelte-sitemap.cjs` in your project root.
+Highly recommended to use as `postbuild` hook in your `package.json`
 
 ```json
 {
   "name": "my-project",
   "scripts": {
-    "postbuild": "npx svelte-sitemap"
+    "postbuild": "npx svelte-sitemap --domain https://mydomain.com"
   }
 }
 ```
@@ -137,7 +114,6 @@ yarn demo
 - svelte-sitemap is workaround for [this official SvelteKit issue](https://github.com/sveltejs/kit/issues/1142)
 - Brand new version is inspired by [Richard's article](https://r-bt.com/learning/sveltekit-sitemap/)
 - Thanks to [@auderer](https://github.com/auderer) because [his issue](https://github.com/bartholomej/svelte-sitemap/issues/1) changed the direction of this library
-- Config files inspired by [next-sitemap](https://github.com/iamvishnusankar/next-sitemap)
 
 ## ⭐️ Show your support
 

package/index.js

@@ -3,19 +3,12 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 const minimist_1 = __importDefault(require("minimist"));
 const package_json_1 = require("./package.json");
-const config_1 = require("./src/helpers/config");
-const vars_helper_1 = require("./src/helpers/vars.helper");
 const index_1 = require("./src/index");
-const vars_1 = require("./src/vars");
-console.log(vars_helper_1.cliColors.cyanAndBold, `> Using ${vars_1.APP_NAME}`);
 const REPO_URL = 'https://github.com/bartholomej/svelte-sitemap';
 let stop = false;
-// Load svelte-sitemap.cjs
-const config = (0, config_1.loadConfig)(vars_1.CONFIG_FILE);
 const args = (0, minimist_1.default)(process.argv.slice(2), {
     string: ['domain', 'out-dir', 'ignore', 'change-freq'],
     boolean: ['attribution', 'reset-time', 'trailing-slashes', 'debug', 'version'],
@@ -62,14 +55,11 @@ if (args.help || args.version === '' || args.version === true) {
     log(' ');
     process.exit(args.help ? 0 : 1);
 }
-else if (!config.domain && !args.domain) {
+else if (!args.domain) {
     console.log(`⚠ svelte-sitemap: --domain argument is required.\n\nSee instructions: ${REPO_URL}\n\nExample:\n\n  svelte-sitemap --domain https://mydomain.com\n`);
     process.exit(0);
 }
-else if (
-// (config.domain || args.domain) &&
-!((_a = config.domain) === null || _a === void 0 ? void 0 : _a.includes('http')) &&
-    !((_b = args.domain) === null || _b === void 0 ? void 0 : _b.includes('http'))) {
+else if (!args.domain.includes('http')) {
     console.log(`⚠ svelte-sitemap: --domain argument must starts with https://\n\nSee instructions: ${REPO_URL}\n\nExample:\n\n  svelte-sitemap --domain https://mydomain.com\n`);
     process.exit(0);
 }
@@ -85,23 +75,14 @@ else {
     const outDir = args['out-dir'];
     const ignore = args['ignore'];
     const attribution = args['attribution'] === '' || args['attribution'] === false ? false : true;
-    const optionsCli = {
+    const options = {
         debug,
         resetTime,
         changeFreq,
         outDir,
-        domain,
         attribution,
         ignore,
         trailingSlashes
     };
-    // Config file is preferred
-    if (config && Object.keys(config).length === 0) {
-        console.log(vars_helper_1.cliColors.cyanAndBold, `  ✔ Using CLI options. Config file ${vars_1.CONFIG_FILE} not found.`);
-        (0, index_1.createSitemap)(optionsCli);
-    }
-    else {
-        console.log(vars_helper_1.cliColors.green, `  ✔ Loading config from ${vars_1.CONFIG_FILE}. CLI options are ignored now.`);
-        (0, index_1.createSitemap)((0, config_1.withDefaultConfig)(config));
-    }
+    (0, index_1.createSitemap)(domain, options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-sitemap",
-  "version": "2.3.2-beta.1",
+  "version": "2.4.0",
   "description": "Small helper which scans your Svelte routes folder and generates static sitemap.xml",
   "main": "./index.js",
   "author": "BART! <bart@bartweb.cz>",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "fast-glob": "^3.2.11",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "xmlbuilder2": "^3.0.2"
   },
   "repository": {

package/src/helpers/global.helper.d.ts

@@ -1,3 +1,4 @@
 import { Options, PagesJson } from '../interfaces/global.interface';
+export declare const removeHtml: (fileName: string) => string;
 export declare function prepareData(domain: string, options?: Options): Promise<PagesJson[]>;
 export declare const writeSitemap: (items: PagesJson[], options: Options) => void;

package/src/helpers/global.helper.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeSitemap = exports.prepareData = void 0;
+exports.writeSitemap = exports.prepareData = exports.removeHtml = void 0;
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs_1 = __importDefault(require("fs"));
 const xmlbuilder2_1 = require("xmlbuilder2");
@@ -18,15 +18,27 @@ const getUrl = (url, domain, options) => {
         .split(((_a = options === null || options === void 0 ? void 0 : options.outDir) !== null && _a !== void 0 ? _a : vars_1.OUT_DIR) + '/')
         .pop()
         .replace('index.html', '');
-    // Remove trailing slashes
-    if (!(options === null || options === void 0 ? void 0 : options.trailingSlashes)) {
+    trimmed = (0, exports.removeHtml)(trimmed);
+    // Add all traling slashes
+    if (options === null || options === void 0 ? void 0 : options.trailingSlashes) {
+        trimmed = trimmed.length && !trimmed.endsWith('/') ? trimmed + '/' : trimmed;
+    }
+    else {
         trimmed = trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed;
         slash = trimmed ? slash : '';
     }
     return `${domain}${slash}${trimmed}`;
 };
+const removeHtml = (fileName) => {
+    if (fileName === null || fileName === void 0 ? void 0 : fileName.endsWith('.html')) {
+        return fileName.slice(0, -5);
+    }
+    return fileName;
+};
+exports.removeHtml = removeHtml;
 async function prepareData(domain, options) {
     var _a;
+    console.log(vars_helper_1.cliColors.cyanAndBold, `> Using ${vars_1.APP_NAME}`);
     const ignore = prepareIgnored(options === null || options === void 0 ? void 0 : options.ignore, options === null || options === void 0 ? void 0 : options.outDir);
     const changeFreq = prepareChangeFreq(options);
     const pages = await (0, fast_glob_1.default)(`${(_a = options === null || options === void 0 ? void 0 : options.outDir) !== null && _a !== void 0 ? _a : vars_1.OUT_DIR}/**/*.html`, { ignore });

package/src/helpers/vars.helper.js

@@ -6,7 +6,7 @@ exports.cliColors = {
     green: '\x1b[32m%s\x1b[0m',
     red: '\x1b[31m%s\x1b[0m'
 };
-const successMsg = (outDir) => `  ✔ Done! Check your new sitemap here: ./${outDir}/sitemap.xml`;
+const successMsg = (outDir) => `  ✔ done. Check your new sitemap here: ./${outDir}/sitemap.xml`;
 exports.successMsg = successMsg;
 const errorMsg = (outDir) => `  × Make sure you are using this script as 'postbuild' so '${outDir}' folder was successfully created before running this script. See https://github.com/bartholomej/svelte-sitemap#readme`;
 exports.errorMsg = errorMsg;

package/src/index.d.ts

@@ -1,2 +1,2 @@
-import { OptionsSvelteSitemap } from './interfaces/global.interface';
-export declare const createSitemap: (options: OptionsSvelteSitemap) => Promise<void>;
+import { Options } from './interfaces/global.interface';
+export declare const createSitemap: (domain?: string, options?: Options) => Promise<void>;

package/src/index.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSitemap = void 0;
 const global_helper_1 = require("./helpers/global.helper");
 const vars_helper_1 = require("./helpers/vars.helper");
-const createSitemap = async (options) => {
+const vars_1 = require("./vars");
+const createSitemap = async (domain = vars_1.DOMAIN, options) => {
+    var _a;
     if (options === null || options === void 0 ? void 0 : options.debug) {
         console.log('OPTIONS', options);
     }
-    const json = await (0, global_helper_1.prepareData)(options.domain, options);
+    const json = await (0, global_helper_1.prepareData)(domain, options);
     if (options === null || options === void 0 ? void 0 : options.debug) {
         console.log('RESULT', json);
     }
@@ -15,7 +17,7 @@ const createSitemap = async (options) => {
         (0, global_helper_1.writeSitemap)(json, options);
     }
     else {
-        console.error(vars_helper_1.cliColors.red, (0, vars_helper_1.errorMsg)(options.outDir));
+        console.error(vars_helper_1.cliColors.red, (0, vars_helper_1.errorMsg)((_a = options.outDir) !== null && _a !== void 0 ? _a : vars_1.OUT_DIR));
     }
 };
 exports.createSitemap = createSitemap;

package/src/interfaces/global.interface.d.ts

@@ -11,9 +11,6 @@ export interface Options {
     ignore?: string | string[];
     trailingSlashes?: boolean;
 }
-export interface OptionsSvelteSitemap extends Options {
-    domain: string;
-}
 export interface PagesJson {
     page: string;
     changeFreq?: ChangeFreq;

package/src/vars.d.ts

@@ -1,4 +1,5 @@
+import { Options } from './interfaces/global.interface';
 export declare const APP_NAME = "svelte-sitemap";
 export declare const DOMAIN = "https://example.com";
+export declare const OPTIONS: Options;
 export declare const OUT_DIR = "build";
-export declare const CONFIG_FILE = "svelte-sitemap.cjs";

package/src/vars.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CONFIG_FILE = exports.OUT_DIR = exports.DOMAIN = exports.APP_NAME = void 0;
+exports.OUT_DIR = exports.OPTIONS = exports.DOMAIN = exports.APP_NAME = void 0;
 exports.APP_NAME = 'svelte-sitemap';
 exports.DOMAIN = 'https://example.com';
+exports.OPTIONS = { resetTime: false, debug: false, changeFreq: 'weekly' };
 exports.OUT_DIR = 'build';
-exports.CONFIG_FILE = 'svelte-sitemap.cjs';

package/src/helpers/config.d.ts

@@ -1,5 +0,0 @@
-import { OptionsSvelteSitemap } from '../interfaces/global.interface';
-export declare const loadConfig: (path: string) => OptionsSvelteSitemap;
-export declare const defaultConfig: OptionsSvelteSitemap;
-export declare const updateConfig: (currConfig: OptionsSvelteSitemap, newConfig: OptionsSvelteSitemap) => OptionsSvelteSitemap;
-export declare const withDefaultConfig: (config: OptionsSvelteSitemap) => OptionsSvelteSitemap;

package/src/helpers/config.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withDefaultConfig = exports.updateConfig = exports.defaultConfig = exports.loadConfig = void 0;
-const vars_1 = require("./../vars");
-const file_1 = require("./file");
-const loadConfig = (path) => {
-    const baseConfig = (0, file_1.loadFile)(path);
-    return baseConfig;
-};
-exports.loadConfig = loadConfig;
-exports.defaultConfig = {
-    debug: false,
-    changeFreq: null,
-    resetTime: false,
-    outDir: vars_1.OUT_DIR,
-    attribution: true,
-    ignore: null,
-    trailingSlashes: false,
-    domain: null
-};
-const updateConfig = (currConfig, newConfig) => {
-    return Object.assign(Object.assign({}, currConfig), newConfig);
-};
-exports.updateConfig = updateConfig;
-const withDefaultConfig = (config) => {
-    return (0, exports.updateConfig)(exports.defaultConfig, config);
-};
-exports.withDefaultConfig = withDefaultConfig;

package/src/helpers/file.d.ts

@@ -1 +0,0 @@
-export declare const loadFile: <T>(fileName: string, throwError?: boolean) => T;

package/src/helpers/file.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadFile = void 0;
-const fs_1 = require("fs");
-const path_1 = require("path");
-const loadFile = (fileName, throwError = true) => {
-    const filePath = (0, path_1.resolve)((0, path_1.resolve)(process.cwd(), fileName));
-    if ((0, fs_1.existsSync)(filePath)) {
-        return require(filePath);
-    }
-    if (throwError) {
-        new Error(`${filePath} does not exist.`);
-    }
-    return null;
-};
-exports.loadFile = loadFile;