feat: upgrade egg v3 (#121)

Author: fengmk2

hackernews-async-ts/.autod.conf.js

@@ -0,0 +1,5 @@
+{
+  "root": true,
+  "extends": "eslint-config-egg/typescript"
+}
+

hackernews-async-ts/.eslintrc

@@ -29,5 +29,5 @@ $ npm start
 
 ### Requirement
 
-- Node.js 8.x
-- Typescript 2.8+
+- Node.js 16.x
+- Typescript 4.x

hackernews-async-ts/.vscode/settings.json

@@ -9,7 +9,7 @@ export default class NewsController extends Controller {
     const idList = await ctx.service.news.getTopStories(page);
 
     // get itemInfo parallel
-    const newsList = await Promise.all(idList.map((id) => ctx.service.news.getItem(id)));
+    const newsList = await Promise.all(idList.map(id => ctx.service.news.getItem(id)));
     await ctx.render('news/list.tpl', { list: newsList, page, pageSize });
   }
 
@@ -18,7 +18,7 @@ export default class NewsController extends Controller {
     const id = ctx.params.id;
     const newsInfo = await ctx.service.news.getItem(id);
     // get comment parallel
-    const commentList = await Promise.all(newsInfo.kids.map((_id) => ctx.service.news.getItem(_id)));
+    const commentList = await Promise.all(newsInfo.kids.map(_id => ctx.service.news.getItem(_id)));
     await ctx.render('news/detail.tpl', { item: newsInfo, comments: commentList });
   }
 

hackernews-async-ts/README.md

@@ -1,11 +1,9 @@
-'use strict';
-
-import * as moment from 'moment';
+import moment from 'moment';
 
 export function relativeTime(time) {
   return moment(new Date(time * 1000)).fromNow();
-};
+}
 
-export function domain (url) {
+export function domain(url) {
   return url && url.split('/')[2];
-};
+}

hackernews-async-ts/app/controller/news.ts

@@ -21,11 +21,12 @@ export class HackerNews extends Service {
    * @param api - Api name
    * @param opts - urllib options
    */
-  public async request(api: string, opts?: object) {
-    const options = Object.assign({
+  public async request(api: string, opts?: any) {
+    const options = {
       dataType: 'json',
-      timeout: ['30s', '30s'],
-    }, opts);
+      timeout: '30s',
+      ...opts,
+    };
 
     const result = await this.ctx.curl(`${this.config.news.serverUrl}/${api}`, options);
     return result.data;
@@ -38,17 +39,17 @@ export class HackerNews extends Service {
    */
   public async getTopStories(page?: number, pageSize?: number): Promise<number[]> {
     page = page || 1;
-    pageSize = pageSize || this.config.news.pageSize;
+    const requestPageSize = pageSize ?? this.config.news.pageSize;
 
     try {
       const result = await this.request('topstories.json', {
         data: {
           orderBy: '"$key"',
-          startAt: `"${pageSize * (page - 1)}"`,
-          endAt: `"${pageSize * page - 1}"`,
+          startAt: `"${requestPageSize * (page - 1)}"`,
+          endAt: `"${requestPageSize * page - 1}"`,
         },
       });
-      return Object.keys(result).map((key) => result[key]);
+      return Object.keys(result).map(key => result[key]);
     } catch (e) {
       this.ctx.logger.error(e);
       return [];

hackernews-async-ts/app/extend/filter.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 import { EggAppConfig, PowerPartial } from 'egg';
 import * as fs from 'fs';
 import * as path from 'path';

hackernews-async-ts/app/service/News.ts

@@ -1,5 +1,3 @@
-'use strict';
-
 export default {
   nunjucks: {
     enable: true,

hackernews-async-ts/config/config.default.ts

@@ -8,39 +8,34 @@
   },
   "scripts": {
     "start": "egg-scripts start",
-    "dev": "egg-bin dev -r egg-ts-helper/register",
-    "debug": "egg-bin debug -r egg-ts-helper/register",
-    "test-local": "egg-bin test -r egg-ts-helper/register",
+    "dev": "egg-bin dev",
+    "debug": "egg-bin debug",
+    "test-local": "egg-bin test",
     "test": "npm run lint -- --fix && npm run test-local",
-    "cov": "egg-bin cov -r egg-ts-helper/register",
-    "tsc": "ets && tsc -p tsconfig.json",
+    "cov": "egg-bin cov",
+    "tsc": "tsc -p tsconfig.json",
     "ci": "npm run lint && npm run cov && npm run tsc",
-    "autod": "autod",
-    "lint": "tslint .",
-    "clean": "ets clean"
+    "lint": "eslint .",
+    "clean": "tsc -b --clean"
   },
   "dependencies": {
-    "egg": "^2.6.0",
-    "egg-scripts": "^2.6.0",
-    "egg-view-nunjucks": "^2.2.0",
+    "egg": "^3.11.0",
+    "egg-scripts": "^2.17.0",
+    "egg-view-nunjucks": "^2.3.0",
     "moment": "^2.22.0"
   },
   "devDependencies": {
+    "@eggjs/tsconfig": "^1.1.0",
     "@types/cheerio": "^0.22.1",
-    "@types/mocha": "^2.2.40",
-    "@types/node": "^7.0.12",
-    "@types/supertest": "^2.0.0",
-    "autod": "^3.0.1",
-    "autod-egg": "^1.1.0",
+    "@types/mocha": "^10.0.1",
     "cheerio": "^1.0.0-rc.2",
-    "egg-bin": "^4.6.2",
-    "egg-mock": "^3.16.0",
-    "egg-ts-helper": "^1.4.2",
-    "tslib": "^1.9.0",
-    "tslint": "^4.0.0",
-    "typescript": "^2.8.1"
+    "egg-bin": "^5.9.0",
+    "egg-mock": "^5.5.0",
+    "eslint": "^8.31.0",
+    "eslint-config-egg": "^12.1.0",
+    "typescript": "^4.9.4"
   },
   "engines": {
-    "node": ">=8.9.0"
+    "node": ">=16.0.0"
   }
 }

hackernews-async-ts/config/plugin.ts

@@ -1,7 +1,6 @@
-'use strict';
-
+import { strict as assert } from 'assert';
 import * as cheerio from 'cheerio';
-import { app, assert } from 'egg-mock/bootstrap';
+import { app } from 'egg-mock/bootstrap';
 
 describe('test/app/controller/news.test.ts', () => {
   it('should GET /news', async () => {
@@ -13,17 +12,17 @@ describe('test/app/controller/news.test.ts', () => {
 
   it('should GET /news/item/:id', async () => {
     await app.httpRequest()
-    .get('/news/item/1')
+      .get('/news/item/1')
     // just a example, use regex to test part of dom string, but should be strong characteristic
-    .expect(/\/news\/item\/1/)
-    .expect(200);
+      .expect(/\/news\/item\/1/)
+      .expect(200);
   });
 
   it('should GET /news/user/:id', async () => {
     await app.httpRequest()
-    .get('/news/user/activatedgeek')
+      .get('/news/user/activatedgeek')
     // just a example, use regex to test part of dom string, but should be strong characteristic
-    .expect(/<span class="label">user:<\/span> activatedgeek/)
-    .expect(200);
+      .expect(/<span class="label">user:<\/span> activatedgeek/)
+      .expect(200);
   });
 });

hackernews-async-ts/package.json

@@ -1,6 +1,4 @@
-'use strict';
-
-import * as assert from 'assert';
+import { strict as assert } from 'assert';
 import { Context } from 'egg';
 import { app } from 'egg-mock/bootstrap';
 

hackernews-async-ts/test/app/controller/news.test.ts

@@ -1,26 +1,7 @@
 {
-  "compileOnSave": true,
+  "extends": "@eggjs/tsconfig",
   "compilerOptions": {
-    "target": "es2017",
-    "module": "commonjs",
-    "strict": true,
-    "noImplicitAny": false,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "charset": "utf8",
-    "allowJs": false,
-    "pretty": true,
-    "noEmitOnError": false,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "allowUnreachableCode": false,
-    "allowUnusedLabels": false,
-    "strictPropertyInitialization": false,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "skipDefaultLibCheck": true,
-    "inlineSourceMap": true,
-    "importHelpers": true
+    "declaration": false
   },
   "exclude": [
     "app/public",