Merge branch 'denoland:main' into rename-FreshContext-req-to-request

Author: timreichen

.github/workflows/deploy.yml

@@ -33,5 +33,5 @@ jobs:
         if: github.repository_owner == 'denoland'
         with:
           project: "fresh"
-          entrypoint: "./www/_fresh/server.js"
-          root: "."
+          entrypoint: "server.js"
+          root: "./www/_fresh/"

deno.json

@@ -6,7 +6,7 @@
   ],
   "tasks": {
     "test": "deno test -A --parallel",
-    "www": "deno task --cwd=www start",
+    "www": "deno task --cwd=www dev",
     "build-www": "deno task --cwd=www build",
     "screenshot": "deno run -A www/utils/screenshot.ts",
     "check:types": "deno check --allow-import",
@@ -102,7 +102,8 @@
       "base",
       "noscript",
       "template"
-    ]
+    ],
+    "types": ["./global.d.ts"]
   },
   "lint": {
     "rules": {

deno.lock

@@ -28,11 +28,6 @@ app.use(
   csrf({ origin: ["https://example.com", "https://trusted.example.com"] }),
 );
 
-// Specify multiple origins
-app.use(
-  csrf({ origin: ["https://example.com", "https://trusted.example.com"] }),
-);
-
 // Use a function
 app.use(
   csrf({

docs/canary/plugins/csrf.md

@@ -0,0 +1,4 @@
+declare module "*.module.css" {
+  const CssMod: Record<string, string>;
+  export default CssMod;
+}

global.d.ts

@@ -1,6 +1,6 @@
 {
   "name": "@fresh/core",
-  "version": "2.0.0-alpha.63",
+  "version": "2.0.0-beta.1",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts",

packages/fresh/deno.json

@@ -97,6 +97,7 @@ export class IslandPreparer {
     mod: Record<string, unknown>,
     chunkName: string,
     modName: string,
+    css: string[],
   ) {
     for (const [name, value] of Object.entries(mod)) {
       if (typeof value !== "function") continue;
@@ -110,6 +111,7 @@ export class IslandPreparer {
         file: chunkName,
         fn,
         name: uniqueName,
+        css,
       });
     }
   }

packages/fresh/src/build_cache.ts

@@ -33,6 +33,7 @@ export interface Island {
   name: string;
   exportName: string;
   fn: ComponentType;
+  css: string[];
 }
 
 export type ServerIslandRegistry = Map<ComponentType, Island>;

packages/fresh/src/context.ts

@@ -314,6 +314,7 @@ export class Builder<State = any> {
         name,
         server: spec,
         browser: null,
+        css: [],
       });
     }
 

packages/fresh/src/dev/builder.ts

@@ -27,6 +27,7 @@ export interface IslandModChunk {
   name: string;
   server: string;
   browser: string | null;
+  css: string[];
 }
 
 export type FsRouteFileNoMod<State> = Omit<FsRouteFile<State>, "mod"> & {
@@ -206,7 +207,7 @@ export class MemoryBuildCache<State> implements DevBuildCache<State> {
             throw new Error(`Unexpected missing browser chunk`);
           }
 
-          preparer.prepare(this.islandRegistry, mod, chunk.browser, name);
+          preparer.prepare(this.islandRegistry, mod, chunk.browser, name, []);
         },
       ),
     );
@@ -461,7 +462,8 @@ export async function generateSnapshotServer(
   const islandMarkers = islands.map((item) => {
     const browser = JSON.stringify(item.browser);
     const name = JSON.stringify(item.name);
-    return `islandPreparer.prepare(islands, ${item.name}, ${browser}, ${name});`;
+    const css = JSON.stringify(item.css);
+    return `islandPreparer.prepare(islands, ${item.name}, ${browser}, ${name}, ${css});`;
   }).join("\n");
 
   const serializedFsRoutes = fsRoutesFiles