Go over Chapter 20

marijnh · marijnh · commit d4188fd0f901 · 2023-10-25T18:01:13.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,7 @@
 /html/ejs.js
 /code/chapter/*
 /code/chapter_info.js
-/code/file_server.js
+/code/file_server.mjs
 /code/skillsharing.zip
 /code/solutions/20_3_a_public_space_on_the_web.zip
 /code/skillsharing/*
diff --git a/18_http.md b/18_http.md
@@ -32,7 +32,7 @@ Then the server responds, through that same connection.
 
 ```{lang: http}
 HTTP/1.1 200 OK
-Content-Length: 140596
+Content-Length: 87320
 Content-Type: text/html
 Last-Modified: Fri, 13 Oct 2023 10:05:41 GMT
 
@@ -81,14 +81,14 @@ Status codes starting with a 2 indicate that the request succeeded. Codes starti
 The first line of a request or response may be followed by any number of _((header))s_. These are lines in the form `name: value` that specify extra information about the request or response. These headers were part of the example ((response)):
 
 ```{lang: null}
-Content-Length: 140596
+Content-Length: 87320
 Content-Type: text/html
 Last-Modified: Fri, 13 Oct 2023 10:05:41 GMT
 ```
 
 {{index "Content-Length header", "Content-Type header", "Last-Modified header"}}
 
-This tells us the size and type of the response document. In this case, it is an HTML document of 140,596 bytes. It also tells us when that document was last modified.
+This tells us the size and type of the response document. In this case, it is an HTML document of 87,320 bytes. It also tells us when that document was last modified.
 
 The client and server are free to decide what ((header))s to include in their ((request))s or ((response))s. But some of them are necessary for things to work. For example, without a `Content-Type` header in the response, the browser won't know how to display the document.
 
diff --git a/20_node.md b/20_node.md
diff --git a/code/solutions/20_1_search_tool.mjs b/code/solutions/20_1_search_tool.mjs
@@ -1,4 +1,4 @@
-const {statSync, readdirSync, readFileSync} = require("fs");
+import {statSync, readdirSync, readFileSync} from "node:fs";
 
 let searchTerm = new RegExp(process.argv[2]);
 
diff --git a/code/solutions/20_2_directory_creation.mjs b/code/solutions/20_2_directory_creation.mjs
@@ -1,7 +1,7 @@
 // This code won't work on its own, but is also included in the
 // code/file_server.js file, which defines the whole system.
 
-const {mkdir} = require("fs").promises;
+import {mkdir} from "node:fs/promises";
 
 methods.MKCOL = async function(request) {
   let path = urlPath(request.url);
diff --git a/src/chapter_info.mjs b/src/chapter_info.mjs
@@ -76,18 +76,18 @@ for (let file of fs.readdirSync(".").sort()) {
   let nodeInfo = "// Node exercises can not be ran in the browser,\n// but you can look at their solution here.\n";
   if (chapter.number == 20) chapter.exercises = [
     {name: "Search tool",
-     file: "code/solutions/20_1_search_tool.js",
+     file: "code/solutions/20_1_search_tool.mjs",
      number: 1,
      type: "js",
      code: nodeInfo,
-     solution: fs.readFileSync("code/solutions/20_1_search_tool.js", "utf8")
+     solution: fs.readFileSync("code/solutions/20_1_search_tool.mjs", "utf8")
     },
     {name: "Directory creation",
-     file: "code/solutions/20_2_directory_creation.js",
+     file: "code/solutions/20_2_directory_creation.mjs",
      number: 2,
      type: "js",
      code: nodeInfo,
-     solution: fs.readFileSync("code/solutions/20_2_directory_creation.js", "utf8")
+     solution: fs.readFileSync("code/solutions/20_2_directory_creation.mjs", "utf8")
     },
     {name: "A public space on the web",
      file: "code/solutions/20_3_a_public_space_on_the_web.zip",
diff --git a/src/client/code.mjs b/src/client/code.mjs
@@ -111,7 +111,7 @@ class CodeSandbox {
       let link = document.querySelector("#download")
       link.setAttribute("download", "solution" + value + ".js")
       if (/\.zip$/.test(exercise.file))
-        link.href = exercise.file
+        link.href = "../" + exercise.file
       else
         link.href = "data:text/plain;charset=UTF-8," + encodeURIComponent(exercise.solution)
     }
@@ -225,7 +225,7 @@ function getChapter(number) {
 function addItem(container, link) {
   let li = container.appendChild(document.createElement("li"))
   let a = li.appendChild(document.createElement("a"))
-  a.href = link
+  a.href = "../" + link
   a.textContent = link.replace(/^code\//, "")
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const {statSync, readdirSync, readFileSync} = require("fs");`
	`1`	`+import {statSync, readdirSync, readFileSync} from "node:fs";`
`2`	`2`
`3`	`3`	`let searchTerm = new RegExp(process.argv[2]);`
`4`	`4`