Merge pull request #173 from aKzenT/fix-160

Use ESM instead of CJS. Potentially fixes #160

Author: JeremyTCD

Changelog.md

@@ -3,7 +3,11 @@ This project uses [semantic versioning](http://semver.org/spec/v2.0.0.html). Ref
 *[Semantic Versioning in Practice](https://www.jering.tech/articles/semantic-versioning-in-practice)*
 for an overview of semantic versioning.
 
-## [Unreleased](https://github.com/JeringTech/Javascript.NodeJS/compare/7.0.0-beta.4...HEAD)
+## [Unreleased](https://github.com/JeringTech/Javascript.NodeJS/compare/7.0.0-beta.5...HEAD)
+
+## [7.0.0-beta.5](https://github.com/JeringTech/Javascript.NodeJS/compare/7.0.0-beta.4...7.0.0-beta.5) - Jul 28, 2023
+### Changes
+- Changed server scripts from CommonJS to EcmaScript modules. This should improve the reliability of `.mjs` file invocations. ([#173](https://github.com/JeringTech/Javascript.NodeJS/pull/173)).
 
 ## [7.0.0-beta.4](https://github.com/JeringTech/Javascript.NodeJS/compare/7.0.0-beta.3...7.0.0-beta.4) - Apr 18, 2023
 ### Fixes

ReadMe.md

@@ -1783,6 +1783,7 @@ Contributions are welcome!
 - [samcic](https://github.com/samcic)
 - [johnrom](https://github.com/johnrom)
 - [aKzenT](https://github.com/aKzenT)
+- [thebuilder](https://github.com/thebuilder)
 
 ## About
 Follow [@JeringTech](https://twitter.com/JeringTech) for updates and more.

src/NodeJS/Javascript/Servers/OutOfProcess/Http/Http11Server.ts

@@ -1,5 +1,4 @@
-// The typings for module are incomplete and can't be augmented, so import as any.
-const Module = require('module');
+import ModuleTemp from 'module';
 import * as http from 'http';
 import { AddressInfo, Socket } from 'net';
 import * as path from 'path';
@@ -8,6 +7,9 @@ import InvocationRequest from '../../../InvocationData/InvocationRequest';
 import ModuleSourceType from '../../../InvocationData/ModuleSourceType';
 import { getTempIdentifier, respondWithError, setup } from './Shared';
 
+// The typings for module are incomplete and can't be augmented, so import as any.
+const Module = ModuleTemp as any;
+
 // Setup
 const [args, projectDir, moduleResolutionPaths] = setup();
 
@@ -118,11 +120,7 @@ function serverOnRequestListener(req: http.IncomingMessage, res: http.ServerResp
                     }
                 } else if (invocationRequest.moduleSourceType === ModuleSourceType.File) {
                     const resolvedPath = path.resolve(projectDir, invocationRequest.moduleSource);
-                    if (resolvedPath.endsWith('.mjs')) {
-                        exports = await import(/* webpackIgnore: true */ 'file:///' + resolvedPath.replaceAll('\\', '/'));
-                    } else {
-                        exports = __non_webpack_require__(resolvedPath);
-                    }
+                    exports = await import('file:///' + resolvedPath.replaceAll('\\', '/'));
                 } else {
                     respondWithError(res, `Invalid module source type: ${invocationRequest.moduleSourceType}.`);
                     return;
@@ -135,9 +133,10 @@ function serverOnRequestListener(req: http.IncomingMessage, res: http.ServerResp
                 // Get function to invoke
                 let functionToInvoke: Function;
                 if (invocationRequest.exportName != null) {
-                    functionToInvoke = exports[invocationRequest.exportName];
+                    functionToInvoke = exports[invocationRequest.exportName] ?? exports.default?.[invocationRequest.exportName];
                     if (functionToInvoke == null) {
-                        respondWithError(res, `The module ${getTempIdentifier(invocationRequest)} has no export named ${invocationRequest.exportName}.`);
+                        let availableExports = Object.keys(exports).join(', ');
+                        respondWithError(res, `The module ${getTempIdentifier(invocationRequest)} has no export named ${invocationRequest.exportName}. Available exports are: ${availableExports}`);
                         return;
                     }
                     if (!(typeof functionToInvoke === 'function')) {

src/NodeJS/Javascript/Servers/OutOfProcess/Http/Http20Server.ts

@@ -1,5 +1,4 @@
-// The typings for module are incomplete and can't be augmented, so import as any.
-const Module = require('module');
+import ModuleTemp from 'module';
 import * as http2 from 'http2';
 import { AddressInfo } from 'net';
 import * as path from 'path';
@@ -8,6 +7,9 @@ import InvocationRequest from '../../../InvocationData/InvocationRequest';
 import ModuleSourceType from '../../../InvocationData/ModuleSourceType';
 import { getTempIdentifier, respondWithError, setup } from './Shared';
 
+// The typings for module are incomplete and can't be augmented, so import as any.
+const Module = ModuleTemp as any;
+
 // Setup
 const [args, projectDir, moduleResolutionPaths] = setup();
 
@@ -104,11 +106,7 @@ function serverOnRequestListener(req: http2.Http2ServerRequest, res: http2.Http2
                     }
                 } else if (invocationRequest.moduleSourceType === ModuleSourceType.File) {
                     const resolvedPath = path.resolve(projectDir, invocationRequest.moduleSource);
-                    if (resolvedPath.endsWith('.mjs')) {
-                        exports = await import(/* webpackIgnore: true */ 'file:///' + resolvedPath.replaceAll('\\', '/'));
-                    } else {
-                        exports = __non_webpack_require__(resolvedPath);
-                    }
+                    exports = await import('file:///' + resolvedPath.replaceAll('\\', '/'));
                 } else {
                     respondWithError(res, `Invalid module source type: ${invocationRequest.moduleSourceType}.`);
                     return;
@@ -121,9 +119,10 @@ function serverOnRequestListener(req: http2.Http2ServerRequest, res: http2.Http2
                 // Get function to invoke
                 let functionToInvoke: Function;
                 if (invocationRequest.exportName != null) {
-                    functionToInvoke = exports[invocationRequest.exportName];
+                    functionToInvoke = exports[invocationRequest.exportName] ?? exports.default?.[invocationRequest.exportName];
                     if (functionToInvoke == null) {
-                        respondWithError(res, `The module ${getTempIdentifier(invocationRequest)} has no export named ${invocationRequest.exportName}.`);
+                        let availableExports = Object.keys(exports).join(', ');
+                        respondWithError(res, `The module ${getTempIdentifier(invocationRequest)} has no export named ${invocationRequest.exportName}. Available exports are: ${availableExports}`);
                         return;
                     }
                     if (!(typeof functionToInvoke === 'function')) {

src/NodeJS/Javascript/Servers/OutOfProcess/Http/Shared.ts

@@ -1,4 +1,4 @@
-const path = require("path");
+import * as path from 'path';
 import * as stream from 'stream';
 import * as http from 'http';
 import * as http2 from 'http2';

src/NodeJS/Javascript/package.json

@@ -1,13 +1,12 @@
 {
     "private": true,
+    "type": "module",
     "scripts": {
-        "build": "echo ------ Yarn Install ------ && yarn install && echo ------ Webpack Compile ------ && webpack"
+        "build": "echo ------ Yarn Install ------ && yarn install && echo ------ Vite Compile ------ && vite build"
     },
     "dependencies": {
         "@types/node": "^18.11.18",
-        "ts-loader": "^9.2.6",
         "typescript": "^4.9.4",
-        "webpack": "^5.75.0",
-        "webpack-cli": "^5.0.1"
+        "vite": "^4.4.7"
     }
 }

src/NodeJS/Javascript/vite.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from "vite";
+
+export default defineConfig({
+    build: {
+        emptyOutDir: false,
+        ssr: true,
+    },
+});