native module resolution fix (microsoft#4467)

pelikhan · web-flow · commit 47a8193c8e14 · 2018-06-12T19:52:59.000-07:00
* resolve modules in target directory as well

* reduce log level

* better log level

* better logging
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -2,12 +2,14 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "DebugBuildTarget",
+			"name": "HidList",
 			"type": "node",
 			"request": "launch",
 			"program": "${workspaceRoot}/built/pxt.js",
 			"stopOnEntry": false,
-			"args": ["buildtarget"],
+			"args": [
+				"hidlist"
+			],
 			"cwd": "${workspaceRoot}/../pxt-adafruit",
 			"runtimeExecutable": null,
 			"runtimeArgs": [
@@ -21,12 +23,35 @@
 			"outFiles": []
 		},
 		{
-			"name": "DebugBuildPackage",
+			"name": "BuildTarget",
 			"type": "node",
 			"request": "launch",
 			"program": "${workspaceRoot}/built/pxt.js",
 			"stopOnEntry": false,
-			"args": ["build"],
+			"args": [
+				"buildtarget"
+			],
+			"cwd": "${workspaceRoot}/../pxt-adafruit",
+			"runtimeExecutable": null,
+			"runtimeArgs": [
+				"--nolazy"
+			],
+			"env": {
+				"NODE_ENV": "development"
+			},
+			"console": "integratedTerminal",
+			"sourceMaps": false,
+			"outFiles": []
+		},
+		{
+			"name": "BuildPackage",
+			"type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/built/pxt.js",
+			"stopOnEntry": false,
+			"args": [
+				"build"
+			],
 			"cwd": "${workspaceRoot}/../pxt-adafruit/projects/pxt-seesaw",
 			"runtimeExecutable": null,
 			"runtimeArgs": [
@@ -45,7 +70,10 @@
 			"request": "launch",
 			"program": "${workspaceRoot}/built/pxt.js",
 			"stopOnEntry": false,
-			"args": ["pyconv", "adafruit_seesaw"],
+			"args": [
+				"pyconv",
+				"adafruit_seesaw"
+			],
 			"cwd": "${workspaceRoot}/../pxt-adafruit/projects/Adafruit_CircuitPython_seesaw",
 			"runtimeExecutable": null,
 			"runtimeArgs": [
@@ -59,16 +87,21 @@
 			"outFiles": []
 		},
 		{
-			"name": "Run mocha",
+			"name": "Mocha",
 			"type": "node",
 			"request": "launch",
 			"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
 			"stopOnEntry": false,
-			"args": ["built/tests/decompile-test/runner.js", "--no-timeouts"],
+			"args": [
+				"built/tests/decompile-test/runner.js",
+				"--no-timeouts"
+			],
 			"cwd": "${workspaceRoot}",
 			"runtimeExecutable": null,
-			"env": { "NODE_ENV": "testing"}
-			},
+			"env": {
+				"NODE_ENV": "testing"
+			}
+		},
 		{
 			"name": "Attach",
 			"type": "node",
diff --git a/cli/hid.ts b/cli/hid.ts
@@ -20,7 +20,10 @@ export interface HidDevice {
 
 export function listAsync() {
     return getHF2DevicesAsync()
-        .then(devices => devices.forEach(device => pxt.log(device)));
+        .then(devices => {
+            pxt.log(`found ${devices.length} HID devices`);
+            devices.forEach(device => pxt.log(device));
+        })
 }
 
 export function serialAsync() {
diff --git a/cli/nodeutil.ts b/cli/nodeutil.ts
@@ -29,6 +29,7 @@ export let pxtCoreDir: string = path.join(__dirname, "..");
 
 export function setTargetDir(dir: string) {
     targetDir = dir;
+    (<any>module).paths.push(path.join(targetDir, "node_modules"));
 }
 
 export function readResAsync(g: events.EventEmitter) {
@@ -510,6 +511,8 @@ export function lazyRequire(name: string, install = false): any {
     } catch (e) {
         if (install)
             pxt.log(`package "${name}" failed to load, run "pxt npminstallnative" to install native depencencies`)
+        pxt.debug(e);
+        pxt.debug((<any>require.resolve).paths(name));
         return undefined;
     }
     /* tslint:enable:non-literal-require */

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ export let pxtCoreDir: string = path.join(__dirname, "..");`
`29`	`29`
`30`	`30`	`export function setTargetDir(dir: string) {`
`31`	`31`	`targetDir = dir;`
	`32`	`+ (<any>module).paths.push(path.join(targetDir, "node_modules"));`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`export function readResAsync(g: events.EventEmitter) {`
`@@ -510,6 +511,8 @@ export function lazyRequire(name: string, install = false): any {`
`510`	`511`	`} catch (e) {`
`511`	`512`	`if (install)`
`512`	`513`	pxt.log(`package "${name}" failed to load, run "pxt npminstallnative" to install native depencencies`)
	`514`	`+ pxt.debug(e);`
	`515`	`+ pxt.debug((<any>require.resolve).paths(name));`
`513`	`516`	`return undefined;`
`514`	`517`	`}`
`515`	`518`	`/* tslint:enable:non-literal-require */`