@decohere/flux 0.0.1-dev.93 → 0.0.1-dev.95

package/commonjs/src/flux.module.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "FluxModule", {
         return FluxModule;
     }
 });
-const _mesh = require("@decohere/mesh");
+const _forge = require("@decohere/forge");
 const _cli = require("@decohere/nexus/cli");
 const _deferredscriptrunner = require("./deferred-script-runner.js");
 const _fluxcommand = require("./flux.command.js");
@@ -27,8 +27,7 @@ class FluxModule extends _cli.ModuleManifest {
         builder.registerSingleton(_deferredscriptrunner.DeferredScriptRunner);
     }
     createWorkspace(options) {
-        return _mesh.WorkspaceFactory.create({
-            configFile: options.configFile
-        });
+        // Same workspace as `flux.run` / `flux.serve` and forge (#516).
+        return (0, _forge.createWorkspace)(options);
     }
 }

package/commonjs/src/source-module-loader.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "SourceModuleLoader", {
 });
 const _nodemodule = require("node:module");
 const _nodepath = /*#__PURE__*/ _interop_require_default(require("node:path"));
+const _nodeurl = require("node:url");
 const _decorators = require("@decohere/crucible/decorators");
 const _forge = require("@decohere/forge");
 const _mesh = require("@decohere/mesh");
@@ -102,10 +103,7 @@ class SourceModuleLoader {
         this.disposed = false;
         this.transpileCache.clear();
         this.buildConfig = options.buildConfig;
-        this.workspace = options.workspace ?? await _mesh.WorkspaceFactory.create({
-            ..._forge.WorkspaceDefaults,
-            rootDir: process.cwd()
-        });
+        this.workspace = options.workspace ?? await (0, _forge.createWorkspace)();
         this.versionFileUrl = options.versionFileUrl ?? ((fileUrl)=>fileUrl);
         this.onResolved = options.onResolved;
         this.fileInfoMap = await this.buildFileInfoMap(this.buildConfig);
@@ -182,7 +180,9 @@ class SourceModuleLoader {
     }
     loadTs(url) {
         if (!url.startsWith("file:")) return null;
-        const cleanPath = new URL(url).pathname;
+        // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
+        // whose path has a space still match Mesh's list (#511).
+        const cleanPath = (0, _nodeurl.fileURLToPath)(url);
         const fileInfo = this.fileInfoMap.get(cleanPath);
         if (fileInfo == null) return null;
         const cached = this.transpileCache.get(cleanPath);

package/es6/src/flux.module.js

@@ -1,4 +1,4 @@
-import { WorkspaceFactory } from "@decohere/mesh";
+import { createWorkspace } from "@decohere/forge";
 import { ModuleManifest } from "@decohere/nexus/cli";
 import { DeferredScriptRunner } from "./deferred-script-runner.js";
 import { FluxCommand } from "./flux.command.js";
@@ -17,8 +17,7 @@ export class FluxModule extends ModuleManifest {
         builder.registerSingleton(DeferredScriptRunner);
     }
     createWorkspace(options) {
-        return WorkspaceFactory.create({
-            configFile: options.configFile
-        });
+        // Same workspace as `flux.run` / `flux.serve` and forge (#516).
+        return createWorkspace(options);
     }
 }

package/es6/src/source-module-loader.js

@@ -6,9 +6,10 @@ function _ts_decorate(decorators, target, key, desc) {
 }
 import { registerHooks } from "node:module";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { injectable } from "@decohere/crucible/decorators";
-import { BuildTargets, SwcTranspiler, WorkspaceDefaults } from "@decohere/forge";
-import { packageAliases, WorkspaceFactory } from "@decohere/mesh";
+import { BuildTargets, createWorkspace, SwcTranspiler } from "@decohere/forge";
+import { packageAliases } from "@decohere/mesh";
 import { FileEx, io } from "@decohere/nexus/io";
 import { scribe } from "@decohere/scribe";
 import { rewriteServeSpecifier } from "./rewrite-serve-specifier.js";
@@ -46,10 +47,7 @@ export class SourceModuleLoader {
         this.disposed = false;
         this.transpileCache.clear();
         this.buildConfig = options.buildConfig;
-        this.workspace = options.workspace ?? await WorkspaceFactory.create({
-            ...WorkspaceDefaults,
-            rootDir: process.cwd()
-        });
+        this.workspace = options.workspace ?? await createWorkspace();
         this.versionFileUrl = options.versionFileUrl ?? ((fileUrl)=>fileUrl);
         this.onResolved = options.onResolved;
         this.fileInfoMap = await this.buildFileInfoMap(this.buildConfig);
@@ -126,7 +124,9 @@ export class SourceModuleLoader {
     }
     loadTs(url) {
         if (!url.startsWith("file:")) return null;
-        const cleanPath = new URL(url).pathname;
+        // fileURLToPath, not URL.pathname: decodes %20 and gives Windows paths, so files
+        // whose path has a space still match Mesh's list (#511).
+        const cleanPath = fileURLToPath(url);
         const fileInfo = this.fileInfoMap.get(cleanPath);
         if (fileInfo == null) return null;
         const cached = this.transpileCache.get(cleanPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/flux",
-  "version": "0.0.1-dev.93",
+  "version": "0.0.1-dev.95",
   "description": "Hot module reload server for Node.js ESM applications",
   "keywords": [
     "typescript",
@@ -25,11 +25,11 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/crucible": "0.0.1-dev.93",
-    "@decohere/forge": "0.0.1-dev.93",
-    "@decohere/mesh": "0.0.1-dev.93",
-    "@decohere/nexus": "0.0.1-dev.93",
-    "@decohere/scribe": "0.0.1-dev.93",
+    "@decohere/crucible": "0.0.1-dev.95",
+    "@decohere/forge": "0.0.1-dev.95",
+    "@decohere/mesh": "0.0.1-dev.95",
+    "@decohere/nexus": "0.0.1-dev.95",
+    "@decohere/scribe": "0.0.1-dev.95",
     "commander": "^13.1.0",
     "rxjs": "^7.8.2"
   },