FIXUP

fengmk2 · fengmk2 · commit 1e1b7237bbcb · 2025-10-18T23:19:17.000+08:00
diff --git a/hackernews-tegg/README.md b/hackernews-tegg/README.md
@@ -1,6 +1,6 @@
-# hackernews-async-ts
+# hackernews-tegg
 
-[Hacker News](https://news.ycombinator.com/) showcase using typescript && egg
+[Hacker News](https://news.ycombinator.com/) showcase using tegg
 
 ## QuickStart
 
@@ -29,5 +29,5 @@ $ npm start
 
 ### Requirement
 
-- Node.js 16.x
-- Typescript 4.x
+- Node.js 22.x
+- Typescript 5.x
diff --git a/hackernews-tegg/app/public/favicon.png b/hackernews-tegg/app/public/favicon.png
diff --git a/hackernews-tegg/app/router.ts b/hackernews-tegg/app/router.ts
@@ -3,7 +3,7 @@ import { Application } from 'egg';
 export default (app: Application) => {
   const { controller, router } = app;
 
-  router.redirect('/', '/news');
+  router.redirect('/', '/news', 302);
   router.get('/news', controller.news.list);
   router.get('/news/item/:id', controller.news.detail);
   router.get('/news/user/:id', controller.news.user);
diff --git a/hackernews-tegg/app/view/layout/layout.tpl b/hackernews-tegg/app/view/layout/layout.tpl
@@ -4,16 +4,16 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
     <link rel="stylesheet" href="/public/css/news.css" />
-    <link rel="icon" href="/public/favicon.png" type="image/x-icon">
+    <link rel="icon" href="https://eggjs.org/favicon.png" type="image/x-icon">
     <title>{% block title %}egg - HackerNews{% endblock %}</title>
   </head>
   <body>
     <div id="wrapper">
       <div id="header">
-        <a id="yc" href="http://www.ycombinator.com"><img src="https://news.ycombinator.com/y18.gif"></a>
+        <a id="yc" href="http://www.ycombinator.com"><img src="https://news.ycombinator.com/y18.svg"></a>
         <h1><a href="/news">Hacker News</a></h1>
         <span class="source">
-          Built with <a href="https://eggjs.org/" target="_blank">Egg</a> | <a href="https://github.com/eggjs/examples/tree/master/hackernews-async-ts" target="_blank">Source</a>
+          Built with <a href="https://eggjs.org/" target="_blank">Egg</a> | <a href="https://github.com/eggjs/examples/tree/master/hackernews-tegg" target="_blank">Source</a>
         </span>
       </div>
       {% block content %}{% endblock %}
diff --git a/hackernews-tegg/config/config.default.ts b/hackernews-tegg/config/config.default.ts
@@ -1,6 +1,3 @@
-import fs from 'node:fs';
-import path from 'node:path';
-
 import { defineConfigFactory, type EggAppConfig } from 'egg';
 
 // for config.{env}.ts
@@ -26,7 +23,7 @@ export default defineConfigFactory(appInfo => {
       },
     },
     siteFile: {
-      '/favicon.ico': fs.readFileSync(path.join(appInfo.baseDir, 'app/public/favicon.png')),
+      '/favicon.ico': 'https://eggjs.org/favicon.png',
     },
     // app special config
     sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,
diff --git a/hackernews-tegg/config/plugin.ts b/hackernews-tegg/config/plugin.ts
@@ -1,6 +1,6 @@
 export default {
   nunjucks: {
     enable: true,
-    package: 'egg-view-nunjucks',
+    package: '@eggjs/view-nunjucks',
   },
 };
diff --git a/hackernews-tegg/package.json b/hackernews-tegg/package.json
@@ -20,21 +20,21 @@
     "clean": "tsc -b --clean"
   },
   "dependencies": {
-    "egg": "beta",
     "@eggjs/scripts": "beta",
     "@eggjs/tegg": "beta",
     "@eggjs/tegg-config": "beta",
     "@eggjs/tegg-controller-plugin": "beta",
     "@eggjs/tegg-plugin": "beta",
-    "egg-view-nunjucks": "beta",
+    "@eggjs/view-nunjucks": "beta",
+    "egg": "beta",
     "moment": "^2.30.1"
   },
   "devDependencies": {
     "@eggjs/bin": "beta",
     "@eggjs/mock": "beta",
     "@eggjs/tsconfig": "beta",
     "@types/mocha": "10",
-    "@types/node": "^24.8.1",
+    "@types/node": "24",
     "eslint": "8",
     "eslint-config-egg": "14",
     "typescript": "5"
diff --git a/hackernews-tegg/test/app/controller/news.test.ts b/hackernews-tegg/test/app/controller/news.test.ts
@@ -1,12 +1,13 @@
 import assert from 'node:assert/strict';
 
-// import cheerio from 'cheerio';
 import { app } from '@eggjs/mock/bootstrap';
 
 describe('test/app/controller/news.test.ts', () => {
   it('should GET /news', async () => {
     const result = await app.httpRequest().get('/news').expect(200);
-    assert.equal(result.text.length, app.config.news.pageSize);
+    const m = result.text.match(/<span class="index">.*?<\/span>/g);
+    assert.ok(m);
+    assert.equal(m.length, app.config.news.pageSize);
   });
 
   it('should GET /news/item/:id', async () => {
diff --git a/hackernews-typescript/README.md b/hackernews-typescript/README.md
@@ -1,6 +1,6 @@
 # hackernews-typescript
 
-[Hacker News](https://news.ycombinator.com/) showcase using egg@4 and TypeScript
+[Hacker News](https://news.ycombinator.com/) showcase using typescript && egg
 
 ## QuickStart
 
@@ -31,4 +31,3 @@ $ npm start
 
 - Node.js 22.x
 - Typescript 5.x
-- egg@4.x
diff --git a/hackernews-typescript/app/public/favicon.png b/hackernews-typescript/app/public/favicon.png
diff --git a/hackernews-typescript/app/router.ts b/hackernews-typescript/app/router.ts
@@ -3,7 +3,7 @@ import { Application } from 'egg';
 export default (app: Application) => {
   const { controller, router } = app;
 
-  router.redirect('/', '/news');
+  router.redirect('/', '/news', 302);
   router.get('/news', controller.news.list);
   router.get('/news/item/:id', controller.news.detail);
   router.get('/news/user/:id', controller.news.user);
diff --git a/hackernews-typescript/app/view/layout/layout.tpl b/hackernews-typescript/app/view/layout/layout.tpl
@@ -4,16 +4,16 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
     <link rel="stylesheet" href="/public/css/news.css" />
-    <link rel="icon" href="/public/favicon.png" type="image/x-icon">
+    <link rel="icon" href="https://eggjs.org/favicon.png" type="image/x-icon">
     <title>{% block title %}egg - HackerNews{% endblock %}</title>
   </head>
   <body>
     <div id="wrapper">
       <div id="header">
-        <a id="yc" href="http://www.ycombinator.com"><img src="https://news.ycombinator.com/y18.gif"></a>
+        <a id="yc" href="http://www.ycombinator.com"><img src="https://news.ycombinator.com/y18.svg"></a>
         <h1><a href="/news">Hacker News</a></h1>
         <span class="source">
-          Built with <a href="https://eggjs.org/" target="_blank">Egg</a> | <a href="https://github.com/eggjs/examples/tree/master/hackernews-async-ts" target="_blank">Source</a>
+          Built with <a href="https://eggjs.org/" target="_blank">Egg</a> | <a href="https://github.com/eggjs/examples/tree/master/hackernews-tegg" target="_blank">Source</a>
         </span>
       </div>
       {% block content %}{% endblock %}
diff --git a/hackernews-typescript/config/config.default.ts b/hackernews-typescript/config/config.default.ts
@@ -1,6 +1,3 @@
-import fs from 'node:fs';
-import path from 'node:path';
-
 import { defineConfigFactory, type EggAppConfig } from 'egg';
 
 // for config.{env}.ts
@@ -26,7 +23,7 @@ export default defineConfigFactory(appInfo => {
       },
     },
     siteFile: {
-      '/favicon.ico': fs.readFileSync(path.join(appInfo.baseDir, 'app/public/favicon.png')),
+      '/favicon.ico': 'https://eggjs.org/favicon.png',
     },
     // app special config
     sourceUrl: `https://github.com/eggjs/examples/tree/master/${appInfo.name}`,
diff --git a/hackernews-typescript/config/plugin.ts b/hackernews-typescript/config/plugin.ts
@@ -1,6 +1,6 @@
 export default {
   nunjucks: {
     enable: true,
-    package: 'egg-view-nunjucks',
+    package: '@eggjs/view-nunjucks',
   },
 };
diff --git a/hackernews-typescript/package.json b/hackernews-typescript/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hackernews-typescript",
   "version": "1.0.0",
-  "description": "hackernews showcase using egg@4 and TypeScript",
+  "description": "hackernews showcase using typescript && egg",
   "private": true,
   "type": "module",
   "egg": {
@@ -20,21 +20,21 @@
     "clean": "tsc -b --clean"
   },
   "dependencies": {
-    "egg": "beta",
     "@eggjs/scripts": "beta",
     "@eggjs/tegg": "beta",
     "@eggjs/tegg-config": "beta",
     "@eggjs/tegg-controller-plugin": "beta",
     "@eggjs/tegg-plugin": "beta",
-    "egg-view-nunjucks": "beta",
+    "@eggjs/view-nunjucks": "beta",
+    "egg": "beta",
     "moment": "^2.30.1"
   },
   "devDependencies": {
     "@eggjs/bin": "beta",
     "@eggjs/mock": "beta",
     "@eggjs/tsconfig": "beta",
     "@types/mocha": "10",
-    "@types/node": "^24.8.1",
+    "@types/node": "24",
     "eslint": "8",
     "eslint-config-egg": "14",
     "typescript": "5"
diff --git a/hackernews-typescript/test/app/controller/news.test.ts b/hackernews-typescript/test/app/controller/news.test.ts
@@ -1,12 +1,13 @@
 import assert from 'node:assert/strict';
 
-// import cheerio from 'cheerio';
 import { app } from '@eggjs/mock/bootstrap';
 
 describe('test/app/controller/news.test.ts', () => {
   it('should GET /news', async () => {
     const result = await app.httpRequest().get('/news').expect(200);
-    assert.equal(result.text.length, app.config.news.pageSize);
+    const m = result.text.match(/<span class="index">.*?<\/span>/g);
+    assert.ok(m);
+    assert.equal(m.length, app.config.news.pageSize);
   });
 
   it('should GET /news/item/:id', async () => {
