Skip to content

Commit ded1af2

Browse files
committed
Move public folder to root, apply patch for eleventy-plugin-vite
1 parent 44056a6 commit ded1af2

21 files changed

+36
-3
lines changed

.eleventy.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ module.exports = function (eleventyConfig) {
2828
clearScreen: false,
2929
server: {
3030
mode: 'development',
31-
middlewareMode: 'ssr'
31+
middlewareMode: true,
3232
},
33+
appType: 'custom',
3334
assetsInclude: ['**/*.xml', '**/*.txt'],
3435
build: {
3536
mode: 'production',
@@ -77,8 +78,6 @@ module.exports = function (eleventyConfig) {
7778
}
7879
})
7980

80-
eleventyConfig.setServerPassthroughCopyBehavior("copy");
81-
8281
// Filters
8382
Object.keys(filters).forEach((filterName) => {
8483
eleventyConfig.addFilter(filterName, filters[filterName])
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/node_modules/@11ty/eleventy-plugin-vite/.eleventy.js b/node_modules/@11ty/eleventy-plugin-vite/.eleventy.js
2+
index e5f7e93..82d9de1 100644
3+
--- a/node_modules/@11ty/eleventy-plugin-vite/.eleventy.js
4+
+++ b/node_modules/@11ty/eleventy-plugin-vite/.eleventy.js
5+
@@ -17,9 +17,10 @@ module.exports = function(eleventyConfig, options = {}) {
6+
eleventyConfig.ignores.add(publicDir);
7+
8+
// Use for-free passthrough copy on the public directory
9+
- let passthroughCopyObject = {};
10+
- passthroughCopyObject[`${publicDir}/**`] = "/"
11+
- eleventyConfig.addPassthroughCopy(passthroughCopyObject);
12+
+ // let passthroughCopyObject = {};
13+
+ // passthroughCopyObject[`${publicDir}/**`] = "/"
14+
+ // eleventyConfig.addPassthroughCopy(passthroughCopyObject);
15+
+ eleventyConfig.addPassthroughCopy(`${publicDir}/**`);
16+
17+
// Add temp folder to the ignores
18+
eleventyConfig.ignores.add(eleventyVite.getIgnoreDirectory());
19+
diff --git a/node_modules/@11ty/eleventy-plugin-vite/EleventyVite.js b/node_modules/@11ty/eleventy-plugin-vite/EleventyVite.js
20+
index 4c90855..8db76f7 100644
21+
--- a/node_modules/@11ty/eleventy-plugin-vite/EleventyVite.js
22+
+++ b/node_modules/@11ty/eleventy-plugin-vite/EleventyVite.js
23+
@@ -46,9 +46,11 @@ class EleventyVite {
24+
try {
25+
let viteOptions = lodashMerge({}, this.options.viteOptions);
26+
viteOptions.root = tmp;
27+
+ let publicDir = path.join(this.outputDir, viteOptions.publicDir || "public", path.sep);
28+
29+
viteOptions.build.rollupOptions.input = input
30+
.filter(entry => !!entry.outputPath) // filter out `false` serverless routes
31+
+ .filter(entry => !entry.outputPath.startsWith(publicDir)) // filter out files in public/, vite/rollup will not touch these files and just copy them to the root of your output folder
32+
.map(entry => {
33+
if(!entry.outputPath.startsWith(this.outputDir + path.sep)) {
34+
throw new Error(`Unexpected output path (was not in output directory ${this.outputDir}): ${entry.outputPath}`);

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-bold.woff renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-bold.woff

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-bold.woff2 renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-bold.woff2

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-bolditalic.woff renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-bolditalic.woff

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-bolditalic.woff2 renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-bolditalic.woff2

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-italic.woff renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-italic.woff

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-italic.woff2 renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-italic.woff2

File renamed without changes.

src/public/assets/fonts/dm-sans/dm-sans-v11-latin-regular-subset.woff renamed to public/assets/fonts/dm-sans/dm-sans-v11-latin-regular-subset.woff

File renamed without changes.

0 commit comments

Comments
 (0)