v0.6.59

mbloch · Dec 8, 2023 · ec6e7a4 · ec6e7a4
1 parent 578879a
commit ec6e7a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+v0.6.59
+* Second attempted fix for -require error on Windows.
+
 v0.6.58
 * Fix for -require error on Windows.
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapshaper",
-  "version": "0.6.58",
+  "version": "0.6.59",
   "description": "A tool for editing vector datasets for mapping and GIS.",
   "keywords": [
     "shapefile",

diff --git a/src/commands/mapshaper-require.mjs b/src/commands/mapshaper-require.mjs
@@ -9,7 +9,7 @@ import { isValidExternalCommand } from '../commands/mapshaper-external';
 
 cmd.require = async function(opts) {
   var globals = getStashedVar('defs');
-  var moduleFile, moduleName, mod, err;
+  var moduleFile, moduleName, mod;
   if (!opts.module) {
     stop("Missing module name or path to module");
   }
@@ -20,17 +20,14 @@ cmd.require = async function(opts) {
   } else {
     moduleName = opts.module;
   }
-  if (moduleFile && !require('path').isAbsolute(moduleFile)) {
-    moduleFile = require('path').join(process.cwd(), moduleFile);
-  }
   try {
     // import CJS and ES modules
     mod = await import(moduleFile ? require('url').pathToFileURL(moduleFile) : moduleName);
     if (mod.default) {
       mod = mod.default;
     }
     if (typeof mod == 'function') {
-      // assuming that functions are mapshpaper command generators...
+      // assuming that functions are mapshaper command generators...
       // this MUST be changed asap.
       var retn = mod(api);
       if (retn && isValidExternalCommand(retn)) {