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

package/client.js

@@ -33,16 +33,16 @@
   }
 
   // Initialize overlay singleton
-  if (!window.anypackOverlay) {
+  if (!globalThis.anypackOverlay) {
     const { init } = require('anypack-overlay');
 
-    window.anypackOverlay = init();
-    window.anypackOverlay.silent = !!options?.client?.silent;
+    globalThis.anypackOverlay = init();
+    globalThis.anypackOverlay.silent = !!options?.client?.silent;
   }
 
   // Start client
   const Compiler = require('./lib/client/Compiler.js');
   const compiler = new Compiler(options, hash);
 
-  window.anypackOverlay.addCompiler(compiler);
+  globalThis.anypackOverlay.addCompiler(compiler);
 })();

package/lib/client/ClientSocket.js

@@ -11,7 +11,7 @@
 const { error, refresh, warn } = require('./log.js')();
 
 // ignore 1008 (HTTP 400 equivalent) and 1011 (HTTP 500 equivalent)
-const ignoreCodes = [1008, 1011];
+const ignoreCodes = new Set([1008, 1011]);
 const maxAttempts = 10;
 
 class ClientSocket {
@@ -50,7 +50,7 @@ class ClientSocket {
 
     if (this.options.retry) {
       this.socket.addEventListener('close', (event) => {
-        if (ignoreCodes.includes(event.code)) {
+        if (ignoreCodes.has(event.code)) {
           return;
         }
 

package/lib/client/hmr.js

@@ -49,8 +49,8 @@ const replace = async (buildHash, hash, refreshOnFailure) => {
 
     try {
       modules = await check(false);
-    } catch (_e) {
-      // noop. this typically happens when a MultiCompiler has more than one compiler that includes
+    } catch {
+      // This typically happens when a MultiCompiler has more than one compiler that includes
       // this script, and an update happens with a hash that isn't part of the compiler/module this
       // instance was loaded for.
       return;

package/lib/client/log.js

@@ -26,4 +26,6 @@ const silent = {
   refresh,
 };
 
-module.exports = () => (window.anypackOverlay.silent ? silent : log);
+module.exports = function getLogger() {
+  return globalThis.anypackOverlay.silent ? silent : log;
+};

package/lib/index.js

@@ -49,7 +49,8 @@ const defaults = {
 const key = 'anypack-plugin-serve';
 const nanoid = customAlphabet('1234567890abcdef', 7);
 
-let instance = null;
+let activeInstanceId = null;
+let activeLog = null;
 
 class AnypackPluginServe extends EventEmitter {
   constructor(opts = {}) {
@@ -68,16 +69,18 @@ class AnypackPluginServe extends EventEmitter {
     // of the plugin to be tested within the same context. If you find this, use this at your own
     // peril.
     /* istanbul ignore if */
-    if (!opts.allowMany && instance) {
-      instance.log.error(
+    if (!opts.allowMany && activeInstanceId !== null) {
+      activeLog.error(
         'Duplicate instances created. Only the first instance of this plugin will be active.',
       );
       return;
     }
 
-    instance = this;
+    const instanceId = Symbol();
+    this._instanceId = instanceId;
+    activeInstanceId = instanceId;
 
-    const options = Object.assign({}, defaults, opts);
+    const options = { ...defaults, ...opts };
 
     if (options.compress === true) {
       options.compress = {};
@@ -110,6 +113,7 @@ class AnypackPluginServe extends EventEmitter {
     }
 
     this.log = getLogger(options.log || {});
+    activeLog = this.log;
     this.options = options;
     this.compilers = [];
     this.state = {};
@@ -120,7 +124,7 @@ class AnypackPluginServe extends EventEmitter {
 
     // only allow once instance of the plugin to run for a build
     /* istanbul ignore if */
-    if (instance !== this) {
+    if (activeInstanceId !== this._instanceId) {
       return;
     }
 
@@ -128,13 +132,9 @@ class AnypackPluginServe extends EventEmitter {
   }
 
   attach() {
-    const self = this;
-    const result = {
-      apply(compiler) {
-        return self.hook(compiler);
-      },
+    return {
+      apply: (compiler) => this.hook(compiler),
     };
-    return result;
   }
 
   // #138. handle emitted events that don't have a listener registered so they can be sent via WebSocket
@@ -239,7 +239,7 @@ class AnypackPluginServe extends EventEmitter {
         wpsId: compiler.wpsId,
       };
 
-      const defineObject = Object.assign({}, this.options, compilerData);
+      const defineObject = { ...this.options, ...compilerData };
       const defineData = { ʎɐɹɔosǝʌɹǝs: JSON.stringify(defineObject) };
       const definePlugin = new compiler.webpack.DefinePlugin(defineData);
 

package/lib/middleware.js

@@ -126,11 +126,11 @@ const getBuiltins = (app, options) => {
     }
   };
 
-  const statik = (root, opts = { dev: true }) => {
-    const paths = [].concat(root || options.static);
+  const statik = (root, opts) => {
+    const paths = [root || options.static].flat();
     staticPaths = paths;
     for (const path of paths) {
-      app.use(sirv(path, opts));
+      app.use(sirv(path, opts ?? { dev: true }));
     }
   };
 

package/lib/plugins/hmr.js

@@ -27,15 +27,15 @@ const init = function init(compiler, log) {
   );
 
   /* istanbul ignore else */
-  if (!hasHMRPlugin) {
-    addPlugin(compiler);
-  } else {
+  if (hasHMRPlugin) {
     log.error(
       'anypack-plugin-serve adds HotModuleReplacementPlugin automatically. Please remove it from your config.',
     );
     throw new PluginExistsError(
       'HotModuleReplacementPlugin exists in the specified configuration.',
     );
+  } else {
+    addPlugin(compiler);
   }
 };
 

package/lib/plugins/ramdisk.js

@@ -29,8 +29,9 @@ const readPkgName = () => {
   try {
     const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
     return pkg.name;
-  } catch (_error) {
+  } catch (error) {
     // istanbul ignore next
+    console.warn(`Could not read package name: ${error.message}`);
     return null;
   }
 };

package/lib/plugins/ramdisk_lib.js

@@ -102,18 +102,17 @@ function run(command, ...args) {
 
 class Ramdisk {
   constructor(opts = {}) {
-    const partialOpts = Object.assign({}, defaults, opts);
-    const options = Object.assign({}, partialOpts, {
+    const partialOpts = { ...defaults, ...opts };
+    const options = {
+      ...partialOpts,
       blocks: partialOpts.bytes / partialOpts.blockSize,
-    });
+    };
 
     this.options = options;
 
     this.commands = getCommands();
     this.options.diskPath = this.commands?.root(this.options);
 
-    // const options = Object.assign({}, opts, { root: commands.root });
-
     this.init();
   }
 

package/lib/routes.js

@@ -41,14 +41,9 @@ const setupRoutes = function setupRoutes() {
         socket.send(stringify({ action, data }));
       };
 
-      registerEvent(
-        this,
-        socket,
-        'build',
-        (compilerName = '<unknown>', { wpsId }) => {
-          send('build', { compilerName, wpsId });
-        },
-      );
+      registerEvent(this, socket, 'build', (compilerName, { wpsId }) => {
+        send('build', { compilerName: compilerName ?? '<unknown>', wpsId });
+      });
 
       registerEvent(this, socket, 'done', (stats, { wpsId }) => {
         const { hash } = stats;
@@ -87,19 +82,15 @@ const setupRoutes = function setupRoutes() {
         }
       });
 
-      registerEvent(
-        this,
-        socket,
-        'invalid',
-        (filePath = '<unknown>', compiler) => {
-          const context =
-            compiler.context || compiler.options.context || process.cwd();
-          const fileName = filePath?.replace?.(context, '') || filePath;
-          const { wpsId } = compiler;
-
-          send('invalid', { fileName, wpsId });
-        },
-      );
+      registerEvent(this, socket, 'invalid', (filePath, compiler) => {
+        const path = filePath ?? '<unknown>';
+        const context =
+          compiler.context || compiler.options.context || process.cwd();
+        const fileName = path?.replace?.(context, '') || path;
+        const { wpsId } = compiler;
+
+        send('invalid', { fileName, wpsId });
+      });
 
       registerEvent(this, socket, 'progress', (data) => {
         send('progress', data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anypack-plugin-serve",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0",
   "description": "A Development Server in a Webpack Plugin",
   "license": "MPL-2.0",
   "repository": "onigoetz/anypack-plugin-serve",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@polka/compression": "^1.0.0-next.25",
     "ansi-colors": "^4.1.3",
-    "anypack-overlay": "0.1.0-beta.1",
+    "anypack-overlay": "0.1.0",
     "connect-history-api-fallback": "^2.0.0",
     "empathic": "^2.0.0",
     "http-proxy-middleware": "^3.0.5",
@@ -48,14 +48,15 @@
     "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.3.11",
-    "@rstest/core": "^0.8.1",
-    "@rstest/coverage-istanbul": "^0.2.0",
+    "@biomejs/biome": "2.4.10",
+    "@rstest/core": "^0.9.0",
+    "@rstest/coverage-istanbul": "^0.3.0",
     "del-cli": "7.0.0",
     "get-port": "^7.1.0",
     "node-fetch": "^3.3.2",
     "puppeteer": "^24.34.0",
     "random-js": "^2.1.0",
+    "rstest-sonar-reporter": "1.0.0",
     "webpack": "^5.0.0",
     "webpack-nano": "^1.0.0"
   },