瀏覽代碼

Fix regressions related to migrating to TS

ghorsington 5 年之前
父節點
當前提交
e6ffc35a03
共有 5 個文件被更改,包括 12 次插入7 次删除
  1. 6 1
      .vscode/launch.json
  2. 1 1
      package.json
  3. 3 3
      src/commands/aggregators/com3d2_world.ts
  4. 1 1
      src/commands/news_aggregator.ts
  5. 1 1
      src/main.ts

+ 6 - 1
.vscode/launch.json

@@ -8,7 +8,12 @@
             "type": "node",
             "request": "launch",
             "name": "Launch Program",
-            "program": "${workspaceFolder}\\main.js",
+            "program": "${workspaceFolder}/src/main.ts",
+            "preLaunchTask": "tsc: build - tsconfig.json",
+            "outFiles": [
+                "${workspaceFolder}/build/**/*.js"
+            ],
+            "cwd": "${workspaceFolder}/build",
             "env": {
                 "NODE_ENV": "dev"
             }

+ 1 - 1
package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "tsc",
-    "start": "npm run build && node main.js"
+    "start": "npm run build && node build/main.js"
   },
   "repository": {
     "type": "git",

+ 3 - 3
src/commands/aggregators/com3d2_world.ts

@@ -2,7 +2,7 @@ import html, { HTMLElement } from "node-html-parser";
 import request from "request-promise-native";
 import { db } from "../../db";
 import { Response } from "request";
-import { INewsItem } from "./aggregator";
+import { INewsItem, IAggregator } from "./aggregator";
 
 const kissDiaryRoot = "https://com3d2.world/r18/notices.php";
 
@@ -79,6 +79,6 @@ async function aggregate() {
     }
 }
 
-module.exports = {
+export default {
     aggregate: aggregate
-};
+} as IAggregator;

+ 1 - 1
src/commands/news_aggregator.ts

@@ -137,7 +137,7 @@ function initAggregators() {
         if(ext != ".js")
             continue;
 
-        let obj = require(path.resolve(aggregatorsPath, file)) as IAggregator;
+        let obj = require(path.resolve(aggregatorsPath, file)).default as IAggregator;
 
         if(obj)
             aggregators.push(obj);

+ 1 - 1
src/main.ts

@@ -103,7 +103,7 @@ function main() {
         if (ext != ".js")
             continue;
 
-        let obj = require(path.resolve(commandsPath, file)) as ICommand;
+        let obj = require(path.resolve(commandsPath, file)).default as ICommand;
         if (obj.commands)
             for (let command of obj.commands) {
                 // if (obj.commands.hasOwnProperty(command))