Update node-fetch and use newer style

package.json

@@ -8,6 +8,7 @@
         "type": "git",
         "url": "https://github.com/oracc/nisaba.git"
     },
+    "type": "module",
     "engines": {
         "vscode": "^1.44.0"
     },
@@ -20,7 +21,7 @@
         "onCommand:ucl-rsdg.lemmatiseAtf",
         "onCommand:ucl-rsdg.aboutNisaba"
     ],
-    "main": "./dist/extension",
+    "main": "./dist/extension.js",
     "contributes": {
         "commands": [
             {
@@ -129,12 +130,12 @@
         "package": "npx vsce package",
         "lint": "eslint src --ext ts",
         "pretest": "npm run compile && npm run lint",
-        "test": "node ./out/test/runTest.js"
+        "test": "node ./out/test/runTest.cjs"
     },
     "dependencies": {
         "adm-zip": "^0.5.5",
         "mimemessage": "^1.0.5",
-        "node-fetch": "^2.6.7",
+        "node-fetch": "^3.1.1",
         "winston": "^3.3.3",
         "winston-transport": "^4.4.0",
         "xml2js": "^0.4.23"
@@ -143,7 +144,6 @@
         "@types/adm-zip": "^0.4.33",
         "@types/mocha": "^7.0.2",
         "@types/node": "^13.13.52",
-        "@types/node-fetch": "^2.5.12",
         "@types/vscode": "^1.44.0",
         "@types/xml2js": "^0.4.8",
         "@typescript-eslint/eslint-plugin": "^5.1.0",

src/client/SOAP_client.ts

@@ -1,7 +1,7 @@
-import { default as fetch }from 'node-fetch';
-import { createEnvelopeMessage, extractLogs, getResponseCode, MultipartMessage, ServerAction } from './mime';
-import { ServerResult } from './server_result';
-import { log } from '../logger';
+import fetch from 'node-fetch';
+import { createEnvelopeMessage, extractLogs, getResponseCode, MultipartMessage, ServerAction } from './mime.js';
+import { ServerResult } from './server_result.js';
+import { log } from '../logger.js';
 
 /*
 1. Gather all the information for the message from the text (start with hardcoded)

src/client/mime.ts

@@ -1,5 +1,5 @@
-import mimemessage = require('mimemessage');
-import * as AdmZip from 'adm-zip';
+import * as mimemessage from 'mimemessage';
+import AdmZip from 'adm-zip';
 import { parseString } from 'xml2js';
 
 /**

src/extension.ts

@@ -1,14 +1,14 @@
 import { basename } from 'path';
 
-import { lemmatise, ServerFunction, validate } from './server/messages';
+import { lemmatise, ServerFunction, validate } from './server/messages.js';
 
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
 import * as vscode from 'vscode';
-import * as nisabaLogger from './logger';
-import { handleResult, initView } from './view';
-import { PreviewPanel } from './preview';
-import { getProjectCode } from './atf_model';
+import * as nisabaLogger from './logger.js';
+import { handleResult, initView } from './view.js';
+import { PreviewPanel } from './preview.js';
+import { getProjectCode } from './atf_model.js';
 
 // Logging output channel
 const nisabaOutputChannel = vscode.window.createOutputChannel("Nisaba");

src/logger.ts

@@ -2,7 +2,7 @@ import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
 import * as winston from 'winston';
-import * as TransportStream from 'winston-transport';
+import TransportStream from 'winston-transport';
 
 class OutputChannelTransport extends TransportStream {
     outputChannel: vscode.OutputChannel;

src/server/messages.ts

@@ -1,5 +1,5 @@
-import { ServerResult } from '../client/server_result';
-import { SOAPClient } from '../client/SOAP_client';
+import { ServerResult } from '../client/server_result.js';
+import { SOAPClient } from '../client/SOAP_client.js';
 
 // The interface of functions which have to send information to the server
 // (for convenience in typing in other files)

src/test/suite/atf.test.ts

@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { getProjectCode } from '../../atf_model';
+import { getProjectCode } from '../../atf_model.js';
 
 suite('ATF Model Test Suite', () => {
     vscode.window.showInformationMessage('Start ATF tests.');

src/test/suite/extension.test.ts

@@ -1,8 +1,8 @@
-import * as assert from 'assert';
+import assert from 'assert';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import * as nisaba from '../../extension';
+import * as nisaba from '../../extension.js';
 
 suite('Extension Test Suite', () => {
     vscode.window.showInformationMessage('Start all tests.');