merge master

CHANGELOG.md

@@ -9,14 +9,20 @@ Any BREAKING CHANGE between minor versions will be documented here in upper case
 ## [1.19.2] - Unreleased
 ### Added
 - The second argument of the `page.data.url()` function has the default URL value.
+- Default options for `Server` class:
+  - root: `Deno.cwd() + "/_site"`
+  - port: `8000`
 
 ### Changed
 - Removed schema.org meta tags in metas plugin, because they are are not valid.
   Probably it needs a new specific plugin.
+- Updated the minimum Deno version supported to `1.37.2`.
+- `redirects` `www` middleware support `307`, `308` status code.
 
 ### Fixed
 - Ignore error checking Lume version in offline environments [#496].
-- Updated dependencies: `deno_dom`, `katex`, `preact`, `sass`, `svg2png`, `terser`.
+- `lightningcss` plugin: after refreshing changes the imports of all files are mixed.
+- Updated dependencies: `std`, `deno_dom`, `katex`, `preact`, `sass`, `svg2png`, `terser`, `pagefind`.
 
 ## [1.19.1] - 2023-09-29
 ### Added

core/server.ts

@@ -17,6 +17,11 @@ export interface Options {
   port: number;
 }
 
+export const defaults: Options = {
+  root: `${Deno.cwd()}/_site`,
+  port: 8000,
+};
+
 export type RequestHandler = (req: Request) => Promise<Response>;
 export type Middleware = (
   req: Request,
@@ -47,8 +52,8 @@ export default class Server {
   middlewares: Middleware[] = [];
   #server?: HttpServer;
 
-  constructor(options: Options) {
-    this.options = options;
+  constructor(options: Partial<Options> = {}) {
+    this.options = { ...defaults, ...options };
   }
 
   /** Register one or more middlewares */

core/utils.ts

@@ -67,7 +67,7 @@ export const pluginNames = [
 
 /** Check the compatibility with the current Deno version */
 export function checkDenoVersion(): void {
-  const minimum = "1.33.4";
+  const minimum = "1.37.2";
   const current = Deno.version.deno;
 
   if (current < minimum) {

deps/assert.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/assert/mod.ts";
+export * from "https://deno.land/std@0.204.0/assert/mod.ts";

deps/base64.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/encoding/base64.ts";
+export * from "https://deno.land/std@0.204.0/encoding/base64.ts";

deps/colors.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/fmt/colors.ts";
+export * from "https://deno.land/std@0.204.0/fmt/colors.ts";

deps/crypto.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/crypto/mod.ts";
+export * from "https://deno.land/std@0.204.0/crypto/mod.ts";

deps/flags.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/flags/mod.ts";
+export * from "https://deno.land/std@0.204.0/flags/mod.ts";

deps/front_matter.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/front_matter/any.ts";
+export * from "https://deno.land/std@0.204.0/front_matter/any.ts";

deps/fs.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/fs/mod.ts";
+export * from "https://deno.land/std@0.204.0/fs/mod.ts";

deps/hex.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/encoding/hex.ts";
+export * from "https://deno.land/std@0.204.0/encoding/hex.ts";

deps/http.ts

@@ -1,4 +1,4 @@
-export { serveFile } from "https://deno.land/std@0.203.0/http/file_server.ts";
-export { Server } from "https://deno.land/std@0.203.0/http/server.ts";
+export { serveFile } from "https://deno.land/std@0.204.0/http/file_server.ts";
+export { Server } from "https://deno.land/std@0.204.0/http/server.ts";
 
-export type { ConnInfo } from "https://deno.land/std@0.203.0/http/server.ts";
+export type { ConnInfo } from "https://deno.land/std@0.204.0/http/server.ts";

deps/jsonc.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/jsonc/mod.ts";
+export * from "https://deno.land/std@0.204.0/jsonc/mod.ts";

deps/media_types.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/media_types/mod.ts";
+export * from "https://deno.land/std@0.204.0/media_types/mod.ts";

deps/pagefind.ts

@@ -1 +1 @@
-export * from "npm:[email protected].3";
+export * from "npm:[email protected].4-beta.0";

deps/path.ts

@@ -1 +1,2 @@
-export * from "https://deno.land/[email protected]/path/mod.ts";
+export * from "https://deno.land/[email protected]/path/mod.ts";
+export * as posix from "https://deno.land/[email protected]/path/posix/mod.ts";

deps/sass.ts

@@ -1 +1 @@
-export * from "npm:[email protected].0";
+export * from "npm:[email protected].3";

deps/snapshot.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/testing/snapshot.ts";
+export * from "https://deno.land/std@0.204.0/testing/snapshot.ts";

deps/toml.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/toml/mod.ts";
+export * from "https://deno.land/std@0.204.0/toml/mod.ts";

deps/xml.ts

@@ -1 +1 @@
-export * from "https://deno.land/x/[email protected].1/mod.ts";
+export * from "https://deno.land/x/[email protected].2/mod.ts";

deps/yaml.ts

@@ -1 +1 @@
-export * from "https://deno.land/std@0.203.0/yaml/mod.ts";
+export * from "https://deno.land/std@0.204.0/yaml/mod.ts";

middlewares/redirects.ts

@@ -6,7 +6,7 @@ export interface Options {
 
 export interface Redirect {
   to: string;
-  code: 301 | 302 | 200;
+  code: 301 | 302 | 307 | 308 | 200;
 }
 
 /** Implements redirects */
@@ -28,6 +28,8 @@ export default function redirects(options: Options): Middleware {
     switch (redirect.code) {
       case 301:
       case 302:
+      case 307:
+      case 308:
         return new Response(null, {
           status: redirect.code,
           headers: {

middlewares/www.ts

@@ -2,7 +2,7 @@ import type { Middleware } from "../core.ts";
 
 export interface Options {
   add: boolean;
-  code: 301 | 302;
+  code: 301 | 302 | 307 | 308;
 }
 
 export const defaults: Options = {

plugins/lightningcss.ts

@@ -59,7 +59,7 @@ export default function (userOptions?: DeepPartial<Options>) {
     site.loadAssets(options.extensions);
 
     if (options.includes) {
-      site.process(options.extensions, lightningCSSBundler);
+      site.processAll(options.extensions, lightningCSSBundler);
     } else {
       site.process(options.extensions, lightningCSSTransformer);
     }
@@ -91,54 +91,59 @@ export default function (userOptions?: DeepPartial<Options>) {
       );
     }
 
-    async function lightningCSSBundler(file: Page) {
-      const { content, filename, sourceMap, enableSourceMap } = prepareAsset(
-        site,
-        file,
-      );
-
-      // Process the code with lightningCSS
-      const bundleOptions: BundleAsyncOptions<CustomAtRules> = {
-        filename,
-        sourceMap: enableSourceMap,
-        inputSourceMap: JSON.stringify(sourceMap),
-        ...options.options,
-        resolver: {
-          resolve(id: string, from: string) {
-            return resolveInclude(
-              id,
-              options.includes as string,
-              posix.dirname(from),
-            );
-          },
-          async read(file: string) {
-            if (file === filename) {
-              return content;
-            }
-
-            if (file.startsWith("http")) {
-              return read(file, false, {
-                headers: {
-                  "User-Agent":
-                    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/115.0",
-                },
-              });
-            }
-
-            return await site.getContent(file, textLoader) as string;
+    /**
+     * Bundles all CSS files into a single file
+     * This cannot be done in parallel because ligthningcss has a bug that mixes the imports of all files
+     * Seems like executing the bundler in sequence fixes the issue
+     */
+    async function lightningCSSBundler(files: Page[]) {
+      for (const file of files) {
+        const { content, filename, sourceMap, enableSourceMap } = prepareAsset(
+          site,
+          file,
+        );
+
+        const { includes } = site.options;
+
+        // Process the code with lightningCSS
+        const bundleOptions: BundleAsyncOptions<CustomAtRules> = {
+          filename,
+          sourceMap: enableSourceMap,
+          inputSourceMap: JSON.stringify(sourceMap),
+          ...options.options,
+          resolver: {
+            resolve(id: string, from: string) {
+              return resolveInclude(id, includes, posix.dirname(from));
+            },
+            async read(file: string) {
+              if (file === filename) {
+                return content;
+              }
+
+              if (file.startsWith("http")) {
+                return read(file, false, {
+                  headers: {
+                    "User-Agent":
+                      "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/115.0",
+                  },
+                });
+              }
+
+              return await site.getContent(file, textLoader) as string;
+            },
           },
-        },
-      };
-
-      const result = await bundleAsync(bundleOptions);
-      const decoder = new TextDecoder();
-
-      saveAsset(
-        site,
-        file,
-        decoder.decode(result.code),
-        enableSourceMap ? decoder.decode(result.map!) : undefined,
-      );
+        };
+
+        const result = await bundleAsync(bundleOptions);
+        const decoder = new TextDecoder();
+
+        saveAsset(
+          site,
+          file,
+          decoder.decode(result.code),
+          enableSourceMap ? decoder.decode(result.map!) : undefined,
+        );
+      }
     }
   };
 }