anypack-plugin-serve 0.1.0-alpha.2 → 0.1.0-beta.1

package/client.js

@@ -19,16 +19,16 @@
   let options;
   try {
     options = ʎɐɹɔosǝʌɹǝs;
-  } catch (e) {
+  } catch (_e) {
     const { log } = require('./lib/client/log.js');
     log.error(
-      'The entry for anypack-plugin-serve was included in your build, but it does not appear that the plugin was. Please check your configuration.'
+      'The entry for anypack-plugin-serve was included in your build, but it does not appear that the plugin was. Please check your configuration.',
     );
   }
 
   try {
     hash = __webpack_hash__;
-  } catch (e) {}
+  } catch (_e) {}
 
   run(hash, options);
 })();

package/lib/client/client.js

@@ -11,12 +11,12 @@
 const run = (buildHash, options) => {
   const { address, client = {}, hmr, progress, secure, status } = options;
 
-  options.firstInstance = !window.webpackPluginServe;
+  options.firstInstance = !window.anypackPluginServe;
 
-  window.webpackPluginServe = window.webpackPluginServe || {
+  window.anypackPluginServe = window.anypackPluginServe || {
     compilers: {},
   };
-  window.webpackPluginServe.silent = !!client.silent;
+  window.anypackPluginServe.silent = !!client.silent;
 
   const { ClientSocket } = require('./ClientSocket.js');
   const { replace } = require('./hmr.js');
@@ -30,7 +30,7 @@ const run = (buildHash, options) => {
 
   const { compilerName } = options;
 
-  window.webpackPluginServe.compilers[compilerName] = {};
+  window.anypackPluginServe.compilers[compilerName] = {};
 
   // prevents ECONNRESET errors on the server
   window.addEventListener('beforeunload', () => socket.close());
@@ -42,7 +42,7 @@ const run = (buildHash, options) => {
     const identifier = options.compilerName
       ? `(Compiler: ${options.compilerName}) `
       : '';
-    const compiler = window.webpackPluginServe.compilers[compilerName];
+    const compiler = window.anypackPluginServe.compilers[compilerName];
     const { wpsId } = data;
 
     switch (action) {

package/lib/client/log.js

@@ -22,4 +22,4 @@ const silent = {
   warn: noop,
 };
 
-module.exports = () => (window.webpackPluginServe.silent ? silent : log);
+module.exports = () => (window.anypackPluginServe.silent ? silent : log);

package/lib/client/overlays/status.js

@@ -366,7 +366,7 @@ const init = (options, socket) => {
       return;
     }
 
-    const { compilers } = window.webpackPluginServe;
+    const { compilers } = window.anypackPluginServe;
 
     switch (action) {
       case 'build':

package/lib/errors.js

@@ -8,14 +8,14 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-class WebpackPluginServeError extends Error {
+class AnypackPluginServeError extends Error {
   constructor(...args) {
     super(...args);
-    this.name = 'WebpackPluginServeError';
+    this.name = 'AnypackPluginServeError';
   }
 }
 
-class PluginExistsError extends WebpackPluginServeError {
+class PluginExistsError extends AnypackPluginServeError {
   constructor(...args) {
     super(...args);
     this.name = 'PluginExistsError';
@@ -23,7 +23,7 @@ class PluginExistsError extends WebpackPluginServeError {
   }
 }
 
-class RamdiskPathError extends WebpackPluginServeError {
+class RamdiskPathError extends AnypackPluginServeError {
   constructor(...args) {
     super(...args);
     this.name = 'RamdiskPathError';
@@ -34,5 +34,5 @@ class RamdiskPathError extends WebpackPluginServeError {
 module.exports = {
   PluginExistsError,
   RamdiskPathError,
-  WebpackPluginServeError,
+  AnypackPluginServeError,
 };

package/lib/helpers.js

@@ -1,16 +1,15 @@
-module.exports = {
-  getMajorVersion: (version) =>
-    typeof version === 'string' && version.includes('.')
-      ? version.split('.')[0]
-      : false,
-  defer: () => {
-    const deferred = {};
+function defer() {
+  /** @type {{ promise: Promise, resolve: () => {}, reject: () => {}  }} */
+  const deferred = {};
+
+  deferred.promise = new Promise((resolve, reject) => {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
+  });
 
-    deferred.promise = new Promise((resolve, reject) => {
-      deferred.resolve = resolve;
-      deferred.reject = reject;
-    });
+  return deferred;
+}
 
-    return deferred;
-  },
+module.exports = {
+  defer,
 };

package/lib/index.js

@@ -15,7 +15,6 @@ const colors = require('ansi-colors');
 
 const globby = require('tinyglobby');
 const { customAlphabet } = require('nanoid');
-const { DefinePlugin, ProgressPlugin } = require('webpack');
 
 const { init: initHmrPlugin } = require('./plugins/hmr');
 const { init: initRamdiskPlugin } = require('./plugins/ramdisk');
@@ -45,13 +44,11 @@ const defaults = {
 };
 
 const key = 'anypack-plugin-serve';
-const newline = () => console.log();
 const nanoid = customAlphabet('1234567890abcdef', 7);
 
 let instance = null;
 
-// TODO: test this on a multicompiler setup
-class WebpackPluginServe extends EventEmitter {
+class AnypackPluginServe extends EventEmitter {
   constructor(opts = {}) {
     super();
 
@@ -59,7 +56,7 @@ class WebpackPluginServe extends EventEmitter {
 
     if (valid.error) {
       forceError(
-        'An option was passed to WebpackPluginServe that is not valid',
+        'An option was passed to AnypackPluginServe that is not valid',
       );
       throw valid.error;
     }
@@ -92,22 +89,12 @@ class WebpackPluginServe extends EventEmitter {
     // returns a promise
     if (typeof options.host === 'string') {
       const { host } = options;
-      options.host = {
-        // biome-ignore lint/suspicious/noThenProperty: legacy
-        then(r) {
-          r(host);
-        },
-      };
+      options.host = Promise.resolve(host);
     }
 
     if (Number.isInteger(options.port)) {
       const { port } = options;
-      options.port = {
-        // biome-ignore lint/suspicious/noThenProperty: legacy
-        then(r) {
-          r(port);
-        },
-      };
+      options.port = Promise.resolve(port);
     }
 
     if (!options.static) {
@@ -231,25 +218,10 @@ class WebpackPluginServe extends EventEmitter {
       });
     }
 
-    compiler.hooks.compilation.tap(key, (compilation) => {
-      compilation.hooks.afterHash.tap(key, () => {
-        // webpack still has a 4 year old bug whereby in watch mode, file timestamps aren't properly
-        // accounted for, which will trigger multiple builds of the same hash.
-        // see: https://github.com/egoist/time-fix-plugin
-        /* istanbul ignore if */
-        if (this.lastHash === compilation.hash) {
-          return;
-        }
-        this.lastHash = compilation.hash;
-        this.emit('build', compiler.name, compiler);
-      });
-    });
-
     watchRun.tapPromise(key, async () => {
       if (!this.state.starting) {
         // ensure we're only trying to start the server once
         this.state.starting = start.bind(this)();
-        this.state.starting.then(() => newline());
       }
 
       // wait for the server to startup so we can get our client connection info from it
@@ -264,16 +236,18 @@ class WebpackPluginServe extends EventEmitter {
 
       const defineObject = Object.assign({}, this.options, compilerData);
       const defineData = { ʎɐɹɔosǝʌɹǝs: JSON.stringify(defineObject) };
-      const definePlugin = new DefinePlugin(defineData);
+      const definePlugin = new compiler.webpack.DefinePlugin(defineData);
 
       definePlugin.apply(compiler);
 
       if (this.options.progress) {
-        const progressPlugin = new ProgressPlugin((percent, message, misc) => {
-          // pass the data onto the client raw. connected sockets may want to interpret the data
-          // differently
-          this.emit('progress', { percent, message, misc }, compiler);
-        });
+        const progressPlugin = new compiler.webpack.ProgressPlugin(
+          (percent, message, misc) => {
+            // pass the data onto the client raw. connected sockets may want to interpret the data
+            // differently
+            this.emit('progress', { percent, message, misc }, compiler);
+          },
+        );
 
         progressPlugin.apply(compiler);
       }
@@ -281,4 +255,4 @@ class WebpackPluginServe extends EventEmitter {
   }
 }
 
-module.exports = { defaults, WebpackPluginServe };
+module.exports = { defaults, AnypackPluginServe };

package/lib/plugins/hmr.js

@@ -8,29 +8,22 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const { HotModuleReplacementPlugin, version } = require('webpack');
-
-const { getMajorVersion } = require('../helpers');
 
 const { PluginExistsError } = require('../errors');
 
 const addPlugin = (compiler) => {
-  const hmrPlugin = new HotModuleReplacementPlugin();
+  const hmrPlugin = new compiler.webpack.HotModuleReplacementPlugin();
   hmrPlugin.apply(compiler);
 };
 
 const init = function init(compiler, log) {
-  const webpackMajorVersion = getMajorVersion(version);
   compiler.options.output = Object.assign(compiler.options.output, {
     hotUpdateChunkFilename: `${compiler.wpsId}-[id]-wps-hmr.js`,
-    hotUpdateMainFilename:
-      webpackMajorVersion >= 5
-        ? `[runtime]-${compiler.wpsId}-wps-hmr.json`
-        : `${compiler.wpsId}-wps-hmr.json`,
+    hotUpdateMainFilename: `[runtime]-${compiler.wpsId}-wps-hmr.json`,
   });
 
   const hasHMRPlugin = compiler.options.plugins.some(
-    (plugin) => plugin instanceof HotModuleReplacementPlugin,
+    (plugin) => plugin instanceof compiler.webpack.HotModuleReplacementPlugin,
   );
 
   /* istanbul ignore else */

package/lib/plugins/ramdisk.js

@@ -85,14 +85,13 @@ module.exports = {
         : defaultOptions,
     );
 
+    compiler.hooks.shutdown.tap('clean-ramdisk', () => plugin.cleanup());
+
     if (
       fs.lstatSync(path, { throwIfNoEntry: false }) ||
       fs.statSync(path, { throwIfNoEntry: false })
     ) {
-      console.log('Removing', path);
       fs.rmSync(path, { recursive: true });
-    } else {
-      console.log('Path does not exist', path);
     }
 
     const ramdiskPath = join(plugin.diskPath, newPath);

package/lib/plugins/ramdisk_lib.js

@@ -125,18 +125,6 @@ class Ramdisk {
       );
       this.commands?.mount(this.options);
     }
-
-    process.on('SIGINT', () => {
-      this.cleanup();
-    });
-
-    process.on('SIGTERM', () => {
-      this.cleanup();
-    });
-
-    process.on('exit', () => {
-      this.cleanup();
-    });
   }
 
   get diskPath() {

package/lib/ws.js

@@ -8,7 +8,7 @@
   The above copyright notice and this permission notice shall be
   included in all copies or substantial portions of this Source Code Form.
 */
-const defer = require('./helpers.js').defer;
+const { defer } = require('./helpers.js');
 const WebSocket = require('ws');
 
 const socketServer = new WebSocket.Server({ noServer: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anypack-plugin-serve",
-  "version": "0.1.0-alpha.2",
+  "version": "0.1.0-beta.1",
   "description": "A Development Server in a Webpack Plugin",
   "license": "MPL-2.0",
   "repository": "onigoetz/anypack-plugin-serve",
@@ -16,7 +16,10 @@
     "dev": "npm run dev:clean && node ../node_modules/webpack-nano/bin/wp --config test/fixtures/simple/webpack.config.js",
     "dev:clean": "del test/fixtures/multi/output/* test/fixtures/simple/output/*",
     "dev:multi": "npm run dev:clean && ../node node_modules/webpack-nano/bin/wp --config test/fixtures/multi/webpack.config.js",
-    "test": "rstest"
+    "test": "rstest",
+    "format": "biome format",
+    "lint": "biome check --write",
+    "ci:lint": "biome check"
   },
   "files": [
     "client.js",
@@ -32,7 +35,7 @@
     "ansi-colors": "^4.1.3",
     "connect-history-api-fallback": "^2.0.0",
     "empathic": "^2.0.0",
-    "http-proxy-middleware": "^1.0.3",
+    "http-proxy-middleware": "^3.0.5",
     "json-stringify-safe": "^5.0.1",
     "nanoid": "^5.1.6",
     "onetime": "^7.0.0",
@@ -44,12 +47,11 @@
     "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@rstest/core": "^0.7.5",
-    "@rstest/coverage-istanbul": "^0.1.3",
+    "@biomejs/biome": "2.3.11",
+    "@rstest/core": "^0.7.7",
+    "@rstest/coverage-istanbul": "^0.1.4",
     "del-cli": "7.0.0",
-    "execa": "^9.0.0",
     "get-port": "^7.1.0",
-    "line-by-line": "^0.1.6",
     "node-fetch": "^3.3.2",
     "puppeteer": "^24.34.0",
     "random-js": "^2.1.0",