airdcpp-extension 2.0.0-beta, ESM updates

.gitignore

@@ -3,7 +3,7 @@ coverage
 .DS_Store
 .idea
 /dist
-/devtools/settings.js
+/devtools/settings.mjs
 /devtools/settings
 /devtools/logs
 /*.log

.vscode/launch.json

@@ -9,7 +9,7 @@
       "type": "node",
       "request": "launch",
       "console": "integratedTerminal",
-      "program": "${workspaceRoot}\\devtools\\dev-server.js",
+      "program": "${workspaceRoot}\\devtools\\dev-server.mjs",
       "protocol": "inspector",
       "cwd": "${workspaceRoot}",
       "outFiles": [ "${workspaceRoot}/dist/*.js" ],
@@ -19,7 +19,7 @@
       "type": "node",
       "request": "launch",
       "console": "integratedTerminal",
-      "program": "${workspaceRoot}\\devtools\\dev-server.js",
+      "program": "${workspaceRoot}\\devtools\\dev-server.mjs",
       "cwd": "${workspaceRoot}",
       "outFiles": [ "${workspaceRoot}/dist/*.js" ],
       "preLaunchTask": "webpack:prof",
@@ -35,7 +35,7 @@
       "type": "node",
       "request": "launch",
       "console": "integratedTerminal",
-      "program": "${workspaceRoot}\\devtools\\dev-server.js",
+      "program": "${workspaceRoot}\\devtools\\dev-server.mjs",
       "cwd": "${workspaceRoot}",
       "outFiles": [ "${workspaceRoot}/dist/*.js" ],
       "preLaunchTask": "webpack:prof",

devtools/dev-server.mjs

@@ -0,0 +1,30 @@
+import fs from 'fs';
+import path from 'path';
+
+import { RemoteExtension } from 'airdcpp-extension';
+
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const extensionConfig = {
+  packageInfo: JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf8')),
+  dataPath: __dirname,
+  nameSuffix: '-dev',
+};
+
+import settings from './settings.mjs';
+
+import(process.argv[2] || '../dist/main.js').then(entry => {
+  // See https://github.com/airdcpp-web/airdcpp-extension-js for usage information
+  RemoteExtension(
+    entry.default, 
+    !process.env.PROFILING ? settings : {
+      ...settings,
+      logLevel: 'error', // Avoid spam while profiling...
+    }, 
+    extensionConfig
+  );
+})
+

devtools/settings.js.example → devtools/settings.mjs.example

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	// API settings
 	url: 'ws://localhost:5600/api/v1/',
 	username: 'myusername',

devtools/watch.js

@@ -32,7 +32,7 @@ webpack(webpackConfig).watch(1000, function(err, stats) {
 	if (!started) {
 		started = true;
 
-		const serverPath = path.resolve(__dirname, 'dev-server.js');
+		const serverPath = path.resolve(__dirname, 'dev-server.mjs');
 		nodemon({
 			execMap: {
 				js: 'node --inspect'

jest.config.js

@@ -1,14 +1,19 @@
 // Sync object
 const config = {
   transform: {
-    '^.+\\.ts$': 'ts-jest'
+    '^.+\\.ts$': 'ts-jest',
+    // "node_modules/node-fetch/.+\\.(j|t)sx?$": "ts-jest"
   },
+  moduleDirectories: ['src', 'node_modules'],
   testEnvironment: 'node',
   moduleFileExtensions: [
     'js',
     'ts',
     'json'
   ],
+  transformIgnorePatterns: [
+    '<rootDir>\/node_modules\/(?!node\\-fetch)\/'
+  ],
   moduleNameMapper: {
     '(src/.*)$': '<rootDir>/$1'
   },