diff --git a/docs/README.md b/docs/README.md index b5eb241..b171988 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ # vite-plugin-multip docs Documentation of the plugin (web version in arrtive) vite-plugin-multip -- [custom html](https://github.com/vclemenzi/vite-plugin-multip/blob/main/docs/custom-html.md) +- [layouts](https://github.com/vclemenzi/vite-plugin-multip/blob/main/docs/layouts.md) diff --git a/docs/custom-html.md b/docs/custom-html.md deleted file mode 100644 index 872360b..0000000 --- a/docs/custom-html.md +++ /dev/null @@ -1,28 +0,0 @@ -# HTML Customization with vite-plugin-multip - -With the `vite-plugin-multip` plugin, you have the ability to fully customize the HTML structure using a custom HTML template. - -Configuration: -```ts -multipage({ customHtml: "path/to/your/template.html" }) -``` - -Example of the custom HTML template: -```html - - - - - - - My Custom HTML - - - {% body %} - - -``` - -`{% body %}` will be replaced with the content of the specific page's body. This feature allows you to completely tailor the appearance and structure of your multipage setup, offering greater flexibility in design. - -*You can find an example [here](https://github.com/vclemenzi/vite-plugin-multip/tree/main/examples/custom-html)* diff --git a/docs/layouts.md b/docs/layouts.md new file mode 100644 index 0000000..95fc26e --- /dev/null +++ b/docs/layouts.md @@ -0,0 +1,65 @@ +## Layouts with vite-plugin-multip + +When utilizing the `vite-plugin-multip` plugin, you gain the capability to finely tailor the structure and appearance of your pages by employing custom layouts. This functionality empowers you to craft distinct layouts for various pages or groups of pages, thereby enhancing the flexibility and customization options for your multipage application. + +### Custom Layout Example + +Below is a minimalist illustration of a custom layout file, `layout.html`, showcasing the fundamental structure: + +```html + + + + + + Custom Layout + + +
+

Header

+
+ +
+ + +
+ + + + +``` + +In this example: + +- The `layout.html` file contains a basic HTML structure with a header, a main section (where the specific page content will be inserted), and a footer. +- The `` tag indicates where the content of the specific page will be inserted into the layout. +- This layout can be further customized by adding CSS styles, JavaScript scripts, or other HTML elements according to the specific project requirements. + +### Layout Structure + +Each page in your application can utilize its own layout, and layouts are resolved based on proximity. Here's an example directory structure: + +```bash +pages/ + layout.html # This layout is named "1" + index.svelte # Uses layout "1" + foo/ + index.svelte # Uses layout "1" + hello/ + layout.html # This layout is named "2" + index.svelte # Uses layout "2" + world/ + index.svelte # Uses layout "2" +``` + +In this structure: + +- Pages located closer to a specific layout file will use that layout. +- For instance, `index.svelte` and `foo/index.svelte` will both use the layout defined in `layout.html` because it's the nearest layout file. +- Pages within the `hello` directory and its subdirectories will use the layout defined in `hello/layout.html`. + +This approach allows you to organize your layouts and pages logically and apply different layouts as needed throughout your application. + +For an example of layout usage with `vite-plugin-multip`, you can refer to the official plugin repository on GitHub at the following link: [https://github.com/vclemenzi/vite-plugin-multip/tree/main/examples/layouts](https://github.com/vclemenzi/vite-plugin-multip/tree/main/examples/layouts). diff --git a/examples/custom-html/custom.html b/examples/custom-html/custom.html deleted file mode 100644 index d122684..0000000 --- a/examples/custom-html/custom.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - My Custom HTML - - - - {% body %} - - - diff --git a/examples/custom-html/src/pages/index.svelte b/examples/custom-html/src/pages/index.svelte deleted file mode 100644 index f78f758..0000000 --- a/examples/custom-html/src/pages/index.svelte +++ /dev/null @@ -1 +0,0 @@ -

Custom HTML

diff --git a/examples/custom-html/vite.config.ts.timestamp-1710927809121-4e20fe6d4f043.mjs b/examples/custom-html/vite.config.ts.timestamp-1710927809121-4e20fe6d4f043.mjs deleted file mode 100644 index 147397a..0000000 --- a/examples/custom-html/vite.config.ts.timestamp-1710927809121-4e20fe6d4f043.mjs +++ /dev/null @@ -1,202 +0,0 @@ -// vite.config.ts -import { defineConfig } from "file:///home/vc/Documents/vite-multipage/examples/custom-html/node_modules/.pnpm/vite@5.2.0/node_modules/vite/dist/node/index.js"; -import { svelte as svelte2 } from "file:///home/vc/Documents/vite-multipage/examples/custom-html/node_modules/.pnpm/@sveltejs+vite-plugin-svelte@3.0.2_svelte@4.2.12_vite@5.2.0/node_modules/@sveltejs/vite-plugin-svelte/src/index.js"; - -// ../../src/index.ts -import { normalizePath } from "file:///home/vc/Documents/vite-multipage/node_modules/.pnpm/vite@5.1.6_@types+node@20.11.27/node_modules/vite/dist/node/index.js"; -import glob from "file:///home/vc/Documents/vite-multipage/node_modules/.pnpm/fast-glob@3.3.2/node_modules/fast-glob/out/index.js"; - -// ../../src/boilerplate/frameworks/react.ts -var react = (file) => { - return ` -
- - `; -}; - -// ../../src/boilerplate/frameworks/svelte.ts -var svelte = (file) => { - return ` -
- - `; -}; - -// ../../src/boilerplate/frameworks/vue.ts -var vue = (file) => { - return ` -
- - `; -}; - -// ../../src/boilerplate/html.ts -import { minify } from "file:///home/vc/Documents/vite-multipage/node_modules/.pnpm/html-minifier-terser@7.2.0/node_modules/html-minifier-terser/src/htmlminifier.js"; -var html = async (body, config) => { - let code = ` - - - - - - - - - ${body} - - `; - if (config?.customHtml) { - console.log("customHtml"); - code = config.customHtml.replace("{% body %}", body); - } - const result = await minify(code, { - collapseWhitespace: config?.minify?.collapseWhitespace || true, - removeComments: config?.minify?.removeComments || true, - ...config?.minify - }); - return result; -}; - -// ../../src/boilerplate/index.ts -var generateBoilerplate = async (file, framework, config) => { - switch (framework) { - case "svelte": - return await html(svelte(file), config); - case "vue": - return await html(vue(file), config); - case "tsx": - return await html(react(file), config); - default: - return ""; - } - ; -}; - -// ../../src/index.ts -import { dirname, resolve } from "path"; - -// ../../src/server/create.ts -import fs from "fs"; -import mime from "file:///home/vc/Documents/vite-multipage/node_modules/.pnpm/mime@4.0.1/node_modules/mime/dist/src/index.js"; - -// ../../src/server/hot.ts -import { exec } from "child_process"; -var hotupdate = () => { - exec("npx vite build --mode development", (err) => { - if (err) { - console.error(err); - return; - } - const timestamp = (/* @__PURE__ */ new Date()).toLocaleTimeString(); - console.log( - `\x1B[2m${timestamp}\x1B[32m [vite-plugin-multip]\x1B[0m Build completed` - ); - }); -}; - -// ../../src/server/create.ts -var createServer = (server) => { - hotupdate(); - server.middlewares.use((req, res) => { - if (!req.url) - return; - if (!/\.[a-z]+$/.test(req.url)) { - return res.end(fs.readFileSync(`dist${req.url}/index.html`)); - } - const ext = req.url.split(".").pop() || ""; - res.setHeader("Content-Type", mime.getType(ext) || "text/plain"); - return res.end(fs.readFileSync(`dist${req.url}`)); - }); -}; - -// ../../src/index.ts -var multipage = (config) => { - const root = config?.directory || "src/pages"; - let framework = config?.framework || ""; - return { - name: "vite-plugin-multi-page", - config: () => { - const pages = glob.sync("**/*.{svelte,vue,tsx,jsx}", { - cwd: root, - onlyFiles: true - }); - const entries = pages.map((page) => { - if (!framework) - framework = page.split(".").pop() || ""; - const name = dirname(page); - if (name === "." || !name) - return "index"; - return name; - }); - const input = entries.reduce((acc, page) => { - const fileName = "index.html"; - if (page === "index") { - acc[page] = resolve(root, fileName); - return acc; - } - acc[page] = resolve(root, page, fileName); - return acc; - }, {}); - return { - root, - appType: "custom", - build: { - outDir: "dist", - rollupOptions: { - input, - output: { - format: "es", - strict: false, - entryFileNames: "assets/[name]-[hash].js", - chunkFileNames: "assets/[name]-[hash].js", - assetFileNames: "assets/[name]-[hash].[ext]", - dir: "dist/" - } - } - } - }; - }, - resolveId(id) { - return id.includes("index.html") ? id : null; - }, - async load(id) { - if (framework === "") - throw new Error("Framework not found"); - const fileName = "index.html"; - if (!id.endsWith(fileName)) - return null; - id = normalizePath(id); - const page = id.replace(fileName, `index.${framework}`); - return await generateBoilerplate(page, framework, config || {}); - }, - configureServer: createServer, - handleHotUpdate: hotupdate - }; -}; - -// vite.config.ts -var vite_config_default = defineConfig({ - plugins: [svelte2(), multipage()] -}); -export { - vite_config_default as default -}; -//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts", "../../src/index.ts", "../../src/boilerplate/frameworks/react.ts", "../../src/boilerplate/frameworks/svelte.ts", "../../src/boilerplate/frameworks/vue.ts", "../../src/boilerplate/html.ts", "../../src/boilerplate/index.ts", "../../src/server/create.ts", "../../src/server/hot.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/examples/custom-html\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/examples/custom-html/vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/examples/custom-html/vite.config.ts\";import { defineConfig } from 'vite'\nimport { svelte } from '@sveltejs/vite-plugin-svelte'\nimport { multipage } from '../../src/index'\n\n// https://vitejs.dev/config/\nexport default defineConfig({\n  plugins: [svelte(), multipage()],\n})\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/index.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/index.ts\";import { normalizePath, type Plugin } from \"vite\";\nimport type { Config } from \"./types\";\nimport glob from \"fast-glob\";\nimport { generateBoilerplate } from \"./boilerplate\";\nimport { dirname, resolve } from \"path\";\nimport { createServer } from \"./server/create\";\nimport { hotupdate } from \"./server/hot\";\n\nexport const multipage = (config?: Config): Plugin => {\n  const root = config?.directory || \"src/pages\";\n  let framework = config?.framework || \"\";\n\n  return {\n    name: \"vite-plugin-multi-page\",\n    config: () => {\n      const pages = glob.sync(\"**/*.{svelte,vue,tsx,jsx}\", {\n        cwd: root,\n        onlyFiles: true,\n      });\n\n      const entries = pages.map((page) => {\n        // Get framework from file extension\n        if (!framework) framework = page.split(\".\").pop() || \"\";\n\n        const name = dirname(page);\n\n        if (name === \".\" || !name) return \"index\";\n\n        return name;\n      });\n\n      const input = entries.reduce((acc: Record<string, string>, page) => {\n        const fileName = \"index.html\";\n\n        if (page === \"index\") {\n          acc[page] = resolve(root, fileName);\n          return acc;\n        }\n\n        acc[page] = resolve(root, page, fileName);\n\n        return acc;\n      }, {});\n\n      return {\n        root,\n        appType: \"custom\",\n        build: {\n          outDir: \"dist\",\n          rollupOptions: {\n            input,\n            output: {\n              format: \"es\",\n              strict: false,\n              entryFileNames: \"assets/[name]-[hash].js\",\n              chunkFileNames: \"assets/[name]-[hash].js\",\n              assetFileNames: \"assets/[name]-[hash].[ext]\",\n              dir: \"dist/\",\n            },\n          },\n        },\n      };\n    },\n\n    resolveId(id) {\n      return id.includes(\"index.html\") ? id : null;\n    },\n\n    async load(id) {\n      if (framework === \"\") throw new Error(\"Framework not found\");\n\n      const fileName = \"index.html\";\n\n      if (!id.endsWith(fileName)) return null;\n\n      id = normalizePath(id);\n\n      const page = id.replace(fileName, `index.${framework}`);\n\n      return await generateBoilerplate(page, framework, config || {})\n    },\n\n    configureServer: createServer,\n    handleHotUpdate: hotupdate,\n  };\n};\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks/react.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/boilerplate/frameworks/react.ts\";export const react = (file: string): string => {\n  return `\n    <div id=\"app\"></div>\n    <script type=\"module\">\n      import React from 'react';\n      import ReactDOM from 'react-dom/client';\n      import App from '${file}';\n\n      const e = React.createElement;\n\n      ReactDOM.createRoot(document.getElementById('app')).render(\n        e(App, null)\n      );\n    </script>\n  `;\n}\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks/svelte.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/boilerplate/frameworks/svelte.ts\";export const svelte = (file: string): string => {\n  return `\n    <div id=\"app\"></div>\n    <script type=\"module\">\n      import App from '${file}';\n      const app = new App({ target: document.getElementById('app') });\n      export default app;\n    </script>\n  `;\n}\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/boilerplate/frameworks/vue.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/boilerplate/frameworks/vue.ts\";export const vue = (file: string): string => {\n  return `\n    <div id=\"app\"></div>\n    <script type=\"module\">\n      import { createApp } from 'vue';\n      import App from '${file}';\n      createApp(App).mount('#app');\n    </script>\n  `;\n}\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/boilerplate\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/boilerplate/html.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/boilerplate/html.ts\";import { minify } from \"html-minifier-terser\";\nimport type { Config } from \"../types\";\n\nexport const html = async (body: string, config?: Config): Promise<string> => {\n  let code = `\n      <!DOCTYPE html>\n      <html lang=\"en\">\n        <head>\n          <meta charset=\"UTF-8\" />\n          <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\" />\n          <title></title>\n        </head>\n        <body>\n          ${body}\n        </body>\n      </html>`;\n\n  if (config?.customHtml) {\n    console.log(\"customHtml\");\n    code = config.customHtml.replace(\"{% body %}\", body);\n  }\n\n  const result = await minify(code, {\n    collapseWhitespace: config?.minify?.collapseWhitespace || true,\n    removeComments: config?.minify?.removeComments || true,\n    ...config?.minify,\n  });\n\n  return result;\n}\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/boilerplate\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/boilerplate/index.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/boilerplate/index.ts\";import type { Config } from \"../types\";\nimport { react } from \"./frameworks/react\";\nimport { svelte } from \"./frameworks/svelte\";\nimport { vue } from \"./frameworks/vue\";\nimport { html } from \"./html\";\n\nexport const generateBoilerplate = async (file: string, framework: string, config: Config): Promise<string> => {\n  switch (framework) {\n    case \"svelte\":\n      return await html(svelte(file), config);\n    case \"vue\":\n      return await html(vue(file), config);\n    case \"tsx\" || \"jsx\":\n      return await html(react(file), config);\n    default:\n      return \"\";\n  };\n}\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/server\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/server/create.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/server/create.ts\";import type { ViteDevServer } from \"vite\";\nimport fs from \"fs\";\nimport mime from \"mime\";\nimport { hotupdate } from \"./hot\";\n\n// This feature is in beta, so it may not work as expected\n// I hope I'll find a better way to do this\n// As today, dev server do the same thing as preview server\n\nexport const createServer = (server: ViteDevServer) => {\n  hotupdate();\n\n  server.middlewares.use((req, res) => {\n    if (!req.url) return;\n\n    if (!/\\.[a-z]+$/.test(req.url)) {\n      return res.end(fs.readFileSync(`dist${req.url}/index.html`));\n    }\n\n    const ext = req.url.split(\".\").pop() || \"\";\n\n    res.setHeader(\"Content-Type\", mime.getType(ext) || \"text/plain\");\n    return res.end(fs.readFileSync(`dist${req.url}`));\n  });\n};;\n", "const __vite_injected_original_dirname = \"/home/vc/Documents/vite-multipage/src/server\";const __vite_injected_original_filename = \"/home/vc/Documents/vite-multipage/src/server/hot.ts\";const __vite_injected_original_import_meta_url = \"file:///home/vc/Documents/vite-multipage/src/server/hot.ts\";import { exec } from \"child_process\";\n\nexport const hotupdate = () => {\n  exec(\"npx vite build --mode development\", (err) => {\n    if (err) {\n      console.error(err);\n      return;\n    }\n\n    const timestamp = new Date().toLocaleTimeString();\n    console.log(\n      `\\x1b[2m${timestamp}\\x1b[32m [vite-plugin-multip]\\x1b[0m Build completed`\n    );\n  });\n};\n"],
  "mappings": "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",
  "names": ["svelte", "svelte"]
}
 diff --git a/examples/custom-html/.gitignore b/examples/layouts/.gitignore similarity index 100% rename from examples/custom-html/.gitignore rename to examples/layouts/.gitignore diff --git a/examples/custom-html/.vscode/extensions.json b/examples/layouts/.vscode/extensions.json similarity index 100% rename from examples/custom-html/.vscode/extensions.json rename to examples/layouts/.vscode/extensions.json diff --git a/examples/custom-html/README.md b/examples/layouts/README.md similarity index 100% rename from examples/custom-html/README.md rename to examples/layouts/README.md diff --git a/examples/layouts/index.html b/examples/layouts/index.html new file mode 100644 index 0000000..b6c5f0a --- /dev/null +++ b/examples/layouts/index.html @@ -0,0 +1,13 @@ + + + + + + + Vite + Svelte + TS + + +
+ + + diff --git a/examples/custom-html/package.json b/examples/layouts/package.json similarity index 84% rename from examples/custom-html/package.json rename to examples/layouts/package.json index 304c19c..d04384c 100644 --- a/examples/custom-html/package.json +++ b/examples/layouts/package.json @@ -1,5 +1,5 @@ { - "name": "custom-html", + "name": "layouts", "private": true, "version": "0.0.0", "type": "module", @@ -13,9 +13,9 @@ "@sveltejs/vite-plugin-svelte": "^3.0.2", "@tsconfig/svelte": "^5.0.2", "svelte": "^4.2.12", - "svelte-check": "^3.6.6", + "svelte-check": "^3.6.7", "tslib": "^2.6.2", "typescript": "^5.2.2", - "vite": "^5.1.6" + "vite": "^5.2.0" } } diff --git a/examples/custom-html/pnpm-lock.yaml b/examples/layouts/pnpm-lock.yaml similarity index 97% rename from examples/custom-html/pnpm-lock.yaml rename to examples/layouts/pnpm-lock.yaml index 775f353..534bb8a 100644 --- a/examples/custom-html/pnpm-lock.yaml +++ b/examples/layouts/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: devDependencies: '@sveltejs/vite-plugin-svelte': specifier: ^3.0.2 - version: 3.0.2(svelte@4.2.12)(vite@5.2.0) + version: 3.0.2(svelte@4.2.12)(vite@5.2.2) '@tsconfig/svelte': specifier: ^5.0.2 version: 5.0.2 @@ -15,17 +15,17 @@ devDependencies: specifier: ^4.2.12 version: 4.2.12 svelte-check: - specifier: ^3.6.6 + specifier: ^3.6.7 version: 3.6.8(svelte@4.2.12) tslib: specifier: ^2.6.2 version: 2.6.2 typescript: specifier: ^5.2.2 - version: 5.4.2 + version: 5.4.3 vite: - specifier: ^5.1.6 - version: 5.2.0 + specifier: ^5.2.0 + version: 5.2.2 packages: @@ -399,7 +399,7 @@ packages: dev: true optional: true - /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.0): + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.2): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} peerDependencies: @@ -407,30 +407,30 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.2.0) + '@sveltejs/vite-plugin-svelte': 3.0.2(svelte@4.2.12)(vite@5.2.2) debug: 4.3.4 svelte: 4.2.12 - vite: 5.2.0 + vite: 5.2.2 transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.2.0): + /@sveltejs/vite-plugin-svelte@3.0.2(svelte@4.2.12)(vite@5.2.2): resolution: {integrity: sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==} engines: {node: ^18.0.0 || >=20} peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.0) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.2)(svelte@4.2.12)(vite@5.2.2) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.8 svelte: 4.2.12 svelte-hmr: 0.15.3(svelte@4.2.12) - vite: 5.2.0 - vitefu: 0.2.5(vite@5.2.0) + vite: 5.2.2 + vitefu: 0.2.5(vite@5.2.2) transitivePeerDependencies: - supports-color dev: true @@ -827,8 +827,8 @@ packages: engines: {node: '>=8.6'} dev: true - /postcss@8.4.37: - resolution: {integrity: sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ==} + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -944,8 +944,8 @@ packages: picocolors: 1.0.0 sade: 1.8.1 svelte: 4.2.12 - svelte-preprocess: 5.1.3(svelte@4.2.12)(typescript@5.4.2) - typescript: 5.4.2 + svelte-preprocess: 5.1.3(svelte@4.2.12)(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - '@babel/core' - coffeescript @@ -967,7 +967,7 @@ packages: svelte: 4.2.12 dev: true - /svelte-preprocess@5.1.3(svelte@4.2.12)(typescript@5.4.2): + /svelte-preprocess@5.1.3(svelte@4.2.12)(typescript@5.4.3): resolution: {integrity: sha512-xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw==} engines: {node: '>= 16.0.0', pnpm: ^8.0.0} requiresBuild: true @@ -1011,7 +1011,7 @@ packages: sorcery: 0.11.0 strip-indent: 3.0.0 svelte: 4.2.12 - typescript: 5.4.2 + typescript: 5.4.3 dev: true /svelte@4.2.12: @@ -1045,14 +1045,14 @@ packages: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true - /typescript@5.4.2: - resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} + /typescript@5.4.3: + resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} engines: {node: '>=14.17'} hasBin: true dev: true - /vite@5.2.0: - resolution: {integrity: sha512-xMSLJNEjNk/3DJRgWlPADDwaU9AgYRodDH2t6oENhJnIlmU9Hx1Q6VpjyXua/JdMw1WJRbnAgHJ9xgET9gnIAg==} + /vite@5.2.2: + resolution: {integrity: sha512-FWZbz0oSdLq5snUI0b6sULbz58iXFXdvkZfZWR/F0ZJuKTSPO7v72QPXt6KqYeMFb0yytNp6kZosxJ96Nr/wDQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -1080,13 +1080,13 @@ packages: optional: true dependencies: esbuild: 0.20.2 - postcss: 8.4.37 + postcss: 8.4.38 rollup: 4.13.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vitefu@0.2.5(vite@5.2.0): + /vitefu@0.2.5(vite@5.2.2): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} peerDependencies: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 @@ -1094,7 +1094,7 @@ packages: vite: optional: true dependencies: - vite: 5.2.0 + vite: 5.2.2 dev: true /wrappy@1.0.2: diff --git a/examples/custom-html/public/vite.svg b/examples/layouts/public/vite.svg similarity index 100% rename from examples/custom-html/public/vite.svg rename to examples/layouts/public/vite.svg diff --git a/examples/layouts/src/pages/index.svelte b/examples/layouts/src/pages/index.svelte new file mode 100644 index 0000000..4040b66 --- /dev/null +++ b/examples/layouts/src/pages/index.svelte @@ -0,0 +1 @@ +

content

diff --git a/examples/layouts/src/pages/layout.html b/examples/layouts/src/pages/layout.html new file mode 100644 index 0000000..51e9424 --- /dev/null +++ b/examples/layouts/src/pages/layout.html @@ -0,0 +1,14 @@ + + + + + + + Layout 1 + + + + + + + diff --git a/examples/layouts/src/pages/layout2/index.svelte b/examples/layouts/src/pages/layout2/index.svelte new file mode 100644 index 0000000..4040b66 --- /dev/null +++ b/examples/layouts/src/pages/layout2/index.svelte @@ -0,0 +1 @@ +

content

diff --git a/examples/layouts/src/pages/layout2/layout.html b/examples/layouts/src/pages/layout2/layout.html new file mode 100644 index 0000000..1e3be6d --- /dev/null +++ b/examples/layouts/src/pages/layout2/layout.html @@ -0,0 +1,14 @@ + + + + + + + Layout 2 + + + + + + + diff --git a/examples/layouts/src/pages/layout2/sub/index.svelte b/examples/layouts/src/pages/layout2/sub/index.svelte new file mode 100644 index 0000000..4040b66 --- /dev/null +++ b/examples/layouts/src/pages/layout2/sub/index.svelte @@ -0,0 +1 @@ +

content

diff --git a/examples/layouts/src/pages/sub/index.svelte b/examples/layouts/src/pages/sub/index.svelte new file mode 100644 index 0000000..4040b66 --- /dev/null +++ b/examples/layouts/src/pages/sub/index.svelte @@ -0,0 +1 @@ +

content

diff --git a/examples/custom-html/src/vite-env.d.ts b/examples/layouts/src/vite-env.d.ts similarity index 100% rename from examples/custom-html/src/vite-env.d.ts rename to examples/layouts/src/vite-env.d.ts diff --git a/examples/custom-html/svelte.config.js b/examples/layouts/svelte.config.js similarity index 100% rename from examples/custom-html/svelte.config.js rename to examples/layouts/svelte.config.js diff --git a/examples/custom-html/tsconfig.json b/examples/layouts/tsconfig.json similarity index 100% rename from examples/custom-html/tsconfig.json rename to examples/layouts/tsconfig.json diff --git a/examples/custom-html/tsconfig.node.json b/examples/layouts/tsconfig.node.json similarity index 100% rename from examples/custom-html/tsconfig.node.json rename to examples/layouts/tsconfig.node.json diff --git a/examples/custom-html/vite.config.ts b/examples/layouts/vite.config.ts similarity index 75% rename from examples/custom-html/vite.config.ts rename to examples/layouts/vite.config.ts index 295dbe3..c795d22 100644 --- a/examples/custom-html/vite.config.ts +++ b/examples/layouts/vite.config.ts @@ -4,5 +4,5 @@ import { multipage } from '../../src/index' // https://vitejs.dev/config/ export default defineConfig({ - plugins: [svelte(), multipage({ customHtml: 'custom.html' })], + plugins: [svelte(), multipage()], }) diff --git a/src/boilerplate/html.ts b/src/boilerplate/html.ts index 327c610..93c28b3 100644 --- a/src/boilerplate/html.ts +++ b/src/boilerplate/html.ts @@ -2,13 +2,13 @@ import { minify } from "html-minifier-terser"; import type { Config } from "../types"; import fs from "fs"; -export const html = async (body: string, config?: Config): Promise => { +export const html = async (body: string, config?: Config, layout?: string) => { let code = ""; - if (config?.customHtml) { - const customHtml = fs.readFileSync(config.customHtml, "utf-8"); + if (layout && fs.existsSync(layout)) { + const customHtml = fs.readFileSync(layout, "utf-8"); - code = customHtml.replace("{% body %}", body); + code = customHtml.replace("", body); } else { code = ` diff --git a/src/boilerplate/index.ts b/src/boilerplate/index.ts index d8e3509..7809ce6 100644 --- a/src/boilerplate/index.ts +++ b/src/boilerplate/index.ts @@ -4,14 +4,14 @@ import { svelte } from "./frameworks/svelte"; import { vue } from "./frameworks/vue"; import { html } from "./html"; -export const generateBoilerplate = async (file: string, framework: string, config: Config): Promise => { +export const generateBoilerplate = async (file: string, framework: string, config: Config, layout: string) => { switch (framework) { case "svelte": - return await html(svelte(file), config); + return await html(svelte(file), config, layout); case "vue": - return await html(vue(file), config); + return await html(vue(file), config, layout); case "tsx" || "jsx": - return await html(react(file), config); + return await html(react(file), config, layout); default: return ""; }; diff --git a/src/index.ts b/src/index.ts index eb7c10d..1b11d8e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -83,7 +83,22 @@ export const multipage = (config?: Config): Plugin => { const page = id.replace(fileName, `index.${framework}`); - return await generateBoilerplate(page, framework, config || {}) + const layouts = await glob("../**/layout.html", { + cwd: dirname(id), + filesOnly: true, + }); + + if (layouts.length < 1 || typeof layouts[0] != "string") return await generateBoilerplate(page, framework, config || {}, ""); + + const nearestLayout = layouts.sort((a, b) => { + return a.split("/").length - b.split("/").length; + }); + + if (nearestLayout.length < 1 || typeof nearestLayout[0] != "string") throw new Error("Nearest layout not found"); + + const layout = resolve(dirname(id), nearestLayout[0]); + + return await generateBoilerplate(page, framework, config || {}, layout); }, configureServer: createServer, diff --git a/src/types.ts b/src/types.ts index 30a3d19..a118640 100644 --- a/src/types.ts +++ b/src/types.ts @@ -5,7 +5,6 @@ export type Config = { directory?: string; page?: Page; framework?: string; - customHtml?: string; minify?: Options; assets?: Target[]; };