debug tests working again, npm serve broken

smolattack · Dec 16, 2021 · 448310a · 448310a
1 parent 2947149
commit 448310a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -15,9 +15,6 @@
         "--experimental-loader",
         "file://${workspaceRoot}/build/debugging/tools/local-module-resolver/esm-debug.js"
       ],
-      "env": {
-        "NODE_ENV": "development"
-      },
       "console": "internalConsole",
       "internalConsoleOptions": "openOnSessionStart",
       "sourceMaps": true,
@@ -32,20 +29,17 @@
       "name": "Debug Tests",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/mocha",
       "cwd": "${workspaceRoot}",
       "preLaunchTask": "test-build",
-      "runtimeArgs": [
-        "--experimental-loader",
-        "file://${workspaceRoot}/build/testing/tools/local-module-resolver/esm-test.js"
-      ],
       "sourceMaps": true,
       "outFiles": [],
       "args": [
         "--retries",
         "0",
         "--verbose",
-        "--logging"
+        "--logging",
+        "--skip-web"
       ],
       "console": "internalConsole",
       "internalConsoleOptions": "openOnSessionStart",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,10 +3,10 @@
     "files.exclude": {
         "**/.git": true,
         "**/.DS_Store": true,
-        "**/node_modules": false,
+        "**/node_modules": true,
         "coverage": true,
         ".nyc_output": true,
-        "build": false,
+        "build": true,
         "dist": true,
         "site": true,
         "buildsystem-config.js": true

diff --git a/tools/local-module-resolver/esm-test.ts b/tools/local-module-resolver/esm-test.ts
@@ -1,2 +1,16 @@
-import { createResolve} from "./esm.js";
+import { createResolve } from "./esm.js";
+
 export const resolve = createResolve("/build/testing/packages");
+
+// export async function getFormat(url: string, context, defaultGetFormat) {
+
+//     // we force node to understand and load the executable mocha as a commonjs module
+//     if (/bin\/mocha$/i.test(url)) {
+//         return {
+//             format: "commonjs",
+//         };
+//     }
+
+//     // Defer to Node.js for all other URLs.
+//     return defaultGetFormat(url, context, defaultGetFormat);
+// }
diff --git a/tools/local-module-resolver/esm.ts b/tools/local-module-resolver/esm.ts
@@ -17,15 +17,19 @@ const cache = new Map<string, ResolvedValue>();
 
 export interface ResolvedValue {
     url: string;
-    format?: "module" | "commonjs";
+    format?: "module";
 }
 
 export interface ResolveContext {
     conditions?: [];
     parentUrl?: string | undefined;
 }
 
-export function createResolve(innerPath: string): (specifier: string, context: ResolveContext, defaultResolve: Function) => Promise<ResolvedValue> {
+export interface ResolverFunc {
+    (specifier: string, context: ResolveContext, defaultResolve: Function): Promise<ResolvedValue>;
+}
+
+export function createResolve(innerPath: string): ResolverFunc {
 
     return async function (specifier: string, context: ResolveContext, defaultResolve: Function): Promise<ResolvedValue> {
 
@@ -66,17 +70,12 @@ export function createResolve(innerPath: string): (specifier: string, context: R
             return resolved;
         }
 
-        // if (specifier.indexOf("_mocha") > -1) {
-        //     return {
-        //         url: specifier,
-        //         format: "commonjs",
-        //     };
-        // }
-
         if (specifier.indexOf("settings.js") > -1 && /^[a-z]:[\\|/]/i.test(specifier) && isWin32) {
             specifier = "file://" + specifier;
-            log(`patching file path for win32: ${specifier}`);
+            log(`patching settings.js import path for win32: ${specifier}`);
         }
+
+
 
         // Defer to Node.js for all other specifiers.
         return defaultResolve(specifier, context, defaultResolve);