@atls/webpack-start-server-plugin 0.0.6 → 1.0.0

package/dist/index.d.ts

@@ -1 +1 @@
-export * from './start-server.plugin';
+export * from './start-server.plugin.js';

package/dist/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./start-server.plugin"), exports);
+export * from "./start-server.plugin.js";

package/dist/start-server.logger.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" resolution-mode="require"/>
+import type { Writable } from 'node:stream';
+export interface StartServerLoggerOptions {
+    stdout?: Writable;
+    stderr?: Writable;
+}
+export declare class StartServerLogger {
+    private readonly options;
+    constructor(options?: StartServerLoggerOptions);
+    info(body: string): void;
+    error(error: Error): void;
+}

package/dist/start-server.logger.js

@@ -0,0 +1,28 @@
+export class StartServerLogger {
+    constructor(options = {}) {
+        this.options = options;
+    }
+    info(body) {
+        if (this.options.stdout) {
+            this.options.stdout.write(Buffer.from(JSON.stringify({
+                body,
+                severityNumber: 9,
+                attributes: {
+                    '@namespace': 'webpack:start-server',
+                },
+            })));
+        }
+    }
+    error(error) {
+        if (this.options.stderr) {
+            this.options.stderr.write(Buffer.from(JSON.stringify({
+                body: error.message,
+                severityNumber: 17,
+                attributes: {
+                    '@namespace': 'webpack:start-server',
+                    '@stack': error.stack,
+                },
+            })));
+        }
+    }
+}

package/dist/start-server.plugin.d.ts

@@ -1,29 +1,22 @@
-/// <reference types="node" />
-import { ChildProcess } from 'child_process';
-import { Writable } from 'stream';
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import type { ChildProcess } from 'node:child_process';
+import type { Writable } from 'node:stream';
+import type webpack from 'webpack';
+import { StartServerLogger } from './start-server.logger.js';
 export interface StartServerPluginOptions {
-    verbose: boolean;
-    entryName: string;
     stdout?: Writable;
     stderr?: Writable;
-    onWorkerStart?: (workeer: ChildProcess) => void;
-    onWorkerExit?: () => void;
 }
 export declare class StartServerPlugin {
     options: StartServerPluginOptions;
     entryFile: string | null;
     worker: ChildProcess | null;
-    workerLoaded: boolean;
+    initialized: boolean;
+    logger: StartServerLogger;
     constructor(options?: Partial<StartServerPluginOptions>);
-    getEntryFile(compilation: any): string | null;
-    handleWorkerExit: (code: any, signal: any) => void;
-    handleWorkerError: (err: any) => void;
-    handleWorkerMessage: (message: any) => void;
-    runWorker(entryFile: string, callback?: any): void;
-    hmrWorker(compilation: any, callback: any): void;
-    afterEmit: (compilation: any, callback: any) => void;
-    getMonitor(): string;
-    apply: (compiler: any) => void;
-    info(body: any): void;
-    error(body: any): void;
+    apply: (compiler: webpack.Compiler) => void;
+    private afterEmit;
+    private startServer;
+    private runWorker;
 }

package/dist/start-server.plugin.js

@@ -1,154 +1,49 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartServerPlugin = void 0;
-const path_1 = __importDefault(require("path"));
-const webpack_1 = require("webpack");
-const child_process_1 = require("child_process");
-class StartServerPlugin {
+import { fork } from 'node:child_process';
+import { join } from 'node:path';
+import { StartServerLogger } from './start-server.logger.js';
+export class StartServerPlugin {
     constructor(options = {}) {
         this.entryFile = null;
         this.worker = null;
-        this.workerLoaded = false;
-        this.handleWorkerExit = (code, signal) => {
-            if (code) {
-                this.error(`script exited with code: ${code}`);
-            }
-            if (signal && signal !== 'SIGTERM') {
-                this.error(`script exited after signal ${signal}`);
-            }
-            this.worker = null;
-            if (this.options.onWorkerExit) {
-                this.options.onWorkerExit();
-            }
-            if (!this.workerLoaded) {
-                this.error('Script did not load, or HMR failed; not restarting');
-                return;
-            }
-            this.workerLoaded = false;
-            if (this.entryFile) {
-                this.runWorker(this.entryFile);
-            }
-        };
-        this.handleWorkerError = (err) => {
-            this.error(err);
-            this.worker = null;
-            if (this.options.onWorkerExit) {
-                this.options.onWorkerExit();
-            }
-        };
-        this.handleWorkerMessage = (message) => {
-            if (message === 'SSWP_LOADED') {
-                this.workerLoaded = true;
-                this.info('Script loaded');
-            }
-            else if (message === 'SSWP_HMR_FAIL') {
-                this.workerLoaded = false;
-            }
+        this.initialized = false;
+        this.apply = (compiler) => {
+            compiler.hooks.afterEmit.tapAsync({ name: 'StartServerPlugin' }, this.afterEmit);
         };
         this.afterEmit = (compilation, callback) => {
-            const entryFile = this.getEntryFile(compilation);
-            if (entryFile) {
-                this.entryFile = entryFile;
-            }
-            if (this.worker) {
-                this.hmrWorker(compilation, callback);
+            if (!this.initialized) {
+                this.initialized = true;
+                callback();
             }
-            else if (this.entryFile) {
-                this.runWorker(this.entryFile, callback);
+            else {
+                if (this.worker?.connected && this.worker.pid) {
+                    process.kill(this.worker.pid);
+                }
+                this.startServer(compilation, callback);
             }
         };
-        this.apply = (compiler) => {
-            const plugin = { name: 'StartServerPlugin' };
-            compiler.hooks.make.tap(plugin, (compilation) => {
-                compilation.addEntry(compilation.compiler.context, webpack_1.EntryPlugin.createDependency(this.getMonitor(), {
-                    name: this.options.entryName,
-                }), this.options.entryName, () => { });
+        this.startServer = (compilation, callback) => {
+            this.logger.info('Starting server...');
+            this.entryFile = join(compilation.compiler.options.output.path, 'index.js');
+            this.runWorker(this.entryFile, (worker) => {
+                this.worker = worker;
+                callback();
             });
-            compiler.hooks.afterEmit.tapAsync(plugin, this.afterEmit);
-        };
-        this.options = {
-            verbose: true,
-            entryName: 'index',
-            ...options,
         };
-    }
-    getEntryFile(compilation) {
-        const { entryName } = this.options;
-        const { entrypoints } = compilation;
-        const entry = entrypoints.get ? entrypoints.get(entryName) : entrypoints[entryName];
-        if (!entry) {
-            throw new Error(`Requested entry "${entryName}" does not exist, try one of: ${(entrypoints.keys
-                ? entrypoints.keys()
-                : Object.keys(entrypoints)).join(' ')}`);
-        }
-        const entryScript = webpack_1.EntryPlugin
-            ? entry._runtimeChunk.files.values().next().value
-            : entry.chunks[0].files[0];
-        if (!entryScript) {
-            this.error(`Entry chunk not outputted: ${entry}`);
-            return null;
-        }
-        const { path } = compilation.outputOptions;
-        return path_1.default.resolve(path, entryScript);
+        this.logger = new StartServerLogger(options);
+        this.options = options;
     }
     runWorker(entryFile, callback) {
-        if (this.worker)
-            return;
-        if (this.options.verbose) {
-            this.info(`running \`node ${entryFile}\``);
-        }
-        const worker = (0, child_process_1.fork)(entryFile, [], {
+        const worker = fork(entryFile, [], {
             silent: true,
         });
-        worker.once('exit', this.handleWorkerExit);
-        worker.once('error', this.handleWorkerError);
-        worker.on('message', this.handleWorkerMessage);
         if (this.options.stdout) {
             worker.stdout?.pipe(this.options.stdout, { end: false });
         }
         if (this.options.stderr) {
             worker.stderr?.pipe(this.options.stderr, { end: false });
         }
-        this.worker = worker;
-        if (this.options.onWorkerStart) {
-            this.options.onWorkerStart(worker);
-        }
-        if (callback)
-            callback();
-    }
-    hmrWorker(compilation, callback) {
-        if (this.worker?.send) {
-            this.worker.send('SSWP_HMR');
-        }
-        else {
-            this.error('hot reloaded but no way to tell the worker');
-        }
-        callback();
-    }
-    getMonitor() {
-        const loaderPath = require.resolve('./monitor.loader');
-        return `!!${loaderPath}!${loaderPath}`;
-    }
-    info(body) {
-        if (this.options.stdout) {
-            this.options.stdout.write(Buffer.from(JSON.stringify({
-                severityText: 'INFO',
-                name: 'start-server',
-                body,
-            })));
-        }
-    }
-    error(body) {
-        if (this.options.stderr) {
-            this.options.stderr.write(Buffer.from(JSON.stringify({
-                severityText: 'ERROR',
-                name: 'start-server',
-                body,
-            })));
-        }
+        setTimeout(() => {
+            callback(worker);
+        }, 0);
     }
 }
-exports.StartServerPlugin = StartServerPlugin;

package/package.json

@@ -1,7 +1,16 @@
 {
   "name": "@atls/webpack-start-server-plugin",
-  "version": "0.0.6",
+  "version": "1.0.0",
   "license": "BSD-3-Clause",
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -12,15 +21,23 @@
     "postpack": "rm -rf dist"
   },
   "dependencies": {
-    "webpack": "^5.73.0"
+    "webpack": "^5.88.1"
   },
   "devDependencies": {
-    "@types/node": "^17.0.38"
+    "@types/node": "^20.14.9"
   },
   "publishConfig": {
     "access": "public",
+    "exports": {
+      "./package.json": "./package.json",
+      ".": {
+        "import": "./dist/index.js",
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    },
     "main": "dist/index.js",
-    "typings": "dist/index.d.ts"
+    "types": "dist/index.d.ts"
   },
-  "typings": "dist/index.d.ts"
+  "types": "dist/index.d.ts"
 }

package/dist/monitor.d.ts

@@ -1,2 +0,0 @@
-declare const monitorFn: () => void;
-export default monitorFn;

package/dist/monitor.js

@@ -1,98 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const monitorFn = () => {
-    if (module.hot) {
-        const log = (type, msg) => {
-            console.log(JSON.stringify({
-                severityText: type.toUpperCase(),
-                name: 'start-server:monitor',
-                body: msg,
-            }));
-        };
-        function logApplyRecult(updatedModules, renewedModules) {
-            var unacceptedModules = updatedModules.filter(function (moduleId) {
-                return renewedModules && renewedModules.indexOf(moduleId) < 0;
-            });
-            if (unacceptedModules.length > 0) {
-                log('warn', "[HMR] The following modules couldn't be hot updated: (They would need a full reload!)");
-                unacceptedModules.forEach(function (moduleId) {
-                    log('warn', '[HMR]  - ' + moduleId);
-                });
-            }
-            if (!renewedModules || renewedModules.length === 0) {
-                log('info', '[HMR] Nothing hot updated.');
-            }
-            else {
-                log('info', '[HMR] Updated modules:');
-                renewedModules.forEach(function (moduleId) {
-                    if (typeof moduleId === 'string' && moduleId.indexOf('!') !== -1) {
-                        var parts = moduleId.split('!');
-                        log('info', '[HMR]  - ' + moduleId);
-                    }
-                    else {
-                        log('info', '[HMR]  - ' + moduleId);
-                    }
-                });
-                var numberIds = renewedModules.every(function (moduleId) {
-                    return typeof moduleId === 'number';
-                });
-                if (numberIds)
-                    log('info', '[HMR] Consider using the optimization.moduleIds: "named" for module names.');
-            }
-        }
-        log('info', 'Handling Hot Module Reloading');
-        var checkForUpdate = function checkForUpdate(fromUpdate) {
-            module.hot
-                .check()
-                .then(function (updatedModules) {
-                if (!updatedModules) {
-                    if (fromUpdate)
-                        log('info', 'Update applied.');
-                    else
-                        log('warn', 'Cannot find update.');
-                    return;
-                }
-                return module.hot
-                    .apply({
-                    ignoreUnaccepted: true,
-                    onUnaccepted: function (data) {
-                        log('warn', '\u0007Ignored an update to unaccepted module ' + data.chain.join(' -> '));
-                    },
-                })
-                    .then(function (renewedModules) {
-                    logApplyRecult(updatedModules, renewedModules);
-                    checkForUpdate(true);
-                });
-            })
-                .catch(function (err) {
-                var status = module.hot.status();
-                if (['abort', 'fail'].indexOf(status) >= 0) {
-                    if (process.send) {
-                        process.send('SSWP_HMR_FAIL');
-                    }
-                    log('warn', 'Cannot apply update.');
-                    log('warn', err);
-                    log('error', 'Quitting process - will reload on next file change\u0007\n\u0007\n\u0007');
-                    process.exit(222);
-                }
-                else {
-                    log('warn', 'Update failed: ' + err.stack || err.message);
-                }
-            });
-        };
-        process.on('message', function (message) {
-            if (message !== 'SSWP_HMR')
-                return;
-            if (module.hot.status() !== 'idle') {
-                log('warn', 'Got signal but currently in ' + module.hot.status() + ' state.');
-                log('warn', 'Need to be in idle state to start hot update.');
-                return;
-            }
-            checkForUpdate();
-        });
-    }
-    if (process.send) {
-        process.send('SSWP_LOADED');
-    }
-};
-exports.default = monitorFn;

package/dist/monitor.loader.d.ts

@@ -1,2 +0,0 @@
-declare const loader: () => string;
-export default loader;

package/dist/monitor.loader.js

@@ -1,11 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const monitor_1 = __importDefault(require("./monitor"));
-const monitorSrc = `(${monitor_1.default.toString()})()`;
-const loader = function () {
-    return monitorSrc;
-};
-exports.default = loader;